From 2b05c4cc3161c990660c599bb4a5b89af31a34d9 Mon Sep 17 00:00:00 2001 From: Jean-Noël Rivasseau Date: Mon, 28 Jul 2008 19:18:27 +0000 Subject: Commited icu4j-4.0 and fixed 3.8.1 for Eclipse Ganymede (Portage version: 2.1.4.4) --- dev-java/icu4j/ChangeLog | 12 ++++- dev-java/icu4j/files/icu4j-3.8.1-manifest | 2 +- dev-java/icu4j/files/icu4j-4.0-manifest | 21 +++++++++ dev-java/icu4j/icu4j-3.8.1-r1.ebuild | 74 +++++++++++++++++++++++++++++++ dev-java/icu4j/icu4j-3.8.1.ebuild | 74 ------------------------------- dev-java/icu4j/icu4j-4.0.ebuild | 72 ++++++++++++++++++++++++++++++ 6 files changed, 179 insertions(+), 76 deletions(-) create mode 100644 dev-java/icu4j/files/icu4j-4.0-manifest create mode 100644 dev-java/icu4j/icu4j-3.8.1-r1.ebuild delete mode 100644 dev-java/icu4j/icu4j-3.8.1.ebuild create mode 100644 dev-java/icu4j/icu4j-4.0.ebuild (limited to 'dev-java/icu4j') diff --git a/dev-java/icu4j/ChangeLog b/dev-java/icu4j/ChangeLog index 1b077ca31e15..0abec46b7346 100644 --- a/dev-java/icu4j/ChangeLog +++ b/dev-java/icu4j/ChangeLog @@ -1,6 +1,16 @@ # 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.23 2008/07/23 14:39:20 elvanor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.24 2008/07/28 19:18:27 elvanor Exp $ + +*icu4j-4.0 (28 Jul 2008) +*icu4j-3.8.1-r1 (28 Jul 2008) + + 28 Jul 2008; Jean-Noël Rivasseau + files/icu4j-3.8.1-manifest, +files/icu4j-4.0-manifest, + -icu4j-3.8.1.ebuild, +icu4j-3.8.1-r1.ebuild, +icu4j-4.0.ebuild: + Added icu4j-4.0 (slotted), changed icu4j-3.8.1 so that it will work with + Eclipse-3.4. Actually, it's the wtp-3.0 plugin that requires a version of + icu4j>3.8.1.1 23 Jul 2008; Jean-Noël Rivasseau icu4j-3.8.1.ebuild: Disabled tests as they are currently failing. diff --git a/dev-java/icu4j/files/icu4j-3.8.1-manifest b/dev-java/icu4j/files/icu4j-3.8.1-manifest index df86b89a2358..ae7ac129b5b6 100644 --- a/dev-java/icu4j/files/icu4j-3.8.1-manifest +++ b/dev-java/icu4j/files/icu4j-3.8.1-manifest @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-Vendor: %vendorName Bundle-SymbolicName: com.ibm.icu; singleton:=true -Bundle-Version: 3.8.1 +Bundle-Version: 3.8.1.1 Bundle-Localization: plugin Export-Package: com.ibm.icu.lang;version="3.8.1", com.ibm.icu.math;version="3.8.1", diff --git a/dev-java/icu4j/files/icu4j-4.0-manifest b/dev-java/icu4j/files/icu4j-4.0-manifest new file mode 100644 index 000000000000..c78e8a043eb1 --- /dev/null +++ b/dev-java/icu4j/files/icu4j-4.0-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: determinedByPortage +Bundle-Localization: plugin +Export-Package: com.ibm.icu.lang;version="4.0", + com.ibm.icu.math;version="4.0", + com.ibm.icu.text;version="4.0", + com.ibm.icu.util;version="4.0", + com.ibm.icu.impl;x-internal:=true, + com.ibm.icu.impl.data;x-internal:=true, + com.ibm.icu.impl.data.icudt40b;x-internal:=true, + com.ibm.icu.impl.data.icudt40b.brkitr;x-internal:=true, + com.ibm.icu.impl.data.icudt40b.coll;x-internal:=true, + com.ibm.icu.impl.data.icudt40b.rbnf;x-internal:=true, + com.ibm.icu.impl.data.icudt40b.translit;x-internal:=true +Eclipse-LazyStart: true +Bundle-ClassPath: . +Eclipse-ExtensibleAPI: true diff --git a/dev-java/icu4j/icu4j-3.8.1-r1.ebuild b/dev-java/icu4j/icu4j-3.8.1-r1.ebuild new file mode 100644 index 000000000000..b7f27cd787a6 --- /dev/null +++ b/dev-java/icu4j/icu4j-3.8.1-r1.ebuild @@ -0,0 +1,74 @@ +# 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-r1.ebuild,v 1.1 2008/07/28 19:18:27 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" + +# 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.5* =virtual/jdk-1.4* ) ) + !test? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* ) ) + app-arch/unzip" + +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 --no-auto-version "${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() { + # Tests currently fail, disabled for now. Need to investigate (tests work in icu4j-4.0) + #eant check + einfo "Tests currently disabled." +} diff --git a/dev-java/icu4j/icu4j-3.8.1.ebuild b/dev-java/icu4j/icu4j-3.8.1.ebuild deleted file mode 100644 index 55c274e5d99c..000000000000 --- a/dev-java/icu4j/icu4j-3.8.1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# 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.4 2008/07/23 14:39:20 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" - -# 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.5* =virtual/jdk-1.4* ) ) - !test? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* ) ) - app-arch/unzip" - -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() { - # Tests currently fail, disabled for now. Need to investigate - #eant check - einfo "Tests currently disabled." -} diff --git a/dev-java/icu4j/icu4j-4.0.ebuild b/dev-java/icu4j/icu4j-4.0.ebuild new file mode 100644 index 000000000000..85e63e24f718 --- /dev/null +++ b/dev-java/icu4j/icu4j-4.0.ebuild @@ -0,0 +1,72 @@ +# 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-4.0.ebuild,v 1.1 2008/07/28 19:18:27 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="doc test 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="4" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" + +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.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-${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/* +} + +# Tests only work with JDK-1.6, severe out of memory problems appear with 1.5 + +src_test() { + eant check +} -- cgit v1.2.3-65-gdbad