stable x86, with fix for bug #157695

(Portage version: 2.1.2_rc3-r6)

3 files changed, 108 insertions, 3 deletions

diff --git a/net-wireless/acx/ChangeLog b/net-wireless/acx/ChangeLog
index 64c68ef6c201..81950eb64be4 100644
--- a/net-wireless/acx/ChangeLog
+++ b/net-wireless/acx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/acx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/ChangeLog,v 1.9 2006/10/20 02:24:29 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/ChangeLog,v 1.10 2006/12/20 02:24:44 spb Exp $
+
+  20 Dec 2006; Stephen Bennett <spb@gentoo.org>
+  +files/acx-0.3.35_p20060521-2.6.19.patch, acx-0.3.35_p20060521.ebuild:
+  Add patch for #157695, and mark 0.3.35_p2006521 stable x86
 
   20 Oct 2006; Daniel Drake <dsd@gentoo.org> +files/acx-0.3.35-2.6.18.patch,
   +files/acx-0.3.35_p20060521-2.6.18.patch, acx-0.3.35.ebuild,
diff --git a/net-wireless/acx/acx-0.3.35_p20060521.ebuild b/net-wireless/acx/acx-0.3.35_p20060521.ebuild
index 3b1f5b6c7d2a..5cd4d61e54da 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
 # 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.2 2006/10/20 02:24:29 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/acx-0.3.35_p20060521.ebuild,v 1.3 2006/12/20 02:24:44 spb Exp $
 
 inherit linux-mod
 
@@ -11,7 +11,7 @@ SRC_URI="http://acx100.erley.org/acx-20060521.tar.bz2"
 
 LICENSE="GPL-2 as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 IUSE="debug"
 
@@ -41,6 +41,7 @@ src_unpack() {
 
 	# fix 2.6.18 compilation
 	epatch ${FILESDIR}/${P}-2.6.18.patch
+	epatch ${FILESDIR}/${P}-2.6.19.patch
 }
 
 src_install() {
diff --git a/net-wireless/acx/files/acx-0.3.35_p20060521-2.6.19.patch b/net-wireless/acx/files/acx-0.3.35_p20060521-2.6.19.patch
new file mode 100644
index 000000000000..c8ff8e440ed2
--- /dev/null
+++ b/net-wireless/acx/files/acx-0.3.35_p20060521-2.6.19.patch
@@ -0,0 +1,100 @@
+diff -ur acx.orig/common.c acx/common.c
+--- acx.orig/common.c	2006-05-20 19:27:58.000000000 +0100
++++ acx/common.c	2006-12-20 02:12:54.000000000 +0000
+@@ -30,8 +30,11 @@
+ ** ---------------------------------------------------------------------
+ */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#include <linux/config.h>
++#endif
++
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+ #include <linux/sched.h>
+Only in acx: .common.c.swp
+diff -ur acx.orig/conv.c acx/conv.c
+--- acx.orig/conv.c	2006-05-20 19:27:57.000000000 +0100
++++ acx/conv.c	2006-12-20 02:12:49.000000000 +0000
+@@ -30,8 +30,11 @@
+ ** ---------------------------------------------------------------------
+ */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#include <linux/config.h>
++#endif
++
+ #include <linux/skbuff.h>
+ #include <linux/if_arp.h>
+ #include <linux/etherdevice.h>
+Only in acx: .conv.c.swp
+diff -ur acx.orig/ioctl.c acx/ioctl.c
+--- acx.orig/ioctl.c	2006-05-20 19:27:59.000000000 +0100
++++ acx/ioctl.c	2006-12-20 02:13:05.000000000 +0000
+@@ -30,8 +30,11 @@
+ ** ---------------------------------------------------------------------
+ */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#include <linux/config.h>
++#endif
++
+ #include <linux/kernel.h>
+ #include <linux/types.h>
+ #include <asm/io.h>
+Only in acx: .ioctl.c.swp
+diff -ur acx.orig/pci.c acx/pci.c
+--- acx.orig/pci.c	2006-05-20 20:11:13.000000000 +0100
++++ acx/pci.c	2006-12-20 02:12:33.000000000 +0000
+@@ -31,8 +31,11 @@
+ */
+ #define ACX_PCI 1
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#include <linux/config.h>
++#endif
++
+ #include <linux/compiler.h> /* required for Lx 2.6.8 ?? */
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+Only in acx: .pci.c.swp
+diff -ur acx.orig/usb.c acx/usb.c
+--- acx.orig/usb.c	2006-05-20 19:27:57.000000000 +0100
++++ acx/usb.c	2006-12-20 02:12:37.000000000 +0000
+@@ -45,7 +45,10 @@
+ #define ACX_USB 1
+ 
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
+ #include <linux/config.h>
++#endif
++
+ #include <linux/types.h>
+ #include <linux/module.h>
+ #include <linux/moduleparam.h>
+Only in acx: .usb.c.swp
+diff -ur acx.orig/wlan.c acx/wlan.c
+--- acx.orig/wlan.c	2006-05-20 19:27:59.000000000 +0100
++++ acx/wlan.c	2006-12-20 02:12:59.000000000 +0000
+@@ -37,8 +37,11 @@
+ ** http://www.linux-wlan.com
+ */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#include <linux/config.h>
++#endif
++
+ #include <linux/types.h>
+ #include <linux/if_arp.h>
+ #include <linux/wireless.h>
+Only in acx: .wlan.c.swp