Fix compilation with latest kernels (2.6.31, 2.6.32), thanks everybody involved, close bug #229459, #265000, #243392

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

7 files changed, 28 insertions, 20 deletions

diff --git a/net-wireless/acx/ChangeLog b/net-wireless/acx/ChangeLog
index 1cb9da205e35..665532f7ef25 100644
--- a/net-wireless/acx/ChangeLog
+++ b/net-wireless/acx/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-wireless/acx
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/ChangeLog,v 1.14 2008/04/28 15:41:22 phreak Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/ChangeLog,v 1.15 2009/12/14 17:33:02 lxnay Exp $
+
+*acx-0.3.37_p20080210 (14 Dec 2009)
+
+  14 Dec 2009; Fabio Erculiani <lxnay@gentoo.org>
+  +files/2.6.31+-mepis/01_addRequestInfo.dpatch.gz,
+  -acx-0.3.37_p20080112.ebuild,
+  +files/2.6.31+-mepis/02_fix_irqreturn_t.dpatch.gz,
+  +acx-0.3.37_p20080210.ebuild, +files/2.6.31+-mepis/03_typo_fix.dpatch.gz,
+  +files/2.6.31+-mepis/04_pci_and_usb.dpatch.gz:
+  Fix compilation with latest kernels (2.6.31, 2.6.32), thanks everybody
+  involved, close bug #229459, #265000, #243392
 
   28 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Remove Stephen Bennett (spb) from metadata.xml (as per #64840).
diff --git a/net-wireless/acx/Manifest b/net-wireless/acx/Manifest
index 2775a63d9927..1ce522a5403a 100644
--- a/net-wireless/acx/Manifest
+++ b/net-wireless/acx/Manifest
@@ -1,22 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 2.6.31+-mepis/01_addRequestInfo.dpatch.gz 1215 RMD160 186546e757bf49a127a5a7d5b217825478e07d41 SHA1 aee4df822b2ea3030654acc32415fdce5e18061c SHA256 520558e5e16383a633442bc6b7e6a30787ff0c22935a01a795f4627ec9f8c519
+AUX 2.6.31+-mepis/02_fix_irqreturn_t.dpatch.gz 493 RMD160 044948450aeb72e76c04a4d053d1195f3b53cbb8 SHA1 bb4e390d22953a16cc816faf0c34c4a33b95f409 SHA256 70b5aef8cbc984cdf2265940e13957b548da99f4b4293b9c4f1999dc77b89d4d
+AUX 2.6.31+-mepis/03_typo_fix.dpatch.gz 587 RMD160 932414724a9bc42f1809aaab57702d19d219000e SHA1 72e0e6d3ea5cb7b6c569bc8ef5ae1356a4ac3200 SHA256 726622cd1537d7efaace496ac0b7c7d82f499cc297c080257dc927c72e088357
+AUX 2.6.31+-mepis/04_pci_and_usb.dpatch.gz 1026 RMD160 7418b806a577e1bf45cb51f11635f2b2beee9531 SHA1 f60346e1282665bab07d36b3603ceb1ebb1c4e6f SHA256 f78d6be2674591c073829f70188d7c2a5e31b575cacec8dc09fcf99af8107db1
 AUX acx-0.3.35_p20060521-2.6.18.patch 332 RMD160 6d5f87956ae99650fa9b48808e7801ecea954b9c SHA1 083cdfdeef1ff23ed75e9b61b9b68f7c89c9bc71 SHA256 39576a808be7ee61cebcaba90c7ae21b763e978cff2a47fa5a6690fafbdda52f
 AUX acx-0.3.35_p20060521-2.6.19.patch 2795 RMD160 0649320c29a1271884c6a38937c87ec845ad4ed1 SHA1 1abd296433fcfc81ad1520fda674bfcbcc5e8c80 SHA256 6389b513dc7e528fe8d8434952521c16d17f13660a4a83e10901088cea26e725
 AUX acx-0.3.35_p20070101-2.6.22.patch 996 RMD160 d24005a3fb6c59dde978bbbf496e2156fad53874 SHA1 09e5b52ebee26dfb0468b6c106fcd0bf5855c858 SHA256 300805905bda0e5c877330ed899bfe589e7b71e993b37d221dd02d05b0847798
 AUX acx-0.3.37_p20080112.patch 1041 RMD160 8e73a6a07a2cd07cf9ef73187f7faef02afc5f49 SHA1 b681801c9a7679f022e322b6f37c265c33ad017d SHA256 3451bebe057c967cd974bf158b43aa632d62a2a94200b2cbbc89b226118548d2
 DIST acx-20060521.tar.bz2 145385 RMD160 9da6b6e3dbfc72d5a5f504143473cce519ada82f SHA1 afef5d851d69e86fa198595bb43d05eb83da7ecc SHA256 18d500cedb356ac88d6b9b5f67af39bd6bb0593842144aa402e412fa758c7be7
 DIST acx-20070101.tar.bz2 146810 RMD160 bad0f792b544fa557660204bf73d284b35303224 SHA1 5c7259c09bc754529910aceead6087876177a143 SHA256 d3a24af46af06c007c65f00167af48a8d702ebbcbe670e339179498d9aea0cdf
-DIST acx-20080112-2.tar.bz2 148890 RMD160 0603693d18e9549a529a55fa25905703529d8d01 SHA1 a4d8b8d0495e120d3dad124e604af155d7682723 SHA256 fcb56fa92d110eab4ecc976db0a856e975a74cbb5ed85249e74bcb647f67d0b8
+DIST acx-20080210.tar.bz2 148820 RMD160 43d766e1041e06a1290a693858b6777f847e3c62 SHA1 c0489b500722761b6ddbd4cc1c3dbab11ff072d5 SHA256 87a6899ab227899043ad481776ad1b847bb57be417d16b6e72c4f6cf56f7e965
 EBUILD acx-0.3.35_p20060521.ebuild 1152 RMD160 9ac0122cbab656e3e87a11882ac2545081f74086 SHA1 1f545b08d9c7b4a61ab99edd97e8a0fb98e27d08 SHA256 0ba3b960e0254104e483c7602585ff36d1ece985a9d85d0a1fd7ffed43dfc780
 EBUILD acx-0.3.35_p20070101.ebuild 1175 RMD160 e5e80a761b540009f69a65e8cb575ea4d1840f5e SHA1 d2c38f480c73c701141bfa4ce26f7cdaa4b2fe3a SHA256 1488f3ec0f4d8b0acfc5dd42e7148056eaacd3bee3550db8e9a3213b69866807
-EBUILD acx-0.3.37_p20080112.ebuild 1155 RMD160 1a0865fc269fd1349f6db31029d08ba4dc7e59ea SHA1 d27df04f8e657f917f4e6f7eea7f917fa5fc60af SHA256 a2b717fcc33bb99be1bbaf9b66252cd943f89a051ae999b3115dba49c6de6601
-MISC ChangeLog 6475 RMD160 b715019be9eded3a70fb660c572a678dd0172075 SHA1 9f43abecb45880366567341e22023c7d1a40cb77 SHA256 52f004a29dd9b77a076f30bedb2fa0490c27e69287e30f9d795f044a7328fa8a
+EBUILD acx-0.3.37_p20080210.ebuild 1251 RMD160 216db50b22a8fac4d0286543704ef9cc30df28ab SHA1 f8b22416697320e5d3447b1c37a9d6ecd83d9de1 SHA256 6d64e88ebf4ef15f4998f29c5bf676a41227b0923e1fa6893ee32d2652adc12c
+MISC ChangeLog 6945 RMD160 8c4f45291dfc38c70f5a6569c16560ce7aa54e98 SHA1 d2e500b27a94493d504926739525f4ddec98ae87 SHA256 a764fda969a981daa4acd2526b23f2dddb99b41efbf5bac48424be1e4f9f2cb2
 MISC metadata.xml 160 RMD160 8521c3bd3ae0fb2bfddce5edb33fd31e223747e1 SHA1 194b7194f38673fe427e5893a42cd4c1506ce846 SHA256 b13062a43e40469b137e1206494a44b45755ea69511b64e5373cb1ce30bbb160
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgV8CcACgkQyuNVb5qfaOaMHgCdGL8r6nshB4AcmBvh4iQrvHzI
-wLkAn38Z+r4YM2vQWrcwBUaG5XKYcsg0
-=P8Op
------END PGP SIGNATURE-----
diff --git a/net-wireless/acx/acx-0.3.37_p20080112.ebuild b/net-wireless/acx/acx-0.3.37_p20080210.ebuild
index 1cb536354f14..db07159afe2e 100644
--- a/net-wireless/acx/acx-0.3.37_p20080112.ebuild
+++ b/net-wireless/acx/acx-0.3.37_p20080210.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/acx-0.3.37_p20080112.ebuild,v 1.2 2008/02/07 21:03:52 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/acx-0.3.37_p20080210.ebuild,v 1.1 2009/12/14 17:33:02 lxnay Exp $
 
 inherit linux-mod
 
@@ -8,7 +8,7 @@ PATCHLEVEL=${PV##*_p}
 
 DESCRIPTION="Driver for the ACX100 and ACX111 wireless chipset (CardBus, PCI, USB)"
 HOMEPAGE="http://acx100.sourceforge.net/"
-SRC_URI="http://downloads.sourceforge.net/acx100/${PN}-${PATCHLEVEL}-2.tar.bz2"
+SRC_URI="http://downloads.sourceforge.net/acx100/${PN}-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2 as-is"
 SLOT="0"
@@ -35,12 +35,15 @@ src_unpack() {
 	chmod ug+w . -R
 
 	# The default acx_config.h has some rather over-zealous debug output.
-	cd $S
+	cd "${S}"
 	if ! use debug; then
 		sed -i '/^#define ACX_DEBUG/s/2/0/' acx_config.h || die "Failed to disable debug support"
 	fi
 
-	epatch "${FILESDIR}/${P}.patch"
+	# Apply various fixes to make module compile with 2.6.31+ kernels
+	# thanks to Mepis
+	epatch "${FILESDIR}"/2.6.31+-mepis/*
+
 }
 
 src_install() {
diff --git a/net-wireless/acx/files/2.6.31+-mepis/01_addRequestInfo.dpatch.gz b/net-wireless/acx/files/2.6.31+-mepis/01_addRequestInfo.dpatch.gz
new file mode 100644
index 000000000000..2b7df3828922
--- /dev/null
+++ b/net-wireless/acx/files/2.6.31+-mepis/01_addRequestInfo.dpatch.gz
diff --git a/net-wireless/acx/files/2.6.31+-mepis/02_fix_irqreturn_t.dpatch.gz b/net-wireless/acx/files/2.6.31+-mepis/02_fix_irqreturn_t.dpatch.gz
new file mode 100644
index 000000000000..6acdba527b97
--- /dev/null
+++ b/net-wireless/acx/files/2.6.31+-mepis/02_fix_irqreturn_t.dpatch.gz
diff --git a/net-wireless/acx/files/2.6.31+-mepis/03_typo_fix.dpatch.gz b/net-wireless/acx/files/2.6.31+-mepis/03_typo_fix.dpatch.gz
new file mode 100644
index 000000000000..3df3b964c635
--- /dev/null
+++ b/net-wireless/acx/files/2.6.31+-mepis/03_typo_fix.dpatch.gz
diff --git a/net-wireless/acx/files/2.6.31+-mepis/04_pci_and_usb.dpatch.gz b/net-wireless/acx/files/2.6.31+-mepis/04_pci_and_usb.dpatch.gz
new file mode 100644
index 000000000000..18a856cebe0f
--- /dev/null
+++ b/net-wireless/acx/files/2.6.31+-mepis/04_pci_and_usb.dpatch.gz