Remove USE="qt3" wrt #246932 by Yaroslav Gorbunov.

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

5 files changed, 22 insertions, 63 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 374cc5542077..d7416ec90329 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,11 @@
 # 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.131 2010/03/12 23:13:21 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.132 2010/03/22 08:51:09 ssuominen Exp $
+
+  22 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  wpa_supplicant-0.6.9.ebuild, wpa_supplicant-0.6.10.ebuild,
+  wpa_supplicant-9999.ebuild:
+  Remove USE="qt3" wrt #246932 by Yaroslav Gorbunov.
 
 *wpa_supplicant-0.6.10 (12 Mar 2010)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 2554ff791c3f..3cb51ee2059d 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dbus_path_fix.patch 286 RMD160 891b3b8dc1ed75089a5be31e4a6937fe52178ad0 SHA1 8bf3cc3e970a039c282ca8e01d3096273f1d19f7 SHA256 1d64d21d9a38a41665b054775bfa77c3c3849d2d60d30575434c77b3630ff52f
 AUX wpa_cli.sh 1312 RMD160 d894097c699d067068d2cace9bf71dd6c8c29908 SHA1 f2887f74eb053183d13fcb7d039d91c01fb3765a SHA256 f6b62c8b1db53e94c49ad717d10f5cbb3b08127ba9f8ab9c72da14ba52f995d8
 AUX wpa_supplicant-0.7.1-dbus_path_fix.patch 316 RMD160 bb1b43b0d369a93fa01cef10ca5ad93d9b608853 SHA1 2f9715b648ceb8c67b15a3b1b345a27b5e1dc933 SHA256 3fdc64892399b158b912dac6902ea8c161e998591d4b3bcf56bc1ab06d7a4791
@@ -11,16 +8,9 @@ AUX wpa_supplicant.conf 183 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 SHA1
 DIST wpa_supplicant-0.6.10.tar.gz 1190391 RMD160 3c2b5269fd261ba695a276204088588a7992c002 SHA1 d2c93758607de250a8dda7adc8f8b304d0a074ce SHA256 ac27c69c26e3f4e06fba13e0dc8e1c7ed7b0012a95263bcfcf0f39be8059f2fd
 DIST wpa_supplicant-0.6.9.tar.gz 1178238 RMD160 e8427935b17c354c2654250501236dcd3f239307 SHA1 3764f7bda4e5c87caac2b9e134cb59996f073f09 SHA256 6e5284fa3f7c56e001fae92486eaa31340db5dd925dcb38bd572d2e8ed70f570
 DIST wpa_supplicant-0.7.1.tar.gz 1604885 RMD160 03e3adecc1754c3a6b0ecdeac13fd1a03131dd5b SHA1 ea641b046a04876827b76cda246689d0de0ed94e SHA256 9576e66703a2824cd7ed4b5cc1299112046529c8360c266a4fe1e9645acb493e
-EBUILD wpa_supplicant-0.6.10.ebuild 7500 RMD160 55a94e02ee9013c53763d50fe31526491745daf3 SHA1 c413f952638830ad845cc969a199813e6cfe9570 SHA256 7ed680b278dc1767459fc28641daf08c0b1164e0c62dc06db00dfc62f2fe1052
-EBUILD wpa_supplicant-0.6.9.ebuild 7493 RMD160 3592c923dc0e3d1cc94c05108e3b798d128dd28e SHA1 57c6c4f0d524497655880d9e9b7bbaa79591f56b SHA256 e5d60808dd3fd17777e007218962948eabb57fce0b3381b0a1c5165e93059340
+EBUILD wpa_supplicant-0.6.10.ebuild 7151 RMD160 d4cde94d3b278cd393be14e40065e0cf2efe457b SHA1 fc85a84ff39a2219ddd1e267d83a01b69a5cbe57 SHA256 ab24394200feb66ae353c0726c90ed9fb974498d3696fe4e184518b46f751a75
+EBUILD wpa_supplicant-0.6.9.ebuild 7146 RMD160 387d3fce3131ad4a5a31632ed184a394ca4915c2 SHA1 879a2056d422c345f38e5682273c452514b12662 SHA256 7ea180edd9224f367dc285e1b11bb3dca8e5d4787ff0ee0ec04a59cc42a4ca27
 EBUILD wpa_supplicant-0.7.1.ebuild 7225 RMD160 5281b8bf0745e2422573d9a27cf07dd66e751e38 SHA1 7683e219bd825ad5d06bb10b1b28a1b0a23d720c SHA256 7ecb262579cf1e53b0e2eb5792c7b568c9b2cf0a474f59a2db0b74c3115af080
-EBUILD wpa_supplicant-9999.ebuild 7878 RMD160 ec136e51cfa64dc5d68a671ac9c2400a688cc1d8 SHA1 cabfd7e45a19d033a9f5635db911b9896ab8be1f SHA256 cab8903bdeff0f0f918d98eacdfb4fd78492a97b641e8fcff001a68488da67f2
-MISC ChangeLog 28340 RMD160 48e40d591244fb03ebb38bbad6084d35fd955d4d SHA1 7a27c4ddcf041d7b0fddb8236e552d0c5e4c43ae SHA256 c670fb6fc57ce68c0c7c45f294ba82963f112c8ae4dff7f09a3d76b113e7117d
+EBUILD wpa_supplicant-9999.ebuild 7529 RMD160 65051207df5cf3ede7fda795ccd67d2e70487c7b SHA1 0bb0d2213a40d158dcf706728756fe1d06eba732 SHA256 4c3e380774a16cfd5ed1122d51bf6290ab56ca4a753024d559cbc9f68336a272
+MISC ChangeLog 28538 RMD160 7122db3df10efd4b4a42d6a7f8b92de7a150c75f SHA1 0b2e094182faf43acb9d759cbee9b57d17bd8857 SHA256 acd346828909ed1a412a53d642e6e2ea8c3a32bedfc3bb9714e2c81605fc6754
 MISC metadata.xml 651 RMD160 c1b0aca5e38265dbd80247ec686a0b7c3f8fb171 SHA1 6c5d98fa137ddb0f8a5866af68032cf769cc315c SHA256 88eec5cdc25fc735e42d5b581463e576a0f4a5df8e7694e1c8b9c24ea8358b93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuaypsACgkQsR7PQhRXYElyCQCeLmFelHJ3K3cB2CkQkVZZz8dH
-mvoAn2HmmtxvFEpRV3/Ka8JE6kQL/cPO
-=xCqX
------END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.10.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.10.ebuild
index 1d08d69e4d65..8aad5ee47be4 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.10.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.6.10.ebuild,v 1.1 2010/03/12 23:13:21 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.10.ebuild,v 1.2 2010/03/22 08:51:09 ssuominen Exp $
 
 EAPI="2"
 
-inherit eutils toolchain-funcs qt3 qt4
+inherit eutils toolchain-funcs qt4
 
 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() {
@@ -179,10 +174,6 @@ src_compile() {
 		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"
 	fi
 }
 
@@ -214,12 +205,9 @@ 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
+	if 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
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 ac1beb84aacb..7e4954374c63 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.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.6.9.ebuild,v 1.10 2010/03/03 16:45:43 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild,v 1.11 2010/03/22 08:51:09 ssuominen Exp $
 
 EAPI="2"
 
-inherit eutils toolchain-funcs qt3 qt4
+inherit eutils toolchain-funcs qt4
 
 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() {
@@ -179,10 +174,6 @@ src_compile() {
 		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"
 	fi
 }
 
@@ -214,12 +205,9 @@ 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
+	if 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
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index 0e9deb9418a0..8fdda2ced7c8 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.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-9999.ebuild,v 1.3 2010/01/14 15:07:09 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild,v 1.4 2010/03/22 08:51:09 ssuominen Exp $
 
 EAPI="2"
 
-inherit eutils toolchain-funcs qt3 qt4
+inherit eutils toolchain-funcs qt4
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://w1.fi/srv/git/hostap.git"
@@ -23,7 +23,7 @@ LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
 KEYWORDS="-*"
-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 )
@@ -36,7 +36,6 @@ DEPEND="dev-libs/libnl
 	)
 	!kernel_linux? ( net-libs/libpcap )
 	qt4? ( x11-libs/qt-gui:4 )
-	!qt4? ( qt3? ( x11-libs/qt:3 ) )
 	readline? ( sys-libs/ncurses sys-libs/readline )
 	ssl? ( dev-libs/openssl )
 	!ssl? ( gnutls? ( net-libs/gnutls ) )
@@ -65,10 +64,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() {
@@ -204,10 +199,6 @@ src_compile() {
 		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"
 	fi
 }
 
@@ -235,12 +226,9 @@ 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
+	if 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