Fix for bug #206819.

Package-Manager: portage-2.1.3.19

4 files changed, 93 insertions, 5 deletions

diff --git a/dev-java/icu4j/ChangeLog b/dev-java/icu4j/ChangeLog
index 6cf57409d504..21e025e4e8cc 100644
--- a/dev-java/icu4j/ChangeLog
+++ b/dev-java/icu4j/ChangeLog
@@ -1,6 +1,12 @@
 # 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.18 2008/01/15 22:32:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.19 2008/01/23 11:11:13 elvanor Exp $
+
+*icu4j-3.6.1-r1 (23 Jan 2008)
+
+  23 Jan 2008; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  +icu4j-3.6.1-r1.ebuild:
+  Fix for bug #206819.
 
   15 Jan 2008; Vlastimil Babka <caster@gentoo.org> icu4j-3.6.1.ebuild:
   Restrict compiler to javac which unlike ecj doesn't mind the API changes in
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 9fe249479a87..d86e75a70803 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -10,14 +10,18 @@ EBUILD icu4j-3.0-r1.ebuild 1103 RMD160 96ae817a6f6a98c3f300288f0ab671b0c6a0a09a
 MD5 ff05b99636d1f0306807b5da40b2a1f5 icu4j-3.0-r1.ebuild 1103
 RMD160 96ae817a6f6a98c3f300288f0ab671b0c6a0a09a icu4j-3.0-r1.ebuild 1103
 SHA256 227d9b0a26a601d3e75a40dd6987895c76263fc65cdf4117561408882c19f7e7 icu4j-3.0-r1.ebuild 1103
+EBUILD icu4j-3.6.1-r1.ebuild 2251 RMD160 aafef16e10a58a6a655d13e0e80f18a29c773192 SHA1 785ee6798ddb2e097bc4accbf5d32cbd654fbb4e SHA256 87578c2f3167dd411ac5daaa0b14075a9baac2c047da603b788fd9dc58b2b1ba
+MD5 98c743e664ae1f1bb11515a83d7d25ba icu4j-3.6.1-r1.ebuild 2251
+RMD160 aafef16e10a58a6a655d13e0e80f18a29c773192 icu4j-3.6.1-r1.ebuild 2251
+SHA256 87578c2f3167dd411ac5daaa0b14075a9baac2c047da603b788fd9dc58b2b1ba icu4j-3.6.1-r1.ebuild 2251
 EBUILD icu4j-3.6.1.ebuild 2222 RMD160 df69c5f2a3905a294a58851b6a74dcceea347b10 SHA1 0cef8b42c4ca072ee6bc3ece262d97c6cd03af27 SHA256 b8deda99fd438c531ddd1e923ead202c65ef24b889f72fabc0b4dda1aac6f7df
 MD5 d0b7302c808b19f02e9fabd83e7c1e2a icu4j-3.6.1.ebuild 2222
 RMD160 df69c5f2a3905a294a58851b6a74dcceea347b10 icu4j-3.6.1.ebuild 2222
 SHA256 b8deda99fd438c531ddd1e923ead202c65ef24b889f72fabc0b4dda1aac6f7df icu4j-3.6.1.ebuild 2222
-MISC ChangeLog 2407 RMD160 eca4b4bc39924b54e2c85857fcbb6708e2dc6939 SHA1 70bd921c7a47b91971721204434e3d29c41181c1 SHA256 d67230b7deaa8087836bfda05b5b1bfc9547f4598208f4f590360a5d658a64f0
-MD5 a3a1e01d22362a0206019b2ee55d42ff ChangeLog 2407
-RMD160 eca4b4bc39924b54e2c85857fcbb6708e2dc6939 ChangeLog 2407
-SHA256 d67230b7deaa8087836bfda05b5b1bfc9547f4598208f4f590360a5d658a64f0 ChangeLog 2407
+MISC ChangeLog 2546 RMD160 3be1369caa6f8dd59a2f7225daf7435907a99395 SHA1 24a773236ab0ccc21c543e24795f10e90100078c SHA256 a45ee75790a746071595031abaa942a10e1a9c371c379b7b1eac2732bfc1e7e7
+MD5 a37b11c25254b0fb138f60ed49cc2247 ChangeLog 2546
+RMD160 3be1369caa6f8dd59a2f7225daf7435907a99395 ChangeLog 2546
+SHA256 a45ee75790a746071595031abaa942a10e1a9c371c379b7b1eac2732bfc1e7e7 ChangeLog 2546
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -28,3 +32,6 @@ SHA256 fbdf152e5320217e4e9ec95e9b0347bb95f21ef9d7bff4f66ddfff6df9f448a5 files/di
 MD5 3d34e1d81ee54a70860c7c7ae231da6f files/digest-icu4j-3.6.1 482
 RMD160 1c95c8c2d5941d84539dc938a1dd4bede2632d2a files/digest-icu4j-3.6.1 482
 SHA256 221180dfe82c3412fb74ff5e6233a4f94919286ad27c3befab3e479375ce5f1e files/digest-icu4j-3.6.1 482
+MD5 3d34e1d81ee54a70860c7c7ae231da6f files/digest-icu4j-3.6.1-r1 482
+RMD160 1c95c8c2d5941d84539dc938a1dd4bede2632d2a files/digest-icu4j-3.6.1-r1 482
+SHA256 221180dfe82c3412fb74ff5e6233a4f94919286ad27c3befab3e479375ce5f1e files/digest-icu4j-3.6.1-r1 482
diff --git a/dev-java/icu4j/files/digest-icu4j-3.6.1-r1 b/dev-java/icu4j/files/digest-icu4j-3.6.1-r1
new file mode 100644
index 000000000000..6c0a52109d2d
--- /dev/null
+++ b/dev-java/icu4j/files/digest-icu4j-3.6.1-r1
@@ -0,0 +1,6 @@
+MD5 db5670fcaf4ea21ee79777024635f0b3 icu4jdocs_3_6_1.jar 1272083
+RMD160 bee225934e218f1ec30d6178cce683af696eb70a icu4jdocs_3_6_1.jar 1272083
+SHA256 94825decfad15ac4ba6dc1bda7893398e421a37b4ce7f3fa87b80a7d1c39d6f0 icu4jdocs_3_6_1.jar 1272083
+MD5 e282dad6502ee0679c69d0a26e541552 icu4jsrc_3_6_1.jar 12914772
+RMD160 58f6c7dcdd62247b633e2ee162b98cb86d7bb498 icu4jsrc_3_6_1.jar 12914772
+SHA256 4800e02ff7916dda103063e51bd6f81237c1003087879b5a12a74593d02f1d36 icu4jsrc_3_6_1.jar 12914772
diff --git a/dev-java/icu4j/icu4j-3.6.1-r1.ebuild b/dev-java/icu4j/icu4j-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..08c2382a05fa
--- /dev/null
+++ b/dev-java/icu4j/icu4j-3.6.1-r1.ebuild
@@ -0,0 +1,69 @@
+# 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.6.1-r1.ebuild,v 1.1 2008/01/23 11:11:13 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="source"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="ICU4J is a mature, widely used set of Java libraries providing Unicode and Globalization support for software applications."
+MY_PV=${PV//./_}
+
+SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}src_${MY_PV}.jar
+	doc? ( http://download.icu-project.org/files/${PN}/${PV}/${PN}docs_${MY_PV}.jar )"
+
+HOMEPAGE="http://www.icu-project.org/"
+LICENSE="icu"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+RDEPEND=">=virtual/jre-1.4"
+
+DEPEND="test? ( || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
+	!test? ( >=virtual/jdk-1.4 )"
+
+IUSE="doc test"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	jar -xf "${DISTDIR}/${PN}src_${MY_PV}.jar" || die "Failed to unpack"
+
+	if use doc; then
+		mkdir docs; cd docs
+		jar -xf "${DISTDIR}/${PN}docs_${MY_PV}.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/*
+}
+
+# Following tests will fail in Sun JDK 6 (at least):
+# toUnicode: http://bugs.icu-project.org/trac/ticket/5663
+# TimeZoneTransitionAdd: http://bugs.icu-project.org/trac/ticket/5887
+# These are bugs in the tests themselves, not in the library
+
+src_test() {
+	eant check
+}