gentoo auto-resync : 17:10:2024 - 04:04:26

10 files changed, 222 insertions, 261 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f6dc89ad37b2..6853bcf7fec5 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index bfba2fbd0fc0..49ceeba1f77a 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,4 +1,7 @@
 DIST commons-logging-1.3.1-src.tar.gz 189156 BLAKE2B 23308b2bff6ea67620b0f07f49a63ffdbd07833fc0d9a6654386f4c17c9125abef5ad2afb6d8c798dcb98bc3e99bd8d94d35b9deec569c3aec1dde20f69e1a1d SHA512 ffda970d086601df4b476caf8bd01d1bdc22dd7f8846a22287036f7f000ce6cf0a757d16621910f041f8d90aa6066819454b3977dd005ca66817bec59e91e91f
 DIST commons-logging-1.3.1-src.tar.gz.asc 488 BLAKE2B 3225a62f6269224f1b52907631be03d97cde65d1c7a76c06b6a23b9e30b1cee08b048eb4fdaa41b0a6b5bcf090b54c9dc54307fb1629b039b786fd426572a4d1 SHA512 6f13f85a5aeab1099ebfca38a6173384050b1f1c2e7eac93d978587c92751ddd24d583e39bc5a949f0caec66ca141d265147e63e9e2afea2094bda4667936a86
+DIST commons-logging-1.3.4-src.tar.gz 195717 BLAKE2B ba691ea0033c14f54fcb525faeadd4b330e063f73175c5ee40a4f50f159f1b264efb9f40661c4af3902ddca7d43f8f9b84e7a77bf1eeb3b237b31f566fc98aab SHA512 a4049d8d7ea0d97f337e169fa5f572e32be1882e07102ab004d8b2de74170cb075a251ee9603590d6e10bee5933651e8e33e108a734fc100e8b2d5acd669cb44
+DIST commons-logging-1.3.4-src.tar.gz.asc 488 BLAKE2B a9cdc993891ff39bb8ebeaa3eefdecee1adb062ed77449dfa1dad75a43cf5aa5678f014d24765ebff7b761498abfc795d3bb68359a73f8de98cb4ac115cb68da SHA512 1c132b87f03ca54887172e45c36e1d8c66d4f12a2a6a2da84e0d6cf3ac2cd2366193829fac0393837371bc1cd34215cd6318c9e7ea6c406c11d9f0dce28b3143
 EBUILD commons-logging-1.3.1.ebuild 5386 BLAKE2B dec24c358e19ac4ba1cad8a4a83527a6af3ad3db1a4006805ca7e529b8984d4f20bec13176dda17595b016e74eb5de0fe0bd3242c84904683ea99985761c5b69 SHA512 6cb7fae5214abd1a4ce0d7ea80a48cb24331ddc103a0a739119815cfe0cd000394a20283a977ff12f97937efcfd44c4e20602b32fc03e3aa7340db19678340d0
+EBUILD commons-logging-1.3.4.ebuild 6645 BLAKE2B 46c8fd7ad6823ea68224c90fecbf998da11e9c41b8393c948c6e2c1f4c736c7032065d8a99ced8c402924bfffd66a12425825e6444980ce2c90b1418a234ab45 SHA512 575816443dba5fc90eb444dbd5a3e7f4bf851c5a6d3b122d78c979acdde45c6eae9b7ff9304d324c85b98fee114509e9a4a25587cd170941e141653e695407b5
 MISC metadata.xml 549 BLAKE2B b20c8451a73329dbdb8aa88120543b948014115d754a84e8a77a8f61b9134277a7849fc10e35323c028a32d69f6e45702200e06af4481bf5238f5d848b3ccc03 SHA512 105c2bdf3eed380f11be1b8987a08fbcf1b6e6cbbb00c0e38e4813875865abd65c9be85267d5b49486913fdb0635b7329b5c4e84a86d9f93f9dcdad74c336ff0
diff --git a/dev-java/commons-logging/commons-logging-1.3.4.ebuild b/dev-java/commons-logging/commons-logging-1.3.4.ebuild
new file mode 100644
index 000000000000..e440061c3289
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.3.4.ebuild
@@ -0,0 +1,194 @@
+# 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="commons-logging:commons-logging:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems"
+HOMEPAGE="https://commons.apache.org/proper/commons-logging/"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/logging/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="log4j"
+
+# src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTestCase.java:26:
+# error: cannot find symbol
+# import org.apache.commons.logging.impl.Log4jApiLogFactory;
+#                                       ^
+#   symbol:   class Log4jApiLogFactory
+#   location: package org.apache.commons.logging.impl
+REQUIRED_USE="test? ( log4j )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+
+COMMON_DEPEND="
+	dev-java/jakarta-servlet-api:4
+	dev-java/slf4j-api:0
+	log4j? (
+		dev-java/log4j-12-api:2
+		dev-java/log4j-api:2
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/commons-io:1
+		dev-java/junit:5
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( NOTICE.txt src/changes/changes.xml )
+HTML_DOCS=( PROPOSAL.html )
+
+JAVA_GENTOO_CLASSPATH="
+	jakarta-servlet-api-4
+	slf4j-api
+"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# https://avalon.apache.org/closed.html Apache Avalon has closed.
+	rm src/main/java/org/apache/commons/logging/impl/{Avalon,LogKit}Logger.java || die
+	rm src/test/java/org/apache/commons/logging/{avalon/AvalonLogger,logkit/Standard}TestCase.java || die
+
+	if use !log4j; then
+		rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die
+		rm src/main/java/org/apache/commons/logging/impl/Log4jApiLogFactory.java || die
+	else
+		JAVA_GENTOO_CLASSPATH+="
+			log4j-12-api-2
+			log4j-api-2
+		"
+	fi
+}
+
+src_compile() {
+	# getting dependencies into the modulepath
+	DEPENDENCIES=(
+		jakarta-servlet-api-4
+		slf4j-api
+		$(use log4j && echo log4j-12-api-2)
+		$(use log4j && echo log4j-api-2)
+	)
+	local modulepath
+	for dependency in ${DEPENDENCIES[@]}; do
+		modulepath="${modulepath}:$(java-pkg_getjars --build-only ${dependency})"
+	done
+
+	local JAVA_MODULE_NAME="org.apache.${PN/-/.}"
+	JAVA_JAR_FILENAME="${JAVA_MODULE_NAME}.jar"
+	java-pkg-simple_src_compile	# creates a legacy jar file without module-info
+
+	# generate module-info.java
+	jdeps \
+		--module-path "${modulepath}" \
+		--add-modules=ALL-MODULE-PATH \
+		--generate-module-info src/main \
+		--multi-release 9 \
+		"${JAVA_MODULE_NAME}.jar" || die
+
+	# compile module-info.java
+	ejavac \
+		-source 9 -target 9 \
+		--module-path "${modulepath}" \
+		--patch-module "${JAVA_MODULE_NAME}"="${JAVA_MODULE_NAME}.jar" \
+		-d target/versions/9 \
+		src/main/"${JAVA_MODULE_NAME}"/versions/9/module-info.java
+
+	# package
+	JAVA_JAR_FILENAME="${PN}.jar"
+	jar cvf "${JAVA_JAR_FILENAME}" \
+		-C target/classes . \
+		--release 9 -C target/versions/9 . || die
+	java-pkg-simple_src_compile
+
+	pushd target/classes > /dev/null || die
+
+	# pom.xml, lines 81-103
+	jar -cvf ../../commons-logging-api.jar \
+		$(find . -type f -name '*.class' \
+		! -name 'Jdk13LumberjackLogger.class' \
+		! -name 'ServletContextCleaner.class' \
+		) || die
+
+	# pom.xml, lines 205-124
+	jar -cvf ../../commons-logging-adapters.jar \
+		$(find . -type f -path './org/apache/commons/logging/impl/**.class' \
+		! -name 'WeakHashtable*.class' \
+		! -name 'LogFactoryImpl*.class' \
+		) || die
+
+	popd > /dev/null || die
+}
+
+src_test() {
+	# Do not run Log4j tests because these tests use an Appender to verify
+	# logging correctness.  The log4j-12-api bridge no longer supports using an
+	# Appender for verifications since the methods for adding an Appender in
+	# the bridge "are largely no-ops".  This means an Appender's state would
+	# never be changed by log4j-12-api after new messages are logged.  The test
+	# cases, however, expect changes to the Appender's state in such an event,
+	# so they would fail with log4j-12-api.
+	# https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html
+	rm src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java || die # Log4JLogger
+	rm src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java || die # Log4JLogger
+	rm -r src/test/java/org/apache/commons/logging/log4j || die
+	rm src/test/java/org/apache/commons/logging/log4j2/CallerInformationTestCase.java || die
+	# error: package ch.qos.logback.classic does not exist
+	rm src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java || die
+
+	JAVA_TEST_EXCLUDES=(
+		org.apache.commons.logging.jdk14.TestHandler # No runnable methods
+		# junit.framework.AssertionFailedError: Wrong factory retrieved through
+		# ServiceLoader: org.apache.commons.logging.impl.Slf4jLogFactory
+		org.apache.commons.logging.serviceloader.ServiceLoaderTestCase
+		# junit.framework.ComparisonFailure: Log class expected:<...ommons.logging.impl.[NoOp]Log>
+		# but was:<...ommons.logging.impl.[Slf4jLogFactory$Slf4j]Log>
+		org.apache.commons.logging.noop.NoOpLogTestCase
+		# org.junit.runners.model.InvalidTestClassyyError: Invalid test class
+		org.apache.commons.logging.LogSourceTest	# No runnable methods
+		# junit.framework.AssertionFailedError: Logging config succeeded when context class loader was null!
+		org.apache.commons.logging.LoadTestCase
+		# junit.framework.AssertionFailedError:
+		# expected:<org.apache.commons.logging.PathableClassLoader@1edf1c96>
+		# but was:<org.apache.commons.logging.PathableClassLoader@15615099>
+		org.apache.commons.logging.tccl.logfactory.AdaptersTcclTestCase
+	)
+	JAVA_TEST_EXTRA_ARGS=(
+		-Dcommons-lang3="$(java-pkg_getjars commons-lang-3.6)"
+		-Dlog4j-api="commons-logging-api.jar"
+		-Dservlet-api="$(java-pkg_getjars jakarta-servlet-api-4)"
+		-Dcommons-logging="commons-logging.jar"
+		-Dcommons-logging-api="commons-logging-api.jar"
+		-Dcommons-logging-adapters="commons-logging-adapters.jar"
+		-Dtestclasses="target/test-classes"
+	)
+	if use log4j; then
+		JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)"
+	fi
+	JAVA_TEST_GENTOO_CLASSPATH="commons-io-1 commons-lang-3.6 junit-4 junit-5"
+	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+	JAVA_TEST_SRC_DIR="src/test/java"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 046be15f418c..27ce0c3b87a3 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,8 +1,6 @@
-DIST mysql-connector-j-8.3.0.tar.gz 4255433 BLAKE2B b5cd437e4ab87052c0fd8e4da6a2612d4c068193a4fe2d207505b2f42d664a414c8a0f3131f34b471a30bfa6b6bb9e76ad0dd4779abbecb46ea014ab5d06e36d SHA512 0849ff13f4adc4ae2d2b9f64ff192435dd9560763a50c7df117a171ae1d90fc97bc36dc89097472d0a2c182492a45ca14ffcf577a9c54267be79e5b3f147dc41
 DIST mysql-connector-j-9.0.0.tar.gz 4469329 BLAKE2B 3248d43654c56a2b566bbf515de996ab43f845beb2104f69c3c3c837b8b527d8e9851fe849bcf55fd7eafb061e4780dfaa19b42583a7d12b72367d0a36a61ab3 SHA512 40028f528e8bff686fcd700d165785194e1732a8c2c29efb2ffe67623f8915caaac4d2a9e548b0e9cda4328e25cfd6fe4e008cca1491117e38a4c79af0231475
 DIST oci-java-sdk-common-3.29.0.jar 453619 BLAKE2B 41a68344a9cf4733c642e3a6e4254f3991f19c13edf57b3c61352b1e6ffdfabfe29cd8dccaa9b128fae618a492fb342007d14ad65b06cd614da572c787cf35ab SHA512 b6def960e114b69d3f34706d5e293f0a05b30c31a1443a92e454631712bb633eaea3795beeeabe4eb1303b8ad42ef2b73d69880b73d360e193f8f1b532bc3430
 DIST opentelemetry-api-1.40.0.jar 141734 BLAKE2B 1f14ca7caadd0a3eed615da7ee528e5df72474d9a4eabcf5a820996830cf76c8fa3402de7d283598f1e4bb44b1a15c488b81863c4b5c0685ea35fe65f3fb12c2 SHA512 d4a1af66075b5f147ba297a8133a707716e323800d8aa2debcdace2bbe10046b2fee8a47d87fa9b6f1f11ad30f4da688670c546841990ad8daa7c8c0535498f2
 DIST opentelemetry-context-1.40.0.jar 47251 BLAKE2B 7effcc63ec6695184467518686ec8165118cae1e7a4f1a7db273a3cbd1ff0b1e98c2a83252291db9536121e1e2999d1d77734acd7ddb5b272264138af4e6af74 SHA512 14ebc39edce8b603fe9f13d304faf54d7362abe3b1ae574aa84d5bbe37c43b133c8131976efd2bfedc94c646b2487054f7b3cce04e1f09efbce0f4ce5a6d5921
-EBUILD jdbc-mysql-8.3.0.ebuild 1575 BLAKE2B 5e2ac925d850cbd027ea9eac9ac1566ed7e724c09954bb1e091ce91793efcc2afb2b88fa24342df64ca6f08aecc18ea340b453becd018b5bf75b9bb83ac19911 SHA512 af4f5da3680caeea3ca5561b69641c958b50c0cf42ace91c256f82382d1b78d3ed3b9fe52fa06c8da3e73388ab962a700bd692b21bff55cd809a65438857c1a4
 EBUILD jdbc-mysql-9.0.0.ebuild 2155 BLAKE2B 43fed7d0957229763236b03a51016f677c7cd102e534688d30b4bed399bd1e6ba58d1b33e133ef32755cbc51a63b707db24fa91de972269e053ab62a24c1008c SHA512 3a16afd8a4212a21500477316bce52a37361930e46c2225ee91066acc0944a79af76d78d84ae2ab0524c8da1a2c8db301404d88ed15906fc192ec82a921c7136
 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
deleted file mode 100644
index fa5c0981ca39..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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/jetbrains-annotations/Manifest b/dev-java/jetbrains-annotations/Manifest
index 7f739088b027..07953914f6da 100644
--- a/dev-java/jetbrains-annotations/Manifest
+++ b/dev-java/jetbrains-annotations/Manifest
@@ -1,3 +1,5 @@
 DIST jetbrains-annotations-24.1.0.tar.gz 84549 BLAKE2B 1c522e4eeb71520108d83305667571fd07b452977277a161ea0f6a940431212ccd3b7ca2980f77b0e8c015cce0b5a35500fefca73e74bf48c9859525332bdc81 SHA512 80dc35009eaac29b44a5126865bf76d1c2d20c0e9094a200b13bc9047d6ec327a25e49a06c462ba65c4aa6e3d201d0a3005614f27b07adcf107080c0189af9fa
+DIST jetbrains-annotations-26.0.1.tar.gz 148134 BLAKE2B 154dad272ea1326281e4dd7b6dbfed98a8ba018ce1d6fc2a225ddff1db785646b1707f4e59640658b6f6a512ef6b3c282fa18eb2d656ce659d0ed2e47e2e9b3f SHA512 230e5812242cdad9baf0c3fd8a9cc0ef17cc52e8c2d120988da84d9097cc63fb809547afdfcd17a3506fbf3e9c96eb9fd5e149ee90645ef9098a085318be3cf1
 EBUILD jetbrains-annotations-24.1.0.ebuild 630 BLAKE2B c15408b095dfcc353df6c8a97dea6ba0e1ebde658675dfaad1d33176651743e3e762bc5c41d5068efa39b38c2476fa3111008c725de46093a6ea5c1733bb805d SHA512 f68ce6114d0b2dcdc77bfe1ca5128c256508515c6d094a7b0ba7c46010e9b3f7c77d34f70271255e1b6fc3034d0e8495a79f7275dc660b27ecef9bcebd5f4bb0
+EBUILD jetbrains-annotations-26.0.1.ebuild 619 BLAKE2B e69de79d160f0a041a29db8f08ab8fc407e54a54e4d75b041213c0339af39856fa9d064b3d92cedb67057bd05901718cc86f641ba9ac208650481e80eb66ec56 SHA512 934c57d3ed2bbc5ff0ba82aa878df7e1f091fd8c06d5630c32e4e4c67428801b03d035ceb1fcaa011df038ff14431839972ec97e659f5f7358ed7cc660e581d4
 MISC metadata.xml 308 BLAKE2B 66accc35b2da2b99b17d16d970773799227fcf57177caf19a258a3a7aac3bf107e63b472f61bfe4dc869f84634f032659fb8049a4e21c164533f988e437897f4 SHA512 2f6c2852f8cc5283186c8dd317265f80400b112eea45a1d8256f6abdd59448cca2cff8516c40922eddc52c98c30307b804139e454cb2e3ae8b84a7a12bca7dd0
diff --git a/dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild b/dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild
new file mode 100644
index 000000000000..596a02691f70
--- /dev/null
+++ b/dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.jetbrains:annotations:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for JVM-based languages"
+HOMEPAGE="https://github.com/JetBrains/java-annotations"
+SRC_URI="https://github.com/JetBrains/java-annotations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/jetbrains/java}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR=( src/jvmMain/{java,moduleInfo} )
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index b41195e72626..a8d98704526f 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,9 +1,6 @@
-AUX protobuf-java-3.23.0-unittest_retention.proto.patch 2122 BLAKE2B b7c7297efaf11291809c46452291419482775e9cca712e000d8a1a604c01fe1bd1df3d076c56154c37ec6d32731a9384bcce1deb23b06dcaa26e0a00b4438160 SHA512 18e9da72f5fca6f1585836c37a3040c43c1db84f617f78ad91d642e9db2811953e30e8a676011ddb5e2c273698527c89487606c0428cfdcbb7c3e7d6d782832f
-DIST protobuf-25.3.tar.gz 5878962 BLAKE2B 9268f9bd993a1cfd6d3937a2ad56ba4cfe3d84923756513841cbf13039d4a07acb260468745cb1294f30334cb34b45c6fde272f5c40d9de63ac6a4ce5c263077 SHA512 1f73e237c919082e5423ae9e2ea8813dccf672c059051d1531fe89ffaa45872d3cf3052b8c3af26f674296ec17d7dc861c67b8f0834ed80261ce4a6a14ed7115
 DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397
 DIST protobuf-28.1.tar.gz 9258233 BLAKE2B 908dd074cc4ef632efdf123fdc76e6d78fd0db13d580584f00fd6afd3b5e1b6d3b6b52e49c528d4095905c802dcf0f391b01d2edf872738ed11a70c1123258a9 SHA512 769ef61206e39336d93df786a25c08cdf1acb12f2f5818ae31afb268aad8b02076eeba15c41c68aadbf140c6e1653c0aaefc2a637278c7695ded1b5d72888d81
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
-EBUILD protobuf-java-3.25.3.ebuild 5064 BLAKE2B b861ad7ab1e4e9fab98d4133779b671473fafe1570f5551f343b81d7185d31ccd99635270e0b41cd155d5b4ac0f353e74606be2c91fe70354ff949acfb950c19 SHA512 e817349fcbeb0b864e5622e9fc9ef7432a813fcbe94a3f904ef6c2481e0e963a7a98b8bfb7ae3d1a82b12bacb9bb8839b83e3500818b86b9ab83c47d7842fe25
 EBUILD protobuf-java-4.27.2.ebuild 5031 BLAKE2B 500a0fa2b0de21721c4324747625168745606de0d7806b8e87534a0a0c9fe8df3a27f04b2ea759fcb43d6374f82803412941f3293beb90b6ee191376ab23a4fd SHA512 3ea3b35c3e843223b01b6e6903cd0a568f521067e347bf1b2bfd33f704c1dc519c31969074deac9ef04efcd68bf5afcc2daa676335b437eaf44b9d765e8f3982
 EBUILD protobuf-java-4.28.1.ebuild 5019 BLAKE2B 79794705a568b5c8a6fdef7abc02bf32ff4b4c82fd99b34fccc505116c16e8ec98e4f989300747280109f17ac7da8e70a19a7c2052f1cac3be4aa0e9b7acb518 SHA512 915cf81eda655d576e0d3ed4397b83f277bf899bf36326cf2566b26fc8621fc2349e56b6575debaf4664358f54f252cede6d3738549252212c37225d39e4df2a
 MISC metadata.xml 534 BLAKE2B aa3ede54aa4e1479f977cecb9dace36fa5db7025a5d45d142cde5ea2ede794f721abf0ced139b24d4c2c1aac3631ee43f15b4d74850abc56c1fbafb8736adebc SHA512 11f7b1fca223910cd42be952760e32d98a553fd660e1da66542a722eb1e3296c79e702f899dc36ab0e794a19014ede3738fc0959b04a9d44910e9e0068f3feb7
diff --git a/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch b/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch
deleted file mode 100644
index c838bf3cede2..000000000000
--- a/dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:68: error: cannot find symbol
-import protobuf_unittest.UnittestRetention;
-                        ^
-  symbol:   class UnittestRetention
-  location: package protobuf_unittest
-java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:402: error: cannot find symbol
-    FileOptions options = UnittestRetention.getDescriptor().getOptions();
-                          ^
-  symbol:   variable UnittestRetention
-  location: class DescriptorsTest
-java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:403: error: cannot find symbol
-    assertThat(options.hasExtension(UnittestRetention.plainOption)).isTrue();
-                                    ^
-  symbol:   variable UnittestRetention
-  location: class DescriptorsTest
-java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:404: error: cannot find symbol
-    assertThat(options.hasExtension(UnittestRetention.runtimeRetentionOption)).isTrue();
-                                    ^
-  symbol:   variable UnittestRetention
-  location: class DescriptorsTest
-java/core/src/test/java/com/google/protobuf/DescriptorsTest.java:405: error: cannot find symbol
-    assertThat(options.hasExtension(UnittestRetention.sourceRetentionOption)).isFalse();
-                                    ^
-  symbol:   variable UnittestRetention
-  location: class DescriptorsTest
---- a/java/core/generate-test-sources-build.xml
-+++ b/java/core/generate-test-sources-build.xml
-@@ -19,6 +19,7 @@
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_optimize_for.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3_optional.proto"/>
-+        <arg value="${protobuf.source.dir}/google/protobuf/unittest_retention.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_well_known_types.proto"/>
-         <arg value="${test.proto.dir}/com/google/protobuf/any_test.proto"/>
-         <arg value="${test.proto.dir}/com/google/protobuf/cached_field_size_test.proto"/>
diff --git a/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild
deleted file mode 100644
index 95aa1c28a226..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 2008-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.google.protobuf:protobuf-java:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple cmake
-
-DESCRIPTION="Core Protocol Buffers library"
-HOMEPAGE="https://protobuf.dev"
-# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 3.25.3 from the 25.3 tarball in order to allow sharing the tarball with
-# dev-libs/protobuf.
-MY_PV3="${PV#3.}"
-MY_PV="${MY_PV3/_rc/-rc}"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz
-	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
-S="${WORKDIR}/protobuf-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="system-protoc"
-
-BDEPEND="
-	system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 )
-	!system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava:0
-		dev-java/mockito:4
-	)
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-PATCHES=(
-	"${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
-JAVA_JAR_FILENAME="protobuf.jar"
-JAVA_RESOURCE_DIRS="java/core/src/main/resources"
-JAVA_SRC_DIR="java/core/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
-JAVA_TEST_SRC_DIR="java/core/src/test/java"
-
-run-protoc() {
-	if use system-protoc; then
-		protoc $1
-	else
-		"${BUILD_DIR}"/protoc $1
-	fi
-}
-
-src_prepare() {
-	# If the corrsponding version of system-protoc is not available we build protoc locally
-	if use system-protoc; then
-		default # apply patches
-	else
-		cmake_src_prepare
-	fi
-	java-pkg-2_src_prepare
-
-	mkdir "${JAVA_RESOURCE_DIRS}" || die
-	# https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/pom.xml#L43-L62
-	PROTOS=(  $(sed \
-		-n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \
-		"${S}/java/core/pom.xml") ) || die
-	pushd src > /dev/null || die
-		cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die
-	popd > /dev/null || die
-
-	# https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/generate-sources-build.xml
-	einfo "Replace variables in generate-sources-build.xml"
-	sed \
-		-e 's:${generated.sources.dir}:java/core/src/main/java:' \
-		-e 's:${protobuf.source.dir}:src:' \
-		-e 's:^.*value="::' -e 's:\"/>::' \
-		-e '/project\|echo\|mkdir\|exec/d' \
-		-i java/core/generate-sources-build.xml || die "sed to sources failed"
-
-	# https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/generate-test-sources-build.xml
-	einfo "Replace variables in generate-test-sources-build.xml"
-	sed \
-		-e 's:${generated.testsources.dir}:java/core/src/test/java:' \
-		-e 's:${protobuf.source.dir}:src:' \
-		-e 's:${test.proto.dir}:java/core/src/test/proto:' \
-		-e 's:^.*value="::' -e 's:\"/>::' \
-		-e '/project\|mkdir\|exec\|Also generate/d' \
-		-i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
-
-	# Split the file in two parts, one for each run-protoc call
-	awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
-		java/core/generate-test-sources-build.xml || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Dprotobuf_BUILD_TESTS=OFF
-		-Dprotobuf_ABSL_PROVIDER=package
-	)
-	if use system-protoc; then
-		:
-	else
-		cmake_src_configure
-	fi
-}
-
-src_compile() {
-	if use system-protoc; then
-		:
-	else
-		cmake_src_compile
-	fi
-
-	einfo "Run protoc to generate sources"
-	run-protoc \
-		@java/core/generate-sources-build.xml \
-		|| die "protoc sources failed"
-
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	# https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/pom.xml#L63-L71
-	jar cvf testdata.jar \
-		-C src google/protobuf/testdata/golden_message_oneof_implemented \
-		-C src google/protobuf/testdata/golden_packed_fields_message || die
-
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
-
-	einfo "Running protoc on first part of generate-test-sources-build.xml"
-	run-protoc @test-sources-build-1 \
-		|| die "run-protoc test-sources-build-1 failed"
-
-	einfo "Running protoc on second part of generate-test-sources-build.xml"
-	run-protoc @test-sources-build-2 \
-		|| die "run-protoc test-sources-build-2 failed"
-
-	einfo "Running tests"
-	# Invalid test class 'map_test.MapInitializationOrderTest':
-	# 1. Test class should have exactly one public constructor
-	# Invalid test class 'protobuf_unittest.CachedFieldSizeTest':
-	# 1. Test class should have exactly one public constructor
-	pushd "${JAVA_TEST_SRC_DIR}" || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-path "**/*Test.java" \
-			! -path "**/Abstract*Test.java" \
-			! -name "MapInitializationOrderTest.java" \
-			! -path '*protobuf_unittest/CachedFieldSizeTest.java'
-			)
-	popd
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-}