Updated kernel 2.4 patch.

4 files changed, 15 insertions, 9 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 0a839aeaf68a..42e35dd2506b 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/ipw2100
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.42 2004/11/04 07:37:21 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.43 2004/11/04 11:48:15 brix Exp $
+
+  04 Nov 2004; Henrik Brix Andersen <brix@gentoo.org> ipw2100-0.56-r1.ebuild:
+  Updated patch for kernel 2.4, use pkg_setup() for checking required kernel
+  options.
 
 *ipw2100-0.59 (04 Nov 2004)
 
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index 66d24d7728c0..9a1c5a2ca05a 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -4,9 +4,9 @@ MD5 ed6da81014c34267a8374e46f567a022 ipw2100-0.59.ebuild 3817
 MD5 c4a97eb25e8d493065e9168268ddb856 ipw2100-0.54.ebuild 2772
 MD5 c25026014f8d853d84d6cdbb05d848ff ipw2100-0.55-r2.ebuild 3725
 MD5 750e2e1318bb6ccf995199399d7a1e9f ipw2100-0.56.ebuild 3999
-MD5 fadd1dfb2b0750da30a9626ef3f4a521 ipw2100-0.56-r1.ebuild 3981
+MD5 131945f7f5e180c4c060b3661c773880 ipw2100-0.56-r1.ebuild 3997
 MD5 c98f3cde3235a2e9e022f3205c8952f4 ipw2100-0.58.ebuild 3817
-MD5 344edc48a41b827b79568cc9de0f4d23 ChangeLog 8714
+MD5 5b56aca34404d6342e4cfd49233649ed ChangeLog 8881
 MD5 8a68b74057e911e6804f77dc21959e80 metadata.xml 282
 MD5 78f6d8f071cd7615df4ad78abf3e55d0 ipw2100-0.44.ebuild 2305
 MD5 1396122738f1bdc3902e7dc6dde31776 ipw2100-0.55-r1.ebuild 3069
@@ -14,7 +14,7 @@ MD5 b80746d07b956e30d091d5b070694b15 files/ipw2100-0.56-2.6.10-susp.patch 1484
 MD5 65f9c3d1b61f2e64d1e47a5d876946e4 files/ipw2100-0.56-wpa_eapol_fix.patch 624
 MD5 b3a600a244bd8a64fd8ade3036a390e1 files/digest-ipw2100-0.55-r1 124
 MD5 feb0687b42df7addb26274578808b9aa files/digest-ipw2100-0.55-r2 193
-MD5 e209b9e5956f0dc1902a5d2b308dde75 files/digest-ipw2100-0.56-r1 195
+MD5 179d5b085933eefa2edd75e3fae3dde0 files/digest-ipw2100-0.56-r1 195
 MD5 0a8c00c1860d7bb54686e647740f23d0 files/ipw2100-0.55-modparam-perm.patch 769
 MD5 1ce1888cb1dcbc65bc76ba8f3f7875b9 files/ipw2100-0.55_manual-disable.patch 2898
 MD5 5ccd21f930c68d8fd53afe3a87bcd56e files/digest-ipw2100-0.44 124
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.56-r1 b/net-wireless/ipw2100/files/digest-ipw2100-0.56-r1
index 917be95cb3b8..572d593df0f3 100644
--- a/net-wireless/ipw2100/files/digest-ipw2100-0.56-r1
+++ b/net-wireless/ipw2100/files/digest-ipw2100-0.56-r1
@@ -1,3 +1,3 @@
 MD5 96473874bb682e2701c4e8e6dd662a64 ipw2100-0.56.tgz 132854
 MD5 46aa75bcda1a00efa841f9707bbbd113 ipw2100-fw-1.3.tgz 248471
-MD5 34dc57c2a37acb3b613e907de16e0080 ipw2100-0.56-2.4-v7.patch.gz 8480
+MD5 f83014d12b4cdc4188191c384770b7e1 ipw2100-0.56-2.4-v8.patch.gz 8874
diff --git a/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild b/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild
index 8ca06d880505..c8aa9d5e819d 100644
--- a/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild
+++ b/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild,v 1.4 2004/10/29 12:13:49 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild,v 1.5 2004/11/04 11:48:15 brix Exp $
 
 inherit kernel-mod eutils
 
@@ -11,7 +11,7 @@ DESCRIPTION="Driver for the Intel PRO/Wireless 2100 3B miniPCI adapter"
 HOMEPAGE="http://ipw2100.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
 		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz
-		mirror://gentoo/${P}-2.4-v7.patch.gz"
+		mirror://gentoo/${P}-2.4-v8.patch.gz"
 
 LICENSE="GPL-2 ipw2100-fw"
 SLOT="0"
@@ -24,7 +24,7 @@ DEPEND="virtual/linux-sources
 RDEPEND=">=sys-apps/hotplug-20030805-r2
 		>=net-wireless/wireless-tools-27_pre23"
 
-src_unpack() {
+pkg_setup() {
 	local DIE=0
 
 	if ! kernel-mod_configoption_present NET_RADIO
@@ -84,13 +84,15 @@ src_unpack() {
 		eerror ""
 		die "You kernel is missing the required option(s) listed above."
 	fi
+}
 
+src_unpack() {
 	unpack ${A}
 
 	if kernel-mod_is_2_4_kernel
 	then
 		cd ${S}
-		epatch ${WORKDIR}/${P}-2.4-v7.patch
+		epatch ${WORKDIR}/${P}-2.4-v8.patch
 	fi
 
 	cd ${S}