gentoo resync : 12.05.2022

4 files changed, 47 insertions, 34 deletions

diff --git a/dev-python/sphinxcontrib-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index 460e0eefb9ab..094923edada1 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-htmlhelp-2.0.0.tar.gz 28144 BLAKE2B 09b0d9bcec57140278c4476fa0bbc40d359fc167d8ea891a1585fbdeafe6eb0b52442dbbc8d1d5b6edb3953b04fc29a71f6f74e58a281ebb0d79e5a30cb02749 SHA512 6ed673966615f3e818e00de4b7e59c27f0a0d7b494294f804540777c580480870c36002c08d8ad626b7b41a676fe40edc0b0b5ffc6ad8080f38f59c24e157636
-EBUILD sphinxcontrib-htmlhelp-2.0.0.ebuild 883 BLAKE2B aa2b85973abaa2d33882f9dbb6d42bfdaa43fc10e5f035d09044d22c942597ceadd444ba4e1fc01e20cd2539cc28e1c98f8927d1fe366f693f311e5e688ba7e0 SHA512 6f4ce3de37a432462cc56bd8671f1f3f5bd718026c794031dbde466db399e542d94075e855e46158b86b2703a1001b74ab2614467dab84317027e12b779e0a5d
-MISC metadata.xml 399 BLAKE2B 093141db0b930e9f59e6a19813101c600310414f940eff499d91740a25aa2eada2123389746b9d0765186ebba773450306d697bc4aabcbafdf6dbe1ae5b08129 SHA512 5d2a6e21f443fd23dddf6b2492e06cb654603f69c2023faafed1fee5ceab0cfc75e64ffec3ea8a7921696048632dad964d2d15fd73e508ec0c356ae2c9b116b5
+EBUILD sphinxcontrib-htmlhelp-2.0.0-r1.ebuild 1014 BLAKE2B 3959aa2a599a2ce3e56f08a1dc854ea081f3f059a914867a80ca70438aa3fdfee972179f05feeb84d498c28cc9842481a55198fddb37c3a22711d2fc9559e93c SHA512 e729a89d684181a311f9dcf0c2a7954a90328add38da301b79bc4ca9d8bb54fe2ef14966df2b071a3afaba950993126a2a014d0417710b3ee5561ccb3771ad9b
+MISC metadata.xml 423 BLAKE2B 49685b4a452f9f05a9f385c7c1913c282bd0714e1c92e42347960bdfa29ae01ed4eba7f43e3d1b7241d6bca4ddf4f8d3e0a1d0820a8af5edb7caca934908ecdf SHA512 8f497fb7ea0724be086c8a564481cf4d46ecf048791f76ed5494a7b0c0f46bf5eaf46875f0695b9add2914430c78427a5a77113a5f379052922217b415bfdb50
diff --git a/dev-python/sphinxcontrib-htmlhelp/metadata.xml b/dev-python/sphinxcontrib-htmlhelp/metadata.xml
index f8f84742d76a..955dd0da5295 100644
--- a/dev-python/sphinxcontrib-htmlhelp/metadata.xml
+++ b/dev-python/sphinxcontrib-htmlhelp/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-htmlhelp</remote-id>
 		<remote-id type="github">sphinx-doc/sphinxcontrib-htmlhelp</remote-id>
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..792c39e7ec5f
--- /dev/null
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild
@@ -0,0 +1,44 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension which outputs HTML help book"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinxcontrib-htmlhelp/
+	https://pypi.org/project/sphinxcontrib-htmlhelp/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+PDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${PDEPEND}
+		dev-python/html5lib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	distutils_write_namespace sphinxcontrib
+	cd "${T}" || die
+	epytest "${S}"/tests
+}
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
deleted file mode 100644
index b94a7f8825b9..000000000000
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
+++ /dev/null
@@ -1,32 +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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs HTML help book"
-HOMEPAGE="https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-htmlhelp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${PDEPEND}
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}