gentoo auto-resync : 11:12:2022 - 09:22:24

9 files changed, 143 insertions, 70 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 2dd48b9897e5..f93c4ec249b2 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 66830d232b89..e3d314a432ca 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,5 +1,3 @@
-DIST javassist-3.29.1.tar.gz 1291658 BLAKE2B 4064401ad01c1e1c9aa4a219a81f0fc2e67b1d4cb85cb98b4a996dd2bf789ee1feb790e5bb332205ef2fafe1c7ac0ea82e5e25afff4d9960c54dfe2cb895d0fd SHA512 5788a4a50b803b2a4520340ceae9fd47466d2004cce4138fd861b57fd760109c61c375a28bd907bb9dfeb56bd44734f003ddd1b550571f101a7d1bc04096b5f8
 DIST javassist-3.29.2.tar.gz 1293705 BLAKE2B 23101970a3fe9e4428b9e2e55ec2973663b537b2e205db55952bce116eb0cdd327e156f9bebf16a3c4322d8e5002d612067b14e8d234e87524361b5f08c9ecde SHA512 651f48d9138b54d4816611c077614bbb15f8189d755c2c2c7e5c2dfb35ad8f48cd9d2e0532edbd565456a923b3166eaecdde8702d65c70a32eb21c2d42f67bfc
-EBUILD javassist-3.29.1.ebuild 2072 BLAKE2B 61ba2d0d93672979234c09fe36e610fd0c58015516458367d7995bbe0a985068d4216effdc01d8363105716513bf448e56f0432435f26cdd8a3b185390dbeda5 SHA512 fd4911cafbbe4e528a2610e72bf438cfc592a9d0f0f164d1547c80863522b624d54991ffe5cd2077dca6c71dda66a2c9f3f4f74ddb7288d7e430785514022de1
 EBUILD javassist-3.29.2.ebuild 2497 BLAKE2B ba0551443870a130e4bd4de2f37684961b569f3f1e529f5494a277021143329fe6a781035db9bd3ce627e106fdeff154871f7b04c09113f753ee5e238a4d2a3c SHA512 ea82bd70b282cab0a694fd420feda0d79eb366d705242a9e1c84a6d9f338b03b6c06ec6add9ee2cd80706f81c9bf37b9d69fee81d831df08f101666feaa05ea0
 MISC metadata.xml 551 BLAKE2B c2f226813733db484e082189bb9420fa19eea8d5f95f751cf42305f110dc6b8a6e07370d9e3bca4be9dfac71333c86e95fb5e3f48543ca0041c2e2a4d96808b0 SHA512 b6b193720397459d3133bed6d0e93973084375684f1df77f93703f9cadf06e0a23e2798a13edf70c67642a656d5e5ef24aef2c032c71b65bc215622dbe42c1e2
diff --git a/dev-java/javassist/javassist-3.29.1.ebuild b/dev-java/javassist/javassist-3.29.1.ebuild
deleted file mode 100644
index 30332016b6d5..000000000000
--- a/dev-java/javassist/javassist-3.29.1.ebuild
+++ /dev/null
@@ -1,68 +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://github.com/jboss-javassist/javassist/archive/rel_3_29_1_ga.tar.gz --slot 3 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javassist-3.29.1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.javassist:javassist:3.29.1-GA"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A class library for editing bytecodes in Java."
-HOMEPAGE="https://www.javassist.org"
-SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
-SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-# Tests run: 431,  Failures: 6
-# Cannot solve those test failures. Using "mvn test" they all pass.
-# https://bugs.gentoo.org/856364
-RESTRICT="test"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:[4.13.1,) -> >=dev-java/junit-4.13.2:4
-# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
-
-DEPEND=">=virtual/jdk-11:*
-	test? ( dev-java/hamcrest-library:1.3 )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( Changes.md README.md )
-HTML_DOCS=( tutorial/{brown.css,tutorial.html,tutorial2.html,tutorial3.html} )
-
-S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.javassist"
-JAVA_MAIN_CLASS="javassist.CtClass"
-JAVA_NEEDS_TOOLS=1
-JAVA_SRC_DIR="src/main"
-
-JAVA_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,junit-4"
-JAVA_TEST_SRC_DIR="src/test"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-# https://github.com/jboss-javassist/javassist/blob/rel_3_29_0_ga/pom.xml#L166-L168
-# <include>javassist/JvstTest.java</include>
-JAVA_TEST_RUN_ONLY="javassist.JvstTest"
-
-src_prepare() {
-	default
-	java-pkg_clean javassist.jar
-	sed -e 's:\.\./\.\./::' -i src/test/javassist/JvstTest{4,Root}.java || die
-}
-
-src_test() {
-	default
-	einfo "Testing"
-	JAVA_PKG_WANT_SOURCE=11
-	JAVA_PKG_WANT_TARGET=11
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index c05502fb59b6..947a39719dd7 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -2,6 +2,8 @@ DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f
 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
+DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
 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
@@ -13,6 +15,7 @@ DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b
 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 1378 BLAKE2B 8a81c24f9ef4ad38ccb2bbd79e0ac11c08c913a50f48c2e0d81a37e6bb894f3527b02606f4bd43ec63ecf3dfd865ba77e48b4ff4e49da1934959caf98e401bdd SHA512 da1ff8e697ee12f3a7325ad51c9cccd04f739d9c2af8627e8b6d0e15799b486f16f9aad58dbfddd6c0f0fcf1f9d33bd6ddb2a4de8cd236bf1284c1acadce5450
+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
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.4.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.4.ebuild
new file mode 100644
index 000000000000..fc428cd76e48
--- /dev/null
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.4.ebuild
@@ -0,0 +1,40 @@
+# 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.4"
+
+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-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest
index 15f0daff9978..09f95230151f 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -2,6 +2,8 @@ DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f
 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
+DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
 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
@@ -13,6 +15,7 @@ DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b
 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 1421 BLAKE2B 386285f7b823c7babcf7626af895d4d403dd2a31c6b6a220188251da2227ec180d657a01f5f37ddd32806b5672c66f64e02809d0d0308d00695cb9aefbafd348 SHA512 995e9e4293fbb5e9c6503c0bb2b8e85ebfeaa0bb4155c04df91e49f8d61cb2c58fc0f43b6b05aa26e63e08a38ec1f4d484145cd28c582d1b45899c0b1d2b4777
+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
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.4.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.4.ebuild
new file mode 100644
index 000000000000..4e8a67f38a9a
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.4.ebuild
@@ -0,0 +1,47 @@
+# 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.4"
+
+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-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index b97f36ad7087..48b4f3a8e6e7 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -5,6 +5,8 @@ DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f
 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
+DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
 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
@@ -20,6 +22,7 @@ DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b
 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 1468 BLAKE2B 67d55f97786e2e4f191b8d9b76ec902b1d362e43f178f2f9b5afd49d70dfd0fa06ecbe519e0fa48cf7592438ddef6119f4917de642bd2380bc9af64b152276a0 SHA512 f654acecda8b6bef951d896355762bb95b2c59a37ea1fece08d0ae611b7bca43c6f363fce7405a87c6cc3df8df3dba3ba9a4d8408e274bf40b035e4d0ec4ff4c
+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
 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
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.4.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.4.ebuild
new file mode 100644
index 000000000000..ad529b04d70d
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.4.ebuild
@@ -0,0 +1,47 @@
+# 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.4"
+
+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"
+}