ICU4J version bump to 3.8.1, bug #209597

(Portage version: 2.1.4.4)

6 files changed, 106 insertions, 9 deletions

diff --git a/dev-java/icu4j/ChangeLog b/dev-java/icu4j/ChangeLog
index 21e025e4e8cc..93fb3e86bf43 100644
--- a/dev-java/icu4j/ChangeLog
+++ b/dev-java/icu4j/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2008/01/23 11:11:13 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.20 2008/03/11 08:52:09 elvanor Exp $
+
+*icu4j-3.8.1 (11 Mar 2008)
+
+  11 Mar 2008; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  +files/icu4j-3.8.1-manifest, icu4j-3.0-r1.ebuild, icu4j-3.6.1.ebuild,
+  icu4j-3.6.1-r1.ebuild, +icu4j-3.8.1.ebuild:
+  Version bump to 3.8.1, bug #209597
 
 *icu4j-3.6.1-r1 (23 Jan 2008)
 
diff --git a/dev-java/icu4j/files/icu4j-3.8.1-manifest b/dev-java/icu4j/files/icu4j-3.8.1-manifest
new file mode 100644
index 000000000000..df86b89a2358
--- /dev/null
+++ b/dev-java/icu4j/files/icu4j-3.8.1-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: 3.8.1
+Bundle-Localization: plugin
+Export-Package: com.ibm.icu.lang;version="3.8.1",
+ com.ibm.icu.math;version="3.8.1",
+ com.ibm.icu.text;version="3.8.1",
+ com.ibm.icu.util;version="3.8.1",
+ com.ibm.icu.impl;x-internal:=true,
+ com.ibm.icu.impl.data;x-internal:=true,
+ com.ibm.icu.impl.data.icudt38b;x-internal:=true,
+ com.ibm.icu.impl.data.icudt38b.brkitr;x-internal:=true,
+ com.ibm.icu.impl.data.icudt38b.coll;x-internal:=true,
+ com.ibm.icu.impl.data.icudt38b.rbnf;x-internal:=true,
+ com.ibm.icu.impl.data.icudt38b.translit;x-internal:=true
+Eclipse-LazyStart: true
+Bundle-ClassPath: .
+Eclipse-ExtensibleAPI: true
diff --git a/dev-java/icu4j/icu4j-3.0-r1.ebuild b/dev-java/icu4j/icu4j-3.0-r1.ebuild
index 57282bf6d31a..849d9eb5ebbc 100644
--- a/dev-java/icu4j/icu4j-3.0-r1.ebuild
+++ b/dev-java/icu4j/icu4j-3.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.0-r1.ebuild,v 1.9 2007/05/18 21:57:31 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-3.0-r1.ebuild,v 1.10 2008/03/11 08:52:09 elvanor Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -22,10 +22,10 @@ RDEPEND=">=virtual/jre-1.4"
 S=${WORKDIR}
 
 src_unpack() {
-	jar -xf ${DISTDIR}/${PN}src_${MY_PV}.jar || die "failed to 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"
+		jar -xf "${DISTDIR}/${PN}docs_${MY_PV}.jar" || die "failed to unpack docs"
 	fi
 }
 
diff --git a/dev-java/icu4j/icu4j-3.6.1-r1.ebuild b/dev-java/icu4j/icu4j-3.6.1-r1.ebuild
index 08c2382a05fa..c5a6ff1cad6d 100644
--- a/dev-java/icu4j/icu4j-3.6.1-r1.ebuild
+++ b/dev-java/icu4j/icu4j-3.6.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.6.1-r1.ebuild,v 1.1 2008/01/23 11:11:13 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-3.6.1-r1.ebuild,v 1.2 2008/03/11 08:52:09 elvanor Exp $
 
 # We currently download the Javadoc documentation.
 # It could optionally be built using the Ant build file.
@@ -12,7 +12,7 @@ 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."
+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}src_${MY_PV}.jar
diff --git a/dev-java/icu4j/icu4j-3.6.1.ebuild b/dev-java/icu4j/icu4j-3.6.1.ebuild
index 03ee29684fa4..fe0dd2a7dd59 100644
--- a/dev-java/icu4j/icu4j-3.6.1.ebuild
+++ b/dev-java/icu4j/icu4j-3.6.1.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.6.1.ebuild,v 1.3 2008/01/15 22:32:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-3.6.1.ebuild,v 1.4 2008/03/11 08:52:09 elvanor Exp $
 
 # We currently download the Javadoc documentation.
 # It could optionally be built using the Ant build file.
@@ -12,7 +12,7 @@ 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."
+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}src_${MY_PV}.jar
diff --git a/dev-java/icu4j/icu4j-3.8.1.ebuild b/dev-java/icu4j/icu4j-3.8.1.ebuild
new file mode 100644
index 000000000000..028089ec57f3
--- /dev/null
+++ b/dev-java/icu4j/icu4j-3.8.1.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.8.1.ebuild,v 1.1 2008/03/11 08:52:09 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 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="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}-${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/*
+}
+
+# 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
+}