gentoo auto-resync : 11:04:2024 - 12:32:48

12 files changed, 222 insertions, 28 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 85b8110eba92..a2119299e0de 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/caffeine/Manifest b/dev-java/caffeine/Manifest
index 56920f088f27..f949ad4d1b03 100644
--- a/dev-java/caffeine/Manifest
+++ b/dev-java/caffeine/Manifest
@@ -1,3 +1,3 @@
 DIST caffeine-2.6.2-sources.jar 715580 BLAKE2B 882cac33d205c8186232c64010b4e25e805d3d188d6a9e6ca151187b55d5ee3a3d5641566f5e8d32de596fab3dae8967c74f3d60e2321b34374ce996382322fe SHA512 52a8c67648e2a6bb1c600d99712473a64911f2b6c8fe6c924ba98e72b4b040a1094fa5c93ae2bae8734d352634bc72960711afd152566ef02f6bad4c84e510c8
-EBUILD caffeine-2.6.2.ebuild 995 BLAKE2B 5b7304bd4567b5dd761072bc0400b0d2189e5b2844c48f0c3dc47810c5083006b440d40a28371f6941b5886032d6dde370d7b7927212d88fd0d441cb18ea164d SHA512 095d3424c0a005437cfcf450b4ba74555826e27bc116e7d1a34f63200a97ef784c22f2fa3af369f1f779e440ca758307e70211765ed61440b383eaf4e242fc19
+EBUILD caffeine-2.6.2-r1.ebuild 1032 BLAKE2B fe123fbcfc40a7f69e897586ed2caa8204d1e2c6f5ab8f846d5a0472fea99a7f5e12025eb60a3b2fc8df9d7229f82ab9b357d39b6ebbfd85b3f8b3e713f1adc5 SHA512 8fc56ea11c9977be21accf913749eef930041361cf4f3bec3021221c20be455a5a2142eca193399b74bc30cb138d6eaaa726b97b99840b4788371dcd8354f9bd
 MISC metadata.xml 300 BLAKE2B fc46ab992a4cbfe6a697b414e72f7bfa69992f5fdfdfa99c2b94b69643492f8144351125ca0edf4cfb4e8d9e67c6aa026d9e7e4d000f46250ff57716cce65ff0 SHA512 fc4dc1847395e619c603488ca3b18b94fcc96e21461854009d46a0e73ff694066e85478eae5c20f8493eda9203ab159ab3a625ac7df49190f7f2e162dd3418fb
diff --git a/dev-java/caffeine/caffeine-2.6.2.ebuild b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild
index e55aadd659b2..b15bcc26da75 100644
--- a/dev-java/caffeine/caffeine-2.6.2.ebuild
+++ b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild
@@ -12,7 +12,7 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="A high performance caching library"
 HOMEPAGE="https://github.com/ben-manes/caffeine"
 SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/${PV}/caffeine-${PV}-sources.jar"
-# Compiling from Github would require to be packaged at least
+# Compiling from Github tarball would require to be packaged at least
 # package com.squareup.javapoet
 # package MethodSpec
 # package TypeSpec
@@ -25,8 +25,9 @@ KEYWORDS="amd64 ppc64 x86"
 
 BDEPEND="app-arch/unzip"
 CP_DEPEND="dev-java/jsr305:0"
+# min java 11 for bug #919464
 DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
+	>=virtual/jdk-11:*"
 RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 15d33624879e..11118c88f965 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,4 +1,7 @@
 DIST mysql-connector-j-8.1.0.tar.gz 4241696 BLAKE2B 930257a876b1b512b598ebf8397125145bb9d1a438fe33bb55ca208dddfdd29bd436a365cc35b9128cdee6eee436da688dd53cc3ed6cd04efb22d1f5af731863 SHA512 f8a7c621397f49981dd7d19e880d92ee051015ad011c027380ac85760dc22ce2f4117fd27b8d72325c5e2bc40a1a9c22e9534f7200208916ee62bbf1e5ad0c75
+DIST mysql-connector-j-8.3.0.tar.gz 4255433 BLAKE2B b5cd437e4ab87052c0fd8e4da6a2612d4c068193a4fe2d207505b2f42d664a414c8a0f3131f34b471a30bfa6b6bb9e76ad0dd4779abbecb46ea014ab5d06e36d SHA512 0849ff13f4adc4ae2d2b9f64ff192435dd9560763a50c7df117a171ae1d90fc97bc36dc89097472d0a2c182492a45ca14ffcf577a9c54267be79e5b3f147dc41
 DIST oci-java-sdk-common-2.47.0.jar 439209 BLAKE2B b3b28bb0cf4b8dbca37bb34df7bb48029901be5d9f7754a2ccce888a9af4a06b3348cd545d480127f942687b9b0d63336c37b5f95ecb9f96111c9388a4bc6053 SHA512 73e7376c92d47d81e0630e2ad2d510a483068664874ae31622629dad6dc016d746499c2d29682563e5cdee35ddb6e9e59a2e7557d32e1eeec5fb12206f9d1d6e
-EBUILD jdbc-mysql-8.1.0.ebuild 1496 BLAKE2B 738e010421ca1a13870d14aa63353d6d5e8981ddcf81292f0be1499e1449a49b22576a8db873d2519858c7e8a6d4e2c60c86c91123b9d4e978a199895b15c69d SHA512 628433db9e89ff506aa871d667220d4a44c5cf458b519c0bcd2c16eeea9721574ec5c2829f3abe046b119c0bd456c7ee969bad8dc50cc49dd7cfadd6a27b9212
+DIST oci-java-sdk-common-3.29.0.jar 453619 BLAKE2B 41a68344a9cf4733c642e3a6e4254f3991f19c13edf57b3c61352b1e6ffdfabfe29cd8dccaa9b128fae618a492fb342007d14ad65b06cd614da572c787cf35ab SHA512 b6def960e114b69d3f34706d5e293f0a05b30c31a1443a92e454631712bb633eaea3795beeeabe4eb1303b8ad42ef2b73d69880b73d360e193f8f1b532bc3430
+EBUILD jdbc-mysql-8.1.0-r1.ebuild 1504 BLAKE2B 041ca21fb16cfc11fc7ee33dc3c9d6b3b6526955e71ca1bfdedcc2721614f60e74357e62e8c07ede49d5cd50f8d38b7714c1d0f5c98c820cf95b2dc8e2e7e041 SHA512 aed6b6d5345a1bdb95fbbc79bb76f0676e55a0646ce8949c13b6b90fd52e13b624d45528ef0e0603e01482909686619ab7c451cb01201d073d70afbdacccb942
+EBUILD jdbc-mysql-8.3.0.ebuild 1576 BLAKE2B cdb39e83b3d94f048eab504808dcdf93d811cf818524c3b959f6b794208f2ac9f9d7bd63f8ba7cbfe3445bce843c3b10aee4e15452a8e52c5986e59eadef6bd3 SHA512 d0d1754258946ff6db3d45efc2947318324cb383d9d750e15358b92baa1a461cdc81fab2566ea50e1c5851b0b326dbefacccfe7d8d1fa6b0cf049c0ea0d84780
 MISC metadata.xml 325 BLAKE2B e1c3ff68e092bb0e4cd63ed17da632f053f938e8e119a3b5f9a68a3961aac6c1df48a03e281583c22e881576ac9c50b405f0a6b40323bd85a183541a02792a05 SHA512 f855f395f2cc16667e5c524b63c409f754e399d657e50e7aeaebaa99af850480e271a890460a313b8be3c5a66d3e51d26dd2ceaade8828ce3d700232b892fca8
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild
index 09f0063500d1..649d226c823b 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-8.1.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
 
 EAPI=8
@@ -27,7 +27,7 @@ KEYWORDS="amd64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/c3p0:0
-	dev-java/protobuf-java:0
+	<dev-java/protobuf-java-3.26.0:0
 	dev-java/slf4j-api:0
 "
 DEPEND=" ${CP_DEPEND}
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild
new file mode 100644
index 000000000000..b1f06a0b4fbd
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild
@@ -0,0 +1,55 @@
+# 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="com.mysql:mysql-connector-j:8.3.0"
+# Tests disabled, see bug #902723
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+# Bundling a binary version of oci-java-sdk-common
+# https://github.com/oracle/oci-java-sdk/blob/v2.47.0/bmc-common/pom.xml
+OSC="3.29.0"
+
+DESCRIPTION="JDBC Type 4 driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/doc/connector-j/en/"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${PV}.tar.gz
+	https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/${OSC}/oci-java-sdk-common-${OSC}.jar"
+
+S="${WORKDIR}/mysql-connector-j-${PV}"
+
+LICENSE="GPL-2-with-MySQL-FLOSS-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/c3p0:0
+	>=dev-java/protobuf-java-3.25:0 <dev-java/protobuf-java-3.26:0
+	dev-java/slf4j-api:0
+"
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/junit:5 )"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( CHANGES README )
+
+JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/oci-java-sdk-common-${OSC}.jar"
+JAVA_JAR_FILENAME="mysql-connector-j.jar"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR=(
+	"src/generated"
+	"src/legacy/java"
+	"src/main/core-api/java"
+	"src/main/core-impl/java"
+	"src/main/protocol-impl/java"
+	"src/main/user-api/java"
+	"src/main/user-impl/java"
+)
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,junit-5"
+JAVA_TEST_RESOURCE_DIRS="src/test/config"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index fa2ba7b03103..271ea08c961a 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,7 +1,10 @@
+AUX junit-4.13.2_p20240222-ignore-failing-test.patch 5184 BLAKE2B d846ac9599216bd9486a26082029dea6a1f1e252f8b023c3e553cc6586365a582b78e20d3a305b7d911ad6a9bd8206057f7ad617e18103c050dd19f46f6c7031 SHA512 bb1f1c13b128fd2a178d58be02b3cc206b030ea421815309dcca3dbed33e529733576e4db0ed5d44d1126ffd077bdad8b9b4cb96d980f8b42d394a32c90d50f6
 DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb
+DIST junit-4.13.2_p20240222.tar.gz 1007781 BLAKE2B 4eeab59aa7ff3cc65c73318acb562523e6ba781da6a0baf28f8fa82042f1affddb583d188c550207a7e267b3475f4a546e8e25eba61d5ba36d13bd7e277ad156 SHA512 89506413b7aca7c2d0b41c8297dde48c1b90a44133bfb3ebf300247c7837839a3aff2d785d891ddb8762427d718eacf016a1d67e2e24edda05f4eae36ca311f1
 DIST junit-5.9.2.tar.gz 2882173 BLAKE2B 6baf8768654b399d64237a110dcb6a821ab7dc8964254a5d00f7ffb65c789818aed51ad7042a963a47669042baaeec87b5d0453643a2b0eeeaf6393a42c75fd6 SHA512 5673577f773042b4e253241d27298a60dbac239502788e1d999fbe0d3ffe76b29c90d4fb43660f2e2e00e3e9b8d4c1b6b909ff95dc6e87ccb6f7b009ae6b0e78
 DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
-EBUILD junit-3.8.2-r2.ebuild 797 BLAKE2B 06cd41709d371c3263db3abeeaa12a1a6481a265aba31b7ccff312b566e437c759ed8d7f3ffacc357b038d46e4083ef142049c148db741c113683730c9da392b SHA512 e6f0a571f0bc833daf4488c783686828b31720ff165ebbea868d9e6a1eeea0599077a23b062807a6ba637723206ed003dff89b048f635ee7e4a79d87c49584d2
-EBUILD junit-4.13.2-r1.ebuild 1372 BLAKE2B d9436a6fc7dc4d9debe2d26c7d5b2a58d2c6f7ce89d6cb87d50e7beb9e1e5328c5cbb0cc6454dbe8d782429091d0276cb4be93db8d0e8137bb3bb4ef11b2a318 SHA512 809e16b55c592b15d5f9da130a7eda0a53792605d08970c093acecbc9794c3aecc7b42237b7c1ceec667db5ff9510405b4873193ce992719bb0aa1283317646e
-EBUILD junit-5.9.2.ebuild 12008 BLAKE2B d6d24a32af7ec0acec0732adf2f85accefc5e92c07d754388ec96e52af2c7803f511b9add52cd26152005957e5c19786b54b56ddb885c0aac15f83ff2e9e396d SHA512 924202efe2dd0f35efc82841c353c0d595c7a5c8099a31559625528731396367597df3e0820e24898720db3350f33feb30fa9707496680a71f5f4f079e83d6a2
+EBUILD junit-3.8.2-r2.ebuild 789 BLAKE2B ee53cf9ac828f901606a89d814ab3f31d298d43aa9723d7e0d6fef6dcddc1bedd7ceb6187e0347d699c544b1afc0d91ab6ee85c817aeeedc0bea2e86c674126f SHA512 554bf808cf560b308de7cddd530115de136a839c5e7fd98ad7f4178f0014c60b8bc26e770837ecb6750c3a3a068d26dcf7aa913ffdce7b95efe2636cedb929a2
+EBUILD junit-4.13.2-r1.ebuild 1372 BLAKE2B 1a355c8f614a9960caf4730bed58545b5ee7cc7d94ffe5f5331d1d4b22fb090ce6bed7565ad61c9086150835ccdff24ee17daf6b8da7cee41671c7631534b466 SHA512 81c8dec8a28df07f9e726bc81b28c9c9c4819e4c27cfd43cb4d24326f4f721baa25adaebc99a59fe1758be4f7fd0a0ff1efbf4fe13901a000780206b052ff474
+EBUILD junit-4.13.2_p20240222.ebuild 1544 BLAKE2B bcd585a30d369b48358f32f65fa9926f1504a24386131e01f5a67cf4eb6c19f181eaa5216835a4a969f9c1416a4760e6d5c753c448d7f06365c8f97b494ba44d SHA512 ee171e4b3588ea585744067222bd52ba69a3ebc91f4a37d4c0dc41c623a6b2501f9573da8829dbd6d5f4620369c27491758990be78084e4f4d590db9b658c214
+EBUILD junit-5.9.2.ebuild 12008 BLAKE2B 1fa16dfc90e0e5327d6c0f0878b9fbcc82a7c5893e5bc6d02e8efb8e1eb7a0b58dba867ee4648bc45f47a27dcc72c3ae1fd38666f6196c610ee3129c820bad95 SHA512 96efdd8f81036253b3990aee756be23394611acf52101aee929e837648bfbbe3358e5d1d97985c45044690e2a98b32624dde122d9e46f264c6a154c654b67798
 MISC metadata.xml 894 BLAKE2B d0f5c989f8a49dc923dfaf51a7d42d6fdc79a9c2cccd48cd31e687bcc5b7d7f25b15f1e7f91ebfe8f87cc15ce11b37c95e06dcf17611b03066f2b079efc6624b SHA512 7d40683565d1e4ff8ceb183fa26d8d6e3ae77dc1f7335a6ea452589f0f794bae8479a9e97c257a7d2332f3fa83b6721b334557944a4f0d6d064b66e0bcda9bd1
diff --git a/dev-java/junit/files/junit-4.13.2_p20240222-ignore-failing-test.patch b/dev-java/junit/files/junit-4.13.2_p20240222-ignore-failing-test.patch
new file mode 100644
index 000000000000..512f680c3aaf
--- /dev/null
+++ b/dev-java/junit/files/junit-4.13.2_p20240222-ignore-failing-test.patch
@@ -0,0 +1,85 @@
+1) lookingForStuckThread_threadGroupNotLeaked[lookingForStuckThread = true](org.junit.internal.runners.statements.FailOnTimeoutTest)
+java.lang.AssertionError: the 'FailOnTimeoutGroup' thread group should be destroyed after running the test
+	at org.junit.Assert.fail(Assert.java:89)
+	at org.junit.Assert.assertTrue(Assert.java:42)
+	at org.junit.internal.runners.statements.FailOnTimeoutTest.lookingForStuckThread_threadGroupNotLeaked(FailOnTimeoutTest.java:207)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:61)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
+	at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)
+	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
+	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
+	at org.junit.runners.Suite.runChild(Suite.java:128)
+	at org.junit.runners.Suite.runChild(Suite.java:27)
+	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
+	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
+	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
+	at org.junit.runners.Suite.runChild(Suite.java:128)
+	at org.junit.runners.Suite.runChild(Suite.java:27)
+	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
+	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
+	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
+	at org.junit.runners.Suite.runChild(Suite.java:128)
+	at org.junit.runners.Suite.runChild(Suite.java:27)
+	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
+	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
+	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
+	at org.junit.runners.Suite.runChild(Suite.java:128)
+	at org.junit.runners.Suite.runChild(Suite.java:27)
+	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
+	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
+	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:141)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:119)
+	at org.junit.runner.JUnitCore.runMain(JUnitCore.java:81)
+	at org.junit.runner.JUnitCore.runMain(JUnitCore.java:40)
+	at org.junit.runner.JUnitCore.main(JUnitCore.java:36)
+
+FAILURES!!!
+Tests run: 1106,  Failures: 1
+--- a/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java
++++ b/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java
+@@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
+ import java.util.concurrent.atomic.AtomicReference;
+ 
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.junit.function.ThrowingRunnable;
+ import org.junit.runner.RunWith;
+ import org.junit.runners.Parameterized;
+@@ -181,7 +182,7 @@ public class FailOnTimeoutTest {
+         }
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void lookingForStuckThread_threadGroupNotLeaked() throws Throwable {
+         assumeTrue(lookingForStuckThread);
+         final AtomicReference<ThreadGroup> innerThreadGroup = new AtomicReference<ThreadGroup>();
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index 2872a332ce63..da6bba7b5fed 100644
--- a/dev-java/junit/junit-3.8.2-r2.ebuild
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -1,31 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="junit:junit:3.8.2"
 
 inherit java-pkg-2 java-pkg-simple
 
-MY_P=${P/-/}
-
 DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-HOMEPAGE="http://www.junit.org/"
+HOMEPAGE="https://junit.org/"
+SRC_URI="mirror://sourceforge/project/junit/junit/${PV}/junit${PV}.zip"
+S="${WORKDIR}/junit${PV}"
+
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
+BDEPEND="app-arch/unzip"
 DEPEND=">=virtual/jdk-1.8"
 RDEPEND=">=virtual/jre-1.8"
 
-DOCS=( README.html cpl-v10.html )
+HTML_DOCS=( README.html cpl-v10.html )
 
 JAVA_SRC_DIR="${PN}"
 
-S="${WORKDIR}/${MY_P}"
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}" || die
@@ -33,11 +32,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
 	java-pkg_clean
 }
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs
-}
diff --git a/dev-java/junit/junit-4.13.2-r1.ebuild b/dev-java/junit/junit-4.13.2-r1.ebuild
index af5e4f424217..0fa825c0272c 100644
--- a/dev-java/junit/junit-4.13.2-r1.ebuild
+++ b/dev-java/junit/junit-4.13.2-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
 
 EAPI=8
diff --git a/dev-java/junit/junit-4.13.2_p20240222.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild
new file mode 100644
index 000000000000..3ca8e79546cc
--- /dev/null
+++ b/dev-java/junit/junit-4.13.2_p20240222.ebuild
@@ -0,0 +1,53 @@
+# 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="junit:junit:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Simple framework to write repeatable tests"
+HOMEPAGE="https://junit.org/junit4/"
+MY_COMMIT="28fa2cae48b365c949935b28967ffb3f388e77ef"
+SRC_URI="https://github.com/${PN}-team/${PN}4/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}4-${MY_COMMIT}"
+
+LICENSE="EPL-1.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+CP_DEPEND="dev-java/hamcrest-core:1.3"
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/hamcrest-library:1.3 )"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+PATCHES=( "${FILESDIR}/junit-4.13.2_p20240222-ignore-failing-test.patch" )
+
+JAVA_AUTOMATIC_MODULE_NAME="junit"
+JAVA_ENCODING="ISO-8859-1"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+}
+
+src_test() {
+	cd "${JAVA_TEST_SRC_DIR}" || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	# pom.xml lines 264-268
+	java -cp "${CP}" -Djava.awt.headless=true \
+		org.junit.runner.JUnitCore org.junit.tests.AllTests || die "Running junit failed"
+}
diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild
index 6b6d656db44a..46efd8fcf0d8 100644
--- a/dev-java/junit/junit-5.9.2.ebuild
+++ b/dev-java/junit/junit-5.9.2.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
 
 EAPI=8
@@ -11,7 +11,6 @@ EAPI=8
 # installs each module's Javadoc to the same directory, which would
 # trigger an error when the second module's Javadoc is installed.
 JAVA_PKG_IUSE="source"
-IUSE="doc migration-support suite vintage"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -19,10 +18,11 @@ DESCRIPTION="Simple framework to write repeatable tests"
 HOMEPAGE="https://junit.org/junit5/"
 SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/junit5-r${PV}"
-
 LICENSE="EPL-2.0"
+
 SLOT="5"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+IUSE="doc migration-support suite vintage"
 
 CP_DEPEND="
 	dev-java/apiguardian-api:0