gentoo auto-resync : 17:12:2022 - 15:39:26

4 files changed, 0 insertions, 392 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 5a5460da64ed..a49d6fb86233 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 43c169a02cf1..36217c04d346 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -9,7 +9,6 @@ AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
-DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
 DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
@@ -17,7 +16,6 @@ DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2
-DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
 DIST apache-tomcat-9.0.69-src.tar.gz 6214949 BLAKE2B 21387c7dbc830c5292d5ea315bf93c2faac2160dd21e8524184495e34cee0739ef57ce77ba46c99a64f7389047da431cffe000da9a5db2aabd481e84f149153f SHA512 8178ef757d8a8a04b87a08e0a5d45e2d244fe0c0fd11b8f6b50182da1811758b7e4b1ea52188e4b241278c32737c0f61ed93d53b5a95075ebabb9209fe57a3b1
 DIST apache-tomcat-9.0.69-src.tar.gz.asc 833 BLAKE2B e4002185d7054ff963d0ecb1373afb2affb4795281bd344fa5b707e45dac4c6168cc2365853923a0cca1b5c21806554987513177ed64e01d7905f5d46ee9c581 SHA512 7d9ea8ac9986303bf649781524dd93db22c9ab1101a50be9aad7b4b65f902640b24462117047ddeba99b3652d63e980deaa232f6b93aff2266887a183059ff8f
 DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
@@ -25,12 +23,10 @@ DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b
 DIST biz.aQute.bnd-6.3.1.jar 16703723 BLAKE2B 97cc171a926be326abe95695e795ccb575bc6ca770b4c4df7764bdedbd6dfcf5643673484f50cc34f845f27d03ddf8a971c1c502b3b63db2541266c2b35e8e23 SHA512 59d3a50575ea8fcfc5f5c2178f7d40248c987c77ae8afeb0a8c9ec397ce9e4ceae277ba3b26dafc245bd2185bbafeaef219dd1af0988921631b6a8fe0cbd0abf
 DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672ed9cb0aa5d9dfca3361033a7f37646bb65bbea8be4ef1fb425518e85ec8a9cc63032815671ece5f956b754ecf555dc174 SHA512 7c3f7bc0280beb1b15182c558ef23f431719c046da8473545efe9aeec935776ebf6682cabbb7e7f53dcf2ccca168d8df35859be77121dab04340a5ec7e993608
 EBUILD tomcat-10.0.27.ebuild 6470 BLAKE2B 14ca531ac0064810e68fe873a176d0a2fd64e411c2ff06f5c7195d8b6b80a61698fbf4c2bfd1bb5ff1f92784f2ddd89eb55f88eb40dbd33b2dd188e71c518c31 SHA512 08f574e72d42b649335dbf06d392d98e0070cc32776cbb5bd92c4449c0d62dc8db0d9f57fd485aa994a1ceacaf10fb5e136c4e9ff06e753a19ce93ac2a0b0213
-EBUILD tomcat-10.1.1.ebuild 6137 BLAKE2B 64b61e8f50da6825231660c690abe13117445ad0203d2487732f51b8a01dbd3d67709f81b0dfc36d067b4082f2c70b463daf7932793e5f34fea1a0e52764c646 SHA512 85bf9f1f084fb57fc0a276412f25fdec428c7fe41923c5261cb57abfd50ae79a489b01fd5565fa1b851f398b3b50f779c163bc6c548bf3a9df2cf4ac30ad3c50
 EBUILD tomcat-10.1.2.ebuild 6535 BLAKE2B f3893d7fe2b29bacac173dca2864202227fdb44299fbe2fea9ccf33e5add8eb384a50803f1a8e806297ebe84956f4f4096924ae90e2f198ebab2ed088302481a SHA512 fbe0a81548b2b45146d6e029c78522f7819fe6df27c69a7607ef1800babd230140c2f525984eb78d59fe435847d3ca34e0870946ba02dbefd06632d4a72f0742
 EBUILD tomcat-10.1.4.ebuild 6536 BLAKE2B 60b4f1335795797298350554dae1c0bc68acaaf4c5af99fe2379cfce0a2b07aee8dc4d49f39c4d7fd2c2781acc31191d51a49211bf6615615c43929b0745414e SHA512 b239cac14c628bf9b493d7698be774bc82613d3d33fa4c2d396c0aa2081f79c8dbb95edb0a9fbc8fe43d3c68cc99db91d5494cc27bced58f7d23e35a15f8b8ca
 EBUILD tomcat-8.5.83.ebuild 5137 BLAKE2B c0bb842eb6e512c6c9d80bc9d923ebeceaeec1050e303bda3fccb2bec95ea91d161cc6acc8c56eac021b37afdaded605957c95c4c8fd69f1c1a004107ae9a722 SHA512 ec301c95e37dc392366f6fd709b6ebc20d13989a38c9347945045527a25ae45a76f7f041a9045b9be1f4febc7f3b90829f1d9ad54fe9efa759a5149d58985f0e
 EBUILD tomcat-8.5.84.ebuild 5434 BLAKE2B 95a1bd6917983a7b165c5eb5cdebd8c33a7cddbaa67e4d572a346f865ff9c23f283d4c2499a72a460224df44215215b42265b31e41008b6d8e43860bb9fa1389 SHA512 464d8ad88c8eae91ed99e636106c3f30fb01e30120dd24f25f2e31e43f540420b9bd0e5bb4220a41bfff0f35ae2c21b1789636e338eab4a364d1a25435a8d5d3
-EBUILD tomcat-9.0.68.ebuild 6034 BLAKE2B 0be969bd2004cfff3eef0b9b93e9d05a75e18af5458c9c3a13c88b16924b37580ed0450f491733096412262907d9b85d6a9751b1fed5278a06f32c76d98dadd0 SHA512 ed582425adb690fd5eb4c5df39b29c58cbf4219ff688c3154df368889218b8799efc145c871ebb3b1bf61199a67db24918b38ea86d2b63386ef230e2fa9437c1
 EBUILD tomcat-9.0.69.ebuild 6424 BLAKE2B 23045cba06ef38470be81488ce24519e9b71ed7f933339ff510ea5e6242b7a723876d24b85148fa57dd310ee205bd4b710e0b37210ac601a872793d057968a17 SHA512 224e902cc9f9408354459f3d53604916ff1989edbecdb456456191040734a47593f5188eb249a9cf409a4e44351f61c134532bea1fb1f734e7787687152b31a0
 EBUILD tomcat-9.0.70.ebuild 6425 BLAKE2B bbc5902443576230cefde4bd47d11bef3b1bf75c7ff9cb9f6151f321bc09ff3b954083152dcb2d4e53ca2d4b3e3e5ae4b3d67d93a8267ebfd65ee2261b490bd2 SHA512 5249e462b7ee53a2438bfe8bbc82d52aa078cda5944e1ffdaba2eb1c7f034310a63b5f093d6ab211690a71c4cadc0f90c29170355ab7c174c79692ad62a508db
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-10.1.1.ebuild b/www-servers/tomcat/tomcat-10.1.1.ebuild
deleted file mode 100644
index 450dc8b11ba0..000000000000
--- a/www-servers/tomcat/tomcat-10.1.1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2022 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
-
-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.3.1"
-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}"
-
-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.25"
-SERVLET_API_SLOT="6.0"
-JSP_API_SLOT="3.1"
-EL_API_SLOT="5.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/glassfish-xmlrpc-api:0
-	dev-java/jakartaee-migration:0
-	~dev-java/tomcat-el-api-${PV}:${EL_API_SLOT}
-	~dev-java/tomcat-jsp-api-${PV}:${JSP_API_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}:${SERVLET_API_SLOT}
-	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
-	)"
-
-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() {
-	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
-
-	# Remove bundled servlet-api
-	rm -rv java/jakarta/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-10.1.0-build.xml.patch"
-
-	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,tomcat-servlet-api-${SERVLET_API_SLOT},tomcat-jsp-api-${JSP_API_SLOT},tomcat-el-api-${EL_API_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} -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 glassfish-xmlrpc-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() {
-	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 "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."
-
-	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."
-}
diff --git a/www-servers/tomcat/tomcat-9.0.68.ebuild b/www-servers/tomcat/tomcat-9.0.68.ebuild
deleted file mode 100644
index 012a43bfc66a..000000000000
--- a/www-servers/tomcat/tomcat-9.0.68.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2022 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
-
-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.3.1"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${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}
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-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"
-SERVLET_API_SLOT="4.0"
-JSP_API_SLOT="2.3"
-EL_API_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/glassfish-xmlrpc-api:0
-	~dev-java/tomcat-el-api-${PV}:${EL_API_SLOT}
-	~dev-java/tomcat-jsp-api-${PV}:${JSP_API_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}:${SERVLET_API_SLOT}
-	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-1.9.13
-	>=virtual/jdk-1.8:*
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
-)
-
-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() {
-	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
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-9.0.62-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-${SERVLET_API_SLOT},tomcat-jsp-api-${JSP_API_SLOT},tomcat-el-api-${EL_API_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} -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 glassfish-xmlrpc-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() {
-	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."
-}