commit:     fb4f99433047c80ee3652410845e7d386ca1d98a
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Feb 13 06:37:12 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Feb 13 08:26:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb4f9943

www-servers/tomcat: drop 8.5.97-r1, 9.0.84-r1, 10.1.17-r1

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 www-servers/tomcat/Manifest                 |   6 -
 www-servers/tomcat/tomcat-10.1.17-r1.ebuild | 181 ----------------------------
 www-servers/tomcat/tomcat-8.5.97-r1.ebuild  | 157 ------------------------
 www-servers/tomcat/tomcat-9.0.84-r1.ebuild  | 180 ---------------------------
 4 files changed, 524 deletions(-)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 3b9d9cdd655a..54b0db213bf3 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,13 +1,7 @@
-DIST apache-tomcat-10.1.17-src.tar.gz 6157591 BLAKE2B 
cd7b21a5ac698570914598bb72c1ddae76df55e36d6a04057a311d80b08375973a74dd26926778e6504b71f08d1dd2f4bf6d1396fd172bc6bf0d65479ddb7eb6
 SHA512 
1a2c71357a358a18d9cea824371d3e12ed637fcf748b42b38406c408c7e597ce8796548a66407454bc00a8c42d647006dcb3ebfaca6aceca3adbbd9cc79319aa
-DIST apache-tomcat-10.1.17-src.tar.gz.asc 849 BLAKE2B 
a517cfbddb778002c9e32e81e2bcb55e9e91a4f77909ce93736c86294dbadf8262a0dd178b236b9119a2d4c1e63367af7dfa19372f76f66519cd2bbd6ad853df
 SHA512 
b0e5937ae0a4960d709a8d120caf7e91cc0af3650d6428e3165c880506f028f451ceb64a2318dd3e9d40bad69c6bf711a0e082ef2497fcbe55e201c87e84a6c1
 DIST apache-tomcat-10.1.18-src.tar.gz 6166424 BLAKE2B 
588b60b25448cf15389449a4f6d6791e005ae69a6b4c840e49a2564a6e483ec24c028d1d4022b38dcba7b0ef9fb1723b3d58474ba52358ff01eb842d951a6259
 SHA512 
62bd651ea24ff856c02688ca6e8bb469b1ae4903c95d89c45342fa82474a0688fae5d773fb43ed8a6ef1a3933509e9b35812147c5b7b193a7cbf7cc58a97e403
 DIST apache-tomcat-10.1.18-src.tar.gz.asc 849 BLAKE2B 
139f943e369f3dcf2d2bd7238296e631d5ca16886222cfa4a715e02d4914c77014a7a284585708a341e450f749ba02b6ecbe18abe0ecbcd10dbfce21aa4180f0
 SHA512 
990333e3d10d9de5162b4fd6f44d2d5f9c97df3fb8bcdd1e4e2cfb9aebd010bc9f6be0cbead17ac57f94ea4e3ae078755e0c157666de8acdcd862c5b11f4cd27
-DIST apache-tomcat-8.5.97-src.tar.gz 6142056 BLAKE2B 
8aa2078d88fe796631c5fa5a611b84ea1622d44e4ccc4ce8bbf6e494d8bd17324fcb849d55dae3d20c9197743712e1b31f3144c3e1c1fba094f271114d439014
 SHA512 
bb2aeac13cf953b98faae35eaf4b9d95acbe334088f26acfe9ae3a0cc1429a5e56c43a6c29829f52472e6abef9077477f38f8b759972c6f11f7fc3143d041eda
-DIST apache-tomcat-8.5.97-src.tar.gz.asc 849 BLAKE2B 
920009a2da8a7d98bb358575a59e0163f6bbafc661fddf8edb1e402623ab41c7faf99fb56f3d6979e7d53987f3d27333674dc539f6e57b8eac3f2abcbe74ba02
 SHA512 
c35f3e4280dd618ec3b91d56a35c25ac3e27b16df1863466bc24a676a9f3e5a676448ba4952f1c13c57d059eedd34505217c86b9cf395a452f8a3c5132f78569
 DIST apache-tomcat-8.5.98-src.tar.gz 6148516 BLAKE2B 
bc60fca292d61e9ff03ca8598d51759c9c516b7f855f60c285c535ffaff9586c84e155a81e903981297ea62520b776a18e2b36982779dddfb5ffa0a5b50d4cfb
 SHA512 
5be5339ab962fd915fec8755194c65636f1d0975ef32aaeaa5c87fc94e8bc51b1a93cf8c35bbcced7be8947a5f89380ab495f7626b1cc540c71949ee448cd41c
 DIST apache-tomcat-8.5.98-src.tar.gz.asc 849 BLAKE2B 
bfaba67dce2899629aa015a04a59f0cfeeab334e61fdb21a7d191dedb4371c576055c1e8ca596a425ddcef8dc7f058ceabcd3bb142b8c7923093a1c042c0fbc9
 SHA512 
bd5cbb0cfd6f1b2bae1cb4bb2c7e0850215dd4a95a988f4d75ff22c9a1c1331b256cf371f4ac90adf7731eba09b35a05e9f7d0e7dde839d60b99f0fd85ceb6c3
-DIST apache-tomcat-9.0.84-src.tar.gz 6308431 BLAKE2B 
34e06e408cf27ab0e0748814df6c97905c40b6415038a67cca161f9c249cfbf26234edc3efbc6f508cc2e0a3742f2c7678e897222e2447ec5b18c1d78c26a6f8
 SHA512 
380db944f8ffd130406182ac22a4f8e4dbaaa54d74cd062261d8ff86eaefa6162a7b01fc868b66999b9ee45450ad1ec3064790166c5cb47fa4bfd7c9eb680c04
-DIST apache-tomcat-9.0.84-src.tar.gz.asc 833 BLAKE2B 
899e154db10ceed4c959fb8f85e5a1556a0b867ddda23bb3b13603384819772a89ade32f612fd4b5e3fc256092103ac9dca7954ded7847d34c5897d279da1354
 SHA512 
f7446d4b4eb6084790cf1f814eeda531364875dfa9e8e5e75e5825d5732286a9275ed5eebed405b74ba75c8a34299ec65119a6c28053fc6e937ae8029d4341c0
 DIST apache-tomcat-9.0.85-src.tar.gz 6315926 BLAKE2B 
571500b3a2fc9c6f2d9bb7df750b769fe3d7bcf327f298d1e1c5c5fbab1dbbd099a4c939f7e9b3bf2f90568da595cf882fbb8433db1122c9026bd358463be52b
 SHA512 
7883ab9adbabd817afc27881051f47918961fc0ee71427e87cb978f6b101c5e33d2a7483b942a2bb1b095b744dc35a566fe2bee77071f4f6e8c5bb9e8b289339
 DIST apache-tomcat-9.0.85-src.tar.gz.asc 833 BLAKE2B 
ffeaa791b09b8552b9165ec98cb6bb4466beef4d3c27ae1fc83bb2b1f0e593b08fea30ae7fb6e515d3dea9fb967f3439f3ba81f119060e9617e36aa303cc9340
 SHA512 
b5204fbbf181c73d6efebb332e6011d4911c39964d5bf28af835f2bcbfff05d6356f2bf98dfd91e6a022a126c77822fb3d4840d52e6ef1b5485ced799e170472
 DIST biz.aQute.bnd-7.0.0.jar 16567341 BLAKE2B 
329b3b750e917ad513a1f767f63b96b1d0b10177a0f3c079bbf07e02aff77607e1f869bae09d09709d8cfef27cd802585e7f332e2a3e3f0ee1c31a4890e53fce
 SHA512 
42b2e43f3e437c7b06f0d168eaf5ee499a4c517b1a01bec67fd6df92d01d037dd9088e0d5b013dfa1839f9dee35bf74903c1af7204712bf4aa72412e071ac503

diff --git a/www-servers/tomcat/tomcat-10.1.17-r1.ebuild 
b/www-servers/tomcat/tomcat-10.1.17-r1.ebuild
deleted file mode 100644
index 9a5e9756ba19..000000000000
--- a/www-servers/tomcat/tomcat-10.1.17-r1.ebuild
+++ /dev/null
@@ -1,181 +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 java-ant-2 prefix verify-sig
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar
-# See bugs #203080 and #676116
-BND_VERSION="7.0.0"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-
-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
-       
https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-       verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 
1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="10.1"
-KEYWORDS="amd64 ~arm ~arm64 ~amd64-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.26"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-       dev-java/jax-rpc-api:0
-       >=dev-java/jakartaee-migration-1.0.5: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-core
-       >=virtual/jdk-17:*
-       test? (
-               dev-java/ant-junit:0
-               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}/${PN}-10.1.6-build.xml.patch" )
-
-S=${WORKDIR}/${MY_P}
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BND_JAR="${BND_HOME}/${BND}"
-
-src_unpack() {
-       if use verify-sig; then
-               verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
-       fi
-
-       unpack ${MY_P}.tar.gz
-
-       mkdir -p "${BND_HOME}" || die "Failed to create dir"
-       ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink 
bnd-*.jar"
-}
-
-src_prepare() {
-       default
-
-       find -name '*.jar' -type f -delete -print || die
-
-       local vm_version="$(java-config -g PROVIDES_VERSION)"
-
-       # 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
-
-       java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} 
-Dcompile.debug=false -Dbnd.jar=${BND_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
-       java-ant-2_src_configure
-
-       eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
-       EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core 
ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
-       LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-       java-pkg-2_src_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 and"
-       einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for 
more information."
-}

diff --git a/www-servers/tomcat/tomcat-8.5.97-r1.ebuild 
b/www-servers/tomcat/tomcat-8.5.97-r1.ebuild
deleted file mode 100644
index e46a8ec1c5ed..000000000000
--- a/www-servers/tomcat/tomcat-8.5.97-r1.ebuild
+++ /dev/null
@@ -1,157 +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 java-ant-2 prefix verify-sig
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 
Container"
-HOMEPAGE="https://tomcat.apache.org/";
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz
-       verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 
1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-
-# we don't use ~ for el and jsp because the same implementation
-# is also present in tomcat 9 and it would be impossible to install
-# both tomcat 8.5 and 9 at the same time
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}"
-RDEPEND="${COMMON_DEP}
-       acct-group/tomcat
-       acct-user/tomcat
-       >=virtual/jre-1.8:*"
-DEPEND="${COMMON_DEP}
-       app-admin/pwgen
-       dev-java/ant-core
-       >=virtual/jdk-11:*
-       doc? (
-               dev-java/jax-rpc-api:0
-               dev-java/wsdl4j:0
-       )
-       test? (
-               >=dev-java/ant-junit-1.9:0
-               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}/${PN}-8.5.86-build.xml.patch"
-       "${FILESDIR}/${PN}-8.5.95-min.java.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-       default
-
-       find -name '*.jar' -type f -delete -print || die
-
-       # 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
-
-       java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} 
-Dcompile.debug=false -Dexecute.validate=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
-       EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core 
ant.jar)"
-       use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars 
--build-only jax-rpc-api):$(java-pkg_getjars --build-only wsdl4j)"
-       LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-       java-pkg-2_src_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 and"
-       einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for 
more information."
-}

diff --git a/www-servers/tomcat/tomcat-9.0.84-r1.ebuild 
b/www-servers/tomcat/tomcat-9.0.84-r1.ebuild
deleted file mode 100644
index 99d05ee6f55b..000000000000
--- a/www-servers/tomcat/tomcat-9.0.84-r1.ebuild
+++ /dev/null
@@ -1,180 +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 java-ant-2 prefix verify-sig
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar
-# See bugs #203080 and #676116
-BND_VERSION="7.0.0"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-
-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
-       
https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-       verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 
1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-# though it could work with 4.22 and upstream uses 4.20,
-# we still use 4.15 because 4.20+ is currently built with java 11
-# and it would force Tomcat to use at least java 11 too
-ECJ_SLOT="4.15"
-
-COMMON_DEP="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-core
-       >=virtual/jdk-17:*
-       test? (
-               dev-java/ant-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"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-       "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
-       "${FILESDIR}/${PN}-9.0.72-build.xml.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BND_JAR="${BND_HOME}/${BND}"
-
-src_unpack() {
-       if use verify-sig; then
-               verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
-       fi
-
-       unpack ${MY_P}.tar.gz
-
-       mkdir -p "${BND_HOME}" || die "Failed to create dir"
-       ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink 
bnd-*.jar"
-}
-
-src_prepare() {
-       default
-
-       find -name '*.jar' -type f -delete -print || die
-
-       # 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
-
-       java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} 
-Dcompile.debug=false -Dbnd.jar=${BND_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
-       java-ant-2_src_configure
-
-       eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
-       EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core 
ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
-       LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-       java-pkg-2_src_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 and"
-       einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for 
more information."
-}

Reply via email to