Pruned old ebuilds.

Package-Manager: portage-2.0.51.22-r1

52 files changed, 34 insertions, 1830 deletions

diff --git a/net-wireless/hostap-driver/ChangeLog b/net-wireless/hostap-driver/ChangeLog
index 5f4036da3095..0be40c451583 100644
--- a/net-wireless/hostap-driver/ChangeLog
+++ b/net-wireless/hostap-driver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/hostap-driver
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.39 2005/06/26 21:03:29 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.40 2005/07/13 10:11:13 brix Exp $
+
+  13 Jul 2005; <brix@gentoo.org>
+  -files/hostap-driver-0.2.5.firmware.diff.bz2,
+  -files/hostap-driver-0.2.6-firmware.patch,
+  -files/hostap-driver-0.4.0-firmware.patch, -hostap-driver-0.2.5-r1.ebuild,
+  -hostap-driver-0.2.6-r1.ebuild, -hostap-driver-0.4.0.ebuild:
+  Pruned old ebuilds.
 
   26 Jun 2005; David Holm <dholm@gentoo.org> hostap-driver-0.3.7.ebuild:
   Stable on ppc.
diff --git a/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.5-r1 b/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.5-r1
deleted file mode 100644
index cbb75bc1293e..000000000000
--- a/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.5-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 44dbc0a8978fe618eee242b0bd25392c pcmcia-cs-3.2.5.tar.gz 1266494
-MD5 33325ed642b5277a9695d10bd19b3d7a pcmcia-cs-3.2.5-module-init-tools.diff.gz 460
-MD5 ee4f8227cc28f9a29a609f6e9561ef54 pcmcia-cs-3.2.5-SMP-fix.diff.gz 320
-MD5 2b2cba3fdd498b001ea3c27d8b2da31b pcmcia-cs-3.2.5-3.2.6.diff.gz 23034
-MD5 f2feda5eb46c1a2b99ae9db274879afc pcmcia-cs-3.2.5-3.2.7.diff.gz 28244
-MD5 6afe257b11554b17c228f7ca8c7ce0d4 hostap-driver-0.2.5.tar.gz 195923
diff --git a/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.6-r1 b/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.6-r1
deleted file mode 100644
index f5cd35b6b549..000000000000
--- a/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.6-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 44dbc0a8978fe618eee242b0bd25392c pcmcia-cs-3.2.5.tar.gz 1266494
-MD5 33325ed642b5277a9695d10bd19b3d7a pcmcia-cs-3.2.5-module-init-tools.diff.gz 460
-MD5 ee4f8227cc28f9a29a609f6e9561ef54 pcmcia-cs-3.2.5-SMP-fix.diff.gz 320
-MD5 2b2cba3fdd498b001ea3c27d8b2da31b pcmcia-cs-3.2.5-3.2.6.diff.gz 23034
-MD5 f2feda5eb46c1a2b99ae9db274879afc pcmcia-cs-3.2.5-3.2.7.diff.gz 28244
-MD5 1815e82419cb83d32d6e416f090e9330 hostap-driver-0.2.6.tar.gz 196183
diff --git a/net-wireless/hostap-driver/files/digest-hostap-driver-0.4.0 b/net-wireless/hostap-driver/files/digest-hostap-driver-0.4.0
deleted file mode 100644
index 63c596abfd1b..000000000000
--- a/net-wireless/hostap-driver/files/digest-hostap-driver-0.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aceb13fcdbe7c59b36318c2444346a27 hostap-driver-0.4.0.tar.gz 201080
diff --git a/net-wireless/hostap-driver/files/hostap-driver-0.2.5.firmware.diff.bz2 b/net-wireless/hostap-driver/files/hostap-driver-0.2.5.firmware.diff.bz2
deleted file mode 100644
index f777fa9b854c..000000000000
--- a/net-wireless/hostap-driver/files/hostap-driver-0.2.5.firmware.diff.bz2
+++ /dev/null
diff --git a/net-wireless/hostap-driver/files/hostap-driver-0.2.6-firmware.patch b/net-wireless/hostap-driver/files/hostap-driver-0.2.6-firmware.patch
deleted file mode 100644
index 06806dd6121e..000000000000
--- a/net-wireless/hostap-driver/files/hostap-driver-0.2.6-firmware.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp hostap-driver-0.2.6/driver/modules/hostap_config.h hostap-driver-0.2.6-firmware/driver/modules/hostap_config.h
---- hostap-driver-0.2.6/driver/modules/hostap_config.h	2004-12-25 19:59:32.000000000 +0100
-+++ hostap-driver-0.2.6-firmware/driver/modules/hostap_config.h	2004-12-26 21:49:43.405265416 +0100
-@@ -59,7 +59,7 @@
-  * In addition, please note that it is possible to kill your card with
-  * non-volatile download if you are using incorrect image. This feature has not
-  * been fully tested, so please be careful with it. */
--/* #define PRISM2_NON_VOLATILE_DOWNLOAD */
-+#define PRISM2_NON_VOLATILE_DOWNLOAD
- #endif /* PRISM2_DOWNLOAD_SUPPORT */
- 
- /* Include wireless extensions sub-ioctl support even if wireless extensions
diff --git a/net-wireless/hostap-driver/files/hostap-driver-0.4.0-firmware.patch b/net-wireless/hostap-driver/files/hostap-driver-0.4.0-firmware.patch
deleted file mode 100644
index e279f0c60d50..000000000000
--- a/net-wireless/hostap-driver/files/hostap-driver-0.4.0-firmware.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp hostap-driver-0.4.0/driver/modules/hostap_config.h hostap-driver-0.4.0-firmware/driver/modules/hostap_config.h
---- hostap-driver-0.4.0/driver/modules/hostap_config.h	2005-04-26 04:47:23.000000000 +0200
-+++ hostap-driver-0.4.0-firmware/driver/modules/hostap_config.h	2005-04-26 11:16:33.000000000 +0200
-@@ -59,7 +59,7 @@
-  * In addition, please note that it is possible to kill your card with
-  * non-volatile download if you are using incorrect image. This feature has not
-  * been fully tested, so please be careful with it. */
--/* #define PRISM2_NON_VOLATILE_DOWNLOAD */
-+#define PRISM2_NON_VOLATILE_DOWNLOAD
- #endif /* PRISM2_DOWNLOAD_SUPPORT */
- 
- /* Include wireless extensions sub-ioctl support even if wireless extensions
diff --git a/net-wireless/hostap-driver/hostap-driver-0.2.5-r1.ebuild b/net-wireless/hostap-driver/hostap-driver-0.2.5-r1.ebuild
deleted file mode 100644
index c009a3ea3d54..000000000000
--- a/net-wireless/hostap-driver/hostap-driver-0.2.5-r1.ebuild
+++ /dev/null
@@ -1,133 +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/hostap-driver/hostap-driver-0.2.5-r1.ebuild,v 1.5 2005/01/03 11:04:49 brix Exp $
-
-inherit toolchain-funcs pcmcia kernel-mod eutils
-
-DESCRIPTION="HostAP wireless drivers"
-HOMEPAGE="http://hostap.epitest.fi"
-SRC_URI="${SRC_URI} http://hostap.epitest.fi/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-
-KEYWORDS="x86 ppc"
-IUSE=""
-SLOT="0"
-
-DEPEND="!net-wireless/hostap
-		virtual/linux-sources
-		sys-apps/sed"
-RDEPEND=">=net-wireless/wireless-tools-25"
-
-src_unpack() {
-	if ! kernel-mod_configoption_present NET_RADIO
-	then
-		eerror ""
-		eerror "${P} requires support for Wireless LAN drivers (non-hamradio) &"
-		eerror "Wireless Extensions (CONFIG_NET_RADIO) in the kernel."
-		eerror ""
-		die "CONFIG_NET_RADIO support not detected."
-	fi
-
-	kernel-mod_check_modules_supported
-
-	unpack ${A}
-
-	## set compiler
-	sed -i -e "s:gcc:$(tc-getCC):" ${S}/Makefile
-
-	# unpack the pcmcia-cs sources if needed
-	pcmcia_src_unpack
-
-	cd ${S}
-	epatch "${FILESDIR}/${P}.firmware.diff.bz2"
-
-	# fix for new coreutils (#31801)
-	sed -i "s:tail -1:tail -n 1:" ${S}/Makefile
-
-	# set correct pcmcia path (PCMCIA_VERSION gets set from pcmcia_src_unpack)
-	if [ -n "${PCMCIA_VERSION}" ]
-	then
-		sed -i "s:^PCMCIA_PATH=:PCMCIA_PATH=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
-	fi
-
-	# install to /lib/modules/${KV}/net
-	sed -i "s:\$(MODPATH)/kernel/drivers/net/wireless:\$(MODPATH)/net:g" ${S}/Makefile
-	sed -i "s:MODPATH_CS \:= \$(MODPATH)/pcmcia:MODPATH_CS \:= \$(MODPATH)/net:" ${S}/Makefile
-
-	# let pkg_postinst() handle depmod
-	sed -i "s:/sbin/depmod -ae; \\\:\\\:" ${S}/Makefile
-	sed -i "s:/sbin/depmod -ae::" ${S}/Makefile
-
-	if ! use pcmcia &> /dev/null
-	then
-		# remove install_pccard dependency from install_2.4 target
-		sed -i "s#^\(install_2.4:.*\)install_pccard#\1#" ${S}/Makefile
-	fi
-
-	kernel-mod_getversion
-
-	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
-	then
-		sed -i "s:SUBDIRS=:M=:" ${S}/Makefile
-	fi
-}
-
-src_compile() {
-	pcmcia_configure
-
-	set_arch_to_kernel
-	emake all || die "emake failed"
-	set_arch_to_portage
-}
-
-src_install() {
-	# Makefile relies on existing /lib/modules/${KV}
-	dodir /lib/modules/${KV}
-
-	if use pcmcia &> /dev/null
-	then
-		# pcmcia configuration file is only installed if /etc/pcmcia exist
-		dodir /etc/pcmcia
-	else
-		# make sure we do not install the hostap_cs module
-		rm -rf ${S}/driver/modules/hostap_cs.*o
-	fi
-
-	set_arch_to_kernel
-	emake DESTDIR=${D} install || die "emake install failed"
-	set_arch_to_portage
-
-	dodoc README ChangeLog
-}
-
-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}
-
-	if [ -e /etc/pcmcia/prism2.conf ]
-	then
-		einfo ""
-		einfo "You may need to edit or remove /etc/pcmcia/prism2.conf"
-		einfo "This is usually a result of conflicts with the"
-		einfo "net-wireless/linux-wlan-ng drivers."
-		einfo ""
-	fi
-
-	einfo ""
-	einfo "Please notice that all ${PN} modules are now installed to"
-	einfo "/lib/modules/${KV}/net/."
-	einfo ""
-	einfo "You may have to manually delete the old modules if upgrading from from"
-	einfo "<=net-wireless/${PN}-0.2.4."
-	einfo ""
-
-	ewarn ""
-	ewarn "Please note that this installation of HostAP contains support"
-	ewarn "for downloading binary firmware images into the non-volatile"
-	ewarn "(permanent) flash memory of wireless LAN cards."
-	ewarn "Albeit being a great feature, this can lead to A DEAD CARD"
-	ewarn "when inappropriately used (e.g. wrong firmware)."
-	ewarn ""
-
-}
diff --git a/net-wireless/hostap-driver/hostap-driver-0.2.6-r1.ebuild b/net-wireless/hostap-driver/hostap-driver-0.2.6-r1.ebuild
deleted file mode 100644
index 9f54d7d3d2fd..000000000000
--- a/net-wireless/hostap-driver/hostap-driver-0.2.6-r1.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/hostap-driver/hostap-driver-0.2.6-r1.ebuild,v 1.2 2005/01/14 17:16:25 brix Exp $
-
-inherit toolchain-funcs eutils pcmcia linux-mod
-
-DESCRIPTION="HostAP wireless drivers"
-HOMEPAGE="http://hostap.epitest.fi"
-SRC_URI="${SRC_URI} http://hostap.epitest.fi/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-
-KEYWORDS="x86 ~ppc"
-IUSE="pcmcia"
-SLOT="0"
-
-RDEPEND=">=net-wireless/wireless-tools-25"
-
-CONFIG_CHECK="NET_RADIO"
-NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-
-pkg_setup() {
-	MODULE_NAMES="hostap(net:${S}/driver/modules)
-				hostap_pci(net:${S}/driver/modules)
-				hostap_plx(net:${S}/driver/modules)
-				hostap_crypt_wep(net:${S}/driver/modules)
-				hostap_crypt_ccmp(net:${S}/driver/modules)
-				hostap_crypt_tkip(net:${S}/driver/modules)"
-
-	if use pcmcia; then
-		MODULE_NAMES="${MODULE_NAMES} hostap_cs(net:${S}/driver/modules)"
-	fi
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-firmware.patch
-
-	# set compiler
-	sed -i "s:gcc:$(tc-getCC):" ${S}/Makefile
-
-	# unpack the pcmcia-cs sources if needed
-	pcmcia_src_unpack
-
-	# fix for new coreutils (#31801)
-	sed -i "s:tail -1:tail -n 1:" ${S}/Makefile
-
-	# set correct pcmcia path (PCMCIA_VERSION gets set from pcmcia_src_unpack)
-	if [ -n "${PCMCIA_VERSION}" ]; then
-		sed -i "s:^\(PCMCIA_PATH\)=:\1=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
-	fi
-
-	convert_to_m ${S}/Makefile
-}
-
-src_compile() {
-	pcmcia_configure
-
-	# hostap-driver expects 'make' to be called in the top-level directory
-	# linux-mod_src_compile() currently can not honor that (2005-01-04 brix)
-	set_arch_to_kernel
-	emake || die "emake failed"
-	set_arch_to_portage
-}
-
-src_install() {
-	if use pcmcia; then
-		insinto /etc/pcmcia
-		doins driver/etc/hostap_cs.conf
-	fi
-
-	dodoc ChangeLog README
-
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	if [ -e /etc/pcmcia/prism2.conf ]
-	then
-		einfo ""
-		einfo "You may need to edit or remove /etc/pcmcia/prism2.conf"
-		einfo "This is usually a result of conflicts with the"
-		einfo "net-wireless/linux-wlan-ng drivers."
-		einfo ""
-	fi
-
-	einfo ""
-	einfo "Please notice that all ${PN} modules are now installed to"
-	einfo "/lib/modules/${KV}/net/."
-	einfo ""
-	einfo "You may have to manually delete the old modules if upgrading from from"
-	einfo "<=net-wireless/${PN}-0.2.4."
-	einfo ""
-
-	ewarn ""
-	ewarn "Please note that this installation of HostAP contains support"
-	ewarn "for downloading binary firmware images into the non-volatile"
-	ewarn "(permanent) flash memory of wireless LAN cards."
-	ewarn ""
-	ewarn "Albeit being a great feature, this can lead to A DEAD CARD"
-	ewarn "when inappropriately used (e.g. wrong firmware)."
-	ewarn ""
-
-	linux-mod_pkg_postinst
-}
diff --git a/net-wireless/hostap-driver/hostap-driver-0.4.0.ebuild b/net-wireless/hostap-driver/hostap-driver-0.4.0.ebuild
deleted file mode 100644
index 2165cb6882f9..000000000000
--- a/net-wireless/hostap-driver/hostap-driver-0.4.0.ebuild
+++ /dev/null
@@ -1,98 +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/hostap-driver/hostap-driver-0.4.0.ebuild,v 1.1 2005/04/27 09:57:27 brix Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-DESCRIPTION="HostAP wireless drivers"
-HOMEPAGE="http://hostap.epitest.fi"
-SRC_URI="${SRC_URI} http://hostap.epitest.fi/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-
-KEYWORDS="~x86 ~ppc"
-IUSE="pcmcia"
-SLOT="0"
-
-RDEPEND=">=net-wireless/wireless-tools-25"
-
-BUILD_PARAMS="KERNEL_PATH=${KV_DIR}"
-BUILD_TARGETS="all"
-MODULESD_HOSTAP_DOCS="README"
-
-CONFIG_CHECK="NET_RADIO"
-NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-
-pkg_setup() {
-	MODULE_NAMES="hostap(net::${S}/driver/modules)
-				hostap_pci(net::${S}/driver/modules)
-				hostap_plx(net::${S}/driver/modules)
-				hostap_crypt_wep(net::${S}/driver/modules)
-				hostap_crypt_ccmp(net::${S}/driver/modules)
-				hostap_crypt_tkip(net::${S}/driver/modules)"
-
-	if use pcmcia; then
-		MODULE_NAMES="${MODULE_NAMES} hostap_cs(net::${S}/driver/modules)"
-	fi
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-firmware.patch
-
-	# set compiler
-	sed -i "s:gcc:$(tc-getCC):" ${S}/Makefile
-
-	# unpack the pcmcia-cs sources if needed
-	pcmcia_src_unpack
-
-	# fix for new coreutils (#31801)
-	sed -i "s:tail -1:tail -n 1:" ${S}/Makefile
-
-	# set correct pcmcia path (PCMCIA_VERSION gets set from pcmcia_src_unpack)
-	if [ -n "${PCMCIA_VERSION}" ]; then
-		sed -i "s:^\(PCMCIA_PATH\)=:\1=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
-	fi
-
-	convert_to_m ${S}/Makefile
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	if use pcmcia; then
-		insinto /etc/pcmcia
-		doins driver/etc/hostap_cs.conf
-	fi
-
-	dodoc ChangeLog
-
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	if [ -e /etc/pcmcia/prism2.conf ]
-	then
-		einfo ""
-		einfo "You may need to edit or remove /etc/pcmcia/prism2.conf"
-		einfo "This is usually a result of conflicts with the"
-		einfo "net-wireless/linux-wlan-ng drivers."
-		einfo ""
-	fi
-
-	ewarn ""
-	ewarn "Please note that this installation of HostAP contains support"
-	ewarn "for downloading binary firmware images into the non-volatile"
-	ewarn "(permanent) flash memory of wireless LAN cards."
-	ewarn ""
-	ewarn "Albeit being a great feature, this can lead to A DEAD CARD"
-	ewarn "when inappropriately used (e.g. wrong firmware)."
-	ewarn ""
-
-	linux-mod_pkg_postinst
-}
diff --git a/net-wireless/hostap-utils/ChangeLog b/net-wireless/hostap-utils/ChangeLog
index ea47f7be72ae..dbc1e7fa3b53 100644
--- a/net-wireless/hostap-utils/ChangeLog
+++ b/net-wireless/hostap-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/hostap-utils
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-utils/ChangeLog,v 1.25 2005/06/27 09:06:12 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-utils/ChangeLog,v 1.26 2005/07/13 10:12:17 brix Exp $
+
+  13 Jul 2005; <brix@gentoo.org> -hostap-utils-0.2.4.ebuild,
+  -hostap-utils-0.2.6.ebuild:
+  Pruned old ebuilds.
 
   27 Jun 2005; David Holm <dholm@gentoo.org> hostap-utils-0.3.7.ebuild:
   Stable on ppc.
diff --git a/net-wireless/hostap-utils/files/digest-hostap-utils-0.2.4 b/net-wireless/hostap-utils/files/digest-hostap-utils-0.2.4
deleted file mode 100644
index 687b0a97a44d..000000000000
--- a/net-wireless/hostap-utils/files/digest-hostap-utils-0.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 774a892131b2e51599d39aab7722c7d9 hostap-utils-0.2.4.tar.gz 56057
diff --git a/net-wireless/hostap-utils/files/digest-hostap-utils-0.2.6 b/net-wireless/hostap-utils/files/digest-hostap-utils-0.2.6
deleted file mode 100644
index 7a39f89f21b5..000000000000
--- a/net-wireless/hostap-utils/files/digest-hostap-utils-0.2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50e9cc79492ad0f3dbc9dc5eb299e6e7 hostap-utils-0.2.6.tar.gz 56135
diff --git a/net-wireless/hostap-utils/hostap-utils-0.2.4.ebuild b/net-wireless/hostap-utils/hostap-utils-0.2.4.ebuild
deleted file mode 100644
index 5b40388ce39e..000000000000
--- a/net-wireless/hostap-utils/hostap-utils-0.2.4.ebuild
+++ /dev/null
@@ -1,28 +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/hostap-utils/hostap-utils-0.2.4.ebuild,v 1.7 2005/01/18 11:19:18 brix Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="HostAP wireless utils"
-HOMEPAGE="http://hostap.epitest.fi/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-DEPEND="virtual/libc"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	for i in \
-		hostap_crypt_conf hostap_diag hostap_io_debug hostap_rid \
-		prism2_param prism2_srec hostap_fw_load \
-		split_combined_hex; do
-		dosbin "${i}"
-	done
-	dodoc README
-}
diff --git a/net-wireless/hostap-utils/hostap-utils-0.2.6.ebuild b/net-wireless/hostap-utils/hostap-utils-0.2.6.ebuild
deleted file mode 100644
index 57437c4c9706..000000000000
--- a/net-wireless/hostap-utils/hostap-utils-0.2.6.ebuild
+++ /dev/null
@@ -1,31 +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/hostap-utils/hostap-utils-0.2.6.ebuild,v 1.3 2005/01/18 11:19:18 brix Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="HostAP wireless utils"
-
-HOMEPAGE="http://hostap.epitest.fi/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-
-	dosbin hostap_{crypt_conf,diag,fw_load,io_debug,rid}
-	dosbin prism2_{param,srec}
-	dosbin split_combined_hex
-
-	dodoc README
-}
diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index ea283c04cc1f..7fc5006add93 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.35 2005/07/08 12:26:11 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.36 2005/07/13 10:16:29 brix Exp $
+
+  13 Jul 2005; <brix@gentoo.org> -files/hostapd-0.4.0-conf.d,
+  -files/hostapd-0.4.0-init.d, -files/hostapd-0.4.1-conf.d,
+  -files/hostapd-0.4.1-init.d, -files/hostapd-0.4.2-conf.d,
+  -files/hostapd-0.4.2-init.d, -hostapd-0.2.5.ebuild, -hostapd-0.2.6.ebuild,
+  -hostapd-0.3.9.ebuild, -hostapd-0.4.0-r1.ebuild, -hostapd-0.4.1.ebuild,
+  -hostapd-0.4.2.ebuild:
+  Pruned old ebuilds.
 
   08 Jul 2005; <brix@gentoo.org> hostapd-0.3.9.ebuild,
   hostapd-0.3.9-r1.ebuild, hostapd-0.4.0-r1.ebuild, hostapd-0.4.1.ebuild,
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.2.5 b/net-wireless/hostapd/files/digest-hostapd-0.2.5
deleted file mode 100644
index 0a3165540090..000000000000
--- a/net-wireless/hostapd/files/digest-hostapd-0.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4714f9f405001be1e14c63c985eaa7e8 hostapd-0.2.5.tar.gz 139697
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.2.6 b/net-wireless/hostapd/files/digest-hostapd-0.2.6
deleted file mode 100644
index d7b659263cda..000000000000
--- a/net-wireless/hostapd/files/digest-hostapd-0.2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b09c430a2a3c8763601a1fbc4da20586 hostapd-0.2.6.tar.gz 140160
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.3.9 b/net-wireless/hostapd/files/digest-hostapd-0.3.9
deleted file mode 100644
index 344f6a5a7d9f..000000000000
--- a/net-wireless/hostapd/files/digest-hostapd-0.3.9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c9cab38387594090a36062008b3de59e hostapd-0.3.9.tar.gz 246919
-MD5 efb9130cf1dcb829caa43af4e0bee2fb madwifi-cvs-snapshot-2005-04-20.tar.bz2 1968548
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.4.0-r1 b/net-wireless/hostapd/files/digest-hostapd-0.4.0-r1
deleted file mode 100644
index cbd70657b20a..000000000000
--- a/net-wireless/hostapd/files/digest-hostapd-0.4.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e94731593b492bfad7a6b341c0514266 hostapd-0.4.0.tar.gz 257771
-MD5 efb9130cf1dcb829caa43af4e0bee2fb madwifi-cvs-snapshot-2005-04-20.tar.bz2 1968548
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.4.1 b/net-wireless/hostapd/files/digest-hostapd-0.4.1
deleted file mode 100644
index cbbb758c84fe..000000000000
--- a/net-wireless/hostapd/files/digest-hostapd-0.4.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8db8550f53fe925140f1e8dfb9d59ba4 hostapd-0.4.1.tar.gz 262224
-MD5 efb9130cf1dcb829caa43af4e0bee2fb madwifi-cvs-snapshot-2005-04-20.tar.bz2 1968548
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.4.2 b/net-wireless/hostapd/files/digest-hostapd-0.4.2
deleted file mode 100644
index 7096b0c5cc1f..000000000000
--- a/net-wireless/hostapd/files/digest-hostapd-0.4.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9ba734b0cf83d8694eb184b64804b496 hostapd-0.4.2.tar.gz 265961
-MD5 efb9130cf1dcb829caa43af4e0bee2fb madwifi-cvs-snapshot-2005-04-20.tar.bz2 1968548
diff --git a/net-wireless/hostapd/files/hostapd-0.4.0-conf.d b/net-wireless/hostapd/files/hostapd-0.4.0-conf.d
deleted file mode 100644
index 5ffe62878b6b..000000000000
--- a/net-wireless/hostapd/files/hostapd-0.4.0-conf.d
+++ /dev/null
@@ -1,12 +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/hostapd/files/hostapd-0.4.0-conf.d,v 1.2 2005/04/29 21:27:37 brix Exp $
-
-# List of interfaces which needs to be started before hostapd
-INTERFACES="wlan0"
-
-# List of configuration files
-CONFIGS="/etc/hostapd/hostapd.conf"
-
-# Extra options to pass to hostapd
-OPTIONS="-B"
diff --git a/net-wireless/hostapd/files/hostapd-0.4.0-init.d b/net-wireless/hostapd/files/hostapd-0.4.0-init.d
deleted file mode 100644
index 40b1afd79e2d..000000000000
--- a/net-wireless/hostapd/files/hostapd-0.4.0-init.d
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.4.0-init.d,v 1.1 2005/04/29 19:49:37 brix Exp $
-
-opts="start stop reload"
-
-depend() {
-	local iface
-
-	for iface in ${INTERFACES}; do
-		need net.${iface}
-	done
-
-	use logger
-}
-
-checkconfig() {
-	local file
-
-	for file in ${CONFIGS}; do
-		if [[ ! -r ${file} ]]; then
-			eerror "hostapd configuration file (${CONFIG}) not found"
-			return 1
-		fi
-	done
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting hostapd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/hostapd \
-		-- ${OPTIONS} ${CONFIGS}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping hostapd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/hostapd
-	eend ${?}
-}
-
-reload() {
-	checkconfig || return 1
-
-	ebegin "Reloading hostapd configuration"
-	start-stop-daemon --stop --signal 1 --quiet --exec /usr/sbin/hostapd
-	eend ${?}
-}
diff --git a/net-wireless/hostapd/files/hostapd-0.4.1-conf.d b/net-wireless/hostapd/files/hostapd-0.4.1-conf.d
deleted file mode 100644
index 7ee716bf3933..000000000000
--- a/net-wireless/hostapd/files/hostapd-0.4.1-conf.d
+++ /dev/null
@@ -1,12 +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/hostapd/files/hostapd-0.4.1-conf.d,v 1.1 2005/05/23 11:47:42 brix Exp $
-
-# List of interfaces which needs to be started before hostapd
-INTERFACES="wlan0"
-
-# List of configuration files
-CONFIGS="/etc/hostapd/hostapd.conf"
-
-# Extra options to pass to hostapd
-OPTIONS="-B"
diff --git a/net-wireless/hostapd/files/hostapd-0.4.1-init.d b/net-wireless/hostapd/files/hostapd-0.4.1-init.d
deleted file mode 100644
index b469a555aa90..000000000000
--- a/net-wireless/hostapd/files/hostapd-0.4.1-init.d
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.4.1-init.d,v 1.1 2005/05/23 11:47:42 brix Exp $
-
-opts="start stop reload"
-
-depend() {
-	local iface
-
-	for iface in ${INTERFACES}; do
-		need net.${iface}
-	done
-
-	use logger
-}
-
-checkconfig() {
-	local file
-
-	for file in ${CONFIGS}; do
-		if [[ ! -r ${file} ]]; then
-			eerror "hostapd configuration file (${CONFIG}) not found"
-			return 1
-		fi
-	done
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting hostapd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/hostapd \
-		-- ${OPTIONS} ${CONFIGS}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping hostapd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/hostapd
-	eend ${?}
-}
-
-reload() {
-	checkconfig || return 1
-
-	ebegin "Reloading hostapd configuration"
-	start-stop-daemon --stop --signal 1 --quiet --exec /usr/sbin/hostapd
-	eend ${?}
-}
diff --git a/net-wireless/hostapd/files/hostapd-0.4.2-conf.d b/net-wireless/hostapd/files/hostapd-0.4.2-conf.d
deleted file mode 100644
index 9eaf67912443..000000000000
--- a/net-wireless/hostapd/files/hostapd-0.4.2-conf.d
+++ /dev/null
@@ -1,12 +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/hostapd/files/hostapd-0.4.2-conf.d,v 1.1 2005/06/13 14:43:25 brix Exp $
-
-# List of interfaces which needs to be started before hostapd
-INTERFACES="wlan0"
-
-# List of configuration files
-CONFIGS="/etc/hostapd/hostapd.conf"
-
-# Extra options to pass to hostapd
-OPTIONS="-B"
diff --git a/net-wireless/hostapd/files/hostapd-0.4.2-init.d b/net-wireless/hostapd/files/hostapd-0.4.2-init.d
deleted file mode 100644
index 540f859365b7..000000000000
--- a/net-wireless/hostapd/files/hostapd-0.4.2-init.d
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.4.2-init.d,v 1.1 2005/06/13 14:43:25 brix Exp $
-
-opts="start stop reload"
-
-depend() {
-	local iface
-
-	for iface in ${INTERFACES}; do
-		need net.${iface}
-	done
-
-	use logger
-}
-
-checkconfig() {
-	local file
-
-	for file in ${CONFIGS}; do
-		if [[ ! -r ${file} ]]; then
-			eerror "hostapd configuration file (${CONFIG}) not found"
-			return 1
-		fi
-	done
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting hostapd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/hostapd \
-		-- ${OPTIONS} ${CONFIGS}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping hostapd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/hostapd
-	eend ${?}
-}
-
-reload() {
-	checkconfig || return 1
-
-	ebegin "Reloading hostapd configuration"
-	start-stop-daemon --stop --signal 1 --quiet --exec /usr/sbin/hostapd
-	eend ${?}
-}
diff --git a/net-wireless/hostapd/hostapd-0.2.5.ebuild b/net-wireless/hostapd/hostapd-0.2.5.ebuild
deleted file mode 100644
index fceba142854b..000000000000
--- a/net-wireless/hostapd/hostapd-0.2.5.ebuild
+++ /dev/null
@@ -1,43 +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/hostapd/hostapd-0.2.5.ebuild,v 1.6 2005/01/18 11:21:36 brix Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="HostAP wireless daemon"
-HOMEPAGE="http://hostap.epitest.fi"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-
-KEYWORDS="x86 ppc"
-IUSE=""
-SLOT="0"
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i "s:^CC=gcc:CC=$(tc-getCC):" ${S}/Makefile
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	insinto /etc/hostapd
-	doins hostapd.conf hostapd.accept hostapd.deny
-
-	dosed 's:\(accept_mac_file=\)/etc/hostapd.accept:\1/etc/hostapd/hostapd.accept:g' \
-		/etc/hostapd/hostapd.conf
-	dosed 's:\(deny_mac_file=\)/etc/hostapd.deny:\1/etc/hostapd/hostapd.deny:g' \
-		/etc/hostapd/hostapd.conf
-
-	dosbin hostapd
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/hostapd.init.d hostapd
-
-	dodoc ChangeLog developer.txt README
-}
diff --git a/net-wireless/hostapd/hostapd-0.2.6.ebuild b/net-wireless/hostapd/hostapd-0.2.6.ebuild
deleted file mode 100644
index a42b7e7621f6..000000000000
--- a/net-wireless/hostapd/hostapd-0.2.6.ebuild
+++ /dev/null
@@ -1,43 +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/hostapd/hostapd-0.2.6.ebuild,v 1.4 2005/01/18 11:21:36 brix Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="HostAP wireless daemon"
-HOMEPAGE="http://hostap.epitest.fi"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-
-KEYWORDS="x86 ~ppc"
-IUSE=""
-SLOT="0"
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i "s:^CC=gcc:CC=$(tc-getCC):" ${S}/Makefile
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	insinto /etc/hostapd
-	doins hostapd.conf hostapd.accept hostapd.deny
-
-	dosed 's:\(accept_mac_file=\)/etc/hostapd.accept:\1/etc/hostapd/hostapd.accept:g' \
-		/etc/hostapd/hostapd.conf
-	dosed 's:\(deny_mac_file=\)/etc/hostapd.deny:\1/etc/hostapd/hostapd.deny:g' \
-		/etc/hostapd/hostapd.conf
-
-	dosbin hostapd
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/hostapd.init.d hostapd
-
-	dodoc ChangeLog developer.txt README
-}
diff --git a/net-wireless/hostapd/hostapd-0.3.9.ebuild b/net-wireless/hostapd/hostapd-0.3.9.ebuild
deleted file mode 100644
index 4f4cfdaaf16c..000000000000
--- a/net-wireless/hostapd/hostapd-0.3.9.ebuild
+++ /dev/null
@@ -1,80 +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/hostapd/hostapd-0.3.9.ebuild,v 1.2 2005/07/08 12:26:11 brix Exp $
-
-inherit toolchain-funcs
-
-MADWIFI_VERSION="2005-04-20"
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://hostap.epitest.fi"
-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"
-
-IUSE="ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	local CONFIG=${S}/.config
-
-	unpack ${A}
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# authentication methods
-	echo "CONFIG_EAP=y"           >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y"       >> ${CONFIG}
-	echo "CONFIG_EAP_GTC=y"       >> ${CONFIG}
-	echo "CONFIG_IAPP=y"          >> ${CONFIG}
-	echo "CONFIG_PKCS12=y"        >> ${CONFIG}
-	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
-	echo "CONFIG_RSN_PREAUTH=y"   >> ${CONFIG}
-	echo "CONFIG_EAP_SIM=y"       >> ${CONFIG}
-
-	if use ssl; then
-		# SSL authentication methods
-		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_DRIVER_HOSTAP=y"  >> ${CONFIG}
-	echo "CONFIG_DRIVER_WIRED=y"   >> ${CONFIG}
-	echo "CONFIG_DRIVER_PRISM54=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() {
-	insinto /etc/hostapd
-	doins hostapd.conf hostapd.accept hostapd.deny
-
-	dosed 's:\(accept_mac_file=\)/etc/hostapd.accept:\1/etc/hostapd/hostapd.accept:g' \
-		/etc/hostapd/hostapd.conf
-	dosed 's:\(deny_mac_file=\)/etc/hostapd.deny:\1/etc/hostapd/hostapd.deny:g' \
-		/etc/hostapd/hostapd.conf
-
-	dosbin hostapd
-
-	newinitd ${FILESDIR}/hostapd.init.d hostapd
-
-	dodoc ChangeLog developer.txt README
-
-	docinto examples
-	dodoc madwifi.conf wired.conf
-}
diff --git a/net-wireless/hostapd/hostapd-0.4.0-r1.ebuild b/net-wireless/hostapd/hostapd-0.4.0-r1.ebuild
deleted file mode 100644
index 461c61893cce..000000000000
--- a/net-wireless/hostapd/hostapd-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,87 +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/hostapd/hostapd-0.4.0-r1.ebuild,v 1.2 2005/07/08 12:26:11 brix Exp $
-
-inherit toolchain-funcs
-
-MADWIFI_VERSION="2005-04-20"
-
-DESCRIPTION="HostAP wireless daemon"
-HOMEPAGE="http://hostap.epitest.fi"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
-		mirror://gentoo/madwifi-cvs-snapshot-${MADWIFI_VERSION}.tar.bz2"
-
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-IUSE="ipv6 ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-		sys-apps/sed"
-
-src_unpack() {
-	local CONFIG=${S}/.config
-
-	unpack ${A}
-
-	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-		${S}/hostapd.conf
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# authentication methods
-	echo "CONFIG_EAP=y"           >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y"       >> ${CONFIG}
-	echo "CONFIG_EAP_GTC=y"       >> ${CONFIG}
-	echo "CONFIG_IAPP=y"          >> ${CONFIG}
-	echo "CONFIG_PKCS12=y"        >> ${CONFIG}
-	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
-	echo "CONFIG_RSN_PREAUTH=y"   >> ${CONFIG}
-	echo "CONFIG_EAP_SIM=y"       >> ${CONFIG}
-
-	if use ssl; then
-		# SSL authentication methods
-		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 ipv6; then
-		echo "CONFIG_IPV6=y" >> ${CONFIG}
-	fi
-
-	# Linux specific drivers
-	echo "CONFIG_DRIVER_HOSTAP=y"  >> ${CONFIG}
-	echo "CONFIG_DRIVER_WIRED=y"   >> ${CONFIG}
-	echo "CONFIG_DRIVER_PRISM54=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() {
-	insinto /etc/hostapd
-	doins hostapd.conf hostapd.accept hostapd.deny
-
-	dosbin hostapd
-	dobin hostapd_cli
-
-	newinitd ${FILESDIR}/${P}-init.d hostapd
-	newconfd ${FILESDIR}/${P}-conf.d hostapd
-
-	doman hostapd.8 hostapd_cli.1
-
-	dodoc ChangeLog developer.txt README
-
-	docinto examples
-	dodoc madwifi.conf wired.conf
-}
diff --git a/net-wireless/hostapd/hostapd-0.4.1.ebuild b/net-wireless/hostapd/hostapd-0.4.1.ebuild
deleted file mode 100644
index 35d4a10d6167..000000000000
--- a/net-wireless/hostapd/hostapd-0.4.1.ebuild
+++ /dev/null
@@ -1,87 +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/hostapd/hostapd-0.4.1.ebuild,v 1.2 2005/07/08 12:26:11 brix Exp $
-
-inherit toolchain-funcs
-
-MADWIFI_VERSION="2005-04-20"
-
-DESCRIPTION="HostAP wireless daemon"
-HOMEPAGE="http://hostap.epitest.fi"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
-		mirror://gentoo/madwifi-cvs-snapshot-${MADWIFI_VERSION}.tar.bz2"
-
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-IUSE="ipv6 ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-		sys-apps/sed"
-
-src_unpack() {
-	local CONFIG=${S}/.config
-
-	unpack ${A}
-
-	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-		${S}/hostapd.conf
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# authentication methods
-	echo "CONFIG_EAP=y"           >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y"       >> ${CONFIG}
-	echo "CONFIG_EAP_GTC=y"       >> ${CONFIG}
-	echo "CONFIG_IAPP=y"          >> ${CONFIG}
-	echo "CONFIG_PKCS12=y"        >> ${CONFIG}
-	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
-	echo "CONFIG_RSN_PREAUTH=y"   >> ${CONFIG}
-	echo "CONFIG_EAP_SIM=y"       >> ${CONFIG}
-
-	if use ssl; then
-		# SSL authentication methods
-		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 ipv6; then
-		echo "CONFIG_IPV6=y" >> ${CONFIG}
-	fi
-
-	# Linux specific drivers
-	echo "CONFIG_DRIVER_HOSTAP=y"  >> ${CONFIG}
-	echo "CONFIG_DRIVER_WIRED=y"   >> ${CONFIG}
-	echo "CONFIG_DRIVER_PRISM54=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() {
-	insinto /etc/hostapd
-	doins hostapd.conf hostapd.accept hostapd.deny
-
-	dosbin hostapd
-	dobin hostapd_cli
-
-	newinitd ${FILESDIR}/${P}-init.d hostapd
-	newconfd ${FILESDIR}/${P}-conf.d hostapd
-
-	doman hostapd.8 hostapd_cli.1
-
-	dodoc ChangeLog developer.txt README
-
-	docinto examples
-	dodoc madwifi.conf wired.conf
-}
diff --git a/net-wireless/hostapd/hostapd-0.4.2.ebuild b/net-wireless/hostapd/hostapd-0.4.2.ebuild
deleted file mode 100644
index 42c5b202f33d..000000000000
--- a/net-wireless/hostapd/hostapd-0.4.2.ebuild
+++ /dev/null
@@ -1,87 +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/hostapd/hostapd-0.4.2.ebuild,v 1.2 2005/07/08 12:26:11 brix Exp $
-
-inherit toolchain-funcs
-
-MADWIFI_VERSION="2005-04-20"
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://hostap.epitest.fi"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
-		mirror://gentoo/madwifi-cvs-snapshot-${MADWIFI_VERSION}.tar.bz2"
-
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-IUSE="ipv6 ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-		sys-apps/sed"
-
-src_unpack() {
-	local CONFIG=${S}/.config
-
-	unpack ${A}
-
-	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-		${S}/hostapd.conf
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# authentication methods
-	echo "CONFIG_EAP=y"           >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y"       >> ${CONFIG}
-	echo "CONFIG_EAP_GTC=y"       >> ${CONFIG}
-	echo "CONFIG_IAPP=y"          >> ${CONFIG}
-	echo "CONFIG_PKCS12=y"        >> ${CONFIG}
-	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
-	echo "CONFIG_RSN_PREAUTH=y"   >> ${CONFIG}
-	echo "CONFIG_EAP_SIM=y"       >> ${CONFIG}
-
-	if use ssl; then
-		# SSL authentication methods
-		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 ipv6; then
-		echo "CONFIG_IPV6=y" >> ${CONFIG}
-	fi
-
-	# Linux specific drivers
-	echo "CONFIG_DRIVER_HOSTAP=y"  >> ${CONFIG}
-	echo "CONFIG_DRIVER_WIRED=y"   >> ${CONFIG}
-	echo "CONFIG_DRIVER_PRISM54=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() {
-	insinto /etc/hostapd
-	doins hostapd.conf hostapd.accept hostapd.deny
-
-	dosbin hostapd
-	dobin hostapd_cli
-
-	newinitd ${FILESDIR}/${P}-init.d hostapd
-	newconfd ${FILESDIR}/${P}-conf.d hostapd
-
-	doman hostapd.8 hostapd_cli.1
-
-	dodoc ChangeLog developer.txt README
-
-	docinto examples
-	dodoc madwifi.conf wired.conf
-}
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 5d3206364be5..8749cec492ee 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,17 @@
 # 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.27 2005/06/27 11:34:37 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.28 2005/07/13 10:20:12 brix Exp $
+
+  13 Jul 2005; <brix@gentoo.org> -files/wpa_supplicant-0.2.7-conf.d,
+  -files/wpa_supplicant-0.2.7-init.d, -files/wpa_supplicant-0.4.0-conf.d,
+  -files/wpa_supplicant-0.4.0-init.d,
+  -files/wpa_supplicant-0.4.0-wpa_cli.action,
+  -files/wpa_supplicant-0.4.1-conf.d, -files/wpa_supplicant-0.4.1-init.d,
+  -files/wpa_supplicant-0.4.1-wpa_cli.action,
+  -files/wpa_supplicant-0.4.2-wpa_cli.action, -wpa_supplicant-0.2.7.ebuild,
+  -wpa_supplicant-0.4.0.ebuild, -wpa_supplicant-0.4.1.ebuild,
+  -wpa_supplicant-0.4.2.ebuild:
+  Pruned old ebuilds.
 
 *wpa_supplicant-0.4.3 (27 Jun 2005)
 
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.7 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.7
deleted file mode 100644
index 3599ed0ad6bd..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 867e28685808700024069c4b935315a1 wpa_supplicant-0.2.7.tar.gz 194574
-MD5 3dc7bcc46ade7ab9ff7ea25fb7377366 madwifi-driver-0.1_pre20041019.tar.bz2 1570237
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.0 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.0
deleted file mode 100644
index 4b5472628e01..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b6adfd43ddf1fa06494e71b186185f45 wpa_supplicant-0.4.0.tar.gz 327380
-MD5 efb9130cf1dcb829caa43af4e0bee2fb madwifi-cvs-snapshot-2005-04-20.tar.bz2 1968548
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.1 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.1
deleted file mode 100644
index 882d700ac514..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0d12157e1d5f725bf3f12cca3c3820c3 wpa_supplicant-0.4.1.tar.gz 355358
-MD5 efb9130cf1dcb829caa43af4e0bee2fb madwifi-cvs-snapshot-2005-04-20.tar.bz2 1968548
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.2 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.2
deleted file mode 100644
index d4d35eb62cfb..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 498cd08b5ca233ff7709c1315ebcbb02 wpa_supplicant-0.4.2.tar.gz 369244
-MD5 efb9130cf1dcb829caa43af4e0bee2fb madwifi-cvs-snapshot-2005-04-20.tar.bz2 1968548
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.7-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.7-conf.d
deleted file mode 100644
index 4bb3bd912233..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.7-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.7-conf.d,v 1.1 2005/02/14 14:20:15 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.7-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.7-init.d
deleted file mode 100644
index 0367c9736866..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.7-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.7-init.d,v 1.1 2005/02/14 14:20:15 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.4.0-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-conf.d
deleted file mode 100644
index 28de81c2e412..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.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.4.0-conf.d,v 1.1 2005/04/27 10:02:48 brix Exp $
-
-# List of interfaces
-INTERFACES="eth1"
-
-# Common arguments to all wpa_supplicant instances
-ARGS="-w"
-
-# Interface specific arguments
-#ARGS_eth1="-Dipw"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-init.d
deleted file mode 100644
index 7c3fd2feb4d6..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.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.4.0-init.d,v 1.1 2005/04/27 10:02:48 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.4.0-wpa_cli.action b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-wpa_cli.action
deleted file mode 100644
index 3935cb2455f7..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-wpa_cli.action
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2005 Gentoo Foundation
-# Written by Roy Marples <uberlord@gentoo.org>
-# Distributed under the terms of the GNU General Public License v2
-# Alternatively, this file may be distributed under the terms of the BSD License
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-wpa_cli.action,v 1.1 2005/04/27 10:02:48 brix Exp $
-
-if [ -z "$1" -o -z "$2" ]; then
-	echo "Insufficient parameters" > /dev/stderr
-	exit 1
-fi
-
-INTERFACE="$1"
-ACTION="$2"
-
-# Note, the below action must NOT mark the interface down via ifconfig, ip or
-# similar. Addresses can be removed, changed and daemons can be stopped, but
-# the interface must remain up for wpa_supplicant to work.
-
-if [ -f /etc/gentoo-release ]; then
-	EXEC="/etc/init.d/net.${INTERFACE} --quiet"
-else
-	echo "I don't know what to do with this distro!" > /dev/stderr
-	exit 1
-fi
-
-case ${ACTION} in
-	CONNECTED)
-		EXEC="${EXEC} start"
-		;;
-	DISCONNECTED)
-		EXEC="${EXEC} stop"
-		;;
-	*)
-		echo "Unknown action ${ACTION}" > /dev/stderr
-		exit 1
-		;;
-esac
-
-# ${EXEC} can use ${IN_BACKGROUND} so that it knows that the user isn't
-# stopping the interface and a background process - like wpa_cli - is.
-export IN_BACKGROUND=true
-
-${EXEC}
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.1-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.1-conf.d
deleted file mode 100644
index c55522b57f21..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.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.4.1-conf.d,v 1.1 2005/05/23 11:49:48 brix Exp $
-
-# List of interfaces
-INTERFACES="eth1"
-
-# Common arguments to all wpa_supplicant instances
-ARGS="-w"
-
-# Interface specific arguments
-#ARGS_eth1="-Dipw"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.1-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.1-init.d
deleted file mode 100644
index cd2761151d2a..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.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.4.1-init.d,v 1.1 2005/05/23 11:49:48 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.4.1-wpa_cli.action b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.1-wpa_cli.action
deleted file mode 100644
index 2641deb9daeb..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.1-wpa_cli.action
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2005 Gentoo Foundation
-# Written by Roy Marples <uberlord@gentoo.org>
-# Distributed under the terms of the GNU General Public License v2
-# Alternatively, this file may be distributed under the terms of the BSD License
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.1-wpa_cli.action,v 1.1 2005/05/23 11:49:48 brix Exp $
-
-if [ -z "$1" -o -z "$2" ]; then
-	echo "Insufficient parameters" > /dev/stderr
-	exit 1
-fi
-
-INTERFACE="$1"
-ACTION="$2"
-
-# Note, the below action must NOT mark the interface down via ifconfig, ip or
-# similar. Addresses can be removed, changed and daemons can be stopped, but
-# the interface must remain up for wpa_supplicant to work.
-
-if [ -f /etc/gentoo-release ]; then
-	EXEC="/etc/init.d/net.${INTERFACE} --quiet"
-else
-	echo "I don't know what to do with this distro!" > /dev/stderr
-	exit 1
-fi
-
-case ${ACTION} in
-	CONNECTED)
-		EXEC="${EXEC} start"
-		;;
-	DISCONNECTED)
-		EXEC="${EXEC} stop"
-		;;
-	*)
-		echo "Unknown action ${ACTION}" > /dev/stderr
-		exit 1
-		;;
-esac
-
-# ${EXEC} can use ${IN_BACKGROUND} so that it knows that the user isn't
-# stopping the interface and a background process - like wpa_cli - is.
-export IN_BACKGROUND=true
-
-${EXEC}
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.2-wpa_cli.action b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.2-wpa_cli.action
deleted file mode 100644
index 66ec575e5f7c..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.2-wpa_cli.action
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2005 Gentoo Foundation
-# Written by Roy Marples <uberlord@gentoo.org>
-# Distributed under the terms of the GNU General Public License v2
-# Alternatively, this file may be distributed under the terms of the BSD License
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.2-wpa_cli.action,v 1.1 2005/06/13 14:39:35 brix Exp $
-
-if [ -z "$1" -o -z "$2" ]; then
-	echo "Insufficient parameters" > /dev/stderr
-	exit 1
-fi
-
-INTERFACE="$1"
-ACTION="$2"
-
-# Note, the below action must NOT mark the interface down via ifconfig, ip or
-# similar. Addresses can be removed, changed and daemons can be stopped, but
-# the interface must remain up for wpa_supplicant to work.
-
-if [ -f /etc/gentoo-release ]; then
-	EXEC="/etc/init.d/net.${INTERFACE} --quiet"
-else
-	echo "I don't know what to do with this distro!" > /dev/stderr
-	exit 1
-fi
-
-case ${ACTION} in
-	CONNECTED)
-		EXEC="${EXEC} start"
-		;;
-	DISCONNECTED)
-		EXEC="${EXEC} stop"
-		;;
-	*)
-		echo "Unknown action ${ACTION}" > /dev/stderr
-		exit 1
-		;;
-esac
-
-# ${EXEC} can use ${IN_BACKGROUND} so that it knows that the user isn't
-# stopping the interface and a background process - like wpa_cli - is.
-export IN_BACKGROUND=true
-
-${EXEC}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.2.7.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.7.ebuild
deleted file mode 100644
index 4aa25bf83261..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.2.7.ebuild
+++ /dev/null
@@ -1,96 +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.7.ebuild,v 1.1 2005/02/14 14:20:15 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 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
-
-	if use gsm; then
-		# Smart card authentication
-		echo "CONFIG_EAP_SIM=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.4.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.0.ebuild
deleted file mode 100644
index 42c2ea75c951..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.0.ebuild
+++ /dev/null
@@ -1,116 +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.4.0.ebuild,v 1.1 2005/04/27 10:02:48 brix Exp $
-
-inherit toolchain-funcs
-
-MY_P=${PN}-${PV/_/-}
-S=${WORKDIR}/${MY_P}
-
-MADWIFI_VERSION="2005-04-20"
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${MY_P}.tar.gz
-		mirror://gentoo/madwifi-cvs-snapshot-${MADWIFI_VERSION}.tar.bz2"
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="debug 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 debug; then
-		echo "CONFIG_NO_STDOUT_DEBUG=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
-
-	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}
-		echo "CONFIG_SMARTCARD=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_IPW=y"         >> ${CONFIG}
-	echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_PRISM54=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_WEXT=y"        >> ${CONFIG}
-	echo "CONFIG_DRIVER_WIRED=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
-
-	newsbin ${FILESDIR}/${MY_P}-wpa_cli.action wpa_cli.action
-
-	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
-
-	newinitd ${FILESDIR}/${MY_P}-init.d wpa_supplicant || die
-	newconfd ${FILESDIR}/${MY_P}-conf.d wpa_supplicant || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use ${MY_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.4.1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.1.ebuild
deleted file mode 100644
index 0685a0be95e8..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.1.ebuild
+++ /dev/null
@@ -1,126 +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.4.1.ebuild,v 1.1 2005/05/23 11:49:48 brix Exp $
-
-inherit toolchain-funcs
-
-MY_P=${PN}-${PV/_/-}
-S=${WORKDIR}/${MY_P}
-
-MADWIFI_VERSION="2005-04-20"
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${MY_P}.tar.gz
-		mirror://gentoo/madwifi-cvs-snapshot-${MADWIFI_VERSION}.tar.bz2"
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="debug gsm qt readline ssl"
-
-DEPEND="gsm? ( sys-apps/pcsc-lite )
-		qt? ( x11-libs/qt )
-		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 debug; then
-		echo "CONFIG_NO_STDOUT_DEBUG=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
-
-	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}
-		echo "CONFIG_SMARTCARD=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_IPW=y"         >> ${CONFIG}
-	echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_PRISM54=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_WEXT=y"        >> ${CONFIG}
-	echo "CONFIG_DRIVER_WIRED=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"
-
-	if use qt; then
-		[[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings
-		emake wpa_gui || die "emake wpa_gui failed"
-	fi
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	if use qt; then
-		dobin wpa_gui/wpa_gui
-	fi
-
-	newsbin ${FILESDIR}/${MY_P}-wpa_cli.action wpa_cli.action
-
-	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
-
-	newinitd ${FILESDIR}/${MY_P}-init.d wpa_supplicant || die
-	newconfd ${FILESDIR}/${MY_P}-conf.d wpa_supplicant || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use ${MY_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.4.2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.2.ebuild
deleted file mode 100644
index f403d62466b3..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.2.ebuild
+++ /dev/null
@@ -1,126 +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.4.2.ebuild,v 1.1 2005/06/13 14:39:35 brix Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}-${PV/_/-}
-S=${WORKDIR}/${MY_P}
-
-MADWIFI_VERSION="2005-04-20"
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${MY_P}.tar.gz
-		mirror://gentoo/madwifi-cvs-snapshot-${MADWIFI_VERSION}.tar.bz2"
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="debug gsm qt readline ssl"
-
-DEPEND="gsm? ( sys-apps/pcsc-lite )
-		qt? ( x11-libs/qt )
-		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 debug; then
-		echo "CONFIG_NO_STDOUT_DEBUG=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
-
-	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}
-		echo "CONFIG_SMARTCARD=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_IPW=y"         >> ${CONFIG}
-	echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_PRISM54=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_WEXT=y"        >> ${CONFIG}
-	echo "CONFIG_DRIVER_WIRED=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"
-
-	if use qt; then
-		[[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings
-		emake wpa_gui || die "emake wpa_gui failed"
-	fi
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	if use qt; then
-		dobin wpa_gui/wpa_gui
-	fi
-
-	newsbin ${FILESDIR}/${MY_P}-wpa_cli.action wpa_cli.action
-
-	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
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use ${MY_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
-	einfo "Please note that the wpa_supplicant init script has been"
-	einfo "removed in favor of sys-apps/baselayout-1.11.x"
-	einfo
-}