Adding metadata

5 files changed, 201 insertions, 136 deletions

diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 406331bdf46f..296c5717e80b 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1 +1,2 @@
 DIST icu4j-70.1.tar.gz 65661187 BLAKE2B 9d2d38fa91092d8f2fa39c773b722019f1d0c9b06ba6e8abaf05c3d3b50977232d6f1a37fd5ab6be6461d133dd361dae9b8633e22c9f165ef4e6e4b8029f6b8a SHA512 f1a653452f42605f799de7ec1d5bf27aa4b715f2ec18534cd3b52bd9be7ddbe7a6d18b47e3a5b36c7a63442bc38304ddc80f519ac65b9a91978ab15b462d9456
+DIST icu4j-71.1.tar.gz 66177851 BLAKE2B 39c5f6e1a8adc6ee913a7a41dcbf733c1f50e6de3047c0c548bf39426102fccef1a03dd7cb4020bd56b32d0c565848f11cc5ce3f738519dd7d2820a670c40443 SHA512 cc9ccb3208d8079c4f8169713aa0ebb930e86cf6c72510a3b7de5824e6482f26166a2e530abaaecfb8338764b23ac215b2921a821167b41d6a3f23952e2718e6
diff --git a/dev-java/icu4j/icu4j-71.1.ebuild b/dev-java/icu4j/icu4j-71.1.ebuild
new file mode 100644
index 000000000000..33022e52d6d9
--- /dev/null
+++ b/dev-java/icu4j/icu4j-71.1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/unicode-org/icu/archive/refs/tags/release-70-1.tar.gz --slot 70 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild icu4j-70.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.ibm.icu:icu4j:71.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
+HOMEPAGE="https://icu.unicode.org"
+SRC_URI="https://github.com/unicode-org/icu/archive/refs/tags/release-${PV/./-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="icu"
+SLOT="70"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/junitparams:0 )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main"
+
+HTML_DOCS=( ../{APIChangeReport,license,readme}.html )
+
+JAVA_GENTOO_CLASSPATH_EXTRA="icu4j.jar:icu4j-charset.jar:icu4j-localespi.jar:testdata.jar:framework.jar"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,junitparams"
+JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI"
+
+JAVA_TEST_SRC_DIR=(
+	tests/charset/src
+	tests/collate/src
+	tests/core/src
+#	tests/framework/src # we compile it in src_compile
+	tests/localespi/src
+	tests/packaging/src
+	tests/translit/src
+)
+
+JAVA_TEST_RESOURCE_DIRS=(
+	tests/charset/resources
+	tests/collate/resources
+	tests/core/resources
+#	tests/framework/resources
+	tests/localespi/resources
+	tests/packaging/resources
+	tests/translit/resources
+)
+
+JAVA_TEST_EXCLUDES=(
+	"com.ibm.icu.dev.data.TestDataElements_testtypes" # Invalid test class 1. No runnable methods
+	"com.ibm.icu.dev.data.resources.TestDataElements_en_Latn_US" # Invalid test class 1. No runnable methods
+	"com.ibm.icu.dev.data.resources.TestDataElements_en_US" # Invalid test class 1. No runnable methods
+	"com.ibm.icu.dev.data.resources.TestDataElements_fr_Latn_FR" # Invalid test class 1. No runnable methods
+	"com.ibm.icu.dev.data.resources.TestDataElements_te" # Invalid test class 1. No runnable methods
+	"com.ibm.icu.dev.data.resources.TestMessages" # Invalid test class 1. No runnable methods
+	"com.ibm.icu.dev.test.translit.TestUtility" # Invalid test class 1. No runnable methods
+	"com.ibm.icu.dev.test.localespi.TestUtil" # Invalid test class 1. No runnable methods
+	"com.ibm.icu.dev.test.stringprep.TestData" # Invalid test class 1. No runnable methods
+	"com.ibm.icu.dev.test.calendar.ChineseTestCase" # Invalid test class 1. Test class should have exactly one public zero-argument constructor
+	"com.ibm.icu.dev.test.calendar.TestCase" # java.lang.IllegalArgumentException: Test class can only have one constructor
+	"com.ibm.icu.dev.test.bidi.TestData" # Invalid test class 1. Test class should have exactly one public constructor
+	# following kills 98 tests and and avoids 9 test failures
+	# coverage tests fail because test handlers for the parametrized tests are not defined so the tests are broken and cannot succeed
+	"com.ibm.icu.dev.test.serializable.CoverageTest"
+)
+
+src_prepare() {
+	default
+
+	# create the resources directories
+	mkdir resources || die
+	cp -r classes/* resources || die
+
+	# remove .java files from resources
+	find resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed"
+
+	# this should not go in the jar files
+	mv shared/licenses/license.html .. || die
+
+	# icudata and icutzdata for "icu4j.jar"
+	pushd resources/core/src || die
+		jar -xf "${S}"/shared/data/icudata.jar || die
+		jar -xf "${S}"/shared/data/icutzdata.jar || die
+		# move these resources to "icu4j-charset.jar"
+		mkdir -p "${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die
+		mv com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/{*.cnv,cnvalias.icu} \
+			"${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die
+
+		# create 9 files com/ibm/icu/impl/data/icudt69b/*/fullLocaleNames.lst
+		for dir in $(find com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/ -type d ! -name 'unit' -exec echo {} +); do
+			ls -1 $dir/*.res | sed -e 's%.*\/%%' -e 's%\..*$%%' -e '/pool/d' -e '/res_index/d' -e '/tzdbNames/d'\
+				> $dir/'fullLocaleNames.lst';
+		done || die "fullLocaleNames.lst failed"
+	popd
+
+	# this test class was failing with "No runnable methods"
+	# but test_excluding it would kill tousands of other tests.
+	mkdir -p tests/framework/src/com/ibm/icu/dev/data/resources || die
+	mv tests/{core,framework}/src/com/ibm/icu/dev/data/resources/TestDataElements.java || die
+
+	# testdata.jar needs to be on classpath
+	cp shared/data/testdata.jar . || die
+
+	# clone tests src
+	for i in charset collate core framework localespi packaging translit; do \
+		cp -r tests/$i/{src,resources} ; \
+		done || die "copying tests from src to resources failed"
+	cp -r ../tools/misc/{src,resources} || die
+
+	# separate tests resources from tests src
+	find tests/*/resources -type f -name '*.java' -exec rm -rf {} + || die
+	find ../tools/misc/resources -type f -name '*.java' -exec rm -rf {} + || die
+}
+
+src_compile() {
+	# "icu4j.jar"
+	JAVA_SRC_DIR=(
+		classes/collate/src
+		classes/core/src
+		classes/currdata/src
+		classes/langdata/src
+		classes/regiondata/src
+		classes/translit/src
+	)
+	JAVA_RESOURCE_DIRS=(
+		resources/collate/src
+		resources/core/src
+		resources/currdata/src
+		resources/langdata/src
+		resources/regiondata/src
+		resources/translit/src
+		shared/licenses
+	)
+	JAVA_JAR_FILENAME="icu4j.jar"
+	JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo"
+	java-pkg-simple_src_compile
+	rm -r target || die
+
+	# "icu4j-charset.jar"
+	JAVA_SRC_DIR=( classes/charset/src )
+	JAVA_RESOURCE_DIRS=( resources/charset/src shared/licenses )
+	JAVA_JAR_FILENAME="icu4j-charset.jar"
+	JAVA_MAIN_CLASS=""
+	java-pkg-simple_src_compile
+	rm -r target || die
+
+	# "icu4j-localespi.jar"
+	JAVA_SRC_DIR=( classes/localespi/src )
+	JAVA_RESOURCE_DIRS=( resources/localespi/src shared/licenses )
+	JAVA_JAR_FILENAME="icu4j-localespi.jar"
+	java-pkg-simple_src_compile
+	rm -r target || die
+
+	# main/test/framework
+	# needed for compilicg the tests
+	# but "No runnable methods" ("Invalid test class")
+	if use test; then
+		JAVA_SRC_DIR=( tests/framework/src ../tools/misc/src )
+		JAVA_RESOURCE_DIRS=( tests/framework/resources ../tools/misc/resources )
+		JAVA_JAR_FILENAME="framework.jar"
+		java-pkg-simple_src_compile
+		rm -fr target || die
+	fi
+
+	# javadocs
+	if use doc; then
+		JAVA_SRC_DIR=( classes )
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test () {
+	# https://bugs.gentoo.org/827212
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if [[ "${vm_version}" != "1.8" ]] ; then
+		java-pkg-simple_src_test
+	fi
+}
+
+src_install() {
+	default
+	java-pkg_dojar "icu4j.jar"
+	java-pkg_dojar "icu4j-charset.jar"
+	java-pkg_dojar "icu4j-localespi.jar"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+	if use source; then
+		java-pkg_dosrc "classes"
+	fi
+}
diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index 569bb6a5f328..df2bb4acf7d4 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -1,2 +1 @@
-DIST Rhino1_7_7_RELEASE.zip 6059127 BLAKE2B 431885bf287da524cfc82e6594802c93e75d48177b4056e9b893d7c852c3c3b30291d616a140981e520fdebacf5cbc8b802a6137f0e29a369f1d01cc771c6b77 SHA512 ce89b6a153d62dd459a86360c67d6db4b05922d8ab49a8d45ccb0deb0f639cd819f0ad75cb4929eda6b7f0fd6ddb5879a4035de6968283317bfd0e93d2bb744e
 DIST rhino-1.7.14.tar.gz 4694660 BLAKE2B d6ba958265c4ebf881161d0b61f598ac7e82d7be4e6b0fbd6416e7b0af7835058a2744ab5524b6ff698159898e962cc246ac559e9c5db1b4467b147700e894e0 SHA512 f20e8a8f7c78c88d815c53f89f3f18a53c2e86d92a284cd275aa5556c08962d2905f2d4fc829e5cb61d416cd55b13323d9a110f4f492f588a149b4d2105b21a1
diff --git a/dev-java/rhino/files/rhino-1.7.7-testsrc-build.xml.patch b/dev-java/rhino/files/rhino-1.7.7-testsrc-build.xml.patch
deleted file mode 100644
index 4760e980245d..000000000000
--- a/dev-java/rhino/files/rhino-1.7.7-testsrc-build.xml.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- testsrc/build.xml.orig	2015-08-05 23:41:56.815000000 +0000
-+++ testsrc/build.xml	2015-08-05 23:46:10.026000000 +0000
-@@ -46,15 +46,8 @@
-   -->
-   <property name="test.vm.mx" value="256m" />
- 
--  <target name="get-junit" unless="offline">
--    <mkdir dir="lib"/>
--    <get src="${test.junit.url}" dest="lib/junit.jar" usetimestamp="true"/>
--    <get src="${test.hamcrest.url}" dest="lib/hamcrest.jar" usetimestamp="true"/>
--  </target>
--
-   <target name="junit-compile">
-     <mkdir dir="${test.classes}" />
--    <antcall target="get-junit"/>
-     <javac
-       destdir="${test.classes}" debug="true"
-       encoding="UTF-8"
-@@ -75,7 +68,6 @@
- 
-   <target name="compile">
-     <mkdir dir="${test.classes}" />
--	<antcall target="get-junit"/>
-     <javac
-       srcdir="testsrc"
-       destdir="${test.classes}" debug="true"
-@@ -105,12 +97,7 @@
-     <delete dir="${test.classes}" />
-   </target>
- 
--  <target name="get-emma" unless="offline">
--    <get src="${test.emma.url}" dest="lib/emma.jar" usetimestamp="true"/>
--    <get src="${test.emma_ant.url}" dest="lib/emma_ant.jar" usetimestamp="true"/>
--  </target>
--
--  <target name="coverage-instrument" depends="get-emma">
-+  <target name="coverage-instrument">
-     <property name="coverage.dir" location="${build.dir}/coverage"/>
-     <property name="coverage.classes.dir" location="${build.dir}/coverage/classes"/>
-     <mkdir dir="${coverage.classes.dir}"/>
diff --git a/dev-java/rhino/rhino-1.7.7-r1.ebuild b/dev-java/rhino/rhino-1.7.7-r1.ebuild
deleted file mode 100644
index 4f518b6a2e02..000000000000
--- a/dev-java/rhino/rhino-1.7.7-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc examples source test"
-MAVEN_ID="org.mozilla:rhino:1.7.7"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-# rhino -> Rhino
-MY_PN="${PN^}"
-
-# 1.7.7 -> 1_7_7
-MY_PV="$(replace_all_version_separators _ ${PV})"
-
-# rhino1.7.7
-MY_P="${PN}${PV}"
-
-# Rhino1_7_7_RELEASE
-MY_RELEASE="${MY_PN}${MY_PV}_RELEASE"
-
-DESCRIPTION="An open-source implementation of JavaScript written in Java"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${MY_RELEASE}.zip"
-HOMEPAGE="https://github.com/mozilla/rhino"
-
-LICENSE="MPL-1.1 GPL-2"
-SLOT="1.6"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE=""
-
-# ../rhino-Rhino1_7_7_RELEASE
-S="${WORKDIR}/${PN}-${MY_RELEASE}"
-
-CDEPEND=""
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/emma:0
-		dev-java/junit:4
-		dev-java/ant-junit:0
-		dev-java/hamcrest-core:1.3
-	)
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-testsrc-build.xml.patch
-)
-
-EANT_TEST_TARGET="junit"
-
-# StackOverFlow errors arise on some tests.
-# Further, the test suite takes way too much time (> 5 min).
-# Maybe reduce the numbers of tests?
-RESTRICT="test"
-
-java_prepare() {
-	java-pkg_clean
-
-	epatch "${PATCHES[@]}"
-
-	if use test; then
-		mkdir lib || die
-		java-pkg_jar-from --build-only emma emma.jar lib/emma.jar
-		java-pkg_jar-from --build-only emma emma_ant.jar lib/emma_ant.jar
-		java-pkg_jar-from --build-only hamcrest-core-1.3 hamcrest-core.jar lib/hamcrest.jar
-		java-pkg_jar-from --build-only junit-4 junit.jar lib/junit.jar
-	fi
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	if use source; then
-		EANT_BUILD_TARGET="source-zip" \
-			java-pkg-2_src_compile
-	fi
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar build/${MY_P}/js.jar
-
-	java-pkg_dolauncher jsscript-${SLOT} \
-		--main org.mozilla.javascript.tools.shell.Main
-
-	use doc && java-pkg_dojavadoc "build/${MY_P}/javadoc"
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org
-}