Add 2.6.12 patch thanks to steev <threeway@gmail.com> in bug 96504 and gcc4 patch from sourceforge patches.

(Portage version: 1.589-cvs)

6 files changed, 75 insertions, 2 deletions

diff --git a/net-wireless/rtl8180/ChangeLog b/net-wireless/rtl8180/ChangeLog
index 84607ae488fa..ec5e8ffa3555 100644
--- a/net-wireless/rtl8180/ChangeLog
+++ b/net-wireless/rtl8180/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/rtl8180
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl8180/ChangeLog,v 1.5 2005/05/14 20:45:23 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl8180/ChangeLog,v 1.6 2005/06/26 17:12:55 genstef Exp $
+
+*rtl8180-0.21-r1 (26 Jun 2005)
+
+  26 Jun 2005; Stefan Schweizer <genstef@gentoo.org>
+  +files/rtl8180-pci_name.patch, +files/rtl8180_gcc4_fix.patch,
+  +rtl8180-0.21-r1.ebuild:
+  Add 2.6.12 patch thanks to steev <threeway@gmail.com> in bug 96504 and gcc4
+  patch from sourceforge patches.
 
 *rtl8180-0.21 (14 May 2005)
 
diff --git a/net-wireless/rtl8180/Manifest b/net-wireless/rtl8180/Manifest
index c05427e10376..b25413a0147d 100644
--- a/net-wireless/rtl8180/Manifest
+++ b/net-wireless/rtl8180/Manifest
@@ -1,8 +1,12 @@
 MD5 7d51ba2c0c5548b1115ed75239f45732 rtl8180-0.20.2.ebuild 793
+MD5 3f4c6a217b3afe7d68ade6aa5942bc74 rtl8180-0.21-r1.ebuild 987
 MD5 2df2b2bceb40a1843e7880bee39b6f77 rtl8180-0.21.ebuild 831
-MD5 2802b27ae64f7d4bca3946c09e85f433 ChangeLog 1108
+MD5 97d02f586394b32cbc375f19f5296fda ChangeLog 1397
 MD5 b25f6de1198415116396fd3ef32bde18 rtl8180-0.19.ebuild 787
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 MD5 780f7752bbe11adba40b702a25f7925d files/digest-rtl8180-0.19 63
 MD5 eb0980987502df4d9f4f67059f4e76ed files/digest-rtl8180-0.21 63
 MD5 7ebf5832221aa18a74d24b886957d706 files/digest-rtl8180-0.20.2 65
+MD5 7383edae44c5e03555476ccdf522598d files/rtl8180-pci_name.patch 441
+MD5 c31df29b9974a8e93e58740068991330 files/rtl8180_gcc4_fix.patch 431
+MD5 eb0980987502df4d9f4f67059f4e76ed files/digest-rtl8180-0.21-r1 63
diff --git a/net-wireless/rtl8180/files/digest-rtl8180-0.21-r1 b/net-wireless/rtl8180/files/digest-rtl8180-0.21-r1
new file mode 100644
index 000000000000..dfd7d09d18cd
--- /dev/null
+++ b/net-wireless/rtl8180/files/digest-rtl8180-0.21-r1
@@ -0,0 +1 @@
+MD5 11f24f693f9661a8bef0305ace663e4a rtl8180-0.21.tar.gz 96748
diff --git a/net-wireless/rtl8180/files/rtl8180-pci_name.patch b/net-wireless/rtl8180/files/rtl8180-pci_name.patch
new file mode 100644
index 000000000000..87c551f3fd90
--- /dev/null
+++ b/net-wireless/rtl8180/files/rtl8180-pci_name.patch
@@ -0,0 +1,12 @@
+diff -pur rtl8180-0.21.orig/r8180_core.c rtl8180-0.21/r8180_core.c
+--- rtl8180-0.21.orig/r8180_core.c	2005-06-26 18:33:08.000000000 +0200
++++ rtl8180-0.21/r8180_core.c	2005-06-26 18:40:24.000000000 +0200
+@@ -3630,7 +3630,7 @@ static int __devinit rtl8180_pci_probe(s
+ 	
+ 	if (!(pmem_flags & IORESOURCE_MEM)) {
+ 		DMESG("%s: region #1 not a MMIO resource, aborting", 
+-		      pdev->slot_name);
++		      pci_name(pdev));
+ 		goto fail;
+ 	}
+ 	
diff --git a/net-wireless/rtl8180/files/rtl8180_gcc4_fix.patch b/net-wireless/rtl8180/files/rtl8180_gcc4_fix.patch
new file mode 100644
index 000000000000..64867fff73f5
--- /dev/null
+++ b/net-wireless/rtl8180/files/rtl8180_gcc4_fix.patch
@@ -0,0 +1,11 @@
+--- rtl8180/r8180_wx.c~	2005-05-08 12:27:05.000000000 +0200
++++ rtl8180/r8180_wx.c	2005-05-13 17:23:59.147295921 +0200
+@@ -968,7 +968,7 @@
+ #else
+ 
+ struct iw_handler_def  r8180_wx_handlers_def={
+-	.standard r8180_wx_handlers,
++	.standard = r8180_wx_handlers,
+ 	.num_standard = sizeof(r8180_wx_handlers) / sizeof(iw_handler),
+ 	.private = r8180_private_handler,
+ 	.num_private = sizeof(r8180_private_handler) / sizeof(iw_handler),
diff --git a/net-wireless/rtl8180/rtl8180-0.21-r1.ebuild b/net-wireless/rtl8180/rtl8180-0.21-r1.ebuild
new file mode 100644
index 000000000000..d9e8284d12be
--- /dev/null
+++ b/net-wireless/rtl8180/rtl8180-0.21-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl8180/rtl8180-0.21-r1.ebuild,v 1.1 2005/06/26 17:12:55 genstef Exp $
+
+inherit linux-mod eutils
+
+DESCRIPTION="Driver for the rtl8180 wireless chipset"
+HOMEPAGE="http://rtl8180-sa2400.sourceforge.net"
+SRC_URI="mirror://sourceforge/rtl8180-sa2400/${P}.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+DEPEND="net-wireless/wireless-tools"
+
+MODULE_NAMES="r8180(net:) ieee80211-r8180(net:)
+	ieee80211_crypt-r8180(net:) ieee80211_crypt_wep-r8180(net:)"
+CONFIG_CHECK="NET_RADIO CRYPTO CRYPTO_ARC4 CRC32"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KSRC=${KV_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	kernel_is ge 2 6 12 && epatch ${FILESDIR}/rtl8180-pci_name.patch
+	epatch ${FILESDIR}/rtl8180_gcc4_fix.patch
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc AUTHORS CHANGES INSTALL README README.adhoc
+}