gentoo resync : 25.10.2021

3 files changed, 2 insertions, 56 deletions

diff --git a/dev-python/sphobjinv/Manifest b/dev-python/sphobjinv/Manifest
index 26f3212adf6c..16b2cced1899 100644
--- a/dev-python/sphobjinv/Manifest
+++ b/dev-python/sphobjinv/Manifest
@@ -1,4 +1,3 @@
 DIST sphobjinv-2.1.tar.gz 1144017 BLAKE2B 71878e1bac5202ab74298b56cd6172236ea524050323e0d6b8bbc0c89f1937d75f10d40b4071cfbe8c9031641e9a0ecb283da908c40840a61c12a7c892438241 SHA512 cde77d73b09b72358b0ac5b0d8f1a748e78dce6664d1b849ba68f5ff70dc43cbcff4581374d0151be29c4d97efe2920c5c00ff68918371243be158031e9554fa
-EBUILD sphobjinv-2.1-r1.ebuild 1387 BLAKE2B e0a7676af0846223b430e85f51bf3fc4d910feae0920c80246e067a2a1bc55150296987d80117fff957a445347789f095a1d075a03cc984d70e89f6477d63ec4 SHA512 8a1b0ddc260c6651b36fa7e6f27908880f64f00a815796727380fe25b320e18b8451a2a8ebfd4f6af2e376ad79d0467f7db6b39646a2eb01ba60058ac7bbb7b1
-EBUILD sphobjinv-2.1.ebuild 1407 BLAKE2B 8695c5392eb2d5440024befdca08563838dedfe1aca714dfb84d276c7bc75ac4150e4d5d98774734f51ffc0790b9c35e90d21e9e81b6333e64e1d6e40dd4c91c SHA512 df353ad06369be41d9dd815ab5abb5c24daea166931a563005425f83687d724368ad4bf5f5be7b3104b0f440269038726ea696cd9d830aadc15a3df1b1e7f6a4
+EBUILD sphobjinv-2.1-r1.ebuild 1384 BLAKE2B ad01bde1629296b0960a9ba16f2df43cd1038623ed3fa6ac2252c37c10bf8aff34b1db238d818ce533d562318f47bfa1577e1efbe0c66ab364813800c01bfa42 SHA512 23b20fdfadc357b258c6a8aa5454a8abd3bd3ae5ed8e78e1b1cdf0370f2c21a48ae5c0b8165fab6df81e9bda971cc73f53b5628deaa564b9d784f63dfa337e53
 MISC metadata.xml 894 BLAKE2B 9e3b9ad864c23cd1cf346de1c06bf25035de4566733c1716846267aeba3aa09c025e04b15b67369e74f703e4b3205d89e35fd6614627d9f5630fd233320843eb SHA512 f5407da0c6c12279317b17d7174627d1fc3a42f249c1e63acd73c0367c526aab6b62fd358a34760c4986d3d487839905e2ddf5e40c62668933280c5278fefd9e
diff --git a/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
index b23d5730c3d4..c1bbc2a2efb7 100644
--- a/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/sphobjinv/sphobjinv-2.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
deleted file mode 100644
index fd89afa41e92..000000000000
--- a/dev-python/sphobjinv/sphobjinv-2.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx objects.inv Inspection/Manipulation Tool"
-HOMEPAGE="
-	https://github.com/bskinn/sphobjinv/
-	https://pypi.org/project/sphobjinv/
-"
-SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
-SLOT="0"
-
-# This requires pytest-check, but that does not work at all, even if it
-# is installed it still fails to find the check fixture
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/fuzzywuzzy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/dictdiffer[${PYTHON_USEDEP}]
-		dev-python/pytest-ordering[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		>=dev-python/stdio-mgr-1.0.1[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc/source \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-issues \
-	dev-python/sphinxcontrib-programoutput
-
-python_prepare_all() {
-	# --strict option is deprecated in pytest>6
-	sed -i -e '/addopts/d' tox.ini || die
-
-	distutils-r1_python_prepare_all
-}