Pruned old versions.

Package-Manager: portage-2.0.51-r15

33 files changed, 19 insertions, 1208 deletions

diff --git a/net-wireless/hostap-utils/Manifest b/net-wireless/hostap-utils/Manifest
index 424c2ee501f4..3cea1d89c741 100644
--- a/net-wireless/hostap-utils/Manifest
+++ b/net-wireless/hostap-utils/Manifest
@@ -1,10 +1,8 @@
 MD5 f266bab830757c79968697a1c0eb9a17 hostap-utils-0.2.4.ebuild 726
 MD5 e2ca0b0fbef37c3454708dc3d03ac0d6 hostap-utils-0.3.2.ebuild 694
 MD5 2c53d4316c073382d1f23a6955f95990 hostap-utils-0.2.6.ebuild 693
-MD5 ff5361662a572a81abc15f0e7a7c8cdc ChangeLog 2816
+MD5 1d95df13db8bb66b83f59af038ddba5f ChangeLog 2923
 MD5 0d08d740672bf3b41532938b6f9c0a19 metadata.xml 337
-MD5 78890b7a4a9e70629334cae1f129ee09 hostap-utils-0.3.0.ebuild 694
 MD5 b31ab184e34a7e5d3443d51d91c5008f files/digest-hostap-utils-0.2.4 69
 MD5 8fe4afb5fcbb29a994a4fa244b962665 files/digest-hostap-utils-0.2.6 69
-MD5 bd6d6d04e2ba70a469fa52ec8afaae4b files/digest-hostap-utils-0.3.0 69
 MD5 66bac96f1cd07eff01bee01597a115d3 files/digest-hostap-utils-0.3.2 69
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index a83d239d39c3..f046e6555ebe 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.14 2005/01/25 14:13:12 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.15 2005/01/25 18:43:14 brix Exp $
+
+  25 Jan 2005; Henrik Brix Andersen <brix@gentoo.org>
+  -files/wpa_supplicant-0.2.5-conf.d, -files/wpa_supplicant-0.2.5-config,
+  -files/wpa_supplicant-0.2.5-init.d,
+  -files/wpa_supplicant-0.2.5-pkg-config.patch,
+  -files/wpa_supplicant-0.3.0-conf.d, -files/wpa_supplicant-0.3.0-init.d,
+  -files/wpa_supplicant-0.3.1-conf.d, -files/wpa_supplicant-0.3.1-init.d,
+  -files/wpa_supplicant-0.3.2-conf.d, -files/wpa_supplicant-0.3.2-init.d,
+  -files/wpa_supplicant-0.3.3-conf.d, -files/wpa_supplicant-0.3.3-init.d,
+  -files/wpa_supplicant-0.3.4-conf.d, -files/wpa_supplicant-0.3.4-init.d,
+  -files/wpa_supplicant-0.3.5-conf.d, -files/wpa_supplicant-0.3.5-init.d,
+  -wpa_supplicant-0.2.5-r1.ebuild, -wpa_supplicant-0.3.0.ebuild,
+  -wpa_supplicant-0.3.1.ebuild, -wpa_supplicant-0.3.2.ebuild,
+  -wpa_supplicant-0.3.3.ebuild, -wpa_supplicant-0.3.4.ebuild,
+  -wpa_supplicant-0.3.5.ebuild:
+  Pruned old versions.
 
 *wpa_supplicant-0.3.6 (25 Jan 2005)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index ab6a5be0835e..9cf508a8f5a3 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,40 +1,10 @@
 MD5 d970c44db030e64224e111746c7800a6 wpa_supplicant-0.2.6.ebuild 2722
-MD5 481aefb5c38f5ced44ea0506d35380ee wpa_supplicant-0.3.4.ebuild 3031
-MD5 577620ac0a76e46bea0eb793f2e83ad8 wpa_supplicant-0.2.5-r1.ebuild 1854
 MD5 992cc004a0f07e7952f6cb96d0382b16 wpa_supplicant-0.3.6.ebuild 3031
-MD5 9011acca2ca6283f800a8553e3d0bbdd wpa_supplicant-0.3.1.ebuild 2843
-MD5 443b36aa0cd3f745cadf73c6378a7914 wpa_supplicant-0.3.3.ebuild 3016
-MD5 c75f54105b1c0353f03e91e6a7907076 wpa_supplicant-0.3.5.ebuild 3031
-MD5 8e5bce452597424813b48e7e9132d584 wpa_supplicant-0.3.0.ebuild 2872
-MD5 a1eb8262ca464cb04df98d15d091bd0d ChangeLog 4240
+MD5 d95528657277ed34b43d1bad03ef932c ChangeLog 5143
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-MD5 e60ab8ed1c92edd42a672f488e97369b wpa_supplicant-0.3.2.ebuild 2842
-MD5 7df20229c8a507ca15d8354c1183c0f4 files/wpa_supplicant-0.3.4-init.d 975
-MD5 2bc46403d4bf3ae6e68ae82693a23914 files/wpa_supplicant-0.2.5-pkg-config.patch 1669
 MD5 ea2a22d419d7894cb53366410ec812cc files/wpa_supplicant-0.3.6-conf.d 398
-MD5 6f5827a2c4a23e44c33018d90ac25829 files/wpa_supplicant-0.3.1-conf.d 398
 MD5 458f271b7f50509448ee82cac0605428 files/wpa_supplicant-0.3.6-init.d 975
-MD5 11ecf21202cd23fc4faa511fec21a85e files/wpa_supplicant-0.3.1-init.d 975
-MD5 8ce172f90e194edc1d06ac18b81a7301 files/wpa_supplicant-0.2.5-conf.d 398
-MD5 b2bb8e6d5a1663945c4ce0d9b4c70ba1 files/wpa_supplicant-0.2.5-config 606
-MD5 f426212b6404b81c4cbdbf5c119489da files/wpa_supplicant-0.3.3-conf.d 398
-MD5 4bec60e49c33275fa8e21d27c3909cc5 files/wpa_supplicant-0.2.5-init.d 974
 MD5 ea1906e324ec931c5a70f344d516dca7 files/digest-wpa_supplicant-0.2.6 156
-MD5 1b08e42f180b3bee6247776212a5fb4f files/digest-wpa_supplicant-0.3.0 156
-MD5 d6b9d13af0f01e8b7fa70b880b8ecdfe files/digest-wpa_supplicant-0.3.1 156
-MD5 3b2cce8cf6663297d567b4f0a7402776 files/digest-wpa_supplicant-0.3.2 156
-MD5 a64b1197d398c9f9c7f2fb9b18f4bfb3 files/digest-wpa_supplicant-0.3.3 156
-MD5 a58834cdce1fe9d8ee712bf79c5d5ee6 files/digest-wpa_supplicant-0.3.4 157
-MD5 031f2fc9a11074a3ee44056f5f5bd4d5 files/digest-wpa_supplicant-0.3.5 157
 MD5 c6c90373d03489557cb9077c964d64ac files/digest-wpa_supplicant-0.3.6 157
-MD5 30b483b9200b67ee26b21e3287e0842d files/wpa_supplicant-0.3.3-init.d 975
-MD5 a9249a7ed61a912ddd1b561317e76f43 files/digest-wpa_supplicant-0.2.5-r1 235
-MD5 8d07cde05cf71a5269348f8782a6cc12 files/wpa_supplicant-0.3.5-conf.d 398
-MD5 6dbdde5c93f286b00afacc10673e4de7 files/wpa_supplicant-0.3.0-conf.d 398
-MD5 74ed0e750594a51ded5b634cf9f85f4a files/wpa_supplicant-0.3.5-init.d 975
-MD5 4290cd41db8ead604b3096f53d6795e4 files/wpa_supplicant-0.3.0-init.d 975
-MD5 586a30fb3487cfd6155df0de2871dedf files/wpa_supplicant-0.3.2-conf.d 398
-MD5 f6319e9891f7bf22f32419bf16535324 files/wpa_supplicant-0.3.2-init.d 975
 MD5 85f5f0949d17e5513602360ba202149c files/wpa_supplicant-0.2.6-conf.d 398
-MD5 ddb566269da7f672c066f63149109e6c files/wpa_supplicant-0.3.4-conf.d 398
 MD5 a75b4655a25978797324051b552a363b files/wpa_supplicant-0.2.6-init.d 975
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.5-r1 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.5-r1
deleted file mode 100644
index e427fe8be624..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6a3bdec50022ce6b56cb874ed55690bf wpa_supplicant-0.2.5.tar.gz 193387
-MD5 6c5f62812f30b962e054782b9cec7b9c madwifi-driver-0.1_pre20040906.tar.bz2 1797060
-MD5 00912391abc208c4c76a0dd0b946a4cd wpa_supplicant-0.2.5-ipw2100.diff.gz 3650
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.0 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.0
deleted file mode 100644
index b619fe51f4a9..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 579e663120882835b5b2484ccfa60548 wpa_supplicant-0.3.0.tar.gz 253706
-MD5 3dc7bcc46ade7ab9ff7ea25fb7377366 madwifi-driver-0.1_pre20041019.tar.bz2 1570237
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.1 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.1
deleted file mode 100644
index b48c7f15689a..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 52bf01f4a930a41b2d08288b31b39512 wpa_supplicant-0.3.1.tar.gz 264159
-MD5 3dc7bcc46ade7ab9ff7ea25fb7377366 madwifi-driver-0.1_pre20041019.tar.bz2 1570237
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.2 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.2
deleted file mode 100644
index 6f41cf4bc5ab..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 72abf53816413929a27cd9889d4a4258 wpa_supplicant-0.3.2.tar.gz 274944
-MD5 3dc7bcc46ade7ab9ff7ea25fb7377366 madwifi-driver-0.1_pre20041019.tar.bz2 1570237
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.3 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.3
deleted file mode 100644
index e40409030727..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ca712a6ef47c46d5fce0e886db87bf7a wpa_supplicant-0.3.3.tar.gz 289131
-MD5 3dc7bcc46ade7ab9ff7ea25fb7377366 madwifi-driver-0.1_pre20041019.tar.bz2 1570237
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.4 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.4
deleted file mode 100644
index 9b7941d04b78..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 17ed1bdbe2124173ff09275a3fa13209 wpa_supplicant-0.3.4.tar.gz 295329
-MD5 8237d57be31464ddd7a710704e6755f0 madwifi-cvs-snapshot-2005-01-07.tar.bz2 1586914
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.5 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.5
deleted file mode 100644
index e86a58a13963..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d24b2eb60e4969b28ca86a84f635f9ec wpa_supplicant-0.3.5.tar.gz 296890
-MD5 8237d57be31464ddd7a710704e6755f0 madwifi-cvs-snapshot-2005-01-07.tar.bz2 1586914
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-conf.d
deleted file mode 100644
index d0b6affe5e56..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-conf.d
+++ /dev/null
@@ -1,12 +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/wpa_supplicant/files/wpa_supplicant-0.2.5-conf.d,v 1.1 2004/12/10 15:45:32 brix Exp $
-
-# List of interfaces
-INTERFACES="eth1"
-
-# Common arguments to all wpa_supplicant instances
-ARGS="-w"
-
-# Interface specific arguments
-#ARGS_eth1="-Dipw2100"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-config b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-config
deleted file mode 100644
index c43e6e0a6034..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-config
+++ /dev/null
@@ -1,27 +0,0 @@
-# Needed for the wireless drivers
-CONFIG_WIRELESS_EXTENSION=y
-
-# Drivers which compile out-of-the-box
-CONFIG_DRIVER_ATMEL=y
-CONFIG_DRIVER_HOSTAP=y
-CONFIG_DRIVER_NDISWRAPPER=y
-CONFIG_DRIVER_PRISM54=y
-CONFIG_DRIVER_WEXT=y
-
-# Drivers which doesn't compile out-of-the-box
-#CONFIG_DRIVER_HERMES=y
-
-# Drivers which compiles using patches/external sources
-CONFIG_DRIVER_IPW2100=y
-CONFIG_DRIVER_MADWIFI=y
-
-# Authentication methods
-CONFIG_IEEE8021X_EAPOL=y
-CONFIG_EAP_GTC=y
-CONFIG_EAP_LEAP=y
-CONFIG_EAP_MD5=y
-CONFIG_EAP_OTP=y
-CONFIG_EAP_SIM=y
-CONFIG_MSCHAPV2=y
-
-# ssl and pcap USE flags controls remaining options!
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-init.d
deleted file mode 100644
index aab9a815a41a..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-init.d
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-init.d,v 1.1 2004/12/10 15:45:32 brix Exp $
-
-depend() {
-	before net
-}
-
-start() {
-	ebegin "Starting wpa_supplicant"
-
-	if [ ! -f /etc/wpa_supplicant.conf ]; then
-		eerror "Configuration file /etc/wpa_supplicant.conf not found"
-		return 1
-	fi
-
-	if [ -z "$INTERFACES" ]; then
-		eerror "No interfaces specified in /etc/conf.d/wpa_supplicant"
-		return 1
-	fi
-
-	for IFACE in $INTERFACES; do
-		ebegin " ${IFACE}"
-
-		eval ARGS_IFACE=\"\$\{ARGS_$IFACE\}\"
-
-		/sbin/ifconfig ${IFACE} up
-
-		start-stop-daemon --start --quiet --exec /usr/sbin/wpa_supplicant \
-			 -- -B -i${IFACE} -c/etc/wpa_supplicant.conf ${ARGS} ${ARGS_IFACE}
-		eend $?
-	done
-}
-
-stop() {
-	ebegin "Stopping wpa_supplicant"
-
-	start-stop-daemon --stop --quiet --exec /usr/sbin/wpa_supplicant
-	eend ${?}
-}
-
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-pkg-config.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-pkg-config.patch
deleted file mode 100644
index 607e25054a9a..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-pkg-config.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -urp wpa_supplicant-0.2.5/Makefile wpa_supplicant-0.2.5-pkg-config/Makefile
---- wpa_supplicant-0.2.5/Makefile	2004-10-04 01:36:26.000000000 +0200
-+++ wpa_supplicant-0.2.5-pkg-config/Makefile	2004-11-29 16:13:24.052231960 +0100
-@@ -9,15 +9,10 @@ endif
- # Include directories for CVS version
- CFLAGS += -I../driver/modules -I../utils -I../hostapd
- 
--# Uncomment following two lines and fix the paths if you have installed openssl
--# in non-default location
--#CFLAGS += -I/usr/local/openssl/include
--#LIBS += -L/usr/local/openssl/lib
--
- # Uncomment following two lines to use portable libdnet and libpcap instead of
- # Linux-specific internal implementation for L2 packet handling
--#CFLAGS += -DUSE_DNET_PCAP
--#LIBS=-ldnet -lpcap
-+#CFLAGS += -DUSE_DNET_PCAP $(shell dnet-config --cflags)
-+#LIBS = $(shell dnet-config --libs) -lpcap
- 
- all: verify_config wpa_supplicant wpa_passphrase wpa_cli
- 
-@@ -173,23 +168,22 @@ endif
- 
- ifdef CONFIG_PCSC
- # PC/SC interface for smartcards (USIM, GSM SIM)
--CFLAGS += -DPCSC_FUNCS
-+CFLAGS += -DPCSC_FUNCS $(shell pkg-config --cflags libpcsclite)
- OBJS += pcsc_funcs.o
--# -lpthread may not be needed depending on how pcsc-lite was configured
--LIBS += -lpcsclite -lpthread
-+LIBS += $(shell pkg-config --libs libpcsclite)
- endif
- 
- ifdef TLS_FUNCS
- # Shared TLS functions (needed for EAP_TLS, EAP_PEAP, and EAP_TTLS)
- CFLAGS += -DEAP_TLS_FUNCS
- OBJS += eap_tls_common.o
--LIBS += -lssl
--LIBS_p += -lcrypto
-+LIBS += $(shell pkg-config --libs openssl)
-+LIBS_p += $(shell pkg-config --libs openssl)
- endif
- 
- ifdef MS_FUNCS
- ifndef TLS_FUNCS
--LIBS += -lcrypto
-+LIBS += $(shell pkg-config --libs openssl)
- endif
- OBJS += ms_funcs.o
- endif
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.0-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.0-conf.d
deleted file mode 100644
index 1c1291a1c460..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.0-conf.d
+++ /dev/null
@@ -1,12 +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/wpa_supplicant/files/wpa_supplicant-0.3.0-conf.d,v 1.1 2004/12/11 14:39:12 brix Exp $
-
-# List of interfaces
-INTERFACES="eth1"
-
-# Common arguments to all wpa_supplicant instances
-ARGS="-w"
-
-# Interface specific arguments
-#ARGS_eth1="-Dipw2100"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.0-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.0-init.d
deleted file mode 100644
index b539ad6e7a2f..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.0-init.d
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.0-init.d,v 1.1 2004/12/11 14:39:12 brix Exp $
-
-depend() {
-	before net
-}
-
-start() {
-	ebegin "Starting wpa_supplicant"
-
-	if [ ! -f /etc/wpa_supplicant.conf ]; then
-		eerror "Configuration file /etc/wpa_supplicant.conf not found"
-		return 1
-	fi
-
-	if [ -z "$INTERFACES" ]; then
-		eerror "No interfaces specified in /etc/conf.d/wpa_supplicant"
-		return 1
-	fi
-
-	for IFACE in $INTERFACES; do
-		ebegin "  ${IFACE}"
-
-		eval ARGS_IFACE=\"\$\{ARGS_$IFACE\}\"
-
-		/sbin/ifconfig ${IFACE} up
-
-		start-stop-daemon --start --quiet --exec /usr/sbin/wpa_supplicant \
-			 -- -B -i${IFACE} -c/etc/wpa_supplicant.conf ${ARGS} ${ARGS_IFACE}
-		eend $?
-	done
-}
-
-stop() {
-	ebegin "Stopping wpa_supplicant"
-
-	start-stop-daemon --stop --quiet --exec /usr/sbin/wpa_supplicant
-	eend ${?}
-}
-
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.1-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.1-conf.d
deleted file mode 100644
index da61e3b107c1..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.1-conf.d
+++ /dev/null
@@ -1,12 +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/wpa_supplicant/files/wpa_supplicant-0.3.1-conf.d,v 1.1 2004/12/13 09:24:34 brix Exp $
-
-# List of interfaces
-INTERFACES="eth1"
-
-# Common arguments to all wpa_supplicant instances
-ARGS="-w"
-
-# Interface specific arguments
-#ARGS_eth1="-Dipw2100"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.1-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.1-init.d
deleted file mode 100644
index abc8398e4e7e..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.1-init.d
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.1-init.d,v 1.1 2004/12/13 09:24:34 brix Exp $
-
-depend() {
-	before net
-}
-
-start() {
-	ebegin "Starting wpa_supplicant"
-
-	if [ ! -f /etc/wpa_supplicant.conf ]; then
-		eerror "Configuration file /etc/wpa_supplicant.conf not found"
-		return 1
-	fi
-
-	if [ -z "$INTERFACES" ]; then
-		eerror "No interfaces specified in /etc/conf.d/wpa_supplicant"
-		return 1
-	fi
-
-	for IFACE in $INTERFACES; do
-		ebegin "  ${IFACE}"
-
-		eval ARGS_IFACE=\"\$\{ARGS_$IFACE\}\"
-
-		/sbin/ifconfig ${IFACE} up
-
-		start-stop-daemon --start --quiet --exec /usr/sbin/wpa_supplicant \
-			 -- -B -i${IFACE} -c/etc/wpa_supplicant.conf ${ARGS} ${ARGS_IFACE}
-		eend $?
-	done
-}
-
-stop() {
-	ebegin "Stopping wpa_supplicant"
-
-	start-stop-daemon --stop --quiet --exec /usr/sbin/wpa_supplicant
-	eend ${?}
-}
-
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.2-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.2-conf.d
deleted file mode 100644
index 9fb802c7fe28..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.2-conf.d
+++ /dev/null
@@ -1,12 +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/wpa_supplicant/files/wpa_supplicant-0.3.2-conf.d,v 1.1 2004/12/20 09:11:24 brix Exp $
-
-# List of interfaces
-INTERFACES="eth1"
-
-# Common arguments to all wpa_supplicant instances
-ARGS="-w"
-
-# Interface specific arguments
-#ARGS_eth1="-Dipw2100"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.2-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.2-init.d
deleted file mode 100644
index 1d5b235cb47b..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.2-init.d
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.2-init.d,v 1.1 2004/12/20 09:11:24 brix Exp $
-
-depend() {
-	before net
-}
-
-start() {
-	ebegin "Starting wpa_supplicant"
-
-	if [ ! -f /etc/wpa_supplicant.conf ]; then
-		eerror "Configuration file /etc/wpa_supplicant.conf not found"
-		return 1
-	fi
-
-	if [ -z "$INTERFACES" ]; then
-		eerror "No interfaces specified in /etc/conf.d/wpa_supplicant"
-		return 1
-	fi
-
-	for IFACE in $INTERFACES; do
-		ebegin "  ${IFACE}"
-
-		eval ARGS_IFACE=\"\$\{ARGS_$IFACE\}\"
-
-		/sbin/ifconfig ${IFACE} up
-
-		start-stop-daemon --start --quiet --exec /usr/sbin/wpa_supplicant \
-			 -- -B -i${IFACE} -c/etc/wpa_supplicant.conf ${ARGS} ${ARGS_IFACE}
-		eend $?
-	done
-}
-
-stop() {
-	ebegin "Stopping wpa_supplicant"
-
-	start-stop-daemon --stop --quiet --exec /usr/sbin/wpa_supplicant
-	eend ${?}
-}
-
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-conf.d
deleted file mode 100644
index 46e8fe44b0ad..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-conf.d
+++ /dev/null
@@ -1,12 +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/wpa_supplicant/files/wpa_supplicant-0.3.3-conf.d,v 1.1 2005/01/03 11:09:01 brix Exp $
-
-# List of interfaces
-INTERFACES="eth1"
-
-# Common arguments to all wpa_supplicant instances
-ARGS="-w"
-
-# Interface specific arguments
-#ARGS_eth1="-Dipw2100"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-init.d
deleted file mode 100644
index a8d833fb2e85..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-init.d
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-init.d,v 1.1 2005/01/03 11:09:01 brix Exp $
-
-depend() {
-	before net
-}
-
-start() {
-	ebegin "Starting wpa_supplicant"
-
-	if [ ! -f /etc/wpa_supplicant.conf ]; then
-		eerror "Configuration file /etc/wpa_supplicant.conf not found"
-		return 1
-	fi
-
-	if [ -z "$INTERFACES" ]; then
-		eerror "No interfaces specified in /etc/conf.d/wpa_supplicant"
-		return 1
-	fi
-
-	for IFACE in $INTERFACES; do
-		ebegin "  ${IFACE}"
-
-		eval ARGS_IFACE=\"\$\{ARGS_$IFACE\}\"
-
-		/sbin/ifconfig ${IFACE} up
-
-		start-stop-daemon --start --quiet --exec /usr/sbin/wpa_supplicant \
-			 -- -B -i${IFACE} -c/etc/wpa_supplicant.conf ${ARGS} ${ARGS_IFACE}
-		eend $?
-	done
-}
-
-stop() {
-	ebegin "Stopping wpa_supplicant"
-
-	start-stop-daemon --stop --quiet --exec /usr/sbin/wpa_supplicant
-	eend ${?}
-}
-
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.4-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.4-conf.d
deleted file mode 100644
index 55121e944ea0..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.4-conf.d
+++ /dev/null
@@ -1,12 +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/wpa_supplicant/files/wpa_supplicant-0.3.4-conf.d,v 1.1 2005/01/10 07:42:11 brix Exp $
-
-# List of interfaces
-INTERFACES="eth1"
-
-# Common arguments to all wpa_supplicant instances
-ARGS="-w"
-
-# Interface specific arguments
-#ARGS_eth1="-Dipw2100"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.4-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.4-init.d
deleted file mode 100644
index 37c464e80141..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.4-init.d
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.4-init.d,v 1.1 2005/01/10 07:42:11 brix Exp $
-
-depend() {
-	before net
-}
-
-start() {
-	ebegin "Starting wpa_supplicant"
-
-	if [ ! -f /etc/wpa_supplicant.conf ]; then
-		eerror "Configuration file /etc/wpa_supplicant.conf not found"
-		return 1
-	fi
-
-	if [ -z "$INTERFACES" ]; then
-		eerror "No interfaces specified in /etc/conf.d/wpa_supplicant"
-		return 1
-	fi
-
-	for IFACE in $INTERFACES; do
-		ebegin "  ${IFACE}"
-
-		eval ARGS_IFACE=\"\$\{ARGS_$IFACE\}\"
-
-		/sbin/ifconfig ${IFACE} up
-
-		start-stop-daemon --start --quiet --exec /usr/sbin/wpa_supplicant \
-			 -- -B -i${IFACE} -c/etc/wpa_supplicant.conf ${ARGS} ${ARGS_IFACE}
-		eend $?
-	done
-}
-
-stop() {
-	ebegin "Stopping wpa_supplicant"
-
-	start-stop-daemon --stop --quiet --exec /usr/sbin/wpa_supplicant
-	eend ${?}
-}
-
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.5-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.5-conf.d
deleted file mode 100644
index eb4c3bdfbac6..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.5-conf.d
+++ /dev/null
@@ -1,12 +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/wpa_supplicant/files/wpa_supplicant-0.3.5-conf.d,v 1.1 2005/01/24 19:17:52 brix Exp $
-
-# List of interfaces
-INTERFACES="eth1"
-
-# Common arguments to all wpa_supplicant instances
-ARGS="-w"
-
-# Interface specific arguments
-#ARGS_eth1="-Dipw2100"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.5-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.5-init.d
deleted file mode 100644
index d4b2d7aa3727..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.5-init.d
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.5-init.d,v 1.1 2005/01/24 19:17:52 brix Exp $
-
-depend() {
-	before net
-}
-
-start() {
-	ebegin "Starting wpa_supplicant"
-
-	if [ ! -f /etc/wpa_supplicant.conf ]; then
-		eerror "Configuration file /etc/wpa_supplicant.conf not found"
-		return 1
-	fi
-
-	if [ -z "$INTERFACES" ]; then
-		eerror "No interfaces specified in /etc/conf.d/wpa_supplicant"
-		return 1
-	fi
-
-	for IFACE in $INTERFACES; do
-		ebegin "  ${IFACE}"
-
-		eval ARGS_IFACE=\"\$\{ARGS_$IFACE\}\"
-
-		/sbin/ifconfig ${IFACE} up
-
-		start-stop-daemon --start --quiet --exec /usr/sbin/wpa_supplicant \
-			 -- -B -i${IFACE} -c/etc/wpa_supplicant.conf ${ARGS} ${ARGS_IFACE}
-		eend $?
-	done
-}
-
-stop() {
-	ebegin "Stopping wpa_supplicant"
-
-	start-stop-daemon --stop --quiet --exec /usr/sbin/wpa_supplicant
-	eend ${?}
-}
-
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild
deleted file mode 100644
index 5ee806ce6d46..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.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/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild,v 1.2 2005/01/03 11:09:01 brix Exp $
-
-inherit toolchain-funcs eutils
-
-MADWIFI_VERSION="0.1_pre20040906"
-
-DESCRIPTION="WPA Supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
-		mirror://gentoo/madwifi-driver-${MADWIFI_VERSION}.tar.bz2
-		mirror://gentoo/${P}-ipw2100.diff.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="gsm pcap ssl"
-
-DEPEND="sys-apps/sed
-		dev-util/pkgconfig"
-RDEPEND="gsm? ( sys-apps/pcsc-lite )
-		pcap? ( net-libs/libpcap
-				dev-libs/libdnet )
-		ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${WORKDIR}/${P}-ipw2100.diff
-	epatch ${FILESDIR}/${P}-pkg-config.patch
-
-	sed -i "s:madwifi/wpa::" ${S}/Makefile
-
-	sed -i "s:gcc:$(tc-getCC):g" ${S}/Makefile
-
-	# Use pcap and libdnet if we have it.
-	if use pcap; then
-		sed -i "s:^#\(CFLAGS\):\1:" ${S}/Makefile
-		sed -i "s:^#\(LIBS\):\1:" ${S}/Makefile
-	fi
-
-	cp ${FILESDIR}/${P}-config ${S}/.config || die
-
-	if use ssl; then
-		echo "CONFIG_EAP_TLS=y" >> ${S}/.config
-		echo "CONFIG_EAP_PEAP=y" >> ${S}/.config
-		echo "CONFIG_EAP_TTLS=y" >> ${S}/.config
-	fi
-
-	if use gsm; then
-		echo "CONFIG_PCSC=y" >> ${S}/.config
-	fi
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	dodoc ChangeLog COPYING developer.txt eap_testing.txt README todo.txt
-	dodoc doc/wpa_supplicant.fig
-
-	insinto /etc
-	newins wpa_supplicant.conf wpa_supplicant.conf.example
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${P}-init.d wpa_supplicant
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/${P}-conf.d wpa_supplicant
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild
deleted file mode 100644
index 787183e2d3cd..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild
+++ /dev/null
@@ -1,101 +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/wpa_supplicant/wpa_supplicant-0.3.0.ebuild,v 1.2 2005/01/03 11:09:01 brix Exp $
-
-inherit toolchain-funcs
-
-MADWIFI_VERSION="0.1_pre20041019"
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
-		mirror://gentoo/madwifi-driver-${MADWIFI_VERSION}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-#IUSE="gsm ssl"
-IUSE="ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-#		gsm? ( sys-apps/pcsc-lite )
-
-src_unpack() {
-	local CONFIG=${S}/.config
-
-	unpack ${A}
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# basic authentication methods
-	echo "CONFIG_EAP_GTC=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_OTP=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y"         >> ${CONFIG}
-	echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CONFIG}
-
-	if use ssl; then
-		# SSL authentication methods
-		echo "CONFIG_EAP_LEAP=y"     >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y"     >> ${CONFIG}
-		echo "CONFIG_EAP_TLS=y"      >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y"     >> ${CONFIG}
-	fi
-
-#	Note: PCSC support is disabled in 0.3.0 due to a bug in the code.
-#	This has been fixed in upstream CVS (brix)
-#
-#	if use gsm; then
-#		# Smart card authentication
-#		echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-#		echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-#		echo "CONFIG_PCSC=y"    >> ${CONFIG}
-#		echo "CFLAGS += -I/usr/include/PCSC" >> ${CONFIG}
-#	fi
-
-	# Linux specific drivers
-	echo "CONFIG_WIRELESS_EXTENSION=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_ATMEL=y"       >> ${CONFIG}
-	echo "CONFIG_DRIVER_HOSTAP=y"      >> ${CONFIG}
-	echo "CONFIG_DRIVER_IPW2100=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_PRISM54=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_WEXT=y"        >> ${CONFIG}
-
-	# Add include path for madwifi-driver headers
-	echo "CFLAGS += -I${WORKDIR}"  >> ${CONFIG}
-	echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG}
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	dodoc ChangeLog COPYING developer.txt eap_testing.txt README todo.txt
-	dodoc doc/wpa_supplicant.fig
-
-	insinto /etc
-	newins wpa_supplicant.conf wpa_supplicant.conf.example
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${P}-init.d wpa_supplicant || die
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/${P}-conf.d wpa_supplicant || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use ${P} you must create the configuration file"
-	einfo "/etc/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file has been installed as"
-	einfo "/etc/wpa_supplicant.conf.example"
-	einfo
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild
deleted file mode 100644
index ad05593041e4..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild
+++ /dev/null
@@ -1,101 +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/wpa_supplicant/wpa_supplicant-0.3.1.ebuild,v 1.2 2005/01/03 11:09:01 brix Exp $
-
-inherit toolchain-funcs
-
-MADWIFI_VERSION="0.1_pre20041019"
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
-		mirror://gentoo/madwifi-driver-${MADWIFI_VERSION}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="gsm ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-		gsm? ( sys-apps/pcsc-lite )"
-
-src_unpack() {
-	local CONFIG=${S}/.config
-
-	unpack ${A}
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# basic setup
-	echo "CONFIG_CTRL_IFACE=y"        >> ${CONFIG}
-	echo "CONFIG_XSUPPLICANT_IFACE=y" >> ${CONFIG}
-
-	# basic authentication methods
-	echo "CONFIG_EAP_GTC=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_OTP=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y"         >> ${CONFIG}
-	echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CONFIG}
-	echo "CONFIG_PKCS12=y"          >> ${CONFIG}
-
-	if use ssl; then
-		# SSL authentication methods
-		echo "CONFIG_EAP_LEAP=y"     >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y"     >> ${CONFIG}
-		echo "CONFIG_EAP_TLS=y"      >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y"     >> ${CONFIG}
-	fi
-
-	if use gsm; then
-		# Smart card authentication
-		echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-		echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-		echo "CONFIG_PCSC=y"    >> ${CONFIG}
-	fi
-
-	# Linux specific drivers
-	echo "CONFIG_WIRELESS_EXTENSION=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_ATMEL=y"       >> ${CONFIG}
-	echo "CONFIG_DRIVER_HOSTAP=y"      >> ${CONFIG}
-	echo "CONFIG_DRIVER_IPW2100=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_PRISM54=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_WEXT=y"        >> ${CONFIG}
-
-	# Add include path for madwifi-driver headers
-	echo "CFLAGS += -I${WORKDIR}"  >> ${CONFIG}
-	echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG}
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	dodoc ChangeLog COPYING developer.txt eap_testing.txt README todo.txt
-	dodoc doc/wpa_supplicant.fig
-
-	insinto /etc
-	newins wpa_supplicant.conf wpa_supplicant.conf.example
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${P}-init.d wpa_supplicant || die
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/${P}-conf.d wpa_supplicant || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use ${P} you must create the configuration file"
-	einfo "/etc/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file has been installed as"
-	einfo "/etc/wpa_supplicant.conf.example"
-	einfo
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.2.ebuild
deleted file mode 100644
index e9c1985a6f9f..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.2.ebuild
+++ /dev/null
@@ -1,101 +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/wpa_supplicant/wpa_supplicant-0.3.2.ebuild,v 1.2 2005/01/03 11:09:01 brix Exp $
-
-inherit toolchain-funcs
-
-MADWIFI_VERSION="0.1_pre20041019"
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
-		mirror://gentoo/madwifi-driver-${MADWIFI_VERSION}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="gsm ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )
-		gsm? ( sys-apps/pcsc-lite )"
-
-src_unpack() {
-	local CONFIG=${S}/.config
-
-	unpack ${A}
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# basic setup
-	echo "CONFIG_CTRL_IFACE=y"        >> ${CONFIG}
-	echo "CONFIG_XSUPPLICANT_IFACE=y" >> ${CONFIG}
-
-	# basic authentication methods
-	echo "CONFIG_EAP_GTC=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_OTP=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y"         >> ${CONFIG}
-	echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CONFIG}
-	echo "CONFIG_PKCS12=y"          >> ${CONFIG}
-
-	if use ssl; then
-		# SSL authentication methods
-		echo "CONFIG_EAP_LEAP=y"     >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y"     >> ${CONFIG}
-		echo "CONFIG_EAP_TLS=y"      >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y"     >> ${CONFIG}
-	fi
-
-	if use gsm; then
-		# Smart card authentication
-		echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-		echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-		echo "CONFIG_PCSC=y"    >> ${CONFIG}
-	fi
-
-	# Linux specific drivers
-	echo "CONFIG_WIRELESS_EXTENSION=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_ATMEL=y"       >> ${CONFIG}
-	echo "CONFIG_DRIVER_HOSTAP=y"      >> ${CONFIG}
-	echo "CONFIG_DRIVER_IPW2100=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_PRISM54=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_WEXT=y"        >> ${CONFIG}
-
-	# Add include path for madwifi-driver headers
-	echo "CFLAGS += -I${WORKDIR}"  >> ${CONFIG}
-	echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG}
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	dodoc ChangeLog COPYING developer.txt eap_testing.txt README todo.txt
-	dodoc doc/wpa_supplicant.fig
-
-	insinto /etc
-	newins wpa_supplicant.conf wpa_supplicant.conf.example
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${P}-init.d wpa_supplicant || die
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/${P}-conf.d wpa_supplicant || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use ${P} you must create the configuration file"
-	einfo "/etc/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file has been installed as"
-	einfo "/etc/wpa_supplicant.conf.example"
-	einfo
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.3.ebuild
deleted file mode 100644
index cdf89bdb4b2f..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.3.ebuild
+++ /dev/null
@@ -1,108 +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/wpa_supplicant/wpa_supplicant-0.3.3.ebuild,v 1.1 2005/01/03 11:09:01 brix Exp $
-
-inherit toolchain-funcs
-
-MADWIFI_VERSION="0.1_pre20041019"
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
-		mirror://gentoo/madwifi-driver-${MADWIFI_VERSION}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="gsm readline ssl"
-
-DEPEND="gsm? ( sys-apps/pcsc-lite )
-		readline? ( sys-libs/ncurses
-					sys-libs/readline )
-		ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-	local CONFIG=${S}/.config
-
-	unpack ${A}
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# basic setup
-	echo "CONFIG_CTRL_IFACE=y"        >> ${CONFIG}
-	echo "CONFIG_XSUPPLICANT_IFACE=y" >> ${CONFIG}
-
-	# basic authentication methods
-	echo "CONFIG_EAP_GTC=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_OTP=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y"         >> ${CONFIG}
-	echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CONFIG}
-	echo "CONFIG_PKCS12=y"          >> ${CONFIG}
-
-	if use gsm; then
-		# smart card authentication
-		echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-		echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-		echo "CONFIG_PCSC=y"    >> ${CONFIG}
-	fi
-
-	if use readline; then
-		# readline/history support for wpa_cli
-		echo "CONFIG_READLINE=y" >> ${CONFIG}
-	fi
-
-	if use ssl; then
-		# SSL authentication methods
-		echo "CONFIG_EAP_LEAP=y"     >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y"     >> ${CONFIG}
-		echo "CONFIG_EAP_TLS=y"      >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y"     >> ${CONFIG}
-	fi
-
-	# Linux specific drivers
-	echo "CONFIG_WIRELESS_EXTENSION=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_ATMEL=y"       >> ${CONFIG}
-	echo "CONFIG_DRIVER_HOSTAP=y"      >> ${CONFIG}
-	echo "CONFIG_DRIVER_IPW2100=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_PRISM54=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_WEXT=y"        >> ${CONFIG}
-
-	# Add include path for madwifi-driver headers
-	echo "CFLAGS += -I${WORKDIR}"  >> ${CONFIG}
-	echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG}
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	dodoc ChangeLog COPYING developer.txt eap_testing.txt README todo.txt
-	dodoc doc/wpa_supplicant.fig
-
-	insinto /etc
-	newins wpa_supplicant.conf wpa_supplicant.conf.example
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${P}-init.d wpa_supplicant || die
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/${P}-conf.d wpa_supplicant || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use ${P} you must create the configuration file"
-	einfo "/etc/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file has been installed as"
-	einfo "/etc/wpa_supplicant.conf.example"
-	einfo
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.4.ebuild
deleted file mode 100644
index 4f81afbdc946..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.4.ebuild
+++ /dev/null
@@ -1,108 +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/wpa_supplicant/wpa_supplicant-0.3.4.ebuild,v 1.2 2005/01/19 21:56:29 brix Exp $
-
-inherit toolchain-funcs
-
-MADWIFI_VERSION="2005-01-07"
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
-		mirror://gentoo/madwifi-cvs-snapshot-${MADWIFI_VERSION}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc -amd64"
-IUSE="gsm readline ssl"
-
-DEPEND="gsm? ( sys-apps/pcsc-lite )
-		readline? ( sys-libs/ncurses
-					sys-libs/readline )
-		ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-	local CONFIG=${S}/.config
-
-	unpack ${A}
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# basic setup
-	echo "CONFIG_CTRL_IFACE=y"        >> ${CONFIG}
-	echo "CONFIG_XSUPPLICANT_IFACE=y" >> ${CONFIG}
-
-	# basic authentication methods
-	echo "CONFIG_EAP_GTC=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_OTP=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y"         >> ${CONFIG}
-	echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CONFIG}
-	echo "CONFIG_PKCS12=y"          >> ${CONFIG}
-
-	if use gsm; then
-		# smart card authentication
-		echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-		echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-		echo "CONFIG_PCSC=y"    >> ${CONFIG}
-	fi
-
-	if use readline; then
-		# readline/history support for wpa_cli
-		echo "CONFIG_READLINE=y" >> ${CONFIG}
-	fi
-
-	if use ssl; then
-		# SSL authentication methods
-		echo "CONFIG_EAP_LEAP=y"     >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y"     >> ${CONFIG}
-		echo "CONFIG_EAP_TLS=y"      >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y"     >> ${CONFIG}
-	fi
-
-	# Linux specific drivers
-	echo "CONFIG_WIRELESS_EXTENSION=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_ATMEL=y"       >> ${CONFIG}
-	echo "CONFIG_DRIVER_HOSTAP=y"      >> ${CONFIG}
-	echo "CONFIG_DRIVER_IPW2100=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_PRISM54=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_WEXT=y"        >> ${CONFIG}
-
-	# Add include path for madwifi-driver headers
-	echo "CFLAGS += -I${WORKDIR}/madwifi" >> ${CONFIG}
-	echo "CONFIG_DRIVER_MADWIFI=y"        >> ${CONFIG}
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	dodoc ChangeLog COPYING developer.txt eap_testing.txt README todo.txt
-	dodoc doc/wpa_supplicant.fig
-
-	insinto /etc
-	newins wpa_supplicant.conf wpa_supplicant.conf.example
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${P}-init.d wpa_supplicant || die
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/${P}-conf.d wpa_supplicant || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use ${P} you must create the configuration file"
-	einfo "/etc/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file has been installed as"
-	einfo "/etc/wpa_supplicant.conf.example"
-	einfo
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.5.ebuild
deleted file mode 100644
index 5d811554d68a..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.5.ebuild
+++ /dev/null
@@ -1,108 +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/wpa_supplicant/wpa_supplicant-0.3.5.ebuild,v 1.1 2005/01/24 19:17:52 brix Exp $
-
-inherit toolchain-funcs
-
-MADWIFI_VERSION="2005-01-07"
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
-		mirror://gentoo/madwifi-cvs-snapshot-${MADWIFI_VERSION}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="gsm readline ssl"
-
-DEPEND="gsm? ( sys-apps/pcsc-lite )
-		readline? ( sys-libs/ncurses
-					sys-libs/readline )
-		ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-	local CONFIG=${S}/.config
-
-	unpack ${A}
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# basic setup
-	echo "CONFIG_CTRL_IFACE=y"        >> ${CONFIG}
-	echo "CONFIG_XSUPPLICANT_IFACE=y" >> ${CONFIG}
-
-	# basic authentication methods
-	echo "CONFIG_EAP_GTC=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_OTP=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y"         >> ${CONFIG}
-	echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CONFIG}
-	echo "CONFIG_PKCS12=y"          >> ${CONFIG}
-
-	if use gsm; then
-		# smart card authentication
-		echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-		echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-		echo "CONFIG_PCSC=y"    >> ${CONFIG}
-	fi
-
-	if use readline; then
-		# readline/history support for wpa_cli
-		echo "CONFIG_READLINE=y" >> ${CONFIG}
-	fi
-
-	if use ssl; then
-		# SSL authentication methods
-		echo "CONFIG_EAP_LEAP=y"     >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y"     >> ${CONFIG}
-		echo "CONFIG_EAP_TLS=y"      >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y"     >> ${CONFIG}
-	fi
-
-	# Linux specific drivers
-	echo "CONFIG_WIRELESS_EXTENSION=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_ATMEL=y"       >> ${CONFIG}
-	echo "CONFIG_DRIVER_HOSTAP=y"      >> ${CONFIG}
-	echo "CONFIG_DRIVER_IPW2100=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_PRISM54=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_WEXT=y"        >> ${CONFIG}
-
-	# Add include path for madwifi-driver headers
-	echo "CFLAGS += -I${WORKDIR}/madwifi" >> ${CONFIG}
-	echo "CONFIG_DRIVER_MADWIFI=y"        >> ${CONFIG}
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	dodoc ChangeLog COPYING developer.txt eap_testing.txt README todo.txt
-	dodoc doc/wpa_supplicant.fig
-
-	insinto /etc
-	newins wpa_supplicant.conf wpa_supplicant.conf.example
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${P}-init.d wpa_supplicant || die
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/${P}-conf.d wpa_supplicant || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use ${P} you must create the configuration file"
-	einfo "/etc/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file has been installed as"
-	einfo "/etc/wpa_supplicant.conf.example"
-	einfo
-}