gentoo resync : 15.12.2019

59 files changed, 1196 insertions, 1582 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index a8372edbc705..84ee525eecfe 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/adsf/Manifest b/www-servers/adsf/Manifest
index 16422a3875ee..00e26e22942c 100644
--- a/www-servers/adsf/Manifest
+++ b/www-servers/adsf/Manifest
@@ -1,5 +1,7 @@
 DIST adsf-1.4.1.tar.gz 170221 BLAKE2B 41a87135b74e62c9d39c64839e7802b3decc47bee04cdd93eb0e1bec6361a654378e9c310bbd18a0bddeb834f444ff67aa0f8efe21dd7ffc94c876db3230b469 SHA512 b0334102308b6ecaead6db1f7b28c3bc27a9ac853fd055e9695e9bcf36ba25db890cae57a91195d398debdfd84b5d6c7ce9142d6bd5bdd30220170210b3cdf6f
 DIST adsf-1.4.2.tar.gz 170414 BLAKE2B e5f4a6f562718f335af0a9ad93d520422a5dddee0b7a737ebcf29f9b597e38422dec6c0e12fbb330d0bd17c4f7e92527f893b08576fc796316ffa1fa31870911 SHA512 20c3000a7c6cc3098ae8473aa6752d84b739492ce2011ca8bb9f31e265eb4fe11ebd8899d934653947cf07f81932511aea5ce542b7452331ab8e49ee4eedcab3
+DIST adsf-1.4.3.tar.gz 171000 BLAKE2B 7e3a524957edfd56382c788e2c551ec693dcbcac2bb807417ac63e1dffba9a8033cb058ad7bed425b7d0448ae98dc14ca53f935c83d1c699ad4f38a8700e402b SHA512 f9b30844bb1d48f139b8f8fe1a65ca404a2a9c3e98b24729bcbb08d083f1f332ecc6e2fc3ca139d1cb69bd7c49a629eaeddfbc6f5f16e4f223cda63f726e1dfc
 EBUILD adsf-1.4.1.ebuild 921 BLAKE2B f95fee7b561dfb4c4c88dc94e4d6bdef54928c007dc695f0b68cafc82f08226050bc1475708de5510d631d5990b3b975562a42fd657d1bc1e5c8f20fad6e4e48 SHA512 f1af5f30aaa87c12e337c3310f8a6e48cd5f6242994b836232fe03b9ab8ff6ba04e9f90783b4623a0dd3a466382f237996b9461b46753067ef51fe7f0aa1fede
 EBUILD adsf-1.4.2.ebuild 914 BLAKE2B fd2b1664c76566869ede140251483a930d69ebd4007f17f4159afa526366e576eed15a36b901740d0f4fa9b04b474540b78b00f8e49b3a12cdeb44f640d6d03d SHA512 9936329e6c27c24414b1cfd4b08a79ed6cc39e22449fde44ee1aa2a529ef0cf60dff24dab3ea0c6caa5b2df8b70805fcceec788e541d68fc3b2d0dab118245b4
+EBUILD adsf-1.4.3.ebuild 1092 BLAKE2B 678d4eba1e79826072e4fb68d00de2ea87179ae96c07dcf93ef390f2100ac0872f8470ae6eacb625b86717d8f499a840bd5c58993f91e0b6bf1108ed8d94a59c SHA512 7cd3f87177fbe3f4ce05b46f844a1a5ae45a2d9d4c935839633392786296c8f269a50032f587b22e65d4bd9e1355d27a7733b836799d992f94982a1ca04e78e1
 MISC metadata.xml 295 BLAKE2B 300607324d7aca3f9af7cf195244b3426a78be1ab6875fc10e645d50e8aad1e4fc6abbaa555cd94248db86afc83bfdd5d58fa78cbf74d0c56b1cfa303dc87b75 SHA512 640f33b2433c2259e00d0fa1daca377084010d7fc28da599ea0d3d4264567691bd4d0ad3033f1c1d852d1cdcf179b88c1e22c75e5955e344c9dfca1e82a79e9c
diff --git a/www-servers/adsf/adsf-1.4.3.ebuild b/www-servers/adsf/adsf-1.4.3.ebuild
new file mode 100644
index 000000000000..bdc14e0d0cfb
--- /dev/null
+++ b/www-servers/adsf/adsf-1.4.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md ../README.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="adsf.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Dead Simple Fileserver is a static file server that can launch in a directory"
+HOMEPAGE="https://github.com/ddfreyne/adsf/"
+SRC_URI="https://github.com/ddfreyne/adsf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${P}/adsf"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rack-1.0.0:*"
+
+ruby_add_bdepend "test? ( dev-ruby/rack-test )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/SimpleCov.command_name/ s:^:#:' \
+		-e '/websocket/ s:^:#:' test/helper.rb || die
+	sed -e '/test_receives_update/,/^  end/ s:^:#:' \
+		-e '/test_non_local_interfaces/askip "networking"' \
+		-i test/test_server.rb || die
+	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+	rm -f test/test_version.rb || die
+
+	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index d2dbb5c8cb9a..4f4734ac9dd9 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -2,11 +2,7 @@ AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d9224
 AUX apache-2.4.41-libressl.patch 1082 BLAKE2B 98428a5653f47e6dd38452809bee92ef7ab32b63b92220a70e7b1c2fb1776969aab1ec385546d6879786e6879e36bd26133a7d78ffca0c67cad75812a09a46ba SHA512 0ee34af486625e7a2a7ffd6e40e9ff24224d2785ea0ccba7402bcbbffedd3194526f38585b5d99f0492cca2edc3ed67234a4e6e6c5c73f1e68540d7ff8db4cef
 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
-AUX apache2.2.service 716 BLAKE2B 0006b5f5eee85bf4bae7b1b49944cedb057df974b7ed6e74cee21eed109846d91537c997241554ee4ff7b8d0534dcc54fc435f6a1e9d1f07817091f93f986500 SHA512 5f736c803772077598248bbb41f76dff396dfd2f11a60d1ba929a619275efb8c1b4c0dab78cbcdf83b9ec94db67b958b3333b01f67d71eb3b2e07dba4bca2a7c
-DIST gentoo-apache-2.2.34-20170918.tar.bz2 64390 BLAKE2B d3f6d85192706d7c49a38cc36e816b3ae531f8c0d42111c33ec32ed39900d36d8a2a85a5d1b5afca22331137f04fb24fb424a42a21caa7eb4f6906fa39cb8224 SHA512 10b42e50dcc196f60bcaefe90c382d62a61339dd8a56e899d6afb6998be4acdd376e2c3509791f22a0acf99d06add497e32703b6d523f640306a6db5e05f358a
 DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4
-DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
-EBUILD apache-2.2.34.ebuild 2954 BLAKE2B 3966698a01ff8fbce49ecfbcf33a3abf1f77a0dcf0121acc658f257aa5f312cd34f5d721167aabfcfba984e8eb51e3864f28e64485ee0df43472acc15b18bca8 SHA512 6b046c4dedd1f039348530eb1f83432164cce304b6be7c7fdc8473c2bd0b7f463aece8923a5f7ab0b17ffb7b7d207c529c9aa10637138d4d0f144ad3cf7cb9d8
 EBUILD apache-2.4.41.ebuild 8583 BLAKE2B bf7ee7af3bbe83fe91e93b6c154eebb6e9ce73e54fdc80566c088cfbd8ad86005acbe89ebddb1da85f755b1491ff14bebc80aa74d8de89a82993ebdd0f11bcc5 SHA512 76558e53631a77d31ef0464234e4f4f8f4b8b2ab6167a73f5d00c2538700ed6b360390bc36098d7d2b6ea8b2661fd66873300c6b0ba62de88f8393157daccbb2
 MISC metadata.xml 1012 BLAKE2B ca2238f428144240f64b5c9e48087a07a3f77278958efb240edeb864050ca01d1e042a37fb304fde76925fb651d7d97755d354a45aff34ac0589b7405b848d54 SHA512 a4e903bb75740c54256fa96359f6a97cd75008ffeeadfd6353648f5bfa2295fb108ec9de398956c79633bc465475f5db365d20d71caa34fc14a07c4715cc8683
diff --git a/www-servers/apache/apache-2.2.34.ebuild b/www-servers/apache/apache-2.2.34.ebuild
deleted file mode 100644
index a9cf7b2ceb36..000000000000
--- a/www-servers/apache/apache-2.2.34.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20170918"
-GENTOO_DEVELOPER="whissi"
-GENTOO_PATCHNAME="gentoo-apache-2.2.34"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="itk peruser prefork"
-IUSE_MPMS_THREAD="event worker"
-
-IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
-authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
-authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
-charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio
-env expires ext_filter file_cache filter headers ident imagemap include info
-log_config log_forensic logio mem_cache mime mime_magic negotiation proxy
-proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite
-reqtimeout setenvif speling status substitute unique_id userdir usertrack
-version vhost_alias"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	disk_cache:cache
-	ext_filter:filter
-	file_cache:cache
-	log_forensic:log_config
-	logio:log_config
-	mem_cache:cache
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_http:proxy
-	proxy_scgi:proxy
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	disk_cache:CACHE
-	file_cache:CACHE
-	info:INFO
-	ldap:LDAP
-	mem_cache:CACHE
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_http:PROXY
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authz_host
-	dir
-	mime
-"
-
-inherit apache-2 systemd toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-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"
-IUSE=""
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_install() {
-	apache-2_src_install
-
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the
-	# old location until all ebuilds and eclasses have been modified to
-	# use the new location.
-	local apxs_dir="/usr/bin"
-	dodir ${apxs_dir}
-	mv "${D}"/usr/sbin/apxs "${D}"${apxs_dir} || die
-	ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die
-
-	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
-	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
-}
diff --git a/www-servers/apache/files/apache2.2.service b/www-servers/apache/files/apache2.2.service
deleted file mode 100644
index 76f783a423b9..000000000000
--- a/www-servers/apache/files/apache2.2.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=The Apache HTTP Server
-After=network.target remote-fs.target nss-lookup.target
-
-[Service]
-EnvironmentFile=/etc/conf.d/apache2
-ExecStart=/usr/sbin/apache2 $APACHE2_OPTS -DFOREGROUND
-ExecReload=/usr/sbin/apache2 $APACHE2_OPTS -k graceful
-ExecStop=/usr/sbin/apache2 $APACHE2_OPTS -k graceful-stop
-# We want systemd to give httpd some time to finish gracefully, but still want
-# it to kill httpd after TimeoutStopSec if something went wrong during the
-# graceful stop. Normally, Systemd sends SIGTERM signal right after the
-# ExecStop, which would kill httpd. We are sending useless SIGCONT here to give
-# httpd time to finish.
-KillSignal=SIGCONT
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest
index 9a6635f090e4..a14283f3a338 100644
--- a/www-servers/gatling/Manifest
+++ b/www-servers/gatling/Manifest
@@ -1,11 +1,8 @@
-AUX gatling-0.12-compile.patch 764 BLAKE2B bb36241c2aae2a6bd11d5055652bdcc087a9a38f1f936c9012a2d56ecae64547a50c7d80f0fd0865c4e585e1ce846ba0c1951bfa6a65a10259d0dcc14cd326f3 SHA512 c734018a9c052ae3cb79e86be2229c222079d87665a32e5de679df9e12361ba2f023043b6ec73506788bbdb00e8a8f7a97a90f779ca12ff93abf96a91144e580
 AUX gatling-0.13-compile.patch 255 BLAKE2B 08de101796184625542dd339b96e246477a0cb8aaa40bac8640f0d442b9fba09389ada09bd4f852736487bfda30915f0ca562e1ea6aed0bee8d0104cb65a9c63 SHA512 77e35689b80a4d1b9598bf31cc14c3572a7b92d49ffeb98442552f58eeb04a196ce5c8215941d07e197191c349548d23baadac3b84854d6eb93d26632555c699
 AUX gatling.confd 659 BLAKE2B ac3a2bc798e8ee9172f7c807c7e80f5bc7ad12e1830f296f097078887e609facfcb6087c6d5cdaa162fd747d7f03d208a28ec30e12fb67e7dc938ed0e65f766b SHA512 e903cd9afbb575226c6de0da8ad673d4650a53cac7442505422c98c32a00457f3d48f2853355cd76ea0f83671cb973ddf90df900d86a15172291317109481fb3
 AUX gatling.initd 1915 BLAKE2B 8f0954d855759b6abe90d6ea823fb2e14bddcc36d45a20bbb731aaeb0a4efa2b3bfdc454d9ae1c127634057a33032dd73086d6f7f8c99678bf79c6bf602bcc19 SHA512 7992a44fc61408eef740bd94fd127240b85a27954c6217b44e7be01a6b95256acc8f61962b661eaeecd6321b958403430aae673b9e88656bb11883b577a3d9a6
 AUX gatling.initd-2 1970 BLAKE2B 6c964b6fba4bf576efbbf659fc027b336fe82ada1f822242fd62964dfb64efb71af4adda687bb406b78234b4a01ac6bd0e419e5a7d638b42c7833515e78b1996 SHA512 916b19712c51564bb38167262de1358289202894b80b948c1d10463c74fea0de9bcddc33a8dd804a08f5a07d1762e0cd21bfe6a404dbfe3fd49138248384dbfc
 AUX gatling.initd-3 1970 BLAKE2B ba48e796b4fca2cd165756b3ef781feb47be18e43043d834e028d80b522f1fe6482db79bb89a7a7e57c1fdd80f6cdbb525ec0153af8600daf848d7408aa4ff6e SHA512 3b198ed6728add5f30e8ec16171cc7086d315448821b3a5487be1cf7b318735a77f0881d9aca0a5af179a2b8aff75fd0c0ce80836172a26c439cba2859c6ab1f
-DIST gatling-0.13.tar.bz2 108128 BLAKE2B a8226bb9c608dd77491e4a922a79c310a40e155afcb28602a0cf279e45919bd86a0e93e58d7f33a3551820de20ae219e7af75bc0402eab27c95ba0530575f4c0 SHA512 b9fa604aa8bb8c5d40d9c3eaaa536ed5e73d0ed93eccb41ca4744316ad893dc6fe92fe2c1f0247de82d4eda63b0ab7ab338355d9963fb58f23d39a2c678a1db8
 DIST gatling-0.15.tar.xz 121804 BLAKE2B 7df5f6d4fc823e8a1252bacca2b57d0848dd3a920216d1d3185d5f471f786eee1eb36396114b367660ead816bd4ee6c734099bbb9bdb5ffbd5b70a59e0fb0667 SHA512 b76d220a0644f1e6e7ea966a4eff409964c564fc4a31c4efdb764e5f7b5857bc58c26bc31e860fe35df932cbd60fb2b0f4f21c75cb5aa56427e8a2a453684716
-EBUILD gatling-0.13-r1.ebuild 1517 BLAKE2B c07ee1269d3cd89c342309f74977f9b08d0cc8d11967805d49ad49365318019f5be857bf9c8d74d0b68a046f8a77c9d8a3522cc33b6b2605a70c8d4ede3dc993 SHA512 b946510624a7154271a78460e50235a1e7d1f2b3aa897efe3bbb378221adb2de296584f02a6c033794a6af27ddbbd1ec1b015059122aab36bdab248b6e3cced1
-EBUILD gatling-0.15.ebuild 1547 BLAKE2B a5e6e2d04fef5bb646debd50ba69d47f7d065cf44a3ba0021efc0f5bcadf056cb03fe1cfcb91b1a38f1e83a357da0c375e4ad198b6a8ea6cb37244fbedd65578 SHA512 409f89a283ac591c3ca06b9140de4e906064de750a76cac70d5abcf632704e23ef72281f3b213b054e43aa019c5f0a9264d21f922144831bf48c1b1b86c16984
+EBUILD gatling-0.15.ebuild 1309 BLAKE2B c70f35d0d7ec361cb2c69eea8e6372e839c86e91242e2eb347534917d390c5131000fe601c8541486a9ea918508680152dd2e387a9f1738985a35731ebd80e07 SHA512 6269217a4998b6684ea2cb2a7a31c1784f57c214ad6b141ce2664071e50bc38128fc6a809692b5a28e20b28a6c11ba26812b07a50a7da854ab02f1a40e728c7b
 MISC metadata.xml 444 BLAKE2B dd65d9cb3f9b6babebc0e45c67e8bda05f48d49d8902f6a0da4d1d75f38ba2e1d627f0a1e9e35dac77466fd7edfe43435b7b99d7ee394268df1e4f5cc5b53ab5 SHA512 0f829523b85ea9fcd62743f72f7a985e532685d4989b0083191286cbc9a99db398fde3c63f86ad9bdeb6e75d559a777e85cf2df037456e5b0960b15c2511815a
diff --git a/www-servers/gatling/files/gatling-0.12-compile.patch b/www-servers/gatling/files/gatling-0.12-compile.patch
deleted file mode 100644
index db609836332b..000000000000
--- a/www-servers/gatling/files/gatling-0.12-compile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- GNUmakefile	2012-04-10 04:31:14.505474482 +0200
-+++ GNUmakefile	2012-04-10 04:31:53.821982958 +0200
-@@ -64,7 +64,7 @@
- acc: acc.c
- 	$(CC) -o $@ $< $(CFLAGS) $(LDFLAGS) -lowfat
- 
--CC:=$(DIET) $(CC)
-+override CC:=$(DIET) $(CC)
- 
- pthreadbench: pthreadbench.o
- 	$(CC) $< -o $@ -I. $(CFLAGS) $(LDFLAGS) $(LDLIBS) -lpthread
-@@ -80,7 +80,7 @@
- $(OBJS) https.o gatling.o: gatling.h version.h gatling_features.h
- 
- tlsgatling: gatling.c ssl.o $(HTTPS_OBJS)
--	-$(CC) -o $@ gatling.c ssl.o $(HTTPS_OBJS) $(CFLAGS) -DSUPPORT_HTTPS $(LDFLAGS) -lssl -lcrypto $(LDLIBS)
-+	$(CC) -o $@ gatling.c ssl.o $(HTTPS_OBJS) $(CFLAGS) -DSUPPORT_HTTPS $(LDFLAGS) -lssl -lcrypto $(LDLIBS)
- 
- gatling: gatling.o $(OBJS) md5lib
- 	$(CC) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LDLIBS) `cat md5lib`
diff --git a/www-servers/gatling/gatling-0.13-r1.ebuild b/www-servers/gatling/gatling-0.13-r1.ebuild
deleted file mode 100644
index 45cbd5827819..000000000000
--- a/www-servers/gatling/gatling-0.13-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="High performance web server"
-HOMEPAGE="http://www.fefe.de/gatling/"
-SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="libressl ssl diet"
-REQUIRED_USE="ssl? ( !diet )"
-
-DEPEND=">=dev-libs/libowfat-0.25[diet=]
-	diet? ( dev-libs/dietlibc )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm Makefile  # leaves us with GNUmakefile
-	epatch "${FILESDIR}/${P}-compile.patch"
-}
-
-src_compile() {
-	local DIET=
-	use diet && DIET='/usr/bin/diet'
-
-	local targets='gatling'
-	use ssl && targets+=' tlsgatling'
-
-	emake DIET="${DIET}" CC="$(tc-getCC)" \
-			CFLAGS="${CFLAGS} -I${ROOT}usr/include/libowfat" \
-			LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} \
-			|| die "emake ${targets} failed"
-}
-
-src_install() {
-	doman gatling.1 || die "installing manpage failed"
-
-	newconfd "${FILESDIR}/gatling.confd" gatling || die
-	newinitd "${FILESDIR}/gatling.initd-2" gatling || die
-	dodoc README.{ftp,http} || die "installing docs failed"
-
-	dobin gatling || die "installing gatling binary failed"
-	use ssl && {
-		dodoc README.tls || die "installing docs failed"
-		dobin tlsgatling || die "installing tlsgatling binary failed"
-	}
-}
-
-pkg_setup() {
-	ebegin "Creating gatling user and group"
-	enewgroup gatling
-	enewuser ${PN} -1 -1 /var/www/localhost ${PN}
-}
diff --git a/www-servers/gatling/gatling-0.15.ebuild b/www-servers/gatling/gatling-0.15.ebuild
index b404cfd8a5c9..ba78c1bb2f64 100644
--- a/www-servers/gatling/gatling-0.15.ebuild
+++ b/www-servers/gatling/gatling-0.15.ebuild
@@ -41,21 +41,20 @@ src_compile() {
 
 	emake DIET="${DIET}" CC="$(tc-getCC)" \
 			CFLAGS="${CFLAGS} -I${ROOT}usr/include/libowfat" \
-			LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} \
-			|| die "emake ${targets} failed"
+			LDFLAGS="${LDFLAGS}" prefix=/usr ${targets}
 }
 
 src_install() {
-	doman gatling.1 || die "installing manpage failed"
+	doman gatling.1
 
-	newconfd "${FILESDIR}/gatling.confd" gatling || die
-	newinitd "${FILESDIR}/gatling.initd-3" gatling || die
-	dodoc README.{ftp,http} || die "installing docs failed"
+	newconfd "${FILESDIR}/gatling.confd" gatling
+	newinitd "${FILESDIR}/gatling.initd-3" gatling
+	dodoc README.{ftp,http}
 
-	dobin gatling || die "installing gatling binary failed"
+	dobin gatling
 	use ssl && {
-		dodoc README.tls || die "installing docs failed"
-		dobin tlsgatling || die "installing tlsgatling binary failed"
+		dodoc README.tls
+		dobin tlsgatling
 	}
 }
 
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index 46c3d49dfdb9..556d17299dfd 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -1,5 +1,5 @@
 DIST gunicorn-19.8.1.tar.gz 415541 BLAKE2B f0eefc4ff24052320b4dfaac3fc2523487f8dbb63365a9a3c52bc411b4d8f6150f348c709cae94dc4acb45e7fda534cf462d0339abc0325230d3560f76ce3241 SHA512 7f7fcbcde20b70d3a2faad595e08a028530348895f784eddcb35f24b3d5a7955edfc5b68aac4630243798fa37d41b7e869ec0d454dc80700c2630ba2cc39afc0
 DIST gunicorn-19.9.0.tar.gz 415774 BLAKE2B 1ac920e3a02aff434d2458cbcacd821df428e2dceeb0ee5a10c8cc449e49c0252980847bfcee02633f791c05aa086b37f5b50f9fd535acee6deb8a18dd1c24f8 SHA512 4a89f963daa7afe7741a4fb9aa4f14192429ac0e9ba5672547d683475dd2f2733efeed903ec99db9d831e2b05b9ed9e583e3cfec483a1b481d897aa77373e8a3
-EBUILD gunicorn-19.8.1.ebuild 1163 BLAKE2B 137625b655ba6c18e4c99a3245bf9528333a0c8cb846d241747acab36ba79069adfc1e6708aa5793994c71ca395b5786577a3ec29989631cebf2cd1c6832b9ae SHA512 003adf0aca47005f506430350d2a9005453fbb47756ca85a726df491857c3942b25c036710f73bab2f64cf38cac9873f52ca6a25dcd8868fa51c24c57f3907b2
-EBUILD gunicorn-19.9.0.ebuild 1164 BLAKE2B 296af295f8950955c4e44fa2b77132efa789c49822dc76dbfe9893962015cb070cee9b9e3c0dcb073e9d8bf0ca856199206aa948eeaf9f68501f6464e18d455d SHA512 3b300bf428cd739a0001bb7efcc7cc630937e0a3adc7e439e36a709dc93100ad61b88538ed1a86c702dadd914c31cd63c8b19e7dc5cce836883968d326efb797
+EBUILD gunicorn-19.8.1.ebuild 1190 BLAKE2B a453db7f470c3675919f60ca99b2e8a11f46703a9bcc8a99bf1fcc950879c3732982b1ea774137c86f6120aa01b63d0c9a7f85a77576a3acb136559f535f2efa SHA512 418729eec3cc78eecf0cf825b795dbb0e83eae2e57a3a814264b83f2f653fe62b0a34fc61bbfcf11e813dfa0ed6a452f178b2161451f62e7520de988969ab9d7
+EBUILD gunicorn-19.9.0.ebuild 1191 BLAKE2B 6aa62e8c80c9315ffe37c9ac268d13b1e9ff2930ef90b73af783a48820339415d76698dd0999ad0878ed409386d04cabb97d916b76e36d06fb4d6c19e6528cfd SHA512 ecede11aa315fbe73b5e05500311423bf66eec93c1f0ca8a2db8856052c2c9bbad3875c841a733f24eef8c32402758d9a52205d0e656bb4e91a628ae0ebeabad
 MISC metadata.xml 707 BLAKE2B baa7ba91610f10f6acc7298c6bbecb030b2d6dcda9a2f0c642f24ee27edbab38baea8bc231d7fbfc9f60459faa13bb05e548a8f7680b735c8c1005d00db2a3ee SHA512 ee74f9e811231c840235bccb318ffd99e7ff765a13efe285dfd870ff343d8e64b5190d5afd6589b6367f0f8cec8e699de8ae19d8da5e9a9f22cb7eb9e3539c0a
diff --git a/www-servers/gunicorn/gunicorn-19.8.1.ebuild b/www-servers/gunicorn/gunicorn-19.8.1.ebuild
index 31ce2e67890e..07f09c37af79 100644
--- a/www-servers/gunicorn/gunicorn-19.8.1.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.8.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT PSF-2 doc? ( BSD )"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/www-servers/gunicorn/gunicorn-19.9.0.ebuild b/www-servers/gunicorn/gunicorn-19.9.0.ebuild
index 258c29118213..c98e3a00bb6f 100644
--- a/www-servers/gunicorn/gunicorn-19.9.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.9.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="MIT PSF-2 doc? ( BSD )"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index a7e6d3829291..8157056d0f06 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -9,7 +9,7 @@ AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469a
 AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d62064a271a7a0cf5b32423b349ac13d2ebc38a8de5c6478823ac022e46eef60a830e6ae9598e848b8c220bc2f SHA512 3fda360423a7a406a2981de647dac6b4419fe60c649bf3cc21fad566e8513293f6e81d4f5b777eaf06a056beedbf44360a39894ca3a2d05d3fc3a2d26c339efe
 DIST lighttpd-1.4.53.tar.xz 732160 BLAKE2B 75848ab259226fc77b232dfb365c6c656e4605055fb5beba1aea60f54f01cb76c3260ca97e59110dc3dd3d1ba7cb3f2fad646f91f37baee69a8cdbaefcf125a4 SHA512 bf5ea1c9f6f664c9ddcdf33ddba5b2bff760960d03c29a2181e73e3aceb45b523bb90003d0e0bc565334751830e6027cd7be2e92d030cde90813511957c9ea76
 DIST lighttpd-1.4.54.tar.xz 763248 BLAKE2B 0425dde326dc514a55790256ab7f3e6c704417fe2ac01c49d109d5f463fb41605140c0773dc3988bd27e1dbee316c5fc96231c9c8699ec40db3acf2c54ec077d SHA512 aa180a2751711a77b9da91a6a285c967d2c183ccbabe3e9064aea74e44629c3b0227ac98c7d720c8d4d223ce4b31e8b221b05b928adc917b199ab1015fcdba37
-EBUILD lighttpd-1.4.53.ebuild 6338 BLAKE2B dded27f7c526fc15425e5859e03e8e0da2192acbf85365a25bd291b31e82a5f83cb7401e2d0c755fe2ca87ebf77af19523e19e0f26a6e2881085771f5f3ac618 SHA512 114d3bdbaf1033283a8f9083e5a2ec482d563e1d4d01539cd05ca2bb05907cd80faf7fca8669f08ab6e3219996366b931b3e8ea9afd817b936ce2bd8ba05565b
-EBUILD lighttpd-1.4.54.ebuild 6340 BLAKE2B b6e0f315621c2dbad74cac9e9fc9045976abca712cfefd9deffb47ef9c3529018d3a121aacd1e3c40b083a1f91d5f9a2eea4ee38938f7ee262440f674b47dde6 SHA512 cfc5c2446c399b3cd022158b4b2244a6dd1fde16895f4c443d74aa86e30b595b4b7ef9667b2582b966adb3930541a247a19574c00a694dd718446ab635ad212d
-EBUILD lighttpd-9999.ebuild 5923 BLAKE2B a8823f34c9957b8bbfbb186c4c0b4141ddaccd35190b761d4fa93ade49bbf716a2b00ff8d8df9f67a827fe8510e468a7b236bbcd06c24353c7f8536ebcc2a1ea SHA512 eee403e0af8bbd58d0ffb443524b4811992464387fc28ec54d63eb1476b2103dcc48eb23b0d77b4966d60828e3bbbecf99b27a449ef47030e6901085ffc4ce99
+EBUILD lighttpd-1.4.53.ebuild 6365 BLAKE2B 0b189627786fe403d3d309bca0f080b3912a96bbc995cde97447b44764e0ab968661afe5a1386373a140174ad71fd797895d7cc3eacf9be4a6f3395d7132cd92 SHA512 d2d74cc6f16caf5066c7ceaa4c6fee66213d65375461541dcf1487f03081cc0590abb884c40e37675b3019277c3f0bb1a15200ec9e33b4f4c19c66b013106068
+EBUILD lighttpd-1.4.54.ebuild 6367 BLAKE2B 7b59e885961550e3d3c1f30b1ca4dd2aa70f935d007f65acdd036a357d5d694ec50c239b8ff59ba232d8fef453a171654f6a8060b5178aba840067803ca8e710 SHA512 457ae96f74749d3690985c9b8980edbfdea997ecff42e9ef7951afcda665109cdb65d352df232e29f9317d968027ae00ef68e662d7b1243ab6071dbc2ecf6587
+EBUILD lighttpd-9999.ebuild 5950 BLAKE2B 6eeee8c3a8f449a11646965ff8d16293050f78fe4855615d2317c58420530ddaef74a7118b9c1fc9d0189dd6084e69c34aefa5003adc9834cd0880bd19ec18cf SHA512 88d88193afbd31c16a0e2a2ec9d5803eee963e03e32eb4f10f0157ea02cf04b37fb1ac110238df16ebf58c9d46f8f277e78e2fc97d61bcff05589450681a364b
 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 b1da554c2102..08f98fd76ef9 100644
--- a/www-servers/lighttpd/lighttpd-1.4.53.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="kerberos? ( ssl !libressl ) webdav? ( sqlite )"
 
diff --git a/www-servers/lighttpd/lighttpd-1.4.54.ebuild b/www-servers/lighttpd/lighttpd-1.4.54.ebuild
index 361c6c497a5c..a30fd3000ed1 100644
--- a/www-servers/lighttpd/lighttpd-1.4.54.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.54.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="kerberos? ( ssl !libressl ) webdav? ( sqlite )"
 
diff --git a/www-servers/lighttpd/lighttpd-9999.ebuild b/www-servers/lighttpd/lighttpd-9999.ebuild
index 46f8da74bb1b..83a7806e757e 100644
--- a/www-servers/lighttpd/lighttpd-9999.ebuild
+++ b/www-servers/lighttpd/lighttpd-9999.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="kerberos? ( ssl !libressl )"
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 2449eee1ada7..3b0feec4cd49 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -15,6 +15,7 @@ DIST nginx-1.16.1.tar.gz 1032630 BLAKE2B 838c5f08b56378dd3ef3940a979eb1449c4ed7e
 DIST nginx-1.17.3.tar.gz 1034586 BLAKE2B 48d1c34cf345794bc345bedb96a6a194f175695b93ee5114095742d67384e81fe87cc1ec10553566a33dbabc2a784158bc1461e2001d67dda71af4a1f540a88d SHA512 b81e75c4c8c03ca2f0b40b9c2a1812cf168cb2319d7246b9b0cce838ef7dba81f3cd57a213ec8d58e457a0fa6b912adff2e5597e5ada7258cfe27f55b05205e2
 DIST nginx-1.17.4.tar.gz 1034845 BLAKE2B 59e32fc4a625ec91696d3c18beb270ab2980f3a33a2952e8f43ce24e5a6a7fecff774ee20b1377dbfc0cee58651c78bb6d2cd2505f32a96966a200dce9569267 SHA512 fb7275c47d2416b597415f736771f8f4f3cdbba33728d9ca8ddb56b8266076a5ec5e63c735215a8d022f685b67d663fdaaac0c95db465a82f79f01d502feaa82
 DIST nginx-1.17.5.tar.gz 1036056 BLAKE2B 7f5c804651011a28d0d6e166a13e082f74173c0e447a88f013fa505e32994f65c159d755c473fa50eb7dc293c554961da23e61b1d59a429985ca6fc82fe69145 SHA512 b6799ddce7135646aa1f0b4405bcdab41d5065fbadcdeeb875f6fae4953159aa57b9104afe815748b0aab0e4d532e7771ccce487d7c4519e423d110f3715da7c
+DIST nginx-1.17.6.tar.gz 1037527 BLAKE2B b642ed0f6a072949d4eefc0676f51bd20b599d621c6d65b9567b2aebee680e2129987040eb1e3e4b8e1ff5e8ff3d215bc61e1ba3a8fe4255968ba5ad7715ffd6 SHA512 8ad6c3d066bf51f3fde3454bb93f2eeab0412d1c10eac0841fd50ec25b0f1204c85f15cb950c6bbe128c0ff72efe5b0bb804b5d66a8bf6234e0e4776aa67b9eb
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
 DIST ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz 12672 BLAKE2B fa2febfa63b98303f8890c6774de6ccb09475ccd639d3b74493a4ffd97c90febdc22755c5928018bdac24a537bd13cde165f97e5d2b50bebf598c3fb22ec0206 SHA512 169566b8764bb2b82e029f954a99063a9c61e2cbf982861c5f6818b389a5f37bf5389afb1b5627de9bd3f7af7b3c404be0230f943d47ab621c2a2bd825cc8203
@@ -39,8 +40,10 @@ DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 DIST njs-0.3.5.tar.gz 339177 BLAKE2B 6327be0b7c8077870408722376782bca579a6cfdf1fe2a4950fc0d289311ad21f671bc2b47d06f70d95d4f68d99e8c70fd4598dcc167b79c57704d99a098d284 SHA512 236e0284f251856f74eb51d8251bb5be725d2ca90056f2feef7677eb636a4e97e203f3bba81fb6b677158d615dc2d6ffcb0dc1059fb678ab12b7d14cc4ea7241
 DIST njs-0.3.6.tar.gz 354475 BLAKE2B a2f3be7c83dd46bb8a7300460b580e053eaa78f2bcc835dd7b586457f045ea63eaa591873041648e3aa3aefce1d47a999b52667adfccadf0439066bfbff73673 SHA512 1973824bb434e9640626c132dac932da7615b534486ab76081a075be4f4e9fdf75a9a400c0d504750a5da341cebb20e6357710149e6de66ac8df8ee4cb1576bb
+DIST njs-0.3.7.tar.gz 360227 BLAKE2B b23e5105e3b9a0575e4da6a6e344983c2fed2081cdf0be9209fc86cd51c6e962ec5d855945d2c6972153de048dfead866686b2248b28660b41219a8e05fa939a SHA512 1975c38fab59a587045e1c6bebd527a4432c4e6bec5a62cb2e1bc5fef19275deffdb6c6558caa3f0dcc58716b702adc0eb89b0171acf5f70f275c593b16f4bfb
 EBUILD nginx-1.16.1-r1.ebuild 40532 BLAKE2B e220ab8234bbbaa59f805a2f2a838627e9feae6b78d5474b9f0f4fb45287894cb4c2c04288f87d8d1a917ac0ed603e27878fd82b9a3bbc5df9b04e27e368aa03 SHA512 8adfe6a783036726afc73d328b1db4f863ff02dfd3f2970a6cb6e7595ede97b08497454382471a89210ae5af943b9ec350283d1b3f2fcf8308feaeefa0eb1fc0
 EBUILD nginx-1.17.3-r1.ebuild 40534 BLAKE2B f7b3ab8ace3ecd8e92800e54d4d597dc1af5a89f97ff2e701c101e0f329872d5d7f5101027080447d48ff333a8891ca6fb270a0e48d27b1153c93ecd8cb6291d SHA512 72a58bc4ee1834f95f188a8789a415209bfe4ec300df69ee79882041dfaa2283d893f1e73666ba81ba62665b95cea11112509cb62ac84509ef09638bf9c7c99a
 EBUILD nginx-1.17.4.ebuild 40534 BLAKE2B f7b3ab8ace3ecd8e92800e54d4d597dc1af5a89f97ff2e701c101e0f329872d5d7f5101027080447d48ff333a8891ca6fb270a0e48d27b1153c93ecd8cb6291d SHA512 72a58bc4ee1834f95f188a8789a415209bfe4ec300df69ee79882041dfaa2283d893f1e73666ba81ba62665b95cea11112509cb62ac84509ef09638bf9c7c99a
 EBUILD nginx-1.17.5.ebuild 40534 BLAKE2B 43e5fe37bbce8e5273d1bdb9bb6fb191af3bcb1085a065c854d8f907e56938aeaac259c472dd07d4810274178440014cb2d013c5455585666ed458253992a393 SHA512 2c4d71111d689ed97994454bac93f3e2d06d5e169d9b9ba4f5419bdfffb13c2c3aa7a4053c9f13624515a0f0f51d1e81e15f914350b44df5acd3e7c82e4bac06
-MISC metadata.xml 1310 BLAKE2B 6f40252a833a188f4b62cb2f2a126f93e68cdcd0e3575febdc371106c82d7ebdc6931b162a5ef8070fb6fe1f18e969191f67d3ccdd5e55712dc4d209c16c34c9 SHA512 10403ec29eaa83eb45b7b0b78340103b226145b52b3795e18b1e8bf272efa83586bc190e6e66061f33544434e3c2f94d2229be988733713578e9bb495ce7219c
+EBUILD nginx-1.17.6.ebuild 40534 BLAKE2B b9639bed18f45b390ca3733defd0cbd95a7abf8d0713cb4cfb650fe2b38e2f8d1f3334c583cc36f42bc3b1a6401cc5e4873da27aca409f7554b78517eb6388a1 SHA512 abbb97e46654615ce5e48c256262dbc6e4600a77684bacc5ffe98efe9db18de96c0c2d6215522b36b92c092873b2fc929c8f6c72f337c5dd0b2c890184932d95
+MISC metadata.xml 1193 BLAKE2B aeb293cf75ed650c946910222d6396f726dc5ed49f1213e6a5664613d78e3b27616399bc1c9f0a360f5303b16931da7016cdf540b24601afafc3ada4428b33a9 SHA512 a96002bc9845bc465542c753c738899b77ad7a32fac7f5f9a7049336868bc41199e926422e3dc23e47f34656c9aaea255511d2ef91e9d59f48c9cd0b4a3c4903
diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index 3eb0471b477a..3958772f3f43 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -5,10 +5,6 @@
     <email>whissi@gentoo.org</email>
     <name>Thomas Deutschmann</name>
   </maintainer>
-  <maintainer type="person">
-    <email>dev-zero@gentoo.org</email>
-    <name>Tiziano Müller</name>
-  </maintainer>
   <use>
     <flag name="aio">Enables file AIO support</flag>
     <flag name="http">Enable HTTP core support</flag>
diff --git a/www-servers/nginx/nginx-1.17.6.ebuild b/www-servers/nginx/nginx-1.17.6.ebuild
new file mode 100644
index 000000000000..9b7d6b814dba
--- /dev/null
+++ b/www-servers/nginx/nginx-1.17.6.ebuild
@@ -0,0 +1,1089 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.3.1"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2)
+HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c"
+HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.33"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.4.3"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.10.15"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.5.1"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+
+# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
+HTTP_NAXSI_MODULE_PV="0.56"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.2.1"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="3.0.0"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.61"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
+# keep the MODULE_P here consistent with upstream to avoid tarball duplication
+HTTP_SECURITY_MODULE_PV="2.9.3"
+HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
+
+# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.19"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
+HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
+HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
+HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+
+# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
+GEOIP2_MODULE_PV="3.2"
+GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
+GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+
+# njs-module (https://github.com/nginx/njs, as-is)
+NJS_MODULE_PV="0.3.7"
+NJS_MODULE_P="njs-${NJS_MODULE_PV}"
+NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
+NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
+
+# We handle deps below ourselves
+SSL_DEPS_SKIP=1
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="https://nginx.org"
+SRC_URI="https://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
+	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="mainline"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# Package doesn't provide a real test suite
+RESTRICT="test"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
+	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
+	proxy referer rewrite scgi ssi split_clients upstream_hash
+	upstream_ip_hash upstream_keepalive upstream_least_conn
+	upstream_zone userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
+	gzip_static image_filter mp4 perl random_index realip secure_link
+	slice stub_status sub xslt"
+NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
+	upstream_hash upstream_least_conn upstream_zone"
+NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_auth_ldap
+	http_auth_pam
+	http_brotli
+	http_cache_purge
+	http_dav_ext
+	http_echo
+	http_fancyindex
+	http_geoip2
+	http_headers_more
+	http_javascript
+	http_lua
+	http_memc
+	http_metrics
+	http_mogilefs
+	http_naxsi
+	http_push_stream
+	http_security
+	http_slowfs_cache
+	http_sticky
+	http_upload_progress
+	http_upstream_check
+	http_vhost_traffic_status
+	stream_geoip2
+	stream_javascript
+"
+
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
+	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_STD; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_OPT; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+# @TODO: jbergstroem: remove on next release series
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	pcre? ( dev-libs/libpcre:= )
+	pcre-jit? ( dev-libs/libpcre:=[jit] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http2? (
+		!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http-cache? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_brotli? ( app-arch/brotli:= )
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
+	nginx_modules_http_secure_link? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
+	nginx_modules_http_lua? ( dev-lang/luajit:2= )
+	nginx_modules_http_auth_pam? ( sys-libs/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl:= )
+	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
+	nginx_modules_http_security? (
+		dev-libs/apr:=
+		dev-libs/apr-util:=
+		dev-libs/libxml2:=
+		net-misc/curl
+		www-servers/apache
+	)
+	nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )
+	nginx_modules_stream_geoip? ( dev-libs/geoip )
+	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:0"
+DEPEND="${CDEPEND}
+	nginx_modules_http_brotli? ( virtual/pkgconfig )
+	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	nginx_modules_http_grpc? ( http2 )
+	nginx_modules_http_lua? (
+		luajit
+		nginx_modules_http_rewrite
+	)
+	nginx_modules_http_naxsi? ( pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
+	eend $?
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
+
+	if use nginx_modules_http_auth_pam; then
+		cd "${HTTP_AUTH_PAM_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_brotli; then
+		cd "${HTTP_BROTLI_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		eautoreconf
+
+		if use luajit ; then
+			sed -i \
+				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
+				configure || die
+		fi
+
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upload_progress; then
+		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
+		cd "${S}" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	# mod_security needs to generate nginx/modsecurity/config before including it
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		./configure \
+			--enable-standalone-module \
+			--disable-mlogc \
+			--with-ssdeep=no \
+			$(use_enable pcre-jit) \
+			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
+
+		cd "${S}" || die
+	fi
+
+	local myconf=() http_enabled= mail_enabled= stream_enabled=
+
+	use aio       && myconf+=( --with-file-aio )
+	use debug     && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre      && myconf+=( --with-pcre )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
+		export LUAJIT_INC=$(pkg-config --variable includedir luajit)
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_memc ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_vhost_traffic_status; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
+		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
+		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
+	fi
+
+	if use nginx_modules_http_brotli; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
+	fi
+
+	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# Stream modules
+	for mod in $NGINX_MODULES_STREAM_STD; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+		else
+			myconf+=( --without-stream_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_STREAM_OPT; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+			myconf+=( --with-stream_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
+		stream_enabled=1
+	fi
+
+	if [ $stream_enabled ]; then
+		myconf+=( --with-stream )
+		use ssl && myconf+=( --with-stream_ssl_module )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN} )
+		myconf+=( --group=${PN} )
+	fi
+
+	local WITHOUT_IPV6=
+	if ! use ipv6; then
+		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
+	fi
+
+	if [[ -n "${EXTRA_ECONF}" ]]; then
+		myconf+=( ${EXTRA_ECONF} )
+		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \
+		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		--with-compat \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
+	newconfd "${FILESDIR}"/nginx.confd nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${D}"usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 ${keepdir_list}
+	fowners ${PN}:${PN} ${keepdir_list}
+
+	fperms 0710 /var/log/nginx
+	fowners 0:${PN} /var/log/nginx
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	if use luajit; then
+		pax-mark m "${ED%/}/usr/sbin/nginx"
+	fi
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/ || die
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		docinto ${HTTP_LDAP_MODULE_P}
+		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn ""
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua; then
+		ewarn ""
+		ewarn "While you can build lua 3rd party module against ${P}"
+		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
+		ewarn "officially supported target yet. You are on your own."
+		ewarn "Expect runtime failures, memory leaks and other problems!"
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn ""
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
+	fi
+
+	local _n_permission_layout_checks=0
+	local _has_to_adjust_permissions=0
+	local _has_to_show_permission_warning=0
+
+	# Defaults to 1 to inform people doing a fresh installation
+	# that we ship modified {scgi,uwsgi,fastcgi}_params files
+	local _has_to_show_httpoxy_mitigation_notice=1
+
+	local _replacing_version=
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
+
+		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
+			# Should never happen:
+			# Package is abusing slots but doesn't allow multiple parallel installations.
+			# If we run into this situation it is unsafe to automatically adjust any
+			# permission...
+			_has_to_show_permission_warning=1
+
+			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
+				"You will have to adjust permissions on your own."
+
+			break
+		fi
+
+		local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}")
+		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
+		# This was before we introduced multiple nginx versions so we
+		# do not need to distinguish between stable and mainline
+		local _need_to_fix_CVE2013_0337=1
+
+		if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then
+			# We are updating an installation which should already be fixed
+			_need_to_fix_CVE2013_0337=0
+			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
+		else
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
+		fi
+
+		# Do we need to inform about HTTPoxy mitigation?
+		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_show_httpoxy_mitigation_notice=1
+			debug-print "Need to inform about HTTPoxy mitigation!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.1-r2"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.3-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that the user has
+					# already seen the HTTPoxy mitigation notice because he/she is doing
+					# an update from previous version where we have already shown
+					# the warning. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation where we already informed
+				# that we are mitigating HTTPoxy per default
+				_has_to_show_httpoxy_mitigation_notice=0
+				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
+			else
+				_has_to_show_httpoxy_mitigation_notice=1
+				debug-print "Need to inform about HTTPoxy mitigation!"
+			fi
+		fi
+
+		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
+		# All branches up to 1.11 are affected
+		local _need_to_fix_CVE2016_1247=1
+
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.2-r3"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.6-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that we have already
+					# adjusted permissions or were never affected because user is
+					# doing an update from previous version which was safe or did
+					# the adjustments. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation which should already be adjusted
+				# or which was never affected
+				_need_to_fix_CVE2016_1247=0
+				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
+			else
+				_has_to_adjust_permissions=1
+				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+			fi
+		fi
+	done
+
+	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
+		# We do not DIE when chmod/chown commands are failing because
+		# package is already merged on user's system at this stage
+		# and we cannot retry without losing the information that
+		# the existing installation needs to adjust permissions.
+		# Instead we are going to a show a big warning ...
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The world-readable bit (if set) has been removed from the"
+			ewarn "following directories to mitigate a security bug"
+			ewarn "(CVE-2013-0337, bug #458726):"
+			ewarn ""
+			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
+			chmod o-rwx \
+				"${EPREFIX%/}"/var/log/nginx \
+				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				_has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The permissions on the following directory have been reset in"
+			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
+			ewarn ""
+			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "Also ensure that no other log directory used by any of your"
+			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+			ewarn "used by nginx can be abused to escalate privileges!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
+			# Should never happen ...
+			ewarn ""
+			ewarn "*************************************************************"
+			ewarn "***************         W A R N I N G         ***************"
+			ewarn "*************************************************************"
+			ewarn "The one-time only attempt to adjust permissions of the"
+			ewarn "existing nginx installation failed. Be aware that we will not"
+			ewarn "try to adjust the same permissions again because now you are"
+			ewarn "using a nginx version where we expect that the permissions"
+			ewarn "are already adjusted or that you know what you are doing and"
+			ewarn "want to keep custom permissions."
+			ewarn ""
+		fi
+	fi
+
+	# Sanity check for CVE-2016-1247
+	# Required to warn users who received the warning above and thought
+	# they could fix it by unmerging and re-merging the package or have
+	# unmerged a affected installation on purpose in the past leaving
+	# /var/log/nginx on their system due to keepdir/non-empty folder
+	# and are now installing the package again.
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
+	if [ $? -eq 0 ] ; then
+		# Cleanup -- no reason to die here!
+		rm -f "${_sanity_check_testfile}"
+
+		ewarn ""
+		ewarn "*************************************************************"
+		ewarn "***************         W A R N I N G         ***************"
+		ewarn "*************************************************************"
+		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
+		ewarn "(bug #605008) because nginx user is able to create files in"
+		ewarn ""
+		ewarn "  ${EPREFIX%/}/var/log/nginx"
+		ewarn ""
+		ewarn "Also ensure that no other log directory used by any of your"
+		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+		ewarn "used by nginx can be abused to escalate privileges!"
+	fi
+
+	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
+		# HTTPoxy mitigation
+		ewarn ""
+		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
+		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
+		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
+		ewarn "are sourcing one of the default"
+		ewarn ""
+		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
+		ewarn "  - 'scgi_params'"
+		ewarn "  - 'uwsgi_params'"
+		ewarn ""
+		ewarn "files in your server block(s)."
+		ewarn ""
+		ewarn "If this is causing any problems for you make sure that you are sourcing the"
+		ewarn "default parameters _before_ you set your own values."
+		ewarn "If you are relying on user-supplied proxy values you have to remove the"
+		ewarn "correlating lines from the file(s) mentioned above."
+		ewarn ""
+	fi
+}
diff --git a/www-servers/ocsigenserver/Manifest b/www-servers/ocsigenserver/Manifest
index 5becd013abcd..0a09219e6ea1 100644
--- a/www-servers/ocsigenserver/Manifest
+++ b/www-servers/ocsigenserver/Manifest
@@ -2,6 +2,6 @@ AUX lwt3.patch 2699 BLAKE2B d4f1062d6a31da61d54b6fe5de7e92ac19551a904d4acf6dcbde
 AUX ocsigenserver.confd 491 BLAKE2B eb425c948e00676e33405d34d5192dfc1f0a0d6510084eed92a286e58bb23c8e571007bf0b5e1b7dfa968c7f79efc4ec68700a00beeed44d8316f4ea9d224e63 SHA512 c48a502565eb0dbba52508227cfd45d1aa6cb4db04a7ad16af714eb7d7ddec7699a3bbb5b8c188a34d159c4c98c9961f862abf34cd0576341c4d2069c3b371ec
 AUX ocsigenserver.initd 1108 BLAKE2B 79199aa0799649bd786a03a54ed033ba2b09bdb75ab548eab2c7cc3e007aa65dad68dffd0a186223e4f87093d65e72036acc99b5f6efd098936ea1f17c48def2 SHA512 087fc49090e39c5b3f554119edbf785bfa12fe3d1b95561fa4a1e08da28bc16efba0d1b0d6ead5b39bf39390f678f63ccd2d637b53ad74a2a7b12e6c3b2c73c4
 DIST ocsigenserver-2.8.tar.gz 1265240 BLAKE2B bc1b7da3579d8853f4c259a8a4d4924e08c5552a68a5b40ce00400147efade8c91d01083f117fe0a78cfb8eb44ce3b9e98b34ee2390bd4171d6606b62999ec29 SHA512 80d5125a93239c73756b03a0f50d83e691810f93a15525daef2f7ccd69279e348f03486c26319a9511c1a746f375317082a89ba37ce0ba22872d6db7d3fddf1b
-EBUILD ocsigenserver-2.8.ebuild 2279 BLAKE2B 413b8d6eaaafd6e1927c70e85496edf73cd412eabd9442a3f969dc9719704be7d6435e4f1054c173afd2d1d084ae9472340a0ea4a7dec51e8796713252edef19 SHA512 8ce16324296163724806ece8de74fc3dabe950b7d1cb53d0a39d53e1b772a718d78b227819b9c2b6926629bd52bc61a6be4fbdd055de444b87e128e368c4d996
-EBUILD ocsigenserver-9999.ebuild 2279 BLAKE2B 413b8d6eaaafd6e1927c70e85496edf73cd412eabd9442a3f969dc9719704be7d6435e4f1054c173afd2d1d084ae9472340a0ea4a7dec51e8796713252edef19 SHA512 8ce16324296163724806ece8de74fc3dabe950b7d1cb53d0a39d53e1b772a718d78b227819b9c2b6926629bd52bc61a6be4fbdd055de444b87e128e368c4d996
-MISC metadata.xml 333 BLAKE2B 450495f38384e5e81ff377d4fc76b2fe46fad626241b27a60ff1cafd6442c932b3ea081c5d8634732b9ff29061d2b7583d221378b7341d015debe0003fc9bce1 SHA512 70cbc55fce7942753a6d1c2e2959c27b9834a18918b77cc208c14121c7fcc16d93b8daaaf5f27fe7023d10f1b0848d1dcf7c847f452022080b356c6e9c6d9f55
+EBUILD ocsigenserver-2.8.ebuild 2265 BLAKE2B a154b04edfd1fa1fcd7c4ba1384996f2bae74560081cb88ee41a49ea771cbeb56d1ce455f3e3bd95fb8576e6135e4e85a99c1b4edd1ac90f0d732e69508cf3c9 SHA512 03bfae5c71f71d3852595a8093e153056a28c118b4d200c3bb8e162f78f8142ec8ea9e216d100ba524bde60b575e72c5a6b48f14c71792c09dd505513224c3f9
+EBUILD ocsigenserver-9999.ebuild 2265 BLAKE2B a154b04edfd1fa1fcd7c4ba1384996f2bae74560081cb88ee41a49ea771cbeb56d1ce455f3e3bd95fb8576e6135e4e85a99c1b4edd1ac90f0d732e69508cf3c9 SHA512 03bfae5c71f71d3852595a8093e153056a28c118b4d200c3bb8e162f78f8142ec8ea9e216d100ba524bde60b575e72c5a6b48f14c71792c09dd505513224c3f9
+MISC metadata.xml 253 BLAKE2B c3578c0dea5e976e1b66de4f6c8347b5a49256e3aee11b491bf2046e9706aae9ded2180a78a2a3cd6e6d4884708f39834e4d3aad9b8b46cea1312cec79b62608 SHA512 96b6f201b05cfb92365b1eb21a0e037acb0ac1d186462395cde751309bf1ec9c43079fc1389cc47c0e03c5fd0d2aeda3eb25165d85452c65f4b54d85f5515a73
diff --git a/www-servers/ocsigenserver/metadata.xml b/www-servers/ocsigenserver/metadata.xml
index f1c393459113..42c018ed1037 100644
--- a/www-servers/ocsigenserver/metadata.xml
+++ b/www-servers/ocsigenserver/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>Gentoo ML Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">ocsigen/ocsigenserver</remote-id>
 	</upstream>
diff --git a/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild
index 6f80dda9a2fd..19602549a243 100644
--- a/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild
+++ b/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild
@@ -90,8 +90,8 @@ src_install() {
 	fi
 	emake logrotate
 
-	newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver || die
-	newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver || die
+	newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver
+	newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver
 
 	dodoc README.md
 
diff --git a/www-servers/ocsigenserver/ocsigenserver-9999.ebuild b/www-servers/ocsigenserver/ocsigenserver-9999.ebuild
index 6f80dda9a2fd..19602549a243 100644
--- a/www-servers/ocsigenserver/ocsigenserver-9999.ebuild
+++ b/www-servers/ocsigenserver/ocsigenserver-9999.ebuild
@@ -90,8 +90,8 @@ src_install() {
 	fi
 	emake logrotate
 
-	newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver || die
-	newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver || die
+	newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver
+	newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver
 
 	dodoc README.md
 
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 8bbe07782c2b..179509da9775 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,9 +1,6 @@
 AUX puma-3.12.1-ruby26-waitpid.patch 1722 BLAKE2B cee9b9e89cf098a387481d754732f54274ce0f9580568e62496513d58d46578f81c13df2aa98d2da218bf9d8ad581e8728ff60be488905493e9acc6b88012a88 SHA512 86f826d7f9ac8a50d62f8cf2b87b0df5f7ce55c1a5e4ac7b928b756ece809e30750bb2a7c3c50dc95f9edcb463e9c453b5d3eb84ffe44952904200b5337351ad
-DIST puma-3.12.1.tar.gz 217543 BLAKE2B 6427c48d17ead515a17fd53ba05baba0ca27b9a3c6b26257e83b21ce099d7ff36666dfe1f1a964d23addd666c5aa83c46e6795ad2e22236de7136e25be689ff5 SHA512 70784ed89403e96d1bdb68f3ee0a5446d98a6f8a1af5ddf369d837e2ae3320118c29c9c33e7a9db7a76b1a80aef66a9b6426140c492721984de50e7cc5fc8300
-DIST puma-4.2.0.tar.gz 234724 BLAKE2B 7cf9381261549f545dfbaf4cf60e57b469c50cf25a8e0f72fb6d0ef3b23e1f59ad2e7d3d0aa195e6019525a6d6084511a098e619a13f8be95dc330086463eb49 SHA512 4e314cde1d2ace8f064205c3f36a602847b2314b5987df303dcb1c8e3820cf56d40a8f8cb9883c157de6d2d76cc1062950feef7f901c51a4bfee9ad3255c455b
-DIST puma-4.2.1.tar.gz 235399 BLAKE2B 1bc0b9a095298e8838dbf466d53ef171d33477f8bc2d628d14ee33bdd46fd8a0219140f3d789293a3d9c98a2d5893960225bf054a6c8e875c3e4a7507f8467c1 SHA512 9eec638b5e1378d6dd4b49f32dfb719f7ae6976442dab53074ba37340a30c4c79ffffb76587625cc3d7a47b7a5535c8caabb56aba479a50f2d396a1c8480030f
-EBUILD puma-3.12.1-r1.ebuild 2046 BLAKE2B 3eb760987f2c8df37e0d1acacf17181295c9be79f17f00ef7d4155b85f9cfc3c9628127c772f7a9f20c341d4a2b0a9da4560df1322547dc79240bbb3a7650e9c SHA512 44af179ce965d60d43a1fbb2acf6d09bc7f60547691fb9928c6055b38f7d240b0037655cdc55e5749b6ef757e317b449eb1b19ccd86e7a9929d73307ff83b31a
-EBUILD puma-3.12.1.ebuild 2020 BLAKE2B 8cfe583c94dd6cd3f8ae694c0512790163659de0875bf0be99995202c1c77c6b84b308cbecc7227846dc6a89f209d52a5153d00191e96850564b458d600e75a7 SHA512 6448152060f9b83c02e4a0c7e586941f3dac7f7498eaad5828df6ed0b3df4a87aa9fc7e258638186cb3ec5fdbac3b549042460fc5a6e5ca8c6c02051be6b80c4
-EBUILD puma-4.2.0.ebuild 2120 BLAKE2B 56ea8d92332904306249554f4ea8027569a7c7ee847ea4def39c0e0441ccb26b30be9e596df750373774538c8c11b2e280c75329316223f7ea05dca00f0a6d4d SHA512 e4bf235ad96a7394b5ae2efad00781af95ef1726de6178fa120b1ffdb7997d0428060273856de1fb445543db4c5c5660446d841f0af804e284311ad2d0506bff
-EBUILD puma-4.2.1.ebuild 2120 BLAKE2B 56ea8d92332904306249554f4ea8027569a7c7ee847ea4def39c0e0441ccb26b30be9e596df750373774538c8c11b2e280c75329316223f7ea05dca00f0a6d4d SHA512 e4bf235ad96a7394b5ae2efad00781af95ef1726de6178fa120b1ffdb7997d0428060273856de1fb445543db4c5c5660446d841f0af804e284311ad2d0506bff
+DIST puma-3.12.2.tar.gz 218109 BLAKE2B 82224c3a9c1b2c8e903e5f02a8b43effab820581abbaea5bea9c537eb36e39deb34d6f7d62d9fc42e1e5a6f3c153583d8e009c73864a9e57c39e2d31387b2813 SHA512 b0721dc9b380f1932a60a8ac2e1f0ef3869c735359e9a9e1e37bb118ebc3f550a24bd3e544142513ebeb1ee37ae01a41ec67e71e1d182faec0bb6ed4a60bafcf
+DIST puma-4.3.1.tar.gz 239800 BLAKE2B 123dcb71dd310a960555fe801530586a39ef6876d9019549eb66590195ab1f450999d5365cf9ebbf2f057f2c641739f3fcdf743f5de076d7e637b0b17210410c SHA512 cbb5fc187d3aebfa255d3d0f2d897e109f50e18feadedbf02b73a350555dcbcfbfd91c0a810c11d6d3ac2ec26103479a53eed3fae77c96f1ae6cc2814960de46
+EBUILD puma-3.12.2.ebuild 2052 BLAKE2B fbc4e7bd899b4c75f7ec08851c78b46f27ffbb31cabbeb722bce41ddbe89f33bcacb0fb87aa95c226f5717d93808d54783d82c0a72e33fb925f272e308af9c35 SHA512 e3dbe4a9be2bd6c7d3207dc51599b0cac765785645c9d72188d603dc9ceb3d2c7911a36992de4e445728a9569ce07cd5ed71d7dbe8f8f3378077c0c88ef85f0d
+EBUILD puma-4.3.1.ebuild 2120 BLAKE2B 56ea8d92332904306249554f4ea8027569a7c7ee847ea4def39c0e0441ccb26b30be9e596df750373774538c8c11b2e280c75329316223f7ea05dca00f0a6d4d SHA512 e4bf235ad96a7394b5ae2efad00781af95ef1726de6178fa120b1ffdb7997d0428060273856de1fb445543db4c5c5660446d841f0af804e284311ad2d0506bff
 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
deleted file mode 100644
index d3cb0a1a16f5..000000000000
--- a/www-servers/puma/puma-3.12.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-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/puma/puma-3.12.1-r1.ebuild b/www-servers/puma/puma-3.12.2.ebuild
index 4c27201eb9dd..539f14fdd63e 100644
--- a/www-servers/puma/puma-3.12.1-r1.ebuild
+++ b/www-servers/puma/puma-3.12.2.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
@@ -25,7 +25,7 @@ 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}/${P}-ruby26-waitpid.patch"
+	eapply "${FILESDIR}/${PN}-3.12.1-ruby26-waitpid.patch"
 
 	sed -i -e '/bundler/ s:^:#:' test/helper.rb || die
 
diff --git a/www-servers/puma/puma-4.2.1.ebuild b/www-servers/puma/puma-4.2.1.ebuild
deleted file mode 100644
index ba941f94f9c7..000000000000
--- a/www-servers/puma/puma-4.2.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-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/puma/puma-4.2.0.ebuild b/www-servers/puma/puma-4.3.1.ebuild
index ba941f94f9c7..ba941f94f9c7 100644
--- a/www-servers/puma/puma-4.2.0.ebuild
+++ b/www-servers/puma/puma-4.3.1.ebuild
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 9878178f457c..56ab6d2d183f 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -2,5 +2,5 @@ AUX resin-4.0.48-build.xml.patch 2186 BLAKE2B 1864f7896312c7b2952f5aac8d73924b90
 AUX resin-4.0.48.conf 542 BLAKE2B 96cc8e582b5e5af4b72d29652fa690928bedf51f8ee74d7acfd16244690eb9f346cb616e20e8711f9b85b77ee1145e74d0dca04d026e04808ded22345c7b6b67 SHA512 61b34c022712f31d3cadcf8e78095900085c8cde5ba5b8cc46d603019f461ae3271fc41a9f6b63d89aeb675de9fb72b27123fc6c6774eaee5349d37cc2c9693f
 AUX resin-4.0.48.init 791 BLAKE2B dd8f14fdbdb5e7be3b8511d33db86781c4595a2f925be613d31036588c2444acfe149a1e215a9d26978fa612ef223c325d6f1bdefc19722c429bdbccdb663b11 SHA512 9fa5db204bf4a3a6e040493dda96adcf86e9fff271b6a98951b03c15f00a18a62c9469d48e155bf7847229e005f8c570fd10737bb120271122a2d746ea22e13a
 DIST resin-4.0.48-src.zip 40883010 BLAKE2B 33588d8ccb5692efd70ede4e25949aa71b61640c090379b36ec5160c16d90da465853c56015304435f15298a358c8a3ee9ad54b423ae0547c1a7f43ac4e4bb40 SHA512 a992ebbff8af9f10e825a259e831dc340f9d74c5a117033a7eda2eb59a453d9e7d0e5e6feaf7bb36526ac65c8a7e1f55f737bb68af3e7e9647381ada995542ee
-EBUILD resin-4.0.48-r1.ebuild 4280 BLAKE2B 879a8d21673e8596a7e0fa5f63727c54307ea5c96d0ff919063dadac4ef0aeaad8bf726f0706e6d8edbc84761c32dc8f7b7078a5b8d94a8b4ab458af83921da9 SHA512 f7c4a58195ee768ba6a48552e1c4fd77e5f0d686a7b464fd0b4fa86b5c52b4e978473692fde45f8c76856d25c10580fb25db3c6d4e32ac65d83810d5fa137d8a
+EBUILD resin-4.0.48-r1.ebuild 4258 BLAKE2B f1ec2a03504713d5b689089b69525ab7e565a955e978b2e92895b530d611bcaaf5a92541964c4cbe22115f33cecb0d84d3693ff04e8a0c535c91e67257d4ccf7 SHA512 b7586f597577b44517ed1c870bb1aeb59e934edabc3308aaa6ddf4dbf77def619ce1dccd185e8f89381ff6a41f3fcecc808a858306e652cf25bb0592d94cbd29
 MISC metadata.xml 305 BLAKE2B cd9ab46596ac556fb225d0d9d087c89a8f46a185aa3ed9524d6258d04b8690373efc1a587b28da5bb0485edbaa18e5f7db1b6dcc84656df09a01b7401027c48c SHA512 2f36d477675c49a8b3475b49891dd9eb45c02cbc5d83a3f60c3ba3b35252a3bdc34214dbdf2c3fb8da37138fec49281f95c3c70055fdf47a8cace006a46137e9
diff --git a/www-servers/resin/resin-4.0.48-r1.ebuild b/www-servers/resin/resin-4.0.48-r1.ebuild
index ad098405d02f..f6273d76edc8 100644
--- a/www-servers/resin/resin-4.0.48-r1.ebuild
+++ b/www-servers/resin/resin-4.0.48-r1.ebuild
@@ -78,7 +78,7 @@ src_configure() {
 	append-flags -fPIC -DPIC
 
 	chmod 755 "${S}/configure" || die
-	econf --prefix=${RESIN_HOME} || die "econf failed"
+	econf --prefix=${RESIN_HOME}
 }
 
 src_compile() {
diff --git a/www-servers/servefile/Manifest b/www-servers/servefile/Manifest
index 9325cbc57f36..ddb485637f92 100644
--- a/www-servers/servefile/Manifest
+++ b/www-servers/servefile/Manifest
@@ -1,3 +1,3 @@
 DIST servefile-0.4.4.tar.gz 14219 BLAKE2B 35bb49cc005a269bd73cb937f3a86faddedbc5e64925be13f6d193382a4bd817729b193f7f78b0b161b30438ff1fc978eefc5c3094c5f51845a157a65d674deb SHA512 31ce200db7c8deee9f135c2151565a41fa791dcaa969d9096e6aae2c6975673fd409320be09b7ca20b544326293ed73369f3bd77f379a2ec5f94642d4ef3e1f4
-EBUILD servefile-0.4.4.ebuild 575 BLAKE2B 25fdc92d8f1f445e17d1f9104bcbdab6da54cf331597f30937be01706fc1e26e389285c479f082a22a308090e5f3f323a36346fa2fb593ebfaa7afb1380265cc SHA512 de03fe5c46451f19dacc7da2255de44ba2105ed42d5a94f8cfa06c3f936aeaaa488fe02e75e60581fe81afa696d62f6ecda9272d279dea0c9dff0d4a8843c525
+EBUILD servefile-0.4.4.ebuild 561 BLAKE2B 3d2ab28b86bdbc8a2b703a8088c870b708521fd7a4a4949b4e5d824e1fb64b85b68fe680fdcf78997d5240eb288d31c7287fb02080af4bf058582a80f07283fe SHA512 45ea05050064de7abe19eb765b3156415da5603df8b37aa07dabc4ad65e8c0be8930530a404beb6037ce90aedc2101bea5905bbad773fbbe0b50e07dbac2126c
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/www-servers/servefile/servefile-0.4.4.ebuild b/www-servers/servefile/servefile-0.4.4.ebuild
index 268ad61c03c7..3766aa87b240 100644
--- a/www-servers/servefile/servefile-0.4.4.ebuild
+++ b/www-servers/servefile/servefile-0.4.4.ebuild
@@ -25,6 +25,6 @@ RDEPEND="
 src_install() {
 	distutils-r1_src_install
 
-	dodoc ChangeLog || die
-	doman ${PN}.1 || die
+	dodoc ChangeLog
+	doman ${PN}.1
 }
diff --git a/www-servers/sniproxy/Manifest b/www-servers/sniproxy/Manifest
index ae3778b51f68..3e192091ad73 100644
--- a/www-servers/sniproxy/Manifest
+++ b/www-servers/sniproxy/Manifest
@@ -2,5 +2,5 @@ AUX sniproxy.init 493 BLAKE2B 4021f98063b76628abd60e52afc3cef2d6860c3fd639c21d0e
 DIST sniproxy-0.5.0.tar.gz 72654 BLAKE2B 11f2a66af0d5a19807178687b2a5044aa0cca18a9586c60a6e15604b90f4c32d16d9ac8d037df2cafe57a2dc3a576e1ff72b8f58b59e6822d2a45520b9c770f4 SHA512 52dbb217193d2b7bf9dea37b13fde395b5c56d0a6627508a245f2807920deb282aae3c1ae7e6b5fa68432990e48998989fd28027b65cb7310f214b29f98e5e5d
 DIST sniproxy-0.6.0.tar.gz 78515 BLAKE2B 1ac8decc793e7b3d73d833bc392b3ef035bd2ba7d515c54ff46de16ee8897c0c5392929d5c7a22a131c1f017897cc6f8e9c50aff8164e4afbdc23155b804b613 SHA512 8a99573673bdd57e528c5781cb166d39c80daed699382b24c3fa18a6011d074a1d9e470fee404d24b4450cf067c9995125910b2941b5216d88d189a1d79ebf73
 EBUILD sniproxy-0.5.0.ebuild 1358 BLAKE2B 85992e780c92ed4903e42e703c5391092cc5f2aa01868b4a160e8c260e2aca1d7af3e13f1af009c1f19fbd6cb3ccae956c421f78c3b81afa34fcbffc233f50a0 SHA512 0f0e254ce173b2c8f563db051cc2647cdad62b09d5fcabf82a43e172c11cdf3406146eb18da087a6ee306fef7299f115592c6d394f2cbcdfb95782b696a2c769
-EBUILD sniproxy-0.6.0.ebuild 1598 BLAKE2B 8c6b6b7f20fae86375ac5c899c2b6bda71e4231f5e6ead5a42315ee4bf32b79d31904da6d654781ffa0e0a502e66d0b5cc6cf7b846a6d09f228a15a7a72f09a5 SHA512 e3439d9e990b7b17e2f1d542cdcbae2f68577eadc97891adb1b9b2c4ed449dd43f59cde94d417bba7c1e2846b6ad8399738c3844ebd071e5cd71dc9b5fa4f2a2
+EBUILD sniproxy-0.6.0.ebuild 1625 BLAKE2B 1dfd5f28a60401b8aacd4268c81c8050b03de3979bd1ff3f51dd07ea508f54798f1ad74c42a24ba0612111c5b749f6017e4a4bfbaf89fdcb2c671f4cd898d71b SHA512 1f6d965e68923d7793286a3d8611dd4b87dd3d08d52c8e2f7197ee968c56deffda3e7a5a30ee4c471f0cedac6313a3306594bb0ceb885bb5b6a9b7750078b8cb
 MISC metadata.xml 630 BLAKE2B ebf3d19da137583e30cd2d19d19280c8f18c9e05beb0dc6a35d7863687ff9d28c4ee473ff9fbd97a05dee4cdc96bcb6785f41a22911a00ddc4645c20fc18f655 SHA512 263e1b4f405a67f6e402cd842d95640664c9f961ee29c614022787be76a2d83b5dcb3c4e784bef4369424680bdf1888d440eeb0a195dd8dfa65132c137a2fb55
diff --git a/www-servers/sniproxy/sniproxy-0.6.0.ebuild b/www-servers/sniproxy/sniproxy-0.6.0.ebuild
index 2c4947ff75ad..458f1e8ac793 100644
--- a/www-servers/sniproxy/sniproxy-0.6.0.ebuild
+++ b/www-servers/sniproxy/sniproxy-0.6.0.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="https://github.com/dlundquist/sniproxy"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="+dns +largefile rfc3339 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/libev
diff --git a/www-servers/spawn-fcgi/Manifest b/www-servers/spawn-fcgi/Manifest
index b2d564937943..adbd982eaeaa 100644
--- a/www-servers/spawn-fcgi/Manifest
+++ b/www-servers/spawn-fcgi/Manifest
@@ -1,8 +1,6 @@
 AUX spawn-fcgi.confd 2238 BLAKE2B 0364383f12b79728830556244485b991f5bf5f7f4595e5500b81330c43b752aca8f3fce53cd08d4f007a69279668c7d212c74ff0682a3e37ae0ec545744836c8 SHA512 0b0d5754de17dd691ead380a93526aa7fbdd432359b248ce06f030daefb1ad96e4a81fe5319557fb66602baccb45a0febf6417ec7b79eee91e1e070d9a852b90
 AUX spawn-fcgi.initd-r1 3090 BLAKE2B c59836f3c67fbf1d3cdd8db0efd923387e7e9f5c2f913cb276b695512cf6ab3f1fc1a9fd14bb654b9b109cbff3ffe31ce75ffb62573f56f2d851fa92d6ab24bf SHA512 e7336da885a19497247648c9b2e04044005285f8b989386d6d5441dbf284ebffa9df062e6e23cd0ae635232abaa2d41ff408b0c913683a6240929c5d1ec8a624
 AUX spawn-fcgi.initd-r3 3048 BLAKE2B 5b501069acfe3a535f1d73cbb706d05de50ea8562e09a49209da551dc5ba9626ddc0093b76139d4291ce8ac4c3e329be0bbf494c41c6ec137a182b8b35c3c891 SHA512 6c983f9d741f508d12b728d24dc5b57396cbd2272ae71c7127ba95aef70bd1a90b68d2b15e3481dfdbcfa723ca73a92deea61baae64051a83cec0b583c7da1e1
-DIST spawn-fcgi-1.6.3.tar.bz2 77607 BLAKE2B eb6331f2f4ec1270f47ba317dcc60668e5d02dea9ed3a840033febd98443a73194559bcf56ff039131c8bf374108b72c47ccc531b7549bb3dee5f4f111308608 SHA512 136a198cbcda0d3ae4e445eac2ccdcc5483801514ce77542c630d615a7a19a68864b9d7d79733adb16347ba64c833afbf2a18df82937107a6bc8467f630b03b4
 DIST spawn-fcgi-1.6.4.tar.xz 79944 BLAKE2B 06fb92261042fe6bccda1a472a712a7c9bc7f56ee04b72f31ee133079f6c1d07ca07ef6c1b7c878db2e32861ea20914998411a3f6b596e4ba950f8767a899346 SHA512 e2b317997b56f852ad644b80fe36fa08376ae81f93566e181c31a3b6764de2eeb32a2e10e420136d8536487c575678ca52a33f7cb3488aadf7185fbd0196bee0
-EBUILD spawn-fcgi-1.6.3-r1.ebuild 784 BLAKE2B e7bf66cdf6281dbfc877e7953df82b1a39fc6826b3e72aeabb5cccd6cf868f5098b8a6c3bb2ce046d3ef203ff5975d32c2bec1b4da08288f59d368a5b6b84ce2 SHA512 402d57c189dfb2bdf1181f84ddc52cacfe31b663cf56fc80c7dac1a5d41f33e81df242ba752acd3d3822214f9a11ae38b4acd283a4e95f3fa7801d163065087c
 EBUILD spawn-fcgi-1.6.4-r1.ebuild 744 BLAKE2B 313090bb550a1894273ae92aa8f742436f4635aaf3cc3db2f00948e4c1b0cb2f7a476744156d2262ff6588778a915dc5f4e233d0ff3ec7fcc91c5a1a3929bc56 SHA512 04126334bd59be9478813f30e14b00296a8c2896f09c6f109539320a43950131d995eb03c5af35048059489274e4ff67aa50fe7c8ca5dc74a48a0a459d900570
 MISC metadata.xml 448 BLAKE2B c5651b029dc5d74e075b0a3ee7eb0b9b1cca540a579ef017faca1363f920fd374277d4e24d25db64d81c5dcea05da91e5d9f3043f98863ca31f38893f67ba041 SHA512 461925b80f58574c97b298aa4b26314e26f40d8874bd3d8e4fc6f9bd1aa7161f9c69cfcc47dd9bd9077b631827e5a6631e0322174fb1387624b7bc3d021e29a2
diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r1.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r1.ebuild
deleted file mode 100644
index 7fba4ede0c9a..000000000000
--- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A FCGI spawner for lighttpd and cherokee and other webservers"
-HOMEPAGE="http://redmine.lighttpd.net/projects/spawn-fcgi"
-SRC_URI="http://www.lighttpd.net/download/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="ipv6"
-
-DEPEND=""
-RDEPEND="!<=www-servers/lighttpd-1.4.20
-	!<=www-servers/cherokee-0.98.1"
-
-src_configure() {
-	econf $(use_enable ipv6)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README NEWS
-
-	newconfd "${FILESDIR}"/spawn-fcgi.confd spawn-fcgi
-	newinitd "${FILESDIR}"/spawn-fcgi.initd-r1 spawn-fcgi
-
-	docinto examples
-	dodoc doc/run-generic doc/run-php doc/run-rails
-}
diff --git a/www-servers/thin/Manifest b/www-servers/thin/Manifest
deleted file mode 100644
index e2c35509a549..000000000000
--- a/www-servers/thin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX thin.confd-2 1251 BLAKE2B ae1a95f5a8695d1dfe31394ef9d70f4ea75795a8a8a4efaafc4b6852d5a50c4ae637e04e20f43a3b2f3474bb3e4c39f9f56d3b461adeabf0c491bb37ef8f2498 SHA512 b3e02dd2c13871068f47241a73ac4d9f0a98932fc263303913a48dbd5d4b95148dcdb7ebced7ac5f2d853e33c1a9214467375b72b3fbee0bc0354f97f96f6891
-AUX thin.initd-r4 1828 BLAKE2B 90dd788ff53deeefc89c002f660d142ecd3267ae6e58e7a0aacc545c900e2a453d3b942b36c6d7d43b55cf442cba070221f646cdf1eadf7de31cfc18981a1c8b SHA512 e953b9c3edc8a881eadba3ea3cadb63e67e8361847ede72678cc4c2730b30aaf1664ffdbe86e21b1524fc9753afe912c8f1466158d088f97ab6318cdd798c110
-DIST thin-1.7.2.tar.gz 180169 BLAKE2B fe902b76cbffbad739327754c14dcc46372d412c607f852a4f52554ec8e41e38a07f211c28751b3528fd53c7eb30eb0f8130e3bc0877996187a3d755ccfbc17f SHA512 2c3c831eed4444d42fc88fc2c46e557284748b6b6bf331d6fd827073918cc3a869e5a60bf7db19ba82add28e07c8a8c92dac609a56cda82b41b37ddfb247e7bf
-EBUILD thin-1.7.2.ebuild 2521 BLAKE2B 057e095899f313d78f9bfa10c5a32333c240f9cc63c2358ce97ba1f1f01a1af1284d1f3cbe16a40a23abef46bbbd947508c4dd86c5d32a7c39534e502c5b7ce9 SHA512 22f1aff7cfb86495da51ebb9832429e77353a50710ba4081fc3b6997441a49906b07ee8bc93eb1a778a546e0c158cb64dfbd29aacfacd932d6d386ed1a6458b5
-MISC metadata.xml 605 BLAKE2B 248df2728a6ea4417dfa1eaafb85ebe63441ac709e47e7f31fc5a32dc10f72e17f5f00d3baea32e508a05899910ed63902b9031caf5f98d9ef0ceb3bdacd7a8f SHA512 df6cb1ce64273629695d5f6a5b2a56957b853d73c75ce2d0cb51abf7a9980783d4370e2f3f1a0813ed03cf77ffc8119bcdf7d20465de64c3d8300e6cc1a2cb3c
diff --git a/www-servers/thin/files/thin.confd-2 b/www-servers/thin/files/thin.confd-2
deleted file mode 100644
index ca89c44cfd0e..000000000000
--- a/www-servers/thin/files/thin.confd-2
+++ /dev/null
@@ -1,39 +0,0 @@
-# /etc/conf.d/thin: Configuration for /etc/init.d/thin*
-# Copy this file to /etc/conf.d/thin.SERVERNAME for server specific options.
-
-# Set the configuration file location.
-# In start-all mode (/etc/init.d/thin), this must point to the directory where
-# all the thin configurations are located.
-# When starting a specific server (/etc/init.d/thin.SERVER), point to the exact
-# location of the .yml configuration file.
-# CONFIG="/etc/thin/${SVCNAME#*.}.yml"
-
-# Disable looking for a configuration file.
-# You can use THIN_OPTS instead for setting command line options.
-# NOCONFIG=0
-
-# Set the Ruby interpreter to use.
-# RUBY="/usr/bin/ruby"
-
-# Whether to start thin using `bundle exec'
-# DO_BUNDLER=0
-
-# What directory to cd into before starting thin
-# (useful for DO_BUNDLER)
-# CHDIR=
-
-# Set the user for this instance.
-# (Should mirror "user" value in /etc/thin/${SVCNAME#*.}.yml)
-# THIN_USER=
-
-# Set the group for this instance.
-# (Should mirror "group" value in /etc/thin/${SVCNAME#*.}.yml)
-# THIN_GROUP=
-
-# Set the pidfile for this instance.
-# (Should mirror "pid" value in /etc/thin/${SVCNAME#*.}.yml)
-# THIN_PID=
-
-# Set command line options to pass to thin.
-# In specific server mode, '--tag SERVER_NAME' is automatically appended.
-# THIN_OPTS=
diff --git a/www-servers/thin/files/thin.initd-r4 b/www-servers/thin/files/thin.initd-r4
deleted file mode 100644
index 9885a830e73e..000000000000
--- a/www-servers/thin/files/thin.initd-r4
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-SERVER=${SVCNAME#*.}
-if [ ${SERVER} != thin ]; then
-	CONFIG=${CONFIG:-/etc/thin/${SERVER}.yml}
-else
-	CONFIG=${CONFIG:-/etc/thin/}
-fi
-NOCONFIG=${NOCONFIG:-0}
-RUBY=${RUBY:-/usr/bin/ruby}
-DO_BUNDLER=${DO_BUNDLER:-0}
-CHDIR=${CHDIR:-}
-THIN_USER=${THIN_USER:-root}
-THIN_GROUP=${THIN_GROUP:-root}
-THIN_PID=${THIN_PID:-/var/run/thin/thin.pid}
-THIN_OPTS=${THIN_OPTS:-}
-
-depend() {
-	need localmount
-}
-
-checkconfig() {
-	if [ -n ${CHDIR} ]; then
-		cd "${CHDIR}"
-
-		if [ $? -ne 0 ]; then
-			eerror "Cannot cd into requested directory"
-			return 1
-		fi
-	fi
-
-	[ ${SERVER} = thin -o ${NOCONFIG} != 0 ] && return 0
-
-	if [ ! -f ${CONFIG} ]; then
-		eerror "Unable to find the server configuration."
-		eerror "Please set the CONFIG variable in /etc/conf.d/${SVCNAME} or"
-		eerror "set NOCONFIG there to 1 to disable looking for a config file."
-		return 1
-	fi
-}
-
-buildargs() {
-	if [ ${NOCONFIG} = 0 -a ${SERVER} != thin ]; then
-		echo -n "-C ${CONFIG} "
-	fi
-
-	echo -n "${THIN_OPTS}"
-}
-
-action() {
-	checkconfig || return 1
-
-	[ ${DO_BUNDLER} -ne 0 ] && RUBY="${RUBY} /usr/bin/bundle exec"
-
-	if [ ${SERVER} = thin ]; then
-		ebegin "$2 all thin servers in ${CONFIG}"
-		${RUBY} /usr/bin/thin $1 $(buildargs) --all ${CONFIG}
-		eend $?
-	else
-		ebegin "$2 thin server ${SERVER}"
-		${RUBY} /usr/bin/thin $(buildargs) --tag ${SERVER} $1
-		eend $?
-	fi
-}
-
-start() {
-	action start 'Starting'
-}
-
-stop() {
-	action stop 'Stopping'
-}
-
-restart() {
-	action restart 'Restarting'
-}
-
-start_pre() {
-	# If the path to the pidfile is /var/run/thin/foo/thin.pid
-	# then checkpath will fail if /var/run/thin/ does not exist.
-	# This caught infra...
-	d=$(dirname ${THIN_PID})
-	mkdir -p "$d"
-	checkpath -d -m 0775 -o ${THIN_USER}:${THIN_GROUP} "$d"
-}
diff --git a/www-servers/thin/metadata.xml b/www-servers/thin/metadata.xml
deleted file mode 100644
index 70ae99a48a27..000000000000
--- a/www-servers/thin/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<longdescription>
-Thin is a very simple web server written in Ruby. It's single-threaded, which
-means it can only serve one request at a time. This simplicity affords increased
-speed and decreased memory usage for singled-threaded framework like Rails.
-</longdescription>
-	<upstream>
-		<remote-id type="github">macournoyer/thin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-servers/thin/thin-1.7.2.ebuild b/www-servers/thin/thin-1.7.2.ebuild
deleted file mode 100644
index c256c85b8463..000000000000
--- a/www-servers/thin/thin-1.7.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and very simple Ruby web server"
-HOMEPAGE="http://code.macournoyer.com/thin/"
-SRC_URI="https://github.com/macournoyer/thin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc test"
-
-DEPEND="${DEPEND}
-	dev-util/ragel"
-RDEPEND="${RDEPEND}"
-
-# The runtime dependencies are used at build-time as well since the
-# Rakefile loads thin!
-mydeps=">=dev-ruby/daemons-1.0.9
-	>=dev-ruby/rack-1.0.0:* <dev-ruby/rack-3:*
-	>=dev-ruby/eventmachine-1.0.4:0
-	virtual/ruby-ssl"
-
-ruby_add_rdepend "${mydeps}"
-ruby_add_bdepend "${mydeps}
-	dev-ruby/rake-compiler"
-
-all_ruby_prepare() {
-	# Fix Ragel-based parser generation (uses a *very* old syntax that
-	# is not supported in Gentoo)
-	sed -i -e 's: | rlgen-cd::' Rakefile || die
-
-	# Fix specs' dependencies so that the extension is not rebuilt
-	# when running tests
-	rm tasks/spec.rake || die
-
-	# Fix rspec version to allow newer 2.x versions
-	sed -i -e '/gem "rspec"/ s/1.2.9/2.0/' spec/spec_helper.rb || die
-
-	# Avoid CLEAN since it may not be available and we don't need it.
-	sed -i -e '/CLEAN/ s:^:#:' tasks/*.rake || die
-
-	# Disable a test that is known for freezing the testsuite,
-	# reported upstream. In thin 1.5.1 this just fails.
-	sed -i \
-		-e '/should force kill process in pid file/,/^  end/ s:^:#:' \
-		spec/daemonizing_spec.rb || die
-
-	sed -i \
-		-e '/tracing routines (with NO custom logger)/,/^  end/ s:^:#:'\
-		spec/logging_spec.rb || die
-
-	find spec/perf -name "*_spec.rb" -exec \
-		sed -i '/be_faster_then/ i \    pending' {} \;
-
-	sed -i -e "s/Spec::Runner/Rspec/" spec/spec_helper.rb || die
-	# nasty but too complex to fix up for now :(
-	use doc || rm tasks/rdoc.rake
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake compile || die "rake compile failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	keepdir /etc/thin
-	newinitd "${FILESDIR}"/${PN}.initd-r4 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-2 ${PN}
-
-	einfo
-	elog "Thin is now shipped with init scripts."
-	elog "The default script (/etc/init.d/thin) will start all servers that have"
-	elog "configuration files in /etc/thin/. You can symlink the init script to"
-	elog "files of the format 'thin.SERVER' to be able to start individual servers."
-	elog "See /etc/conf.d/thin for more configuration options."
-	einfo
-}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 790c0221e8a3..f9858fe38c06 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,7 +1,5 @@
 AUX tomcat-7.0.94-build.xml.patch 5966 BLAKE2B 01e253b0597e7353eaa38b5af29f4f6db4161fbe91aa1a46e2b8412f37cb66a10c06a14291e1c49ea108f7fbbff538e1c605829de8ee20d85a57d9c6122e4436 SHA512 66e001d705a7081461a3ddb9477e857b7fb87676b1ebc3eaa4bbf7f6a1e8f88f7eae4fc49a8a5b7a7baebc2258acc2bd0fe11d3683716021430e4a9dcd367b43
-AUX tomcat-8.5.40-build.xml.patch 10429 BLAKE2B ba2dcd97d06d353f1ae8c9041ad5eaf510ea6668fe08d2331b6f2b9efc886492c7946ad5d3e6dfe49e83d62bce7df20eaa8003c40c91f8f1be95e301bd02a87f SHA512 18ddf79f7fd12ca0095c75cd60876a942b35bd7d5f38919ce2edd1199d2a544381f157e7544bbf52c0d54d2786535c29910ae10ea1ef7f6afb030505861c5807
 AUX tomcat-8.5.47-build.xml.patch 10363 BLAKE2B 8f851b5eaa4ffb3073ee526122ef278f8e975e263b439140748ba774152a72712b6bc78d6568d097befac4ba56bc6a1721f14dd0a85d288e88621f49819e1a97 SHA512 236df8ce63e7e48293584868c140d4ba5160172cc19bd90eeacd6f14e08663b7c750f95fb24ab1eddf7c7a2a80e2f05e5470261159f3c95d3b22bd790b2f6b89
-AUX tomcat-9.0.19-build.xml.patch 10992 BLAKE2B 2205b3973bff2cd252679e3cc809c907f9df56874d7030283b4a4b1ce32337a832eacf84b62ce6d01473da2e539a1dc00e7ee233d1226458f266eb627c7fbcd5 SHA512 0988b9b52ef9921a174fb52ea3982d3560fa808fa83c77cbcf0a0d09c09ede2269957f6bc966357ac461250158c45c54b3f45e80ce62916f5c015d77d7e27d06
 AUX tomcat-9.0.27-build.xml.patch 10936 BLAKE2B a75c4635744b1815d5f4df29ac6bbb2afebf752c7b43cda2cd69c2cbe66100b10e04fe8a4306e2c166a6b2159091a7c7a4b88d299ea7d408e6af04c8b552ea8f SHA512 e1a68955dc6a89e1751cb429d44a19501644425b1a7553c0021255016bf69c58b64059267dab91457e78573e9dce01c3f3abe0f776d69bbf35d1c36c0535e1ce
 AUX tomcat-9.0.4-build.xml.patch 10399 BLAKE2B 3ec7f4d315b51056884b44abbd03093e2bf3675acfb572c556a62a8a32de3209dae82ee3f3b1c65178b2a62b42f5d4c3fba2e765aa27aa7147a9d8478d09f0f0 SHA512 60729e4f085951aa1133b0d6fdc6386bac9fd4bcd421814eb87c8a45a62819fab1ea2347dfffd12150e93c54fda2ba98bf1df4bc39a622de5ac9ea0c2e81a710
 AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f7174453cfbe7b4a1a7167e122efa3ec2ea6c17c88de1f9223e21e773cf717ed04d79fe0b1e7fc816400033094a07a35c6 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570
@@ -9,17 +7,13 @@ AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f
 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-8.5.46-src.tar.gz 5599021 BLAKE2B 3755f15612e63ac06cbfa097f1531dc36542ba559a6ef60230b133e45d14bb4c4c54d4dcc8b05b9996f54ac253fb1630f6a6e900ee00e4af0a9200f83455a952 SHA512 02e93cc6fb4226e81b03ae60f479e15b438b1c68c1a4104200db9cc473939b92d66eea12f0783727b06f643d11ebe3da2a81c80cbe486ed497a3280e8cdb2e62
 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
-DIST apache-tomcat-9.0.26-src.tar.gz 5750303 BLAKE2B 582acae0f24cab5fdd44c085b36e771508020d124f9329036b3bf0698da1fb2cda69d6f4254eeaca00ce3c34c3740fe69c077637107167fface60b9fa74c8869 SHA512 8f430439c66f5a43c7a35bc99edd11549100be28b17fb44e17ec432f72e1797cdebd641a7f19c1d918635e51c164ecd1c9d1399a63abfce05d9a8c37db381837
 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
 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.96.ebuild 4230 BLAKE2B 028f3b1c800225c67bcb79cd8efe9e88b15914bb72b4f0144a404e45e4b7e8a13e288d57a20d05ee01366ec1835078e85aa1063f68e7db8ee7b25f72f414ff00 SHA512 5e9bd56f9ee06e246f95360f2c73f448a6425e9445f2d2d9ba591b587fde11793963bce184b8dbf19de3cbaf71cf645753e04a614d9532df6a9b0dcbd464a781
-EBUILD tomcat-8.5.46.ebuild 4600 BLAKE2B 83a3150b11244cf690433d298319f25451e03a1caa6ef07eda33de00160f049dcbc3a6b3071412c2e14a5612c732479e93ad55d5f2a096ac179aa57bc8c78d0f SHA512 bc83eeac436f6fbd2eee8c07cf0526befed08327ac4820d4b2fd7559bbbd0f366cd076692bec2c9faabf1f1ef1a65307c7afad0d941a3e21f4a5d669828346ac
-EBUILD tomcat-8.5.47.ebuild 4593 BLAKE2B 4dbfb90bbbdee3f1dcdba40e344c98ac5633ff754348e6255650051e8f5a3d9e7f0a993eb9dfa077cae98be5181fa048ea1acec8d849e1fbfc87c02603f4634e SHA512 5597597cdcdceaf70bcf0443fca4d6a1f734f5b0269cc85850620d1bbd73ce35770d9192f9de368947c98cfe1d29ada42f44a899bcfd5a9c4dcc9a6e135de4cd
-EBUILD tomcat-9.0.26.ebuild 5511 BLAKE2B 751c4feb923a08c6cb549e7f191cec57d6f940fc57de62e0b4fcd597f92513189cc2709df4dcf69c75fd12956cefc835f5ac6bd543eef8f64edf3e943e99b7b1 SHA512 d74b33ad5fd345ce86ce0ffebfeade235906ad73347404d62caa9c07f82d893f13454be824be42a147f3a7f737438a336d9c74895107ed68492dae695dd1cedd
-EBUILD tomcat-9.0.27.ebuild 5503 BLAKE2B 5295f15732c306d5bf87b38b8d79ec244c9733cfefd44d51b713d4dfbd48f90e809418c969c1baf607456ea885836bfb1d75d794fe1546afc7cc42e4a6a89bd4 SHA512 3713cfe1744d467ebdcef1a486de748c57dd8b2decab08448d9f1e633c9a01c78f29a9e1bbcda386ee858b77f319757ae5d404b082f3ad97c2e380cfc19898d2
-EBUILD tomcat-9.0.7.ebuild 4554 BLAKE2B ed8c298301b751bdead671e91111b44b2ae84ab5597263b67fbcf40d95679c9850dae96c796cb9a348799ee0bf677d88ac3e7c8c936c3d2098ba8643b1ae33d5 SHA512 46197feebee5fa8fdfe63670374bc443e275175a27cfe64e57d144322d1418cba0eb54c89840b695fd12577e067330c71b4871d1fab787d899b4500bb9beb989
+EBUILD tomcat-7.0.96.ebuild 4197 BLAKE2B e20677c88681fb4c79dbeec633981176b7b309e67bfd8361546b531ee627d74aa3e5f6c5ac4da5593603b6fff3b00e7b63471e9b2c6cebae84f6437ce34039a5 SHA512 a0b7045e9edea9661ca17e5d3d8151152b817d605c218158365cedf1528a9a167d487dcd304ef9417bd35c73f1e73a058f8fb590e4009c24f45e3d062aaa154c
+EBUILD tomcat-8.5.47.ebuild 4559 BLAKE2B 2b6ac83085c87208bfc013e3ec68a6412b2bbd9208aab1732096ef8079500497a2a53e6c2a2a1f235f7d7f29a87aa52ae105b34994fc46bee73127e22b12e2df SHA512 7bb79bd8f186a0e782c3b9ff9ed056df0c1e8e458d6886079654878722f8584409a069b7f39cd712f1e73c98a0f21dc733a49c93ea96dd12b8e92617722183e0
+EBUILD tomcat-9.0.27.ebuild 5470 BLAKE2B a001f155a2214e363aee2e8fefcb0e73d0881e52ef8da29c53480e464609a48a9526bc886ca8257e7a761c4e4c0b86b9ecd1c0bd84d6e900aa7e388410843326 SHA512 6d4b46bf13cc1abe2d8b5544ff6eb5419d2d716fa47b60879fe244ad04264cd7029272fe24085472e9c181af6e4346ce59f180636d06a941a1a9e0d5566d2518
+EBUILD tomcat-9.0.7.ebuild 4518 BLAKE2B af856b921778713ca7ffd9d35dd5916ca1bcbdd438945d91bd9ec26ac4bf36b8e33176c05523df12b76c2ebeb5055ff296be8b1ee2e03b38e21b468ada3f112b SHA512 fe3933a53df4395dee7884910b6d3d293b351e9ed6e0015f850ecb008afa49778c5e7b30d694ec55c41f889bd155e831a940492c35e16be03177a697b17a6844
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch
deleted file mode 100644
index e049d77141e4..000000000000
--- a/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 179802b..49ac8c0 100644
---- a/build.xml
-+++ b/build.xml
-@@ -727,24 +727,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}"
-@@ -836,9 +841,9 @@
-       filesId="files.jasper-el" />
- 
-     <!-- Re-packaged Apache Commons DBCP 2-->
--    <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!--    <jarIt jarfile="${tomcat-dbcp.jar}"
-       filesDir="${tomcat.classes}"
--      filesId="files.tomcat-dbcp" />
-+      filesId="files.tomcat-dbcp" /> -->
- 
-     <!-- i18n JARs -->
-     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"
-@@ -1030,9 +1035,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">
-@@ -1092,7 +1097,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" />
-@@ -1128,7 +1133,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}"
-@@ -1143,7 +1148,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}"
-@@ -1246,9 +1251,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
-@@ -1629,7 +1636,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}"/>
-@@ -1793,6 +1800,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"
-@@ -1857,6 +1865,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"
-@@ -1897,9 +1906,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/"/>
-@@ -2629,7 +2640,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">
-@@ -2655,7 +2666,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}"/>
-@@ -2733,7 +2744,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}"/>
-@@ -2788,13 +2799,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>
-@@ -2916,7 +2927,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}"/>
-@@ -2933,7 +2944,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}"/>
-@@ -2958,7 +2969,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}"/>
-@@ -2974,7 +2985,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}"/>
-@@ -2998,7 +3009,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}"/>
-@@ -3013,7 +3024,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}"/>
-@@ -3041,7 +3052,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>
-@@ -3052,7 +3063,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>
-@@ -3063,7 +3074,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.19-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch
deleted file mode 100644
index a4bcbeb949bc..000000000000
--- a/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-diff --git a/build.xml b/build.xml
-index b3b299f..40bf4f8 100644
---- a/build.xml
-+++ b/build.xml
-@@ -752,6 +752,7 @@
-       addOSGi="true" />
- 
-     <!-- Servlet 4.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -759,21 +760,23 @@
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license"
-       addOSGi="true" />
--
-+-->
-     <!-- 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"
-       addOSGi="true" />
--
-+-->
-     <!-- 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"
-       addOSGi="true" />
--
-+-->
-     <!-- WebSocket 1.1 API JAR File -->
-     <jarIt jarfile="${websocket-api.jar}"
-       filesDir="${tomcat.classes}"
-@@ -879,10 +882,10 @@
-       addOSGi="true" />
- 
-     <!-- Re-packaged Apache Commons DBCP 2-->
--    <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!--    <jarIt jarfile="${tomcat-dbcp.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-dbcp"
--      addOSGi="true" />
-+      addOSGi="true" /> -->
- 
-     <!-- i18n JARs -->
-     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1124,9 +1127,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">
-@@ -1186,7 +1189,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" />
-@@ -1222,7 +1225,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}"
-@@ -1237,7 +1240,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}"
-@@ -1340,9 +1343,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
-@@ -1849,11 +1854,12 @@
-     </copy>
- 
-     <!-- Source bundles for native components -->
-+<!--
-     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
--
-+-->
-     <!-- platform README files -->
-     <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1863,6 +1869,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- 
-   <target name="javadoc" depends="dist-source"
-     description="Create the Tomcat javadoc" >
-+<!--
-     <javadoc packagenames="javax.servlet.*"
-       excludepackagenames="javax.servlet.jsp.*"
-       sourcepath="${tomcat.dist}/src/java"
-@@ -1924,6 +1931,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"
-@@ -1962,9 +1970,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-         <path refid="compile.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/8/docs/api/"/>
-       <link href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2686,7 +2696,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">
-@@ -2741,7 +2751,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}"/>
-@@ -2819,7 +2829,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}"/>
-@@ -2874,13 +2884,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>
-@@ -3002,7 +3012,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}"/>
-@@ -3019,7 +3029,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}"/>
-@@ -3044,7 +3054,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}"/>
-@@ -3060,7 +3070,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}"/>
-@@ -3084,7 +3094,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}"/>
-@@ -3099,7 +3109,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}"/>
-@@ -3127,7 +3137,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>
-@@ -3138,7 +3148,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>
-@@ -3149,7 +3159,7 @@ skip.installer property in build.properties" />
- 
-   <target name="ide-eclipse"
-           depends="download-compile, download-test-compile"
--          description="Prepares the source tree to be built in Eclipse">
-+          description="Prepares the source tree to be built in Eclipse" unless="noget">
- 
-     <!-- Copy the sample project files into the root directory -->
-     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3167,7 +3177,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-7.0.96.ebuild b/www-servers/tomcat/tomcat-7.0.96.ebuild
index cd40b029523a..443dd981a8d0 100644
--- a/www-servers/tomcat/tomcat-7.0.96.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.96.ebuild
@@ -26,8 +26,7 @@ SAPI_SLOT="3.0"
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
 	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
-	virtual/jre
-	!<dev-java/tomcat-native-1.1.24"
+	virtual/jre"
 DEPEND="${COMMON_DEP}
 	virtual/jdk:1.8
 	test? ( dev-java/ant-junit:0 )"
diff --git a/www-servers/tomcat/tomcat-8.5.46.ebuild b/www-servers/tomcat/tomcat-8.5.46.ebuild
deleted file mode 100644
index c6e5e958e89e..000000000000
--- a/www-servers/tomcat/tomcat-8.5.46.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	>=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
-	>=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=dev-java/ant-core-1.9.13
-	>=virtual/jdk-1.7
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-8.5.40-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_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
-	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 ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "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.47.ebuild
index 5f75e72509c6..d34cd3a9d3cb 100644
--- a/www-servers/tomcat/tomcat-8.5.47.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.47.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
@@ -26,7 +26,6 @@ SAPI_SLOT="3.1"
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
 	>=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
 	>=virtual/jre-1.8"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
diff --git a/www-servers/tomcat/tomcat-9.0.26.ebuild b/www-servers/tomcat/tomcat-9.0.26.ebuild
deleted file mode 100644
index bc8bb7bd1eee..000000000000
--- a/www-servers/tomcat/tomcat-9.0.26.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="4.1.0"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.10"
-SAPI_SLOT="4.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_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"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=dev-java/ant-core-1.9.13
-	>=virtual/jdk-11
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
-	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
-	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-9.0.19-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},glassfish-xmlrpc-api,wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
-	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 ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "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-9.0.27.ebuild b/www-servers/tomcat/tomcat-9.0.27.ebuild
index 6f5e0ef52f6d..182cad35d13c 100644
--- a/www-servers/tomcat/tomcat-9.0.27.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.27.ebuild
@@ -36,7 +36,6 @@ COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
 	dev-java/tomcat-servlet-api:${SAPI_SLOT}
 	dev-java/wsdl4j:0"
 RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
 	>=virtual/jre-11"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
diff --git a/www-servers/tomcat/tomcat-9.0.7.ebuild b/www-servers/tomcat/tomcat-9.0.7.ebuild
index 7a404767db95..967fffcd751e 100644
--- a/www-servers/tomcat/tomcat-9.0.7.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,9 +24,8 @@ ECJ_SLOT="4.5"
 SAPI_SLOT="4.0"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	=dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
+	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
 	>=virtual/jre-1.8"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index ab40571c3af0..b1c41578c8e6 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -6,9 +6,9 @@ DIST tornado-4.5.1.tar.gz 483225 BLAKE2B 261a5da8a7cc43b11b8504162a030fdad9c3c14
 DIST tornado-4.5.3.tar.gz 484221 BLAKE2B 7b3682fa85a7f6ad32351d40993516a3e397b7b0a5de9d807bcd8b2b21325a6170f3670cb13e12aa208b6590313cf165ddf40537dba1fee61fa9d71954265a66 SHA512 c17dd7a3b541c26950d27c8a399ae4fdff1d99d16ff0c5de9871fe2de4c0f797c96712b23b5ed5efdaee06bb251f7def114c83fe6f7f37f344cdac9996d14448
 DIST tornado-5.0.2.tar.gz 506544 BLAKE2B 616298761f5e0cdcacfa96c3a14efaf2cc1d7579d582dc8b2fae2a3a3e45405804aa2a1409665a9af38d2f415908b373c1c34e4ff5868f989bb1bd29fe81a569 SHA512 fbd360df34fe29ed3e5f406992923e2af2815f93446fb9d9810f7575fe06300a2cb15c3f36bd93150284ba297772f94c94a4227acca2dc65c94cf7d100cb5974
 DIST tornado-5.1.tar.gz 516359 BLAKE2B 1ff6e6ced124b7b0df0e476eac555de20e4ac86f01369ee484e33bf5d749c269a81dd11a0b4c8b3169db6fd9f7a1b4e3c3551d46474c53a1fed8e342660c57f9 SHA512 8f45e5bbee5453a4225f05840a9fa80dd574c5a9cac9ec4d787f11c3f86f347c66d39c984a8bbe96dbb41f599e25102f1a3dad1c55b479bebee7d856aaca764a
-EBUILD tornado-4.4.2-r1.ebuild 1842 BLAKE2B 2768d755118cff87118e220bbb3ceb42eee3ea3fef0d1673e297eb2b169b8eccc10aa383900d01cc504d333ed2b53ffcffae41962085c610944178ae2bc36c09 SHA512 7d884601d236d35a39c900b2f11eaa3b3563ecedc40733459423b17b8382e3d67a81fd41c974c2c4eef0afb61b23e6d85a02d7fd4c6906b90282a34e56ea85a6
-EBUILD tornado-4.5.1.ebuild 1840 BLAKE2B 0f682ab8f8698ae3557b4959e3507239b1eb1ff70a90bc40528cdff522f997402daeaf20383246a52b5fd1a25d5b84edc3b7e46d617e0c46c82f95f64b5ffda1 SHA512 bb613c2270d588a3f7d654fed3650f306d37b7b710a0d4afc33280e56708057b2ced35383f0cc53b6ebafa59ddaf9f1f3f38be99441493385ddb7b88f54c6fc8
-EBUILD tornado-4.5.3.ebuild 1830 BLAKE2B 6d2d4af90deaefe7aa9576254f158df612841a699f090ab6dc5454afd8a27dff1cbd3a20718f99f2ccaf31a8ca81dc96ee4c201ecf33d582e5b6d2744b27420a SHA512 b49269558d2a4896a4ecf4b6ac8792c4346b86788a8437e3770c1383d709b80bc968455cae804dbd3a52c77648d5a3249fab8ca71163d1c2797ee78409eb2d31
-EBUILD tornado-5.0.2.ebuild 1775 BLAKE2B 3768a6ee11873499d052ec4b13208c9eeda7897c9cea3efc103bd06fd609a151c898c3b6c3afc39f0c27ef9ae96404ba513faeba1773330efcf71c30792b8467 SHA512 0ba5b19b97435a9817379ae99183c66314925822977c1ea0a92a3983156204769c6cdb0f396ac32061e93306b137bd808e732891250d1d5aa7e7d7f733bbd9b0
-EBUILD tornado-5.1.ebuild 1598 BLAKE2B d4b15cdaa212c116b745ea3ec47b57fd34b4d57960c5b6557eff1bff563ea4f41e7c56c46764c9cc93076f46cb6c14705cb7c8c9d2be66c63e87497bd53d9c5e SHA512 a46a2c211b430361ecee89bd64191591f4e7e383127448371ff5d372e4d672afad7141ae0e323ba33519a15e4d70ccb7f2f5835fef0fc87fe7b927d4af4239b1
+EBUILD tornado-4.4.2-r1.ebuild 1869 BLAKE2B 5f56b6ac2fffc717fe9bd31060cc5788190cc2644d3764dc9b573ffb8bf521c2c33ef49f39022a2a857677b8960274a70e88121b2df10e8b8937cf398ebc7093 SHA512 2402e470a9e8174f8e16bbaa17e99e7666d11869f592a22bbcd8fe87a8082c36142b4e4a8bb13c2203d719bfc07944f1fd01aeae59c9a366db2ad057294b4424
+EBUILD tornado-4.5.1.ebuild 1867 BLAKE2B d003532288d815089ddd423801f5f95bb4435c8f2f8f723186832fb6547e6ba9e7666b18bafc806669335f4dd37de1b69add52cc8ea0ce186c95078f5c03496b SHA512 983150e053e4ffb9907c85327eefb1d533074899407298c5f43a87a7674c6f643c1e0000a3b336adf5778d4df4e99ff1399751fbcb7b5cacc98a181ce83f7948
+EBUILD tornado-4.5.3.ebuild 1857 BLAKE2B 82a2f85ec08e7035c322b8ce29744fcc34b92d18f55cfa9a8e1e74068af34b51897255a05ab2175a4357bb0938835998761844b3ec0930bc8bc90312189d959c SHA512 4add7aeacbd85501cf748a9d029b15bba4d74cd2085696984822661769f3be86459940f60dcd03ef05d205f66d0cdb78064b9388b0162a87613ee7aa31b0e0b2
+EBUILD tornado-5.0.2.ebuild 1802 BLAKE2B 63ebc83246683f61e2c69d1a9105fd59abc6acf4d9a98af5ba03094d5a5a43093ec3c80451eb1d583296b33008dd9a5d9fbaec125fd6403f53671d889c668e6b SHA512 df4a6ed35983acbae462b9523219c718b38c2e6a07164bd7cdf83899f72f5cb87e53f5e5a3a0f4c29ddd057c52c5861e7b833c3aa18f86bc4ddd529712693782
+EBUILD tornado-5.1.ebuild 1621 BLAKE2B afc6927b5dc5b098b0aca15c677691fc524a21a24bca8e19044d18d8efa36d3c15176fa9a72d597a032c1e9cac4fb6876652b80cac32dbe183e7a4856f9853f6 SHA512 1b6760cdd3a49f9d1e66d30bf1b3a34e6c979a9decc36c7ba52b5bcf77f2da98b1fbd373192edf4ecff128dea49451ed262c78d12d6082befa4c3b9b87783826
 MISC metadata.xml 380 BLAKE2B 16a28ca707ba911df09dfad39b269bd888734c1f5e54fdc57d84f62b541e284f248137a01c13055f5e9fa1e1da0a2c9e1382006119cc11ec19302516262b7dc1 SHA512 e790429d61042b60a9011710e96df0044c64cc5ac941ab6268386138d3a66e46d40ed1098ec8bc164d9f4341040946ec7231e8f28dda11790ecc482b06978771
diff --git a/www-servers/tornado/tornado-4.4.2-r1.ebuild b/www-servers/tornado/tornado-4.4.2-r1.ebuild
index 3d603a22ae1d..b03ef4435a9a 100644
--- a/www-servers/tornado/tornado-4.4.2-r1.ebuild
+++ b/www-servers/tornado/tornado-4.4.2-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/www-servers/tornado/tornado-4.5.1.ebuild b/www-servers/tornado/tornado-4.5.1.ebuild
index df6e808e25cc..d4bb99a886e1 100644
--- a/www-servers/tornado/tornado-4.5.1.ebuild
+++ b/www-servers/tornado/tornado-4.5.1.ebuild
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/www-servers/tornado/tornado-4.5.3.ebuild b/www-servers/tornado/tornado-4.5.3.ebuild
index 206e059e0de9..1deec81f52bb 100644
--- a/www-servers/tornado/tornado-4.5.3.ebuild
+++ b/www-servers/tornado/tornado-4.5.3.ebuild
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/www-servers/tornado/tornado-5.0.2.ebuild b/www-servers/tornado/tornado-5.0.2.ebuild
index 98921c38ee75..689b47f22e8d 100644
--- a/www-servers/tornado/tornado-5.0.2.ebuild
+++ b/www-servers/tornado/tornado-5.0.2.ebuild
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
diff --git a/www-servers/tornado/tornado-5.1.ebuild b/www-servers/tornado/tornado-5.1.ebuild
index addc3d01bc47..7ae492a1d302 100644
--- a/www-servers/tornado/tornado-5.1.ebuild
+++ b/www-servers/tornado/tornado-5.1.ebuild
@@ -14,8 +14,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
diff --git a/www-servers/xsp/Manifest b/www-servers/xsp/Manifest
index 5705948e1d21..c1cccf2a6659 100644
--- a/www-servers/xsp/Manifest
+++ b/www-servers/xsp/Manifest
@@ -7,5 +7,5 @@ AUX aclocal-fix.patch 299 BLAKE2B eb9e5ecf89d31bdb0e64675e49c75218234ace565bc1de
 AUX systemd/mono-xsp4.service 340 BLAKE2B 96674d1c6cdfffcfa0a2530ea58c99b4cea8e7c4d3cc1ee8a9b694919b045cb5ead55a715fdfc125fe8c8cd2e4277bf8620e3a4e06471697ba7799acdc7abcac SHA512 d4df0cad0ca0c72cf282ecf377409d255375402910a7f762f9d395a407e63eb3c314932cfee69ec733cb9f1cb7cf88af7125fc2723335efc049cc6ebce2756b4
 AUX systemd/mono.webapp 315 BLAKE2B 159a9c27bba5956dad1b7a2ec1587bd35782d1cb236b9c957c1906b52faeceb4d333e91872b9505e73153a4d16bc1ed6aa76b3b296c1641cb0dc04fc4f56744f SHA512 e7b33fa0f36b27854c8a215cacab25760b5ff91f12415dbd9406e1f92cb0faf035bcfb14b8e0b37c22ff73f0a9c31a1cf9ac213c9167e5f8618a943440e0384d
 DIST xsp-2014.12.zip 632555 BLAKE2B e9c63a1e7ae26b45a6d4bec7aca48fc5f9712ffeb17087f6685009abb3feed4395015e8506b3c1333b59658f0334cadb66d181b35e4508bc807bb9680e360196 SHA512 a9d298079cfae4bacac1575f04e58c3106f532c1f283cc243a8a6560561c0a6b535320d1d3e925c7383bd1f7510f31f115d8e85506e31623c175d7f3f606ab91
-EBUILD xsp-2014.12-r2014120900.ebuild 2425 BLAKE2B 1e600555903d50298d89d74295929ca43e0eb65db47429ecb302560af21802597dfbc1b466422582a90e0cbe57d51eb00d0ef990b326a88fb9587cf1cc6a5400 SHA512 75a2d05703c25dc133cbf09f870498d3e3091b062479dfc5ee0622d8b6da85c3f912095a5990995d267205afb12ce3f94a372b99ff5334cca2b7c747af892791
+EBUILD xsp-2014.12-r2014120900.ebuild 2449 BLAKE2B 168f0a4d62fc657cbff4cc017291228739b11481130694b4e44d27aead31d1aa17e4cd0350ca5a1d74aaa88eac718f7eff5e9dd93aa7ad3b3f2f6daeb660639e SHA512 89708c86346edfd313343b6b2ee307d8c255e953e749956eab10ae0f1b301235281c1533c46b56ceff9c7726326cd3605c2a4c28ec969da867a1d64b51269d96
 MISC metadata.xml 725 BLAKE2B acf5a3c262a129d0aca29935930a5e6f77dae4e6d8fece17f308686ec6f1abc5000e4bdceeb4c86605698b9f9d1a8748b8cf2718df1772e130cdbf523db47889 SHA512 6440ecfb49e563e5b2333343a6484dad837dc9513348315ed095f55d7a3f2970b719fe5515d0e8fa203d099e67fa4c37e73ac0cbca34ceb428747c8e22296189
diff --git a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
index 0f2567648c57..682da894b805 100644
--- a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
+++ b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,6 +19,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc test developer"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}"