Removed alternative dependency on Qt metapackage

Package-Manager: portage-2.2_rc43/cvs/Linux x86_64

5 files changed, 27 insertions, 26 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 340d68e0101e..f722d4cf89a1 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.56 2009/09/24 00:06:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.57 2009/10/06 17:46:39 ayoy Exp $
+
+  06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> root-5.22.00-r2.ebuild,
+  root-5.22.00-r3.ebuild, root-5.24.00.ebuild:
+  Removed alternative dependency on Qt metapackage
 
 *root-5.24.00 (24 Sep 2009)
 
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 690f6f40dd3c..e73b5be1f6b2 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -19,15 +19,15 @@ DIST root-5.22.00-patches-p04.tar.bz2 92875 RMD160 c87aa60cf1a68a13705df3da123cb
 DIST root-5.24.00-patches-p01.tar.bz2 44343 RMD160 be0e350e6ae79c52dfe1b425c91ef2a1cfe17435 SHA1 ae2887297b43e83a37534a1d3155aae2acbafffb SHA256 66144d5f24ba4198bf7a7530c92e33fad5d8df4f5704a6d84ad8aea0bc5df1a1
 DIST root_v5.22.00.source.tar.gz 26320334 RMD160 0fba2518802ce1f737b8cededbf518f0e475ba19 SHA1 b63e09d90ffef973fd487fdc7fc1ed3b26cf6d48 SHA256 9445351905e2b1b546bd6fea9d7397054aa1622a91bbc388014f3706b0843fe2
 DIST root_v5.24.00.source.tar.gz 27387383 RMD160 2f400d69dad1db2cd1e5f96fe4208a5a7b156689 SHA1 8a7d73c069798bb0e075cf31c54dd7feb475cefe SHA256 d4df055276a1a96599e553166efbd11f1f7eb0a2dcf0d892959771705bd1914e
-EBUILD root-5.22.00-r2.ebuild 9199 RMD160 f24a697205890213db2d3f7ee5cc2f7d2ee3febc SHA1 fc37bee0bac6cf0019088200164bfcef70d4994b SHA256 9ad12f02920dac1eeb345d02acd5c0691d6d6e46173f8938502063e6489e11f8
-EBUILD root-5.22.00-r3.ebuild 9575 RMD160 9d8451612d8753fc4e0b7fbb4ba3565a2a0f20be SHA1 dc62332cd4418abdfffecfa919be3e415a9746da SHA256 c50201a74cf918d09b6b3192763d8bdf4cd52308753492cd1035c25661e7601b
-EBUILD root-5.24.00.ebuild 9109 RMD160 06950038ff48cb1e2a0ebfec417bf7675edf2806 SHA1 3f5dfcf42e88451daa56b490b1653698c92fcfc5 SHA256 51f36a32a0b9aa13086cba84495815b56a6eaf2bba8d32538c733ce376637657
-MISC ChangeLog 17395 RMD160 9e44bcc80141ac94a31e69e18420ed4d78dcc737 SHA1 dc39fe02037d1d44fab17ab697cbb7de2f5fa8f7 SHA256 d416b73df0ced591f6e2f0c2da1909a4402030d5b6e6836e9e8c79960f4548cd
+EBUILD root-5.22.00-r2.ebuild 9136 RMD160 61d62c9075b10a37cfbd53aed4c390bed5c847b0 SHA1 9d9886fd5c9311ea982a5e602dba1f5adaaa84f9 SHA256 4066ff6a1fe1af8161ce955a7788fd15352b2fa2fb95ed44bf8ea81af5103aa7
+EBUILD root-5.22.00-r3.ebuild 9512 RMD160 5769e1e614c937cd686dbf11ddfb4779f8726591 SHA1 837bfe4f6b1fe32e16e107b60362c9c218805dbc SHA256 f9b15c5d3de2e1a707ea71bc20ec858c1eb0f751f6b17e904d661a904cde9926
+EBUILD root-5.24.00.ebuild 9046 RMD160 33ad2a0fd5627611d88111c6afbd80b488272f9f SHA1 15f837978e4b174b3e76548bdbd39674c2af8402 SHA256 924b0efa9a15bb824db753de845d01ecd3e6923dc1f0af0cd1172c42f5a85c78
+MISC ChangeLog 17563 RMD160 d745af3d71b7e7a5d020ea469efa348e5ccfc2b2 SHA1 523fa0b13a57f58a2add1109097504705fd50aaf SHA256 63cd7220a4990f229b94ae6d1b825ec2571a7ebc9ea6c6b0dadad645bffa2725
 MISC metadata.xml 1569 RMD160 dba331cab0e10890d441d667416e43098a764c3f SHA1 38d5cc13c7531ac1ba267f447b2ac84cb9c2e6c4 SHA256 884bc118e850e655cdf52e3f7e8171d8a88d2c6c986fd5d5e49cbd303c18aaa2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq6uA8ACgkQ1ycZbhPLE2DIvwCfRQm1hGpUTWG9nGs+ogvXDNGv
-xmwAn2lrsjNkovmpd2tFFhYl9FiZK5zV
-=nvLR
+iEYEARECAAYFAkrLgowACgkQ+CZEqwt+F6Yp0gCggk8cqgzdTjVlVOLVQiiDxwrL
+pJkAoKGSdhUIkXCG+B6hby9sbCmzhThu
+=9vVa
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/root/root-5.22.00-r2.ebuild b/sci-physics/root/root-5.22.00-r2.ebuild
index 6d6cc5dc4f67..8cbbce228e5c 100644
--- a/sci-physics/root/root-5.22.00-r2.ebuild
+++ b/sci-physics/root/root-5.22.00-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.22.00-r2.ebuild,v 1.4 2009/07/19 22:56:53 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.22.00-r2.ebuild,v 1.5 2009/10/06 17:46:39 ayoy Exp $
 
 EAPI=2
 inherit versionator eutils qt4 fortran elisp-common fdo-mime toolchain-funcs
@@ -58,11 +58,10 @@ CDEPEND=">=dev-lang/cfortran-4.4-r2
 	pythia6? ( sci-physics/pythia:6 )
 	pythia8? ( sci-physics/pythia:8 )
 	python? ( dev-lang/python )
-	qt4? ( || ( ( x11-libs/qt-gui:4
-				  x11-libs/qt-opengl:4
-				  x11-libs/qt-qt3support:4
-				  x11-libs/qt-xmlpatterns:4 )
-			x11-libs/qt:4[qt3support,opengl] ) )
+	qt4? ( x11-libs/qt-gui:4
+		x11-libs/qt-opengl:4
+		x11-libs/qt-qt3support:4
+		x11-libs/qt-xmlpatterns:4 )
 	ruby? ( dev-lang/ruby
 			dev-ruby/rubygems )
 	ssl? ( dev-libs/openssl )
diff --git a/sci-physics/root/root-5.22.00-r3.ebuild b/sci-physics/root/root-5.22.00-r3.ebuild
index e8b9a198a0d6..ea8af7661430 100644
--- a/sci-physics/root/root-5.22.00-r3.ebuild
+++ b/sci-physics/root/root-5.22.00-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.22.00-r3.ebuild,v 1.1 2009/09/23 23:47:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.22.00-r3.ebuild,v 1.2 2009/10/06 17:46:39 ayoy Exp $
 
 EAPI=2
 inherit versionator eutils qt4 elisp-common fdo-mime toolchain-funcs
@@ -57,11 +57,10 @@ CDEPEND=">=dev-lang/cfortran-4.4-r2
 	pythia6? ( sci-physics/pythia:6 )
 	pythia8? ( sci-physics/pythia:8 )
 	python? ( dev-lang/python )
-	qt4? ( || ( ( x11-libs/qt-gui:4
-				  x11-libs/qt-opengl:4
-				  x11-libs/qt-qt3support:4
-				  x11-libs/qt-xmlpatterns:4 )
-			x11-libs/qt:4[qt3support,opengl] ) )
+	qt4? ( x11-libs/qt-gui:4
+		x11-libs/qt-opengl:4
+		x11-libs/qt-qt3support:4
+		x11-libs/qt-xmlpatterns:4 )
 	ruby? ( dev-lang/ruby
 			dev-ruby/rubygems )
 	ssl? ( dev-libs/openssl )
diff --git a/sci-physics/root/root-5.24.00.ebuild b/sci-physics/root/root-5.24.00.ebuild
index 62776ee59492..7734bc2d071e 100644
--- a/sci-physics/root/root-5.24.00.ebuild
+++ b/sci-physics/root/root-5.24.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.24.00.ebuild,v 1.1 2009/09/24 00:06:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.24.00.ebuild,v 1.2 2009/10/06 17:46:39 ayoy Exp $
 
 EAPI=2
 inherit versionator eutils qt4 elisp-common fdo-mime toolchain-funcs
@@ -57,11 +57,10 @@ CDEPEND=">=dev-lang/cfortran-4.4-r2
 	pythia6? ( sci-physics/pythia:6 )
 	pythia8? ( sci-physics/pythia:8 )
 	python? ( dev-lang/python )
-	qt4? ( || ( ( x11-libs/qt-gui:4
-				  x11-libs/qt-opengl:4
-				  x11-libs/qt-qt3support:4
-				  x11-libs/qt-xmlpatterns:4 )
-			x11-libs/qt:4[qt3support,opengl] ) )
+	qt4? ( x11-libs/qt-gui:4
+		x11-libs/qt-opengl:4
+		x11-libs/qt-qt3support:4
+		x11-libs/qt-xmlpatterns:4 )
 	ruby? ( dev-lang/ruby
 			dev-ruby/rubygems )
 	ssl? ( dev-libs/openssl )