8 files changed, 179 insertions, 3 deletions
diff --git a/dev-java/findbugs-annotations/Manifest b/dev-java/findbugs-annotations/Manifest
index d218d89a086e..5dca4bf596c2 100644
--- a/dev-java/findbugs-annotations/Manifest
+++ b/dev-java/findbugs-annotations/Manifest
@@ -1 +1,2 @@
 DIST findbugs-annotations-3.0.1-sources.jar 25170 BLAKE2B aebd9acccae5d4fe209aa9393fb35868a67096889375eab5817eeb6b6cabe950e1a3479826c921254fa1faeaaa8231095b5ef88dc2f83fa3b6ca2a76a1572b42 SHA512 bf77991bcbad1dd3e072c65df36d7714cf2f2967a01ed9e8435b6b40c925d905fc879c83303a227cffa5c3db4c960c9c6813ebb520f5d1c0f178f27710075d43
+DIST findbugs-annotations-4.10.3.tar.gz 4735712 BLAKE2B eb90a88246cbd05f8f4091bf6b1be798e3cb5f308dc3285dd090d7534d6017673d21f1f4f7f58844f79f74ce695d5bb811d50745b63d1b16fd39cf72a3c8ea46 SHA512 e78accd3b060304fce3a1508e371beee90fd7199c448d5928aa977b35580fb74a237440cdea5db731b57e562660ccf2fb7162d6235cdf392cdbc0a46e1e39c1f
diff --git a/dev-java/findbugs-annotations/findbugs-annotations-4.10.3.ebuild b/dev-java/findbugs-annotations/findbugs-annotations-4.10.3.ebuild
new file mode 100644
index 000000000000..4c6f5a4037c4
--- /dev/null
+++ b/dev-java/findbugs-annotations/findbugs-annotations-4.10.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations the SpotBugs tool supports"
+HOMEPAGE="https://spotbugs.github.io"
+SRC_URI="https://github.com/spotbugs/spotbugs/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/spotbugs-${PV}/spotbugs-annotations"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+CP_DEPEND="
+	>=dev-java/jsr305-3.0.2:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
diff --git a/dev-java/gradle-bin/gradle-bin-9.3.1.ebuild b/dev-java/gradle-bin/gradle-bin-9.3.1-r1.ebuild
index e5f439be63ba..3a598b5dbb6f 100644
--- a/dev-java/gradle-bin/gradle-bin-9.3.1.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-9.3.1-r1.ebuild
@@ -23,7 +23,7 @@ DEPEND="app-eselect/eselect-gradle"
 BDEPEND="app-arch/unzip"
 RDEPEND="
 	${DEPEND}
-	>=virtual/jre-1.8:*
+	>=virtual/jre-17:*
 "
 
 src_compile() {
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.13.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.13.ebuild
index 80f61f61378b..aa61e4c7f6db 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.13.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.13.ebuild
@@ -38,8 +38,8 @@ DEPEND="
 	>=dev-java/waffle-jna-3.5.1:0
 	>=virtual/jdk-11:*
 	test? (
-		>=dev-java/asm-9.9.1:0
-		>=dev-java/byte-buddy-1.18.4:0
+		>=dev-java/asm-9.10.1:0
+		>=dev-java/byte-buddy-1.18.10:0
 		dev-java/junit:4
 		dev-java/junit:5[vintage]
 	)
@@ -68,3 +68,8 @@ JAVA_SRC_DIR=( src/main ! -name 'SSPIClient.java' ! -path '**/java11/**' -path '
 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"
+
+src_install() {
+	JAVA_SRC_DIR=( src/main/{java,java11,version} ) # https://bugs.gentoo.org/974911
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/scram/Manifest b/dev-java/scram/Manifest
index 6d10b409e2fd..2531e9eea77d 100644
--- a/dev-java/scram/Manifest
+++ b/dev-java/scram/Manifest
@@ -1 +1,2 @@
 DIST scram-3.2.tar.gz 73477 BLAKE2B e33a715825cc1c816e30bc3f3d1932f24dc642f2cd25fb11d50241662e150a4f3849cc727fb0a9d709bf090a5f1ec4bc7f999be2e89ea6392f555b687955b5e6 SHA512 53a07a014e1c4b86c5ba4f8fbf80ebf2f4e6d10a5bbb6438d66eb1e42ef9e168d2d8949ac6b96c747675df92e6dccf465b570d7c7eb1b28935622875e93b8609
+DIST scram-3.4.tar.gz 90065 BLAKE2B 205b849bc040c3847c9adaf754637b47cc7e32551a487000435a810d2d768d1190b5966163db38d5a4ffa900e8dcadc4dc5795e8e4f0c5e6bf2f2561c73127e3 SHA512 2d2af972dfc984210b75ac44934bfaf3312df9ffb1ddd9bae48c7a912cfbd396054b78267e0522c35a6908b49eb99a66ba06ad420a476c8ec876a076d22cd282
diff --git a/dev-java/scram/scram-3.4.ebuild b/dev-java/scram/scram-3.4.ebuild
new file mode 100644
index 000000000000..e5c85562fe56
--- /dev/null
+++ b/dev-java/scram/scram-3.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple junit5
+
+DESCRIPTION="SCRAM (RFC 5802) Java implementation"
+HOMEPAGE="https://github.com/ongres/scram"
+SRC_URI="https://github.com/ongres/scram/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	>=dev-java/jetbrains-annotations-26.0.2.1:0
+	>=dev-java/stringprep-2.4:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	dev-java/findbugs-annotations:0
+	dev-java/jsr305:0
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+JAVADOC_CLASSPATH="findbugs-annotations jetbrains-annotations stringprep"
+JAVADOC_SRC_DIRS=( scram-{common,client}/src/main/java )
+JAVA_CLASSPATH_EXTRA="findbugs-annotations jetbrains-annotations jsr305 stringprep"
+JAVA_TEST_GENTOO_CLASSPATH="junit-5 stringprep"
+
+src_compile() {
+	einfo "Compiling module common"
+	JAVA_SRC_DIR="scram-common/src/main/java"
+	JAVA_JAR_FILENAME="common.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":common.jar"
+	rm -r target || die
+
+	einfo "Compiling module client"
+	JAVA_SRC_DIR="scram-client/src/main/java"
+	JAVA_JAR_FILENAME="client.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":client.jar"
+	rm -r target || die
+
+	use doc && ejavadoc
+}
+
+src_test() {
+	einfo "Testing scram-common"
+	JAVA_TEST_RESOURCE_DIRS="scram-common/src/test/resources"
+	JAVA_TEST_SRC_DIR="scram-common/src/test/java"
+	junit5_src_test
+
+	einfo "Testing scram-client"
+	JAVA_TEST_SRC_DIR="scram-client/src/test/java"
+	junit5_src_test
+}
+
+src_install() {
+	JAVA_JAR_FILENAME="client.jar"
+	JAVA_SRC_DIR=( scram-{client,common}/src/main/java/* )
+	java-pkg-simple_src_install
+	java-pkg_dojar "common.jar"
+}
diff --git a/dev-java/stringprep/Manifest b/dev-java/stringprep/Manifest
index 8682e4995cc8..f56531403c24 100644
--- a/dev-java/stringprep/Manifest
+++ b/dev-java/stringprep/Manifest
@@ -1 +1,2 @@
 DIST stringprep-2.2.tar.gz 89428 BLAKE2B 1453bc3f6ffcf2cbb245c1e18bec1d3b0f7955f63727370c8dfce3e94bce2d880b6c24b91c59b52cbc8bc42330324ae3be7e750d3ecddfa04fd711bdbd171ef3 SHA512 ccaa184016c202b0343f15ce00e91b39d6f1d759904e501d67854142527fb96cf0accf8ef49fda463a0be5257ca3a6ea68f09661dba26ae9c0c25ad80af8ecb4
+DIST stringprep-2.4.tar.gz 93341 BLAKE2B 92238c47ab51a6e496d80ad135bd2d8265afbb47190974a2bebd9989a50a4b856ddbcb51638581172fcd215a7e195fe28b93e733f4e90a30123a7a49dc37830d SHA512 50860a83a8a288be63269c866f4b2b5c12e3b0ae23d7f4ed57cf2d650dc1d64f86f0098bcf14af4596b07673aab4fe48b92360ff967f6c728582baa74e577a34
diff --git a/dev-java/stringprep/stringprep-2.4.ebuild b/dev-java/stringprep/stringprep-2.4.ebuild
new file mode 100644
index 000000000000..092e6ed7fbd0
--- /dev/null
+++ b/dev-java/stringprep/stringprep-2.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple junit5
+
+DESCRIPTION="Stringprep (RFC 3454) Java implementation"
+HOMEPAGE="https://github.com/ongres/stringprep/"
+SRC_URI="https://github.com/ongres/stringprep/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVADOC_SRC_DIRS=( {string,name,sasl}prep/src/main/java )
+JAVA_TEST_GENTOO_CLASSPATH="junit-5"
+JAVA_TEST_RESOURCE_DIRS=( stringprep/src/test/resources )
+JAVA_TEST_SRC_DIR=( {string,name,sasl}prep/src/test/java )
+
+src_compile() {
+	mkdir -p target/classes || die
+	local module
+	for module in stringprep nameprep saslprep; do
+		einfo "Compiling ${module}"
+		JAVA_JAR_FILENAME="${module}.jar"
+		JAVA_INTERMEDIATE_JAR_NAME="com.ongres.${module}"
+		JAVA_RELEASE_SRC_DIRS=( ["9"]="${module}/src/main/java9" )
+		JAVA_SRC_DIR=( "${module}"/src/main/java )
+		if [[ -d "${module}/src/main/resources" ]]; then
+			JAVA_RESOURCE_DIRS="${module}/src/main/resources"
+		fi
+		java-pkg-simple_src_compile
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar"
+		rm -r target || die
+	done
+
+	use doc && ejavadoc
+}
+
+src_install() {
+	JAVA_JAR_FILENAME="stringprep.jar"
+	java-pkg-simple_src_install
+	java-pkg_dojar {name,sasl}prep.jar
+
+	local module
+	for module in stringprep nameprep saslprep; do
+		if use source; then
+			java-pkg_dosrc "${module}/src/main/java/*"
+		fi
+	done
+}