summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin55182 -> 55195 bytes
-rw-r--r--dev-java/bcel/Manifest2
-rw-r--r--dev-java/bcel/bcel-6.10.0-r1.ebuild (renamed from dev-java/bcel/bcel-6.10.0.ebuild)2
-rw-r--r--dev-java/jctools-core/Manifest6
-rw-r--r--dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch1
-rw-r--r--dev-java/jctools-core/jctools-core-4.0.3-r1.ebuild (renamed from dev-java/jctools-core/jctools-core-4.0.3.ebuild)2
-rw-r--r--dev-java/jctools-core/jctools-core-4.0.5.ebuild82
-rw-r--r--dev-java/jdbc-mysql/Manifest2
-rw-r--r--dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild2
-rw-r--r--dev-java/log4j-core/Manifest2
-rw-r--r--dev-java/log4j-core/log4j-core-2.19.0-r1.ebuild (renamed from dev-java/log4j-core/log4j-core-2.19.0.ebuild)4
-rw-r--r--dev-java/opentest4j/Manifest2
-rw-r--r--dev-java/opentest4j/opentest4j-1.3.0-r1.ebuild52
-rw-r--r--dev-java/opentest4j/opentest4j-1.3.0.ebuild28
-rw-r--r--dev-java/protobuf-java/Manifest2
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.25.3.ebuild2
16 files changed, 150 insertions, 41 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 4c5e970845aa..b831953c912d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 4fefde886475..8cc625dee264 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -2,6 +2,6 @@ DIST bcel-6.10.0-src.tar.gz 1085294 BLAKE2B d2d3a0824ec45a5f47282a7255915ba0c891
DIST bcel-6.10.0-src.tar.gz.asc 488 BLAKE2B c575c3f68f06538dc8d34dccf6dd157824b6ecf8b7a1f0a220fe1828a1546ecfb46699f1374c9dd90bf89d9b311ce48f8d4b9e45818764d5f078817a17573557 SHA512 a19a5a6702c9d8d38733af6d983da6c60dac910f8ef3f4c6daae8e6ebe7bdd0ccc9029bad7af78984979e62cdc63d50e6f3a4ef02f409212fde1479465901863
DIST bcel-6.6.0-src.tar.gz 1009654 BLAKE2B 9043cc077773383aebf9b56e8c67de9ffb9e278db1737eefb5966b32cbe36131bd6ec14454361daaf424a8114de21e804dadaebfbee6d11493026b8a98135668 SHA512 13f361be498625c3276860ae14c225c49135687f4ba69de4afaac2d135df4e5c6b51277e3cd4c05bac27156e4fab5316c102a25a67d8abb6c640499917d01917
DIST bcel-6.6.0-src.tar.gz.asc 488 BLAKE2B b3d07f9d6f8f2b92215173d390281cab03b98dea2e926f5fe7f3ced74610c56dfa2915c5bfeeca360cd3904773cb66f8d9042062e6b3821f707853ef5c82fc73 SHA512 65830fcd5f5adb1deb92edd0b9181b9aeaf3d5357858a348606416dcfb416f58420ceb6c8ea58a550d5d7b4d1909dcff125b31496c00a9107ae211936c1d6e1d
-EBUILD bcel-6.10.0.ebuild 1474 BLAKE2B 2ccee3493d9d5fa90bc262750b914b6dbe40a1e10c425b114a2ba3392a57f109318f7fb6901eadd2561995bb474cf90cc70b2212758208854979fa530222f0ae SHA512 1f81b2c7173b89283898ad5164db6413a2b314349a01013eaf9a2bc4d08b30def7c5d371f921ca22897b16b793a2ae7797918fdd654817d8b8557d3668b3eb9a
+EBUILD bcel-6.10.0-r1.ebuild 1473 BLAKE2B 0c6a264dd2a87ddc7ce31ca13f5cc3f53dc618ed201411f27ad544a142ca3e6de210537a97fdab4610a0ec9b8c8359c87dd79c74e986af1b7ed0e20ef02dcd37 SHA512 158d1a78522f0f362c81420bc038f5eed988c07ba4f3d42b49ab4e31eb0e52aeda78481bc88bc6b3c2781983026ec3719af20bf06b97ec88a510679fb56e8438
EBUILD bcel-6.6.0.ebuild 1913 BLAKE2B 9705f6d74ea351e2defb615435b622aa30ea9d31f040a1c463bf16b8be65b73763740b363f0b1f3533b6649cf666314f17250b63722798060ebbc86d6e98cf22 SHA512 b5e0457a0a82c22f3765a31b53a3b8e9cdfcca468f727acd76a2a01cd0426af64b844fb571e4b7db786b450e41f4992f04c80390031b581618a0d3a7020b7f57
MISC metadata.xml 897 BLAKE2B fdd417f23c2717d0ff95cbf4decc58768b60710baa803f71c956a3fb4c5049fd83b14679f0ebdb95185f3212541706e2b598617e2a61d6399cd254bd66d031a2 SHA512 99ea77ae905471f571c87a43fd9e8621ea169cf2b41bf3025fc2ecf2e4eed0088c6cc6cbc5c5d756f9083b9c6b11c2f8d0cb05090dcef9f69a797f6c887cab57
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 264d3f73684b..2b5a54ed43a4 100644
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@@ -1,4 +1,6 @@
-AUX jctools-core-4.0.3-increase-TEST_TIMEOUT.patch 855 BLAKE2B dab4a25c6de51cb8632006b13f1a191520331a6bd261bb77bd119e81ca17ce5d502dfeedcccd9a1a327cac62f5320a564b6ddc64f1518932ccf45bd47aa74192 SHA512 ae03b10c521a44ebf7f3fefb88a91c54af25981265c6106d81437b8b0d19bb9070a1cc416126d12da93088914a54dafa40b99722378daad61dc01e1ac038a495
+AUX jctools-core-4.0.3-increase-TEST_TIMEOUT.patch 856 BLAKE2B f6d61567dd9ab1ade1602f11cf90952c63db6730011ebe55961288ecd6bb1ac4b63422a382c898ebfb5ede7a27d63e3c142acf8d21b9d22c9d40aa15b97769f2 SHA512 0da3505510422a3de9bfbc275683fe885d7ddd9a8d5cf37831956b20faa0f11f19d3a228a7ee000efc98aefb176cc84d0684b35516f4de75e64e83627790e388
DIST jctools-4.0.3.tar.gz 4237279 BLAKE2B be74c2b0997ec68b90249c8d2b841737fffa4e09724a25b5f5e15b8c4bbf811215023358bc674ed20f81d06a10db3ac2428b29d159ac99ef6dff7e6c36bf7fe2 SHA512 3d7cede6beba54871365cc2f49dc30f014a6f36a5e1f66e9cebd523d202806d49f24c23dbfd6bef0c25cbea0ca230b5d1afefd2b83b0150d335e8e99b6cec90f
-EBUILD jctools-core-4.0.3.ebuild 1977 BLAKE2B b24a25fde4e2ba08cc26a29c804bb4684d5a7730ef4e0eb10c8748262944799517171541c2157ec43ef89792b620ce2159c0ae08784e8b6b323e45c9c9613104 SHA512 d1e2ef546b1942af85608d00be1c71e150a19bb9310f6d94dd1d26e083ef76e957af7d09e862f163db2d5306ee134183459e816e74c5ae860166a643aa7ead7b
+DIST jctools-4.0.5.tar.gz 4259231 BLAKE2B 33088bdb9f9d0030127990fadcef13295ea446ac54788c7d330c123af7e73626a7214481f8e10c5885e2026da281188c4c606965c8281f62c3fe2427e3754b79 SHA512 13069fb1b5c1275557e2343e6b8008ce549f948c185824a3e6a254fa0c1dc105e59de707d6b5b7bdb81120372a63026334cbd7a244d4e76b1de65d475cf02cd4
+EBUILD jctools-core-4.0.3-r1.ebuild 1977 BLAKE2B b32198338ff1db6d59031bca7706afc72fffded0c85629fd04165626010574edd0207cc894b5b5519931f9104d3d77cba2000a4bd1fb289ae9aa3101b76f992a SHA512 ab9dc63c568db0cce006567837edaba42ae61fff91f7da9e98359cc5bf6024e4d192017ee1aed2e36608dea08f91564595a494d2bb7147cb4ea12a1fd1b4bf9c
+EBUILD jctools-core-4.0.5.ebuild 2282 BLAKE2B 799b12d7a03b3843fb5213548cc323ae50a6b28e8e0dc452ebabbd0f2c318f89bc7c847d63a19eaabb8c189da98eb19366afb78c7747b91961c5774be2ca37da SHA512 e116c5273d891e10d40ced38bf10a299b186dd60f38193b36b2e6ccc16e1dba107a89e87d5ed00206ccf6f91c48cccd58b6530efe99a9be3f444aa9c873f5bd3
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
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/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 6ad4d7f586c1..24c6aa9a4fa2 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -3,5 +3,5 @@ DIST mysql-connector-j-8.3.0.tar.gz 4255433 BLAKE2B b5cd437e4ab87052c0fd8e4da6a2
DIST oci-java-sdk-common-2.47.0.jar 439209 BLAKE2B b3b28bb0cf4b8dbca37bb34df7bb48029901be5d9f7754a2ccce888a9af4a06b3348cd545d480127f942687b9b0d63336c37b5f95ecb9f96111c9388a4bc6053 SHA512 73e7376c92d47d81e0630e2ad2d510a483068664874ae31622629dad6dc016d746499c2d29682563e5cdee35ddb6e9e59a2e7557d32e1eeec5fb12206f9d1d6e
DIST oci-java-sdk-common-3.29.0.jar 453619 BLAKE2B 41a68344a9cf4733c642e3a6e4254f3991f19c13edf57b3c61352b1e6ffdfabfe29cd8dccaa9b128fae618a492fb342007d14ad65b06cd614da572c787cf35ab SHA512 b6def960e114b69d3f34706d5e293f0a05b30c31a1443a92e454631712bb633eaea3795beeeabe4eb1303b8ad42ef2b73d69880b73d360e193f8f1b532bc3430
EBUILD jdbc-mysql-8.1.0-r1.ebuild 1504 BLAKE2B 192d1ffc3619f1968e21dd8bba1c1380172bbe7eb5331a406cc5d33c14616be9b5467fc398315c17b4fca0a0aeaf3c5e1f0accd009c95c9288203ebc2b2d9021 SHA512 145d4c9a3e9f25ed784f26618c428a454ab29c26ca8e7b34896e523d12bd789167f6f718c1aad94d157229b70f3d46d83b0af88ce058e5d6e3e4e196674ba12c
-EBUILD jdbc-mysql-8.3.0.ebuild 1576 BLAKE2B cdb39e83b3d94f048eab504808dcdf93d811cf818524c3b959f6b794208f2ac9f9d7bd63f8ba7cbfe3445bce843c3b10aee4e15452a8e52c5986e59eadef6bd3 SHA512 d0d1754258946ff6db3d45efc2947318324cb383d9d750e15358b92baa1a461cdc81fab2566ea50e1c5851b0b326dbefacccfe7d8d1fa6b0cf049c0ea0d84780
+EBUILD jdbc-mysql-8.3.0.ebuild 1575 BLAKE2B 5e2ac925d850cbd027ea9eac9ac1566ed7e724c09954bb1e091ce91793efcc2afb2b88fa24342df64ca6f08aecc18ea340b453becd018b5bf75b9bb83ac19911 SHA512 af4f5da3680caeea3ca5561b69641c958b50c0cf42ace91c256f82382d1b78d3ed3b9fe52fa06c8da3e73388ab962a700bd692b21bff55cd809a65438857c1a4
MISC metadata.xml 325 BLAKE2B e1c3ff68e092bb0e4cd63ed17da632f053f938e8e119a3b5f9a68a3961aac6c1df48a03e281583c22e881576ac9c50b405f0a6b40323bd85a183541a02792a05 SHA512 f855f395f2cc16667e5c524b63c409f754e399d657e50e7aeaebaa99af850480e271a890460a313b8be3c5a66d3e51d26dd2ceaade8828ce3d700232b892fca8
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild
index b1f06a0b4fbd..fa5c0981ca39 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/mysql-connector-j-${PV}"
LICENSE="GPL-2-with-MySQL-FLOSS-exception"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
CP_DEPEND="
dev-java/c3p0:0
diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
index eb7a385a7fd7..fa7ce9b7ae8d 100644
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@@ -1,3 +1,3 @@
DIST apache-log4j-2.19.0-src.tar.gz 11764795 BLAKE2B 02ec7c5c825cabe9994a2f50d6761110f87a19ff46874c00d46986da7338c32148f3b6c3551c95721aaf94b71d1d5ce8bcea32462e11fa3fe0c3cbbc0cf5f887 SHA512 c72859c415e701921497bb4f02047fa022083f66b4d21b1dbae28361bd73498b2eae335b9a1ac2d7f796df734a6d54db2701ae5ebf999197597e9e2ad064c271
-EBUILD log4j-core-2.19.0.ebuild 8754 BLAKE2B adf025c108c73f92e864c7b2d738fcdef3d78b85eca63845cecf14bd580ff3b4b794a7060d717e2904036a914cce2934f52f07b5072062a4ee1e9c732d6ca6f1 SHA512 95177eb4e946e4b4e26a86bb5caeb651af60c5efc6cae61931f441261ae0b5f6b84a01d50fb05fd58ea6f3d01271ac0befa65ddef7328c57a14a478c2138986b
+EBUILD log4j-core-2.19.0-r1.ebuild 8765 BLAKE2B 4ecc309211f8a5ae84c06e4a57d3ca7b057251e7090091d65003363e73585c7b4aee3623a0c69fd0f30d33f325894c58690851d800e4fbf2a3b324b99d9d4d1c SHA512 b042b41f79be87460bb4f900d8b1f0049f5bb6f13a0a41eaf8fed400f6caad46105b1cba9fedf2531d2de48a372ad61318c94365fc9781d550aeaf3bb4fa5c91
MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
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/Manifest b/dev-java/opentest4j/Manifest
index 5a499b4b6cc0..f63fedf21684 100644
--- a/dev-java/opentest4j/Manifest
+++ b/dev-java/opentest4j/Manifest
@@ -1,5 +1,5 @@
DIST opentest4j-1.2.0.tar.gz 77616 BLAKE2B a331cc5e97d1e50b3b57e6aac926278d16f4d75067b4e4b25acb5ee25d4d4cd9d1f75c115155303ec63f5cb22b09ad1cbaa01d62620b350dd2c1d61541657b78 SHA512 cd98d976935de97d259ec4c04510334f2b56f8a32db2c97e0f20a2e3b99f119ffeb390589eb42d4594808d96194067871d5eaad6a40dd58af30b9f995b13ef08
DIST opentest4j-1.3.0.tar.gz 89527 BLAKE2B f8ac763c3ec1b1617c38c3744a8fac82e0d93ff4ff409a00e3e22d343fc873aa4129bee3d906de0e13cc78450a1c67cdcffebed91d00c9758f20113a68a76dc7 SHA512 6141fed5230d1195eee137031fc6cf8e3df0b857f2fd341ba823d5aeb92d86e56262b57b93a901a4e00f6000920b67f28e02e04f404df7df8e62be9d60c3e79d
EBUILD opentest4j-1.2.0-r1.ebuild 765 BLAKE2B b8aa0a51b4f1ec10e38de919212927afbfc45274e779e5a24b0d20e3769648d2648aa4f891ff0d682dca2c6545e0007d36b43738c89a5bc269bbec7736b8a9b7 SHA512 9811e4fbe56119d089f9b7dafb9d11479cc79cfe7f2f794e6fee231f3c89af0c9df16a3f54535962053efa6f5dfbf81f8e86577d464cb1ae2c7b136d6b6d0bf5
-EBUILD opentest4j-1.3.0.ebuild 765 BLAKE2B 163e681533bd04be3ce7557c9d35c28636e0547dc56ebcd5d3f076500f365af5d81ca07b3cc3e05a95f113eee849213df9518f87bde4b047bc890085e5149431 SHA512 f5103dc9b5e1b5f2b2eed2545169a1c3939fd7888bc78b004683162994be95aead0e055a0771e57cd69822c7a50a20a6412b808c03c69c5a139fb75df28125b3
+EBUILD opentest4j-1.3.0-r1.ebuild 1673 BLAKE2B 607c849cfd6a066c90bf87f48dbc87d331381a167912915023559df0cece8398520c18c16dc5ecd5e472d9744e38e44f06e6df9c4585a1a4a1faab4da111aa78 SHA512 fa268ef4842b7417059cdc2362c879c34530fce322d639eaeba37629839e1b060a67e228cbb90e4dd7e9cc22cb82e200251780ff038a564c37b48ac887492a7c
MISC metadata.xml 303 BLAKE2B 07307ccd1ef1f074fa091ff02bdacfe83a3f3c0a2d79f7545821d5955834a83391d64d34dc8170cb5a4752302296e746393491f7b628a6936a3f0c2b85e09f29 SHA512 9760587d9dec49089d8ea86b7046d145e41075c6ae02af3be319e795272b3eeaef6540dfbb90564bb85d50974f44acd4bfd71d57956b1ff0e2e216220bf60f48
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 )
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 5ea03528f39e..cc5012df71b4 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -8,7 +8,7 @@ DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd98
DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
EBUILD protobuf-java-3.23.3.ebuild 5026 BLAKE2B 5918ff65f4a52a8c397c4e4e4f48dff195ac1eb6d396a22cfde80683e7714c88cb807fdf4d6db99eda5d00a39d25c8bd75609119f2edd68484ba44a14df3ccf0 SHA512 296165685cf050804a978a5a6e63fe8a78e367ebb433ce8256239bcc6400d4acf4a1eb3fd8c618e3ac296e024bdc6a5144781dfa5e3dfc63c29a36f258b8e6f9
EBUILD protobuf-java-3.23.4.ebuild 5063 BLAKE2B d48f546256aed60a72ce4f27f689d70c8c9cb7f3223d4100ae4aa9fce65d1fb346945f922850434ca353cf667a680f170afe94012908e188e6608ffccf6b0ace SHA512 908cc9c7b684bd3cf8d5c322c7ba15db7e5959a3b884e459f105d0f68d51a92e8a17114e77b3d66cf03889878f1705f5c2d8ae956b5e8378f0f642e384677965
-EBUILD protobuf-java-3.25.3.ebuild 5070 BLAKE2B 253564d29b833f09bda7830790bdd120b5807ff75d4ff70949ceca2c1b79410ba4b023e57c0a58763ad8cb037eb2bcefc875198a3385b7dd032c8b709bac45ea SHA512 503911709bf44eb849037f480d813ae45ca55752cedbb9652fb62a155cd2cadaa0c6511c69ed259d16a7799ee19fe57e7c3359d02196185652386da390807f1b
+EBUILD protobuf-java-3.25.3.ebuild 5069 BLAKE2B 6226594990ef634ffddd329d307bd609e233002a657e1511314eb5ac7f52a9f8c3d13ca69135ae6d516e86ec5bd2f773e07c4348d0bbf366e40ce83d385b06e1 SHA512 b9d3a71faa1cebee349792066cc3257d738894347ee02be440db01f9e1d85530c969f73af8e53384c0e5320f117fd2fa403c4d9b5853d1e2e8f902987b7c3e18
EBUILD protobuf-java-4.26.1.ebuild 4758 BLAKE2B 018ffa86d9af50a96db808ee51892e930630ec0709f0effb26522e70bc8d9890a84cb67276b2aab743950b7ba53e77567615f9d1bc63e391521a22696afe1e7b SHA512 4a738022a541fc6b73a13fa7cdc461137adbcfc8f3cf95a522355991c9be2c459b10b99191fb1efa3d23efb4783e539cc5e119fa6e84096b0ed3cc2762675ced
EBUILD protobuf-java-4.27.2.ebuild 5037 BLAKE2B 67330a0834b53ed7a950daea16be0b2cb7c8523cd6b2c0cafcc1468b39b6dd064e07a12d7e90a6b19612d6e82711c07e76cd6a2951ff6ec5709abcab042eac63 SHA512 51187de703cb88ded86536a068725eddb2692ba71150d2fcfb566058f1996edf39491c46363f31aecfb5210d7e7fbf7974da5dd4fbc90e70caa262079ad48d63
MISC metadata.xml 534 BLAKE2B aa3ede54aa4e1479f977cecb9dace36fa5db7025a5d45d142cde5ea2ede794f721abf0ced139b24d4c2c1aac3631ee43f15b4d74850abc56c1fbafb8736adebc SHA512 11f7b1fca223910cd42be952760e32d98a553fd660e1da66542a722eb1e3296c79e702f899dc36ab0e794a19014ede3738fc0959b04a9d44910e9e0068f3feb7
diff --git a/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild
index 5415eb83ec8c..f1f4647303c7 100644
--- a/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/protobuf-${MY_PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="system-protoc"
BDEPEND="