summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2008-11-24 10:21:50 +0000
committerVlastimil Babka <caster@gentoo.org>2008-11-24 10:21:50 +0000
commit52051df879e88ec37ef0ead37dc8651deabd3d03 (patch)
treeb53af714baf9b92ed8fe42edd21379b6794bc7d6 /dev-java/icu4j
parentia64/sparc/x86 stable (diff)
downloadgentoo-2-52051df879e88ec37ef0ead37dc8651deabd3d03.tar.gz
gentoo-2-52051df879e88ec37ef0ead37dc8651deabd3d03.tar.bz2
gentoo-2-52051df879e88ec37ef0ead37dc8651deabd3d03.zip
Restrict jdk deps to rule out 1.7, fails with it.
(Portage version: 2.2_rc15/cvs/Linux 2.6.27-gentoo-r1-perfctr x86_64)
Diffstat (limited to 'dev-java/icu4j')
-rw-r--r--dev-java/icu4j/ChangeLog5
-rw-r--r--dev-java/icu4j/icu4j-4.0.ebuild7
2 files changed, 8 insertions, 4 deletions
diff --git a/dev-java/icu4j/ChangeLog b/dev-java/icu4j/ChangeLog
index 4a666bb621dd..20fbb31eb2f5 100644
--- a/dev-java/icu4j/ChangeLog
+++ b/dev-java/icu4j/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/icu4j
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.27 2008/08/24 16:03:21 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.28 2008/11/24 10:21:50 caster Exp $
+
+ 24 Nov 2008; Vlastimil Babka <caster@gentoo.org> icu4j-4.0.ebuild:
+ Restrict jdk deps to rule out 1.7, fails with it.
24 Aug 2008; nixnut <nixnut@gentoo.org> icu4j-3.8.1-r1.ebuild:
Stable on ppc wrt bug 235509
diff --git a/dev-java/icu4j/icu4j-4.0.ebuild b/dev-java/icu4j/icu4j-4.0.ebuild
index 85e63e24f718..4db8c5825eef 100644
--- a/dev-java/icu4j/icu4j-4.0.ebuild
+++ b/dev-java/icu4j/icu4j-4.0.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/icu4j/icu4j-4.0.ebuild,v 1.1 2008/07/28 19:18:27 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-4.0.ebuild,v 1.2 2008/11/24 10:21:50 caster Exp $
# We currently download the Javadoc documentation.
# It could optionally be built using the Ant build file.
@@ -22,13 +22,14 @@ HOMEPAGE="http://www.icu-project.org/"
LICENSE="icu"
SLOT="4"
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
RDEPEND=">=virtual/jre-1.4"
# build.xml does file version detection that fails for 1.7
# http://bugs.gentoo.org/show_bug.cgi?id=213555
-DEPEND="test? ( >=virtual/jdk-1.6 )
- !test? ( >=virtual/jdk-1.4 )
+DEPEND="test? ( =virtual/jdk-1.6* )
+ !test? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
app-arch/unzip"
RESTRICT="ia64? ( test )