commit: 23fee1102431c81478db7fd625927986fb1bbce8
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Jan 8 09:16:11 2025 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jan 8 10:40:58 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23fee110
www-servers/tomcat: drop 9.0.97, 10.1.33
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 4 -
www-servers/tomcat/tomcat-10.1.33.ebuild | 179 -------------------------------
www-servers/tomcat/tomcat-9.0.97.ebuild | 172 -----------------------------
3 files changed, 355 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7ed492aaeeab..efdab7147a4a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,10 +1,6 @@
-DIST apache-tomcat-10.1.33-src.tar.gz 6926625 BLAKE2B
4502c02d618569eb9f526769877f0817722d4a474a72ad9020c2fbf86ff6ec17599df547d019d81656d433a22efb7d81c56902e435bf3fde636849957070cdd5
SHA512
63ef609bbb2d664f5fe969216eee157a3f45f040f2aa90b6885c9ebe706099896beb620b7659d2dc8c759a08a0370d7849f5e664844e3b78bc82d521617bfd8d
-DIST apache-tomcat-10.1.33-src.tar.gz.asc 833 BLAKE2B
8bf20910fbefc277cf7e677c06aa3476ad4190f38fafb820063e4af59854d955666ff77eede13e6a7a952a21b88d169d9601655dcfcd38682f87db5522310e2a
SHA512
111e8d7c7d7d365a8fee2207307fb64685a3c77e1b87a73ede8fe87a083e3e2f3425c41ca6072f6ded51ba6e59ff2997b7198f048d86daa1a947a91fcfe276e4
DIST apache-tomcat-10.1.34-src.tar.gz 6946871 BLAKE2B
9e25c8fd0ca4a8d19e2d4f912bb904d691b98b1597fbdd823a3381bdf99073a00cc8655924ef733c13214afb2a9ef92f75708eb4454e266245ad8861f90f64cb
SHA512
0124d92eb1d184bdce1a50d5934958a0c796460a7157a8622aeee2b21060f5377198939a0260285bcdaa25cea42b880cb97575469a63f7b33ec22d532927e6ca
DIST apache-tomcat-10.1.34-src.tar.gz.asc 833 BLAKE2B
564c266e4967967450c10944a388c3df051971d00a632d8ecfe68f0a8741f89b270d965f8f62ff8cdc1f097f184f34025ec18b0e4ecfef26bed3a8db9ff8e028
SHA512
2c96d2f89f2bfc449516cdc06682a5404168cdd9e473211444a141aafe3fabe743d68d4e7e32c8a2bc2bb23d875e09c28781ca4cb33e9e13288086c97c20e891
DIST apache-tomcat-11.0.2-src.tar.gz 6877090 BLAKE2B
3ed1b184ecf43d12678d3682830065562ce4442aab571ee926b91f509195e314aeceeb10ff2ad935332b38607fd09237eeca274d526df9b7daad17fe6f144508
SHA512
38c5b9c75edb7e620a89376deab0c2e2af08e5853021e207ba26f8b4a2fa1dae2aecffb79bc9c443eb989c96317268a947a42b6869ca2cd827d2bda3be426433
DIST apache-tomcat-11.0.2-src.tar.gz.asc 849 BLAKE2B
0e670e67396068747d5371da13135696be8b4555892e1cd8338413f7540ded08203c986074cfe42bd077e475a30a05299fd35def29e8a089e570e68be473366c
SHA512
ae10b95f4a5a9e922721d190ff9abfeeb62d5814277b076e1d12a5dec64491de8c382273a1b4ccc3f3d193ce561ba34214334048a9e28dcb22a50458d9103016
-DIST apache-tomcat-9.0.97-src.tar.gz 7072346 BLAKE2B
ab6e4359d01016f83d66ed516471701c4a9ecc6c4bffc13474978b7bf01cf4336ea88a6f3c3bb9e97f63f9056e4b3fc7d766e144f100862b2c0e5540109f46e9
SHA512
e0500e0c7e4af40f0a6db845b73f41423a7b7746e110053c36744fc376a0db96d141069035171f5b6efdf6011c155cbc29815cd286a0508cefaddb776909a00a
-DIST apache-tomcat-9.0.97-src.tar.gz.asc 833 BLAKE2B
0efe929bc4e6be06cfdb4ea424af5d7a07633aeab42320b46eb724f25a3bdb8eccee0cd7cdd437579d49c63e40b4bfe6689620048e3a23196e5b34345a9c7c17
SHA512
00ae9e08cdec0ddee501ba51f42b44979dd2a9ffd8211eb121eb8851cd8332e2ff00de25d1ba517a494b5ef71b5ae8934a6fbf8094623631bd2cc70c49c0140c
DIST apache-tomcat-9.0.98-src.tar.gz 7091158 BLAKE2B
040f6a1a02140b85e324f1a17485c3866d9d336f8c032e7de4b8e3880d405339d43e853cf0999ff3e5e4e12c0551d64a39a3bb218dd0cad4cc5124ce2915a3cd
SHA512
eb380dae515a259d23d5311d0b96b8ef5068c0d8d72da215410e5475582d2ff82182b7331e0d197eb993d8014a99ea40290154a343e961a07ed02be6894759cc
DIST apache-tomcat-9.0.98-src.tar.gz.asc 833 BLAKE2B
2f232eeb4af506cf81a32ae6f2bca8c2e7b7c3bc8cc8fade48685fd888e7bd7ea4da1967eb815ae2321d2a02ffbc5598f1ecc8a52695d41e3b2830447331b1ac
SHA512
fb6f36bb4a19cc52c3bc1f7d6ccd922db7b61e0274a0aa93e5d79bf2ca0938446509b1e3f966963a583ca9a513fafc9d5c9039bac9d7a03dae1cdd94a722ef3b
diff --git a/www-servers/tomcat/tomcat-10.1.33.ebuild
b/www-servers/tomcat/tomcat-10.1.33.ebuild
deleted file mode 100644
index 335e0c37e0dd..000000000000
--- a/www-servers/tomcat/tomcat-10.1.33.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2024 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-9.0.97.ebuild
b/www-servers/tomcat/tomcat-9.0.97.ebuild
deleted file mode 100644
index 65bb2104fdd8..000000000000
--- a/www-servers/tomcat/tomcat-9.0.97.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2024 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.87-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";
-}
