Version bump, bug #256242.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 86 insertions, 34 deletions

diff --git a/dev-java/icu4j/ChangeLog b/dev-java/icu4j/ChangeLog
index 60f016c2e3d6..9480ea9ecca7 100644
--- a/dev-java/icu4j/ChangeLog
+++ b/dev-java/icu4j/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/icu4j
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.29 2009/02/04 12:25:53 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.30 2009/05/16 19:11:20 caster Exp $
+
+*icu4j-4.0.1 (16 May 2009)
+
+  16 May 2009; Vlastimil Babka <caster@gentoo.org>
+  -files/icu4j-3.6.1-manifest, +icu4j-4.0.1.ebuild:
+  Version bump, bug #256242.
 
   04 Feb 2009; Petteri Räty <betelgeuse@gentoo.org> -icu4j-3.0-r1.ebuild,
   -icu4j-3.6.1.ebuild, -icu4j-3.6.1-r1.ebuild:
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 0bfa6d6060da..cb4a7f26ab0e 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX icu4j-3.6.1-manifest 805 RMD160 1f8378a6d47e7b8d96d45f07907e8bc1e9a914c2 SHA1 49065c79a1f280f3c92b406e1bd9d886d0ec47cb SHA256 1dbfaedb1e9d045f80ec493c2b77466d7ff4ce151d4077f81e79c5d3f27eecea
 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 icu4j-4_0_1-docs.jar 1552686 RMD160 3c589663809c45bed1c5a4704e4f070cff50ecfb SHA1 7c87c68956f77f5c43f4bce9265c1def14eb3c29 SHA256 999e859ffadf5e00427bbc2969ff30eb3040a79e295d7c83bcd2711568b2107a
+DIST icu4j-4_0_1-src.jar 15103010 RMD160 bcdeb9867725e6b4cc47af1bb27324cc9436941a SHA1 951d1949d507234d2a6f849b4b6fcd6507eca542 SHA256 cd68b4a2c665c9354f2e6a7fc9927eb07ab60ce0df05f4efae5a051c863c814a
 EBUILD icu4j-3.8.1-r1.ebuild 2513 RMD160 2e1bbff26a4510645bfce3b51f0922b61716b304 SHA1 3ab0108a27e22cfb77786af7300bd1dbfec35655 SHA256 e09084fe3cdfe3e31f934f60ed5da9fb15967ed95c4e68c37dd2cef7bc64e089
+EBUILD icu4j-4.0.1.ebuild 2280 RMD160 cc23e427daa2cfa4d4f308ee5d4444eb6499275b SHA1 6b62d6852e5f62fad9134c582fb17192d37ee2fa SHA256 91222ac648437a3a83e16336d566cbfe8f68ee099f991fc87012b58caa0536fc
 EBUILD icu4j-4.0.ebuild 2281 RMD160 b2b19f7b87c46412aed4d76e0127272ed5bb8674 SHA1 c97ebef5c83cfd28e6fd64d83e888f01787d914b SHA256 097ca7ec48b6042569412d90ab44565b03bb6c015c5e3ffc7b5dd517770c9e3c
-MISC ChangeLog 4202 RMD160 c122bf59ea447cf5a0924b04d74c790b8542bf69 SHA1 9ee0c8c779a2063e13f8507965b7697262a67f19 SHA256 d0073a24f6f449184eb8631581066deec35fe3c08e49e632e1d1b928957a9752
+MISC ChangeLog 4359 RMD160 8eb1be4202d8bc28a3ffdb4ed65d5b4ca851e4bd SHA1 12819621e7844246bd702249a3980edf8354161e SHA256 075f226bc6a08e18e7304dd1c6bfd44ce821031b17d58bac16fe72276e212673
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmJibcACgkQcxLzpIGCsLT0OQCeKNu7cYemIics6LFAamqCjteS
-NFEAn0u/NQ0ZT4/kR5E499lhNI/hDj5h
-=JhcQ
------END PGP SIGNATURE-----
diff --git a/dev-java/icu4j/files/icu4j-3.6.1-manifest b/dev-java/icu4j/files/icu4j-3.6.1-manifest
deleted file mode 100644
index 43e8275c73c0..000000000000
--- a/dev-java/icu4j/files/icu4j-3.6.1-manifest
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-Vendor: %vendorName
-Bundle-SymbolicName: com.ibm.icu; singleton:=true
-Bundle-Version: 3.6.1
-Bundle-Localization: plugin
-Export-Package: com.ibm.icu.lang;version="3.6.1",
- com.ibm.icu.math;version="3.6.1",
- com.ibm.icu.text;version="3.6.1",
- com.ibm.icu.util;version="3.6.1",
- com.ibm.icu.impl;x-internal:=true,
- com.ibm.icu.impl.data;x-internal:=true,
- com.ibm.icu.impl.data.icudt36b;x-internal:=true,
- com.ibm.icu.impl.data.icudt36b.brkitr;x-internal:=true,
- com.ibm.icu.impl.data.icudt36b.coll;x-internal:=true,
- com.ibm.icu.impl.data.icudt36b.rbnf;x-internal:=true,
- com.ibm.icu.impl.data.icudt36b.translit;x-internal:=true
-Eclipse-LazyStart: true
-Bundle-ClassPath: icu-jse4.jar,icu-data.jar,.
-Eclipse-ExtensibleAPI: true
diff --git a/dev-java/icu4j/icu4j-4.0.1.ebuild b/dev-java/icu4j/icu4j-4.0.1.ebuild
new file mode 100644
index 000000000000..fb9b36881b23
--- /dev/null
+++ b/dev-java/icu4j/icu4j-4.0.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-4.0.1.ebuild,v 1.1 2009/05/16 19:11:20 caster Exp $
+
+EAPI=2
+
+# 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="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"
+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.6* =virtual/jdk-1.5* =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-4.0-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
+}