gentoo auto-resync : 13:11:2024 - 03:02:42

6 files changed, 372 insertions, 2 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index a98d5cff394f..1840ffc7d7ed 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index ff81bf54ac0b..7bc1bb2e1906 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -8,14 +8,20 @@ AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b44
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-10.1.31-src.tar.gz 6898465 BLAKE2B bcc4b1e973be8f83a02b046bd0df046367d1eaef897e0e5ef88127ede77988ed97243e39f240542a24ab81ffbe3d97abef81a39b790a63e2319e1990c2aacb84 SHA512 79d4052935c6f1757de34cd5cab1560095c901764d363509d84a3c77527e146f38776c78ae934adde19cf04d863b0e6010adba5cb403dae1ff48bdc99e9126e9
 DIST apache-tomcat-10.1.31-src.tar.gz.asc 833 BLAKE2B 59d59001cdaa03d52ab807689959349b41d59fed0a896106567c8fc2392966aa365c355fd1ac944943e0571202a088c3ebbd439b62b8e446a1d48c001d9d7be3 SHA512 11f917d616ea00c1d53b7e439cfe0033fa922bb8a0a3c4d430e3bfae536c24af0de5fbba4ab99b2cd84dc0e3b4f98a5ac4c8fe776e2d2f2fb7335fef6a7c78b1
+DIST apache-tomcat-10.1.33-src.tar.gz 6926625 BLAKE2B 4502c02d618569eb9f526769877f0817722d4a474a72ad9020c2fbf86ff6ec17599df547d019d81656d433a22efb7d81c56902e435bf3fde636849957070cdd5 SHA512 63ef609bbb2d664f5fe969216eee157a3f45f040f2aa90b6885c9ebe706099896beb620b7659d2dc8c759a08a0370d7849f5e664844e3b78bc82d521617bfd8d
+DIST apache-tomcat-10.1.33-src.tar.gz.asc 833 BLAKE2B 8bf20910fbefc277cf7e677c06aa3476ad4190f38fafb820063e4af59854d955666ff77eede13e6a7a952a21b88d169d9601655dcfcd38682f87db5522310e2a SHA512 111e8d7c7d7d365a8fee2207307fb64685a3c77e1b87a73ede8fe87a083e3e2f3425c41ca6072f6ded51ba6e59ff2997b7198f048d86daa1a947a91fcfe276e4
 DIST apache-tomcat-11.0.0-src.tar.gz 6827697 BLAKE2B 7568d29fea915cd0dfbb62961eac1d864c8760706b1f76c6244c124ee3f00ea650b5a702c11439352cd5de9515dded91958666d6bf45bba7745ca5dbd53caf1d SHA512 1628ff115e3c44a6f66051e78cd5910bc9a748d1f47f484098b3a24c10c50b74c554997d35558e8e563694f718a9017c0f2ad33f4159d206dde1c838369ec426
 DIST apache-tomcat-11.0.0-src.tar.gz.asc 849 BLAKE2B a6974cd097f30f2b46654362d1f05d9d02d82c5c6c2555500a42b094ab1835f70c700b7b3f6994a794bc2532a9f81cccd0cf81f66ef37626d278a7bc9f1c64ed SHA512 745338894fe8f579ec51b9b18d43c7419af8756bd9adcfaefb3eba8a8bd6cf0436fecfb38decc4accb3b47f89ca7a513077bf05a3968d0df8f9927b6b99649d3
+DIST apache-tomcat-11.0.1-src.tar.gz 6857402 BLAKE2B 7e8b006454578328b200a2ecb93ab6db7f5db19c9a7be5af794cd90cf72a6836170c1ca8228b89c132ef42adedbc4a6ac4ee0b0c11ab77cdd3180cbdd40ad394 SHA512 9e05a85331d5c868b149476e8bad4618c4608cd82d425c2bd907c1c4888e7d7e8eebba623ad7e5ded03123e089a1a8c271f69d4d9c62c3829634fe145b668588
+DIST apache-tomcat-11.0.1-src.tar.gz.asc 849 BLAKE2B e7d20faf4bf17318bf3afb053b0c573b1c721b2d40633f0bdb928143b632dabcd53dac302de672e119195947ea11aaee5fbab1f5d6b1fd660c9839369c27f4ff SHA512 32fb68ead6b5576d9d52f7c27a9b8aa55cec0f6db76f5fb2abb5666804d5eacba3636d7fa8b337ada3320a1cab7e01f829a9d644ede3584a5a05aec613aa92a8
 DIST apache-tomcat-9.0.96-src.tar.gz 7042818 BLAKE2B de7d573a2ee83ffe997f65ff2b66b8205efdb05c7155e6e6982c5ff0406b0f7ddf1a93978b758c956e5fee8f5b8df8880ef55b4009248a2477f26dc1da30a8b0 SHA512 cd6d0730b2aa34520249f8285b0663f88b601ca508f8534fa948ad0a9502dd760f446b6adc930b947c310d05e33025186b88ecab71a0ea16618ae24edb0c4884
 DIST apache-tomcat-9.0.96-src.tar.gz.asc 833 BLAKE2B 6df8c0c7ee73b9104c102c1c4c0f2030728de90a968efc26a0c85537d7876a0402bc66fea9a3a398be8f210c6255b5741ee969a0633cdecd95268731615f8635 SHA512 37404f8687b0bfc761611402ac4581e98063a229f9a4b40d4b4c6fc25e966d48a2b951cdd198cf60930bb7b776ebce6ef02eeaa89e51351120b462ae1b20e54c
 DIST apache-tomcat-9.0.97-src.tar.gz 7072346 BLAKE2B ab6e4359d01016f83d66ed516471701c4a9ecc6c4bffc13474978b7bf01cf4336ea88a6f3c3bb9e97f63f9056e4b3fc7d766e144f100862b2c0e5540109f46e9 SHA512 e0500e0c7e4af40f0a6db845b73f41423a7b7746e110053c36744fc376a0db96d141069035171f5b6efdf6011c155cbc29815cd286a0508cefaddb776909a00a
 DIST apache-tomcat-9.0.97-src.tar.gz.asc 833 BLAKE2B 0efe929bc4e6be06cfdb4ea424af5d7a07633aeab42320b46eb724f25a3bdb8eccee0cd7cdd437579d49c63e40b4bfe6689620048e3a23196e5b34345a9c7c17 SHA512 00ae9e08cdec0ddee501ba51f42b44979dd2a9ffd8211eb121eb8851cd8332e2ff00de25d1ba517a494b5ef71b5ae8934a6fbf8094623631bd2cc70c49c0140c
 EBUILD tomcat-10.1.31.ebuild 5434 BLAKE2B 14c8fb4ea095811ddbdac986e9e048c9e01131de398d95d703b2bea8ef1cbb094764a666257c4f39af88cf90e175328035ad20cb2092e0f19427dcad144eb175 SHA512 536148e97e39e5548e290f7fbe23db06154f53960b2d6418a5227aa75318a635f344fa11db9ddc1202833b0084d8b5024a2f7319ff71a9c7b9b394f76c4fc4e9
+EBUILD tomcat-10.1.33.ebuild 5435 BLAKE2B 19bd34060658756fddfa8a06f36c084c13ba7eef8985905c1abf0c9b96418353bd84ba54ddc203c8d9f2796b035d04184f86dafff3985aa8c1bf7888bc5558ec SHA512 543917f1b6d20fbc9ebc27c6d72901b94d20c7ea8ebd73936cb0a86aa09385be2bf9d9a13ee4e5bcbd08fc31f536ec53307122783cd67d4a12e6898e2d7dddd6
 EBUILD tomcat-11.0.0.ebuild 5550 BLAKE2B 66e4623ac46bcd4b06d95b9d92591e30c79c78cf9387d400ace84459f1b25b5ac0e6be51b4a6c57d9d0a9f040c810eeeed680addb2fc01cf85f8cefd9f5286ad SHA512 46ef13d18a06822abf02433ba88bbd75fef79f9f2f6000cee30b16b314740d9c5e65ad1ab600f59c3acc4eb99da9f1a684b8b3103e6cea36b6fc2ffffec0612a
+EBUILD tomcat-11.0.1.ebuild 5550 BLAKE2B 66e4623ac46bcd4b06d95b9d92591e30c79c78cf9387d400ace84459f1b25b5ac0e6be51b4a6c57d9d0a9f040c810eeeed680addb2fc01cf85f8cefd9f5286ad SHA512 46ef13d18a06822abf02433ba88bbd75fef79f9f2f6000cee30b16b314740d9c5e65ad1ab600f59c3acc4eb99da9f1a684b8b3103e6cea36b6fc2ffffec0612a
 EBUILD tomcat-9.0.96.ebuild 5014 BLAKE2B 5c4632a8aced391064f0060a319794056d3121c21c29e002f9c366bf6078ce2f97f04c31babdcc1bffbe1f938208f4d7a249a72c0376a743fa5e7188e713e120 SHA512 ec1ae289100699b992fe0d0e0270b59f6b049579863c1f5dbee2a563dfb70e3e8270539860f209404fbbf3ee013cc04c8c3b7f68735fd3cbb2f614e5acdd4b3a
 EBUILD tomcat-9.0.97.ebuild 5015 BLAKE2B 0a6752c6da2f0c63df88308ac347ca932c0b36e787e80d3ed81e87de961e4ea3a0c7978c35a0f1623696dee1ab7d7ebeac5efbc5489e38e5472198fb4fc14dec SHA512 927f04c4e89c04d0f2fa21c8884c859fe4a15691dbdc0157fcd0878b0e0212ab2c8df6bad1d1306090d6844f1e028c9dbde3e23e5e9e37ba94852d5de262bb00
 MISC metadata.xml 699 BLAKE2B 66aff1137e5d4ad92749176a5375c1c27c1e6cde936e05ce904d965eb71a985c421235917742d4065765e1ebf9f9e3faa51c3de109a9e5a169000b4263c3cd97 SHA512 b50874d1e741835bf8cb839517241465018254eba1ddb0e691f2b5b188eca97dd27394c29d2082654049d9ee0898c1e5e4e625666cf8abe029b8e6085122d9a0
diff --git a/www-servers/tomcat/tomcat-10.1.33.ebuild b/www-servers/tomcat/tomcat-10.1.33.ebuild
new file mode 100644
index 000000000000..4eeadd5c4bce
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.33.ebuild
@@ -0,0 +1,179 @@
+# 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 prefix verify-sig
+
+MY_P="apache-${P}-src"
+
+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
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="10.1"
+KEYWORDS="~amd64 ~arm64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.26"
+
+COMMON_DEP="dev-java/bnd-annotation:0
+	dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/jax-rpc-api:0
+	>=dev-java/jakartaee-migration-1.0.7-r2: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-1.10.14-r3:0
+	dev-java/bnd:0
+	dev-java/bnd-ant:0
+	dev-java/bnd-util:0
+	dev-java/bndlib:0
+	dev-java/libg:0
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	dev-java/slf4j-api:0
+	>=virtual/jdk-17:*
+	test? (
+		>=dev-java/ant-1.10.14-r3:0[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"
+
+PATCHES=(
+	"${FILESDIR}/tomcat-10.1.20-do-not-copy.patch"
+	"${FILESDIR}/tomcat-10.1.20-offline.patch"
+	"${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean
+
+	cat > build.properties <<-EOF || die
+		compile.debug=false
+		execute.download=false
+		exist=true # skip target="downloadfile-2"
+		version=${PV}-gentoo
+		version.number=${PV}
+		ant.jar=$(java-pkg_getjar --build-only ant ant.jar)
+		bnd-annotation.jar=$(java-pkg_getjars bnd-annotation)
+		bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant)
+		bnd-util.jar=$(java-pkg_getjars --build-only bnd-util)
+		bnd.jar=$(java-pkg_getjars --build-only bnd)
+		bndlib.jar=$(java-pkg_getjars --build-only bndlib)
+		jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api)
+		jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT})
+		libg.jar=$(java-pkg_getjars --build-only libg)
+		migration-lib.jar=$(java-pkg_getjars jakartaee-migration)
+		osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8)
+		osgi-core.jar=$(java-pkg_getjars --build-only osgi-core)
+		slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api)
+		wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j)
+	EOF
+	if use test; then
+		echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \
+			>> build.properties || die "easymock"
+	fi
+
+	# 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
+}
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	LC_ALL=C eant
+	use doc && LC_ALL=C eant javadoc
+}
+
+src_test() {
+	eant 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"
+}
diff --git a/www-servers/tomcat/tomcat-11.0.1.ebuild b/www-servers/tomcat/tomcat-11.0.1.ebuild
new file mode 100644
index 000000000000..0a27c5cc1870
--- /dev/null
+++ b/www-servers/tomcat/tomcat-11.0.1.ebuild
@@ -0,0 +1,185 @@
+# 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 prefix verify-sig
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-6.1/JSP-4.0/EL-6.0/WebSocket-2.2/JASPIC-3.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="11"
+KEYWORDS="~amd64 ~arm64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.33"
+
+COMMON_DEP="
+	dev-java/bnd-annotation:0
+	dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/jax-rpc-api:0
+	>=dev-java/jakartaee-migration-1.0.7-r2:0
+	dev-java/wsdl4j:0"
+
+# jre-17:* because of line 1081, build.xml
+# <filter token="target.jdk" value="${compile.release}"/>
+RDEPEND="
+	${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-17:*"
+DEPEND="
+	${COMMON_DEP}
+	app-admin/pwgen
+	>=dev-java/ant-1.10.14-r3:0
+	dev-java/bnd:0
+	dev-java/bnd-ant:0
+	dev-java/bnd-util:0
+	dev-java/bndlib:0
+	dev-java/libg:0
+	dev-java/osgi-cmpn:8
+	dev-java/osgi-core:0
+	dev-java/slf4j-api:0
+	>=virtual/jdk-17:*
+	test? (
+		>=dev-java/ant-1.10.14-r3:0[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"
+
+PATCHES=(
+	"${FILESDIR}/tomcat-10.1.20-do-not-copy.patch"
+	"${FILESDIR}/tomcat-11.0.0-offline.patch"
+	"${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean
+
+	cat > build.properties <<-EOF || die
+		compile.debug=false
+		execute.download=false
+		exist=true # skip target="downloadfile-2"
+		version=${PV}-gentoo
+		version.number=${PV}
+		ant.jar=$(java-pkg_getjar --build-only ant ant.jar)
+		bnd-annotation.jar=$(java-pkg_getjars bnd-annotation)
+		bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant)
+		bnd-util.jar=$(java-pkg_getjars --build-only bnd-util)
+		bnd.jar=$(java-pkg_getjars --build-only bnd)
+		bndlib.jar=$(java-pkg_getjars --build-only bndlib)
+		jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api)
+		jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT})
+		libg.jar=$(java-pkg_getjars --build-only libg)
+		migration-lib.jar=$(java-pkg_getjars jakartaee-migration)
+		osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8)
+		osgi-core.jar=$(java-pkg_getjars --build-only osgi-core)
+		slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api)
+		wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j)
+	EOF
+	if use test; then
+		echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \
+			>> build.properties || die "easymock"
+	fi
+
+	# 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
+}
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	LC_ALL=C eant
+	use doc && LC_ALL=C eant javadoc
+}
+
+src_test() {
+	eant 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"
+}
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 354245de445b..16167d90b5b8 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -5,5 +5,5 @@ AUX uwsgi.initd-r7 3831 BLAKE2B e284adae0d4f467b6b28481b917d31a77703057e912c22fb
 DIST uwsgi-2.0.23.tar.gz 810116 BLAKE2B be4353ac71a5282233b0a996e74e49bff66f4c460eb2640058c7028cfeae41214661785de78cdd4aa35415bcc4595e1e340ba48db87bee413754b13d8b24a7d8 SHA512 4060dd66f8c6309497b52a961c36a58fe2b3b3afc7e11b97cfa464757c614d1d44ccc561b18500a394b5d95e5660eae48759003a30ec07379a6f079f63f3899b
 DIST uwsgi-2.0.27.tar.gz 815302 BLAKE2B 6e1aab8a896405f0ab87fdb33bb14117cfd8473da61008e3ecf6b0d2664e7fd29acc12ba322c40772f015adb99ba79c3edcb40b87051fba918c162740d53f241 SHA512 78de6b8aa401ca5e27204cc68dec540617407dc9a0dad2c785a7eadc449889aad4eb516d4d8d257dc46e5b91b6c2d85be5953b19e0897375a7f0fecaa298d066
 EBUILD uwsgi-2.0.23.ebuild 10877 BLAKE2B 18f9c29fed7a010ada499843442c3ad69d041f0467f8d50a6e08e6bd924997430c00a2b1e204f06bc4569e303e98f244ad61c7edce66425d95f89811611e9253 SHA512 f997b3a7fd0dec1242be2862e47db99423a96b800d9316e19f55f919e156dd1f58386d28b20fae311615028a52dbdabb98635051d49226fb4016e3b7c1f73155
-EBUILD uwsgi-2.0.27.ebuild 10947 BLAKE2B f42f84175c4743888729bcfb98dcf10498eff70fdcc7c1f442581a8dad9a2d78af9e1e31d2a9d267abb47dc86432c5130f2554dde322ae2d88f5dbab0b84fe9e SHA512 92b0ec1ea88d003a0856e88c98a7311fab7c8a2e58b26d81626575dc2a5902f119cae22a226be5a12454f763ae7043eee01ff29a0f1e3093175dc7941ec0832a
+EBUILD uwsgi-2.0.27.ebuild 10945 BLAKE2B de2143ed4645402f9b3d6bbb284259cf8c144f3f19f1f8f85bb1f97c9438d57735ba2879c91b768820b47ac5d8681e5cb1b34ff21c2f98f3f82ea906d34db4f6 SHA512 fbea15ac78d6c1fb7cc6288cc400792f9fac6eecdd2a67abc0a8a6255e0b7263d63bb99e571958bd7b4aabe4ac25cca4196e9f256febbe33735b9259d8d09fe8
 MISC metadata.xml 1049 BLAKE2B 5d12b036bb85027d016d48dbd975dac53c64778da842b00bfa7cf85188686838bcf3effb48e972650e3bc2bd39ec41123d6951650223e12319dd0ce79da64f15 SHA512 4aca870984e4c336b22a1047c7bf42f9f1b74059527327dcc343c3c3384a56b5ba0b6f54542fe1c75aab1b9699780bcf744a1d886f49cccf7a7aabf8d4347f58
diff --git a/www-servers/uwsgi/uwsgi-2.0.27.ebuild b/www-servers/uwsgi/uwsgi-2.0.27.ebuild
index c8c92ba514e8..ba530a77a2e0 100644
--- a/www-servers/uwsgi/uwsgi-2.0.27.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.27.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux"
 
 UWSGI_PLUGINS_STD=(
 	ping cache carbon nagios rpc rrdtool