gentoo resync : 19.07.2019

4 files changed, 59 insertions, 9 deletions

diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index a597a12d6f6c..00188d00586d 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,4 +1,5 @@
 DIST sphinxcontrib-blockdiag-1.5.5.tar.gz 12066 BLAKE2B 4913aa53b365a05db2962c81c3f15df748c3424c88dc70bb5c97325c92492852698246b2d644748fde46ccc9ac6535871036851798db6d9db5e9610c5ef58b45 SHA512 4c007e2c394bf90ff84a000cf44ec1d50b39286a32929c89a64320299a70f10e44da35d942e7bb8697a9d61eb6a551f74bd15349cf0b439369aaaf12d175635a
-EBUILD sphinxcontrib-blockdiag-1.5.5-r1.ebuild 871 BLAKE2B 81254dd1370890e677b8cf300d2a36d40fb1c2c2858b819d8613ee43e4f1a7f6e219895e1781a1aa6ffd8871f302f5f507ceaf0e15526c0acb27e919a596ba6d SHA512 3099521e1a7c8131c279b71962bf7c3368b5268fe066e38f3645b4dee3afb5912faa7b0b0940c2c6e43ee438afdb262329863a711230c34044388505948f2577
+EBUILD sphinxcontrib-blockdiag-1.5.5-r1.ebuild 923 BLAKE2B 29b6a166090519a8a6d7aa3f381661161429db8e5f912f0a92dcb669ad92b23c550097755ae57bf7024e23fd4b58f3dac496e9f973bb742fe75d083249afd816 SHA512 f5d13643c66e24c6095badf6eecc4072bfdbd41928b2042b901042818229ba21236fd4bb0de71ab6161a5031f861d008b839d1eea2c2b592892a47c52189d875
+EBUILD sphinxcontrib-blockdiag-1.5.5-r2.ebuild 1322 BLAKE2B 985de97e36f3531ac5b3ab35f5e868ae5ae1caedd468544b7e255c67d04b697254ec2220c110ac5fd3622b06e361cca7550c08ee90999c557ca6c1eff9466a01 SHA512 0c97a3c79a693911ff35a6a21c5ca74ac79ac472a0a31496c44bab722c6cbe4283d8039a1a031d9c30e8a3c5854dc29b6b3561b629bcbb45cde19b368e20e80b
 EBUILD sphinxcontrib-blockdiag-1.5.5.ebuild 674 BLAKE2B 58d9d30ab0ac583c6414fb8a650bdc1bdd37ea55a942fba667cc0bdcd2618d842518c694636ef5d1a09990b36375c1e6ffcc68c68dea88f6d5e6e33ce50a31d7 SHA512 ac98f936ae0824a53ac52a3cbe87b10a67d44c938eef071ff2bcf3e8c9996d32b858acb4777adc39a0d730261dc35278479479fbffbf41176552373312235fb2
-MISC metadata.xml 415 BLAKE2B 3fc15637b9b04474ae8c9a0dd7ada374a37648e6cfe691e0979b9bc6b122e4b76c22f64faca554f03fa404f63fe6d0447bc3530382419319904c849efcc70160 SHA512 857a231d759fecabeaa764a2ec8181788f5ae4d9271414f75d001ef60b0a146f533a277dd6473678d398013fbde58c4f0479291089653a521d30cc1931f7da89
+MISC metadata.xml 494 BLAKE2B 07d540997f553498944f9ddc98afa804bf1dd6e4cce5447aa8d7990ebbc375813cb7d9d284915d7bbc181b12cc905923a1b858b663743eb408bca485e40ba22b SHA512 f83022805ed92e559cc35f663da9eed77d33fbe0d25bba287b77fa53235c14534493c493d107af0ad9573d6cd7fbfafe74017fe0b96e65afcdd45c5e3761fdde
diff --git a/dev-python/sphinxcontrib-blockdiag/metadata.xml b/dev-python/sphinxcontrib-blockdiag/metadata.xml
index c0b469c17c97..718fa6583747 100644
--- a/dev-python/sphinxcontrib-blockdiag/metadata.xml
+++ b/dev-python/sphinxcontrib-blockdiag/metadata.xml
@@ -4,6 +4,9 @@
 	<maintainer type="person">
 		<email>dolsen@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>i.tkomiya@gmail.com</email>
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
index fc5d9a3d0f2d..31208c5e314f 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
@@ -7,24 +7,20 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
-
 HOMEPAGE="https://github.com/blockdiag/sphinxcontrib-blockdiag"
-
 SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-
 SLOT="0"
-
 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
 IUSE=""
 
-DEPEND="
+COMMON_DEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	>=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
 "
-
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
new file mode 100644
index 000000000000..a66bb2552775
--- /dev/null
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
+HOMEPAGE="https://github.com/blockdiag/sphinxcontrib-blockdiag"
+SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${COMMON_DEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/reportlab[${PYTHON_USEDEP}]
+		dev-python/sphinx-testing[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i -e /build-base/d setup.cfg || die
+	# Those tests are known-broken upstream
+	# https://github.com/blockdiag/sphinxcontrib-blockdiag/pull/11
+	rm tests/test_latex.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}