--- a/wpa_supplicant-0.7.0.ebuild	2010-01-24 17:02:43.000000000 +0100
+++ a/wpa_supplicant-0.7.0.ebuild	2010-01-24 16:58:36.000000000 +0100
@@ -4,7 +4,7 @@ 
 
 EAPI="2"
 
-inherit eutils toolchain-funcs qt3 qt4
+inherit eutils toolchain-funcs qt4-r2
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
 HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
@@ -13,7 +13,7 @@ 
 
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
+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 )
@@ -27,7 +27,6 @@ 
 	!kernel_linux? ( net-libs/libpcap )
 	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 )
 	!ssl? ( gnutls? ( net-libs/gnutls ) )
@@ -44,10 +43,6 @@ 
 	if use gnutls && use ssl ; then
 		einfo "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
 	fi
-
-	if use qt3 && use qt4 ; then
-		einfo "You have both 'qt3' and 'qt4' USE flags enabled: defaulting to USE=\"qt4\""
-	fi
 }
 
 src_prepare() {
@@ -170,19 +165,21 @@ 
 
 	# 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
-		eqmake4 wpa_gui.pro
-		emake || die "Qt4 wpa_gui compilation failed"
-	elif use qt3 ; then
-		cd "${S}"/wpa_gui
-		eqmake3 wpa_gui.pro
-		emake || die "Qt3 wpa_gui compilation failed"
+		einfo "Building wpa_gui"
+		emake || die "wpa_gui compilation failed"
 	fi
 }
 
@@ -214,12 +211,6 @@ 
 	if use qt4 ; then
 		into /usr
 		dobin wpa_gui-qt4/wpa_gui || die
-	elif use qt3 ; then
-		into /usr
-		dobin wpa_gui/wpa_gui || die
-	fi
-
-	if use qt3 || 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