Version bump, thanks to Geoffrey Clements in bug #196664

Package-Manager: portage-2.1.2.3

4 files changed, 98 insertions, 3 deletions

diff --git a/net-wireless/acx/ChangeLog b/net-wireless/acx/ChangeLog
index f1e36a84aa83..a4f94f187df8 100644
--- a/net-wireless/acx/ChangeLog
+++ b/net-wireless/acx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/acx
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/ChangeLog,v 1.12 2007/07/27 06:21:23 genstef Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/ChangeLog,v 1.13 2008/02/07 20:58:41 spb Exp $
+
+*acx-0.3.37_p20080112 (07 Feb 2008)
+
+  07 Feb 2008; Stephen Bennett <spb@gentoo.org>
+  +files/acx-0.3.37_p20080112.patch, +acx-0.3.37_p20080112.ebuild:
+  Version bump, thanks to Geoffrey Clements in bug #196664
 
   27 Jul 2007; Stefan Schweizer <genstef@gentoo.org>
   -files/acx-0.3.35-2.6.18.patch, +files/acx-0.3.35_p20070101-2.6.22.patch,
diff --git a/net-wireless/acx/Manifest b/net-wireless/acx/Manifest
index 8bb59068c615..f0ccc878e141 100644
--- a/net-wireless/acx/Manifest
+++ b/net-wireless/acx/Manifest
@@ -1,9 +1,12 @@
 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
 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
-MISC ChangeLog 6133 RMD160 add186f59ab866fb14bda954b8af633f152ef162 SHA1 ff1b9e0af4b50f2a6eb657e9f5e8fab32feb866e SHA256 eff91d7092c04dc1d5977b57f3e38648a0282a10af776131b14885dc0a30b9af
+EBUILD acx-0.3.37_p20080112.ebuild 1121 RMD160 7abf9a8838ee7b83252475185ef60633aec39a38 SHA1 bef056afee99f0f9de823221f27e6034fccb40c2 SHA256 b4a7efd4d7ded298a3d083836ef2219b31a9d9059f8a073f16df45b4b3108889
+MISC ChangeLog 6341 RMD160 18b70499ba383627fa4e92845009d24ca54404fa SHA1 17a40bb8fc845af082ca645520cde8c2bb89c2c5 SHA256 6a850ce600db02b0427f598a0c47bb6c3f7843285b4d2dfcad21723c91c9681b
 MISC metadata.xml 214 RMD160 0382eb0801e91bc8bd3840d000d8be4ba5c0c602 SHA1 556372b4c456ea688b9ac2d594db9d494e643338 SHA256 90cfa1234a16d7fa1be51cd426d4b4e26fdfa0c8ff60ed7fac422b2df929bd1b
diff --git a/net-wireless/acx/acx-0.3.37_p20080112.ebuild b/net-wireless/acx/acx-0.3.37_p20080112.ebuild
new file mode 100644
index 000000000000..3b943c8a4d82
--- /dev/null
+++ b/net-wireless/acx/acx-0.3.37_p20080112.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2008 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.1 2008/02/07 20:58:41 spb Exp $
+
+inherit linux-mod
+
+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"
+
+LICENSE="GPL-2 as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="debug"
+
+RDEPEND="net-wireless/wireless-tools
+		net-wireless/acx-firmware"
+
+S=${WORKDIR}/${PN}-${PATCHLEVEL}
+
+MODULE_NAMES="acx(net:${S})"
+CONFIG_CHECK="WIRELESS_EXT FW_LOADER"
+BUILD_TARGETS="modules"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S}"
+}
+
+src_unpack() {
+	unpack ${A}
+	chmod ug+w . -R
+
+	# The default acx_config.h has some rather over-zealous debug output.
+	cd $S
+	if ! use debug; then
+		sed -i '/^#define ACX_DEBUG/s/2/0/' acx_config.h || die "Failed to disable debug support"
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc README
+}
diff --git a/net-wireless/acx/files/acx-0.3.37_p20080112.patch b/net-wireless/acx/files/acx-0.3.37_p20080112.patch
new file mode 100644
index 000000000000..ecfbd3c8a9e4
--- /dev/null
+++ b/net-wireless/acx/files/acx-0.3.37_p20080112.patch
@@ -0,0 +1,38 @@
+--- acx-20080112/pci.c.orig 
++++ acx-20080112/pci.c 
+@@ -1632,8 +1632,10 @@
+ 	acx_show_card_eeprom_id(adev);
+ #endif /* NONESSENTIAL_FEATURES */
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
+ #ifdef SET_MODULE_OWNER
+-	SET_MODULE_OWNER(ndev);
++ 	SET_MODULE_OWNER(ndev);
++#endif
+ #endif
+ 	SET_NETDEV_DEV(ndev, &pdev->dev);
+ 
+@@ -2128,7 +2130,11 @@
+ /* TODO: pci_set_power_state(pdev, PCI_D0); ? */
+ 
+ 	/* request shared IRQ handler */
++	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21))	
++		if (request_irq(ndev->irq, acxpci_i_interrupt, IRQF_SHARED, ndev->name, ndev)) {
++	#else
+ 	if (request_irq(ndev->irq, acxpci_i_interrupt, SA_SHIRQ, ndev->name, ndev)) {
++	#endif		
+ 		printk("%s: request_irq FAILED\n", ndev->name);
+ 		result = -EAGAIN;
+ 		goto done;
+--- acx-20080112/usb.c.orig
++++ acx-20080112/usb.c
+@@ -859,7 +859,9 @@
+ 	ndev->watchdog_timeo = 4 * HZ;
+ #endif
+ 	ndev->change_mtu = &acx_e_change_mtu;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
+ 	SET_MODULE_OWNER(ndev);
++#endif
+ 
+ 	/* Setup private driver context */
+