Kernel 2.4 patch update + removal of non-functional version.

6 files changed, 12 insertions, 155 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 204d32e05941..fa9ca7dcc444 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.45 2004/11/05 10:18:17 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.46 2004/11/08 20:29:07 brix Exp $
+
+  08 Nov 2004; Henrik Brix Andersen <brix@gentoo.org> ipw2100-0.56-r1.ebuild,
+  -ipw2100-0.56.ebuild:
+  Updated kernel 2.4.x patch, cleaned out non-functional version 0.56.
 
 *ipw2100-0.60 (05 Nov 2004)
 
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index a1738883dac0..772ccd36042f 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -2,16 +2,14 @@ MD5 6bc8f40845cc7b96b79ccbcd6e1fa2fb ipw2100-0.57.ebuild 3817
 MD5 ed6da81014c34267a8374e46f567a022 ipw2100-0.59.ebuild 3817
 MD5 c4a97eb25e8d493065e9168268ddb856 ipw2100-0.54.ebuild 2772
 MD5 a7551dca10e0976ba202483e1ac15333 ipw2100-0.60.ebuild 3817
-MD5 750e2e1318bb6ccf995199399d7a1e9f ipw2100-0.56.ebuild 3999
-MD5 131945f7f5e180c4c060b3661c773880 ipw2100-0.56-r1.ebuild 3997
+MD5 efcbe60a24906978ba139ff96df5ed82 ipw2100-0.56-r1.ebuild 3997
 MD5 c98f3cde3235a2e9e022f3205c8952f4 ipw2100-0.58.ebuild 3817
-MD5 cf5ec12e0e632adda5c85816f106d661 ChangeLog 9292
+MD5 4adb5f30c4147260ac5a38361fa4de84 ChangeLog 9466
 MD5 8a68b74057e911e6804f77dc21959e80 metadata.xml 282
 MD5 b80746d07b956e30d091d5b070694b15 files/ipw2100-0.56-2.6.10-susp.patch 1484
 MD5 65f9c3d1b61f2e64d1e47a5d876946e4 files/ipw2100-0.56-wpa_eapol_fix.patch 624
-MD5 179d5b085933eefa2edd75e3fae3dde0 files/digest-ipw2100-0.56-r1 195
+MD5 3281ce7f4f675298655322854f41fdd6 files/digest-ipw2100-0.56-r1 195
 MD5 674152317ec0021f718398ba7a213b0d files/digest-ipw2100-0.54 124
-MD5 5fa9f803ddce8467b15e0397a8155057 files/digest-ipw2100-0.56 195
 MD5 97e5b39dd6c08d7d582c250e3af2f950 files/digest-ipw2100-0.57 124
 MD5 8928c2c9c01fd33dc6af010e74190332 files/digest-ipw2100-0.58 124
 MD5 3e6d6af3cead7c15b2c76688e3a38c17 files/digest-ipw2100-0.59 124
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.56 b/net-wireless/ipw2100/files/digest-ipw2100-0.56
deleted file mode 100644
index c33cf5be1ca0..000000000000
--- a/net-wireless/ipw2100/files/digest-ipw2100-0.56
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 96473874bb682e2701c4e8e6dd662a64 ipw2100-0.56.tgz 132854
-MD5 46aa75bcda1a00efa841f9707bbbd113 ipw2100-fw-1.3.tgz 248471
-MD5 8e0d061b2567361c76c3193aa342ec6f ipw2100-0.56-2.4-v1.patch.gz 8208
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.56-r1 b/net-wireless/ipw2100/files/digest-ipw2100-0.56-r1
index 572d593df0f3..24cce39e0ed2 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 f83014d12b4cdc4188191c384770b7e1 ipw2100-0.56-2.4-v8.patch.gz 8874
+MD5 5367fe7ad991a70f3af0797ba0d83e2d ipw2100-0.56-2.4-v9.patch.gz 8832
diff --git a/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild b/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild
index c8aa9d5e819d..41a28084b34e 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.5 2004/11/04 11:48:15 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild,v 1.6 2004/11/08 20:29:07 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-v8.patch.gz"
+		mirror://gentoo/${P}-2.4-v9.patch.gz"
 
 LICENSE="GPL-2 ipw2100-fw"
 SLOT="0"
@@ -92,7 +92,7 @@ src_unpack() {
 	if kernel-mod_is_2_4_kernel
 	then
 		cd ${S}
-		epatch ${WORKDIR}/${P}-2.4-v8.patch
+		epatch ${WORKDIR}/${P}-2.4-v9.patch
 	fi
 
 	cd ${S}
diff --git a/net-wireless/ipw2100/ipw2100-0.56.ebuild b/net-wireless/ipw2100/ipw2100-0.56.ebuild
deleted file mode 100644
index 79233551da0f..000000000000
--- a/net-wireless/ipw2100/ipw2100-0.56.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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.ebuild,v 1.4 2004/10/21 08:13:25 brix Exp $
-
-inherit kernel-mod eutils
-
-FW_VERSION="1.3"
-
-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-v1.patch.gz"
-
-LICENSE="GPL-2 ipw2100-fw"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-DEPEND="!net-wireless/ipw2200
-		sys-apps/sed"
-RDEPEND=">=sys-apps/hotplug-20030805-r2
-		>=net-wireless/wireless-tools-27_pre23"
-
-src_unpack() {
-	if ! kernel-mod_configoption_present NET_RADIO
-	then
-		eerror ""
-		eerror "${P} requires support for Wireless LAN drivers (non-hamradio) &"
-		eerror "Wireless Extensions (CONFIG_NET_RADIO) in the kernel."
-		eerror ""
-		die "CONFIG_NET_RADIO support not detected."
-	fi
-
-	if ! kernel-mod_configoption_present CRYPTO_ARC4
-	then
-		eerror ""
-		eerror "${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)"
-		eerror "in the kernel."
-		eerror ""
-		die "CONFIG_CRYPTO_ARC4 support not detected."
-	fi
-
-	if ! kernel-mod_configoption_present CRYPTO_MICHAEL_MIC
-	then
-		eerror ""
-		eerror "${P} requires support for Michael MIC keyed digest algorithm"
-		eerror "(CONFIG_CRYPTO_MICHAEL_MIC) in the kernel."
-		eerror ""
-		die "CONFIG_CRYPTO_MICHAEL_MIC support not detected."
-	fi
-
-	if ! kernel-mod_configoption_present CRYPTO_AES_586 && ! kernel-mod_configoption_present CRYPTO_AES
-	then
-		eerror ""
-		eerror "${P} requires support for AES cipher algorithms (i586)"
-		eerror "(CONFIG_CRYPTO_AES_586) in the kernel."
-		eerror ""
-		eerror "This is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
-		eerror ""
-		die "CONFIG_CRYPTO_AES_586 support not detected."
-	fi
-
-	if ! kernel-mod_configoption_present FW_LOADER
-	then
-		eerror ""
-		eerror "${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)"
-		eerror "in the kernel."
-		eerror ""
-		die "CONFIG_FW_LOADER support not detected."
-	fi
-
-	if ! kernel-mod_configoption_present CRC32
-	then
-		eerror ""
-		eerror "${P} requires support for CRC32 functions (CONFIG_CRC32) in the"
-		eerror "kernel."
-		eerror ""
-		die "CONFIG_CRC32 support not detected."
-	fi
-
-	kernel-mod_check_modules_supported
-
-	unpack ${A}
-
-	if kernel-mod_is_2_4_kernel
-	then
-		cd ${S}
-		epatch ${WORKDIR}/${P}-2.4-v1.patch
-	fi
-
-	einfo "Patching Makefile to enable WPA"
-	sed -i "s:^# CONFIG_IEEE80211_WPA=:CONFIG_IEEE80211_WPA=:" \
-		${S}/Makefile
-
-	# let pkg_postinst() handle depmod
-	sed -i "s:/sbin/depmod -a::" ${S}/Makefile
-
-	kernel-mod_getversion
-
-	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
-	then
-		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
-	fi
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	emake KSRC=${ROOT}/usr/src/linux all || die
-}
-
-src_install() {
-	set_arch_to_kernel
-
-	emake KSRC=${ROOT}/usr/src/linux KMISC=${D}/lib/modules/${KV}/net install || die
-
-	set_arch_to_portage
-
-	dodoc ISSUES README.ipw2100 CHANGES LICENSE
-
-	insinto /lib/firmware
-	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
-	doins ${WORKDIR}/${PN}-${FW_VERSION}-p.fw
-	doins ${WORKDIR}/${PN}-${FW_VERSION}-i.fw
-	newins ${WORKDIR}/LICENSE ${PN}-${FW_VERSION}-LICENSE
-
-	# Create symbolic links for old (<=hotplug-20040920) firmware location
-	# See bug #65059
-	dodir /usr/lib/hotplug/firmware
-	dosym /lib/firmware/${PN}-${FW_VERSION}.fw      /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}.fw
-	dosym /lib/firmware/${PN}-${FW_VERSION}-p.fw    /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}-p.fw
-	dosym /lib/firmware/${PN}-${FW_VERSION}-i.fw    /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}-i.fw
-	dosym /lib/firmware/${PN}-${FW_VERSION}-LICENSE /usr/lib/hotplug/firmware/${PN}-${FW_VERSION}-LICENSE
-}
-
-pkg_postinst() {
-	einfo "Checking kernel module dependencies"
-	test -r "${ROOT}/usr/src/linux/System.map" && \
-		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
-}