gentoo resync : 24.03.2019

21 files changed, 379 insertions, 270 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index c5dad9fb1f2f..846786cb17d1 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 9db01a84b51a..4bb6f5e8aefa 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -15,5 +15,5 @@ DIST httpd-2.4.38.tar.bz2 7035030 BLAKE2B 52d965b0eae3402c268f1c5f5fb669ad844086
 EBUILD apache-2.2.34.ebuild 2976 BLAKE2B 8816d1f547ba7e8de670ef0f45cde40748fc5d611e1060f0c76a8b35ce9771a493f89f2277afcd90ac36fc6f4f684be1e19913d2d3a2ecd78e63e9f4f0d97470 SHA512 32b49f813a80f28b50a2170878d3b204c51db243bbd117b60b8aff63627b42d2cb76e87282ad9053ac1513f0faf8489a60edc7dec0c8087f12650a74d3a533b7
 EBUILD apache-2.4.27-r1.ebuild 7737 BLAKE2B 6e459c6d091a5d91d1179cde68fa1b34bb4faf04d3c66b8b0a759311e6b03102485fc4758a65437c5c9bd12f63e3afdd50730c196f3e5785c3c6aa25fb2cf2c5 SHA512 bd2df8d64f22fd28af9e2225492de2d3dc2d8172220f14f495841fec587aeb39c02d4d7021d4f96430f9821922baa84a78a7b8470f56d5c5305bd124d763afd2
 EBUILD apache-2.4.34-r2.ebuild 8245 BLAKE2B ea58474549b4c05319ae4d4eab60d0035415b6698c201aad0255c28cf0b0cd636f1666d4d90b8fc55a1fa53a9da2bd36c49afae7818715101c693cc8837c4abb SHA512 f3ed8140685860c7c8e44baa1198a38dd44de8015e7c994490c37bd9289386a446aed2dd448d75a9159124bf06eb2441dbab59e9c617d70d81f8d4b6c106eaf1
-EBUILD apache-2.4.38-r1.ebuild 8143 BLAKE2B c83aee644fae5906f2db21f8e4119ded7335117a342ce0b461a1a541f69daea2de812ca840b437af38ee218401a7132f89aff320bc1ebb9dedfad1cffb28889d SHA512 2fb23b0e1dd59253d4481f5b8dee2bdf8696d28932684f2bbcc96bcfa674f0710b46ffe243ad4757f32141896e7f73655224b2973d0d8c86f11e4600bb4b765b
+EBUILD apache-2.4.38-r1.ebuild 8140 BLAKE2B a0d9ed00a1bff171d5bb84fac9c443bdaf42bf40c292275247456d6d94ca61db86668d3d68f5bc7babe3fc210bc7de5b841c2ee1c855f60015f1745eaaee1efe SHA512 a72aca34cf3ee36847a1df0fb8aa56ac4b359a41a22a4c61587c15e95cfde11f76b121723e8e5b285395921daa3b40579464c21e09967cc42f1fea35f4ba04cf
 MISC metadata.xml 4052 BLAKE2B dba078e60afae4caf7f47f309f4fb6e65a10ee844b1ef8841e64bc5fb0ec34b0d9ee200473ca751e41498ba34a91f9eed2e84f3c86e6063b1c276adbdaba140a SHA512 0db051271c4b2b6487e3e28f0f994ff0c9167d9ced09042838a049d4a63df3787595213aa1c86108fd8c4f27ef961e1c04b375356b91e9d30231317c56ec7d78
diff --git a/www-servers/apache/apache-2.4.38-r1.ebuild b/www-servers/apache/apache-2.4.38-r1.ebuild
index 4aa2c5d6969c..851d9a886063 100644
--- a/www-servers/apache/apache-2.4.38-r1.ebuild
+++ b/www-servers/apache/apache-2.4.38-r1.ebuild
@@ -130,7 +130,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 ~sh ~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 ~sh 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/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index afb16e40c18d..a99f3e5c6319 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -1,11 +1,3 @@
-DIST gunicorn-19.1.1.tar.gz 385155 BLAKE2B 683bff89e9f7037b22748c968f842cbd6328f63aaf63edba088bdf5cb1b4774614a8bfba1449bc0c90685ba2a12cc95b474d15dfd40f0f22055d1e9d554fc55c SHA512 1b42f0dadb8ced12954e821ad3dc7fad67ae6f1123218fe79e32d7089d9ae65bcd973613c226d9a16b11d7d35632990f2c9499594c7a383a79698a1c2db471de
-DIST gunicorn-19.3.0.tar.gz 395381 BLAKE2B cbdf0e4a8c5f107b3dbee9ac30b141142bd10e5a4d9046de3c2fe3af965e6b5f091ff29bdfd9f4a1da75ea409e6f9a3b9627f6069d5529dc9db4d6ad1e3f9860 SHA512 8c4e0bb1bf0b35aaf9160b9b7d87890a991451fbc86186454203f3483767858944704c1ec22dd52480ce1e4693e84b62b1428dd3b67b2ae925e0475dc08fcb50
-DIST gunicorn-19.4.5.tar.gz 399066 BLAKE2B 046dd95170b3d6c6071c955462af5777ee0fbaa48d80c4a16b78fb1c9abd49bef98f7428e7f861b404a2791683074ae37a22a7e73d5b7f183fa6ac77d139123e SHA512 a255178a4ce7966af5883fc6c104e7c472c87ce91861caf976b52cfb0ccd90b34109130334afa6c1f6dd251a4b33b052b1f9a4f598c5cd1e7f26e332b92e9154
-DIST gunicorn-19.6.0.tar.gz 404497 BLAKE2B 8edc6907daf9cced83ab4213146d468789a23b4428a562f9f5cc7d2aa8f7c57137ca9f163609b6a8955537dfc5a93910a7cef183fa6457c5017cbb3941f4e0c8 SHA512 50b69ae18acc6f60be6fc5c6f4a867d8415d32009a1f959155b58502d52403a057612e97d6c9b69ec068ee5af7b9b045952a636a5edf4713a1249492611be479
 DIST gunicorn-19.8.1.tar.gz 415541 BLAKE2B f0eefc4ff24052320b4dfaac3fc2523487f8dbb63365a9a3c52bc411b4d8f6150f348c709cae94dc4acb45e7fda534cf462d0339abc0325230d3560f76ce3241 SHA512 7f7fcbcde20b70d3a2faad595e08a028530348895f784eddcb35f24b3d5a7955edfc5b68aac4630243798fa37d41b7e869ec0d454dc80700c2630ba2cc39afc0
-EBUILD gunicorn-19.1.1.ebuild 1152 BLAKE2B dbee01db983b6ca5402a30870570fdf2b60e1923120cb6e14e28b0fad3e33b93f756f100a8acf4c958630045246a9ff4949a899251335f6928db78e23b4f6d85 SHA512 ee87314f83c32f458faf5f642f67879622d3574d3d4d482d512f2941dd1b218193fec6221822946eb4c71d24118dffe315132065c73e824471b6ab02307ff0d3
-EBUILD gunicorn-19.3.0.ebuild 1208 BLAKE2B 47c394fdc6f3648e8584eb29fc49ca25447c288aa0cd511d72c5871ff868756d477e310c870abd9977edfaf107e3c1fdff0caa6fcf2971ad10f7cb12720efb3a SHA512 56e7977b28609dd8e419b8db7d392db0ad937a3493727a64d6c66da0ed7845763ef768052d8070442aabc8f285acaea12a75001b4f6bd51501652354ef1093ba
-EBUILD gunicorn-19.4.5.ebuild 1106 BLAKE2B c45268926c2b5710c1c2866d00dd526a3642332a05f9e233bf20b623dad8dc5b6aa1d1b6ad981b8dc15659e9fcc38ba3a736d6775a76a5a6b32b523f8aee65a4 SHA512 49812ce39dce295c98f776fce7f4e018792d74a4344f1d0bbf90231746c18adc39c86c5c04d8ea320ee214c469a9f2fdcb72670af0912afc3930330103810050
-EBUILD gunicorn-19.6.0.ebuild 1173 BLAKE2B 4c6f29f434697976ac7a15856f81fa16c68ac391390d47e87b4aeedaaf2305dc6e43129b7470d69b74e1f9809de0f63364fcc68fa2149f28a1c93085e4e11467 SHA512 37ab860b3447f649350e58d5ad620d61e92d4bb969d275ffe9503be78db221cc7f927f73a4e302e1ba7fbec33b53d45964dce87165d4084b70c2920ca7ea8df8
 EBUILD gunicorn-19.8.1.ebuild 1164 BLAKE2B 92aa1f913f40baa512f8096336294124058f5d793818eb189449fc269ca87cc581c993ba9384e88b88eecd5a9947fcfd5c997874697df328b54c130b1e897169 SHA512 f4908c777bc5d86069638ec8d59d268642583b0e55f39bdd5c58825ffeb7c88b9b3434586ff2e510bc9ab8c1fad072e2b0c47f3c406b4ccb56e3eb820a299692
 MISC metadata.xml 707 BLAKE2B baa7ba91610f10f6acc7298c6bbecb030b2d6dcda9a2f0c642f24ee27edbab38baea8bc231d7fbfc9f60459faa13bb05e548a8f7680b735c8c1005d00db2a3ee SHA512 ee74f9e811231c840235bccb318ffd99e7ff765a13efe285dfd870ff343d8e64b5190d5afd6589b6367f0f8cec8e699de8ae19d8da5e9a9f22cb7eb9e3539c0a
diff --git a/www-servers/gunicorn/gunicorn-19.1.1.ebuild b/www-servers/gunicorn/gunicorn-19.1.1.ebuild
deleted file mode 100644
index 65b519308c98..000000000000
--- a/www-servers/gunicorn/gunicorn-19.1.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="http://gunicorn.org https://pypi.org/project/gunicorn/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc examples test"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-DOCS="README.rst"
-
-python_prepare() {
-	# these tests requires an already installed version of gunicorn
-	rm tests/test_003-config.py
-
-	sed -ie "s/..\/bin/\/usr\/bin\//" docs/Makefile || die
-
-	distutils-r1_python_prepare
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${P}
-		doins -r examples
-	fi
-}
diff --git a/www-servers/gunicorn/gunicorn-19.3.0.ebuild b/www-servers/gunicorn/gunicorn-19.3.0.ebuild
deleted file mode 100644
index 133e77bef3ad..000000000000
--- a/www-servers/gunicorn/gunicorn-19.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="http://gunicorn.org https://pypi.org/project/gunicorn/ https://github.com/benoitc/gunicorn"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-DOCS="README.rst"
-
-python_prepare_all() {
-	# these tests requires an already installed version of gunicorn
-	rm tests/test_003-config.py || die
-
-	sed -ie "s/..\/bin/\/usr\/bin\//" docs/Makefile || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/www-servers/gunicorn/gunicorn-19.4.5.ebuild b/www-servers/gunicorn/gunicorn-19.4.5.ebuild
deleted file mode 100644
index e926a618c442..000000000000
--- a/www-servers/gunicorn/gunicorn-19.4.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="http://gunicorn.org https://pypi.org/project/gunicorn/ https://github.com/benoitc/gunicorn"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-DOCS="README.rst"
-
-python_prepare_all() {
-	sed -ie "s/..\/bin/\/usr\/bin\//" docs/Makefile || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/www-servers/gunicorn/gunicorn-19.6.0.ebuild b/www-servers/gunicorn/gunicorn-19.6.0.ebuild
deleted file mode 100644
index 895e2e4d9c49..000000000000
--- a/www-servers/gunicorn/gunicorn-19.6.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="http://gunicorn.org https://pypi.org/project/gunicorn/ https://github.com/benoitc/gunicorn"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT PSF-2 doc? ( BSD )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="doc examples test"
-
-RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-DOCS="README.rst"
-
-python_prepare_all() {
-	sed -ie "s/..\/bin/\/usr\/bin\//" docs/Makefile || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index a294c4a0a047..2458df28ac48 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,5 +1,7 @@
 DIST puma-3.11.4.tar.gz 210324 BLAKE2B 16c01182f4a3adad026ab4f214945b1c5e002d2d99ef965947d982b488c3d080f50d41b175cc69181b2c953d32df6dfb63253dbd0312d594a2472f69f01aa30f SHA512 4c32c7587cab7ae0afd1e90d3de00db67fe314a700240d295303549905e3c556cba06ea41fbe6230f50328769d47272c52f9eb6460b0653fa14e336bacd120ea
 DIST puma-3.12.0.tar.gz 215213 BLAKE2B 1b142e6cc135021eccb01b2e8643d8d22f1c535723a943ae996c6607c7e771d8990ae2132fa2aad8ea44eceaf8c8f586fbb3d61a9aa2963a02d9f54c76773f5e SHA512 e8f0383de24e452735dddaf80e997cc428af2de767be31db6b47fdd5d09268fcb7ca139233311dda83c7a70db6646109e04308c076ac2bf2510766791171ddc5
+DIST puma-3.12.1.tar.gz 217543 BLAKE2B 6427c48d17ead515a17fd53ba05baba0ca27b9a3c6b26257e83b21ce099d7ff36666dfe1f1a964d23addd666c5aa83c46e6795ad2e22236de7136e25be689ff5 SHA512 70784ed89403e96d1bdb68f3ee0a5446d98a6f8a1af5ddf369d837e2ae3320118c29c9c33e7a9db7a76b1a80aef66a9b6426140c492721984de50e7cc5fc8300
 EBUILD puma-3.11.4.ebuild 1912 BLAKE2B 3b230f35f65f74e07adaaf85c979e823281920def719d056264e718f823878c7c8cefdf2d08f5146c57067e3c0932379415566730bb5f21dbca5980198503560 SHA512 568ecfb914f2d0ccb3896fe3c3a1d6d1a18413b992f72a2e1b67373194f8ca6072da937d09cdeabfc0f6971cb2b0ebc887922c00554ef7dd526082f2280b5573
 EBUILD puma-3.12.0.ebuild 1910 BLAKE2B ce5c492096c3b163c8f446f5ddac6304b1b67c7a61dddc16fe7e08e264a7fa1767fcbc45708e33bda99015e7d3fb2932a215c95d902aab224d146db4566a1aca SHA512 e267e4f13d75caf2de3c9bf9e9dcb84d07df7233c9c433ad1a35ecce047aa27e33b933957360b955a19dc0b3f17e810880694fdec275419770d1df477fee57a4
+EBUILD puma-3.12.1.ebuild 2022 BLAKE2B 0bd5123d6b723af2467eae3a9aaffdbbfaa8e343e3c04d92afbfe48515969dfafc411645681ea31078dbfb14ab32c6f8eab5ec067ebed1553979d3f33882dcbc SHA512 cc999ba40db84b461b4d20afea801ea5c804f2098a4e92163d6b08dfe74fcfe70d71baa6342a166ca46c40fb6be734736f1f830372f505350e5d82fe5c179444
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/puma-3.12.1.ebuild b/www-servers/puma/puma-3.12.1.ebuild
new file mode 100644
index 000000000000..df9ff4d937e3
--- /dev/null
+++ b/www-servers/puma/puma-3.12.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
+HOMEPAGE="https://puma.io/"
+SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
+RDEPEND+=" dev-libs/openssl:0"
+
+ruby_add_bdepend "virtual/ruby-ssl
+	test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
+
+all_ruby_prepare() {
+	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
+
+	# 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
+	# while allowing these tests to fail.
+	# https://github.com/puma/puma/pull/1345
+	rm -f test/test_{persistent,puma_server,puma_server_ssl}.rb || die
+
+	# Use correct ruby version
+	sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \
+		-e 's/localhost/127.0.0.1/' test/shell/* || die
+	sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/puma_http11 extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/puma_http11
+	cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
+}
+
+each_ruby_test() {
+	einfo "Running test suite"
+	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
+
+	einfo "Running integration tests"
+	pushd test/shell
+	#sh run.sh || die
+	popd
+}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c004221832ef..75290413fd8a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,8 +1,9 @@
 AUX tomcat-7.0.84-build.xml.patch 5771 BLAKE2B fc7ceb5503836f2d2e52611b1fef76390d62668ac030cfc51b51ab20278d80fb4c3561e6ff4eb0fa5f7461b72f73930a69af6c616bc10b6dd6a3c4033d6ad618 SHA512 3583167e6e7b307ab282982779ef58e1f401e0ada8ddf0fc1ac9669147a22d6472ab9ec09aa293f2846be2f406dda63df5fc0351eac67c86742606140293a0c3
 AUX tomcat-8.0.53-build.xml.patch 10949 BLAKE2B 2693f3e74a69967ceeb5f4ee41756b840da5bc2ab3c64cb855d52bd099bad8d6115f1d01903bacdcb634c24b9085dbb2ef34027f71325f887f20826721b268aa SHA512 20373a340dcb17595e7ff52608e8d3d3b1eddd5f0104b588c5f91b21eb4510047df61a0dfd9ed8674fb7b0b709945d5014d6e1cad4027414ff9e72c2b5d56cfc
 AUX tomcat-8.5.37-build.xml.patch 9814 BLAKE2B 8f25989b1fa957337686beacc12d9b1fa5427fc26582645c0b9fd7a45fba11100fbd10516ed9bdd510afc25a180986076db00f8b026e9ed8ca00b285404889c9 SHA512 ac1328a6fb755c87cd8804b5538aaec7b09a966e427c0a9c3db408947135087ce5e1e81c9e18243d7b34f1751002afbe538424b975a6772a1d5c7443dab73f8f
-AUX tomcat-9.0.14-build.xml.patch 10582 BLAKE2B 01609bf6867784f789ae41cb06acdd9496b0fc62dd65d72420cd01f1d73070ef10d74e038629cb4c983e313a958f810cd8f5f02bb5c464924f8a6b73be084dca SHA512 8bb3d5b58c9c49386a15f3bcb1e13656adfeed0e1d4c3bf76589577cae7fcdd6f107cf02126e69b5864f6077ad2660fb7fc811ea52b5ac89de822e535a36826b
+AUX tomcat-8.5.39-build.xml.patch 10037 BLAKE2B f8815ff5c9b959daa58260ce029d0af337ef38a8e057f9cabe4c7079a443149890803c9a379fdfcbf7128392e2e1220385616488b30f6bba9afed1ed9598e22b SHA512 b33d8b018fd8def02a7f9bfaf0aed2f7954d70e110c82f3999104aec933f616d1b68fb2bf2cbe2ba00810b571333d17bae47d60bdea212803eb131f46314ffaf
 AUX tomcat-9.0.16-build.xml.patch 10623 BLAKE2B ff6b110604628cbf750a75cea2544789cb65357f2f5bd87e8f781fcffade2a538f4a76ed4c8709a34dbb5995006a550e10e13b74487570b0474ca451ea21c209 SHA512 27f5040e2384ad4c212c1e25aaa850c26fec93de73b86a1b3e06e763ff5e13ed491153427d1206eec662eb225ee0890c43f292cbe95dd6521702254632983df1
+AUX tomcat-9.0.17-build.xml.patch 10600 BLAKE2B 34ac1539155c8263b8fbf48096685a4e63567727fa129ba33c896d82e1d57fefb5d390375cc1655312f7f3b69ab3f51b1990857b6765c954c4026d650d9a8f24 SHA512 0065397d64c8a508c62d3acc689bb968c2ccb303f7e8013de107feb63d15637f58a2fcefdd24dbf6edfddf8f5e4227277c9a5b7b188c65adb0c02985bb3bd4c0
 AUX tomcat-9.0.4-build.xml.patch 10399 BLAKE2B 3ec7f4d315b51056884b44abbd03093e2bf3675acfb572c556a62a8a32de3209dae82ee3f3b1c65178b2a62b42f5d4c3fba2e765aa27aa7147a9d8478d09f0f0 SHA512 60729e4f085951aa1133b0d6fdc6386bac9fd4bcd421814eb87c8a45a62819fab1ea2347dfffd12150e93c54fda2ba98bf1df4bc39a622de5ac9ea0c2e81a710
 AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f7174453cfbe7b4a1a7167e122efa3ec2ea6c17c88de1f9223e21e773cf717ed04d79fe0b1e7fc816400033094a07a35c6 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
@@ -11,19 +12,19 @@ AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c
 DIST apache-tomcat-7.0.92-src.tar.gz 4778943 BLAKE2B d11b01219a25c303ce791d965908c79cd48b5c97e1f0bed81ae60e0fcae3c4b23906f652eaf1d2922db7a57e68ee9f5a09ef017b7f1b89ed6c2ab81a477a810e SHA512 8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a
 DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 8b72418c98369e0e104c5f51e9d822c287487b5d3b66a4a6d005535b33a35a6cbc50c49b48100555bfaba0c6c983ea11dcdf381d2fba80a77fc17ac0df20efaa SHA512 5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc
 DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
-DIST apache-tomcat-8.5.37-src.tar.gz 5233414 BLAKE2B 1848180c3e0a3f4559e5c232bea8bad6d05f09d9c4f2f9f903178012b7b8837d395a5ac73c8ac0504fbd3d1df3c2dc785022e1c97da4441cfdcf8b790170ff7c SHA512 29ddbf7bfef19441a8a043020b5f1149d12590dac8120012a2167b6892e3db7c644990e49ba14cc4b4c7339faed65f010a7b24d660db0fb8adde34f032099cec
 DIST apache-tomcat-8.5.38-src.tar.gz 5253678 BLAKE2B b2ecc732128934a3afa314ddc569b1b3d330ccb12b99b0ce4b12e1952347ac57cafb3a5637595997a0c9e77752ae41665e637c826c3b9ae9925799124e735480 SHA512 b84d96fa972a9d24957ef047cdce0fb49de3d365401b07990eaa5bad8f3c87a6b1ad1eac077c4be595ee291daef68720381fe63461815de47664275b486ceeee
-DIST apache-tomcat-9.0.14-src.tar.gz 5472704 BLAKE2B ee533afd733dacbe4a20baadb4c5dc9fa7620d695c1c57b1662894945731f978508b45ef0d8169068c13ba862804868f12d3e494873643589b9f57bc9ec0a342 SHA512 46119f6ae9003b7a178dd5158c1eae3b5116461e73c5d78cd763bff82b80f282ff08cee5175cf850d3f209af900677e93bab31c556035a6eaf6aae86a5d42fc6
+DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859 SHA512 ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d
 DIST apache-tomcat-9.0.16-src.tar.gz 5654943 BLAKE2B a412457c2d34367301b4335a3a4bf46a647f8e60440be751874e1eaad400a0832b64fcae4c9f81585a4afbddafd75f2929bc78c12eb05b20539b11de686dfecc SHA512 60fbdefbddaa6fac4bc9d0ca4c1d9a119dd53063fd4574c474daf5f346fddc9cb7fd174f1be189e965d5ae4670710347d84fcf443c7df01faac9a1b84ecb33ce
+DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7 SHA512 b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 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.92.ebuild 4230 BLAKE2B 4a16e1282fff97b370a2b1b676fcaba190c3dd75ae6e0355cdebc32f97a43e244c135a8445862f5c8105af101563fcc4aced9a5a582ad3ed096870e7496c4ca1 SHA512 ae58f357dddbd7aa960c85c7f903cb8ba45d845ba93b836ad273c16a16672f34cce1bedf90d6e71b589c4bc112853184f2fc7a3ad20bfd79bbd6d291b6fe0892
 EBUILD tomcat-7.0.93.ebuild 4231 BLAKE2B b1bed407c15f9562cb15a7360ae8091ce6c2143a5597c9f0e0a0cfea3f382661f916b9cdf66a94a6317629d54d0351667ad6694abc5d772fda0eb17c7a4b70e8 SHA512 c40e6edb3b38c116e3f367a4d744d8c785d49fa59e955aad1ebfd9faed50dc7c0aad1729f3ff05c5b6cea7bb8315be161bfae30b585bcc46491b49fc5d413170
 EBUILD tomcat-8.0.53.ebuild 4554 BLAKE2B acdadf7f369b1c69ad391056abbe79dccfbaa1b561cdf050f7da1cb1da0bd3b8be0004ebfd9795bd1cdaa2b9b58d2b3cbfd84e97453a8a70455bd99d2d46b524 SHA512 665c4bd33e542f36268f4c4b1384f10a69e65dd81aca1a603e9b3969380a050754c215684131683940e346300bca77e7c1fee0714a5e4ee785531c5c3edeb2e9
-EBUILD tomcat-8.5.37.ebuild 4602 BLAKE2B 5c780c1fe4dc7a62830114f5bc0de0d2dcd5b49a15af8ce363c68c3c820af2bc308e2732da3a3c38c6e68216e31d601a3178adcb2a5f136afaada9c9ceeca1a4 SHA512 b79c3a1093be0f6d1301bda73df499ba64d69eb3c840070b2909c123f262ddb65baf05ce1757e78375f2366b5bfa656d4c69342dfa635726b838c25a8535eeed
-EBUILD tomcat-8.5.38.ebuild 4611 BLAKE2B 1ebc6c2eda263ab66957c68625ee2e0047e0038c33f79a47c3b04d18433c47ac07f0038471d7e9e059d290ab34900fe4ffc40d6785ec193fc5523e0cfe1ebc18 SHA512 c6c8008050c04919fc277a68dac04a346b196ce3f8001fe5aa86081ba94b696db6c43dcc6ccfe9ef04b8b6f3f1935d266bd210b922f4133e1fad66d8ad8dda6f
-EBUILD tomcat-9.0.14.ebuild 5433 BLAKE2B b347fa0d21bd81df62c6cda9d16d7669a83c404216b0919d13907058c0a1fe3510f46b857aac01a70cd0e08276ae3c1e9bbe89098c2f0a8c04712c5e97553660 SHA512 5014cd47e3355184552bf3fd98215506dd36cf8919efd8cc1cc624d8243f2bc7800490c13f7625966b46fe63bd7bc47cbbcc89e150d5907771a3838bd5326cf7
+EBUILD tomcat-8.5.38.ebuild 4610 BLAKE2B c874fc536892996a46f5d0da15486f6cd3082f5178c4843e2ffc421b11c9ed36fcb79b9f9a8dc7e01993318562323963c3b3158af51321fab592fe76f27f32fb SHA512 86a36fe791e700969331df3a9a1d7f45e79a0c8a6d22bfb4aa524d37c765057a7e2f26ab748c79ba209021906fc7568088e5ae89aa046c9b3ca2fbb07ff5c790
+EBUILD tomcat-8.5.39.ebuild 4603 BLAKE2B ebef90f1f6cbf209a87aef11bb43042465dbbd4d2275150f3ac7425b27b3929d1804690d3c3fae7a18aa0e25c44ea53168b1201eb8cb857a9285d61bbd1af321 SHA512 15a61c6f1e16d43f60998e5f1a668d46fc5187f920b720033cad4b1d0c0521e647cbaede2245de1542b7e487273a7b8ffdd9319d126b4f6d5a879ecd40ac0468
 EBUILD tomcat-9.0.16.ebuild 5513 BLAKE2B 2675ab6497b53e3f02d88dfd419ead40db3e20df8ffb447218b772d9c5bca9a696190b523b4ea104d056a312619532c3478695171968eadea013b5b1962116b0 SHA512 0880a152d77a9b9db7e2fdd360208d20ae8ffea03a76f3b40ed4288a03f6c7d3dd3dd261d5942234a58806184885bd8eb1faa35590d8c434b0835fda73bf70b6
+EBUILD tomcat-9.0.17.ebuild 5513 BLAKE2B 2675ab6497b53e3f02d88dfd419ead40db3e20df8ffb447218b772d9c5bca9a696190b523b4ea104d056a312619532c3478695171968eadea013b5b1962116b0 SHA512 0880a152d77a9b9db7e2fdd360208d20ae8ffea03a76f3b40ed4288a03f6c7d3dd3dd261d5942234a58806184885bd8eb1faa35590d8c434b0835fda73bf70b6
 EBUILD tomcat-9.0.7.ebuild 4564 BLAKE2B bb3e1e254fc8eada11610515139c5edf3e4c310dca7990a3d1595862848dbd4157eb7380362a893ae2a904cadfc1f1e6e5c576f89a2c1b5fb48c047e9bb70328 SHA512 cc933b2ddccd45542d8be98cb18b2288ef7eb1db9f587405cc0d04591b0de9334394b4962b0c1deecbd3e8cb0429b2cacabb5de607203030aaf6fcc4134fe9c4
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/files/tomcat-8.5.39-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.39-build.xml.patch
new file mode 100644
index 000000000000..4b9bc77170a7
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.39-build.xml.patch
@@ -0,0 +1,247 @@
+diff --git a/build.xml b/build.xml
+index 8f5f5c5..cebfcfa 100644
+--- a/build.xml
++++ b/build.xml
+@@ -722,24 +722,29 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       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 -->
++<!--
+     <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 -->
+     <jarIt jarfile="${websocket-api.jar}"
+@@ -1025,9 +1030,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1087,7 +1092,7 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -1123,7 +1128,7 @@
+     </javac>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc" depends="package">
++  <target name="build-tomcat-jdbc" depends="package" unless="noget">
+     <!-- build the jdbc-pool jar and source jar-->
+     <echo message="Building Tomcat JDBC pool libraries"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1138,7 +1143,7 @@
+     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc-src">
++  <target name="build-tomcat-jdbc-src" unless="noget">
+     <!-- build the jdbc-pool source jar-->
+     <echo message="Building Tomcat JDBC pool src JAR"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1241,9 +1246,11 @@
+ 
+     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
++-->
+     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
+ 
+     <!-- Note the meta-inf below will work as long as there is only one JAR
+@@ -1623,7 +1630,7 @@
+ 
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1787,6 +1794,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" >
++<!--
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -1851,6 +1859,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="javax.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1891,9 +1900,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path refid="tomcat.webservices.classpath"/>
+         <path location="${ant.core.lib}"/>
+       </classpath>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2617,7 +2628,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-compile"
+-          description="Download components necessary to compile" >
++          description="Download components necessary to compile" unless="noget" >
+ 
+     <!-- Download Commons Daemon -->
+     <antcall target="downloadgz-2">
+@@ -2643,7 +2654,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -2721,7 +2732,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2776,13 +2787,13 @@ skip.installer property in build.properties" />
+ 
+   <!-- =============== Utility Targets to support downloads ================ -->
+ 
+-  <target name="setproxy" if="${proxy.use}">
++  <target name="setproxy" if="${proxy.use}" unless="noget">
+     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+   </target>
+ 
+-  <target name="testexist">
++  <target name="testexist" unless="noget">
+     <echo message="Testing  for ${destfile}"/>
+     <available file="${destfile}" property="exist"/>
+   </target>
+@@ -2904,7 +2915,7 @@ skip.installer property in build.properties" />
+     </sequential>
+   </macrodef>
+ 
+-  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2921,7 +2932,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadgz-2" unless="exist" depends="testexist">
++  <target name="downloadgz-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2946,7 +2957,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2962,7 +2973,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadzip-2" unless="exist" depends="testexist">
++  <target name="downloadzip-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2986,7 +2997,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+     <!-- Download the file -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3001,7 +3012,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="downloadfile-2" unless="exist" depends="testexist">
++  <target name="downloadfile-2" unless="noget" depends="testexist">
+     <!-- Download the file from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3029,7 +3040,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="trydownload.check" depends="setproxy">
++  <target name="trydownload.check" depends="setproxy" unless="noget">
+     <condition property="trydownload.run">
+       <and>
+         <not>
+@@ -3040,7 +3051,7 @@ skip.installer property in build.properties" />
+     </condition>
+   </target>
+ 
+-  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+     <!-- Downloads a file if not yet downloaded and the source URL is available -->
+     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+   </target>
+@@ -3051,7 +3062,7 @@ skip.installer property in build.properties" />
+ 
+   <target name="ide-eclipse"
+           depends="download-compile, extras-webservices-prepare, download-test-compile"
+-          description="Prepares the source tree to be built in Eclipse">
++          description="Prepares the source tree to be built in Eclipse" unless="noget">
+ 
+     <!-- Copy the sample project files into the root directory -->
+     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-9.0.14-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.17-build.xml.patch
index c3f3e71c0ebf..b86841762a09 100644
--- a/www-servers/tomcat/files/tomcat-9.0.14-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-9.0.17-build.xml.patch
@@ -1,8 +1,8 @@
 diff --git a/build.xml b/build.xml
-index 971f912..1e43ae0 100644
+index 54507d1..9c0bf6d 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -769,6 +769,7 @@
+@@ -742,6 +742,7 @@
        addOSGi="true" />
  
      <!-- Servlet 4.0 Implementation JAR File -->
@@ -10,7 +10,7 @@ index 971f912..1e43ae0 100644
      <jarIt jarfile="${servlet-api.jar}"
        filesDir="${tomcat.classes}"
        filesId="files.servlet-api"
-@@ -776,21 +777,23 @@
+@@ -749,21 +750,23 @@
        notice="${tomcat.manifests}/servlet-api.jar.notice"
        license="${tomcat.manifests}/servlet-api.jar.license"
        addOSGi="true" />
@@ -37,7 +37,7 @@ index 971f912..1e43ae0 100644
      <!-- WebSocket 1.1 API JAR File -->
      <jarIt jarfile="${websocket-api.jar}"
        filesDir="${tomcat.classes}"
-@@ -1131,9 +1134,9 @@
+@@ -1114,9 +1117,9 @@
  
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
            description="Default. Builds a working Tomcat instance">
@@ -49,7 +49,7 @@ index 971f912..1e43ae0 100644
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -1193,7 +1196,7 @@
+@@ -1176,7 +1179,7 @@
          <exclude name="${jdt.jar.filename}"/>
        </fileset>
      </delete>
@@ -58,7 +58,7 @@ index 971f912..1e43ae0 100644
  
      <!-- Add sources for examples -->
      <antcall target="examples-sources" />
-@@ -1229,7 +1232,7 @@
+@@ -1212,7 +1215,7 @@
      </javac>
    </target>
  
@@ -67,7 +67,7 @@ index 971f912..1e43ae0 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}"
-@@ -1244,7 +1247,7 @@
+@@ -1227,7 +1230,7 @@
      <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
    </target>
  
@@ -76,7 +76,7 @@ index 971f912..1e43ae0 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}"
-@@ -1348,9 +1351,11 @@
+@@ -1330,9 +1333,11 @@
  
      <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
      <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
@@ -88,16 +88,7 @@ index 971f912..1e43ae0 100644
      <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
  
      <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1734,7 +1739,7 @@
- 
-   <target name="extras-webservices-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package" unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1884,11 +1889,12 @@
+@@ -1785,11 +1790,12 @@
      </copy>
  
      <!-- Source bundles for native components -->
@@ -111,15 +102,15 @@ index 971f912..1e43ae0 100644
      <!-- platform README files -->
      <echo append="false" file="${tomcat.dist}/bin/x64/README">
  Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1898,6 +1904,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1799,6 +1805,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
  
-   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
+   <target name="javadoc" depends="dist-source"
      description="Create the Tomcat javadoc" >
 +<!--
      <javadoc packagenames="javax.servlet.*"
        excludepackagenames="javax.servlet.jsp.*"
        sourcepath="${tomcat.dist}/src/java"
-@@ -1962,6 +1969,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1860,6 +1867,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
      </javadoc>
@@ -127,8 +118,8 @@ index 971f912..1e43ae0 100644
      <javadoc packagenames="javax.websocket.*"
        sourcepath="${tomcat.dist}/src/java"
        destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2002,9 +2010,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-         <path refid="tomcat.webservices.classpath"/>
+@@ -1898,9 +1906,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path refid="compile.classpath"/>
          <path location="${ant.core.lib}"/>
        </classpath>
 +<!--
@@ -139,17 +130,17 @@ index 971f912..1e43ae0 100644
        <link href="../websocketapi"/>
        <link href="http://docs.oracle.com/javase/8/docs/api/"/>
        <link href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2727,7 +2737,7 @@ skip.installer property in build.properties" />
+@@ -2616,7 +2626,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
-+          description="Download (and build) components necessary to compile" unless="noget">
+-          description="Download components necessary to compile" >
++          description="Download components necessary to compile" unless="noget" >
  
      <!-- Download Commons Daemon -->
      <antcall target="downloadgz-2">
-@@ -2763,7 +2773,7 @@ skip.installer property in build.properties" />
-  </target>
+@@ -2671,7 +2681,7 @@ skip.installer property in build.properties" />
+   </target>
  
    <target name="download-test-compile"
 -          description="Download additional components for the tests" >
@@ -157,7 +148,7 @@ index 971f912..1e43ae0 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${junit.loc}"/>
-@@ -2841,7 +2851,7 @@ skip.installer property in build.properties" />
+@@ -2749,7 +2759,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-dist"
@@ -166,7 +157,7 @@ index 971f912..1e43ae0 100644
  
      <antcall target="downloadfile-2">
        <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2896,13 +2906,13 @@ skip.installer property in build.properties" />
+@@ -2804,13 +2814,13 @@ skip.installer property in build.properties" />
  
    <!-- =============== Utility Targets to support downloads ================ -->
  
@@ -182,7 +173,7 @@ index 971f912..1e43ae0 100644
      <echo message="Testing  for ${destfile}"/>
      <available file="${destfile}" property="exist"/>
    </target>
-@@ -3024,7 +3034,7 @@ skip.installer property in build.properties" />
+@@ -2932,7 +2942,7 @@ skip.installer property in build.properties" />
      </sequential>
    </macrodef>
  
@@ -191,7 +182,7 @@ index 971f912..1e43ae0 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3041,7 +3051,7 @@ skip.installer property in build.properties" />
+@@ -2949,7 +2959,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -200,7 +191,7 @@ index 971f912..1e43ae0 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3066,7 +3076,7 @@ skip.installer property in build.properties" />
+@@ -2974,7 +2984,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -209,7 +200,7 @@ index 971f912..1e43ae0 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3082,7 +3092,7 @@ skip.installer property in build.properties" />
+@@ -2990,7 +3000,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -218,7 +209,7 @@ index 971f912..1e43ae0 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3106,7 +3116,7 @@ skip.installer property in build.properties" />
+@@ -3014,7 +3024,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -227,7 +218,7 @@ index 971f912..1e43ae0 100644
      <!-- Download the file -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3121,7 +3131,7 @@ skip.installer property in build.properties" />
+@@ -3029,7 +3039,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -236,7 +227,7 @@ index 971f912..1e43ae0 100644
      <!-- Download the file from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3149,7 +3159,7 @@ skip.installer property in build.properties" />
+@@ -3057,7 +3067,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -245,7 +236,7 @@ index 971f912..1e43ae0 100644
      <condition property="trydownload.run">
        <and>
          <not>
-@@ -3160,7 +3170,7 @@ skip.installer property in build.properties" />
+@@ -3068,7 +3078,7 @@ skip.installer property in build.properties" />
      </condition>
    </target>
  
@@ -254,12 +245,21 @@ index 971f912..1e43ae0 100644
      <!-- Downloads a file if not yet downloaded and the source URL is available -->
      <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
    </target>
-@@ -3171,7 +3181,7 @@ skip.installer property in build.properties" />
+@@ -3079,7 +3089,7 @@ skip.installer property in build.properties" />
  
    <target name="ide-eclipse"
-           depends="download-compile, extras-webservices-prepare, download-test-compile"
+           depends="download-compile, download-test-compile"
 -          description="Prepares the source tree to be built in Eclipse">
 +          description="Prepares the source tree to be built in Eclipse" unless="noget">
  
      <!-- Copy the sample project files into the root directory -->
      <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
+@@ -3097,7 +3107,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
+ 
+   <target name="ide-intellij"
+           depends="download-compile, download-test-compile"
+-          description="Creates project directory .idea for IntelliJ IDEA">
++          description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
+ 
+     <copy todir="${tomcat.home}/.idea">
+       <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/tomcat-8.5.38.ebuild b/www-servers/tomcat/tomcat-8.5.38.ebuild
index 19c5ce31a3ef..f4aff4478a60 100644
--- a/www-servers/tomcat/tomcat-8.5.38.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.38.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.37.ebuild b/www-servers/tomcat/tomcat-8.5.39.ebuild
index eaca4fb8c6ac..3d8ad6af6922 100644
--- a/www-servers/tomcat/tomcat-8.5.37.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.39.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.14.ebuild b/www-servers/tomcat/tomcat-9.0.17.ebuild
index 94606ee34539..e6cda13656f0 100644
--- a/www-servers/tomcat/tomcat-9.0.14.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.17.ebuild
@@ -32,7 +32,9 @@ ECJ_SLOT="4.10"
 SAPI_SLOT="4.0"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+	dev-java/glassfish-xmlrpc-api:0
+	dev-java/tomcat-servlet-api:${SAPI_SLOT}
+	dev-java/wsdl4j:0"
 RDEPEND="${COMMON_DEP}
 	!<dev-java/tomcat-native-1.1.24
 	>=virtual/jre-11"
@@ -87,7 +89,7 @@ src_prepare() {
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
 EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},glassfish-xmlrpc-api,wsdl4j"
 EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
 EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
 EANT_NEEDS_TOOLS="true"
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index cd60f31cbdf2..b1fccc9c06b5 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -6,8 +6,8 @@ AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886
 DIST uwsgi-2.0.17.1.tar.gz 800156 BLAKE2B a8697263e6e7689c0062a06a9fdb1101a2df72e0ac9122b5f8a0acc78bbdbdeaa96faa1c8870b9c3a43e2e1fb5fc835e708e1bc3d0171ae746467b4734dc299d SHA512 10d357961fde3a3f5f8e77986cc647313f95a33243e24c2afc482fce21df68a8ae48f90e7b5b76d7edc3cf8fd474d99823d6d60ef7477349abc65a319222f11b
 DIST uwsgi-2.0.17.tar.gz 798642 BLAKE2B 86efb2103efaeedb37ebb00de4c01477162d119ae3dea0dc0696385216e30ff2c74eb48576f86eb181b8ada4b9eaa63b0aa761e966e3301597633d33b81142e1 SHA512 639427fbb89a1c2610c1cafb6ff009398a3c0a8e27c3de3f00829428271ba97b64b1253368dd6150912cf44441052be2a63cbe81613bbe964be27ee2e570d2b2
 DIST uwsgi-2.0.18.tar.gz 801555 BLAKE2B d8008e751fd699474a1b7d6276c10b3d2f1ebd0ca325e45bfb3b13f81e88de20e4e7389cd6aa9c8b3daa964d9b11524ee71e93717ed9762bf021471f6a2c09fa SHA512 6561703279bcc4a81311d033810ac066d0f113bab13b0942f3eef86cac29c584a6641b52476840d6895151aee5ed064ae2d03b18932cf7f47e62f4eeed76da61
-EBUILD uwsgi-2.0.17.1-r1.ebuild 12295 BLAKE2B 5b616f71d40cb6f395cc0c8a3403e01e486ef3e8b981627dbb9fd3aee709bbb82a23f70ab676804d3ec1a954cd0575a74bae9241603591a056feb0aa546c3965 SHA512 c378f545b9b63499f14962f28a117f3349c9bb3d5dc57a83e68195212eff224f2a2511bdd70b88de5e6c67ad17f4721b00a83292071c5ebd1c17fa9ec0a88c1f
-EBUILD uwsgi-2.0.17.1.ebuild 12776 BLAKE2B 168f3a2d7554d8f61455cfd6a1845dab38a70a8c0a42730621c3d5f3b12c45d14f24c732d6eac9304c82d67a80735368d241ec7b6e80bcbba66c71d9fdde16e8 SHA512 b6682d0330c944abc4fa523a683023d017737a5ce06acfc68a89d694e03918d90ab5b603b0c03b78ae3f359b88aac17701f9edd3ea85cd57c2df3bd78a6d28c7
-EBUILD uwsgi-2.0.17.ebuild 12836 BLAKE2B d6139be1455da0bde6958613016c77e36b93542e99d7225f4550cdaf8fbc30b7902e9d113e73d942f42bd9f1efeaa4e1bc5eec4697399bd56e42843ebdd2f8dc SHA512 91b1a45a90a039876c32ff0bbcd985d5bfe91087a03d020d5101e1b42d3e1a17dd722c3c593d6a2f94f1f7d775639e13fc303e0e7f7e8660a5d8e6eb885d33ac
-EBUILD uwsgi-2.0.18.ebuild 12295 BLAKE2B 5b616f71d40cb6f395cc0c8a3403e01e486ef3e8b981627dbb9fd3aee709bbb82a23f70ab676804d3ec1a954cd0575a74bae9241603591a056feb0aa546c3965 SHA512 c378f545b9b63499f14962f28a117f3349c9bb3d5dc57a83e68195212eff224f2a2511bdd70b88de5e6c67ad17f4721b00a83292071c5ebd1c17fa9ec0a88c1f
+EBUILD uwsgi-2.0.17.1-r1.ebuild 12221 BLAKE2B 07cb023a9449db1936362e0b1012a554fdeee6e97f80d24cb4656bcb241210297f8e6683565f4a1a6add8d2c5158c75d1d455cc9715c82d1fa5bbde1b53bd75c SHA512 e2b0462dcb816b73f782fb23dd32962badb906af646e2f842b16249de39eadc475d201e9ea348021c62d75c9b27ab73ff200228ffc5777ee3b7deda9e49ba3d2
+EBUILD uwsgi-2.0.17.1.ebuild 12702 BLAKE2B 71622151c2900cdf41aadd8e141e6895e39142be4d268cf193b2d8227ded7e40cbd034b4db1861b7b4b711f16de724b9e09c64289242636b7a21eb8cc2eab59a SHA512 7579a86a6fdd74532b25a18946faef4b977f8073a459d74de6f07799810e8cc3b318caec594889e87728697465753a12c2c999a3f0415af5c94eb5157f2938cf
+EBUILD uwsgi-2.0.17.ebuild 12787 BLAKE2B 6cfe5bba7c593158a1f7b40fe1d43a33c5721f87db69c3740f3b204fadb26449292328202f1537b5c19e249bd20fed01a68f5344b7da4f2199e3502eb3ae264e SHA512 ebf3ba7efcc3ab85a0d392a286aba4a7dea3d1109e50f59806849e2420f7c0ceea2c55db0547fe1b678c8a751ddaa4c3b8cc491d4b6622bf8f011d6a9a66545a
+EBUILD uwsgi-2.0.18.ebuild 12221 BLAKE2B 07cb023a9449db1936362e0b1012a554fdeee6e97f80d24cb4656bcb241210297f8e6683565f4a1a6add8d2c5158c75d1d455cc9715c82d1fa5bbde1b53bd75c SHA512 e2b0462dcb816b73f782fb23dd32962badb906af646e2f842b16249de39eadc475d201e9ea348021c62d75c9b27ab73ff200228ffc5777ee3b7deda9e49ba3d2
 MISC metadata.xml 1508 BLAKE2B 22125c58eed49b27100421613726f650e78bba0fb712eea2a3e122862101f34803636c12fa98cdb7483dbfad00e51cba6419ee4a93d43e5116530cb43e6778b2 SHA512 4a925a03e1ff9fedf6d7d4ad9673fdf12caaf6d9b2c4ce5cce01b964ae50294451b6d2f820121dfbe8a9288d0ae62180acc243a07ab1b365e10fef65adff2a02
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
index 08f75a25f172..865383e7054c 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
@@ -69,7 +69,7 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
 	uwsgi_plugins_router_xmldir? ( xml !expat )
 	pypy? ( python_targets_python2_7 )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+	python_asyncio? ( || ( $(python_gen_useflags -3) ) )
 	python_gevent? ( python )
 	expat? ( xml )"
 
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
index 953baaab672c..68b9e8da4660 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
@@ -69,7 +69,7 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
 	uwsgi_plugins_router_xmldir? ( xml !expat )
 	pypy? ( python_targets_python2_7 )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) python_gevent )
+	python_asyncio? ( || ( $(python_gen_useflags -3) ) python_gevent )
 	python_gevent? ( python )
 	expat? ( xml )"
 
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.ebuild
index 9b2f7f849142..13867675ceb2 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.ebuild
@@ -69,7 +69,7 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
 	uwsgi_plugins_router_xmldir? ( xml !expat )
 	pypy? ( python_targets_python2_7 )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) python_gevent )
+	python_asyncio? ( || ( $(python_gen_useflags -3) ) python_gevent )
 	python_gevent? ( python )
 	expat? ( xml )"
 
diff --git a/www-servers/uwsgi/uwsgi-2.0.18.ebuild b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
index 08f75a25f172..865383e7054c 100644
--- a/www-servers/uwsgi/uwsgi-2.0.18.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
@@ -69,7 +69,7 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
 	uwsgi_plugins_router_xmldir? ( xml !expat )
 	pypy? ( python_targets_python2_7 )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+	python_asyncio? ( || ( $(python_gen_useflags -3) ) )
 	python_gevent? ( python )
 	expat? ( xml )"