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

Package-Manager: portage-2.1.4.4

4 files changed, 12 insertions, 8 deletions

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index 4f8af15e7037..d7e4d374a370 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/gnu-classpath
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.85 2008/07/17 13:05:54 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.86 2008/07/27 01:03:32 carlo Exp $
+
+  27 Jul 2008; Carsten Lohrke <carlo@gentoo.org>
+  gnu-classpath-0.97-r1.ebuild, gnu-classpath-0.97.2.ebuild:
+  Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
 
   17 Jul 2008; Jeremy Olexa <darkside@gentoo.org> Manifest:
   Restore Manifest to proper file.
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index 5e456e566d93..8cf3a0470322 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -8,8 +8,8 @@ DIST classpath-0.97.tar.gz 10262902 RMD160 3fcc0f0457ad90d3a6e6237202d671332d482
 EBUILD gnu-classpath-0.90.ebuild 2477 RMD160 dee48d23556bae4aaef77cad7f89cbbd706035c7 SHA1 bef9be363d5cdf4be177d282ba549b2f1a31d4b7 SHA256 b5a9f580f34974c7ecf0c65c7f85bf1a151c9f6bf39580cec935ea9f89712f4d
 EBUILD gnu-classpath-0.92.ebuild 2613 RMD160 5c293925c98dc096dbd509568f770ab98895a116 SHA1 9d441ac16615500761f8c7d4bcaa6b47222621ac SHA256 7d073a304bb3e986bb5f3256d31681771a3a62fdbff12ceec4a0389e5bc7ae27
 EBUILD gnu-classpath-0.93.ebuild 3498 RMD160 6e7f05441f2a3de33f015564f66d634c4a711ef4 SHA1 3681bbd107a6088d75c71bf64762f6e000ff54d7 SHA256 9d8ba3bf15fc1500ac6e6200da94e94f8685c9587c0daca51af52a702fd1e972
-EBUILD gnu-classpath-0.97-r1.ebuild 3416 RMD160 b8dac05c09a662c402dd9820b629840aefa9a401 SHA1 c1820d9a97584666cf1b7e047a96d4857d7a0496 SHA256 8a38ecbfecd7877fe1c4615c3b290ec2169e29d65547adae6c74b371428c27b6
-EBUILD gnu-classpath-0.97.2.ebuild 2559 RMD160 cd19158908f38c9aaa121046b7b9baf7524337ca SHA1 257bb99124a87eda3acc940eac4206ca3257ed28 SHA256 0dbd66f778068649b2b6eca89feb2192cdbf4978be9a6730f1b2e3e025bf8b63
+EBUILD gnu-classpath-0.97-r1.ebuild 3413 RMD160 d7fffcf247f8a693d8795c71652e461070ca85c2 SHA1 9cb5eba4d9898f32559b1976d8ad6015548c4cea SHA256 858d9c5142c5401005145556cdf2c7097b2ced8e04afddae72358082e2bf8b0d
+EBUILD gnu-classpath-0.97.2.ebuild 2554 RMD160 6bd0c2a95acf7a00305c29c42eb754bfe84acdd4 SHA1 c0d0efc620b76dba6901405743f0049faae544d1 SHA256 0327fd32c12e77b681c933b07b009e9f9ab92001fd9c9a1008b142d84087e8ec
 EBUILD gnu-classpath-0.97.ebuild 2892 RMD160 52d20e272d66b6f2b7b4bd87f4d844e799e5687a SHA1 88e941bcb021ea591bfe3cbc60856222f6081f40 SHA256 7101a80cb26a127c9dcfbab78fa15c47782b9fc3d6e0f530aea08090134c4e75
-MISC ChangeLog 12549 RMD160 12d2dbcd662e7e80fccf54a091db7a285b4d6752 SHA1 e03645159931bee5ad3f26cd5b9ef5c4eebbe716 SHA256 af0873593efe7730005fec5badffa68aad8f394ee5894aed8ce7e904ffe62d40
+MISC ChangeLog 12724 RMD160 50740465796ab102dfd02307d7298255c70e145f SHA1 1273c23b9a4466f30b4510410fca5bb40185b32f SHA256 219ca48ab543e4a4f22a2d33049b5895ba5e9df4af611107d72e82e9b4f802ed
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild
index 2542ab886244..e8c533c4805e 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.97-r1.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/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v 1.7 2008/05/17 11:36:40 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v 1.8 2008/07/27 01:03:32 carlo Exp $
 
 EAPI=1
 
@@ -47,7 +47,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 				=www-client/mozilla-firefox-bin-2*
 			)
 		)
-		qt4? ( || ( x11-libs/qt-gui:4 >=x11-libs/qt-4.1.0:4 ) )
+		qt4? ( || ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*:4 ) )
 		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )
 		gstreamer? (
 			>=media-libs/gstreamer-0.10.10
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild
index 928c4de7bbfa..3441d0fbf44f 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.97.2.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/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild,v 1.2 2008/07/17 05:02:59 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild,v 1.3 2008/07/27 01:03:32 carlo Exp $
 
 EAPI=1
 
@@ -44,7 +44,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 				=www-client/mozilla-firefox-bin-2*
 			)
 		)
-		qt4? ( || ( x11-libs/qt-gui:4 >=x11-libs/qt-4.1.0:4 ) )
+		qt4? ( || ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*:4 ) )
 		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )
 		gstreamer? (
 			>=media-libs/gstreamer-0.10.10