Adding metadata

7 files changed, 273 insertions, 40 deletions

diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 14622dceb93a..5048a70707f9 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1 +1,3 @@
+DIST SHASUM512.txt.asc 659 BLAKE2B 474c5dd9eb166181b488dcc2c225f490fc4a27cdec603a6bdc7897bc08ba1e3f15866eb413350a65833885d079ac986268eaa9a3be262b68f736de5afc57c5ba SHA512 6385df565c244b62cca1cdb6a71ff46c901b994ab2675d632df7c0421394c85471ffdb0b78516610b78cd622e89f0700ffd4a75fd71150b7f2ea3934c63c4242
+DIST icu-72.1.tar.gz 67092974 BLAKE2B 2261c7969ddbfdb4e75e405646cc9f29b1f8dd21f98641b9318457d3cd27694833a9181f4888d2cb243ba65191fe9216a508684c1dbd5a85f36e06ae8fac7d9e SHA512 fee1278f16528867da63d95feee6864a1f62befa9cc0b006439e1b47cf6f3f0e6581692432129e465208b5bd7fcc44e1175f124e83157547b3d9a78f3a4944ab
 DIST icu4j-71.1.tar.gz 66177851 BLAKE2B 39c5f6e1a8adc6ee913a7a41dcbf733c1f50e6de3047c0c548bf39426102fccef1a03dd7cb4020bd56b32d0c565848f11cc5ce3f738519dd7d2820a670c40443 SHA512 cc9ccb3208d8079c4f8169713aa0ebb930e86cf6c72510a3b7de5824e6482f26166a2e530abaaecfb8338764b23ac215b2921a821167b41d6a3f23952e2718e6
diff --git a/dev-java/icu4j/icu4j-72.1.ebuild b/dev-java/icu4j/icu4j-72.1.ebuild
new file mode 100644
index 000000000000..338379b560d8
--- /dev/null
+++ b/dev-java/icu4j/icu4j-72.1.ebuild
@@ -0,0 +1,205 @@
+# 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/release-72-1.tar.gz --slot 70 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild icu4j-72.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.ibm.icu:icu4j:72.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+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 -> icu-${PV}.tar.gz
+	https://github.com/unicode-org/icu/releases/download/release-${PV/./-}/SHASUM512.txt.asc"
+
+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() {
+	einfo "Compiling 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_AUTOMATIC_MODULE_NAME="com.ibm.icu"
+	JAVA_JAR_FILENAME="icu4j.jar"
+	JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo"
+	java-pkg-simple_src_compile
+	rm -r target || die
+
+	einfo "Compiling icu4j-charset.jar"
+	JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.charset"
+	JAVA_JAR_FILENAME="icu4j-charset.jar"
+	JAVA_MAIN_CLASS=""
+	JAVA_RESOURCE_DIRS=( resources/charset/src shared/licenses )
+	JAVA_SRC_DIR=( classes/charset/src )
+	java-pkg-simple_src_compile
+	rm -r target || die
+
+	einfo "Compiling icu4j-localespi.jar"
+	JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.localespi"
+	JAVA_JAR_FILENAME="icu4j-localespi.jar"
+	JAVA_RESOURCE_DIRS=( resources/localespi/src shared/licenses )
+	JAVA_SRC_DIR=( classes/localespi/src )
+	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_JAR_FILENAME="framework.jar"
+		JAVA_RESOURCE_DIRS=( tests/framework/resources ../tools/misc/resources )
+		JAVA_SRC_DIR=( tests/framework/src ../tools/misc/src )
+		java-pkg-simple_src_compile
+		rm -fr target || die
+	fi
+
+	# javadocs
+	if use doc; then
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		JAVA_SRC_DIR=( classes )
+		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/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
index 74495765cc3e..b3bba8165175 100644
--- a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
+++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm arm64 ppc64"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-11:*"
diff --git a/dev-java/logback-classic/logback-classic-1.2.11.ebuild b/dev-java/logback-classic/logback-classic-1.2.11-r1.ebuild
index 2759bdc02256..10c52f8637b1 100644
--- a/dev-java/logback-classic/logback-classic-1.2.11.ebuild
+++ b/dev-java/logback-classic/logback-classic-1.2.11-r1.ebuild
@@ -14,7 +14,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="logback-classic module"
-HOMEPAGE="http://logback.qos.ch"
+HOMEPAGE="https://logback.qos.ch"
 SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${PV}.tar.gz"
 
 LICENSE="EPL-1.0 LGPL-3"
@@ -32,9 +32,9 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 CP_DEPEND="
 	dev-java/janino:0
 	dev-java/javax-mail:0
-	dev-java/logback-core:0
+	~dev-java/logback-core-${PV}:0
 	dev-java/reflections:0
-	dev-java/slf4j-api:0
+	dev-java/slf4j-api:1
 	java-virtuals/servlet-api:3.1
 "
 
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.36-r1.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.36-r1.ebuild
new file mode 100644
index 000000000000..cf71aac2aaed
--- /dev/null
+++ b/dev-java/slf4j-api/slf4j-api-1.7.36-r1.ebuild
@@ -0,0 +1,62 @@
+# 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/qos-ch/slf4j/archive/v_1.7.36.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild slf4j-api-1.7.36.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:slf4j-api:1.7.36"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The slf4j API"
+HOMEPAGE="https://www.slf4j.org"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+BDEPEND="app-arch/zip"
+
+DOCS=( LICENSE.txt ../README.md )
+
+S="${WORKDIR}/slf4j-v_${PV}/${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+JAVA_TEST_EXCLUDES=(
+	# java.lang.InstantiationException - not run by upstream anyway
+	"org.slf4j.helpers.MultithreadedInitializationTest"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# remove org/slf4j/impl/ from the jar file
+	zip -d ${PN}.jar org/slf4j/impl/\* || die "Failed to remove impl files"
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/xsdlib/Manifest b/dev-java/xsdlib/Manifest
index 492661f462ca..9475f768708b 100644
--- a/dev-java/xsdlib/Manifest
+++ b/dev-java/xsdlib/Manifest
@@ -1,2 +1 @@
 DIST msv-2022.7.tar.gz 2594951 BLAKE2B fce006f4b845efcd930b7999ac00eaab06c404888eb73a6eeab6cfad616b4922271d2d682abc82f3be4c4f6a791aa14681f6e6bfebd2118ac3aa2bcba41fd1f8 SHA512 315342628f79c561883be0d966211dd81daae66a414dcc9bb5a87d86f97121d38b5835e9a6d1ac7c21ccff46040e53d3cabd32e9ea677c9ca4335a86c5259949
-DIST xsdlib-2013.6.1-sources.jar 274740 BLAKE2B 356c3e6005c26a1b63ea016a523140d93bb8c6a4c1952d60f5a881c92dd013e1691451be96e31b7c96c48e1f182e0224bceb712e230bb008ad97732a8e9ffdb6 SHA512 a4e308fae6a1116158ddbebfad0570f6cf1f840acb72de8bdd9414b363da78edf6aea2349f4ac7511b774a494f9e4c17c309f86aefc39b30421a1c86945302b0
diff --git a/dev-java/xsdlib/xsdlib-2013.6.1.ebuild b/dev-java/xsdlib/xsdlib-2013.6.1.ebuild
deleted file mode 100644
index 44b1fa499ffa..000000000000
--- a/dev-java/xsdlib/xsdlib-2013.6.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="net.java.dev.msv:xsdlib:2013.6.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Sun XML Datatypes Library"
-HOMEPAGE="http://msv.java.net/"
-SRC_URI="https://repo1.maven.org/maven2/net/java/dev/msv/xsdlib/${PV}/xsdlib-${PV}-sources.jar"
-
-LICENSE="BSD Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-CP_DEPEND="dev-java/relaxng-datatype:0"
-BDEPEND="app-arch/unzip"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-S="${WORKDIR}"
-
-JAVA_RESOURCE_DIRS="resources"
-
-src_prepare() {
-	default
-	mkdir resources || die
-	cp -r com resources || die
-	find "${JAVA_RESOURCE_DIRS}" -type f ! -name '*.properties' -exec rm -rf {} + || die
-}