Adding metadata

11 files changed, 101 insertions, 335 deletions

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/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/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 2c3dcda5087a..bbf2a2357ea5 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,4 +1,5 @@
 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
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 f45dcc2bb20b..a76762113c02 100644
--- a/dev-java/json-smart/Manifest
+++ b/dev-java/json-smart/Manifest
@@ -1,3 +1,2 @@
 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
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 49cfea20357d..da0365083669 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,3 +1,2 @@
-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
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 0a1e9af92ec3..7618a62bf168 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,9 +1,9 @@
-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
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