USE flag change qt->qt3/qt4 bug #137785

(Portage version: 2.1.1_pre1-r1)

5 files changed, 24 insertions, 20 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 2c54b648c608..16a94952f990 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.36 2006/06/17 00:15:05 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.37 2006/06/24 04:40:36 cardoe Exp $
+
+  24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> hplip-0.9.7-r3.ebuild,
+  hplip-0.9.8-r2.ebuild, hplip-0.9.11-r1.ebuild, hplip-1.6.6.ebuild:
+  USE flag change qt->qt3/qt4 bug #137785
 
   17 Jun 2006; Stefan Schweizer <genstef@gentoo.org> hplip-1.6.6.ebuild:
   cups-1.2 fixes and major ebuild cleanups
diff --git a/net-print/hplip/hplip-0.9.11-r1.ebuild b/net-print/hplip/hplip-0.9.11-r1.ebuild
index b758ed410e76..faaad67e5c45 100644
--- a/net-print/hplip/hplip-0.9.11-r1.ebuild
+++ b/net-print/hplip/hplip-0.9.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.11-r1.ebuild,v 1.3 2006/06/04 13:56:38 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.11-r1.ebuild,v 1.4 2006/06/24 04:40:36 cardoe Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="foomaticdb snmp X qt ppds scanner cups"
+IUSE="foomaticdb snmp X qt3 ppds scanner cups"
 
 DEPEND="dev-lang/python
 	snmp? ( >=net-analyzer/net-snmp-5.0.9 )
@@ -31,7 +31,7 @@ RDEPEND="virtual/ghostscript
 			>=media-gfx/sane-frontends-1.0.9
 		)
 	)
-	qt? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
+	qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
 	>=dev-libs/libusb-0.1.10a
 	sys-apps/hotplug
 	net-print/cups
@@ -86,7 +86,7 @@ src_install() {
 	fi
 
 	# bug 106035
-	if ! use qt ; then
+	if ! use qt3 ; then
 		rm -f "${D}"/usr/bin/hp-print
 		rm -f "${D}"/usr/bin/hp-toolbox
 		rm -f "${D}"/usr/share/hplip/print
@@ -116,7 +116,7 @@ src_install() {
 	fi
 
 	# desktop entry, bug 122758
-	if use qt; then
+	if use qt3; then
 		dodir /usr/share/applications
 		mv "${D}"/usr/share/hplip/data/hplip.desktop \
 		"${D}"/usr/share/applications
diff --git a/net-print/hplip/hplip-0.9.7-r3.ebuild b/net-print/hplip/hplip-0.9.7-r3.ebuild
index 20298891f336..00977d5b6742 100644
--- a/net-print/hplip/hplip-0.9.7-r3.ebuild
+++ b/net-print/hplip/hplip-0.9.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.7-r3.ebuild,v 1.9 2006/06/04 13:56:38 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.7-r3.ebuild,v 1.10 2006/06/24 04:40:36 cardoe Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/hpinkjet/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="foomaticdb snmp X qt ppds scanner cups usb"
+IUSE="foomaticdb snmp X qt3 ppds scanner cups usb"
 
 DEPEND="dev-lang/python
 	snmp? ( >=net-analyzer/net-snmp-5.0.9 )
@@ -31,7 +31,7 @@ RDEPEND="virtual/ghostscript
 			>=media-gfx/sane-frontends-1.0.9
 		)
 	)
-	qt? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
+	qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
 	usb? ( >=dev-libs/libusb-0.1.10a sys-apps/hotplug )
 	net-print/cups
 	foomaticdb? ( net-print/foomatic-db-engine )
@@ -85,7 +85,7 @@ src_install() {
 	fi
 
 	# bug 106035
-	if ! use qt ; then
+	if ! use qt3 ; then
 		rm -f "${D}"/usr/bin/hp-print
 		rm -f "${D}"/usr/bin/hp-toolbox
 		rm -f "${D}"/usr/share/hplip/print
@@ -115,7 +115,7 @@ src_install() {
 	fi
 
 	# desktop entry, bug 122758
-	if use qt; then
+	if use qt3; then
 		dodir /usr/share/applications
 		mv "${D}"/usr/share/hplip/data/hplip.desktop \
 		"${D}"/usr/share/applications
diff --git a/net-print/hplip/hplip-0.9.8-r2.ebuild b/net-print/hplip/hplip-0.9.8-r2.ebuild
index 1c7c13f525d5..fb59536c434b 100644
--- a/net-print/hplip/hplip-0.9.8-r2.ebuild
+++ b/net-print/hplip/hplip-0.9.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.8-r2.ebuild,v 1.4 2006/06/04 13:56:38 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.8-r2.ebuild,v 1.5 2006/06/24 04:40:36 cardoe Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/hpinkjet/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="foomaticdb snmp X qt ppds scanner cups usb"
+IUSE="foomaticdb snmp X qt3 ppds scanner cups usb"
 
 DEPEND="dev-lang/python
 	snmp? ( >=net-analyzer/net-snmp-5.0.9 )
@@ -31,7 +31,7 @@ RDEPEND="virtual/ghostscript
 			>=media-gfx/sane-frontends-1.0.9
 		)
 	)
-	qt? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
+	qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
 	usb? ( >=dev-libs/libusb-0.1.10a sys-apps/hotplug )
 	net-print/cups
 	foomaticdb? ( net-print/foomatic-db-engine )
@@ -84,7 +84,7 @@ src_install() {
 	fi
 
 	# bug 106035
-	if ! use qt ; then
+	if ! use qt3 ; then
 		rm -f "${D}"/usr/bin/hp-print
 		rm -f "${D}"/usr/bin/hp-toolbox
 		rm -f "${D}"/usr/share/hplip/print
@@ -114,7 +114,7 @@ src_install() {
 	fi
 
 	# desktop entry, bug 122758
-	if use qt; then
+	if use qt3; then
 		dodir /usr/share/applications
 		mv "${D}"/usr/share/hplip/data/hplip.desktop \
 		"${D}"/usr/share/applications
diff --git a/net-print/hplip/hplip-1.6.6.ebuild b/net-print/hplip/hplip-1.6.6.ebuild
index 86cfc3e82cc0..4b5171947651 100644
--- a/net-print/hplip/hplip-1.6.6.ebuild
+++ b/net-print/hplip/hplip-1.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-1.6.6.ebuild,v 1.3 2006/06/17 11:19:09 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-1.6.6.ebuild,v 1.4 2006/06/24 04:40:36 cardoe Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="foomaticdb snmp X qt ppds scanner"
+IUSE="foomaticdb snmp X qt3 ppds scanner"
 
 DEPEND=">=dev-lang/python-2.2.0
 	snmp? ( >=net-analyzer/net-snmp-5.0.9 )
@@ -29,7 +29,7 @@ RDEPEND="virtual/ghostscript
 			>=media-gfx/sane-frontends-1.0.9
 		)
 	)
-	qt? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
+	qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
 	>=dev-libs/libusb-0.1.10a
 	sys-apps/hotplug
 	net-print/cups
@@ -98,7 +98,7 @@ src_install() {
 	fi
 
 	# bug 106035
-	if ! use qt ; then
+	if ! use qt3 ; then
 		rm -f "${D}"/usr/bin/hp-print
 		rm -f "${D}"/usr/bin/hp-toolbox
 		rm -f "${D}"/usr/share/hplip/print