Version bump.

16 files changed, 60 insertions, 620 deletions

diff --git a/net-wireless/ipw2200/ChangeLog b/net-wireless/ipw2200/ChangeLog
index dc0728af5378..b940fd504457 100644
--- a/net-wireless/ipw2200/ChangeLog
+++ b/net-wireless/ipw2200/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/ipw2200
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.11 2004/11/11 22:04:48 jbms Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.12 2004/11/25 18:27:43 jbms Exp $
+
+*ipw2200-0.15 (25 Nov 2004)
+
+  25 Nov 2004; Jeremy Maitin-Shepard <jbms@gentoo.org> +ipw2200-0.15.ebuild,
+  -ipw2200-0.3.ebuild, -ipw2200-0.4-r1.ebuild, -ipw2200-0.4.ebuild,
+  -ipw2200-0.5.ebuild, -ipw2200-0.6.ebuild, -ipw2200-0.7.ebuild,
+  -ipw2200-0.8.ebuild:
+  Version bump.  Resolves Bug #72473.
 
 *ipw2200-0.13 (11 Nov 2004)
 
diff --git a/net-wireless/ipw2200/Manifest b/net-wireless/ipw2200/Manifest
index a28aa754522a..dab717e23fe9 100644
--- a/net-wireless/ipw2200/Manifest
+++ b/net-wireless/ipw2200/Manifest
@@ -1,32 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 22b64750cf7b7b4eed411c4ac0548a3c ChangeLog 2336
-MD5 de516e64385db3ced64f2ec4861cdc38 ipw2200-0.3.ebuild 2129
-MD5 6bf446c6177f9a0e3a88e7450e6bea0e ipw2200-0.4-r1.ebuild 2639
-MD5 6560f2c5f03b5d00cab56743f3cae61d ipw2200-0.4.ebuild 2525
-MD5 e33c43b256ce937ba82846532879e312 metadata.xml 219
-MD5 e63f86f5a39d7f5c6b1f1c08790c9376 ipw2200-0.5.ebuild 2636
-MD5 5a61bb208ed909f35cd0e72a387dade4 ipw2200-0.6.ebuild 2636
-MD5 7b9b63fe9b15540f7e7349b80761294d ipw2200-0.7.ebuild 2636
-MD5 f5b8b18f65282da1c2e011e7ac9a4816 ipw2200-0.8.ebuild 2710
-MD5 e0d907bf16ff8360de006e279dc0d8b5 ipw2200-0.11.ebuild 3633
 MD5 e646c816468f1b0d9f48b9d4d8585b61 ipw2200-0.12.ebuild 3633
+MD5 e0d907bf16ff8360de006e279dc0d8b5 ipw2200-0.11.ebuild 3633
 MD5 93309a7c59bb640cb21ff4e63011dc99 ipw2200-0.13.ebuild 3633
-MD5 13bdb18aad2ee350659575449ba67113 files/digest-ipw2200-0.3 122
-MD5 4bf7fd9d6b68afc2a846b35e57bad566 files/digest-ipw2200-0.4 122
-MD5 4bf7fd9d6b68afc2a846b35e57bad566 files/digest-ipw2200-0.4-r1 122
-MD5 a8198c21381ff4f1c065fcfa47e2d4d8 files/digest-ipw2200-0.5 122
-MD5 6cff0de0da9eee2345b4955c5ccf9ab7 files/digest-ipw2200-0.6 122
-MD5 373cecb0258af7f08eb59e3c9a2757e5 files/digest-ipw2200-0.7 122
-MD5 67d6cb99c9b5497da126f0a18b3909b7 files/digest-ipw2200-0.8 123
+MD5 3fc0b483bb4e42e74ea4e7468493f3bb ChangeLog 2637
+MD5 e33c43b256ce937ba82846532879e312 metadata.xml 219
+MD5 93309a7c59bb640cb21ff4e63011dc99 ipw2200-0.15.ebuild 3633
 MD5 601ee5ee19593a86cd81b66b97e69b93 files/digest-ipw2200-0.11 124
 MD5 840c3b4bb0f0e094cf22be064b5ba8ad files/digest-ipw2200-0.12 124
 MD5 057dbf7b28512ed5c0b28ea58af21de9 files/digest-ipw2200-0.13 124
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBlMM7I1lqEGTUzyQRAuMbAJ9qj8n5LPXuyi2xW58hMBUreV5tkQCfSzcu
-9G5LTvInNOa12uHAvUUm9vQ=
-=hPgJ
------END PGP SIGNATURE-----
+MD5 107a78bf283ab8383f759f8c4ab37b81 files/digest-ipw2200-0.15 124
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-0.3 b/net-wireless/ipw2200/files/digest-ipw2200-0.3
deleted file mode 100644
index 63246de4849d..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-0.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fcd18cf220184f4b6f5fd9ac58376124 ipw2200-0.3.tgz 88133
-MD5 eb20f3ce94f8b18d5b558b738e410c58 ipw2200-fw-1.2.tgz 133331
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-0.4 b/net-wireless/ipw2200/files/digest-ipw2200-0.4
deleted file mode 100644
index a92e4e5bd568..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-0.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7f33d9a084e24ef913f7bba2828acccd ipw2200-0.4.tgz 88918
-MD5 eb20f3ce94f8b18d5b558b738e410c58 ipw2200-fw-1.2.tgz 133331
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-0.4-r1 b/net-wireless/ipw2200/files/digest-ipw2200-0.4-r1
deleted file mode 100644
index a92e4e5bd568..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-0.4-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7f33d9a084e24ef913f7bba2828acccd ipw2200-0.4.tgz 88918
-MD5 eb20f3ce94f8b18d5b558b738e410c58 ipw2200-fw-1.2.tgz 133331
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-0.5 b/net-wireless/ipw2200/files/digest-ipw2200-0.5
deleted file mode 100644
index 0aedfb7cdc0a..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-0.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f8bfd3a46b907238d010f167a7da6d8b ipw2200-0.5.tgz 95987
-MD5 eb20f3ce94f8b18d5b558b738e410c58 ipw2200-fw-1.2.tgz 133331
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-0.6 b/net-wireless/ipw2200/files/digest-ipw2200-0.6
deleted file mode 100644
index 03a5e7a9a319..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-0.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 dd550d08966041667de49bbe7ad957e6 ipw2200-0.6.tgz 97780
-MD5 8bdad731fb923a9fe1921358202f4f0f ipw2200-fw-2.0.tgz 163989
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-0.7 b/net-wireless/ipw2200/files/digest-ipw2200-0.7
deleted file mode 100644
index 9812723c018f..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-0.7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 63622d7c538d73d87d00755f98146b39 ipw2200-0.7.tgz 97893
-MD5 8bdad731fb923a9fe1921358202f4f0f ipw2200-fw-2.0.tgz 163989
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-0.8 b/net-wireless/ipw2200/files/digest-ipw2200-0.8
deleted file mode 100644
index aa85e00c51dc..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-0.8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 05bbb81e7cb3d3d8abfa9b4087010bc5 ipw2200-0.8.tgz 100305
-MD5 8bdad731fb923a9fe1921358202f4f0f ipw2200-fw-2.0.tgz 163989
diff --git a/net-wireless/ipw2200/ipw2200-0.4.ebuild b/net-wireless/ipw2200/ipw2200-0.15.ebuild
index 32d6cdba05cd..2074ebb9d180 100644
--- a/net-wireless/ipw2200/ipw2200-0.4.ebuild
+++ b/net-wireless/ipw2200/ipw2200-0.15.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-0.4.ebuild,v 1.3 2004/08/17 04:14:02 jbms Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-0.15.ebuild,v 1.1 2004/11/25 18:27:43 jbms Exp $
 
 inherit kernel-mod eutils
 
-FW_VERSION="1.2"
+FW_VERSION="2.0"
 
 DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG miniPCI adapter"
 
@@ -26,32 +26,56 @@ RDEPEND="!net-wireless/ipw2100 >=sys-apps/hotplug-20030805-r2"
 
 src_unpack() {
 
+	if ! egrep "^CONFIG_NET_RADIO=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
+	then
+		eerror ""
+		eerror "${PN} requires support for Wireless LAN drivers (non-hamradio) &"
+		eerror "Wireless Extensions in the kernel."
+		eerror ""
+		die "Wireless LAN support not detected."
+	fi
 	if ! egrep "^CONFIG_CRYPTO_ARC4=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
 	then
 		eerror ""
-		eerror "This version of ${PN} requires the ARC4 CryptoAPI module from"
+		eerror "New versions of ${PN} require the ARC4 CryptoAPI module from"
 		eerror "the kernel."
+		eerror ""
 		die "ARC4 Crypto support not detected."
 	fi
+
 	if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
 	then
 		eerror ""
-		eerror "This version of ${PN} require firmware loader support from"
+		eerror "New versions of ${PN} require firmware loader support from"
 		eerror "your kernel. This can be found in Device Drivers --> Generic"
 		eerror "Driver Support on 2.6 or in Library Routines on 2.4 kernels."
+		eerror ""
 		die "Firmware loading support not detected."
 	fi
 
 	if ! egrep "^CONFIG_CRC32=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
 	then
 		eerror ""
-		eerror "This version of ${PN} requires support for CRC32 in"
+		eerror "New versions of ${PN} require support for CRC32 in"
 		eerror "your kernel. This can be found in Library Routines in"
 		eerror "kernel configs."
+		eerror ""
 		die "CRC32 function support not detected."
 	fi
 
 	unpack ${A}
+
+	cd "${S}"
+
+	einfo "Patching Makefile"
+	sed -i -e 's/CONFIG_IPW_DEBUG=y/CONFIG_IPW_DEBUG=n/' "${S}/Makefile"
+	sed -i -e 's/CONFIG_IEEE80211_DEBUG=y/CONFIG_IEEE80211_DEBUG=n/' "${S}/Makefile"
+	sed -i -e 's/# CONFIG_IPW_PROMISC=/CONFIG_IPW_PROMISC=/' "${S}/Makefile"
+	sed -i -e '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 ]
@@ -61,29 +85,36 @@ src_unpack() {
 }
 
 src_compile() {
-	unset ARCH
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		unset ARCH
+	fi
+
 	emake KSRC=${ROOT}/usr/src/linux all || die
 }
 
 src_install() {
-	if [ ${KV_MINOR} -gt 4 ]
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
 	then
-		KV_OBJ="ko"
-	else
-		KV_OBJ="o"
+		unset ARCH
 	fi
 
-	dodoc ISSUES README.${PN} CHANGES
+	emake KMISC=${D}/lib/modules/${KV}/net install || die
 
-	insinto /lib/modules/${KV}/net
-	doins ieee80211_crypt.${KV_OBJ} ieee80211_crypt_wep.${KV_OBJ} \
-		ieee80211.${KV_OBJ} ${PN}.${KV_OBJ}
+	dodoc ISSUES README.${PN} CHANGES
 
-	insinto /usr/lib/hotplug/firmware
+	insinto /lib/firmware
 	doins ${WORKDIR}/${PN}_boot.fw
 	doins ${WORKDIR}/${PN}_bss.fw
 	doins ${WORKDIR}/${PN}_ibss.fw
 	doins ${WORKDIR}/${PN}_ucode.fw
+
+	# Create symbolic links for old hotplug firmware location
+	dodir /usr/lib/hotplug/firmware
+	dosym /lib/firmware/${PN}_boot.fw /usr/lib/hotplug/firmware/${PN}_boot.fw
+	dosym /lib/firmware/${PN}_bss.fw /usr/lib/hotplug/firmware/${PN}_bss.fw
+	dosym /lib/firmware/${PN}_ibss.fw /usr/lib/hotplug/firmware/${PN}_ibss.fw
+	dosym /lib/firmware/${PN}_ucode.fw /usr/lib/hotplug/firmware/${PN}_ucode.fw
 }
 
 pkg_postinst() {
diff --git a/net-wireless/ipw2200/ipw2200-0.3.ebuild b/net-wireless/ipw2200/ipw2200-0.3.ebuild
deleted file mode 100644
index a34ce0cb33f9..000000000000
--- a/net-wireless/ipw2200/ipw2200-0.3.ebuild
+++ /dev/null
@@ -1,81 +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/ipw2200/ipw2200-0.3.ebuild,v 1.2 2004/08/17 04:14:02 jbms Exp $
-
-inherit kernel-mod eutils
-
-FW_VERSION="1.2"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG miniPCI adapter"
-
-HOMEPAGE="http://ipw2200.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
-		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
-
-LICENSE="GPL-2 ipw2200-fw"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-DEPEND="!net-wireless/ipw2100"
-RDEPEND="!net-wireless/ipw2100 >=sys-apps/hotplug-20030805-r2"
-
-src_unpack() {
-	if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "New versions of ${PN} require firmware loader support from"
-		eerror "your kernel. This can be found in Device Drivers --> Generic"
-		eerror "Driver Support on 2.6 or in Library Routines on 2.4 kernels."
-		die "Firmware loading support not detected."
-	fi
-
-	if ! egrep "^CONFIG_CRC32=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "New versions of ${PN} require support for CRC32 in"
-		eerror "your kernel. This can be found in Library Routines in"
-		eerror "kernel configs."
-		die "CRC32 function support not detected."
-	fi
-
-	unpack ${A}
-	kernel-mod_getversion
-
-	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
-	then
-		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
-	fi
-}
-
-src_compile() {
-	unset ARCH
-	emake KSRC=${ROOT}/usr/src/linux all || die
-}
-
-src_install() {
-	if [ ${KV_MINOR} -gt 4 ]
-	then
-		KV_OBJ="ko"
-	else
-		KV_OBJ="o"
-	fi
-
-	dodoc ISSUES README.${PN} CHANGES
-
-	insinto /lib/modules/${KV}/net
-	doins ieee80211_crypt.${KV_OBJ} ieee80211_crypt_wep.${KV_OBJ} \
-		ieee80211.${KV_OBJ} ${PN}.${KV_OBJ}
-
-	insinto /usr/lib/hotplug/firmware
-	doins ${WORKDIR}/${PN}_boot.fw
-	doins ${WORKDIR}/${PN}_bss.fw
-	doins ${WORKDIR}/${PN}_ibss.fw
-	doins ${WORKDIR}/${PN}_ucode.fw
-}
-
-pkg_postinst() {
-	einfo "Checking kernel module dependancies"
-	test -r "${ROOT}/usr/src/linux/System.map" && \
-		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
-}
diff --git a/net-wireless/ipw2200/ipw2200-0.4-r1.ebuild b/net-wireless/ipw2200/ipw2200-0.4-r1.ebuild
deleted file mode 100644
index a94657d6a847..000000000000
--- a/net-wireless/ipw2200/ipw2200-0.4-r1.ebuild
+++ /dev/null
@@ -1,96 +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/ipw2200/ipw2200-0.4-r1.ebuild,v 1.1 2004/08/17 04:14:02 jbms Exp $
-
-inherit kernel-mod eutils
-
-FW_VERSION="1.2"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG miniPCI adapter"
-
-HOMEPAGE="http://ipw2200.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
-		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
-
-LICENSE="GPL-2 ipw2200-fw"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-
-# net-wireless/ipw2100 builds a possibly incompatible ieee80211
-# module, so it is blocked.  This problem will likely be resolved
-# upstream eventually.
-DEPEND="!net-wireless/ipw2100"
-RDEPEND="!net-wireless/ipw2100 >=sys-apps/hotplug-20030805-r2"
-
-src_unpack() {
-
-	if ! egrep "^CONFIG_CRYPTO_ARC4=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "This version of ${PN} requires the ARC4 CryptoAPI module from"
-		eerror "the kernel."
-		die "ARC4 Crypto support not detected."
-	fi
-	if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "This version of ${PN} require firmware loader support from"
-		eerror "your kernel. This can be found in Device Drivers --> Generic"
-		eerror "Driver Support on 2.6 or in Library Routines on 2.4 kernels."
-		die "Firmware loading support not detected."
-	fi
-
-	if ! egrep "^CONFIG_CRC32=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "This version of ${PN} requires support for CRC32 in"
-		eerror "your kernel. This can be found in Library Routines in"
-		eerror "kernel configs."
-		die "CRC32 function support not detected."
-	fi
-
-	unpack ${A}
-	kernel-mod_getversion
-
-	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
-	then
-		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
-	fi
-}
-
-src_compile() {
-	unset ARCH
-
-	# Build WPA support
-	emake KSRC=${ROOT}/usr/src/linux all CONFIG_IEEE80211_WPA=y || die
-}
-
-src_install() {
-	if [ ${KV_MINOR} -gt 4 ]
-	then
-		KV_OBJ="ko"
-	else
-		KV_OBJ="o"
-	fi
-
-	dodoc ISSUES README.${PN} CHANGES
-
-	insinto /lib/modules/${KV}/net
-	doins ieee80211_crypt.${KV_OBJ} ieee80211_crypt_wep.${KV_OBJ} \
-		ieee80211_crypt_ccmp.${KV_OBJ} ieee80211_crypt_tkip.${KV_OBJ} \
-		ieee80211.${KV_OBJ} ${PN}.${KV_OBJ}
-
-	insinto /usr/lib/hotplug/firmware
-	doins ${WORKDIR}/${PN}_boot.fw
-	doins ${WORKDIR}/${PN}_bss.fw
-	doins ${WORKDIR}/${PN}_ibss.fw
-	doins ${WORKDIR}/${PN}_ucode.fw
-}
-
-pkg_postinst() {
-	einfo "Checking kernel module dependancies"
-	test -r "${ROOT}/usr/src/linux/System.map" && \
-		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
-}
diff --git a/net-wireless/ipw2200/ipw2200-0.5.ebuild b/net-wireless/ipw2200/ipw2200-0.5.ebuild
deleted file mode 100644
index 7ba537692cbf..000000000000
--- a/net-wireless/ipw2200/ipw2200-0.5.ebuild
+++ /dev/null
@@ -1,96 +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/ipw2200/ipw2200-0.5.ebuild,v 1.1 2004/09/02 15:40:41 jbms Exp $
-
-inherit kernel-mod eutils
-
-FW_VERSION="1.2"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG miniPCI adapter"
-
-HOMEPAGE="http://ipw2200.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
-		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
-
-LICENSE="GPL-2 ipw2200-fw"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-
-# net-wireless/ipw2100 builds a possibly incompatible ieee80211
-# module, so it is blocked.  This problem will likely be resolved
-# upstream eventually.
-DEPEND="!net-wireless/ipw2100"
-RDEPEND="!net-wireless/ipw2100 >=sys-apps/hotplug-20030805-r2"
-
-src_unpack() {
-
-	if ! egrep "^CONFIG_CRYPTO_ARC4=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "This version of ${PN} requires the ARC4 CryptoAPI module from"
-		eerror "the kernel."
-		die "ARC4 Crypto support not detected."
-	fi
-	if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "This version of ${PN} require firmware loader support from"
-		eerror "your kernel. This can be found in Device Drivers --> Generic"
-		eerror "Driver Support on 2.6 or in Library Routines on 2.4 kernels."
-		die "Firmware loading support not detected."
-	fi
-
-	if ! egrep "^CONFIG_CRC32=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "This version of ${PN} requires support for CRC32 in"
-		eerror "your kernel. This can be found in Library Routines in"
-		eerror "kernel configs."
-		die "CRC32 function support not detected."
-	fi
-
-	unpack ${A}
-	kernel-mod_getversion
-
-	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
-	then
-		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
-	fi
-}
-
-src_compile() {
-	unset ARCH
-
-	# Build WPA support
-	emake KSRC=${ROOT}/usr/src/linux all CONFIG_IEEE80211_WPA=y || die
-}
-
-src_install() {
-	if [ ${KV_MINOR} -gt 4 ]
-	then
-		KV_OBJ="ko"
-	else
-		KV_OBJ="o"
-	fi
-
-	dodoc ISSUES README.${PN} CHANGES
-
-	insinto /lib/modules/${KV}/net
-	doins ieee80211_crypt.${KV_OBJ} ieee80211_crypt_wep.${KV_OBJ} \
-		ieee80211_crypt_ccmp.${KV_OBJ} ieee80211_crypt_tkip.${KV_OBJ} \
-		ieee80211.${KV_OBJ} ${PN}.${KV_OBJ}
-
-	insinto /usr/lib/hotplug/firmware
-	doins ${WORKDIR}/${PN}_boot.fw
-	doins ${WORKDIR}/${PN}_bss.fw
-	doins ${WORKDIR}/${PN}_ibss.fw
-	doins ${WORKDIR}/${PN}_ucode.fw
-}
-
-pkg_postinst() {
-	einfo "Checking kernel module dependancies"
-	test -r "${ROOT}/usr/src/linux/System.map" && \
-		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
-}
diff --git a/net-wireless/ipw2200/ipw2200-0.6.ebuild b/net-wireless/ipw2200/ipw2200-0.6.ebuild
deleted file mode 100644
index c29f3d40ab7d..000000000000
--- a/net-wireless/ipw2200/ipw2200-0.6.ebuild
+++ /dev/null
@@ -1,96 +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/ipw2200/ipw2200-0.6.ebuild,v 1.1 2004/09/02 21:05:25 jbms Exp $
-
-inherit kernel-mod eutils
-
-FW_VERSION="2.0"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG miniPCI adapter"
-
-HOMEPAGE="http://ipw2200.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
-		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
-
-LICENSE="GPL-2 ipw2200-fw"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-
-# net-wireless/ipw2100 builds a possibly incompatible ieee80211
-# module, so it is blocked.  This problem will likely be resolved
-# upstream eventually.
-DEPEND="!net-wireless/ipw2100"
-RDEPEND="!net-wireless/ipw2100 >=sys-apps/hotplug-20030805-r2"
-
-src_unpack() {
-
-	if ! egrep "^CONFIG_CRYPTO_ARC4=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "This version of ${PN} requires the ARC4 CryptoAPI module from"
-		eerror "the kernel."
-		die "ARC4 Crypto support not detected."
-	fi
-	if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "This version of ${PN} require firmware loader support from"
-		eerror "your kernel. This can be found in Device Drivers --> Generic"
-		eerror "Driver Support on 2.6 or in Library Routines on 2.4 kernels."
-		die "Firmware loading support not detected."
-	fi
-
-	if ! egrep "^CONFIG_CRC32=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "This version of ${PN} requires support for CRC32 in"
-		eerror "your kernel. This can be found in Library Routines in"
-		eerror "kernel configs."
-		die "CRC32 function support not detected."
-	fi
-
-	unpack ${A}
-	kernel-mod_getversion
-
-	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
-	then
-		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
-	fi
-}
-
-src_compile() {
-	unset ARCH
-
-	# Build WPA support
-	emake KSRC=${ROOT}/usr/src/linux all CONFIG_IEEE80211_WPA=y || die
-}
-
-src_install() {
-	if [ ${KV_MINOR} -gt 4 ]
-	then
-		KV_OBJ="ko"
-	else
-		KV_OBJ="o"
-	fi
-
-	dodoc ISSUES README.${PN} CHANGES
-
-	insinto /lib/modules/${KV}/net
-	doins ieee80211_crypt.${KV_OBJ} ieee80211_crypt_wep.${KV_OBJ} \
-		ieee80211_crypt_ccmp.${KV_OBJ} ieee80211_crypt_tkip.${KV_OBJ} \
-		ieee80211.${KV_OBJ} ${PN}.${KV_OBJ}
-
-	insinto /usr/lib/hotplug/firmware
-	doins ${WORKDIR}/${PN}_boot.fw
-	doins ${WORKDIR}/${PN}_bss.fw
-	doins ${WORKDIR}/${PN}_ibss.fw
-	doins ${WORKDIR}/${PN}_ucode.fw
-}
-
-pkg_postinst() {
-	einfo "Checking kernel module dependancies"
-	test -r "${ROOT}/usr/src/linux/System.map" && \
-		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
-}
diff --git a/net-wireless/ipw2200/ipw2200-0.7.ebuild b/net-wireless/ipw2200/ipw2200-0.7.ebuild
deleted file mode 100644
index d5ca4edbd73c..000000000000
--- a/net-wireless/ipw2200/ipw2200-0.7.ebuild
+++ /dev/null
@@ -1,96 +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/ipw2200/ipw2200-0.7.ebuild,v 1.1 2004/09/04 21:11:03 jbms Exp $
-
-inherit kernel-mod eutils
-
-FW_VERSION="2.0"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG miniPCI adapter"
-
-HOMEPAGE="http://ipw2200.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
-		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
-
-LICENSE="GPL-2 ipw2200-fw"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-
-# net-wireless/ipw2100 builds a possibly incompatible ieee80211
-# module, so it is blocked.  This problem will likely be resolved
-# upstream eventually.
-DEPEND="!net-wireless/ipw2100"
-RDEPEND="!net-wireless/ipw2100 >=sys-apps/hotplug-20030805-r2"
-
-src_unpack() {
-
-	if ! egrep "^CONFIG_CRYPTO_ARC4=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "This version of ${PN} requires the ARC4 CryptoAPI module from"
-		eerror "the kernel."
-		die "ARC4 Crypto support not detected."
-	fi
-	if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "This version of ${PN} require firmware loader support from"
-		eerror "your kernel. This can be found in Device Drivers --> Generic"
-		eerror "Driver Support on 2.6 or in Library Routines on 2.4 kernels."
-		die "Firmware loading support not detected."
-	fi
-
-	if ! egrep "^CONFIG_CRC32=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "This version of ${PN} requires support for CRC32 in"
-		eerror "your kernel. This can be found in Library Routines in"
-		eerror "kernel configs."
-		die "CRC32 function support not detected."
-	fi
-
-	unpack ${A}
-	kernel-mod_getversion
-
-	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
-	then
-		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
-	fi
-}
-
-src_compile() {
-	unset ARCH
-
-	# Build WPA support
-	emake KSRC=${ROOT}/usr/src/linux all CONFIG_IEEE80211_WPA=y || die
-}
-
-src_install() {
-	if [ ${KV_MINOR} -gt 4 ]
-	then
-		KV_OBJ="ko"
-	else
-		KV_OBJ="o"
-	fi
-
-	dodoc ISSUES README.${PN} CHANGES
-
-	insinto /lib/modules/${KV}/net
-	doins ieee80211_crypt.${KV_OBJ} ieee80211_crypt_wep.${KV_OBJ} \
-		ieee80211_crypt_ccmp.${KV_OBJ} ieee80211_crypt_tkip.${KV_OBJ} \
-		ieee80211.${KV_OBJ} ${PN}.${KV_OBJ}
-
-	insinto /usr/lib/hotplug/firmware
-	doins ${WORKDIR}/${PN}_boot.fw
-	doins ${WORKDIR}/${PN}_bss.fw
-	doins ${WORKDIR}/${PN}_ibss.fw
-	doins ${WORKDIR}/${PN}_ucode.fw
-}
-
-pkg_postinst() {
-	einfo "Checking kernel module dependancies"
-	test -r "${ROOT}/usr/src/linux/System.map" && \
-		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
-}
diff --git a/net-wireless/ipw2200/ipw2200-0.8.ebuild b/net-wireless/ipw2200/ipw2200-0.8.ebuild
deleted file mode 100644
index 462c760aa5cd..000000000000
--- a/net-wireless/ipw2200/ipw2200-0.8.ebuild
+++ /dev/null
@@ -1,98 +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/ipw2200/ipw2200-0.8.ebuild,v 1.1 2004/09/19 21:31:59 jbms Exp $
-
-inherit kernel-mod eutils
-
-FW_VERSION="2.0"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG miniPCI adapter"
-
-HOMEPAGE="http://ipw2200.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
-		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
-
-LICENSE="GPL-2 ipw2200-fw"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-
-# net-wireless/ipw2100 builds a possibly incompatible ieee80211
-# module, so it is blocked.  This problem will likely be resolved
-# upstream eventually.
-DEPEND="!net-wireless/ipw2100"
-RDEPEND="!net-wireless/ipw2100 >=sys-apps/hotplug-20030805-r2"
-
-src_unpack() {
-
-	if ! egrep "^CONFIG_CRYPTO_ARC4=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "This version of ${PN} requires the ARC4 CryptoAPI module from"
-		eerror "the kernel."
-		die "ARC4 Crypto support not detected."
-	fi
-	if ! egrep "^CONFIG_FW_LOADER=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "This version of ${PN} require firmware loader support from"
-		eerror "your kernel. This can be found in Device Drivers --> Generic"
-		eerror "Driver Support on 2.6 or in Library Routines on 2.4 kernels."
-		die "Firmware loading support not detected."
-	fi
-
-	if ! egrep "^CONFIG_CRC32=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "This version of ${PN} requires support for CRC32 in"
-		eerror "your kernel. This can be found in Library Routines in"
-		eerror "kernel configs."
-		die "CRC32 function support not detected."
-	fi
-
-	unpack ${A}
-	kernel-mod_getversion
-
-	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
-	then
-		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
-	fi
-}
-
-src_compile() {
-	unset ARCH
-
-	# Build WPA support
-	emake KSRC=${ROOT}/usr/src/linux all CONFIG_IEEE80211_CRYPT_WPA=m \
-		CONFIG_IEEE80211_CRYPT_TKIP=m \
-		CONFIG_IEEE80211_CRYPT_CCMP=m || die
-}
-
-src_install() {
-	if [ ${KV_MINOR} -gt 4 ]
-	then
-		KV_OBJ="ko"
-	else
-		KV_OBJ="o"
-	fi
-
-	dodoc ISSUES README.${PN} CHANGES
-
-	insinto /lib/modules/${KV}/net
-	doins ieee80211_crypt.${KV_OBJ} ieee80211_crypt_wep.${KV_OBJ} \
-		ieee80211_crypt_ccmp.${KV_OBJ} ieee80211_crypt_tkip.${KV_OBJ} \
-		ieee80211.${KV_OBJ} ${PN}.${KV_OBJ}
-
-	insinto /usr/lib/hotplug/firmware
-	doins ${WORKDIR}/${PN}_boot.fw
-	doins ${WORKDIR}/${PN}_bss.fw
-	doins ${WORKDIR}/${PN}_ibss.fw
-	doins ${WORKDIR}/${PN}_ucode.fw
-}
-
-pkg_postinst() {
-	einfo "Checking kernel module dependancies"
-	test -r "${ROOT}/usr/src/linux/System.map" && \
-		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
-}