Adding an updated patch, that only gets applied if a kernel greater or equal to 2.6.19 is found in /usr/src/linux. The old one was breaking backwards compatiblity.

Package-Manager: portage-2.1.2_rc3-r6

3 files changed, 39 insertions, 3 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index b8775f979f5a..161560b9f53e 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,13 @@
 # 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.104 2006/12/18 02:12:10 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.105 2006/12/19 09:55:50 phreak Exp $
+
+  19 Dec 2006; Christian Heim <phreak@gentoo.org>
+  -files/ipw2100-1.2.1-config.h.patch,
+  +files/ipw2100-1.2.1-kernel-2.6.19.patch, ipw2100-1.2.1-r2.ebuild:
+  Adding an updated patch, that only gets applied if a kernel greater or equal
+  to 2.6.19 is found in /usr/src/linux. The old one was breaking backwards
+  compatiblity.
 
   18 Dec 2006; Christian Heim <phreak@gentoo.org>
   +files/ipw2100-1.2.1-config.h.patch, ipw2100-1.2.1-r2.ebuild:
diff --git a/net-wireless/ipw2100/files/ipw2100-1.2.1-kernel-2.6.19.patch b/net-wireless/ipw2100/files/ipw2100-1.2.1-kernel-2.6.19.patch
new file mode 100644
index 000000000000..1116bb86cea2
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-1.2.1-kernel-2.6.19.patch
@@ -0,0 +1,26 @@
+Index: ipw2100-1.2.1/Makefile
+===================================================================
+--- ipw2100-1.2.1.orig/Makefile
++++ ipw2100-1.2.1/Makefile
+@@ -143,9 +143,6 @@ ifdef ($(KSRC_OUTPUT)/.tmp_versions)
+ 	-cp $(KSRC_OUTPUT)/.tmp_versions/*.mod $(MODVERDIR)
+ endif
+ ifeq ($(KSRC),$(KSRC_OUTPUT)) # We're not outputting elsewhere
+-ifdef ($(KSRC)/.tmp_versions)
+-	-cp $(KSRC)/.tmp_versions/*.mod $(MODVERDIR)
+-endif
+ 	$(MAKE) -C $(KSRC) M=$(PWD) MODVERDIR=$(MODVERDIR) modules
+ else # We've got a kernel with seperate output, copy the config, and use O=
+ 	mkdir -p $(TMP)
+Index: ipw2100-1.2.1/ipw2100.c
+===================================================================
+--- ipw2100-1.2.1.orig/ipw2100.c
++++ ipw2100-1.2.1/ipw2100.c
+@@ -134,7 +134,6 @@ that only one external action is invoked
+ */
+ 
+ #include <linux/compiler.h>
+-#include <linux/config.h>
+ #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 bfbb82d6f52d..056adbd79b70 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.2 2006/12/18 02:12:10 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.2.1-r2.ebuild,v 1.3 2006/12/19 09:55:50 phreak Exp $
 
 inherit eutils linux-mod
 
@@ -64,7 +64,10 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-cflags.patch"
 	epatch "${FILESDIR}/${P}-double-parentheses.patch"
 	epatch "${FILESDIR}/${P}-essid.patch"
-	epatch "${FILESDIR}/${P}-config.h.patch"
+
+	if kernel_is ge 2 6 19 ; then
+		epatch "${FILESDIR}/${P}-kernel-2.6.19.patch"
+	fi
 
 	use debug && debug="y"
 	sed -i -e "s:^\(CONFIG_IPW2100_DEBUG\)=.*:\1=$debug:" "${S}"/Makefile