Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.

Package-Manager: portage-2.1.4.4

4 files changed, 20 insertions, 26 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index f34474005346..7cf5459d7cf8 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/root
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.30 2008/07/18 09:19:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.31 2008/07/26 21:40:13 carlo Exp $
+
+  26 Jul 2008; Carsten Lohrke <carlo@gentoo.org> root-5.18.00d.ebuild,
+  root-5.20.00.ebuild:
+  Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
 
   18 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> root-5.16.00.ebuild,
   root-5.18.00d.ebuild, root-5.20.00.ebuild:
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 9f45b99bc16f..3bdca2668514 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX root-5.16.00-fortran.patch 5076 RMD160 2218584a3a5093a8d4171913a2b024bb759aae03 SHA1 4ed648d54260fd2593174154d8331c5d5afd5f09 SHA256 4ad7a3057528f30716d200c8f1462cf92da6f1ebef9bc3fee1874000bc10deec
 AUX root-5.16.00-xft.patch 687 RMD160 58efbc6efea7970ce267d05998deb8f849ecd5c5 SHA1 19ba24f17846a46d0ca10d0958587bd9166efd6d SHA256 e3540b4cecae6eb9e1c80e7edc923334056d63b4dedfc8bece34d29eec76d0a1
 AUX root-5.18.00d-gcc43.patch 22153 RMD160 33e93c0bb1cf78f963948aef2603b52b8159502e SHA1 679770eca8079c63f8816375212734794f4997af SHA256 94dc090797e2b8e972d5803d0bb94b61eb9581d559c0d91d489b1e893c343519
@@ -18,14 +15,7 @@ DIST root_v5.18.00d.source.tar.gz 23581098 RMD160 8fd731b271d542e73ba0c7982f344d
 DIST root_v5.20.00.source.tar.gz 25349138 RMD160 daa702dd8729d125f57a4ac3bf35ea1e84c15e22 SHA1 20ab6f3ad974449ad105c3e330a28f80ea310501 SHA256 8286c78d5c9ac10b0d0b93c8ef353f1399b1c034384f0ac4845a4df1efd09a87
 EBUILD root-3.05.04.ebuild 1654 RMD160 7f96255fd29b2fc2f2d30e41aa1e41ac57d24622 SHA1 ca10f01367a50aa1c867a4e48e435f4eb24e5151 SHA256 d74fbfd44a1da70c297196b56885128ca47297c9c349f8a083050ff346058dce
 EBUILD root-5.16.00.ebuild 5019 RMD160 880dbcf9e46a8d739d8004d800e0f4c09b95202b SHA1 7b2a9ad4ae4d97dd9d51d1fd2673a53e4192fa67 SHA256 80a02ae9475dde9e1feeff48ce20f59a76150b5c813a9bd0cd3aee874d6136df
-EBUILD root-5.18.00d.ebuild 5280 RMD160 2738b4d3116afee289a33d88f32ff5df45396890 SHA1 369a1f57e583b550e339568590a8b65240e0356f SHA256 c38a31e02f2363943340bde98f80c087ac019bb2bd1782f85bf5fca3cd1957b2
-EBUILD root-5.20.00.ebuild 5196 RMD160 bc69efffcc716846ec40078321696410e9d8d18d SHA1 e2ec6d55b252754befc983b99db9ee514d86ab11 SHA256 3fa1203b97b2f64f826662989b13bffb4cdca454cd7d1cf0941ca441269cec3e
-MISC ChangeLog 10527 RMD160 15ae632f3c0d753258e3fbec44d1605e4f82c98a SHA1 10e443151557a80ad85829f97964fe7b6dc52782 SHA256 46576fca0bde91c3579457a5a4a395950b41f77139afdb7600925a79d1d0b0e1
+EBUILD root-5.18.00d.ebuild 5266 RMD160 3349bdd9e32218f262c9883fd2318dd771a85486 SHA1 fc112fc820b02b0b86847d6b759244faf75cba2d SHA256 7bbbf57363873fb2585f198d9eb198137b828d1f17cc1378cf663c725b48f0bb
+EBUILD root-5.20.00.ebuild 5181 RMD160 1284e512c1eeb9adccd9b08fb495c81b4c00e4a6 SHA1 d5a3dd8ed86a17a31802df1ab722c0c3b7601a04 SHA256 52347304601efa48852aad12d0593f4679ff9567a29064c73ce43ebc4f0e6b14
+MISC ChangeLog 10686 RMD160 80c6ebb4d9e38f1eed08c1073cdebcd00599d6cb SHA1 820c6c528fc08278bf383d16dfcd6aaed519aa35 SHA256 b8fa038af8889f835b61dc00639af5c108e3efa545b689522b3bc2b1f6d854e5
 MISC metadata.xml 597 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d SHA1 8fd69478a8a90f6222b1e428961815e0e697905a SHA256 8ae8ab4051e8534ca2df70f81fb999c478b8f1223980c0b366dc0501fa987c6c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiAYGIACgkQ1ycZbhPLE2CbZwCbB/mQv8iH4AlFEeoXpaWTyx+/
-hsEAn2bJvU7dvgSSolk7O/BtHE+USlKq
-=6sE8
------END PGP SIGNATURE-----
diff --git a/sci-physics/root/root-5.18.00d.ebuild b/sci-physics/root/root-5.18.00d.ebuild
index 6c35f9070562..a14fce30b22c 100644
--- a/sci-physics/root/root-5.18.00d.ebuild
+++ b/sci-physics/root/root-5.18.00d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.18.00d.ebuild,v 1.3 2008/07/18 09:19:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.18.00d.ebuild,v 1.4 2008/07/26 21:40:13 carlo Exp $
 
 EAPI="1"
 inherit versionator flag-o-matic eutils toolchain-funcs qt3 qt4 fortran
@@ -36,11 +36,11 @@ RDEPEND="sys-apps/shadow
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
 	qt3? ( !qt4? ( $(qt_min_version 3.3.4) ) )
-	qt4? ( || ( >=x11-libs/qt-4.3:4
-				( x11-libs/qt-gui:4
-				  x11-libs/qt-opengl:4
-				  x11-libs/qt-qt3support:4
-				  x11-libs/qt-xml:4 ) ) )
+	qt4? ( || ( ( x11-libs/qt-gui:4
+			x11-libs/qt-opengl:4
+			x11-libs/qt-qt3support:4
+			x11-libs/qt-xml:4 ) 
+			=x11-libs/qt-4.3* ) )
 	fftw? ( >=sci-libs/fftw-3 )
 	python? ( dev-lang/python )
 	ruby? ( dev-lang/ruby )
diff --git a/sci-physics/root/root-5.20.00.ebuild b/sci-physics/root/root-5.20.00.ebuild
index d4db7bbe771b..5736e6e29d26 100644
--- a/sci-physics/root/root-5.20.00.ebuild
+++ b/sci-physics/root/root-5.20.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.20.00.ebuild,v 1.2 2008/07/18 09:19:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.20.00.ebuild,v 1.3 2008/07/26 21:40:13 carlo Exp $
 
 EAPI=1
 inherit versionator flag-o-matic eutils toolchain-funcs qt4 fortran
@@ -40,11 +40,11 @@ RDEPEND="sys-apps/shadow
 	postgres? ( virtual/postgresql-server )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	qt4? ( || ( >=x11-libs/qt-4.3:4
-				( x11-libs/qt-gui:4
-				  x11-libs/qt-opengl:4
-				  x11-libs/qt-qt3support:4
-				  x11-libs/qt-xml:4 ) ) )
+	qt4? ( || ( ( x11-libs/qt-gui:4
+			x11-libs/qt-opengl:4
+			x11-libs/qt-qt3support:4
+			x11-libs/qt-xml:4 )
+			=x11-libs/qt-4.3* ) )
 	fftw? ( sci-libs/fftw:3.0 )
 	python? ( dev-lang/python )
 	ruby? ( dev-lang/ruby )