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

(Portage version: 2.2_rc46/cvs/Linux x86_64)

6 files changed, 21 insertions, 7 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/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