gentoo auto-resync : 04:01:2023 - 12:06:28

8 files changed, 262 insertions, 584 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 70ea053c95f8..a87be2e79c6b 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 445ff1c18f35..efdcccf160af 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -2,11 +2,14 @@ AUX conf/lighttpd.conf-r1 7623 BLAKE2B 51805756814ed7ea8770419fa98009b1ecf6e963c
 AUX conf/mime-types.conf 5802 BLAKE2B 894906c67176dfb98819fe0d61e66905d873ad96907c14684a1b6284796ea69950606c950a72f16ffa9fdd46675ac79050cc39456ae66c91a38a50e1ef5449e9 SHA512 28fb746307daa92ae8077850627097d8ed4f24ad6f1c1963a3397a052add17282292e6f230550fb65d2fef969af0448f2f86e36afb5b15dc92b00fd80821c54a
 AUX conf/mod_cgi.conf 625 BLAKE2B 9d10f74566edd260a9160a7b3588aa08903603dafe412b73e0a28ce57b3e45c4bbebd0443daeb7e922c66bca66947f79c24eb65256cd5f6011ea2ad140c3f16f SHA512 39cba5cc14be21356c7038a8436a4dd7da80d18e3db2ba0527669f2ce9e9ca1a99a985e931e92cd7ea550f2b79467adc92b0803291f6d55084cca901919ea0da
 AUX conf/mod_fastcgi.conf 425 BLAKE2B 5c78303b686677bc77a6c9c51f295a023f4854ce351cf41e8984f84f6d8520fee93db4c96b25495bb935ed53d57090e481516c3fd4862401cea174fa2bccc0d2 SHA512 0847a55736dd86f6589086614331a54d1656214ab918638a319b69825ef67bfc8003fa567dc8b82c1c1611d2b4d2771dce4bdd337ecb9b277758a5dcf6c12331
+AUX lighttpd-1.4.68-meson-mod_evasive-remove.patch 585 BLAKE2B 7f1745436c59d461edf1b6e7b847ea2285f6b94bf01c00af5f8d134ba9a479fcb0a9bca4cdc7b8c6b77593751a315ec9cf59da5e4b5ac5a896f6e903ad9f5c21 SHA512 c4f2b8cb24d2bdc2ad0d6a82512890fa1e2915806e90cf42ac8043a0f71cbce42dab3eb3c3130b2311ee0d396648eb9cda347e5dffb73516e6f1ae33d8066635
 AUX lighttpd.confd 240 BLAKE2B 8383c102f9e3a373909f26cda9f73d1edf81ef9dae42a48593f6d6f61c1b1060cc324bb773d402307d54c6cca520ddada8016dc5b3f0922ddf75d24934bfc7c4 SHA512 dd722c15230df734d7151bcb9cfc66d6d54aac5dcdca5f50eb33979d3a2443ba3a9ef3d7cb35e6dbd3d39fce09da15ab0029b1399bf1b1e4f4ef20d40f70a416
 AUX lighttpd.initd-r1 1993 BLAKE2B 719a854c4faad43a7d33303afd68950ec5393b63f485cfcbcd89e39b6a4a6eef3fe74a73acdd95dd948f7d3c822d0cca1a7da087c83eb455f50b2402a5ef8acd SHA512 545b923f199a6f3399df3cbd8122e7a5a83bf4128a59bf000690ccba1e6d9bd7ec3bd31aeecf4c7a14b6349ccc99df5ab4e6ff8ef9b3f026efd6ae628c872962
 AUX lighttpd.logrotate-r1 385 BLAKE2B c41e4b7892d3cb8cd7306eb7fa93b4a03452786acc7a3078464cf2cb7eec982f626201cc0d0aea7dd7de81cacf603f6d064c8ec6f8dcff09f78dfd48b656aa93 SHA512 8cae2d3acb2f4d9a9043e492c4b15024f85f92d93616d5e92e08d51e2295fde6160c750be08244703f999208c4b43ecfb9a2fcb8e223e52992551a0668302ffe
 AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469ab074469ba0b670f56b147c8088ad9211f97a4f314fe4eaebac89cd9cddee34edbf3652b7ea0712c94 SHA512 fbcd7dbf9c6b97284465af133a7cd1f711978ef4318a749ff7d366b053265fac94a1d76f074f56722c382179631d38ed8a07ac2c2fc4b712a93acab2f3609c0f
 AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d62064a271a7a0cf5b32423b349ac13d2ebc38a8de5c6478823ac022e46eef60a830e6ae9598e848b8c220bc2f SHA512 3fda360423a7a406a2981de647dac6b4419fe60c649bf3cc21fad566e8513293f6e81d4f5b777eaf06a056beedbf44360a39894ca3a2d05d3fc3a2d26c339efe
 DIST lighttpd-1.4.67.tar.xz 1039872 BLAKE2B e8e32970fe8b6e36fbee0c5104c8f42f846531c75689ad8e561e8eef9e92c69989a094d18ad65e4c404ea69d67dd960c57ef91773f9b5599bfd6072e5d4588d9 SHA512 acfde71675d1c54b4e805998d1dabaa291437181bdbca0d6a3a069584c4576d7585d2401f57f8691f23aaf6283a95ac61156789a055a2a7236fd305c1f248627
+DIST lighttpd-1.4.68.tar.xz 1030612 BLAKE2B 5682194a9e124598daf22bca56826535ac48f1c89087238f2a455cd4cb0f12287ce79ab5a7b6ca966003772335e6a14d484658300e401c098b4e87a7207198c4 SHA512 137cf62e3c7b07d1dc4af50318f1ec67bbf60058ad1a4fef0b1c94668916e23cfcdf85fe9cd728163e55c1b21f4831b9ab922fcf6b6ba8e2a03b2f73a9694189
 EBUILD lighttpd-1.4.67.ebuild 6001 BLAKE2B 2716620d5461d8cd94e8970b15bf201180045755dfd5a9a34cf6f3c730eb11fa4f8f014a2d22a80b6ca308e4e4f2e0db54bf0c7434bda1f318baed9d97ff0270 SHA512 00ea9635270477fec723574927e26b3540e164fc6636505e7754789335c3289dbd56324a5e15bca025fed9fa9019d89e10e94a54e812037c84a9c017bbb0c168
+EBUILD lighttpd-1.4.68.ebuild 6140 BLAKE2B 4f90dc1c11a8d30f66466664e614ea36b2c33b645d9dd92acbe0ddd87f04c1c78cc1d4d4198529788d120b3fd0ea184a14dc05cd6e3050d09abf703d588b85cf SHA512 53ca9af5eac99f6d40c397de922663a23328fb36baf61f230b11cf5ce130a394883832c5c6f58475bec9ab97de7834fd8af07683c3ac411133acefaf6e295073
 MISC metadata.xml 1763 BLAKE2B 906a9cf10ee127ce19e5184188158a0a82f79fb33dea289a74fbe24465a119893cdda65223dbae31ced1692ab9837e0cf591495e859de63ebafb198f4acc2fcc SHA512 c71be3ada914e18f6303fef04edae206237a41aa0b2c82dbc7e05a6dbdfd57d26762cf27f156c52a0e054802f98f5a242fb1b28f53e699c8ec363a36f4099ca0
diff --git a/www-servers/lighttpd/files/lighttpd-1.4.68-meson-mod_evasive-remove.patch b/www-servers/lighttpd/files/lighttpd-1.4.68-meson-mod_evasive-remove.patch
new file mode 100644
index 000000000000..82725b2505c5
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.4.68-meson-mod_evasive-remove.patch
@@ -0,0 +1,18 @@
+https://github.com/lighttpd/lighttpd1.4/commit/d809433d6d900e899f796606b11bdc6a73413ac5
+
+From d809433d6d900e899f796606b11bdc6a73413ac5 Mon Sep 17 00:00:00 2001
+From: Glenn Strauss <gstrauss@gluelogic.com>
+Date: Tue, 3 Jan 2023 17:50:16 -0500
+Subject: [PATCH] [meson] remove t/test_mod_evasive.c
+
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -721,7 +721,6 @@ test('test_mod', executable('test_mod',
+ 		't/test_mod.c',
+ 		't/test_mod_access.c',
+ 		't/test_mod_alias.c',
+-		't/test_mod_evasive.c',
+ 		't/test_mod_evhost.c',
+ 		't/test_mod_indexfile.c',
+ 		't/test_mod_simple_vhost.c',
+
diff --git a/www-servers/lighttpd/lighttpd-1.4.68.ebuild b/www-servers/lighttpd/lighttpd-1.4.68.ebuild
new file mode 100644
index 000000000000..d8cedebef1d8
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.68.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit lua-single meson readme.gentoo-r1 systemd tmpfiles
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
+SRC_URI="https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite +system-xxhash test unwind webdav xattr +zlib zstd"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	mysql? ( dbi )
+	postgres? ( dbi )
+	sqlite? ( dbi )
+	webdav? ( sqlite )
+"
+
+COMMON_DEPEND="
+	acct-group/lighttpd
+	acct-user/lighttpd
+	virtual/libcrypt:=
+	brotli? ( app-arch/brotli:= )
+	dbi? (
+		dev-db/libdbi
+		mysql? ( dev-db/libdbi-drivers[mysql] )
+		postgres? ( dev-db/libdbi-drivers[postgres] )
+		sqlite? ( dev-db/libdbi-drivers[sqlite] )
+	)
+	gnutls? ( net-libs/gnutls )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2.1.26:= )
+	lua? ( ${LUA_DEPS} )
+	maxminddb? ( dev-libs/libmaxminddb )
+	mbedtls? ( net-libs/mbedtls )
+	nettle? ( dev-libs/nettle:= )
+	nss? ( dev-libs/nss )
+	pcre? ( dev-libs/libpcre2 )
+	php? ( dev-lang/php:*[cgi] )
+	rrdtool? ( net-analyzer/rrdtool )
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( >=dev-libs/openssl-0.9.7:= )
+	system-xxhash? ( dev-libs/xxhash )
+	unwind? ( sys-libs/libunwind:= )
+	webdav? (
+		dev-libs/libxml2
+		sys-fs/e2fsprogs
+	)
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	zlib? ( >=sys-libs/zlib-1.1 )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-apache )
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( virtual/perl-Test-Harness )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-mod_evasive-remove.patch
+)
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+	local config="${ED}/etc/lighttpd/lighttpd.conf"
+
+	# Enable php/mod_fastcgi settings
+	if use php; then
+		sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die
+	fi
+
+	# Automatically listen on IPv6 if built with USE=ipv6 (which we now always do)
+	# bug #234987
+	sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die
+}
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+
+	if ! use pcre ; then
+		ewarn "It is highly recommended that you build ${PN}"
+		ewarn "with perl regular expressions support via USE=pcre."
+		ewarn "Otherwise you lose support for some core options such"
+		ewarn "as conditionals and modules such as mod_re{write,direct}."
+	fi
+
+	DOC_CONTENTS="IPv6 migration guide:\n
+		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dmoduledir="$(get_libdir)"/${PN}
+
+		$(meson_feature brotli with_brotli)
+
+		# TODO: revisit (was off in autotools ebuild)
+		-Dwith_bzip=disabled
+
+		$(meson_feature dbi with_dbi)
+
+		# Unpackaged in Gentoo
+		-Dwith_libdeflate=disabled
+		# Obsolete
+		-Dwith_fam=disabled
+
+		$(meson_use gnutls with_gnutls)
+		$(meson_feature kerberos with_krb5)
+		$(meson_feature ldap with_ldap)
+
+		# TODO: revisit (was off in autotools ebuild)
+		-Dwith_libev=disabled
+
+		$(meson_feature unwind with_libunwind)
+
+		$(meson_use lua with_lua)
+		-Dlua_version=${ELUA}
+
+		$(meson_feature maxminddb with_maxminddb)
+		$(meson_use mbedtls with_mbedtls)
+
+		# TODO: revisit (was off in autotools ebuild)
+		-Dwith_mysql=disabled
+
+		$(meson_use nettle with_nettle)
+		$(meson_use nss with_nss)
+
+		# Obsolete
+		-Dwith_pcre=disabled
+
+		$(meson_use pcre with_pcre2)
+
+		# TODO: revisit (was off in autotools ebuild)
+		-Dwith_pgsql=disabled
+
+		$(meson_feature sasl with_sasl)
+		$(meson_use ssl with_openssl)
+		$(meson_feature system-xxhash with_xxhash)
+		$(meson_feature webdav with_webdav_props)
+		$(meson_feature webdav with_webdav_locks)
+
+		# Unpackaged in Gentoo
+		-Dwith_wolfssl=false
+
+		$(meson_use xattr with_xattr)
+		$(meson_feature zlib with_zlib)
+		$(meson_feature zstd with_zstd)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Init script stuff
+	newinitd "${FILESDIR}"/lighttpd.initd-r1 lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
+
+	# Configs
+	insinto /etc/lighttpd
+	newins "${FILESDIR}"/conf/lighttpd.conf-r1 lighttpd.conf
+	doins "${FILESDIR}"/conf/mime-types.conf
+	doins "${FILESDIR}"/conf/mod_cgi.conf
+	doins "${FILESDIR}"/conf/mod_fastcgi.conf
+
+	# Update lighttpd.conf directives based on conditionals
+	update_config
+
+	# Docs
+	dodoc AUTHORS README NEWS doc/scripts/*.sh
+	newdoc doc/config/lighttpd.conf lighttpd.conf.distrib
+	readme.gentoo_create_doc
+
+	docinto txt
+	dodoc doc/outdated/*.txt
+
+	doman doc/*.8
+
+	# Logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
+
+	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+	fperms 0750 /var/l{ib,og}/lighttpd
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	readme.gentoo_print_elog
+
+	if [[ -f ${EROOT}/etc/lighttpd.conf ]] ; then
+		elog
+		elog "Gentoo has a customized configuration,"
+		elog "which is now located in ${EROOT}/etc/lighttpd. Please migrate your"
+		elog "existing configuration."
+	fi
+
+	if use brotli || use zstd || use zlib ; then
+		elog
+		elog "Remember to clean your cache directory when using"
+		elog "output compression!"
+		elog "https://wiki.lighttpd.net/Docs_ModDeflate"
+	fi
+
+	if use mysql ; then
+		elog
+		elog "Note that upstream has moved away from using mysql directly"
+		elog "via mod_mysql and is now accessing it through mod_dbi. You"
+		elog "may need to update your configuration"
+	fi
+
+	elog
+	elog "Upstream has deprecated a number of features. They are not missing"
+	elog "but have been migrated to other mechanisms. Please see upstream"
+	elog "changelog for details."
+	elog "https://www.lighttpd.net/2022/1/19/1.4.64/"
+}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c443609724ca..824882184c48 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,3 @@
-AUX tomcat-10.0.16-build.xml-strip-html5.patch 1201 BLAKE2B 57df5e44b741bc3c981312ce48330d0f43353f3ca010870c5f4a43539c120178147371129a66baa6d3a16da31328d21e0653060aa5cd4647b5935a05349d20e9 SHA512 38e194748ffae04be81624fe3dd5175acc1d0f62d07f9762e0831c5e840180c947492d03bde9722271690f6c94b5805992a5f7513520968bfdc037e33f9ba455
-AUX tomcat-10.0.26-build.xml.patch 13736 BLAKE2B 2946d2b8c1330fbf29244f1038f0854aff44bbfa702d6c648a041b7945b628e0f748a6bc13f89df466762542bb8904c406d1fa9c76f89f52b44d66348145aee9 SHA512 56670abd0e28b27d0fa27c99e69ed13964478edf64f6f8551a8a6bbde6ec70f0ff4f879fa40e6a61398d9e59f9b018e03e466a0b217f5667db448a60c61717b9
 AUX tomcat-10.1.0-build.xml.patch 13790 BLAKE2B f84bfdd9da38d738cc8fbd91bc4bf29b76feb82bb7b562e90aa9fbaa55009e482260c39958210912c0fa9936b29e7a479951765d99f49c8d70fe2190aa50cabe SHA512 c30fba95c36190dd1d0b61497536c5b8880c3e2ef629e697509c343a34be24a4848d84279ad9881196752b40d5d9b1d496840ffc317f4f9e668290f52ebc48a8
 AUX tomcat-8.5.66-build.xml.patch 10850 BLAKE2B 69353bcf5697e6ae0b930c71fbb870401e822340f0eb0b8a6283e0d8cd1388d1d22a12190d089f7001a06e2491bb2309aab8c93b8f2a79e8439571fed8d0aebb SHA512 498c2ac8ab49cd83151ddfc6b47bd3a7a7148096e331ae55c7fe3da90007c19387208de64f5b3e796ec54b4b8534b11f906940fcf49343157acc862fcf06f5c7
 AUX tomcat-9.0.37-fix-build-rewrite.patch 513 BLAKE2B e806ca32771bcad0fbc2f1b3f223af2b17d2caffe6ed034783294650d4ec22c8d9d9d215ade85569f6627508c61b7d469412d582093708b6bb728d6123d65155 SHA512 7aab16d1b52fa88352df849ca051dcaf27f645b1b3edd3df3a7d87385b5068d300105f89c18ba3a0f65818739b85ec847ddd5b28b8b655efbb7b39036099cae2
@@ -8,7 +6,6 @@ AUX tomcat-9.0.62-build.xml.patch 12687 BLAKE2B 55b0c142875581231ca65e9198d5da11
 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.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
 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
@@ -21,7 +18,6 @@ DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd84
 DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
 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.2.ebuild 6535 BLAKE2B f3893d7fe2b29bacac173dca2864202227fdb44299fbe2fea9ccf33e5add8eb384a50803f1a8e806297ebe84956f4f4096924ae90e2f198ebab2ed088302481a SHA512 fbe0a81548b2b45146d6e029c78522f7819fe6df27c69a7607ef1800babd230140c2f525984eb78d59fe435847d3ca34e0870946ba02dbefd06632d4a72f0742
 EBUILD tomcat-10.1.4.ebuild 6536 BLAKE2B 60b4f1335795797298350554dae1c0bc68acaaf4c5af99fe2379cfce0a2b07aee8dc4d49f39c4d7fd2c2781acc31191d51a49211bf6615615c43929b0745414e SHA512 b239cac14c628bf9b493d7698be774bc82613d3d33fa4c2d396c0aa2081f79c8dbb95edb0a9fbc8fe43d3c68cc99db91d5494cc27bced58f7d23e35a15f8b8ca
 EBUILD tomcat-8.5.84.ebuild 5433 BLAKE2B 779607815b07ff151b82e94c6547acd08407b536f297fd4bd56453b5738230ad6c2b35a438d84ce75677234516cd85ac921343ac42c19b148ed8ffafe093565f SHA512 2bb0cbcab94901ffafb0d31a0e8a198e1835e3a432ee36b02764e24db199946308aed92c244432d5143d6791787a694667f28bb3d65609d92b88771b1d871c4c
diff --git a/www-servers/tomcat/files/tomcat-10.0.16-build.xml-strip-html5.patch b/www-servers/tomcat/files/tomcat-10.0.16-build.xml-strip-html5.patch
deleted file mode 100644
index 44f629ec29b0..000000000000
--- a/www-servers/tomcat/files/tomcat-10.0.16-build.xml-strip-html5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 6b2b5d5..16d55c2 100644
---- a/build.xml
-+++ b/build.xml
-@@ -2148,7 +2148,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       encoding="UTF-8"
-       docencoding="UTF-8"
-       charset="UTF-8"
--      additionalparam="-breakiterator -notimestamp -html5"
-+      additionalparam="-breakiterator -notimestamp"
-       source="${compile.release}"
-       maxmemory="512m"
-       failonerror="true">
-@@ -2231,7 +2231,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       encoding="UTF-8"
-       docencoding="UTF-8"
-       charset="UTF-8"
--      additionalparam="-breakiterator -notimestamp -html5"
-+      additionalparam="-breakiterator -notimestamp"
-       source="${compile.release}"
-       maxmemory="512m"
-       failonerror="true">
-@@ -2269,7 +2269,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       encoding="UTF-8"
-       docencoding="UTF-8"
-       charset="UTF-8"
--      additionalparam="-breakiterator -notimestamp -html5"
-+      additionalparam="-breakiterator -notimestamp"
-       source="${compile.release}"
-       maxmemory="512m"
-       failonerror="true">
diff --git a/www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch
deleted file mode 100644
index aff5333f0833..000000000000
--- a/www-servers/tomcat/files/tomcat-10.0.26-build.xml.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 774e25e..2684b10 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1041,6 +1041,7 @@
-       addOSGi="true" />
- 
-     <!-- Servlet Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -1048,21 +1049,23 @@
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license"
-       addOSGi="true" />
--
-+-->
-     <!-- EL Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest"
-       addOSGi="true" />
--
-+-->
-     <!-- JSP Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
-       addOSGi="true" />
--
-+-->
-     <!-- WebSocket API JAR File -->
-     <jarIt jarfile="${websocket-api.jar}"
-       filesDir="${tomcat.classes}"
-@@ -1175,10 +1178,10 @@
-       addOSGi="true" />
- 
-     <!-- Re-packaged Apache Commons DBCP 2-->
--    <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!--    <jarIt jarfile="${tomcat-dbcp.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-dbcp"
--      addOSGi="true" />
-+      addOSGi="true" /> -->
- 
-     <!-- i18n JARs -->
-     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1415,9 +1418,9 @@
- 
-   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
-           description="Default. Builds a working Tomcat instance">
--
-+<!--
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1477,7 +1480,7 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
- 
-     <!-- Delete all other versions of Tomcat Migration Tool for Jakarta EE and copy the current one -->
-     <local name="migration.jar.filename" />
-@@ -1488,7 +1491,7 @@
-         <exclude name="${migration-lib.jar.filename}"/>
-       </fileset>
-     </delete>
--    <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
-+<!--    <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> -->
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
-@@ -1517,7 +1520,7 @@
- 
-   </target>
- 
--  <target name="build-tomcat-jdbc" depends="package">
-+  <target name="build-tomcat-jdbc" depends="package" unless="noget">
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1534,7 +1537,7 @@
-     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
-   </target>
- 
--  <target name="build-tomcat-jdbc-src">
-+  <target name="build-tomcat-jdbc-src" unless="noget">
-     <!-- build the jdbc-pool source jar-->
-     <echo message="Building Tomcat JDBC pool src JAR"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1637,9 +1640,11 @@
- 
-     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
-     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
-     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
- 
-     <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -2144,11 +2149,12 @@
-     </copy>
- 
-     <!-- Source bundles for native components -->
-+<!--
-     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
--
-+-->
-     <!-- platform README files -->
-     <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -2172,13 +2178,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       additionalparam="-breakiterator -notimestamp -html5"
-       source="${compile.release}"
-       maxmemory="512m"
--      failonerror="true"
--      failonwarning="true">
-+      failonerror="true">
-       <classpath>
-         <path refid="compile.classpath"/>
-         <path location="${ant.core.lib}"/>
-       </classpath>
-     </javadoc>
-+<!--
-     <javadoc packagenames="jakarta.servlet.*"
-       excludepackagenames="jakarta.servlet.jsp.*"
-       sourcepath="${tomcat.dist}/src/java"
-@@ -2194,8 +2200,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       additionalparam="-breakiterator -notimestamp -html5"
-       source="${compile.release}"
-       maxmemory="512m"
--      failonerror="true"
--      failonwarning="true">
-+      failonerror="true">
-       <classpath>
-         <path refid="compile.classpath"/>
-         <path location="${ant.core.lib}"/>
-@@ -2215,8 +2220,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       additionalparam="-breakiterator -notimestamp -html5"
-       source="${compile.release}"
-       maxmemory="512m"
--      failonerror="true"
--      failonwarning="true">
-+      failonerror="true">
-       <classpath>
-         <path refid="compile.classpath"/>
-         <path location="${ant.core.lib}"/>
-@@ -2236,13 +2240,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       additionalparam="-breakiterator -notimestamp -html5"
-       source="${compile.release}"
-       maxmemory="512m"
--      failonerror="true"
--      failonwarning="true">
-+      failonerror="true">
-       <classpath>
-         <path refid="compile.classpath"/>
-         <path location="${ant.core.lib}"/>
-       </classpath>
-     </javadoc>
-+-->
-     <javadoc packagenames="jakarta.websocket.*"
-       sourcepath="${tomcat.dist}/src/java"
-       destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2257,8 +2261,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       additionalparam="-breakiterator -notimestamp -html5"
-       source="${compile.release}"
-       maxmemory="512m"
--      failonerror="true"
--      failonwarning="true">
-+      failonerror="true">
-       <classpath>
-         <path refid="compile.classpath"/>
-         <path location="${ant.core.lib}"/>
-@@ -2277,8 +2280,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       charset="UTF-8"
-       additionalparam="-breakiterator -notimestamp -html5"
-       maxmemory="512m"
--      failonerror="true"
--      failonwarning="true">
-+      failonerror="true">
-       <classpath>
-         <path refid="compile.classpath"/>
-         <path location="${ant.core.lib}"/>
-@@ -2297,20 +2299,23 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-       additionalparam="-breakiterator -notimestamp -html5"
-       source="${compile.release}"
-       maxmemory="512m"
--      failonerror="true"
-       failonwarning="true">
-       <classpath>
-         <path refid="compile.classpath"/>
-         <path location="${ant.core.lib}"/>
-       </classpath>
-       <link href="../annotationapi"/>
-+<!--
-       <link href="../servletapi"/>
-       <link href="../jspapi"/>
-       <link href="../elapi"/>
-+-->
-       <link href="../websocketapi"/>
-       <link href="../jaspicapi"/>
-+<!--
-       <link href="https://docs.oracle.com/javase/8/docs/api/"/>
-       <link href="https://jakarta.ee/specifications/platform/9/apidocs/"/>
-+-->
-       <packageset dir="${tomcat.dist}/src/java/">
-         <include name="org/**"/>
-         <exclude name="org/apache/el/parser/**"/>
-@@ -3275,7 +3280,7 @@ asf.ldap.username=${release.asfusername}
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -3403,7 +3408,7 @@ asf.ldap.username=${release.asfusername}
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -3458,13 +3463,13 @@ asf.ldap.username=${release.asfusername}
- 
-   <!-- =============== Utility Targets to support downloads ================ -->
- 
--  <target name="setproxy" if="${proxy.use}">
-+  <target name="setproxy" if="${proxy.use}" unless="noget">
-     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
-     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
-   </target>
- 
--  <target name="testexist">
-+  <target name="testexist" unless="noget">
-     <echo message="Testing  for ${destfile}"/>
-     <available file="${destfile}" property="exist"/>
-   </target>
-@@ -3586,7 +3591,7 @@ asf.ldap.username=${release.asfusername}
-     </sequential>
-   </macrodef>
- 
--  <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+  <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -3603,7 +3608,7 @@ asf.ldap.username=${release.asfusername}
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
-+  <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -3628,7 +3633,7 @@ asf.ldap.username=${release.asfusername}
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+  <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -3644,7 +3649,7 @@ asf.ldap.username=${release.asfusername}
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
-+  <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -3668,7 +3673,7 @@ asf.ldap.username=${release.asfusername}
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+  <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
-     <!-- Download the file -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -3683,7 +3688,7 @@ asf.ldap.username=${release.asfusername}
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
-+  <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
-     <!-- Download the file from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -3711,7 +3716,7 @@ asf.ldap.username=${release.asfusername}
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="trydownload.check" depends="setproxy">
-+  <target name="trydownload.check" depends="setproxy" unless="noget">
-     <condition property="trydownload.run">
-       <and>
-         <not>
-@@ -3722,7 +3727,7 @@ asf.ldap.username=${release.asfusername}
-     </condition>
-   </target>
- 
--  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
-     <!-- Downloads a file if not yet downloaded and the source URL is available -->
-     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
-   </target>
-@@ -3733,7 +3738,7 @@ asf.ldap.username=${release.asfusername}
- 
-   <target name="ide-eclipse"
-           depends="download-compile, download-test-compile"
--          description="Prepares the source tree to be built in Eclipse">
-+          description="Prepares the source tree to be built in Eclipse" unless="noget">
- 
-     <!-- Copy the sample project files into the root directory -->
-     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3751,7 +3756,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
- 
-   <target name="ide-intellij"
-           depends="download-compile, download-test-compile"
--          description="Creates project directory .idea for IntelliJ IDEA">
-+          description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
- 
-     <copy todir="${tomcat.home}/.idea">
-       <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/tomcat-10.0.27.ebuild b/www-servers/tomcat/tomcat-10.0.27.ebuild
deleted file mode 100644
index a54403b4f0d2..000000000000
--- a/www-servers/tomcat/tomcat-10.0.27.ebuild
+++ /dev/null
@@ -1,202 +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-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.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"
-KEYWORDS="amd64 ~amd64-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"
-SERVLET_API_SLOT="5.0"
-JSP_API_SLOT="3.0"
-EL_API_SLOT="4.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"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	dev-java/ant-core
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit: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/jakarta/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-10.0.26-build.xml.patch"
-
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	[[ "${vm_version}" == "1.8" ]] && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.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},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."
-}