Removing old version and broken live ebuild

(Portage version: 2.2_rc77/cvs/Linux i686)

6 files changed, 8 insertions, 794 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 2af812280ee8..a71ed30269ed 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.143 2010/08/14 10:16:52 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.144 2010/09/08 17:23:52 gurligebis Exp $
+
+  08 Sep 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  -wpa_supplicant-0.6.9.ebuild, -wpa_supplicant-0.7.1.ebuild,
+  -files/wpa_supplicant-0.7.1-dbus_path_fix.patch,
+  -wpa_supplicant-9999.ebuild,
+  -files/wpa_supplicant-9999-dbus_path_fix.patch:
+  Removing old versions and broken unsupported live ebuild
 
 *wpa_supplicant-0.7.2-r3 (14 Aug 2010)
 
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.1-dbus_path_fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.1-dbus_path_fix.patch
deleted file mode 100644
index eb4a1c01a5e0..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.1-dbus_path_fix.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- dbus/fi.epitest.hostap.WPASupplicant.service	2009-04-15 23:16:19.000000000 +0000
-+++ dbus/fi.epitest.hostap.WPASupplicant.service	2009-04-15 23:16:29.000000000 +0000
-@@ -1,4 +1,4 @@
- [D-BUS Service]
- Name=fi.epitest.hostap.WPASupplicant
--Exec=/sbin/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -u
- User=root
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-9999-dbus_path_fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-9999-dbus_path_fix.patch
deleted file mode 100644
index f21f831d42bd..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-9999-dbus_path_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
-index a9ce1ec..e8b4250 100644
---- a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
-+++ b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
-@@ -1,4 +1,4 @@
- [D-BUS Service]
- Name=fi.epitest.hostap.WPASupplicant
--Exec=/sbin/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -u
- User=root
-diff --git a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
-index df78471..f0f5172 100644
---- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
-+++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
-@@ -1,4 +1,4 @@
- [D-BUS Service]
- Name=fi.w1.wpa_supplicant1
--Exec=/sbin/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -u
- User=root
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
deleted file mode 100644
index b73dfd661191..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2010 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.6.9.ebuild,v 1.13 2010/06/05 11:07:17 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs qt4
-
-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"
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
-IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
-
-RDEPEND="dbus? ( sys-apps/dbus )
-	kernel_linux? (
-		eap-sim? ( sys-apps/pcsc-lite )
-		madwifi? ( ||
-			( >net-wireless/madwifi-ng-tools-0.9.3
-			net-wireless/madwifi-old )
-		)
-		dev-libs/libnl
-	)
-	!kernel_linux? ( net-libs/libpcap )
-	qt4? ( x11-libs/qt-gui:4
-		x11-libs/qt-svg:4 )
-	readline? ( sys-libs/ncurses sys-libs/readline )
-	ssl? ( dev-libs/openssl )
-	!ssl? ( gnutls? ( net-libs/gnutls ) )
-	!ssl? ( !gnutls? ( dev-libs/libtommath ) )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${P}/${PN}"
-
-pkg_setup() {
-	if use fasteap && (use gnutls || use ssl) ; then
-		die "If you use fasteap, you must build with wpa_supplicant's internal TLS implementation.  That is, both 'gnutls' and 'ssl' USE flags must be disabled"
-	fi
-
-	if use gnutls && use ssl ; then
-		einfo "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
-	fi
-}
-
-src_prepare() {
-	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
-	sed -i \
-		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-		../src/l2_packet/l2_packet_freebsd.c || die
-
-	# People seem to take the example configuration file too literally (bug #102361)
-	sed -i \
-		-e "s:^\(opensc_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_module_path\):#\1:" \
-		wpa_supplicant.conf || die
-
-	# Change configuration to match Gentoo locations (bug #143750)
-	sed -i \
-		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-		wpa_supplicant.conf || die
-
-	epatch "${FILESDIR}"/dbus_path_fix.patch
-}
-
-src_configure() {
-	# Toolchain setup
-	echo "CC = $(tc-getCC)" > .config
-
-	# Basic setup
-	echo "CONFIG_CTRL_IFACE=y" >> .config
-	echo "CONFIG_BACKEND=file" >> .config
-
-	# Basic authentication methods
-	# NOTE: we don't set GPSK or SAKE as they conflict
-	# with the below options
-	echo "CONFIG_EAP_GTC=y"         >> .config
-	echo "CONFIG_EAP_MD5=y"         >> .config
-	echo "CONFIG_EAP_OTP=y"         >> .config
-	echo "CONFIG_EAP_PAX=y"         >> .config
-	echo "CONFIG_EAP_PSK=y"         >> .config
-	echo "CONFIG_EAP_TLV=y"         >> .config
-	echo "CONFIG_IEEE8021X_EAPOL=y" >> .config
-	echo "CONFIG_PKCS12=y"          >> .config
-	echo "CONFIG_PEERKEY=y"         >> .config
-	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
-
-	if use dbus ; then
-		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
-	fi
-
-	if use debug ; then
-		echo "CONFIG_DEBUG_FILE=y" >> .config
-	fi
-
-	if use eap-sim ; then
-		# Smart card authentication
-		echo "CONFIG_EAP_SIM=y"       >> .config
-		echo "CONFIG_EAP_AKA=y"       >> .config
-		echo "CONFIG_EAP_AKA_PRIME=y" >> .config
-		echo "CONFIG_PCSC=y"          >> .config
-	fi
-
-	if use fasteap ; then
-		echo "CONFIG_EAP_FAST=y" >> .config
-	fi
-
-	if use readline ; then
-		# readline/history support for wpa_cli
-		echo "CONFIG_READLINE=y" >> .config
-	fi
-
-	# SSL authentication methods
-	if use ssl ; then
-		echo "CONFIG_TLS=openssl"    >> .config
-		echo "CONFIG_SMARTCARD=y"    >> .config
-	elif use gnutls ; then
-		echo "CONFIG_TLS=gnutls"     >> .config
-		echo "CONFIG_GNUTLS_EXTRA=y" >> .config
-	else
-		echo "CONFIG_TLS=internal"   >> .config
-	fi
-
-	if use kernel_linux ; then
-		# Linux specific drivers
-		echo "CONFIG_DRIVER_ATMEL=y"       >> .config
-		#echo "CONFIG_DRIVER_BROADCOM=y"   >> .config
-		#echo "CONFIG_DRIVER_HERMES=y"	   >> .config
-		echo "CONFIG_DRIVER_HOSTAP=y"      >> .config
-		echo "CONFIG_DRIVER_IPW=y"         >> .config
-		echo "CONFIG_DRIVER_NDISWRAPPER=y" >> .config
-		echo "CONFIG_DRIVER_NL80211=y"     >> .config
-		#echo "CONFIG_DRIVER_PRISM54=y"    >> .config
-		echo "CONFIG_DRIVER_RALINK=y"      >> .config
-		echo "CONFIG_DRIVER_WEXT=y"        >> .config
-		echo "CONFIG_DRIVER_WIRED=y"       >> .config
-
-		if use madwifi ; then
-			# Add include path for madwifi-driver headers
-			echo "CFLAGS += -I/usr/include/madwifi" >> .config
-			echo "CONFIG_DRIVER_MADWIFI=y"          >> .config
-		fi
-
-		if use ps3 ; then
-			echo "CONFIG_DRIVER_PS3=y" >> .config
-		fi
-
-	elif use kernel_FreeBSD ; then
-		# FreeBSD specific driver
-		echo "CONFIG_DRIVER_BSD=y" >> .config
-	fi
-
-	# Wi-Fi Protected Setup (WPS)
-	if use wps ; then
-		echo "CONFIG_WPS=y" >> .config
-	fi
-
-	# Enable mitigation against certain attacks against TKIP
-	echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use qt4 ; then
-		cd "${S}"/wpa_gui-qt4
-		eqmake4 wpa_gui.pro
-		emake || die "Qt4 wpa_gui compilation failed"
-	fi
-}
-
-src_install() {
-	dosbin wpa_supplicant || die
-	dobin wpa_cli wpa_passphrase || die
-
-	# baselayout-1 compat
-	if has_version "<sys-apps/baselayout-2.0.0"; then
-		dodir /sbin
-		dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant || die
-		dodir /bin
-		dosym /usr/bin/wpa_cli /bin/wpa_cli || die
-	fi
-
-	if has_version ">=sys-apps/openrc-0.5.0"; then
-		newinitd "$FILESDIR"/${PN}-init.d wpa_supplicant
-		newconfd "$FILESDIR"/${PN}-conf.d wpa_supplicant
-	fi
-
-	exeinto /etc/wpa_supplicant/
-	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
-
-	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
-		wpa_supplicant.conf || die "dodoc failed"
-
-	doman doc/docbook/*.{5,8} || die "doman failed"
-
-	if use qt4 ; then
-		into /usr
-		dobin wpa_gui-qt4/wpa_gui || die
-	fi
-
-	if use qt4 ; then
-		doicon wpa_gui-qt4/icons/wpa_gui.svg || die "Icon not found"
-		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
-	fi
-
-	if use dbus ; then
-		insinto /etc/dbus-1/system.d
-		newins dbus-wpa_supplicant.conf wpa_supplicant.conf || die
-		insinto /usr/share/dbus-1/system-services
-		newins dbus-wpa_supplicant.service 'fi.epitest.hostap.WPASupplicant.service' || die
-		keepdir /var/run/wpa_supplicant
-	fi
-}
-
-pkg_postinst() {
-	einfo "If this is a clean installation of wpa_supplicant, you"
-	einfo "have to create a configuration file named"
-	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file is available for reference in"
-	einfo "/usr/share/doc/${PF}/"
-
-	if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
-		echo
-		ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
-		ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
-	fi
-
-	if use madwifi ; then
-		echo
-		einfo "This package compiles against the headers installed by"
-		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
-		einfo "You should re-emerge ${PN} after upgrading these packages."
-	fi
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.1.ebuild
deleted file mode 100644
index 77556d053966..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2010 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.7.1.ebuild,v 1.6 2010/06/05 11:07:17 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs qt4-r2
-
-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"
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
-
-RDEPEND="dbus? ( sys-apps/dbus )
-	kernel_linux? (
-		eap-sim? ( sys-apps/pcsc-lite )
-		madwifi? ( ||
-			( >net-wireless/madwifi-ng-tools-0.9.3
-			net-wireless/madwifi-old )
-		)
-		dev-libs/libnl
-	)
-	!kernel_linux? ( net-libs/libpcap )
-	qt4? ( x11-libs/qt-gui:4
-		x11-libs/qt-svg:4 )
-	readline? ( sys-libs/ncurses sys-libs/readline )
-	ssl? ( dev-libs/openssl )
-	!ssl? ( gnutls? ( net-libs/gnutls ) )
-	!ssl? ( !gnutls? ( dev-libs/libtommath ) )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${P}/${PN}"
-
-pkg_setup() {
-	if use fasteap && (use gnutls || use ssl) ; then
-		die "If you use fasteap, you must build with wpa_supplicant's internal TLS implementation.  That is, both 'gnutls' and 'ssl' USE flags must be disabled"
-	fi
-
-	if use gnutls && use ssl ; then
-		einfo "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
-	fi
-}
-
-src_prepare() {
-	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
-	sed -i \
-		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-		../src/l2_packet/l2_packet_freebsd.c || die
-
-	# People seem to take the example configuration file too literally (bug #102361)
-	sed -i \
-		-e "s:^\(opensc_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_module_path\):#\1:" \
-		wpa_supplicant.conf || die
-
-	# Change configuration to match Gentoo locations (bug #143750)
-	sed -i \
-		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-		wpa_supplicant.conf || die
-
-	epatch "${FILESDIR}"/${P}-dbus_path_fix.patch
-}
-
-src_configure() {
-	# Toolchain setup
-	echo "CC = $(tc-getCC)" > .config
-
-	# Basic setup
-	echo "CONFIG_CTRL_IFACE=y" >> .config
-	echo "CONFIG_BACKEND=file" >> .config
-
-	# Basic authentication methods
-	# NOTE: we don't set GPSK or SAKE as they conflict
-	# with the below options
-	echo "CONFIG_EAP_GTC=y"         >> .config
-	echo "CONFIG_EAP_MD5=y"         >> .config
-	echo "CONFIG_EAP_OTP=y"         >> .config
-	echo "CONFIG_EAP_PAX=y"         >> .config
-	echo "CONFIG_EAP_PSK=y"         >> .config
-	echo "CONFIG_EAP_TLV=y"         >> .config
-	echo "CONFIG_IEEE8021X_EAPOL=y" >> .config
-	echo "CONFIG_PKCS12=y"          >> .config
-	echo "CONFIG_PEERKEY=y"         >> .config
-	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
-
-	if use dbus ; then
-		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
-	fi
-
-	if use debug ; then
-		echo "CONFIG_DEBUG_FILE=y" >> .config
-	fi
-
-	if use eap-sim ; then
-		# Smart card authentication
-		echo "CONFIG_EAP_SIM=y"       >> .config
-		echo "CONFIG_EAP_AKA=y"       >> .config
-		echo "CONFIG_EAP_AKA_PRIME=y" >> .config
-		echo "CONFIG_PCSC=y"          >> .config
-	fi
-
-	if use fasteap ; then
-		echo "CONFIG_EAP_FAST=y" >> .config
-	fi
-
-	if use readline ; then
-		# readline/history support for wpa_cli
-		echo "CONFIG_READLINE=y" >> .config
-	fi
-
-	# SSL authentication methods
-	if use ssl ; then
-		echo "CONFIG_TLS=openssl"    >> .config
-		echo "CONFIG_SMARTCARD=y"    >> .config
-	elif use gnutls ; then
-		echo "CONFIG_TLS=gnutls"     >> .config
-		echo "CONFIG_GNUTLS_EXTRA=y" >> .config
-	else
-		echo "CONFIG_TLS=internal"   >> .config
-	fi
-
-	if use kernel_linux ; then
-		# Linux specific drivers
-		echo "CONFIG_DRIVER_ATMEL=y"       >> .config
-		#echo "CONFIG_DRIVER_BROADCOM=y"   >> .config
-		#echo "CONFIG_DRIVER_HERMES=y"	   >> .config
-		echo "CONFIG_DRIVER_HOSTAP=y"      >> .config
-		echo "CONFIG_DRIVER_IPW=y"         >> .config
-		echo "CONFIG_DRIVER_NDISWRAPPER=y" >> .config
-		echo "CONFIG_DRIVER_NL80211=y"     >> .config
-		#echo "CONFIG_DRIVER_PRISM54=y"    >> .config
-		echo "CONFIG_DRIVER_RALINK=y"      >> .config
-		echo "CONFIG_DRIVER_WEXT=y"        >> .config
-		echo "CONFIG_DRIVER_WIRED=y"       >> .config
-
-		if use madwifi ; then
-			# Add include path for madwifi-driver headers
-			echo "CFLAGS += -I/usr/include/madwifi" >> .config
-			echo "CONFIG_DRIVER_MADWIFI=y"          >> .config
-		fi
-
-		if use ps3 ; then
-			echo "CONFIG_DRIVER_PS3=y" >> .config
-		fi
-
-	elif use kernel_FreeBSD ; then
-		# FreeBSD specific driver
-		echo "CONFIG_DRIVER_BSD=y" >> .config
-	fi
-
-	# Wi-Fi Protected Setup (WPS)
-	if use wps ; then
-		echo "CONFIG_WPS=y" >> .config
-	fi
-
-	# Enable mitigation against certain attacks against TKIP
-	echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config
-
-	if use qt4 ; then
-		cd "${S}"/wpa_gui-qt4
-		eqmake4 wpa_gui.pro
-	fi
-}
-
-src_compile() {
-	einfo "Building wpa_supplicant"
-	emake || die "emake failed"
-
-	if use qt4 ; then
-		cd "${S}"/wpa_gui-qt4
-		einfo "Building wpa_gui"
-		emake || die "wpa_gui compilation failed"
-	fi
-}
-
-src_install() {
-	dosbin wpa_supplicant || die
-	dobin wpa_cli wpa_passphrase || die
-
-	# baselayout-1 compat
-	if has_version "<sys-apps/baselayout-2.0.0"; then
-		dodir /sbin
-		dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant || die
-		dodir /bin
-		dosym /usr/bin/wpa_cli /bin/wpa_cli || die
-	fi
-
-	if has_version ">=sys-apps/openrc-0.5.0"; then
-		newinitd "$FILESDIR"/${PN}-init.d wpa_supplicant
-		newconfd "$FILESDIR"/${PN}-conf.d wpa_supplicant
-	fi
-
-	exeinto /etc/wpa_supplicant/
-	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
-
-	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
-		wpa_supplicant.conf || die "dodoc failed"
-
-	doman doc/docbook/*.{5,8} || die "doman failed"
-
-	if use qt4 ; then
-		into /usr
-		dobin wpa_gui-qt4/wpa_gui || die
-		doicon wpa_gui-qt4/icons/wpa_gui.svg || die "Icon not found"
-		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
-	fi
-
-	if use dbus ; then
-		cd "${S}"/dbus
-		insinto /etc/dbus-1/system.d
-		newins dbus-wpa_supplicant.conf wpa_supplicant.conf || die
-		insinto /usr/share/dbus-1/system-services
-		doins fi.epitest.hostap.WPASupplicant.service || die
-		keepdir /var/run/wpa_supplicant
-	fi
-}
-
-pkg_postinst() {
-	einfo "If this is a clean installation of wpa_supplicant, you"
-	einfo "have to create a configuration file named"
-	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file is available for reference in"
-	einfo "/usr/share/doc/${PF}/"
-
-	if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
-		echo
-		ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
-		ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
-	fi
-
-	if use madwifi ; then
-		echo
-		einfo "This package compiles against the headers installed by"
-		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
-		einfo "You should re-emerge ${PN} after upgrading these packages."
-	fi
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
deleted file mode 100644
index 39eca79b9b1b..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild,v 1.5 2010/07/25 13:29:03 alexxy Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs qt4
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://w1.fi/srv/git/hostap.git"
-	inherit git
-	SRC_URI=""
-	S="${WORKDIR}/${P}/${PN}/${PN}"
-else
-	SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-	S="${WORKDIR}/${P}/${PN}"
-fi
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS=""
-IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
-
-DEPEND="dev-libs/libnl
-	dbus? ( sys-apps/dbus )
-	kernel_linux? (
-		eap-sim? ( sys-apps/pcsc-lite )
-		madwifi? ( ||
-			( >net-wireless/madwifi-ng-tools-0.9.3
-			net-wireless/madwifi-old )
-		)
-	)
-	!kernel_linux? ( net-libs/libpcap )
-	qt4? ( x11-libs/qt-gui:4 )
-	readline? ( sys-libs/ncurses sys-libs/readline )
-	ssl? ( dev-libs/openssl )
-	!ssl? ( gnutls? ( net-libs/gnutls ) )
-	!ssl? ( !gnutls? ( dev-libs/libtommath ) )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/${PN}/${PN}"
-
-src_unpack() {
-	einfo "src dir ${S}/"
-	if [[ ${PV} == "9999" ]] ; then
-		S="${WORKDIR}/${P}/${PN}"
-		git_src_unpack
-		S="${WORKDIR}/${P}/${PN}/${PN}"
-	  else
-		unpack ${A}
-	fi
-	cd "${S}"
-}
-
-pkg_setup() {
-	if use fasteap && (use gnutls || use ssl) ; then
-		die "If you use fasteap, you must build with wpa_supplicant's internal TLS implementation.  That is, both 'gnutls' and 'ssl' USE flags must be disabled"
-	fi
-
-	if use gnutls && use ssl ; then
-		einfo "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
-	fi
-}
-
-src_prepare() {
-	einfo "src dir ${S}/"
-
-	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
-	sed -i \
-		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-		../src/l2_packet/l2_packet_freebsd.c || die
-
-	# People seem to take the example configuration file too literally (bug #102361)
-	sed -i \
-		-e "s:^\(opensc_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_module_path\):#\1:" \
-		wpa_supplicant.conf || die
-
-	# Change configuration to match Gentoo locations (bug #143750)
-	sed -i \
-		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-		wpa_supplicant.conf || die
-
-	epatch "${FILESDIR}"/${P}-dbus_path_fix.patch
-}
-
-src_configure() {
-# 	cd ${S}/${PN}
-	# Toolchain setup
-	echo "CC = $(tc-getCC)" > .config
-
-	# Basic setup
-	echo "CONFIG_CTRL_IFACE=y" >> .config
-	echo "CONFIG_BACKEND=file" >> .config
-
-	# Basic authentication methods
-	# NOTE: we don't set GPSK or SAKE as they conflict
-	# with the below options
-	echo "CONFIG_EAP_GTC=y"         >> .config
-	echo "CONFIG_EAP_MD5=y"         >> .config
-	echo "CONFIG_EAP_OTP=y"         >> .config
-	echo "CONFIG_EAP_PAX=y"         >> .config
-	echo "CONFIG_EAP_PSK=y"         >> .config
-	echo "CONFIG_EAP_TLV=y"         >> .config
-	echo "CONFIG_IEEE8021X_EAPOL=y" >> .config
-	echo "CONFIG_PKCS12=y"          >> .config
-	echo "CONFIG_PEERKEY=y"         >> .config
-	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
-
-	if use dbus ; then
-		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
-	fi
-
-	if use debug ; then
-		echo "CONFIG_DEBUG_FILE=y" >> .config
-	fi
-
-	if use eap-sim ; then
-		# Smart card authentication
-		echo "CONFIG_EAP_SIM=y"       >> .config
-		echo "CONFIG_EAP_AKA=y"       >> .config
-		echo "CONFIG_EAP_AKA_PRIME=y" >> .config
-		echo "CONFIG_PCSC=y"          >> .config
-	fi
-
-	if use fasteap ; then
-		echo "CONFIG_EAP_FAST=y" >> .config
-	fi
-
-	if use readline ; then
-		# readline/history support for wpa_cli
-		echo "CONFIG_READLINE=y" >> .config
-	fi
-
-	# SSL authentication methods
-	if use ssl ; then
-		echo "CONFIG_TLS=openssl"    >> .config
-		echo "CONFIG_SMARTCARD=y"    >> .config
-	elif use gnutls ; then
-		echo "CONFIG_TLS=gnutls"     >> .config
-		echo "CONFIG_GNUTLS_EXTRA=y" >> .config
-	else
-		echo "CONFIG_TLS=internal"   >> .config
-	fi
-
-	if use kernel_linux ; then
-		# Linux specific drivers
-		echo "CONFIG_DRIVER_ATMEL=y"       >> .config
-		#echo "CONFIG_DRIVER_BROADCOM=y"   >> .config
-		#echo "CONFIG_DRIVER_HERMES=y"	   >> .config
-		echo "CONFIG_DRIVER_HOSTAP=y"      >> .config
-		echo "CONFIG_DRIVER_IPW=y"         >> .config
-		echo "CONFIG_DRIVER_NDISWRAPPER=y" >> .config
-		echo "CONFIG_DRIVER_NL80211=y"     >> .config
-		#echo "CONFIG_DRIVER_PRISM54=y"    >> .config
-		echo "CONFIG_DRIVER_RALINK=y"      >> .config
-		echo "CONFIG_DRIVER_WEXT=y"        >> .config
-		echo "CONFIG_DRIVER_WIRED=y"       >> .config
-
-		if use madwifi ; then
-			# Add include path for madwifi-driver headers
-			echo "CFLAGS += -I/usr/include/madwifi" >> .config
-			echo "CONFIG_DRIVER_MADWIFI=y"          >> .config
-		fi
-
-		if use ps3 ; then
-			echo "CONFIG_DRIVER_PS3=y" >> .config
-		fi
-
-	elif use kernel_FreeBSD ; then
-		# FreeBSD specific driver
-		echo "CONFIG_DRIVER_BSD=y" >> .config
-	fi
-
-	# Wi-Fi Protected Setup (WPS)
-	if use wps ; then
-		echo "CONFIG_WPS=y" >> .config
-	fi
-
-	# Enable mitigation against certain attacks against TKIP
-	echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config
-}
-
-src_compile() {
-# 	cd ${S}/${PN}
-	emake || die "emake failed"
-
-	if use qt4 ; then
-		cd "${S}"/wpa_gui-qt4
-		eqmake4 wpa_gui.pro
-		emake || die "Qt4 wpa_gui compilation failed"
-	fi
-}
-
-src_install() {
-
-# 	cd ${S}/${PN}
-
-	dosbin wpa_supplicant || die
-	dobin wpa_cli wpa_passphrase || die
-
-	# baselayout-1 compat
-	if has_version "<sys-apps/baselayout-2.0.0"; then
-		dodir /sbin
-		dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant || die
-		dodir /bin
-		dosym /usr/bin/wpa_cli /bin/wpa_cli || die
-	fi
-
-	exeinto /etc/wpa_supplicant/
-	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
-
-	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
-		wpa_supplicant.conf || die "dodoc failed"
-
-	if use qt4 ; then
-		into /usr
-		dobin wpa_gui-qt4/wpa_gui || die
-	fi
-
-	if use qt4 ; then
-		doicon wpa_gui-qt4/icons/wpa_gui.svg || die "Icon not found"
-		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
-	fi
-
-	if use dbus ; then
-		insinto /etc/dbus-1/system.d
-		newins dbus-wpa_supplicant.conf wpa_supplicant.conf || die
-		insinto /usr/share/dbus-1/system-services
-		newins dbus-wpa_supplicant.service 'fi.epitest.hostap.WPASupplicant.service' || die
-		keepdir /var/run/wpa_supplicant
-	fi
-}
-
-pkg_postinst() {
-	einfo "If this is a clean installation of wpa_supplicant, you"
-	einfo "have to create a configuration file named"
-	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file is available for reference in"
-	einfo "/usr/share/doc/${PF}/"
-
-	if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
-		echo
-		ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
-		ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
-	fi
-
-	if use madwifi ; then
-		echo
-		einfo "This package compiles against the headers installed by"
-		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
-		einfo "You should re-emerge ${PN} after upgrading these packages."
-	fi
-}
-
-pkg_postinst() {
-	ewarn "You are installing a live ebuild of wpa_supplicant"
-	ewarn "Since this is a moving target, bug reports must be"
-	ewarn "reported on a regular ebuild instead."
-}