Drop qt3 support

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

9 files changed, 87 insertions, 148 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 418d625fbbea..b784d5bfd940 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.140 2010/01/02 19:38:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.141 2010/01/02 19:49:06 yngwin Exp $
+
+  02 Jan 2010; Ben de Groot <yngwin@gentoo.org> hplip-2.8.6b.ebuild,
+  hplip-3.9.4b-r1.ebuild, hplip-3.9.8-r3.ebuild, hplip-3.9.10.ebuild,
+  hplip-3.9.12.ebuild, hplip-3.9.12-r1.ebuild, metadata.xml:
+  Drop qt3 support
 
 *hplip-3.9.12-r1 (02 Jan 2010)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 24e3c34d518d..a1bb1e410010 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70-hpmud.rules 763 RMD160 b8326b26658b8e8355ae3d74423b51e2e15001e2 SHA1 fdb6b4937a814db50dc3ac3ca9b9c04cb44a6590 SHA256 6e7f2a0fd5a2111505066a412daea0d29c1ce858f09dbbaa489bb5a2f231e837
 AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207d04 SHA1 67eec05d9b29445a98a16d496e671cd0f29e1471 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875
 AUX hplip-3.9.10-cupsddk.patch 1128 RMD160 de693684826251f595a54c32ac31ab1e1ff082ef SHA1 c95ed5c2313c951b543c1df58b179ee0f1290bd2 SHA256 80b09b3b6e24860aebdd856384261b7f7e1887a7779dec668693dcf10a1c159a
@@ -14,18 +11,11 @@ DIST hplip-3.9.10.tar.gz 20999540 RMD160 65ea83e53bc19df0e2a054e723c74734fc5f39a
 DIST hplip-3.9.12.tar.gz 21371447 RMD160 f1717e8bad043b54497489fa1a2764b3ac548094 SHA1 d4d659ae52f01055bfc7060e0d4e3c7354c1dee3 SHA256 1c53febe3101b3718d43c9176c08826a1a46c49a79c9f6445cd16981fbf2a12a
 DIST hplip-3.9.4b.tar.gz 15712313 RMD160 bfed762c59b8dc2210d450ba86a5636773831cc1 SHA1 d2b06f1ee347a1f3aacd6b52600d08fc71ac5b12 SHA256 57496c01fb3ead9678e630c1c4a385e156b76d328440da550ebfc24b95ff8b1a
 DIST hplip-3.9.8.tar.gz 15715640 RMD160 8b06537176bfb32d32ae20eec1cfa6765609ecc0 SHA1 bcf0d1d8d6a006dd00224b4f90c208c21af28e55 SHA256 6471d99bde2b1182f45082c50dbd9e424a3ec2c0e98c48c934a1cd0d4ccb4e36
-EBUILD hplip-2.8.6b.ebuild 5245 RMD160 3b9d399e52f4444c2d30e81c15d6b3a3af54e223 SHA1 6f2562d02f046e71e8c9080578bdeb55050d3e1f SHA256 47b05ee530e0cc9ea9feab9ddf1c67306d3ab7aa12ea221ef5928cd28547cc81
-EBUILD hplip-3.9.10.ebuild 8566 RMD160 0d82cdc44061655cbab06b021f0a7f2bd2423842 SHA1 c30e2b394396b8e7ef50336a94b6099b247118c2 SHA256 2f29a15027b498f5f840dce50165222b82596bee13c1c99910e16a899515504b
-EBUILD hplip-3.9.12-r1.ebuild 8579 RMD160 b2bacf31912ec25699b5ff212c7b7a85292af85a SHA1 3b9da74566ba2a637d4ca48031605d9c988bf3b0 SHA256 a413186b3b69512c57755fc3add2cf2231c6fbfa15f679629bb49cb5ea0107a0
-EBUILD hplip-3.9.12.ebuild 8408 RMD160 dbbb1e38a01053e15cbebcbfb496f11eb7084c10 SHA1 4d03d9743b672189577bec4a29d9023192dd676b SHA256 9044e050aceadbff7b907e200ba1ef01fc0287690e946aa910b34f001707874d
-EBUILD hplip-3.9.4b-r1.ebuild 6467 RMD160 c66e3049bf50372343f22958396c0b0397d1a1d0 SHA1 abaade86c2f46dac35232f0a4ff1f9623165898c SHA256 97543ab9f2a73dd50ea2c15a2cf5e10494bb7c6c6e89729d2de4ea9794782334
-EBUILD hplip-3.9.8-r3.ebuild 8042 RMD160 9a1e9f4a50a207bcd89051d8c50faa8222699924 SHA1 69db997b844c07d2080a290ae6948362a3d04406 SHA256 4bf1b9b2be266e8a873c3519636c1d41463701386115cdb4aa42ad39d0b8fea8
-MISC ChangeLog 24409 RMD160 f245f46e94df831017ece1155b7c6f2315ca995f SHA1 b79f4075079e2f4dc7dc233c267bcc43bbc404b1 SHA256 15061519ecbe75a859783a763c75663d78303e231a3ba720d9c03467c974f538
-MISC metadata.xml 2576 RMD160 a22d81c0a7e8ec6c839a87c32d7c412d79ca5e2e SHA1 9971502edf107a48d22a1a0faf2160122baa7d56 SHA256 9b1b9e41c2df3d9fcc466aedccf078fa03e1b67b38c3bfb4723820e5b56ba0a5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks/oKkACgkQCaWpQKGI+9SLqgCfcDid7nDhzVafpByHbSylF5jF
-3nUAnieHSGdFUh7vtqQ2FCGagcam2BuL
-=3Z3R
------END PGP SIGNATURE-----
+EBUILD hplip-2.8.6b.ebuild 5050 RMD160 7624863e53dcffd3ad902ff55433c07c1eed5eff SHA1 e9e026f7509acb19a428b3fa5992ad30cb733a1c SHA256 0fbd44664623b4102e6a0941e05ad606ebc51e88e48641a750feb01c1cab20af
+EBUILD hplip-3.9.10.ebuild 8322 RMD160 189c45a40ab8ca2acd4efeafdbe3e1c9d2dfad65 SHA1 13355b0dc3681da7ae15f96c2624675979316f98 SHA256 8d5afc2a1c9e9b1c1834128ee56b306cc701f025e9cbb666d5a753c8247772f3
+EBUILD hplip-3.9.12-r1.ebuild 8322 RMD160 0d3be081f5ff5c978fef7fad078934e4b9fc63b0 SHA1 86722eff3a05ab89be3bf52209cdb7373e01767e SHA256 67b2ec05ddfe6378c4a7110e3d76f594f4c06b6492045b9031d95c154b277081
+EBUILD hplip-3.9.12.ebuild 8153 RMD160 9239caece471cf0ef7c8b6d82fbb0a69b3af16d4 SHA1 7b759d9862d69db2f03604ad3e22be5459478d03 SHA256 5d897b8ea27b139f734f79f27afe6620575bd1b46fbf9bfd0bf6e394fec2637e
+EBUILD hplip-3.9.4b-r1.ebuild 6217 RMD160 f6904eaaae5bebc5d2c6f6c40bf7738a13226ca0 SHA1 b90c4b848f7e0f91e57c9110b3aced73bcaac512 SHA256 f88a37610deaf1158746d317064194f92911690e4b5f941e0e5ecb24e3fb251e
+EBUILD hplip-3.9.8-r3.ebuild 7774 RMD160 d3a837be6e09b52ef4b1505856f49d802555a17e SHA1 20dcd4e1c744170b9ca8dac9b357722ef0be3da4 SHA256 40870700b57c770cbbd623c3f14a2275e45f1dbc42558b3d51350ea14d1d88ca
+MISC ChangeLog 24630 RMD160 6688d4481283864d1060175aff72c5780751f960 SHA1 a73f110e8b8f7c7182ddfc6505919dd62f4926a9 SHA256 3b097ff684786eaa714cc845b463a20e2b48243029f84cad27cab481acbee3f8
+MISC metadata.xml 2333 RMD160 6b2c4fdddadd93608749ac11f049337f904cfdab SHA1 22eeef64a1f227ca6652f2f08d4b1f10d0d749de SHA256 96667f48f4823e7349134852b8c2a6e59ad2706bf5bfc5c6cfed6a7f872a5d65
diff --git a/net-print/hplip/hplip-2.8.6b.ebuild b/net-print/hplip/hplip-2.8.6b.ebuild
index c3a02afe85c6..d60c61774c84 100644
--- a/net-print/hplip/hplip-2.8.6b.ebuild
+++ b/net-print/hplip/hplip-2.8.6b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.8.6b.ebuild,v 1.11 2009/12/26 17:44:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.8.6b.ebuild,v 1.12 2010/01/02 19:49:06 yngwin Exp $
 
 EAPI="1"
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 
-IUSE="cupsddk dbus doc fax minimal parport ppds qt3 qt4 scanner snmp"
+IUSE="cupsddk dbus doc fax minimal parport ppds qt4 scanner snmp"
 
 # Note : libusb-compat untested (calchan 20090516)
 
@@ -44,14 +44,7 @@ RDEPEND="${DEPEND}
 			qt4? ( >=media-gfx/xsane-0.89 )
 			!qt3? ( !qt4? ( >=media-gfx/sane-frontends-1.0.9 ) )
 		)
-		qt4? ( !qt3? (
-			dev-python/PyQt4
-			dbus? ( >=dev-python/dbus-python-0.80 )
-			fax? ( dev-python/reportlab )
-		) )
-		qt3? (
-			>=dev-python/PyQt-3.14
-			dev-python/ctypes
+		qt4? ( dev-python/PyQt4
 			dbus? ( >=dev-python/dbus-python-0.80 )
 			fax? ( dev-python/reportlab )
 		)
@@ -101,7 +94,6 @@ src_unpack() {
 	# Qt4 is still undocumented by upstream, so use with caution
 	local QT_VER
 	use qt4 && QT_VER="4"
-	use qt3 && QT_VER="3"
 	sed -i \
 		-e "s/%s --force-startup/%s --force-startup --qt${QT_VER}/" \
 		-e "s/'--force-startup'/'--force-startup', '--qt${QT_VER}'/" \
@@ -112,7 +104,7 @@ src_unpack() {
 }
 
 src_compile() {
-	if use qt3 || use qt4 ; then
+	if use qt4 ; then
 		local GUI_BUILD="--enable-gui-build"
 	else
 		local GUI_BUILD="--disable-gui-build"
@@ -143,7 +135,7 @@ src_install() {
 	rm -f "${D}"/etc/sane.d/dll.conf
 
 	# bug 106035
-	use qt3 || use qt4 || rm -Rf "${D}"/usr/share/applications
+	use qt4 || rm -Rf "${D}"/usr/share/applications
 
 	use minimal && rm -rf "${D}"/usr/lib
 }
diff --git a/net-print/hplip/hplip-3.9.10.ebuild b/net-print/hplip/hplip-3.9.10.ebuild
index 437ae152afd4..d752a479e34a 100644
--- a/net-print/hplip/hplip-3.9.10.ebuild
+++ b/net-print/hplip/hplip-3.9.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v 1.7 2009/12/26 17:44:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v 1.8 2010/01/02 19:49:06 yngwin Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 # zeroconf does not work properly with >=cups-1.4. thus support for it is also disabled in hplip.
-IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt3 qt4 scanner snmp static-ppds -udev-acl"
+IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt4 scanner snmp static-ppds -udev-acl"
 
 # Note : libusb-compat untested (calchan 20090516)
 
@@ -52,9 +52,6 @@ RDEPEND="${COMMON_DEPEND}
 			sys-apps/dbus
 			dev-python/dbus-python
 		)
-		qt3? ( !qt4? (
-			dev-python/PyQt
-		) )
 		qt4? (
 			dev-python/PyQt4[dbus,X]
 			dev-python/pygobject
@@ -71,7 +68,7 @@ CONFIG_CHECK="~PARPORT ~PPDEV"
 ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)."
 
 pkg_setup() {
-	! use qt3 && ! use qt4 && ewarn "You need USE=qt4 or USE=qt3 for the hplip GUI."
+	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
 
 	use scanner && ! use gtk && ewarn "You need USE=gtk for the scanner GUI."
 
@@ -129,8 +126,7 @@ src_prepare() {
 	done
 
 	local qt_ver
-	if use qt3 || use qt4 ; then
-		use qt3 && qt_ver="3"
+	if use qt4 ; then
 		use qt4 && qt_ver="4"
 		sed -i \
 			-e "s/%s --force-startup/%s --force-startup --qt${qt_ver}/" \
@@ -147,17 +143,12 @@ src_prepare() {
 src_configure() {
 	local gui_build myconf drv_build minimal_build
 
-	if use qt3 || use qt4 ; then
-		gui_build="--enable-gui-build"
-		if use qt4 ; then
-			gui_build="${gui_build} --enable-qt4 --disable-qt3"
-			if use policykit ; then
-				myconf="--enable-policykit"
-			else
-				myconf="--disable-policykit"
-			fi
+	if use qt4 ; then
+		gui_build="--enable-gui-build --enable-qt4 --disable-qt3"
+		if use policykit ; then
+			myconf="--enable-policykit"
 		else
-			use qt3 && gui_build="${gui_build} --enable-qt3 --disable-qt4"
+			myconf="--disable-policykit"
 		fi
 	else
 		gui_build="--disable-gui-build --disable-qt3 --disable-qt4"
diff --git a/net-print/hplip/hplip-3.9.12-r1.ebuild b/net-print/hplip/hplip-3.9.12-r1.ebuild
index 7bfccd7450f1..24bfbdb06fe8 100644
--- a/net-print/hplip/hplip-3.9.12-r1.ebuild
+++ b/net-print/hplip/hplip-3.9.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.12-r1.ebuild,v 1.1 2010/01/02 19:38:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.12-r1.ebuild,v 1.2 2010/01/02 19:49:06 yngwin Exp $
 
 EAPI=2
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 # zeroconf does not work properly with >=cups-1.4. thus support for it is also disabled in hplip.
-IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt3 qt4 scanner snmp static-ppds -udev-acl"
+IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt4 scanner snmp static-ppds -udev-acl"
 
 # Note : libusb-compat untested (calchan 20090516)
 
@@ -52,9 +52,6 @@ RDEPEND="${COMMON_DEPEND}
 			sys-apps/dbus
 			dev-python/dbus-python
 		)
-		qt3? ( !qt4? (
-			dev-python/PyQt
-		) )
 		qt4? (
 			dev-python/PyQt4[dbus,X]
 			dev-python/pygobject
@@ -71,7 +68,7 @@ CONFIG_CHECK="~PARPORT ~PPDEV"
 ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)."
 
 pkg_setup() {
-	! use qt3 && ! use qt4 && ewarn "You need USE=qt4 or USE=qt3 for the hplip GUI."
+	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
 
 	use scanner && ! use gtk && ewarn "You need USE=gtk for the scanner GUI."
 
@@ -133,9 +130,8 @@ src_prepare() {
 	done
 
 	local qt_ver
-	if use qt3 || use qt4 ; then
-		use qt3 && qt_ver="3"
-		use qt4 && qt_ver="4"
+	if use qt4 ; then
+		qt_ver="4"
 		sed -i \
 			-e "s/%s --force-startup/%s --force-startup --qt${qt_ver}/" \
 			-e "s/'--force-startup'/'--force-startup', '--qt${qt_ver}'/" \
@@ -151,17 +147,12 @@ src_prepare() {
 src_configure() {
 	local gui_build myconf drv_build minimal_build
 
-	if use qt3 || use qt4 ; then
-		gui_build="--enable-gui-build"
-		if use qt4 ; then
-			gui_build="${gui_build} --enable-qt4 --disable-qt3"
-			if use policykit ; then
-				myconf="--enable-policykit"
-			else
-				myconf="--disable-policykit"
-			fi
+	if use qt4 ; then
+		gui_build="--enable-gui-build --enable-qt4 --disable-qt3"
+		if use policykit ; then
+			myconf="--enable-policykit"
 		else
-			use qt3 && gui_build="${gui_build} --enable-qt3 --disable-qt4"
+			myconf="--disable-policykit"
 		fi
 	else
 		gui_build="--disable-gui-build --disable-qt3 --disable-qt4"
diff --git a/net-print/hplip/hplip-3.9.12.ebuild b/net-print/hplip/hplip-3.9.12.ebuild
index 9ccfa59982b9..c42a3b64da3f 100644
--- a/net-print/hplip/hplip-3.9.12.ebuild
+++ b/net-print/hplip/hplip-3.9.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.12.ebuild,v 1.3 2009/12/26 17:44:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.12.ebuild,v 1.4 2010/01/02 19:49:06 yngwin Exp $
 
 EAPI=2
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 # zeroconf does not work properly with >=cups-1.4. thus support for it is also disabled in hplip.
-IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt3 qt4 scanner snmp static-ppds -udev-acl"
+IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt4 scanner snmp static-ppds -udev-acl"
 
 # Note : libusb-compat untested (calchan 20090516)
 
@@ -52,9 +52,6 @@ RDEPEND="${COMMON_DEPEND}
 			sys-apps/dbus
 			dev-python/dbus-python
 		)
-		qt3? ( !qt4? (
-			dev-python/PyQt
-		) )
 		qt4? (
 			dev-python/PyQt4[dbus,X]
 			dev-python/pygobject
@@ -71,7 +68,7 @@ CONFIG_CHECK="~PARPORT ~PPDEV"
 ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)."
 
 pkg_setup() {
-	! use qt3 && ! use qt4 && ewarn "You need USE=qt4 or USE=qt3 for the hplip GUI."
+	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
 
 	use scanner && ! use gtk && ewarn "You need USE=gtk for the scanner GUI."
 
@@ -129,9 +126,8 @@ src_prepare() {
 	done
 
 	local qt_ver
-	if use qt3 || use qt4 ; then
-		use qt3 && qt_ver="3"
-		use qt4 && qt_ver="4"
+	if use qt4 ; then
+		qt_ver="4"
 		sed -i \
 			-e "s/%s --force-startup/%s --force-startup --qt${qt_ver}/" \
 			-e "s/'--force-startup'/'--force-startup', '--qt${qt_ver}'/" \
@@ -147,17 +143,12 @@ src_prepare() {
 src_configure() {
 	local gui_build myconf drv_build minimal_build
 
-	if use qt3 || use qt4 ; then
-		gui_build="--enable-gui-build"
-		if use qt4 ; then
-			gui_build="${gui_build} --enable-qt4 --disable-qt3"
-			if use policykit ; then
-				myconf="--enable-policykit"
-			else
-				myconf="--disable-policykit"
-			fi
+	if use qt4 ; then
+		gui_build="--enable-gui-build --enable-qt4 --disable-qt3"
+		if use policykit ; then
+			myconf="--enable-policykit"
 		else
-			use qt3 && gui_build="${gui_build} --enable-qt3 --disable-qt4"
+			myconf="--disable-policykit"
 		fi
 	else
 		gui_build="--disable-gui-build --disable-qt3 --disable-qt4"
diff --git a/net-print/hplip/hplip-3.9.4b-r1.ebuild b/net-print/hplip/hplip-3.9.4b-r1.ebuild
index ebd9b7a140a7..2f5d791fe6a4 100644
--- a/net-print/hplip/hplip-3.9.4b-r1.ebuild
+++ b/net-print/hplip/hplip-3.9.4b-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.4b-r1.ebuild,v 1.7 2009/12/26 17:44:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.4b-r1.ebuild,v 1.8 2010/01/02 19:49:06 yngwin Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
-IUSE="cupsddk dbus doc fax gtk minimal parport policykit ppds qt3 qt4 scanner snmp"
+IUSE="cupsddk dbus doc fax gtk minimal parport policykit ppds qt4 scanner snmp"
 
 # Note : libusb-compat untested (calchan 20090516)
 
@@ -52,9 +52,6 @@ RDEPEND="${DEPEND}
 		fax? (
 			dev-python/reportlab
 		)
-		qt3? ( !qt4? (
-			dev-python/PyQt
-		) )
 		qt4? (
 			dev-python/PyQt4[X]
 		)
@@ -69,7 +66,7 @@ CONFIG_CHECK="~PARPORT ~PPDEV"
 ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)."
 
 pkg_setup() {
-	! use qt3 && ! use qt4 && ewarn "You need USE=qt3 or USE=qt4 for the hplip GUI."
+	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
 
 	use scanner && ! use gtk && ewarn "You need USE=gtk for the scanner GUI."
 
@@ -126,9 +123,8 @@ src_prepare() {
 
 	# Qt4 is still undocumented by upstream, so use with caution
 	local qt_ver
-	use qt3 && qt_ver="3"
 	use qt4 && qt_ver="4"
-	if use qt3 || use qt4 ; then
+	if use qt4 ; then
 		sed -i \
 			-e "s/%s --force-startup/%s --force-startup --qt${qt_ver}/" \
 			-e "s/'--force-startup'/'--force-startup', '--qt${qt_ver}'/" \
@@ -144,13 +140,8 @@ src_prepare() {
 }
 
 src_configure() {
-	if use qt3 || use qt4 ; then
-		local gui_build="--enable-gui-build"
-		if use qt4; then
-			gui_build="${gui_build} --enable-qt4 --disable-qt3"
-		else
-			use qt3 && gui_build="${gui_build} --enable-qt3 --disable-qt4"
-		fi
+	if use qt4 ; then
+		local gui_build="--enable-gui-build --enable-qt4 --disable-qt3"
 	else
 		local gui_build="--disable-gui-build"
 	fi
@@ -181,7 +172,7 @@ src_install() {
 	use minimal && rm -r "${D}"/usr/$(get_libdir)
 
 	# bug 106035/259763
-	if ! use qt3 && ! use qt4; then
+	if ! use qt4; then
 		rm -r "${D}"/usr/share/applications "${D}"/etc/xdg
 	fi
 
diff --git a/net-print/hplip/hplip-3.9.8-r3.ebuild b/net-print/hplip/hplip-3.9.8-r3.ebuild
index eaa40ec1afd1..82daa7cc6968 100644
--- a/net-print/hplip/hplip-3.9.8-r3.ebuild
+++ b/net-print/hplip/hplip-3.9.8-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild,v 1.5 2009/12/26 17:44:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild,v 1.6 2010/01/02 19:49:06 yngwin Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-IUSE="doc fax gtk +hpcups hpijs libnotify minimal parport policykit qt3 qt4 scanner snmp static-ppds -udev-acl"
+IUSE="doc fax gtk +hpcups hpijs libnotify minimal parport policykit qt4 scanner snmp static-ppds -udev-acl"
 
 # Note : libusb-compat untested (calchan 20090516)
 
@@ -51,9 +51,6 @@ RDEPEND="${COMMON_DEPEND}
 			sys-apps/dbus
 			dev-python/dbus-python
 		)
-		qt3? ( !qt4? (
-			dev-python/PyQt
-		) )
 		qt4? (
 			dev-python/PyQt4[dbus,X]
 			dev-python/pygobject
@@ -70,7 +67,7 @@ CONFIG_CHECK="~PARPORT ~PPDEV"
 ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)."
 
 pkg_setup() {
-	! use qt3 && ! use qt4 && ewarn "You need USE=qt4 or USE=qt3 for the hplip GUI."
+	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
 
 	use scanner && ! use gtk && ewarn "You need USE=gtk for the scanner GUI."
 
@@ -119,9 +116,8 @@ src_prepare() {
 	done
 
 	local qt_ver
-	if use qt3 || use qt4 ; then
-		use qt3 && qt_ver="3"
-		use qt4 && qt_ver="4"
+	if use qt4 ; then
+		qt_ver="4"
 		sed -i \
 			-e "s/%s --force-startup/%s --force-startup --qt${qt_ver}/" \
 			-e "s/'--force-startup'/'--force-startup', '--qt${qt_ver}'/" \
@@ -143,17 +139,12 @@ src_prepare() {
 src_configure() {
 	local drv_build gui_build myconf
 
-	if use qt3 || use qt4 ; then
-		gui_build="--enable-gui-build"
-		if use qt4 ; then
-			gui_build="${gui_build} --enable-qt4 --disable-qt3"
-			if use policykit ; then
-				myconf="--enable-policykit"
-			else
-				myconf="--disable-policykit"
-			fi
+	if use qt4 ; then
+		gui_build="--enable-gui-build --enable-qt4 --disable-qt3"
+		if use policykit ; then
+			myconf="--enable-policykit"
 		else
-			use qt3 && gui_build="${gui_build} --enable-qt3 --disable-qt4"
+			myconf="--disable-policykit"
 		fi
 	else
 		gui_build="--disable-gui-build --disable-qt3 --disable-qt4"
@@ -223,7 +214,7 @@ src_install() {
 	rm -f "${D}"/etc/sane.d/dll.conf
 
 	# bug 106035/259763
-	if ! use qt3 && ! use qt4 ; then
+	if ! use qt4 ; then
 		rm -r "${D}"/usr/share/applications "${D}"/etc/xdg
 	fi
 
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index 7ee87abd3f3b..375947d5d542 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -21,40 +21,37 @@
 
   <use>
     <flag name="doc">Build documentation</flag>
-    <flag name="cupsddk">Add support for <pkg>net-print/cupsddk</pkg> which 
+    <flag name="cupsddk">Add support for <pkg>net-print/cupsddk</pkg> which
     enables dynamic PPD files (recommended)</flag>
-    <flag name="dbus">Add support for <pkg>sys-apps/dbus</pkg> which enables 
+    <flag name="dbus">Add support for <pkg>sys-apps/dbus</pkg> which enables
     better communications with your device (recommended)</flag>
-    <flag name="fax">Enable fax on multifunction devices which support 
+    <flag name="fax">Enable fax on multifunction devices which support
     it</flag>
-    <flag name="gtk">Enable GTK+ dependencies, currently only the scanner GUI 
+    <flag name="gtk">Enable GTK+ dependencies, currently only the scanner GUI
     with USE=scanner</flag>
     <flag name="hpcups">Build the hpcups driver for cups (by HP)</flag>
     <flag name="hpijs">Build the IJS driver for cups (Foomatic)</flag>
     <flag name="libnotify">Enables desktop notifications</flag>
-    <flag name="minimal">Only build internal hpijs driver (not recommended at 
+    <flag name="minimal">Only build internal hpijs driver (not recommended at
     all, make sure you know what you are doing)</flag>
-    <flag name="new-hpcups">Build the new hpcups driver for cups which is no 
+    <flag name="new-hpcups">Build the new hpcups driver for cups which is no
     longer based on APDK (by HP)</flag>
-    <flag name="parport">Enable parallel port for devices which require 
+    <flag name="parport">Enable parallel port for devices which require
     it</flag>
-    <flag name="policykit">Enable sys-auth/policykit authentication 
+    <flag name="policykit">Enable sys-auth/policykit authentication
     support</flag>
-    <flag name="ppds">Use precompiled PPD files (obsolete, use cupsddk 
+    <flag name="ppds">Use precompiled PPD files (obsolete, use cupsddk
     instead)</flag>
-    <flag name="qt3">Enable graphical interface using Qt 3; when both qt3 and 
-    qt4 USE flags are enabled then qt4 has priority over qt3</flag>
-    <flag name="qt4">Enable graphical interface using Qt 4; when both qt3 and 
-    qt4 USE flags are enabled then qt4 has priority over qt3</flag>
-    <flag name="scanner">Enable scanner on multifunction devices which support 
+    <flag name="qt4">Enable graphical interface using Qt 4</flag>
+    <flag name="scanner">Enable scanner on multifunction devices which support
     it</flag>
-    <flag name="snmp">Add support for <pkg>net-analyzer/net-snmp</pkg> which 
-    enables this driver to work over networks (both for server and 
+    <flag name="snmp">Add support for <pkg>net-analyzer/net-snmp</pkg> which
+    enables this driver to work over networks (both for server and
     client)</flag>
-    <flag name="static-ppds">Use statically-generated PPDs instead of Dynamic 
-    PPDs. This is deprecated, and this USE flag is thus suggested to stay 
+    <flag name="static-ppds">Use statically-generated PPDs instead of Dynamic
+    PPDs. This is deprecated, and this USE flag is thus suggested to stay
     turned off</flag>
-    <flag name="udev-acl">Install udev acl rules which needs 
+    <flag name="udev-acl">Install udev acl rules which needs
     <pkg>sys-fs/udev</pkg> with acl support</flag>
   </use>