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

Package-Manager: portage-2.1.1_pre1-r1

6 files changed, 54 insertions, 40 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/Manifest b/net-print/hplip/Manifest
index 6648dcc83184..ff433d54b49d 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hplip.init.d 948 RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c SHA1 bc9c9a8767c5f253cd9c0dd40bb7e4248cd13b0b SHA256 9dad79022ced93da207a50f8d49d93acfc19f36b89e2b3d77f6b809ee81abd95
 MD5 dcda3bf144b5f2cd4bebd1719383dd31 files/hplip.init.d 948
 RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c files/hplip.init.d 948
@@ -12,26 +15,26 @@ DIST hplip-0.9.7.tar.gz 9705231
 DIST hplip-0.9.8-4.patch 31429 RMD160 ebbc0d557fa00a70f8945e51924a3078ded810df SHA1 b10957f66ac4a61866873f653b44ea17433ef929 SHA256 e28ed1fa1aaa3b55c10ac36ce4c539cb2fa97b5fde59dc6844b044ff000556b3
 DIST hplip-0.9.8.tar.gz 9298145 RMD160 6f3fb9af7bedd3de375554d71ce77bb6cd6a3f3a SHA1 4280ceba70d841906c3df9c4ab1abc0677c9bcdb SHA256 b573e31499920a787f2d6b3eb1e0de732e48d7ba00cb0e7ecd5d3e860e48662a
 DIST hplip-1.6.6.tar.gz 10429794 RMD160 84171d39677e132915169cb4c687271325777f25 SHA1 613f54cc41df367fd9497e6a5788e69e940b561a SHA256 cb148342ef56de7426290a8556114de440ff01ed36008ab81ea64755828701d0
-EBUILD hplip-0.9.11-r1.ebuild 3334 RMD160 ec2612727fdb490355ac349239aae9fc22ccde27 SHA1 fc8f8833012a4221a7dc5aa014e4faba250db889 SHA256 57c185c97058b234d3ebe2d709f5167c77be66ca3a535d00cde90a5fe9be7961
-MD5 f5607fe7587656f6248c9bde90bc6822 hplip-0.9.11-r1.ebuild 3334
-RMD160 ec2612727fdb490355ac349239aae9fc22ccde27 hplip-0.9.11-r1.ebuild 3334
-SHA256 57c185c97058b234d3ebe2d709f5167c77be66ca3a535d00cde90a5fe9be7961 hplip-0.9.11-r1.ebuild 3334
-EBUILD hplip-0.9.7-r3.ebuild 3336 RMD160 35247f043e4ab2e7f3f0fa1ca6171ef9c9009f62 SHA1 72419c98df0ac0f46b5cd555c32c9c6cbc945d1c SHA256 3a24d57ec2246856bb25704893267dfd23a6877e00372bc5fd0a0cd0c960ce70
-MD5 59049b57d4e2248499c09e11408c2c38 hplip-0.9.7-r3.ebuild 3336
-RMD160 35247f043e4ab2e7f3f0fa1ca6171ef9c9009f62 hplip-0.9.7-r3.ebuild 3336
-SHA256 3a24d57ec2246856bb25704893267dfd23a6877e00372bc5fd0a0cd0c960ce70 hplip-0.9.7-r3.ebuild 3336
-EBUILD hplip-0.9.8-r2.ebuild 3325 RMD160 67e3923e25d285cd3b95f777cd545f76d9fbdfff SHA1 098cb75f31d5cbdcb469f1bf178f351f649194d1 SHA256 f2b8b888c97e4164208f894130a745c47054f90dd6bf3d04ef7ae55111a30e98
-MD5 12340dda48ab3f17a14149a5c797cf67 hplip-0.9.8-r2.ebuild 3325
-RMD160 67e3923e25d285cd3b95f777cd545f76d9fbdfff hplip-0.9.8-r2.ebuild 3325
-SHA256 f2b8b888c97e4164208f894130a745c47054f90dd6bf3d04ef7ae55111a30e98 hplip-0.9.8-r2.ebuild 3325
-EBUILD hplip-1.6.6.ebuild 3294 RMD160 9cf9bc3f24cdf6331dcc4a491da1de2b36641726 SHA1 0ff02595b0caca7015d8632a74a114b4ece00127 SHA256 4c906528001497afe6e18f5cd41dc3480467b90bcefd2d58f717525c38b26816
-MD5 2796aa805147d6243a2ce9342b1e73f3 hplip-1.6.6.ebuild 3294
-RMD160 9cf9bc3f24cdf6331dcc4a491da1de2b36641726 hplip-1.6.6.ebuild 3294
-SHA256 4c906528001497afe6e18f5cd41dc3480467b90bcefd2d58f717525c38b26816 hplip-1.6.6.ebuild 3294
-MISC ChangeLog 6135 RMD160 ad816567266e736c0cfaf443f495e7f54733a737 SHA1 75c396907504b756213c144c5febda7628fae4a2 SHA256 438be7f64b774ba83c4b145a2804160a4f348239b7e3e09a40974a91a3d2b5e2
-MD5 df19a2eaf83dae479324a47402a0630d ChangeLog 6135
-RMD160 ad816567266e736c0cfaf443f495e7f54733a737 ChangeLog 6135
-SHA256 438be7f64b774ba83c4b145a2804160a4f348239b7e3e09a40974a91a3d2b5e2 ChangeLog 6135
+EBUILD hplip-0.9.11-r1.ebuild 3337 RMD160 c874a2909180283c09d5c51b109442aa3c08b93b SHA1 dc24e6b2d2d1a48cce323d571fdb618726aac192 SHA256 ccb021e8a7debcf2518e48e952bb138045d42257283d23c97edb8d0febc4af4c
+MD5 b753026d752c95ed57d8ce94a75698b1 hplip-0.9.11-r1.ebuild 3337
+RMD160 c874a2909180283c09d5c51b109442aa3c08b93b hplip-0.9.11-r1.ebuild 3337
+SHA256 ccb021e8a7debcf2518e48e952bb138045d42257283d23c97edb8d0febc4af4c hplip-0.9.11-r1.ebuild 3337
+EBUILD hplip-0.9.7-r3.ebuild 3340 RMD160 a4572e28563351444d27c2f47cb40278b4e77bd7 SHA1 83a924ce9c380c81484c05bd0f2416634d4c080e SHA256 604da063ec27ab779d7b5edd67286016a328db5c9c3a2fd7af5f67d1845fd810
+MD5 2a697d2ed8239bac96c2ce2cf6627bfc hplip-0.9.7-r3.ebuild 3340
+RMD160 a4572e28563351444d27c2f47cb40278b4e77bd7 hplip-0.9.7-r3.ebuild 3340
+SHA256 604da063ec27ab779d7b5edd67286016a328db5c9c3a2fd7af5f67d1845fd810 hplip-0.9.7-r3.ebuild 3340
+EBUILD hplip-0.9.8-r2.ebuild 3328 RMD160 b29e4c313ad6c4f06f00ab5e4adefb038f2534cc SHA1 7eb91e3e365363244c559a72b8dfba81c5221a99 SHA256 86b9928a277dfa2250e10907dcbd87d934cbb8381a3ed9102b4110dc8b53ed94
+MD5 96e1e05a66e40e518b2cb7a2dd7bcf68 hplip-0.9.8-r2.ebuild 3328
+RMD160 b29e4c313ad6c4f06f00ab5e4adefb038f2534cc hplip-0.9.8-r2.ebuild 3328
+SHA256 86b9928a277dfa2250e10907dcbd87d934cbb8381a3ed9102b4110dc8b53ed94 hplip-0.9.8-r2.ebuild 3328
+EBUILD hplip-1.6.6.ebuild 3296 RMD160 dca7709b1d4fd2e86c293ce090e420835e4bd4c7 SHA1 8046f3033f531b473bfed6697af8ad17f3be68a0 SHA256 f85b2aed25a15cea258259cd7d5d5e0c7b6e536df1deae9274861eeddde8cc3d
+MD5 457589cac5897489b7739b562bf2628d hplip-1.6.6.ebuild 3296
+RMD160 dca7709b1d4fd2e86c293ce090e420835e4bd4c7 hplip-1.6.6.ebuild 3296
+SHA256 f85b2aed25a15cea258259cd7d5d5e0c7b6e536df1deae9274861eeddde8cc3d hplip-1.6.6.ebuild 3296
+MISC ChangeLog 6319 RMD160 92cf8c5959a3cb2ce560840d14317ce5f5919710 SHA1 73e902267833481fb4b8a2e344101ecff1c82a2c SHA256 54bbe2881a329236e8f628b954931f104b01d1a683549507a4cbb6c7a5087315
+MD5 f79e4f9c240a2fc75e30a62cc8a680a8 ChangeLog 6319
+RMD160 92cf8c5959a3cb2ce560840d14317ce5f5919710 ChangeLog 6319
+SHA256 54bbe2881a329236e8f628b954931f104b01d1a683549507a4cbb6c7a5087315 ChangeLog 6319
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -48,3 +51,10 @@ SHA256 079f5ac90d4d00f03099796a7f307aebff27f22c546cb44b696cdf33dfb1625b files/di
 MD5 c0d122eabe6edd697928b8ebc16e5d00 files/digest-hplip-1.6.6 518
 RMD160 5c51391233b44dc618afe99ed23e961c960912b7 files/digest-hplip-1.6.6 518
 SHA256 c512c5108775eb02c47ffeacf8d0575acfc77d648d1a3dcc5b9a2dbc1d328847 files/digest-hplip-1.6.6 518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEnMJToeSe8B0zEfwRAuv9AKCL3VMfOaJfQ6gCZkdygXY2g63fPwCfVXAP
+07cP4n1BLlYTcUaKepAzuAE=
+=sN4E
+-----END PGP SIGNATURE-----
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