gentoo auto-resync : 22:05:2023 - 08:56:17

3 files changed, 0 insertions, 346 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 805ef6a2c96c..509db5f5368a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,14 +6,10 @@ AUX tomcat-9.0.72-build.xml.patch 3794 BLAKE2B 886bf69f4c78f385249e02e1f91ed9106
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
-DIST apache-tomcat-10.1.7-src.tar.gz 6075723 BLAKE2B ef00c3c43a6cd6c68b09930fd7dc8f822b49f5cec3a0c2b3dad1cb20e5f37ff17f35dfd48c5a8537dedbb9c3887620b6e0ec29272a002df46aa8fa0e5ccbaaa7 SHA512 3daeb5cb3650382224ba4b5cf830c7288531b7f565fdde4a8acca1ee66bebbbfafb4790a6ce50b965e176e9669203e90342e61d42d1656fd12f656d9394c3283
-DIST apache-tomcat-10.1.7-src.tar.gz.asc 849 BLAKE2B 79d5d6885dd3304999a3ec1e16ffeca95df0b0b135ad6733b932b745e248bfd84be06f7eb70588167e7a8b74c4fa1db93cfba99dee10b8ebc00b7ce46226e128 SHA512 ae5c9238ea33743ed40dc74e47e6441f52437322376df94b770dd00e354dc67851cedeb2b4b1148262bdb12b15f7ded49d0f5ee050d451006fa81c5c86b20768
 DIST apache-tomcat-10.1.8-src.tar.gz 6086270 BLAKE2B 080ffacfb3b010605fa901319f3f059524f532306af5a5d05a0e4eaf108be06ed139977ef39e8b9fa0423fef0ad073305b57793bcbb4e897bbb0239cee183017 SHA512 14ac35a22d24284b770182996388bdc004defc5e56e65d2420e096a1e1c5c45887e4a55c0174884294acb7c99e6412f98159bb9be92de337e1a1cacc48d39ea4
 DIST apache-tomcat-10.1.8-src.tar.gz.asc 849 BLAKE2B 2a62d64e349739397fc786b92e75a14b74d3e8f9243a4f90ca17a070d85bb31707417da01d9d34217a23ab10157dbff46857efd65629a66aa41be861fe036ca5 SHA512 e818e040be1e1c29c989228cf72586ac8a602a93373ac33760db22578fbf79a5202f038b4cf36a0ec3549112bcdd5f5629a6859119aa0b129fef923c073c3055
 DIST apache-tomcat-10.1.9-src.tar.gz 6098538 BLAKE2B b2699765e48168cfb75dfbb3168cfd96caf53a76b492d6dfe94be9311d0cdc470c549329bb8a647e7a5d8ce0784d3491dd03d8dd8d9463b0492b581b97d48373 SHA512 25e0e268697ff83ebd6c06f8e03eca0463cb41bb99827b60334fe9772670c3ac8bd18853817ee481db68a2ac7b0389e86274c6fe5c6c9efa97a2866754f07e5b
 DIST apache-tomcat-10.1.9-src.tar.gz.asc 849 BLAKE2B a961fa216154458472745e1de16f0b3530c9e038d604ef39cee341a36bb9e17062dae68fe72c7d019ec79e668e3207044612fe159387339c9d1d331ed70ca480 SHA512 c9cc5c535e51cf2a6186506692409f3ae098059c2188c1baf48e67f4c5c6d890130535c78d9d109bb9dda1de5d5b87ae477c1ede6aeea3e7ff9217ad4858430a
-DIST apache-tomcat-8.5.87-src.tar.gz 6041463 BLAKE2B 2b41e324be028b9bf4db3fcd32a45ad6a84644535c20c5a46c7850c8b0ee054130a7fa5091009928b71c8ece2f24f49530845727cc3f1b6d5907de07d7ad3703 SHA512 cd15fc27c781a0835ec5c35726832f51abfc8bba9b647e690b3dadb7141b5c96b5014f0d6ebf46277d43cf10e2839ef0229dccf87c0449f2004ae90041ef10b6
-DIST apache-tomcat-8.5.87-src.tar.gz.asc 849 BLAKE2B 05a5911b344b5ffdcb392189b64dc4c4d31d000a8b653338780e74ab569a3b024a13b491ba4946bbf68b5955af65df05bfe7b4795a120977f1b26a2bcff0c96d SHA512 fb56af00d3f9302251e65a08d852992192137eeed0eecf100bcfafb778e01dfb92fc024f47ef41ca71f01eebb3622fcaa53fcb776403939313502039080a2b4c
 DIST apache-tomcat-8.5.88-src.tar.gz 6051684 BLAKE2B bae4785765d2c373a5507bf1f422a9d4d0c0157f7b642bb2c34edeefc341af6661fc55077b03d8f5fc77744bf903792f0fdfd7265efebdafbeca35fb04a3a20f SHA512 f3db0daf451ab6ef34163e2adf6388cd4d4502c7b28915f3ae954b79ea3fe5ed17c900294bac0b192268431a62d501b3b8d35f6d9e0bcb3ae1f9962ac3b8a084
 DIST apache-tomcat-8.5.88-src.tar.gz.asc 849 BLAKE2B e82e714721272c7ca6e6837a4be369c9ef3ad6c654f56ba15028f7f8d8f54ab62d7c1da32a2f4914c417889b3b65ef9f5ba6dea7d8ed4125de871ee4f91339df SHA512 f5ad2bd77287e763d7a09b5be17601b318ed6492d5c476903eadd54304b19afbbedd90ee5232b5dbc30ee597ed3c4fe5fc371c3d9809b94ca1614fcde1bec4d1
 DIST apache-tomcat-8.5.89-src.tar.gz 6064408 BLAKE2B b8f1a4ae044c1609c37bad9b51e2afbb84b111e9d68bbaa6f0a5499c85f5f36394bb5871a2b3ab4ee7895d13ccf4538bde89d64ee0c5e01d8932d18dc3b0e103 SHA512 610855dfcca593d20e813dbd1a2410c9b6767f2efe79b24b2ba69304047b835b212f86758c020867e46bd3971ce98e88a56b99a4ab651e228ae5b4eac08c4ff1
@@ -24,10 +20,8 @@ DIST apache-tomcat-9.0.75-src.tar.gz 6241477 BLAKE2B f48f47f99fa3eecc4d450674ebb
 DIST apache-tomcat-9.0.75-src.tar.gz.asc 833 BLAKE2B bc590f3d5697da75a095be4e677be311cb7e558ec4f81d1503e1c2318daecaac4bed6c6ae7fc067ea784e8b2a9b14ba59d4f546d677925a3d527c604cf26235b SHA512 d154420e27d0ca6a4c04c6b79585e60591decdfed1728c5ce2e80aba827eddc8a706b9fe6df9e790684fc158bad0320cc81eaf294e97ce7f4c8cf613bb8404f1
 DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 73cdeb9e63c04b41db26f91efc3b01fdfd7c8796d6b1f556c77f90bcdbe048f374b5164b885689f3e62ca45b8ca8b97fce70e1fa13d807d2f76869155c8ba7f5 SHA512 b113177f97894b0ed5cfbc38f96c995d6425e981ec8c7b27d99044793ff77dd2450367ad9ee977f443fba349fe1d68fc26f3aaa737eba0a402abcf29716b2e85
 DIST biz.aQute.bndlib-6.4.0.jar 3200265 BLAKE2B c8b8c1d0ff398e2a701edc4431cd8d65671a5e5daa0ef04be6b02eabb570768e0202640c15ce1290a5ae21bb31700a89f2822826851d7dc026267cb31da9f1ef SHA512 15a20751d879291c31b6530cb0d51652bf5bb33bf944ed703369eada439df6464190c01e2872ea6e7535209abd0b4692ea8980499d4b43edfffcc5729633c85d
-EBUILD tomcat-10.1.7.ebuild 5786 BLAKE2B 0dde89723c9e9ea059f846e184bfe502014a828e921a8b2d2df2204939aa53b9be4602c2b757cfc93fb36dc8e9ba18612a38a49bb527758bfb92737661ea182d SHA512 a5327a33f611f68e5582a22026452f8a89eff27abcf267e75c928aea078737ac5b44f179bf5dc6ef0436243f16b5226431d0ef03c6b8a157f835d5afc8f08503
 EBUILD tomcat-10.1.8.ebuild 5786 BLAKE2B 0dde89723c9e9ea059f846e184bfe502014a828e921a8b2d2df2204939aa53b9be4602c2b757cfc93fb36dc8e9ba18612a38a49bb527758bfb92737661ea182d SHA512 a5327a33f611f68e5582a22026452f8a89eff27abcf267e75c928aea078737ac5b44f179bf5dc6ef0436243f16b5226431d0ef03c6b8a157f835d5afc8f08503
 EBUILD tomcat-10.1.9.ebuild 5787 BLAKE2B c75a963504b636477be460f2fb1938b5ebd2aa757c563a2dab47c075b86ce9dbae54ac17f01fb88c4b53daf3a6b04b15567e6c6e3f06bc2dee5657683bf94f1c SHA512 1d3f73161a73c3a5513bc78b391eec20a4a332529fc9f2370581015a83404edd7e01f767c3126b4cd25392985d0b84a05f1825c70ed431af4c5056ee9734e92f
-EBUILD tomcat-8.5.87.ebuild 4649 BLAKE2B 1e4b40f696dff7f9e3f8eceba242cf13059f90904a16fca5334e7705b5905f2ce14175eba2f9a8c4e6c88aec0668a96a90057ade846ce3bfa0d5c671efdf3169 SHA512 e531dd28399421d9cc78237cd36c70bcb21aa0d760d3e9375f5b2a20a08a640dba2854af9a67eff2501efc8f917fce7ef9b13d9f553902af7b47d81f675349aa
 EBUILD tomcat-8.5.88.ebuild 4649 BLAKE2B 1e4b40f696dff7f9e3f8eceba242cf13059f90904a16fca5334e7705b5905f2ce14175eba2f9a8c4e6c88aec0668a96a90057ade846ce3bfa0d5c671efdf3169 SHA512 e531dd28399421d9cc78237cd36c70bcb21aa0d760d3e9375f5b2a20a08a640dba2854af9a67eff2501efc8f917fce7ef9b13d9f553902af7b47d81f675349aa
 EBUILD tomcat-8.5.89.ebuild 4650 BLAKE2B c16f87d43ded61e661d3ac4031e2372cbcdf6fca64afb0f7a76d1ab71bcf2fd73096b8afe5239b6efb103c2763b52805d52571ff3f9f133e6a8ffc1dc2e011e5 SHA512 7e213a31359181a6f2cae5e6c9836b0825fd2fd51a130daf83cd44b74f48374fea451bc48822da85128173e336438b6f0b1145aec9fd0606f6d03b0ea6515f0e
 EBUILD tomcat-9.0.74.ebuild 5648 BLAKE2B a2fec52af2982e3db8311388d8d46691aafa6c98da71683f4ab97d174bca7dd0c546975b8b02b02f1890020b75d92c231aa90539d7bf81e7e6a44a38dc1328b8 SHA512 6f7ad632749477699cea962d7672433209aaaa9bc6503de50aba362e1b5fe554e4478f9a6538712ecce035431d3edf5f3ddd9f927362abc3bec6cfe093bfd88b
diff --git a/www-servers/tomcat/tomcat-10.1.7.ebuild b/www-servers/tomcat/tomcat-10.1.7.ebuild
deleted file mode 100644
index 0441c95309f2..000000000000
--- a/www-servers/tomcat/tomcat-10.1.7.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2023 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 and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="6.4.0"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${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}
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
-	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 ~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-11:*
-	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="${BROOT}/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"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-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}" "${BNDLIB_HOME}" || die "Failed to create dir"
-	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
-	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.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} -Dbndlib.jar=${BNDLIB_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.87.ebuild b/www-servers/tomcat/tomcat-8.5.87.ebuild
deleted file mode 100644
index dc4d5cb47d2a..000000000000
--- a/www-servers/tomcat/tomcat-8.5.87.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2023 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 ~x86-solaris"
-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-1.8:*
-	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="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
-
-PATCHES=( "${FILESDIR}/${PN}-8.5.86-build.xml.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."
-}