Version bump, bug #296767.

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

3 files changed, 86 insertions, 12 deletions

diff --git a/dev-java/icu4j/ChangeLog b/dev-java/icu4j/ChangeLog
index 744e46e22599..0dd1ce6c94db 100644
--- a/dev-java/icu4j/ChangeLog
+++ b/dev-java/icu4j/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icu4j
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.38 2010/04/13 11:58:54 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.39 2010/04/14 05:29:45 caster Exp $
+
+*icu4j-4.2.1 (13 Apr 2010)
+
+  13 Apr 2010; Vlastimil Babka <caster@gentoo.org> +icu4j-4.2.1.ebuild:
+  Version bump, bug #296767.
 
   13 Apr 2010; Christian Faulhammer <fauli@gentoo.org> icu4j-4.0.1.1.ebuild:
   stable x86, bug 310181
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index ffdb62e2f2ac..9e181eec596f 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
@@ -9,15 +6,11 @@ DIST icu4j-4_0_1_1-docs.jar 1553089 RMD160 e8304c27dc363ae99d2ddb6a0624e869c7c3a
 DIST icu4j-4_0_1_1-src.jar 15138020 RMD160 d6cd5163ebbf7bcb2bdfd8f65f83e9ec390c290d SHA1 daa3467983e6ecd735cd67e5920170702375bc7d SHA256 9d5484ccb3ad6849b6d3986ee2cf146984cbbb8adb2349dc79f6a4e006bc417e
 DIST icu4j-4_2-docs.jar 1635014 RMD160 1849be04b1bd26bf3cd3ae6cfff20a2e531b16ed SHA1 63bff833fc3818da74d035e66542b8cb2eacfb6d SHA256 11640200bfb4e9c7dd012ee8a02f32b83262ad1a497926d1dc31124b9a3b1a0e
 DIST icu4j-4_2-src.jar 15994443 RMD160 3a32e25032845568f2a08958042f5b9177e1b575 SHA1 43521cf6e9fb4a457e54bf82a1375aa4e96e57e1 SHA256 0d025dd566ef0eb7135980cc406a69536d7219bed6b7ae385f84f0713a83aba1
+DIST icu4j-4_2_1-docs.jar 1634050 RMD160 634a56a70dfd520b92855e5ae112420e1630acc6 SHA1 25444dcd3381c3a20d6c2ba90cd9537972e60dbe SHA256 c59f3104c3b8d64b1b2b5ad31f653cb49993ceb49501ed37965fdd4f16c37bdd
+DIST icu4j-4_2_1-src.jar 16002772 RMD160 68e33327b04b984be8eddb3cc7460feb77648b05 SHA1 b6f2264c79f0c98a6a0ea4c35e48524803c0584e SHA256 47f1acc6061867abc2b2ae9aaa99fa517b68f8111e74e0d13033f350f68a76d4
 EBUILD icu4j-3.8.1-r1.ebuild 2686 RMD160 4c70cde175a7e5125d28f6eb69d6cac8c5f2e67c SHA1 a224038c20d1661ee2269f487ddb7f896d402813 SHA256 89d6aa5745b802217e9afcb4ff26d5b263b6c0e61c7992b6c05ab34f3fcf0212
 EBUILD icu4j-4.0.1.1.ebuild 2497 RMD160 d4ad4ae12f47011b03168dfa6ed4308cfabba175 SHA1 6fad8ec90a33b9b205a98c6f63b7ef8aa359a7fc SHA256 089b8a32171018d83205941a1254240937833ddfee1eacc802efcdcadc266f7e
+EBUILD icu4j-4.2.1.ebuild 2308 RMD160 36a76c227a353a77705bb034b4e0a85c98e6b652 SHA1 415610a2962dcd5b1edd0a9fbf2e17ff8827ce22 SHA256 b1a56573ca5e2d0036d4a08c50dfafa74b1f4426b3e3d76730d209d9d49f08a7
 EBUILD icu4j-4.2.ebuild 2306 RMD160 f2f7389cfae7313403935b56bf0d111fa62dbedd SHA1 1d408944c00c6d31e32b10ac14cc6256b806f5f6 SHA256 7f4eedf57b1543bbf8a10264eea239ac398a9c9399358b6dfff4c4df0a2d60f0
-MISC ChangeLog 5505 RMD160 930124e32cd129f00e342dabea8ebbcccf72a462 SHA1 ca4daddb2255166595224e714d24ab47a16014ba SHA256 1a4737d73ee53ce60c45e12ea0db29cdbab91f934d630695a31277a877b3ecf0
+MISC ChangeLog 5636 RMD160 9983e8f4ff01fbecae13c8f84c7b8715f8b4bb74 SHA1 3cf424ff85ef3c48db665804586f9aa7eb805665 SHA256 155191c9c0954358ce45a073c320fba659cbc94fb3d26e7d66b726ccc22120c0
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvEXIQACgkQNQqtfCuFneM8/ACcDx0HBj1LnAqasTyl4NLpM/iF
-9qAAn2vJoSEsfJFvq6ooH4PhsyS976l0
-=05bH
------END PGP SIGNATURE-----
diff --git a/dev-java/icu4j/icu4j-4.2.1.ebuild b/dev-java/icu4j/icu4j-4.2.1.ebuild
new file mode 100644
index 000000000000..ef9a55f46f70
--- /dev/null
+++ b/dev-java/icu4j/icu4j-4.2.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-4.2.1.ebuild,v 1.1 2010/04/14 05:29:45 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
+
+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.2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+
+# there's some test that limit its run to 10s and fails
+RESTRICT="test"
+
+# Tests only work with JDK-1.6, severe out of memory problems appear with 1.5
+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-pkg_dojar "${PN}.jar"
+	java-pkg_dojar "${PN}-charsets.jar"
+
+	use doc && dohtml -r readme.html docs/*
+	use source && java-pkg_dosrc src/*
+}
+
+src_test() {
+	# bug #299082 - these tests fail with icedtea, assume too much about double<>string conversions
+	sed -i '/DiagBigDecimal/d' src/com/ibm/icu/dev/test/TestAll.java || die
+	eant check
+}