Adding metadata

8 files changed, 140 insertions, 32 deletions

diff --git a/dev-java/bcel/bcel-6.10.0.ebuild b/dev-java/bcel/bcel-6.10.0-r1.ebuild
index c2ce6131da33..8c3d2a18b744 100644
--- a/dev-java/bcel/bcel-6.10.0.ebuild
+++ b/dev-java/bcel/bcel-6.10.0-r1.ebuild
@@ -23,7 +23,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
 CP_DEPEND="dev-java/commons-lang:3.6"
 DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
+	>=virtual/jdk-11:*"
 RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 
diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest
index dc7d15805cb7..19c388c630ec 100644
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@@ -1 +1,2 @@
 DIST jctools-4.0.3.tar.gz 4237279 BLAKE2B be74c2b0997ec68b90249c8d2b841737fffa4e09724a25b5f5e15b8c4bbf811215023358bc674ed20f81d06a10db3ac2428b29d159ac99ef6dff7e6c36bf7fe2 SHA512 3d7cede6beba54871365cc2f49dc30f014a6f36a5e1f66e9cebd523d202806d49f24c23dbfd6bef0c25cbea0ca230b5d1afefd2b83b0150d335e8e99b6cec90f
+DIST jctools-4.0.5.tar.gz 4259231 BLAKE2B 33088bdb9f9d0030127990fadcef13295ea446ac54788c7d330c123af7e73626a7214481f8e10c5885e2026da281188c4c606965c8281f62c3fe2427e3754b79 SHA512 13069fb1b5c1275557e2343e6b8008ce549f948c185824a3e6a254fa0c1dc105e59de707d6b5b7bdb81120372a63026334cbd7a244d4e76b1de65d475cf02cd4
diff --git a/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch b/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch
index 6eccce942b62..57941ff69001 100644
--- a/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch
+++ b/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch
@@ -1,5 +1,6 @@
 https://bugs.gentoo.org/863977
 https://bugs.gentoo.org/924135
+
 --- a/src/test/java/org/jctools/util/TestUtil.java
 +++ b/src/test/java/org/jctools/util/TestUtil.java
 @@ -19,7 +19,7 @@ import static org.jctools.util.UnpaddedQueueFactory.newUnpaddedQueue;
diff --git a/dev-java/jctools-core/jctools-core-4.0.3.ebuild b/dev-java/jctools-core/jctools-core-4.0.3-r1.ebuild
index 5b54f3488a28..a32f97d770ab 100644
--- a/dev-java/jctools-core/jctools-core-4.0.3.ebuild
+++ b/dev-java/jctools-core/jctools-core-4.0.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${P
 S="${WORKDIR}/JCTools-${PV}/jctools-core"
 
 LICENSE="Apache-2.0"
-SLOT="3"
+SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
diff --git a/dev-java/jctools-core/jctools-core-4.0.5.ebuild b/dev-java/jctools-core/jctools-core-4.0.5.ebuild
new file mode 100644
index 000000000000..1bd8525e6a44
--- /dev/null
+++ b/dev-java/jctools-core/jctools-core-4.0.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jctools:jctools-core:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Concurrency Tools Core Library"
+HOMEPAGE="https://jctools.github.io/JCTools/"
+SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz"
+S="${WORKDIR}/JCTools-${PV}/jctools-core"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	dev-java/osgi-annotation:0
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/guava-testlib:0
+		dev-java/hamcrest:0
+	)"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{README,RELEASE-NOTES}.md )
+PATCHES=( "${FILESDIR}/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch" )
+
+JAVA_CLASSPATH_EXTRA="osgi-annotation"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_compile() {
+	JAVA_JAR_FILENAME="org.${PN}.jar"
+	java-pkg-simple_src_compile	# creates a legacy jar file without module-info
+
+	jdeps --generate-module-info \
+		src/main/java \
+		--multi-release 9 \
+		"${JAVA_JAR_FILENAME}" || die
+
+	JAVA_JAR_FILENAME="${PN}.jar"
+	java-pkg-simple_src_compile	# creates the final jar file including module-info
+}
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+}
+
+# Using the defaults of java-pkg-simple would skip more than half the number of tests.
+src_test() {
+	# org.jetbrains.kotlinx.lincheck is not yet packaged
+	rm -r src/test/java/org/jctools/maps/linearizability_test || die
+	# These tests would fail and are not run by "mvn test".
+	# "org.jctools.queues.MpqSanityTest"
+	# "org.jctools.queues.QueueSanityTest"
+	# "org.jctools.queues.ScQueueRemoveTest"
+	# "org.jctools.util.TestUtil"
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			\( -name "*Test*.java" \
+			-o -name "nbsi_tester.java" \
+			-o -name "nbhs_tester.java" \)\
+			! -name "MpqSanityTest.java" \
+			! -name "QueueSanityTest.java" \
+			! -name "ScQueueRemoveTest.java" \
+			! -name "TestUtil.java" \
+			)
+	popd
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+	# OK (8746 tests)
+}
diff --git a/dev-java/log4j-core/log4j-core-2.19.0.ebuild b/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild
index 1ef9298c2298..23f8b39d5371 100644
--- a/dev-java/log4j-core/log4j-core-2.19.0.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -51,7 +51,7 @@ CP_DEPEND="
 	dev-java/jackson-dataformat-yaml:0
 	dev-java/jansi:2
 	dev-java/javax-mail:0
-	dev-java/jctools-core:3
+	>=dev-java/jctools-core-4.0.3-r1:0
 	dev-java/jeromq:0
 	dev-java/kafka-clients:0
 	dev-java/lmax-disruptor:0
diff --git a/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild b/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..1fd5072d0edf
--- /dev/null
+++ b/dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.opentest4j:opentest4j:1.3.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Open Test Alliance for the JVM"
+HOMEPAGE="https://github.com/ota4j-team/opentest4j"
+SRC_URI="https://github.com/ota4j-team/opentest4j/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-r${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"	#939580
+
+JAVA_SRC_DIR=( src/{main,module}/java )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR=( src/test/java )
+JAVA_TEST_RESOURCE_DIRS=( src/test/resources )
+
+src_test() {
+	# src/test/java/org/opentest4j/FileInfoTests.java:52: error: cannot find symbol
+	# 		var out = new ByteArrayOutputStream();
+	# 		^
+	#   symbol:   class var
+	#   location: class FileInfoTests
+	# src/test/java/org/opentest4j/FileInfoTests.java:55: error: cannot find symbol
+	# 		var deserialized = (AssertionFailedError) new ObjectInputStream(
+	# 		^
+	#   symbol:   class var
+	#   location: class FileInfoTests
+	# src/test/java/org/opentest4j/FileInfoTests.java:64: error: cannot find symbol
+	# 		var contents = "contents".getBytes(UTF_8);
+	# 		^
+	#   symbol:   class var
+	#   location: class FileInfoTests
+	# src/test/java/org/opentest4j/FileInfoTests.java:65: error: cannot find symbol
+	# 		var fileInfo = new FileInfo("path", contents);
+	# 		^
+	#   symbol:   class var
+	#   location: class FileInfoTests
+	JAVAC_ARGS="--source 11 --target 11" java-pkg-simple_src_test
+}
diff --git a/dev-java/opentest4j/opentest4j-1.3.0.ebuild b/dev-java/opentest4j/opentest4j-1.3.0.ebuild
deleted file mode 100644
index 646ec2c91a4e..000000000000
--- a/dev-java/opentest4j/opentest4j-1.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.opentest4j:opentest4j:1.3.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Open Test Alliance for the JVM"
-HOMEPAGE="https://github.com/ota4j-team/opentest4j"
-SRC_URI="https://github.com/ota4j-team/opentest4j/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-r${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-11:*"
-
-JAVA_SRC_DIR=( src/{main,module}/java )
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR=( src/test/java )
-JAVA_TEST_RESOURCE_DIRS=( src/test/resources )