gentoo auto-resync : 07:02:2025 - 00:11:15

17 files changed, 106 insertions, 342 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 697d58acebb6..1bd756bac394 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index 64f2ebbebd3c..8ee603cd0db3 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1,4 +1,3 @@
 DIST cglib-RELEASE_3_3_0.tar.gz 151490 BLAKE2B d7ca4cc9ea6dad9f7a827c784ad13f93e8f31c817c5a0182a86b2ba759ccd3dfbec88d5178507599cd08a97a1ef13ba4880cab016b68b92dda3358bfb0a751c0 SHA512 635dcdb10a8fe83887a1dc8cf12844fe61b73a12fb530bf84d6ac53f75b0103820d76518cbc0d93d63dba86d13929f0df4dbae3b4943a402cf9f2af76f44161a
-EBUILD cglib-3.3.0-r2.ebuild 2048 BLAKE2B 6839bbf7f1b555a264f67465fa60336a07d8d61e4b300873154d0574e42957a0572c0b0b1ea75abda081f5bb6ba7fb92e036545969cfa39e7979e23ddf567a5d SHA512 e6ee4ff8bf63a7d2c20ed7a9d6ccb69ce46c093e2806d890a11cdbb7a0f42edbb93132df3fbd74f506c2dce185c92d5a229b7e66535f5cd8d4f12ac825c77d02
 EBUILD cglib-3.3.0-r3.ebuild 2066 BLAKE2B 6daf9a5400894bcb073c938e52265db42f3a113ff204e016068c27a71dfbd9657bdd5babe724980c331e806f74f0196573feed04a432cbad6bae0c27cef9c78f SHA512 aaf5df36b7d47fdc9691b97be0b7bd99380933498c98e2a29aae7ce949829dc77ca37dc3f442c95d4225d9a6960d67e62aa11b62c935533ca405604557e4e28d
 MISC metadata.xml 663 BLAKE2B b64f3da3e4d1dd5ac67867d982f124244f81c03e91b5d7140ee1b16a0fd0250751d41debf9a228150569b7e750929942d011afb0872e3e5098e6106639e0ee3b SHA512 d05d3d71c2511c289c2d1cd4ba638cdc488ee5ea5a8a0da8145929befb41c3efa64f672f12584974239039536c68051f7665730221364ffd20fb8f301672db42
diff --git a/dev-java/cglib/cglib-3.3.0-r2.ebuild b/dev-java/cglib/cglib-3.3.0-r2.ebuild
deleted file mode 100644
index cb4cacd8a66b..000000000000
--- a/dev-java/cglib/cglib-3.3.0-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# doc USE flag is not in IUSE as the docs does not compile because of errors
-JAVA_PKG_IUSE="examples source test"
-MAVEN_ID="cglib:cglib:3.3.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PV=RELEASE_${PV//./_}
-MY_P=cglib-${MY_PV}
-
-DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
-HOMEPAGE="https://github.com/cglib/cglib"
-SRC_URI="https://github.com/cglib/cglib/archive//${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
-	>=dev-java/ant-1.10.14-r3:0
-	dev-java/asm:9
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-JAVA_SRC_DIR="${MY_P}/${PN}/src/main/java"
-JAVA_RESOURCE_DIRS="${MY_P}/${PN}/src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="${MY_P}/${PN}/src/test/java"
-JAVA_TEST_EXCLUDES=(
-	"net.sf.cglib.CodeGenTestCase"		# not a test class
-	"net.sf.cglib.TestAll"
-	"net.sf.cglib.TestGenerator"		# not a test class
-	"net.sf.cglib.proxy.TestEnhancer"	# broken tests
-	"net.sf.cglib.proxy.TestInterceptor"	# not a test class
-	"net.sf.cglib.reflect.TestFastClass"	# broken tests
-)
-
-src_test() {
-	# Caused by: net.sf.cglib.core.CodeGenerationException:
-	# java.lang.reflect.InaccessibleObjectException-->Unable to make protected final java.lang.Class
-	# java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain)
-	# throws java.lang.ClassFormatError accessible: \
-	# module java.base does not "opens java.lang" to unnamed module @42bb2aee
-
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge "17" ; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
-	fi
-
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	use examples && java-pkg_doexamples --subdir samples ${MY_P}/cglib-sample/src/main/java
-}
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
index 5ec339d1c112..6c135779c2c2 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -1,5 +1,5 @@
 DIST commons-digester-2.1-src.tar.gz 304060 BLAKE2B 2360f6f8ab77b20ad6b4058e0437aa792bf3886ddec2e09b6db259bc142c070965ce066ef224e92fb91614075631a2af1358ae4b4fc065fe9118e1d2559bb9bb SHA512 6bdb63431ed1e17f5e8ba24951762750a0e59b70c76eabecbf13f5fe6974864825456beed615c8f2c16f9a2f1404f2e56bdbc3ba335656c3661d5f368c708b88
 DIST commons-digester-3.2.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
 EBUILD commons-digester-2.1-r2.ebuild 1971 BLAKE2B 3ca0d54794623343c908ede4a10e56c54fcb23908111077e80c3d2142f1f9e0aac3b07d3ce27d5fb869cfa52e5c5c99d3fcb20cb557e0767edc2afd8398178c0 SHA512 234cf84cfa9758f470e8f5dc9c991627f752ec12028db99290f9cdb7efca4c33066200f70becff250ec081230613fcc25b5ab110820233b81ef3df9f22fdf25f
-EBUILD commons-digester-3.2-r3.ebuild 2377 BLAKE2B bf571ae3508a95abfa531ea561e20297c6a87e8a2f4f2be4c31d68077bd2e74f44e96362cf5477791ff42c3887cf1a77bdf2e5c451739857a1be599251839d22 SHA512 cb60aea9c7597ec7b5233787ffdf6fc4fa12f7950d99d83434e67215480e41b8eea81f32c866d18743da14bbcfa267b9ee28361779bf4d7192bb0365cfba8363
+EBUILD commons-digester-3.2-r4.ebuild 1803 BLAKE2B cebc2f164709e83de2751e71945df4662c7e13a59f41da3ddcbfbccbad2a01c26419937d41539d947d2888b91e901946b845cc2dccbe7457c6be183cdd7df79d SHA512 fabca523606502cd572a634883d72e9686eaa5b1e0bd097c65877d69e69bf401b5c10e191ec2819f80ad5e918f02ee7b338a27c36af787d2fa259356b020bf46
 MISC metadata.xml 482 BLAKE2B 2c8b9ab044dd5e95d9f17fcb0e284c7d8ed87727fa891bc6c15414b8db928346e8af71222bb3e6daec5ce682cfe72c7f315aa55d1dd5d55531554ab7d4ddc863 SHA512 31bd4dd9999a412986ac2dcc5cccffd7dd1f36ce8bf148f93dd35115da003c2663a0f5994a3e2a44ad537c26ee534294c80697f986737c02f434b3646e8f7c40
diff --git a/dev-java/commons-digester/commons-digester-3.2-r3.ebuild b/dev-java/commons-digester/commons-digester-3.2-r4.ebuild
index 30428563c87c..cce136b3888f 100644
--- a/dev-java/commons-digester/commons-digester-3.2-r3.ebuild
+++ b/dev-java/commons-digester/commons-digester-3.2-r4.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz --slot 3.2 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-digester3.2-r3.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
@@ -15,9 +12,10 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
 HOMEPAGE="https://commons.apache.org/digester/"
 SRC_URI="mirror://apache/commons/digester/source/${PN}3-${PV}-src.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/commons-digester3-${PV}-src"
 
 LICENSE="Apache-2.0"
-SLOT="3.2"
+SLOT="0"
 KEYWORDS="amd64 ppc64"
 
 # 1) atomWithNamespaceParse(org.apache.commons.digester3.xmlrules.SetNamespaceURITestCase)
@@ -25,53 +23,46 @@ KEYWORDS="amd64 ppc64"
 PROPERTIES="test_network"
 RESTRICT="test"
 
-# Common dependencies
-# POM: pom.xml
-# cglib:cglib:2.2.2 -> >=dev-java/cglib-3.3.0:3
-# commons-beanutils:commons-beanutils:1.8.3 -> >=dev-java/commons-beanutils-1.9.4:1.7
-# commons-logging:commons-logging:1.1.1 -> >=dev-java/commons-logging-1.2:0
-
 CP_DEPEND="
-	>=dev-java/cglib-3.3.0:3
+	>=dev-java/cglib-3.3.0-r3:0
 	>=dev-java/commons-beanutils-1.9.4:1.7
 	>=dev-java/commons-logging-1.2:0
 "
 
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt )
-
-S="${WORKDIR}/commons-digester3-${PV}-src"
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
 
-JAVA_ENCODING="iso-8859-1"
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
 
-JAVA_SRC_DIR="src/main/java"
+DOCS=( {NOTICE,RELEASE-NOTES}.txt )
 JAVA_RESOURCE_DIRS="src/main/resources"
-
+JAVA_SRC_DIR="src/main/java"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
 
 src_test() {
 	pushd src/test/java || die
 		# Exclusions according to 226,229 pom.xml
-		local JAVA_TEST_RUN_ONLY=$(find * -name "*TestCase.java" ! -name "Abstract*.java" ! -name "TestBean.java" ! -name "TestRule.java" ! -name "TestRuleSet.java")
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-name "*TestCase.java" \
+			! -name "Abstract*.java" \
+			! -name "TestBean.java" \
+			! -name "TestRule.java" \
+			! -name "TestRuleSet.java")
 		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
 		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
 	popd
 
-	# Testing with java-17 throws too many test failures
 	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" != "17" ]] ; then
-		java-pkg-simple_src_test
+	if ver_test "${vm_version}" -ge "17" ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
 	fi
-}
 
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
+	java-pkg-simple_src_test
 }
diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index 8407f5be8f91..c13c7d5e28b4 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -4,6 +4,5 @@ AUX easymock-2.5.5-tests2nameClash.patch 16138 BLAKE2B 8d93149e3415c315a98a82cab
 DIST easymock-2.5.2.tar.gz 100112 BLAKE2B 2952aad1a88b169413152e8fa63eaba85767d93ccd8535e309cb647b90ad86695da59c394d1199abfb6f1c624913b2546f326ae5a68092261968d734d2018c5c SHA512 0343815f74258739ac60e1ef2fe72a0e9ce0e1b6ecd4f14d657d7da2a10523e24df5160533b0d75e87ffa0322a3477ec6823b257fe5968929d55dee9dfa68267
 DIST easymock-3.3.1.tar.gz 624460 BLAKE2B bb5a472aef6c162d3afe5b66edef4891cc48fe6698c1f1eccc7f45f1883ff7f940b0479af5c0dd61b3354b41225ca50f191ba54b92479362a0074ddf3dbb5b43 SHA512 93fefd458a42b6c13d85ab1df768bf906620f052eea88116e93578374a5086eb8b27d8731e82b689dc3d73699e45d03b718c7d8bf2a430ac4a6a717365e52a9a
 EBUILD easymock-2.5.2.ebuild 1850 BLAKE2B a9d5226b7203347663927d4f1eca49f17d1a562830681bf33a7f0742573d7c30ac453e439a86ee1e93aa60eb3c6d3342670622ca2e04d2fa0d0359b6e219a80a SHA512 d590a0c1faa87b399c8af0f7ed6c971954f381025d0417a044d097cf8ae732e7a6753bdf1517525ceaa199b2933a85e6bb4a977c80b0272646976709c208f3fb
-EBUILD easymock-3.3.1-r1.ebuild 1970 BLAKE2B 86e095f41338259679cc8b10f60e7cd256182b282c3e1e61b5eb7a5bb7a695962bc499d374b899947a58d60d11ad4cf7f8f560d4408f5f850b67f1ad3d351b82 SHA512 52b2f89129561060c6752b9f067bf18f021a9968fc67a93bcb04e203f9fe19cca8f4a500f867ab823cb0499e297b1425d375a0e925d499fd5bf980f0130ea537
 EBUILD easymock-3.3.1-r2.ebuild 1978 BLAKE2B bfd493acbae85c10b423a64923370dac62512436fba508758cee6bf0198413d8c0fac18c96dc7fd9a00bab3ee80240cedf83a88d0631b00b82d9446a3d42ce1a SHA512 96bac1a414493b022aa32525b3b0f0c75500650eef04e67c549a63445d3dd516047e27cb0a163e55da3fb1d17181249dda48df047ccda1bb7b4342d47526cae7
 MISC metadata.xml 487 BLAKE2B a24b4adf994d9fe7aa7db824ee499c476d971c7d4265a6a502644d0dd498e87bbecf1b50fa3a0b53a27e1b7d9e91a1c67bafaa783d173435228f0c36a740df12 SHA512 dba708a8b66d470df4378efc4e0ceba8bd896132f3d086f7751ca9409a47e04a24fc5f98255264b44711efd960810bf491c657975acec72bfb863ba603bc64ee
diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild
deleted file mode 100644
index 0e51e3cce151..000000000000
--- a/dev-java/easymock/easymock-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,71 +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="org.easymock:easymock:3.3.1"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Mock Objects for interfaces in JUnit tests by generating them on the fly"
-HOMEPAGE="https://easymock.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="amd64 arm64 ppc64"
-
-CDEPEND="
-	dev-java/cglib:3
-	dev-java/junit:4
-	dev-java/objenesis:0
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-JAVA_GENTOO_CLASSPATH="cglib-3,junit-4,objenesis"
-JAVA_SRC_DIR=(
-	"${PN}/src/main/java"
-	"${PN}/src/samples/java"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="${PN}/src/test/java"
-JAVA_TEST_EXCLUDES=(
-	"org.easymock.tests2.EasyMockAnnotationsTest" # "java.lang.InstantiationException" (12 x)
-	"org.easymock.tests.BaseEasyMockRunnerTest" # No runnable methods
-)
-
-src_prepare() {
-	default
-	# error: package com.google.dexmaker.stock does not exist
-	eapply "${FILESDIR}"/3.3.1-r1-no-android.patch
-	rm easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java || die
-	# cannot find symbol   o = ProxyBuilder.forClass(ArrayList.class)
-	rm easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java || die
-}
-
-src_test() {
-	# ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain) throws
-	# java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @66da75e4
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge 17; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
-	fi
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index acac7ee8c18d..d452827fb7b8 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,6 +1,8 @@
 DIST mysql-connector-j-9.1.0.tar.gz 4485702 BLAKE2B f382d58f559c6ec10899e32d4370e817f07561b294c1a173856df98a088a3e981952ac117ec3cc0946b8ef43a68eb52880ba45d9bb23b393b8a00a6999d52176 SHA512 042aa06fc5fb84d33b8308731371a29199a68bac5ae0866729fb2881f1bd4f41141f355c56c24764f2084059d99da56d9bba35d6ce3b48d9286bd1294d84ac02
+DIST mysql-connector-j-9.2.0.tar.gz 4502257 BLAKE2B 00c2bddf27f090236ce67bbd31b746d9d16c25aca27257005bbbb02430574d2b9e25eb597cb5948e6bb8b00bf5b2e564a44e7f072763816914c2c76bdfc80a1a SHA512 31a32cbb026932c3ec08c5a6f24643db084b3bf43d28e11b94bbccb5478b66f69322819dd611daa7b2ba0b705fba00d3a7ba2ce6d96f023cf4e2b0ae4457ba6a
 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-9.1.0.ebuild 2150 BLAKE2B d7f6efcca1076ebaeeb4f1554e6bb9a20413d53328117d79b06ef5a93c3fe845c18964f51fdd145877a0c67886b70dc0f0d1dd0b7f040601dce3e78a029c8a51 SHA512 6f2b2e86ed181455fa57bcb5cd90ba2d57d789753fe3f0665156cdf94ac2bca6b0899062f519ad8d094f0568d3c70d90960f04db9b1972e60ea32aef2c5a03f3
+EBUILD jdbc-mysql-9.2.0.ebuild 2159 BLAKE2B b1c6e51ab83409ec7a4de6426414557b4bff17afaab13fd51fac6021839d81b9d826ec6f65fe32fadc699bc20c9a67c6514ae05d1e9200b314086dd51c66ffe9 SHA512 4393471743ac2ceb7740de68b89bd65e082de4874ca7520ea232a543a91dbcef03ea9053dc9300ab678d56950d40023d918283dffb7e3b5e54d044f4634dafcf
 MISC metadata.xml 325 BLAKE2B e1c3ff68e092bb0e4cd63ed17da632f053f938e8e119a3b5f9a68a3961aac6c1df48a03e281583c22e881576ac9c50b405f0a6b40323bd85a183541a02792a05 SHA512 f855f395f2cc16667e5c524b63c409f754e399d657e50e7aeaebaa99af850480e271a890460a313b8be3c5a66d3e51d26dd2ceaade8828ce3d700232b892fca8
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-9.2.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-9.2.0.ebuild
new file mode 100644
index 000000000000..6286f05c36fa
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-9.2.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No tests, see bug #902723
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.mysql:mysql-connector-j:9.1.0"
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+# Bundling binary versions of oci-java-sdk-common and opentelemetry
+# https://github.com/oracle/oci-java-sdk/blob/v2.47.0/bmc-common/pom.xml
+OSC="3.29.0"
+OAV="1.40.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
+	https://repo1.maven.org/maven2/io/opentelemetry/opentelemetry-context/${OAV}/opentelemetry-context-${OAV}.jar
+	https://repo1.maven.org/maven2/io/opentelemetry/opentelemetry-api/${OAV}/opentelemetry-api-${OAV}.jar"
+
+S="${WORKDIR}/mysql-connector-j-${PV}"
+
+LICENSE="GPL-2-with-MySQL-FLOSS-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+CP_DEPEND="
+	dev-java/c3p0:0
+	>=dev-java/protobuf-java-4.27.2:0
+	dev-java/slf4j-api:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( CHANGES README )
+
+JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/oci-java-sdk-common-${OSC}.jar"
+JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/opentelemetry-context-${OAV}.jar"
+JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/opentelemetry-api-${OAV}.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"
+)
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_newjar "${DISTDIR}/oci-java-sdk-common-${OSC}.jar" oci-java-sdk-common.jar
+	java-pkg_newjar "${DISTDIR}/opentelemetry-context-${OAV}.jar" opentelemetry-context.jar
+	java-pkg_newjar "${DISTDIR}/opentelemetry-api-${OAV}.jar" opentelemetry-api.jar
+	java-pkg_regjar "${ED}/usr/share/jdbc-mysql/lib/oci-java-sdk-common.jar"
+}
diff --git a/dev-java/json-smart/Manifest b/dev-java/json-smart/Manifest
index 2eb5152483d7..607978d75d56 100644
--- a/dev-java/json-smart/Manifest
+++ b/dev-java/json-smart/Manifest
@@ -1,7 +1,5 @@
 DIST json-smart-1.3.3.tar.gz 49430 BLAKE2B 805e16e0de5321a2e8164468757e9b722849f0fe90fd6822cc99f7afffd9f4e480fc4e14c2bbd12b325a27abc8ca7e93b4a17ce56ac352117cef336e1ebb3fe9 SHA512 c6006c6a00a085ea8810e18889450d11240dc3671351f20602214db418107808df1f413fe67c199d6529e4c0087f2533601826666ac4fa493bcaf72d2c18ed83
-DIST json-smart-2.5.0.tar.gz 88839 BLAKE2B 25760bd9c9ddecfef2fc3e60fc28b83def2223c7fc1e52ef39b3e6d01e5f2f29f36a35bfd43fc4d6ce6d5df5fcb25f59b1c86e1864a3044c69a6d0010335280b SHA512 4bffadf68998da4b63b34bcc9dbf804fd2b21b8d9514de4e155127d5a2eb3db74c7e396959b54c61c08e169eeed85dff3ad2f1d899cfddca53e501c45cebae21
 DIST json-smart-2.5.1.tar.gz 91171 BLAKE2B 21e83eadb15dbaa43ebe1fc9a5fd9500d4d233571dc4b65f417d7179630fde8a47e44cb652b2f598a2a6f46569876e8cac4769752dd4db179dc01b274514ef02 SHA512 00454e1debcebe009300a8f5d53b24b5c1917d173c9f3b98278236b52584631ab0e8bbf18c193f181e77537fb335b5bb31c1978918dc4f6e0ca82c44adb6797b
 EBUILD json-smart-1.3.3.ebuild 667 BLAKE2B 7c6299b11320c7095c955411b7c1264c88ccfec04a58e0c44d4ece8b149cbc847d7713214b5b91da27c102d8246d3be447b75f11588f61368bf725756f2b554d SHA512 c9667f022d0fa9d2164a9f5823763e84e412d200f09ca075f63ae0038cdf4726d4f0e1b6f3e6b62677d4f0a27e0ea3f1fc921b13c51fedbfb5dd8f80fa6cbdfd
-EBUILD json-smart-2.5.0.ebuild 1622 BLAKE2B 0548fe28848155e798ae793d1b55f628a360d8712891c08318bdcbce27a2bd00186bc95290be0c8c29ced3d3b3a9946b2a1fcff38cf9e3f43ec46eff431e6361 SHA512 13c7c1e183a0d8d46949e1dc328f9aa2292a22f8b4d9c6ca6a97a8c1e2980225a0a53fd2f00cc1dee9cf758bd51da37368173c3647326d489ad1145ea2b072d1
 EBUILD json-smart-2.5.1.ebuild 1547 BLAKE2B 8e876225cf74902d8f6ff6b331c249912eb72dd0806bdea09561fb64fe83ad76d6d3d46f1f6fd34938fcee64d5545b363b184d5e05ebb04c6d978af8c8f96c23 SHA512 2473b362fcd8e952a075516c8f1bf38279b94a26d56f80557b659671089c39c36b6b1de11f4372352851866393118baeb09516b7eec19343e5aaa43047f3d873
 MISC metadata.xml 642 BLAKE2B c365803a643b02f870ff0658d1184c227a243f1d9801ddfa9f5c487412f390a4714b75f461ad5b4acf589da5f0201df19e10126c5ccd2a2685c77edd5c774765 SHA512 f28271bf046bdcec40f7c8fa824d8eaf0d222c082412c08f9e9f3a766769d8c5c29e32cb4136f0722ae4400ce9fbf28776880c0d10903ccabe2a1d6953cee3ac
diff --git a/dev-java/json-smart/json-smart-2.5.0.ebuild b/dev-java/json-smart/json-smart-2.5.0.ebuild
deleted file mode 100644
index ddc968a2a7b6..000000000000
--- a/dev-java/json-smart/json-smart-2.5.0.ebuild
+++ /dev/null
@@ -1,71 +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_PROVIDES="
-	net.minidev:accessors-smart:${PV}
-	net.minidev:json-smart:${PV}
-"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JSON Small and Fast Parser"
-HOMEPAGE="https://urielch.github.io"
-SRC_URI="https://github.com/netplex/json-smart-v2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-v2-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="test" #839681
-
-DEPEND="
-	dev-java/asm:9
-	>=virtual/jdk-1.8:*
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-src_compile() {
-	einfo "Compiling accessors-smart.jar"
-	JAVA_CLASSPATH_EXTRA="asm-9"
-	JAVA_JAR_FILENAME="accessors-smart.jar"
-	JAVA_SRC_DIR="accessors-smart/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":accessors-smart.jar"
-	rm -r target || die
-
-	einfo "Compiling json-smart.jar"
-	JAVA_JAR_FILENAME="json-smart.jar"
-	JAVA_SRC_DIR="json-smart/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":json-smart.jar"
-	rm -r target || die
-
-	if use doc; then
-		einfo "Compiling javadocs"
-		JAVA_SRC_DIR=(
-			accessors-smart/src/main/java
-			json-smart/src/main/java
-		)
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_install() {
-	einstalldocs
-	java-pkg_dojar "accessors-smart.jar"
-	java-pkg_dojar "json-smart.jar"
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-
-	if use source; then
-		java-pkg_dosrc "accessors-smart/src/main/java/*"
-		java-pkg_dosrc "json-smart/src/main/java/*"
-	fi
-}
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index c78fc8526db4..86460aa67e88 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,6 +1,4 @@
-DIST json-20240303.tar.gz 245665 BLAKE2B 3462398895ab6da9610dac8851f2aa4528359e255015fd59a160fe99443819fa5bb57eb30ce177238d06abe95aaae9847cc85e4eee59c90edf7732bd823d9b89 SHA512 22465216eca7e4721aacca7b519d0bf1b0fe20b2de68ef0b6c62feae811e11203bfc733d8e9c97e2aa5b6ed30c74eefc601025b31807e51d496666412516afc9
 DIST json-20241224.tar.gz 260438 BLAKE2B a531f8009cada5bbb9cd7207ce20ed1b1d358bc6533b9678a7845c31714351bac3406fd85663bf7e3fcc9cf4249221a6a5599b1d841a82e924f594ae6a46e848 SHA512 d487201c20c4c36714a944297fd0a175006ddc742e077bbb2a0e541c8b52fafc0169bc984e5a5f085e580e5a770fa30f0588c2f15ad761f6afae22134b544797
 DIST json-path-2.9.0.jar 276633 BLAKE2B bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862 SHA512 9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a
-EBUILD json-20240303.ebuild 1792 BLAKE2B b036e49be8f779de191692dc971693e37df8ccb47bee2ce6f05cfbd567cd9eaca4354a373b0d73b21ca01e624e3d0cf9417d261eaeb98018df25fc61f2940c31 SHA512 5cfbbbcf88c2e4ec5dc745a89dd3ec6c3821a9ad72a81764234dac6b902c6efc5e01f4ffcadfb9a0b0118cdbe4d66c93f742b8f58fe9259b2543b180f36cc072
 EBUILD json-20241224.ebuild 1787 BLAKE2B cf107a0c7380f0f12056736804cf697588ded75b2b71825b2e23048255a56064d5a87eb1c30fd5cd900eeb00d536ca1e282cd8bb2f67a84ceeab1d231578f497 SHA512 7d47ca69a3b642ae75c1f083f1c5f18ef255d88d26a0e0d216411afffbc04f3a650804af28a1e42733f8e342f25b249f0cf61b60136908d8f7675aa4c0c2154c
 MISC metadata.xml 1083 BLAKE2B 9dfa3392b02d2bb6ae3198a884c154a52926de81aead27309fd0bbe25011a1b0ea89c0c7fa3694c56fee4cb339c2fd161384c9d7c780369cc3da4464d3abd40a SHA512 3d0f231f0e67e178f838474e6aa07e88dffc26e26261a49515124c3e68120d323cc1a790be017b082af8f27dd051121750c1e1829e7a2fc2714821caf9a8802b
diff --git a/dev-java/json/json-20240303.ebuild b/dev-java/json/json-20240303.ebuild
deleted file mode 100644
index b039a3797e52..000000000000
--- a/dev-java/json/json-20240303.ebuild
+++ /dev/null
@@ -1,81 +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="org.json:json:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple check-reqs
-
-DESCRIPTION="A reference implementation of a JSON package in Java"
-HOMEPAGE="https://github.com/stleary/JSON-java"
-JPV="2.9.0"
-SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz
-	test? (
-		https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar
-	)"
-S="${WORKDIR}/JSON-java-${PV}"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/asm:9
-		dev-java/json-smart:2
-		dev-java/mockito:4
-		dev-java/slf4j-api:0
-	)
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,README,SECURITY}.md )
-
-JAVA_AUTOMATIC_MODULE_NAME="org.json"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="
-	asm-9
-	json-smart-2
-	junit-4
-	mockito-4
-	slf4j-api
-"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-check_env() {
-	if use test; then
-		# this is needed only for tests
-		CHECKREQS_MEMORY="2048M"
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_env
-}
-
-pkg_setup() {
-	check_env
-	java-pkg-2_pkg_setup
-}
-
-src_test() {
-	# setting Xms for bug #930723
-	# gradlew: DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"
-	JAVA_TEST_EXTRA_ARGS=" -Xmx${CHECKREQS_MEMORY}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency
-
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge 17; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
-	fi
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index f9e1b88d8b08..a6b0b112f796 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,11 +1,11 @@
 AUX openjdk-bin-8.env.sh 607 BLAKE2B 447575fc213003930ba6d6bbbd7cda0d53f53b16e3679fcb13d219cccf3525c7dfda755c79826b4d3c7b238502ed5ecaf4c8514971e576c756f4fc168fd9a0d2 SHA512 4cfbe2dddc89408824621bbd2036afa2966d550e6e189a8835f78b46fe91305221d8fa46219e9c53c83c9f73d83cdb1208bc78a46b9115041511b97b70abbf1b
 AUX openjdk-bin.env.sh 398 BLAKE2B b83d85e2a4e0dbeb24b8c21fb442a8964e55eaf01125cd52f5c930cd67b95b7d1744362cbefe436e4f4115f0b7600860200d8f134b241b6b60ffae6b807b476b SHA512 2c2f753a05154d17a7c324e61d3e4513119050f44d2a8d0aea5c6e2542e9989a955689a97d47fc1d5c710a056f2ccc7b239e3eed3b2d516df6b2aa7450c44613
-DIST OpenJDK-jdk_aarch64_alpine-linux_hotspot_25_6-ea.tar.gz 137389244 BLAKE2B 6a94e5cfdf3df1ce9c0260a29df2794647721acd29408cf9ded988686528eed7bc145d2123ded77c56c959f405c2142f364888968f0b5332ccf289208371fe24 SHA512 19956aa65f87f800cd5bcb8970c8a5b27c76a3bafc7f8526aeeae36963cbb24a303b01b05ffef58fece4157c302d4c180d425ebc1b34e669cf4cc5ef3a84026d
-DIST OpenJDK-jdk_aarch64_linux_hotspot_25_6-ea.tar.gz 137427153 BLAKE2B cb5395ecdd651b6232f9f942fabc8daaeb99f781a1a3f8a82cfb7cdf833cfa828eab7317d01cc510d90b9744f314849fd67a78fae33a4b0f541e77cdb8b4b41d SHA512 db70867f3d0d37167d18fd30ef8473b926442610a9771ed19b9f8ba43007360a28b0fe451065a0d6fb0fa1143e2f7bc87f00f9c1e18bd3f31c6080fca3e65e20
-DIST OpenJDK-jdk_ppc64le_linux_hotspot_25_6-ea.tar.gz 137953029 BLAKE2B 89cca67b1975a09a77d8cc7fb45d01925a7353f0727f8aa9c013796754fc588443787795c47db4a3c663e5e32194886f77bccc5dc6faf5170f06c12210618276 SHA512 2beffacca5e238de3d3c6a587719895b45c61f32586c0bb70b60ca9eb30411575ff21636321bd13b0be78ebeb0cde50f80afd84427cc17cb908d7dc4b77c8206
-DIST OpenJDK-jdk_riscv64_linux_hotspot_25_6-ea.tar.gz 136262097 BLAKE2B 2fb33e86c14cd290e8693879cff2fe18baa050371bfb0df637b001c317590825f94336c898affe76db94310bb7f38e74735b3e7ffb3568c92425fc0cba0aa45b SHA512 3fa525bb4b68f3178dec8c0353a81f5c7aa883cc68efd79054e8c4181a575eb67e81f34decd3bc4dafc7797ad0d521b2220e8f2957e7206db1416d6bddbe9077
-DIST OpenJDK-jdk_x64_alpine-linux_hotspot_25_6-ea.tar.gz 138489277 BLAKE2B 1f43b392f97d991bad1abdebd254b7d8a0c113aee1bcb30567665d18bf779f4f9ff757f2c307f2de041649ae6a18b66d7276360091ec63573195f0d49f779b16 SHA512 0628a65fc7aae60f7d0700c8078246a74e90b64d3d1e3505713649b917b9fbc0f142316c3b8230239a2bc86b1e286890328bebc385a9ea8f949574fd4969010b
-DIST OpenJDK-jdk_x64_linux_hotspot_25_6-ea.tar.gz 138401572 BLAKE2B dd26911ec6181c8a3683b735df50855604a2ae10c62b7533b954c8abe560ff6db10d98f34e9a713a2c3ce266727a60c172125e54f3e1fe3fa514cd5dec759d5e SHA512 d2d91b375ba05283ce65f67b272485d87963bc19efc22cd7de7fc2e19fc20630e118322c9af47b4d66d1df7ed29012d350e4908a4df2cec7857ca3dab32be06b
+DIST OpenJDK-jdk_aarch64_alpine-linux_hotspot_25_8-ea.tar.gz 137447871 BLAKE2B 2dc696f8cd34c128c9c840d8d509247cf4699816a3b06480b201f3641f4f6c3f8055a2390e34b1a7f9d90e169a79070222b5e5ec1e0f3c33a5777c9edce8e94d SHA512 066124758eab1a678a3913e0d326c639815515043c4c773e3dc1aee4419a5160f1979fd6e934f0af34f191719dc16ee66c8b85e0fcf60d4884693fbdb33e07bf
+DIST OpenJDK-jdk_aarch64_linux_hotspot_25_8-ea.tar.gz 137489040 BLAKE2B 6ae069f594952c8090ceed5e2743f34af32cea09eda72f4e55cef11b0ea434acb191ffe8a4cf3388870faf5a01011fc3cf2f8dbc63b3972843db2702f1c3f4dc SHA512 9bc55c38601c9ecab84b9571a02ce06a298aa935af51b70e1fdf1654c606ba5c42a88b1d63e40cc113f1e1cb37293a32ff6a37cdf62908adcc3896103bb8b2d9
+DIST OpenJDK-jdk_ppc64le_linux_hotspot_25_8-ea.tar.gz 138012844 BLAKE2B a132a9155f3df282fca5baa41b3b6d852f5778584dcd7d1664decfc0bac6b4151598b173f14197c733df271e4322f7d149b290bb27247211f688fd11e4311141 SHA512 3cca397a9028afe330e8db2badb84bf85284c8e6fbdea83c258dd06d35f4c15b01bc4f88c3503d78f40f2bc440eeff81f20dfb9be7b27956ec494338132d99c5
+DIST OpenJDK-jdk_riscv64_linux_hotspot_25_8-ea.tar.gz 136333837 BLAKE2B cd6c76d7bc8aad5148acef9c8692d9e4e5fbe45dc65b4a423bde2489f81f1c0b32a567cda9d9cc120187d59f049d911f27541194b1d8b850e05a16a7cb3976d1 SHA512 b07c909746f7b08fe083c074958278ed09b32a168733e90fbc217a3416631a5608239182562cf4f62f3f64b68888f4be4af8bbab9b9b37bacca04572d3190792
+DIST OpenJDK-jdk_x64_alpine-linux_hotspot_25_8-ea.tar.gz 138562452 BLAKE2B 8452c21184a46c4226b8bf77fd0d6a9eda1761236e5f5b8633f030817da44edc65c80bfdfb1b00ba30a486ae738e09463dc7b34fa1784fd0bba68b4f513154f7 SHA512 dda08230a73bcdcd2e721b0a7675f4ebe94e0fe1f83d203c35f274a55b8ca3a7a668cac9610a32bc848d4d2589fa27c8562257593fbf66f82e9d99b19195d0fe
+DIST OpenJDK-jdk_x64_linux_hotspot_25_8-ea.tar.gz 138473327 BLAKE2B 16bb374435e20b5f5c2833455c2ee1bc1eeb6cc986f1fa67a5a4312b0a6ca27f3d2518d655de6c7f5cdd7058d1208f5db1aaf773dbcdb7584b34ea7bcd4440e0 SHA512 c53f7dd8535a496ae75b98be4427cf87e0710bc464c988306998e919ac499553558cec4aa66a2f490f18deae722a7679b8b7c8af21d4ffe8d750d7d21eddfc65
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.25_9.tar.gz 192125336 BLAKE2B e083ce8691f8462310eeaa7495d26519754f5bfadc8a786dd188f1dad4dc36164eea9220125340b43c9e6b4321be6e26d66a9c18247a6462e4cae9f453fe1171 SHA512 860fff5eff6ef2a29062aac0ee7f90d80dca417fb58ccbf9a9f2ca96a8dc4798a00dab42deedbc64a371d0356b17e6cd12cdc2b2879edfcec9463ffc004ce5fb
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.26_4.tar.gz 192142736 BLAKE2B ee6d2496dc6f8182d22fe7621110c783ac5506cbd88b9ee820f820eecb38348bd02990cbd20be91262d5dca5c27bd5476be8a529412f5f50efd412ce8a460629 SHA512 4afa228939aa26d131c829299bac90a863488c32f81ef61ad47ffc8ebac358399c460faca734994c4b6aed61fa68f669f45f375390dcb0698b6f7eb1db12834d
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz 182871332 BLAKE2B ac6ba9e02fcec38dbb685cdebf379ecdcb5041bc53a71a0896baf7f2628faaa0dd1402b045a57010e2495c16e48116fd1216fe6d4b6cf35cbc996dafe8516e0a SHA512 db0761f8b0baa82c61567a869f2c23da61470d055ecbd73c7693a7be37167282af7387006f22a0c7a46e1e71591615fac0431925987af8fb8e36d77207669856
@@ -62,7 +62,7 @@ EBUILD openjdk-bin-17.0.13_p11.ebuild 3215 BLAKE2B f2ec6fe938342dbdce0a068c391d9
 EBUILD openjdk-bin-17.0.14_p7.ebuild 3218 BLAKE2B 85ac361f2e6fe30043ebfddad10c9458ebaaa3c1edb3cd8a8d71bf5ec4b217634825c7a87c8ef2aa449ba120e6bf290f378ff39e5537f06ab4b2e3a69226b22f SHA512 bb709c362b30b0cf1ee6c48eb13ac4e9aaf417d540facba20b1ac945ab3f9195ab25416d9d3a490c7aae3a685eecec144a3f57f3f0a91a2fe6a6915b3926e5ca
 EBUILD openjdk-bin-21.0.5_p11.ebuild 3244 BLAKE2B f3662b3df32641ce5688231d68af1d65b650da771c1520e504a2479dbc585046693e1ad964a58c79d7ac9786b4c9e21b4a9d998e2610f64e776b9b50c53513cb SHA512 9be1a111ce4678f37d2cc9beb77dc3ab905ae881d686786f17503b76d5ea1e2e163a37344499c581313d6e75829c4aaac464672d8c0057422271e1303cc91200
 EBUILD openjdk-bin-21.0.6_p7.ebuild 3246 BLAKE2B f3f6c66f140e21ae6b7bcb902671bb89f4a636c7e281ef2c79d368f0066dbf0b5ec58fe88a211ed8f7bb9b317f3519635757888641a29ea7a1bff00c4ba22010 SHA512 f6858d425b14afcf0de6de92faa4e557230e9db765ee6fec9b615b6640cfe4aa0b1f221ba89c8a2e1d05abccb6879205f116bde22468f983a0f73fe518f7a11b
-EBUILD openjdk-bin-25_p6_beta.ebuild 3244 BLAKE2B e8d619e3cd047b15fda4f677b2d24f2e5f08488d67505a4ae4a8de0ad216c64e79807954e3a5e45408f2ca6da842a4d766735c30df5a019e6fead621ca157d42 SHA512 aa4a4b1288cbf94137b5d1a648a2fcbb25890c9bf1023aef7c86d27bde4b4dd5bb9d226678aaee5f8bc5c72a30f1d9bbeca31b357f547547689b2731cab904f9
+EBUILD openjdk-bin-25_p8_beta.ebuild 3244 BLAKE2B e8d619e3cd047b15fda4f677b2d24f2e5f08488d67505a4ae4a8de0ad216c64e79807954e3a5e45408f2ca6da842a4d766735c30df5a019e6fead621ca157d42 SHA512 aa4a4b1288cbf94137b5d1a648a2fcbb25890c9bf1023aef7c86d27bde4b4dd5bb9d226678aaee5f8bc5c72a30f1d9bbeca31b357f547547689b2731cab904f9
 EBUILD openjdk-bin-8.432_p06.ebuild 2936 BLAKE2B 6a60e6aa39cb48a07345b57bb30f8184bc2297957b0b71cc819c395815203ca16978b4008eb05bb21ebb6e54ab533da877e6f6f4a62711163b0b90aa7df46d6a SHA512 6149ff525bc36f48b61ab64f988698d6fca229844f03f3099e9f4d58e47446e711bb06f76bd06910d75f0f2ef040b0e3cb5b0c11019884cd0705162792a9056d
 EBUILD openjdk-bin-8.442_p06.ebuild 2939 BLAKE2B b452efda73608f35dd24e0e95f17bd94e43a282128a28c8fac7511753a0dea827230851233d6a0ce1a49be16fda50bfd6b558d806469f1d430632169c053c10e SHA512 fbad2c994447a622e53e5b64bbf9237ff692f14cd7a42c467581777a34cb617ab6a9ea3722d07f7577214b5e32e5949c156d57789a888e13c57cc78455584c22
 MISC metadata.xml 1059 BLAKE2B 07f5d1d3aff8e962f70522b1fd1b33d9589695e1ccec43191bc31d065f48ff0efde065ac25d96ae994b6eb15fad9a6dcf2a24cc3c2b37633df242ba8b9d5e35b SHA512 a5094da75f572407c4391fb449469c56c4f1a6b86b8e72be98db45d8cadb9f142bc11a2e0a9131cba5d4fe2c9942edcd8e43066caddf8cab8638fbaba230e7b6
diff --git a/dev-java/openjdk-bin/openjdk-bin-25_p6_beta.ebuild b/dev-java/openjdk-bin/openjdk-bin-25_p8_beta.ebuild
index 1df73d6d9ac5..1df73d6d9ac5 100644
--- a/dev-java/openjdk-bin/openjdk-bin-25_p6_beta.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-25_p8_beta.ebuild
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 2f694b41a262..de663e55e5c4 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -35,4 +35,4 @@ EBUILD openjdk-21.0.6_p7.ebuild 9561 BLAKE2B e4d31e2c580b8704da3e3798f7f894ee8a9
 EBUILD openjdk-25_p8.ebuild 9442 BLAKE2B 9a0e8ee1d523bfbc2243ac4625ded98b953a4e5fcba241e2d66db1397c01e093a500268d48d8a97f1c5d5c4ab838466f70bcd7ba614d39ea13a4a645716f7aec SHA512 7f3f6c90ffbfadd66879e0e35187842f7479d965036bce66205b9d01176cd97dcfaa44905a0724c4c86c0c7efd5d85ee7f2d1b19925f4ac463fe1176b3548514
 EBUILD openjdk-8.432_p06.ebuild 7819 BLAKE2B 46ee633ad8c8751885c948f3648e76f973266336fe15fa0016368302719770d9435c5e0db4cb59481e782e2b89adabe8b8cd0b4624749051c066de120509f8b7 SHA512 250754810305bf30ac7ce4dbc15dd1a321f4dc47cf5e49154f26b80b704218b21b6ab2f428a9857096936793460f2471df2fcd921c7fdc40838f11a2d0cce377
 EBUILD openjdk-8.442_p06.ebuild 7823 BLAKE2B 2e8a74e173e84a272566676eebda1165a44f10afdb071ca00d06697d1c3868272a3c726914c09fbacde9c050523b6093f816f04b0eaf9d834a60fc95a127c173 SHA512 5b48fe8649f42019eea64920d79b586e1c541e959c6b8a918f183758011260845053141d16a0f344784d53ac400274552e27de49118d638f022efecaa8cd75c2
-MISC metadata.xml 1549 BLAKE2B 6c922cbe1dd4261036670a176be092d495024dd25e2ffb83cc1af1e3ad0dda3491e8973cdd7f8688f1c0854acf55cdc11e9d80ac5b9a16b544455d2cd1bdcbfe SHA512 57cd1a08f0479e8b11d37665c1d905255685ed2d8d27f469a9689ffe070c7ee6cd5944a1baf87cb19722b31af56b1a4692f7967e817d1e4ffbf7c4d97881d838
+MISC metadata.xml 1593 BLAKE2B 89674213fcbe29a938a4f0812445a42013c467ec3c1ffae7168438abe9214125d0db15f796b34252ca4b83d5aa31ae5949730bfa60a948cac0619cee9cec7941 SHA512 8355c2dc2e23922861989171b6168799074d518c5e5c7f54c8f8b09a1b94c971d90002753fe1b2981345d3bcae5928ea049b8af71279cb6e3d573a25a7b7fb49
diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml
index 095cbbb07ad6..3c6133392b41 100644
--- a/dev-java/openjdk/metadata.xml
+++ b/dev-java/openjdk/metadata.xml
@@ -13,6 +13,7 @@
 		<slot name="8">Java™ 8 is Java™ 1.8, where 8 is the version number, and 1.8 is the version string</slot>
 		<slot name="11">Java™ version 11</slot>
 		<slot name="17">Java™ version 17</slot>
+		<slot name="25">Java™ version 25</slot>
 	</slots>
 	<use>
 		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag>