[gentoo-commits] gentoo-x86 commit in net-print/hplip: hplip-3.9.12-r1.ebuild hplip-3.9.10.ebuild hplip-3.9.12.ebuild hplip-3.9.8-r3.ebuild ChangeLog hplip-2.8.6b.ebuild metadata.xml hplip-3.9.4b-r1.ebuild

[Ben de Groot (yngwin)]

yngwin      10/01/02 19:49:07

  Modified:             hplip-3.9.12-r1.ebuild hplip-3.9.10.ebuild
                        hplip-3.9.12.ebuild hplip-3.9.8-r3.ebuild ChangeLog
                        hplip-2.8.6b.ebuild metadata.xml
                        hplip-3.9.4b-r1.ebuild
  Log:
  Drop qt3 support
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-print/hplip/hplip-3.9.12-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.12-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.12-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.12-r1.ebuild?r1=1.1&r2=1.2

Index: hplip-3.9.12-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.12-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-3.9.12-r1.ebuild	2 Jan 2010 19:38:07 -0000	1.1
+++ hplip-3.9.12-r1.ebuild	2 Jan 2010 19:49:06 -0000	1.2
@@ -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 @@
 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 @@
 			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 @@
 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 @@
 	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_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"



1.8                  net-print/hplip/hplip-3.9.10.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild?r1=1.7&r2=1.8

Index: hplip-3.9.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hplip-3.9.10.ebuild	26 Dec 2009 17:44:10 -0000	1.7
+++ hplip-3.9.10.ebuild	2 Jan 2010 19:49:06 -0000	1.8
@@ -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 @@
 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 @@
 			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 @@
 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 @@
 	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_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"



1.4                  net-print/hplip/hplip-3.9.12.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.12.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.12.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.12.ebuild?r1=1.3&r2=1.4

Index: hplip-3.9.12.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.12.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hplip-3.9.12.ebuild	26 Dec 2009 17:44:10 -0000	1.3
+++ hplip-3.9.12.ebuild	2 Jan 2010 19:49:06 -0000	1.4
@@ -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 @@
 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 @@
 			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 @@
 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 @@
 	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_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"



1.6                  net-print/hplip/hplip-3.9.8-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild?r1=1.5&r2=1.6

Index: hplip-3.9.8-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hplip-3.9.8-r3.ebuild	26 Dec 2009 17:44:10 -0000	1.5
+++ hplip-3.9.8-r3.ebuild	2 Jan 2010 19:49:06 -0000	1.6
@@ -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 @@
 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 @@
 			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 @@
 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 @@
 	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_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 @@
 	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
 



1.141                net-print/hplip/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?rev=1.141&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?rev=1.141&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?r1=1.140&r2=1.141

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- ChangeLog	2 Jan 2010 19:38:07 -0000	1.140
+++ ChangeLog	2 Jan 2010 19:49:06 -0000	1.141
@@ -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@g.o> 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)
 



1.12                 net-print/hplip/hplip-2.8.6b.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-2.8.6b.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-2.8.6b.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-2.8.6b.ebuild?r1=1.11&r2=1.12

Index: hplip-2.8.6b.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.8.6b.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- hplip-2.8.6b.ebuild	26 Dec 2009 17:44:10 -0000	1.11
+++ hplip-2.8.6b.ebuild	2 Jan 2010 19:49:06 -0000	1.12
@@ -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 @@
 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 @@
 			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 @@
 	# 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_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 @@
 	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
 }



1.14                 net-print/hplip/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/metadata.xml?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/metadata.xml?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/metadata.xml?r1=1.13&r2=1.14

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/metadata.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- metadata.xml	2 Dec 2009 18:07:34 -0000	1.13
+++ metadata.xml	2 Jan 2010 19:49:06 -0000	1.14
@@ -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>
 



1.8                  net-print/hplip/hplip-3.9.4b-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.4b-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.4b-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.4b-r1.ebuild?r1=1.7&r2=1.8

Index: hplip-3.9.4b-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.4b-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hplip-3.9.4b-r1.ebuild	26 Dec 2009 17:44:10 -0000	1.7
+++ hplip-3.9.4b-r1.ebuild	2 Jan 2010 19:49:06 -0000	1.8
@@ -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 @@
 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 @@
 		fax? (
 			dev-python/reportlab
 		)
-		qt3? ( !qt4? (
-			dev-python/PyQt
-		) )
 		qt4? (
 			dev-python/PyQt4[X]
 		)
@@ -69,7 +66,7 @@
 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 @@
 
 	# 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_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 @@
 	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