11 files changed, 0 insertions, 338 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 5e9a9488d805..a06dab3c9de5 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index 3836d21cbbde..cd7178854496 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -1,10 +1,4 @@
 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.85-src.tar.gz 6035271 BLAKE2B 06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528 SHA512 1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736
-DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47 SHA512 e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
-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
 EBUILD tomcat-el-api-10.1.5.ebuild 1374 BLAKE2B da44f5b089f5b92bc5b6fdcef7ffbbcc7388cb872188d60ae657cfcdf72d31e33b559715ec71956e0f6b3d7104f54f1006a137c1714d8592f12f4883147ea009 SHA512 3bd49602d10d8e095f6914ea1d5dd3ddda28fdba98ac8049de35642fe8fbc23d2aea35200678c8cd7a555196663959fabda25286be5a7b6b80e64e279ca51430
-EBUILD tomcat-el-api-8.5.85.ebuild 1370 BLAKE2B 8ab42987589b75064311014bebb3ca3e9945fad6ce2783c0f46189cb28c7f238600e5072de09ebcf613897803352bf0e82d2df4045b9e9e4953280ab2804d09b SHA512 aa649a08bdc00b67fdefbe6ccdd3d750edaf9a5d35d0427140abb80615c46038f3cb1f030bef01b9b013e44cbfbd981fe224e1e0a23c07ccc871eb37597388ef
-EBUILD tomcat-el-api-9.0.71.ebuild 1370 BLAKE2B 8cea3eb051ad2a2fc4543888b6e5673932b97e87bdf0601f52c8232367776ad0481156cc4681d28db7689461829a1092a186b135f3f0607cbf19f134b187e43f SHA512 ed379cdec5989e0f50b9c861d9024b455961d2f38200af52fc741f8321ac3f401332b76e5b279759ba93ceaa687becac1fe3bd498b8243fe237555a80d9bc4c3
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-8.5.85.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-8.5.85.ebuild
deleted file mode 100644
index de38458630eb..000000000000
--- a/dev-java/tomcat-el-api/tomcat-el-api-8.5.85.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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:8.5.85"
-
-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-el-api/tomcat-el-api-9.0.71.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-9.0.71.ebuild
deleted file mode 100644
index 7f5b502ea765..000000000000
--- a/dev-java/tomcat-el-api/tomcat-el-api-9.0.71.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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 bc9023bc8220..ab3530b983e7 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -1,10 +1,4 @@
 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.85-src.tar.gz 6035271 BLAKE2B 06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528 SHA512 1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736
-DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47 SHA512 e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
-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
 EBUILD tomcat-jsp-api-10.1.5.ebuild 1417 BLAKE2B 5197ba88a576dee17469d700d5adc1967c2760db4418c9110e8db4176200635c4b0736c861e2e32c48d9e87511156da42d1b931f4412bc62b6f537e7c56092ed SHA512 41e68bb4bdd27e8c299fc29293f972abb7fb9626d8c62e8f4420cd21c51e4a7e1ee65d8aa7d9cf34299e562c9ef705ccaf6329444c1f0da425cd8e1d9f2d36d2
-EBUILD tomcat-jsp-api-8.5.85.ebuild 1413 BLAKE2B f33e0a67bafd9fd611ca31d9087383211c013ebc94ba969b2c1a472cdb185e426c18b98b274b41a80896e3f855ae6b16b312b05a5401cc08a2434d7e548d4c74 SHA512 7691f73c4760e3e10bac9a1e1cc2a6e4303ed0776d69e16d6f319969c4277bf1b5021d96dcff519231fe4395a7d5e7b567b72932e7ce6a8160b946e05515c2de
-EBUILD tomcat-jsp-api-9.0.71.ebuild 1413 BLAKE2B ae56ef540e45ff1b87badf3f1be94dd75382c6bd2e4f32cddb5be57577aa80e70bfecbd54ee4e6e205c3b5eea3b3220d6db4c56c43b0eb863407197ddff12401 SHA512 2f80daaf5cfd4dac63e89746496c1763289364accd8bfc89fdeb7319375dd12cb4c746162fa2b195ec8226f49aced0025eb2701320427e6ce5591695fe4f153a
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.85.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.85.ebuild
deleted file mode 100644
index a9212356cc4d..000000000000
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.85.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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:8.5.85"
-
-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}:3.1
-"
-
-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-jsp-api/tomcat-jsp-api-9.0.71.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.71.ebuild
deleted file mode 100644
index f8ae3bc3aa43..000000000000
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.71.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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 0849965c75db..cea3b5ebf41e 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,21 +1,12 @@
 AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfdfe4ac706137791b329b05a28f56f77c57fa8de30b77d457e912208068b97bf6b8fbee7d7af168d07a5 SHA512 1bf5789c683896ffde160f96dc6fcb2ef58dd645a208b3d8e08863fd176337ae81e4d29535bb18df909cfe233576f25d93c35ad1072fca3a79b19e784638f5fb
 AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
-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
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528 SHA512 1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736
-DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47 SHA512 e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
-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
-EBUILD tomcat-servlet-api-10.1.5.ebuild 1464 BLAKE2B e33a866c18dae4d049e0e6e52035a83bd84112bd0ae83cfe900fb1dd0ab3b04a5730d1f829b3749fb2d96a367a6815cceca81d8b1f9aabc363f62dbab6abd943 SHA512 3db2184a609ea5af1e05a2152c6bac038c615debcb41f65e1e9b73429b9934cec8dba5b9c3c4c4cb46870df8f0194c70f73c4f2fc79f800ae7fa6c41c90004c9
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
-EBUILD tomcat-servlet-api-8.5.85.ebuild 1620 BLAKE2B 75dbe99373d84dbe1b051e8d5eea7595b2743304ecb882dd0946beb3a82684d8785c8fe995d96df212d421a7405447b1ba6b2a51a72d99fef357fe2b050c18dc SHA512 809a4028c8a70ec85b9b3a590da0c594b205bfe7bd8893d483bf70d599afe0e78764ca8be67e39f28705c6e71749e09f11719017cb683943b863c78a328ab447
-EBUILD tomcat-servlet-api-9.0.71.ebuild 1460 BLAKE2B b505ff56ecc48f03e22171242182bcf0f40580b7ad9d7baed0ddd3d2aa38e8af96c98d8ccacf5b29804ec623db3c9de807b0d5e7e1a1cd69170911ff4ea1ac07 SHA512 fec96a7163cc3b9efaefc61a5c59bf43bad121d8eff80adfb73730125c5d0ac16abfed90a1eaafb1f461aca60eb4405d5e283797bebc805ab8aed29a8377a03b
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
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
deleted file mode 100644
index 2824090700ad..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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-8.5.85.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.85.ebuild
deleted file mode 100644
index 2e25ad1aeca5..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.85.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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:8.5.85"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Tomcat's Servlet 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"
-
-# we can't use the exact same version of el as tomcat 9 implements the same slot and
-# it would prevent from installing both tomcat 8.5 and 9 at the same time
-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"
-}
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
deleted file mode 100644
index fee6378b5064..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.71.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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"
-}