Bumping to 0.7.1 and removing QT3 support

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

3 files changed, 30 insertions, 23 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 6d0329977900..b63f45cee069 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.127 2010/01/14 15:07:09 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.128 2010/01/25 00:08:42 gurligebis Exp $
+
+*wpa_supplicant-0.7.1 (25 Jan 2010)
+
+  25 Jan 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  -wpa_supplicant-0.7.0.ebuild, +wpa_supplicant-0.7.1.ebuild,
+  +files/wpa_supplicant-0.7.1-dbus_path_fix.patch:
+  Bumping to 0.7.1 and fixing bug #302080
 
   14 Jan 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
   wpa_supplicant-0.6.9.ebuild, wpa_supplicant-0.7.0.ebuild,
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
new file mode 100644
index 000000000000..eb4a1c01a5e0
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.1-dbus_path_fix.patch
@@ -0,0 +1,8 @@
+--- 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/wpa_supplicant-0.7.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.1.ebuild
index 80efa9aa077e..c3ff375d1cba 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.0.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.1.ebuild
@@ -1,10 +1,10 @@
 # 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.0.ebuild,v 1.2 2010/01/14 15:07:09 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.1.ebuild,v 1.1 2010/01/25 00:08:42 gurligebis Exp $
 
 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 @@ LICENSE="|| ( GPL-2 BSD )"
 
 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 @@ DEPEND="dev-libs/libnl
 	!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 @@ pkg_setup() {
 	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() {
@@ -69,7 +64,7 @@ src_prepare() {
 		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
 		wpa_supplicant.conf || die
 
-	epatch "${FILESDIR}"/dbus_path_fix.patch
+	epatch "${FILESDIR}/${P}-dbus_path_fix.patch"
 }
 
 src_configure() {
@@ -170,19 +165,21 @@ src_configure() {
 
 	# 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,21 +211,16 @@ src_install() {
 	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
 
 	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
-		newins dbus-wpa_supplicant.service 'fi.epitest.hostap.WPASupplicant.service' || die
+		doins fi.epitest.hostap.WPASupplicant.service || die
 		keepdir /var/run/wpa_supplicant
 	fi
 }