gentoo auto-resync : 15:09:2023 - 10:49:51

4 files changed, 0 insertions, 524 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 18fd97f342f7..42723d03a9f5 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,32 +6,23 @@ 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.11-src.tar.gz 6118924 BLAKE2B 0e97bafe7a0451c34d16f2c3ae37263d09746d3b240d0770970ccaaefa05d1a6e0687e17db5dd71ca6b305a6b9fdf2fd58e86f97bd07fd60ff239f5f262a5164 SHA512 5c722344bb5886fb33ef70f81d5e2500e6c8446b628cb118ee5fac710ee1d7f4cfbd134eac6955090cc0ba99518e3ddd18970c5f16793f51f089249959ec088f
-DIST apache-tomcat-10.1.11-src.tar.gz.asc 849 BLAKE2B 6427668fe4f93b1de322bafbefb9ef6ac47baca8d8cc56bddb267a35bd280792ce096971a032eacb04c0322d68c21af32b681d9ef9ba006c78dde489247429d0 SHA512 6895f874bf1265b2cab94594ff542d0b9760afaa70f1486b882b25593878470ab8a4d399cf5320bec9ae9d18f2a881f59072f0909345ddeb42d549ded460f791
 DIST apache-tomcat-10.1.12-src.tar.gz 6122423 BLAKE2B 6de2189e415aba38168ebf09493e96d5906a72e77cbb5af358144e510e6de9fcb342db83c64ac6827ec8e03ab7402e24648b3cfb1a5385153a85dec71d2c55a9 SHA512 f383a4f401c21cb1acd93b6446fd915ba41da9a67c2538d7177a90238adc3294d260f29ef2ebb72e300cb93b4a7a42090e1c3b478b5deea344eb3d19992a9fd7
 DIST apache-tomcat-10.1.12-src.tar.gz.asc 849 BLAKE2B 8f1f5cb35a24fe22999b0ba68b50e1fe4118b3a645d3c991c55161448356d505d6b953e40d70b4fd5e17d20e63f873d04388f315b96eb4fdc2025d1ed7b897a0 SHA512 1f3cbdf57e289013111726f14f868dad69f9c24faf375497408560e8b46ccf131a79095f097378ea2cdfcc802120a65d7a36e655ce62361bdb7511cb9cfa3c70
 DIST apache-tomcat-10.1.13-src.tar.gz 6123612 BLAKE2B 0ce1519ec19f7b69808653856474a0011fc76a46c903ecaf97085d91c3fe31676e3064c68600cd4222dd53e0033d24cbb11f82226b8dd086f88a88e910b3f6cd SHA512 e44e2dba618f70d9a39e976cc07d33fc9cbead2169e24d6ea2051c8db20601f63ee7bc657245869450c82cf0ceb272501066b77ae45265d19b7964f5ed0e85b1
 DIST apache-tomcat-10.1.13-src.tar.gz.asc 890 BLAKE2B 75ccd687749749e04ed479c57ed6d6f69b9dd6ccf0c215a7c08c15a18967a7c4529ab3d5a013954a6a13072c49d8a039763d3a73a6f0e472213d632877d4d6d7 SHA512 223efe5c1972b9f455ac76895ca7774fa17c1d80e14331342dc538229c12bea83e8c3f838be03a748f291ecf80dc99c72896f25aafccac868f42eb830c4add7f
-DIST apache-tomcat-8.5.91-src.tar.gz 6098592 BLAKE2B 026fb19cb938986401e95f5441c5a775c73bf31b5ca23c8be54d30a710fd9a5badd0ed9360598883ed641056594c3f471c21c834f79af3cdb4a879bb54402399 SHA512 f3a69630e3cd144c74ea3edce68f8e39bc67e734bf02822caf7c6e59a2e4db404a5c0bdf40a22614b6dd85bac3dc5821e6b74c56a1147655f602cdf39fb651f5
-DIST apache-tomcat-8.5.91-src.tar.gz.asc 849 BLAKE2B 9f5f347692101a93dedf7014dc9d5351dfee5b956247edeec87c29b33548ff9c78c55a6e426aac40626a616ffaa73dd7f01ee5a384d080845f86b13c92f1cd63 SHA512 3d4bce771c7f044338eaad0d7d959c360396be67e989938a5595dfc42d1f7cfe451fc00de9197cd1a20ac2fc50f8b7ad93ecee07fe50c097fdeabf8ae1b8bf3d
 DIST apache-tomcat-8.5.92-src.tar.gz 6104937 BLAKE2B 32027d52506b13bba1826cb966cbc431e39c3da9b0362467bdbed5be1ae6be35928b691cc806bae761297c323f3c3dfec6ca1d6041aecaad3d2ffaf0cd4a216e SHA512 d2f502c1cfe22a17ae4ec4007f7c3296d81210dd21628bf6e38707376670a1fcd4323d55ccda5d9bdd76d58b0829dd04a2956f3d99b01ca6731cf4d87db3963b
 DIST apache-tomcat-8.5.92-src.tar.gz.asc 849 BLAKE2B 90b66f037ffdaf8823ea29841a339c537ab71d6012318cb576e04d61f185a91e8a1313f9ba800445bdecda3769079364dc871d84740af6c12b4ed983678d24e1 SHA512 88ee2f4ded06597b13785096f4ef10b6784a2f6879889a3a517db29dc2461d39dd80306a1cd394d98f58bdca41d31bee639701cea17de8b0092d59f4de2ec01d
 DIST apache-tomcat-8.5.93-src.tar.gz 6106306 BLAKE2B ca9a05902b492696ca89db5017dd5c042a28c95b4138477049cd8ce2ded91c7814f2326c67718b83fd5e962c57666a1b2ab41d9b928c7d890ced9afbb13d9ce6 SHA512 655752367585e7aa4af7b9b1392edb2c6e40dbda739aa459d81929ab0376648b8731baa469acaa8886bc3c859f8c8485f6826e86f59c3ac2bc1d876d17c2ce9b
 DIST apache-tomcat-8.5.93-src.tar.gz.asc 890 BLAKE2B b3f64af8af6652657f76ff216e003a647bb278a8f5770babdc74f904a02bf21f91810d74d64efbbfc547282c39a14b72542dd97fad50630061207c75cd0b234e SHA512 7b3afd083bc353680df40daac2053a52afa0bd38a902f6acd54bfd27bd274597fd40206c7b8a053223dfaf344b02b416071f662c928e3d43715f4a4f106fad79
-DIST apache-tomcat-9.0.78-src.tar.gz 6266960 BLAKE2B 15bf31c4d4445d0f7b8f53ea23aedefaa0e5635c3dce7e6bc35d11f7bba0e8f5b00263c680287c0b0a4743317dbf8191c1759fbe1f899e1aa157d488c037276d SHA512 220bf46004c4cbad536a7040c979651ee49a13994cf83045369c1bfdc0a96c0172ddc8fd24ab76c9526591c50033d915dbd258939b24d22d660050dcb5abcad4
-DIST apache-tomcat-9.0.78-src.tar.gz.asc 833 BLAKE2B 2ee91e558dc0478b519a252e3c4b7101d5c96f5e95b06e29bc2be69b4f9828f35392633f870e1cbe45cd5f9215642d961e73be2ab501af287c64af7f8d370c15 SHA512 175c8c43f19ba82d658ac8a7c3496a335edfa7eafc12cf552ea40b8c6c1cd353d9af930091fc6a5069d75473ebebfac2a101e09925fb18119ed563945cf680c2
 DIST apache-tomcat-9.0.79-src.tar.gz 6272073 BLAKE2B d33c127660045e6b24f73b695042aff51a5ffb811d3c2ea97acf1f2c82f6a948710728b707d684f6ec91e787c7f6cb7d9c13c37afc0f96c0f23bda7fa605bd19 SHA512 dae963c0ab473810de750483a71e9ff6ecf762133d0b9ea2e14ec134a03de70eb9b04d3efbb61aad84e43ed930fcb4e07a53288cac11917b2e0c359f433e0dbe
 DIST apache-tomcat-9.0.79-src.tar.gz.asc 833 BLAKE2B e551a1b4e2b05020ab0122c6efb945036f83563e28c00fa015b0fe0ecdfbc5977dfcbcd9902b4a065e9ba9262d9351cc1cfdb25d0dbeb0207f2078e39095cc6e SHA512 92089b97a64d06bcc799d6927a657d30e4387a2025ae81c99d04dfa1647e34b6f492c4ad09a24dffd1a0045261bd3e933ef0f47365e749b93c367f735cbbd9a7
 DIST apache-tomcat-9.0.80-src.tar.gz 6272358 BLAKE2B 025e704d44e5c7576b1f96f01ab375e29771da2bb8539c88aa374afadfb15072070b2021766d8ed3b67a77b9d43782dd480f5d8ec4842bf942c5ed6e4f59dd72 SHA512 a2fb298c1fd2615e1a69371b5f84eb569e897faad3cbe17e3626460f5ce311085c120dd3f62c255fde87e6517915365ab52ada613776d45185b8e53624935114
 DIST apache-tomcat-9.0.80-src.tar.gz.asc 890 BLAKE2B c4620b61c1902c3a908aedffec22e215c72c43dc6844a32bc5de9ac13f39b5e09da7898150f6ec4f1af250d8c366280976f424e603a9a7d56f5fdfdbd773ab00 SHA512 019cbe91b7a6b34bbeaee3117b9fe620749845025d7a699179a1dd6acb9cb9169e5af506bbe515ddf0c66726832bb4c8cf9c0c5870f3f151879706309bab754f
 DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 73cdeb9e63c04b41db26f91efc3b01fdfd7c8796d6b1f556c77f90bcdbe048f374b5164b885689f3e62ca45b8ca8b97fce70e1fa13d807d2f76869155c8ba7f5 SHA512 b113177f97894b0ed5cfbc38f96c995d6425e981ec8c7b27d99044793ff77dd2450367ad9ee977f443fba349fe1d68fc26f3aaa737eba0a402abcf29716b2e85
-EBUILD tomcat-10.1.11.ebuild 5432 BLAKE2B d8468c032a279c8b1bd7f95d41c25a4c4e06e1a413b1ffecf32dc6fda76f4e91122b3f9e2426e4523d2f653430199c17fe503092c1e3b4269c1a527deb16f177 SHA512 9f907a70800df7da6be008ee8d4e8beb02e7c4f6595dbdec25aeac3298fce28143e71472b90278d36f4bb4704bab351d55274e9445884910b00ebb2ffbd8d83c
 EBUILD tomcat-10.1.12.ebuild 5432 BLAKE2B d8468c032a279c8b1bd7f95d41c25a4c4e06e1a413b1ffecf32dc6fda76f4e91122b3f9e2426e4523d2f653430199c17fe503092c1e3b4269c1a527deb16f177 SHA512 9f907a70800df7da6be008ee8d4e8beb02e7c4f6595dbdec25aeac3298fce28143e71472b90278d36f4bb4704bab351d55274e9445884910b00ebb2ffbd8d83c
 EBUILD tomcat-10.1.13.ebuild 5433 BLAKE2B aad79da428d6e624a93caf667c73b32e4a6d1482f1d782f80f80bb587a3902ee213836d40e1554eabda89b7f6fdd1bd11b4ad615cabf9c81eb5000b6c8bc2e37 SHA512 f62f86394de987790a1a070bf3856d05615f2f593726e3db82d70991d021bbcc168d345572637fb65211dbb3543b525d6ce30f8712e69048c49adaa41744adb3
-EBUILD tomcat-8.5.91.ebuild 4636 BLAKE2B 16d14d1b7ad61614010e6d3eb5cbf25f9545b8737d30422ad3ba140e40a686ae31ae091fc481f4d8835fd1cd71f44b9930c6cf41a561ba5121156088d6693f69 SHA512 9729f7813e53c57908b37d71d113df349880f1993ba6814f7470599960cfda8188d662d532c000338ed091ec3bf6bee7f5a4ae267cc7cd1cd232e800a0ff4bdb
 EBUILD tomcat-8.5.92.ebuild 4636 BLAKE2B 16d14d1b7ad61614010e6d3eb5cbf25f9545b8737d30422ad3ba140e40a686ae31ae091fc481f4d8835fd1cd71f44b9930c6cf41a561ba5121156088d6693f69 SHA512 9729f7813e53c57908b37d71d113df349880f1993ba6814f7470599960cfda8188d662d532c000338ed091ec3bf6bee7f5a4ae267cc7cd1cd232e800a0ff4bdb
 EBUILD tomcat-8.5.93.ebuild 4637 BLAKE2B 91241d2fb01b2f5b91d859870f86732b1793568278551f52311179ee553ac46eb5adf67ab3ac04badc3b8315129da77e1e64145cf888a8f98e7223ae11334e29 SHA512 dc0c128616263c1d2066053cac073c92db1573a093e6585b0b42c580a7768c670df07b03a9da1b01bf6fd76e1b1d24af981e586aece6a7e966f019d0fa9cf570
-EBUILD tomcat-9.0.78.ebuild 5281 BLAKE2B 1a23d6095043a3ce77410fa6e0d5e9aa4663502f504e5ba890e4c130f5f797b2e273c863e90c68c536616b378ea05fe44c0ecb509b0a6f3f8875638db93e23a2 SHA512 c90de086e2a96275379dc815de77f79dd1300ce5f98543865539c305ca15dc83844ced874501a9ba9ba53048302aa921b7bd4c643ad5061af72433e6858403ef
 EBUILD tomcat-9.0.79.ebuild 5281 BLAKE2B 1a23d6095043a3ce77410fa6e0d5e9aa4663502f504e5ba890e4c130f5f797b2e273c863e90c68c536616b378ea05fe44c0ecb509b0a6f3f8875638db93e23a2 SHA512 c90de086e2a96275379dc815de77f79dd1300ce5f98543865539c305ca15dc83844ced874501a9ba9ba53048302aa921b7bd4c643ad5061af72433e6858403ef
 EBUILD tomcat-9.0.80.ebuild 5282 BLAKE2B 4a2c928dfda87f667f4defa440d202f210a81c4ab361d62ecb22b40a24c0e825c5495de7ab15839e107c34a6ee7ace6b0a2a880c89f481ce83bcf81d791627e1 SHA512 4ebef803641515b9326443f3798478a0db830d30c4fa87d7c89d6776a0f4ced7368b20bd2e512b1bb967b64f16e7007c79201ab5358219cc57f997e3759e77e2
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-10.1.11.ebuild b/www-servers/tomcat/tomcat-10.1.11.ebuild
deleted file mode 100644
index 603e2c46e673..000000000000
--- a/www-servers/tomcat/tomcat-10.1.11.ebuild
+++ /dev/null
@@ -1,181 +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
-# See bugs #203080 and #676116
-BND_VERSION="6.4.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-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"
-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.91.ebuild b/www-servers/tomcat/tomcat-8.5.91.ebuild
deleted file mode 100644
index 265c9e364fe1..000000000000
--- a/www-servers/tomcat/tomcat-8.5.91.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"
-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."
-}
diff --git a/www-servers/tomcat/tomcat-9.0.78.ebuild b/www-servers/tomcat/tomcat-9.0.78.ebuild
deleted file mode 100644
index 6c17491db575..000000000000
--- a/www-servers/tomcat/tomcat-9.0.78.ebuild
+++ /dev/null
@@ -1,180 +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
-# See bugs #203080 and #676116
-BND_VERSION="6.4.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-1.8:*
-	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="${BROOT}/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."
-}