Adding metadata

35 files changed, 496 insertions, 348 deletions

diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 3bafcae6e224..9f6a03ff3abb 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,2 +1,3 @@
 DIST asm-ASM_9_7_1.tar.bz2 1378103 BLAKE2B f7da3a9c1bcf76398c9e9b9b86d60f8854e5248632a8b2d76605851e29ee1807713fb28c9e76012ec8f9444c44e3a151ed409cd120c34ab8d3495fdc9c84edcb SHA512 77ae76464eec97dbc8129c4a746d13f0d286d2033f909b65e0e34858e1785616b7bee22faa92128b91eb39cbd849e262efe574b73ed2859920add457d6422dd0
 DIST asm-ASM_9_8.tar.bz2 1378904 BLAKE2B 8ace6a729e28569d21b3b2104d6256836ce552f9e571f62fbf994675ca5dcda846abbaa80ec5cede0ab06e519abfaa6745679733f6780be4d16f3e266651e850 SHA512 61142b14a3e1b9873a71057ef649dce3f40cf7553cf536213bee373ddc3320d4e183290adec5274f31562262845dab4505b16f64ba1be3c9893b6a11d1169370
+DIST asm-d4c246469f5fcc477ae943957ac9fa46795ee249.tar.bz2 1382310 BLAKE2B 3048dffbaa1d7374bf53b37bb41bef3a0d7c71a01df1cc28d33a8bed6accb13c0f633783579eb4e91384150bfc3c02104bf297765399063e3fa8e2f1aecba33a SHA512 ce5e10f05d9ec2cf218d211ab6667b3a0cf0c932237a207934fdf9c2da4d9a9cfe70620ee734628872a6742953698c61d1d7a08e3bbb23eee0fd6c6debd09bd8
diff --git a/dev-java/asm/asm-9.8_p20250706.ebuild b/dev-java/asm/asm-9.8_p20250706.ebuild
new file mode 100644
index 000000000000..90489439bd9b
--- /dev/null
+++ b/dev-java/asm/asm-9.8_p20250706.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# tests not enabled because of missing eclass support of junit-jupiter
+JAVA_PKG_IUSE="doc source"
+MAVEN_PROVIDES="
+	org.ow2.asm:asm-bom:${PV}
+	org.ow2.asm:asm:${PV}
+	org.ow2.asm:asm-analysis:${PV}
+	org.ow2.asm:asm-commons:${PV}
+	org.ow2.asm:asm-tree:${PV}
+	org.ow2.asm:asm-util:${PV}
+"
+
+# Avoid circular dependency
+JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="https://asm.ow2.io"
+MY_P="ASM_${PV//./_}"
+MY_COMMIT="d4c246469f5fcc477ae943957ac9fa46795ee249"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_COMMIT}/asm-${MY_COMMIT}.tar.bz2"
+S="${WORKDIR}/asm-${MY_COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x64-macos"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+ASM_MODULES=( "asm" "asm-tree" "asm-analysis" "asm-commons" "asm-util" )
+JAVADOC_SRC_DIRS=(
+	asm/src/main/java
+	asm-tree/src/main/java
+	asm-analysis/src/main/java
+	asm-commons/src/main/java
+	asm-util/src/main/java
+)
+
+src_prepare() {
+	default
+	local module
+	touch asm.module || die
+	for module in "${ASM_MODULES[@]}"; do
+		module=${module/-/.}
+		cat > ${module/./-}/src/main/java/module-info.java <<-EOF || die
+			open module org.objectweb.${module/analysis/tree.analysis} {
+				$(cat asm.module)
+				requires java.base;
+				exports org.objectweb.${module/analysis/tree.analysis};
+			}
+		EOF
+		echo "requires transitive org.objectweb.${module/analysis/tree.analysis};" \
+			>> asm.module || die
+	done
+	sed -e '/^$/d' \
+		-e '/asm;/p;s:\(asm\)\(;\):\1.signature\2:' \
+		-i  asm/src/main/java/module-info.java || die
+	sed -e '/analysis/d' \
+		-i  asm-commons/src/main/java/module-info.java || die
+	sed -e '/commons/d' \
+		-i  asm-util/src/main/java/module-info.java || die
+}
+
+src_compile() {
+	local module
+	for module in "${ASM_MODULES[@]}"; do
+		einfo "Compiling ${module}"
+		JAVA_JAR_FILENAME="${module}.jar"
+		JAVA_SRC_DIR="${module}/src/main/java"
+		java-pkg-simple_src_compile
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar"
+		rm -r target || die
+	done
+
+	if use doc; then
+		einfo "Compiling javadocs"
+		for module in "${ASM_MODULES[@]}"; do
+			rm "${module}/src/main/java/module-info.java" || die
+			JAVA_SRC_DIR+=("${module}/src/main/java")
+		done
+		ejavadoc
+	fi
+}
+
+src_install() {
+	JAVA_JAR_FILENAME="asm.jar"
+	java-pkg-simple_src_install
+	local module
+	for module in asm-{analysis,commons,tree,util}; do
+		java-pkg_dojar ${module}.jar
+		if use source; then
+			java-pkg_dosrc "${module}/src/main/java/*"
+		fi
+	done
+}
diff --git a/dev-java/bnd-annotation/Manifest b/dev-java/bnd-annotation/Manifest
index efb6528140b2..f909d128d99e 100644
--- a/dev-java/bnd-annotation/Manifest
+++ b/dev-java/bnd-annotation/Manifest
@@ -1,2 +1 @@
-DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
 DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
diff --git a/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild b/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild
deleted file mode 100644
index d34e0f32ba5a..000000000000
--- a/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild
+++ /dev/null
@@ -1,29 +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"
-MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.annotation:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="bnd Annotations Library"
-HOMEPAGE="https://bnd.bndtools.org/"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
-S="${WORKDIR}/bnd-${PV}"
-
-LICENSE="Apache-2.0 EPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND="
-	dev-java/osgi-cmpn:8
-	>=virtual/jdk-11:*
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.annotation"
-JAVA_CLASSPATH_EXTRA="osgi-cmpn-8"
-JAVA_SRC_DIR="biz.aQute.bnd.annotation/src"
diff --git a/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild b/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild
index 7b8979c026db..30107d661b2a 100644
--- a/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild
+++ b/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV/_rc/.RC}"
 
 LICENSE="Apache-2.0 EPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND="
 	dev-java/osgi-cmpn:8
diff --git a/dev-java/bnd-util/Manifest b/dev-java/bnd-util/Manifest
index efb6528140b2..f909d128d99e 100644
--- a/dev-java/bnd-util/Manifest
+++ b/dev-java/bnd-util/Manifest
@@ -1,2 +1 @@
-DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
 DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
diff --git a/dev-java/bnd-util/bnd-util-7.0.0.ebuild b/dev-java/bnd-util/bnd-util-7.0.0.ebuild
deleted file mode 100644
index e1ac2c5f0308..000000000000
--- a/dev-java/bnd-util/bnd-util-7.0.0.ebuild
+++ /dev/null
@@ -1,43 +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"
-MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.util:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="AQute Bnd Utilities"
-HOMEPAGE="https://bnd.bndtools.org/"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
-S="${WORKDIR}/bnd-${PV}"
-
-LICENSE="Apache-2.0 EPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="dev-java/osgi-annotation:0"
-
-DEPEND="${CP_DEPEND}
-	~dev-java/bnd-annotation-${PV}:0
-	~dev-java/libg-${PV}:0
-	dev-java/osgi-cmpn:8
-	dev-java/osgi-core:0
-	dev-java/slf4j-api:0
-	>=virtual/jdk-17:*
-"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-17:*
-"
-
-JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.util"
-JAVA_CLASSPATH_EXTRA="
-	bnd-annotation
-	libg
-	osgi-cmpn-8
-	osgi-core
-	slf4j-api
-"
-JAVA_SRC_DIR="biz.aQute.bnd.util/src"
diff --git a/dev-java/bnd-util/bnd-util-7.1.0-r1.ebuild b/dev-java/bnd-util/bnd-util-7.1.0-r1.ebuild
index bfe8e1184dc6..6f93a3c69232 100644
--- a/dev-java/bnd-util/bnd-util-7.1.0-r1.ebuild
+++ b/dev-java/bnd-util/bnd-util-7.1.0-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV/_rc/.RC}"
 
 LICENSE="Apache-2.0 EPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ppc64"
 
 CP_DEPEND="
 	dev-java/osgi-annotation:0
diff --git a/dev-java/bndlib/Manifest b/dev-java/bndlib/Manifest
index efb6528140b2..f909d128d99e 100644
--- a/dev-java/bndlib/Manifest
+++ b/dev-java/bndlib/Manifest
@@ -1,2 +1 @@
-DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
 DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
diff --git a/dev-java/bndlib/bndlib-7.0.0.ebuild b/dev-java/bndlib/bndlib-7.0.0.ebuild
deleted file mode 100644
index 621bb7bd3c4c..000000000000
--- a/dev-java/bndlib/bndlib-7.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="biz.aQute.bnd:biz.aQute.bndlib:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="bndlib: A Swiss Army Knife for OSGi"
-HOMEPAGE="https://bnd.bndtools.org/"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
-S="${WORKDIR}/bnd-${PV}"
-
-LICENSE="Apache-2.0 EPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64"
-
-CP_DEPEND="
-	~dev-java/bnd-annotation-${PV}:0
-	~dev-java/bnd-util-${PV}:0
-	~dev-java/libg-${PV}:0
-	dev-java/osgi-annotation:0
-	dev-java/osgi-cmpn:8
-	dev-java/osgi-core:0
-	dev-java/slf4j-api:0
-"
-
-DEPEND="${CP_DEPEND}
-	dev-java/osgi-service-log:0
-	>=virtual/jdk-17:*
-"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-17:*
-"
-
-JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bndlib"
-JAVA_CLASSPATH_EXTRA="osgi-service-log"
-JAVA_RESOURCE_DIRS="res"
-JAVA_SRC_DIR="biz.aQute.bndlib/src"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	mkdir res || die
-
-	# java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
-	mv biz.aQute.bndlib/img	res || die
-	pushd biz.aQute.bndlib/src > /dev/null || die
-		find -type f \
-			! -name '*.java' \
-			| xargs cp --parent -t ../../res || die
-	popd > /dev/null || die
-}
diff --git a/dev-java/bndlib/bndlib-7.1.0.ebuild b/dev-java/bndlib/bndlib-7.1.0.ebuild
index fca4c94c6ffb..e77df61c6013 100644
--- a/dev-java/bndlib/bndlib-7.1.0.ebuild
+++ b/dev-java/bndlib/bndlib-7.1.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV/_rc/.RC}"
 
 LICENSE="Apache-2.0 EPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ppc64"
 
 CP_DEPEND="
 	~dev-java/bnd-annotation-${PV}:0
diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
index 3c826c64f985..929aabb2320a 100644
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@@ -1 +1,2 @@
 DIST checker-framework-3.48.4.tar.gz 8347976 BLAKE2B 29a874f406ca20d12563950e6f7603c94e8c0672871ec8c3f05bc7f37629cc7fc26ae8743283e55cc69f4eb8c40e1e8fc123ba636d19bba3084cd9f1b36a8b0c SHA512 6495e328c041e0b5fc0fddfc4e5811171531933e7154f95eb39113d7aaa78b08a83860426406f66461614f53c024a55a9486a3dd736bc04fb9c306ab3349157f
+DIST checker-framework-3.49.5.tar.gz 8393359 BLAKE2B 1cf9eedfb290e214761a7915dd82829aea6be2ddc4cfc3da4c136eb12801a87b1dc5dd08ac15fb3a06cee04eb412097eab1d17f85b6b6e0056f0e3273bdb7186 SHA512 940754511309e8131d712d3006bad0e3087359c10f723b26646d1d2500477a78b06f413f6b02a13ea5ac22d91a9bc28cf0083d8a9a73acb860cdcef492976c72
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.49.5.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.49.5.ebuild
new file mode 100644
index 000000000000..435d4b3f0da2
--- /dev/null
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.49.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.checkerframework:checker-qual:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for type-checking by the Checker Framework"
+HOMEPAGE="https://checkerframework.org/"
+SRC_URI="https://github.com/typetools/checker-framework/archive/checker-framework-${PV}.tar.gz"
+S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild b/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild
index 2ae4a1989ffd..82a35822add9 100644
--- a/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild
+++ b/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/eclipse.jdt.core-R${PV//./_}/org.eclipse.jdt.annotation"
 
 LICENSE="EPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ppc64"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index edf2c4e3c1a2..2c4f9f17db57 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1 +1,2 @@
 DIST error-prone-2.36.0.tar.gz 2887918 BLAKE2B 8478d23214681f887607c10339a554f839f84a1f6c80d2fda0c35463c405673e50301a0fb2f450a22ee12ef1b8c84ff904721f4184004bb35e28f567df760a0f SHA512 a9e8c78119ecfc99d064ed1a1748a7ca9931a9391f241b0d36886268dd1294623368a5f703bee5b5008fb4f20008be5a0073f2c1078a7086bc34adb4c6cdf5bd
+DIST error-prone-2.41.0.tar.gz 2390500 BLAKE2B 24d3602df463bf652907d1b7193ed1defbab61f3a511c34903b12f58ed073ec0075764037e41ed9fa58f691293d98c50d1bca208236d6d34d676753bab928e9c SHA512 0826b8451638f48ac03abd291d410cca8f1b478bdfd5816c77199fe870e1bddcb063db2860066a5b55564a327187d0f4558036f342debec489e2eba79be103c3
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.41.0.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.41.0.ebuild
new file mode 100644
index 000000000000..5a43fe982382
--- /dev/null
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.41.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.errorprone:error_prone_annotations:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java annotations for the Error Prone static analysis tool"
+HOMEPAGE="https://errorprone.info"
+SRC_URI="https://github.com/google/error-prone/archive/v${PV}.tar.gz -> error-prone-${PV}.tar.gz"
+S="${WORKDIR}/error-prone-${PV}/annotations"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_INTERMEDIATE_JAR_NAME="com.google.errorprone.annotations"
+JAVA_RELEASE_SRC_DIRS=( ["9"]="src/main/java9" )
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir src/main/java9 || die
+	mv src/main/java{,9}/module-info.java || die
+}
diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
index 22494f7a30f9..b75e71e84663 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,2 +1,4 @@
 DIST guava-33.4.0.tar.gz 5900161 BLAKE2B 85201845218bfba9150e1190259588d46113c5267bf492f54a7d789e8ba7e890fa79e44a0fdf378949899b93f7df12d7480a38ccec4bc756b581f5b6529318a2 SHA512 6534867f40e2a63e7268e3dec1bc3ee0caafb89c77abc2fa2527b2612ecae17d01803f3968bee9844b3948cdb039b9c61ffdbba5309841c9a6a8d14118af970d
+DIST guava-33.4.8.tar.gz 5876137 BLAKE2B 67c14f95ac894bd821126519034ef45cffc016d7e29652b5020bc01a4ea7cecf779359f21261e1011842ff694299f62be3577a34ea0234c61d21fde7ccfa129d SHA512 e0ce963356e9404bd80a1caa76108ece9bb82c1a46a10ff262b8ba515af17fc33c520bf7dae35168ea9d92250b40e46ef062e5ccf5fec6ebad1a791b137c0f60
 DIST truth-1.4.2.jar 275487 BLAKE2B 9c0dce92648f734ab88a0faf1a1e5328d747efffd29aa8f12b7ed2b2c87036ce18bf3195348f9ffce848842a240179fa60e9625c6997439a4cedce6aac6c2b77 SHA512 5f29cb259f2cf63e8a908061d2a58b28ecf12366a03564c8e63c33cdbdb21935ac95ed7b68437b015a2bd055732c88ec8ca1e55b45b99a2cb3e9dd53cb0b87cc
+DIST truth-1.4.4.jar 274574 BLAKE2B b8ada1085b9f463daf82827a3f080d599719846eed8b68a3c4341b087d8e86d1fc690820eaaab900531ac4cb75b928542215d622b1e93cb268d43f02daf248e2 SHA512 f6b817bd148a4dae757b836d9b9ddc6812a079bebd8febfc34504fc252c8ca2fe895e6978f697d9c64e7255d32611994246dd691a6d3cbea47b3a9bcdb53e282
diff --git a/dev-java/guava-testlib/guava-testlib-33.4.8.ebuild b/dev-java/guava-testlib/guava-testlib-33.4.8.ebuild
new file mode 100644
index 000000000000..81f4693f7d38
--- /dev/null
+++ b/dev-java/guava-testlib/guava-testlib-33.4.8.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2025 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.guava:guava-testlib:${PV}-jre"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple check-reqs
+
+DESCRIPTION="A set of java classes to assist the tests for Guava itself"
+HOMEPAGE="https://github.com/google/guava"
+# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz
+	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.4.4/truth-1.4.4.jar )"
+S="${WORKDIR}/guava-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	>=dev-java/error-prone-annotations-2.41.0:0
+	~dev-java/guava-${PV}:0
+	dev-java/jspecify:0
+	dev-java/junit:4
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=dev-java/checker-framework-qual-3.49.5:0
+	dev-java/jsr305:0
+	dev-java/j2objc-annotations:0
+	>=virtual/jdk-11:*
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+JAVA_CLASSPATH_EXTRA="checker-framework-qual jsr305 j2objc-annotations"
+JAVA_INTERMEDIATE_JAR_NAME="com.google.common.testlib"
+JAVA_RELEASE_SRC_DIRS=( ["9"]="guava-testlib/src9" )
+JAVA_SRC_DIR="${PN}/src"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${PN}/test"
+
+check_env() {
+	if use test; then
+		# this is needed only for tests
+		CHECKREQS_MEMORY="1024M"
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_env
+}
+
+pkg_setup() {
+	check_env
+	java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir guava-testlib/src9 || die "mkdir"
+	mv guava-testlib/src{,9}/module-info.java || die "mv module-info"
+}
+
+src_test() {
+	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.4.4.jar:testdata.jar"
+	JAVA_TEST_EXTRA_ARGS="-Xmx${CHECKREQS_MEMORY}"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index ec6ae1cf83ba..a6accb86b202 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1 +1,2 @@
 DIST guava-33.4.0.tar.gz 5900161 BLAKE2B 85201845218bfba9150e1190259588d46113c5267bf492f54a7d789e8ba7e890fa79e44a0fdf378949899b93f7df12d7480a38ccec4bc756b581f5b6529318a2 SHA512 6534867f40e2a63e7268e3dec1bc3ee0caafb89c77abc2fa2527b2612ecae17d01803f3968bee9844b3948cdb039b9c61ffdbba5309841c9a6a8d14118af970d
+DIST guava-33.4.8.tar.gz 5876137 BLAKE2B 67c14f95ac894bd821126519034ef45cffc016d7e29652b5020bc01a4ea7cecf779359f21261e1011842ff694299f62be3577a34ea0234c61d21fde7ccfa129d SHA512 e0ce963356e9404bd80a1caa76108ece9bb82c1a46a10ff262b8ba515af17fc33c520bf7dae35168ea9d92250b40e46ef062e5ccf5fec6ebad1a791b137c0f60
diff --git a/dev-java/guava/guava-33.4.8.ebuild b/dev-java/guava/guava-33.4.8.ebuild
new file mode 100644
index 000000000000..0d13e50c6aa7
--- /dev/null
+++ b/dev-java/guava/guava-33.4.8.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.guava:guava:${PV}-jre"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="https://github.com/google/guava"
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	>=dev-java/error-prone-annotations-2.41.0:0
+	dev-java/j2objc-annotations:0
+	dev-java/jspecify:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=dev-java/checker-framework-qual-3.49.5:0
+	dev-java/jsr305:0
+	>=virtual/jdk-11:*
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+JAVA_CLASSPATH_EXTRA="jsr305"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# Get module-info.class into versions/9
+	mkdir -p futures/failureaccess/src9 || die "mkdir futures"
+	mv futures/failureaccess/src{,9}/module-info.java || die "mv futures"
+	mkdir -p guava/src9 || die "mkdir guava"
+	mv guava/src{,9}/module-info.java || die "mv guava"
+}
+
+src_compile() {
+	einfo "Compiling failureaccess.jar"
+	JAVA_INTERMEDIATE_JAR_NAME="com.google.common.util.concurrent.internal"
+	JAVA_JAR_FILENAME="failureaccess.jar"
+	JAVA_RELEASE_SRC_DIRS=( ["9"]="futures/failureaccess/src9" )
+	JAVA_SRC_DIR="futures/failureaccess/src"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":failureaccess.jar"
+	rm -r target || die
+
+	einfo "Compiling guava.jar"
+	JAVA_CLASSPATH_EXTRA="checker-framework-qual"
+	JAVA_INTERMEDIATE_JAR_NAME="com.google.common"
+	JAVA_JAR_FILENAME="guava.jar"
+	JAVA_RELEASE_SRC_DIRS=( ["9"]="guava/src9" )
+	JAVA_SRC_DIR="guava/src"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":guava.jar"
+	rm -r target || die
+
+	JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}"
+	JAVADOC_SRC_DIRS=( {futures/failureaccess,guava}/src )
+	use doc && ejavadoc
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dojar failureaccess.jar
+}
diff --git a/dev-java/guice/guice-5.1.0-r1.ebuild b/dev-java/guice/guice-5.1.0-r1.ebuild
index 5bc330f4392f..b1fb56915543 100644
--- a/dev-java/guice/guice-5.1.0-r1.ebuild
+++ b/dev-java/guice/guice-5.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-java/guice/guice-5.1.0-r2.ebuild b/dev-java/guice/guice-5.1.0-r2.ebuild
new file mode 100644
index 000000000000..d5bb78b074dd
--- /dev/null
+++ b/dev-java/guice/guice-5.1.0-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 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.inject:guice:5.1.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Guice is a lightweight dependency injection framework for Java 6 and above"
+HOMEPAGE="https://github.com/google/guice"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+# Most of the test dependencies are missing in Gentoo.
+RESTRICT="test"
+
+CP_DEPEND="
+	dev-java/aopalliance:1
+	dev-java/asm:0
+	>=dev-java/error-prone-annotations-2.41.0:0
+	dev-java/guava:0
+	dev-java/javax-inject:0
+	dev-java/jsr305:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		dev-java/guava-testlib:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( {COPYING,{CONTRIBUTING,README}.md} )
+
+JAVA_SRC_DIR=( "core/src" )
+JAVA_RESOURCE_DIRS=( "core/res" )
+
+JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,junit-4"
+JAVA_TEST_SRC_DIR=( "core/test" )
+JAVA_TEST_RESOURCE_DIRS=( "core/test" )
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir -p "core/res/com/google/inject/" || die
+	cp core/{src,res}/com/google/inject/BUILD || die
+}
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index d4ea9aee6e3e..97a05cd66cb2 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1 +1,5 @@
+DIST classloader-leak-test-framework-1.1.2.jar 16197 BLAKE2B dd63a5c351c9048bb6d5936b3a0225813acd85444a2f0ba4067e8b0516714b45e81672c05fe4a8731c7d9ad16676acdf7148474a3caaec396a61493b19b4c73a SHA512 fe4859206561170153ddc04d4ebcbc8d521836a4352bf96c97e8851637e8596901d3ec4d6fb41db9625e51274d264ee496f7681437be96cb140ccd52791af7e3
 DIST postgresql-jdbc-42.7.5.src.tar.gz 1036340 BLAKE2B 16695421f5e86e9c2d29dd3699339326b50fdd10293d9a1e93fcdef057f9e9c060005d190ee95aef2f0c018771e057793ef1f62d55d436e363a99311b184157e SHA512 4e7fc7167ab9f63bd73a3d5c50787360e29d444bbfb677baa60c519418ebc243c2144639d1817fd223fe2f7fcc47294253eb83dda9fe0484abf5cdf76821000b
+DIST postgresql-jdbc-42.7.7.src.tar.gz 1052965 BLAKE2B 8eb6da8a2969e4610e8d35853abb571c39581cc66742806b3a63e323e328e3de194435a154b57723157384b1340339574f31814f64ab419d4916c94a46727491 SHA512 f94f858e1732a6b38bd748014ccc335570ff9db8da84b8277e114f974abea1046d264fe75cde965eb270c70fccd323695b147a8e69fb7603fdfb4a0be0c7cd39
+DIST system-stubs-core-2.1.8.jar 55449 BLAKE2B 7ca3c45e388e88bbea97c6a00b19e3569c0ea5573c8aef21f62e0adb84b17332c898fb18875f9e8f7d9c4846dbde5a982cedf42a4d42757084156e01cabd13b2 SHA512 b2665a8dab79564c637fcce8c3d8bd203c19ffc7dd1844fc354fb282f7eb7bdd12af2437cfc5366e8a0b9343ba93dce6d26c40ae123768758f3030f718b7ac6a
+DIST system-stubs-jupiter-2.1.8.jar 7365 BLAKE2B 65fa4bd569a21995f69d7fb834b4add57fb1782fdcf448d172f39fcc4d0fd867c3e0fe14f979a5c49030c477f25fe432dde61d34e0ce2914c980aa94e5ed8339 SHA512 1e5eb9d4503a2cbe3ec14ecce0a211df49d841471a6aa18c72de9fc6bda403f7d63dc0e842e4c47905aa7d0b9e917d6c7fa52dcbe3fc1293ed3d5f176fc58aa4
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.7.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.7.ebuild
new file mode 100644
index 000000000000..16dddc83290f
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.postgresql:postgresql:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple junit5
+
+DESCRIPTION="Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database"
+HOMEPAGE="https://jdbc.postgresql.org/"
+CFV="1.1.2"	# classloader-leak-test-framework isn't yet packaged.
+WSV="2.1.8"	# webcompere/systemstubs isn't yet packaged.
+SRC_URI="https://jdbc.postgresql.org/download/postgresql-jdbc-${PV}.src.tar.gz
+	test? (
+		https://repo1.maven.org/maven2/uk/org/webcompere/system-stubs-core/${WSV}/system-stubs-core-${WSV}.jar
+		https://repo1.maven.org/maven2/uk/org/webcompere/system-stubs-jupiter/${WSV}/system-stubs-jupiter-${WSV}.jar
+		https://repo1.maven.org/maven2/se/jiderhamn/classloader-leak-test-framework/${CFV}/classloader-leak-test-framework-${CFV}.jar
+	)"
+S="${WORKDIR}/postgresql-${PV}-jdbc-src"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Most tests fail with:
+# "org.postgresql.util.PSQLException: Connection to localhost:5432 refused.
+# Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections."
+RESTRICT="test"
+
+DEPEND="
+	dev-java/checker-framework-qual:0
+	>=dev-java/jna-5.17.0:0
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	>=dev-java/scram-3.1:0
+	>=dev-java/waffle-jna-3.3.0-r1:0
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/asm-9.8-r1:0
+		>=dev-java/byte-buddy-1.15.1:0
+		dev-java/junit:4
+		dev-java/junit:5[vintage]
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_CLASSPATH_EXTRA="
+	checker-framework-qual
+	jna
+	osgi-cmpn-8
+	osgi-core
+	scram
+	waffle-jna
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.postgresql.jdbc"
+JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/system-stubs-core-${WSV}.jar"
+JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/system-stubs-jupiter-${WSV}.jar"
+JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/classloader-leak-test-framework-${CFV}.jar"
+JAVA_MAIN_CLASS="org.postgresql.util.PGJDBCMain"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="asm byte-buddy junit-4 junit-5"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jspecify/Manifest b/dev-java/jspecify/Manifest
new file mode 100644
index 000000000000..4571846eef2e
--- /dev/null
+++ b/dev-java/jspecify/Manifest
@@ -0,0 +1 @@
+DIST jspecify-1.0.0.tar.gz 605795 BLAKE2B ee0b48895ec77de9766e5f861b0b33e231cf1aea9d44e1eab3b5ef87423b0b90d3b1691afdda85c6557d429806dc799de9b393deaf4acc55bb962682f5b2345e SHA512 2cbb2559b290f9cb913eb54814ed92884538be345efed51fcb5c7fcb4fff3a021a2f9ec7cba3aec1a84940337ddb7b9d5d0bdadf01180b08a21e8f2d214c2b09
diff --git a/dev-java/jspecify/jspecify-1.0.0.ebuild b/dev-java/jspecify/jspecify-1.0.0.ebuild
new file mode 100644
index 000000000000..e9582d8f3c7b
--- /dev/null
+++ b/dev-java/jspecify/jspecify-1.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.jspecify:jspecify:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JSpecify annotations"
+HOMEPAGE="https://jspecify.dev/"
+SRC_URI="https://github.com/jspecify/jspecify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_INTERMEDIATE_JAR_NAME="org.jspecify"
+JAVA_RELEASE_SRC_DIRS=( ["9"]="src/java9/java" )
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/jspecify/metadata.xml b/dev-java/jspecify/metadata.xml
new file mode 100644
index 000000000000..a63267abaf71
--- /dev/null
+++ b/dev-java/jspecify/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>java@gentoo.org</email>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/libg/Manifest b/dev-java/libg/Manifest
index efb6528140b2..f909d128d99e 100644
--- a/dev-java/libg/Manifest
+++ b/dev-java/libg/Manifest
@@ -1,2 +1 @@
-DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
 DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
diff --git a/dev-java/libg/libg-7.0.0.ebuild b/dev-java/libg/libg-7.0.0.ebuild
deleted file mode 100644
index a0d110013f1e..000000000000
--- a/dev-java/libg/libg-7.0.0.ebuild
+++ /dev/null
@@ -1,51 +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="biz.aQute.bnd:aQute.libg:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A library to be statically linked. Contains many small utilities"
-HOMEPAGE="https://bnd.bndtools.org/"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
-S="${WORKDIR}/bnd-${PV}"
-
-LICENSE="Apache-2.0 EPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-# aQute.bnd.test.jupiter does not exist
-# org.assertj.core.api.junit.jupiter does not exist
-RESTRICT="test" #839681
-
-CP_DEPEND="
-	dev-java/slf4j-api:0
-"
-
-# compile error with jdk:21, restricting to jdk:17
-# aQute.libg/src/aQute/lib/collections/SortedList.java:31: error: types List<T> and SortedSet<T> are incompatible;
-# public class SortedList<T> implements SortedSet<T>, List<T> {
-#        ^
-#   both define reversed(), but with unrelated return types
-#   where T is a type-variable:
-#     T extends Object declared in class SortedList
-DEPEND="${CP_DEPEND}
-	~dev-java/bnd-annotation-${PV}:0
-	dev-java/osgi-cmpn:8
-	virtual/jdk:17
-"
-
-# aQute.libg/src/aQute/libg/uri/URIUtil.java:161:
-# error: switch expressions are not supported in -source 11
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-17:*
-"
-
-JAVA_AUTOMATIC_MODULE_NAME="aQute.libg"
-JAVA_CLASSPATH_EXTRA="
-	bnd-annotation
-	osgi-cmpn-8
-"
-JAVA_SRC_DIR="aQute.libg/src"
diff --git a/dev-java/libg/libg-7.1.0-r1.ebuild b/dev-java/libg/libg-7.1.0-r1.ebuild
index 8491d48c546f..7c7331019ceb 100644
--- a/dev-java/libg/libg-7.1.0-r1.ebuild
+++ b/dev-java/libg/libg-7.1.0-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV/_rc/.RC}"
 
 LICENSE="Apache-2.0 EPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ppc64"
 # aQute.bnd.test.jupiter does not exist
 # org.assertj.core.api.junit.jupiter does not exist
 RESTRICT="test" #839681
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 3c972ffcdd9f..1924ab00b17d 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,2 +1 @@
-DIST velocity-2.3_p20240314.tar.gz 440967 BLAKE2B c5fcea7af49d6c46d5c0943efe82f3c04d921afc2c53201b97842ae71714e7035d075c147b3bea71e959db12dd970b7879ade73bbc23bab09a1fd262e21f2fc6 SHA512 9055e780d2a3c798bfe30e5c7859a7311c4984b551d7b2ffa68c57c076549326d0ddae31eabff8009ea021c749331d34c71eee8cab55599dea5f3c8dba841a02
 DIST velocity-2.4.1.tar.gz 445671 BLAKE2B 3a142303bd7bb1a6e012b9d33f96078fa925249bd62287e166e45faca7ad605b1b57f8f72b4829d009e4c11f54780727d919a96bcc081d83c26adf0a61eaecaa SHA512 3e821eaeb705e6ede8a51a8d3bff00d26909c20738bed92f5ef9600f3736709324807f7bbb93f5d431e60380b9a4f757f47cca6ec64e8e774c7ec1e4708d25f1
diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild
deleted file mode 100644
index 03a0be67f16f..000000000000
--- a/dev-java/velocity/velocity-2.3_p20240314.ebuild
+++ /dev/null
@@ -1,108 +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.apache.velocity:velocity-engine-core:2.3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Velocity is a general purpose template engine"
-HOMEPAGE="https://velocity.apache.org"
-MY_COMMIT="86cfcf41105f8a25db11ca6483e33c20fc0804d9"
-SRC_URI="https://github.com/apache/${PN}-engine/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-engine-${MY_COMMIT}/${PN}-engine-core"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
-	>=dev-java/commons-io-2.8.0:1
-	>=dev-java/commons-lang-3.11:3.6
-	>=dev-java/slf4j-api-1.7.30:0
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? (
-		dev-db/hsqldb:0
-		>=dev-java/slf4j-simple-1.7.30:0
-	)
-"
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-JAVACC_SLOT="7.0.13"
-BDEPEND="dev-java/javacc:${JAVACC_SLOT}"
-
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-JAVA_TEST_EXTRA_ARGS="-Dtest.compare.dir=target/test-classes -Dtest.result.dir=results"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	sed -e "s/\${project.version}/${PV}/" \
-		src/main/java-templates/org/apache/velocity/runtime/VelocityEngineVersion.java > \
-		src/main/java/org/apache/velocity/runtime/VelocityEngineVersion.java || die
-
-	sed -i \
-		-e 's/\${parser.basename}/Standard/g' \
-		-e 's/\${parser.package}/org.apache.velocity.runtime.parser/g' \
-		-e 's/\${parser.char.asterisk}/\*/g' \
-		-e 's/\${parser.char.at}/\@/g' \
-		-e 's/\${parser.char.dollar}/\$/g' \
-		-e 's/\${parser.char.hash}/\#/g' \
-		"${S}/src/main/parser/Parser.jjt" || die
-
-	# File "StandardParserTreeConstants.java" does not exist.  Will create one.
-	# File "StandardParserVisitor.java" does not exist.  Will create one.
-	# File "JJTStandardParserState.java" does not exist.  Will create one.
-	"jjtree-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \
-		-JDK_VERSION=1.8 \
-		-BUILD_NODE_FILES=false \
-		-MULTI=true \
-		-NODE_PACKAGE=org.apache.velocity.runtime.parser.node \
-		-NODE_USES_PARSER=true \
-		-STATIC=false \
-		-OUTPUT_DIRECTORY="${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node" \
-		"${S}/src/main/parser/Parser.jjt" \
-		|| die "Code generation via jjtree failed"
-
-	"javacc-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \
-		-JDK_VERSION=1.8 \
-		-STATIC=false \
-		-DEBUG_PARSER=false \
-		-DEBUG_LOOKAHEAD=false \
-		-DEBUG_TOKEN_MANAGER=false \
-		-BUILD_PARSER=true \
-		-TOKEN_MANAGER_USES_PARSER=true \
-		-OUTPUT_DIRECTORY="${JAVA_SRC_DIR}" \
-		"${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node/Parser.jj" \
-		|| die "Parser.java code generation via javacc failed"
-
-	# Avoid "error: duplicate class: org.apache.velocity.runtime.parser...."
-	rm -v "${JAVA_SRC_DIR}/CharStream.java" || die "cannot remove 'CharStream.java'"
-	rm -v "${JAVA_SRC_DIR}/ParseException.java" || die "cannot remove 'ParseException.java'"
-}
-
-src_test() {
-	pushd src/test/java > /dev/null || die
-		# DataSourceResourceLoaderTestCase.java requires configured jdbc
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-name "*TestCase.java" \
-			! -name "BaseTestCase.java" \
-			! -name "DataSourceResourceLoaderTestCase.java" \
-			)
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	popd > /dev/null || die
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/velocity/velocity-2.4.1.ebuild b/dev-java/velocity/velocity-2.4.1.ebuild
index 9f43e4bf6f50..2795b31a6b98 100644
--- a/dev-java/velocity/velocity-2.4.1.ebuild
+++ b/dev-java/velocity/velocity-2.4.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-engine-${PV}/${PN}-engine-core"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 CP_DEPEND="
 	dev-java/commons-lang:3.6
diff --git a/dev-java/waffle-jna/waffle-jna-3.3.0-r1.ebuild b/dev-java/waffle-jna/waffle-jna-3.3.0-r1.ebuild
index 940f8101994a..1c030b45a6b5 100644
--- a/dev-java/waffle-jna/waffle-jna-3.3.0-r1.ebuild
+++ b/dev-java/waffle-jna/waffle-jna-3.3.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/waffle-waffle-parent-${PV}/Source/JNA/waffle-jna"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 RESTRICT="test" #839681
 
 DEPEND="
@@ -26,7 +26,10 @@ DEPEND="
 	>=dev-java/jna-5.17.0:0
 	dev-java/slf4j-api:0
 	>=virtual/jdk-1.8:*
-	test? ( dev-java/junit:5 )
+	test? (
+		dev-java/junit:5
+		dev-java/assertj-core:3
+	)
 "
 RDEPEND=">=virtual/jre-1.8:*"
 
diff --git a/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild b/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild
deleted file mode 100644
index 5b63501c0254..000000000000
--- a/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.github.waffle:waffle-jna:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Enable drop-in Windows Single Sign On for popular Java web servers"
-HOMEPAGE="https://waffle.github.io/waffle/"
-SRC_URI="https://github.com/Waffle/waffle/archive/waffle-parent-${PV}.tar.gz"
-S="${WORKDIR}/waffle-waffle-parent-${PV}/Source/JNA/waffle-jna"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-RESTRICT="test" #839681
-
-DEPEND="
-	dev-java/caffeine:0
-	dev-java/checker-framework-qual:0
-	dev-java/jakarta-servlet-api:4
-	dev-java/jna:4
-	dev-java/slf4j-api:0
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/junit:5 )
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="waffle.jna"
-JAVA_CLASSPATH_EXTRA="
-	caffeine
-	checker-framework-qual
-	jakarta-servlet-api-4
-	jna-4
-	slf4j-api
-"
-JAVA_RESOURCE_DIR="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-JAVA_TEST_GENTOO_CLASSPATH="
-	assertj-core-3
-	junit-5
-"
-JAVA_TEST_SRC_DIR="src/test/java"