commit: 1fb5838e6d0e631eac52135b575ccf8dc86735f2
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 2 17:25:26 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Oct 2 17:25:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb5838e
www-servers/tomcat: removed obsolete 8.5.69
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 1 -
www-servers/tomcat/tomcat-8.5.69.ebuild | 159 --------------------------------
2 files changed, 160 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index dd8b8f8dbd6..67a776d50aa 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,7 +2,6 @@ DIST apache-tomcat-10.0.10-src.tar.gz 6032784 BLAKE2B
f73d2b0d549d773a13a8adcc76
DIST apache-tomcat-10.0.11-src.tar.gz 6065513 BLAKE2B
e734a3f5086d94dd49886a1fc7e1fddc1b500240837ccba945dc0d10ad5aaaf580d1b9e2c78aca8af474c4312d723bc4095ec8e90a14f0bd7f292b9333bc554f
SHA512
c06f4069c1664483f176231dd9fe132c89e7c66f845d82b41d6c962ea2d2ba2d3c6004b6a875388925ba295761f533ced416fc91261ecb97d11219a87940db2b
DIST apache-tomcat-10.0.8-src.tar.gz 6010420 BLAKE2B
86390f04147d3082fbc9f15704121cbd6aa8ba756b4bc03e64a49aae3dca96c6b503949da0096f8ddf143bdeb1320b7601008683ce94bdad9ef235e1f73ad948
SHA512
c264be4cb29d87c95918d2723ab20bc7e2cb5149cb366cca348c6cd311b0f38ac500ed6b4756b20245a446ead50e7208f77093d6081563ed76d6691abfcbe14c
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B
56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703
SHA512
ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.69-src.tar.gz 5916996 BLAKE2B
4a3ef958b6bb0089149877c25baaa2c1a0bcee473c0942b419c5c1d7071dcae4f8a6e6f1805efdee1201042feedc64e213fffbcdb35cf2b7f9a67217b8dcad48
SHA512
467dd38bd77d8b5ac6fa2acf9f6ee71d04467a3182647757fa47f5d1d9576c96e5061db61ba08b04318f1db9ee4f2bcac7b45f1f9f4f81cd1807a57483dd7bbb
DIST apache-tomcat-8.5.70-src.tar.gz 5939095 BLAKE2B
9a2bf14c9b9f551af15ebf2b95ffede140b3accdb9fc1b9836c980169b597e8c796d5aa59df28cd42ccff67dbda83c7b7ced8b0ac2954a40214a0767ad8b90ce
SHA512
fe752c4196d12496a3dcb4e6b59df30da10cd52b8642f9273de7158dcf6dd16d2443675744db0033e6dc5c1cf0aeaf0125c9921e1e36ceb8dea9ba58328a4133
DIST apache-tomcat-8.5.71-src.tar.gz 5945776 BLAKE2B
b7a5b344dbe09ef88ee046dcce701ea65d8587f1d8c2f980c67fff5466979d15dea019a9abae6d48a45797a989ebddb4dbdbc5196c8740cde9ebc45041b857ef
SHA512
df99749d7ef387e29c1d2976c584dc219fc8764f618a004a646564315ab3f00a71ca94408d1fbaff20c3bab3911c82af4f7cf2ec02f0408d9e829c27f8aabdba
DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B
59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a
SHA512
1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2
diff --git a/www-servers/tomcat/tomcat-8.5.69.ebuild
b/www-servers/tomcat/tomcat-8.5.69.ebuild
deleted file mode 100644
index 0d566b00a7b..00000000000
--- a/www-servers/tomcat/tomcat-8.5.69.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- acct-group/tomcat
- acct-user/tomcat
- virtual/jre"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- dev-java/ant-core
- virtual/jdk:1.8
- doc? (
- dev-java/glassfish-xmlrpc-api:0
- dev-java/wsdl4j:0
- )
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-8.5.66-build.xml.patch"
-
- # 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},tomcat-servlet-api-${SAPI_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_getjar
--build-only glassfish-xmlrpc-api glassfish-xmlrpc-api.jar):$(java-pkg_getjar
--build-only wsdl4j wsdl4j.jar)"
- 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() {
- elog "New ebuilds of Tomcat support running multiple instances. If you
used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance
to work with new Tomcat."
- elog "You can find more information at
https://wiki.gentoo.org/wiki/Apache_Tomcat";
-
- elog "To manage Tomcat instances, run:"
- elog "
${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- 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."
-}
