gentoo resync : 12.05.2022

4 files changed, 57 insertions, 45 deletions

diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index 5785fea89476..c4fb8104320c 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,3 +1,3 @@
-DIST sphinxcontrib-blockdiag-2.0.0.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
-EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1079 BLAKE2B ef688f7503ae9b0921c67a42e534382486f66912e9bcf06258a260f4a7dbad7bdfb49157168fab13b2507ff735585a8eaa0a1d39246d59996f97c317a67bb26b SHA512 aa4658286b181429c3e71c7e7fdd4588f8dcca57cee59d5aa8916199246ebf548dc0ec4e649792e36cc9bf92239ff004759afe3d602d8de095625341c73cd810
-MISC metadata.xml 478 BLAKE2B 14eb33746c2d0288a2fc45b4f794e28cfd53949a9a3e8150b511c3866fe3420db734fe4ca6b81b99bf43ab3ec50477a5a6d7d9bf86be5dc13af712abb513a32f SHA512 b44b73905e2c2952d54224ecd30c4ee19ea1ef69cb02f5bf17ee26753e3351af14337d723cd70131d9284d426d14ac7063e63e42643188061e37c8b78b26cc46
+DIST sphinxcontrib-blockdiag-2.0.0.gh.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
+EBUILD sphinxcontrib-blockdiag-2.0.0-r1.ebuild 1227 BLAKE2B 4111c11961945fa16b5e326014eaecb3d88b806a50eb2e377ddc94dff954497b6008d83e43313ce6f18306600ce9a41c74473a080648f977e3afa11f4469029f SHA512 2b98094fc3ebb15babf69712ac9a932b746ff126bf2f4c7f3628e693c47780c2b148f79be4e6b152294a8234d49eed1e7d448970fd7241b1abf7ed7e2fd3bfb5
+MISC metadata.xml 502 BLAKE2B a9910c9ee4029937c23f98b7cab1b6d9b2ca72db3272fab0c11d8e3e851e249229a2749d74250c8717e83d90eab0613cab892e7218b70ab26b761a77c23bd4a8 SHA512 993ab6e8cd639af61f08bffe017bd6d12539d20f827b1992a8d99e9cbcc6cfb18b254b2b7a86ce16a2b87125254d801333f68469bc6bc6b576a70d27c605c6a4
diff --git a/dev-python/sphinxcontrib-blockdiag/metadata.xml b/dev-python/sphinxcontrib-blockdiag/metadata.xml
index 7786df3b3319..b212d7d00f0f 100644
--- a/dev-python/sphinxcontrib-blockdiag/metadata.xml
+++ b/dev-python/sphinxcontrib-blockdiag/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>i.tkomiya@gmail.com</email>
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0-r1.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..d71321ef67f9
--- /dev/null
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
+HOMEPAGE="
+	https://github.com/blockdiag/sphinxcontrib-blockdiag/
+	https://pypi.org/project/sphinxcontrib-blockdiag/
+"
+SRC_URI="
+	https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
+	>=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/reportlab[${PYTHON_USEDEP}]
+		dev-python/sphinx-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	sed -i -e "/build-base/d" setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	rm -rf sphinxcontrib || die
+	distutils_write_namespace sphinxcontrib
+	"${EPYTHON}" -m nose -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
deleted file mode 100644
index e7d18a6002f3..000000000000
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
-	>=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/reportlab[${PYTHON_USEDEP}]
-		dev-python/sphinx-testing[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests nose
-
-RDEPEND+="
-	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
-}