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

Package-Manager: portage-2.1.1_pre1-r1

7 files changed, 63 insertions, 48 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index 30a14f937174..8f8027202671 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/djvu
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.42 2006/06/08 12:43:33 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.43 2006/06/24 05:27:42 cardoe Exp $
+
+  24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> djvu-3.5.12.ebuild,
+  djvu-3.5.14.ebuild, djvu-3.5.14-r1.ebuild, djvu-3.5.16.ebuild,
+  djvu-3.5.17.ebuild:
+  USE flag change qt->qt3/qt4 bug #137785
 
   08 Jun 2006; Joseph Jezak <josejx@gentoo.org> djvu-3.5.16.ebuild:
   Marked ppc stable.
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index d06df7e2092a..abf317a4a5f9 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX djvu-3.5.16-gcc41-hash.patch 4158 RMD160 50f7df203aa9d3fbf8049dab8b748d481908fd2d SHA1 2ed1237cfe5bf8895ff570f3be92f1c5c2894d4b SHA256 92b9778c5f1b0b7b2a1d819e31546765bf32a8fadafd23e114977b28b910e568
 MD5 8b63d5bd9cc44163e6e9ab5dac8c0477 files/djvu-3.5.16-gcc41-hash.patch 4158
 RMD160 50f7df203aa9d3fbf8049dab8b748d481908fd2d files/djvu-3.5.16-gcc41-hash.patch 4158
@@ -18,30 +21,30 @@ DIST djvulibre-3.5.12.tar.gz 1298191
 DIST djvulibre-3.5.14.tar.gz 1742428 RMD160 6f5724f177e1080ad5b853335f069bebaba5c548 SHA1 15425f6f866d9d8ade2ba7e8b11f3dcf96b10374 SHA256 049774c33d03b48006a99c61e431e3e9242985d62b65a54abf024a492c71acc2
 DIST djvulibre-3.5.16.tar.gz 1803961 RMD160 7b4aaf69665d7ee33ec5476be88b3d9e075a26f0 SHA1 6b661c117c3a04209fbb22133c4d89f2af2720cf SHA256 3d90cdb7ad4c0481ec90796f12cfaf5240c4d73ba59e158d8ee333fec0837b58
 DIST djvulibre-3.5.17.tar.gz 2298690 RMD160 1f9d2b1106d1e1898f04c0657b2c8b557246c33e SHA1 ee7358b0d3a5941e0f68dae1f5cd44407d63b1bd SHA256 a39977be3ca99f5b1d6a01a7795133c18de538bf20ff1f2d52d652bac94647c7
-EBUILD djvu-3.5.12.ebuild 1044 RMD160 21871b4f191ea10ef5b77d9aefd2c068e12563f8 SHA1 f4c0ceac9ee601df84e3aec8e2b20dd9fa01230e SHA256 376b19f33797c21652d8771fae46760ebf70d1321daa7f0627de36d0799aa0e5
-MD5 9755fe91fba4e4fd0fcc505b688975ad djvu-3.5.12.ebuild 1044
-RMD160 21871b4f191ea10ef5b77d9aefd2c068e12563f8 djvu-3.5.12.ebuild 1044
-SHA256 376b19f33797c21652d8771fae46760ebf70d1321daa7f0627de36d0799aa0e5 djvu-3.5.12.ebuild 1044
-EBUILD djvu-3.5.14-r1.ebuild 1575 RMD160 26fa332e1669280cd4a35f8f14bb14776653045d SHA1 fe28dbff1f77c635a7111541e1dbbfa58fc21208 SHA256 49552c608b5708041b4dee2cf1aa6dd91ad76e8e20e1362b015b34898d31379f
-MD5 214930004dd850e115ab479b188d43be djvu-3.5.14-r1.ebuild 1575
-RMD160 26fa332e1669280cd4a35f8f14bb14776653045d djvu-3.5.14-r1.ebuild 1575
-SHA256 49552c608b5708041b4dee2cf1aa6dd91ad76e8e20e1362b015b34898d31379f djvu-3.5.14-r1.ebuild 1575
-EBUILD djvu-3.5.14.ebuild 1108 RMD160 437ca73fa680ac88359bee4589736a72114fc20c SHA1 107e5d81fcea0acc010e5688d28044143438f855 SHA256 1d8f0e7df2abae07d4338e56d2f1d36678c5f34d4ff7263a74d4874f195a23e9
-MD5 986cb703c5675d7e0fd2df81fdb6bb64 djvu-3.5.14.ebuild 1108
-RMD160 437ca73fa680ac88359bee4589736a72114fc20c djvu-3.5.14.ebuild 1108
-SHA256 1d8f0e7df2abae07d4338e56d2f1d36678c5f34d4ff7263a74d4874f195a23e9 djvu-3.5.14.ebuild 1108
-EBUILD djvu-3.5.16.ebuild 1989 RMD160 9be773e9f6f51cdcda64301a8ab455c578bb9ed8 SHA1 daab17a67ae6a576d092b92366ac859d0ba40e2a SHA256 06998eb7c7407db5658fed6e4561eebed9becfe9e1d2536a00846a412e3395f5
-MD5 a4c328bf6b88eebd4bf55cc9f719f162 djvu-3.5.16.ebuild 1989
-RMD160 9be773e9f6f51cdcda64301a8ab455c578bb9ed8 djvu-3.5.16.ebuild 1989
-SHA256 06998eb7c7407db5658fed6e4561eebed9becfe9e1d2536a00846a412e3395f5 djvu-3.5.16.ebuild 1989
-EBUILD djvu-3.5.17.ebuild 1922 RMD160 13780a1dd29c1e01b84ba0666fb00bf7225ddc47 SHA1 b55cf372317ae0f2b85a4edda72fd32494e5b3d4 SHA256 6efd256de0d890c0258f45de9ea98d98ea42d03aeb666de5cb2180cebb2653c3
-MD5 2c3820b21cc5455802c722fd537021b6 djvu-3.5.17.ebuild 1922
-RMD160 13780a1dd29c1e01b84ba0666fb00bf7225ddc47 djvu-3.5.17.ebuild 1922
-SHA256 6efd256de0d890c0258f45de9ea98d98ea42d03aeb666de5cb2180cebb2653c3 djvu-3.5.17.ebuild 1922
-MISC ChangeLog 5099 RMD160 f7ca375415bbd97e6078e988daf770b1e2113ab0 SHA1 9d1a7cc76cf639e4a748efd0eb036b7d1b894895 SHA256 328bb0a9c50a497c03908cffe431283f33517a9e86a8fb635ba261440cdd41a7
-MD5 d55971555fc2450fad2b27a33561fe97 ChangeLog 5099
-RMD160 f7ca375415bbd97e6078e988daf770b1e2113ab0 ChangeLog 5099
-SHA256 328bb0a9c50a497c03908cffe431283f33517a9e86a8fb635ba261440cdd41a7 ChangeLog 5099
+EBUILD djvu-3.5.12.ebuild 1048 RMD160 bc1a48396a302603b891bbd120c4ecd5896d12e2 SHA1 59a54de8a85825029fae1ca379522c8421f70a5c SHA256 0f5473cbbaece64aca7ab4e379dd74a54969105d687abee01c39341310248a30
+MD5 639d526f2ac4c3c3caca72f70725a16f djvu-3.5.12.ebuild 1048
+RMD160 bc1a48396a302603b891bbd120c4ecd5896d12e2 djvu-3.5.12.ebuild 1048
+SHA256 0f5473cbbaece64aca7ab4e379dd74a54969105d687abee01c39341310248a30 djvu-3.5.12.ebuild 1048
+EBUILD djvu-3.5.14-r1.ebuild 1582 RMD160 c74434580df076adf207464c694c89abce2b6df0 SHA1 08d8cd655c1a276dc333298d35a7848c3918824b SHA256 fc2d6608acbf619cf2fae8186a7cd3d87f891d92e6487369ff5d81c6625b5371
+MD5 9242f53fc21da29771027ee704e83123 djvu-3.5.14-r1.ebuild 1582
+RMD160 c74434580df076adf207464c694c89abce2b6df0 djvu-3.5.14-r1.ebuild 1582
+SHA256 fc2d6608acbf619cf2fae8186a7cd3d87f891d92e6487369ff5d81c6625b5371 djvu-3.5.14-r1.ebuild 1582
+EBUILD djvu-3.5.14.ebuild 1112 RMD160 61fbdda190f87a476822707ac8e563983597b230 SHA1 396f7a95a6852c0e897b2b3eccea08a4a2d8c272 SHA256 dd36cd694f495f09efec01c3922231d57eb928891438afe79c1fbee440a60029
+MD5 87cd8e2ebf061e6e3c6ff0c952fce786 djvu-3.5.14.ebuild 1112
+RMD160 61fbdda190f87a476822707ac8e563983597b230 djvu-3.5.14.ebuild 1112
+SHA256 dd36cd694f495f09efec01c3922231d57eb928891438afe79c1fbee440a60029 djvu-3.5.14.ebuild 1112
+EBUILD djvu-3.5.16.ebuild 1992 RMD160 e1cb01d1f00a6d00d21af18ed08e5557f358752d SHA1 4acc7dd0cb3d1917b4ef4e503fe6bae62fb95d53 SHA256 9cee0f36f78bc1b0253739c1bb10e814d893fbd4d73605d160c36bc2addefcd3
+MD5 5382c76fbd87445ad1baa3217208ca78 djvu-3.5.16.ebuild 1992
+RMD160 e1cb01d1f00a6d00d21af18ed08e5557f358752d djvu-3.5.16.ebuild 1992
+SHA256 9cee0f36f78bc1b0253739c1bb10e814d893fbd4d73605d160c36bc2addefcd3 djvu-3.5.16.ebuild 1992
+EBUILD djvu-3.5.17.ebuild 1925 RMD160 9d0f003f30a2658c67ad0d81b2d3d7b035b2000f SHA1 e25741e13f63e18349b13a3cfdce01ace702bed0 SHA256 bd06beaac3bf37df8f9f360c6c8aff86a79a20cec7257b6ee6d5b780d829c2f2
+MD5 5e8892384433bddacb95b0a2b0150361 djvu-3.5.17.ebuild 1925
+RMD160 9d0f003f30a2658c67ad0d81b2d3d7b035b2000f djvu-3.5.17.ebuild 1925
+SHA256 bd06beaac3bf37df8f9f360c6c8aff86a79a20cec7257b6ee6d5b780d829c2f2 djvu-3.5.17.ebuild 1925
+MISC ChangeLog 5299 RMD160 7862eb13a19ac63cf892010325192bdf8362a8d3 SHA1 713deb2ff51e3b85f909eb0ccbb13b519bfb5652 SHA256 8c5d1268b8f332ee293b4e4f98a946267b9e5d2d16031656a18174c58de496cd
+MD5 af7dde564c9735a411b727da1874b6bf ChangeLog 5299
+RMD160 7862eb13a19ac63cf892010325192bdf8362a8d3 ChangeLog 5299
+SHA256 8c5d1268b8f332ee293b4e4f98a946267b9e5d2d16031656a18174c58de496cd ChangeLog 5299
 MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
@@ -61,3 +64,10 @@ SHA256 9f3a365ecf587dbc824623175b8843ca4dac458dd710ae7ef8432a4760e1e782 files/di
 MD5 a9e217b0929984f6ebc7e06e81c94736 files/digest-djvu-3.5.17 253
 RMD160 a5c10def62ab40a70338cf96867754df9515486b files/digest-djvu-3.5.17 253
 SHA256 d09697f4e47fd027ca22b391ecc4ee4f47d4f0d0c747fabe8bf3a041dc7ca16b files/digest-djvu-3.5.17 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEnM1joeSe8B0zEfwRApW5AJ96wodjKIskVliGqHV6Cn41A7FA7QCdF6Xs
+qZZrxGRSRqfqrGGpkqh+E40=
+=hzGN
+-----END PGP SIGNATURE-----
diff --git a/app-text/djvu/djvu-3.5.12.ebuild b/app-text/djvu/djvu-3.5.12.ebuild
index 25be4ecd5d05..5adbad96eb82 100644
--- a/app-text/djvu/djvu-3.5.12.ebuild
+++ b/app-text/djvu/djvu-3.5.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.12.ebuild,v 1.10 2005/07/21 15:32:08 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.12.ebuild,v 1.11 2006/06/24 05:27:42 cardoe Exp $
 
 inherit nsplugins flag-o-matic
 
@@ -13,10 +13,10 @@ SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc ~amd64"
-IUSE="xml qt"
+IUSE="xml qt3"
 
 DEPEND=">=media-libs/jpeg-6b-r2
-	qt? ( <x11-libs/qt-4 )"
+	qt3? ( <x11-libs/qt-4 )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -28,7 +28,7 @@ src_compile() {
 	local myconf=""
 	use xml \
 		&& myconf="${myconf} --enable-xmltools"
-	use qt \
+	use qt3 \
 		|| myconf="${myconf} --without-qt"
 
 	econf ${myconf} || die
diff --git a/app-text/djvu/djvu-3.5.14-r1.ebuild b/app-text/djvu/djvu-3.5.14-r1.ebuild
index 954d789356d1..d1d334b7fcf0 100644
--- a/app-text/djvu/djvu-3.5.14-r1.ebuild
+++ b/app-text/djvu/djvu-3.5.14-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.14-r1.ebuild,v 1.3 2005/07/21 15:32:08 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.14-r1.ebuild,v 1.4 2006/06/24 05:27:42 cardoe Exp $
 
 inherit nsplugins flag-o-matic fdo-mime
 
@@ -13,11 +13,11 @@ SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-IUSE="xml qt jpeg tiff debug threads nls nsplugin kde"
+IUSE="xml qt3 jpeg tiff debug threads nls nsplugin kde"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( media-libs/tiff )
-	qt? ( <x11-libs/qt-4 )"
+	qt3? ( <x11-libs/qt-4 )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -44,7 +44,7 @@ src_compile() {
 
 	econf --enable-desktopfiles \
 		$(use_enable xml xmltools) \
-		$(use_with qt) \
+		$(use_with qt3 qt) \
 		$(use_with jpeg) \
 		$(use_with tiff) \
 		$(use_enable threads) \
diff --git a/app-text/djvu/djvu-3.5.14.ebuild b/app-text/djvu/djvu-3.5.14.ebuild
index c9585136a7a1..e3e1f34c519f 100644
--- a/app-text/djvu/djvu-3.5.14.ebuild
+++ b/app-text/djvu/djvu-3.5.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.14.ebuild,v 1.7 2005/07/21 15:32:08 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.14.ebuild,v 1.8 2006/06/24 05:27:42 cardoe Exp $
 
 inherit nsplugins flag-o-matic
 
@@ -13,10 +13,10 @@ SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc amd64 ppc"
-IUSE="xml qt"
+IUSE="xml qt3"
 
 DEPEND=">=media-libs/jpeg-6b-r2
-	qt? ( <x11-libs/qt-4 )"
+	qt3? ( <x11-libs/qt-4 )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -28,7 +28,7 @@ src_compile() {
 	local myconf=""
 	use xml \
 		&& myconf="${myconf} --enable-xmltools"
-	use qt \
+	use qt3 \
 		|| myconf="${myconf} --without-qt"
 
 	econf ${myconf} || die "econf failed"
diff --git a/app-text/djvu/djvu-3.5.16.ebuild b/app-text/djvu/djvu-3.5.16.ebuild
index 4d3fe636ab82..5aaa26cca46d 100644
--- a/app-text/djvu/djvu-3.5.16.ebuild
+++ b/app-text/djvu/djvu-3.5.16.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/app-text/djvu/djvu-3.5.16.ebuild,v 1.13 2006/06/08 12:43:33 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.16.ebuild,v 1.14 2006/06/24 05:27:42 cardoe Exp $
 
 inherit nsplugins flag-o-matic fdo-mime eutils multilib toolchain-funcs
 
@@ -13,11 +13,11 @@ SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="xml qt jpeg tiff debug threads nls nsplugin kde"
+IUSE="xml qt3 jpeg tiff debug threads nls nsplugin kde"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( media-libs/tiff )
-	qt? ( <x11-libs/qt-4 )"
+	qt3? ( <x11-libs/qt-4 )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -49,7 +49,7 @@ src_compile() {
 	fi
 
 	# When enabling qt it must be compiled with threads. See bug #89544.
-	if use qt ; then
+	if use qt3 ; then
 		QTCONF=" --with-qt --enable-threads "
 	elif use threads ; then
 		QTCONF=" --enable-threads "
diff --git a/app-text/djvu/djvu-3.5.17.ebuild b/app-text/djvu/djvu-3.5.17.ebuild
index 1f61e082469c..2524f6bb0254 100644
--- a/app-text/djvu/djvu-3.5.17.ebuild
+++ b/app-text/djvu/djvu-3.5.17.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/app-text/djvu/djvu-3.5.17.ebuild,v 1.4 2006/06/02 07:33:38 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.17.ebuild,v 1.5 2006/06/24 05:27:42 cardoe Exp $
 
 inherit nsplugins flag-o-matic fdo-mime eutils multilib toolchain-funcs
 
@@ -13,11 +13,11 @@ SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="xml qt jpeg tiff debug threads nls nsplugin kde"
+IUSE="xml qt3 jpeg tiff debug threads nls nsplugin kde"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( media-libs/tiff )
-	qt? ( <x11-libs/qt-4 )"
+	qt3? ( <x11-libs/qt-4 )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -45,7 +45,7 @@ src_compile() {
 	fi
 
 	# When enabling qt it must be compiled with threads. See bug #89544.
-	if use qt ; then
+	if use qt3 ; then
 		QTCONF=" --with-qt --enable-threads "
 	elif use threads ; then
 		QTCONF=" --enable-threads "