gentoo auto-resync : 11:04:2025 - 08:43:58HEADmaster

7 files changed, 626 insertions, 0 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 0f3535c3585d..faa8e420a274 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 42581dab9394..273e79d10de6 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,8 @@
 AUX tomcat-10.1.20-do-not-copy.patch 1164 BLAKE2B 4df0dc611ab7694d784adfaf132502c8e11b60f91a8dbb5e1385ed44e965f175660e9d5ed29d0e32d1b77a614d1bb41499bcc987e109d41bc1acd5876ace3c0c SHA512 e7a1f058566a44b6b88f3c968cddb7effe9301aadc199d127bf8269c847ecc6a2c4ad8d09b3d489dba49eff79e69e033e3acb729fd7337ec8bb378aa65c0bdfa
 AUX tomcat-10.1.20-offline.patch 562 BLAKE2B 338f3fe3604004ab2920d67c39facb41d506a3a56c5fe7d1c11f4fa11b8391aac7b0088b46be3b4ef5ffef7590b525f09a53985abc8d753999a548ea9a2f31c5 SHA512 0f814adf5a837985b14aca22fd1e41f36eff74c6065577a5fb46df19c67cfd85aac86edbdd12f009014c9a96342baa8db74130d0020c0390e74bdfa5cd7a56e6
 AUX tomcat-11.0.0-offline.patch 562 BLAKE2B eaadd020053976c37d8a1e77d7a19c65b3a843c7a4ec3cc18c709f0d37726d39135bc603c4d33a45efebaa640de197301f972ba5be486dcf834a1a91519cb327 SHA512 5b3b629623152fe2fa6f29d4078b5af9128cba562faa509c9b64677eb9cafb0a88aaf2203bd599346abff7b9588d19fcff2fa9f8c2350c7855f658107cbd4206
+AUX tomcat-11.0.6-avoid_eclipse-ecj_4.35.patch 3179 BLAKE2B 67b8a76576e4ed1d1fdb777c8b6dfb7ab67e9c5d8046a1ebf057439f5a4d96de9cba191f9d4f4759bfae70b1b2a514619aeec696989a3328e8d6e53360d03200 SHA512 b10fafb0ee0abd3fd5bf6ef373aed070769e6bc6146064e810a9f2995dcc78e10f641af4c19ce68b7c60d42fcc0024b47ee651de3e7eca2ab4701505c1c9fe38
+AUX tomcat-9.0.104-build.xml.patch 1250 BLAKE2B 4825624dcbd4e8ebadd75d8c7828ada05a56c1471ec6c8bde2c024ebf42a7959fb39061a5d9a4ecc21fa301fd70c3255b0f631a6cea3319efb0885476ce60aea SHA512 4e7d587700eefd81b6b620ea6578f5ae08fb268ce228859265af0aa43e73ba40a2a6c577e042a4600e78558188685d045ee9cbdf4f7d4d520f4ae2535da1c38b
 AUX tomcat-9.0.87-build.xml.patch 1240 BLAKE2B 26fbfd5ba353fd3f5a02a1feb984eee7b6e5b9ed1f711e969e135e87761f0b6be5503abf93a53ecdfa7de35e00765f1c3a7e057702fe14d62bfb58cc93356b84 SHA512 b62fc4d3a0d2d1134587fe284956a4961b353c730a4084e50f4cbf1ec096a2261c8c77a58940c808e47e5c0a8cdbffdbbb74de45de0251bddff9e461a5fe450c
 AUX tomcat-9.0.87-gentoo-bnd.patch 1432 BLAKE2B 07964d271be70afe13116c9ce27c956a6812f5da0237b19a1bc915ac3a0abd1e3e1ad89d59049152c1f3f24b84a45a076375f7dc6784c87ebac440b15ec5557d SHA512 210754982a5ac789aecedd9916d45190c8ca92661b9f492d40b6c4f0758c69a2d5b961150cc83573c9b7890a73fc4e8bd130a2837d6de9164fc8a18bee0e7676
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
@@ -8,11 +10,20 @@ AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b44
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-10.1.39-src.tar.gz 6988808 BLAKE2B a0b5c962660ce32d19d1c3470c978b6c40aec3c50f741f96ece6bad4f63805c531a9ad2255a111348e11c9f05829ac68f45a43a75e422aa5e01b6ab5285fb798 SHA512 ff36f5ba20b5305f207b80a8f2f781b8075d334de327b36f70846a009d0441e993315ca1568bc67cbbdc09520cfbbb768437c4122699507bfc9b8b5e971a9151
 DIST apache-tomcat-10.1.39-src.tar.gz.asc 833 BLAKE2B 6979ce15e50cbbe5ff610d32dfe32b42ff50f53fc3de6bca127e229551882dd1f5d59907166a35d7a5e036365cb2c7ec14d1170f0f8da399290b53e0e3883eb1 SHA512 e99937734460d80ca431610b8496a56871f9536cd93eb21ad7c07176855dcc5157043ac77423a7cfd9c5ca527bef7c53d178ab6fc9f7cfdaed663b2cda727664
+DIST apache-tomcat-10.1.40-src.tar.gz 6995521 BLAKE2B b196e637d488501cf6b309d452472e44770f1bd2a5e2fd3f83c358388414dd660509c437d266537f14b9571a067ccdbede86fb90ae9ee60c8cfaf018caed88c8 SHA512 8174f0c6a4deb505bf8edc29917a237a52ea20166d582849ca7d5623f318c34f8adfd0576e2b4434292507d0237a1dfb54b9d496a379b1db51d46225ab6f5d87
+DIST apache-tomcat-10.1.40-src.tar.gz.asc 833 BLAKE2B 5b28148654ea28d637529f40388c9f1f0a9f415f131a4ee25c6b0667da03ee5e071363490c5b966b70c01e4efc9184f2f834307726ee2b06320870d2bed98e81 SHA512 0b2f3aa14613dd507d11451b922cf570e065f13f7f070a62805ccaebb2fcd2c3ae3ac66caee5d6161d94ec0b4706e314643a1465c8e7988ba34a936eff96f29c
 DIST apache-tomcat-11.0.5-src.tar.gz 6918820 BLAKE2B 90789cf6cd68cbf813ce47a7860bec03f22f00fabf90df7742e9e37a8dea458445f54e9dea4ac26d9b5b2143c337973a89c71af16fe3d0d500115b7fb158c5e4 SHA512 58d864c0a560c840b303d20b34b1aeb9c03a534bb58badcf407144d1797d355f8f83e91963b8a8f656cae6abd6f9228206eeec3c5ff61a6318f5a9393ee2f91a
 DIST apache-tomcat-11.0.5-src.tar.gz.asc 849 BLAKE2B 2ebf1daddf32988d7e708eacf2d6d606d671f55fee6061d4d3381f029eb616a3e367ad982816ea63eefa8fd75b4b1f6360409ca3f9883519b72c1a7896270eb9 SHA512 c1f7d37e5e81a94fb5e5522831e772d29035b2e9684a90471ae45680d18ab536fd8acf72b06f648635df9e0cc32a69bdaab38442598684d388eb4acf9015cecb
+DIST apache-tomcat-11.0.6-src.tar.gz 6923455 BLAKE2B 1381bfe42390235e9726c5704ff943707b3f8f776a25ca8093f013b39bdcf219eb43e0151eafda7d86b9d7f4f2f6d4d117bc9f9be46b77147287387109967771 SHA512 83ac60a058eb1fdff77b94708cd1c54efe7754b2dc4db6fe9ebae58791db74901a9646707d3e5f34856d134fa9a50e77866a3c1726dfec7622b064cee3265b9f
+DIST apache-tomcat-11.0.6-src.tar.gz.asc 849 BLAKE2B 21ac13391c6fe25496ede76af999032dfaec14edb3d8babe99bf63f6fed047eedb240c4aa557370d787c62cf2169a7e4333a036231f81f2684b4407b30fbf55e SHA512 9a42f9a7264c8f757b710b1cf6ab0642b0446838b56644ef51799b0f2c7202d03e7fd57d89e6bc42fedbf8ab42838128151554d5109e5206ca36853e3b9eab9b
 DIST apache-tomcat-9.0.102-src.tar.gz 7133459 BLAKE2B 211ce90f9b3ea4fb4ec213ed4523c5934fd105afa6e6b9664297d26e3fa21cc2c61f8f5f9c88bcc9af3a2a2c27c13417053db30dc3d24572f61c54607aea1153 SHA512 2f06b1432a217470097704040cd7aed70e169981140f78c6fd6d46d55b2fd36fa174d85f34f288138f9373469d8c98cddeb3cd030c76dc69c724ab3e3b978095
 DIST apache-tomcat-9.0.102-src.tar.gz.asc 833 BLAKE2B 79fd45f7d94b66c0140c20dbf2711005e512e2709dc105d78e774145a07ad681c2264bef56099329db5d371252dcad4d6b7fa2762534db691ff383ff5c7b84ca SHA512 deb59a0dd77dcac3ce9996360883341d9450f00a6fcaedffb1d162e37344cb28cb816d5342b3d5c401edbfa76aae8b474c5228210f1a414d5ac1a2c71a5d9020
+DIST apache-tomcat-9.0.104-src.tar.gz 7141508 BLAKE2B 125a38e2e46e190e84368f7269968b5724cc84dea0b1ced5f6edf0fc2f494b6fb60d70b27fc046ce4007565b428ad922c3e14ed8b0f1960726b0cc67d01d95af SHA512 d2d66a1e0bf55cd6379154a023aaccec5e4007a95412e7207ecf729d315c6afdc3125a985cdf1289ad66162a180f24798161436e99d792e24deee71aaf521a4c
+DIST apache-tomcat-9.0.104-src.tar.gz.asc 833 BLAKE2B 2d42e131df4c42dc831c0d0b8d2068083c5812e500737e84f3c6a37a1a695311e871b2c1ad7bacbdfd53b2400fe1211039bdcfa48908335551bef99a5de7da89 SHA512 533f81f8dce8f840c19796d306565aff4bd16797dc3c2786ae6a748e2b91214768849036477d465e1de522880458bc35e38424a2cd30e13152561df575af7947
 EBUILD tomcat-10.1.39.ebuild 5434 BLAKE2B 171c19188692b17959bf50a19ba7cc901034921930d5b392dcbe28a7d6a573ebb9dd5b5f6bb8a850a1c119a57e25f6deccb437047651d482a1e5892210af2bb4 SHA512 e39ab519c32d819838fe1beef127be3a5e862f7c3b57ccb77d02827398577dfa0cde3d2c7f1d888c03e9a8b30d236a3121db557e7ed7b3433d21ccac17ff0d4f
+EBUILD tomcat-10.1.40.ebuild 5435 BLAKE2B b0eec1155288c70b85a967c8f76b3e73800c0a0dd4b7b2a0af9ec5ae3cb15cc1c216be07bb79df9d69cfff5056682f30f13299be07ca27d0e4395d68543ff241 SHA512 1caad80ce202fd2fb59ad4de24e0159744c02ee1a21aeff87fe7a904ea31bf95e211d10081db2fefe475009c91a0d92d31e9237fbea8c590f8b421328eb4978d
 EBUILD tomcat-11.0.5.ebuild 5549 BLAKE2B 9e92c011d18c1217de0247a5a522e098219b47ec5bd7676fb1657361b36fbf0e6dd32c54dd947967456d4a57c5de54d6369746ed13b45c97bd029c1730d9da90 SHA512 b1a64f98c3fd94f73736adeb38c4a66233d26746b6d2fe264410b82fdff317014f722da158f9efa3f3eaa885afd1181ab98790ec9360fab0108338ddf42a409a
+EBUILD tomcat-11.0.6.ebuild 5815 BLAKE2B 32c8761ca451a47317f10f94327a64275c71112792dfcb0c38cc0b318166dfb15836e9768a04ae7cf25977202919172b443ee0d39c3fe22db6bd99413df1bce8 SHA512 f98ddf127ca67e04b86802f11e66a905f99a987500f442d75ba074faa4f88aa1827e0076e9e80c171186a0911e9c4a48f020a97a560d13987fa89be0748bca79
 EBUILD tomcat-9.0.102.ebuild 5014 BLAKE2B fe4e709d0f675dd3a87d272cbd1bbd9ab55672d8a1770951a6a92f779c793ea9074a214bcf43cba821b028718ecac59cb172730c385050ab728ae2209d84fda5 SHA512 fab72dfd89c51d1bd13b2859d9330f0cf0b3a8e0865658cb7a9297caa75a16873e1bd54c181477d0bc8e6e002e30efd4cc5583df43926ed3e63e15d8e86a625c
+EBUILD tomcat-9.0.104.ebuild 5016 BLAKE2B b83df22afc4999af3fec7d442dd6ad92448f73fe8f5198535e051640b59bd7d5187be30b48f4a60d64815203a9fe812a950522febbf1e980bc867a4cce70cb37 SHA512 33bdfb8d6f68df937acd014d2e879494d95ef4cdc4af78887b941f05e95f2b8b4530af3de22e38f0d07d758b4d83479dafa5c6f0d5b0a017f5cbc48e93926ae4
 MISC metadata.xml 699 BLAKE2B 66aff1137e5d4ad92749176a5375c1c27c1e6cde936e05ce904d965eb71a985c421235917742d4065765e1ebf9f9e3faa51c3de109a9e5a169000b4263c3cd97 SHA512 b50874d1e741835bf8cb839517241465018254eba1ddb0e691f2b5b188eca97dd27394c29d2082654049d9ee0898c1e5e4e625666cf8abe029b8e6085122d9a0
diff --git a/www-servers/tomcat/files/tomcat-11.0.6-avoid_eclipse-ecj_4.35.patch b/www-servers/tomcat/files/tomcat-11.0.6-avoid_eclipse-ecj_4.35.patch
new file mode 100644
index 000000000000..8515cab96a71
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-11.0.6-avoid_eclipse-ecj_4.35.patch
@@ -0,0 +1,43 @@
+
+In order to allow building tomcat-11.0.6 with java 21 we have to use an older version of eclipse-ecj.
+We cannot keyword eclipse-ecj:4.35 as long we don't have Java 23 or higher keyworded.
+Otherwise compilation would run into this error:
+
+    [javac] /var/tmp/portage/www-servers/tomcat-11.0.6/work/apache-tomcat-11.0.6-src/java/org/apache/jasper/compiler/JDTCompiler.java:327: error: cannot find symbol
+    [javac]                 settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_23);
+    [javac]                                                                            ^
+    [javac]   symbol:   variable VERSION_23
+    [javac]   location: class CompilerOptions
+    [javac] /var/tmp/portage/www-servers/tomcat-11.0.6/work/apache-tomcat-11.0.6-src/java/org/apache/jasper/compiler/JDTCompiler.java:415: error: cannot find symbol
+    [javac]                 settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_23);
+    [javac]                                                                                    ^
+    [javac]   symbol:   variable VERSION_23
+    [javac]   location: class CompilerOptions
+    [javac] /var/tmp/portage/www-servers/tomcat-11.0.6/work/apache-tomcat-11.0.6-src/java/org/apache/jasper/compiler/JDTCompiler.java:416: error: cannot find symbol
+    [javac]                 settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_23);
+    [javac]                                                                                ^
+    [javac]   symbol:   variable VERSION_23
+    [javac]   location: class CompilerOptions
+
+--- a/java/org/apache/jasper/compiler/JDTCompiler.java
++++ b/java/org/apache/jasper/compiler/JDTCompiler.java
+@@ -324,7 +324,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
+             } else if (opt.equals("22")) {
+                 settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_22);
+             } else if (opt.equals("23")) {
+-                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_23);
++                settings.put(CompilerOptions.OPTION_Source, "23");
+             } else if (opt.equals("24")) {
+                 // Constant not available in latest ECJ version shipped with
+                 // Tomcat. May be supported in a snapshot build.
+@@ -412,8 +412,8 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
+                 settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_22);
+                 settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_22);
+             } else if (opt.equals("23")) {
+-                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_23);
+-                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_23);
++                settings.put(CompilerOptions.OPTION_TargetPlatform, "23");
++                settings.put(CompilerOptions.OPTION_Compliance, "23");
+             } else if (opt.equals("24")) {
+                 // Constant not available in latest ECJ version shipped with
+                 // Tomcat. May be supported in a snapshot build.
diff --git a/www-servers/tomcat/files/tomcat-9.0.104-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.104-build.xml.patch
new file mode 100644
index 000000000000..753661661249
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.104-build.xml.patch
@@ -0,0 +1,31 @@
+1. we don't need commons-daemon
+2. jdt.jar is eclipse-ecj.jar which we provide as a separate package
+3. javadoc would fail without network access
+
+--- a/build.xml
++++ b/build.xml
+@@ -1496,7 +1496,6 @@
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+ 
+-    <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+ 
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+@@ -1557,7 +1556,6 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -2436,8 +2434,6 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       <link href="../elapi"/>
+       <link href="../websocketapi"/>
+       <link href="../jaspicapi"/>
+-      <link href="https://docs.oracle.com/en/java/javase/11/docs/api/"/>
+-      <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
diff --git a/www-servers/tomcat/tomcat-10.1.40.ebuild b/www-servers/tomcat/tomcat-10.1.40.ebuild
new file mode 100644
index 000000000000..0431b446752a
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.40.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 prefix verify-sig
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="10.1"
+KEYWORDS="~amd64 ~arm64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.26"
+
+COMMON_DEP="dev-java/bnd-annotation:0
+	dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/jax-rpc-api:0
+	>=dev-java/jakartaee-migration-1.0.7-r2:0
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=dev-java/ant-1.10.14-r3:0
+	dev-java/bnd:0
+	dev-java/bnd-ant:0
+	dev-java/bnd-util:0
+	dev-java/bndlib:0
+	dev-java/libg:0
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	dev-java/slf4j-api:0
+	>=virtual/jdk-17:*
+	test? (
+		>=dev-java/ant-1.10.14-r3:0[junit]
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+PATCHES=(
+	"${FILESDIR}/tomcat-10.1.20-do-not-copy.patch"
+	"${FILESDIR}/tomcat-10.1.20-offline.patch"
+	"${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean
+
+	cat > build.properties <<-EOF || die
+		compile.debug=false
+		execute.download=false
+		exist=true # skip target="downloadfile-2"
+		version=${PV}-gentoo
+		version.number=${PV}
+		ant.jar=$(java-pkg_getjar --build-only ant ant.jar)
+		bnd-annotation.jar=$(java-pkg_getjars bnd-annotation)
+		bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant)
+		bnd-util.jar=$(java-pkg_getjars --build-only bnd-util)
+		bnd.jar=$(java-pkg_getjars --build-only bnd)
+		bndlib.jar=$(java-pkg_getjars --build-only bndlib)
+		jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api)
+		jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT})
+		libg.jar=$(java-pkg_getjars --build-only libg)
+		migration-lib.jar=$(java-pkg_getjars jakartaee-migration)
+		osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8)
+		osgi-core.jar=$(java-pkg_getjars --build-only osgi-core)
+		slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api)
+		wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j)
+	EOF
+	if use test; then
+		echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \
+			>> build.properties || die "easymock"
+	fi
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+}
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	LC_ALL=C eant
+	use doc && LC_ALL=C eant javadoc
+}
+
+src_test() {
+	eant test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
+	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "Please note that since version 10 the primary package for all implemented APIs"
+	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat"
+}
diff --git a/www-servers/tomcat/tomcat-11.0.6.ebuild b/www-servers/tomcat/tomcat-11.0.6.ebuild
new file mode 100644
index 000000000000..e567904a0461
--- /dev/null
+++ b/www-servers/tomcat/tomcat-11.0.6.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 prefix verify-sig
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-6.1/JSP-4.0/EL-6.0/WebSocket-2.2/JASPIC-3.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="11"
+
+KEYWORDS="~amd64 ~arm64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+# We use ECJ_SLOT="4.33" instead of "4.35" because "4.35" would need Java
+# version 23 or higher to build which is not keyworded:
+# To use "4.33" we also added "tomcat-11.0.6-avoid_eclipse-ecj_4.35.patch".
+ECJ_SLOT="4.33"
+
+COMMON_DEP="
+	dev-java/bnd-annotation:0
+	dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/jax-rpc-api:0
+	>=dev-java/jakartaee-migration-1.0.7-r2:0
+	dev-java/wsdl4j:0"
+
+# jre-17:* because of line 1081, build.xml
+# <filter token="target.jdk" value="${compile.release}"/>
+RDEPEND="
+	${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-17:*"
+DEPEND="
+	${COMMON_DEP}
+	app-admin/pwgen
+	>=dev-java/ant-1.10.14-r3:0
+	dev-java/bnd:0
+	dev-java/bnd-ant:0
+	dev-java/bnd-util:0
+	dev-java/bndlib:0
+	dev-java/libg:0
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	dev-java/slf4j-api:0
+	>=virtual/jdk-17:*
+	test? (
+		>=dev-java/ant-1.10.14-r3:0[junit]
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+PATCHES=(
+	"${FILESDIR}/tomcat-10.1.20-do-not-copy.patch"
+	"${FILESDIR}/tomcat-11.0.0-offline.patch"
+	"${FILESDIR}/tomcat-11.0.6-avoid_eclipse-ecj_4.35.patch"
+	"${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean
+
+	cat > build.properties <<-EOF || die
+		compile.debug=false
+		execute.download=false
+		exist=true # skip target="downloadfile-2"
+		version=${PV}-gentoo
+		version.number=${PV}
+		ant.jar=$(java-pkg_getjar --build-only ant ant.jar)
+		bnd-annotation.jar=$(java-pkg_getjars bnd-annotation)
+		bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant)
+		bnd-util.jar=$(java-pkg_getjars --build-only bnd-util)
+		bnd.jar=$(java-pkg_getjars --build-only bnd)
+		bndlib.jar=$(java-pkg_getjars --build-only bndlib)
+		jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api)
+		jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT})
+		libg.jar=$(java-pkg_getjars --build-only libg)
+		migration-lib.jar=$(java-pkg_getjars jakartaee-migration)
+		osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8)
+		osgi-core.jar=$(java-pkg_getjars --build-only osgi-core)
+		slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api)
+		wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j)
+	EOF
+	if use test; then
+		echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \
+			>> build.properties || die "easymock"
+	fi
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+}
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	LC_ALL=C eant
+	use doc && LC_ALL=C eant javadoc
+}
+
+src_test() {
+	eant test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
+	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "Please note that since version 10 the primary package for all implemented APIs"
+	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat"
+}
diff --git a/www-servers/tomcat/tomcat-9.0.104.ebuild b/www-servers/tomcat/tomcat-9.0.104.ebuild
new file mode 100644
index 000000000000..548b4ce433e2
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.104.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 prefix verify-sig
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.20"
+
+COMMON_DEP="dev-java/bnd-annotation:0
+	dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/jax-rpc-api:0
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=dev-java/ant-1.10.14-r3:0
+	dev-java/bnd:0
+	dev-java/bnd-ant:0
+	dev-java/bnd-util:0
+	dev-java/bndlib:0
+	dev-java/libg:0
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	dev-java/slf4j-api:0
+	>=virtual/jdk-17:*
+	test? (
+		>=dev-java/ant-1.10.14-r3:0[junit]
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+PATCHES=(
+	"${FILESDIR}/tomcat-9.0.104-build.xml.patch"
+	"${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean
+
+	cat > build.properties <<-EOF || die
+		compile.debug=false
+		execute.download=false
+		exist=true # skip target="downloadfile-2"
+		version=${PV}-gentoo
+		version.number=${PV}
+		ant.jar=$(java-pkg_getjar --build-only ant ant.jar)
+		bnd-annotation.jar=$(java-pkg_getjars bnd-annotation)
+		bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant)
+		bnd-util.jar=$(java-pkg_getjars --build-only bnd-util)
+		bnd.jar=$(java-pkg_getjars --build-only bnd)
+		bndlib.jar=$(java-pkg_getjars --build-only bndlib)
+		jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api)
+		jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT})
+		libg.jar=$(java-pkg_getjars --build-only libg)
+		osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8)
+		osgi-core.jar=$(java-pkg_getjars --build-only osgi-core)
+		slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api)
+		wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j)
+	EOF
+	if use test; then
+		echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \
+			>> build.properties || die "easymock"
+	fi
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+}
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	LC_ALL=C eant
+	use doc && LC_ALL=C eant javadoc
+}
+
+src_test() {
+	eant test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
+	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat"
+}