gentoo auto-resync : 10:01:2024 - 13:02:42

4 files changed, 527 insertions, 0 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 18d39813d143..dbbfe0b347ef 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -11,19 +11,28 @@ DIST apache-tomcat-10.1.16-src.tar.gz 6148509 BLAKE2B d6b8169c6761a4a27a84d0c5e8
 DIST apache-tomcat-10.1.16-src.tar.gz.asc 849 BLAKE2B 698555997aec1f8c0a8c01a40d7c991099623db60f4e5f5e9d26a6eec6f67a12967d6d2f58ffad311b13e0266316fcfcb8a3f2f1dc9b418b3104808de88527af SHA512 85e055ce437242b64af42c2c500704ff272fc8624bc1b4d7eb4ea3e28277186a214ee177927c9ef7b593b43571d462ccdab33fcbf401c23ddd7931e61c0b4275
 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.96-src.tar.gz 6135041 BLAKE2B 7bb00cb835f1c56a9eb79ab44333436782ed526bc22ba31b2522323a0ab7c80384b76d049e2d9f0703a07cd5ecd449995125b2b7ce319943ab85b65f7acb66ff SHA512 3d2652e06d81eb014623bf1b0f03c238f330487682a255a4ed37a2b722f99194d08e3083b491d962917bc21cfbefd44f0e7808248c6b90c6a87db292138144dd
 DIST apache-tomcat-8.5.96-src.tar.gz.asc 849 BLAKE2B 2f1e20008cdad11bca95146542566c64956b79ff10571b7bc8068fe65cf3025e190bc43f94d29511f12c5091f79f2a69a02afeff51f8e78aef7058264c32e35f SHA512 fa86689b1438d39ea1fbe376cef2941d09c572fba2f1aa2d4f63cfa238da94880d4e8eb6403175073bfa379434abf0571f4b85c3789714a04183c416db94f25f
 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.83-src.tar.gz 6300235 BLAKE2B 207f617e6af89898be2a120376d6ee926ea1b67becfeb4e35ab7eb1c97aa09a59d714e642722f3cfeadbc71d90f49b483a02d1d2d909fdf1f28954ff8326e0f9 SHA512 28e112a9d01918434ad03c414058275bbc4e34be408c2cfe2d819c3a08cadc3c31920e279c5312529aa2f5abf1e002537012c5f06d43ba8894448afd5585c231
 DIST apache-tomcat-9.0.83-src.tar.gz.asc 833 BLAKE2B b9aa578aaf28db7837576e19ab7d3443546d29c087789c9a98650b75c387b4169c0d2b16b7dfabb1d046972a6b78b82462d5d44c85c964903627702bf31037e2 SHA512 f8aa1859e79e403587feb7c5dad44664b68f1627f953d65848e53e971cd30f2addc94572849119031978a33114a90e64e2a50fb2a0e0be3c26bc5f31ed196e3d
 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
 EBUILD tomcat-10.1.16.ebuild 5424 BLAKE2B c60973a3167464086ec6f1e9005abcb6cc909b141f23cac7e98387b582e992fa8e812dcf71c9de780460f62f0a1165cacb86e26c351b3aed70a9d3d01493ad0a SHA512 484a9837715a65d01c1f4e063808f9dd71ba079daa117fb3d5bf49b9044ef90f66033dbe61fe7a488930489633c983cdee6315431480e2b37825ec27ebbdf6cd
 EBUILD tomcat-10.1.17.ebuild 5425 BLAKE2B ce5acab3000fe0403f38a03d11776f18e43cc32b99bc38777b0d35810ac36736efd7b73161c07a800ccc646928d7fd16cd791753b9e2bac7a2693affb6ece676 SHA512 35d980580aac95c32fbef51dbc707521ff666ca17704537fcf5bf906296c09e0f56ee713cae419c92940e83a26368a0705f323aa0e8d203b24a465d8177a07fe
+EBUILD tomcat-10.1.18.ebuild 5425 BLAKE2B e720d613771e0dd91a7a7c824bd780e726bfc39ba086a8150e36a6e4f8603afa6697a736e3defa96a40a2d481f21209887757a5c78a5bfeaa6b60b8d11cf0b98 SHA512 b2112d2631aec57a990425c400e6136d76d1efe2230b7ce94c90f5a337e107b207971ca356c26036e7f0798785f00d51d3c546e1ec847b434baf08fae613c7f9
 EBUILD tomcat-8.5.96.ebuild 4672 BLAKE2B fadb9b875c785d70aababb62125d9046e123bb9d451be6dcb01d43b5b292fe0f247a6215008ac902855857f0a30c43c2ed2672fda17860c4aa5b139fbe08f3d6 SHA512 4cb2c3da06f98200f40b087e7221740ceb88bc1536d9272fabc67cfe66cbbe4a27ea3a05a7d36720893d518bf7f45a3c735d629b03bca5835db2400056575415
 EBUILD tomcat-8.5.97.ebuild 4673 BLAKE2B 19f5b188bbc36e71aea45a6cf1619d039931fd65b8ac7795ab99d0483b3c5b83f7f3b3d3170c5f50f71acca29b486658469bbe5d1080a5b491549354ac63370b SHA512 8b1475295334d6ca6079cdde29c2eb0912e5b7c16de8430b9b45962568c99427011ede5fd299ef442ab72006a72e5a7179efef490c1893f6f06d34df2a19f0a1
+EBUILD tomcat-8.5.98.ebuild 4673 BLAKE2B b1506cc53460b960d0b7f3033aaa06f9121072c65e8db40eb09b5dac8921927bd6bbb57059d994af690f2384cd1e869955ca21b7527686d42cdf9efb0dc97f02 SHA512 7e2b408d9979ba76cad3873de66026c9a9ad4dbb347e97fbb0e3dc25cab297609362282b4a9312645d727887667b16080b4b0d3b3cf05e525bafb0bddd87519f
 EBUILD tomcat-9.0.83.ebuild 5273 BLAKE2B 5844711385b8edd987900b764349319febadbd96050d92d240a72571b2bb9956e0f07f350c6f8d237878e6c7ef1d1ff657db9ed97bbf721927cd28a728dc397e SHA512 5b30ee2b23947ce3f0aca30f6d2b65e6d0fa5ee24d16d9e49d671c83acf858c2a6cbc6938553081d53c2473f509d54ffb568092a8e626baa8d63e62aba4d65f4
 EBUILD tomcat-9.0.84.ebuild 5274 BLAKE2B 1ff1fa3f563a54b2601f053a0b0af3febb0374d97ebec1d83e5716d5a08f42496a85bd815ea027439cd21579ef640d10a30546b0a1afe6c4bab2c91ca74c4050 SHA512 1fdbd29700d2ccac2219389c8a2209102246b3ccdd478aea1bbe1e3a6a7fef4f2f1b91990db6ca2b8a6fac7d8ce8d1432f50706266698e3485818a51ba8f4f2b
+EBUILD tomcat-9.0.85.ebuild 5274 BLAKE2B ac2c77fe215fa07c787e79fefb2a7a7f267e7df96c910a4259b082805fecc3adc06da9e3dfd2a938c7830a547674ed8958ee56b965b99659db8e821886b016a6 SHA512 56d9b4be6705db7825b5770cc07133fcd847370d6c98a02faf8e1cf750a433147607b59d72048411b59c4bf4fdff369451dc924067010dc7b0fb998a2535bc31
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-10.1.18.ebuild b/www-servers/tomcat/tomcat-10.1.18.ebuild
new file mode 100644
index 000000000000..104bd1129668
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.18.ebuild
@@ -0,0 +1,181 @@
+# 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-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="/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.98.ebuild b/www-servers/tomcat/tomcat-8.5.98.ebuild
new file mode 100644
index 000000000000..56f524f6912d
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.98.ebuild
@@ -0,0 +1,157 @@
+# 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-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="/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.85.ebuild b/www-servers/tomcat/tomcat-9.0.85.ebuild
new file mode 100644
index 000000000000..7580b033f525
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.85.ebuild
@@ -0,0 +1,180 @@
+# 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-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="/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."
+}