gentoo auto-resync : 12:10:2022 - 01:39:26

16 files changed, 273 insertions, 6 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7f8b0b6a5f40..ef89132036c9 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 5ef2f9c06738..977ecde22ff4 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,7 +1,10 @@
 AUX ecj-4.15 354 BLAKE2B e8ddbe928140e99fa36f0e4937cf1e9bf06bc3660ffdfba91099b35e4effaae3df1cb582a3cc8e9b26415d129d3c7e6b43f69e80f714ec1770ff593aebe4d5a8 SHA512 a8c159538a280ddc3616dce8fe6d1677ac45d7a72b27c23c85224a1d7e3acbb73912f2013be99b075f7b91e7ab52b4d871280246f1af56cf3718e3ce24b8ccc0
-AUX ecj-4.22 378 BLAKE2B d0d01286ef045eabeb70a82c9839a12758a5b942208262a1eae1abf49dc2b9a8397de773a75fafb821cfc5e65d16203d7969982275b8cd0b8941be9ccca5d200 SHA512 f687c6105029f6b46191277e88a6d16b9d814bca5dfb9ddc6dcc306db49a97052e04be8aeb52b82a9e512645b4eb47614ec046f53b398de19e0e27405314baa2
+AUX ecj-4.22 378 BLAKE2B 778ccee76b754a47ac6aaaad293c836a0505ce2d761e5b18d2e83b3a6a7cc9c611a6b447f3fe973f6875253678799b165534eb9d6c5a68fed95efd25f4e41db5 SHA512 da5cdb2ebf8857dd04f5189b85a58a6738d8cee14490533d8b10b39489b293542571abe8b34fd7366300cffaa36ae4f942c0a7844db5a276560ab23044809978
+AUX ecj-4.25 384 BLAKE2B 8c1b7500a376c89c56bcff2954f06fd7595092e4eaa4f8dbe0f04a09cd2acb80199cee747b7b47617bbee1ec1ade69a2a0229d93e177d602eda2617a81bdb1eb SHA512 e799535ff08bbceb9be6034421fe10a8cc92f982641f89eedeba49887c512accb5729c8d1a2dcdb540ebe39041fc3857303192a350d286669154848f75b6e286
 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
 EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1265 BLAKE2B 10003921348e6a8c03eb7fb048fdaf391ecfcf2c9a8d45cff57491bc0bd4507462fbba41282c8998aa4b4b50792fc6d374052c1ef1019e4dab30e24f8ff853fa SHA512 2cac62f7e51e2086fcdfbbef59a2e794d165692683d993e6c8aa77f0fb3daf55f0c4c20c117a984edb70b268d2fac1c3742ab674a56e73778ecc4b434242e00a
-EBUILD ant-eclipse-ecj-4.22-r1.ebuild 1422 BLAKE2B a0b035a6386747d32ad2197ccb0e6eeb85a24b497236f5cf651dde1e39e81dd54746f4df6f9766e390c72a394b1d10e7cf4b40a86700a0875a59fe5ce469692b SHA512 739b38433d47dbd8e4d6bbf1c663d4001b33614c69c69d6bf146be0777624c55cff6c1d1c869dfa42ed6f8d325d5f8dbcd7eca9e77b18f7ecf89eeefd60f0ab8
+EBUILD ant-eclipse-ecj-4.22-r2.ebuild 1422 BLAKE2B a0b035a6386747d32ad2197ccb0e6eeb85a24b497236f5cf651dde1e39e81dd54746f4df6f9766e390c72a394b1d10e7cf4b40a86700a0875a59fe5ce469692b SHA512 739b38433d47dbd8e4d6bbf1c663d4001b33614c69c69d6bf146be0777624c55cff6c1d1c869dfa42ed6f8d325d5f8dbcd7eca9e77b18f7ecf89eeefd60f0ab8
+EBUILD ant-eclipse-ecj-4.25.ebuild 1424 BLAKE2B b54f3778c93a14b4db29b1a80eb12cf1f69eb139db4003aea7136083bf0bc9cdfe2f60914a4bd8924dedd0479b93940488d5206a7bafc744981a865c047804ca SHA512 e3eb3e24194a22baeda5fbf814a74b2408076672cc63da37c3b90960f90fcd832f59e9110565705c579c2e0cb31cd59fca634ef944ff8eda529c66a31714474f
 MISC metadata.xml 547 BLAKE2B 250bb477a3547d97e993539eb2965d6ff8a5085627c8a4ce221fc74704b1c824b1ba4a2891a850b820bd42c4ccf3e684af3035ccaf45cc595f0eac6b62da2a4a SHA512 e1283be49bebaf5bb03e55ead8336a046eff3c657e600dd1456690280e2ae2f9f4fb12987d7c1cfd192e41d8f8d40b36896a2d7430063d243f374e4aedc4ec77
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild
index a2d55cda8ca1..a2d55cda8ca1 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
new file mode 100644
index 000000000000..0d981d39a2f3
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 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}-202208311800"
+
+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.25"
+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.22 b/dev-java/ant-eclipse-ecj/files/ecj-4.22
index 5bbcc318d9ba..57e76b76c539 100644
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.22
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.22
@@ -1,5 +1,5 @@
 JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.22"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.21*"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.22*"
 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"
 SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
 ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.25 b/dev-java/ant-eclipse-ecj/files/ecj-4.25
new file mode 100644
index 000000000000..b1f3ece05dd7
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.25
@@ -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"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.25,ant-eclipse-ecj-4.25"
+GENERATION="2"
diff --git a/dev-java/cdi-api/Manifest b/dev-java/cdi-api/Manifest
index c6ac276a5302..13e473179470 100644
--- a/dev-java/cdi-api/Manifest
+++ b/dev-java/cdi-api/Manifest
@@ -1,4 +1,4 @@
 AUX cdi-api-4.0.1-skip-tests.patch 2530 BLAKE2B 6b4fac604f1b3692ce4150b2e6f29d60a32004dd61a7cd4f12e092bb43e8bed6a1ddc33ad711e0f3025ec95f37a8aba11c305e9df23b3f11e29021baa3808e17 SHA512 0d7d99baea9cbc21e9bc435118f793c6a11d802968b24aed20a65b337b3cebb7d50e37a493084deaa7961c64bfd4f2b96f0750897b0589586b3e89077edf364e
 DIST cdi-api-4.0.1.tar.gz 280719 BLAKE2B 9c4cf34f1b0c096a3097bed658ba4c13ab6fa655cd8233b82b13a788dd047e1be89bcde69b3c69665c0987c4f62cd5e4596e51f6235c95db5239daf403dea4e9 SHA512 7f3e9ca45e0708b3c998ff6f743975a9995309d1fb93fde64ca8a0fca73e16ea653085ca743c921d52385f0fbcbdab10b45fd8b6e8b27c2e058871febbbeeb1e
-EBUILD cdi-api-4.0.1-r1.ebuild 2637 BLAKE2B 9e54a6c301a20584ed5d20f35b3d7de31921967c42540f23fc61b8cf895e8479b8051ce00bae55bd51357e86e562ef76e6c5025a86df855516a05e1fdaecf287 SHA512 87392b6d44503916d9fd3d3f60ebdbc5278e3851a87db6c8be744eca48ee3d9337edbf33aa63ea6436ea2edc01614c2c3532883cb9b80e139c5d665c62e52c1b
+EBUILD cdi-api-4.0.1-r2.ebuild 2682 BLAKE2B 038cc135050411e3e8d4138c195e9cc4ef78acecc8dec4f2520dd3245b48a96c8cd2e411862404eabecc667893582df25efd766f14e1f819b43e800f363ec774 SHA512 bca1114cb862759ae15905d32776a86609f84929eea0c951b09584b7d60243ef8b5f2682500801f4b46f1402e2533a33b50489c85e219adde1c104e97a8352a9
 MISC metadata.xml 295 BLAKE2B 349f4209d0a1dac5a43b3cc197c78aadf3263cfb1e6ddfa39b4ea54bf5b4883a80e800b600720b745a86ee6defe57304736910fc4bb42ee1c1f57f35a3936ea0 SHA512 6f7bf9a1c0e9418a7a0d3cc2baa8f6cbbcf1b4a7abf7f4501d718355d778966b3a16f56bd30c5136d7fb96597d3377e61cbb9a9d840b53fa4da26e00cb3d72e1
diff --git a/dev-java/cdi-api/cdi-api-4.0.1-r1.ebuild b/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
index 6f9b47eb063a..03f7d747c211 100644
--- a/dev-java/cdi-api/cdi-api-4.0.1-r1.ebuild
+++ b/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
@@ -20,10 +20,12 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
+EL_API_SLOT="5.0"
+
 DEPEND="
 	dev-java/injection-api:0
 	dev-java/jakarta-annotations-api:0
-	dev-java/jakarta-el-api:5.0
+	dev-java/jakarta-el-api:${EL_API_SLOT}
 	dev-java/jakarta-interceptors:0
 	>=virtual/jdk-11:*
 "
@@ -58,7 +60,7 @@ src_compile() {
 	JAVA_CLASSPATH_EXTRA="
 		injection-api
 		jakarta-annotations-api
-		jakarta-el-api
+		jakarta-el-api-${EL_API_SLOT}
 		jakarta-interceptors
 	"
 	JAVA_SRC_DIR="lang-model/src/main/java"
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index ac4b821610d3..9be886f82780 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD eclipse-ecj-4.15.ebuild 1737 BLAKE2B de3aff3c46cf68494920930ffbf337cc79864d1adaef1c603f1c9ea8ce168823e8ba772a0a616c77ab7dafc596e37687e6460db89ee61c4127c41ed739b2d914 SHA512 6a0bd08a4aac020bc4f299907777d40673128798bd093b3bc03602aa86bb7c3436d7400ba0dc31c58ff0703d6357ac691f909dd2358a773e0b548139d251a8e7
 EBUILD eclipse-ecj-4.22-r1.ebuild 1693 BLAKE2B 4b19af6eef3b9626b1451391c09836c764232352071cac79e82064c2a4a9be93b6f689845f38e8ff2c191c81e7a3a230f7927cd1fdb19115a99265f1720dbe5d SHA512 27e74aee2c6c828ed686ef17a82976f3ec6841d878384af29b10c8ee91792446153603cd8e5383b669564122f334310846ce7a72d592b2361ac02a60e64b65d4
+EBUILD eclipse-ecj-4.25.ebuild 1695 BLAKE2B 82ee2cc81a26882bd5fbe107dbe70a4c469c8a943f99e0f04f30efa6a6f11e061ceeaf22d79e0e7519a34254c77e081a79f1ec80a060bf0ff645ef1a49117228 SHA512 2df447371659055cfe9af39a250a0e4f94d063bf854d5584c8a042db9574342091d81c77b745b2327c21a8c802800f7704943d0aa262c26244ae5d313bc448c1
 MISC metadata.xml 657 BLAKE2B ed8b1b4598051b4191bad5e92df382f1e0910f7aa6888d9df4dedef6929a3d8933c2951c98e8f8af8750f176ff541608d8db5d311e06c721b14ce1703a95a00e SHA512 ad91b4e46f609db5c5abc145feaea99dc0e6f4297ee1f6532ff1001a991775679e8f53ef91e823d61a614e6d77fbc18637469ea1869d8f82bab352a69c6fbdaf
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
new file mode 100644
index 000000000000..6cbe1264075f
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 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}-202208311800"
+
+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.25"
+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/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index 23cb18c4121f..a3ffaa0908a6 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -1,9 +1,11 @@
 DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
 DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c
+DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
 EBUILD tomcat-el-api-10.0.27.ebuild 1083 BLAKE2B 58f51c703d498d80e40648224ffe877fb0d7ec4b2d4f561f9c6be1778d66b55b93927b170893d1ac11a2d8db99e4b68f1ac5017609e65937708c44a225312b9e SHA512 c7ce691177ba5a77cb4fd25f6e9007289b106567775e30fe68d2191a6636032be04fb0f5fbaf9af450388524ac62148682c98569c9a812e6cdf34d0a741445cf
 EBUILD tomcat-el-api-10.1.0.ebuild 1082 BLAKE2B adc315817fed7b3e6a1a45b27b25b0e957c429635afd31e49175c82cbaa47b5a4174bab46e41dd82d01e60a682fc81b42d96284a5a7512759f67afcd74343a52 SHA512 6d282345502bb66b6382b4fa3d8ccdb6ed76433a82a434affb05b455eead27c4665e5ee1481ea55317d2d9b5b887da63b298cdfc4536bb3e2508b1e76451cf3b
+EBUILD tomcat-el-api-10.1.1.ebuild 1082 BLAKE2B 20ff75d660d6d5ee3dfa7a72cf12cddf1cf2050a77aa126eff41b4d8a66c12b857ae6c41c455948ef55115bf528d32360cff146e5cd09dae2da646b624923cd1 SHA512 47056f27631aba63f320f3db12a6cf4994a1bb3584fd62bc4214eb529ad6a58a335de3359466a0243fc060594e5fafea5b7b7b3a3fba506689e07fde0326ff70
 EBUILD tomcat-el-api-8.5.83.ebuild 1076 BLAKE2B aa49bde0626113e99ce532715428320ed9043a75951bee403b4d05487f583d6dba2b8da3212868abb36315f1dfd39d4d57d6d9323c6209f3d3f6df10e05db69b SHA512 322f2be36089bef983e2b57e326f99efa85fe336861e98cd1b865d03069b7372b2cc56725c1e179d4f483ed7796a5953fbca89c537bc83eef9ec659dc58b5551
 EBUILD tomcat-el-api-9.0.68.ebuild 1076 BLAKE2B 45700d1bc3ed251e678a22e6a1bff5a4b868adc0ec00041c19cf172dae7e2bcf6893295d47f574a1a19088d61fda870281259cf9def483dd5f950f3077ec4d24 SHA512 5066ba19d61dec2d1bc18f9843947f8f041b134d82a415b9ec7592a1df7cb4682e985dcf57e74c65bfb71decda5fda3cf16901990fc7838d629c93543248e94b
 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
new file mode 100644
index 000000000000..c8754c29a16a
--- /dev/null
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild
@@ -0,0 +1,36 @@
+# 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-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest
index 7156f4e48ec1..b98cbf69192b 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -1,9 +1,11 @@
 DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
 DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c
+DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
 EBUILD tomcat-jsp-api-10.0.27.ebuild 1126 BLAKE2B 7b0e41b08f2f7633a2bc9dd2bf32016a7dbd13b2d6a3958e4b6a5a45af141a68a56bd123f2596eec5ffeed19363fabe6934b8df52403352f30d36a3318812aa5 SHA512 a3a63b9fdf8894d74e6b40510c2ee2fdaa8e7fa383c67daffa020c8d388ee8390d93bbfbb83e125d0944719a16c080efacc9d340f61b821f10467b4723c51b01
 EBUILD tomcat-jsp-api-10.1.0.ebuild 1125 BLAKE2B 5c59fe6a146a1540ee6bacdb34d80b3d171f97a7c902b5cbb0e7a49fb04f2d6baaec3561dabb3a7c95d9411629bf5b0ed654535d09bd59553b2653a3456695a7 SHA512 3162b038a1dcce3557941f850e430f55d95acdbaa9916c4b5c59cb12f9afebb9bad2fbdedfb59e3cbdfb43f409dea9baaa5051ce5f94a48d889a54d091b9595b
+EBUILD tomcat-jsp-api-10.1.1.ebuild 1125 BLAKE2B f3b45e551b1e1daa68659cb713479edab10d31983a1a2ec70c83dfa84028b7bac7f85af3c07ab65447c04c1184d01a635043c31f916e49f13d2f37af604c403f SHA512 ba7f23b9bc7b74ba0c5b51bef0ba276a481455c4056461c4e340e1b2d37dc498fc76eccf12679b64e6c46ec3f31bb147049953cd1e61ae494006750c6a47d661
 EBUILD tomcat-jsp-api-8.5.83.ebuild 1119 BLAKE2B b6cb219a30b2c4f3e5b0fb390aad6787bcf3bc1ba0b8f35b8ddb3cd43d45b15ed54af57eee2dfdd66b6e21dd953cff872b73da8020d07f1db21adecb55fdcc40 SHA512 012b78a1736e4684c80fdd945a6c5923d61bce6bd3e9c53fd2f1fc4490c6bcf153569e858d209ea79b83fb1c84389600d7c6055eaa70aa3f4ad6f66a027aafeb
 EBUILD tomcat-jsp-api-9.0.68.ebuild 1119 BLAKE2B 1273b3f1f9c82d68e2f4cf035f009342921c02175f4f1431ac36920cbb48975688e26b3ee5b556280e680a6005398168c32611717c71175ae774f19370069752 SHA512 eb9c5994b8459e4c2baf9a0bf843e953d841165998499600afef7d591d12b1dddb1733810763ea7c19ba65f61b23940b78c2e680e20ed9cb426f4f70886bde31
 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
new file mode 100644
index 000000000000..b5373fb0891a
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild
@@ -0,0 +1,43 @@
+# 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-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index c7427b623bcc..b97b02c9011d 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -5,6 +5,7 @@ DIST apache-tomcat-10.0.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85
 DIST apache-tomcat-10.0.26-src.tar.gz 6153701 BLAKE2B fb16f83cf71dc97f21739c3714d2d3d201aa6b6b4242c351fabfc04ee767e59b6e376c7c8984dcda12d6942835221c55d4451b2d0a1245a2dbb73636c93da47c SHA512 f66387a3ca67b6b3df8504c4ae089e8f30e389811a8d0b7d2241e115b8cf712a38f3d0fea938cef7fa9745f412aa70ad47840e40e2385fbd1435b636e93b45b4
 DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
 DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c
+DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 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
@@ -18,6 +19,7 @@ EBUILD tomcat-servlet-api-10.0.23.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91
 EBUILD tomcat-servlet-api-10.0.26.ebuild 3025 BLAKE2B 2198be652150c8c8d0cb4c7dab9beca30094e184e1812038df79b193a8c3c148d076fe8164a9d0b746b667dfbe9b261da266513573352229980b3481faf4fb56 SHA512 5ea6ad3fba96aef3ff05897fb1a13f58b7b106a6b9a8dc265851747719592dda261fa6b7fca1640c1dc1b3aa4e4e75b5ba8e22d4a2797a66f8b708bdfb5ed32b
 EBUILD tomcat-servlet-api-10.0.27.ebuild 1173 BLAKE2B 7c3971c88e6ecd675d7f755e50ac0ee541018b95b920c6172531ad3fbd089d68916476551566e1cf776e8f65251bc569058639d6cd784850b9c4f6c7562db853 SHA512 1827595648bc70984c47d712209f9d448db9f1dea5a795943858ad6e1a3c79a5bc17c7322c15359cf3d0b614568919ee30426464be11de6f6201c25492e42ddf
 EBUILD tomcat-servlet-api-10.1.0-r1.ebuild 1172 BLAKE2B 4f7067a7e31c04bf55c66c0fa25c10a3744bc6e010db04ad922739b4ad57130e667da67c3513636ecbd61f126866e9edafa0c05dedaed2a60ce4adc875183971 SHA512 73640743378e8914d06fd4ab02cb7418356b03b152e24272a3600a14eaaaa85045c8e4f47378c3bb397a6bf08a9366fe13aa3f2bf574cdc6cc33ed1ed10756e6
+EBUILD tomcat-servlet-api-10.1.1.ebuild 1172 BLAKE2B a0e939bb1464ee12c11cd92ccba5ea6c868aaeea83fe0dd4a65d44ff5b04e9bbc7a8723575796833123232b351456e313530aa86cb9fdb94f1cd336bb355f9dd SHA512 98311d5bdcbb1e784bb8228b185c78bec7d46f06ec9ef6bae0f6bfc6f58dc0d5e5bc36b84df604864a332a4b53da5b750a092c99dcde8e1175b996b3a97433f5
 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.1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild
new file mode 100644
index 000000000000..a546fc617378
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild
@@ -0,0 +1,43 @@
+# 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"
+}