gentoo resync : 13.10.2019

39 files changed, 310 insertions, 55 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index d1644e5b43a9..8431fcdaa3c1 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 2cfa18e28083..e16d14f866c7 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -7,6 +7,6 @@ DIST gentoo-apache-2.2.34-20170918.tar.bz2 64390 BLAKE2B d3f6d85192706d7c49a38cc
 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 2976 BLAKE2B 8816d1f547ba7e8de670ef0f45cde40748fc5d611e1060f0c76a8b35ce9771a493f89f2277afcd90ac36fc6f4f684be1e19913d2d3a2ecd78e63e9f4f0d97470 SHA512 32b49f813a80f28b50a2170878d3b204c51db243bbd117b60b8aff63627b42d2cb76e87282ad9053ac1513f0faf8489a60edc7dec0c8087f12650a74d3a533b7
+EBUILD apache-2.2.34.ebuild 2954 BLAKE2B 3966698a01ff8fbce49ecfbcf33a3abf1f77a0dcf0121acc658f257aa5f312cd34f5d721167aabfcfba984e8eb51e3864f28e64485ee0df43472acc15b18bca8 SHA512 6b046c4dedd1f039348530eb1f83432164cce304b6be7c7fdc8473c2bd0b7f463aece8923a5f7ab0b17ffb7b7d207c529c9aa10637138d4d0f144ad3cf7cb9d8
 EBUILD apache-2.4.41.ebuild 8556 BLAKE2B 47b9c03ff5e300069862e397f372c39036d04b2fe8eb4a3d0124914a947d85ca4178f3272b7a39e632bef79944bd3439c4b0946d35b730fa66a0598c924ac267 SHA512 e08037cbf804a2a5bca91d956f7d08e36f7f6d75d440cb4a411abe10fdb819bbf7b23afa14315a35d1efe1454aa4f728a8d0aca70b2c45bedfaf04236d439a89
 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
index e17bfb660c57..a9cf7b2ceb36 100644
--- a/www-servers/apache/apache-2.2.34.ebuild
+++ b/www-servers/apache/apache-2.2.34.ebuild
@@ -88,7 +88,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 src_configure() {
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 4c88db6892bd..f82521c01d9f 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -4,5 +4,5 @@ AUX cherokee-initd-1.2.99 1186 BLAKE2B 3c4d0bbc378940e425bcc8ae4f451e44ded8bc4d4
 AUX cherokee.logrotate-r1 255 BLAKE2B 33d6c7dca525e424d1a88c0248595d011215cebae749a5d6aacc9eecd2b6e8d447d67655570baf62b23db96c5f5611d4a98b99bfcb6be9e194b52794264fcf49 SHA512 73be4a46f217302b3e7969f0a5acf7f83357a831331f85c89c17320c594eb9e6fd87da111b7d8eb06840e0b1bb094106a5bb6f7dbf7923e834164a367f85d5ad
 AUX cherokee.service 184 BLAKE2B 76a55b38f5a7d78df80fd57f9461f68dc360b5efafe19338cc242c71f625b6900c5872283c32a97b6234f58621b89616e123983dec027d3bb1f797d388cf743b SHA512 e05cfe0805bcd7f133fc0bf485fbf781b9cc5e6f9e222b8ea89bdc4e9d4531caa6049100670b67d12bdb73c1e93ed5d949cc1828241213cfcd60a39b7424d8ec
 DIST cherokee-1.2.104.zip 6200164 BLAKE2B 55ff5b5475c478078727ec072da4f1205209701b972efa420fbee4133cb83cf2ebd4a0f49165e4653c4a6b6f9e0f6ef633258e6ee4732d998b19863e99e6e2f2 SHA512 9c9f44643d0d2636f2e3e61ef8e2918d91d9bb6099be761826c8ffad01d339739ed40984d01151044c2e536d4754b5157d6d20c37627ce49eecdb404a716cd9d
-EBUILD cherokee-1.2.104-r1.ebuild 4964 BLAKE2B 029d8ad7715dfdff093e455fcf9fab5d24822dfc078b3a3af33036d0f565df2a38bc83db0f3495e12801cd6c7148fe553cf7863632e6c31e50ac1709d887973f SHA512 191da8332104f432303da4614088861195bcd2d7cec8db8b09547e8a69408cc05245e72b2d9fa99f2c65f22f7f32226d92dcc0d2a2a669f195ece722eafc50c3
+EBUILD cherokee-1.2.104-r1.ebuild 4965 BLAKE2B 2e34aed173cdfc180931252edf77fd89ab1e448c03e08dbb88a902fe06079c8d68c065f9cc6f3ce819b5aa002ebfbc3e23a38393ea8afcf345989e9b3e1b501e SHA512 7257d36a8449b200f24011d9ffb6edc16c010b861999c5b47376696a5e491cae9a74a5ad06c3043bc571af447e4eef228c883929e297f0401778975f1453ec6f
 MISC metadata.xml 468 BLAKE2B cbf0b56c17065b7281b4a762cd2390deb3af8c4388c46488d07c0ba39eee46224ee6420075e587345fbaba4a0cfa160daac8fd59b0343dd7cf25d313bee8aac7 SHA512 bfd1c8c432210025dd9b29ec89b383d3211ee9d1aabec4d59c2ec5801feccebcee3c55f7b6ed4e02daab9e72f42ab12517f957f396d0fd410ad3eee4fd05520d
diff --git a/www-servers/cherokee/cherokee-1.2.104-r1.ebuild b/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
index 0908c4897baa..d73f066ac20e 100644
--- a/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="
 	ldap? ( net-nds/openldap )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nls? ( virtual/libintl )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	php? ( || (
 		dev-lang/php:*[fpm]
 		dev-lang/php:*[cgi]
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index 4128ca61dc0d..0e5388b2f2ed 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -6,6 +6,8 @@ AUX h2o.initd 845 BLAKE2B f420962962517051c695f00e11a3b6edb899a672d0984db3d68b88
 AUX h2o.logrotate 230 BLAKE2B 44eeaf3b0e60104d4f87c7110815a30f907a6fd676e75a2068fb9cddd8192d3e75729aaeabc89d6430eef7c075b21271918fd65b086de188f7df0c6ceb332141 SHA512 88d36e272c52c5df765d8ebac8f2acca378c8b096af7fa8eda68e1ec5597cba6096286f0ab634f128329148e65980128f0612e90a185de781c5d109653e096dd
 AUX h2o.service 364 BLAKE2B 9995cde4d79e5998624a2cadfc6ec3e954d4609458cc267628c2fbcb44dccd78277bddc032a784a00445c6b399fafc1ee629920355bf7aa84d26b1010bd103b0 SHA512 475b1e7b616eae335e094451532b0de5aa9cf9abc4999aaa44a9a35c43def4fb060ee5e728409bc33960f8ad3a81e6f549783906ac7ebad5b72cb7422ffb96a2
 DIST h2o-2.2.5.tar.gz 16257295 BLAKE2B 3c13796eaf9a0aca29bbff7c35fb36d0b5ef47da91f39f71614a89f2d4fea5b1ebbc8f4e3e50bf37a02a84c0fcd96d5ac0be20c83add274157af966134b2d185 SHA512 24b07140d24fbb7796038aab44f44be5ffabc6f2841954273e2ad9f1a864e5482051dd7abfa6446297a46b6868763114695fa4f123ee3175bdac53b4c1868bc2
-EBUILD h2o-2.2.5.ebuild 2175 BLAKE2B 79fbffda3ba28d8d383e8e8ccdc45d4ef42b2b8c04d56dc0391962f1064a59025c22f1d06d770ff739f51474900d3171dd7af117b6d992d5bcf7caf79281eec7 SHA512 1ed3ac19b15cdc5a8348973f8ad0b5631cfbd9d7ef7803a0e99f8fb9d0fd022f78dd930a799c1921e5e18b5bec4c2a3d75450efa5b25d489caa1ecc3878df36b
-EBUILD h2o-9999.ebuild 2102 BLAKE2B a8c2566677bda5a24891f616301fe6384b0a7d96baf8ac073a6b22121abe33dfff124945209acfe03da6561f703092be90ccd06f0c606c8833ca9bd49d7aa146 SHA512 e57abf5cb72bbc96420866cb70721ceebe6114a878d717fc0e0a77fe508fcf03edbe1714b2bc6c63eff0f9f7de5a3604fd6d4f12c0e6e46e8b84ff95c5ba7d2e
+DIST h2o-2.2.6.tar.gz 16257760 BLAKE2B 8474751ca9832ddae2022710654ca58a93ebf9ca01afe934950209b04357b7548b05c598c49fe92684b2910fd6309d6fc3923a0b01cdeeb4b0dc65b08842255f SHA512 f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20
+EBUILD h2o-2.2.5.ebuild 2180 BLAKE2B 9cc3d47f222c70ef32b03579b4186a46256d923dee5c590060e9e09ee8fcf0cbed43ef06f3e4bd978ecf7b3daa5c64751cb2ad6c7ee03c4f6a2a7e6c1d2b4778 SHA512 b7ba9e38180a414cc50390195dd77e9b6dbb1ef765418bfaaa80950b3523fec3366f4b95a0487486b4b2109259403a26cd2e8e95719be296ea269d07c572b29a
+EBUILD h2o-2.2.6.ebuild 2182 BLAKE2B 1bf3c1932cb5085057b5402bc3b22e77d64cb88c2e31c6559963e941ae88465fc127525e6914aee8ef74caedd80dee54dec49680d503ead3fbf76f6b1f8f7860 SHA512 3ee1f726689b7a9d032c911569d8df769315e648fafe866e9d58b6e96f236651ed481b218be1a65bef2dbf82b455252ba0c7b999d4570345fb0a6b5233520faf
+EBUILD h2o-9999.ebuild 2106 BLAKE2B 0f379d92725b055419e6458c84b36dbdb80682e3eceb8ad9d51e1e05bc493556e2c547c8aba82be16eef4909cb1fad7ac53813637e7dddf78e10e2507c8a8b56 SHA512 c56eb0615f10d583f1be479ac24e2f37d8e5c48f25ea2d484a1e9b2a3a5e5456ebf8f65985f7fa5aba3f6d74ee4bcfda650f87c839f74b33c2a5f140eeb4011d
 MISC metadata.xml 610 BLAKE2B ada180731f691d3937d481e71f704b3ad47212114b170420f58e82e4163e4ca388c4f88c1b0760de4fa87e839b5485855f4a23f5fc57f305bd14dcd4b2c54405 SHA512 91c163c3d59c8797d6fac98c20c6bb888cf547e4c6d71090d0556e49b46ec23a44ffc116230621262aaaf0e9cd9aabc1c0b250b7d8e435c42ec01fae5a0d913b
diff --git a/www-servers/h2o/h2o-2.2.5.ebuild b/www-servers/h2o/h2o-2.2.5.ebuild
index de3a311b7555..afa121fe12a7 100644
--- a/www-servers/h2o/h2o-2.2.5.ebuild
+++ b/www-servers/h2o/h2o-2.2.5.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl +mruby"
 
 RDEPEND="dev-lang/perl
diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6.ebuild
new file mode 100644
index 000000000000..586600774979
--- /dev/null
+++ b/www-servers/h2o/h2o-2.2.6.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+CMAKE_MAKEFILE_GENERATOR="emake"
+SSL_DEPS_SKIP=1
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user
+
+DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
+HOMEPAGE="https://h2o.examp1e.net/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +mruby"
+
+RDEPEND="dev-lang/perl
+	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	mruby? (
+		${RUBY_DEPS}
+		|| (
+			dev-libs/onigmo
+			dev-libs/oniguruma
+		)
+		sys-devel/bison
+		virtual/pkgconfig
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2-libressl-2.7.patch
+	"${FILESDIR}"/${PN}-2.2-mruby.patch
+)
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	local ruby="ruby"
+	if use mruby; then
+		for ruby in ${RUBY_TARGETS_PREFERENCE}; do
+			if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then
+				break
+			fi
+			ruby=
+		done
+		[[ -z ${ruby} ]] && die "no suitable ruby version found"
+	fi
+
+	sed -i \
+		-e "/INSTALL/s:\(/doc/${PN}\) :\1/html :" \
+		-e "/INSTALL/s:\(/doc\)/${PN}:\1/${PF}:" \
+		-e "s: ruby: ${ruby}:" \
+		CMakeLists.txt
+
+	sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" deps/mruby/lib/mruby/gem.rb
+	tc-export CC
+	export LD="$(tc-getCC)"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
+		-DWITH_MRUBY=$(usex mruby)
+		-DWITHOUT_LIBS=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	keepdir /var/www/localhost/htdocs
+
+	insinto /etc/${PN}
+	doins "${FILESDIR}"/${PN}.conf
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	fperms 0750 /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then
+		install_cert /etc/ssl/${PN}/server
+		chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.*
+	fi
+}
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index b43017863ba8..54be51dba8fc 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 inherit cmake-utils git-r3 ruby-single ssl-cert systemd toolchain-funcs user
 
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 157656b8c35f..a7e6d3829291 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 6348 BLAKE2B 44f35ac3d1e8f23f4cd2c19c096122b167e771880fbd0f0e09418ec6c6c80f8caa7a3db3837e39f8c39786290166b77f2c3af2f266006cb3e0de095dfaec3b60 SHA512 9bf03dbb369ef1c58d8c6cd8b316973b9d30967358fb57a76be23753054a7cf5021ab08be7ca1b4602eda5f73f9d00aa2d8b34c17747e3f21cd3579f76e609f5
-EBUILD lighttpd-1.4.54.ebuild 6350 BLAKE2B b5330b52a9ad6da987c01f4da797ead95269966c3ba1f96c3632bc85448b4226839a0a42718c969f38f987e3d2ce5562719d4fef7a190f745cee9fb51d73abd3 SHA512 b5db001a909d9cb85763e228468efeb329a24e195223e9de2db5b7ffe92a3ddcc61d89d0ba80dc94559128c3ec32f036fb8de36466696ccc436d29d1aba89704
+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
 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 39be6f6e690d..b1da554c2102 100644
--- a/www-servers/lighttpd/lighttpd-1.4.53.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
+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"
 
 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 7a5a47049e1f..361c6c497a5c 100644
--- a/www-servers/lighttpd/lighttpd-1.4.54.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.54.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+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"
 
 REQUIRED_USE="kerberos? ( ssl !libressl ) webdav? ( sqlite )"
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index 97a708c670e1..6cb8e20c3c2e 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1,8 +1,8 @@
 AUX nginx-unit.initd 288 BLAKE2B 94caaeee62d93cdb3b9240bc6563fabe9b273b2125f9ec0c1ae0a2b079bef89b94f7e3a748d649a0840595f46047cee7ea388bd9514d1da88bb4a041a4a2c8ef SHA512 52a788e21a9aaa90a470a7861cd9856e3c2d2c52e3b4a23276c8b43e2a22f6f5aaec78caaf5f449463f1b856e0ffd83515e583f0ced00eada2d0afc00949ca77
-DIST nginx-unit-1.10.0.tar.gz 564348 BLAKE2B 82339422b4b3b696ff4bbb216d6c0d54f046531aa56f6e0f5602a9bbe18db878b6bc9c9e9b1513be0cee3197f288549d8a6f826bf69ffbb91fc35757775bde4d SHA512 da2b248ba22e5d46fa1c8c21041a875655fad0e1a09683c58cb5bb33ed0a671a921c7a13f99269f0574da02d0efaeff0233abc901e4e333f3f7ac9383334c781
 DIST nginx-unit-1.11.0.tar.gz 681333 BLAKE2B 4e727f1b0bd5a593ea360b4125173bc6b3694b953fa2c775ce4f7112bd9f2df131d4bfd4e01cb653c08a9cdacc560a6961b8926c797ea2ce7d6c32a7e4f7f7e2 SHA512 894093385137bc188c50b86540182007bac1740a063359f494c1984687352eccb879f7d6b7b6623d5702cce3c793f12c60a2dfab94bcf9cb817b80a1577409d9
+DIST nginx-unit-1.12.0.tar.gz 681661 BLAKE2B 1e497172a37fdcd33d0ced5b97675bff42f4cadab2f9363316e667c90c8b4dc4b43f4b8d5cff9f547daa7e92d532550434907515134a5c958586f1822beea749 SHA512 a55a084ed6e1cd3f784bd81571772ca29ca9a0d19089c9bb74c88258d2e1ef872978219c47b6dc2610711ae1aa95ef68ddb77f45747a2eacdd9d92c6f8fee28b
 DIST nginx-unit-1.8.0.tar.gz 511226 BLAKE2B e396b27954840a5f1ad3a4cd9501a5e5fe769a754c51043da784a2c4596e6acc33089f495bf412a0db086e5c715a51292c7dece004a6512564421a431b6c339e SHA512 1d0ad05343ff70aff4c6e221a36c20df95fa2e2262ae5c69963a9bcb9ef883151e8a2fa9fef29f43ac5489aa5cbb3e9dfd10cf5e7f6d7a98742b490ebf3a0413
-EBUILD nginx-unit-1.10.0.ebuild 1704 BLAKE2B 89e32ac74a41281be6fd66d069a7ee8068cddbd20cc3c82af9d21a9dacb3a6ce770c39547758e2653bbe82b86110985fde7b71f875437f9ec158b2148b664d00 SHA512 1620db91709ccff3a3ed4e79cdb01616aadc2c9790049cc23ffa45e9c0f54c3f8d0460a8bded8e49d44179592d9db979fa43b473f23d08fd6fa2d905e8289b9e
 EBUILD nginx-unit-1.11.0.ebuild 1704 BLAKE2B 89e32ac74a41281be6fd66d069a7ee8068cddbd20cc3c82af9d21a9dacb3a6ce770c39547758e2653bbe82b86110985fde7b71f875437f9ec158b2148b664d00 SHA512 1620db91709ccff3a3ed4e79cdb01616aadc2c9790049cc23ffa45e9c0f54c3f8d0460a8bded8e49d44179592d9db979fa43b473f23d08fd6fa2d905e8289b9e
+EBUILD nginx-unit-1.12.0.ebuild 1704 BLAKE2B 89e32ac74a41281be6fd66d069a7ee8068cddbd20cc3c82af9d21a9dacb3a6ce770c39547758e2653bbe82b86110985fde7b71f875437f9ec158b2148b664d00 SHA512 1620db91709ccff3a3ed4e79cdb01616aadc2c9790049cc23ffa45e9c0f54c3f8d0460a8bded8e49d44179592d9db979fa43b473f23d08fd6fa2d905e8289b9e
 EBUILD nginx-unit-1.8.0.ebuild 1702 BLAKE2B d1e3ca67f25ffe4f4538acb00a0e5c2ed91c3e56facc2c9e7591d7944f12a070fc3dd839154ee848795756f87dfcc60cadfa6ed2e5396a8abe189569f6ba18b6 SHA512 a09d58603a0d9529ad3684ba3306d0a0f603a3dc8479c6c12e9841f88c2b4f9daf6a261fbf60682b9596d6f7eea9fba5dafa4ccb514ae0667b834c0384ddf5e0
 MISC metadata.xml 998 BLAKE2B 89d0469b5b21967d1526d121fea36c3312a43e0a4c703aea36f451d4ef8cb4926435aca6a8af2d1ba9964498166da7551bcb6a87bb86a24896f08bf1d2016fc4 SHA512 c9e76bb48c5e1297354c25c7bf01cc80a3d0e2d21f130e24df5647987e9ac6747a9f02851070eea3fa948a7bfbb030b12f869f604ab3c63d82f481ee6c7d3ef3
diff --git a/www-servers/nginx-unit/nginx-unit-1.10.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.12.0.ebuild
index 72e543d89536..72e543d89536 100644
--- a/www-servers/nginx-unit/nginx-unit-1.10.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.12.0.ebuild
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 42f2a2ddf439..6fe4266096d3 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -37,7 +37,7 @@ DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 DIST njs-0.3.5.tar.gz 339177 BLAKE2B 6327be0b7c8077870408722376782bca579a6cfdf1fe2a4950fc0d289311ad21f671bc2b47d06f70d95d4f68d99e8c70fd4598dcc167b79c57704d99a098d284 SHA512 236e0284f251856f74eb51d8251bb5be725d2ca90056f2feef7677eb636a4e97e203f3bba81fb6b677158d615dc2d6ffcb0dc1059fb678ab12b7d14cc4ea7241
-EBUILD nginx-1.16.1-r1.ebuild 40541 BLAKE2B 716e9f89beef4e4ba6b31342a2d9b2d8ab15b3d535e8efa47f5f08f5189069bd109fe863f5cc213569ade567e23a42b428c08582a730ac0fb2a6c9bf4c9323c4 SHA512 9cc3c04aa21f0176e4edd9649fb1947dfb67464183db94cf9a28257a564f2882ffc9d01babf96ec6ac59463a9798d3c2ae50cba30eac24a9d4410a4106ab6c87
-EBUILD nginx-1.17.3-r1.ebuild 40543 BLAKE2B 09d98cabe18fe823f39c8fed10020be747a62b93a5548e217af587ea4f6fa4774d761ad06e099d7cf7d0dfa98935e02ce423a52a27f9b71a841e195a17e681c5 SHA512 aca5a9c33c4619445c870de8cc674df065d43dca92cdc831b4f346dfcec8059270b99592cc587701a805ca8380418ca96ce2c6a245a7362f2e0668041ed32c2e
-EBUILD nginx-1.17.4.ebuild 40543 BLAKE2B 09d98cabe18fe823f39c8fed10020be747a62b93a5548e217af587ea4f6fa4774d761ad06e099d7cf7d0dfa98935e02ce423a52a27f9b71a841e195a17e681c5 SHA512 aca5a9c33c4619445c870de8cc674df065d43dca92cdc831b4f346dfcec8059270b99592cc587701a805ca8380418ca96ce2c6a245a7362f2e0668041ed32c2e
+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
 MISC metadata.xml 1310 BLAKE2B 6f40252a833a188f4b62cb2f2a126f93e68cdcd0e3575febdc371106c82d7ebdc6931b162a5ef8070fb6fe1f18e969191f67d3ccdd5e55712dc4d209c16c34c9 SHA512 10403ec29eaa83eb45b7b0b78340103b226145b52b3795e18b1e8bf272efa83586bc190e6e66061f33544434e3c2f94d2229be988733713578e9bb495ce7219c
diff --git a/www-servers/nginx/nginx-1.16.1-r1.ebuild b/www-servers/nginx/nginx-1.16.1-r1.ebuild
index 545fb9980583..fcb191046b1b 100644
--- a/www-servers/nginx/nginx-1.16.1-r1.ebuild
+++ b/www-servers/nginx/nginx-1.16.1-r1.ebuild
@@ -202,7 +202,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 # Package doesn't provide a real test suite
 RESTRICT="test"
@@ -311,7 +311,7 @@ CDEPEND="
 	)
 	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
 	nginx_modules_http_lua? ( dev-lang/luajit:2= )
-	nginx_modules_http_auth_pam? ( virtual/pam )
+	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? (
diff --git a/www-servers/nginx/nginx-1.17.3-r1.ebuild b/www-servers/nginx/nginx-1.17.3-r1.ebuild
index fdcbac0c5c8c..e855a007babc 100644
--- a/www-servers/nginx/nginx-1.17.3-r1.ebuild
+++ b/www-servers/nginx/nginx-1.17.3-r1.ebuild
@@ -202,7 +202,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 # Package doesn't provide a real test suite
 RESTRICT="test"
@@ -311,7 +311,7 @@ CDEPEND="
 	)
 	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
 	nginx_modules_http_lua? ( dev-lang/luajit:2= )
-	nginx_modules_http_auth_pam? ( virtual/pam )
+	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? (
diff --git a/www-servers/nginx/nginx-1.17.4.ebuild b/www-servers/nginx/nginx-1.17.4.ebuild
index fdcbac0c5c8c..e855a007babc 100644
--- a/www-servers/nginx/nginx-1.17.4.ebuild
+++ b/www-servers/nginx/nginx-1.17.4.ebuild
@@ -202,7 +202,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 # Package doesn't provide a real test suite
 RESTRICT="test"
@@ -311,7 +311,7 @@ CDEPEND="
 	)
 	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
 	nginx_modules_http_lua? ( dev-lang/luajit:2= )
-	nginx_modules_http_auth_pam? ( virtual/pam )
+	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? (
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 56926342e859..325b20a907b8 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -2,8 +2,12 @@ AUX puma-3.12.1-ruby26-waitpid.patch 1722 BLAKE2B cee9b9e89cf098a387481d754732f5
 DIST puma-3.12.1.tar.gz 217543 BLAKE2B 6427c48d17ead515a17fd53ba05baba0ca27b9a3c6b26257e83b21ce099d7ff36666dfe1f1a964d23addd666c5aa83c46e6795ad2e22236de7136e25be689ff5 SHA512 70784ed89403e96d1bdb68f3ee0a5446d98a6f8a1af5ddf369d837e2ae3320118c29c9c33e7a9db7a76b1a80aef66a9b6426140c492721984de50e7cc5fc8300
 DIST puma-4.0.0.tar.gz 224071 BLAKE2B ff8adaf78a6534739e7a93d50ee4a82548d89698f4f9007e38ae7fd92bf97ce19e515a2f31556884655d30bb2f0d8395262a2c32125543728ba3c5d1f14fdebd SHA512 5393a254e213ef4e9378ce1ffd05b5a0db54a356f1293dabca04cd2281673d28dfa619750b618b415f7673c47f6edbec5c1a7332e962901b17fb434b60156373
 DIST puma-4.0.1.tar.gz 224363 BLAKE2B 775814eaa6c71deae90bcef850bb8779b6e2b18ed6a694639354678be684d7369f1be7c2234856289f3ac3adf42fbecbbcf243cb44b07c8f99d6a09fef6e09ab SHA512 5d7c8efcf7740484f017311cc074ef4897f600bb21f90836844a6871389206167a4b646c7782e270f68d173e03b5ee16d34ffc2e04f06cebcd31c795d7410885
+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.0.0.ebuild 1997 BLAKE2B d6bb73a3b56d05e69e504650b3af501948ca76054de2e15040867912503bcc7bbe87f6b0cb5d013cfedb73ea75e7c08028b1e591391ccb374fae7c9772960f01 SHA512 75b94a5106c5697c16765d9db68c867978f87374655d4c3b8fa965a884802ce21fffd7e5ef28010bd3fd9a0374b5bf4cf1f1ba9d576529d200fb69d97e09c40a
 EBUILD puma-4.0.1.ebuild 2034 BLAKE2B 7d221d2b2067e62cbe38de4cc8c2b5a8d342499effa293530787cbbc992d12e6fd090e38e9624fa8ffe0939774c4a05f1b6770f1cc25b522af4460fa43d6e965 SHA512 ce21700c04dcc98febf7a5f50815ae2324565c24737beb0226024362b394e8186529d0d8e318ddbf66f3a850685978f476cde4f0a54a3b0766e44d21c85fe335
+EBUILD puma-4.2.0.ebuild 2120 BLAKE2B 56ea8d92332904306249554f4ea8027569a7c7ee847ea4def39c0e0441ccb26b30be9e596df750373774538c8c11b2e280c75329316223f7ea05dca00f0a6d4d SHA512 e4bf235ad96a7394b5ae2efad00781af95ef1726de6178fa120b1ffdb7997d0428060273856de1fb445543db4c5c5660446d841f0af804e284311ad2d0506bff
+EBUILD puma-4.2.1.ebuild 2120 BLAKE2B 56ea8d92332904306249554f4ea8027569a7c7ee847ea4def39c0e0441ccb26b30be9e596df750373774538c8c11b2e280c75329316223f7ea05dca00f0a6d4d SHA512 e4bf235ad96a7394b5ae2efad00781af95ef1726de6178fa120b1ffdb7997d0428060273856de1fb445543db4c5c5660446d841f0af804e284311ad2d0506bff
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/puma-4.2.0.ebuild b/www-servers/puma/puma-4.2.0.ebuild
new file mode 100644
index 000000000000..ba941f94f9c7
--- /dev/null
+++ b/www-servers/puma/puma-4.2.0.ebuild
@@ -0,0 +1,73 @@
+# 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.1.ebuild b/www-servers/puma/puma-4.2.1.ebuild
new file mode 100644
index 000000000000..ba941f94f9c7
--- /dev/null
+++ b/www-servers/puma/puma-4.2.1.ebuild
@@ -0,0 +1,73 @@
+# 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/tomcat/Manifest b/www-servers/tomcat/Manifest
index 69b78ec3ef22..839b16ede1b5 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -18,11 +18,11 @@ DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec
 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.0.53.ebuild 4554 BLAKE2B acdadf7f369b1c69ad391056abbe79dccfbaa1b561cdf050f7da1cb1da0bd3b8be0004ebfd9795bd1cdaa2b9b58d2b3cbfd84e97453a8a70455bd99d2d46b524 SHA512 665c4bd33e542f36268f4c4b1384f10a69e65dd81aca1a603e9b3969380a050754c215684131683940e346300bca77e7c1fee0714a5e4ee785531c5c3edeb2e9
-EBUILD tomcat-8.5.43.ebuild 4610 BLAKE2B a866bc62257c5e626d3d87d2fac5bc5bbe8e78c9a10f4e7c3fa54ba189dc0b91809004ce7a694a542f2d731d1c9ffaec92c7e69215b5cd837f756569ae30e6ab SHA512 9384a10d39b2558c468b720e6f80d232cf60b9d511017dc774ab035db03ccdca4d328e4daf2775d525f73eba488d44f4bf5c284523018140d50213b596501ebc
-EBUILD tomcat-8.5.45.ebuild 4611 BLAKE2B cc605cde3f85f6bd888a95caaa8876b832c0a4004a0a204a43a7e98eb6f0f8659c730d1daefd0d017a505c85f87f4f4fda4b617dd3c7288543470bdebaa411a9 SHA512 af20afd3a50be9e9424f250022f97f314e97f38dc252f9cfa9be692f1cc7f144cbedf662e56dfdfba18b28f2f3fcf788303b9365ec57c868caf60555d2696651
-EBUILD tomcat-8.5.46.ebuild 4611 BLAKE2B cc605cde3f85f6bd888a95caaa8876b832c0a4004a0a204a43a7e98eb6f0f8659c730d1daefd0d017a505c85f87f4f4fda4b617dd3c7288543470bdebaa411a9 SHA512 af20afd3a50be9e9424f250022f97f314e97f38dc252f9cfa9be692f1cc7f144cbedf662e56dfdfba18b28f2f3fcf788303b9365ec57c868caf60555d2696651
-EBUILD tomcat-9.0.24.ebuild 5521 BLAKE2B 6e93568948c6019823c0bc206a5ad977e4dc1baba0071644a32c0e84cd6b5e6bf5f8085c92a4976c4ca76cb51ea2162615697fcd118ddb7d17bc4d4f6c6c820b SHA512 2bcb2c9002e2566c64d74990ede3c4dddc72cdc8e1a783326987afadbd10b8a073d21b8ca6fbf300f1e9d82d104a34f52ca2c525449a15a7d7fda4ce17b2da26
-EBUILD tomcat-9.0.26.ebuild 5521 BLAKE2B 6e93568948c6019823c0bc206a5ad977e4dc1baba0071644a32c0e84cd6b5e6bf5f8085c92a4976c4ca76cb51ea2162615697fcd118ddb7d17bc4d4f6c6c820b SHA512 2bcb2c9002e2566c64d74990ede3c4dddc72cdc8e1a783326987afadbd10b8a073d21b8ca6fbf300f1e9d82d104a34f52ca2c525449a15a7d7fda4ce17b2da26
-EBUILD tomcat-9.0.7.ebuild 4564 BLAKE2B bb3e1e254fc8eada11610515139c5edf3e4c310dca7990a3d1595862848dbd4157eb7380362a893ae2a904cadfc1f1e6e5c576f89a2c1b5fb48c047e9bb70328 SHA512 cc933b2ddccd45542d8be98cb18b2288ef7eb1db9f587405cc0d04591b0de9334394b4962b0c1deecbd3e8cb0429b2cacabb5de607203030aaf6fcc4134fe9c4
+EBUILD tomcat-8.0.53.ebuild 4544 BLAKE2B 9bbede27a251312d310a8fb067e6d2734877907c8264895fa97e8de5d0839599e0a8c9e249740a673b7ead61406e74f281c358d21eb0e553834ba0c7852d1b42 SHA512 52ad7767dc5edc0ed43ec111433ff7323e135134f3c9d357a66a604c3a0e8184f36a7bb47935c104075a7dd4e8bbd0075c933d1c7cc745639c9c842c07dd2d72
+EBUILD tomcat-8.5.43.ebuild 4600 BLAKE2B 83a3150b11244cf690433d298319f25451e03a1caa6ef07eda33de00160f049dcbc3a6b3071412c2e14a5612c732479e93ad55d5f2a096ac179aa57bc8c78d0f SHA512 bc83eeac436f6fbd2eee8c07cf0526befed08327ac4820d4b2fd7559bbbd0f366cd076692bec2c9faabf1f1ef1a65307c7afad0d941a3e21f4a5d669828346ac
+EBUILD tomcat-8.5.45.ebuild 4601 BLAKE2B 31710c36ed15ed670d28824e55362b9f08303335596a5077353d1c0142dbb0f9654aff566687e32c2a2066709a000eae643fc203147d30c95b0a5153f9baf55e SHA512 e36396e6e8ad501692a9bb6e49d7300db7357e0501d20a9be17319f673b4250e090cf32d6392bf4ef54cefd0ef746277a78cd231b2abe195c6eab96606d8c666
+EBUILD tomcat-8.5.46.ebuild 4601 BLAKE2B 31710c36ed15ed670d28824e55362b9f08303335596a5077353d1c0142dbb0f9654aff566687e32c2a2066709a000eae643fc203147d30c95b0a5153f9baf55e SHA512 e36396e6e8ad501692a9bb6e49d7300db7357e0501d20a9be17319f673b4250e090cf32d6392bf4ef54cefd0ef746277a78cd231b2abe195c6eab96606d8c666
+EBUILD tomcat-9.0.24.ebuild 5511 BLAKE2B 751c4feb923a08c6cb549e7f191cec57d6f940fc57de62e0b4fcd597f92513189cc2709df4dcf69c75fd12956cefc835f5ac6bd543eef8f64edf3e943e99b7b1 SHA512 d74b33ad5fd345ce86ce0ffebfeade235906ad73347404d62caa9c07f82d893f13454be824be42a147f3a7f737438a336d9c74895107ed68492dae695dd1cedd
+EBUILD tomcat-9.0.26.ebuild 5511 BLAKE2B 751c4feb923a08c6cb549e7f191cec57d6f940fc57de62e0b4fcd597f92513189cc2709df4dcf69c75fd12956cefc835f5ac6bd543eef8f64edf3e943e99b7b1 SHA512 d74b33ad5fd345ce86ce0ffebfeade235906ad73347404d62caa9c07f82d893f13454be824be42a147f3a7f737438a336d9c74895107ed68492dae695dd1cedd
+EBUILD tomcat-9.0.7.ebuild 4554 BLAKE2B ed8c298301b751bdead671e91111b44b2ae84ab5597263b67fbcf40d95679c9850dae96c796cb9a348799ee0bf677d88ac3e7c8c936c3d2098ba8643b1ae33d5 SHA512 46197feebee5fa8fdfe63670374bc443e275175a27cfe64e57d144322d1418cba0eb54c89840b695fd12577e067330c71b4871d1fab787d899b4500bb9beb989
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/tomcat-8.0.53.ebuild b/www-servers/tomcat/tomcat-8.0.53.ebuild
index 2bff270eb8b9..04b793c91442 100644
--- a/www-servers/tomcat/tomcat-8.0.53.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.53.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"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.43.ebuild b/www-servers/tomcat/tomcat-8.5.43.ebuild
index 542077cf4929..c6e5e958e89e 100644
--- a/www-servers/tomcat/tomcat-8.5.43.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.43.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.45.ebuild b/www-servers/tomcat/tomcat-8.5.45.ebuild
index 04794c75c5e0..4122092f6b87 100644
--- a/www-servers/tomcat/tomcat-8.5.45.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.45.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.46.ebuild b/www-servers/tomcat/tomcat-8.5.46.ebuild
index 04794c75c5e0..4122092f6b87 100644
--- a/www-servers/tomcat/tomcat-8.5.46.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.46.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.24.ebuild b/www-servers/tomcat/tomcat-9.0.24.ebuild
index 653707b85ff7..bc8bb7bd1eee 100644
--- a/www-servers/tomcat/tomcat-9.0.24.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.24.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.26.ebuild b/www-servers/tomcat/tomcat-9.0.26.ebuild
index 653707b85ff7..bc8bb7bd1eee 100644
--- a/www-servers/tomcat/tomcat-9.0.26.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.26.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.7.ebuild b/www-servers/tomcat/tomcat-9.0.7.ebuild
index e3c61d5f22c2..7a404767db95 100644
--- a/www-servers/tomcat/tomcat-9.0.7.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index e2bfedcd860f..ab40571c3af0 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -7,8 +7,8 @@ DIST tornado-4.5.3.tar.gz 484221 BLAKE2B 7b3682fa85a7f6ad32351d40993516a3e397b7b
 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 1852 BLAKE2B 974e164a7794e7ad8d30447bcb0ab8aa6c9510e1c86f546b1e06327f83dc38c6af90400f5cc2cad9007475b9a5e7557bc49a1a5c21f823e72c4279506c3966c8 SHA512 0e90bf0b2e8d7216a7714c14b51e9100c6f8e79e18d7718e4f97c05d211df976166614b0d1546493c2c08d7bf6c2ab8f10015f891af05afe754d97c0646da303
-EBUILD tornado-4.5.3.ebuild 1842 BLAKE2B 6c6b4db4d90d2a74dd4e52a35c149b93d36abe2b3cc84e83b4f18fc7b18d4963f7a25b0e7d9040b09496a8fbe82d6a02d3d4f87a13c6e669fb91e1c427149202 SHA512 dbf0efd7fb45d1a4416913a77e8dc2b3792ba0fff6b62fa494eebbd2481fb75c4946c95b93097d6f069ca86f3bdae8b7ebee971c2d503682f3ee5926f8959eff
-EBUILD tornado-5.0.2.ebuild 1787 BLAKE2B 1c0fdb179e0dbe19c5e617038ff526365cd2ad2546a306024c5492e43f335bad4807aa923f6e0794143ce7724acec5d83ff5c5b4686f133270719e7d38af802f SHA512 bb4ef16a3d17f379b71fc2781984d762dd6e75874c8feeab18e62e7282f8625f8b8fd52f92f4127031f557003fce5806d19875b51440ac437e0d3536405c4720
-EBUILD tornado-5.1.ebuild 1610 BLAKE2B 4ce7ae2faed9e11335c0c2998b651c49b5becf07ffebbce3623b5864fa4d73ab4e05f84bfb7efdcc18c6385f363955ea1b87a3ff87c17d1b07aabbc8b8c5e522 SHA512 7c7ba94be1c273df596ea3068400301efc6f4bc9eb14a0badc6393091fb7560d03c9cc59f97d52ee037760084f40b7d8d241796c782d89ee46a472ca62216a4b
+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
 MISC metadata.xml 380 BLAKE2B 16a28ca707ba911df09dfad39b269bd888734c1f5e54fdc57d84f62b541e284f248137a01c13055f5e9fa1e1da0a2c9e1382006119cc11ec19302516262b7dc1 SHA512 e790429d61042b60a9011710e96df0044c64cc5ac941ab6268386138d3a66e46d40ed1098ec8bc164d9f4341040946ec7231e8f28dda11790ecc482b06978771
diff --git a/www-servers/tornado/tornado-4.5.1.ebuild b/www-servers/tornado/tornado-4.5.1.ebuild
index 43da253ccc07..df6e808e25cc 100644
--- a/www-servers/tornado/tornado-4.5.1.ebuild
+++ b/www-servers/tornado/tornado-4.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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"
 
 CDEPEND="
diff --git a/www-servers/tornado/tornado-4.5.3.ebuild b/www-servers/tornado/tornado-4.5.3.ebuild
index b7cc6d4b6ee0..206e059e0de9 100644
--- a/www-servers/tornado/tornado-4.5.3.ebuild
+++ b/www-servers/tornado/tornado-4.5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~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"
 
 CDEPEND="
diff --git a/www-servers/tornado/tornado-5.0.2.ebuild b/www-servers/tornado/tornado-5.0.2.ebuild
index 069b29f2dc0a..98921c38ee75 100644
--- a/www-servers/tornado/tornado-5.0.2.ebuild
+++ b/www-servers/tornado/tornado-5.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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"
 
 CDEPEND="
diff --git a/www-servers/tornado/tornado-5.1.ebuild b/www-servers/tornado/tornado-5.1.ebuild
index 86ab2f2853ad..addc3d01bc47 100644
--- a/www-servers/tornado/tornado-5.1.ebuild
+++ b/www-servers/tornado/tornado-5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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"
 
 CDEPEND="
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index f776a39b4582..db48fd306625 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -6,8 +6,8 @@ AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886
 DIST uwsgi-2.0.17.1.tar.gz 800156 BLAKE2B a8697263e6e7689c0062a06a9fdb1101a2df72e0ac9122b5f8a0acc78bbdbdeaa96faa1c8870b9c3a43e2e1fb5fc835e708e1bc3d0171ae746467b4734dc299d SHA512 10d357961fde3a3f5f8e77986cc647313f95a33243e24c2afc482fce21df68a8ae48f90e7b5b76d7edc3cf8fd474d99823d6d60ef7477349abc65a319222f11b
 DIST uwsgi-2.0.17.tar.gz 798642 BLAKE2B 86efb2103efaeedb37ebb00de4c01477162d119ae3dea0dc0696385216e30ff2c74eb48576f86eb181b8ada4b9eaa63b0aa761e966e3301597633d33b81142e1 SHA512 639427fbb89a1c2610c1cafb6ff009398a3c0a8e27c3de3f00829428271ba97b64b1253368dd6150912cf44441052be2a63cbe81613bbe964be27ee2e570d2b2
 DIST uwsgi-2.0.18.tar.gz 801555 BLAKE2B d8008e751fd699474a1b7d6276c10b3d2f1ebd0ca325e45bfb3b13f81e88de20e4e7389cd6aa9c8b3daa964d9b11524ee71e93717ed9762bf021471f6a2c09fa SHA512 6561703279bcc4a81311d033810ac066d0f113bab13b0942f3eef86cac29c584a6641b52476840d6895151aee5ed064ae2d03b18932cf7f47e62f4eeed76da61
-EBUILD uwsgi-2.0.17.1-r1.ebuild 12195 BLAKE2B bd12570a9a4e6f8dbed88f152c2e70fe558c88cbd18ac1d8fcdd72c154f4038d5bd4e6de32e8f69dce9208510663130b0a56e64756555bff94f5165e025dcf63 SHA512 1f28c1aba92855d2926dfd7de342662daad8674b688149a231d3107e25762b3f544325f4b08c273887e4549a81f41ecd47f9dd15bfcd71cbc5f6f283cd9f0fd4
-EBUILD uwsgi-2.0.17.1.ebuild 12676 BLAKE2B 959c2e430a7e0034260550abeada39ff66760507d16d1abd87dc298c7eec6c798ba37c45277c861dd3b483118bc1980e473aa305a34e947452ff9d0a88b7e9b1 SHA512 932306df88885319479efba216b001b20dd4c357da9ba232ed7fb49b0ce75ead1ded8da560832fba7998537f3419f39b66af302e7d8ad2b415dd9a2a8d5d1775
-EBUILD uwsgi-2.0.17.ebuild 12761 BLAKE2B a4fe5bd57e8f54433b9a5e36c362fe58080f132050ff404b3277f983203ed4702b47686ebd90b3080ddc317ca6b72a5ae973ad07f5db9abf6dbde8e75f411298 SHA512 15443b2a197b2e16dada318bb296c62dd576785e283f2402696fb6055af860691ca0a1ac693acc942dc6131299d52f6d3cd5c8a841f9bf43642fcf6f359d734f
-EBUILD uwsgi-2.0.18.ebuild 12220 BLAKE2B fbdac6caea2c87cda1b5dcaae932b9fe823db1a142dbe560aac917b379eeb91f5bd5cfb3bcf038fe20cbc7e8f03633daca0a6b5bd7e90c1c37a7a4bd93b26c0e SHA512 c0fb69a18e71023316426b3e7fe38094e0c322fc3f9f66a1aa329d34d78c5b5bee04a035b7c99ef2ac24bbe06c07836484c39447bc7d2c8670b3a20d31ab5e0b
+EBUILD uwsgi-2.0.17.1-r1.ebuild 12196 BLAKE2B 28ecaa493e426821879dbaa6cd81447a2f44eb6605accb58b57b04db3aecc547f86b8048751f3a47b47816742a31234145504357dba736c889933a95397985f0 SHA512 e65f1908c4ade761776e3e0a92f52dda4f2bce4e299a284ae4cf85625fea37f2105c0965220160120e9ddc22717cf4cb416d4ae0f189c2ffb167ac65402b7b93
+EBUILD uwsgi-2.0.17.1.ebuild 12677 BLAKE2B 7e1e3ebb71f36956f9795a83c5d2b6da385c2360685a5b20021822d62d595fc7ed6f896e23b04d17c227b65eefbd14dcc8399d0b5339918b391fde5109a8aa54 SHA512 251687fbf01c35ac6dabce3b7bd67e3b702e7f573e02e7bc12501c3ad798ec2711cae61246e6d224836366db39566e48754dfdda1fab77246b19a97402474de1
+EBUILD uwsgi-2.0.17.ebuild 12762 BLAKE2B a42910c75d9f7c8695e35cb508af3b5c4f5ddcd8e15b4586df20d698515ff2fbf4d8e1d343c9b4f80a61712f5927251c9ab9e8f603b9a854cb2614db4e0609fd SHA512 27d4669cc1056c220dfda8f56f7acb5687befa109c328ba443bd44192e5c0e46691fc46eab88fdb18f4896d2b96fb818f55bea5b08ac53bfeb704fe6569c2e6a
+EBUILD uwsgi-2.0.18.ebuild 12221 BLAKE2B 2823ecb28a598cb1ecd62f894be18e150488e52440047600b61b757148d1cce4c5064152b9426f905f7ba2ed7f56e9d3c08c64cd5487ad2d51071245ba703da6 SHA512 48f520af1ec89a61b3df2b3cc0a6e0919f7ac75dfe55f4f563acd4c648e5920a5bb8e9653315807627368f741dcbb34e2a7f79f333cecbf31104ff1de0a2df3e
 MISC metadata.xml 1508 BLAKE2B 22125c58eed49b27100421613726f650e78bba0fb712eea2a3e122862101f34803636c12fa98cdb7483dbfad00e51cba6419ee4a93d43e5116530cb43e6778b2 SHA512 4a925a03e1ff9fedf6d7d4ad9673fdf12caaf6d9b2c4ce5cce01b964ae50294451b6d2f820121dfbe8a9288d0ae62180acc243a07ab1b365e10fef65adff2a02
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
index 972eee8c2333..3796af4266e3 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
@@ -103,7 +103,7 @@ CDEPEND="
 	uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
 	uwsgi_plugins_geoip? ( dev-libs/geoip )
 	uwsgi_plugins_ldap? ( net-nds/openldap )
-	uwsgi_plugins_pam? ( virtual/pam )
+	uwsgi_plugins_pam? ( sys-libs/pam )
 	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
 	uwsgi_plugins_rados? ( sys-cluster/ceph )
 	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
index dbf4130313b5..8f7415b12c4a 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
@@ -98,7 +98,7 @@ CDEPEND="sys-libs/zlib
 	uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
 	uwsgi_plugins_geoip? ( dev-libs/geoip )
 	uwsgi_plugins_ldap? ( net-nds/openldap )
-	uwsgi_plugins_pam? ( virtual/pam )
+	uwsgi_plugins_pam? ( sys-libs/pam )
 	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
 	uwsgi_plugins_rados? ( sys-cluster/ceph )
 	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.ebuild
index 91962faabb4b..042f8eb04412 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.ebuild
@@ -98,7 +98,7 @@ CDEPEND="sys-libs/zlib
 	uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
 	uwsgi_plugins_geoip? ( dev-libs/geoip )
 	uwsgi_plugins_ldap? ( net-nds/openldap )
-	uwsgi_plugins_pam? ( virtual/pam )
+	uwsgi_plugins_pam? ( sys-libs/pam )
 	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
 	uwsgi_plugins_rados? ( sys-cluster/ceph )
 	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
diff --git a/www-servers/uwsgi/uwsgi-2.0.18.ebuild b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
index 08bbfffa2829..72b936012c29 100644
--- a/www-servers/uwsgi/uwsgi-2.0.18.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
@@ -103,7 +103,7 @@ CDEPEND="
 	uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
 	uwsgi_plugins_geoip? ( dev-libs/geoip )
 	uwsgi_plugins_ldap? ( net-nds/openldap )
-	uwsgi_plugins_pam? ( virtual/pam )
+	uwsgi_plugins_pam? ( sys-libs/pam )
 	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
 	uwsgi_plugins_rados? ( sys-cluster/ceph )
 	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )