gentoo resync : 20.03.2022

3 files changed, 8 insertions, 54 deletions

diff --git a/dev-python/sphobjinv/Manifest b/dev-python/sphobjinv/Manifest
index 4b84978b704a..8c83ef3a667f 100644
--- a/dev-python/sphobjinv/Manifest
+++ b/dev-python/sphobjinv/Manifest
@@ -1,5 +1,3 @@
-DIST sphobjinv-2.1.tar.gz 1144017 BLAKE2B 71878e1bac5202ab74298b56cd6172236ea524050323e0d6b8bbc0c89f1937d75f10d40b4071cfbe8c9031641e9a0ecb283da908c40840a61c12a7c892438241 SHA512 cde77d73b09b72358b0ac5b0d8f1a748e78dce6664d1b849ba68f5ff70dc43cbcff4581374d0151be29c4d97efe2920c5c00ff68918371243be158031e9554fa
-DIST sphobjinv-2.2.tar.gz 1150648 BLAKE2B db29624c9e7c5ec014793bb76693dfbe87d8742a688b91c196bec12ac03852ae7999717588e075f58f5d2c3109b10d532bd117d482b540d30af27760869a5904 SHA512 257327ad168d5804639d3a064db683e0b9eb4f1dcb864a12a8ba440f3fde31c832bd72298f6381d2590bfac85ffe811563b8de124a135de2b6c1511217925103
-EBUILD sphobjinv-2.1-r1.ebuild 1387 BLAKE2B 107abe0e53cebde1dc43e5eb2fcb9e11f5cc3cd56bd873947f460c561dd85c2cb2c65d4e90241d4e58306868e7f83e1acce74b386ac6f842abd669bfe83828b4 SHA512 23a796385f377571388107d6b3bdea1dc763005325bb824aa3d6a3975b0bb52bd13d353cd5577b587c92e20d8e08b5be288c8012400e262a69fd632a54079995
-EBUILD sphobjinv-2.2.ebuild 1356 BLAKE2B 2c1bafaf34db8941c0be0c5b5946d0f4af94f3b262f40447b753aea2f3f15744518b9ef00ddac1315a7fe66db6cb287f5e627c56d32473a105e74ece027d3755 SHA512 57ab85fb1967d6afa5cdb157c1f20c5d1bf78808bc5cbd2a11cf441e2e93ead802ca19c242836f717983d694e89d07c479267bf9c252ed45787957b8d4f8a345
+DIST sphobjinv-2.2.1.tar.gz 1150428 BLAKE2B 13bec53b00d14466aad652fb822ba32156d4ee3141f2df5bf55eaf77d03627c98c48dd142757ac43fe7dbf00716a85ee4c03060dfcf89e1d9aca4cd2589df5b0 SHA512 9247fc38e5d49adab0921f31e4ad1a8b2ca260c7a921b5fb9db7f800ee484335449031b0f51f81149ff71edba6cc93ab14a683ff6cdce2494322d05474e9a2c7
+EBUILD sphobjinv-2.2.1.ebuild 1538 BLAKE2B c8604ec45bb62d73955f3e65e5a2b8614c63fad40033da95cc72ad7d40cab42b4d9e6b489917c0cb801ea627ed8634f50b9177145b4425ea24b7a507129d7d08 SHA512 029b7303c2cd42b5d0052e146b07d9f776369c031b470546783ed19619c957cf89870ff629d3b093d5cb3989387fac98f3d0fd084262c157928d6aa6a5c51aeb
 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
deleted file mode 100644
index 88cd5e852d49..000000000000
--- a/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
+++ /dev/null
@@ -1,49 +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="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 ~riscv sparc x86"
-SLOT="0"
-
-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-check[${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/sphinx[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install 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
-	sed -e '/CLI_TEST_TIMEOUT/s/2/20/' -i tests/test_cli.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/sphobjinv/sphobjinv-2.2.ebuild b/dev-python/sphobjinv/sphobjinv-2.2.1.ebuild
index d3097e5c313a..b701065103ce 100644
--- a/dev-python/sphobjinv/sphobjinv-2.2.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.2.1.ebuild
@@ -16,12 +16,13 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
 	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
 	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/fuzzywuzzy[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
@@ -46,5 +47,9 @@ src_prepare() {
 	sed -i -e '/addopts/d' tox.ini || die
 	sed -e '/CLI_TEST_TIMEOUT/s/2/20/' -i tests/test_cli.py || die
 
+	# remove bundled deps
+	rm -r src/sphobjinv/_vendored || die
+	sed -i -e 's:sphobjinv[.]_vendored[.]::' src/sphobjinv/*.py || die
+
 	distutils-r1_src_prepare
 }