gentoo (leap year) resync : 29.02.2020

20 files changed, 180 insertions, 183 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 92b4802d37f2..8841d2c0b274 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index f82521c01d9f..59f914b71aa1 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-r1.ebuild 4965 BLAKE2B 2e34aed173cdfc180931252edf77fd89ab1e448c03e08dbb88a902fe06079c8d68c065f9cc6f3ce819b5aa002ebfbc3e23a38393ea8afcf345989e9b3e1b501e SHA512 7257d36a8449b200f24011d9ffb6edc16c010b861999c5b47376696a5e491cae9a74a5ad06c3043bc571af447e4eef228c883929e297f0401778975f1453ec6f
+EBUILD cherokee-1.2.104-r1.ebuild 4931 BLAKE2B 98f63e4168517d99ec58fab1d228c5468edf5e3150e583d07be4b67af950cb352c8ae753c1361cfaed7f37e06e361ee1278626736564e218b450c82d3bb2dcd5 SHA512 7e79d16dd394a2dc97c5cf33264d726fe8359742b15fb4e5674d03209f20e5e650dc1c31c2e59e5aead42eb8b49244e030a984d89839786a2c0647340b610160
 MISC metadata.xml 468 BLAKE2B cbf0b56c17065b7281b4a762cd2390deb3af8c4388c46488d07c0ba39eee46224ee6420075e587345fbaba4a0cfa160daac8fd59b0343dd7cf25d313bee8aac7 SHA512 bfd1c8c432210025dd9b29ec89b383d3211ee9d1aabec4d59c2ec5801feccebcee3c55f7b6ed4e02daab9e72f42ab12517f957f396d0fd410ad3eee4fd05520d
diff --git a/www-servers/cherokee/cherokee-1.2.104-r1.ebuild b/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
index d73f066ac20e..89557f2f8b98 100644
--- a/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -107,7 +107,6 @@ src_configure() {
 		$(use_with ldap) \
 		$(use_with mysql) \
 		$(use_with ssl libssl) \
-		--disable-dependency-tracking \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		--enable-os-string="Gentoo ${os}" \
 		--enable-tmpdir="${EPREFIX}/var/tmp" \
diff --git a/www-servers/fnord/Manifest b/www-servers/fnord/Manifest
index b3f3bd3c2b97..4090a0b9ca97 100644
--- a/www-servers/fnord/Manifest
+++ b/www-servers/fnord/Manifest
@@ -1,4 +1,4 @@
 AUX fnord-1.10-gentoo.diff 3204 BLAKE2B 98b868e50712d8048a3f3924d8af93f5a5b34d083cba7b2d64a4f02ccc672e20d8a3eaf5a1c2411537763d85ea74a577de6f8b5bb57bd2c1554e038bcbb00f5a SHA512 93921b050e8b165124b738fcd96c0d828289ee238284088c6859777fd5ca647f9156a0419e4cd6ee65df6e9d944913b8f1e7c6382c358b8c549425cac7414a7b
 DIST fnord-1.11.tar.bz2 28845 BLAKE2B 1f9ce7ca3476f03af0528f9ea6701be25babbd8a38398df3f87d1b1a18a28182a54bdfe814165ca6422f427bcdabd013f9eed2c1f178f0403829b38d618c2d08 SHA512 12a3751a2f98acb3ba2d468972bb785b656fa01bfb0828bc9ba5488dc7a2a66e9f226a6cc49ceda57aa7875d8d90954a9e79806c9506a7906cfff346cd400154
-EBUILD fnord-1.11-r1.ebuild 891 BLAKE2B ade8d8820c95b84ce4ab4895ee8a308c69c8b1fa709e36fb33358d6709c18542cf1296f4d7bd583329e4cb8bdc1b790f377b0f5bc8504c416ed711c7eec70483 SHA512 e3cde539aa9d77f42383fcfc96910a4ac8f41dbb06a8739d16fce7d6567837a601d21cb615fd77ec3ffd6473b5fb63721eb4982c2d7d88762c4f010cd5adb618
+EBUILD fnord-1.11-r1.ebuild 887 BLAKE2B 71fd224ec6a348255692a4781fa284a5f0982be5815c3df46a9920a73b46c7f28eb25e105bc436cdfe7846f1a50dadc6a483b0141014eb2640711cdb03d0b863 SHA512 1e055e649e7497c4232e49fe4ab4fdd8dca013f94e57da1aa5474ca0689b6d876ecadd9c3fbf506354202ed1a93ae0bc3a4783508586fce1ec37504787859106
 MISC metadata.xml 242 BLAKE2B de3429346ad1b5e7b5cc5bb2ca71af997b3702565c6dbab9d02c358724423a4bdc916b0ea48180a2273404e59e4bfca367e1659e4c1e2f70f3cff0b111bd8b6b SHA512 688a7e67d3fcc02afd7795ace015bf7832ba3bc428cf64042b4ad9ea72d815996ea128b0a4cf97e8331dc3ad371c4565963d6c773d161e88cd6b6926b58aecec
diff --git a/www-servers/fnord/fnord-1.11-r1.ebuild b/www-servers/fnord/fnord-1.11-r1.ebuild
index 0a94b74d531a..0b042f4d516e 100644
--- a/www-servers/fnord/fnord-1.11-r1.ebuild
+++ b/www-servers/fnord/fnord-1.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,7 @@ src_compile() {
 	emake DIET="" CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
-src_install () {
+src_install() {
 	dobin fnord-conf fnord
 	einstalldocs
 }
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 5b67d9d6a62d..d9f6f98015f7 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -10,7 +10,7 @@ AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d620
 DIST lighttpd-1.4.53.tar.xz 732160 BLAKE2B 75848ab259226fc77b232dfb365c6c656e4605055fb5beba1aea60f54f01cb76c3260ca97e59110dc3dd3d1ba7cb3f2fad646f91f37baee69a8cdbaefcf125a4 SHA512 bf5ea1c9f6f664c9ddcdf33ddba5b2bff760960d03c29a2181e73e3aceb45b523bb90003d0e0bc565334751830e6027cd7be2e92d030cde90813511957c9ea76
 DIST lighttpd-1.4.54.tar.xz 763248 BLAKE2B 0425dde326dc514a55790256ab7f3e6c704417fe2ac01c49d109d5f463fb41605140c0773dc3988bd27e1dbee316c5fc96231c9c8699ec40db3acf2c54ec077d SHA512 aa180a2751711a77b9da91a6a285c967d2c183ccbabe3e9064aea74e44629c3b0227ac98c7d720c8d4d223ce4b31e8b221b05b928adc917b199ab1015fcdba37
 DIST lighttpd-1.4.55.tar.xz 765660 BLAKE2B 7b972de86e7d1a51438718e4d5bd49188c107b0f2e656ead597085ae84f3d41cdb662a7774c6655155d390c26f3e4f0b0dc4243c85cb0255a91d8ca57742f402 SHA512 023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439
-EBUILD lighttpd-1.4.53.ebuild 6307 BLAKE2B b9c6407dc67c59de97d4ea75326b0a6211b09637060eddbc8b57fc9fe4d3db49a4da27c015a482757b8b9aa43828d0974cf4613846dba568eae4f974242fc74c SHA512 e0e241ca1daa6e79ff6309b3646cc548779e79f9a3073eae073914b8b6310bb13bd1d9d0b2c8417044c127e8704bd11ee9625d8167de3fa6392c91524cb725a1
-EBUILD lighttpd-1.4.54.ebuild 6308 BLAKE2B 82c072ee05bbcb396bc412ef7d836c9aee457cd02733b6ed2ad9330d567c7cce045a5d14c8738a5f73cfaa2a7b562719e95f08ddd5291bcc58fad0ca9c6451e4 SHA512 41c4eaeb1cbbbd7b5e4ef1b99d81b5a08615eeb520944fc84ef237c1fbfd23ed297f883446d85567d1f805ada30dbe8812663ab5bac372607f9e519a8023b16e
-EBUILD lighttpd-1.4.55.ebuild 6308 BLAKE2B 82c072ee05bbcb396bc412ef7d836c9aee457cd02733b6ed2ad9330d567c7cce045a5d14c8738a5f73cfaa2a7b562719e95f08ddd5291bcc58fad0ca9c6451e4 SHA512 41c4eaeb1cbbbd7b5e4ef1b99d81b5a08615eeb520944fc84ef237c1fbfd23ed297f883446d85567d1f805ada30dbe8812663ab5bac372607f9e519a8023b16e
+EBUILD lighttpd-1.4.53.ebuild 6306 BLAKE2B f3a82a0cb2a89647f9201d880b5c8168dd14e75a6d37839cf3a6bbe0875c746821240cbd6c11044c1d366360c85353546ddb7040b60518fa53dc5be7da056a02 SHA512 6219858751720b89d5302427cccf2fd9ccf7d4d5d516b35ac1d77803524d0f9e4fe467651bbaf04b625a26d5a45460296e61515fa72191d03c42c94d4d4cda8c
+EBUILD lighttpd-1.4.54.ebuild 6307 BLAKE2B fc0ed43e1e4cdfc759b27cd61843151d4e7e28ea828b9424705d4c812280c5378efb1e327852550e4977782aaa66e4fe4445d367b733da6e81d3f02e3454809e SHA512 6165f747a0eb575620fe3241098591172cd07ee72bc1429eb75415c5ba572a855824b7ffde1f87852a62a836dcf580b4ada9048542802bffa73cdd7a698836d3
+EBUILD lighttpd-1.4.55.ebuild 6307 BLAKE2B fc0ed43e1e4cdfc759b27cd61843151d4e7e28ea828b9424705d4c812280c5378efb1e327852550e4977782aaa66e4fe4445d367b733da6e81d3f02e3454809e SHA512 6165f747a0eb575620fe3241098591172cd07ee72bc1429eb75415c5ba572a855824b7ffde1f87852a62a836dcf580b4ada9048542802bffa73cdd7a698836d3
 MISC metadata.xml 1054 BLAKE2B caf21b255e5eb1fc5300edf62d928b933540613492333abd65dc2c0ae89f5a22c18467ff4ab90b2b0582b4f1eff9bad21eeca91bca9c034377280c9ec022b1f9 SHA512 a773d9b8da2f118b148943c4f78662f26aaea5def18abc37ba39bb539fb31449beb04b8e9f1a09ce893ae07aaea2e2fabb42bcba47c5e9100db1f1ef3bf9ea82
diff --git a/www-servers/lighttpd/lighttpd-1.4.53.ebuild b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
index 0097aa1b826d..4999171183f3 100644
--- a/www-servers/lighttpd/lighttpd-1.4.53.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
@@ -210,7 +210,7 @@ src_install() {
 	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	use ipv6 && readme.gentoo_print_elog
 
 	if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then
diff --git a/www-servers/lighttpd/lighttpd-1.4.54.ebuild b/www-servers/lighttpd/lighttpd-1.4.54.ebuild
index b8d0d13b8efa..4a53b7055f41 100644
--- a/www-servers/lighttpd/lighttpd-1.4.54.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.54.ebuild
@@ -210,7 +210,7 @@ src_install() {
 	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	use ipv6 && readme.gentoo_print_elog
 
 	if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then
diff --git a/www-servers/lighttpd/lighttpd-1.4.55.ebuild b/www-servers/lighttpd/lighttpd-1.4.55.ebuild
index b8d0d13b8efa..4a53b7055f41 100644
--- a/www-servers/lighttpd/lighttpd-1.4.55.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.55.ebuild
@@ -210,7 +210,7 @@ src_install() {
 	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	use ipv6 && readme.gentoo_print_elog
 
 	if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 179509da9775..863ef40a7e96 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,6 +1,10 @@
 AUX puma-3.12.1-ruby26-waitpid.patch 1722 BLAKE2B cee9b9e89cf098a387481d754732f54274ce0f9580568e62496513d58d46578f81c13df2aa98d2da218bf9d8ad581e8728ff60be488905493e9acc6b88012a88 SHA512 86f826d7f9ac8a50d62f8cf2b87b0df5f7ce55c1a5e4ac7b928b756ece809e30750bb2a7c3c50dc95f9edcb463e9c453b5d3eb84ffe44952904200b5337351ad
 DIST puma-3.12.2.tar.gz 218109 BLAKE2B 82224c3a9c1b2c8e903e5f02a8b43effab820581abbaea5bea9c537eb36e39deb34d6f7d62d9fc42e1e5a6f3c153583d8e009c73864a9e57c39e2d31387b2813 SHA512 b0721dc9b380f1932a60a8ac2e1f0ef3869c735359e9a9e1e37bb118ebc3f550a24bd3e544142513ebeb1ee37ae01a41ec67e71e1d182faec0bb6ed4a60bafcf
+DIST puma-3.12.4.tar.gz 219148 BLAKE2B d9fcef62474a1522c29f13fb2572c99bd6d4217bc94febb9c4fe6e699808ad0002fcd88dfd16884a5a9c7296e4d6dd08bc50ce7278f41608678feb18e3a034b4 SHA512 302505512b04c68f9794461b0e7693cd3ff4dfb325b18e50f0f659649c7f504f55765437382557c65bce45d32a1710ab16a875d1fc6d143d4ca297d2b2333108
 DIST puma-4.3.1.tar.gz 239800 BLAKE2B 123dcb71dd310a960555fe801530586a39ef6876d9019549eb66590195ab1f450999d5365cf9ebbf2f057f2c641739f3fcdf743f5de076d7e637b0b17210410c SHA512 cbb5fc187d3aebfa255d3d0f2d897e109f50e18feadedbf02b73a350555dcbcfbfd91c0a810c11d6d3ac2ec26103479a53eed3fae77c96f1ae6cc2814960de46
+DIST puma-4.3.3.tar.gz 241756 BLAKE2B a6ff66a449bf04110b4a6e9bdaa740f1144076290f1733922ecab45b5b7e6115ee1f7431b280401adb866838b539b943a35a5955f6d7cf51075941e05451e655 SHA512 1ee81c8d144466a75d5110fd3545527c36af51d2e191c171a985944206524c10a2b4e35fb535e2a1a0a3af5d460a7071ceb9233fae8dc81784643c6b9dc06e6e
 EBUILD puma-3.12.2.ebuild 2052 BLAKE2B fbc4e7bd899b4c75f7ec08851c78b46f27ffbb31cabbeb722bce41ddbe89f33bcacb0fb87aa95c226f5717d93808d54783d82c0a72e33fb925f272e308af9c35 SHA512 e3dbe4a9be2bd6c7d3207dc51599b0cac765785645c9d72188d603dc9ceb3d2c7911a36992de4e445728a9569ce07cd5ed71d7dbe8f8f3378077c0c88ef85f0d
+EBUILD puma-3.12.4.ebuild 2054 BLAKE2B 3c7d17f1b5ce725f7a97f9ab48992c53e14a7db85bdd257045401249e631717563fd483ea28186531ef37c651f00ce7253e58b3704995e8a0eae73cebeb8330e SHA512 6fb3f8dd98fd969c1cfd3845cc2d811d5df70099ba0d8c6b89732602014259fab30d1255f2c96c9ba1d6d3527495a6d3951cebbdb6b24f493e5a769c2912eb7f
 EBUILD puma-4.3.1.ebuild 2120 BLAKE2B 56ea8d92332904306249554f4ea8027569a7c7ee847ea4def39c0e0441ccb26b30be9e596df750373774538c8c11b2e280c75329316223f7ea05dca00f0a6d4d SHA512 e4bf235ad96a7394b5ae2efad00781af95ef1726de6178fa120b1ffdb7997d0428060273856de1fb445543db4c5c5660446d841f0af804e284311ad2d0506bff
+EBUILD puma-4.3.3.ebuild 2127 BLAKE2B 8a73ebcb22058b32d090e6e2eb6eb5b4a2b9234b2243458e5ae2ab11f43d47aa19d4399c37414ee726b56837c6e45db5e0b886a0827eedc9d109485738c6b1fa SHA512 b4623a2a576024d05b37ba0580a57cf9c7f09a125bcea57e67b9b373a1d195a51f93c7749d122a9add5e323f1d791280b82e84e33bfbfbc9d10ab0c51cdc5813
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/puma-3.12.4.ebuild b/www-servers/puma/puma-3.12.4.ebuild
new file mode 100644
index 000000000000..6d43e6fb3a09
--- /dev/null
+++ b/www-servers/puma/puma-3.12.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+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() {
+	eapply "${FILESDIR}/${PN}-3.12.1-ruby26-waitpid.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
+
+	# 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_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/puma/puma-4.3.3.ebuild b/www-servers/puma/puma-4.3.3.ebuild
new file mode 100644
index 000000000000..184d12b0c48f
--- /dev/null
+++ b/www-servers/puma/puma-4.3.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
+
+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 )"
+
+ruby_add_rdepend "dev-ruby/nio4r:2"
+
+all_ruby_prepare() {
+	sed -e '/bundler/ s:^:#:' \
+		-e '/prove/ s:^:#:' \
+		-i test/helper.rb || die
+
+	# Avoid tests failing inconsistently
+	sed -i -e '/phased_restart_via_pumactl/,/^  end/ s:^:#:' test/test_integration_pumactl.rb || die
+	sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
+
+	# Loosen timing on flakey test
+	#sed -i -e '390 s/sleep 2/sleep 4/' test/test_integration.rb || die
+
+	# Use correct ruby version
+	sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die
+
+	# Avoid launcher tests since they make assumptions about bundler use
+	rm -f test/test_launcher.rb || die
+
+	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || 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/thttpd/Manifest b/www-servers/thttpd/Manifest
index d8e257f8e2e0..c65e91349aa2 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -4,6 +4,6 @@ AUX thttpd.confd.1 1263 BLAKE2B 69cbb0fe3675b809183d10f6418c8e4d5d9d19d9768a6440
 AUX thttpd.init.1 735 BLAKE2B c50383feccbae81c835ccb1f0803001474dec2790916634b375b958357ca02d66f933fd7f0091f9a9918220101b1150c6e39a53bc26c29d6c6329339dbe0f1ed SHA512 991b8153fa030026e3fadc0b838b26fda75ab706e4fdaf1195931ed63be15dde290e4e3653951c78f41ec70464ed2d3dd984dc10bee4551cbf069435d447bea1
 AUX thttpd.logrotate 197 BLAKE2B 8b801de472c4c7902abf133218a6df79023bf54023c0217576ef1a23a30d4905b3d7815fbcfe3c3254a9ed86d137d1bf681f2fa187325a57442dd05ac4ded7c6 SHA512 a481c8c2d3a4526b04d6c95873336e46368e32e6f254f7453f5ccefe38cb11104ecacd7829caa7881df81c0d36c1dd4f60a91bbc7696fa349ed9c2cc7ddc84cd
 DIST thttpd-2.27.1.tar.gz 96430 BLAKE2B a3b24c0345f65ddb5b6d3b1db2e2fbcad5ec3f664eb86ebfbe6eb28e50b56476f9a1467300b9ec8a2735a97fc9620a396005f3545a7760979284dd8609681e0d SHA512 5d42e32652eb2310c7379d2c4373ad8f54b33bd7c2b444f06d1756eb4ed296774ce3144d91bbba85c6ad604e575128dc7199b797dc8d1b4849b0249054ba5d24
-EBUILD thttpd-2.27.1.ebuild 1924 BLAKE2B 187d335fc3559741a6b26cc833e09b72e57bdbbc20d76ad736c8092471e83fdc0077c51e71716e8b9aff12e85951c106b64d09934b1ccf07ca0b113b5e2ffa96 SHA512 3a83715f858fe6a6c710f904f5d96a01a1034054abe463d6ee3de1f69fd505b8a7539ba0221e9fce86ea79daaa4beb12e60a2f2e684a56adeb6c42b450862172
-EBUILD thttpd-9999.ebuild 1901 BLAKE2B 6a0ca8790604282df7f83208bf3bed2cfe336efee3190234d478dbc6266db8ae06d22ab13bb1d42a8a3120cb5e8e16b6db5939071b4e8e4b7d14f228b36d753e SHA512 95ac2aa592e94b2533955c99f1a302eaa424209931fd4ecf6228e95ef4fa354640bd0b72a58e77cdb733a176b1d2cb2244ed2a0cf65476c05e4731b43b0663b1
+EBUILD thttpd-2.27.1.ebuild 1920 BLAKE2B 8212e6563e1448f52b9f60dab6cbc23f7ec6a3ffdaed14a99b752cbc21689913745777173d017eb401c02d37ffe5ea1f34d22c60c7774247bbd3b42920d96429 SHA512 bd9ebf23786ee1b938abff27aa8ec9b44eb6b5ec96af4b48d1d5f8a456fb9a7429736bb0142c513543c840fe9311e77e3471e4a3f8e833d87ce5f2b8fa70f55c
+EBUILD thttpd-9999.ebuild 1897 BLAKE2B a0681a8140cd751c87b351ce5d32e1212c6da889d33254891d95fc3e5493ab7eb44cd444183b746b9ee5a728360d07527d6b7a705c13004a3cea027b36600c9d SHA512 f03e28abda20d13e0062412f14ca3ee6741fc78e6d37a4de86efb84a57e258ad76691bb2444a6599a8dbec1b88f67cc01ed769504b2ebf30b3cd9bdd5f829233
 MISC metadata.xml 248 BLAKE2B 098d4976304542e71e494b46eb846b1ddc3f761a0e1eb4477c68fb0270bfd195de3fa8da7de3cf5a86d33442d7f1fc30fded9f56346e784edfbb969387d62eb5 SHA512 5a0cba98b94cc06306b0e352d40ff113de69408752b14e1ba9efdce3f564c9bd11f8f65e89fc24d2e2056056edef5b77ab1ca8aa33e7faad5d0eaef40b895c85
diff --git a/www-servers/thttpd/thttpd-2.27.1.ebuild b/www-servers/thttpd/thttpd-2.27.1.ebuild
index d159c40b01dc..8cfda6631775 100644
--- a/www-servers/thttpd/thttpd-2.27.1.ebuild
+++ b/www-servers/thttpd/thttpd-2.27.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -52,7 +52,7 @@ src_configure() {
 	econf WEBDIR=${THTTPD_DOCROOT}
 }
 
-src_install () {
+src_install() {
 	default
 
 	newinitd "${FILESDIR}"/thttpd.init.1 thttpd
diff --git a/www-servers/thttpd/thttpd-9999.ebuild b/www-servers/thttpd/thttpd-9999.ebuild
index 80c1db05155d..1ede15252e33 100644
--- a/www-servers/thttpd/thttpd-9999.ebuild
+++ b/www-servers/thttpd/thttpd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -52,7 +52,7 @@ src_configure() {
 	econf WEBDIR=${THTTPD_DOCROOT}
 }
 
-src_install () {
+src_install() {
 	default
 
 	newinitd "${FILESDIR}"/thttpd.init.1 thttpd
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 945a717350ba..8f20dd1bcac4 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,14 +6,12 @@ AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
-DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
-DIST apache-tomcat-7.0.99-src.tar.gz 5242549 BLAKE2B e24933364bae6ddd2b7aeec342f3bfe0293533e2513a34ec6e9b5b6da7ecc3c2fb1d88c1b49f470532d8db821a0b8f0821698d8ec52a6d88a7769cd86912a8bc SHA512 3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0
-DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
-DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
+DIST apache-tomcat-7.0.100-src.tar.gz 5265444 BLAKE2B 9c706e6a50e13cd8f542669e2d80f8940816976cfb84f62c3e17bbe6f0cc6d76d6fcdd18ec69e706ce27552aa66041833f6ae7bba8e671e187de3246e90a25c5 SHA512 53ef64c64263d0f25d72ed179bd7b7beed3f73cd63010988ba740ff7328b00a5ec09fe1d4575188ecacf258c891e022a0f1ae07d2957d9830a56881170bb1a57
+DIST apache-tomcat-8.5.51-src.tar.gz 5661227 BLAKE2B 711de5678903941a5261693972906f2d0fca2c9d3219e62d3186e5d71a2e3cb4da0a5028e62790a26dad2d244246c2f41c74f18e17d52ec0af070f0d5842ca3f SHA512 8529d2e7d83a863fe88ed4ee8ec29b673e5df4bea53231412c0d89e2384d3939b9d1f29350a4ca46966ab5d4a0d3178ed5d2caa50aa766092a3ab8f28dd27592
+DIST apache-tomcat-9.0.31-src.tar.gz 5812430 BLAKE2B 7ef0f989860b046b4ddbacde50013284a623eb9d81e2c3465b0e04ec9c934a5319293677919ab758243a352fc60cb6691b51f946d8c5a36360b9108dafc5dfe3 SHA512 a0ba9e46a3d2a4cf708e6e29b4647c041495e45865ce5c679c9dcfee77181373a2d3034222701d0f15d5c7e71e6aa3cc7db236c66ba069b3e3660a948b44342f
 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.96.ebuild 4191 BLAKE2B 00d7bd4b1ccf3146d8cb140674626910a5da66f79494ea2f6fe1e9758177adb62edd54deef493c94c8a511203a1c3d6c4ad63067a531db2ad11011279a500363 SHA512 0f940fb8ec7386d0565700d35d7d137de8e5928c6f813d0a82f55d82bf79dbb57565af7c32ad673760802c57cfc776c83c88100cf7adc31dd3a923c352c59381
-EBUILD tomcat-7.0.99.ebuild 4184 BLAKE2B ae1b4ddd54a605743ac85b68e3a73a58be1fb92f84da7521f1042138fae89e0ddd7c12e6083243c01a038a5d94b804f2117407f8826b5d8db9c58b88d6498d22 SHA512 6b5f9f452256e8f4038cef1a76ca3b4b87323fbbd8ff97e1f7e8ebe3d452b4df91fc7cfe943f8fd121f10a623d85b71ef9bb3fe07e776334a25bbc8f706a8fd3
-EBUILD tomcat-8.5.47.ebuild 4543 BLAKE2B 96ea6dca520f6f8796b49383fa14136c76a98f4397078ce400f45a7f7a7142d056a83506fcef659772574351bba812385dc135af3e8c2c06e253284db23adac9 SHA512 9df31dc266d9310ddd812f35e895d8fd7422f5dda883bfb9b2fd39ca0bd64db90e962f7b2000220952defa9dc7ab5140dfe6a9e3b7df69dd831a8cab164532ce
-EBUILD tomcat-9.0.27.ebuild 5464 BLAKE2B eb4a423dd96a63cc7ef60aa0e22baf4bc0f2472548d6a695dbfaf001d30c2a2af56e25359a04763415273c1be92e16da6e8af7dd817d68f0fc2b27efd58e76ba SHA512 7df1e66ed73fdcb6961a4e4d07c85776f74c8617ba5e1ecc83d925e5b4bd66b5ea9d0e27c58f8f4989130c507d043bcf5b1e37a76c75612efff4eb050ea10c34
+EBUILD tomcat-7.0.100.ebuild 4204 BLAKE2B 933c63117433e3c57c394bfedbaf75c808f79d5b811a0d3580281658298d62c81a81b35c20be389d8135391a14cb68942749927f8b3c02063fdd89411a53f70b SHA512 8a5e1571002872eb6bd972c50ebfb721ad05a78a9176c7215f0ad9d4422109a2206d24d68ff7b82f62745c67d2416b5771af14f24e809a8c097aaaa44e7fd8e5
+EBUILD tomcat-8.5.51.ebuild 4556 BLAKE2B 6a67a362e8fd98f7b233857abbcc2e85e3ce6911c795db4ba899932e62848c060f607b9bff66426dd0fbec9df91dcae959258ad813d4629ddede5c4986204ffb SHA512 de5dfd04a260674bab8c6d6dfbedc9684ad26a98994796472e694a1fa6105f55f721f97eb5ff3331a5c71182aa6874aa9be4bb0ee1fba427a6d7a0e2bdb25154
+EBUILD tomcat-9.0.31.ebuild 5479 BLAKE2B f9ca5f12da777e5a7c4022324f5dbd5e7c62607e1afd2888b9903307ae3af7a6b17fdc8ee7e82011291b4ca39fa59334754189e9abee646453bacbd497a92a03 SHA512 ce012dea0e52c29533191fc08436779309c6ce053d620c018c82d31fe26a8e5da9f39ebc64902ccd642577351c4093e23055306b3790ef107a512c01b0cdc639
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/tomcat-7.0.96.ebuild b/www-servers/tomcat/tomcat-7.0.100.ebuild
index ad19069fd89c..8fa804171b41 100644
--- a/www-servers/tomcat/tomcat-7.0.96.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.100.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -24,7 +24,7 @@ ECJ_SLOT="4.5"
 SAPI_SLOT="3.0"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}"
+	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
 	virtual/jre"
 DEPEND="${COMMON_DEP}
@@ -47,7 +47,7 @@ src_prepare() {
 
 	java-pkg_clean
 
-	eapply "${FILESDIR}/${PN}-7.0.94-build.xml.patch"
+	eapply "${FILESDIR}/${PN}-7.0.99-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
diff --git a/www-servers/tomcat/tomcat-7.0.99.ebuild b/www-servers/tomcat/tomcat-7.0.99.ebuild
deleted file mode 100644
index 4df8f1204b9f..000000000000
--- a/www-servers/tomcat/tomcat-7.0.99.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}"
-RDEPEND="${COMMON_DEP}
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	virtual/jdk:1.8
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
-	default
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	java-pkg_clean
-
-	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}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
-	use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.47.ebuild b/www-servers/tomcat/tomcat-8.5.51.ebuild
index 729cd12dcdf1..688cb7615768 100644
--- a/www-servers/tomcat/tomcat-8.5.47.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.51.ebuild
@@ -24,13 +24,13 @@ ECJ_SLOT="4.5"
 SAPI_SLOT="3.1"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}"
+	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.8"
+	virtual/jre"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
 	>=dev-java/ant-core-1.9.13
-	>=virtual/jdk-1.8
+	virtual/jdk:1.8
 	test? (
 		>=dev-java/ant-junit-1.9:0
 		dev-java/easymock:3.2
@@ -52,7 +52,7 @@ src_prepare() {
 	# Remove bundled servlet-api
 	rm -rv java/javax/{el,servlet} || die
 
-	eapply "${FILESDIR}/${P}-build.xml.patch"
+	eapply "${FILESDIR}/${PN}-8.5.47-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
diff --git a/www-servers/tomcat/tomcat-9.0.27.ebuild b/www-servers/tomcat/tomcat-9.0.31.ebuild
index b8e080bf0d7e..b0c29cb19e68 100644
--- a/www-servers/tomcat/tomcat-9.0.27.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.31.ebuild
@@ -33,14 +33,14 @@ SAPI_SLOT="4.0"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
 	dev-java/glassfish-xmlrpc-api:0
-	~dev-java/tomcat-servlet-api-${PV}
+	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
 	dev-java/wsdl4j:0"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-11"
+	virtual/jre"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
 	>=dev-java/ant-core-1.9.13
-	>=virtual/jdk-11
+	virtual/jdk:1.8
 	test? (
 		>=dev-java/ant-junit-1.9:0
 		dev-java/easymock:3.2
@@ -75,7 +75,7 @@ src_prepare() {
 	# Remove bundled servlet-api
 	rm -rv java/javax/{el,servlet} || die
 
-	eapply "${FILESDIR}/${P}-build.xml.patch"
+	eapply "${FILESDIR}/${PN}-9.0.27-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\