gentoo resync : 15.01.2020

3 files changed, 9 insertions, 18 deletions

diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index 556d17299dfd..438fe165d460 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 1190 BLAKE2B a453db7f470c3675919f60ca99b2e8a11f46703a9bcc8a99bf1fcc950879c3732982b1ea774137c86f6120aa01b63d0c9a7f85a77576a3acb136559f535f2efa SHA512 418729eec3cc78eecf0cf825b795dbb0e83eae2e57a3a814264b83f2f653fe62b0a34fc61bbfcf11e813dfa0ed6a452f178b2161451f62e7520de988969ab9d7
-EBUILD gunicorn-19.9.0.ebuild 1191 BLAKE2B 6aa62e8c80c9315ffe37c9ac268d13b1e9ff2930ef90b73af783a48820339415d76698dd0999ad0878ed409386d04cabb97d916b76e36d06fb4d6c19e6528cfd SHA512 ecede11aa315fbe73b5e05500311423bf66eec93c1f0ca8a2db8856052c2c9bbad3875c841a733f24eef8c32402758d9a52205d0e656bb4e91a628ae0ebeabad
+EBUILD gunicorn-19.8.1.ebuild 1181 BLAKE2B 1c3b390f24ac73eb0254f1da267e9576625f7342f2d6cbcc3b880af9d52dcdf3561e39337deea77dfa1e5a3ef91a3a07e29792feaf0916f182bea1dce5f64a82 SHA512 0f5e92617807dc4d49d970c7b59f14d0e17a7f16fabdc2c13511e1102ffd9fb6e3c92cc92e27d97292da717040b0c29e98c4903dc141aa0fac5a116814d3ebf5
+EBUILD gunicorn-19.9.0.ebuild 1023 BLAKE2B e9c04fe3b5f6e11c5f2f27a95ae6aaa7898aa8d7cf6cdb62d47371b07592b8a335b6f3b2fd250767cd668768f1bc5144a68bbb6d95d1091bd6e05ea8ac0f966f SHA512 7f109433e0244bc23ebe02de41db69d55c7b313c0a9e1a7d23e62cde9c29a3c756c58730f04b3c558a2b19ea0360879178bc8a6119fa358e939e188c00530da1
 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 07f09c37af79..a16655f74215 100644
--- a/www-servers/gunicorn/gunicorn-19.8.1.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 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 c98e3a00bb6f..34f357fed9df 100644
--- a/www-servers/gunicorn/gunicorn-19.9.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-19.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -13,13 +13,12 @@ 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="doc test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
@@ -29,22 +28,14 @@ DEPEND="
 
 DOCS="README.rst"
 
-python_prepare_all() {
-	sed -ie "s/..\/bin/\/usr\/bin\//" docs/Makefile || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
+distutils_enable_sphinx 'docs/source' --no-autodoc
 
 python_test() {
 	py.test -v || die "Testing failed with ${EPYTHON}"
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
+	use doc && local HTML_DOCS=( docs/source/_build/html/. )
 
 	distutils-r1_python_install_all
 }