Allow compilation on newer kernels - causes oopsies for me though.

  Fixes #144129 thanks to Marijn Schouten.
Package-Manager: portage-2.1.1_pre5-r1

5 files changed, 45 insertions, 14 deletions

diff --git a/net-wireless/rt2x00/ChangeLog b/net-wireless/rt2x00/ChangeLog
index 767dc413b9e1..c3c2cbab1b5f 100644
--- a/net-wireless/rt2x00/ChangeLog
+++ b/net-wireless/rt2x00/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/rt2x00
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/ChangeLog,v 1.13 2006/08/09 09:04:56 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/ChangeLog,v 1.14 2006/08/17 11:55:33 uberlord Exp $
+
+  17 Aug 2006; Roy Marples <uberlord@gentoo.org>
+  +files/rt2x00-2.0.0_beta3-compat.patch, rt2x00-2.0.0_beta3.ebuild:
+  Allow compilation on newer kernels - causes oopsies for me though.
+  Fixes #144129 thanks to Marijn Schouten.
 
   09 Aug 2006; Roy Marples <uberlord@gentoo.org> rt2x00-9999.ebuild:
   Install the crc-itu-t.ko module correctly.
diff --git a/net-wireless/rt2x00/Manifest b/net-wireless/rt2x00/Manifest
index b888054ac14f..4e8ecf3cd6b6 100644
--- a/net-wireless/rt2x00/Manifest
+++ b/net-wireless/rt2x00/Manifest
@@ -1,23 +1,27 @@
-DIST rt2x00-2.0.0-b3.tar.gz 133603
-EBUILD rt2x00-2.0.0_beta3.ebuild 2243 RMD160 b329ba359a96e2dfc357c8e98623da7a7ea9f04e SHA1 ed4bbb08df755070470734580c6e2d06211d8b12 SHA256 f34e9edd8b48dfb562c97663e80187fff91d614d74ba4c906e0925853dc9f970
-MD5 e777f0371a1095249105ea8fe6029e37 rt2x00-2.0.0_beta3.ebuild 2243
-RMD160 b329ba359a96e2dfc357c8e98623da7a7ea9f04e rt2x00-2.0.0_beta3.ebuild 2243
-SHA256 f34e9edd8b48dfb562c97663e80187fff91d614d74ba4c906e0925853dc9f970 rt2x00-2.0.0_beta3.ebuild 2243
+AUX rt2x00-2.0.0_beta3-compat.patch 442 RMD160 5e9ed9d12d79f2fa65a9467625b99e649b14a63a SHA1 dd001c11abcbb7c5c701990af43be25d6c26e456 SHA256 be6bde63ab72537c9100134c92d1561d1e8e5e79634bd475f895c5a6da6adcab
+MD5 a1be06f7314b0ecb73e7eb9a06e2faf3 files/rt2x00-2.0.0_beta3-compat.patch 442
+RMD160 5e9ed9d12d79f2fa65a9467625b99e649b14a63a files/rt2x00-2.0.0_beta3-compat.patch 442
+SHA256 be6bde63ab72537c9100134c92d1561d1e8e5e79634bd475f895c5a6da6adcab files/rt2x00-2.0.0_beta3-compat.patch 442
+DIST rt2x00-2.0.0-b3.tar.gz 133603 RMD160 e9aaa7444eea894ca51cd0e637751160b873c4c9 SHA1 59b431280c877a5b4d6ee14f39086368c04e4aaa SHA256 60d6effe0675cd83da03c279c13b9d790ac5fdf89e41fb8230f9490a635ce1ec
+EBUILD rt2x00-2.0.0_beta3.ebuild 2364 RMD160 7d239e4fcf69dd60a981d5e468eb59cf7da0f868 SHA1 b3bbd825e29fad35da8eeb27e79bfc0563bcec70 SHA256 99a2b3805b2902c0fc1730d55ce0007d4aef86ed22943dbfb35e00f163e6911f
+MD5 a9ec3d94486babfbf7460a4ba4b9cf64 rt2x00-2.0.0_beta3.ebuild 2364
+RMD160 7d239e4fcf69dd60a981d5e468eb59cf7da0f868 rt2x00-2.0.0_beta3.ebuild 2364
+SHA256 99a2b3805b2902c0fc1730d55ce0007d4aef86ed22943dbfb35e00f163e6911f rt2x00-2.0.0_beta3.ebuild 2364
 EBUILD rt2x00-9999.ebuild 3397 RMD160 2aa4219be0b0075c1c6adfd7c3ab3bbb63e4e799 SHA1 d8146cf1336274193f9e89457b49bc3fb75b410b SHA256 077e0daa97fd2447a59053cf1f25cd7393a64aa4116e7f4abd05fc020e13fc34
 MD5 0023941e81230c6e382f0cbdffeb9bac rt2x00-9999.ebuild 3397
 RMD160 2aa4219be0b0075c1c6adfd7c3ab3bbb63e4e799 rt2x00-9999.ebuild 3397
 SHA256 077e0daa97fd2447a59053cf1f25cd7393a64aa4116e7f4abd05fc020e13fc34 rt2x00-9999.ebuild 3397
-MISC ChangeLog 2347 RMD160 d8d03fba715671633a3b1894ead71eb1634d6cbe SHA1 3f79197cf28b568ecd98db6a10afdf840c76d2ad SHA256 abfd18a4c61a082cbf1b03ba5870a60db8f48b94461e7d30f99f292fa2cdf138
-MD5 bd7b561f8f99c0ea5728aa46b4a98c99 ChangeLog 2347
-RMD160 d8d03fba715671633a3b1894ead71eb1634d6cbe ChangeLog 2347
-SHA256 abfd18a4c61a082cbf1b03ba5870a60db8f48b94461e7d30f99f292fa2cdf138 ChangeLog 2347
+MISC ChangeLog 2578 RMD160 5ac255d33f424ba7e0a2ef2a6eaac47512a19dbe SHA1 9bd829c2614c1a17b0fc391d50bffa4d6b96d629 SHA256 5ed8ee0b867a4bb4698ea0274d9967e6e81193b9d87d304e5893904af3b1e8e5
+MD5 c8339af7570eeabebba1b5e9f336c730 ChangeLog 2578
+RMD160 5ac255d33f424ba7e0a2ef2a6eaac47512a19dbe ChangeLog 2578
+SHA256 5ed8ee0b867a4bb4698ea0274d9967e6e81193b9d87d304e5893904af3b1e8e5 ChangeLog 2578
 MISC metadata.xml 315 RMD160 ea1a3437291c10800cf4b14aff8dc354474dfabf SHA1 9b94dc5449046ada499b5b23e93f90926a70c52c SHA256 a99d2151b06a4dff601057b3b582bac32c80563c7567eee64bf5b59865eb6bd6
 MD5 d881dd1c4bfd4e45a852f320b5a973c7 metadata.xml 315
 RMD160 ea1a3437291c10800cf4b14aff8dc354474dfabf metadata.xml 315
 SHA256 a99d2151b06a4dff601057b3b582bac32c80563c7567eee64bf5b59865eb6bd6 metadata.xml 315
-MD5 249132d59cf43ab39a9e65d88a672658 files/digest-rt2x00-2.0.0_beta3 67
-RMD160 7654e17f054f56b4ff455ca50bde341846ed85ee files/digest-rt2x00-2.0.0_beta3 67
-SHA256 4695741b84238062dca0ec4356ffffee1695b7f8bc1fb405194c8365f607639b files/digest-rt2x00-2.0.0_beta3 67
+MD5 c3bb0b84ba77e15cf2daaab6fbbc931a files/digest-rt2x00-2.0.0_beta3 247
+RMD160 d61ee666bf98a5aafeebf961abf93c839b8fda70 files/digest-rt2x00-2.0.0_beta3 247
+SHA256 e5f508f8c319433bf716cc1012e74fbb40d7bc5b97bc27929a49b48422e2aecd files/digest-rt2x00-2.0.0_beta3 247
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-rt2x00-9999 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-rt2x00-9999 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-rt2x00-9999 1
diff --git a/net-wireless/rt2x00/files/digest-rt2x00-2.0.0_beta3 b/net-wireless/rt2x00/files/digest-rt2x00-2.0.0_beta3
index 330829b105ff..192e2e2d8c73 100644
--- a/net-wireless/rt2x00/files/digest-rt2x00-2.0.0_beta3
+++ b/net-wireless/rt2x00/files/digest-rt2x00-2.0.0_beta3
@@ -1 +1,3 @@
 MD5 4881d742ee49d3ea12c435a91deacd41 rt2x00-2.0.0-b3.tar.gz 133603
+RMD160 e9aaa7444eea894ca51cd0e637751160b873c4c9 rt2x00-2.0.0-b3.tar.gz 133603
+SHA256 60d6effe0675cd83da03c279c13b9d790ac5fdf89e41fb8230f9490a635ce1ec rt2x00-2.0.0-b3.tar.gz 133603
diff --git a/net-wireless/rt2x00/files/rt2x00-2.0.0_beta3-compat.patch b/net-wireless/rt2x00/files/rt2x00-2.0.0_beta3-compat.patch
new file mode 100644
index 000000000000..0dfa3efce303
--- /dev/null
+++ b/net-wireless/rt2x00/files/rt2x00-2.0.0_beta3-compat.patch
@@ -0,0 +1,12 @@
+--- rt2500usb.c.orig	2006-08-17 12:47:35.000000000 +0100
++++ rt2500usb.c	2006-08-17 12:48:21.000000000 +0100
+@@ -1282,7 +1282,9 @@
+ #endif /* CONFIG_RT2X00_DEBUG */
+ 
+ static struct usb_driver rt2x00_usb_driver = {
++#ifdef LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15)
+ 	.owner		= THIS_MODULE,
++#ifdef /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15) */
+ 	.name		= DRV_NAME,
+ 	.id_table	= rt2x00_device_usb_tbl,
+ 	.probe		= rt2x00_usb_probe,
diff --git a/net-wireless/rt2x00/rt2x00-2.0.0_beta3.ebuild b/net-wireless/rt2x00/rt2x00-2.0.0_beta3.ebuild
index d5126c548e72..a96261eec57e 100644
--- a/net-wireless/rt2x00/rt2x00-2.0.0_beta3.ebuild
+++ b/net-wireless/rt2x00/rt2x00-2.0.0_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/rt2x00-2.0.0_beta3.ebuild,v 1.2 2006/05/12 10:30:13 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/rt2x00-2.0.0_beta3.ebuild,v 1.3 2006/08/17 11:55:34 uberlord Exp $
 
 inherit linux-mod eutils
 
@@ -51,6 +51,14 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Allow compilation on newer kernels
+	epatch "${FILESDIR}/${P}-compat.patch"
+}
+
 src_install() {
 	linux-mod_src_install
 	dodoc CHANGELOG COPYING README THANKS