gentoo resync : 20.06.2021

9 files changed, 42 insertions, 9 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index e45d110f1866..905635bd0294 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index f2f616357768..2ab6263c3945 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -1,4 +1,5 @@
+AUX gunicorn-20.1.0-new-eventlet.patch 1103 BLAKE2B 3329864c05238c3b2a6e38727991f7273bb0fe5aa8e3e4c09cd2f7132b5d47fb9ee02fde171abbfc64d84ab0bf11b6712101e8510935d284175ea46771bc8f5b SHA512 cf404efa930c1e6948a8d2508107315d380bbd55a54df1e2a2e8472bbf392383a8505cc7dc15077f1d182f7be9ece558676470a6dbedbfcb0d873438b82fa9b8
 AUX gunicorn-20.1.0-tests_optional_modules.patch 622 BLAKE2B 27efd7afd2c69e65622091f9fbc59e5db1efbd519015c51cc607735cb6c709b2234e3ee5fce045f3d2c3eb67099b68ae5295d7000df893775e3a28c050b5b0ce SHA512 42ef99e0ae1b125e379cd2d6ef3dd917de640db96411495eaa04c09eae88254fa7930f00de72571aca3320454eef2fdd54d16c97bb09b45abd7232965e4fb861
 DIST gunicorn-20.1.0.tar.gz 354960 BLAKE2B bae414a8da7a4dbdf79e0b46f517138534521a1a8544f4ea2e1e27e6778d2f6ad8d6a8af02590fedad47d305acdea53f1cdbc4deeda3619fc4a5ffef0932bea1 SHA512 4fd905f62adc30e044cf2a56a1a77e14bc633258267d6bfbd4f6a68494f93f377e9fb9ed94fab7f11f9d7813857a680974a88c4b6bf97d4f1b74792a81810111
-EBUILD gunicorn-20.1.0.ebuild 1431 BLAKE2B 8ffaf7b47cc8d9ae0c0b0ce568195f0f8b14a5d19d3c7b350630dfb17319e5b3f71da98b285cc9cd1ccc7fbb385be457af027ea823cd494654825088e905f494 SHA512 133f4328830d900890d34fb2bfb100786b65e9b131c3d5c9cd3b60a3d5696f34ab79844569084d3f486d1ad7d7a3be3c948db87ccff3f421624bd761cf7d94df
+EBUILD gunicorn-20.1.0.ebuild 1471 BLAKE2B 5cbcf5ae0de263945a67b67adb8f4f0bc7f918cd83033da7240ac85c1406c2ecd78e14941fe272fa04256cd25f320f7956db5f61a54185cd8ad73a4bc406eb58 SHA512 fd71234fd75286148c97e95247f7124926a04e1d9ea556efe7edea56326c8821096a5261a76e62ee481f7495faf4835784dffe39392853490f8f3df2784f9a83
 MISC metadata.xml 820 BLAKE2B d0d69bf646aea74e6b85daee66e739857ff027050bf3085c6f56eadaaca90297825234477d0b4b9540646edf92d7b5daabe523336545e756b5d1a9d17e34c95c SHA512 fc0e570d92321b0255fecb3511fa313a3caa8686f7956438e18ccaff802b0ea0edccc9a196f356fd9d24370100edfae0470d0afdeafa6a7398330829d8a95644
diff --git a/www-servers/gunicorn/files/gunicorn-20.1.0-new-eventlet.patch b/www-servers/gunicorn/files/gunicorn-20.1.0-new-eventlet.patch
new file mode 100644
index 000000000000..0ba4faffe639
--- /dev/null
+++ b/www-servers/gunicorn/files/gunicorn-20.1.0-new-eventlet.patch
@@ -0,0 +1,31 @@
+From a244b149b15c4417b4f0a4b4a57a1f8c296e968e Mon Sep 17 00:00:00 2001
+From: Daniel Bibik <55541040+Boring-Mind@users.noreply.github.com>
+Date: Mon, 10 May 2021 12:31:29 +0300
+Subject: [PATCH] Fix compatibility with latest eventlet
+
+Fix issue with import error while using latest eventlet (>=0.30.3).
+
+Changes made in eventlet: https://github.com/benoitc/gunicorn/pull/2581
+---
+ gunicorn/workers/geventlet.py | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py
+index ffdb206c0..06477e74d 100644
+--- a/gunicorn/workers/geventlet.py
++++ b/gunicorn/workers/geventlet.py
+@@ -17,7 +17,13 @@
+ 
+ from eventlet import hubs, greenthread
+ from eventlet.greenio import GreenSocket
+-from eventlet.wsgi import ALREADY_HANDLED as EVENTLET_ALREADY_HANDLED
++
++try:
++    from eventlet.wsgi import ALREADY_HANDLED as EVENTLET_ALREADY_HANDLED
++except ImportError:
++    # Since eventlet 0.30.3
++    from eventlet.wsgi import WSGI_LOCAL as EVENTLET_ALREADY_HANDLED
++
+ import greenlet
+ 
+ from gunicorn.workers.base_async import AsyncWorker
diff --git a/www-servers/gunicorn/gunicorn-20.1.0.ebuild b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
index 937224d87db1..462bfab82950 100644
--- a/www-servers/gunicorn/gunicorn-20.1.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1 optfeature
 
@@ -22,6 +22,7 @@ RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-20.1.0-tests_optional_modules.patch
+	"${FILESDIR}"/${P}-new-eventlet.patch
 )
 
 DOCS=( README.rst )
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 0cd448b657db..c684f4394a85 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -34,7 +34,7 @@ DIST ngx_memc_module-0.19.tar.gz 34654 BLAKE2B 536384c264d88535179634d459d3a47b1
 DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc8b2b93f692615a1b39c1f327393647f80e7a27e6929799a6e7e3469b61e1cd72f7821f7a820da4dd7cd9a96d85c SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e
 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.5.3.tar.gz 519938 BLAKE2B 1d06f8a20f6c37977e3b4b9afa0f136761a6998b85739a9853bb41d70ea6af42f49541035961fd0251eda2e10579f7bf983eaec2f9e19460138e53f44b9e6788 SHA512 b1d2e7498c37cc1df18e0f65866391637bf75d3d251fc7d7ad1ef5c76457697f49eaea088e1d157c94a6e779e9b8cc07b3f5aaac965666624506f517f6878c23
-EBUILD nginx-1.20.1.ebuild 40225 BLAKE2B 58762e404eb6850818e40d10ffe5a124a9b439bd4ca38d9e58a3731411e0fd559b23a6bfe2a64a0146762f092a938bc863f0d6492b6549ef013ba48e219ff68f SHA512 03ebf84e1ad526ab775a7d0b073070f9689cb5143842415c7846e7f149c0325c6c9b947fe51b2fcce421deccac1c1395721261d7065445eb74c6adaf6c3678c1
-EBUILD nginx-1.21.0.ebuild 40227 BLAKE2B 48aa0810fa1514c379f8c0ef4436d5071a52a4bac04f716cfa31869dbcf3c2c1432e363487be03249d33aa0a5c80aa6236b6aa6f62ac768fdab0e99b1896dc89 SHA512 ac88f2cfb18b41e1606194dae2d6c9f78e37da2ed28c036a775f3b6d3a43bfac2307ad48267f9578baf37d05c5ac3db2bd5f9ed2e818dc16bc505b3faecfc84b
+DIST njs-0.6.0.tar.gz 528419 BLAKE2B 7b3c9dd4be8182298cc283e8b19eb4efeef66416d26332ae73dde66b5b67ad980c3e07f12fe0006dfb9710f3df449ac2598bfd1803f6c86d721f48697d975087 SHA512 fa569623fd594e859c535c75041be443ef6329a4ee33d9e0f29eeb56e69ae2f3c44264ccba736b4a97ab0b33700f381acb65a884889d6f644f3fbce7c1bc586e
+EBUILD nginx-1.20.1-r1.ebuild 40225 BLAKE2B f69e4764465fe171929c7df8ad64aa3fe959e4a2198c721dbba0a51e2825c46087cf0185901fb4edb53b4ed76a5a5b01a29babb76d5c08fc3792cc99143383ff SHA512 bf9e7b81110d7ddcb50b461c1eb686d60ca445424135eec5ffa13e7d6528684431fbd8ffd7c2a8ef3719c9d99c727d66d61bdde08306433cca6d75618477d125
+EBUILD nginx-1.21.0-r1.ebuild 40227 BLAKE2B 02802925b843dcf866eae12f33ceef1a9f1e74e4928876df16f475048e5b39556a05bae42af3c4b1e30bbd6aa1ebd580c1535d228f288f205c3807e95ffdc9c5 SHA512 058dd24472a5d7b7d21cf1492d4bb89d969e1250cedabaa3a90ca90dca27feb7e8cc1e1c0bb9156e2e7a2ccc6552e1b9a0f2cc3c1aa75b62c3d4aa1683d1d2e9
 MISC metadata.xml 1045 BLAKE2B e439ddfd1104b92548cc094a890152297ff81e1c4c3d04e58df8c2f1ebef01daadf317d3d22047c22c1c907fdfb3ed844d279a4692b837d8afb1149da4205538 SHA512 33b75c84396551de2559a56efb9922284991e5ebaa9a18c9d7088b49290f4225a08302c917090dafd6805bb717aa8bd24cdab8fa6d2a0b12050d43f7cb936847
diff --git a/www-servers/nginx/nginx-1.20.1.ebuild b/www-servers/nginx/nginx-1.20.1-r1.ebuild
index 544187614256..9bfadd1ec3c3 100644
--- a/www-servers/nginx/nginx-1.20.1.ebuild
+++ b/www-servers/nginx/nginx-1.20.1-r1.ebuild
@@ -157,7 +157,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
 GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
 
 # njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.5.3"
+NJS_MODULE_PV="0.6.0"
 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}"
diff --git a/www-servers/nginx/nginx-1.21.0.ebuild b/www-servers/nginx/nginx-1.21.0-r1.ebuild
index 1cdf07062dfa..a452afe9fcab 100644
--- a/www-servers/nginx/nginx-1.21.0.ebuild
+++ b/www-servers/nginx/nginx-1.21.0-r1.ebuild
@@ -157,7 +157,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
 GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
 
 # njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.5.3"
+NJS_MODULE_PV="0.6.0"
 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}"
diff --git a/www-servers/pound/Manifest b/www-servers/pound/Manifest
index 529c35fbead3..1adc85ad358c 100644
--- a/www-servers/pound/Manifest
+++ b/www-servers/pound/Manifest
@@ -3,5 +3,5 @@ AUX pound.init-1.9 495 BLAKE2B 9489ff9c18d6524dfb5b3b9af1f67898ac32b5e8ff2432b43
 DIST Pound-2.7f.tgz 186719 BLAKE2B 39a31b43c5945db1b5ad008e2f43d3026728ea5bdc3de0fa8c0b68a743d0bea4b86dd61a527ea140e6b0546732f0c66c863e78131432af32ab5b0874a7c1f705 SHA512 292f4f7b4363365829f204b687080eae9e17b9a67ae7eb6021eb5a028321191d97abd9633d5664db5ebca6467795f73a787be4a0bd29360d737865930ff81830
 DIST Pound-3.0.tgz 75905 BLAKE2B 8834d2d57c81bf792d803bc2aef7ad5d17243539ea3fddab777ab3dbd7f903a2f771762ee8d4818c63b7c6380c253dc7c7465e10225f884c2bb968af3dfab831 SHA512 28426fa2d66efa310fce43fc57b87b6cd9d646573161ab880b139feec856710306002af623f023907bb77f8b37979cf2332dc3e16cde48c6d349d813c6ac47e2
 EBUILD pound-2.7f-r1.ebuild 1212 BLAKE2B 1e1e6d2feb7eafa6564dddf435e6fc54b0dfc2df394d6e8ec2028689e3246b28070280edd165f89a1d66c8338da2027605623bef2b702676b11b45bf4c03fe64 SHA512 7c547c436b4ec84601dc0fa2adff3d34323429a98b7e7bd4606abf695fb3655e720f4c0ded6ade2820b5d056f49534334407c5f3e4801f23caa55c79f8293b97
-EBUILD pound-3.0.ebuild 1001 BLAKE2B 54289ab58e177af37b5a9ef6d99aec883fd29cf92c6e61c91edd557a4b5f0c04e4a9117e31d25613bc674ef9f605befc0f3c51f9357c7755b217e2aa47b8aae7 SHA512 c898d33bd07417ab865c18b99128d6238aa7e8f2f276d3508ec47e316a3fd542250e4ed66cb1fb4bf068102f13624f0a74d4c18bb113a2bda4a6a585cb504478
+EBUILD pound-3.0.ebuild 999 BLAKE2B ff36810dd873caf72f17abcf4e3e071f8ecfa61bfd3065bdd1a6e0661530c0ed3a2b050d533a355b05802fa619770fb5c77f065b14219d31eb3e288d1280d407 SHA512 60c18211a955ed374f48df80ec0ac0705c842357cfb5379ec61c46dc1edde8a1a47da36cc738a1912a48ef89456c8fd5cc7ed1111edac88f66d6c77201373a86
 MISC metadata.xml 578 BLAKE2B 24020874dd95fe9c002b654c60d9eac93b881eae6d4bd7cb64475344a16830b5727097e86e396866f6fabb949ea2606962dc8968278d6ea7ebddab7f63e9b99a SHA512 6405f3f81cc0aeeb98ec133af5af9c5611e3642b97918cce90e96b7698b500bd085422d439862813adbea3f9f8905a414f4afeb12b61d84a1c0d2bb83f19da5f
diff --git a/www-servers/pound/pound-3.0.ebuild b/www-servers/pound/pound-3.0.ebuild
index 007b10014cfa..449b52b0ebae 100644
--- a/www-servers/pound/pound-3.0.ebuild
+++ b/www-servers/pound/pound-3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.apsis.ch/pound/${MY_P}.tgz"
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 
 DEPEND="
 	dev-libs/libpcre:=