Version bump, bug #256242, new slot. Drop osgi for now, until it's needed. Restrict tests.

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

3 files changed, 85 insertions, 2 deletions

diff --git a/dev-java/icu4j/ChangeLog b/dev-java/icu4j/ChangeLog
index 9480ea9ecca7..66acb2f28bfc 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.30 2009/05/16 19:11:20 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.31 2009/05/16 22:21:03 caster Exp $
+
+*icu4j-4.2 (16 May 2009)
+
+  16 May 2009; Vlastimil Babka <caster@gentoo.org> +icu4j-4.2.ebuild:
+  Version bump, bug #256242, new slot. Drop osgi for now, until it's needed.
+  Restrict tests.
 
 *icu4j-4.0.1 (16 May 2009)
 
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index cb4a7f26ab0e..64d77c802c40 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -6,8 +6,11 @@ DIST icu4j-4_0-docs.jar 1553226 RMD160 3088fb8ca695006238fedaa2a2fc88e38aecb506
 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
+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
 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 4359 RMD160 8eb1be4202d8bc28a3ffdb4ed65d5b4ca851e4bd SHA1 12819621e7844246bd702249a3980edf8354161e SHA256 075f226bc6a08e18e7304dd1c6bfd44ce821031b17d58bac16fe72276e212673
+EBUILD icu4j-4.2.ebuild 2088 RMD160 b8695454d9bc5dfa6883a4253f47f579cd5e839b SHA1 5de040567da74ff46c2c19a3f73377b0ce462a40 SHA256 f7e89d73374ba653a7adc3a1c3ffd438a93279ea39839e0c641692f871093a55
+MISC ChangeLog 4551 RMD160 110dfeca925834b94b4065751e1941b87bb56359 SHA1 5846d0693c996971ec0a833b87026ec0961e73ee SHA256 593a520fee0f1baa0ea3a76f805b978d6f1207ff5af3bd6aba3f2b31a799b64d
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
diff --git a/dev-java/icu4j/icu4j-4.2.ebuild b/dev-java/icu4j/icu4j-4.2.ebuild
new file mode 100644
index 000000000000..83f9f5ae2777
--- /dev/null
+++ b/dev-java/icu4j/icu4j-4.2.ebuild
@@ -0,0 +1,74 @@
+# 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.2.ebuild,v 1.1 2009/05/16 22:21:03 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"
+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() {
+	eant check
+}