Fix compiling with 2.6.17, bug 137336

Package-Manager: portage-2.1.1_pre1-r2

5 files changed, 13 insertions, 82 deletions

diff --git a/net-wireless/rtl8180/Manifest b/net-wireless/rtl8180/Manifest
index 0dbeed76db7e..4026d82ca5ba 100644
--- a/net-wireless/rtl8180/Manifest
+++ b/net-wireless/rtl8180/Manifest
@@ -1,24 +1,16 @@
-MD5 7b2182cc5c3e6e7ae1fae3670ad606df ChangeLog 1955
-RMD160 d5c31be918f1fd53b1aeac1a96af73377ad94cbe ChangeLog 1955
-SHA256 e358ca6fff41cae651b1a6dc9b63d1baede77b80d57d797ebc0a92fb6ef77541 ChangeLog 1955
-MD5 eb0980987502df4d9f4f67059f4e76ed files/digest-rtl8180-0.21-r1 63
-RMD160 090318b867eb9510525cf7fd3effe849654a771b files/digest-rtl8180-0.21-r1 63
-SHA256 647db4659979fcf821ca5e981c690a07615fa383aecf2ffecda43c6670a578e9 files/digest-rtl8180-0.21-r1 63
-MD5 99aa2eb686e06c7c01c519312e53be78 files/digest-rtl8180-0.22_pre20050528 274
-RMD160 7f53747511fc047672f056a357aebf4f940ddc06 files/digest-rtl8180-0.22_pre20050528 274
-SHA256 c682ed663e93866b2a6cf55c32636c3ca1bd5a8c5845471f87b375bf26700fef files/digest-rtl8180-0.22_pre20050528 274
-MD5 7383edae44c5e03555476ccdf522598d files/rtl8180-pci_name.patch 441
-RMD160 40b4e9d6cae37ffe0c041a669bd666dbfc51d6ac files/rtl8180-pci_name.patch 441
-SHA256 6494dc2f5abecada26534adf3bcf388c40649626a7c7e3a118b189adb6e69761 files/rtl8180-pci_name.patch 441
-MD5 c31df29b9974a8e93e58740068991330 files/rtl8180_gcc4_fix.patch 431
-RMD160 d9758e22747fc2572738bc5a691a2d1c26eb5753 files/rtl8180_gcc4_fix.patch 431
-SHA256 b59a3544a2baed21d312396de836d03d768f162e1572743da6a0b7180790f33b files/rtl8180_gcc4_fix.patch 431
+DIST rtl8180-0.22_pre20050528.tar.bz2 90275 RMD160 5ee29d89fa568841270e7fe7955e3c82cf204110 SHA1 37bcf9ffa214a1409aae41e5ed2353bec1c065a7 SHA256 73b0e8a05800bf1ffc116c5c38cec2e84688b347d977ef7fe825d39870d28ac8
+EBUILD rtl8180-0.22_pre20050528.ebuild 1080 RMD160 f6e1b67f6a23276fe2b07db68d4ffba934903432 SHA1 04da11034ae4f342e8a2e13c706f96d84a7092d6 SHA256 67d06caabcd5123b70fb9524a4492fd5f18d82ec9fec2b66f31d9e660faa2bc3
+MD5 0b0175b47d1636975d656a827df61b35 rtl8180-0.22_pre20050528.ebuild 1080
+RMD160 f6e1b67f6a23276fe2b07db68d4ffba934903432 rtl8180-0.22_pre20050528.ebuild 1080
+SHA256 67d06caabcd5123b70fb9524a4492fd5f18d82ec9fec2b66f31d9e660faa2bc3 rtl8180-0.22_pre20050528.ebuild 1080
+MISC ChangeLog 2176 RMD160 ca042f77bd7db07eb3cfcff7b4caa3b49b3e4c9d SHA1 e42b66ec91fd0d7c1c14878c4162511fecb42b2b SHA256 7739ef7d2e224368869e3f01e1719644c173170e5c4c9bde61fc87d4e15fd850
+MD5 0fa776ebce72d12f13b313a74713307f ChangeLog 2176
+RMD160 ca042f77bd7db07eb3cfcff7b4caa3b49b3e4c9d ChangeLog 2176
+SHA256 7739ef7d2e224368869e3f01e1719644c173170e5c4c9bde61fc87d4e15fd850 ChangeLog 2176
+MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159
 SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f metadata.xml 159
-MD5 af4c4c9a240a5ea3cc303c1db37f9eb9 rtl8180-0.21-r1.ebuild 990
-RMD160 9998654c3d0eb7cbb3db74a1e9a11ec582dd4545 rtl8180-0.21-r1.ebuild 990
-SHA256 2d73efe74a9c4eb2a1e6ddfea8b73c7bf1f57554fed8672c1c7d03623cf8b8b8 rtl8180-0.21-r1.ebuild 990
-MD5 64a8de77e71fd5cdf6a7584d23ebcd84 rtl8180-0.22_pre20050528.ebuild 950
-RMD160 ce5c00731cf0c2afd912091067bf11ad9efe81ac rtl8180-0.22_pre20050528.ebuild 950
-SHA256 cac8fc0f03bb53f5b8b384228af832f87e86ec82413518ad2462b12d97b09c61 rtl8180-0.22_pre20050528.ebuild 950
+MD5 99aa2eb686e06c7c01c519312e53be78 files/digest-rtl8180-0.22_pre20050528 274
+RMD160 7f53747511fc047672f056a357aebf4f940ddc06 files/digest-rtl8180-0.22_pre20050528 274
+SHA256 c682ed663e93866b2a6cf55c32636c3ca1bd5a8c5845471f87b375bf26700fef files/digest-rtl8180-0.22_pre20050528 274
diff --git a/net-wireless/rtl8180/files/digest-rtl8180-0.21-r1 b/net-wireless/rtl8180/files/digest-rtl8180-0.21-r1
deleted file mode 100644
index dfd7d09d18cd..000000000000
--- a/net-wireless/rtl8180/files/digest-rtl8180-0.21-r1
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 87c551f3fd90..000000000000
--- a/net-wireless/rtl8180/files/rtl8180-pci_name.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 64867fff73f5..000000000000
--- a/net-wireless/rtl8180/files/rtl8180_gcc4_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 1ffdf4a26f03..000000000000
--- a/net-wireless/rtl8180/rtl8180-0.21-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.2 2005/07/07 20:56:39 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="ieee80211_crypt-r8180(net:) ieee80211_crypt_wep-r8180(net:)
-	ieee80211-r8180(net:) 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
-}