Also including Johan Hovold's patch for kernel-2.6.19 and the removed config.h (thanks again to Johan Hovold <jhovold at gmail.com>, this time #157796).

Package-Manager: portage-2.1.2_rc3-r6

4 files changed, 38 insertions, 15 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index e1161e630374..b8775f979f5a 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/ipw2100
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.103 2006/12/18 01:52:46 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.104 2006/12/18 02:12:10 phreak Exp $
+
+  18 Dec 2006; Christian Heim <phreak@gentoo.org>
+  +files/ipw2100-1.2.1-config.h.patch, ipw2100-1.2.1-r2.ebuild:
+  Also including Johan Hovold's patch for kernel-2.6.19 and the removed
+  config.h (thanks again to Johan Hovold <jhovold at gmail.com>, this time
+  #157796).
 
 *ipw2100-1.2.1-r2 (18 Dec 2006)
 
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index db7993005c50..320e461ca798 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -5,6 +5,10 @@ AUX ipw2100-1.2.1-cflags.patch 1750 RMD160 583394f7f4ccf05526bd744cfcf66a939a6a7
 MD5 3f437a010335dd4afb6c22bb04bfea09 files/ipw2100-1.2.1-cflags.patch 1750
 RMD160 583394f7f4ccf05526bd744cfcf66a939a6a7380 files/ipw2100-1.2.1-cflags.patch 1750
 SHA256 c19f23b40376ff1054d8355b7eb88218e134c35d81d02773f89af2c9b478152c files/ipw2100-1.2.1-cflags.patch 1750
+AUX ipw2100-1.2.1-config.h.patch 327 RMD160 263c0391f9105d5d9208ead36b8d674dccbb4b70 SHA1 096f4d313913a632eeb2d831ca334ce4655dc77f SHA256 693c10924522238df421605d35e3c3960f358775e3562a01f170374e7b05facc
+MD5 85d0da10a8fb5ab2f395058c787c0f46 files/ipw2100-1.2.1-config.h.patch 327
+RMD160 263c0391f9105d5d9208ead36b8d674dccbb4b70 files/ipw2100-1.2.1-config.h.patch 327
+SHA256 693c10924522238df421605d35e3c3960f358775e3562a01f170374e7b05facc files/ipw2100-1.2.1-config.h.patch 327
 AUX ipw2100-1.2.1-double-parentheses.patch 544 RMD160 6332d2bb6a6c145c0ebabf946d9f741b60a2dbbc SHA1 f7b4c92b6971b2b42ef8542b574b4f0623c601c2 SHA256 3d6860d007f153deb9690cbb6169951b7393e18dddae689bf715ac50e1eae39f
 MD5 94c0b4113d86f126cb06efcb816bc426 files/ipw2100-1.2.1-double-parentheses.patch 544
 RMD160 6332d2bb6a6c145c0ebabf946d9f741b60a2dbbc files/ipw2100-1.2.1-double-parentheses.patch 544
@@ -18,14 +22,14 @@ EBUILD ipw2100-1.2.1-r1.ebuild 2783 RMD160 d8c7dbe723896ccaa28ef0baf7f26f68e7bda
 MD5 6e52d7f2eaf2eadc86bc67bd9e722237 ipw2100-1.2.1-r1.ebuild 2783
 RMD160 d8c7dbe723896ccaa28ef0baf7f26f68e7bdaf88 ipw2100-1.2.1-r1.ebuild 2783
 SHA256 d44de0a5db6963f1a8dd66610800a80cf031c421d59ff47ba66d6548117de4ad ipw2100-1.2.1-r1.ebuild 2783
-EBUILD ipw2100-1.2.1-r2.ebuild 2840 RMD160 f3dee00b24b8c317974b8431c365ab69c7c5578d SHA1 7887df84af179a5075b122bb4c8b75695e61cce5 SHA256 a68297e096c1765ec7933f87441a68f8339c39ad1ec030316eeb93cd28401f0f
-MD5 2379aeaf222f07e8943d08d5bc045a7d ipw2100-1.2.1-r2.ebuild 2840
-RMD160 f3dee00b24b8c317974b8431c365ab69c7c5578d ipw2100-1.2.1-r2.ebuild 2840
-SHA256 a68297e096c1765ec7933f87441a68f8339c39ad1ec030316eeb93cd28401f0f ipw2100-1.2.1-r2.ebuild 2840
-MISC ChangeLog 19303 RMD160 38531d92001f46e8988fcb78cdc04d9e5130dfed SHA1 9d96ef9dce368a4a891f28862144c2ef9af5ee98 SHA256 6bc73e002075dd872e263bff19128e372527d144c15068a432529a0aaa891089
-MD5 736a5854f487425b916223d204f53184 ChangeLog 19303
-RMD160 38531d92001f46e8988fcb78cdc04d9e5130dfed ChangeLog 19303
-SHA256 6bc73e002075dd872e263bff19128e372527d144c15068a432529a0aaa891089 ChangeLog 19303
+EBUILD ipw2100-1.2.1-r2.ebuild 2886 RMD160 f9ad70e930980e44e993cdaabc9f7f25df56b926 SHA1 2d636986fb35b6713bd4b5c9dbc8003fe43ae366 SHA256 d4f5419d075d0112af3a88dec02809da23e6e20d2585805dd30a112f1e49efbd
+MD5 f3b615bf7cdd5992f6f602416db25b01 ipw2100-1.2.1-r2.ebuild 2886
+RMD160 f9ad70e930980e44e993cdaabc9f7f25df56b926 ipw2100-1.2.1-r2.ebuild 2886
+SHA256 d4f5419d075d0112af3a88dec02809da23e6e20d2585805dd30a112f1e49efbd ipw2100-1.2.1-r2.ebuild 2886
+MISC ChangeLog 19577 RMD160 51a95d361ceda004ed9c11c072659af5f719cc77 SHA1 4ffb24fa5752de4f65effb5d8fd0a4bbc2c04b88 SHA256 4b04badedb5ce72cfd6368c1f64b92f7561b9aa56599147cc2cfbdce1625cfb6
+MD5 1aa4718502cc887f028d9fdd3af05a37 ChangeLog 19577
+RMD160 51a95d361ceda004ed9c11c072659af5f719cc77 ChangeLog 19577
+SHA256 4b04badedb5ce72cfd6368c1f64b92f7561b9aa56599147cc2cfbdce1625cfb6 ChangeLog 19577
 MISC metadata.xml 349 RMD160 39e2f26e4bd4dc0813d0bc35ff05dec4e4ceca2f SHA1 c6e2560229748739c2182a6d4e4ff26479166443 SHA256 8a23fb2e817a602bea0365aa503bf0c42e72639d0a176b507064a751ea893e04
 MD5 1bb91f469544cf1f1edf3c158c40c2ba metadata.xml 349
 RMD160 39e2f26e4bd4dc0813d0bc35ff05dec4e4ceca2f metadata.xml 349
@@ -39,7 +43,7 @@ SHA256 e3affb268173dc7e7b28f4b2d3bd84e1d6bd9fdac51ce043162e605095e3ffd8 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFhfR5yuNVb5qfaOYRAjEvAJ9KBNR5pONoWpFFOQS8YPInkpPcSQCgp7zb
-dmhhH7mzUF8gIF21b5k6W/0=
-=FitC
+iD8DBQFFhfkGyuNVb5qfaOYRAmRuAJ9n8jaVG/C6W7wsjn3CGO3XhsCJ0gCfcKS4
+yt6mcLtfey/shz94oGhF+VQ=
+=YIOP
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ipw2100/files/ipw2100-1.2.1-config.h.patch b/net-wireless/ipw2100/files/ipw2100-1.2.1-config.h.patch
new file mode 100644
index 000000000000..8b65bc8c7902
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-1.2.1-config.h.patch
@@ -0,0 +1,12 @@
+--- ipw2100-1.2.1.orig/ipw2100.c	2006-12-11 15:12:53.000000000 +1100
++++ ipw2100-1.2.1/ipw2100.c	2006-12-11 15:14:35.000000000 +1100
+@@ -134,7 +134,9 @@
+ */
+ 
+ #include <linux/compiler.h>
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
diff --git a/net-wireless/ipw2100/ipw2100-1.2.1-r2.ebuild b/net-wireless/ipw2100/ipw2100-1.2.1-r2.ebuild
index d52648d90c2b..bfbb82d6f52d 100644
--- a/net-wireless/ipw2100/ipw2100-1.2.1-r2.ebuild
+++ b/net-wireless/ipw2100/ipw2100-1.2.1-r2.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/ipw2100/ipw2100-1.2.1-r2.ebuild,v 1.1 2006/12/18 01:52:46 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.2.1-r2.ebuild,v 1.2 2006/12/18 02:12:10 phreak Exp $
 
 inherit eutils linux-mod
 
@@ -41,7 +41,7 @@ pkg_setup() {
 		die "${P} does not support building against kernel 2.4.x"
 	fi
 
-	if [[ ! -f ${ROOT}/lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ} ]]; then
+	if [[ ! -f "${ROOT}/lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ}" ]]; then
 		eerror
 		eerror "Looks like you forgot to remerge net-wireless/ieee80211 after"
 		eerror "upgrading your kernel."
@@ -64,6 +64,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-cflags.patch"
 	epatch "${FILESDIR}/${P}-double-parentheses.patch"
 	epatch "${FILESDIR}/${P}-essid.patch"
+	epatch "${FILESDIR}/${P}-config.h.patch"
 
 	use debug && debug="y"
 	sed -i -e "s:^\(CONFIG_IPW2100_DEBUG\)=.*:\1=$debug:" "${S}"/Makefile
@@ -87,7 +88,7 @@ src_install() {
 pkg_postinst() {
 	linux-mod_pkg_postinst
 
-	if [ -f ${ROOT}/lib/modules/${KV_FULL}/net/${PN}.ko ]; then
+	if [ -f "${ROOT}/lib/modules/${KV_FULL}/net/${PN}.ko" ]; then
 		einfo
 		einfo "Modules from an earlier installation detected. You will need to manually"
 		einfo "remove those modules by running the following commands:"