4 files changed, 110 insertions, 21 deletions
diff --git a/dev-java/bsh/bsh-2.1.1.ebuild b/dev-java/bsh/bsh-2.1.1-r1.ebuild
index 11a9caad1ce4..ad59a52c5953 100644
--- a/dev-java/bsh/bsh-2.1.1.ebuild
+++ b/dev-java/bsh/bsh-2.1.1-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
@@ -32,7 +32,7 @@ RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 
 DEPEND="${CP_DEPEND}
-	virtual/jdk:1.8"
+	>=virtual/jdk-1.8:*"
 
 DOCS=(
 	CHANGES.md
@@ -50,7 +50,7 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 JAVA_TEST_SRC_DIR="tests"
 
 src_prepare() {
-	default
+	default #780585
 	java-pkg-2_src_prepare
 	java-pkg_clean ! -path "./tests/test-scripts/*"
 
@@ -81,30 +81,31 @@ src_test() {
 	#                                                       ^
 	#   symbol:   class BshScriptEngineFactory
 	#   location: class Issue_55_Test
-#	cp {engine,tests}/src/bsh/engine/BshScriptEngineFactory.java || die
 	rm tests/junitTests/src/bsh/Issue_55_Test.java || die
 
 	# We add 3 test classes which are not covered by the default test selection of java-pkg-simple
 	# We skip "OldScriptsTest" and 4 failing test classes.
 	# Test failures are documeted in bug #903519.
-	pushd tests/junitTests/src > /dev/null || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-type f \
-			! -name 'OldScriptsTest.java' \
-			! -name 'Class3_Test.java' \
-			! -name 'Class13Test.java' \
-			! -name 'Issue_7_Test.java' \
-			! -name 'Issue_8_Test.java' \
-			\( \
-			-name "*Test.java" \
-			-o -name "AnnotationsParsing.java" \
-			-o -name "GoogleReports.java" \
-			-o -name "Namespace_chaining.java" \
-			\) )
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	popd > /dev/null || die
+	local JAVA_TEST_RUN_ONLY=$(find tests/junitTests/src \
+		-type f \
+		! -name 'OldScriptsTest.java' \
+		! -name 'Class3_Test.java' \
+		! -name 'Class13Test.java' \
+		! -name 'Issue_7_Test.java' \
+		! -name 'Issue_8_Test.java' \
+		\( \
+		-name "*Test.java" \
+		-o -name "AnnotationsParsing.java" \
+		-o -name "GoogleReports.java" \
+		-o -name "Namespace_chaining.java" \
+		\) -printf '%P\n')
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
 
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED)
+	fi
 	java-pkg-simple_src_test
 }
 
diff --git a/dev-java/jna/jna-5.17.0.ebuild b/dev-java/jna/jna-5.17.0.ebuild
index 653716c607c5..4d13509036db 100644
--- a/dev-java/jna/jna-5.17.0.ebuild
+++ b/dev-java/jna/jna-5.17.0.ebuild
@@ -82,6 +82,8 @@ src_compile() {
 	JAVA_GENTOO_CLASSPATH_EXTRA+=":jna-platform.jar"
 	rm -r target || die
 
+	#954164
+	rm contrib/platform/src/com.sun.jna.platform/versions/9/module-info.java || die
 	use doc && ejavadoc
 
 	einfo "Generating headers com_sun_jna_Native.h com_sun_jna_Function.h"
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index b8af1b64ed64..55976ded0b30 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -2,3 +2,5 @@ DIST tomcat-native-1.3.1-src.tar.gz 346588 BLAKE2B 3b979845dd10a0c74c7ed2e6404b2
 DIST tomcat-native-1.3.1-src.tar.gz.asc 833 BLAKE2B d7483efea5dc4d9cc069a667896950526e22a6b4b0ee1fd6739754196d1b9e84a2b16f766f68419faf2c3fcc87d1fa83c9985de7149849d4f761d2c5b7e45af7 SHA512 3550e38556dab5594aea469cd8ae43505deceeab25bf60ecd61c26ed1106ce88e35634f936cb36e7fc766f30b5c5f0f19dd01a1513ed219ae7f68c8c10e960f1
 DIST tomcat-native-2.0.8-src.tar.gz 471386 BLAKE2B 7fb5e3c4671e4b56bfa5eb546ac1f87fdf1e33b350533ffcadb9005c1f3054013d61d15f4212923d9ec9370d15fd2717e2b446c80818c82d83cd9f1497e321c4 SHA512 fd45533b9c34b008717d18ed49334c7286b93c849c487c1c42746f2998cc4a6ff0362e536a8b5124c6539847a92a9f7631c7638a21cd5d22134fe1a9bb0f0702
 DIST tomcat-native-2.0.8-src.tar.gz.asc 833 BLAKE2B b438034baf5191ce2af55087d1fcd55f196c3cfa75dc2c7fc9d1bfa8fa5b5289181dad6a02e55674e7d685482228df603478ba1f73a9b67169f50390cdd198a7 SHA512 64879cd6f02a6213a2b6cd102dc175d968a7c20bc821877e9f6f5bbaa11069e5cb672b584c47e3a7563a6c872d56646535a59e42331a2ad524c7f85e628085df
+DIST tomcat-native-2.0.9-src.tar.gz 474706 BLAKE2B 0e3b5d4832278cb0f5d5a3f32c68a62c572d27afa30aba1f69a5f42de4b3f9f48b32e5e6b98a923732216685b67f6fa55be9624aee6ff1b09a0905b27d3a238c SHA512 c8eb81de1cf7316174c36038c2133b013fd18ba11df09c41edb927ff33fef46863ef706b6193487ecde1eed7055d4c47fa23fc29d5a8d53f0c4b6d69b0ce9b33
+DIST tomcat-native-2.0.9-src.tar.gz.asc 833 BLAKE2B 976ee6cc17de4b5aaf3bbd7cf0d47c17b116961bf5c3b06d5059d9aba8c511be50c286444806a01f0f96b079ec3e88a9e89284666b1d2dcb01135228a03db705 SHA512 dd281e2835304a5ca3a3f1f9db92b6161155db940608d1e3aeea64f280cbdb421f6f774d4ec465efde93a1976b1602f72614e3f4ceca46624418f24d0895ee9f
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.9.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.9.ebuild
new file mode 100644
index 000000000000..a6450b75cb1e
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-2.0.9.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
+HOMEPAGE="https://tomcat.apache.org/native-doc/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
+	verify-sig? (
+		https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz.asc
+	)"
+S=${WORKDIR}/${P}-src/native
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE="static-libs"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+RDEPEND="
+	dev-libs/apr:1=
+	dev-libs/openssl:0/3
+	>=virtual/jre-1.8:*
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
+
+JAVA_RESOURCE_DIRS="../resources"
+JAVA_SRC_DIR="../java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="../test"
+
+DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
+	sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
+		../build.xml \
+		| sed "s:\${version}:${PV}:" \
+		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
+		--with-ssl="${EPREFIX}"/usr
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	default
+}
+
+src_test() {
+	# WARNING: A restricted method in java.lang.System has been called
+	# WARNING: Restricted methods will be blocked in a future release unless native access is enabled
+	JAVA_TEST_EXTRA_ARGS=(
+		-Djava.library.path=".libs"
+		--enable-native-access=ALL-UNNAMED
+	)
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_doso .libs/*.so*
+	dodoc -r ../docs
+	! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "For more information, please visit"
+	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
+}