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
commitfb7f4e3b74ac1d739095e7a911c82ce3d672885c (patch)
treef993eb42b08a1b682b3299f10da2c8b3d9b095e6 /dev-java/icu4j
parentia64/sparc/x86 stable (diff)
downloadhistorical-fb7f4e3b74ac1d739095e7a911c82ce3d672885c.tar.gz
historical-fb7f4e3b74ac1d739095e7a911c82ce3d672885c.tar.bz2
historical-fb7f4e3b74ac1d739095e7a911c82ce3d672885c.zip
Restrict jdk deps to rule out 1.7, fails with it.
Package-Manager: portage-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/Manifest4
-rw-r--r--dev-java/icu4j/icu4j-4.0.ebuild7
3 files changed, 10 insertions, 6 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/Manifest b/dev-java/icu4j/Manifest
index e220aa902965..8e855175e18d 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -13,6 +13,6 @@ EBUILD icu4j-3.0-r1.ebuild 1103 RMD160 13da4a227d8c6ad18a56701a43ede44348e07638
EBUILD icu4j-3.6.1-r1.ebuild 2224 RMD160 641b73754452eb03a1d1af35a5f8365144741306 SHA1 e399560f555fd387313a93f79b939c9ae86af502 SHA256 c73e2b7e1743921c866bd3ebaa4713c24115c4f995ab5ea9b2a0c990a0211a64
EBUILD icu4j-3.6.1.ebuild 2196 RMD160 d0d4c41f4d1039347f8d70c08418b29de1b36b24 SHA1 edcfa546f80c4beef3e64392f8cb53adbae0af43 SHA256 029e848e050882f260d53d4b25227b5b4382014a24446736632f77c95e7c04eb
EBUILD icu4j-3.8.1-r1.ebuild 2513 RMD160 2e1bbff26a4510645bfce3b51f0922b61716b304 SHA1 3ab0108a27e22cfb77786af7300bd1dbfec35655 SHA256 e09084fe3cdfe3e31f934f60ed5da9fb15967ed95c4e68c37dd2cef7bc64e089
-EBUILD icu4j-4.0.ebuild 2231 RMD160 484cba18ebe6bc3dd6761395225a0f10ff5523e9 SHA1 0d89b6708a28e29c428f29d67b3d162c7576bd0c SHA256 17e8a75e26578dbae117e9f177d4ed1ee9da45f6f0052d9c02fab4ce9f572805
-MISC ChangeLog 3931 RMD160 44be6d41c6ccef7dbb942ebac2be841b697c04d5 SHA1 24b0d5ec5620af5d44871fb2e0de387ec2487e0c SHA256 a90c3484e712857ec7d40b8669f6b3f0e86aff3ea3618396ee739b254f380a0b
+EBUILD icu4j-4.0.ebuild 2281 RMD160 b2b19f7b87c46412aed4d76e0127272ed5bb8674 SHA1 c97ebef5c83cfd28e6fd64d83e888f01787d914b SHA256 097ca7ec48b6042569412d90ab44565b03bb6c015c5e3ffc7b5dd517770c9e3c
+MISC ChangeLog 4053 RMD160 1be9cb793c99186134c9e19197dbb51508b7d8b7 SHA1 46e147dae8679b6c40498540cb74cf74ae1a7cab SHA256 ccf4c8b45123bba6bf03d57fd67a4baff6f6ab2a2cb23319142ddb89bfa05c33
MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
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 )