gentoo resync : 17.02.2020

23 files changed, 37 insertions, 47 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 4434d8aac3da..92b4802d37f2 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 3f002f8e78f4..d276a645419b 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -4,5 +4,5 @@ AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
 DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4
 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
-EBUILD apache-2.4.41.ebuild 8584 BLAKE2B acf6adc4c11c1a459e365ef45ff560e28b5d927600ebf35449441682f8ae19cdaca8d4109fab2c1fead463015564533e9895c33945a59a792dec79c04a8c2165 SHA512 a3d446244976930697f73acf62ea76f01c4a14e36b84b13846db9914f703f88215ae8064bc6b9307374f6414621d315a7b2581470a910e426794d62323d737f2
+EBUILD apache-2.4.41.ebuild 8584 BLAKE2B 8921396e21f7cf458c4e81784758838116cacc149a58650166802f9f13748d2e38ccca24f7e8c8a6daa2001995525bb23278d4eeb77a9cec6770e08bf0ca6a70 SHA512 9bc84a2435f086d89d31514aced1d319380845ff62abeee82d5b8fdcff20eea16e914403fa58c33048c0fa120578e21965aa279f83e97aa6f7c0f1866df643f3
 MISC metadata.xml 1012 BLAKE2B ca2238f428144240f64b5c9e48087a07a3f77278958efb240edeb864050ca01d1e042a37fb304fde76925fb651d7d97755d354a45aff34ac0589b7405b848d54 SHA512 a4e903bb75740c54256fa96359f6a97cd75008ffeeadfd6353648f5bfa2295fb108ec9de398956c79633bc465475f5db365d20d71caa34fc14a07c4715cc8683
diff --git a/www-servers/apache/apache-2.4.41.ebuild b/www-servers/apache/apache-2.4.41.ebuild
index dfe780bfb87d..d19670b4ff4c 100644
--- a/www-servers/apache/apache-2.4.41.ebuild
+++ b/www-servers/apache/apache-2.4.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index 438fe165d460..ffdd7303402e 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 1181 BLAKE2B 1c3b390f24ac73eb0254f1da267e9576625f7342f2d6cbcc3b880af9d52dcdf3561e39337deea77dfa1e5a3ef91a3a07e29792feaf0916f182bea1dce5f64a82 SHA512 0f5e92617807dc4d49d970c7b59f14d0e17a7f16fabdc2c13511e1102ffd9fb6e3c92cc92e27d97292da717040b0c29e98c4903dc141aa0fac5a116814d3ebf5
-EBUILD gunicorn-19.9.0.ebuild 1023 BLAKE2B e9c04fe3b5f6e11c5f2f27a95ae6aaa7898aa8d7cf6cdb62d47371b07592b8a335b6f3b2fd250767cd668768f1bc5144a68bbb6d95d1091bd6e05ea8ac0f966f SHA512 7f109433e0244bc23ebe02de41db69d55c7b313c0a9e1a7d23e62cde9c29a3c756c58730f04b3c558a2b19ea0360879178bc8a6119fa358e939e188c00530da1
+EBUILD gunicorn-19.8.1.ebuild 1171 BLAKE2B a8c6b1dcbb749db4dcf60b8c26111045be976f28559b2cb4a7f7ef1536dae320a0f7060bd572bdc2998dab0003230ad1688ca4c28130c70757702504222998e6 SHA512 ab4761df1c5e57b7aa87095de97915126007055a87cac29866a603604c47ef4f25886cdef723de8b36eccdbfd7b2ed835832b54b827ed3f27c97cee0c30a90f5
+EBUILD gunicorn-19.9.0.ebuild 1013 BLAKE2B 6e30bbc1a0daafe10ff55a05817543d3b4343f5cb3f6c2567bec0d6f00a5353d75ca3ab264e42c2e6af1115f77e4640c8ca6e31d28f93c5719354c063f6c057a SHA512 83518408d3a1205de0e8d5fdb4b813daf2ae7df9b45ebf0d8297fb76332d31a6d8982228dfa575909204409659c7e274e0080c222bb418dd75ae7eab5c5947c8
 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 a16655f74215..199d85ec02d5 100644
--- a/www-servers/gunicorn/gunicorn-19.8.1.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/www-servers/gunicorn/gunicorn-19.9.0.ebuild b/www-servers/gunicorn/gunicorn-19.9.0.ebuild
index 34f357fed9df..a3c4673b2fcb 100644
--- a/www-servers/gunicorn/gunicorn-19.9.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.9.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index de641ab08164..df4b50170cc7 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -6,9 +6,9 @@ DIST nginx-unit-1.13.0.tar.gz 693159 BLAKE2B fd2e803188e66c16d5956f26e693c81273b
 DIST nginx-unit-1.14.0.tar.gz 708603 BLAKE2B 482ab76a1eaef2943c0000c6dd2adf37aca285304b306e5b05d67e9cca30665269d11c1a585bd1a638d6811b8ee6370ef3cf682bebaf7165585cdaea51f3a5c8 SHA512 0cfe5364d427ff09d08c3b1b134827665f8bf70b8871f3c4506680e4c2d61249a53581122c42276b590f5eb077c398ae6a6c2fa46f24c680844b7d365f2ca66b
 DIST nginx-unit-1.15.0.tar.gz 712284 BLAKE2B 8db45644a22a4043de660ed0dcb94957e6e9f26ee1735a0a053128b0995cfb670d9c52d7d64ffa2292818cc7aed79071fdd753186f010e1bd0fae876f886adff SHA512 3be17ba5290d323283e962a3a5b9c244c3c45302848b62fdad2fd92129e330c8783b4f76273dedc7b010ed71bd6a4bf1cc4085a3425288b1e28dc532e1a1bf5a
 DIST nginx-unit-1.8.0.tar.gz 511226 BLAKE2B e396b27954840a5f1ad3a4cd9501a5e5fe769a754c51043da784a2c4596e6acc33089f495bf412a0db086e5c715a51292c7dece004a6512564421a431b6c339e SHA512 1d0ad05343ff70aff4c6e221a36c20df95fa2e2262ae5c69963a9bcb9ef883151e8a2fa9fef29f43ac5489aa5cbb3e9dfd10cf5e7f6d7a98742b490ebf3a0413
-EBUILD nginx-unit-1.12.0-r3.ebuild 1963 BLAKE2B afda4ef0d65e3ec12fd77350be7b2384dd39bc575310bad5632fe65e340bf424655737755b2e346cb38a7070a48276052050c493def70a3e8e46375bd1e04c94 SHA512 524682cf26343e769b478873fff40db5f38808a9679684f5484f306b6282840feca54fcfc1fd55c79c753626f3a710667e014850ba24e56358b53c9d7ee0d9d0
-EBUILD nginx-unit-1.13.0.ebuild 1980 BLAKE2B d66c20e69d49ae7b58cd8106d59cb1e84763ee99fcb9de4b7b10449d96c857f3117576b93bcaa262516d1134f6611bb1c11c08f2a6a0d103206fa1079f01158e SHA512 59f9c42a423c925089301b0176a3c1f4554c9e7a61b3beba2689d24d7945923a69dfefb95c97467e308681853eb227859822e22db66922c029451b8eb2f1ef2a
-EBUILD nginx-unit-1.14.0.ebuild 1982 BLAKE2B 1673391165bd459f87864810aa9688c5727c00f7817a4cd46d0f3027e0d8ed9e96db733bdf42f8995dd006a1388af40d9d48a351ec5ff786f4c01b4dce495d82 SHA512 3e1af60d9abe2ad885706cb5cc9a6eaf4912bfb6d2879ccb06adb3358d6bef03996d9d298e99a62bdaf07e390f9c2d3e41b4fe3042edd09bc53d328d548b4da0
-EBUILD nginx-unit-1.15.0.ebuild 1938 BLAKE2B 8f2aa722511d06f54afd5a6d8b2b2d823a6fcf6893907440b981685daf10189b220ae6eca9bde955ab2d014c74ac106c5a8841574bcd6be0235e5b0f061eecf3 SHA512 889e7e38e483dd657bfcb6babd1d6d90542f4b31b799ee93bcf0727f11d2093535a7f699495f56b532f6accb2e0deda1c3c28e514f3cd4338da81f17cd307d66
-EBUILD nginx-unit-1.8.0.ebuild 1690 BLAKE2B 620a1ffa238fc609f2436080140d49e8d4d0387d5a82a28aa683a0c8a29482e786ceb7d4343b35da9f4fb5a0caccabdd4a3baeba34d8d95a32a88be01e269aa7 SHA512 64279e44a4980e33806cabe186c41048631d34c57afbb4ff256a0280800b51197cb758f8b12dc0a856b829b9fdd27565843317fbc4c7f598a805923f12e353fb
-MISC metadata.xml 1047 BLAKE2B 04429a2c4f083e98a753a293b77bec95c6a9eada3b14d8d249e0f0a71788e31f36125f637e5afeb204727f2dabae1cfc359524e7019a71cca7c7c5d5805d61d0 SHA512 1e8b885289895816758f9711145b4d6e69b54f27394434700794d60fa613fa771246909b44987c9e884f11ab1c5b1e1e82053ec733678c1712401cc51e291879
+EBUILD nginx-unit-1.12.0-r3.ebuild 1891 BLAKE2B a92029f704645fe3b41be314d4e0dc640c94a067a56dcde17faa4b3ad6ed0944dc9de2f394ddde263f344bbaddbfeebba58f0ab0124a1135875abfa17a001ea1 SHA512 6647c14d0acda6ab84e447390252f575338f5f611659e94bcc68b9c669dbaf9f1a55d162ec6ee6e1c98fdde37c36c42054dbe59803f5a218628b550a5b12c631
+EBUILD nginx-unit-1.13.0.ebuild 1908 BLAKE2B c72a328c698b017f794f4f095d27e0c557f5dda4db129dfc4c4c1def92a3687744a77ea404ced5757c47f23c731842dfebcf879711bba5726b4916a99183ff0c SHA512 f6a7bc3afc7a60fe084c283e87f152cfbcda0e80bb0cd32824e243def5574782f77a4ddabcbabdb38a2d21e17c63740710648e459f9e550c1296e5ab7902dd61
+EBUILD nginx-unit-1.14.0.ebuild 1910 BLAKE2B 20eef694c4373412012d468e04c4579d89978c60948a1cbee8846915f9806b40624b9c5104109761d09d910816ab9d53934c12febf65df44633c3dc39b62e821 SHA512 9be703e244b959f3378a668958d062394ca27c8ec6fdcaee060532fe393e580d5b6a0c65c2ae104c61b8b8ad3db52507cf44c42e5bff7033bb0c8b0cdf3a0bbc
+EBUILD nginx-unit-1.15.0.ebuild 1954 BLAKE2B a889f8b1f34ea66df35e682bf26f7e22462076efad22cc6f6cb41c182ee80bd4c7687c8742b5364ecfac3dd5a04d148fedbef3b6ad70ba123aa7697060603f87 SHA512 21ec634694b9761493395d4ca72193840e152e16888f777ca382e96a6e3743583a0368854081373b6730e0ceea212a6100ab7c5c8938285afc617a206788cd67
+EBUILD nginx-unit-1.8.0.ebuild 1602 BLAKE2B c35777bed33ab33da0458037c03702d91a6596d6b5b5a1a11197cb3961d53b523a5a8be7a8a4d52735fa66aabb430467913d0e9f122930e69b44302e764145c2 SHA512 3c500bf702ce9e09118d68339fff0eabd7cf01be05e25bd3179d21a32f13e39a7513f10480da3595d462392572f36a2a1ef4698a8b51a8adb1e44177b0f408fa
+MISC metadata.xml 949 BLAKE2B 47faacf65d957c617419ef5183d99b77421bd45dd4499263eda7097fecc73633a085c05833e5b375e70865c4b12e6e02e224fdded5fed0e9eee19d44eb525e26 SHA512 c8073b3eea6233733ac01329aab48e51dd43fc6deb9c8ca8b482dbcb3df781069d750d0002f203309cebf64890d517b1ed900a9cda62e4a028fd2fd721a7f5c7
diff --git a/www-servers/nginx-unit/metadata.xml b/www-servers/nginx-unit/metadata.xml
index c6f29a250703..31019253313f 100644
--- a/www-servers/nginx-unit/metadata.xml
+++ b/www-servers/nginx-unit/metadata.xml
@@ -17,8 +17,6 @@
 		engineering or operations.
 	</longdescription>
 	<use>
-		<flag name="php5-6">Support for PHP 5.6</flag>
-		<flag name="php7-1">Support for PHP 7.1</flag>
 		<flag name="php7-2">Support for PHP 7.2</flag>
 		<flag name="php7-3">Support for PHP 7.3</flag>
 		<flag name="php7-4">Support for PHP 7.4</flag>
diff --git a/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild b/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild
index ab4379548ef8..b5cc2daa9bc1 100644
--- a/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=(python3_{6,7})
 
-inherit flag-o-matic python-single-r1
+inherit flag-o-matic python-single-r1 toolchain-funcs
 
 MY_P="unit-${PV}"
 DESCRIPTION="Dynamic web and application server"
@@ -16,14 +16,12 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 MY_USE="perl python ruby"
-MY_USE_PHP="php5-6 php7-1 php7-2 php7-3"
+MY_USE_PHP="php7-2 php7-3"
 IUSE="${MY_USE} ${MY_USE_PHP} ssl"
 REQUIRED_USE="|| ( ${IUSE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="perl? ( dev-lang/perl:= )
-	php5-6? ( dev-lang/php:5.6[embed] )
-	php7-1? ( dev-lang/php:7.1[embed] )
 	php7-2? ( dev-lang/php:7.2[embed] )
 	php7-3? ( dev-lang/php:7.3[embed] )
 	python? ( ${PYTHON_DEPS} )
diff --git a/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild
index 7f3d1031a1e3..b6cf78f36215 100644
--- a/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=(python3_{6,7})
 
-inherit flag-o-matic python-single-r1
+inherit flag-o-matic python-single-r1 toolchain-funcs
 
 MY_P="unit-${PV}"
 DESCRIPTION="Dynamic web and application server"
@@ -16,14 +16,12 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 MY_USE="perl python ruby"
-MY_USE_PHP="php5-6 php7-1 php7-2 php7-3"
+MY_USE_PHP="php7-2 php7-3"
 IUSE="${MY_USE} ${MY_USE_PHP} ssl"
 REQUIRED_USE="|| ( ${IUSE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="perl? ( dev-lang/perl:= )
-	php5-6? ( dev-lang/php:5.6[embed] )
-	php7-1? ( dev-lang/php:7.1[embed] )
 	php7-2? ( dev-lang/php:7.2[embed] )
 	php7-3? ( dev-lang/php:7.3[embed] )
 	python? ( ${PYTHON_DEPS} )
diff --git a/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild
index a1506b1539e9..60d99e08ee71 100644
--- a/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=(python3_{6,7,8})
 
-inherit flag-o-matic python-single-r1
+inherit flag-o-matic python-single-r1 toolchain-funcs
 
 MY_P="unit-${PV}"
 DESCRIPTION="Dynamic web and application server"
@@ -16,14 +16,12 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 MY_USE="perl python ruby"
-MY_USE_PHP="php5-6 php7-1 php7-2 php7-3"
+MY_USE_PHP="php7-2 php7-3"
 IUSE="${MY_USE} ${MY_USE_PHP} ssl"
 REQUIRED_USE="|| ( ${IUSE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="perl? ( dev-lang/perl:= )
-	php5-6? ( dev-lang/php:5.6[embed] )
-	php7-1? ( dev-lang/php:7.1[embed] )
 	php7-2? ( dev-lang/php:7.2[embed] )
 	php7-3? ( dev-lang/php:7.3[embed] )
 	python? ( ${PYTHON_DEPS} )
diff --git a/www-servers/nginx-unit/nginx-unit-1.15.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.15.0.ebuild
index 28295fbc991c..ac0c6c8fc956 100644
--- a/www-servers/nginx-unit/nginx-unit-1.15.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.15.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=(python3_{6,7,8})
 
-inherit flag-o-matic python-single-r1
+inherit flag-o-matic python-single-r1 toolchain-funcs
 
 MY_P="unit-${PV}"
 DESCRIPTION="Dynamic web and application server"
diff --git a/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
index 85232da8eb28..ac86712d6623 100644
--- a/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
@@ -16,13 +16,11 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64"
 MY_USE="perl python ruby"
-MY_USE_PHP="php5-6 php7-1 php7-2 php7-3"
+MY_USE_PHP="php7-2 php7-3"
 IUSE="${MY_USE} ${MY_USE_PHP}"
 REQUIRED_USE="|| ( ${IUSE} ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="perl? ( dev-lang/perl:= )
-	php5-6? ( dev-lang/php:5.6[embed] )
-	php7-1? ( dev-lang/php:7.1[embed] )
 	php7-2? ( dev-lang/php:7.2[embed] )
 	php7-3? ( dev-lang/php:7.3[embed] )
 	python? ( ${PYTHON_DEPS} )
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index f5af0d7c224b..73d7e0273baa 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -39,7 +39,7 @@ DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b
 DIST njs-0.3.5.tar.gz 339177 BLAKE2B 6327be0b7c8077870408722376782bca579a6cfdf1fe2a4950fc0d289311ad21f671bc2b47d06f70d95d4f68d99e8c70fd4598dcc167b79c57704d99a098d284 SHA512 236e0284f251856f74eb51d8251bb5be725d2ca90056f2feef7677eb636a4e97e203f3bba81fb6b677158d615dc2d6ffcb0dc1059fb678ab12b7d14cc4ea7241
 DIST njs-0.3.7.tar.gz 360227 BLAKE2B b23e5105e3b9a0575e4da6a6e344983c2fed2081cdf0be9209fc86cd51c6e962ec5d855945d2c6972153de048dfead866686b2248b28660b41219a8e05fa939a SHA512 1975c38fab59a587045e1c6bebd527a4432c4e6bec5a62cb2e1bc5fef19275deffdb6c6558caa3f0dcc58716b702adc0eb89b0171acf5f70f275c593b16f4bfb
 DIST njs-0.3.8.tar.gz 398172 BLAKE2B 2bc76a1267c21bd691dd05ba5416e9d443d9a1d59adca07d6e370bf5b8c9a1420dc4fae2831620b26b6ea2ed16fb00c2058f569c1d60179dce83ff7cf44067c2 SHA512 7a68f5205357c64d5b4e13d72ab03b81ce5675d6f5d5643960c8e1273001828f3c1c9caab7e6b7616168f73d45c1cebb802a75ed31c22f8ca12e377ec5a4d5a5
-EBUILD nginx-1.16.1-r1.ebuild 40512 BLAKE2B bae783454c045e184733ea1b86cd966049a83a70b97d7dd82cc3d6338703ec6f0224efa83e6f306e357c1240c775b0f7bec893776a18695ad236788da0c4ee9b SHA512 93db7e72940f13fe9453a9f6d7a2caa0ae7107b4d81a28c7461e0bc2ae89b683e784b0dbec1f08770764d3d0aff91f2d83f269bc7f5a52ac589fd1ebac950a77
-EBUILD nginx-1.17.7.ebuild 40514 BLAKE2B eb51d676352152ab02a7e8e10ee482219488f60bc9c977b79cf23dd8e080a40fd603e44da9bee5f0d673fe1a02b3cb32c3ad83e657abc39ab59362a61b36e612 SHA512 78949b4317c41b9084296181123ad088634908dab157214ffa8ee5b6d6b3f3ed2bdc896dc124b2c1db3507163b21a7000582aaa87bd70a0a62086f4507552917
+EBUILD nginx-1.16.1-r1.ebuild 40512 BLAKE2B 6b40f32241a5bde9fa46e0b8cbf894383c3410f05ec461ac3228d1f777e59ce16d27eead78def5f36c6637751461c4b5e45f2692e46c28feaed6b14c697eeff6 SHA512 84af1476b643c53316c8c8f430e6cd6316e3128f615fab8156e79bab6b749633f6d9cf928b0201fe748adecd1d3baf216bc1562b7a122245a1137d36ae8cdf6d
+EBUILD nginx-1.17.7.ebuild 40514 BLAKE2B 60f3bb329313930f81b454aef3105b06dfe1be3a013f0cb2a805511a53540121cbd559d981e02b7cb86fdcf5ee07e929b692f2762079abb61bea500d8f0f3240 SHA512 8f465f914412d2fa765984889d3f60f0d033463fb0007113058904581df887d2a032f40024b036d8b3775ba448742e756b42d0355124b54abddc909df2eea735
 EBUILD nginx-1.17.8.ebuild 40514 BLAKE2B 52817e558f2afc30bfd5bb29b751d63f17c52ed725da2b39ada17d524e9f0a09ff3a439c3ee036b450ff76c170ff94c7cfb2941aa8d0ce18e1853a8a4d3b6870 SHA512 96fcf83c290015b16c53f736cdbb9ea38193ab388c9cae9d6780fbc48a6e3f6f51ca69a4c80f716598b700e1b6595741814b6bbbd8e188ba3e85b616b54b8350
 MISC metadata.xml 1193 BLAKE2B aeb293cf75ed650c946910222d6396f726dc5ed49f1213e6a5664613d78e3b27616399bc1c9f0a360f5303b16931da7016cdf540b24601afafc3ada4428b33a9 SHA512 a96002bc9845bc465542c753c738899b77ad7a32fac7f5f9a7049336868bc41199e926422e3dc23e47f34656c9aaea255511d2ef91e9d59f48c9cd0b4a3c4903
diff --git a/www-servers/nginx/nginx-1.16.1-r1.ebuild b/www-servers/nginx/nginx-1.16.1-r1.ebuild
index 9c62c90db19c..f171f8a2e225 100644
--- a/www-servers/nginx/nginx-1.16.1-r1.ebuild
+++ b/www-servers/nginx/nginx-1.16.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/www-servers/nginx/nginx-1.17.7.ebuild b/www-servers/nginx/nginx-1.17.7.ebuild
index 266794ff8ded..3651f7e35243 100644
--- a/www-servers/nginx/nginx-1.17.7.ebuild
+++ b/www-servers/nginx/nginx-1.17.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/www-servers/spawn-fcgi/Manifest b/www-servers/spawn-fcgi/Manifest
index 4237ad761b48..c642c6b8f89a 100644
--- a/www-servers/spawn-fcgi/Manifest
+++ b/www-servers/spawn-fcgi/Manifest
@@ -1,5 +1,5 @@
 AUX spawn-fcgi.confd 2238 BLAKE2B 0364383f12b79728830556244485b991f5bf5f7f4595e5500b81330c43b752aca8f3fce53cd08d4f007a69279668c7d212c74ff0682a3e37ae0ec545744836c8 SHA512 0b0d5754de17dd691ead380a93526aa7fbdd432359b248ce06f030daefb1ad96e4a81fe5319557fb66602baccb45a0febf6417ec7b79eee91e1e070d9a852b90
 AUX spawn-fcgi.initd-r3 3048 BLAKE2B 5b501069acfe3a535f1d73cbb706d05de50ea8562e09a49209da551dc5ba9626ddc0093b76139d4291ce8ac4c3e329be0bbf494c41c6ec137a182b8b35c3c891 SHA512 6c983f9d741f508d12b728d24dc5b57396cbd2272ae71c7127ba95aef70bd1a90b68d2b15e3481dfdbcfa723ca73a92deea61baae64051a83cec0b583c7da1e1
 DIST spawn-fcgi-1.6.4.tar.xz 79944 BLAKE2B 06fb92261042fe6bccda1a472a712a7c9bc7f56ee04b72f31ee133079f6c1d07ca07ef6c1b7c878db2e32861ea20914998411a3f6b596e4ba950f8767a899346 SHA512 e2b317997b56f852ad644b80fe36fa08376ae81f93566e181c31a3b6764de2eeb32a2e10e420136d8536487c575678ca52a33f7cb3488aadf7185fbd0196bee0
-EBUILD spawn-fcgi-1.6.4-r1.ebuild 745 BLAKE2B 9f0903a882e5269526bd1bb4e4c9ee2be3f73e05d0195265b071ef0440fd3c9186dd06dd2e96cbcbc5f57e274113cb3adcb611194a165de409f3ba18240cc6e8 SHA512 39ad2157e39e6326da20da841506efbb1e46ec5f208e79df4b2426fe003b2ecec9f34d765020362656238b065fe312fa38f718f27b401bf060dbf73eb72dcc16
+EBUILD spawn-fcgi-1.6.4-r1.ebuild 745 BLAKE2B e42316e95889479f16c4f6d4b7eddc8182ff79badfc8bcee370dd689246ca73b8ced387c278245c98826ddc9abf460911b670af4060a62b1f45db0665d02f86b SHA512 34685f5232585e3e176259d32754640f8088ee9e5b754c65e10c13956167390fcaa0aff8ad7e63430ccbbcc5221fccd5a656ccbe56edbf4f49409639b05ebc1b
 MISC metadata.xml 448 BLAKE2B c5651b029dc5d74e075b0a3ee7eb0b9b1cca540a579ef017faca1363f920fd374277d4e24d25db64d81c5dcea05da91e5d9f3043f98863ca31f38893f67ba041 SHA512 461925b80f58574c97b298aa4b26314e26f40d8874bd3d8e4fc6f9bd1aa7161f9c69cfcc47dd9bd9077b631827e5a6631e0322174fb1387624b7bc3d021e29a2
diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
index 0ce4b012527c..5482479d06df 100644
--- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
+++ b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 359c53cbfc92..945a717350ba 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -12,8 +12,8 @@ DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581
 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
 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 4197 BLAKE2B e20677c88681fb4c79dbeec633981176b7b309e67bfd8361546b531ee627d74aa3e5f6c5ac4da5593603b6fff3b00e7b63471e9b2c6cebae84f6437ce34039a5 SHA512 a0b7045e9edea9661ca17e5d3d8151152b817d605c218158365cedf1528a9a167d487dcd304ef9417bd35c73f1e73a058f8fb590e4009c24f45e3d062aaa154c
-EBUILD tomcat-7.0.99.ebuild 4190 BLAKE2B b749f120ab3e162ee61b06f717070603bec4c7961731f0a196bb754980c6f8f21dfe954780ddcc9550083228e3695abf2fd64da635c42852ab5a553973478a3b SHA512 840917afe93cf802a6977118d711ef19a6b553c0c6023540d9400b7f7eb41488b14ae9219e8ad40b0ee6d6c8b4419a2e0908e12ecc7ebfda495b010f19f62ef4
-EBUILD tomcat-8.5.47.ebuild 4559 BLAKE2B 2b6ac83085c87208bfc013e3ec68a6412b2bbd9208aab1732096ef8079500497a2a53e6c2a2a1f235f7d7f29a87aa52ae105b34994fc46bee73127e22b12e2df SHA512 7bb79bd8f186a0e782c3b9ff9ed056df0c1e8e458d6886079654878722f8584409a069b7f39cd712f1e73c98a0f21dc733a49c93ea96dd12b8e92617722183e0
-EBUILD tomcat-9.0.27.ebuild 5470 BLAKE2B a001f155a2214e363aee2e8fefcb0e73d0881e52ef8da29c53480e464609a48a9526bc886ca8257e7a761c4e4c0b86b9ecd1c0bd84d6e900aa7e388410843326 SHA512 6d4b46bf13cc1abe2d8b5544ff6eb5419d2d716fa47b60879fe244ad04264cd7029272fe24085472e9c181af6e4346ce59f180636d06a941a1a9e0d5566d2518
+EBUILD tomcat-7.0.96.ebuild 4191 BLAKE2B 00d7bd4b1ccf3146d8cb140674626910a5da66f79494ea2f6fe1e9758177adb62edd54deef493c94c8a511203a1c3d6c4ad63067a531db2ad11011279a500363 SHA512 0f940fb8ec7386d0565700d35d7d137de8e5928c6f813d0a82f55d82bf79dbb57565af7c32ad673760802c57cfc776c83c88100cf7adc31dd3a923c352c59381
+EBUILD tomcat-7.0.99.ebuild 4184 BLAKE2B ae1b4ddd54a605743ac85b68e3a73a58be1fb92f84da7521f1042138fae89e0ddd7c12e6083243c01a038a5d94b804f2117407f8826b5d8db9c58b88d6498d22 SHA512 6b5f9f452256e8f4038cef1a76ca3b4b87323fbbd8ff97e1f7e8ebe3d452b4df91fc7cfe943f8fd121f10a623d85b71ef9bb3fe07e776334a25bbc8f706a8fd3
+EBUILD tomcat-8.5.47.ebuild 4543 BLAKE2B 96ea6dca520f6f8796b49383fa14136c76a98f4397078ce400f45a7f7a7142d056a83506fcef659772574351bba812385dc135af3e8c2c06e253284db23adac9 SHA512 9df31dc266d9310ddd812f35e895d8fd7422f5dda883bfb9b2fd39ca0bd64db90e962f7b2000220952defa9dc7ab5140dfe6a9e3b7df69dd831a8cab164532ce
+EBUILD tomcat-9.0.27.ebuild 5464 BLAKE2B eb4a423dd96a63cc7ef60aa0e22baf4bc0f2472548d6a695dbfaf001d30c2a2af56e25359a04763415273c1be92e16da6e8af7dd817d68f0fc2b27efd58e76ba SHA512 7df1e66ed73fdcb6961a4e4d07c85776f74c8617ba5e1ecc83d925e5b4bd66b5ea9d0e27c58f8f4989130c507d043bcf5b1e37a76c75612efff4eb050ea10c34
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/tomcat-7.0.96.ebuild b/www-servers/tomcat/tomcat-7.0.96.ebuild
index 443dd981a8d0..ad19069fd89c 100644
--- a/www-servers/tomcat/tomcat-7.0.96.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.96.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ ECJ_SLOT="4.5"
 SAPI_SLOT="3.0"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+	~dev-java/tomcat-servlet-api-${PV}"
 RDEPEND="${COMMON_DEP}
 	virtual/jre"
 DEPEND="${COMMON_DEP}
diff --git a/www-servers/tomcat/tomcat-7.0.99.ebuild b/www-servers/tomcat/tomcat-7.0.99.ebuild
index 7fa74915d25f..4df8f1204b9f 100644
--- a/www-servers/tomcat/tomcat-7.0.99.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.99.ebuild
@@ -24,7 +24,7 @@ ECJ_SLOT="4.5"
 SAPI_SLOT="3.0"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+	~dev-java/tomcat-servlet-api-${PV}"
 RDEPEND="${COMMON_DEP}
 	virtual/jre"
 DEPEND="${COMMON_DEP}
diff --git a/www-servers/tomcat/tomcat-8.5.47.ebuild b/www-servers/tomcat/tomcat-8.5.47.ebuild
index d34cd3a9d3cb..729cd12dcdf1 100644
--- a/www-servers/tomcat/tomcat-8.5.47.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.47.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ ECJ_SLOT="4.5"
 SAPI_SLOT="3.1"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	>=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
+	~dev-java/tomcat-servlet-api-${PV}"
 RDEPEND="${COMMON_DEP}
 	>=virtual/jre-1.8"
 DEPEND="${COMMON_DEP}
diff --git a/www-servers/tomcat/tomcat-9.0.27.ebuild b/www-servers/tomcat/tomcat-9.0.27.ebuild
index 182cad35d13c..b8e080bf0d7e 100644
--- a/www-servers/tomcat/tomcat-9.0.27.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ 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/tomcat-servlet-api-${PV}
 	dev-java/wsdl4j:0"
 RDEPEND="${COMMON_DEP}
 	>=virtual/jre-11"