stable x86, with fix for bug #157695

Package-Manager: portage-2.1.2_rc3-r6

diff --git a/net-wireless/acx/ChangeLog b/net-wireless/acx/ChangeLog
index 64c68ef6c2019bee2cb36cb71c8547fabfb47a68..81950eb64be41ee5f4bfbf59a27b0866efe5513a 100644 (file)
--- 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/Manifest b/net-wireless/acx/Manifest
index ba2f3d4550091927c9a1d81b72496a19188c75bf..854e9c86337043e87b8948d35afffbcef8f090d2 100644 (file)
--- a/net-wireless/acx/Manifest
+++ b/net-wireless/acx/Manifest
@@ -6,20 +6,24 @@ AUX acx-0.3.35_p20060521-2.6.18.patch 332 RMD160 6d5f87956ae99650fa9b48808e7801e
 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
 SHA256 39576a808be7ee61cebcaba90c7ae21b763e978cff2a47fa5a6690fafbdda52f files/acx-0.3.35_p20060521-2.6.18.patch 332
+AUX acx-0.3.35_p20060521-2.6.19.patch 2795 RMD160 0649320c29a1271884c6a38937c87ec845ad4ed1 SHA1 1abd296433fcfc81ad1520fda674bfcbcc5e8c80 SHA256 6389b513dc7e528fe8d8434952521c16d17f13660a4a83e10901088cea26e725
+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
 DIST acx-20060521.tar.bz2 145385 RMD160 9da6b6e3dbfc72d5a5f504143473cce519ada82f SHA1 afef5d851d69e86fa198595bb43d05eb83da7ecc SHA256 18d500cedb356ac88d6b9b5f67af39bd6bb0593842144aa402e412fa758c7be7
 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 1109 RMD160 921cfbcaeee853bc00bce635954108c1b07c5982 SHA1 1e83de6876c1bd0911b7d2e14010132b2fd1a889 SHA256 3df196d3e1ce0bf7fe44bd76a67e65e6c5dfae31813ca6f48b4382f58642b884
-MD5 1db0a5a39d132d87668431caaeba114e acx-0.3.35_p20060521.ebuild 1109
-RMD160 921cfbcaeee853bc00bce635954108c1b07c5982 acx-0.3.35_p20060521.ebuild 1109
-SHA256 3df196d3e1ce0bf7fe44bd76a67e65e6c5dfae31813ca6f48b4382f58642b884 acx-0.3.35_p20060521.ebuild 1109
-MISC ChangeLog 5432 RMD160 b2cb0b49e7bafc698678082f81a680bb4abc973c SHA1 199707cbdbc66e8cd64abb7495e1dbdfa53311bf SHA256 fc6fe811f662c4b6174ca8357bdc25e6470573f1413416a022489b05f5885c5e
-MD5 69a221f212d775ccf8e1d2c576f9d7e2 ChangeLog 5432
-RMD160 b2cb0b49e7bafc698678082f81a680bb4abc973c ChangeLog 5432
-SHA256 fc6fe811f662c4b6174ca8357bdc25e6470573f1413416a022489b05f5885c5e ChangeLog 5432
+EBUILD acx-0.3.35_p20060521.ebuild 1146 RMD160 4a719d183beb5158c3b4f1117683715e578a6a1b SHA1 9d9e2e2a569b8a6c6ca481b5335f37caa2893234 SHA256 163e2e07289a6ea04e5e042692e819b22bb642270cbfc94f60754face5c5fe6e
+MD5 da08bb531a56760269655b58a22825f5 acx-0.3.35_p20060521.ebuild 1146
+RMD160 4a719d183beb5158c3b4f1117683715e578a6a1b acx-0.3.35_p20060521.ebuild 1146
+SHA256 163e2e07289a6ea04e5e042692e819b22bb642270cbfc94f60754face5c5fe6e acx-0.3.35_p20060521.ebuild 1146
+MISC ChangeLog 5616 RMD160 8691b8ca0e8e23d3278264df35fec752e85d846e SHA1 99264c49f94e16b28f906e10ed6bec5bed54714f SHA256 666fcf4ad5905370d04a023b79c65a990eee45af8d1a9bec44f983cc289dc3aa
+MD5 95c38d256a6c0dd36f43b17a5a71de4e ChangeLog 5616
+RMD160 8691b8ca0e8e23d3278264df35fec752e85d846e ChangeLog 5616
+SHA256 666fcf4ad5905370d04a023b79c65a990eee45af8d1a9bec44f983cc289dc3aa ChangeLog 5616
 MISC metadata.xml 214 RMD160 0382eb0801e91bc8bd3840d000d8be4ba5c0c602 SHA1 556372b4c456ea688b9ac2d594db9d494e643338 SHA256 90cfa1234a16d7fa1be51cd426d4b4e26fdfa0c8ff60ed7fac422b2df929bd1b
 MD5 765551472f6e8da31ab317acc0199eb0 metadata.xml 214
 RMD160 0382eb0801e91bc8bd3840d000d8be4ba5c0c602 metadata.xml 214

diff --git a/net-wireless/acx/acx-0.3.35_p20060521.ebuild b/net-wireless/acx/acx-0.3.35_p20060521.ebuild
index 3b1f5b6c7d2a610524f23f0e0d8894d28654a25e..5cd4d61e54da86d5f049ed270c0d68d9e1ab3a2c 100644 (file)
--- 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 (file)
index 0000000..c8ff8e4
--- /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