Stop using $ROOT in src_* functions, #168039

(Portage version: 2.1.2-r10)

15 files changed, 7 insertions, 945 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 5e56fbb27279..cf5b54c9398d 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.92 2007/02/13 23:23:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.93 2007/02/23 12:24:59 uberlord Exp $
+
+  23 Feb 2007; Roy Marples <uberlord@gentoo.org>
+  wpa_supplicant-0.5.7.ebuild:
+  Stop using $ROOT in src_* functions, #168039
 
   13 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   wpa_supplicant-0.5.7.ebuild:
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.9 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.9
deleted file mode 100644
index cba126fa9367..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 98498c152cbfc388c306fd9bbf7d57d4 wpa_supplicant-0.4.9.tar.gz 483279
-RMD160 627ddb6c12f15e08448606f24b3082b50f814a43 wpa_supplicant-0.4.9.tar.gz 483279
-SHA256 bc7b0dc81248394d2456ea25059bdf1df2173fa8d178cda7d4570671ab916857 wpa_supplicant-0.4.9.tar.gz 483279
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.4 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.4
deleted file mode 100644
index 6277e57aa0a6..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eaf78fa5dde04ee20e718a8e94eed827 wpa_supplicant-0.5.4.tar.gz 630779
-RMD160 34074a4d1ebab4d455eb021a18ef9012943b1fd9 wpa_supplicant-0.5.4.tar.gz 630779
-SHA256 6c14c9c6c68acc40aa1c860d4fde58424c57b48ea90700da189e6cf5c1dd6bd7 wpa_supplicant-0.5.4.tar.gz 630779
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.5 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.5
deleted file mode 100644
index 5b43cdbe9c60..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 482dd85949c82aa15309e5ab3d2cf5c3 wpa_supplicant-0.5.5.tar.gz 661097
-RMD160 eda95756c49fb140063c14e0b9950b7045f47972 wpa_supplicant-0.5.5.tar.gz 661097
-SHA256 d571021d74fe7433716fc968b568e458451f40cfb333b5a682cd4d8ee2373543 wpa_supplicant-0.5.5.tar.gz 661097
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.6 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.6
deleted file mode 100644
index 4b6b5c50b91c..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c90eca479fa0cb58c7f447dc45d7cef1 wpa_supplicant-0.5.6.tar.gz 710441
-RMD160 a00dfdf4874a09b6ee89d7a691f0e48e75325133 wpa_supplicant-0.5.6.tar.gz 710441
-SHA256 892c6972b0940aa5d96d5a49ea924eb0f0504210213ba1134993e69dc395363f wpa_supplicant-0.5.6.tar.gz 710441
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-default_driver.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-default_driver.patch
deleted file mode 100644
index 6f3a845cc1c6..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-default_driver.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- drivers.c.orig	2006-09-06 10:43:08.000000000 +0100
-+++ drivers.c	2006-09-06 10:44:22.000000000 +0100
-@@ -15,6 +15,9 @@
- #include "includes.h"
- 
- 
-+#ifdef CONFIG_DRIVER_WEXT
-+extern struct wpa_driver_ops wpa_driver_wext_ops; /* driver_wext.c */
-+#endif /* CONFIG_DRIVER_WEXT */
- #ifdef CONFIG_DRIVER_HOSTAP
- extern struct wpa_driver_ops wpa_driver_hostap_ops; /* driver_hostap.c */
- #endif /* CONFIG_DRIVER_HOSTAP */
-@@ -30,9 +33,6 @@
- #ifdef CONFIG_DRIVER_ATMEL
- extern struct wpa_driver_ops wpa_driver_atmel_ops; /* driver_atmel.c */
- #endif /* CONFIG_DRIVER_ATMEL */
--#ifdef CONFIG_DRIVER_WEXT
--extern struct wpa_driver_ops wpa_driver_wext_ops; /* driver_wext.c */
--#endif /* CONFIG_DRIVER_WEXT */
- #ifdef CONFIG_DRIVER_NDISWRAPPER
- /* driver_ndiswrapper.c */
- extern struct wpa_driver_ops wpa_driver_ndiswrapper_ops;
-@@ -59,6 +59,9 @@
- 
- struct wpa_driver_ops *wpa_supplicant_drivers[] =
- {
-+#ifdef CONFIG_DRIVER_WEXT
-+	&wpa_driver_wext_ops,
-+#endif /* CONFIG_DRIVER_WEXT */
- #ifdef CONFIG_DRIVER_HOSTAP
- 	&wpa_driver_hostap_ops,
- #endif /* CONFIG_DRIVER_HOSTAP */
-@@ -74,9 +77,6 @@
- #ifdef CONFIG_DRIVER_ATMEL
- 	&wpa_driver_atmel_ops,
- #endif /* CONFIG_DRIVER_ATMEL */
--#ifdef CONFIG_DRIVER_WEXT
--	&wpa_driver_wext_ops,
--#endif /* CONFIG_DRIVER_WEXT */
- #ifdef CONFIG_DRIVER_NDISWRAPPER
- 	&wpa_driver_ndiswrapper_ops,
- #endif /* CONFIG_DRIVER_NDISWRAPPER */
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-inuse-warning.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-inuse-warning.patch
deleted file mode 100644
index cf25a6a04494..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-inuse-warning.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ctrl_iface_unix.c	2006-11-10 14:14:21.686328744 +0000
-+++ ctrl_iface_unix.c	2006-11-10 14:15:11.000000000 +0000
-@@ -321,7 +321,6 @@
- 		goto fail;
- 	strncpy(addr.sun_path, fname, sizeof(addr.sun_path));
- 	if (bind(priv->sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
--		perror("bind(PF_UNIX)");
- 		if (connect(priv->sock, (struct sockaddr *) &addr,
- 			    sizeof(addr)) < 0) {
- 			wpa_printf(MSG_DEBUG, "ctrl_iface exists, but does not"
-@@ -342,6 +341,7 @@
- 			wpa_printf(MSG_DEBUG, "Successfully replaced leftover "
- 				   "ctrl_iface socket '%s'", fname);
- 		} else {
-+			perror("bind(PF_UNIX)");
- 			wpa_printf(MSG_INFO, "ctrl_iface exists and seems to "
- 				   "be in use - cannot override it");
- 			wpa_printf(MSG_INFO, "Delete '%s' manually if it is "
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-qt4.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-qt4.patch
deleted file mode 100644
index c13c41837ae3..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-qt4.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- wpa_supplicant-0.5.5.orig/wpa_gui-qt4/eventhistory.h	2006-09-04 14:06:41.000000000 +0200
-+++ wpa_supplicant-0.5.5/wpa_gui-qt4/eventhistory.h	2006-09-04 14:07:02.000000000 +0200
-@@ -47,7 +47,7 @@ class EventHistory : public QDialog, pub
- public:
- 	EventHistory(QWidget *parent = 0, const char *name = 0,
- 		     bool modal = false, Qt::WFlags fl = 0);
--	EventHistory::~EventHistory();
-+	~EventHistory();
- 
- public slots:
- 	virtual void addEvents(WpaMsgList msgs);
---- wpa_supplicant-0.5.5.orig/wpa_gui-qt4/scanresults.h	2006-09-04 14:06:41.000000000 +0200
-+++ wpa_supplicant-0.5.5/wpa_gui-qt4/scanresults.h	2006-09-04 14:07:59.000000000 +0200
-@@ -27,7 +27,7 @@ class ScanResults : public QDialog, publ
- public:
- 	ScanResults(QWidget *parent = 0, const char *name = 0,
- 		    bool modal = false, Qt::WFlags fl = 0);
--	ScanResults::~ScanResults();
-+	~ScanResults();
- 
- public slots:
- 	virtual void setWpaGui(WpaGui *_wpagui);
---- wpa_supplicant-0.5.5.orig/wpa_gui-qt4/userdatarequest.h	2006-09-04 14:06:41.000000000 +0200
-+++ wpa_supplicant-0.5.5/wpa_gui-qt4/userdatarequest.h	2006-09-04 14:11:08.000000000 +0200
-@@ -27,7 +27,7 @@ class UserDataRequest : public QDialog, 
- public:
- 	UserDataRequest(QWidget *parent = 0, const char *name = 0,
- 			bool modal = false, Qt::WFlags fl = 0);
--	UserDataRequest::~UserDataRequest();
-+	~UserDataRequest();
- 
- 	int setParams(WpaGui *_wpagui, const char *reqMsg);
- 
---- wpa_supplicant-0.5.5.orig/wpa_gui-qt4/networkconfig.h	2006-09-04 14:06:41.000000000 +0200
-+++ wpa_supplicant-0.5.5/wpa_gui-qt4/networkconfig.h	2006-09-04 14:11:30.000000000 +0200
-@@ -27,7 +27,7 @@ class NetworkConfig : public QDialog, pu
- public:
- 	NetworkConfig(QWidget *parent = 0, const char *name = 0,
- 		      bool modal = false, Qt::WFlags fl = 0);
--	NetworkConfig::~NetworkConfig();
-+	~NetworkConfig();
- 
- 	virtual void paramsFromScanResults(Q3ListViewItem *sel);
- 	virtual void setWpaGui(WpaGui *_wpagui);
---- wpa_supplicant-0.5.5.orig/wpa_gui-qt4/wpagui.h	2006-09-04 14:06:41.000000000 +0200
-+++ wpa_supplicant-0.5.5/wpa_gui-qt4/wpagui.h	2006-09-04 14:12:43.000000000 +0200
-@@ -28,7 +28,7 @@ class WpaGui : public QMainWindow, publi
- public:
- 	WpaGui(QWidget *parent = 0, const char *name = 0,
- 	       Qt::WFlags fl = Qt::WType_TopLevel);
--	WpaGui::~WpaGui();
-+	~WpaGui();
- 
- 	virtual int ctrlRequest(const char *cmd, char *buf, size_t *buflen);
- 	virtual void triggerUpdate();
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-sigpoll.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-sigpoll.patch
deleted file mode 100644
index 6460e8234c15..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-sigpoll.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ctrl_iface_dbus.h.orig	2006-09-29 09:41:07 +0100
-+++ ctrl_iface_dbus.h	2006-09-29 09:44:23 +0100
-@@ -17,6 +17,13 @@
- 
- #ifdef CONFIG_CTRL_IFACE_DBUS
- 
-+/* If we don't have SIGPOLL, so use SIGIO instead */
-+#ifndef SIGPOLL
-+#ifdef SIGIO
-+#define SIGPOLL SIGIO
-+#endif
-+#endif
-+
- #include <dbus/dbus.h>
- 
- #define WPAS_DBUS_OBJECT_PATH_MAX 150
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.6-sigpoll.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.6-sigpoll.patch
deleted file mode 100644
index 6a9be745fb7f..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.6-sigpoll.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ctrl_iface_dbus.h.orig	2006-11-25 09:01:16 +0000
-+++ ctrl_iface_dbus.h	2006-11-25 09:00:53 +0000
-@@ -15,6 +15,13 @@
- #ifndef CTRL_IFACE_DBUS_H
- #define CTRL_IFACE_DBUS_H
- 
-+/* If we don't have SIGPOLL, so use SIGIO instead */
-+#ifndef SIGPOLL
-+#ifdef SIGIO
-+#define SIGPOLL SIGIO
-+#endif
-+#endif
-+
- #ifdef CONFIG_CTRL_IFACE_DBUS
- 
- #include <dbus/dbus.h>
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild
deleted file mode 100644
index 2f52c46173e8..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2006 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.9.ebuild,v 1.10 2006/09/06 07:53:29 uberlord Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}-${PV/_/-}
-S=${WORKDIR}/${MY_P}
-
-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"
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gsm madwifi qt3 qt4 readline ssl"
-
-RDEPEND="gsm? ( sys-apps/pcsc-lite )
-		qt4? ( =x11-libs/qt-4* )
-		!qt4? ( qt3? ( =x11-libs/qt-3* ) )
-		readline? ( sys-libs/ncurses sys-libs/readline )
-		ssl? ( dev-libs/openssl )
-		kernel_linux? ( madwifi? ( || ( net-wireless/madwifi-ng net-wireless/madwifi-old ) ) )
-		!kernel_linux? ( net-libs/libpcap )"
-DEPEND="sys-apps/sed
-		${RDEPEND}"
-
-pkg_setup() {
-	if use kernel_linux ; then
-		ewarn
-		ewarn "${PN} requires kernel support for Packet Socket (CONFIG_PACKET)."
-		ewarn
-	fi
-
-	if use qt3 && use qt4; then
-		einfo
-		einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\""
-		einfo
-	fi
-}
-
-src_unpack() {
-	local CONFIG=${S}/.config
-
-	unpack ${A}
-
-	# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
-	sed -i \
-		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-		${S}/l2_packet_freebsd.c
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# basic setup
-	echo "CONFIG_CTRL_IFACE=y" >> ${CONFIG}
-	echo "CONFIG_BACKEND=file" >> ${CONFIG}
-
-	# basic authentication methods
-	echo "CONFIG_EAP_GTC=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_OTP=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y"         >> ${CONFIG}
-	echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CONFIG}
-	echo "CONFIG_PKCS12=y"          >> ${CONFIG}
-
-	if use gsm; then
-		# smart card authentication
-		echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-		echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-		echo "CONFIG_PCSC=y"    >> ${CONFIG}
-	fi
-
-	if use readline; then
-		# readline/history support for wpa_cli
-		echo "CONFIG_READLINE=y" >> ${CONFIG}
-	fi
-
-	if use ssl; then
-		# SSL authentication methods
-		echo "CONFIG_EAP_LEAP=y"     >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y"     >> ${CONFIG}
-		echo "CONFIG_EAP_TLS=y"      >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y"     >> ${CONFIG}
-		echo "CONFIG_SMARTCARD=y"    >> ${CONFIG}
-	fi
-
-	if use kernel_linux; then
-		# Linux specific drivers
-		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}
-
-		if use madwifi; then
-			# Add include path for madwifi-driver headers
-			echo "CFLAGS += -I${ROOT}/usr/include/madwifi" >> ${CONFIG}
-			echo "CONFIG_DRIVER_MADWIFI=y"                 >> ${CONFIG}
-		fi
-	fi
-
-	if 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:" \
-		${S}/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
-		/usr/qt/3/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() {
-	into /
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	exeinto /etc/wpa_supplicant/
-	newexe ${FILESDIR}/wpa_cli.sh wpa_cli.sh
-
-	# compatibility symlink for =baselayout-1.11*
-	dosym /etc/wpa_supplicant/wpa_cli.sh /sbin/wpa_cli.action
-
-	if use qt4; then
-		into /usr
-		dobin wpa_gui-qt4/wpa_gui
-	elif use qt3; then
-		into /usr
-		dobin wpa_gui/wpa_gui
-	fi
-
-	dodoc ChangeLog COPYING eap_testing.txt README todo.txt
-	newdoc wpa_supplicant.conf wpa_supplicant.conf.example
-
-	doman doc/docbook/*.8
-	doman doc/docbook/*.5
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use ${MY_P} you must create the configuration file"
-	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file is available as"
-	einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.example.gz"
-	einfo
-	if use madwifi; then
-		einfo "This package now compiles against the headers installed by"
-		einfo "the madwifi driver. You should reemerge ${PN} after"
-		einfo "upgrading your madwifi driver."
-		einfo
-	fi
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild
deleted file mode 100644
index 3ddffa99cd7f..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2006 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.4.ebuild,v 1.14 2006/09/23 22:51:52 josejx 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 ppc x86"
-IUSE="dbus gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
-
-RDEPEND="dbus? ( sys-apps/dbus )
-		gsm? ( sys-apps/pcsc-lite )
-		qt4? ( =x11-libs/qt-4* )
-		!qt4? ( qt3? ( =x11-libs/qt-3* ) )
-		readline? ( sys-libs/ncurses sys-libs/readline )
-		ssl? ( dev-libs/openssl )
-		kernel_linux? ( madwifi? ( || ( net-wireless/madwifi-ng net-wireless/madwifi-old ) ) )
-		!kernel_linux? ( net-libs/libpcap )"
-DEPEND="sys-apps/sed
-		${RDEPEND}"
-
-pkg_setup() {
-	if use kernel_linux ; then
-		ewarn
-		ewarn "${PN} requires kernel support for Packet Socket (CONFIG_PACKET)."
-		ewarn
-	fi
-
-	if use qt3 && use qt4; then
-		einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\""
-	fi
-}
-
-src_unpack() {
-	local CONFIG="${S}/.config"
-
-	unpack ${A}
-
-	# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
-	sed -i \
-		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-		"${S}"/l2_packet_freebsd.c
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > "${CONFIG}"
-
-	# basic setup
-	echo "CONFIG_CTRL_IFACE=y" >> "${CONFIG}"
-	echo "CONFIG_BACKEND=file" >> "${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_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}"
-
-	if use dbus; then
-		echo "CONFIG_CTRL_IFACE_DBUS=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
-
-	if use kernel_linux; then
-		# Linux specific drivers
-		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}"
-
-		if use madwifi; then
-			# Add include path for madwifi-driver headers
-			echo "CFLAGS += -I${ROOT}/usr/include/madwifi" >> "${CONFIG}"
-			echo "CONFIG_DRIVER_MADWIFI=y"                 >> "${CONFIG}"
-		fi
-	fi
-
-	if 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:" \
-		${S}/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):" \
-		"${S}"/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
-		/usr/qt/3/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() {
-	into /
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	exeinto /etc/wpa_supplicant/
-	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
-
-	# compatibility symlink for =baselayout-1.11*
-	dosym /etc/wpa_supplicant/wpa_cli.sh /sbin/wpa_cli.action
-
-	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
-
-	dodoc ChangeLog COPYING eap_testing.txt README todo.txt
-	newdoc wpa_supplicant.conf wpa_supplicant.conf.example
-
-	doman doc/docbook/*.8
-	doman doc/docbook/*.5
-}
-
-pkg_postinst() {
-	einfo "To use ${MY_P} you must create the configuration file"
-	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file is available as"
-	einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.example.gz"
-	if use madwifi; then
-		einfo
-		einfo "This package now compiles against the headers installed by"
-		einfo "the madwifi driver. You should reemerge ${PN} after"
-		einfo "upgrading your madwifi driver."
-	fi
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
deleted file mode 100644
index 9d09e45def22..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2006 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.5.ebuild,v 1.13 2006/11/12 14:08:04 uberlord 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 ~ppc ~x86 ~x86-fbsd"
-IUSE="dbus gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
-
-#When dbus-core is out of package mask, this is how it works
-#RDEPEND="dbus? ( || ( sys-apps/dbus-core sys-apps/dbus ) )"
-RDEPEND="dbus? ( sys-apps/dbus )
-		kernel_linux? (
-			gsm? ( sys-apps/pcsc-lite )
-		 	madwifi? (
-				|| ( net-wireless/madwifi-ng 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 )"
-
-pkg_setup() {
-	if use kernel_linux ; then
-		ewarn
-		ewarn "${PN} requires kernel support for Packet Socket (CONFIG_PACKET)."
-		ewarn
-	fi
-
-	if use qt3 && use qt4; then
-		einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\""
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix QT4 support, #146177 thanks to Horst Schirmeier.
-	epatch "${FILESDIR}/${P}-qt4.patch"
-
-	# If we don't have SIGPOLL (like FreeBSD), use SIGIO instead
-	epatch "${FILESDIR}/${P}-sigpoll.patch"
-
-	# Change the default driver to wext for Linux systems.
-	epatch "${FILESDIR}/${P}-default_driver.patch"
-
-	# Move the PF_UNIX: Address in use warning to where it's needed
-	epatch "${FILESDIR}/${P}-inuse-warning.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
-
-	if use dbus ; then
-		echo "CONFIG_CTRL_IFACE_DBUS=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
-
-	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${ROOT}/usr/include/madwifi" >> .config
-			echo "CONFIG_DRIVER_MADWIFI=y"                 >> .config
-		fi
-	fi
-
-	if 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
-		/usr/qt/3/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() {
-	into /
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	exeinto /etc/wpa_supplicant/
-	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
-	insinto /etc/wpa_supplicant/
-	newins "${FILESDIR}"/wpa_supplicant.conf wpa_supplicant.conf
-
-	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
-
-	dodoc ChangeLog COPYING eap_testing.txt README todo.txt
-	newdoc wpa_supplicant.conf wpa_supplicant.conf
-
-	doman doc/docbook/*.8
-	doman doc/docbook/*.5
-}
-
-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 now compiles against the headers installed by"
-		einfo "the madwifi driver. You should reemerge ${PN} after"
-		einfo "upgrading your madwifi driver."
-	fi
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.6.ebuild
deleted file mode 100644
index e12f451b170e..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.6.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2006 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.6.ebuild,v 1.4 2006/12/13 18:26:50 uberlord 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 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
-
-RDEPEND="dbus? ( sys-apps/dbus )
-		kernel_linux? (
-			gsm? ( sys-apps/pcsc-lite )
-		 	madwifi? (
-				|| ( net-wireless/madwifi-ng 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 )"
-
-pkg_setup() {
-	if use kernel_linux ; then
-		ewarn
-		ewarn "${PN} requires kernel support for Packet Socket (CONFIG_PACKET)."
-		ewarn
-	fi
-
-	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}"
-
-	# If we don't have SIGPOLL (like FreeBSD), use SIGIO instead
-	epatch "${FILESDIR}/${P}-sigpoll.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
-
-	if use dbus ; then
-		echo "CONFIG_CTRL_IFACE_DBUS=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
-
-	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${ROOT}/usr/include/madwifi" >> .config
-			echo "CONFIG_DRIVER_MADWIFI=y"                 >> .config
-		fi
-	fi
-
-	if 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
-		/usr/qt/3/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() {
-	into /
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	exeinto /etc/wpa_supplicant/
-	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
-	insinto /etc/wpa_supplicant/
-	newins "${FILESDIR}"/wpa_supplicant.conf wpa_supplicant.conf
-
-	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
-
-	dodoc ChangeLog COPYING eap_testing.txt README todo.txt
-	newdoc wpa_supplicant.conf wpa_supplicant.conf
-
-	doman doc/docbook/*.8
-	doman doc/docbook/*.5
-}
-
-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 now compiles against the headers installed by"
-		einfo "the madwifi driver. You should reemerge ${PN} after"
-		einfo "upgrading your madwifi driver."
-	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
index fb33a33de11f..06f9905dd0ea 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.4 2007/02/13 23:23:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild,v 1.5 2007/02/23 12:24:59 uberlord Exp $
 
 inherit eutils toolchain-funcs
 
@@ -118,7 +118,7 @@ src_unpack() {
 
 		if use madwifi ; then
 			# Add include path for madwifi-driver headers
-			echo "CFLAGS += -I${ROOT}/usr/include/madwifi" >> .config
+			echo "CFLAGS += -I/usr/include/madwifi" >> .config
 			echo "CONFIG_DRIVER_MADWIFI=y"                 >> .config
 		fi
 	elif use kernel_FreeBSD ; then