Fix compilation on 2.6.18 thanks to Fabio Erculiani in bug #148521

Package-Manager: portage-2.1.2_pre3-r5

6 files changed, 63 insertions, 15 deletions

diff --git a/net-wireless/acx/ChangeLog b/net-wireless/acx/ChangeLog
index 4abb3cfc29a6..64c68ef6c201 100644
--- a/net-wireless/acx/ChangeLog
+++ b/net-wireless/acx/ChangeLog
@@ -1,6 +1,11 @@
 # 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.8 2006/08/07 20:22:59 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/ChangeLog,v 1.9 2006/10/20 02:24:29 dsd Exp $
+
+  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,
+  acx-0.3.35_p20060521.ebuild:
+  Fix compilation on 2.6.18 thanks to Fabio Erculiani in bug #148521
 
 *acx-0.3.35_p20060521 (07 Aug 2006)
 
diff --git a/net-wireless/acx/Manifest b/net-wireless/acx/Manifest
index 971e860103dc..ba2f3d455009 100644
--- a/net-wireless/acx/Manifest
+++ b/net-wireless/acx/Manifest
@@ -1,17 +1,25 @@
+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
+SHA256 39576a808be7ee61cebcaba90c7ae21b763e978cff2a47fa5a6690fafbdda52f files/acx-0.3.35_p20060521-2.6.18.patch 332
 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 900 RMD160 5dcb827cdd3d3305fb4a0d07633501132e77aa57 SHA1 3cd4ffe7d2222b87acb33e7fad531809ecd4386e SHA256 54822b16f9cc43df3f7c20f3083aa448c19f17e04b0bca2e96e3e7cf5bca1e4a
-MD5 750f19961823b2d72c29020e98fd4753 acx-0.3.35.ebuild 900
-RMD160 5dcb827cdd3d3305fb4a0d07633501132e77aa57 acx-0.3.35.ebuild 900
-SHA256 54822b16f9cc43df3f7c20f3083aa448c19f17e04b0bca2e96e3e7cf5bca1e4a acx-0.3.35.ebuild 900
-EBUILD acx-0.3.35_p20060521.ebuild 1043 RMD160 ea01d2d624aedabcd6ede193aea72a44f4381157 SHA1 97cadf2a031ffdb0cf2a4e3fed192e025880251c SHA256 b061faa336356d555c7b989810f1e5a02c34b0c82fe105269ea9d04665b3025b
-MD5 6583c1b0156707b696b4658403055546 acx-0.3.35_p20060521.ebuild 1043
-RMD160 ea01d2d624aedabcd6ede193aea72a44f4381157 acx-0.3.35_p20060521.ebuild 1043
-SHA256 b061faa336356d555c7b989810f1e5a02c34b0c82fe105269ea9d04665b3025b acx-0.3.35_p20060521.ebuild 1043
-MISC ChangeLog 5191 RMD160 ca247595a54de3854621527b71432eecfc7eda4f SHA1 3a2c181dd7bd9f6586eb420cfd20fa863bdf54da SHA256 f7a81d8c9dc293ffaec5e00d06a9669082443aeeb57d218b1cbf7a2c6a15cb60
-MD5 d9cac36caecb12ee32f558b9302fa03c ChangeLog 5191
-RMD160 ca247595a54de3854621527b71432eecfc7eda4f ChangeLog 5191
-SHA256 f7a81d8c9dc293ffaec5e00d06a9669082443aeeb57d218b1cbf7a2c6a15cb60 ChangeLog 5191
+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
 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.ebuild b/net-wireless/acx/acx-0.3.35.ebuild
index 34f8c74ee56a..1aef06e32d39 100644
--- a/net-wireless/acx/acx-0.3.35.ebuild
+++ b/net-wireless/acx/acx-0.3.35.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.ebuild,v 1.3 2006/05/24 22:06:03 josejx Exp $
+# $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
 
@@ -31,6 +31,9 @@ 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() {
diff --git a/net-wireless/acx/acx-0.3.35_p20060521.ebuild b/net-wireless/acx/acx-0.3.35_p20060521.ebuild
index 0ca28539e5ed..3b1f5b6c7d2a 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.1 2006/08/07 20:22:59 spb Exp $
+# $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 $
 
 inherit linux-mod
 
@@ -37,6 +37,10 @@ src_unpack() {
 	if ! use debug; then
 		sed -i '/^#define ACX_DEBUG/s/2/0/' acx_config.h || die "Failed to disable debug support"
 	fi
+
+
+	# fix 2.6.18 compilation
+	epatch ${FILESDIR}/${P}-2.6.18.patch
 }
 
 src_install() {
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
new file mode 100644
index 000000000000..472036b2c0eb
--- /dev/null
+++ b/net-wireless/acx/files/acx-0.3.35-2.6.18.patch
@@ -0,0 +1,14 @@
+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_p20060521-2.6.18.patch b/net-wireless/acx/files/acx-0.3.35_p20060521-2.6.18.patch
new file mode 100644
index 000000000000..922e74d26ff6
--- /dev/null
+++ b/net-wireless/acx/files/acx-0.3.35_p20060521-2.6.18.patch
@@ -0,0 +1,14 @@
+Index: work/pci.c
+===================================================================
+--- work.orig/pci.c
++++ work/pci.c
+@@ -51,6 +51,9 @@
+ #include <linux/pm.h>
+ #include <linux/vmalloc.h>
+ #include <linux/dma-mapping.h>
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17)
++#include <linux/utsrelease.h>
++#endif
+ 
+ #include "acx.h"
+