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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 18 insertions, 49 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/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