gentoo Easter resync : 12.04.2020

5 files changed, 2 insertions, 124 deletions

diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index 959b6c5ee51e..86bca40b40bb 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,7 +1,3 @@
-DIST sphinxcontrib-blockdiag-1.5.5.tar.gz 12066 BLAKE2B 4913aa53b365a05db2962c81c3f15df748c3424c88dc70bb5c97325c92492852698246b2d644748fde46ccc9ac6535871036851798db6d9db5e9610c5ef58b45 SHA512 4c007e2c394bf90ff84a000cf44ec1d50b39286a32929c89a64320299a70f10e44da35d942e7bb8697a9d61eb6a551f74bd15349cf0b439369aaaf12d175635a
 DIST sphinxcontrib-blockdiag-2.0.0.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
-EBUILD sphinxcontrib-blockdiag-1.5.5-r1.ebuild 909 BLAKE2B 5a26b005193c31dfeba6857c574a36f1a04cc9547e59abda942285f34968626aabd2c13149886255b6babd54a24780ab168f07489a9da9cde796dec7e68c4f87 SHA512 fa33c848d73d802df7d3ffce63528085fb4409ae6d04740b48a8d895ac4b15dcd08e8f846408edaba6cf5337baf8ec27dcf3de60778e798fcd3d503adfefc0ef
-EBUILD sphinxcontrib-blockdiag-1.5.5-r2.ebuild 1320 BLAKE2B ca7468a14990cdf2fc8b07f4a460859d4d98790fe49f100746e7b64f3af1eeb90c2545b4b6ca0cd32106ab0b1bf9916d839e13204c35c40b1e603dc1e1675a7c SHA512 27c5840d236ac77b3fd8a6b75a654a5faefd02ff19bba8fb4d637cb18684cb0940bdbdc00e439ad5faa9c5cd3baeb48075e90d48bc0eae366a03309bf5108b21
-EBUILD sphinxcontrib-blockdiag-1.5.5.ebuild 660 BLAKE2B d79ba86a023deda75cc902bf1aeef06a529a343e5959528b93c60a64cb1749471572154a0a73356e55cdb4fc972486636644ddb8ebed7d0c06b5c79f7db76fea SHA512 c1674c57a8773a88ee8dfb97eba82db32a9a2d316f01daeb35c8002ea7f2255fa31e17cd62db1a8a67876577bef04532637b8d6a80b02347f173d3569fc6aec6
-EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1177 BLAKE2B 47e6a9f127caee1dfcf88d233433780752cfdd97246d86231ab68eb9fe35b13ef055084d031bc12a845f0da320dd4a384b0052366ee12c57f1b5d7918d2333af SHA512 d9c799abbfe972c37c769f440cf956464eb54d669d58b0cbad56408d3f914c05de0634c9c27d854d96bcbf5c8db1080beeeb69ab9c20708c936bc7c134685e5e
+EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1175 BLAKE2B d8357f47bf454ecb5a09391223e4ad92221c2daa566fce2c34ee92f3fcfc0e59e2648e811974c2537548aac158e124978e434889bc12e37cd211bddabd935c92 SHA512 7260d2d332833515bbad47c966eab7ae763267c5db1f4ff8c27a009906e9c033d959231778df9280d73ba73d730802de602013e486deaf10f5c0e0fc3c02f508
 MISC metadata.xml 416 BLAKE2B 4383283e64d8db0b5576f1defc62412b5c4f4003e5ac75a2755e79d3e2a53f6d7aff82741d6225d2c96f0e2d87df650d47110a31cc91362dee641a86c54b18da SHA512 10fc4ff78fce4beadf8f8b64cfcaf4b71f84c3f74d80bd7299055ef7c2a759bf8d8eaef841e464d72d3272d999fe20ebfbcd382f2025932eef474387e92be6e0
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
deleted file mode 100644
index e2f7a4c438d5..000000000000
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_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=""
-
-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}]"
-
-python_prepare_all() {
-	sed -i -e /build-base/d setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
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
deleted file mode 100644
index e2449197687a..000000000000
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{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 ~arm ~arm64 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
-}
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild
deleted file mode 100644
index 8375f8282c8e..000000000000
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_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"
-
-IUSE=""
-
-DEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
-"
-
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	sed -i -e /build-base/d setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
index 4fcd524df2f5..75e9b6ad5829 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]