gentoo resync : 13.06.2020

4 files changed, 49 insertions, 11 deletions

diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index ffdd7303402e..e0dd7f399808 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -1,5 +1,7 @@
 DIST gunicorn-19.8.1.tar.gz 415541 BLAKE2B f0eefc4ff24052320b4dfaac3fc2523487f8dbb63365a9a3c52bc411b4d8f6150f348c709cae94dc4acb45e7fda534cf462d0339abc0325230d3560f76ce3241 SHA512 7f7fcbcde20b70d3a2faad595e08a028530348895f784eddcb35f24b3d5a7955edfc5b68aac4630243798fa37d41b7e869ec0d454dc80700c2630ba2cc39afc0
 DIST gunicorn-19.9.0.tar.gz 415774 BLAKE2B 1ac920e3a02aff434d2458cbcacd821df428e2dceeb0ee5a10c8cc449e49c0252980847bfcee02633f791c05aa086b37f5b50f9fd535acee6deb8a18dd1c24f8 SHA512 4a89f963daa7afe7741a4fb9aa4f14192429ac0e9ba5672547d683475dd2f2733efeed903ec99db9d831e2b05b9ed9e583e3cfec483a1b481d897aa77373e8a3
+DIST gunicorn-20.0.4.tar.gz 373841 BLAKE2B d6f0b5b901697ebc6ee987af5766174a845de8bfad03ce95638ed087b92175e9b2f0e9a49fda70f8f9c6fdc15e1ef1a431c069270af068fb29780abcedf63fc3 SHA512 706620f165e36c178a6d3e65f51a9bb7746abd40dfc7c0f1b3b523771be953dd03b36111f192407aef474ad44afdffd11b6502e51376d11465ffac2255822d5e
 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
+EBUILD gunicorn-19.9.0.ebuild 923 BLAKE2B d6a784321f92ca5b2cc04f077a7d18bc24a1371867607b3813820e5089ce36f2f41ac38fae36b00fb1c8c2fbee9a36398624bc3823072c2eba50e3e8848f18c7 SHA512 f14c034ae4d0fa97483b80df04e5bba6ca4219b8944d38cbd43a21c91daafe001331985f1bda79fb9be81bac55db6fce2a64be489a91db37c723af452d563a7a
+EBUILD gunicorn-20.0.4.ebuild 859 BLAKE2B 69200f06fb8b724de78bbfc53c273d6fbeee24183707cfa4e58f3b9e6a085d71a44f244e63a07bc011cd23c5c13e65250a6e8749eebb0e2cb958c536d2957f87 SHA512 e84d1c06e6559708a197fbdf876201c527a1ac1218e370edc3f628df37dbb19ff7e0d2c09e8ac63764187bd6c60bba665a7a66c027dd4a6ff6fe3feeca298fc9
+MISC metadata.xml 808 BLAKE2B d23e87c5659aed0bcb8a8719d3eb3a862ddff635b231ae01b3928cd6f33cd073b5b054742ed806a9dc408528c3a843a06e5db4c6a252beaaace6873d798468f7 SHA512 c420223f8e7f0b3ec1fb82091e38a85087ca814b16051dfd783e54d8af5fdb811086887a5f1e7177f8bcd37e098ab6244e3e8ecf38c6a3fa9941c2933b38e1c0
diff --git a/www-servers/gunicorn/gunicorn-19.9.0.ebuild b/www-servers/gunicorn/gunicorn-19.9.0.ebuild
index a3c4673b2fcb..7a3d0bb71655 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=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,25 +13,22 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT PSF-2 doc? ( BSD )"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
 		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
 
 DOCS="README.rst"
 
 distutils_enable_sphinx 'docs/source' --no-autodoc
+distutils_enable_tests pytest
 
-python_test() {
-	py.test -v || die "Testing failed with ${EPYTHON}"
+src_prepare() {
+	sed -e 's:--cov=gunicorn --cov-report=xml::' -i setup.cfg || die
+	distutils-r1_src_prepare
 }
 
 python_install_all() {
diff --git a/www-servers/gunicorn/gunicorn-20.0.4.ebuild b/www-servers/gunicorn/gunicorn-20.0.4.ebuild
new file mode 100644
index 000000000000..1c881d642a18
--- /dev/null
+++ b/www-servers/gunicorn/gunicorn-20.0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI HTTP Server for UNIX"
+HOMEPAGE="https://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT PSF-2 doc? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
+
+DOCS="README.rst"
+
+distutils_enable_sphinx 'docs/source' --no-autodoc
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's:--cov=gunicorn --cov-report=xml::' -i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/source/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/www-servers/gunicorn/metadata.xml b/www-servers/gunicorn/metadata.xml
index 96e0eb804f85..63bf1bf57b34 100644
--- a/www-servers/gunicorn/metadata.xml
+++ b/www-servers/gunicorn/metadata.xml
@@ -5,6 +5,10 @@
 		<email>rafaelmartins@gentoo.org</email>
 		<name>Rafael G. Martins</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Gunicorn 'Green Unicorn' is a Python WSGI HTTP Server for UNIX. It's a
 		pre-fork worker model ported from Ruby's Unicorn project. The Gunicorn