gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /www-servers
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
43 files changed, 871 insertions, 432 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 143cf4cc61b5..1172c5b2a4fb 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/adsf/Manifest b/www-servers/adsf/Manifest
index 00e26e22942c..06179b4107fd 100644
--- a/www-servers/adsf/Manifest
+++ b/www-servers/adsf/Manifest
@@ -1,7 +1,3 @@
-DIST adsf-1.4.1.tar.gz 170221 BLAKE2B 41a87135b74e62c9d39c64839e7802b3decc47bee04cdd93eb0e1bec6361a654378e9c310bbd18a0bddeb834f444ff67aa0f8efe21dd7ffc94c876db3230b469 SHA512 b0334102308b6ecaead6db1f7b28c3bc27a9ac853fd055e9695e9bcf36ba25db890cae57a91195d398debdfd84b5d6c7ce9142d6bd5bdd30220170210b3cdf6f
-DIST adsf-1.4.2.tar.gz 170414 BLAKE2B e5f4a6f562718f335af0a9ad93d520422a5dddee0b7a737ebcf29f9b597e38422dec6c0e12fbb330d0bd17c4f7e92527f893b08576fc796316ffa1fa31870911 SHA512 20c3000a7c6cc3098ae8473aa6752d84b739492ce2011ca8bb9f31e265eb4fe11ebd8899d934653947cf07f81932511aea5ce542b7452331ab8e49ee4eedcab3
 DIST adsf-1.4.3.tar.gz 171000 BLAKE2B 7e3a524957edfd56382c788e2c551ec693dcbcac2bb807417ac63e1dffba9a8033cb058ad7bed425b7d0448ae98dc14ca53f935c83d1c699ad4f38a8700e402b SHA512 f9b30844bb1d48f139b8f8fe1a65ca404a2a9c3e98b24729bcbb08d083f1f332ecc6e2fc3ca139d1cb69bd7c49a629eaeddfbc6f5f16e4f223cda63f726e1dfc
-EBUILD adsf-1.4.1.ebuild 921 BLAKE2B f95fee7b561dfb4c4c88dc94e4d6bdef54928c007dc695f0b68cafc82f08226050bc1475708de5510d631d5990b3b975562a42fd657d1bc1e5c8f20fad6e4e48 SHA512 f1af5f30aaa87c12e337c3310f8a6e48cd5f6242994b836232fe03b9ab8ff6ba04e9f90783b4623a0dd3a466382f237996b9461b46753067ef51fe7f0aa1fede
-EBUILD adsf-1.4.2.ebuild 914 BLAKE2B fd2b1664c76566869ede140251483a930d69ebd4007f17f4159afa526366e576eed15a36b901740d0f4fa9b04b474540b78b00f8e49b3a12cdeb44f640d6d03d SHA512 9936329e6c27c24414b1cfd4b08a79ed6cc39e22449fde44ee1aa2a529ef0cf60dff24dab3ea0c6caa5b2df8b70805fcceec788e541d68fc3b2d0dab118245b4
 EBUILD adsf-1.4.3.ebuild 1092 BLAKE2B 678d4eba1e79826072e4fb68d00de2ea87179ae96c07dcf93ef390f2100ac0872f8470ae6eacb625b86717d8f499a840bd5c58993f91e0b6bf1108ed8d94a59c SHA512 7cd3f87177fbe3f4ce05b46f844a1a5ae45a2d9d4c935839633392786296c8f269a50032f587b22e65d4bd9e1355d27a7733b836799d992f94982a1ca04e78e1
 MISC metadata.xml 295 BLAKE2B 300607324d7aca3f9af7cf195244b3426a78be1ab6875fc10e645d50e8aad1e4fc6abbaa555cd94248db86afc83bfdd5d58fa78cbf74d0c56b1cfa303dc87b75 SHA512 640f33b2433c2259e00d0fa1daca377084010d7fc28da599ea0d3d4264567691bd4d0ad3033f1c1d852d1cdcf179b88c1e22c75e5955e344c9dfca1e82a79e9c
diff --git a/www-servers/adsf/adsf-1.4.1.ebuild b/www-servers/adsf/adsf-1.4.1.ebuild
deleted file mode 100644
index ba94f80fadc6..000000000000
--- a/www-servers/adsf/adsf-1.4.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="../NEWS.md ../README.md"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Dead Simple Fileserver is a static file server that can launch in a directory"
-HOMEPAGE="https://github.com/ddfreyne/adsf/"
-SRC_URI="https://github.com/ddfreyne/adsf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${P}/adsf"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rack-1.0.0:*"
-
-ruby_add_bdepend "test? ( dev-ruby/rack-test )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/SimpleCov.command_name/ s:^:#:' \
-		-e '/websocket/ s:^:#:' test/helper.rb || die
-	sed -i -e '/test_receives_update/,/^  end/ s:^:#:' test/test_server.rb || die
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-	rm -f test/test_version.rb || die
-}
diff --git a/www-servers/adsf/adsf-1.4.2.ebuild b/www-servers/adsf/adsf-1.4.2.ebuild
deleted file mode 100644
index 2e8d1a60f04b..000000000000
--- a/www-servers/adsf/adsf-1.4.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="../NEWS.md ../README.md"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Dead Simple Fileserver is a static file server that can launch in a directory"
-HOMEPAGE="https://github.com/ddfreyne/adsf/"
-SRC_URI="https://github.com/ddfreyne/adsf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${P}/adsf"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rack-1.0.0:*"
-
-ruby_add_bdepend "test? ( dev-ruby/rack-test )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/SimpleCov.command_name/ s:^:#:' \
-		-e '/websocket/ s:^:#:' test/helper.rb || die
-	sed -i -e '/test_receives_update/,/^  end/ s:^:#:' test/test_server.rb || die
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-	rm -f test/test_version.rb || die
-}
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 4e5c3ae5b130..ba8649c31099 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -3,8 +3,8 @@ AUX apache-2.4.41-libressl.patch 1082 BLAKE2B 98428a5653f47e6dd38452809bee92ef7a
 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
 DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4
-DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
 DIST httpd-2.4.43.tar.bz2 7155865 BLAKE2B cd85c7e25500f8f1b4bd6ac5f715718a61bf548dfaf36408a970d27bacbfce256e4dda255ba5b62f89e117c335d0568d6207c93e5fb0d2b1ee84dba4ce0d4bd7 SHA512 16cfeecc8f6fab6eca478065a384bdf1872f7ac42206b0bc2bcac6c0d9c576f392c07107201f39e0601dec1bbafcb33d66153544de4d87d79b9a52094d334b64
-EBUILD apache-2.4.41.ebuild 8581 BLAKE2B 0cd1879e77c0959e4240cd48b8e7b38bf46a946e35efd8a8fb75642f69d7ee0194024f40bb79ac2b428aa583ed7ac57c71f86f6e60d388d44866cf4efdd50ea7 SHA512 8efe75e056041c7cb4912c6dee6514a5ac6c68a69d3ea4148586c1af6c9aaaa2e5fc2d7049fb687cc389633c249e9584117968638f628e3e8fca683cc178d36a
+DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
 EBUILD apache-2.4.43.ebuild 8581 BLAKE2B 0cd1879e77c0959e4240cd48b8e7b38bf46a946e35efd8a8fb75642f69d7ee0194024f40bb79ac2b428aa583ed7ac57c71f86f6e60d388d44866cf4efdd50ea7 SHA512 8efe75e056041c7cb4912c6dee6514a5ac6c68a69d3ea4148586c1af6c9aaaa2e5fc2d7049fb687cc389633c249e9584117968638f628e3e8fca683cc178d36a
+EBUILD apache-2.4.46.ebuild 8583 BLAKE2B a001c085a489d04814e05f0ffa2559a893dade8d0724613d54c8abdfaf112dc631309775099f30c5fbfd771b075ed40be278b6c7564c15e3712c27b14131e8f9 SHA512 43280c29d986be71a4be6f52a9980a394eb5bec4cf870a55316d735840e4b9943c94d23f2f299bbd360742087d065d7299cd1fac349e3eb99af0298cef89fd56
 MISC metadata.xml 1012 BLAKE2B ca2238f428144240f64b5c9e48087a07a3f77278958efb240edeb864050ca01d1e042a37fb304fde76925fb651d7d97755d354a45aff34ac0589b7405b848d54 SHA512 a4e903bb75740c54256fa96359f6a97cd75008ffeeadfd6353648f5bfa2295fb108ec9de398956c79633bc465475f5db365d20d71caa34fc14a07c4715cc8683
diff --git a/www-servers/apache/apache-2.4.41.ebuild b/www-servers/apache/apache-2.4.46.ebuild
index ac4fa3b9f318..e7c1f5be1091 100644
--- a/www-servers/apache/apache-2.4.41.ebuild
+++ b/www-servers/apache/apache-2.4.46.ebuild
@@ -136,7 +136,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 # Enable http2 by default (bug #563452)
 # FIXME: Move to apache-2.eclass once this has reached stable.
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index da2060b601bd..9e0f852e8861 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -1,4 +1,3 @@
-DIST caddy-0.10.11.tar.gz 2860871 BLAKE2B 9050ee76a325c5ae183dcafec05b0d234a1308103f617908ec31a2bd8c3ce55c8d9ced9e30a36d616ff2c6f1581e1496bed4379a6f1ba3d0b5e7f9242edfabf8 SHA512 03539ae59f654d56ad0b441e7f67eb51135b1ffd539f9eb5953445089e72d3eab905ad9b08b001ef27e5054b760887a898b89ea85b48b4f852398b073e6e4924
 DIST caddy-2.0.0.tar.gz 350050 BLAKE2B 5cf53b85fa267d6686ce00754d4653013aab56e1fd076f4c4f8c864d57f924ab3fedaba4bce24972159e83ce7ae3889b75d5d0e259c8d77a0620e0b53b3888e2 SHA512 b7393f117e33529990424a78804c0e04a86ff8af8393564134066ab7b6a1d64a141b73708928209c1f29147a2f8fd94b2056f11642b8205b6de4ede6a783f2af
 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
@@ -1197,6 +1196,5 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d
 DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f361d08bba5f5689a0e8b51dc17f11fe893c1fb3c0b671d323c6f66448d0c73d26b64586ce2236cc91f44839eba5ebf2a858b04aa85b5bde847c5956b0a519 SHA512 ef74bbbbb50cb01b861dc25c1a1ee276cebb64a383a31f4acf3f78db0e1b5fa907c6ecb9a88e4819d4aa7d5fccced97b574c12e147c36677a8d4e5f73b55d04c
 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-0.10.11.ebuild 740 BLAKE2B 5db6734ed49caa6fd0df9a95a393a3fb763ee8963fbff9ea3e370239bd10ef6da189335505b1e04ebbedf6cb204f317c04c16474c03b77d9d2bf600938019de6 SHA512 27e78b3ec41d60e3acd781ff59f93468a998b2fae789e8a71bb142c433a9e07153251b5bac08d0b982dbdc98773f934013525bb7c68f5dc302c562dbee18fde1
-EBUILD caddy-2.0.0.ebuild 66031 BLAKE2B 4209c138a6746778eab3f86a1e0e0d4c43569282e10ee223a7796fb052966c0e23f0c9aa2b753566ba18ad5b18d71ca46a0752e9e26a1e601ef18d3f06b3d401 SHA512 f476e53905841f4439e7781855e049a987c3b46b7f11ed4c869e87279ab0271dae35346be012379c5472726c7d2740264fa558047035d926bb5261d39b6d6adf
+EBUILD caddy-2.0.0.ebuild 66030 BLAKE2B 6b32af19bfa3a76058d88fc019f16e1b03d07fb6e1e15cd8c8d455f6aded141270fa1726f1a6b816a5349025f88dfda20345eb8eae963d61632f94abd1f8e759 SHA512 453fefda0c13df71a2fec8f31ed21edb32e0d1b5ab1a9249b72f32cca901d993ccfbcdf0ce3092afe598783e55767906808720616098ce0464602e7140a3e1f8
 MISC metadata.xml 243 BLAKE2B db1542294c2fef7bcf6f008542d87fc1661eeb5ba5caee9658a0b2f803f17c30b26523fe6d252f70d692b52e85ba7c7c16567316ce33a534cf250a169e2b0f36 SHA512 9f804a00b8c8d98d3c097b0487f8f528d3648a316214b0009292903d0930f6808fde06be5a3b2b938203ee124f9102e7f15a1446e468c26e057cba332f70c539
diff --git a/www-servers/caddy/caddy-0.10.11.ebuild b/www-servers/caddy/caddy-0.10.11.ebuild
deleted file mode 100644
index bc2df356b5fb..000000000000
--- a/www-servers/caddy/caddy-0.10.11.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/mholt/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
-HOMEPAGE="https://github.com/mholt/caddy"
-
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" go install -ldflags "-X github.com/mholt/caddy/caddy/caddymain.gitTag=${PV}" ${EGO_PN}/caddy || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc src/${EGO_PN}/README.md src/${EGO_PN}/dist/CHANGES.txt
-}
diff --git a/www-servers/caddy/caddy-2.0.0.ebuild b/www-servers/caddy/caddy-2.0.0.ebuild
index 18347731925c..f14b1d5efd3e 100644
--- a/www-servers/caddy/caddy-2.0.0.ebuild
+++ b/www-servers/caddy/caddy-2.0.0.ebuild
@@ -1212,7 +1212,7 @@ SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RESTRICT+=" test"
 
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 7ce6d740dca3..187cc4a26f46 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -4,5 +4,5 @@ AUX cherokee-initd-1.2.99 1186 BLAKE2B 3c4d0bbc378940e425bcc8ae4f451e44ded8bc4d4
 AUX cherokee.logrotate-r1 255 BLAKE2B 33d6c7dca525e424d1a88c0248595d011215cebae749a5d6aacc9eecd2b6e8d447d67655570baf62b23db96c5f5611d4a98b99bfcb6be9e194b52794264fcf49 SHA512 73be4a46f217302b3e7969f0a5acf7f83357a831331f85c89c17320c594eb9e6fd87da111b7d8eb06840e0b1bb094106a5bb6f7dbf7923e834164a367f85d5ad
 AUX cherokee.service 184 BLAKE2B 76a55b38f5a7d78df80fd57f9461f68dc360b5efafe19338cc242c71f625b6900c5872283c32a97b6234f58621b89616e123983dec027d3bb1f797d388cf743b SHA512 e05cfe0805bcd7f133fc0bf485fbf781b9cc5e6f9e222b8ea89bdc4e9d4531caa6049100670b67d12bdb73c1e93ed5d949cc1828241213cfcd60a39b7424d8ec
 DIST cherokee-1.2.104.zip 6200164 BLAKE2B 55ff5b5475c478078727ec072da4f1205209701b972efa420fbee4133cb83cf2ebd4a0f49165e4653c4a6b6f9e0f6ef633258e6ee4732d998b19863e99e6e2f2 SHA512 9c9f44643d0d2636f2e3e61ef8e2918d91d9bb6099be761826c8ffad01d339739ed40984d01151044c2e536d4754b5157d6d20c37627ce49eecdb404a716cd9d
-EBUILD cherokee-1.2.104-r2.ebuild 4935 BLAKE2B 1a94d38311894aba8fe4bfb39341223dac09e85a66afffb3156c9b114fff79483e294957395fc5e924a8b403887fb3bf8041dc5e0c6d804ebb86d1ccacdc5647 SHA512 495e5f4446519afb74b62e4dfd23110f5f3554dfbc4dfb4303efeba86fff6df0ee02bb716072cfa1030ab61a65ddad9c10255fdb29d3ed0c4e450f1770855bee
+EBUILD cherokee-1.2.104-r2.ebuild 4961 BLAKE2B ee1c0dfb98e9415edc6ab190c9c3883add22ee1f1c2a1ba17dcf3dbe4dcfab7c8c099cdde380b585079ba37186cbfb8e23e656f977e57f6ad019d72346044f32 SHA512 bafe857b2591c00df5adfe4ae7e90f2bf1806effa949675867e8e9e27ede7af7ce0adf87be323c9e0ad6d661580b8963a5ccfb4eea3d051ea6e2f0b5159db04d
 MISC metadata.xml 468 BLAKE2B cbf0b56c17065b7281b4a762cd2390deb3af8c4388c46488d07c0ba39eee46224ee6420075e587345fbaba4a0cfa160daac8fd59b0343dd7cf25d313bee8aac7 SHA512 bfd1c8c432210025dd9b29ec89b383d3211ee9d1aabec4d59c2ec5801feccebcee3c55f7b6ed4e02daab9e72f42ab12517f957f396d0fd410ad3eee4fd05520d
diff --git a/www-servers/cherokee/cherokee-1.2.104-r2.ebuild b/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
index c93835e180e9..431f42db0e99 100644
--- a/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
@@ -11,7 +11,7 @@ inherit autotools python-r1 pam systemd user
 
 DESCRIPTION="An extremely fast and tiny web server"
 SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip -> ${P}.zip"
-HOMEPAGE="http://www.cherokee-project.com/"
+HOMEPAGE="https://www.cherokee-project.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -43,6 +43,7 @@ DEPEND="${COMMON_DEPEND}
 	nls? ( sys-devel/gettext )"
 RDEPEND="${COMMON_DEPEND}
 	rrdtool? ( net-analyzer/rrdtool )"
+BDEPEND="app-arch/unzip"
 
 RESTRICT="test"
 
diff --git a/www-servers/civetweb/Manifest b/www-servers/civetweb/Manifest
index 912324d26c69..f0250c48688c 100644
--- a/www-servers/civetweb/Manifest
+++ b/www-servers/civetweb/Manifest
@@ -1,3 +1,5 @@
 DIST civetweb-1.11.tar.gz 11421650 BLAKE2B 487044a313c2ff005a8dfa247b3d8a3c3b52ef048cbc3050ec8c0402ccef4e12e28de53fed5a3a91df1e7f59ba6c03bf545413ffdd0ce3e4d604148c16c661e9 SHA512 e1520fd2f4a54b6ab4838f4da2ce3f0956e9884059467d196078935a3fce61dad619f3bb1bc2b4c6a757e1a8abfed0e83cba38957c7c52fff235676e9dd1d428
+DIST civetweb-1.12.tar.gz 11463079 BLAKE2B 1182f798a2f9cdb34754b3c0edf80160efda31f72d800b26b27ec36ff4a5623745495a52632a128aefda67c6b902250c4e01ec7debd73d4a95abfc42a1b17ea6 SHA512 d6f8d29011bc1accd5384856bef16c0f20305f622a8f8c127cdf3ae5c567db3aba0d76293cc8c77f90f4989c44b2896a45e533d2f2408cc49488d1d234d308f5
 EBUILD civetweb-1.11.ebuild 919 BLAKE2B f1fd8bbfaafbb7623895ef6084d9959a8203ca1f7f56283a057376e4bd69870d4117d0fd225cb07a8909799287107277a1b4efe8b9ac1dab6db632eb5a7318a2 SHA512 50577978d94dddf28657145055a3fd0513ec9e86779e84a5357128d4d2b7ad209b8d772990f52ada74a1d9b5a3148ef919044c7d2afd0a35a750af0ac458d1a6
+EBUILD civetweb-1.12.ebuild 764 BLAKE2B 06f6526a9adefea78f17bb96f6577bebf52bb010551a974422dfbccf5f13ad29ff96137a3fa31ef8317a12e42d5bc6efd146932daa08e79918644dfa5c117ed8 SHA512 72fb4e4963bf4595388ab0ff77a5d548b61f7649fd5de22dc39d639315cc148dff6f6d94c49f14308d4b23f9bbef84410822782e5c362a37e32e0eac7abb0ce0
 MISC metadata.xml 404 BLAKE2B fabc0ad84971b528fe36760060c3daf34ef0e9e7a730a4ab7624813e8262ec2dc9e336f077d510877a8151b14934c3af2ad6a2617081fd6729b08b3e043111e3 SHA512 4444aa744d80abf7d64042a1a34fc425f76054a2d8c8e8d892007f4ef94742e0e367663f222bf39f76c611ec36af075b1c5972e5fea3c82d8b062494dfced5f4
diff --git a/www-servers/civetweb/civetweb-1.12.ebuild b/www-servers/civetweb/civetweb-1.12.ebuild
new file mode 100644
index 000000000000..f5dc3264ac3f
--- /dev/null
+++ b/www-servers/civetweb/civetweb-1.12.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+HOMEPAGE="https://github.com/civetweb/civetweb/"
+DESCRIPTION="Embedded C/C++ web server"
+SRC_URI="https://github.com/civetweb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cxx +server ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		-DBUILD_SHARED_LIBS=ON
+		-DCIVETWEB_BUILD_TESTING=OFF
+		-DCIVETWEB_ENABLE_LUA=OFF
+		-DCIVETWEB_ENABLE_DUKTAPE=OFF
+		-DCIVETWEB_ENABLE_CXX="$(usex cxx)"
+		-DCIVETWEB_ENABLE_SERVER_EXECUTABLE="$(usex server)"
+		-DCIVETWEB_ENABLE_SSL="$(usex ssl)"
+	)
+
+	cmake_src_configure
+}
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index e0dd7f399808..8a849ce9668e 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -3,5 +3,5 @@ DIST gunicorn-19.9.0.tar.gz 415774 BLAKE2B 1ac920e3a02aff434d2458cbcacd821df428e
 DIST gunicorn-20.0.4.tar.gz 373841 BLAKE2B d6f0b5b901697ebc6ee987af5766174a845de8bfad03ce95638ed087b92175e9b2f0e9a49fda70f8f9c6fdc15e1ef1a431c069270af068fb29780abcedf63fc3 SHA512 706620f165e36c178a6d3e65f51a9bb7746abd40dfc7c0f1b3b523771be953dd03b36111f192407aef474ad44afdffd11b6502e51376d11465ffac2255822d5e
 EBUILD gunicorn-19.8.1.ebuild 1171 BLAKE2B a8c6b1dcbb749db4dcf60b8c26111045be976f28559b2cb4a7f7ef1536dae320a0f7060bd572bdc2998dab0003230ad1688ca4c28130c70757702504222998e6 SHA512 ab4761df1c5e57b7aa87095de97915126007055a87cac29866a603604c47ef4f25886cdef723de8b36eccdbfd7b2ed835832b54b827ed3f27c97cee0c30a90f5
 EBUILD gunicorn-19.9.0.ebuild 923 BLAKE2B d6a784321f92ca5b2cc04f077a7d18bc24a1371867607b3813820e5089ce36f2f41ac38fae36b00fb1c8c2fbee9a36398624bc3823072c2eba50e3e8848f18c7 SHA512 f14c034ae4d0fa97483b80df04e5bba6ca4219b8944d38cbd43a21c91daafe001331985f1bda79fb9be81bac55db6fce2a64be489a91db37c723af452d563a7a
-EBUILD gunicorn-20.0.4.ebuild 859 BLAKE2B 69200f06fb8b724de78bbfc53c273d6fbeee24183707cfa4e58f3b9e6a085d71a44f244e63a07bc011cd23c5c13e65250a6e8749eebb0e2cb958c536d2957f87 SHA512 e84d1c06e6559708a197fbdf876201c527a1ac1218e370edc3f628df37dbb19ff7e0d2c09e8ac63764187bd6c60bba665a7a66c027dd4a6ff6fe3feeca298fc9
+EBUILD gunicorn-20.0.4.ebuild 876 BLAKE2B ee71f46d43eaf4c56eb7f2942530539b6893d7165924f8d22ba4b849a9f4e4be2fb8d3c9f732d14409dabf7e2cf9886b20ba9738cabecb09c864ff733c676062 SHA512 79448cdf422c527ee1447994cb5f1fef76f9dde6f0210c17ae919f4d781afadbc00c4a91f8181836c4c560f9e5a3f60dd15e182c7e4874cf8e5d2ffe82cc669f
 MISC metadata.xml 808 BLAKE2B d23e87c5659aed0bcb8a8719d3eb3a862ddff635b231ae01b3928cd6f33cd073b5b054742ed806a9dc408528c3a843a06e5db4c6a252beaaace6873d798468f7 SHA512 c420223f8e7f0b3ec1fb82091e38a85087ca814b16051dfd783e54d8af5fdb811086887a5f1e7177f8bcd37e098ab6244e3e8ecf38c6a3fa9941c2933b38e1c0
diff --git a/www-servers/gunicorn/gunicorn-20.0.4.ebuild b/www-servers/gunicorn/gunicorn-20.0.4.ebuild
index 1c881d642a18..9f57cc04685d 100644
--- a/www-servers/gunicorn/gunicorn-20.0.4.ebuild
+++ b/www-servers/gunicorn/gunicorn-20.0.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT PSF-2 doc? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~sparc x86"
 
 RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
 
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index d866ba63e503..57454fec4bd2 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -8,5 +8,5 @@ AUX lighttpd.logrotate-r1 385 BLAKE2B c41e4b7892d3cb8cd7306eb7fa93b4a03452786acc
 AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469ab074469ba0b670f56b147c8088ad9211f97a4f314fe4eaebac89cd9cddee34edbf3652b7ea0712c94 SHA512 fbcd7dbf9c6b97284465af133a7cd1f711978ef4318a749ff7d366b053265fac94a1d76f074f56722c382179631d38ed8a07ac2c2fc4b712a93acab2f3609c0f
 AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d62064a271a7a0cf5b32423b349ac13d2ebc38a8de5c6478823ac022e46eef60a830e6ae9598e848b8c220bc2f SHA512 3fda360423a7a406a2981de647dac6b4419fe60c649bf3cc21fad566e8513293f6e81d4f5b777eaf06a056beedbf44360a39894ca3a2d05d3fc3a2d26c339efe
 DIST lighttpd-1.4.55.tar.xz 765660 BLAKE2B 7b972de86e7d1a51438718e4d5bd49188c107b0f2e656ead597085ae84f3d41cdb662a7774c6655155d390c26f3e4f0b0dc4243c85cb0255a91d8ca57742f402 SHA512 023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439
-EBUILD lighttpd-1.4.55.ebuild 6296 BLAKE2B 0493e2f384b54f7c26d8ef50078a949daa7a8551bc52cbca27ec820816b4ac70473a07747b35fefff7e0b462e91ccaea9944a9a2509f13411d402badf11c8938 SHA512 89dd87618ed581823f4e6f73ec8e94a4e036ddac0913d3cc54c934a6ac4898df2a487524a4587a6612a3c38a2abca61dcf51a1ced5d22435cd8ce2d07a3dfb08
+EBUILD lighttpd-1.4.55.ebuild 6351 BLAKE2B 57bda84f469073ea76254352aeb667a7a2e83f582e4064033fd35730e6e7718a1244e032c946df2117bf86830938b4e81999c59d32d290f4d21b67a38b2332b2 SHA512 6f81a1515662abc1eb2599f5a5f8675a56824c46efc43b665fd27ccd12fa3451b37af560faa30819f4538ba53546722bf1b356c283a24d5faca3e7846edbb859
 MISC metadata.xml 1054 BLAKE2B caf21b255e5eb1fc5300edf62d928b933540613492333abd65dc2c0ae89f5a22c18467ff4ab90b2b0582b4f1eff9bad21eeca91bca9c034377280c9ec022b1f9 SHA512 a773d9b8da2f118b148943c4f78662f26aaea5def18abc37ba39bb539fb31449beb04b8e9f1a09ce893ae07aaea2e2fabb42bcba47c5e9100db1f1ef3bf9ea82
diff --git a/www-servers/lighttpd/lighttpd-1.4.55.ebuild b/www-servers/lighttpd/lighttpd-1.4.55.ebuild
index 691b80ba1c6e..a2bba42a2ca4 100644
--- a/www-servers/lighttpd/lighttpd-1.4.55.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.55.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic readme.gentoo-r1 systemd
+inherit autotools flag-o-matic readme.gentoo-r1 systemd toolchain-funcs
 
 DESCRIPTION="Lightweight high-performance web server"
 HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
@@ -118,7 +118,9 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
+	econf \
+		CC_FOR_BUILD=$(tc-getBUILD_CC) \
+		--libdir=/usr/$(get_libdir)/${PN} \
 		--enable-lfs \
 		$(use_enable ipv6) \
 		$(use_enable mmap) \
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index fe2eb6559d69..87f22df9ff10 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,5 +1,3 @@
-AUX http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch 1166 BLAKE2B 180c0b509ef32afd9cffaa6c922e925101d750ad2b5c93dbad4e16e4d0ccd866efeb3ded3ffff3bf5a4566bbea9e9910dd92ab8f40ec66b2011a6396e472aef1 SHA512 8e9c192e504e6a7e93384104dee544530442c3d7a67f6da81cb79a3cba43f64bbf2a4cba9115c48626b1f6faa3d170da915cfe2a7dceaff453300b400141192d
-AUX http_brotli-detect-brotli-r2.patch 763 BLAKE2B 63e1a86dc6c9607159ef4466dfcfc692fe53ec4019385297dfc92672271e3679b9013c83423b5d9aa79bc912b6d9dda0b099899f3020a8e01872087aad5a64f1 SHA512 ba6794ea39a775a61dd8a30ad183bfb7fae0feeb0a3f5c2cdbfc4d1f4891c11f3da44d31e9470bf443feaca7621a27c8483cce19f8bed00b811f78ccc1188a4e
 AUX http_brotli-detect-brotli-r3.patch 745 BLAKE2B 1442822f9b16362c04354f29f45ee4e7605e0f74ac09092161b9e69a1c3b42f024d12cb64cc5bb0e417200dc963a531110f82b003d54690138b7df35e019e9e3 SHA512 a287636c07335b48303585d906adb87cf9094133c16c238074826aebb19347428bb15ac4ebc77040142c509f8a87c9fbca9783e2f5c10399ef63341fbc22e881
 AUX http_cache_purge-1.11.6+.patch 615 BLAKE2B 520a437290dbed718f392bedecdb66c9eae3440c2e5977bede5829f8420905e60c74fac3dad7b22c12d2070ce47430795482d270222ba8d4640af415e4974210 SHA512 a3f45d8121d89a5c41783306577e146990404ff0e3691454e99cd6270ab02dfc7fd8718b3781666373ea6784ed2c06cec0b40315486a6a138185ca1548c04b60
 AUX http_uploadprogress-issue_50-r1.patch 1098 BLAKE2B f8191fdfa85c7aa016555a636b5c291d6d0ed54fea0714b361ce500deb7431f16c77a2f5675c5dc2f6e8ed278f7c24efd45eba3ddab27a2fa7d4e6d1391cfe8d SHA512 bdc3a129059b1af9c317d1e8b74ec98a14bf1e55b59ae867b963304541457e1676acb775ac2cec730ee2036feedf75d636eeb36700b0913e417045a52a00eec9
@@ -13,16 +11,15 @@ AUX nginx.logrotate-r1 257 BLAKE2B d62c57377efd5259b6c776861d921b6e4ea026387157d
 AUX nginx.service-r1 356 BLAKE2B 05d89efcc73b70a26655f306f1e074e61c81063cb4e949161efbe95dc375e63807233f38c9af6723801e8f653cfad08f62fbec225b061d1179b7d05fe761afc4 SHA512 e51f4e88abe10555afe79d4d029651a4de42a5dc1dddaf951f13c021453da00e0c56a3fa2129d08fcd090909a54564e76887c93fdf72952021f5a2b09f6097eb
 DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd
 DIST nginx-1.18.0.tar.gz 1039530 BLAKE2B a8962a6af96acb043ff0c3dc4ad5192083773c449950aff53b01f6f7c46a2a540eb061a43432acccd753fa71067b1451d75f440ba5526575b78608be9d40a50b SHA512 8c21eeb62ab6e32e436932500f700bd2fb99fd2d29e43c08a5bfed4714c189c29c7141db551fcd5d2437303b7439f71758f7407dfd3e801e704e45e7daa78ddb
-DIST nginx-1.19.0.tar.gz 1043748 BLAKE2B 46647676c2e5dd0b06a1079329d211f7449312873f40d762b1c81841863f61dbc11f836956c006e0283dc79ab9b6bb4b9430136e4c66ff194402413fdc0bdf83 SHA512 3240d5dc59877f9d6a95c8779240675cec9290df079b9d52c06147e58900f2e060e768729669ffaf9a2a90bb9abbe8ab7fba24ff65d45fec9eeb3b6733b65f30
+DIST nginx-1.19.2.tar.gz 1048727 BLAKE2B db00b5945ed82fe90059269ba987931642981a2b8fa1cb24e0d842b97d89857993f99443c644d9217af29430b868ee8efd90dbc5daefd719d0f98c0766601554 SHA512 f6232d58a91db486cf36cc027ab84f04ad25aeafe586051043f0f3295dad5f475094f7cedad142ef0f56ff15a0971d700d6ec34b68697c462364650c49be8fcc
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
 DIST ngx_brotli-25f86f0bac1101b6512135eac5f93c49c63609e3.tar.gz 16201 BLAKE2B 2da3ce8a9f29b713da4de4cd60fe22256742ff61e1718346e5246ffa0169d5a2e1babb625b16ac52e3b79431f749adb3ee0170957024953c139aaebc7a496478 SHA512 c6eb026f204e1e6f930ab7ca68cca78054318e05a0dc11d897d3516380dbc4e42e93d40334e3088bf348d4b7b182e87c77473974719e5850a4f97666f9babbd6
-DIST ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz 12672 BLAKE2B fa2febfa63b98303f8890c6774de6ccb09475ccd639d3b74493a4ffd97c90febdc22755c5928018bdac24a537bd13cde165f97e5d2b50bebf598c3fb22ec0206 SHA512 169566b8764bb2b82e029f954a99063a9c61e2cbf982861c5f6818b389a5f37bf5389afb1b5627de9bd3f7af7b3c404be0230f943d47ab621c2a2bd825cc8203
 DIST ngx_devel_kit-0.3.1.tar.gz 66542 BLAKE2B 8242d884464d99a131a48f599f9d0c2b546610f73f646e7eb0dcfdb98220810d949189cffa721360ddbe3b7b8adc8b678a848b9d1a56db6c62fd4439ecb63d24 SHA512 de1e3349d8dd08e5982279b2219dc8a8006739f0409b8e0f5c50d93434beff1fbafba43e9c5ac85a5fab90afc5c0a7244a340610339c36f82f2cba7233e72de9
-DIST ngx_http_auth_pam-1.5.1.tar.gz 6863 BLAKE2B 00807cc3db8f6c007c968b8a30d7f6094b7d9db4eaa60d211fcb3ac60aeb28c5f8193578a7e1ca67acbbf57a319c8442fe44efc1e193927c3bce5961539f9c16 SHA512 973b94874d8a58c0df0ac2d31571eafc1e80b11179cba33ec88421a826207fbf7e99b0387e135a1ca48d82daacb78f19a4c21d3a27b49b16dc86b4748bb72261
+DIST ngx_http_auth_pam-1.5.2.tar.gz 7016 BLAKE2B 1efc8d2d12aa09a2b2a36f6f6d0132ac21fcd1720a2843ce598450198e2b7fe902e9ded15a78b66e8a897e811faa872e4e391bf211c795e320c1ccd57607c319 SHA512 b82e401533c44298c41bc9a1caaf3f7850e42da151c06a77a927f817810ebf5ce01c49ca81de42c326345765c784bb55e28fbf0f6a5500626f51e58a216b53c4
 DIST ngx_http_cache_purge-2.3.tar.gz 12248 BLAKE2B f83b267f4c19a9d4af5964522695814c164d200ecd4108bf8f6b5c21388eba8af989bdda646dee18a03174211e8c090a04736bbeb44043cb0e19fbccdc66278e SHA512 50a31dbf2216a6fae74a186af56dec4600cf55777e76a10ac0075f609e7737135aab063a64f2590dddcd0369ebebd4a523027f3d9ebcca74f7b4355be1c5dcc0
 DIST ngx_http_dav_ext-3.0.0.tar.gz 14558 BLAKE2B 0d370bfe34600d43a540dd19a386aa52ce135b2eae14e4e108a359d5ff3405939130d1c802062c7523057ec35d38322d3fbed8c13deb58ce7a08ebf9e3f106d4 SHA512 d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde
-DIST ngx_http_echo-0.62rc1.tar.gz 53331 BLAKE2B e7fded849e34a64804dbbc62cd7b535683c65f12b571a7382d3e6a0700ce000853c40a9715c238414a000361613eb3fa550b72f15eeda6d8d99346a0e54e8604 SHA512 9f4e1a91058c803c14711a1a66175e373ad0e05353c72963c39cda9bc5396e792ec1a3d18738af9991bee35bfd5d39d4c1777859ac1db0c0f73c6873b535746e
+DIST ngx_http_echo-0.62.tar.gz 53329 BLAKE2B 7d92184f7fb878cb5261be1c68de4432d472469028e20c2150925ab3d9a1c472ef557a11b84ee60d7ae6b48d08b35890c50161540668918492f2092dd0272962 SHA512 240896b1c559a71ca6ca87136d8535edd25b1d65ebb80d46080ad41c09ed1cec9737828f9efe260782294d660cea66cf402f4e75bba3fed26f3a94de0ae2f89b
 DIST ngx_http_fancyindex-0.4.4.tar.gz 26292 BLAKE2B a1ed76cb31cd4f7a349bcbe63d75f8e00331d0ba4ee9b7b1df41dac77fe64ebe6c72a6fd5f6ebc9de53e8d3a8a2ad5185fbaa533d8ff008fcf92f6956f267d80 SHA512 bf8ebb188c10fee5e6ebcb338fe20fdf859bb88d9b2b0e3da6f3e2f1847738d30760d2642d0dfe257092bdf2399b561631556a3a8e2fb33dc9cd0c59d371c173
 DIST ngx_http_geoip2_module-3.3.tar.gz 8509 BLAKE2B 4841e1bdd13b9b85f34732d1eb7447638f62bb09e1bd480da0fa8b0085d3b2d90a740732ef534c355feb71d7db613c73f68a4e6e3624b47a0937be046dfa1f8d SHA512 06963b598c54e22d75ce837fb222f5aa6c9494c29e558ff46f1205d7159fc305414bfac4ed3288c836dcbf7628d92f26458e1992d34fc2f4b73275a32847bdc0
 DIST ngx_http_headers_more-0.33.tar.gz 28130 BLAKE2B fe3097a7700ce5da087058f7bb44c95164b75137031187400473f6833bf0e33e5c4920807225a6ff94174fe7dbd6186cca176a33a629ca0911faab6804bdd12a SHA512 13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37
@@ -37,7 +34,7 @@ DIST ngx_memc_module-0.19.tar.gz 34654 BLAKE2B 536384c264d88535179634d459d3a47b1
 DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc8b2b93f692615a1b39c1f327393647f80e7a27e6929799a6e7e3469b61e1cd72f7821f7a820da4dd7cd9a96d85c SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
-DIST njs-0.4.1.tar.gz 422917 BLAKE2B 8a6b9c06b74256289636e06437a8160a0e91767959cd2c4dde4f6769437b2654cd2aa6e65902251bd135429c87ef497f7137ffe0afee72c2723d147db8615810 SHA512 58ae280be37ac0402886281837b82a7038ea62d3bde5a0857d8008806937b2d11fe4984986b1e40bd9528ee8d2f5aac271346dc387f30930161cc2b41aa08998
-EBUILD nginx-1.18.0-r1.ebuild 40661 BLAKE2B cf9eb996481901b29b34fb5538f92fa85ef59baa5d7672dc9d9be90e350315ccee32f5c78e70d5697914873c8b383ec4d21531c6afe7b7149b114bcf9e1f9e14 SHA512 9b58768f7b0b2b214bebda3ee36c45478ad79aa0615ebe07478a37a72ec1c5e849afa9edf46df6c37eccc89dfde1dc73b8205df1ec556e6000f03ff4fe318cba
-EBUILD nginx-1.19.0-r1.ebuild 40663 BLAKE2B 6322ac6bfbe2801f41263a3757b673c24650b79bceef15fc8152dce753f9f248ad411e71239c24532597e1c7d3b3a1bd9f30baafd3d6f20ced87ed7b3a91c1c5 SHA512 03d9a202db43be165654a99f4f58521c6960fe5068c5f5eabbd4fcf4ecbc210a602df4ac27f665c32d9ff5d9386850aa8d39a499dae7ecab427db5a0e8988f49
+DIST njs-0.4.3.tar.gz 460997 BLAKE2B 373a4aca51ada84d628ae6b6254c9268b4cec4ac8870f81ba43ff693f20148a9ca862038e57a68c22cbff29ea613785e83778cc708cf1b47103e9f950a198289 SHA512 b3b4294817997a06661f00f53d38e0cde08e022f41b3663f9d17a91b343fb944e21184114f09d89995096faee491187c3ae424407f2855ed0670c0cccf928cd7
+EBUILD nginx-1.18.0-r2.ebuild 40458 BLAKE2B bab6ebfd5a4ef14026cf3149757dcf207dad0245b48a31bcb93a61709bb6a9a656ebb0d8ebcc0f502daab9b7b9a0a7a4dc5d00cb2ececc4606f508d87e8e23f2 SHA512 54651ac56efa4ed927189dbbc2165af8d916097c0e623fcd7427096be4605d093772913511372dd5040ff2c7c9d305d0686ccf713205eff3c3cf41e3fa12a241
+EBUILD nginx-1.19.2-r1.ebuild 40460 BLAKE2B 620254271c03d328f5377c23307af52838a8f2eaa8e60a91eed785fdf2c02c8cf3ae349e2b7b04a29024ee14247c001253e234c1551ac2fcb665ab98ca1674a8 SHA512 0a9c9d53cf47520c5f2f04a72b6f64d5399571ce371b31a09d1d81f160ffa88e461b6e335d0ea05428d62612e014f682bfeefeb25d6b05eaf1690c31f822e134
 MISC metadata.xml 1193 BLAKE2B aeb293cf75ed650c946910222d6396f726dc5ed49f1213e6a5664613d78e3b27616399bc1c9f0a360f5303b16931da7016cdf540b24601afafc3ada4428b33a9 SHA512 a96002bc9845bc465542c753c738899b77ad7a32fac7f5f9a7049336868bc41199e926422e3dc23e47f34656c9aaea255511d2ef91e9d59f48c9cd0b4a3c4903
diff --git a/www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch b/www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
deleted file mode 100644
index 632dcdee50e2..000000000000
--- a/www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/sto/ngx_http_auth_pam_module/pull/18
-
---- a/ngx_http_auth_pam_module.c
-+++ b/ngx_http_auth_pam_module.c
-@@ -348,7 +348,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
-     /* try to authenticate user, log error on failure */
-     if ((rc = pam_authenticate(pamh,
-                                PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
--        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                       "PAM: user '%s' - not authenticated: %s",
-                       ainfo.username.data, pam_strerror(pamh, rc));
-         pam_end(pamh, PAM_SUCCESS);
-@@ -357,7 +357,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r,
- 
-     /* check that the account is healthy */
-     if ((rc = pam_acct_mgmt(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
--        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                       "PAM: user '%s'  - invalid account: %s",
-                       ainfo.username.data, pam_strerror(pamh, rc));
-         pam_end(pamh, PAM_SUCCESS);
diff --git a/www-servers/nginx/files/http_brotli-detect-brotli-r2.patch b/www-servers/nginx/files/http_brotli-detect-brotli-r2.patch
deleted file mode 100644
index 8774fa60d1cf..000000000000
--- a/www-servers/nginx/files/http_brotli-detect-brotli-r2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/config
-+++ b/config
-@@ -59,13 +59,7 @@ have=NGX_HTTP_BROTLI_STATIC_MODULE . auto/have  # deprecated
- ngx_module_type=HTTP_FILTER
- ngx_module_name=ngx_http_brotli_filter_module
- 
--brotli="/usr/local"
--
--if [  -f "/usr/include/brotli/encode.h" ]; then
--
--brotli="/usr"
--
--fi
-+brotli=$(pkg-config --variable=prefix libbrotlienc)
- 
- if [ ! -f "$brotli/include/brotli/encode.h" ]; then
- 
-@@ -75,11 +69,7 @@ if [ ! -f "$brotli/include/brotli/encode.h" ]; then
- cat << END
- 
- $0: error: \
--Brotli library is missing from the $brotli directory.
--
--Please make sure that the git submodule has been checked out:
--
--    cd $ngx_addon_dir && git submodule update --init && cd $PWD
-+Brotli library not found. Don't you have app-arch/brotli installed?
- 
- END
-     exit 1
diff --git a/www-servers/nginx/nginx-1.18.0-r1.ebuild b/www-servers/nginx/nginx-1.18.0-r2.ebuild
index cc1a711b92c4..c4aa1254fc98 100644
--- a/www-servers/nginx/nginx-1.18.0-r1.ebuild
+++ b/www-servers/nginx/nginx-1.18.0-r2.ebuild
@@ -23,9 +23,9 @@ DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KI
 DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
 
 # ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c"
+HTTP_BROTLI_MODULE_PV="25f86f0bac1101b6512135eac5f93c49c63609e3"
 HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
 HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
 
 # http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
@@ -65,7 +65,7 @@ HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HT
 HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
 
 # http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.1"
+HTTP_AUTH_PAM_MODULE_PV="1.5.2"
 HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
 HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
 HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
@@ -107,7 +107,7 @@ HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v$
 HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
 
 # echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.62rc1"
+HTTP_ECHO_MODULE_PV="0.62"
 HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
 HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
 HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
@@ -156,7 +156,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
 GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
 
 # njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.4.1"
+NJS_MODULE_PV="0.4.3"
 NJS_MODULE_P="njs-${NJS_MODULE_PV}"
 NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
 NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
@@ -385,15 +385,9 @@ src_prepare() {
 	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
 	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
 
-	if use nginx_modules_http_auth_pam; then
-		cd "${HTTP_AUTH_PAM_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
-		cd "${S}" || die
-	fi
-
 	if use nginx_modules_http_brotli; then
 		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch
+		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
 		cd "${S}" || die
 	fi
 
diff --git a/www-servers/nginx/nginx-1.19.0-r1.ebuild b/www-servers/nginx/nginx-1.19.2-r1.ebuild
index fafd960ce178..a23f3375b041 100644
--- a/www-servers/nginx/nginx-1.19.0-r1.ebuild
+++ b/www-servers/nginx/nginx-1.19.2-r1.ebuild
@@ -65,7 +65,7 @@ HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HT
 HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
 
 # http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.1"
+HTTP_AUTH_PAM_MODULE_PV="1.5.2"
 HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
 HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
 HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
@@ -107,7 +107,7 @@ HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v$
 HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
 
 # echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.62rc1"
+HTTP_ECHO_MODULE_PV="0.62"
 HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
 HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
 HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
@@ -156,7 +156,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
 GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
 
 # njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.4.1"
+NJS_MODULE_PV="0.4.3"
 NJS_MODULE_P="njs-${NJS_MODULE_PV}"
 NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
 NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
@@ -385,12 +385,6 @@ src_prepare() {
 	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
 	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
 
-	if use nginx_modules_http_auth_pam; then
-		cd "${HTTP_AUTH_PAM_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
-		cd "${S}" || die
-	fi
-
 	if use nginx_modules_http_brotli; then
 		cd "${HTTP_BROTLI_MODULE_WD}" || die
 		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
diff --git a/www-servers/pshs/Manifest b/www-servers/pshs/Manifest
index b52c7aad5a51..c98f62e37482 100644
--- a/www-servers/pshs/Manifest
+++ b/www-servers/pshs/Manifest
@@ -1,4 +1,6 @@
 DIST pshs-0.3.3.tar.bz2 81109 BLAKE2B c73aa8390257de4ffd616ecb08b570273075e72473a7e506a4ab4ca59a3ebf9f4c1467eabd1ef45b88d0d3422b14f55108c94d2e92222b186606b8b5cf8ab8c4 SHA512 c9c6dd854319153350a6e7ef245af8f89c0d50f783507211a34994d375f2ae442b22959e4a2fb1bcc02f976a8ff6f41545b176a32ea70174af0850cf1eaf77d9
+DIST pshs-0.3.4.tar.bz2 81435 BLAKE2B e5a72c02efbaa95f0069d2533ce4434da88a5eaf33b7025b5d83bd0679631d6ee0b1faf31a5f3b0ed3bf2e23d4500bf6f473d997cabf99d8b769f4a2c662d32f SHA512 d264b46ad54286d5c4fac601e3353c1029af75ad59f28fea5a2970dc7e9b00327a08dfdd82141c76656f07047cfce1fa35b485b2f69f0728bcf74c835def917d
 EBUILD pshs-0.3.3.ebuild 981 BLAKE2B 7ba4628b45d41a11abe219f66513815f4882e89b9615075bfea8480a60cc5eb4739247614a51bd19188085ce985816da7aeb44879d72ebf99d4cba2817b78771 SHA512 ff647197f62dec1c3abadb4405f04724f1cab7569d5440e07122d0161bbcde624635624540fc19140f9a70f4b29621ce002fd9fc38457b300e6cf7076902bfd5
+EBUILD pshs-0.3.4.ebuild 978 BLAKE2B 02fafd025b5ea2f40146462a93039a934f7e788f1011471a6cbb7924db3090f54e0fc417ea44dcda21605db28032b9834253719b9916d81caaa1408a660eac27 SHA512 e5a8a26f2d3bb7e1d050a1880e321dbeefae7162c682bed27f1100de6466c0406110ccf536edab58423f62bc79b8ff97fc730734ee9b86ca9d992efd18ecf375
 EBUILD pshs-9999.ebuild 1011 BLAKE2B 6b9807aabc60e93373dc2e38b15aa6877df3a42ae9791f4a6f3a92eaa0db0a618c6dd299865bb035e302b7e1a457b578ddf978240e44d4443a30e5744b4f4ea8 SHA512 831f63979c59d8aefa9d1b41f98e4eded021b437f1607218c34143687f22668dbd7dd7435bb2688d128699712ed9b5fa2e30536511dd4da9d39ab7b43d9f4b5f
 MISC metadata.xml 812 BLAKE2B 22683da13714799f768dbbf0e941ef96434d78566d3b7ee136d88214b360ef2c1d15dd4357238103bfeccc559e99e342ff3b61c3241563d816671844f2e4c23d SHA512 9e58734863a46f1f6d8d4b0c2666fc0d596d45d924a60fc5a19a173018e3ca881c20862a3e879a63b9ccfab6dc6018ba122b3537e408336db26672b02374cdb2
diff --git a/www-servers/pshs/pshs-0.3.4.ebuild b/www-servers/pshs/pshs-0.3.4.ebuild
new file mode 100644
index 000000000000..8f78da415803
--- /dev/null
+++ b/www-servers/pshs/pshs-0.3.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Pretty small HTTP server -- a command-line tool to share files"
+HOMEPAGE="https://github.com/mgorny/pshs/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +magic +netlink qrcode ssl upnp"
+
+RDEPEND=">=dev-libs/libevent-2:0=
+	magic? ( sys-apps/file:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	ssl? ( >=dev-libs/libevent-2.1:0=[ssl]
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	upnp? ( net-libs/miniupnpc:0= )"
+DEPEND="${RDEPEND}
+	netlink? ( sys-apps/iproute2[-minimal]
+		>=sys-kernel/linux-headers-2.6.27 )"
+# libnetlink is static only ATM
+
+src_configure() {
+	local myconf=(
+		$(use_enable magic libmagic)
+		$(use_enable netlink)
+		$(use_enable qrcode qrencode)
+		$(use_enable ssl)
+		$(use_enable upnp)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 3af4d9ef63cb..bed69926339a 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,6 +1,8 @@
 AUX puma-3.12.1-ruby26-waitpid.patch 1722 BLAKE2B cee9b9e89cf098a387481d754732f54274ce0f9580568e62496513d58d46578f81c13df2aa98d2da218bf9d8ad581e8728ff60be488905493e9acc6b88012a88 SHA512 86f826d7f9ac8a50d62f8cf2b87b0df5f7ce55c1a5e4ac7b928b756ece809e30750bb2a7c3c50dc95f9edcb463e9c453b5d3eb84ffe44952904200b5337351ad
-DIST puma-3.12.4.tar.gz 219148 BLAKE2B d9fcef62474a1522c29f13fb2572c99bd6d4217bc94febb9c4fe6e699808ad0002fcd88dfd16884a5a9c7296e4d6dd08bc50ce7278f41608678feb18e3a034b4 SHA512 302505512b04c68f9794461b0e7693cd3ff4dfb325b18e50f0f659649c7f504f55765437382557c65bce45d32a1710ab16a875d1fc6d143d4ca297d2b2333108
-DIST puma-4.3.3.tar.gz 241756 BLAKE2B a6ff66a449bf04110b4a6e9bdaa740f1144076290f1733922ecab45b5b7e6115ee1f7431b280401adb866838b539b943a35a5955f6d7cf51075941e05451e655 SHA512 1ee81c8d144466a75d5110fd3545527c36af51d2e191c171a985944206524c10a2b4e35fb535e2a1a0a3af5d460a7071ceb9233fae8dc81784643c6b9dc06e6e
-EBUILD puma-3.12.4.ebuild 2052 BLAKE2B e53818548f6ef533e350689273a7be372e383f21ffb1c1e20db9d3c6b50072e0220960f6295c911a442ca41af4a3c98ff27c3ca1b07f96514bdb54351886c8d7 SHA512 c858c379c926f513d2d81e4667d8626642e2e76a7afcb5b3506829a726bc7f57768315f58d88109a45516e9fc4cde879ad7384f5d1a45f347320529e9e596a42
-EBUILD puma-4.3.3.ebuild 2134 BLAKE2B d3491e5a8f671267931b9b602936a60fff1341516c2f5ebf358c63f649788746d52e57d7842b14c35749c27d31f2c689d8c46f483c1baf28d588176512bfb5dc SHA512 bdb7b3afdff870d38c03d68fae15c112f50910f8b5bcfc8f8b5e9b961e12f6fe33e040edcbbacf816ba15d597bc457e7441fb74f7e72c53e12d673ed1ac603d5
+AUX puma-3.12.5-cve-2020-11077.patch 3490 BLAKE2B 08f103ed5a5cf9878404f04c139476c730f7a663681aa6cc0107c033317826ed803b72b384034b08b361ed7c99683fe3d90d51c5f97708647750db9edf59e15c SHA512 25f26889e74c98e5ee45dbdb2dad356099d15c70027f32fa2500e0f5b40d742d376b7f29560dde985c3652064f6bdec8dd411154301f6c89b1ef356632570c29
+AUX puma-4.3.4-cve-2020-11077.patch 3578 BLAKE2B 34ed185950223fe952f29c98aa80211f8b066ec9d89a04ce4900b6fa654521ac4abb3ae4fd6ae9f56c3143649b0d07bb1a1b66691522c1a9d0ee4d574fe9c58b SHA512 1df326102f6efd0b0aec4918ddda8beba467a76fb863cb0f117d9f073cd6adfdc4dbcb5b698cff8a43404794aa0171e5c124bdf9e0b8ab4161475c6ab3bbd95e
+DIST puma-3.12.5.tar.gz 219175 BLAKE2B 55e80fba8fd84004090cb8d30b6fd01652f1beb1d1216c5d41ce46c616677504fa867f9701ed2631f4edc956c9377d72c6fd4a1b61e99fdbb50ea371b170a0c0 SHA512 1e6721844cbabab0cfb8b1707625723061821dae3ee06a3330075f787ae580e6836d9cbe436e63dc4602253ad1da3b56135316c923c03bbbae454d9457a44aec
+DIST puma-4.3.4.tar.gz 241806 BLAKE2B 5450f14112ad45c48794186c7e9f078feed28a4194a917c949f4058b9d3a115273df6d93260de330047fa59730cb3ad45f31eb05e5880569e95a0b2c9de99a42 SHA512 619bf44c17622233b673dbf6c8f34b0463cd32684df81c20f31045d3106a86e110753b4da80e7b51b46fe18d90ee107d9a84a975dc3116840d9a9b5962178873
+EBUILD puma-3.12.5-r1.ebuild 2159 BLAKE2B 9890e397dd8966c4f1480cc435cca1235a87d317d37fd7879a32b03a8ad8b1ec1a6898f7cf5731c8f80a0014ad8dc7b01bc3c10a46f817269101f641101d12a3 SHA512 f922181874ab1c8cd685f1837d3631682aaacc2c316bffe8918fd35f1c8a2f879d5b199a3a4bb9346017bb5e5faec51135ec47a0f502c300413d6a5c9389631a
+EBUILD puma-4.3.4-r1.ebuild 2176 BLAKE2B 433e221931b2716fdf1bbddf2aa7c2e08c759a63681bb21b34c3a5b8db3618203c4024473fbe98ba88dc7c4f0b63e96444f5305ace3338b14d1dd62140fbbed3 SHA512 91dde6a7c485b46f158f35432e136bb40b5115dace83e9f4446b4cf1c8e24660467b23f5f147bb6c26e699c13405e36205db4871e4afa6a1b1cc1c9180998b9c
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/files/puma-3.12.5-cve-2020-11077.patch b/www-servers/puma/files/puma-3.12.5-cve-2020-11077.patch
new file mode 100644
index 000000000000..4d26da28eee8
--- /dev/null
+++ b/www-servers/puma/files/puma-3.12.5-cve-2020-11077.patch
@@ -0,0 +1,114 @@
+From 089df0727ffab1b3b69f2e6da40597c52e346013 Mon Sep 17 00:00:00 2001
+From: Evan Phoenix <evan@phx.io>
+Date: Tue, 19 May 2020 15:20:10 -0700
+Subject: [PATCH] Reduce ambiguity of headers
+
+---
+ ext/puma_http11/http11_parser.c  |  4 +++-
+ ext/puma_http11/http11_parser.rl |  4 +++-
+ lib/puma/server.rb               | 31 +++++++++++++++++++++++++++++++
+ 3 files changed, 37 insertions(+), 2 deletions(-)
+
+diff --git a/ext/puma_http11/http11_parser.c b/ext/puma_http11/http11_parser.c
+index 453f8cd40..e8844a37e 100644
+--- a/ext/puma_http11/http11_parser.c
++++ b/ext/puma_http11/http11_parser.c
+@@ -14,12 +14,14 @@
+ 
+ /*
+  * capitalizes all lower-case ASCII characters,
+- * converts dashes to underscores.
++ * converts dashes to underscores, and underscores to commas.
+  */
+ static void snake_upcase_char(char *c)
+ {
+     if (*c >= 'a' && *c <= 'z')
+       *c &= ~0x20;
++    else if (*c == '_')
++      *c = ',';
+     else if (*c == '-')
+       *c = '_';
+ }
+diff --git a/ext/puma_http11/http11_parser.rl b/ext/puma_http11/http11_parser.rl
+index 880c1d40b..62452ba7c 100644
+--- a/ext/puma_http11/http11_parser.rl
++++ b/ext/puma_http11/http11_parser.rl
+@@ -12,12 +12,14 @@
+ 
+ /*
+  * capitalizes all lower-case ASCII characters,
+- * converts dashes to underscores.
++ * converts dashes to underscores, and underscores to commas.
+  */
+ static void snake_upcase_char(char *c)
+ {
+     if (*c >= 'a' && *c <= 'z')
+       *c &= ~0x20;
++    else if (*c == '_')
++      *c = ',';
+     else if (*c == '-')
+       *c = '_';
+ }
+diff --git a/lib/puma/server.rb b/lib/puma/server.rb
+index d870b383f..5b2cd94df 100644
+--- a/lib/puma/server.rb
++++ b/lib/puma/server.rb
+@@ -665,6 +665,37 @@ def handle_request(req, lines)
+         }
+       end
+ 
++      # Fixup any headers with , in the name to have _ now. We emit
++      # headers with , in them during the parse phase to avoid ambiguity
++      # with the - to _ conversion for critical headers. But here for
++      # compatibility, we'll convert them back. This code is written to
++      # avoid allocation in the common case (ie there are no headers
++      # with , in their names), that's why it has the extra conditionals.
++
++      to_delete = nil
++      to_add = nil
++
++      env.each do |k,v|
++        if k.start_with?("HTTP_") and k.include?(",") and k != "HTTP_TRANSFER,ENCODING"
++          if to_delete
++            to_delete << k
++          else
++            to_delete = [k]
++          end
++
++          unless to_add
++            to_add = {}
++          end
++
++          to_add[k.gsub(",", "_")] = v
++        end
++      end
++
++      if to_delete
++        to_delete.each { |k| env.delete(k) }
++        env.merge! to_add
++      end
++
+       # A rack extension. If the app writes #call'ables to this
+       # array, we will invoke them when the request is done.
+       #
+From 0a3c09a0603857f088571d0eb69e0b9adee0fed1 Mon Sep 17 00:00:00 2001
+From: Evan Phoenix <evan@phx.io>
+Date: Tue, 19 May 2020 15:34:06 -0700
+Subject: [PATCH] Adjust test to match real world value
+
+---
+ test/test_puma_server.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/test_puma_server.rb b/test/test_puma_server.rb
+index 9d40cd5f3..375eca399 100644
+--- a/test/test_puma_server.rb
++++ b/test/test_puma_server.rb
+@@ -137,6 +137,7 @@ def test_default_server_port
+ 
+     req = Net::HTTP::Get.new("/")
+     req['HOST'] = "example.com"
++    req['X-FORWARDED-PROTO'] = "https,http"
+ 
+     res = Net::HTTP.start @host, @server.connected_port do |http|
+       http.request(req)
diff --git a/www-servers/puma/files/puma-4.3.4-cve-2020-11077.patch b/www-servers/puma/files/puma-4.3.4-cve-2020-11077.patch
new file mode 100644
index 000000000000..673641a91627
--- /dev/null
+++ b/www-servers/puma/files/puma-4.3.4-cve-2020-11077.patch
@@ -0,0 +1,115 @@
+From f3b409c565d67557c04ad37c10a42dd8cad0b655 Mon Sep 17 00:00:00 2001
+From: Evan Phoenix <evan@phx.io>
+Date: Tue, 19 May 2020 15:20:10 -0700
+Subject: [PATCH] Reduce ambiguity of headers
+
+---
+ ext/puma_http11/http11_parser.c  |  4 +++-
+ ext/puma_http11/http11_parser.rl |  4 +++-
+ lib/puma/server.rb               | 31 +++++++++++++++++++++++++++++++
+ 3 files changed, 37 insertions(+), 2 deletions(-)
+
+diff --git a/ext/puma_http11/http11_parser.c b/ext/puma_http11/http11_parser.c
+index 0b5fdabc3..bf1dd89ab 100644
+--- a/ext/puma_http11/http11_parser.c
++++ b/ext/puma_http11/http11_parser.c
+@@ -14,12 +14,14 @@
+ 
+ /*
+  * capitalizes all lower-case ASCII characters,
+- * converts dashes to underscores.
++ * converts dashes to underscores, and underscores to commas.
+  */
+ static void snake_upcase_char(char *c)
+ {
+     if (*c >= 'a' && *c <= 'z')
+       *c &= ~0x20;
++    else if (*c == '_')
++      *c = ',';
+     else if (*c == '-')
+       *c = '_';
+ }
+diff --git a/ext/puma_http11/http11_parser.rl b/ext/puma_http11/http11_parser.rl
+index 880c1d40b..62452ba7c 100644
+--- a/ext/puma_http11/http11_parser.rl
++++ b/ext/puma_http11/http11_parser.rl
+@@ -12,12 +12,14 @@
+ 
+ /*
+  * capitalizes all lower-case ASCII characters,
+- * converts dashes to underscores.
++ * converts dashes to underscores, and underscores to commas.
+  */
+ static void snake_upcase_char(char *c)
+ {
+     if (*c >= 'a' && *c <= 'z')
+       *c &= ~0x20;
++    else if (*c == '_')
++      *c = ',';
+     else if (*c == '-')
+       *c = '_';
+ }
+diff --git a/lib/puma/server.rb b/lib/puma/server.rb
+index b8e8a7b48..0e123687c 100644
+--- a/lib/puma/server.rb
++++ b/lib/puma/server.rb
+@@ -672,6 +672,37 @@ def handle_request(req, lines)
+         }
+       end
+ 
++      # Fixup any headers with , in the name to have _ now. We emit
++      # headers with , in them during the parse phase to avoid ambiguity
++      # with the - to _ conversion for critical headers. But here for
++      # compatibility, we'll convert them back. This code is written to
++      # avoid allocation in the common case (ie there are no headers
++      # with , in their names), that's why it has the extra conditionals.
++
++      to_delete = nil
++      to_add = nil
++
++      env.each do |k,v|
++        if k.start_with?("HTTP_") and k.include?(",") and k != "HTTP_TRANSFER,ENCODING"
++          if to_delete
++            to_delete << k
++          else
++            to_delete = [k]
++          end
++
++          unless to_add
++            to_add = {}
++          end
++
++          to_add[k.gsub(",", "_")] = v
++        end
++      end
++
++      if to_delete
++        to_delete.each { |k| env.delete(k) }
++        env.merge! to_add
++      end
++
+       # A rack extension. If the app writes #call'ables to this
+       # array, we will invoke them when the request is done.
+       #
+From 6d87ed2101dab40e6aaa85b0df01433cfb84df53 Mon Sep 17 00:00:00 2001
+From: Evan Phoenix <evan@phx.io>
+Date: Tue, 19 May 2020 15:34:06 -0700
+Subject: [PATCH] Adjust test to match real world value
+
+---
+ test/test_puma_server.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_puma_server.rb b/test/test_puma_server.rb
+index 75fcc22e8..a10490a71 100644
+--- a/test/test_puma_server.rb
++++ b/test/test_puma_server.rb
+@@ -151,7 +151,7 @@ def test_default_server_port_respects_x_forwarded_proto
+ 
+     req = Net::HTTP::Get.new("/")
+     req['HOST'] = "example.com"
+-    req['X_FORWARDED_PROTO'] = "https,http"
++    req['X-FORWARDED-PROTO'] = "https,http"
+ 
+     res = Net::HTTP.start @host, @server.connected_port do |http|
+       http.request(req)
diff --git a/www-servers/puma/puma-3.12.4.ebuild b/www-servers/puma/puma-3.12.5-r1.ebuild
index e0078c5b6898..063d1408eda7 100644
--- a/www-servers/puma/puma-3.12.4.ebuild
+++ b/www-servers/puma/puma-3.12.5-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 inherit multilib ruby-fakegem
 
@@ -26,12 +24,16 @@ ruby_add_bdepend "virtual/ruby-ssl
 
 all_ruby_prepare() {
 	eapply "${FILESDIR}/${PN}-3.12.1-ruby26-waitpid.patch"
+	eapply "${FILESDIR}/${PN}-3.12.5-cve-2020-11077.patch"
 
 	sed -i -e '/bundler/ s:^:#:' test/helper.rb || die
 
 	# Avoid test failing inconsistently
 	sed -i -e '/phased_restart_via_pumactl/,/^  end/ s:^:#:' test/test_integration.rb || die
 
+	# Fix FORWARDED_PROTO
+	sed -i -e '127 s/443/80/' test/test_puma_server.rb || die
+
 	# Avoid test that trigger a bug in ruby very easily and lead to
 	# failure. This affects all current puma versions in combination
 	# with the latest ruby versions, so we add this new version anyway
diff --git a/www-servers/puma/puma-4.3.3.ebuild b/www-servers/puma/puma-4.3.4-r1.ebuild
index 20e753cc834a..ec3645ec7477 100644
--- a/www-servers/puma/puma-4.3.3.ebuild
+++ b/www-servers/puma/puma-4.3.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
 
@@ -27,6 +27,8 @@ ruby_add_bdepend "virtual/ruby-ssl
 ruby_add_rdepend "dev-ruby/nio4r:2"
 
 all_ruby_prepare() {
+	eapply "${FILESDIR}/${P}-cve-2020-11077.patch"
+
 	sed -e '/bundler/ s:^:#:' \
 		-e '/prove/ s:^:#:' \
 		-i test/helper.rb || die
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 47e4079c3f7f..d9e4d68af6d8 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,16 +1,17 @@
 AUX tomcat-7.0.99-build.xml.patch 5913 BLAKE2B 21316c4ce76bd3e87c2749354cbd455c1322431649b276b59a93f10b97f59d03690f3531c2fd3a8ce67b81969544d498bf04e829407005dbed867067f8970347 SHA512 f8d0cb4ba0effdeea3db4049381efc84513551a1e28551b59a254340a8add306824d1dba344f6eaddc93e8b61fc0b71e1a8d0bcfc860500134cc19072deef30e
-AUX tomcat-8.5.47-build.xml.patch 10363 BLAKE2B 8f851b5eaa4ffb3073ee526122ef278f8e975e263b439140748ba774152a72712b6bc78d6568d097befac4ba56bc6a1721f14dd0a85d288e88621f49819e1a97 SHA512 236df8ce63e7e48293584868c140d4ba5160172cc19bd90eeacd6f14e08663b7c750f95fb24ab1eddf7c7a2a80e2f05e5470261159f3c95d3b22bd790b2f6b89
-AUX tomcat-9.0.27-build.xml.patch 10936 BLAKE2B a75c4635744b1815d5f4df29ac6bbb2afebf752c7b43cda2cd69c2cbe66100b10e04fe8a4306e2c166a6b2159091a7c7a4b88d299ea7d408e6af04c8b552ea8f SHA512 e1a68955dc6a89e1751cb429d44a19501644425b1a7553c0021255016bf69c58b64059267dab91457e78573e9dce01c3f3abe0f776d69bbf35d1c36c0535e1ce
+AUX tomcat-8.5.57-build.xml.patch 10554 BLAKE2B 40df509d8f5e3022a9d384d8d939800062ec383ea000f1224dfd5816a76af12dbde7d36826659707ae7e2a2bf0c19c1e8bc96bec5854bcd2422910530a0530fd SHA512 c1e3b73e2aece5e849219c663a01a31bd2f6355d37b51e18b68d42a05be2a49d173520450ac1aeef7b394fe860135afda225d450b4e98d912fe90231c9d70601
+AUX tomcat-9.0.37-build.xml.patch 11111 BLAKE2B dea5b3226ec9ade17e8e84c1ea00c97bb6154e212f5e43ee93876c60d4ac365e24613d80457b02ab27141a51933d8a758acd8ed2ee7f0224d13c0fb9d18101ae SHA512 3f185c3108a1f6ddccc068fe4b9f45638faba1060ab26237da17521110450d19722f374a86c4122eb59ee7ea53dbec78c9e77d8ba1c36c9e8e8cbbb414e9041c
+AUX tomcat-9.0.37-fix-build-rewrite.patch 513 BLAKE2B e806ca32771bcad0fbc2f1b3f223af2b17d2caffe6ed034783294650d4ec22c8d9d9d215ade85569f6627508c61b7d469412d582093708b6bb728d6123d65155 SHA512 7aab16d1b52fa88352df849ca051dcaf27f645b1b3edd3df3a7d87385b5068d300105f89c18ba3a0f65818739b85ec847ddd5b28b8b655efbb7b39036099cae2
 AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f7174453cfbe7b4a1a7167e122efa3ec2ea6c17c88de1f9223e21e773cf717ed04d79fe0b1e7fc816400033094a07a35c6 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570
 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-7.0.104-src.tar.gz 5309794 BLAKE2B 0d4d5d668e1131bb533af1d56fe37ee1f5c252c2c4dd987e24aae67484f27805f88750b27248c6acfd0585eacd0d3f2155c723e9a25c8613652101944add2a15 SHA512 788eab3ac343815362decf4c0d5db91f3697cc669e7e051f93bf82905cc52f9b040d00b7e07f7b85bcf470e802418896a678f991e523e08a3ae5a2f212a53257
-DIST apache-tomcat-8.5.56-src.tar.gz 5724546 BLAKE2B 623dc2d1f6808f012f19fdd0d914c4bb200e8328ab6b6855666c1db1704e198d069ff74d227bf51e8376c20daf0640002e5d6907edadfde294d8c62a64d55f83 SHA512 75529e567a7be48f2c1034f3eeada571478d0babb63fb2d368061573d7e64d5fc0a937304e2e2ffa956b5d8a403936c1543a93ee78b258b532939fb9ce80ef3d
-DIST apache-tomcat-9.0.36-src.tar.gz 5890912 BLAKE2B 18962c7d4dcd75a04476acd306002977bf039d832aa1ed5551ffcaa0612e612e6b11db6d80cea149b9fb5df9d0f76284d55a1745760df8f4fa7449999e095c61 SHA512 f8263594bc679f75cecf5bcf4ad8e8ccfea42ad8e90eaeb7004c63875c6b700b0f863d68f1cdd932ebc7b303bdfb86d70afe88686e576c8ea7ccd9574c74e25b
-DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
-DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4 SHA512 2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30
-EBUILD tomcat-7.0.104.ebuild 4204 BLAKE2B 933c63117433e3c57c394bfedbaf75c808f79d5b811a0d3580281658298d62c81a81b35c20be389d8135391a14cb68942749927f8b3c02063fdd89411a53f70b SHA512 8a5e1571002872eb6bd972c50ebfb721ad05a78a9176c7215f0ad9d4422109a2206d24d68ff7b82f62745c67d2416b5771af14f24e809a8c097aaaa44e7fd8e5
-EBUILD tomcat-8.5.56.ebuild 4556 BLAKE2B 6a67a362e8fd98f7b233857abbcc2e85e3ce6911c795db4ba899932e62848c060f607b9bff66426dd0fbec9df91dcae959258ad813d4629ddede5c4986204ffb SHA512 de5dfd04a260674bab8c6d6dfbedc9684ad26a98994796472e694a1fa6105f55f721f97eb5ff3331a5c71182aa6874aa9be4bb0ee1fba427a6d7a0e2bdb25154
-EBUILD tomcat-9.0.36.ebuild 5479 BLAKE2B f9ca5f12da777e5a7c4022324f5dbd5e7c62607e1afd2888b9903307ae3af7a6b17fdc8ee7e82011291b4ca39fa59334754189e9abee646453bacbd497a92a03 SHA512 ce012dea0e52c29533191fc08436779309c6ce053d620c018c82d31fe26a8e5da9f39ebc64902ccd642577351c4093e23055306b3790ef107a512c01b0cdc639
+DIST apache-tomcat-7.0.105-src.tar.gz 5312024 BLAKE2B 0eaad66c6dcc3e2f6a2d8e142a7832cbd413724cab8b10f00e87d5535f4f20d5ba4712794e09444a8b3e0cf23f036da7c6923f038a6a11714682b129ed4ac5dd SHA512 249e039775e833d75b631cec26132b42e4aed25491a29f2349fa41b81737688b0a2e453072d8e3c5fc28763a9d1922f59da7529378ce8fd472eca7bbc73a6bd2
+DIST apache-tomcat-8.5.57-src.tar.gz 5730658 BLAKE2B f9bd2e159abc6af62c8681c38ea4eae8155f95df11f7c244e45018929189ef6b6a37a11e84119c3ddcb134a8ab58773add19cbab7506bb87c43b0039899fde60 SHA512 8bf4334b190c36900b708ee7097097e513f2d4572f119173bee732c76b5b660350fe516e58ac867250c2ef7a1371b55c116d3a1abd18323ceb92337f1dcb0f60
+DIST apache-tomcat-9.0.37-src.tar.gz 5894559 BLAKE2B 63148418ef96e90f212ce8a00dc6a274a8da2a1aa8a53ad0f6d3960efc8e876dd2812f425c0f21c73ee291752c5fd3bc8025eed46d18d31ae72e8bbe6dc1ba10 SHA512 6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98
+DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
+DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b
+EBUILD tomcat-7.0.105-r1.ebuild 4224 BLAKE2B 9ff5e9fa663926e0609ffc15804c5426e95d4eb6dacd1e4e9f27ca06dd167f22bccf44e8b2cfc323532490846f7ae04672494f000e5efcddbf21c1126ae17a67 SHA512 9160d59093bbe4fe7260ac0bb26f124f70574cc4564f52f02d2987f7d6ca46825fe973cdbc69f1493d6a5a9c62ba5059ccabf5bb618ccdfd162c631b1a347b3e
+EBUILD tomcat-8.5.57-r1.ebuild 4805 BLAKE2B 3a5d5f2af2c2d9e430f986b1226754f039956e4af8a23c05ffe4f77f9e662703c95d235b78796bd8e34f3b22f873324aa1d797600ad36ef5cbc612e9429fd953 SHA512 501fc5e0db0329232cb68b370e3d496a4a9c9a992c50e4d6b9a7151f4478ea7e6778ffa054bdbe8eeb0be42e5f6fec6597ce2240f1a0550f8e100bfdb0369117
+EBUILD tomcat-9.0.37-r1.ebuild 5590 BLAKE2B 550cb8e050d04bbc872b788c35fbea2aff91d9d12c153cf06a41e980bc9f9f61adbc025271e50764ecde87585999a2ab243040962ef71a96aa4e18c13197c1c2 SHA512 576e3a41e80f10c0372e81de2bacf7f900c6bc6220986be56fa102a0133521bc7c11af69b5c5083a9224f605d3d09a22b86965a8d8e32b81ec781a66d3fd5c2d
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/files/tomcat-8.5.47-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch
index ffbd07016110..c01699945e0c 100644
--- a/www-servers/tomcat/files/tomcat-8.5.47-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.5.57-build.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/build.xml b/build.xml
-index c274aab..ed1c3e5 100644
+index 348487c..d0b8b81 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -739,24 +739,29 @@
+@@ -762,25 +762,28 @@
        manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
  
      <!-- Servlet 3.1 Implementation JAR File -->
@@ -15,26 +15,27 @@ index c274aab..ed1c3e5 100644
        license="${tomcat.manifests}/servlet-api.jar.license" />
 -
 +-->
-     <!-- JSP 2.3 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
- 
-     <!-- EL 3.0 Implementation JAR File -->
+     <!-- EL Implementation JAR File -->
 +<!--
      <jarIt jarfile="${el-api.jar}"
        filesDir="${tomcat.classes}"
        filesId="files.el-api"
        manifest="${tomcat.manifests}/el-api.jar.manifest" />
+-
 +-->
- 
-     <!-- WebSocket 1.1 API JAR File -->
+     <!-- JSP Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
+-
++-->
+     <!-- WebSocket API JAR File -->
      <jarIt jarfile="${websocket-api.jar}"
-@@ -848,9 +853,9 @@
-       filesId="files.jasper-el" />
+       filesDir="${tomcat.classes}"
+@@ -872,9 +875,9 @@
+       meta-inf="${tomcat.manifests}/jasper.jar" />
  
      <!-- Re-packaged Apache Commons DBCP 2-->
 -    <jarIt jarfile="${tomcat-dbcp.jar}"
@@ -45,7 +46,7 @@ index c274aab..ed1c3e5 100644
  
      <!-- i18n JARs -->
      <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
-@@ -1072,9 +1077,9 @@
+@@ -1096,9 +1099,9 @@
  
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
            description="Default. Builds a working Tomcat instance">
@@ -57,7 +58,7 @@ index c274aab..ed1c3e5 100644
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -1134,7 +1139,7 @@
+@@ -1158,7 +1161,7 @@
          <exclude name="${jdt.jar.filename}"/>
        </fileset>
      </delete>
@@ -66,7 +67,7 @@ index c274aab..ed1c3e5 100644
  
      <!-- Add sources for examples -->
      <antcall target="examples-sources" />
-@@ -1177,7 +1182,7 @@
+@@ -1201,7 +1204,7 @@
  
    </target>
  
@@ -75,7 +76,7 @@ index c274aab..ed1c3e5 100644
      <!-- 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}"
-@@ -1192,7 +1197,7 @@
+@@ -1216,7 +1219,7 @@
      <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
    </target>
  
@@ -84,7 +85,7 @@ index c274aab..ed1c3e5 100644
      <!-- 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}"
-@@ -1295,9 +1300,11 @@
+@@ -1319,9 +1322,11 @@
  
      <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
      <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
@@ -96,7 +97,7 @@ index c274aab..ed1c3e5 100644
      <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
  
      <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1681,7 +1688,7 @@
+@@ -1710,7 +1715,7 @@
  
    <target name="extras-webservices-prepare"
            depends="extras-prepare"
@@ -105,15 +106,15 @@ index c274aab..ed1c3e5 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1845,6 +1852,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- 
-   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
-     description="Create the Tomcat javadoc" >
+@@ -1895,6 +1900,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
 +<!--
-     <javadoc packagenames="javax.annotation.*"
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
        sourcepath="${tomcat.dist}/src/java"
-       destdir="${tomcat.dist}/webapps/docs/annotationapi"
-@@ -1933,6 +1941,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1962,6 +1968,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
      </javadoc>
@@ -121,7 +122,7 @@ index c274aab..ed1c3e5 100644
      <javadoc packagenames="javax.websocket.*"
        sourcepath="${tomcat.dist}/src/java"
        destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1996,9 +2005,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2025,13 +2032,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
        <link href="../annotationapi"/>
@@ -132,8 +133,14 @@ index c274aab..ed1c3e5 100644
 +-->
        <link href="../websocketapi"/>
        <link href="../jaspicapi"/>
++<!--
        <link href="https://docs.oracle.com/javase/7/docs/api/"/>
-@@ -2728,7 +2739,7 @@ skip.installer property in build.properties" />
+       <link href="https://docs.oracle.com/javaee/7/api/"/>
++-->
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
+@@ -2759,7 +2770,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-compile"
@@ -142,7 +149,7 @@ index c274aab..ed1c3e5 100644
  
      <!-- Download Commons Daemon -->
      <antcall target="downloadgz-2">
-@@ -2764,7 +2775,7 @@ skip.installer property in build.properties" />
+@@ -2795,7 +2806,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-test-compile"
@@ -151,7 +158,7 @@ index c274aab..ed1c3e5 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${junit.loc}"/>
-@@ -2842,7 +2853,7 @@ skip.installer property in build.properties" />
+@@ -2873,7 +2884,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-dist"
@@ -160,7 +167,7 @@ index c274aab..ed1c3e5 100644
  
      <antcall target="downloadfile-2">
        <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2897,13 +2908,13 @@ skip.installer property in build.properties" />
+@@ -2928,13 +2939,13 @@ skip.installer property in build.properties" />
  
    <!-- =============== Utility Targets to support downloads ================ -->
  
@@ -176,7 +183,7 @@ index c274aab..ed1c3e5 100644
      <echo message="Testing  for ${destfile}"/>
      <available file="${destfile}" property="exist"/>
    </target>
-@@ -3025,7 +3036,7 @@ skip.installer property in build.properties" />
+@@ -3056,7 +3067,7 @@ skip.installer property in build.properties" />
      </sequential>
    </macrodef>
  
@@ -185,7 +192,7 @@ index c274aab..ed1c3e5 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3042,7 +3053,7 @@ skip.installer property in build.properties" />
+@@ -3073,7 +3084,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -194,7 +201,7 @@ index c274aab..ed1c3e5 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3067,7 +3078,7 @@ skip.installer property in build.properties" />
+@@ -3098,7 +3109,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -203,7 +210,7 @@ index c274aab..ed1c3e5 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3083,7 +3094,7 @@ skip.installer property in build.properties" />
+@@ -3114,7 +3125,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -212,7 +219,7 @@ index c274aab..ed1c3e5 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3107,7 +3118,7 @@ skip.installer property in build.properties" />
+@@ -3138,7 +3149,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -221,7 +228,7 @@ index c274aab..ed1c3e5 100644
      <!-- Download the file -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3122,7 +3133,7 @@ skip.installer property in build.properties" />
+@@ -3153,7 +3164,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -230,7 +237,7 @@ index c274aab..ed1c3e5 100644
      <!-- Download the file from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3150,7 +3161,7 @@ skip.installer property in build.properties" />
+@@ -3181,7 +3192,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -239,7 +246,7 @@ index c274aab..ed1c3e5 100644
      <condition property="trydownload.run">
        <and>
          <not>
-@@ -3161,7 +3172,7 @@ skip.installer property in build.properties" />
+@@ -3192,7 +3203,7 @@ skip.installer property in build.properties" />
      </condition>
    </target>
  
@@ -248,7 +255,7 @@ index c274aab..ed1c3e5 100644
      <!-- Downloads a file if not yet downloaded and the source URL is available -->
      <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
    </target>
-@@ -3172,7 +3183,7 @@ skip.installer property in build.properties" />
+@@ -3203,7 +3214,7 @@ skip.installer property in build.properties" />
  
    <target name="ide-eclipse"
            depends="download-compile, extras-webservices-prepare, download-test-compile"
diff --git a/www-servers/tomcat/files/tomcat-9.0.27-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch
index 05c8ffa1f990..ea902b4b922f 100644
--- a/www-servers/tomcat/files/tomcat-9.0.27-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/build.xml b/build.xml
-index 020531c..a71f6ee 100644
+index 8e02cb5..9007e8b 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -754,6 +754,7 @@
+@@ -760,6 +760,7 @@
        addOSGi="true" />
  
      <!-- Servlet 4.0 Implementation JAR File -->
@@ -10,34 +10,34 @@ index 020531c..a71f6ee 100644
      <jarIt jarfile="${servlet-api.jar}"
        filesDir="${tomcat.classes}"
        filesId="files.servlet-api"
-@@ -761,21 +762,23 @@
+@@ -767,21 +768,23 @@
        notice="${tomcat.manifests}/servlet-api.jar.notice"
        license="${tomcat.manifests}/servlet-api.jar.license"
        addOSGi="true" />
 -
 +-->
-     <!-- JSP 2.3 Implementation JAR File -->
+     <!-- EL Implementation JAR File -->
 +<!--
-     <jarIt jarfile="${jsp-api.jar}"
+     <jarIt jarfile="${el-api.jar}"
        filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest"
        addOSGi="true" />
 -
 +-->
-     <!-- EL 3.0 Implementation JAR File -->
+     <!-- JSP Implementation JAR File -->
 +<!--
-     <jarIt jarfile="${el-api.jar}"
+     <jarIt jarfile="${jsp-api.jar}"
        filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
        addOSGi="true" />
 -
 +-->
-     <!-- WebSocket 1.1 API JAR File -->
+     <!-- WebSocket API JAR File -->
      <jarIt jarfile="${websocket-api.jar}"
        filesDir="${tomcat.classes}"
-@@ -881,10 +884,10 @@
+@@ -894,10 +897,10 @@
        addOSGi="true" />
  
      <!-- Re-packaged Apache Commons DBCP 2-->
@@ -50,7 +50,7 @@ index 020531c..a71f6ee 100644
  
      <!-- i18n JARs -->
      <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1126,9 +1129,9 @@
+@@ -1139,9 +1142,9 @@
  
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
            description="Default. Builds a working Tomcat instance">
@@ -62,7 +62,7 @@ index 020531c..a71f6ee 100644
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -1188,7 +1191,7 @@
+@@ -1201,7 +1204,7 @@
          <exclude name="${jdt.jar.filename}"/>
        </fileset>
      </delete>
@@ -71,7 +71,7 @@ index 020531c..a71f6ee 100644
  
      <!-- Add sources for examples -->
      <antcall target="examples-sources" />
-@@ -1231,7 +1234,7 @@
+@@ -1244,7 +1247,7 @@
  
    </target>
  
@@ -80,7 +80,7 @@ index 020531c..a71f6ee 100644
      <!-- 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}"
-@@ -1246,7 +1249,7 @@
+@@ -1259,7 +1262,7 @@
      <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
    </target>
  
@@ -89,7 +89,7 @@ index 020531c..a71f6ee 100644
      <!-- 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}"
-@@ -1349,9 +1352,11 @@
+@@ -1362,9 +1365,11 @@
  
      <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
      <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
@@ -101,7 +101,7 @@ index 020531c..a71f6ee 100644
      <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
  
      <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1830,11 +1835,12 @@
+@@ -1863,11 +1868,12 @@
      </copy>
  
      <!-- Source bundles for native components -->
@@ -115,15 +115,15 @@ index 020531c..a71f6ee 100644
      <!-- platform README files -->
      <echo append="false" file="${tomcat.dist}/bin/x64/README">
  Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1844,6 +1850,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- 
-   <target name="javadoc" depends="dist-source"
-     description="Create the Tomcat javadoc" >
+@@ -1898,6 +1904,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
 +<!--
-     <javadoc packagenames="javax.annotation.*"
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
        sourcepath="${tomcat.dist}/src/java"
-       destdir="${tomcat.dist}/webapps/docs/annotationapi"
-@@ -1929,6 +1936,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1962,6 +1969,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
      </javadoc>
@@ -131,7 +131,7 @@ index 020531c..a71f6ee 100644
      <javadoc packagenames="javax.websocket.*"
        sourcepath="${tomcat.dist}/src/java"
        destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1990,9 +1998,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2023,13 +2031,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
        <link href="../annotationapi"/>
@@ -142,8 +142,14 @@ index 020531c..a71f6ee 100644
 +-->
        <link href="../websocketapi"/>
        <link href="../jaspicapi"/>
++<!--
        <link href="https://docs.oracle.com/javase/8/docs/api/"/>
-@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" />
+       <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
++-->
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
+@@ -2756,7 +2768,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-compile"
@@ -152,7 +158,7 @@ index 020531c..a71f6ee 100644
  
      <!-- Download Commons Daemon -->
      <antcall target="downloadgz-2">
-@@ -2769,7 +2779,7 @@ skip.installer property in build.properties" />
+@@ -2811,7 +2823,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-test-compile"
@@ -161,7 +167,7 @@ index 020531c..a71f6ee 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${junit.loc}"/>
-@@ -2847,7 +2857,7 @@ skip.installer property in build.properties" />
+@@ -2889,7 +2901,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-dist"
@@ -170,7 +176,7 @@ index 020531c..a71f6ee 100644
  
      <antcall target="downloadfile-2">
        <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2902,13 +2912,13 @@ skip.installer property in build.properties" />
+@@ -2944,13 +2956,13 @@ skip.installer property in build.properties" />
  
    <!-- =============== Utility Targets to support downloads ================ -->
  
@@ -186,7 +192,7 @@ index 020531c..a71f6ee 100644
      <echo message="Testing  for ${destfile}"/>
      <available file="${destfile}" property="exist"/>
    </target>
-@@ -3030,7 +3040,7 @@ skip.installer property in build.properties" />
+@@ -3072,7 +3084,7 @@ skip.installer property in build.properties" />
      </sequential>
    </macrodef>
  
@@ -195,7 +201,7 @@ index 020531c..a71f6ee 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3047,7 +3057,7 @@ skip.installer property in build.properties" />
+@@ -3089,7 +3101,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -204,7 +210,7 @@ index 020531c..a71f6ee 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3072,7 +3082,7 @@ skip.installer property in build.properties" />
+@@ -3114,7 +3126,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -213,7 +219,7 @@ index 020531c..a71f6ee 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3088,7 +3098,7 @@ skip.installer property in build.properties" />
+@@ -3130,7 +3142,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -222,7 +228,7 @@ index 020531c..a71f6ee 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3112,7 +3122,7 @@ skip.installer property in build.properties" />
+@@ -3154,7 +3166,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -231,7 +237,7 @@ index 020531c..a71f6ee 100644
      <!-- Download the file -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3127,7 +3137,7 @@ skip.installer property in build.properties" />
+@@ -3169,7 +3181,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -240,7 +246,7 @@ index 020531c..a71f6ee 100644
      <!-- Download the file from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3155,7 +3165,7 @@ skip.installer property in build.properties" />
+@@ -3197,7 +3209,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -249,7 +255,7 @@ index 020531c..a71f6ee 100644
      <condition property="trydownload.run">
        <and>
          <not>
-@@ -3166,7 +3176,7 @@ skip.installer property in build.properties" />
+@@ -3208,7 +3220,7 @@ skip.installer property in build.properties" />
      </condition>
    </target>
  
@@ -258,7 +264,7 @@ index 020531c..a71f6ee 100644
      <!-- Downloads a file if not yet downloaded and the source URL is available -->
      <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
    </target>
-@@ -3177,7 +3187,7 @@ skip.installer property in build.properties" />
+@@ -3219,7 +3231,7 @@ skip.installer property in build.properties" />
  
    <target name="ide-eclipse"
            depends="download-compile, download-test-compile"
@@ -267,7 +273,7 @@ index 020531c..a71f6ee 100644
  
      <!-- Copy the sample project files into the root directory -->
      <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3195,7 +3205,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
+@@ -3237,7 +3249,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"
diff --git a/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch b/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch
new file mode 100644
index 000000000000..7aa1e883f133
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch
@@ -0,0 +1,13 @@
+diff --git a/build.xml b/build.xml
+index 9ba357b..352e141 100644
+--- a/build.xml
++++ b/build.xml
+@@ -2716,7 +2716,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
+       <bndfiles >
+         <pathelement location="${tomcat.bnd}/${filename}.tmp.bnd" ></pathelement>
+       </bndfiles>
+-    <classpath path="${gentoo.classpath}" ></classpath></bnd>
++    </bnd>
+     <delete file="${jarfile}" ></delete>
+     <move file="${jarfile}.tmp" tofile="${jarfile}" ></move>
+   </target>
diff --git a/www-servers/tomcat/tomcat-7.0.104.ebuild b/www-servers/tomcat/tomcat-7.0.105-r1.ebuild
index 8fa804171b41..a905c145be4a 100644
--- a/www-servers/tomcat/tomcat-7.0.104.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.105-r1.ebuild
@@ -51,7 +51,7 @@ src_prepare() {
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
 		bin/catalina.sh || die
 
 	java-pkg-2_src_prepare
diff --git a/www-servers/tomcat/tomcat-8.5.56.ebuild b/www-servers/tomcat/tomcat-8.5.57-r1.ebuild
index 688cb7615768..3ab7947a19c5 100644
--- a/www-servers/tomcat/tomcat-8.5.56.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.57-r1.ebuild
@@ -31,6 +31,10 @@ DEPEND="${COMMON_DEP}
 	app-admin/pwgen
 	>=dev-java/ant-core-1.9.13
 	virtual/jdk:1.8
+	doc? (
+		dev-java/glassfish-xmlrpc-api:0
+		dev-java/wsdl4j:0
+	)
 	test? (
 		>=dev-java/ant-junit-1.9:0
 		dev-java/easymock:3.2
@@ -52,11 +56,11 @@ src_prepare() {
 	# Remove bundled servlet-api
 	rm -rv java/javax/{el,servlet} || die
 
-	eapply "${FILESDIR}/${PN}-8.5.47-build.xml.patch"
+	eapply "${FILESDIR}/${P}-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
 		bin/catalina.sh || die
 
 	java-pkg-2_src_prepare
@@ -77,6 +81,7 @@ INIT_REV="-r1"
 
 src_compile() {
 	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only glassfish-xmlrpc-api glassfish-xmlrpc-api.jar):$(java-pkg_getjar --build-only wsdl4j wsdl4j.jar)"
 	java-pkg-2_src_compile
 }
 
diff --git a/www-servers/tomcat/tomcat-9.0.36.ebuild b/www-servers/tomcat/tomcat-9.0.37-r1.ebuild
index b0c29cb19e68..8ac1a2107bd5 100644
--- a/www-servers/tomcat/tomcat-9.0.36.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.37-r1.ebuild
@@ -11,7 +11,7 @@ MY_P="apache-${PN}-${PV}-src"
 
 # Currently we bundle binary versions of bnd.jar and bndlib.jar
 # See bugs #203080 and #676116
-BND_VERSION="4.1.0"
+BND_VERSION="5.1.1"
 BND="biz.aQute.bnd-${BND_VERSION}.jar"
 BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
 
@@ -75,11 +75,11 @@ src_prepare() {
 	# Remove bundled servlet-api
 	rm -rv java/javax/{el,servlet} || die
 
-	eapply "${FILESDIR}/${PN}-9.0.27-build.xml.patch"
+	eapply "${FILESDIR}/${P}-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
 		bin/catalina.sh || die
 
 	java-pkg-2_src_prepare
@@ -98,6 +98,12 @@ EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=f
 IM_REV="-r2"
 INIT_REV="-r1"
 
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${P}-fix-build-rewrite.patch"
+}
+
 src_compile() {
 	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
 	java-pkg-2_src_compile
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index ec14ba4c2d4e..965c15d5d114 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -1,9 +1,5 @@
 DIST tornado-4.5.3.tar.gz 484221 BLAKE2B 7b3682fa85a7f6ad32351d40993516a3e397b7b0a5de9d807bcd8b2b21325a6170f3670cb13e12aa208b6590313cf165ddf40537dba1fee61fa9d71954265a66 SHA512 c17dd7a3b541c26950d27c8a399ae4fdff1d99d16ff0c5de9871fe2de4c0f797c96712b23b5ed5efdaee06bb251f7def114c83fe6f7f37f344cdac9996d14448
-DIST tornado-5.1.tar.gz 516359 BLAKE2B 1ff6e6ced124b7b0df0e476eac555de20e4ac86f01369ee484e33bf5d749c269a81dd11a0b4c8b3169db6fd9f7a1b4e3c3551d46474c53a1fed8e342660c57f9 SHA512 8f45e5bbee5453a4225f05840a9fa80dd574c5a9cac9ec4d787f11c3f86f347c66d39c984a8bbe96dbb41f599e25102f1a3dad1c55b479bebee7d856aaca764a
-DIST tornado-6.0.3.tar.gz 482444 BLAKE2B 1dda4baae52034d779879fef507d5764894f4aa054e60b00a2f8a989df4b31b495cbed6397d602e7c19844ea1538988558d5741da91646b64b6dbb8e78d618ed SHA512 2db182da7327fdd32fe76a50726a1285332139972766368c3b3dac5b4d54b4bd452a76062c09d1d158a97ace78b7915d93a29a7a8138499a2e56aee9df461abc
 DIST tornado-6.0.4.tar.gz 496204 BLAKE2B 6c092214d03baf5cf7615b780043e2fa40a4ed623b7ca59a2528cc3625ba904b21ef93c528278adedaf83e3b6e5a6311d867833dfe9826637e97918dee6fa334 SHA512 d29d69cf40f8b34fb2c55d81b6ecd9bc7c6fdf644eb4ff35452829510c0d5ec185da0a6067fec3e8afb2bedf9f5f08b06adb0ad53dcab04cb791a75abc304d6e
 EBUILD tornado-4.5.3.ebuild 1272 BLAKE2B 803fffb9d8b1568ad02836612c73aa1b9d4c8ab409aba395d6a7a44adb786f03145936328b650536c88564f66a5dbf337b587a30e03d092753fbc104d2dcab3c SHA512 089dacaeeb8fe14380d3afcf5a9ba91b580d9bd67559433f3143e5b73a7ad879367a199862e81494df279a38b4bb631718dbc8bf22dfbda65734bf8b5481c7e4
-EBUILD tornado-5.1-r1.ebuild 1287 BLAKE2B 6ebf14bd2fbb026f6676b884745620f30090b5419602927c69130b2e521a3eec9ecf02784c27e9808fb616b4b795a0d364d2874caf647344d25705f874a4554c SHA512 466e8f0ccdb601067b44dd294e50340e9887b5fa2631057f66ef43dc69f10adea870587f538905f0987208e33e82c71bbf31811e34490204d730b1aad0efb2fc
-EBUILD tornado-6.0.3.ebuild 1488 BLAKE2B 785ebed748c2b65385596cdbb1e8174245ceb08276c444a9c66e0257d25d89d33666f0a44c5dad57800bf8913d3a664aed99a7c0f5596426cc64ad2a04c7c9d7 SHA512 0016d09047e0ce4701700f836865ae59cabccb8d5d212b81bfd4af889b4a7e30754913fb67b58f5a1c3009eb3ddd0961c657260a35a21fd5c5668c75ce91c67c
-EBUILD tornado-6.0.4.ebuild 1338 BLAKE2B 9bca256f556dccfe299856a95cf69061f12ba4eb45709935f4119416205a7033e329d39c4a1008413768961c8178f117930527fd2ba82fe060f70f9b27737cf1 SHA512 bd30f16c9dcbff90eeaf81ea615979169fddec2f79f5e1120505ab8097b3d31f170822656a4bdd7a178b0009ca7bc5d8620dd803063f643187c946898469c6ee
+EBUILD tornado-6.0.4.ebuild 1343 BLAKE2B fa7cd89bec971a2635de9e70e02d46f9000a08141bd4e234c7af64496642591aa55615f1e71325c7f961f480c94e2bab8b29184db67f8f324c683f1d2816da8d SHA512 7080bb1dcbc422298abf6dc52af7ddb311ff7834affb3d05afc66d05b154407581115bb7d5bdd8f69c61d06606a3cdc68f0862c635689d7d798cbbaf00fa29c4
 MISC metadata.xml 380 BLAKE2B 16a28ca707ba911df09dfad39b269bd888734c1f5e54fdc57d84f62b541e284f248137a01c13055f5e9fa1e1da0a2c9e1382006119cc11ec19302516262b7dc1 SHA512 e790429d61042b60a9011710e96df0044c64cc5ac941ab6268386138d3a66e46d40ed1098ec8bc164d9f4341040946ec7231e8f28dda11790ecc482b06978771
diff --git a/www-servers/tornado/tornado-5.1-r1.ebuild b/www-servers/tornado/tornado-5.1-r1.ebuild
deleted file mode 100644
index 8ad9e01ae78d..000000000000
--- a/www-servers/tornado/tornado-5.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python web framework and asynchronous networking library"
-HOMEPAGE="http://www.tornadoweb.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-# doc without intersphinx does not build (asyncio error)
-#PATCHES=(
-#	"${FILESDIR}"/4.5.1-drop-intersphinx.patch
-#)
-
-python_test() {
-	local -x ASYNC_TEST_TIMEOUT=60
-	"${PYTHON}" -m tornado.test.runtests --verbose ||
-		die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r demos/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/www-servers/tornado/tornado-6.0.3.ebuild b/www-servers/tornado/tornado-6.0.3.ebuild
deleted file mode 100644
index a26972210ab6..000000000000
--- a/www-servers/tornado/tornado-6.0.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python web framework and asynchronous networking library"
-HOMEPAGE="https://www.tornadoweb.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-# doc without intersphinx does not build (asyncio error)
-#PATCHES=(
-#	"${FILESDIR}"/4.5.1-drop-intersphinx.patch
-#)
-
-src_prepare() {
-	# it used to pass, so apparently something changed somewhere
-	sed -i -e 's:test_method_after_redirect:_&:' \
-		tornado/test/httpclient_test.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x ASYNC_TEST_TIMEOUT=60
-	"${PYTHON}" -m tornado.test.runtests --verbose ||
-		die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r demos/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/www-servers/tornado/tornado-6.0.4.ebuild b/www-servers/tornado/tornado-6.0.4.ebuild
index 3220a5e3f31f..e4e095338d49 100644
--- a/www-servers/tornado/tornado-6.0.4.ebuild
+++ b/www-servers/tornado/tornado-6.0.4.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 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 0cb370810e93..975b7b81cc90 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -2,5 +2,7 @@ AUX gentoo.buildconf 490 BLAKE2B 320b0471c0c76ab6c8ada7b034f612fc20398eb60e1edc3
 AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8d1090a8b9cba973ac2d3dbcbc2ceb980415e98317bc55b07a9a7e6641fac593dc4dd5466bd8d67c9 SHA512 041d1bd694fad6f7c5e28944aab6d7ba53b3c7fc990ce6b7c2d97b9f3d6650c46dda8069e545c252a7400e1d825c8e46d7393a289757b1bd665e64241ca3789a
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
 DIST uwsgi-2.0.18.tar.gz 801555 BLAKE2B d8008e751fd699474a1b7d6276c10b3d2f1ebd0ca325e45bfb3b13f81e88de20e4e7389cd6aa9c8b3daa964d9b11524ee71e93717ed9762bf021471f6a2c09fa SHA512 6561703279bcc4a81311d033810ac066d0f113bab13b0942f3eef86cac29c584a6641b52476840d6895151aee5ed064ae2d03b18932cf7f47e62f4eeed76da61
-EBUILD uwsgi-2.0.18.ebuild 11514 BLAKE2B 9bdbf0807ae4fd3e970fa237905e6e9425eff0b4b4e4d9342f540076adf30f1082f7c634901326cc3075c271b5f57584b30b31c2328df5e10ceaa61338d9c279 SHA512 435f7f79ac14b5e21b17ef0ca80535f6f67b0663691e0a5084765d0ce77215c103e9a3f85c9c4e6ce6b55d8e46d76fa19b675714c1999e102c8fca88d02b9085
+DIST uwsgi-2.0.19.1.tar.gz 804398 BLAKE2B 73fc19990866eb1058a742b34a817b3bd87e00c838da055bece2bff5e13c161f53c642866ed591aa4afeb23ef924205502f2cb0a4cf9d303b5b63fb9a53f57e2 SHA512 34b55f7c7a77dc0b0dab34d1a9ca9a4cba8a9261969656c88435e7f32fe8a0c5654e1562706775f77e2f60c4ad0f5c6055257a23ab7d387c1579639e054807b5
+EBUILD uwsgi-2.0.18.ebuild 11515 BLAKE2B 28735e0d5ee86d4d66b5b7a286d8b74b6435101f7359edb90fee281ab60c718b49c03ea86aab146eea7e871733f89c13dd702785dfdda1b9a0f8ac0fd11d5733 SHA512 9d84926c814bcdb0c9fe9a534d0bd0320fade83acccc841003629a5d399bd225d96492d0faff9bf940f305dfc47afe8d7467ecb4014cf71940295dcb7cb183f9
+EBUILD uwsgi-2.0.19.1.ebuild 11520 BLAKE2B 26f4c7d5230cbe6e35a9660ac7da9472e68b338d39db16eda6fae712031c32e155f3eb0b0470cc6b4024b49540a7cbf0e0ccefa17ec39f18c62eedae1385ddbf SHA512 e766f3d7a9f21e1158c104716d329275dcd652c1bd13bf7f4b12e856eadba5c63c0cdb308321548bc2af5a0695434d8dd4f35ec7ac0506cbc890dfac6680aa62
 MISC metadata.xml 1411 BLAKE2B 89114f75b2150f4340e30cd106115f0e9aa1a00389558f6f75aa86c0bf5a11d5df5ecb794c12f7bb39791d8edef40415cbca4403f8f2b65bd642ce52e95357a3 SHA512 33d3767a25dfca633e5149a20900d56998c40204a4c55e3814248574d0c8525883a842222ed5f8ac739a06cd09d806c189ff6f742d1277bcd3f8e8afdea84445
diff --git a/www-servers/uwsgi/uwsgi-2.0.18.ebuild b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
index 2ba21267a170..fe97b6c84932 100644
--- a/www-servers/uwsgi/uwsgi-2.0.18.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 RUBY_OPTIONAL="yes"
@@ -267,7 +267,7 @@ python_install_symlinks() {
 src_compile() {
 	mkdir -p "${T}/plugins" || die
 
-	python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
+	CPUCOUNT=1 python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
 
 	if use go ; then
 		python uwsgiconfig.py --plugin plugins/gccgo gentoo || die "building plugin for go failed"
diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1.ebuild
new file mode 100644
index 000000000000..bafab8c38f01
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-2.0.19.1.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+PHP_EXT_INI="no"
+PHP_EXT_NAME="dummy"
+PHP_EXT_OPTIONAL_USE="php"
+USE_PHP="php7-2 php7-3 php7-4" # deps must be registered separately below
+
+MY_P="${P/_/-}"
+
+inherit eapi7-ver eutils flag-o-matic multilib pax-utils php-ext-source-r3 python-r1 ruby-ng
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="http://projects.unbit.it/uwsgi/"
+SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
+
+UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
+	http ugreen signal syslog rsyslog
+	router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics}
+	{core,fast,raw,ssl}router
+	redislog mongodblog log{file,socket}
+	spooler cheaper_busyness symcall
+	transformation_{chunked,gzip,offload,tofile}
+	zergpool )
+UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
+	dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter
+	geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam
+	rados router_{access,radius,spnego,xmldir}
+	sqlite ssi stats_pusher_statsd
+	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
+
+LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
+LANG_SUPPORT_EXTENDED=( go lua php python python-asyncio python-gevent ruby )
+
+# plugins to be ignored (for now):
+# cheaper_backlog2: example plugin
+# coroae: TODO
+# cplusplus: partially example code, needs explicit class
+# dummy: no idea
+# example: example plugin
+# exception_log: example plugin
+# *java*: TODO
+# v8: TODO
+# matheval: TODO
+IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq"
+
+for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done
+for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done
+IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}"
+
+REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
+	uwsgi_plugins_logcrypto? ( ssl )
+	uwsgi_plugins_sslrouter? ( ssl )
+	routing? ( pcre )
+	uwsgi_plugins_emperor_zeromq? ( zeromq )
+	uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
+	uwsgi_plugins_router_xmldir? ( xml !expat )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	python-asyncio? ( || ( $(python_gen_useflags -3) ) )
+	python-gevent? ( python )
+	expat? ( xml )"
+
+# util-linux is required for libuuid when requesting zeromq support
+# Order:
+# 1. Unconditional
+# 2. General features
+# 3. Plugins
+# 4. Language/app support
+CDEPEND="
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	json? (
+		!yajl? ( dev-libs/jansson )
+		yajl? ( dev-libs/yajl )
+	)
+	pcre? ( dev-libs/libpcre:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	xml? (
+		!expat? ( dev-libs/libxml2 )
+		expat? ( dev-libs/expat )
+	)
+	yaml? ( dev-libs/libyaml )
+	zeromq? ( net-libs/zeromq sys-apps/util-linux )
+	uwsgi_plugins_alarm_curl? ( net-misc/curl )
+	uwsgi_plugins_alarm_xmpp? ( net-libs/gloox )
+	uwsgi_plugins_curl_cron? ( net-misc/curl )
+	uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
+	uwsgi_plugins_geoip? ( dev-libs/geoip )
+	uwsgi_plugins_ldap? ( net-nds/openldap )
+	uwsgi_plugins_pam? ( sys-libs/pam )
+	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
+	uwsgi_plugins_rados? ( sys-cluster/ceph )
+	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
+	uwsgi_plugins_router_spnego? ( virtual/krb5 )
+	uwsgi_plugins_systemd_logger? ( sys-apps/systemd )
+	uwsgi_plugins_webdav? ( dev-libs/libxml2 )
+	uwsgi_plugins_xslt? ( dev-libs/libxslt )
+	go? ( sys-devel/gcc:=[go] )
+	lua? ( dev-lang/lua:= )
+	mono? ( dev-lang/mono:= )
+	perl? ( dev-lang/perl:= )
+	php? (
+		net-libs/libnsl
+		php_targets_php7-2? ( dev-lang/php:7.2[embed] )
+		php_targets_php7-3? ( dev-lang/php:7.3[embed] )
+		php_targets_php7-4? ( dev-lang/php:7.4[embed] )
+	)
+	python? ( ${PYTHON_DEPS} )
+	python-asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )
+	python-gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )
+	ruby? ( $(ruby_implementations_depend) )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-uwsgi )
+	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	echo ${PYTHON_USEDEP}
+	default
+}
+
+pkg_setup() {
+	python_setup
+	use ruby && ruby-ng_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s|'-O2', ||" \
+		-e "s|'-Werror', ||" \
+		-e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
+		uwsgiconfig.py || die "sed failed"
+
+	sed -i \
+		-e "s|/lib|/$(get_libdir)|" \
+		plugins/php/uwsgiplugin.py || die "sed failed"
+}
+
+src_configure() {
+	local embedded_plugins=()
+	local plugins=()
+	local malloc_impl="libc"
+	local json="false"
+	local xml="false"
+
+	for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do
+		use uwsgi_plugins_${p} && embedded_plugins+=("${p}")
+	done
+	for p in ${LANG_SUPPORT_SIMPLE[@]} ; do
+		use ${p} && plugins+=("${p}")
+	done
+
+	# do not embed any plugins
+	if ! use embedded; then
+		plugins=( ${plugins[@]} ${embedded_plugins[@]} )
+		embedded_plugins=()
+	fi
+
+	# flatten the arrays
+	plugins=${plugins[@]}
+	embedded_plugins=${embedded_plugins[@]}
+
+	# rename some of the use flags, language plugins are always real plugins
+	plugins="${plugins/perl/psgi}"
+	plugins="${plugins/sqlite/sqlite3}"
+	embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
+
+	# override defaults as requested by the user
+	if use xml; then
+		use expat && xml="expat" || xml="libxml2"
+	fi
+	if use json; then
+		use yajl && json="yajl" || json="jansson"
+	fi
+	use jemalloc && malloc_impl="jemalloc"
+
+	# prepare the buildconf for gentoo
+	cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini || die
+	sed -i \
+		-e "s|VAR_XML|${xml}|" \
+		-e "s|VAR_YAML|$(usex yaml libyaml true)|" \
+		-e "s|VAR_JSON|${json}|" \
+		-e "s|VAR_SSL|$(usex ssl true false)|" \
+		-e "s|VAR_PCRE|$(usex pcre true false)|" \
+		-e "s|VAR_ZMQ|$(usex zeromq true false)|" \
+		-e "s|VAR_ROUTING|$(usex routing true false)|" \
+		-e "s|VAR_DEBUG|$(usex debug true false)|" \
+		-e "s|VAR_MALLOC|${malloc_impl}|" \
+		-e "s|VAR_PLUGINS|${plugins// /, }|" \
+		-e "s|VAR_PLUGIN_DIR|${EPREFIX}/usr/$(get_libdir)/uwsgi|" \
+		-e "s|VAR_BUILD_DIR|${T}/plugins|" \
+		-e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \
+		buildconf/gentoo.ini || die "sed failed"
+
+	if ! use caps; then
+		sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+	fi
+
+	if ! use zeromq; then
+		sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+	fi
+
+	if use uwsgi_plugins_emperor_pg ; then
+		PGPV="$(best_version dev-db/postgresql)"
+		PGSLOT="$(ver_cut 1-2 ${PGPV##dev-db/postgresql-})"
+		sed -i \
+			-e "s|pg_config|pg_config${PGSLOT/.}|" \
+			plugins/emperor_pg/uwsgiplugin.py || die "sed failed"
+	fi
+}
+
+each_ruby_compile() {
+	cd "${WORKDIR}/${MY_P}" || die "sed failed"
+
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed"
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed"
+}
+
+python_compile_plugins() {
+	local EPYV
+	local PYV
+	EPYV=${EPYTHON/.}
+	PYV=${EPYV/python}
+
+	${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
+
+	if use python-asyncio ; then
+		if [[ "${PYV}" != "27" ]] ; then
+			${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
+		fi
+	fi
+
+	if use python-gevent ; then
+		${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
+	fi
+
+	if use python-gevent || use python-asyncio; then
+			${PYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed"
+	fi
+}
+
+python_install_symlinks() {
+	dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.}
+}
+
+src_compile() {
+	mkdir -p "${T}/plugins" || die
+
+	CPUCOUNT=1 python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
+
+	if use go ; then
+		python uwsgiconfig.py --plugin plugins/gccgo gentoo || die "building plugin for go failed"
+	fi
+
+	if use lua ; then
+		# setting the name for the pkg-config file to lua, since we don't have
+		# slotted lua
+		UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
+	fi
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
+		done
+	fi
+
+	if use python ; then
+		python_foreach_impl python_compile_plugins
+	fi
+
+	if use ruby ; then
+		ruby-ng_src_compile
+	fi
+}
+
+src_install() {
+	dobin uwsgi
+	pax-mark m "${D}"/usr/bin/uwsgi
+
+	insinto /usr/$(get_libdir)/uwsgi
+	doins "${T}/plugins"/*.so
+
+	use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
+	use go && dosym uwsgi /usr/bin/uwsgi_go
+	use lua && dosym uwsgi /usr/bin/uwsgi_lua
+	use mono && dosym uwsgi /usr/bin/uwsgi_mono
+	use perl && dosym uwsgi /usr/bin/uwsgi_psgi
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			dosym uwsgi /usr/bin/uwsgi_${s/.}
+		done
+	fi
+
+	if use python ; then
+		python_foreach_impl python_install_symlinks
+		python_foreach_impl python_domodule uwsgidecorators.py
+	fi
+
+	newinitd "${FILESDIR}"/uwsgi.initd-r7 uwsgi
+	newconfd "${FILESDIR}"/uwsgi.confd-r4 uwsgi
+	keepdir /etc/"${PN}".d
+	use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}"
+}
+
+pkg_postinst() {
+	if use apache2 ; then
+		ewarn "As reported on bug #650776 [1], Apache module mod_proxy_uwsgi"
+		ewarn "is being transferred to upstream Apache since 2.4.30, see [2]."
+		ewarn "We therefore do not build them any more."
+		ewarn "    [1] https://bugs.gentoo.org/650776"
+		ewarn "    [2] https://github.com/unbit/uwsgi/issues/1636"
+	fi
+
+	elog "Append the following options to the uwsgi call to load the respective language plugin:"
+	use cgi    && elog "  '--plugins cgi' for cgi"
+	use lua    && elog "  '--plugins lua' for lua"
+	use mono   && elog "  '--plugins mono' for mono"
+	use perl   && elog "  '--plugins psgi' for perl"
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			elog "  '--plugins ${s/.}' for ${s}"
+		done
+	fi
+
+	python_pkg_postinst() {
+		local EPYV
+		local PYV
+		EPYV=${EPYTHON/.}
+		PYV=${EPYV/python}
+
+		elog " "
+		elog "  '--plugins ${EPYV}' for ${EPYTHON}"
+		if use python-asyncio ; then
+			if [[ ${EPYV} == python34 ]] ; then
+				elog "  '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
+			else
+				elog "  (asyncio is only supported in python3.4)"
+			fi
+		fi
+		if use python-gevent ; then
+			elog "  '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
+		fi
+	}
+
+	use python && python_foreach_impl python_pkg_postinst
+
+	if use ruby ; then
+		for ruby in $(ruby_get_use_implementations) ; do
+			elog "  '--plugins rack_${ruby/.}' for ${ruby}"
+			elog "  '--plugins fiber_${ruby/.}' for ${ruby} fibers"
+			elog "  '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads"
+		done
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /www-servers
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)