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

Package-Manager: portage-2.1.1_pre1-r1

4 files changed, 45 insertions, 31 deletions

diff --git a/games-action/chromium/ChangeLog b/games-action/chromium/ChangeLog
index f8272c781c9a..a4703b562fc5 100644
--- a/games-action/chromium/ChangeLog
+++ b/games-action/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/chromium
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/ChangeLog,v 1.17 2006/05/20 00:16:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/ChangeLog,v 1.18 2006/06/24 04:53:45 cardoe Exp $
+
+  24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> chromium-0.9.12-r5.ebuild,
+  chromium-0.9.12-r6.ebuild:
+  USE flag change qt->qt3/qt4 bug #137785
 
 *chromium-0.9.12-r6 (20 May 2006)
 
diff --git a/games-action/chromium/Manifest b/games-action/chromium/Manifest
index 10ea935eb1cc..24391321911e 100644
--- a/games-action/chromium/Manifest
+++ b/games-action/chromium/Manifest
@@ -1,38 +1,41 @@
-AUX 0.9.12-configure.patch 323 RMD160 19cee25d368692c5aa6214f55eea7a640cbdd6c9 SHA1 c92698b0791e744f9e005657a560e8c095e650c0 SHA256 51dd41f1aaf7dccb5f25dd88f931f5142339c629836cc5256a2b0ddc65f658a3 size 323
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.9.12-configure.patch 323 RMD160 19cee25d368692c5aa6214f55eea7a640cbdd6c9 SHA1 c92698b0791e744f9e005657a560e8c095e650c0 SHA256 51dd41f1aaf7dccb5f25dd88f931f5142339c629836cc5256a2b0ddc65f658a3
 MD5 78d6e86e35c196199788c0550b6cfc51 files/0.9.12-configure.patch 323
 RMD160 19cee25d368692c5aa6214f55eea7a640cbdd6c9 files/0.9.12-configure.patch 323
 SHA256 51dd41f1aaf7dccb5f25dd88f931f5142339c629836cc5256a2b0ddc65f658a3 files/0.9.12-configure.patch 323
-AUX 0.9.12-freealut.patch 7006 RMD160 e14eed7b6006dbf4b08d8766fa2279db7483b850 SHA1 fc6041b069bd10d55969cb92d37e25ee71cb154c SHA256 50b221196a057eb2d0800cdc987d3156be15747f093dbd752d3ac06343e21696 size 7006
+AUX 0.9.12-freealut.patch 7006 RMD160 e14eed7b6006dbf4b08d8766fa2279db7483b850 SHA1 fc6041b069bd10d55969cb92d37e25ee71cb154c SHA256 50b221196a057eb2d0800cdc987d3156be15747f093dbd752d3ac06343e21696
 MD5 0e251478e227304cdd2bc2da88835727 files/0.9.12-freealut.patch 7006
 RMD160 e14eed7b6006dbf4b08d8766fa2279db7483b850 files/0.9.12-freealut.patch 7006
 SHA256 50b221196a057eb2d0800cdc987d3156be15747f093dbd752d3ac06343e21696 files/0.9.12-freealut.patch 7006
-AUX 0.9.12-gcc3-gentoo.patch 530 RMD160 2599f72b8a4cdb81cbad7802085321dbb2aa096d SHA1 49c2dca0dc05a29872d743bed457c984fae179ce SHA256 e10024adff892effc7ad2230234260c00106020c920180c69539f6f4e43b5d50 size 530
+AUX 0.9.12-gcc3-gentoo.patch 530 RMD160 2599f72b8a4cdb81cbad7802085321dbb2aa096d SHA1 49c2dca0dc05a29872d743bed457c984fae179ce SHA256 e10024adff892effc7ad2230234260c00106020c920180c69539f6f4e43b5d50
 MD5 704ffc456916b1e4953b5292b78f64c2 files/0.9.12-gcc3-gentoo.patch 530
 RMD160 2599f72b8a4cdb81cbad7802085321dbb2aa096d files/0.9.12-gcc3-gentoo.patch 530
 SHA256 e10024adff892effc7ad2230234260c00106020c920180c69539f6f4e43b5d50 files/0.9.12-gcc3-gentoo.patch 530
-AUX 0.9.12-proper-options.patch 1708 RMD160 6e3bb9f6f500904a986dfb04ae47123bd4cf28b3 SHA1 3c6c6b65f34c34b3dca9e2b06a5c53ea99bdfe3c SHA256 7ea0a8e6861d710b01bbe683585fdebd26a3d530f5b579aea10c563d4803a869 size 1708
+AUX 0.9.12-proper-options.patch 1708 RMD160 6e3bb9f6f500904a986dfb04ae47123bd4cf28b3 SHA1 3c6c6b65f34c34b3dca9e2b06a5c53ea99bdfe3c SHA256 7ea0a8e6861d710b01bbe683585fdebd26a3d530f5b579aea10c563d4803a869
 MD5 e363d085caa6b62c91264e68a15b0459 files/0.9.12-proper-options.patch 1708
 RMD160 6e3bb9f6f500904a986dfb04ae47123bd4cf28b3 files/0.9.12-proper-options.patch 1708
 SHA256 7ea0a8e6861d710b01bbe683585fdebd26a3d530f5b579aea10c563d4803a869 files/0.9.12-proper-options.patch 1708
-AUX 0.9.12-qt3.patch 979 RMD160 efe12c75b8d83b85292d974b0b4fe17f554a463b SHA1 0ce024be66d6ab60b72bb0d7c29764de18f1fee2 SHA256 3671171967c89b6ab675e49fd228cef0398bb01b9b60f77d26f749e4ea4f9861 size 979
+AUX 0.9.12-qt3.patch 979 RMD160 efe12c75b8d83b85292d974b0b4fe17f554a463b SHA1 0ce024be66d6ab60b72bb0d7c29764de18f1fee2 SHA256 3671171967c89b6ab675e49fd228cef0398bb01b9b60f77d26f749e4ea4f9861
 MD5 031dc9787ccdcb049081dccf31a4a401 files/0.9.12-qt3.patch 979
 RMD160 efe12c75b8d83b85292d974b0b4fe17f554a463b files/0.9.12-qt3.patch 979
 SHA256 3671171967c89b6ab675e49fd228cef0398bb01b9b60f77d26f749e4ea4f9861 files/0.9.12-qt3.patch 979
-DIST chromium-data-0.9.12.tar.gz 1111134 RMD160 b05510d8b4a5a868b632108f688ec187a89ed805 SHA256 749d10bcedeff7a82701da97701f9d31b4a057dfa84f33e197085ac71975b195 size 1111134
-DIST chromium-src-0.9.12.tar.gz 640283 RMD160 f422098a67efedb53fafbbb08119596c6b87a1d8 SHA256 a4a2c929dfd462a9281d8c0dae485c70362140e038f532608550f6528b6ab745 size 640283
-EBUILD chromium-0.9.12-r5.ebuild 2258 RMD160 f3c53be798bf716ae046ec44bba61a9ee80d34f7 SHA1 694fb645c40cc63b0dbbb874f6e2747342e0331e SHA256 3c1eb6c1e12c3fa42e647792e9f9a643494d73e8b62da0c7744c14d9d006294c size 2258
-MD5 2e744113fb586283003e4c1d2a25630f chromium-0.9.12-r5.ebuild 2258
-RMD160 f3c53be798bf716ae046ec44bba61a9ee80d34f7 chromium-0.9.12-r5.ebuild 2258
-SHA256 3c1eb6c1e12c3fa42e647792e9f9a643494d73e8b62da0c7744c14d9d006294c chromium-0.9.12-r5.ebuild 2258
-EBUILD chromium-0.9.12-r6.ebuild 2323 RMD160 93a87c6c9e9c4a0fe346be78314fc96ff776645d SHA1 3ac89aa03147dce3bcb5d42909504a573027e3eb SHA256 53e370514fc9878ed03338c61f052b94888073f4b5167f334e2b007bc17b1335 size 2323
-MD5 6cac5f53bc8d0927eb0e3ae9128cf575 chromium-0.9.12-r6.ebuild 2323
-RMD160 93a87c6c9e9c4a0fe346be78314fc96ff776645d chromium-0.9.12-r6.ebuild 2323
-SHA256 53e370514fc9878ed03338c61f052b94888073f4b5167f334e2b007bc17b1335 chromium-0.9.12-r6.ebuild 2323
-MISC ChangeLog 3987 RMD160 88e92e51529aad24f437cd5a07f31bbb6180bed7 SHA1 425821cc1f1339be923cfd5139078e0abe6fe446 SHA256 287df9c30bd8ae84c9d37c510f6cd1fcc5dce5a4f6c1a7ce34fe1d47371d6fe5 size 3987
-MD5 8e8c4889cf031f41fa9e87b4c1e8f43b ChangeLog 3987
-RMD160 88e92e51529aad24f437cd5a07f31bbb6180bed7 ChangeLog 3987
-SHA256 287df9c30bd8ae84c9d37c510f6cd1fcc5dce5a4f6c1a7ce34fe1d47371d6fe5 ChangeLog 3987
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+DIST chromium-data-0.9.12.tar.gz 1111134 RMD160 b05510d8b4a5a868b632108f688ec187a89ed805 SHA256 749d10bcedeff7a82701da97701f9d31b4a057dfa84f33e197085ac71975b195
+DIST chromium-src-0.9.12.tar.gz 640283 RMD160 f422098a67efedb53fafbbb08119596c6b87a1d8 SHA256 a4a2c929dfd462a9281d8c0dae485c70362140e038f532608550f6528b6ab745
+EBUILD chromium-0.9.12-r5.ebuild 2260 RMD160 10385609ad5702ddc4081f4e4b28306efad13017 SHA1 902c354a52cc32515417b67cf168a8e024c68cab SHA256 0aafc7d6fdc3a3ababbc0308888be8f6feb5eae6ef0efd691b23918bd6a93fd1
+MD5 26c02a2100b269a80ead9cc68654f771 chromium-0.9.12-r5.ebuild 2260
+RMD160 10385609ad5702ddc4081f4e4b28306efad13017 chromium-0.9.12-r5.ebuild 2260
+SHA256 0aafc7d6fdc3a3ababbc0308888be8f6feb5eae6ef0efd691b23918bd6a93fd1 chromium-0.9.12-r5.ebuild 2260
+EBUILD chromium-0.9.12-r6.ebuild 2325 RMD160 607fd056e98e41ddeb558001c5deb8cf4697361d SHA1 8e802cb84571e46b6fef1818bd003c7f72343f3f SHA256 607dc07f6b7a1f4e30b4ee0157c8a84709d97714138a42936a3918fcfed6efe4
+MD5 f98adb122d46f2161e6e722adeba4d76 chromium-0.9.12-r6.ebuild 2325
+RMD160 607fd056e98e41ddeb558001c5deb8cf4697361d chromium-0.9.12-r6.ebuild 2325
+SHA256 607dc07f6b7a1f4e30b4ee0157c8a84709d97714138a42936a3918fcfed6efe4 chromium-0.9.12-r6.ebuild 2325
+MISC ChangeLog 4134 RMD160 bd2e318f703f2b8f3f7e95e5ab8bb5ca4fa65bc3 SHA1 7bc0c1848f6e0cf0991be24caf513b10f44375cd SHA256 1fcf1b40698d07114550c96fbbec559373431032661396e6efb070b1b13d6149
+MD5 fea63a0b915918c6962fab3ca168878d ChangeLog 4134
+RMD160 bd2e318f703f2b8f3f7e95e5ab8bb5ca4fa65bc3 ChangeLog 4134
+SHA256 1fcf1b40698d07114550c96fbbec559373431032661396e6efb070b1b13d6149 ChangeLog 4134
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
@@ -42,3 +45,10 @@ SHA256 e15835fb5548e4a00ad3f117321c25681586d4b65569d538f3d9454ea6edbbcc files/di
 MD5 1091ea4475a76a7d4c9ece5a6d7d9ffa files/digest-chromium-0.9.12-r6 524
 RMD160 f81a71dfef00a132ebd52a1bc7b545483715672e files/digest-chromium-0.9.12-r6 524
 SHA256 e15835fb5548e4a00ad3f117321c25681586d4b65569d538f3d9454ea6edbbcc files/digest-chromium-0.9.12-r6 524
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEnMVzoeSe8B0zEfwRAjgKAJsHxHFGdCu3JnFAcUNAShoFOqUk8QCghTj2
+v24fgdZwB+fGWJHbZi4SXaw=
+=jMH1
+-----END PGP SIGNATURE-----
diff --git a/games-action/chromium/chromium-0.9.12-r5.ebuild b/games-action/chromium/chromium-0.9.12-r5.ebuild
index a499fb939dc6..ba4cf831e17c 100644
--- a/games-action/chromium/chromium-0.9.12-r5.ebuild
+++ b/games-action/chromium/chromium-0.9.12-r5.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/games-action/chromium/chromium-0.9.12-r5.ebuild,v 1.16 2006/05/20 00:16:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/chromium-0.9.12-r5.ebuild,v 1.17 2006/06/24 04:53:45 cardoe Exp $
 
 inherit flag-o-matic eutils games
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.reptilelabour.com/software/files/chromium/chromium-src-${PV}
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE="vorbis qt sdl"
+IUSE="vorbis qt3 sdl"
 
 DEPEND="|| ( x11-libs/libXext virtual/x11 )
 	|| (
@@ -21,7 +21,7 @@ DEPEND="|| ( x11-libs/libXext virtual/x11 )
 		virtual/glut
 	)
 	vorbis? ( media-libs/libvorbis )
-	qt? ( =x11-libs/qt-3* )
+	qt3? ( =x11-libs/qt-3* )
 	media-libs/openal"
 
 S=${WORKDIR}/Chromium-0.9
@@ -33,7 +33,7 @@ src_unpack() {
 	epatch \
 		"${FILESDIR}"/${PV}-gcc3-gentoo.patch \
 		"${FILESDIR}"/${PV}-proper-options.patch
-	if use qt ; then
+	if use qt3 ; then
 		epatch "${FILESDIR}/${PV}-qt3.patch"
 	fi
 	append-flags -DPKGDATADIR="'\"${GAMES_DATADIR}/${PN}\"'"
@@ -61,7 +61,7 @@ src_compile() {
 	use vorbis \
 		&& export ENABLE_VORBIS="yes" \
 		|| export ENABLE_VORBIS="no"
-	if use qt ; then
+	if use qt3 ; then
 		export ENABLE_SETUP="yes"
 		export QTDIR=/usr/qt/3
 	else
diff --git a/games-action/chromium/chromium-0.9.12-r6.ebuild b/games-action/chromium/chromium-0.9.12-r6.ebuild
index b7f13de09e6e..bf65d65abe48 100644
--- a/games-action/chromium/chromium-0.9.12-r6.ebuild
+++ b/games-action/chromium/chromium-0.9.12-r6.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/games-action/chromium/chromium-0.9.12-r6.ebuild,v 1.1 2006/05/20 00:16:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/chromium-0.9.12-r6.ebuild,v 1.2 2006/06/24 04:53:45 cardoe Exp $
 
 inherit flag-o-matic eutils games
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.reptilelabour.com/software/files/chromium/chromium-src-${PV}
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="vorbis qt sdl"
+IUSE="vorbis qt3 sdl"
 
 DEPEND="|| ( x11-libs/libXext virtual/x11 )
 	|| (
@@ -21,7 +21,7 @@ DEPEND="|| ( x11-libs/libXext virtual/x11 )
 		virtual/glut
 	)
 	vorbis? ( media-libs/libvorbis )
-	qt? ( =x11-libs/qt-3* )
+	qt3? ( =x11-libs/qt-3* )
 	~media-libs/openal-0.0.8
 	media-libs/freealut"
 
@@ -35,7 +35,7 @@ src_unpack() {
 		"${FILESDIR}"/${PV}-gcc3-gentoo.patch \
 		"${FILESDIR}"/${PV}-freealut.patch \
 		"${FILESDIR}"/${PV}-configure.patch
-	if use qt ; then
+	if use qt3 ; then
 		epatch "${FILESDIR}/${PV}-qt3.patch"
 	fi
 	append-flags -DPKGDATADIR="'\"${GAMES_DATADIR}/${PN}\"'"
@@ -63,7 +63,7 @@ src_compile() {
 	use vorbis \
 		&& export ENABLE_VORBIS="yes" \
 		|| export ENABLE_VORBIS="no"
-	if use qt ; then
+	if use qt3 ; then
 		export ENABLE_SETUP="yes"
 		export QTDIR=/usr/qt/3
 	else