Drop old ebuilds. Fix Qt4 deps (including bugs 245123 and 269337).

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

8 files changed, 24 insertions, 917 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index b7c65b3e3f9a..80a9f22dea43 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.119 2009/05/18 22:27:58 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.120 2009/06/25 18:59:07 yngwin Exp $
+
+  25 Jun 2009; Ben de Groot <yngwin@gentoo.org>
+  -wpa_supplicant-0.5.7.ebuild, -wpa_supplicant-0.5.8.ebuild,
+  -wpa_supplicant-0.5.10.ebuild, -wpa_supplicant-0.6.3.ebuild,
+  wpa_supplicant-0.6.4.ebuild, wpa_supplicant-0.6.9.ebuild:
+  Drop old ebuilds. Fix Qt4 deps (including bugs 245123 and 269337).
 
 *wpa_supplicant-9999 (18 May 2009)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 200f48423e22..9e23ffebe09d 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -4,18 +4,10 @@ AUX wpa_supplicant-0.5.10-gcc-4.3.patch 1362 RMD160 2d3e8ee4cdda932e83127203db26
 AUX wpa_supplicant-0.5.7-gnutls.patch 375 RMD160 b8868a503a71d2cc4ebd4826430654c3a6645ec0 SHA1 fdfa5fefc507fa133f7d41a7ca75c33b14d876f7 SHA256 7d4a2a6f70fd18757e139ca1d1dc2734fe854ea1879d62d378febce49feef3aa
 AUX wpa_supplicant-0.6.3-ps3_support.patch 10930 RMD160 e572a6c024e8f8b845fd404c775813e4f65b4de5 SHA1 88f804078bb25ebc0630b2dd5a5133126d24f7ba SHA256 b4b2082a4cd25c0fd23a783d2d8d55985a1acc44e30a9c6757e6252c4405711a
 AUX wpa_supplicant.conf 183 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 SHA1 0a7f2922ad2394f475e1485d5537d1b2c6d7cafb SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a
-DIST wpa_supplicant-0.5.10.tar.gz 720661 RMD160 8559827e5df80b50a8c7a9ddd2190189c1c689be SHA1 db2bba1df664675ff06c7e334e22a60c4e3a7a49 SHA256 c5c5ae89b4d3a247d4f5dcfa37e86df248d7e483d42636ef1f82c0bc48597dde
-DIST wpa_supplicant-0.5.7.tar.gz 713251 RMD160 dffc3b5cbead92757840f71ccdd4548348698b28 SHA1 43f769d46fdca47b024e777331fb00577595c0ef SHA256 cf688be96ba5f3227876b3412150e84a3cee60ddd0207b6d940d1fbbaf136b57
-DIST wpa_supplicant-0.5.8.tar.gz 714467 RMD160 322cd5cba8afffe8343bd8c574e8941fd595dbad SHA1 434545faf4758044629f574d82939511be8deb0b SHA256 2f9755e2e3f96d26380857ef95be7765e6e276f6b53194c70633c027485d67f0
-DIST wpa_supplicant-0.6.3.tar.gz 952273 RMD160 4aa954040e3eae572fe600fda8587885e1fface1 SHA1 0e15731bb3fc5c84a1292d665afd53e2fc176998 SHA256 f70b18243e049bbda66254388b6e94d404e747d913b8496d6e93a9c56bbf4af2
 DIST wpa_supplicant-0.6.4.tar.gz 995486 RMD160 338b901726779a47cb3c3cb43b11d3d38af3fe7d SHA1 c17a992bdcbe0d2427f0968c5a921e54cf28306f SHA256 0c10e59dd079c4e5d9ec6eebe9a8ac0e1b9e472cccef49c705f87a78391e79fa
 DIST wpa_supplicant-0.6.9.tar.gz 1178238 RMD160 e8427935b17c354c2654250501236dcd3f239307 SHA1 3764f7bda4e5c87caac2b9e134cb59996f073f09 SHA256 6e5284fa3f7c56e001fae92486eaa31340db5dd925dcb38bd572d2e8ed70f570
-EBUILD wpa_supplicant-0.5.10.ebuild 6595 RMD160 e7e75759a33d8f5e644918f3a52e162bb51f825a SHA1 940d5c66bd325d3a5ea76a392e8435a1eac6003f SHA256 364f680b9e9e795f3c2c54ae57b5bd4cf1a1168136016193f77d3d632a245792
-EBUILD wpa_supplicant-0.5.7.ebuild 6329 RMD160 0aed14875974e8b696a872328fffe5cad2beebbf SHA1 170c32870860ae0278b52fce61d2da104b0dd3f0 SHA256 6c55c20a3bbc0bc48b0eaee71775fb238299a28e0a12aa706d07b4343c6c3178
-EBUILD wpa_supplicant-0.5.8.ebuild 6289 RMD160 4c656f7f675f8ed1610da6ecc91895228db47420 SHA1 98d8e97dd2290812d3969f41e4081f6f2414afff SHA256 dda3a969516ec52fc8c52a0c1bcc0076eb128ed0a7893f72337d5ffc82629ce3
-EBUILD wpa_supplicant-0.6.3.ebuild 6565 RMD160 4a235424a74e4b8ccd0bc6bc645332fe0b2bb2b8 SHA1 08bbed20b1e894af246f6d7365aa777280879c75 SHA256 edcc845695c6515fb35cb430d7c9b678fff9b9459de2908b9a7955547dca746d
-EBUILD wpa_supplicant-0.6.4.ebuild 6709 RMD160 5be6f93f12fabf7328020f8acc82362aaa75fe59 SHA1 931c3150ff167647b3f52c87722485cc7f164b77 SHA256 6c411291a5bab03dff96ad6b5b5986f13c1f54883191180886819fc620980e6b
-EBUILD wpa_supplicant-0.6.9.ebuild 7040 RMD160 f2ba4ef725534956b37bc5b63969973889a4b9e5 SHA1 42de9aa59512a03668c5da37bfda852a82a9bb96 SHA256 556eb1f5e8ce979de257714f927d9d652bd58f5c265440ff0faebb3d742a9171
+EBUILD wpa_supplicant-0.6.4.ebuild 6693 RMD160 df1644e7b9abf9dfc2e9844acab543f116fccabd SHA1 4b7b90f36f0bbe044ac7550949dc80835941714b SHA256 21f5e5352bc5bfc1fac0af32d99c08572c162210f068b7ff1e473af198ff2771
+EBUILD wpa_supplicant-0.6.9.ebuild 7056 RMD160 a083e0f376ff8b57a319136edb91b8cd7ac0a5a7 SHA1 2037c5d955550a3e581fa91a301a02edc6235c7e SHA256 d6259dbc54e73324833c7f8114468d8a9c3d8f601fa4d4911109ed62062758ed
 EBUILD wpa_supplicant-9999.ebuild 7581 RMD160 b988d4b5427c8b5b3c8716d76f07a857685b6aa5 SHA1 908209ae2fe0bf625d84c32f0575063e2eca02b2 SHA256 e35822c796849541ed403f4ca6b9487f3d2bcb28347087c3db975222e3d707d7
-MISC ChangeLog 25789 RMD160 ca1f8b7fdf0b46029f9606be6abb574f0804b68c SHA1 54ac0729956a18343c94ad4ac3087552287edca0 SHA256 a4932a84c5ea9fee887e9a68fa49dfffc9f4b784d9ea4f2bab360094bab3c825
+MISC ChangeLog 26088 RMD160 4b69c91e1b1874f764c3a6c5a3b766c88ab2b4ae SHA1 e896a6ccef2f2c000efa89c5298ea0556d6ca013 SHA256 76bec558b6bf1efb0e4f49b024a783b9338f701c6ce57060a841928492427e4c
 MISC metadata.xml 571 RMD160 71dd26fb78e0841fdf8094e70f69ed8f3467767f SHA1 d506d908102c64873349b144915070b19bdd5fda SHA256 d51b505588babd99225c67330dcb85a438c3739e8aa56c2b65c14a91a46aa4fa
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild
deleted file mode 100644
index 24a0dc43e07e..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.10.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2009 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.5.10.ebuild,v 1.6 2009/05/05 21:13:20 gurligebis Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs
-
-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 gnutls eap-sim madwifi qt3 qt4 readline ssl 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 )
-			)
-		)
-		!kernel_linux? ( net-libs/libpcap )
-		qt4? (
-			|| ( ( x11-libs/qt-core:4
-				x11-libs/qt-gui:4
-				x11-libs/qt-qt3support:4 )
-				<x11-libs/qt-4.4:4
-			)
-		)
-		!qt4? ( qt3? ( =x11-libs/qt-3* ) )
-		readline? ( sys-libs/ncurses sys-libs/readline )
-		ssl? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls )
-		!ssl? ( !gnutls? ( dev-libs/libtommath ) )"
-
-pkg_setup() {
-	if use qt3 && use qt4; then
-		einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\""
-	fi
-
-	if use qt4 && has_version ">=x11-libs/qt-4.2.2" ; then
-		if ! built_with_use x11-libs/qt qt3support ; then
-			eerror ">=qt4.2.2 requires qt3support"
-			die "rebuild >=x11-libs/qt-4.2.2 with the qt3support USE flag"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
-
-	# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
-	sed -i \
-		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-		l2_packet_freebsd.c || die
-
-	# 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 eap-sim ; 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
-
-	# SSL authentication methods
-	if use gnutls ; then
-		echo "CONFIG_TLS=gnutls" >> .config
-		echo "CONFIG_GNUTLS_EXTRA=y" >> .config
-	elif use ssl ; then
-		echo "CONFIG_TLS=openssl" >> .config
-		echo "CONFIG_SMARTCARD=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_PRISM54=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
-	elif use kernel_FreeBSD ; then
-		# FreeBSD specific driver
-		echo "CONFIG_DRIVER_BSD=y" >> .config
-	fi
-
-	# 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, #143750
-	sed -i \
-		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-		wpa_supplicant.conf || die
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use qt4 ; then
-		qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro
-		cd "${S}"/wpa_gui-qt4
-		emake || die "emake wpa_gui-qt4 failed"
-	elif use qt3 ; then
-		[[ -d "${QTDIR}"/etc/settings ]] && addwrite "${QTDIR}"/etc/settings
-		"${QTDIR}"/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro
-		cd "${S}"/wpa_gui
-		emake || die "emake wpa_gui failed"
-	fi
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	# baselayout-1 compat
-	dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
-	dosym /usr/bin/wpa_cli /bin/wpa_cli
-
-	exeinto /etc/wpa_supplicant/
-	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
-	insinto /etc/wpa_supplicant/
-	newins "${FILESDIR}"/wpa_supplicant.conf wpa_supplicant.conf
-
-	dodoc ChangeLog eap_testing.txt README todo.txt
-	newdoc wpa_supplicant.conf wpa_supplicant.conf
-
-	doman doc/docbook/*.8
-	doman doc/docbook/*.5
-
-	if use qt4 ; then
-		into /usr
-		dobin wpa_gui-qt4/wpa_gui
-	elif use qt3 ; then
-		into /usr
-		dobin wpa_gui/wpa_gui
-	fi
-
-	if use qt3 || use qt4; then
-		make_desktop_entry wpa_gui "WPA_Supplicant Administration GUI"
-	fi
-
-	if use dbus ; then
-		insinto /etc/dbus-1/system.d
-		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
-		insinto /usr/share/dbus-1/system-services
-		newins dbus-wpa_supplicant.service 'fi.epitest.hostap.WPASupplicant.service'
-		keepdir /var/run/wpa_supplicant
-	fi
-}
-
-pkg_postinst() {
-	einfo "A default configuration file has been installed to"
-	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file is available as"
-	einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.gz"
-
-	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 remerge ${PN} after upgrading these packages."
-	fi
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild
deleted file mode 100644
index ee0ec51b7d70..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2009 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.5.7.ebuild,v 1.13 2009/05/05 21:13:20 gurligebis Exp $
-
-inherit eutils toolchain-funcs
-
-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 gnutls eap-sim madwifi qt3 qt4 readline ssl 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 )
-			)
-		)
-		!kernel_linux? ( net-libs/libpcap )
-		qt4? ( =x11-libs/qt-4* )
-		!qt4? ( qt3? ( =x11-libs/qt-3* ) )
-		readline? ( sys-libs/ncurses sys-libs/readline )
-		ssl? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls )
-		!ssl? ( !gnutls? ( dev-libs/libtommath ) )"
-
-pkg_setup() {
-	if use qt3 && use qt4; then
-		einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\""
-	fi
-
-	if use qt4 && has_version ">=x11-libs/qt-4.2.2" ; then
-		if ! built_with_use x11-libs/qt qt3support ; then
-			eerror ">=qt4.2.2 requires qt3support"
-			die "rebuild >=x11-libs/qt-4.2.2 with the qt3support USE flag"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}"-gnutls.patch
-
-	# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
-	sed -i \
-		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-		l2_packet_freebsd.c || die
-
-	# 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 eap-sim ; 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_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_PRISM54=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
-	elif use kernel_FreeBSD ; then
-		# FreeBSD specific driver
-		echo "CONFIG_DRIVER_BSD=y" >> .config
-	fi
-
-	# 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, #143750
-	sed -i \
-		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-		wpa_supplicant.conf || die
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use qt4 ; then
-		qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro
-		cd "${S}"/wpa_gui-qt4
-		emake || die "emake wpa_gui-qt4 failed"
-	elif use qt3 ; then
-		[[ -d "${QTDIR}"/etc/settings ]] && addwrite "${QTDIR}"/etc/settings
-		"${QTDIR}"/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro
-		cd "${S}"/wpa_gui
-		emake || die "emake wpa_gui failed"
-	fi
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	# baselayout-1 compat
-	dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
-	dosym /usr/bin/wpa_cli /bin/wpa_cli
-
-	exeinto /etc/wpa_supplicant/
-	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
-	insinto /etc/wpa_supplicant/
-	newins "${FILESDIR}"/wpa_supplicant.conf wpa_supplicant.conf
-
-	dodoc ChangeLog eap_testing.txt README todo.txt
-	newdoc wpa_supplicant.conf wpa_supplicant.conf
-
-	doman doc/docbook/*.8
-	doman doc/docbook/*.5
-
-	if use qt4 ; then
-		into /usr
-		dobin wpa_gui-qt4/wpa_gui
-	elif use qt3 ; then
-		into /usr
-		dobin wpa_gui/wpa_gui
-	fi
-
-	if use qt3 || use qt4; then
-		make_desktop_entry wpa_gui "WPA_Supplicant Administration GUI"
-	fi
-
-	if use dbus ; then
-		insinto /etc/dbus-1/system.d
-		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
-	fi
-}
-
-pkg_postinst() {
-	einfo "A default configuration file has been installed to"
-	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file is available as"
-	einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.gz"
-
-	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 remerge ${PN} after upgrading these packages."
-	fi
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild
deleted file mode 100644
index 0fb95faa07ab..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2009 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.5.8.ebuild,v 1.8 2009/05/05 21:13:20 gurligebis Exp $
-
-inherit eutils toolchain-funcs
-
-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 gnutls eap-sim madwifi qt3 qt4 readline ssl 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 )
-			)
-		)
-		!kernel_linux? ( net-libs/libpcap )
-		qt4? ( =x11-libs/qt-4* )
-		!qt4? ( qt3? ( =x11-libs/qt-3* ) )
-		readline? ( sys-libs/ncurses sys-libs/readline )
-		ssl? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls )
-		!ssl? ( !gnutls? ( dev-libs/libtommath ) )"
-
-pkg_setup() {
-	if use qt3 && use qt4; then
-		einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\""
-	fi
-
-	if use qt4 && has_version ">=x11-libs/qt-4.2.2" ; then
-		if ! built_with_use x11-libs/qt qt3support ; then
-			eerror ">=qt4.2.2 requires qt3support"
-			die "rebuild >=x11-libs/qt-4.2.2 with the qt3support USE flag"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${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:" \
-		l2_packet_freebsd.c || die
-
-	# 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 eap-sim ; 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
-
-	# SSL authentication methods
-	if use gnutls ; then
-		echo "CONFIG_TLS=gnutls" >> .config
-		echo "CONFIG_GNUTLS_EXTRA=y" >> .config
-	elif use ssl ; then
-		echo "CONFIG_TLS=openssl" >> .config
-		echo "CONFIG_SMARTCARD=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_PRISM54=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
-	elif use kernel_FreeBSD ; then
-		# FreeBSD specific driver
-		echo "CONFIG_DRIVER_BSD=y" >> .config
-	fi
-
-	# 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, #143750
-	sed -i \
-		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-		wpa_supplicant.conf || die
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use qt4 ; then
-		qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro
-		cd "${S}"/wpa_gui-qt4
-		emake || die "emake wpa_gui-qt4 failed"
-	elif use qt3 ; then
-		[[ -d "${QTDIR}"/etc/settings ]] && addwrite "${QTDIR}"/etc/settings
-		"${QTDIR}"/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro
-		cd "${S}"/wpa_gui
-		emake || die "emake wpa_gui failed"
-	fi
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	# baselayout-1 compat
-	dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
-	dosym /usr/bin/wpa_cli /bin/wpa_cli
-
-	exeinto /etc/wpa_supplicant/
-	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
-	insinto /etc/wpa_supplicant/
-	newins "${FILESDIR}"/wpa_supplicant.conf wpa_supplicant.conf
-
-	dodoc ChangeLog eap_testing.txt README todo.txt
-	newdoc wpa_supplicant.conf wpa_supplicant.conf
-
-	doman doc/docbook/*.8
-	doman doc/docbook/*.5
-
-	if use qt4 ; then
-		into /usr
-		dobin wpa_gui-qt4/wpa_gui
-	elif use qt3 ; then
-		into /usr
-		dobin wpa_gui/wpa_gui
-	fi
-
-	if use qt3 || use qt4; then
-		make_desktop_entry wpa_gui "WPA_Supplicant Administration GUI"
-	fi
-
-	if use dbus ; then
-		insinto /etc/dbus-1/system.d
-		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
-	fi
-}
-
-pkg_postinst() {
-	einfo "A default configuration file has been installed to"
-	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file is available as"
-	einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.gz"
-
-	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 remerge ${PN} after upgrading these packages."
-	fi
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.3.ebuild
deleted file mode 100644
index 48e9d5b77c1d..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.3.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2009 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.3.ebuild,v 1.5 2009/05/05 21:13:20 gurligebis Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs
-
-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 gnutls eap-sim madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD
-	  ps3"
-
-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 )
-			)
-		)
-		!kernel_linux? ( net-libs/libpcap )
-		qt4? (
-			|| ( ( x11-libs/qt-core:4
-					x11-libs/qt-gui:4 )
-					<x11-libs/qt-4.4:4
-			)
-		)
-		!qt4? ( qt3? ( =x11-libs/qt-3* ) )
-		readline? ( sys-libs/ncurses sys-libs/readline )
-		ssl? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls )
-		!ssl? ( !gnutls? ( dev-libs/libtommath ) )"
-
-S="${WORKDIR}/${P}/${PN}"
-
-pkg_setup() {
-	if use qt3 && use qt4; then
-		einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\""
-	fi
-
-	if use qt4 && has_version ">=x11-libs/qt-4.2.2" ; then
-		if ! built_with_use x11-libs/qt qt3support ; then
-			eerror ">=qt4.2.2 requires qt3support"
-			die "rebuild >=x11-libs/qt-4.2.2 with the qt3support USE flag"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${WORKDIR}/${P}"
-	epatch "${FILESDIR}/${P}-ps3_support.patch"
-
-	cd "${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
-
-	# 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 eap-sim ; 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
-
-	# SSL authentication methods
-	if use gnutls ; then
-		echo "CONFIG_TLS=gnutls" >> .config
-		echo "CONFIG_GNUTLS_EXTRA=y" >> .config
-	elif use ssl ; then
-		echo "CONFIG_TLS=openssl" >> .config
-		echo "CONFIG_SMARTCARD=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_PRISM54=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
-
-	# 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, #143750
-	sed -i \
-		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-		wpa_supplicant.conf || die
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use qt4 ; then
-		qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro
-		cd "${S}"/wpa_gui-qt4
-		emake || die "emake wpa_gui-qt4 failed"
-	elif use qt3 ; then
-		[[ -d "${QTDIR}"/etc/settings ]] && addwrite "${QTDIR}"/etc/settings
-		"${QTDIR}"/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro
-		cd "${S}"/wpa_gui
-		emake || die "emake wpa_gui failed"
-	fi
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	# baselayout-1 compat
-	dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
-	dosym /usr/bin/wpa_cli /bin/wpa_cli
-
-	exeinto /etc/wpa_supplicant/
-	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
-	insinto /etc/wpa_supplicant/
-	newins "${FILESDIR}"/wpa_supplicant.conf wpa_supplicant.conf
-
-	dodoc ChangeLog ../COPYING eap_testing.txt README todo.txt
-	newdoc wpa_supplicant.conf wpa_supplicant.conf
-
-	doman doc/docbook/*.8
-	doman doc/docbook/*.5
-
-	if use qt4 ; then
-		into /usr
-		dobin wpa_gui-qt4/wpa_gui
-	elif use qt3 ; then
-		into /usr
-		dobin wpa_gui/wpa_gui
-	fi
-
-	if use qt3 || use qt4; then
-		make_desktop_entry wpa_gui "WPA_Supplicant Administration GUI"
-	fi
-
-	if use dbus ; then
-		insinto /etc/dbus-1/system.d
-		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
-	fi
-}
-
-pkg_postinst() {
-	einfo "A default configuration file has been installed to"
-	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file is available as"
-	einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.gz"
-
-	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 remerge ${PN} after upgrading these packages."
-	fi
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild
index c41bd82e6ed3..0bfd99f77a65 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 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.4.ebuild,v 1.7 2009/05/05 21:13:20 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild,v 1.8 2009/06/25 18:59:07 yngwin Exp $
 
-EAPI="1"
+EAPI="2"
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs qt4
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
 HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
@@ -25,13 +25,10 @@ RDEPEND="dbus? ( sys-apps/dbus )
 			)
 		)
 		!kernel_linux? ( net-libs/libpcap )
-		qt4? (
-			|| ( ( x11-libs/qt-core:4
-					x11-libs/qt-gui:4 )
-					<x11-libs/qt-4.4:4
-			)
+		qt4? ( x11-libs/qt-gui:4[qt3support]
+			x11-libs/qt-svg:4
 		)
-		!qt4? ( qt3? ( =x11-libs/qt-3* ) )
+		!qt4? ( qt3? ( x11-libs/qt:3 ) )
 		readline? ( sys-libs/ncurses sys-libs/readline )
 		ssl? ( dev-libs/openssl )
 		gnutls? ( net-libs/gnutls )
@@ -52,16 +49,14 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
+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
+}
 
+src_configure() {
 	# toolchain setup
 	echo "CC = $(tc-getCC)" > .config
 
@@ -162,8 +157,9 @@ src_compile() {
 	emake || die "emake failed"
 
 	if use qt4 ; then
-		qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro
+		#qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro
 		cd "${S}"/wpa_gui-qt4
+		eqmake4 wpa_gui.pro
 		emake || die "emake wpa_gui-qt4 failed"
 	elif use qt3 ; then
 		[[ -d "${QTDIR}"/etc/settings ]] && addwrite "${QTDIR}"/etc/settings
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
index 8890d7b761fd..5455aac1a436 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.3 2009/05/17 10:32:54 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild,v 1.4 2009/06/25 18:59:07 yngwin Exp $
 
 EAPI="2"
 
@@ -25,7 +25,8 @@ DEPEND="dev-libs/libnl
 		)
 	)
 	!kernel_linux? ( net-libs/libpcap )
-	qt4? ( x11-libs/qt-gui:4 )
+	qt4? ( x11-libs/qt-gui:4
+		x11-libs/qt-svg:4 )
 	!qt4? ( qt3? ( x11-libs/qt:3 ) )
 	readline? ( sys-libs/ncurses sys-libs/readline )
 	ssl? ( dev-libs/openssl )