Bumping to 0.7.1 and removing QT3 support

Package-Manager: portage-2.2_rc61/cvs/Linux i686

4 files changed, 37 insertions, 29 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/Manifest b/net-wireless/wpa_supplicant/Manifest
index abd197b3da08..7051e56c4d56 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -6,23 +6,24 @@ AUX wpa_cli.sh 1312 RMD160 d894097c699d067068d2cace9bf71dd6c8c29908 SHA1 f2887f7
 AUX wpa_supplicant-0.5.10-gcc-4.3.patch 1362 RMD160 2d3e8ee4cdda932e83127203db261e8fdcb5754d SHA1 f676db4ff6938b043e654e876c8976223b181b7d SHA256 e71a75a2a16741598d7f4588537e147271e960c1d0f9991ce9e0734850ef9944
 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-0.7.1-dbus_path_fix.patch 316 RMD160 bb1b43b0d369a93fa01cef10ca5ad93d9b608853 SHA1 2f9715b648ceb8c67b15a3b1b345a27b5e1dc933 SHA256 3fdc64892399b158b912dac6902ea8c161e998591d4b3bcf56bc1ab06d7a4791
 AUX wpa_supplicant-9999-dbus_path_fix.patch 836 RMD160 f8928718fff167aed2b799c87111b805b24034f2 SHA1 740a2035ed876ba410c3ba20a3af8a02bd268f8e SHA256 dbcb1a9a84b5439e1a008f5c8ce7fd4e373be63d199abefd0bcc0e86a44b08ad
 AUX wpa_supplicant-conf.d 161 RMD160 8188ddf3448d31c6288d4201cc9d10d0c4ac3ee3 SHA1 c0ca31e2ddb9b2b5cbafc3eba66316e83688b808 SHA256 61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90
 AUX wpa_supplicant-init.d 1249 RMD160 b91b304a2913ce47f04c625e01e5cc504922cf0f SHA1 0e158f5954e4046af3bc157a1c85aab4bbcc71cb SHA256 62a3655ea88b3dfff5243666a4e90d3f0eef6370a7889affb849e178ba4a82b0
 AUX wpa_supplicant.conf 183 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 SHA1 0a7f2922ad2394f475e1485d5537d1b2c6d7cafb SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a
 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
-DIST wpa_supplicant-0.7.0.tar.gz 1666796 RMD160 fce5f77f7d85947ba22c50ea0a661ceb1b10f379 SHA1 647655f0fc194499e97976a016de67a5d4f29543 SHA256 9d34f678881b21eb685b730bfed2dc56f4c9eb50bf79245c246f0b8266b75e21
+DIST wpa_supplicant-0.7.1.tar.gz 1604885 RMD160 03e3adecc1754c3a6b0ecdeac13fd1a03131dd5b SHA1 ea641b046a04876827b76cda246689d0de0ed94e SHA256 9576e66703a2824cd7ed4b5cc1299112046529c8360c266a4fe1e9645acb493e
 EBUILD wpa_supplicant-0.6.4.ebuild 6465 RMD160 24e22e1c3f51df2c9edca1f4186d6c93704ccf84 SHA1 d190555fd05a1fbf591a54d9b3e50c8c551beee0 SHA256 56e3782f15e48c4315be606329383bec49d56084a3fe18dc175972fdd9eb9c88
 EBUILD wpa_supplicant-0.6.9.ebuild 7495 RMD160 1b8dc5990a9b5c59eb1389c6955c009f0f9b27d1 SHA1 230f6db17a68906857253716032324a9c28a9155 SHA256 38ef6700a3533c05ace4a5671810a5d5cf2ed3092537a4e1d73c99cb1d8ca3a0
-EBUILD wpa_supplicant-0.7.0.ebuild 7499 RMD160 91b0cd9e0933c1f0e18e5a871e895bd5f737694c SHA1 429711e4a01adc3dda22b69688763155c1abc69b SHA256 06066af11c539975e3d5ecdb88742e32f62af47bf634d9c5bb05d0dec98232de
+EBUILD wpa_supplicant-0.7.1.ebuild 7225 RMD160 4309189654e776eb2716ea8c7898c1897e347701 SHA1 d808861369d3d7c4fba21a715bdf40da4e1d7e89 SHA256 a49ec54ba07042d71910d804030f021214271b8d264d425255431a95bfa58aba
 EBUILD wpa_supplicant-9999.ebuild 7878 RMD160 ec136e51cfa64dc5d68a671ac9c2400a688cc1d8 SHA1 cabfd7e45a19d033a9f5635db911b9896ab8be1f SHA256 cab8903bdeff0f0f918d98eacdfb4fd78492a97b641e8fcff001a68488da67f2
-MISC ChangeLog 27484 RMD160 1fa937867a1e7a1bf374350d7393142536f72562 SHA1 5e1e09b09b5b7708e846fd744e3fba87c1227ff2 SHA256 6a3c4a5e2f519c23841bde9ad6e38a37b5ac1fbd3aa4df0b683d12db7c00bb9a
+MISC ChangeLog 27739 RMD160 01583aa93cff35950ad2f65aec488ef8cb0b1250 SHA1 7e7c440cb23b0401e2220dbbe9a776c4b0d80409 SHA256 e64f3c2c67aff263bb0f252e0915638ccd7b4cebfec481467f4f6f9c1d65be84
 MISC metadata.xml 651 RMD160 c1b0aca5e38265dbd80247ec686a0b7c3f8fb171 SHA1 6c5d98fa137ddb0f8a5866af68032cf769cc315c SHA256 88eec5cdc25fc735e42d5b581463e576a0f4a5df8e7694e1c8b9c24ea8358b93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktPMywACgkQsR7PQhRXYEkq5ACaArB6dRAUzxdmU0+tEztWrO7q
-rf8AnR8N5AMZXi5p12lZNMdwzQS/G6Zt
-=mqjc
+iEYEARECAAYFAktc4RUACgkQsR7PQhRXYEmXmwCfcGUiB2inopLp1/tjUZGtERM0
+ASMAn0WYLmwtmSr/w8Vws9TAftseb9Rq
+=caRE
 -----END PGP SIGNATURE-----
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
 }