gentoo auto-resync : 17:12:2022 - 15:39:26

12 files changed, 0 insertions, 350 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7e0804eeb414..018e2ab11477 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index b228eafe1df0..9e4e8e3e577e 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,5 +1,3 @@
-DIST jakartaee-migration-1.0.4-sources.tar.gz 38400 BLAKE2B c0c0151adfde56632ad95919a88eedd6a44056e2d29320e63e0dc64c59cf7ba928135f817ddb3c79a96dd7a8418ab92c8fe4aa9f50a51442bb55384349de603f SHA512 a9d49463f44affa1c5f57d9342e7b4dc77a829c904ba2376f87f086c3662f01e05a2b1cfe2dc746e33605a66849f12415ebb2b63eb05c5e476a4eab9ffd39644
 DIST jakartaee-migration-1.0.6-sources.tar.gz 42167 BLAKE2B 9252078f3b31e07dab533ca9d1d32812f49571adf942a3f11bf074d2110b5fb0c2500dae244b10597f0d76c18bb153cd577528cb01ff01350abb46d32251293a SHA512 81ecfe561695e4e5cacaed0ef89e5759e357b332f2798ac6f3d89c43c9a5dfed1a684745b7fe3afe6d1e82ac9405fd2de68da599a53bfe5f67397b452753b572
-EBUILD jakartaee-migration-1.0.4.ebuild 2979 BLAKE2B 1213e1b55b6822382c81fe9d8643b6ad6c55a5ef1ad204f732fafabec6d914f9b2b04c70ef6ec4af26e9e39026f96a67a64f0f23ff2bf81d2b3c4a43e582a1b8 SHA512 9740c0f632d1c6d9102806bca98eb87ee8728aff425515af033a5c6cb895af7ca500a347a51a943ae52dcfe5f3955bbc7a181b916c399336761f87ac61a2918d
 EBUILD jakartaee-migration-1.0.6.ebuild 2982 BLAKE2B 515935ead5a0f7bdc727e459bc63d2512aca0e7b3267fcea078717f04c7f1bf72bb4652a0ca43590352106646fc76e33ab16f544f9e255ffd295381fd69df8c3 SHA512 873dbde9202b7688dc4e48d2ee7f460e28c116c96cb7cc09ee6a4513d83c9360e04fc833ba72524217bb2c0e951d945803b3405ba6d6a4296c3e80f8022059fa
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
deleted file mode 100644
index 92c0218f4b3b..000000000000
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.4/source/jakartaee-migration-1.0.4-src.tar.gz --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.4.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.4"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-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 -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-# Common dependencies
-# POM: pom.xml
-# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
-# org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0
-# org.apache.commons:commons-compress:1.21 -> >=dev-java/commons-compress-1.21:0
-
-CDEPEND="
-	dev-java/ant-core:0
-	>=dev-java/bcel-6.5.0:0
-	>=dev-java/commons-compress-1.21:0
-	>=dev-java/commons-io-2.11.0:1
-"
-
-# Compile dependencies
-# POM: pom.xml
-# org.apache.ant:ant:1.10.12 -> !!!suitable-mavenVersion-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_LAUNCHER_FILENAME="${PN}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1"
-JAVA_SRC_DIR="src/main/java"
-JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
-JAVA_RESOURCE_DIRS=(
-	"src/main/resources"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
-	"src/test/resources"
-)
-JAVA_TEST_EXCLUDES=(
-	"org.apache.tomcat.jakartaee.TesterConstants"
-)
-
-src_prepare() {
-	default
-	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 target/test-classes/META-INF || die
-	pushd target/test-classes || 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/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index c4583e9add57..c61eb4810769 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -1,5 +1,4 @@
 DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
-DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
 DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
@@ -7,18 +6,15 @@ DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 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.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
 DIST apache-tomcat-9.0.69-src.tar.gz 6214949 BLAKE2B 21387c7dbc830c5292d5ea315bf93c2faac2160dd21e8524184495e34cee0739ef57ce77ba46c99a64f7389047da431cffe000da9a5db2aabd481e84f149153f SHA512 8178ef757d8a8a04b87a08e0a5d45e2d244fe0c0fd11b8f6b50182da1811758b7e4b1ea52188e4b241278c32737c0f61ed93d53b5a95075ebabb9209fe57a3b1
 DIST apache-tomcat-9.0.69-src.tar.gz.asc 833 BLAKE2B e4002185d7054ff963d0ecb1373afb2affb4795281bd344fa5b707e45dac4c6168cc2365853923a0cca1b5c21806554987513177ed64e01d7905f5d46ee9c581 SHA512 7d9ea8ac9986303bf649781524dd93db22c9ab1101a50be9aad7b4b65f902640b24462117047ddeba99b3652d63e980deaa232f6b93aff2266887a183059ff8f
 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
 EBUILD tomcat-el-api-10.0.27-r1.ebuild 1081 BLAKE2B 6857d00f026a30c1ead3172c2ef5e14bc3ad1ecb654664fb497592fefec76348fdf2ff33be25b3dcb0053cc12a7eb7370be6df54e2a8e95d73fd7e73a4ec60db SHA512 4486b915b1fec57e9ae076377267c9232d20a47d835144173157fb2bb25682c93e846add000e7d9cc1b00c74d1c9526fdbcb10fe7e5ae7242f4d37945b78799d
-EBUILD tomcat-el-api-10.1.1.ebuild 1078 BLAKE2B 102936dff87a81ba38b59eb82a4e6643021278e203d5a1f929d0d59affe5664b28c9be24b71e87a19c67547c33d20717a1bdd4d1d688336978cbb46ec7db1603 SHA512 d5b14c813a66af8ef01b30b515f524c1adfedace4b82fa6b8761cd9c7c8ffcee3522ad063d0a7432f9482501af532dff71123602e1cd43a0a4d8c3f429ec5a4d
 EBUILD tomcat-el-api-10.1.2.ebuild 1374 BLAKE2B 17b60391fd43e9a788a846b6ab803edc4df33073dd2f5a9c317409b71f1e3ec97a7f80285f533889484c03dbd4c783b093547f49c91d4c01fd7c1a7260176a7c SHA512 c128cd5d425aaba434bb46cb7aa4514751de7a2e59f8c40652cdd124f545c564efefff3ca71c8bba309f60bc525bec50d7a47f101c20d5cc85fe82f912786482
 EBUILD tomcat-el-api-10.1.4.ebuild 1378 BLAKE2B 3eceda8178c020a0b56f12d084a877a6ef576876c34ef7bf04ee33a261b6fdc59c43c656cdc49abe059d71889dc3698dd20ce1856c9c74af101e949eb61d3287 SHA512 b4f83e63e448a4f16003b589b105694847a20e4b02a4b34f220d08af00f86ed2cf3bf41f6970cdfb068a599325e22efb545ab74ceb09512d10b37b1fa4edf59f
 EBUILD tomcat-el-api-8.5.83-r1.ebuild 1074 BLAKE2B 0265263b3c8ffb18c4f298f37825077154ff548e36a02817752826d603c35e1b47b58d099253d5f8b23e5c194c2157947970faa52459809c0136fdbb00a3193d SHA512 bb5dfb679a825e5d7cc69d37871ef541dab45d3c234d39baf373745528c5dbeaf5388b3c63407d606cda053a07ae867f25347f88dda7acaf6f49467020fcb61a
 EBUILD tomcat-el-api-8.5.84.ebuild 1374 BLAKE2B 49636903311ea08eecc21383ba28668f85a0b81e9a2e7769ab851e512886a4365a7870d6c7e54a12bf18ad0b2f36130cf601c776aa7ff4963c23486752a71ca2 SHA512 ae9e51bab4ef27768e8a5a4b04a53ea9c8b000db7020bc939c19a363b638c905df7385c8d4f5dfaeb7c53b8592d022c80f5047e6fea5d2d9b6dbefdfd28302bb
-EBUILD tomcat-el-api-9.0.68-r1.ebuild 1074 BLAKE2B 6c7857d992e45f72ea22e6aa1cbd149ab0e163418ebf49d576b0f2fcb0ab5c47f63993bb8ac892611205d33a1895128892d4e570c513b252120665b347b87d66 SHA512 988472477469d03e307ff4c36461ac024d76e8e7e05cb209dc5111f9d118aead88a41e930583b1a5bb56f45de7fd7dbcf6203d51fc271a1435870d62ca5d7a1a
 EBUILD tomcat-el-api-9.0.69.ebuild 1370 BLAKE2B 8b3c6bcd5e8edda4430349201a7b2f280fb6daea01734b0e8a5106e28c60a08f09f5808d19744a9bc4018cef2edf9f4be8b56db244e2c4c755f8bb841be5e30f SHA512 56f1239bb98176d4acf9cce473f77c023ea1fd429dd5e2d7cd8ad8170ddf10a634ac9752cb9a01a6d93a043284835aa4f2f524a1f7802eb6ac2d1f93fa040a67
 EBUILD tomcat-el-api-9.0.70.ebuild 1374 BLAKE2B 71e22d407a445273ff2bcb6b19d5c33fdb01863db702b0a9b98d51db3234d50e915a068391149272e173b2bdfc9a4b9b4aacef889a4f982a4fa09b5271012709 SHA512 395529457fb65eb99c25bb049fb6207d4079e6ea4532b7cf52c9af1343ada44902f544416c8ae894758d232bbb01b68beecfc56e65d924a3757a2fa83446abf0
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild
deleted file mode 100644
index f6571a0cfc3f..000000000000
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 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.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-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"
-
-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:*"
-
-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.68-r1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild
deleted file mode 100644
index c62e311cee21..000000000000
--- a/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 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.68"
-
-inherit java-pkg-2 java-pkg-simple
-
-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"
-
-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:*"
-
-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 d7cedce843ce..d330284c8a57 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -1,5 +1,4 @@
 DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
-DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
 DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
@@ -7,18 +6,15 @@ DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 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.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
 DIST apache-tomcat-9.0.69-src.tar.gz 6214949 BLAKE2B 21387c7dbc830c5292d5ea315bf93c2faac2160dd21e8524184495e34cee0739ef57ce77ba46c99a64f7389047da431cffe000da9a5db2aabd481e84f149153f SHA512 8178ef757d8a8a04b87a08e0a5d45e2d244fe0c0fd11b8f6b50182da1811758b7e4b1ea52188e4b241278c32737c0f61ed93d53b5a95075ebabb9209fe57a3b1
 DIST apache-tomcat-9.0.69-src.tar.gz.asc 833 BLAKE2B e4002185d7054ff963d0ecb1373afb2affb4795281bd344fa5b707e45dac4c6168cc2365853923a0cca1b5c21806554987513177ed64e01d7905f5d46ee9c581 SHA512 7d9ea8ac9986303bf649781524dd93db22c9ab1101a50be9aad7b4b65f902640b24462117047ddeba99b3652d63e980deaa232f6b93aff2266887a183059ff8f
 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
 EBUILD tomcat-jsp-api-10.0.27-r1.ebuild 1124 BLAKE2B 156423a2485711c72c10edf6617587872ec1ce3f89d4e1722f1969089b90d96cd49153cf9139437a4d08a8980243059a35c27be20345339ff99861bb77fee663 SHA512 e717a54ac7176b45f5a55eed7063a9cc6fa7457029a68f5a3eafd461cd1586d6fb2a36d02d9b98bd0b139232786670680bc2f4f3e8ac91ac82041e20d6e2dc79
-EBUILD tomcat-jsp-api-10.1.1.ebuild 1121 BLAKE2B 28281e634eae4990fda6afdcc45b451eb2fa397ba8f0ef26c0403a67618c1062a77002c051729c9238bfde185be4878bfcca113ff55d36cee3aaa0b9a5082686 SHA512 b476387af9ceeea788ecf9e54243e60533aec90d0f6609b4c86d9bc9860f9bf07d6cf8460ea508be28c1190a9d18c5f4bfb3af1dd3a735150ae80e81b61054b4
 EBUILD tomcat-jsp-api-10.1.2.ebuild 1417 BLAKE2B ba8f0659b764d412c055e82c10974db38c93d7d33e85aeaaa4886b8b54738ff2ee6e6ec452f42fb3ff61b6cf8ec011f5fedadd3567f67ca536b75170a49e5e2b SHA512 a06ca64936cf9246c23d0c5d3e16eaee14446f739cbaaeeecee9691d155b45dd9d056ed12e4174d0b8c6f199c989d6ef1e94c7e0e47f2b51df0d624b76457a82
 EBUILD tomcat-jsp-api-10.1.4.ebuild 1421 BLAKE2B 5772c460b91398713fc37a32cf88b0d13b179090ea5fc76b5aea12b9b21e3f9e222eaffbe9feccac6d02c23dbecbcf682d4bde5f377544d4f9cb41f73d928ef2 SHA512 6d35f8506e603445a7a90b284d34ee5faede6a27f49ac9a3528f327b0a42ba594ddc522a0debecd4c1440ca20a45ea95410f85ec12aa969340abe91a5fa6fdbb
 EBUILD tomcat-jsp-api-8.5.83-r1.ebuild 1117 BLAKE2B 5d9eb8bd7e2e79e2f4e7e37d3e9a41ab87a375a9aa72b1a73bead1335a730c3a9c5d3b60526e4b87d7e46f0d25f70b251002b1ecccfe3df40cf9bb96e0dd0d7b SHA512 abadc559103fb67928be0f0a62cdff998248f5843284011556a08c3aaa5f06ba5764cb2e6448a8de05c3dfeff5d276d201c900fa434a145ba6914106839fda5f
 EBUILD tomcat-jsp-api-8.5.84.ebuild 1417 BLAKE2B ba676748e8426dab6b0cecfeaf857c59d5b2e8c40882ec72028b8c67a39e377f82256254e5109805068a9eb0521c9183bb867d3d4c43376ef0d98044bde24839 SHA512 3e9b09aa9c3ff00ac6f52d7087c87fd745727ad595ce3083977aa7df6207bd068e5e51a7235f7ce230f5e45abf3b7d2d296bba70b4f3e37bc8fa5ff6b7223ef1
-EBUILD tomcat-jsp-api-9.0.68-r1.ebuild 1117 BLAKE2B 80e7bc1fad34ae43c7d84a5caf0fee14d40d2b162398ede8b0eb1faf9f6e7ba5f48765186bb68922dcd163a5a2b4fa6a90b2bd044d530fd331785d7d783c49a2 SHA512 41af601effda53de446251bab678b846b6508fe5e92d2d03d7966f51095d4d907f302ac0c8dee6356b4af35dfd3802f326423515e559313b737d9b573c7f6336
 EBUILD tomcat-jsp-api-9.0.69.ebuild 1413 BLAKE2B b81c654811aac7c51ff8cf86d248a1987f87f7ce050fb895c540d9f1ad3de1e451274414a628d3ae630dadf72ea1fc042408661b18e55d6a4f2bbd2e9e2caad2 SHA512 be68c3f765ae98787e30f0cf567e320ffc38e343b44077dccb91fe5a30fba1d7d32fbbf1bb418d9bc97ec5f6f4aac65b643a0bcec62d69289b1ab56bbf80bb6e
 EBUILD tomcat-jsp-api-9.0.70.ebuild 1417 BLAKE2B e11354fe4234fc6c75a4243d5475b0635d5aa18281f52c694ff0dc96612a2a25ea8b10efd518d53e256263ec6d9b2b7cb2aeefd93e398cdf41880fe812061a64 SHA512 122aac311a2f54db5a8f95ad3a29615d82a4efdf720c60ff2800c7973a37ddddfb89d5895987118d4a4f806f55b3424d341b8edfacf82cf099b0bb6267413cf0
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild
deleted file mode 100644
index 3e5dbf40ae2a..000000000000
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 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.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-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"
-
-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}"
-
-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.68-r1.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild
deleted file mode 100644
index 7ebb6ebd022f..000000000000
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 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.68"
-
-inherit java-pkg-2 java-pkg-simple
-
-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"
-
-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}"
-
-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 f5f2d1d356f1..82b5f13e32bd 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -2,7 +2,6 @@ AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfd
 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.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
-DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
 DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
@@ -14,13 +13,11 @@ DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a88
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 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.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
 DIST apache-tomcat-9.0.69-src.tar.gz 6214949 BLAKE2B 21387c7dbc830c5292d5ea315bf93c2faac2160dd21e8524184495e34cee0739ef57ce77ba46c99a64f7389047da431cffe000da9a5db2aabd481e84f149153f SHA512 8178ef757d8a8a04b87a08e0a5d45e2d244fe0c0fd11b8f6b50182da1811758b7e4b1ea52188e4b241278c32737c0f61ed93d53b5a95075ebabb9209fe57a3b1
 DIST apache-tomcat-9.0.69-src.tar.gz.asc 833 BLAKE2B e4002185d7054ff963d0ecb1373afb2affb4795281bd344fa5b707e45dac4c6168cc2365853923a0cca1b5c21806554987513177ed64e01d7905f5d46ee9c581 SHA512 7d9ea8ac9986303bf649781524dd93db22c9ab1101a50be9aad7b4b65f902640b24462117047ddeba99b3652d63e980deaa232f6b93aff2266887a183059ff8f
 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
 EBUILD tomcat-servlet-api-10.0.27-r1.ebuild 1171 BLAKE2B 2e49a8a90f7936385988b221b6a1dd540590bac31a0969f38727441d7f6448236c82b6345f713b285834fcb3a4407fcb661889fe0f95b8d54f35d33d961f33f9 SHA512 cefdd4b9433d4cc16a4c6ba38752911a278bd97a78161755b98b96eb0280826b46300dc0ef26591ae9f28a2df47fcac58bf64b96064008c2cd2e5a4997435655
-EBUILD tomcat-servlet-api-10.1.1.ebuild 1168 BLAKE2B ec65a3778cbc678f576e564fbb99ca990f99bfc6f02eea04beb6525e54e1b7a64fdbbf621df0af3106dfd6f8f0e9508c49e0c31c2f04aecce75138b7cf410cfc SHA512 6b6c241894e17a37eecee863454e98d56a274bafe3ef913aeb139d7aec1f906488a4485604f5178ed404d35a3953c1dd62b51e97c9a8de66b477deb2d5f38695
 EBUILD tomcat-servlet-api-10.1.2.ebuild 1464 BLAKE2B f15c08f22b4a8f0317b5487cab9f2d4624fe575730cc648f12cd448681e700559ed4075fdf291be40db6510ad72092758b5c36a9eb8e9522996b04e84b87e2cb SHA512 46bd926b649995861f42196aeec6b44c3e4e80c75417a3b0977630c04bec5145e8134ae5118cc18c44f0640c79c2c7a0d9e01282426417c13da87c227fbc182e
 EBUILD tomcat-servlet-api-10.1.4.ebuild 1468 BLAKE2B 1c120380e8ab778805d7c63fee68e8fbef0b9102a5b24cd0262357f19572c1644251d8e552bc5e2d8d41b710a4c73bd8f35057083f82208f02ba123b9183e1c9 SHA512 bc2887d2850edd8eaa3db5ad533dc3d87f9f3043f4b1aebea050dc2c91f164b533000e962352a75c9ed9adad86664054846e527e7bec35abca22dd4f59ae2386
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
@@ -29,7 +26,6 @@ EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1324 BLAKE2B 079d3ad08580256a30a3d359818e940be01f962be2019c7468f17c1bf6a4e8c8f685056ad4d08419175c4d5983333332b07117ecc07326df63c2de5083ee0cf7 SHA512 122bf1cb7a4ef88481888715d878c5c4bbb117e2214b28722173e60ddf6458e377487679312755105e360bb94b261b77e496f80bcde0e1a8e402794cf8a1cca8
 EBUILD tomcat-servlet-api-8.5.84.ebuild 1624 BLAKE2B 64e617c79ba7facfe16b6e80421035c2281425a796bfffc80f7d2b99ff422fb0082d096aec56f3a80c700a748bb9d375a4909f91870263c56e0dc44dc2a6a876 SHA512 1198f5406abad645cb90baafe36781d17efcc76901fc46b3cd38efdc4dd3037a7fb7411c62849f3b57a0c568785cb719dfd3edff98f11057ba20a1157cfab57e
-EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1164 BLAKE2B 89ee54e02f25080b1faa6e2279dbda2394e7efd74465818afb9d6da5a21ff0b6d8dbc0e3e7ba6ebafb8e0979ef7e3950cc4de9e2242df10b67521f1cad1531b0 SHA512 c32dc63e1dfffcb4ddaa3869a9e5b7ead54005f2d316593a0b1ec6dd98014321e9c7f3144830a924ecf88ba9e2cfdc446a76ab47166ed78efd4e4c49e63dbf03
 EBUILD tomcat-servlet-api-9.0.69.ebuild 1460 BLAKE2B e103a08116a7e081120a825bca0572b111be20aa98d9413358b77cc6314a9125618e0c3f9ca5302b89c6ca96dbb824a93c007a9a89160a207660b23ce9f5f5f2 SHA512 be6d8afe287e047f9aa8330d652ae9f197b3c26e741d7896e8b811b22b7b23fe7cd349ac410fc321a8ba76f6d1c19b3f147d5953b61764b27814fb91bf604122
 EBUILD tomcat-servlet-api-9.0.70.ebuild 1464 BLAKE2B 19849693c5fdd62fe9902181042378d185694978e0419099d4b75d019fead7d626400e6d95b0d363bf12bb665e924527ffff66bca5a997ebc0ebaf2ace679943 SHA512 b092f1512ca679821efac75a13468e8e3b495fd1815eb6eb0f2874dc4a9fadbabf9735abc9a76634555e313ca124e555b1b4482fc154ec464410f6f7ab7f7899
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild
deleted file mode 100644
index 89d897766496..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 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.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-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"
-
-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}"
-
-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.68-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild
deleted file mode 100644
index a7301a8805cb..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 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.68"
-
-inherit java-pkg-2 java-pkg-simple
-
-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"
-
-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}"
-
-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"
-}