Commited icu4j-4.0 and fixed 3.8.1 for Eclipse Ganymede

Package-Manager: portage-2.1.4.4

6 files changed, 115 insertions, 8 deletions

diff --git a/dev-java/icu4j/ChangeLog b/dev-java/icu4j/ChangeLog
index 1b077ca31e15..0abec46b7346 100644
--- a/dev-java/icu4j/ChangeLog
+++ b/dev-java/icu4j/ChangeLog
@@ -1,6 +1,16 @@
 # 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.23 2008/07/23 14:39:20 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.24 2008/07/28 19:18:27 elvanor Exp $
+
+*icu4j-4.0 (28 Jul 2008)
+*icu4j-3.8.1-r1 (28 Jul 2008)
+
+  28 Jul 2008; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  files/icu4j-3.8.1-manifest, +files/icu4j-4.0-manifest,
+  -icu4j-3.8.1.ebuild, +icu4j-3.8.1-r1.ebuild, +icu4j-4.0.ebuild:
+  Added icu4j-4.0 (slotted), changed icu4j-3.8.1 so that it will work with
+  Eclipse-3.4. Actually, it's the wtp-3.0 plugin that requires a version of
+  icu4j>3.8.1.1
 
   23 Jul 2008; Jean-Noël Rivasseau <elvanor@gentoo.org> icu4j-3.8.1.ebuild:
   Disabled tests as they are currently failing.
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index cc26ebf16622..1730d2b2988e 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,7 +1,10 @@
 AUX icu4j-3.6.1-manifest 805 RMD160 1f8378a6d47e7b8d96d45f07907e8bc1e9a914c2 SHA1 49065c79a1f280f3c92b406e1bd9d886d0ec47cb SHA256 1dbfaedb1e9d045f80ec493c2b77466d7ff4ce151d4077f81e79c5d3f27eecea
-AUX icu4j-3.8.1-manifest 779 RMD160 02089bcb484d443818622da6f81a2bab83e8c002 SHA1 0eb5a211c63f510fb2480489db03d0abf0dcb98e SHA256 f490c0def8f05ae0cc27d4cc5e4a4f98b8223aed65ab0e637725cdfd95046589
+AUX icu4j-3.8.1-manifest 781 RMD160 a7ed98a6cd2977a8dfbcf4231dc06b5fb0b0dcf9 SHA1 57d00b01e51fe5c196ea51bfa841326b6ab6ea63 SHA256 1a1db870dac202bf316d4a13b92551d4223a49b7ed8182a17fd053ed03953826
+AUX icu4j-4.0-manifest 785 RMD160 4d6026d51c29b39a26ba09203fdc82b1ac6df88f SHA1 0a14e30093a8ee1f224895ec0ae054f4431c4426 SHA256 d2b1599ac0826cab97290a4ac3f54b01330d54a046d0ed28c5f26ef558addc41
 DIST icu4j-3_8_1-docs.jar 1470606 RMD160 8131fc868505050ded8563618f3a287e0a57d8eb SHA1 261ba7e69c97e1ea98f08c878280f9cc313184af SHA256 e3acbb4523ebf90288bde1ff4ebe16241ff8d5a3e53ce9e29636f569a42f0b46
 DIST icu4j-3_8_1-src.jar 13782832 RMD160 8b0feb5d956b4d82ecc69e8da89c572c5c25cc8c SHA1 420d988835f6ac4582ebab90a0f97d2800a8bc4e SHA256 c6b42a4a9fe0d13302897ee0bf2c955b8a7a02af1ee01ad9cdb61a515638ca0f
+DIST icu4j-4_0-docs.jar 1553226 RMD160 3088fb8ca695006238fedaa2a2fc88e38aecb506 SHA1 fbb33104a30e641ab63e310ac268d5ed9da599a9 SHA256 3a2cbecd2b3f4e09a8cd60a4648e1691e9638f049fe97ca4b597abb9c8ca14b4
+DIST icu4j-4_0-src.jar 15055760 RMD160 3e33cbf582927b058d040cd78d1844544794e0cc SHA1 9d334416de215b9a5d3150e11ed7bd2dddeb1046 SHA256 32d66ed9f8469731ab957b27872307a9cf2bcae663e9ae6b2d9f223828ebab55
 DIST icu4jdocs_3_0.jar 1458824 RMD160 9f2391db66c5f12f4faf982b8b90dc5940de588c SHA1 cb9599d4eeae2e18352c2d1dd0ab0353c47500f5 SHA256 13b38d12566fba7d3e23a762fce15d3c03048da7bff4ddd6d1f03277fb2de6b0
 DIST icu4jdocs_3_6_1.jar 1272083 RMD160 bee225934e218f1ec30d6178cce683af696eb70a SHA1 3c20dbe3537307b57d76af05160b9d505a811d08 SHA256 94825decfad15ac4ba6dc1bda7893398e421a37b4ce7f3fa87b80a7d1c39d6f0
 DIST icu4jsrc_3_0.jar 8987972 RMD160 490d34765f678393bdbe6cabcff1755f6dd4154c SHA1 a8868abdecdd87913750d4e20f748832a3de74e9 SHA256 96fb1a09fe7021bfab76cc732daf76b0ce2bb64f84bf67b2ae1e610666edbdda
@@ -9,6 +12,7 @@ DIST icu4jsrc_3_6_1.jar 12914772 RMD160 58f6c7dcdd62247b633e2ee162b98cb86d7bb498
 EBUILD icu4j-3.0-r1.ebuild 1103 RMD160 13da4a227d8c6ad18a56701a43ede44348e07638 SHA1 db118f1dbfebcb407e941c8dd82af0eb84866f0f SHA256 7f255620bbee344c87c7987b3e50e3715697b9ccdc95f8e6d82704abe7d0fc00
 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.ebuild 2471 RMD160 59d821573969d2888a407259ea9f731fb42ee685 SHA1 dcef0f8653acb920ba82a74fd1f3dd1d62d1eb28 SHA256 d155c2e0f3d23333fba0d82a2740941d2ae59d2e4ec11eeb28bd889ed462f96e
-MISC ChangeLog 3223 RMD160 043746089dfa4541848f6e5ec0aae2c5dc64ca0a SHA1 531ff2a7c2807459045d40d84fdd0c1e86c9e7f3 SHA256 a52888598475bf79a2e1a5cf7b3763e41db608067a5211c87ad0e28664a52d9c
+EBUILD icu4j-3.8.1-r1.ebuild 2518 RMD160 6b146c0daf6e43aa659ad45b7a829047d7741a3f SHA1 2cad0f66338d061ea8effd2643ef0d3bbe268da6 SHA256 27fe704d19de6d77c9d9785f234573e190cdef613c6e8f2871e1d15ed804bf70
+EBUILD icu4j-4.0.ebuild 2231 RMD160 484cba18ebe6bc3dd6761395225a0f10ff5523e9 SHA1 0d89b6708a28e29c428f29d67b3d162c7576bd0c SHA256 17e8a75e26578dbae117e9f177d4ed1ee9da45f6f0052d9c02fab4ce9f572805
+MISC ChangeLog 3627 RMD160 4faedddf10792960f0615bf4397e91d317267d2a SHA1 3df22e481d04c90443c3fbef04eaf99032d78294 SHA256 6547bf1893bf874a02b089305131845ccca91c0b1602fc6034c461aa850ae677
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
diff --git a/dev-java/icu4j/files/icu4j-3.8.1-manifest b/dev-java/icu4j/files/icu4j-3.8.1-manifest
index df86b89a2358..ae7ac129b5b6 100644
--- a/dev-java/icu4j/files/icu4j-3.8.1-manifest
+++ b/dev-java/icu4j/files/icu4j-3.8.1-manifest
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-Vendor: %vendorName
 Bundle-SymbolicName: com.ibm.icu; singleton:=true
-Bundle-Version: 3.8.1
+Bundle-Version: 3.8.1.1
 Bundle-Localization: plugin
 Export-Package: com.ibm.icu.lang;version="3.8.1",
  com.ibm.icu.math;version="3.8.1",
diff --git a/dev-java/icu4j/files/icu4j-4.0-manifest b/dev-java/icu4j/files/icu4j-4.0-manifest
new file mode 100644
index 000000000000..c78e8a043eb1
--- /dev/null
+++ b/dev-java/icu4j/files/icu4j-4.0-manifest
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-Vendor: %vendorName
+Bundle-SymbolicName: com.ibm.icu; singleton:=true
+Bundle-Version: determinedByPortage
+Bundle-Localization: plugin
+Export-Package: com.ibm.icu.lang;version="4.0",
+ com.ibm.icu.math;version="4.0",
+ com.ibm.icu.text;version="4.0",
+ com.ibm.icu.util;version="4.0",
+ com.ibm.icu.impl;x-internal:=true,
+ com.ibm.icu.impl.data;x-internal:=true,
+ com.ibm.icu.impl.data.icudt40b;x-internal:=true,
+ com.ibm.icu.impl.data.icudt40b.brkitr;x-internal:=true,
+ com.ibm.icu.impl.data.icudt40b.coll;x-internal:=true,
+ com.ibm.icu.impl.data.icudt40b.rbnf;x-internal:=true,
+ com.ibm.icu.impl.data.icudt40b.translit;x-internal:=true
+Eclipse-LazyStart: true
+Bundle-ClassPath: .
+Eclipse-ExtensibleAPI: true
diff --git a/dev-java/icu4j/icu4j-3.8.1.ebuild b/dev-java/icu4j/icu4j-3.8.1-r1.ebuild
index 55c274e5d99c..b7f27cd787a6 100644
--- a/dev-java/icu4j/icu4j-3.8.1.ebuild
+++ b/dev-java/icu4j/icu4j-3.8.1-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/icu4j/icu4j-3.8.1.ebuild,v 1.4 2008/07/23 14:39:20 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-3.8.1-r1.ebuild,v 1.1 2008/07/28 19:18:27 elvanor Exp $
 
 # We currently download the Javadoc documentation.
 # It could optionally be built using the Ant build file.
@@ -54,7 +54,7 @@ src_compile() {
 }
 
 src_install() {
-	java-osgi_newjar-fromfile "${PN}.jar" "${FILESDIR}/icu4j-${PV}-manifest" \
+	java-osgi_newjar-fromfile --no-auto-version "${PN}.jar" "${FILESDIR}/icu4j-${PV}-manifest" \
 		"International Components for Unicode for Java (ICU4J)"
 	java-pkg_dojar "${PN}-charsets.jar"
 
@@ -68,7 +68,7 @@ src_install() {
 # These are bugs in the tests themselves, not in the library
 
 src_test() {
-	# Tests currently fail, disabled for now. Need to investigate
+	# Tests currently fail, disabled for now. Need to investigate (tests work in icu4j-4.0)
 	#eant check
 	einfo "Tests currently disabled."
 }
diff --git a/dev-java/icu4j/icu4j-4.0.ebuild b/dev-java/icu4j/icu4j-4.0.ebuild
new file mode 100644
index 000000000000..85e63e24f718
--- /dev/null
+++ b/dev-java/icu4j/icu4j-4.0.ebuild
@@ -0,0 +1,72 @@
+# 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 $
+
+# We currently download the Javadoc documentation.
+# It could optionally be built using the Ant build file.
+# testdata.jar and icudata.jar do not contain *.class files but *.res files
+# These *.res data files are needed to built the final jar
+# They do not need to be installed however as they will already be present in icu4j.jar
+
+JAVA_PKG_IUSE="doc test source"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="ICU4J is a set of Java libraries providing Unicode and Globalization support."
+MY_PV=${PV//./_}
+
+SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-src.jar
+	doc? ( http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-docs.jar )"
+
+HOMEPAGE="http://www.icu-project.org/"
+LICENSE="icu"
+SLOT="4"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+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 )
+	app-arch/unzip"
+
+RESTRICT="ia64? ( test )
+	x86-fbsd? ( test )"
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	jar -xf "${DISTDIR}/${PN}-${MY_PV}-src.jar" || die "Failed to unpack"
+
+	if use doc; then
+		mkdir docs; cd docs
+		jar -xf "${DISTDIR}/${PN}-${MY_PV}-docs.jar" || die "Failed to unpack docs"
+	fi
+}
+
+src_compile() {
+	# Classes extending CharsetICU not implementing Comparable
+	# Breaks with ecj on jdk 1.5+, javac doesn't mind - Sun's hack?
+	# Restricting to javac (didn't even care to try jikes) is better
+	# than forcing 1.4
+	java-pkg_force-compiler javac
+	eant jar || die "Compile failed"
+}
+
+src_install() {
+	java-osgi_newjar-fromfile "${PN}.jar" "${FILESDIR}/icu4j-${PV}-manifest" \
+		"International Components for Unicode for Java (ICU4J)"
+	java-pkg_dojar "${PN}-charsets.jar"
+
+	use doc && dohtml -r readme.html docs/*
+	use source && java-pkg_dosrc src/*
+}
+
+# Tests only work with JDK-1.6, severe out of memory problems appear with 1.5
+
+src_test() {
+	eant check
+}