CONFIG_CHECK for WIRELESS_EXT so it also works with 2.6.22 and add a 2.6.22 patch thanks to Thomas S. Howard <thoward1120@sbcglobal.net> in bug 185845

Package-Manager: portage-2.1.3_rc9

8 files changed, 59 insertions, 90 deletions

diff --git a/net-wireless/acx/ChangeLog b/net-wireless/acx/ChangeLog
index 28c6aba117c0..f1e36a84aa83 100644
--- a/net-wireless/acx/ChangeLog
+++ b/net-wireless/acx/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2007/02/04 15:18:39 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/ChangeLog,v 1.12 2007/07/27 06:21:23 genstef Exp $
+
+  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,
+  -acx-0.3.35.ebuild, acx-0.3.35_p20060521.ebuild,
+  acx-0.3.35_p20070101.ebuild:
+  CONFIG_CHECK for WIRELESS_EXT so it also works with 2.6.22 and add a 2.6.22
+  patch thanks to Thomas S. Howard <thoward1120@sbcglobal.net> in bug 185845
 
 *acx-0.3.35_p20070101 (04 Feb 2007)
 
diff --git a/net-wireless/acx/Manifest b/net-wireless/acx/Manifest
index c91939b8b4a8..fb0ce53d7619 100644
--- a/net-wireless/acx/Manifest
+++ b/net-wireless/acx/Manifest
@@ -1,7 +1,3 @@
-AUX acx-0.3.35-2.6.18.patch 324 RMD160 3b7e394199cf3621202e74a723f624d89d18435e SHA1 22cca933c3e70bcb869a210145b71e7cf175e478 SHA256 e294c396dc19db75446d457d4f633fdacb8eff5eba02cf207d7f9916dbec2563
-MD5 a834a09e975cc4816558e556661e5bfb files/acx-0.3.35-2.6.18.patch 324
-RMD160 3b7e394199cf3621202e74a723f624d89d18435e files/acx-0.3.35-2.6.18.patch 324
-SHA256 e294c396dc19db75446d457d4f633fdacb8eff5eba02cf207d7f9916dbec2563 files/acx-0.3.35-2.6.18.patch 324
 AUX acx-0.3.35_p20060521-2.6.18.patch 332 RMD160 6d5f87956ae99650fa9b48808e7801ecea954b9c SHA1 083cdfdeef1ff23ed75e9b61b9b68f7c89c9bc71 SHA256 39576a808be7ee61cebcaba90c7ae21b763e978cff2a47fa5a6690fafbdda52f
 MD5 b2dd5247df8ce2cbaf9cab942c19267b files/acx-0.3.35_p20060521-2.6.18.patch 332
 RMD160 6d5f87956ae99650fa9b48808e7801ecea954b9c files/acx-0.3.35_p20060521-2.6.18.patch 332
@@ -10,32 +6,28 @@ AUX acx-0.3.35_p20060521-2.6.19.patch 2795 RMD160 0649320c29a1271884c6a38937c87e
 MD5 ac35b15c452a57c5866db85f38f1d532 files/acx-0.3.35_p20060521-2.6.19.patch 2795
 RMD160 0649320c29a1271884c6a38937c87ec845ad4ed1 files/acx-0.3.35_p20060521-2.6.19.patch 2795
 SHA256 6389b513dc7e528fe8d8434952521c16d17f13660a4a83e10901088cea26e725 files/acx-0.3.35_p20060521-2.6.19.patch 2795
-DIST acx-20060215.tar.bz2 145630 RMD160 40f4871b8aff191cf3decb7a48f2bc1bf9100e99 SHA1 6e8f8fd0079263bcd6c34ccb288056d7647594a5 SHA256 22b5fb7eb833e3168ffcad4d8eae4e778002d892d0dbbf28d27a0fe0a717e19c
+AUX acx-0.3.35_p20070101-2.6.22.patch 996 RMD160 d24005a3fb6c59dde978bbbf496e2156fad53874 SHA1 09e5b52ebee26dfb0468b6c106fcd0bf5855c858 SHA256 300805905bda0e5c877330ed899bfe589e7b71e993b37d221dd02d05b0847798
+MD5 1d4175578af803a7d25c945835bee08f files/acx-0.3.35_p20070101-2.6.22.patch 996
+RMD160 d24005a3fb6c59dde978bbbf496e2156fad53874 files/acx-0.3.35_p20070101-2.6.22.patch 996
+SHA256 300805905bda0e5c877330ed899bfe589e7b71e993b37d221dd02d05b0847798 files/acx-0.3.35_p20070101-2.6.22.patch 996
 DIST acx-20060521.tar.bz2 145385 RMD160 9da6b6e3dbfc72d5a5f504143473cce519ada82f SHA1 afef5d851d69e86fa198595bb43d05eb83da7ecc SHA256 18d500cedb356ac88d6b9b5f67af39bd6bb0593842144aa402e412fa758c7be7
 DIST acx-20070101.tar.bz2 146810 RMD160 bad0f792b544fa557660204bf73d284b35303224 SHA1 5c7259c09bc754529910aceead6087876177a143 SHA256 d3a24af46af06c007c65f00167af48a8d702ebbcbe670e339179498d9aea0cdf
-EBUILD acx-0.3.35.ebuild 962 RMD160 9e82d4f11da91c00fe84a7fd14fac4e8a06371b7 SHA1 c4bd30649bd1b4469406dc98fe7717ffb4069f12 SHA256 5711adafc198a17f5b49dc66a85e39c7b2ebd084ce880696dc9711d95dad9fdb
-MD5 e49b47aec83c9684349689a5fa5cf976 acx-0.3.35.ebuild 962
-RMD160 9e82d4f11da91c00fe84a7fd14fac4e8a06371b7 acx-0.3.35.ebuild 962
-SHA256 5711adafc198a17f5b49dc66a85e39c7b2ebd084ce880696dc9711d95dad9fdb acx-0.3.35.ebuild 962
-EBUILD acx-0.3.35_p20060521.ebuild 1151 RMD160 9a3d1a6a0b3209020a8f26719b1b2dfccb6acafc SHA1 1c895ba98912b6a6d3abc933872cf3087b7f066c SHA256 4f634d0f4220cbe78d18f992669870893fc98bfed7cff5d30a30368de508f115
-MD5 e6dc414f76ca7e84846c1a453b6ca8bb acx-0.3.35_p20060521.ebuild 1151
-RMD160 9a3d1a6a0b3209020a8f26719b1b2dfccb6acafc acx-0.3.35_p20060521.ebuild 1151
-SHA256 4f634d0f4220cbe78d18f992669870893fc98bfed7cff5d30a30368de508f115 acx-0.3.35_p20060521.ebuild 1151
-EBUILD acx-0.3.35_p20070101.ebuild 1111 RMD160 4c89c8c65a5621f613a48671cf51e2693cc41440 SHA1 88b42d6ab66382a2d810e7359677ad95451a9891 SHA256 cd7ed59f17dbbf13738a5e095f92ceafc09c77e6ad9d0f490709e6c08ad82883
-MD5 f86461a553b63f22f0e53c1a6f419baf acx-0.3.35_p20070101.ebuild 1111
-RMD160 4c89c8c65a5621f613a48671cf51e2693cc41440 acx-0.3.35_p20070101.ebuild 1111
-SHA256 cd7ed59f17dbbf13738a5e095f92ceafc09c77e6ad9d0f490709e6c08ad82883 acx-0.3.35_p20070101.ebuild 1111
-MISC ChangeLog 5762 RMD160 910384b5178f68fdf0b0714b35fdd4019cdc7571 SHA1 73bfc4ccc600e8abcfda013e349b10dbd2067795 SHA256 4397549092160f523dbf1521a01d5b66417f2c82cb4c3574c34c52afbc209fbe
-MD5 52ffe682386e14f86297220542b27b27 ChangeLog 5762
-RMD160 910384b5178f68fdf0b0714b35fdd4019cdc7571 ChangeLog 5762
-SHA256 4397549092160f523dbf1521a01d5b66417f2c82cb4c3574c34c52afbc209fbe ChangeLog 5762
+EBUILD acx-0.3.35_p20060521.ebuild 1152 RMD160 9ac0122cbab656e3e87a11882ac2545081f74086 SHA1 1f545b08d9c7b4a61ab99edd97e8a0fb98e27d08 SHA256 0ba3b960e0254104e483c7602585ff36d1ece985a9d85d0a1fd7ffed43dfc780
+MD5 a364139ace223e00718ac351b836cf97 acx-0.3.35_p20060521.ebuild 1152
+RMD160 9ac0122cbab656e3e87a11882ac2545081f74086 acx-0.3.35_p20060521.ebuild 1152
+SHA256 0ba3b960e0254104e483c7602585ff36d1ece985a9d85d0a1fd7ffed43dfc780 acx-0.3.35_p20060521.ebuild 1152
+EBUILD acx-0.3.35_p20070101.ebuild 1174 RMD160 c48abe4ae459bdfba7a73c1aa403a8676e285995 SHA1 45139d52769d30dbab8488a1cb48f9891cd9df39 SHA256 9ef8602b0bf855fbe5292b83a533669323b5432bcb894a5e08dd2311e3029135
+MD5 c48016758fab99aeb00d0eafc601b6b9 acx-0.3.35_p20070101.ebuild 1174
+RMD160 c48abe4ae459bdfba7a73c1aa403a8676e285995 acx-0.3.35_p20070101.ebuild 1174
+SHA256 9ef8602b0bf855fbe5292b83a533669323b5432bcb894a5e08dd2311e3029135 acx-0.3.35_p20070101.ebuild 1174
+MISC ChangeLog 6133 RMD160 add186f59ab866fb14bda954b8af633f152ef162 SHA1 ff1b9e0af4b50f2a6eb657e9f5e8fab32feb866e SHA256 eff91d7092c04dc1d5977b57f3e38648a0282a10af776131b14885dc0a30b9af
+MD5 7849b3aecf0b95a84b6ea5bccf7d7492 ChangeLog 6133
+RMD160 add186f59ab866fb14bda954b8af633f152ef162 ChangeLog 6133
+SHA256 eff91d7092c04dc1d5977b57f3e38648a0282a10af776131b14885dc0a30b9af ChangeLog 6133
 MISC metadata.xml 214 RMD160 0382eb0801e91bc8bd3840d000d8be4ba5c0c602 SHA1 556372b4c456ea688b9ac2d594db9d494e643338 SHA256 90cfa1234a16d7fa1be51cd426d4b4e26fdfa0c8ff60ed7fac422b2df929bd1b
 MD5 765551472f6e8da31ab317acc0199eb0 metadata.xml 214
 RMD160 0382eb0801e91bc8bd3840d000d8be4ba5c0c602 metadata.xml 214
 SHA256 90cfa1234a16d7fa1be51cd426d4b4e26fdfa0c8ff60ed7fac422b2df929bd1b metadata.xml 214
-MD5 ce0b35a5fe287e7b1525a33ba0bf9d65 files/digest-acx-0.3.35 241
-RMD160 cc2240a302e0be5ac0d3e41fdabd336d727632bc files/digest-acx-0.3.35 241
-SHA256 6a7ced10bc9ab2c78c8a6dee1a152f8b5f3e172328ad07d2c63efb6e96ec4635 files/digest-acx-0.3.35 241
 MD5 6c9c72124399fa4e61bb830e3d77cd63 files/digest-acx-0.3.35_p20060521 241
 RMD160 48fc52764ffc61b535cf4aa13e7ea62d851106cf files/digest-acx-0.3.35_p20060521 241
 SHA256 a0791def9f4377b0c0ba86a85926e7a0b9c7cad0d6a495a6d5175bddf3e68da4 files/digest-acx-0.3.35_p20060521 241
diff --git a/net-wireless/acx/acx-0.3.35.ebuild b/net-wireless/acx/acx-0.3.35.ebuild
deleted file mode 100644
index 1aef06e32d39..000000000000
--- a/net-wireless/acx/acx-0.3.35.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/acx-0.3.35.ebuild,v 1.4 2006/10/20 02:24:29 dsd Exp $
-
-inherit linux-mod
-
-DESCRIPTION="Driver for the ACX100 and ACX111 wireless chipset (CardBus, PCI, USB)"
-
-HOMEPAGE="http://acx100.sourceforge.net/"
-SRC_URI="http://acx100.erley.org/acx-20060215.tar.bz2"
-
-LICENSE="GPL-2 as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-RDEPEND="net-wireless/wireless-tools
-	net-wireless/acx-firmware"
-
-S=${WORKDIR}
-
-MODULE_NAMES="acx(net:${S})"
-CONFIG_CHECK="NET_RADIO 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
-	sed -i 's:usr/share/acx:lib/firmware:' common.c || die "sed failed"
-
-	# fix 2.6.18 compilation
-	epatch ${FILESDIR}/${P}-2.6.18.patch
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README
-}
diff --git a/net-wireless/acx/acx-0.3.35_p20060521.ebuild b/net-wireless/acx/acx-0.3.35_p20060521.ebuild
index d2b04f14910b..07fdd43263bf 100644
--- a/net-wireless/acx/acx-0.3.35_p20060521.ebuild
+++ b/net-wireless/acx/acx-0.3.35_p20060521.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/acx-0.3.35_p20060521.ebuild,v 1.4 2007/07/15 03:28:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/acx-0.3.35_p20060521.ebuild,v 1.5 2007/07/27 06:21:23 genstef Exp $
 
 inherit linux-mod
 
@@ -21,7 +21,7 @@ RDEPEND="net-wireless/wireless-tools
 S=${WORKDIR}
 
 MODULE_NAMES="acx(net:${S})"
-CONFIG_CHECK="NET_RADIO FW_LOADER"
+CONFIG_CHECK="WIRELESS_EXT FW_LOADER"
 BUILD_TARGETS="modules"
 
 pkg_setup() {
diff --git a/net-wireless/acx/acx-0.3.35_p20070101.ebuild b/net-wireless/acx/acx-0.3.35_p20070101.ebuild
index 8ccc15811bc2..a051a4385cce 100644
--- a/net-wireless/acx/acx-0.3.35_p20070101.ebuild
+++ b/net-wireless/acx/acx-0.3.35_p20070101.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/acx-0.3.35_p20070101.ebuild,v 1.2 2007/07/15 03:28:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/acx-0.3.35_p20070101.ebuild,v 1.3 2007/07/27 06:21:23 genstef Exp $
 
 inherit linux-mod
 
@@ -22,7 +22,7 @@ RDEPEND="net-wireless/wireless-tools
 S=${WORKDIR}/${PN}-${PATCHLEVEL}
 
 MODULE_NAMES="acx(net:${S})"
-CONFIG_CHECK="NET_RADIO FW_LOADER"
+CONFIG_CHECK="WIRELESS_EXT FW_LOADER"
 BUILD_TARGETS="modules"
 
 pkg_setup() {
@@ -39,6 +39,7 @@ src_unpack() {
 	if ! use debug; then
 		sed -i '/^#define ACX_DEBUG/s/2/0/' acx_config.h || die "Failed to disable debug support"
 	fi
+	kernel_is ge 2 6 22 && epatch ${FILESDIR}/${P}-2.6.22.patch 
 
 }
 
diff --git a/net-wireless/acx/files/acx-0.3.35-2.6.18.patch b/net-wireless/acx/files/acx-0.3.35-2.6.18.patch
deleted file mode 100644
index 472036b2c0eb..000000000000
--- a/net-wireless/acx/files/acx-0.3.35-2.6.18.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: work/pci.c
-===================================================================
---- work.orig/pci.c
-+++ work/pci.c
-@@ -50,6 +50,9 @@
- #include <linux/pci.h>
- #include <linux/pm.h>
- #include <linux/vmalloc.h>
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17)
-+#include <linux/utsrelease.h>
-+#endif
- 
- #include "acx.h"
- 
diff --git a/net-wireless/acx/files/acx-0.3.35_p20070101-2.6.22.patch b/net-wireless/acx/files/acx-0.3.35_p20070101-2.6.22.patch
new file mode 100644
index 000000000000..5db2a9c3859c
--- /dev/null
+++ b/net-wireless/acx/files/acx-0.3.35_p20070101-2.6.22.patch
@@ -0,0 +1,29 @@
+--- acx-20070101/pci.c.orig	2007-07-24 03:57:41.000000000 -0700
++++ acx-20070101/pci.c	2007-07-24 03:59:20.000000000 -0700
+@@ -2104,7 +2104,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-20070101/common.c.orig	2007-07-24 03:59:40.000000000 -0700
++++ acx-20070101/common.c	2007-07-24 04:01:23.000000000 -0700
+@@ -2753,8 +2753,11 @@
+ 
+ 	skb->dev = adev->ndev;
+ 	skb->dev->last_rx = jiffies;
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
++	skb_reset_mac_header(skb);
++#else
+ 	skb->mac.raw = skb->data;
++#endif
+ 	skb->ip_summed = CHECKSUM_NONE;
+ 	skb->pkt_type = PACKET_OTHERHOST;
+ 	skb->protocol = htons(ETH_P_80211_RAW);
diff --git a/net-wireless/acx/files/digest-acx-0.3.35 b/net-wireless/acx/files/digest-acx-0.3.35
deleted file mode 100644
index 62ab9f3d5b56..000000000000
--- a/net-wireless/acx/files/digest-acx-0.3.35
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 95bcd5df2365dfcfc78169b0331f69a2 acx-20060215.tar.bz2 145630
-RMD160 40f4871b8aff191cf3decb7a48f2bc1bf9100e99 acx-20060215.tar.bz2 145630
-SHA256 22b5fb7eb833e3168ffcad4d8eae4e778002d892d0dbbf28d27a0fe0a717e19c acx-20060215.tar.bz2 145630