Adding metadata

18 files changed, 417 insertions, 112 deletions

diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 00234773ac65..ca4978dfd113 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,3 +1,4 @@
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
 DIST ecjsrc-4.25.jar 2340770 BLAKE2B e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776 SHA512 b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
+DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
new file mode 100644
index 000000000000..749502b069a2
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202211231800"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.26"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+	dev-java/ant-core:0"
+# though technically both could be set to 1.8 and it would
+# compile using jdk 11+, it would not compile using jdk 1.8
+# because eclipse ecj has min jdk 11
+RDEPEND="${CDEPEND}
+	>=virtual/jre-11:*"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-17:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+src_prepare() {
+	default
+
+	# Remove everything but the Ant component.
+	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
+
+	rm build.xml || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.26 b/dev-java/ant-eclipse-ecj/files/ecj-4.26
new file mode 100644
index 000000000000..950088453264
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.26
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.25"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.25*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.26,ant-eclipse-ecj-4.26"
+GENERATION="2"
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 00234773ac65..ca4978dfd113 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,3 +1,4 @@
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
 DIST ecjsrc-4.25.jar 2340770 BLAKE2B e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776 SHA512 b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
+DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
new file mode 100644
index 000000000000..d4a38077e777
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="ecj"
+DMF="R-${PV}-202211231800"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.26"
+IUSE="+ant"
+
+COMMON_DEP="
+	app-eselect/eselect-java
+	dev-java/ant-core:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-17:*
+	app-arch/unzip"
+PDEPEND="
+	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+JAVA_JAR_FILENAME="${MY_PN}.jar"
+JAVA_GENTOO_CLASSPATH="ant-core"
+
+S="${WORKDIR}"
+
+# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
+src_prepare() {
+	default
+
+	# These have their own package.
+	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -r org/eclipse/jdt/internal/antadapter || die
+
+	# JavaCore is not distributed in the jar
+	sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \
+		-e 's|JavaCore.getOptions()||g' \
+		org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+		org.eclipse.jdt.internal.compiler.batch.Main
+}
+
+pkg_postinst() {
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild b/dev-java/java-config/java-config-2.3.1.ebuild
index 5d9ce9fa9767..2a9518d45cc8 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild
index b7287a76494a..63fdde2100c1 100644
--- a/dev-java/java-config/java-config-9999.ebuild
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
index c53496487200..aef94c201119 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
deleted file mode 100644
index f269a7bc8533..000000000000
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2008-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-# Version based on value in (java/)core/pom.xml from main branch
-# Please update me when new release
-# Maybe find a way to automatically change it?
-MAVEN_ID="com.google.protobuf:${PN}:3.21.7"
-# Tests not enabled, depend on com.google.truth which is not packaged
-# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L35-L40
-# JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit edo java-pkg-2 java-pkg-simple
-
-PARENT_PN="${PN/-java/}"
-PARENT_PV="${PV}"
-PARENT_P="${PARENT_PN}-${PARENT_PV}"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
-else
-	SRC_URI="
-		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
-			-> ${PARENT_P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="
-	https://developers.google.com/protocol-buffers/
-"
-
-LICENSE="BSD"
-SLOT="0/32"
-
-S="${WORKDIR}/${PARENT_P}/java"
-
-BDEPEND="
-	dev-libs/protobuf:${SLOT}
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava:0
-		dev-java/mockito:4
-	)
-"
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
-JAVA_JAR_FILENAME="protobuf.jar"
-JAVA_RESOURCE_DIRS="core/src/main/resources"
-JAVA_SRC_DIR="core/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
-JAVA_TEST_RESOURCE_DIRS="../src"
-JAVA_TEST_SRC_DIR="core/src/test/java"
-
-# Same than PATCHES but from repository's root directory,
-# please see function `src_prepare` below.
-# Simplier for users IMHO.
-PARENT_PATCHES=(
-)
-
-# Here for patches within "java/" subdirectory.
-PATCHES=(
-)
-
-src_prepare() {
-	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
-	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
-	eapply_user
-	popd > /dev/null || die
-
-	# Remove bundled jars
-	java-pkg_clean
-
-	java-pkg-2_src_prepare
-
-	# There is also compiler/plugin, but not in this list because in a subdirectory
-	core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
-
-	# Copy resources from ../src/google/protobuf according to
-	# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L45-L61
-	mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
-	local core_proto
-	for core_proto in "${core_protos[@]}"; do
-		cp "../src/google/protobuf/${core_proto}.proto" \
-		   "${JAVA_RESOURCE_DIRS}/google/protobuf" \
-			|| die
-	done
-	cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
-
-	# Generate 146 .java files according to
-	# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/generate-sources-build.xml
-	for core_proto in "${core_protos[@]}" compiler/plugin; do
-		edo "${BROOT}/usr/bin/protoc" \
-			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${core_proto}".proto
-	done
-}
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index 746d2c7c6a0f..dcdea634313d 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -1,6 +1,10 @@
 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
 DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
+DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d SHA512 d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02
+DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2
 DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
 DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
+DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
+DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.5.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.5.ebuild
new file mode 100644
index 000000000000..c39acb26e40e
--- /dev/null
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-el-api:10.1.5"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's EL API 5.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-11:*"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/el"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/jakarta \( -name 'jsp' -o -name 'servlet' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/jakarta resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-9.0.71.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-9.0.71.ebuild
new file mode 100644
index 000000000000..89c977fcae8c
--- /dev/null
+++ b/dev-java/tomcat-el-api/tomcat-el-api-9.0.71.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-el-api:9.0.71"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/el"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/javax \( -name 'jsp' -o -name 'servlet' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/javax resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest
index 746d2c7c6a0f..dcdea634313d 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -1,6 +1,10 @@
 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
 DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
+DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d SHA512 d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02
+DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2
 DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
 DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
+DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
+DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.5.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.5.ebuild
new file mode 100644
index 000000000000..4dbfa1e5d83d
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:10.1.5"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's JSP API 3.1 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/tomcat-el-api-${PV}:5.0
+	~dev-java/tomcat-servlet-api-${PV}:6.0
+"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-11:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/servlet/jsp"
+
+src_prepare() {
+	default
+	mkdir -p resources/jakarta/servlet || "creating \"resources\" failed"
+	cp -r {java,resources}/jakarta/servlet/jsp || "cannot copy to \"resources\" dir"
+	find resources \( -name '*.java' -o -name 'tagext' \) \
+		-exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.71.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.71.ebuild
new file mode 100644
index 000000000000..4e38cdaba4ea
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.71.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:9.0.71"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's JSP API 2.3 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/tomcat-el-api-${PV}:3.0
+	~dev-java/tomcat-servlet-api-${PV}:4.0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/servlet/jsp"
+
+src_prepare() {
+	default
+	mkdir -p resources/javax/servlet || "creating \"resources\" failed"
+	cp -r {java,resources}/javax/servlet/jsp || "cannot copy to \"resources\" dir"
+	find resources \( -name '*.java' -o -name 'tagext' \) \
+		-exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 7e2dd26c9767..b9200bea89ac 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,5 +1,7 @@
 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
 DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
+DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d SHA512 d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02
+DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
@@ -8,3 +10,5 @@ DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a968
 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2
 DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
 DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
+DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
+DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.5.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.5.ebuild
new file mode 100644
index 000000000000..1417a3fe7289
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-servlet-api:10.1.5"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's Servlet API 6.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="6.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="~dev-java/tomcat-el-api-${PV}:5.0"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-11:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/servlet"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/jakarta \( -name 'el' -o -name 'jsp' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/jakarta resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.71.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.71.ebuild
new file mode 100644
index 000000000000..bf643c6263da
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.71.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-servlet-api:9.0.71"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's Servlet API 4.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="~dev-java/tomcat-el-api-${PV}:3.0"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/servlet"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/javax \( -name 'el' -o -name 'jsp' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/javax resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}