summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Lohrke <carlo@gentoo.org>2008-07-27 01:03:32 +0000
committerCarsten Lohrke <carlo@gentoo.org>2008-07-27 01:03:32 +0000
commite6de08956e715ed44fb233f54b3d545f3dae29d5 (patch)
tree1734c0003cd39750f049d50696aada2c8bfbcdac /dev-java
parent Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11. (diff)
downloadgentoo-2-e6de08956e715ed44fb233f54b3d545f3dae29d5.tar.gz
gentoo-2-e6de08956e715ed44fb233f54b3d545f3dae29d5.tar.bz2
gentoo-2-e6de08956e715ed44fb233f54b3d545f3dae29d5.zip
Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/gnu-classpath/ChangeLog6
-rw-r--r--dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild4
-rw-r--r--dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild4
3 files changed, 9 insertions, 5 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/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