summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ant-eclipse-ecj/Manifest1
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild (renamed from dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild)0
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild53
-rw-r--r--dev-java/ant-eclipse-ecj/files/ecj-4.222
-rw-r--r--dev-java/ant-eclipse-ecj/files/ecj-4.257
-rw-r--r--dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild (renamed from dev-java/cdi-api/cdi-api-4.0.1.ebuild)12
-rw-r--r--dev-java/eclipse-ecj/Manifest1
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild72
-rw-r--r--dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild (renamed from dev-java/jakarta-el-api/jakarta-el-api-5.0.1.ebuild)2
-rw-r--r--dev-java/tomcat-el-api/Manifest3
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-10.0.27.ebuild36
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild36
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-8.5.83.ebuild36
-rw-r--r--dev-java/tomcat-jsp-api/Manifest3
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27.ebuild43
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild43
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83.ebuild43
-rw-r--r--dev-java/tomcat-servlet-api/Manifest3
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27.ebuild43
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild43
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83.ebuild45
21 files changed, 520 insertions, 7 deletions
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 8445570a7ca7..00234773ac65 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,2 +1,3 @@
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
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/cdi-api-4.0.1.ebuild b/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
index b06d8b168585..03f7d747c211 100644
--- a/dev-java/cdi-api/cdi-api-4.0.1.ebuild
+++ b/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
@@ -20,11 +20,13 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+EL_API_SLOT="5.0"
+
DEPEND="
- >=dev-java/injection-api-2.0.1:0
- >=dev-java/jakarta-annotations-api-2.1.1:0
- >=dev-java/jakarta-el-api-5.0.1:0
- >=dev-java/jakarta-interceptors-2.1.0:0
+ dev-java/injection-api:0
+ dev-java/jakarta-annotations-api:0
+ dev-java/jakarta-el-api:${EL_API_SLOT}
+ dev-java/jakarta-interceptors:0
>=virtual/jdk-11:*
"
RDEPEND=">=virtual/jre-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 8445570a7ca7..00234773ac65 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,2 +1,3 @@
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
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/jakarta-el-api/jakarta-el-api-5.0.1.ebuild b/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild
index 57e07997639f..a957bf56b450 100644
--- a/dev-java/jakarta-el-api/jakarta-el-api-5.0.1.ebuild
+++ b/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild
@@ -18,8 +18,8 @@ HOMEPAGE="https://projects.eclipse.org/projects/ee4j.el"
SRC_URI="https://github.com/jakartaee/expression-language/archive/${PV}-RELEASE-api.tar.gz -> ${P}.tar.gz"
LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
-SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+SLOT="5.0"
DEPEND=">=virtual/jdk-11:*"
# <release>11</release>
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index 7e0e1d249f19..a3def728e01b 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -1,2 +1,5 @@
+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
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.0.27.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.0.27.ebuild
new file mode 100644
index 000000000000..c37846a39e08
--- /dev/null
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.0.27.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.0.27"
+
+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="4.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-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-el-api/tomcat-el-api-8.5.83.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-8.5.83.ebuild
new file mode 100644
index 000000000000..e39d522dbf7a
--- /dev/null
+++ b/dev-java/tomcat-el-api/tomcat-el-api-8.5.83.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:8.5.83"
+
+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-11:*"
+RDEPEND=">=virtual/jre-11:*"
+
+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 7e0e1d249f19..a3def728e01b 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -1,2 +1,5 @@
+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
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27.ebuild
new file mode 100644
index 000000000000..2eb2bb85a441
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27.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.0.27"
+
+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.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+ ~dev-java/tomcat-el-api-${PV}:4.0
+ ~dev-java/tomcat-servlet-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/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-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-jsp-api/tomcat-jsp-api-8.5.83.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83.ebuild
new file mode 100644
index 000000000000..960e6f41d937
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83.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:8.5.83"
+
+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}:3.1
+"
+
+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/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 6fa49d7e316a..46448b6655c3 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,11 +1,14 @@
DIST apache-tomcat-10.0.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e SHA512 19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360
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
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
+DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
DIST apache-tomcat-9.0.67-src.tar.gz 6211392 BLAKE2B 273b921ce580be6fb76d8567e5b0aec01b936518875f8470c1cee4b159519f723e606680d9986f61fbbab79cea2d027195f3debe9af59dfac786b0d0566d7c02 SHA512 33319d70c50fde71d163f66dc388ed2d5855aa4f087f7e2259adc27cc7ed30ace079d81e52def43a904c88ac670bb0c71667938b931a214470d77679108914cc
DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27.ebuild
new file mode 100644
index 000000000000..4cd61104c574
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27.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.0.27"
+
+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="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="~dev-java/tomcat-el-api-${PV}:4.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-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"
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83.ebuild
new file mode 100644
index 000000000000..e5260644b3ab
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83.ebuild
@@ -0,0 +1,45 @@
+# 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:8.5.83"
+
+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="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+# we can't use the exact same version of el as tomcat 9 implements the same slot and
+# it would prevent from installing both tomcat 8.5 and 9 at the same time
+CP_DEPEND=">=dev-java/tomcat-el-api-${PV}:3.0"
+
+DEPEND="
+ >=virtual/jdk-11:*
+ ${CP_DEPEND}"
+
+RDEPEND="
+ >=virtual/jre-11:*
+ ${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"
+}