gentoo resync : 19.07.2019

3 files changed, 56 insertions, 37 deletions

diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index 245de10b7eec..c888dc7b0876 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,4 +1,4 @@
 DIST Flask-Babel-0.11.2.tar.gz 41105 BLAKE2B 88cd5f2f72c7533f173a3fef7acdcd9ee882b06111f112da18075ce007f94cb342acd16f35da138ca0548b5bd0fd8070d4b3b7941a136e5490c3b45d1351d239 SHA512 d95947983ff5bc33a28384f000512e85ed64c16555aa03e110a32b7c0c9e91eebc02259bfc69a0dbc84adb6ecf8155cffaecde5726658d64d36435060de3f22b
 EBUILD flask-babel-0.11.2-r1.ebuild 1107 BLAKE2B f698a39491c8ec1852386174992c9a0330176c5e4836670d111d16bc5c512e14287805f959cb86bfb6ab9fe94676e51be092ef4fb6b8836d4ef93d92625fd266 SHA512 c6f53e535ea1194b7fa0d4db5f267042bdd28f39103f5bc7f4d244f03e46c3d77499de456ad89135bb4a629067491a869418b64d2c3fcc3f23db378bcb007817
-EBUILD flask-babel-0.11.2.ebuild 863 BLAKE2B 94aee9931f697600a46fe52f45be6be45029580dfd4b1fe9df3ed0ac33185421e7778290aa6c19a0a2195aa0ef8b8882893c50891026fb985fca38dbdb94f103 SHA512 a93c39e462a60bea6be1f7085998f5c599df2a4b3c3496a0f9780711c93e25014fdf4915b46209eab84dc9dfba57b3806da1364b93c9dff7ef66130dc5129649
+EBUILD flask-babel-0.11.2-r2.ebuild 1192 BLAKE2B 572e2d24e27d50519f7dee10b25647fb76decd63d114d1be24f8566ddcdbaf1f165dd83cdb54304e9416707b8c00764ddeedbb6793a0b8c6bf74c6e7d3b83488 SHA512 f426ccab215782bdbc970ebdaef37f3ec53245471167f47faf1b2b6ac6a543d33755718e12704c7b2824ff8663f54e3593fefef257219bb2c45c9932d6ad7aef
 MISC metadata.xml 450 BLAKE2B db38ca56f4b683429248baf7411355305672c23126c4b6c7486971fb1e099bb3117b9246870a24f6ecd66e7f27647e80285461d046c02e9227970a111c58dd98 SHA512 d6fb2f7cdf0a8d4b54dce372bbb3d9728a5ebb0e6d714da9c58e5215d6711e3f4211e2a6ef5390cdfa663d375d7e2942a210bfa2822489dd04a911d9e9c24985
diff --git a/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild b/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild
new file mode 100644
index 000000000000..194980cc4134
--- /dev/null
+++ b/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="Flask-Babel"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz"
+HOMEPAGE="https://pythonhosted.org/Flask-Babel/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/flask-sphinx-themes[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed -i -e "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	nosetests -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/flask-babel/flask-babel-0.11.2.ebuild b/dev-python/flask-babel/flask-babel-0.11.2.ebuild
deleted file mode 100644
index c99d258e67e5..000000000000
--- a/dev-python/flask-babel/flask-babel-0.11.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} pypy )
-
-inherit distutils-r1
-
-MY_PN="Flask-Babel"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz"
-HOMEPAGE="https://pythonhosted.org/Flask-Babel/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	nosetests || die "Tests failed under ${EPYTHON}"
-}