gentoo resync : 12.05.2022

3 files changed, 61 insertions, 46 deletions

diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index f887d15ef481..ec567134cbe8 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-websupport-1.2.4.gh.tar.gz 599695 BLAKE2B 909fc3dd77377769b6242963c2228a01dae4c73b2c1128094ecb5c113517ddb103498fa8615a0690cc41333778a21ba62a7638e36e3d82ad89c74b76156580a4 SHA512 4b5a382037988079e12e5c022ce0351c953e65dacfee7e3a63852370deddcee083cb65914b0bb9a8dc42481015f33d1ac2b5fea61c676ab947f8b0cbe331d7f6
-EBUILD sphinxcontrib-websupport-1.2.4.ebuild 1266 BLAKE2B 83976ed277ab141e8960324ec9684cf55f4ffe19e7edd703be7b2909bc1680a141cd56c621b275d2a075853398249cea27ab9777ea8bad03acf45013c7798c76 SHA512 18e5ba68d18bec66d76d5d125b193c179bc026940beb7cd09a37870f1867b501d6af10630339257bf81ce8b008417233a6feeb49de7a01e0b9bab54d20aceccf
+EBUILD sphinxcontrib-websupport-1.2.4-r1.ebuild 1415 BLAKE2B 0e3eb3fd0a4dd47528e641bc12070c5c115a0571959589f5e3fa613fc5a433a17bfbd5371f50ad0cc2398d7202114cd7ca7338d5747a28180f1bb49041a6a264 SHA512 6845324ac82c0a62f34ca6898fa89387593162fa3b32d982bae5c91e6a11da8430fb27b11d87cb715263cd6aa7825c645647ad69c91858c1fcdae652aaec138e
 MISC metadata.xml 614 BLAKE2B 4029475965c4514884e0ca09ca1ba257806fa222367acdc77caf7878d8564f46a6050a06e7f43a5483d9c855e746818c037dd80889fba245c3626537722281d0 SHA512 014e0efd914a7fc32fbb8bb432efd5d7e4b2efd6e189ec33da2c409281e67529de574f7708c9963723d314d45d1daefd33eeabb9f25e5af389ac0d0ed6f37d51
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..97cb4e352fe1
--- /dev/null
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
@@ -0,0 +1,60 @@
+# 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 websupport extension"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinxcontrib-websupport/
+	https://pypi.org/project/sphinxcontrib-websupport/
+"
+# pypi tarball is missing templates
+SRC_URI="
+	https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/${PV}.tar.gz
+		-> ${P}.gh.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 ~x64-solaris"
+
+RDEPEND="
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+"
+# avoid circular dependency with sphinx
+PDEPEND="
+	>=dev-python/sphinx-1.5.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${PDEPEND}
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# breaks tests
+	sed -i -e '/pkg_resources/d' \
+		sphinxcontrib/websupport/__init__.py || die
+	distutils-r1_src_prepare
+}
+
+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-websupport/sphinxcontrib-websupport-1.2.4.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
deleted file mode 100644
index 9fc9cb7ac243..000000000000
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
+++ /dev/null
@@ -1,45 +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 websupport extension"
-HOMEPAGE="https://www.sphinx-doc.org
-	https://github.com/sphinx-doc/sphinxcontrib-websupport"
-# pypi tarball is missing templates
-SRC_URI="https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/${PV}.tar.gz -> ${P}.gh.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 ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]"
-# avoid circular dependency with sphinx
-PDEPEND="
-	>=dev-python/sphinx-1.5.3[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${PDEPEND}
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# breaks tests
-	sed -i -e '/pkg_resources/d' \
-		sphinxcontrib/websupport/__init__.py || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}