Adding a patch for ipw3945-1.0.5 compilation against linux-2.6.19 (thanks to Scott Van Der Wall <svdw@udel.edu> for the patch - #157076 - and Stefan for bugging me about it).

Package-Manager: portage-2.1.2_rc2-r5

4 files changed, 42 insertions, 14 deletions

diff --git a/net-wireless/ipw3945/ChangeLog b/net-wireless/ipw3945/ChangeLog
index 87f67035deb4..93162edd15b8 100644
--- a/net-wireless/ipw3945/ChangeLog
+++ b/net-wireless/ipw3945/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/ipw3945
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.13 2006/12/07 19:49:49 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.14 2006/12/07 21:04:16 phreak Exp $
+
+  07 Dec 2006; Christian Heim <phreak@gentoo.org>
+  +files/ipw3945-1.0.5-linux-2.6.19.patch, ipw3945-1.0.5.ebuild:
+  Adding a patch for ipw3945-1.0.5 compilation against linux-2.6.19 (thanks to
+  Scott Van Der Wall <svdw@udel.edu> for the patch - #157076 - and Stefan for bugging me
+  about it).
 
   07 Dec 2006; Christian Heim <phreak@gentoo.org> metadata.xml:
   Adding Seemant as secondary maintainer.
diff --git a/net-wireless/ipw3945/Manifest b/net-wireless/ipw3945/Manifest
index db8b74b36259..04a52cffb7a8 100644
--- a/net-wireless/ipw3945/Manifest
+++ b/net-wireless/ipw3945/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ipw3945-1.0.5-linux-2.6.19.patch 356 RMD160 322ba91a6096b09dd5a5dfb2f1dfe07c1b3ea08a SHA1 06d82253361c0ab570788443e31e87f234d99730 SHA256 6d931054664ecf1545fd6f94e28e3549c1178bdbe247e0579e8f93334f9c9cd4
+MD5 24592a5a90c5230c46b352538faf7149 files/ipw3945-1.0.5-linux-2.6.19.patch 356
+RMD160 322ba91a6096b09dd5a5dfb2f1dfe07c1b3ea08a files/ipw3945-1.0.5-linux-2.6.19.patch 356
+SHA256 6d931054664ecf1545fd6f94e28e3549c1178bdbe247e0579e8f93334f9c9cd4 files/ipw3945-1.0.5-linux-2.6.19.patch 356
 DIST ipw3945-1.0.5.tgz 174149 RMD160 485f8dbe3404d5e7f32d6f3a6f955de322b0d7c9 SHA1 8dc4a59a4228aaf69e605ed3ad48cabc84b41a31 SHA256 c2acb3403d623b43e432e09c34739c9265cadc586effc1dac2444ae701c4aa45
 DIST ipw3945-1.1.0.tgz 196361 RMD160 6d4b8c12c253b4d00b376911e73ca48d8ab6da35 SHA1 0d1e6acb05003d2f8d40f64114236982f980a170 SHA256 be62bb249527dbe5a4031eec9cdf15e09fe1dc0fdd1b5dc374e85bc5229c1ff1
 DIST ipw3945-1.1.1.tgz 196455 RMD160 0d2fdbc397f35e798ac2cf5f81899c42153c5ab4 SHA1 f86affe2450149de9a80948e241fa26479b8b85d SHA256 37876722e88feb30b305f9d298597d5ea6c5d1976c05851fd1d06ff0a041cdab
 DIST ipw3945-1.1.2.tgz 196846 RMD160 c1e9a968e2378817b8e406d3be5c1ea4bd3b4bed SHA1 aefa31aca38b62d7497db7559336ad65919f5146 SHA256 5bc6eaaea215c9c3f1e025fb1320a7eea102301cd6b5a4f831ad7a8c5a9927d7
-EBUILD ipw3945-1.0.5.ebuild 2514 RMD160 f8e66bae2bcf90a6a369aa4e314b544ebc87e8a2 SHA1 27df67f2ee06ca898ae71f75c81ef8b69e96d159 SHA256 6eb3f002e573396af07781eac992434dc7062359691a484005a2c4e3c619543c
-MD5 747b893f79663a7956eee93c18b396c2 ipw3945-1.0.5.ebuild 2514
-RMD160 f8e66bae2bcf90a6a369aa4e314b544ebc87e8a2 ipw3945-1.0.5.ebuild 2514
-SHA256 6eb3f002e573396af07781eac992434dc7062359691a484005a2c4e3c619543c ipw3945-1.0.5.ebuild 2514
+EBUILD ipw3945-1.0.5.ebuild 2645 RMD160 5a5bb89186156d25d03bd394e2d9fdb3f1103de1 SHA1 a8412147786e7df4d70fc0e3c8cba525dd011702 SHA256 31628d32903a29f5fcae03b9333e8285bd6abf9959b791e5cb29a0aa4cf7c9b1
+MD5 27382806a3fb85e5eb1eb087f428a56c ipw3945-1.0.5.ebuild 2645
+RMD160 5a5bb89186156d25d03bd394e2d9fdb3f1103de1 ipw3945-1.0.5.ebuild 2645
+SHA256 31628d32903a29f5fcae03b9333e8285bd6abf9959b791e5cb29a0aa4cf7c9b1 ipw3945-1.0.5.ebuild 2645
 EBUILD ipw3945-1.1.0-r1.ebuild 2546 RMD160 ea1b5f292c57537866d40ff90bb0853722d16d14 SHA1 c744c72ce622c49f80a83c6f84678fb6857d4b8c SHA256 f04a1b524e5f8407a09d49db2c1c86501d773e760e350f939b2bfd09ce820eb8
 MD5 30e1c0cf5f5093094acbcc1dfd998dbe ipw3945-1.1.0-r1.ebuild 2546
 RMD160 ea1b5f292c57537866d40ff90bb0853722d16d14 ipw3945-1.1.0-r1.ebuild 2546
@@ -25,10 +29,10 @@ EBUILD ipw3945-1.1.2.ebuild 2545 RMD160 add57a060476a8793529d9643a065aad4e3af6a7
 MD5 6d37ba0362176fef0ca4d2db1c8087e8 ipw3945-1.1.2.ebuild 2545
 RMD160 add57a060476a8793529d9643a065aad4e3af6a7 ipw3945-1.1.2.ebuild 2545
 SHA256 1f6e58969b6720b56489bfa6e09b1b8e0802f0c57c365d8cf157dbd7925272df ipw3945-1.1.2.ebuild 2545
-MISC ChangeLog 2388 RMD160 9780372ac12285dd8e852a0bf06df224e832900a SHA1 bc7d84019c6e943d39663dc42e630c3fbdcd5908 SHA256 805e2ef49eba83f45998f6f199896a85d832c75f818bf10164e05eb5fc02a9df
-MD5 cb5f0bf584a13891c3f565b13734b2fc ChangeLog 2388
-RMD160 9780372ac12285dd8e852a0bf06df224e832900a ChangeLog 2388
-SHA256 805e2ef49eba83f45998f6f199896a85d832c75f818bf10164e05eb5fc02a9df ChangeLog 2388
+MISC ChangeLog 2685 RMD160 40fef5a879ff02f86b9dd382d146dbd94378b6ef SHA1 edf0d6b0b89b348ddba4d5913e3af6298e05186a SHA256 00d1e4212983a669df4b8d8c1c60a4c2fc7df44fa9486260d00481e41edd573e
+MD5 6b1559929376e56750035d1a712df4ec ChangeLog 2685
+RMD160 40fef5a879ff02f86b9dd382d146dbd94378b6ef ChangeLog 2685
+SHA256 00d1e4212983a669df4b8d8c1c60a4c2fc7df44fa9486260d00481e41edd573e ChangeLog 2685
 MISC metadata.xml 350 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 SHA1 7d738b5835510288a15729917f3cc272535ec550 SHA256 4c12367eb2d4a151bfdfe4c2809f164ae6092fd2448321a800cd1a3a063c085c
 MD5 792d2ecc8cee12c92c45b9878fdb2192 metadata.xml 350
 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 metadata.xml 350
@@ -51,7 +55,7 @@ SHA256 fec1be42ddc8cb161469402a4ac4210fd0b93af3ae49913c464cd5243d25543d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFeHBmyuNVb5qfaOYRAsspAJ9/myMy5evlFSDQxrg+4cKfYPjhBwCgnOdc
-jm8a4LbPP0+QMrNIPFphJUI=
-=3+p9
+iD8DBQFFeIHZyuNVb5qfaOYRAlW3AJ9xWFViu/iEsX9e/IRDFmo9TZm4jQCgx/Uo
+palmeXF4k2ccYLDEmcyr1KA=
+=zCah
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ipw3945/files/ipw3945-1.0.5-linux-2.6.19.patch b/net-wireless/ipw3945/files/ipw3945-1.0.5-linux-2.6.19.patch
new file mode 100644
index 000000000000..84ae4872af0d
--- /dev/null
+++ b/net-wireless/ipw3945/files/ipw3945-1.0.5-linux-2.6.19.patch
@@ -0,0 +1,14 @@
+Index: ipw3945-1.0.5/ipw3945.h
+===================================================================
+--- ipw3945-1.0.5.orig/ipw3945.h
++++ ipw3945-1.0.5/ipw3945.h
+@@ -29,7 +29,9 @@
+ 
+ #include <linux/module.h>
+ #include <linux/moduleparam.h>
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/init.h>
+ 
+ #include <linux/version.h>
diff --git a/net-wireless/ipw3945/ipw3945-1.0.5.ebuild b/net-wireless/ipw3945/ipw3945-1.0.5.ebuild
index 0738aef1784d..80d56847667d 100644
--- a/net-wireless/ipw3945/ipw3945-1.0.5.ebuild
+++ b/net-wireless/ipw3945/ipw3945-1.0.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ipw3945-1.0.5.ebuild,v 1.2 2006/06/05 13:07:55 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ipw3945-1.0.5.ebuild,v 1.3 2006/12/07 21:04:16 phreak Exp $
 
-inherit linux-mod
+inherit linux-mod eutils
 
 IEEE80211_VERSION="1.1.13-r1"
 UCODE_VERSION="1.13"
@@ -57,6 +57,10 @@ src_unpack() {
 	local debug="n"
 
 	unpack ${A}
+	cd "${S}"
+
+	# bug 157076 (ipw3945 doesn't compile against 2.6.19)
+	epatch "${FILESDIR}/ipw3945-1.0.5-linux-2.6.19.patch"
 
 	sed -i \
 		-e "s:^#\(CONFIG_IPW3945_QOS\)=.*:\1=y:" \