gentoo resync : 23.06.2018

4 files changed, 12 insertions, 71 deletions

diff --git a/dev-python/flask-appconfig/Manifest b/dev-python/flask-appconfig/Manifest
index a275c40afc0b..3ab75e8e9c8a 100644
--- a/dev-python/flask-appconfig/Manifest
+++ b/dev-python/flask-appconfig/Manifest
@@ -1,4 +1,3 @@
 DIST flask-appconfig-0.11.1.tar.gz 14545 BLAKE2B 71cb3252707ee546aaa16ed36f1c605c5e90d49070a64aa381f23fcc1fa9147724a8794b8530738115c3b0505537487c63b3131c586b4383884b58f6141cd515 SHA512 9ebc42be5ef247b1f14b85f7b65600a1595ecdc70e792c0cd495347254b07675a3b7a306df8d2f2663626ceafa4ce7700f6f26cd0f1bcd974ba6bbab293847ee
-EBUILD flask-appconfig-0.11.1-r1.ebuild 1293 BLAKE2B 32e0d853faa86e7867d780a70475321b0cbf458659425626a178616c3468ba95a8b5c0db21f4ab98d015ddf5dd08cff7c1ae3b52079c348a246ead65835a0b77 SHA512 834c004413be8a0a5148aaf7b4d31a46ec1dbe77d828127bb57243301c735fb4699571cbfeb222770abf970f124bb2fbf7c60d973c989131bfe4f1238bdb9571
-EBUILD flask-appconfig-0.11.1.ebuild 1189 BLAKE2B 6980e99439e143bd20031e031539a56ec5df43323f012b89f36cb045a113aecf4ef7b3b5327271c6e8d15a9035108b871e13c91f4fa2ee2f68fc639c4b83db60 SHA512 aa7836360cbb4de89fed9ffabe2313b4ab2f582e072cfee815304eca0fd2dd1e320674ae029572554cf46bb11c72aa6437f9a7de46d9e09d246b293ab2e8069d
-MISC metadata.xml 573 BLAKE2B c71d596357cca1771ad69d71119ef536bc4372fd25b73eb43df03748e4d1c44639eaf49dc4de6f94682f2e88a485fd9290654468fe66deca00849765bcd7f651 SHA512 77d7130b75896a8a317f3ee741e0bd1c9b0c0d3acecc183985bb8330a7b6010174eff3631c98b706b28af17790926bdba275a6e9a05b5b799eec7b04e4e8e6d9
+EBUILD flask-appconfig-0.11.1-r1.ebuild 1219 BLAKE2B c4990b3715f60bb277c3373413b3cb6eac7c44a8d2804af753e027dbf18e56297dfaa9ed0724bf1902d50ac2c5c4a3a5cef302c94e8a5fa0f55fb5a3901153ef SHA512 28edc3c6370258c78a8c44ee7a401f2eb0f43b37b7386c3343bb15b5b4bc454676630ac7e377134eca050cb66b2e976db9af4fd8414b246debde239711b4320e
+MISC metadata.xml 449 BLAKE2B 062ef689f336373983993c0c666feb9a5fa6a6d6a19d3509a6856c6f75a4b810fbf6ed6ea42511073691d83c23a63c5cf3a78db1f0e41d2001b146d8b950e30c SHA512 6a71fd90326834e06eab6e45aeddf17940a9140d7ac41e9fbd1dd8551042066a7fe4f6eb6840d5e2363deffb9d00d59283aea87c113b4b190590d545cd283122
diff --git a/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild b/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
index 66d2f6d35180..2e1c7689325f 100644
--- a/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
+++ b/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
 
 inherit distutils-r1
 
@@ -24,12 +24,11 @@ RDEPEND="
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
 	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 "
 
 python_prepare_all() {
@@ -40,14 +39,12 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	use doc && emake -C docs html
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
 }
 
 python_test() {
 	py.test || die "Tests failed with ${EPYTHON}"
 }
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-appconfig/flask-appconfig-0.11.1.ebuild b/dev-python/flask-appconfig/flask-appconfig-0.11.1.ebuild
deleted file mode 100644
index c543bd77e196..000000000000
--- a/dev-python/flask-appconfig/flask-appconfig-0.11.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Configures Flask applications in a canonical way"
-HOMEPAGE="https://github.com/mbr/flask-appconfig"
-# PyPI tarballs don't include tests
-# https://github.com/mbr/flask-appconfig/pull/4
-SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-appconfig/metadata.xml b/dev-python/flask-appconfig/metadata.xml
index 8639b4a6ed3a..0f9d841b0609 100644
--- a/dev-python/flask-appconfig/metadata.xml
+++ b/dev-python/flask-appconfig/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>sautier.louis@gmail.com</email>
+		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">flask-appconfig</remote-id>
 		<remote-id type="github">mbr/flask-appconfig</remote-id>