7 files changed, 248 insertions, 68 deletions
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index f6ed186f5967..cc2fb8a27802 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,2 +1,4 @@
 DIST jakartaee-migration-1.0.10-src.tar.gz 53924 BLAKE2B 263144d2401cd4444d4afbaa0ecba7f9009a7f2312241882dc035db80be33e51f6e90d5bd7c6daa3e274008a5b617fa5169144f645d4d6af399b4100c75ca86a SHA512 88132a7ebca68df60fa4ba2835f6e2ec57b674c38152f83d124380d53fc214e505f2d6696682acc41dc742bad1220956e1a9b063bf7c337042076af45bf69579
 DIST jakartaee-migration-1.0.10-src.tar.gz.asc 833 BLAKE2B 330f1596ad1ef3337747a617c7a1f951d77a16d5fa486b4ae2b50ad2ecf4068e79837728f372efbb65f7ee88575bac90f02c9234ebba795c557ce53d9445dc40 SHA512 e41fe2d920824bc6db93bacb5c5a182de6b47fe0504a07e9f28b162382e30e7bb350d1c031065ea7041228089aa56870023fdb289a5a99fccbb97422e4e73362
+DIST jakartaee-migration-1.0.12-src.tar.gz 54175 BLAKE2B 5db536218b3a151dd617d18203c4cb7d6baacf029e286042809fdec6cbfa2e6cb04911ce2defd9ab30fe98abbebb94d090421ef53e5e928ac8a6864eafbee01a SHA512 ff44ca1209a78b35201c71d241fc92e31a80c63d713b791fd2ef1c4977774a5eb1b71d469db5d1c8673085ecea6b3638688ebd316b86fc637002e69542885ce7
+DIST jakartaee-migration-1.0.12-src.tar.gz.asc 833 BLAKE2B 48e3b2bb54ca26ba879779814f0126e2b7c451c8d4370e556a695e96310bd81c2e904fcd7d04327a86b7be59570a3337fbeeee94b6c9f76a7dc535f746802852 SHA512 a23d663043e995112d1c67be92990247ad35c63e8ba2348f4876014bbfbe244ab5830f7aafb77cd157383c7b482539ef7cbba1ee7623bd53d31475063bef6533
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.12.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.12.ebuild
new file mode 100644
index 000000000000..944980e10a92
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.12.ebuild
@@ -0,0 +1,76 @@
+# 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-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9"
+HOMEPAGE="https://tomcat.apache.org"
+SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz
+	verify-sig? ( mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-11 )"
+CP_DEPEND="
+	>=dev-java/ant-1.10.15:0
+	>=dev-java/bcel-6.11.0:0
+	>=dev-java/commons-compress-1.28.0:0
+	>=dev-java/commons-io-2.21.0:0
+	>=dev-java/eclipse-osgi-4.31:0
+"
+
+# we need jdk-11 just for some tests as those need stuff from newer jdk,
+# otherwise the package as of version 1.0.7 compiles fine with jdk 1.8
+# with tests disabled
+# see bug https://bugs.gentoo.org/910499
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-11:*
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_EXCLUDES=( org.apache.tomcat.jakartaee.TesterConstants )
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-11.apache.org.asc"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties
+}
+
+src_test() {
+	# we need to create jar files for the tests the same way as it's done using pom.xml
+	local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
+	mkdir -p generated-test/META-INF || die
+	pushd generated-test || die
+	echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF
+	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die
+	jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
+	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die
+	jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die
+	for enc in rsa dsa ec; do
+		cp hellocgi.jar hellocgi-signed-${enc}.jar || die
+		jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die
+	done
+	popd
+
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index d70443f59705..142052b6e42d 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,4 +1,2 @@
-DIST apache-maven-3.9.15-bin.tar.gz 9236330 BLAKE2B c77284023d1eaa54eb8d848da2fd9526dea0fef92da2afa63b989ad3e6434f51f3e99320aa44df2ae2dc8a5c678edbd3c50a62e96414e87b4a21f264b842265d SHA512 33d81e0ec785f0207e3e5e3ffb61863e1dca5784c15ac3fb5ff105f69cffbea484eb8d473ea60467a63f7b0570eef8622f2fed8eee96acbe668aa313391cddb3
-DIST apache-maven-3.9.15-bin.tar.gz.asc 902 BLAKE2B 723ec58653eb8625c46ea71be83d050ceb0c4ba3499d188c3138fd62bb61474aca37f301aa045ee7bacaaa45d7f52903b4ea915fc66833591010c8d2866e9bdf SHA512 9fc39b41b21af0a2a46d43f869be917d74f1cc65d622b86eadfbcf3e4d9b324f6626c23f9fda994980d53d6b631c5871dcbaa7154dc493a840fda23532743654
 DIST apache-maven-3.9.16-bin.tar.gz 9278065 BLAKE2B df04a9684e0d46e9986990f086fd2a46db016669b9444de0e227af21c6d94b0b137456850cc7367764b2ef01a661900ee868a798125c9ef15bd2df4d352e87bd SHA512 831a8591fe20c8243b1dbe7d71e3244f31d1665b0804b2e825e38cbbe5ce0cafb8338851f90780735568773e0a6cd07bbec107cda0b896b008b861075358b6f6
 DIST apache-maven-3.9.16-bin.tar.gz.asc 902 BLAKE2B c41f8f7478b0824f1b1507dbc9059cea1c5309c9415e062abdc35c17ada94c947f828a3e362c5c6aa6b5ad3e08f7ccbdc44a57531956d62c11a56c8d1d69adb8 SHA512 a85ceb2985a23ef06070fb96a5cb7e32036f12489044e512cf87b1ae36003354e6079baf8cfae7252b0e01d1505bb57e988db5213aec4260347cc9d5bd749adb
diff --git a/dev-java/maven-bin/maven-bin-3.9.15.ebuild b/dev-java/maven-bin/maven-bin-3.9.15.ebuild
deleted file mode 100644
index 93bc3069ccaa..000000000000
--- a/dev-java/maven-bin/maven-bin-3.9.15.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=9
-
-inherit java-pkg-2 verify-sig
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-HOMEPAGE="https://maven.apache.org/"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz
-	verify-sig? ( mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="3.9"
-KEYWORDS="amd64"
-
-BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-apache-maven-20260421:0 )"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	app-eselect/eselect-java"
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-QA_FLAGS_IGNORED=(
-	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
-	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
-)
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/apache-maven.asc"
-
-# TODO:
-# We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dosym -r "${MAVEN_SHARE}/bin/mvn" "/usr/bin/mvn-${SLOT}"
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 8939ba401b14..ebaa7720ee9f 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,4 +1,8 @@
 DIST tomcat-native-1.3.7-src.tar.gz 352199 BLAKE2B 20fc14a5304af0ec78468ac81a669dee7ba2610a36232b3acd3246da34a37d5f030b2b1bd7070360858f43236dd73133b2ee8ee8e1ee90415864eda9a173a8e1 SHA512 a7d466d3cbca0cd1d63bd00588f62ab5bdd23f9e063818b03783605de5ac0dfe4402765db46bb10cd62dd05e0c6ca3f9be5b98f17e522ac6690dd0efd66b7ba2
 DIST tomcat-native-1.3.7-src.tar.gz.asc 833 BLAKE2B 06394e7cd8b74991e228303e7fbcc4b28aa17e24eeb722f2962c6351471d77912354a57d43259b1b081921c9544fe70ecabac51046bd6e506a9519427e79c370 SHA512 062a26fd18bcf0e480412c63af8e4c6e57d492e777b18dd74ffb491c8e6240e75dce72a22381605bd2e6fd41e27f1526fd53d567ac90c4795917a4b84e9bdc53
+DIST tomcat-native-1.3.8-src.tar.gz 355659 BLAKE2B 75d6600753ebddda3ad46162640910a9aa70aa8bd504c2b2f851d407a0cdc5a1110ba7a0ae9d1cfa4b37c56866dee6f6a7623cd5105e529b4b4cdf5bb336bf76 SHA512 a12b97979037720465300cbc05777ff6ee2ec1dc59ff698864d7068800bf0c2d2606a4e0e29a4d7b16f92c9130604a13e0cc27929a224c9ff77e532ac98a4695
+DIST tomcat-native-1.3.8-src.tar.gz.asc 833 BLAKE2B 9e532e7eb97308275cd94b01b88f1dc8f71034df8fe6c2acb1e56a3781e9ac36a1eaff342b1ca004bd189fb381859d8369372a4d9d6d8791150997140d6e8bc0 SHA512 b9c6ec501926f747b7e178a9eadc6f366ba4af58882077b3ebc870c9d7f7039db8565707c18e731bc9fb590dcdf21e6d73c9145df9abb0f34136c15b9a2b4cc1
 DIST tomcat-native-2.0.14-src.tar.gz 474739 BLAKE2B 749d87c677eda0fd78c4e7aa357ec663121f50d5410282c46e835b4014463322d30803fb9e1a68515cdb6b4ed7acaa58cac0b65aa02e5134de5fbd67362db6dd SHA512 33d626fab35cbfa7398ca90cabd99950c6362ab4e19637012850fd84ecc78184e4c6c975ece92dc8d6461b6a8c2f83221cbc7374ff154422e7722606a4a144c7
 DIST tomcat-native-2.0.14-src.tar.gz.asc 833 BLAKE2B 2096792039fee1bcf71c944c81385e5e580d8705c3e098510c052e0bb8081ba397118f5664598a3526e8ae9a682be5c5fa67ee3e3b3aeff6576d5dbb1f66faf2 SHA512 bf148807aa61ac16dd3cd7d06989c9e4ae5a7d5bad7312aec1447489b65be6f1d44f448e052c2eb3be4d156750090b39ed196e7867e3126059c269b13b189715
+DIST tomcat-native-2.0.15-src.tar.gz 476797 BLAKE2B 08136de22b018abf5f531f52a8a9a75c8578ff477b4332b131842e3a47ae566c3e3b7cf92fa172ec8b19abcbe9e2a70b3f0f5517e00e78f1b58308a7095ab7ae SHA512 a0b53890c36c3409e764895cfc521cdbbc49af4d03968f5d3ed72ba686524a05bd15c3f7ab8259fbab091547ecbc2fb7aae8f47d8bc38027db0f6a5dbda65004
+DIST tomcat-native-2.0.15-src.tar.gz.asc 833 BLAKE2B d5bf8356f8821a8cadbd0fb61b563777832e0b214016214ab2beb732736be851c125c0d8a3388e93431f8942538743e82b6e11304252b315b2791184e4318137 SHA512 eb3f14786323a01cfcd27174e246f293dab726e7514309a58334ac65a1685c1385eef03eb03dd83091b84ca2145dea79c3fd198600224bf0e6ac369e08f8805c
diff --git a/dev-java/tomcat-native/tomcat-native-1.3.8.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.8.ebuild
new file mode 100644
index 000000000000..b122573e109b
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.3.8.ebuild
@@ -0,0 +1,85 @@
+# 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-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? ( mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz.asc )"
+S=${WORKDIR}/${P}-src/native
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-11 )"
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+RDEPEND="
+	dev-libs/apr:1=
+	dev-libs/openssl:0/3
+	>=virtual/jre-1.8:*
+"
+
+JAVA_RESOURCE_DIRS="../resources"
+JAVA_SRC_DIR="../java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="../test"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-11.apache.org.asc"
+
+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() {
+	# Adjusting "String testFile =" path in TestFile.java:29 to match ${S}
+	sed \
+		-e '/String testFile =/s&test/&../test/&' \
+		-i ../test/org/apache/tomcat/jni/TestFile.java || die
+
+	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"
+}
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.15.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.15.ebuild
new file mode 100644
index 000000000000..82a74804bc27
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-2.0.15.ebuild
@@ -0,0 +1,81 @@
+# 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-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? ( mirror://apache/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"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-11 )"
+DEPEND=">=virtual/jdk-17:*"	#958655
+
+RDEPEND="
+	dev-libs/apr:1=
+	dev-libs/openssl:0/3
+	>=virtual/jre-1.8:*
+"
+
+JAVA_RESOURCE_DIRS="../resources"
+JAVA_SRC_DIR="../java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="../test"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-11.apache.org.asc"
+
+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"
+}