commit: ca5f92d565c597f3a0e9bda93738b78dabcea8e1 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Nov 12 07:09:42 2025 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Dec 14 17:44:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5f92d5
www-servers/tomcat: drop 9.0.109, 10.1.46, 11.0.11 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/44599 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> www-servers/tomcat/Manifest | 6 - .../tomcat-11.0.6-avoid_eclipse-ecj_4.35.patch | 43 ----- .../tomcat-11.0.9-avoid_eclipse-ecj_4.35.patch | 53 ------ .../tomcat/files/tomcat-9.0.87-build.xml.patch | 30 ---- www-servers/tomcat/tomcat-10.1.46.ebuild | 182 -------------------- www-servers/tomcat/tomcat-11.0.11.ebuild | 186 --------------------- www-servers/tomcat/tomcat-9.0.109.ebuild | 181 -------------------- 7 files changed, 681 deletions(-) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 2488567092b0..714c1f23051e 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,12 +1,6 @@ -DIST apache-tomcat-10.1.46-src.tar.gz 7255282 BLAKE2B 36d3448d5416d13b30ef75a8cebf7f6944c052945c6038f3901a76dcb1a4acbd050fee66aa7471055a33b4b443f183a2dbe589a0f0b295b49ec3d1589d4d4eae SHA512 4abb5a5fad013135c4107508e4530673e4af623658b6aff5c4fc18fd557dfca37b58a9c5c0479e52e240b53d469ad91a34225a80b718aa2f91b8d385d16d9682 -DIST apache-tomcat-10.1.46-src.tar.gz.asc 833 BLAKE2B 41a78695b8e93d2673727da9ced935ebb1e6228b57481fa133e81c36f1e9fbfc000ff7ff3d4db3feede2d3b24c2cdca4b6d488d7a4a4775a470a19edd89cf738 SHA512 cff0be2aa0c395b729b600b029f1be98b288e8c9e7c1a08d7fedae8f85d681480c552b51f239bda80a65b392351205d795cd9acfc918291d2ee62a4268af2ade DIST apache-tomcat-10.1.48-src.tar.gz 7269762 BLAKE2B e3458a202e9e42000300926c26391d3cf16f827276596fc598b7e822c60c7ea16910a4d9093e7c26c07e504258d75d97a8fbcade37e7886d2c51836aade701ef SHA512 2f136e84e87811a31fde122f14d3b4aa6f0fd4a9e1a78015ff68ec31898cb8d7c1e14363464507ac987bc74b40cdfffc393faa0e04749ad9da8f32c6e84b5421 DIST apache-tomcat-10.1.48-src.tar.gz.asc 833 BLAKE2B 77143a702afd36f779417dec5c0b838928fda5520536e706f1b27f722d133112488351fd433c5acc6dbba80c39bd671cf7c251ca323428348b0e5197528d9f88 SHA512 8ce77c7ed01c97eed060159a26a24ebe48d0df06200ebdc1d2a27759c46987da15309958cc292095873e2b3f26da17f4151e93a918a8f4195b402390aa977e65 -DIST apache-tomcat-11.0.11-src.tar.gz 7174430 BLAKE2B d38e7cdb8304f6635e729a4afe6d70b3f8dfd375aebff86a08d984013e6ebd05b8baa5c4ce11abdfec94de7f3dec83336058eaeafc84e643f08d1bef0637df36 SHA512 ecdd59ab212036d5d0a1b043ca5e27169e13601d7f3c2b394b26396feced027b77694711e115a76065ff394999ed69c9829f780460069f51e03be086c3b4e7b6 -DIST apache-tomcat-11.0.11-src.tar.gz.asc 849 BLAKE2B 9358f07e7c08a3f3005a24f83c9c7689f0e69eddc2e396b730377baec9fcb7033edda03ea23bfc776602cbc587174f2ec6e5f8bae256f1b489b16ca1f96ae656 SHA512 3bb76a43281aca4d35f2e43d0b455fa58726a6636099d92f697cbcd520ed3a428360eb9d80ce6efa80ab5a5456e7c915b1df2864dab99caa7c4534f662710e78 DIST apache-tomcat-11.0.13-src.tar.gz 7191673 BLAKE2B ec4be9ba9f7d5d999bc53214419bfe028351b921dc7b3f97c900982a0152c7d8f42d8b0dc73dd5c808cd1e8e904f558b6c15112008ac573b13656d4311201c7b SHA512 be2b4c7ccdb7065f6862dd90e0ca0d09de08d68d25472044736a35e96dd6d3c37f8606ef2b321051454e31d210bf1a08a2cf6099a763d8d6610632666070315c DIST apache-tomcat-11.0.13-src.tar.gz.asc 849 BLAKE2B 5380a3d02580c48ba4d0a6551da2d36872354fdeb6c02c220a3de7c2bf70563ee7b23ab91f5e955dd3ffa7c272706c1373e36f76c5986a74723c893f2a99a2e1 SHA512 03395c1f06bc49adf3d8eb1fab81fe0ed3cbeaca540f26e6060158b7ca27b1213b34a0fe9f123d26d2d5e8a9b8440c0d0c03bd1dd317c27df50db89ede12de9d -DIST apache-tomcat-9.0.109-src.tar.gz 7396259 BLAKE2B 78140ce85281ecc1f12d080c37af7bdd738030a61fd0a356c625550c3e5f260c2944e3a01da03c2b39020b4d51b683e8c2825208b011c3afe6079e6771d60d90 SHA512 5ff1fdc882ffd3e3bd05be17b6dc45f914fb2b6553f2438ef30f929f2255cde49b1bac3e39f1a1b1440664b5477e64bde6c408a477e7eab097aa8cee01b82850 -DIST apache-tomcat-9.0.109-src.tar.gz.asc 833 BLAKE2B f2b1bef430cec5564d330cb122e2353464deeb1f5361768afaccf5bbadba177f14c6dfd97e9be85f3adcc33e890facb5824000636be47945b447976cf3ac04f7 SHA512 2387801b7a26d4e3406e0af7265d3174ece25433b78ebd9e8d346c98371eb2a62de6b31a94e7cbf8f46cdd66f1682876c9ea8164168b56584cbad2669290737b DIST apache-tomcat-9.0.111-src.tar.gz 7411297 BLAKE2B 7728dfda254fedb2f780c1b56c41b3ac9d9bc8a447f60c11884ae5e2940acf622e47aa4576975e9fd5f981d99b1ebe6cc82af842453629cc28372f082602c3d6 SHA512 aa27b0e104cecb2d75853fc46ddae2bccda12ebb1c0e86e51731f7183028e17970dbacfd9d0f5534b32ea4c1d1f68bb0dac510aa71944ea686a545cf8e5adb40 DIST apache-tomcat-9.0.111-src.tar.gz.asc 833 BLAKE2B bb6b6a86a251f3ed2daf9ce20af902fe99593c9c3185f5f6e9ddbe1f98baac51557a7e710942d0f444690b9a0b755fca7543f7f600df4f55e966a9c86fe32d91 SHA512 2592cc95ea36a951c96063992e3a3c8fd08e23367e2fdee6455673d461de3175d3f29ed01b255820e3cb37318635d65a18635e5e7b3a0879b69c74ac0cf0d21e 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 deleted file mode 100644 index 8515cab96a71..000000000000 --- a/www-servers/tomcat/files/tomcat-11.0.6-avoid_eclipse-ecj_4.35.patch +++ /dev/null @@ -1,43 +0,0 @@ - -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-11.0.9-avoid_eclipse-ecj_4.35.patch b/www-servers/tomcat/files/tomcat-11.0.9-avoid_eclipse-ecj_4.35.patch deleted file mode 100644 index 3c7c8fcfaff7..000000000000 --- a/www-servers/tomcat/files/tomcat-11.0.9-avoid_eclipse-ecj_4.35.patch +++ /dev/null @@ -1,53 +0,0 @@ - -In order to allow building tomcat-11.0.9 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 - -diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java -index 1a267be..79b56bd 100644 ---- a/java/org/apache/jasper/compiler/JDTCompiler.java -+++ b/java/org/apache/jasper/compiler/JDTCompiler.java -@@ -332,9 +332,9 @@ 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")) { -- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_24); -+ settings.put(CompilerOptions.OPTION_Source, "24"); - } else if (opt.equals("25")) { - // Constant not available in latest ECJ version shipped with - // Tomcat. May be supported in a snapshot build. -@@ -417,11 +417,11 @@ 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")) { -- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_24); -- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_24); -+ settings.put(CompilerOptions.OPTION_TargetPlatform, "24"); -+ settings.put(CompilerOptions.OPTION_Compliance, "24"); - } else if (opt.equals("25")) { - // 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.87-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.87-build.xml.patch deleted file mode 100644 index 354cfeaa190e..000000000000 --- a/www-servers/tomcat/files/tomcat-9.0.87-build.xml.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 -@@ -1451,7 +1451,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"> -@@ -1512,7 +1511,6 @@ - <exclude name="${jdt.jar.filename}"/> - </fileset> - </delete> -- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> - - <!-- Add sources for examples --> - <antcall target="examples-sources" /> -@@ -2358,8 +2356,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/javase/8/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.46.ebuild b/www-servers/tomcat/tomcat-10.1.46.ebuild deleted file mode 100644 index ba9574548e59..000000000000 --- a/www-servers/tomcat/tomcat-10.1.46.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# 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/ant-1.10.15:0 - 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/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:21 virtual/jdk:17 ) - test? ( - >=dev-java/ant-1.10.15:0[junit] - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-$(ver_cut 1) )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-$(ver_cut 1).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.11.ebuild b/www-servers/tomcat/tomcat-11.0.11.ebuild deleted file mode 100644 index 75aee543f48a..000000000000 --- a/www-servers/tomcat/tomcat-11.0.11.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# 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? - -ECJ_SLOT="4.37" - -COMMON_DEP=" - >=dev-java/ant-1.10.15:0 - 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/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:21 virtual/jdk:17 ) - test? ( - >=dev-java/ant-1.10.15:0[junit] - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-$(ver_cut 1) )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-$(ver_cut 1).apache.org.asc" - -PATCHES=( - "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch" - "${FILESDIR}/tomcat-11.0.0-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 --build-only 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 --build-only 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.109.ebuild b/www-servers/tomcat/tomcat-9.0.109.ebuild deleted file mode 100644 index f87310543866..000000000000 --- a/www-servers/tomcat/tomcat-9.0.109.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# 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 - dev-java/javax-persistence-api:0 - >=virtual/jre-1.8:* -" - -DEPEND=" - ${COMMON_DEP} - app-admin/pwgen - >=dev-java/ant-1.10.15: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:21 virtual/jdk:17 ) - test? ( - >=dev-java/ant-1.10.15:0[junit] - dev-java/easymock:3.2 - ) -" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-$(ver_cut 1) )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-$(ver_cut 1).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"; -}
