gentoo resync : 12.05.2022

20 files changed, 97 insertions, 299 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 37ef6e5032ac..8b2b19e80043 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index d5aa5eadbd9c..25f997d5f200 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -7,6 +7,8 @@ DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20180421153158-65cc252bf669.mod 22 BLAKE2B c
 DIST bitbucket.org%2Fcreachadair%2Fshell%2F@v%2Fv0.0.6.mod 48 BLAKE2B 97b2e5e0f91c66c301db92f58f064d0c91a85b0766ee77d85a8298269e1ac8c82acd1880664e302517143892b98b1f011688d3003ff595a1f9adf0fe8df6e8ac SHA512 eb5c512e9be3b38de69c2708418456ce71dc4285f64abb5e5bea738375576ea1d9ac2f4bd46163af34e7a7f7ae554ca3439a8122e2dbbeedc60221865bbfc2b4
 DIST caddy-2.0.0.tar.gz 350050 BLAKE2B 5cf53b85fa267d6686ce00754d4653013aab56e1fd076f4c4f8c864d57f924ab3fedaba4bce24972159e83ce7ae3889b75d5d0e259c8d77a0620e0b53b3888e2 SHA512 b7393f117e33529990424a78804c0e04a86ff8af8393564134066ab7b6a1d64a141b73708928209c1f29147a2f8fd94b2056f11642b8205b6de4ede6a783f2af
 DIST caddy-2.4.6.tar.gz 471625 BLAKE2B 43cabb5ca092f21eedb34941d58384feacbd021acdd408eaaf486e25f92e367c7d2e6a193f983b57ae374f6200dc8c04728ea2dfae45ec411b2bdab58dd81d32 SHA512 adbf59825fc7b2ad561db936e77272d2f6867212e1dd0099df80a0aefd41d1c67ad112094a4aa3a14492aa3818b02d331ab51987c3d84fdf980954ad1fa6852b
+DIST caddy-2.5.1-deps.tar.xz 133130008 BLAKE2B 1ef818f057a46109cea61d4821981909a8da93227eb691611a1356415d56d829b4ae922e6dc0b67e7252e2bf5a2738935b4e15e0131c85d7e9a40781410ad202 SHA512 5c0c52d2e5349c32c59211de8b210f4e9a49d21ce0182f2b3999d4dfb220e9c99a5981b155db3ab425325615509e2ed7443654cfc72e11a186bb479e2471e631
+DIST caddy-2.5.1.tar.gz 524858 BLAKE2B 727dbdecce1d16d7f53db0e1fd0a83d3739b0d19226683ed41a3831a8701c657aa49240f05f5985a1f381fc45a68e54420356bab56980e7b1afc85e47b942747 SHA512 fe110e9f71f58cd090f695dfaf3e129cd03e4eefabfeddc4d92b2ae8686c849fc7d0e3911014f9a0ce214add9af28b8668af383b83d3dd833ff3666cd14c66b8
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
@@ -2107,5 +2109,6 @@ DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f36
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv1.0.0.mod 76 BLAKE2B 2b8d5265d8f690bdfe78bc571e24d3b5f51dd9dadbf87cd5a5019ddf5a54cd8a9f895e65ecf216bad03687115d404d8e8637a6b2b5aafb19c6988340a1da3574 SHA512 c8b52c1a238330c05e1baf979ab78726f8276944b1d9ab93334f9020c7ca2cd3fb39008e1e56c5399916a6da6a1ff896346c6616ea1fe2cbacc01202a2d56e06
 EBUILD caddy-2.0.0.ebuild 66030 BLAKE2B 6b32af19bfa3a76058d88fc019f16e1b03d07fb6e1e15cd8c8d455f6aded141270fa1726f1a6b816a5349025f88dfda20345eb8eae963d61632f94abd1f8e759 SHA512 453fefda0c13df71a2fec8f31ed21edb32e0d1b5ab1a9249b72f32cca901d993ccfbcdf0ce3092afe598783e55767906808720616098ce0464602e7140a3e1f8
-EBUILD caddy-2.4.6.ebuild 84951 BLAKE2B 0680f5522cf57fcb5e36eb9dd2fafd82ed9a5e5d89d7b164d3c4ec3525a499caef8fbd3fa9fcae983cfe07945d9f6dc4f89c9d947a2be397e89cc7b9635bdecb SHA512 e2242d7aacfd372ea8e70f81b473214622510281b2b2f2fc08ebac19fea08a941f8064f4f375972aa45462b72caf25ee5d1b301a609eaa2a853809f189773b3c
+EBUILD caddy-2.4.6.ebuild 84950 BLAKE2B 5c918615924debe833d25a6a3204570959c6adb9888e93e3d3bf8c833f92b6a6bb0cee5b3438a5cd9c2650856d23cffc4933fe82645db9931eed0ed0447198f7 SHA512 4c029884677bda87c234ac0db0cd51b29d732317c159919a44d7b607b6d0ee85e692859e1ed859f9e78fa928ab79dbcbecc82e88bc4d96887401aacdd66fce6c
+EBUILD caddy-2.5.1.ebuild 1036 BLAKE2B 486d26f6727ecc957bc973b1851f684d8f8dfab06be959540838744c9b273c2a68a4dbeed6bd05581443fd63f9cfe4b5ef1df2581aafff94dc3b81902ef9f2fd SHA512 16a33de564002ed83c2d0be5163bb34508571ef5062a24e1987302e3c52609cbba158586c10aba13fecea818888cc065972dd452268a701296ac10195abc039e
 MISC metadata.xml 327 BLAKE2B c733fe2ddb3626e38631dea64fc3edf837fc52c8454ed7a37f2859a9759db43db0ef018753649276f846cf4a67b705f2080d7bf55856848c8fb2a2a5db43cb4a SHA512 c52162e031367163930279cf1ebb06b5a59a5d0d13769fe79f6ee146c4752865ac6e4bb13fb8087a569be125dc6d8ee0b2d052088f27d2ae327ba6a31160252b
diff --git a/www-servers/caddy/caddy-2.4.6.ebuild b/www-servers/caddy/caddy-2.4.6.ebuild
index 028e4f7bda66..b03f10936176 100644
--- a/www-servers/caddy/caddy-2.4.6.ebuild
+++ b/www-servers/caddy/caddy-2.4.6.ebuild
@@ -1585,7 +1585,7 @@ SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0 BSD ECL-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 RDEPEND="
 	acct-user/http
 	acct-group/http"
diff --git a/www-servers/caddy/caddy-2.5.1.ebuild b/www-servers/caddy/caddy-2.5.1.ebuild
new file mode 100644
index 000000000000..12a995b0d9e9
--- /dev/null
+++ b/www-servers/caddy/caddy-2.5.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit fcaps go-module systemd
+
+DESCRIPTION="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
+HOMEPAGE="https://caddyserver.com"
+SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD ECL-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+RDEPEND="
+	acct-user/http
+	acct-group/http"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
+
+FILECAPS=(
+	-m 755 'cap_net_bind_service=+ep' usr/bin/${PN}
+)
+
+src_compile() {
+	ego build ./cmd/caddy
+}
+
+src_install() {
+	dobin caddy
+	dodoc README.md
+	keepdir /etc/caddy
+	insinto /etc/caddy
+	newins "${FILESDIR}"/caddy_config.json caddy_config.json.example
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newinitd "${FILESDIR}/initd" "${PN}"
+	newconfd "${FILESDIR}/confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotated" "${PN}"
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+}
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index 857a7ff6418c..eb479ce40a75 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -1,5 +1,5 @@
 AUX gunicorn-20.1.0-new-eventlet.patch 1103 BLAKE2B 3329864c05238c3b2a6e38727991f7273bb0fe5aa8e3e4c09cd2f7132b5d47fb9ee02fde171abbfc64d84ab0bf11b6712101e8510935d284175ea46771bc8f5b SHA512 cf404efa930c1e6948a8d2508107315d380bbd55a54df1e2a2e8472bbf392383a8505cc7dc15077f1d182f7be9ece558676470a6dbedbfcb0d873438b82fa9b8
 AUX gunicorn-20.1.0-tests_optional_modules.patch 622 BLAKE2B 27efd7afd2c69e65622091f9fbc59e5db1efbd519015c51cc607735cb6c709b2234e3ee5fce045f3d2c3eb67099b68ae5295d7000df893775e3a28c050b5b0ce SHA512 42ef99e0ae1b125e379cd2d6ef3dd917de640db96411495eaa04c09eae88254fa7930f00de72571aca3320454eef2fdd54d16c97bb09b45abd7232965e4fb861
 DIST gunicorn-20.1.0.tar.gz 354960 BLAKE2B bae414a8da7a4dbdf79e0b46f517138534521a1a8544f4ea2e1e27e6778d2f6ad8d6a8af02590fedad47d305acdea53f1cdbc4deeda3619fc4a5ffef0932bea1 SHA512 4fd905f62adc30e044cf2a56a1a77e14bc633258267d6bfbd4f6a68494f93f377e9fb9ed94fab7f11f9d7813857a680974a88c4b6bf97d4f1b74792a81810111
-EBUILD gunicorn-20.1.0.ebuild 1478 BLAKE2B ef0236d45bff759644b1f17e1e3ddc2bfc3ee2a697760ec05b81efc9568bed8c8eccb9315c65745f8e9bba962b9143c9fdb583361bfcf0d9d2d461fcec35106b SHA512 349e7c4c1a5979a3bc65da18e0189e2d91938e215813c407ef69003beafbb9c0bc92e67c26c0769704a69086349c0fdf73c6e28b8c7b666b9a4256cd45529498
+EBUILD gunicorn-20.1.0.ebuild 1491 BLAKE2B 4355e0d37670b335a42a5a6ad1a950666996007e0edbe89cf9b35a229ab82437cc23572d049ab5cdb0f3a45fdf9859b6cde584352465fa08531a3a325cf95dea SHA512 802c5a707b6cb3096a092e1d51d110eb12b42455a654839cf387da5bbd158ee77ea96342e05aca3572009a98cdd8121969e3bc7848342873194bbaeb7cb8cb62
 MISC metadata.xml 821 BLAKE2B aa75468eafd9c717f3b3b55b4c91917cd94e612f591e752c93bec95b57e5abd4f46fd98de88c52ca5c624dc00f6d45afbd03f04743f962f87be9321902142712 SHA512 c7746b7036159f99a67dcc688a839ec06adf85d2bfb2214a2ec0b961bfcbd9a72fb5f2dd66dc3868f0d50e5d99386e4a4251f872afd7ad932dc4cca6fc33dff3
diff --git a/www-servers/gunicorn/gunicorn-20.1.0.ebuild b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
index 6984d7900984..0758612b5491 100644
--- a/www-servers/gunicorn/gunicorn-20.1.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/benoitc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT PSF-2 doc? ( BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index a81e3e6a2bda..e62c6874523a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -11,26 +11,22 @@ AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f
 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.17-src.tar.gz 6086996 BLAKE2B ff3584e58ec6f22f493cf7f32435423d68b941d9eec22441ee54ba69af03b50b687b23012129108485c9db147c8e7364ded037cf9ed2add174e6c928b927382a SHA512 1cc0f8e2187934c6dac3e31739f8c53a0a152527a98210deab8ce027c1347cbbd1cef3bdf0294bee3c4dbed20ba57b2291bcd887f353837fd505ea2d17e7ba3d
 DIST apache-tomcat-10.0.18-src.tar.gz 6088118 BLAKE2B 7d3fdb5a682dd44d358a619a18ca3df3bde27c9fc963436c9bce86baf07a42e87ba80724afdc6ce72b493d2fb35dda644eba29df7d4434f8c815ada4cb5d2ca3 SHA512 001205f382f44163f08dba1d306472b7ef3256e31a522c3f1f7595bca4fd084776a0c1f69b241302fa5d0d2f143ac063cb34d4fcf79a51ec9722f2f2ce3f1dab
 DIST apache-tomcat-10.0.20-src.tar.gz 6097471 BLAKE2B 77df97d73ff87a5ad55dfc3a0df02e3a306e619a5ae4bd2df0a0e3d42d236ccf2c6a6c46f60f56311f9be1bd561be9096d810d932f136b5856ff275fb3ae8368 SHA512 1e75b0bad54a9fac6ddc650156fac88bc91933ff0bf4e9a62948f5e116454b6def10d7ad632968e709e8aac72b15c567e4497cdb9b594352cd12d7518fdaf18f
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.76-src.tar.gz 5961741 BLAKE2B 4c661c2f753edac48c28fdec3caa06c487e1546feb91f2d69003a4d9f71fb023eb2314520bb156f3087656d655acdfdbdff3f68cd3f81d0d9dfbb2c9577898ee SHA512 b1c1b8c870c77e46969fe64acc71194d37605e5ccda87d105186d8070ec2dd0b7b9c64cf2f9b276db140fd3927832405123018f6fe8f46c0ebda50af6404d8b9
 DIST apache-tomcat-8.5.77-src.tar.gz 5963037 BLAKE2B 63192409b148cf0691e6ad22180e4f79d8603e89633598ee3f1dcfdd7d55b88530ecb1aa7c585920e086a7582dea78fcbcd1498ed2552e0f8d17127658769f66 SHA512 a0d2f77540b5370e09d03d04340e0c7f539eb5761b84ea3c8ef924e2a3e7f9528b3ed83a0c8e413bc9335cee6052135788e48e30d95f231ba3ade7f0b53ec157
 DIST apache-tomcat-8.5.78-src.tar.gz 5972826 BLAKE2B 93acb2e997a877a2195642da7d896ec4f08bebd83aa12d868607056c23722bdb90147814173dde17fc142a9e4e434e4570a15ebfa1f8b1c7911a16408728b4bb SHA512 b58fdaa57420fcf7759420fba26bfd6edaa5174f5d3a81fdf8783f19d5385e2502d2ad4bfa0e4a77c6a084bf6d97a6d3cd274ab0ab3f2311d23079e273c41b32
-DIST apache-tomcat-9.0.59-src.tar.gz 6142359 BLAKE2B 26dee501a374e54280237dbe392924ac89e3e4b331a11b30c2e0923ac38fa16bb52c02dfc8a9f3597fb0ee169ae2835ac254eab745d1e2ab1e64cfed6395d0c3 SHA512 cea0125ca9b90b247ed114fa7b2e9c63da38b1ef97b3a373a43ed0d775764178534a4014b254219c8c5a26575eaf0ddc25ebc1e276b2ad5086ef3406627f1c80
 DIST apache-tomcat-9.0.60-src.tar.gz 6143845 BLAKE2B af7061854659de06afa6a7cf6380c4be4375e18bec896049bf468ddb9139794170271454af4712ade5099b8d46ed7c8d642e9c5f37ea168f0e31394a5128beeb SHA512 e5cb12fb134ff0a59e01a30fbcabc350ddbef6959494176848c2858c3c68444bc520153e00fdcdecb0eefbe7f69876c2965fedbffeeb0aeda7931dc1c11b0de5
 DIST apache-tomcat-9.0.62-src.tar.gz 6156545 BLAKE2B 414f4f7193a8db2bb3d0abcbd2d8c30ede5783e83ba01229ffb322e9bf6b08d2fb10d83ce4742d9e6a4ebc50c9b047679ae798fbd3db8ae165f76d2782034d71 SHA512 7e9cad2703473d9f096009c464b28d54d3765259fab1923ef8c9b1cbfa231fa51cedadfe771a3a95abffd258759a71023e036bda78b949440a5e826fbd4e9e09
 DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f
 DIST biz.aQute.bndlib-6.2.0.jar 3156015 BLAKE2B 922b9bc78e47968bad73a26f4df475d84d8a2bca3773473b1f8c147737e652728df4e90a49d09a20943f418a91fd5acfe18e51137e85850796d95b7415bcf684 SHA512 7b7b366467b71c6dd67b3d7a7bc63d476c4aca479153bbc1506435168b0b4c792152fb5b44e2b1f916cd67f482d15956d2c38182fdfaf9679dff65b1b109a16a
-EBUILD tomcat-10.0.17.ebuild 6257 BLAKE2B 95e9a101c876de408f2441f0b7a269375365b68e6b50cf8bf4da3df68537f221b87a4237d3a929aa68f8efc4cab6dc9876adb9aa0152d01ad8155d21d7fee8f6 SHA512 dcadf16232b1eb18605e90abca410e825a401057698a96c8bee7be828de97deea22ada40f282519d6d1f7ce03988b068056cf6f7641aced2a81f6f9244d2b4b5
-EBUILD tomcat-10.0.18.ebuild 6258 BLAKE2B 21668cc1db4c932750ee53bbb2e8806231858bfc42cbeebbca639b272475b548db84ebf994cd89bdb72e44c5f8eabf13e002b5d372bf84c855baf98593abc0b3 SHA512 f7adac14aa388aa4ea5a3cd2ae3bdc02ac48d890bd411cc93d34c5df324fac177e9e05a69b9439a7e8d53725e8f126aae5c1808311f7e08b0b74adab4e2d7139
-EBUILD tomcat-10.0.20.ebuild 6258 BLAKE2B bc9c56962454cb375d6c8cf32a513d19b5a60cecf5441d5e2136d662580f98301b108bb1ab05f09ac4ab90180bb0e582132b632aaf1ca19472f7ea651f0fba38 SHA512 3d26aa850c8a13921c797d91445c955fb80b5e58889db3c50ff2b121505d0a3553f2b0627eda45734b78f78767b3e3612ddd34b2b4d5cb8865d7fa8e0bfdd9ac
+EBUILD tomcat-10.0.18.ebuild 6258 BLAKE2B a6e327e45698975dd113defb9423b706cc93327457c34ebefc54dc76c428cc7ffdb20a8ba4640a7502ce1fde11996d9486148781523ece067edbef1e234a7bbb SHA512 8950c857f87f54fdada301936fe1b2167ea9cbd9a87f6c602d68f70f5ea00a4ac2e0d290c82030433169538cfd10aec365f7902380b39135473216e601f3045d
+EBUILD tomcat-10.0.20.ebuild 6259 BLAKE2B 98aafd111b5567ed267889bef4752a77837046621215aac65425868370d22198502c2398b8633d056345529d9a488bfcb1ffd8cb02667ae9c411f1b4b888a58b SHA512 b6202ca76aea59086cc906ca4af6df31dc907e6239f9684d737b979f7e158deec7e9e24c4d33dd2c145bc6b2c60b5ec01e9288aa4c71db95c64e768f7814fa6b
+EBUILD tomcat-7.0.109-r1.ebuild 4145 BLAKE2B 1f9d8ec17cde0bb8ad4bbea05128f7643b5ae691faf9119bde3e031a6d4e35b48db47e0f1a89aaa72ec449bd6f61be8b31b80decb0ab04485b88d1f30340e6e0 SHA512 740a18f8f5f68a635616edfb0c166f3bfb2e80b538462325eb5abff5e296a50cc3367561cbb3e53afc5b0f44084c4b3cb16781a3d1f659e6c8077aa3513414ef
 EBUILD tomcat-7.0.109.ebuild 4147 BLAKE2B 8023fb9265a3e57bbdb506559bfe9a337f566e09b6cccd0e74e84341e54d1434134eb0aecaf72a97113826d8f7359dea1e5672db44e9dfb706b020cf79c51802 SHA512 0730da2fe90a5fa203e03eef5044eb8b90c5b800d064d65467370834b788c3de03ea5c57ccfe20b29deac9c560c68029e94a80be180b240356565121d453a2a4
-EBUILD tomcat-8.5.76.ebuild 4748 BLAKE2B 9d71dfebbb683069226f975aca6dfbd3c6d6b81fe56b99ec9d15f50603e393ffb1f38ea7157ece56593f13dd7f9418bac17c0bb25d559ae9c6a3f4859c4189b5 SHA512 7f65aa3ba78642bf986126adc1fbb3b4a73fcc66d6473fe75c7a6e5b10991633c5333c7d6c5859b06714eac5a43fea85bdcb778ef8536b111811c07465f8477c
-EBUILD tomcat-8.5.77.ebuild 4749 BLAKE2B ce31b7dd5afeeb23e3be117041e0b3381d62d1efe66514354670f24223ca1086c2474d0894ee44e3ec2f8bc76a620ce601fde5a6404bfc4aabd9c79531bb555b SHA512 7bad1081b03af5f21b7e9289cc5e813379aa837b6ae0ccb3ea87dcfbe5c24a351ac5053f5dd27791ab035d22d72b06eaaf6799fe41d326e8559b0fce86d491bf
+EBUILD tomcat-8.5.77.ebuild 4748 BLAKE2B 9d71dfebbb683069226f975aca6dfbd3c6d6b81fe56b99ec9d15f50603e393ffb1f38ea7157ece56593f13dd7f9418bac17c0bb25d559ae9c6a3f4859c4189b5 SHA512 7f65aa3ba78642bf986126adc1fbb3b4a73fcc66d6473fe75c7a6e5b10991633c5333c7d6c5859b06714eac5a43fea85bdcb778ef8536b111811c07465f8477c
+EBUILD tomcat-8.5.78-r1.ebuild 4750 BLAKE2B a35a7ab335879705ba77fc18d1d90d07d2438073a3efa75dbccd7a5a54cb93aa53d6618b63d99f3c1c959ed0ceddc738257034aa1ccb002e686a836f65e87aac SHA512 b78bd351be7d5f111827f46e23447372eac320b3af8891106658002f44cded4c7ad404a8ff221120e5b777d29beb02d292d71503af7f1e7dfd6c0684d49f9226
 EBUILD tomcat-8.5.78.ebuild 4749 BLAKE2B ce31b7dd5afeeb23e3be117041e0b3381d62d1efe66514354670f24223ca1086c2474d0894ee44e3ec2f8bc76a620ce601fde5a6404bfc4aabd9c79531bb555b SHA512 7bad1081b03af5f21b7e9289cc5e813379aa837b6ae0ccb3ea87dcfbe5c24a351ac5053f5dd27791ab035d22d72b06eaaf6799fe41d326e8559b0fce86d491bf
-EBUILD tomcat-9.0.59.ebuild 5822 BLAKE2B f72cc3f9c4d22884da100c08c1d52b83c0ee5cc4f370a73bd7d7a48beda1c942d481bef45b65097d71429b96b54a32368c401e11427bde953e34ad92f6aab67b SHA512 7591792003f8f2fd4d00e510ba6f54c9fd08cc4dec9b786827d8997affc3d984a21bc30cc251924048bd62b70d33a14f5b8deb268ecb82e22382a4e8ed79f044
-EBUILD tomcat-9.0.60.ebuild 5823 BLAKE2B 8aeb5f0eab7e68936fe5ac7f6855d2017ca0e8539c2751521b0e11f4be521f4996eb5b6f8790e27a3c6249f4d60dab093340c8930091df47d5f9b4c0e36efe0a SHA512 86af1c38188fca1b71acbf4d8f6c8c15a51a854681e1bf82854a695f01350ad99e4d5770131a3fe753f9f4a7afb3d39218fd3f5124982ef920c559715474da75
+EBUILD tomcat-9.0.60.ebuild 5822 BLAKE2B f72cc3f9c4d22884da100c08c1d52b83c0ee5cc4f370a73bd7d7a48beda1c942d481bef45b65097d71429b96b54a32368c401e11427bde953e34ad92f6aab67b SHA512 7591792003f8f2fd4d00e510ba6f54c9fd08cc4dec9b786827d8997affc3d984a21bc30cc251924048bd62b70d33a14f5b8deb268ecb82e22382a4e8ed79f044
 EBUILD tomcat-9.0.62.ebuild 5823 BLAKE2B 4cb40dde75f3a89d20cd2fbf069862a0cb733499e871d4d72808424d041cfdf6e03e2226f713af663f9a56069c66874079781d72619c92fd53fe367b6b07e644 SHA512 882546993468a1743de5c3cc289fdd9da57d3b95fb8bbb5184215cd7b53f8454e3a2c49a8f765514da1545d80ee14709eead03cd919fa0b056212e80de3c0901
 MISC metadata.xml 713 BLAKE2B 8a4ecfb2190e156b77598a825550953f936ddc1a1303a95bcae173592ac4f482e81af1d7b62bc62248c20ac92cdd1dd3a9c351c74f684193085c0b242043fee7 SHA512 946fed270cb43e9c239f6f831ac2e8021526a9c3b1b8fea91d00d1b48f979273de3f7c227bce03009de04bcc8386803606864ffdb85666005d6b0ef5c49f01c5
diff --git a/www-servers/tomcat/tomcat-10.0.17.ebuild b/www-servers/tomcat/tomcat-10.0.17.ebuild
deleted file mode 100644
index 1880f8d73eaa..000000000000
--- a/www-servers/tomcat/tomcat-10.0.17.ebuild
+++ /dev/null
@@ -1,198 +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.2.0"
-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-9/v${PV}/src/${MY_P}.tar.gz
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="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"
-SAPI_SLOT="5.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/glassfish-xmlrpc-api:0
-	dev-java/jakartaee-migration:0
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_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.16-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-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
-	java-ant-2_src_configure
-
-	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "Please note that since version 10 the primary package for all implemented APIs"
-	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
-	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-10.0.18.ebuild b/www-servers/tomcat/tomcat-10.0.18.ebuild
index 2d8f92da7a35..8846292412ce 100644
--- a/www-servers/tomcat/tomcat-10.0.18.ebuild
+++ b/www-servers/tomcat/tomcat-10.0.18.ebuild
@@ -17,13 +17,13 @@ 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-9/v${PV}/src/${MY_P}.tar.gz
+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"
+KEYWORDS="amd64 ~amd64-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-10.0.20.ebuild b/www-servers/tomcat/tomcat-10.0.20.ebuild
index 685d4e4d5ae4..17405e3e5eda 100644
--- a/www-servers/tomcat/tomcat-10.0.20.ebuild
+++ b/www-servers/tomcat/tomcat-10.0.20.ebuild
@@ -17,7 +17,7 @@ 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-9/v${PV}/src/${MY_P}.tar.gz
+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}"
 
diff --git a/www-servers/tomcat/tomcat-9.0.59.ebuild b/www-servers/tomcat/tomcat-7.0.109-r1.ebuild
index 164acb30f6e5..c04750470fc6 100644
--- a/www-servers/tomcat/tomcat-9.0.59.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.109-r1.ebuild
@@ -7,78 +7,43 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2 prefix
 
-MY_P="apache-${PN}-${PV}-src"
+MY_P="apache-${P}-src"
 
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="6.2.0"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
 HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+SRC_URI="https://archive.apache.org/dist/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
+SLOT="7"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="extra-webapps websockets"
 
 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"
-SAPI_SLOT="4.0"
+SAPI_SLOT="3.0"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/glassfish-xmlrpc-api:0
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
-	dev-java/wsdl4j:0"
+	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
 	acct-group/tomcat
 	acct-user/tomcat
-	>=virtual/jre-1.8:*"
+	virtual/jre"
 DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=dev-java/ant-core-1.9.13
-	>=virtual/jdk-1.8:*
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
+	virtual/jdk:1.8
+	test? ( dev-java/ant-junit:0 )"
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=(
-	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
-	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
-	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
 src_prepare() {
 	default
 
-	find -name '*.jar' -type f -delete -print || die
-
 	# Remove bundled servlet-api
 	rm -rv java/javax/{el,servlet} || die
 
-	eapply "${FILESDIR}/${PN}-9.0.58-build.xml.patch"
+	java-pkg_clean
+
+	eapply "${FILESDIR}/${PN}-7.0.99-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
@@ -91,25 +56,19 @@ src_prepare() {
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
 EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
 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}"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
 
 # revisions of the scripts
-IM_REV="-r2"
+IM_REV="-r1"
 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
+	use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
 }
 
 src_test() {
@@ -133,13 +92,6 @@ src_install() {
 
 	### 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}
@@ -152,7 +104,7 @@ src_install() {
 	fperms 0750 "${dest}"/logs
 
 	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
+	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
 	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
 
 	# prepend gentoo.classpath to common.loader, see #453212
diff --git a/www-servers/tomcat/tomcat-8.5.77.ebuild b/www-servers/tomcat/tomcat-8.5.77.ebuild
index 67b6462910bf..00727fd8a0a6 100644
--- a/www-servers/tomcat/tomcat-8.5.77.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.77.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.76.ebuild b/www-servers/tomcat/tomcat-8.5.78-r1.ebuild
index 00727fd8a0a6..d0fb542639ea 100644
--- a/www-servers/tomcat/tomcat-8.5.76.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.78-r1.ebuild
@@ -15,12 +15,12 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
 
-ECJ_SLOT="4.5"
+ECJ_SLOT="4.15"
 SAPI_SLOT="3.1"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
diff --git a/www-servers/tomcat/tomcat-9.0.60.ebuild b/www-servers/tomcat/tomcat-9.0.60.ebuild
index bd49dfe74c96..164acb30f6e5 100644
--- a/www-servers/tomcat/tomcat-9.0.60.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.60.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index 191b22f27041..e4800d211d6c 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -1,3 +1,3 @@
 DIST tornado-6.1.tar.gz 497359 BLAKE2B ed5981dec5cca962f907f97b7f906c1eef40d2b2b6d6cc16a21bd0a0a91ee58a60bea84b7ceeeff30b3462d707c56a5062c71d4ac8f25ca6a306ded6c6f072c5 SHA512 0ec1db1fad911182bda547c177a18b107b906cf66576443069e2b986cf041b3d4ebe08e5a168aa5cd3b56547f32f8b384bacaf74db89f582951d7b610b7494e8
-EBUILD tornado-6.1.ebuild 1432 BLAKE2B 8756030c4c9df6500656e11d133d3da2de765624a840ec9f6b00c5233ee3a0cdd9c5fc72187476610a1a32ae1009a99dac8daf5ba1445f8486e0d4ee4a90553f SHA512 eec81e174587b4570f426a986decec238643948ca765113e1a432906a4155380ceb5c1546e7221c7a12d1d3c9f5ae9758986ba9a609f162ec48586150c59f38d
+EBUILD tornado-6.1.ebuild 1439 BLAKE2B 52e2446e769f5c7b55c653a8e396a1c1fe7c9e23f0c956a3199d3da41e9236c4cc08a9cc017f0a2a353b737803373bf5187b0ba5023fa5590a9c4f2805f72aec SHA512 795ed32b0d25730dd1ca73a589602e9f48c7cd069417a8f990ff2a8cd427cdafb77e28b1efa0558ba0e3556ed147f42aefcd50ecf4d8ae9f6db4139247b81188
 MISC metadata.xml 381 BLAKE2B 96d5942b11b6364eeac2248f6e92a9e7a54094ba2b6e9ef966be4143e1fa01fa0c417027d33a71c51bb094b905b9ff79e05107e1a9debb4b1ef932ba11fd8565 SHA512 cd4db13e0c6a9cf8b3c788c53dc5ecd0dce2cf783e7b2d67dba71299d1c6a3d1dd2c2a76c0d69816ab0da4ca23f831613323c55864fd858690c605da5426bf60
diff --git a/www-servers/tornado/tornado-6.1.ebuild b/www-servers/tornado/tornado-6.1.ebuild
index 2f2533b8e189..282234024f34 100644
--- a/www-servers/tornado/tornado-6.1.ebuild
+++ b/www-servers/tornado/tornado-6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 156f2c4bf318..07c494556e37 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -10,7 +10,7 @@ AUX varnishncsa.initd 716 BLAKE2B 33fd6b044ab50aef629fa4501eb4a78bd3d690db52b86a
 DIST varnish-6.5.2.tgz 3464372 BLAKE2B 68a7bca159ed9539126f66d21450c87780b49b66a2d45a5abc7db6fe9d68c8526aa059546fb1d865de753736793e700611f4f110edb1c649f4e9753c4dfedacc SHA512 31673eaa95e5d3413cd3a4a6fb324c1f0ad2efb22b75409fc0e02c61446787eb167bd530ee5b0a199da4fc76cc36f3603984d86781f856cc6a4aac48260fe4ef
 DIST varnish-6.6.1.tgz 3518308 BLAKE2B 6a88165394c0578427de20588ac2c17f502242bf94f30e9284f7bc2c271b77c3d6511a9dfb8d1cb6d75e1fc4563360fb0bec762aa17481fa598cb5e9d9527705 SHA512 af3ee1743af2ede2d3efbb73e5aa9b42c7bbd5f86163ec338c8afd1989c3e51ff3e1b40bed6b72224b5d339a74f22d6e5f3c3faf2fedee8ab4715307ed5d871b
 DIST varnish-7.0.1.tgz 3712763 BLAKE2B ec47b557d8623e349032ac48459ea0c636a4b2810b4354666a651b652b65389abedafd0b665ca1e8178ea2b8339be8fd782dc61e1245f9307e00d665a3c20500 SHA512 7541d50b03a113f0a13660d459cc4c2eb45d57fb19380ab56a5413a4e5d702f9c0856585f09aeea6084a239ad8c69017af3805a864540b4697e0eac29f00b408
-EBUILD varnish-6.5.2.ebuild 2248 BLAKE2B b673e951aa702159c080bf53a3a021df476317987d6c14f872657a14480b158de0c6181b51f04432df6dab6fd03a10597d6a1d08c3af81d280def6b24df57fe0 SHA512 1aa8dbdc05d16694443bb8f83006257cc26ec73dc7ac402f24f0f53694214736260f7bf1aca76bd612efe848a98c2b8f0603e7cdf38ef5535ff321b922567b50
-EBUILD varnish-6.6.1.ebuild 2384 BLAKE2B a546085652753ade2e1c67c6ea13cf5bc52bac3d09566e4678e22982e77577a3ce685f3e7d8112f4ffc019cd9837c9bab957fd98b97b918e8f88ce50ee93bd63 SHA512 e3f4414a0a9e7e3229a6fde701221ab0487e4cfb087938ec9266a02ab8a31ed799c10191add4b7b9022cd45b16a02c8b58df618492d05c8965b814ac7012879d
-EBUILD varnish-7.0.1.ebuild 2168 BLAKE2B 8ff90982fdfc3fd11bc1df4e128f370a8e5992f66a42b28e0f899fd508eae947fc706bc73ba996b3a752bbbd101f1a3c92f63fd23f8efdd3bf6aee2289d80592 SHA512 419d179ab362c046243a241b91b6af4b06baa7425b0156adbeddaf818cdf93b486446d74fd74ba5132d52937c2fd45fffba6b6fea1c3f5de7596f3dcadaaa5bb
+EBUILD varnish-6.5.2.ebuild 2242 BLAKE2B 12642eb183c75f065bb97891e00642aaeb7f3ea2c05ef20af158a52ed75d14618f97b8a06fa2376aaa4040e315d08838cc153195f136d7f1ce0342868a5219d7 SHA512 5f004408695a3dabe3671f1c8cc69be8b79990ef2155f2ce7e2322fb4de8154ee47da6bcc16f8bb41d0c2fb89b1de9d21d781c948574d27106876e416926e634
+EBUILD varnish-6.6.1.ebuild 2378 BLAKE2B e9a1de09eb47db50bb33fdef696abe0f22bf9608a7e42f1ace47169ba51783953a83fb32d63d3ac9cc86f2e4176404aa6e5e224bf1b6a4b7852ad99c08aca6c2 SHA512 3de370dea3ef7746f39e38f11383261f4d3fd0eefa18ed33f463ba3a1da460256d3367da96be73d9ae5b55c935af23b2ff4f4318d6f612c0418a010df387894c
+EBUILD varnish-7.0.1.ebuild 2162 BLAKE2B dcbb241284b0f5974a3af310f9398fd33a4090397f2ccc7cb67b8c8d54518312c5b063318302a321bd33f05ca1e7fb334c3b6f5a82d831b09f7af71a2537162b SHA512 330aac9d0e3d549d5d0cd19e97f0d39ca8a6e5b54f740ec0b108aef1038493eb793fe78c4b28085b5331eefc4c67aa135cd113161033dedab00c786a04c1c51e
 MISC metadata.xml 1155 BLAKE2B 84875f3204cf314d1cb22e323ae8edb4e439e11d165c019bdf959925236ee4df671a9dbfd5a98d4c8841f8ec19cf8e602b703052d9a864d7e3c652ffe40054f0 SHA512 34bad8011b4530abc02f35b1bacb3d632ea5d57da41162a246d5601d766f192448efb31445536e02485fa195ab5f5eb564b4a1886632d0fd32626184d1173db7
diff --git a/www-servers/varnish/varnish-6.5.2.ebuild b/www-servers/varnish/varnish-6.5.2.ebuild
index 887ae91d7519..42bef71981c5 100644
--- a/www-servers/varnish/varnish-6.5.2.ebuild
+++ b/www-servers/varnish/varnish-6.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0/2"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="jemalloc jit static-libs"
 
 CDEPEND="
diff --git a/www-servers/varnish/varnish-6.6.1.ebuild b/www-servers/varnish/varnish-6.6.1.ebuild
index 2f73463cee01..5f1c242c2b34 100644
--- a/www-servers/varnish/varnish-6.6.1.ebuild
+++ b/www-servers/varnish/varnish-6.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0/2"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="jemalloc jit static-libs"
 
 CDEPEND="
diff --git a/www-servers/varnish/varnish-7.0.1.ebuild b/www-servers/varnish/varnish-7.0.1.ebuild
index c8878790c48c..9043508fdaf4 100644
--- a/www-servers/varnish/varnish-7.0.1.ebuild
+++ b/www-servers/varnish/varnish-7.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0/2"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="jemalloc jit static-libs"
 
 CDEPEND="