Pruned old versions.

(Portage version: 2.0.51.19)

19 files changed, 12 insertions, 770 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 85cebca21b30..1089baa722ad 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-wireless/ipw2100
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.69 2005/03/02 20:51:14 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.70 2005/03/12 11:20:21 brix Exp $
+
+  12 Mar 2005; Henrik Brix Andersen <brix@gentoo.org>
+  -files/ipw2100-0.56-2.6.10-susp.2.patch,
+  -files/ipw2100-0.56-ieee80211_scan_age.2.patch,
+  -files/ipw2100-0.56-wpa_eapol_fix.patch,
+  -files/ipw2100-1.0.0-2.6.10-susp.patch,
+  -files/ipw2100-1.0.2-2.6.10-susp.patch,
+  -files/ipw2100-1.0.2-set_security.patch, -ipw2100-0.56-r2.ebuild,
+  -ipw2100-0.56-r3.ebuild, -ipw2100-1.0.0-r1.ebuild, -ipw2100-1.0.2-r2.ebuild,
+  -ipw2100-1.0.3.ebuild, -ipw2100-1.0.4.ebuild:
+  Pruned old versions.
 
   02 Mar 2005; Henrik Brix Andersen <brix@gentoo.org> ipw2100-1.0.5.ebuild:
   Stable on x86.
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.56-r2 b/net-wireless/ipw2100/files/digest-ipw2100-0.56-r2
deleted file mode 100644
index 24cce39e0ed2..000000000000
--- a/net-wireless/ipw2100/files/digest-ipw2100-0.56-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 96473874bb682e2701c4e8e6dd662a64 ipw2100-0.56.tgz 132854
-MD5 46aa75bcda1a00efa841f9707bbbd113 ipw2100-fw-1.3.tgz 248471
-MD5 5367fe7ad991a70f3af0797ba0d83e2d ipw2100-0.56-2.4-v9.patch.gz 8832
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.56-r3 b/net-wireless/ipw2100/files/digest-ipw2100-0.56-r3
deleted file mode 100644
index 4af7455ebda4..000000000000
--- a/net-wireless/ipw2100/files/digest-ipw2100-0.56-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 96473874bb682e2701c4e8e6dd662a64 ipw2100-0.56.tgz 132854
-MD5 5367fe7ad991a70f3af0797ba0d83e2d ipw2100-0.56-2.4-v9.patch.gz 8832
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-1.0.0-r1 b/net-wireless/ipw2100/files/digest-ipw2100-1.0.0-r1
deleted file mode 100644
index ce5cdd399da7..000000000000
--- a/net-wireless/ipw2100/files/digest-ipw2100-1.0.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a76362f9a3d3d751a9e93208e08824fd ipw2100-1.0.0.tgz 136668
-MD5 46aa75bcda1a00efa841f9707bbbd113 ipw2100-fw-1.3.tgz 248471
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-1.0.2-r2 b/net-wireless/ipw2100/files/digest-ipw2100-1.0.2-r2
deleted file mode 100644
index ba8aba187002..000000000000
--- a/net-wireless/ipw2100/files/digest-ipw2100-1.0.2-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5ba45b7586ee61e319681d6c5f77616e ipw2100-1.0.2.tgz 138288
-MD5 26a909851e51f16f948a99e357d08d23 ipw2100-1.0.2-2.4-v3.patch.gz 8934
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-1.0.3 b/net-wireless/ipw2100/files/digest-ipw2100-1.0.3
deleted file mode 100644
index 724e5a9a4c54..000000000000
--- a/net-wireless/ipw2100/files/digest-ipw2100-1.0.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8f6a1d7de247fce52660383208a334b4 ipw2100-1.0.3.tgz 137843
-MD5 289dd3c1df618012cb811b59de446b3d ipw2100-1.0.3-2.4-v1.patch.gz 8933
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-1.0.4 b/net-wireless/ipw2100/files/digest-ipw2100-1.0.4
deleted file mode 100644
index 24b330f5717c..000000000000
--- a/net-wireless/ipw2100/files/digest-ipw2100-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a87173f75eb440b325e90b4f3220df36 ipw2100-1.0.4.tgz 137749
diff --git a/net-wireless/ipw2100/files/ipw2100-0.56-2.6.10-susp.2.patch b/net-wireless/ipw2100/files/ipw2100-0.56-2.6.10-susp.2.patch
deleted file mode 100644
index 543710c3a249..000000000000
--- a/net-wireless/ipw2100/files/ipw2100-0.56-2.6.10-susp.2.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -urp ipw2100-0.56/ipw2100.c ipw2100-0.56/ipw2100.c
---- ipw2100-0.56/ipw2100.c	2004-10-14 03:06:57.000000000 +0800
-+++ ipw2100-0.56/ipw2100.c	2004-10-28 15:57:10.000000000 +0800
-@@ -6475,7 +6475,6 @@ static int ipw2100_pci_init_one(struct p
- 		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
- 
- 	pci_set_power_state(pdev, 0);
--	pci_restore_state(pdev, NULL);
- 
- 	if (!ipw2100_hw_is_adapter_in_system(dev)) {
- 		err = -ENODEV;
-@@ -6666,8 +6665,11 @@ static int ipw2100_suspend(struct pci_de
- 	/* Remove the PRESENT state of the device */
- 	netif_device_detach(dev);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
- 	pci_save_state(pdev, priv->pm_state);
--	pci_disable_device(pdev);       // needed?
-+#else
-+	pci_save_state(pdev);
-+#endif
- 	pci_set_power_state(pdev, state);
- 	
- 	return 0;
-@@ -6686,7 +6686,11 @@ static int ipw2100_resume(struct pci_dev
- 	       dev->name);
- 
- 	pci_set_power_state(pdev, 0);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
- 	pci_restore_state(pdev, priv->pm_state);
-+#else
-+	pci_restore_state(pdev);
-+#endif
- 
- 	/*
- 	 * Suspend/Resume resets the PCI configuration space, so we have to
-diff -urp ipw2100-0.56/ipw2100.h ipw2100-0.56/ipw2100.h
---- ipw2100-0.56/ipw2100.h	2004-10-14 03:06:57.000000000 +0800
-+++ ipw2100-0.56/ipw2100.h	2004-10-27 11:16:36.000000000 +0800
-@@ -608,7 +608,9 @@ struct ipw2100_priv {
- 	spinlock_t low_lock;
- 
- 	wait_queue_head_t wait_command_queue;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
- 	u32 pm_state[PM_STATE_SIZE];
-+#endif
- };
- 
- 
diff --git a/net-wireless/ipw2100/files/ipw2100-0.56-ieee80211_scan_age.2.patch b/net-wireless/ipw2100/files/ipw2100-0.56-ieee80211_scan_age.2.patch
deleted file mode 100644
index 64b1215ed2f0..000000000000
--- a/net-wireless/ipw2100/files/ipw2100-0.56-ieee80211_scan_age.2.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: ieee80211_wx.c
-===================================================================
-RCS file: /usr/src/repository/wireless/ipw2100/ieee80211_wx.c,v
-retrieving revision 1.43
-retrieving revision 1.47
-diff -u -p -r1.43 -r1.47
---- ieee80211_wx.c	7 Oct 2004 20:57:30 -0000	1.43
-+++ ieee80211_wx.c	14 Oct 2004 18:21:12 -0000	1.47
-@@ -258,9 +258,17 @@ int ieee80211_wx_get_scan(struct ieee802
- 	
- 	list_for_each_entry(network, &ieee->network_list, list) {
- 		i++;
--/*		if (ieee->scan_age == 0 ||
--		jiffies - network->last_scanned < ieee->scan_age) */
-- 			ev = ipw2100_translate_scan(ieee, ev, stop, network);
-+		if (ieee->scan_age == 0 ||
-+		    (jiffies - network->last_scanned) < ieee->scan_age) 
-+			ev = ipw2100_translate_scan(ieee, ev, stop, network);
-+		else 
-+			IEEE80211_DEBUG_SCAN(
-+				"Not showing network '%s (" 
-+				MAC_FMT ")' due to age (%lums).\n",
-+				escape_essid(network->ssid, 
-+					     network->ssid_len),
-+				MAC_ARG(network->bssid),
-+				(jiffies - network->last_scanned) / (HZ / 100));
- 	}
- 
- 	spin_unlock_irqrestore(&ieee->lock, flags);
-Index: ieee80211.h
-===================================================================
-RCS file: /usr/src/repository/wireless/ipw2100/ieee80211.h,v
-retrieving revision 1.53
-retrieving revision 1.55
-diff -u -p -r1.53 -r1.55
---- ieee80211.h	13 Oct 2004 15:40:07 -0000	1.53
-+++ ieee80211.h	14 Oct 2004 18:31:32 -0000	1.55
-@@ -594,7 +590,7 @@ enum ieee80211_state {
- 	IEEE80211_SHUTDOWN
- };
- 
--#define DEFAULT_MAX_SCAN_AGE (5 * HZ) 
-+#define DEFAULT_MAX_SCAN_AGE (15 * HZ) 
- #define DEFAULT_FTS 2342
- #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
- #define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
diff --git a/net-wireless/ipw2100/files/ipw2100-0.56-wpa_eapol_fix.patch b/net-wireless/ipw2100/files/ipw2100-0.56-wpa_eapol_fix.patch
deleted file mode 100644
index 82d03b239851..000000000000
--- a/net-wireless/ipw2100/files/ipw2100-0.56-wpa_eapol_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp ipw2100-0.56/ieee80211_tx.c ipw2100-0.56-wpa_eapol_fix/ieee80211_tx.c
---- ipw2100-0.56/ieee80211_tx.c	2004-10-13 21:06:57.000000000 +0200
-+++ ipw2100-0.56-wpa_eapol_fix/ieee80211_tx.c	2004-10-16 21:11:26.759132272 +0200
-@@ -274,7 +274,7 @@ struct ieee80211_txb *ieee80211_skb_to_t
- #ifdef CONFIG_IEEE80211_CRYPT
- 	crypt = ieee->crypt[ieee->tx_keyidx];
- 
--	encrypt = (ether_type != ETH_P_PAE && ieee->host_encrypt && crypt && crypt->ops);
-+	encrypt = !(ether_type == ETH_P_PAE && ieee->ieee_802_1x) && ieee->host_encrypt && crypt && crypt->ops;
- 
- #ifdef CONFIG_IEEE80211_WPA
- 	if (!encrypt && ieee->ieee_802_1x &&
diff --git a/net-wireless/ipw2100/files/ipw2100-1.0.0-2.6.10-susp.patch b/net-wireless/ipw2100/files/ipw2100-1.0.0-2.6.10-susp.patch
deleted file mode 100644
index 2160ca375709..000000000000
--- a/net-wireless/ipw2100/files/ipw2100-1.0.0-2.6.10-susp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp ipw2100-1.0.0/ipw2100.c ipw2100-1.0.0-2.6.10-susp/ipw2100.c
---- ipw2100-1.0.0/ipw2100.c	2004-11-12 21:45:33.000000000 +0100
-+++ ipw2100-1.0.0-2.6.10-susp/ipw2100.c	2005-01-02 16:07:55.488841880 +0100
-@@ -6664,6 +6664,8 @@ static int ipw2100_suspend(struct pci_de
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
- 	pci_save_state(pci_dev, priv->pm_state);
-+#else
-+	pci_save_state(pci_dev);
- #endif
- 	pci_set_power_state(pci_dev, state);
- 
diff --git a/net-wireless/ipw2100/files/ipw2100-1.0.2-2.6.10-susp.patch b/net-wireless/ipw2100/files/ipw2100-1.0.2-2.6.10-susp.patch
deleted file mode 100644
index c143cc4faa1c..000000000000
--- a/net-wireless/ipw2100/files/ipw2100-1.0.2-2.6.10-susp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp ipw2100-1.0.2/ipw2100.c ipw2100-1.0.2-2.6.10-susp/ipw2100.c
---- ipw2100-1.0.2/ipw2100.c	2004-12-14 07:29:32.000000000 +0100
-+++ ipw2100-1.0.2-2.6.10-susp/ipw2100.c	2005-01-02 16:09:26.989931600 +0100
-@@ -6718,6 +6718,8 @@ static int ipw2100_suspend(struct pci_de
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
- 	pci_save_state(pci_dev, priv->pm_state);
-+#else
-+	pci_save_state(pci_dev);
- #endif
- 	pci_set_power_state(pci_dev, state);
- 
diff --git a/net-wireless/ipw2100/files/ipw2100-1.0.2-set_security.patch b/net-wireless/ipw2100/files/ipw2100-1.0.2-set_security.patch
deleted file mode 100644
index bbd5134d0760..000000000000
--- a/net-wireless/ipw2100/files/ipw2100-1.0.2-set_security.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urp ipw2100-1.0.2/ipw2100.c ipw2100-1.0.2-set_security/ipw2100.c
---- ipw2100-1.0.2/ipw2100.c	2004-12-14 07:29:32.000000000 +0100
-+++ ipw2100-1.0.2-set_security/ipw2100.c	2004-12-14 19:13:52.031176680 +0100
-@@ -5788,7 +5788,7 @@ static int ipw2100_wpa_enable(struct ipw
- 	}
- 
- 	if (ieee->set_security)
--		ieee->set_security(ieee, &sec);
-+		ieee->set_security(ieee->dev, &sec);
- 	else
- 		ret = -EOPNOTSUPP;
- 		
-@@ -5815,7 +5815,7 @@ static int ipw2100_wpa_set_auth_algs(str
- 	}
- 
- 	if (ieee->set_security)
--		ieee->set_security(ieee, &sec);
-+		ieee->set_security(ieee->dev, &sec);
- 	else
- 		ret = -EOPNOTSUPP;
- 		
-@@ -6067,7 +6067,7 @@ static int ipw2100_wpa_set_encryption(st
- 	}
-  done:
- 	if (ieee->set_security)
--		ieee->set_security(ieee, &sec);
-+		ieee->set_security(ieee->dev, &sec);
- 
- 	/* Do not reset port if card is in Managed mode since resetting will
- 	 * generate new IEEE 802.11 authentication which may end up in looping
diff --git a/net-wireless/ipw2100/ipw2100-0.56-r2.ebuild b/net-wireless/ipw2100/ipw2100-0.56-r2.ebuild
deleted file mode 100644
index 0f72f9f2d105..000000000000
--- a/net-wireless/ipw2100/ipw2100-0.56-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.56-r2.ebuild,v 1.2 2005/01/04 00:30:20 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-v9.patch.gz"
-
-LICENSE="GPL-2 ipw2100-fw"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE=""
-DEPEND="virtual/linux-sources
-		!net-wireless/ipw2200
-		!net-wireless/ipw2100-firmware
-		sys-apps/sed"
-RDEPEND=">=sys-apps/hotplug-20030805-r2
-		>=net-wireless/wireless-tools-27_pre23"
-
-pkg_setup() {
-	local DIE=0
-
-	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."
-		DIE=1
-	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."
-		DIE=1
-	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."
-		DIE=1
-	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."
-		DIE=1
-	fi
-
-	if ! kernel-mod_configoption_present FW_LOADER
-	then
-		eerror ""
-		eerror "${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)"
-		eerror "in the kernel."
-		DIE=1
-	fi
-
-	if ! kernel-mod_configoption_present CRC32
-	then
-		eerror ""
-		eerror "${P} requires support for CRC32 functions (CONFIG_CRC32) in the"
-		eerror "kernel."
-		DIE=1
-	fi
-
-	kernel-mod_check_modules_supported
-
-	if [ $DIE -eq 1 ]
-	then
-		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-v9.patch
-	fi
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-wpa_eapol_fix.patch
-	epatch ${FILESDIR}/${P}-ieee80211_scan_age.2.patch
-	epatch ${FILESDIR}/${P}-2.6.10-susp.2.patch
-
-	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}
-}
diff --git a/net-wireless/ipw2100/ipw2100-0.56-r3.ebuild b/net-wireless/ipw2100/ipw2100-0.56-r3.ebuild
deleted file mode 100644
index 8f59abc46216..000000000000
--- a/net-wireless/ipw2100/ipw2100-0.56-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.56-r3.ebuild,v 1.3 2005/01/20 22:22:04 brix Exp $
-
-inherit linux-mod eutils
-
-FW_VERSION="1.3"
-PATCH_2_4_VERSION="9"
-
-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/${P}-2.4-v${PATCH_2_4_VERSION}.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE=""
-RDEPEND="=net-wireless/ipw2100-firmware-${FW_VERSION}
-		>=net-wireless/wireless-tools-27_pre23
-		!net-wireless/ipw2200"
-
-BUILD_PARAMS="KSRC=${KV_DIR}"
-BUILD_TARGETS="all"
-
-MODULE_NAMES="ipw2100(net:)
-			ieee80211(net:)
-			ieee80211_crypt(net:)
-			ieee80211_crypt_wep(net:)
-			ieee80211_crypt_ccmp(net:)
-			ieee80211_crypt_tkip(net:)"
-MODULESD_IPW2100_DOCS="README.ipw2100"
-
-CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC FW_LOADER CRC32"
-NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-CRYPTO_ARC4_ERROR="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
-CRYPTO_MICHAEL_MIC_ERROR="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
-FW_LOADER_ERROR="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-CRC32_ERROR="${P} requires support for CRC32 functions (CONFIG_CRC32)."
-
-pkg_setup() {
-	if linux_chkconfig_present CRYPTO_AES_586 && linux_chkconfig_present CRYPTO_AES; then
-		eerror "${P} requires support for AES cipher algorithms (i586) (CONFIG_CRYPTO_AES_586)."
-		eerror "This option is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
-		die "CONFIG_CRYPTO_AES_586 support not detected"
-	fi
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if kernel_is 2 4; then
-		cd ${S}
-		epatch ${WORKDIR}/${P}-2.4-v${PATCH_2_4_VERSION}.patch
-	fi
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-wpa_eapol_fix.patch
-	epatch ${FILESDIR}/${P}-ieee80211_scan_age.2.patch
-	epatch ${FILESDIR}/${P}-2.6.10-susp.2.patch
-
-	einfo "Patching Makefile to enable WPA"
-	sed -i "s:^# CONFIG_IEEE80211_WPA=:CONFIG_IEEE80211_WPA=:" \
-		${S}/Makefile
-
-	convert_to_m ${S}/Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc ISSUES CHANGES
-}
diff --git a/net-wireless/ipw2100/ipw2100-1.0.0-r1.ebuild b/net-wireless/ipw2100/ipw2100-1.0.0-r1.ebuild
deleted file mode 100644
index 21362f82b00d..000000000000
--- a/net-wireless/ipw2100/ipw2100-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.0.0-r1.ebuild,v 1.2 2005/01/04 00:30:20 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"
-
-LICENSE="GPL-2 ipw2100-fw"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-DEPEND="virtual/linux-sources
-		!net-wireless/ipw2200
-		!net-wireless/ipw2100-firmware
-		sys-apps/sed"
-RDEPEND=">=sys-apps/hotplug-20030805-r2
-		>=net-wireless/wireless-tools-27_pre23"
-
-pkg_setup() {
-	local DIE=0
-
-	if kernel-mod_is_2_4_kernel
-	then
-		die "${P} does not support building against kernel 2.4.x"
-	fi
-
-	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."
-		DIE=1
-	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."
-		DIE=1
-	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."
-		DIE=1
-	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."
-		DIE=1
-	fi
-
-	if ! kernel-mod_configoption_present FW_LOADER
-	then
-		eerror ""
-		eerror "${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)"
-		eerror "in the kernel."
-		DIE=1
-	fi
-
-	if ! kernel-mod_configoption_present CRC32
-	then
-		eerror ""
-		eerror "${P} requires support for CRC32 functions (CONFIG_CRC32) in the"
-		eerror "kernel."
-		DIE=1
-	fi
-
-	kernel-mod_check_modules_supported
-
-	if [ $DIE -eq 1 ]
-	then
-		eerror ""
-		die "You kernel is missing the required option(s) listed above."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-2.6.10-susp.patch
-
-	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}
-}
diff --git a/net-wireless/ipw2100/ipw2100-1.0.2-r2.ebuild b/net-wireless/ipw2100/ipw2100-1.0.2-r2.ebuild
deleted file mode 100644
index 4a4d483c7782..000000000000
--- a/net-wireless/ipw2100/ipw2100-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.0.2-r2.ebuild,v 1.4 2005/01/16 00:03:51 brix Exp $
-
-inherit linux-mod eutils
-
-FW_VERSION="1.3"
-PATCH_2_4_VERSION="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/${P}-2.4-v${PATCH_2_4_VERSION}.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-RDEPEND="=net-wireless/ipw2100-firmware-${FW_VERSION}
-		>=net-wireless/wireless-tools-27_pre23
-		!net-wireless/ipw2200"
-
-BUILD_PARAMS="KSRC=${KV_DIR}"
-BUILD_TARGETS="all"
-
-MODULE_NAMES="ipw2100(net:)
-			ieee80211(net:)
-			ieee80211_crypt(net:)
-			ieee80211_crypt_wep(net:)
-			ieee80211_crypt_ccmp(net:)
-			ieee80211_crypt_tkip(net:)"
-MODULESD_IPW2100_DOCS="README.ipw2100"
-
-CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC FW_LOADER CRC32"
-NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-CRYPTO_ARC4_ERROR="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
-CRYPTO_MICHAEL_MIC_ERROR="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
-FW_LOADER_ERROR="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-CRC32_ERROR="${P} requires support for CRC32 functions (CONFIG_CRC32)."
-
-pkg_setup() {
-	if linux_chkconfig_present CRYPTO_AES_586 && linux_chkconfig_present CRYPTO_AES; then
-		eerror "${P} requires support for AES cipher algorithms (i586) (CONFIG_CRYPTO_AES_586)."
-		eerror "This option is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
-		die "CONFIG_CRYPTO_AES_586 support not detected"
-	fi
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if kernel_is 2 4; then
-		cd ${S}
-		epatch ${WORKDIR}/${P}-2.4-v${PATCH_2_4_VERSION}.patch
-	fi
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-2.6.10-susp.patch
-	epatch ${FILESDIR}/${P}-set_security.patch
-
-	einfo "Patching Makefile to enable WPA"
-	sed -i "s:^# CONFIG_IEEE80211_WPA=:CONFIG_IEEE80211_WPA=:" \
-		${S}/Makefile
-
-	convert_to_m ${S}/Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc ISSUES CHANGES
-}
diff --git a/net-wireless/ipw2100/ipw2100-1.0.3.ebuild b/net-wireless/ipw2100/ipw2100-1.0.3.ebuild
deleted file mode 100644
index 4612c28542f4..000000000000
--- a/net-wireless/ipw2100/ipw2100-1.0.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.0.3.ebuild,v 1.3 2005/02/01 10:11:42 brix Exp $
-
-inherit linux-mod eutils
-
-FW_VERSION="1.3"
-PATCH_2_4_VERSION="1"
-
-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/${P}-2.4-v${PATCH_2_4_VERSION}.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-RDEPEND="=net-wireless/ipw2100-firmware-${FW_VERSION}
-		>=net-wireless/wireless-tools-27_pre23
-		!net-wireless/ipw2200"
-
-BUILD_PARAMS="KSRC=${KV_DIR}"
-BUILD_TARGETS="all"
-
-MODULE_NAMES="ipw2100(net:)
-			ieee80211(net:)
-			ieee80211_crypt(net:)
-			ieee80211_crypt_wep(net:)
-			ieee80211_crypt_ccmp(net:)
-			ieee80211_crypt_tkip(net:)"
-MODULESD_IPW2100_DOCS="README.ipw2100"
-
-CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC FW_LOADER CRC32"
-NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-CRYPTO_ARC4_ERROR="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
-CRYPTO_MICHAEL_MIC_ERROR="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
-FW_LOADER_ERROR="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-CRC32_ERROR="${P} requires support for CRC32 functions (CONFIG_CRC32)."
-
-pkg_setup() {
-	if linux_chkconfig_present CRYPTO_AES_586 && linux_chkconfig_present CRYPTO_AES; then
-		eerror "${P} requires support for AES cipher algorithms (i586) (CONFIG_CRYPTO_AES_586)."
-		eerror "This option is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
-		die "CONFIG_CRYPTO_AES_586 support not detected"
-	fi
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if kernel_is 2 4; then
-		cd ${S}
-		epatch ${WORKDIR}/${P}-2.4-v${PATCH_2_4_VERSION}.patch
-	fi
-
-	einfo "Patching Makefile to enable WPA"
-	sed -i "s:^# CONFIG_IEEE80211_WPA=:CONFIG_IEEE80211_WPA=:" \
-		${S}/Makefile
-
-	convert_to_m ${S}/Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES
-}
diff --git a/net-wireless/ipw2100/ipw2100-1.0.4.ebuild b/net-wireless/ipw2100/ipw2100-1.0.4.ebuild
deleted file mode 100644
index 3ab259cbba6f..000000000000
--- a/net-wireless/ipw2100/ipw2100-1.0.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.0.4.ebuild,v 1.1 2005/02/01 18:51:10 brix Exp $
-
-inherit linux-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-RDEPEND="=net-wireless/ipw2100-firmware-${FW_VERSION}
-		>=net-wireless/wireless-tools-27_pre23
-		!net-wireless/ipw2200"
-
-BUILD_PARAMS="KSRC=${KV_DIR}"
-BUILD_TARGETS="all"
-
-MODULE_NAMES="ipw2100(net:)
-			ieee80211(net:)
-			ieee80211_crypt(net:)
-			ieee80211_crypt_wep(net:)
-			ieee80211_crypt_ccmp(net:)
-			ieee80211_crypt_tkip(net:)"
-MODULESD_IPW2100_DOCS="README.ipw2100"
-
-CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC FW_LOADER CRC32"
-NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-CRYPTO_ARC4_ERROR="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
-CRYPTO_MICHAEL_MIC_ERROR="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
-FW_LOADER_ERROR="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-CRC32_ERROR="${P} requires support for CRC32 functions (CONFIG_CRC32)."
-
-pkg_setup() {
-	if kernel_is 2 4; then
-		die "${P} does not support building against kernel 2.4.x"
-	fi
-
-	if linux_chkconfig_present CRYPTO_AES_586 && linux_chkconfig_present CRYPTO_AES; then
-		eerror "${P} requires support for AES cipher algorithms (i586) (CONFIG_CRYPTO_AES_586)."
-		eerror "This option is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
-		die "CONFIG_CRYPTO_AES_586 support not detected"
-	fi
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	einfo "Patching Makefile to enable WPA"
-	sed -i "s:^# CONFIG_IEEE80211_WPA=:CONFIG_IEEE80211_WPA=:" \
-		${S}/Makefile
-
-	convert_to_m ${S}/Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES
-}