4 files changed, 86 insertions, 0 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 1f1847a1be5c..d641e3089b3b 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest
index ac0d5ccecf35..4a790e7cd3bd 100644
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@@ -1,3 +1,6 @@
+AUX jctools-core-4.0.3-increase-TEST_TIMEOUT.patch 855 BLAKE2B dab4a25c6de51cb8632006b13f1a191520331a6bd261bb77bd119e81ca17ce5d502dfeedcccd9a1a327cac62f5320a564b6ddc64f1518932ccf45bd47aa74192 SHA512 ae03b10c521a44ebf7f3fefb88a91c54af25981265c6106d81437b8b0d19bb9070a1cc416126d12da93088914a54dafa40b99722378daad61dc01e1ac038a495
 DIST jctools-4.0.2.tar.gz 4237275 BLAKE2B 9bac4f8442f7a64aac47208ecf98799506244783d71a5444b6a3ff74ddca4e16232cf19dd5e7a9243dfcc3510674717982ef915759c8b6b2de74d4711d996302 SHA512 d19237929ab18360427efdf2844adc08589fc8ba2838b1f983118e1d6f1270bacad34477cb000e6bc85aeab38e7e337c397181b4351681f18977547c5b2e8f37
+DIST jctools-4.0.3.tar.gz 4237279 BLAKE2B be74c2b0997ec68b90249c8d2b841737fffa4e09724a25b5f5e15b8c4bbf811215023358bc674ed20f81d06a10db3ac2428b29d159ac99ef6dff7e6c36bf7fe2 SHA512 3d7cede6beba54871365cc2f49dc30f014a6f36a5e1f66e9cebd523d202806d49f24c23dbfd6bef0c25cbea0ca230b5d1afefd2b83b0150d335e8e99b6cec90f
 EBUILD jctools-core-4.0.2.ebuild 2104 BLAKE2B bb49a9745ffcaa8d2823f4ede576b3d470f4a5e099a26ae5fa34bacca9baac6017c0c13de6a4d9be3312a0d0642adc98f91712f3f1e7e3e150fecc23e6c84e06 SHA512 3c8135965ed004db6b53d858223f121d090f1afd4c520a172ba7766c1fc226890484c9e06e059549c4583aa40b0c49982e7d249b756e9d3588ea00a426272d5c
+EBUILD jctools-core-4.0.3.ebuild 1981 BLAKE2B a636b7d559a0722c719dcb41968ad3890aa8054525cbef34f26af080e56d3541b198834c4e23559f6471f0c26087ed490617f7e537dd958077a528a7494cd3f1 SHA512 d72b875431c3ed03e0e01c272ce7b6c27b10c1fec2a53e5afde6ee84b87c34d02d938f50be72508994d58747b3176cee0b112972f39e05216aa2c7d1e9f5a0f2
 MISC metadata.xml 360 BLAKE2B 17c673e9f1a2114b2ba115cdd8f4240dc3731b26f7f5fef3a8ca2425192aece79740a7be59b030f79163c6ebece400940316991e34ec55c0e3490acd2fd8262d SHA512 ee2a7373801073e1c3af974bd937189f61e55af28ffd0a724d852da714e8b7abeb5375d377a7629a265c684880fb6a858358c63fe4434b768de9c92bfffe4637
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
new file mode 100644
index 000000000000..6eccce942b62
--- /dev/null
+++ b/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch
@@ -0,0 +1,13 @@
+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;
+ public class TestUtil {
+     public static final int CONCURRENT_TEST_DURATION = Integer.getInteger("org.jctools.concTestDurationMs", 500);
+     public static final int CONCURRENT_TEST_THREADS = Integer.getInteger("org.jctools.concTestThreads", Math.min(4, Runtime.getRuntime().availableProcessors()));
+-    public static final int TEST_TIMEOUT = 30000;
++    public static final int TEST_TIMEOUT = 60000;
+     private static final AtomicInteger threadIndex = new AtomicInteger();
+     public static void sleepQuietly(long timeMs) {
+         LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(timeMs));
diff --git a/dev-java/jctools-core/jctools-core-4.0.3.ebuild b/dev-java/jctools-core/jctools-core-4.0.3.ebuild
new file mode 100644
index 000000000000..bd095315bc5c
--- /dev/null
+++ b/dev-java/jctools-core/jctools-core-4.0.3.ebuild
@@ -0,0 +1,70 @@
+# 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-1.8:*
+	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_AUTOMATIC_MODULE_NAME="org.jctools.core"
+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_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)
+}