gentoo resync : 29.12.2022

3 files changed, 2 insertions, 59 deletions

diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 59c5ecd3718f..d034a02c570f 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,5 +1,3 @@
-DIST jsonpickle-2.1.0.tar.gz 186799 BLAKE2B a9e82a046fc77e1a4d5e7b1f13fc34f07e0e42e34922258bb0bd5aa4557bfec2b5fc06e450a0391522ae27380306111001204eb4f5429c2ad1f908fc4dec40a0 SHA512 46e8bcc2e24616da43b87bf8371ec9b39de1e8e33380684c05b7d7c6695f17bcc21150848c3306d235f89c5d74c69b6fda79e93fc823665d72cc88d9d89d8484
 DIST jsonpickle-2.2.0.tar.gz 189866 BLAKE2B d8fcd0e8b71947b734c59240d9fa4f0b35b9b0ac2e2940a9baf05c160771db0eae5f011b61e3b1c0bc746a740ac2e137a392931e270fea3acf4884578133283e SHA512 b6cb35316e32f38875cbfa3784a3930f669d4ea730ead6117242070590647987383e9f933c193b8c246c40dba87ad56600a65db89c45c18a790b3c1f9232b245
-EBUILD jsonpickle-2.1.0.ebuild 1548 BLAKE2B 0eb883cc66012426460d9f0817a6bb55e0d770f927ee06303b13be7331c37dbb3d94227210a03c0e1dbf3837a4e6e8bd11a03c64664573389954cc9d18cac1f6 SHA512 a81b01d27fbe4f9ed94d06b874fffcf3c21682575eb2f2e65d2c85c6218a75ecd2c60819239be1628f50af3ecdd9683608aff7926b5d2df634217e8c1062e51f
-EBUILD jsonpickle-2.2.0.ebuild 1580 BLAKE2B 72b3aa768fca978bd56d3d7549b04d5dd644bef169da49c1594f0b00c221e97f0a4043277b00f0ed955820a6a3355501141b11438cef9380003622fb6a172620 SHA512 2d3a55b73fd97fe433e22356f04bd6f14ec44391381e2f97be239ae27fef4b8a6733da02e2ba7fbcacd033949c8e492b0c5191d0ed0e230b10f85d9039d687e4
+EBUILD jsonpickle-2.2.0.ebuild 1578 BLAKE2B 39d842372cdf7bd6a86b57f8b0cee9744732f3d4ddf3bae0b29211564976418369b4b3a8bea718e3c06ee172eebc1a1a4bac6eb54f046606f0f77c3fdac84366 SHA512 2cc3d983f8a524ea61a3044b2d14135b745f9405e3e5c02cc1f42df369ed1d74938818041f654300a23ddcc6b9ea187d1e3c65158f34e6527de6353464e53875
 MISC metadata.xml 412 BLAKE2B a7e746abd8b45415ecdbccbde1b65ba9f1fa9fe7ce353411681c2a3de046878e990aad20849ee561a56ad3208bd5071d7b5e5b3c767fd71b7c44d2e8412d349b SHA512 dc52df78fdfe9024e695aae3d2bf22bed7162e1f2a528a288056b68022ebbc400b0a3a2f3e9c2155ee57e66d77a4f7a3f6f67188fb13ee15f200212ac6809a31
diff --git a/dev-python/jsonpickle/jsonpickle-2.1.0.ebuild b/dev-python/jsonpickle/jsonpickle-2.1.0.ebuild
deleted file mode 100644
index 12e12c24f3b8..000000000000
--- a/dev-python/jsonpickle/jsonpickle-2.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-		dev-python/feedparser[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/jaraco-packaging \
-	dev-python/rst-linker
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# unpackaged bson dependency
-		tests/bson_test.py
-		# broken when gmpy is installed
-		# https://github.com/jsonpickle/jsonpickle/issues/328
-		# https://github.com/jsonpickle/jsonpickle/issues/316
-		tests/ecdsa_test.py
-	)
-	epytest
-}
-
-pkg_postinst() {
-	# Unpackaged optional backends: yajl, demjson
-	optfeature "encoding numpy-based data" dev-python/numpy
-	optfeature "encoding pandas objects" dev-python/pandas
-	optfeature "fast JSON backend" dev-python/simplejson
-}
diff --git a/dev-python/jsonpickle/jsonpickle-2.2.0.ebuild b/dev-python/jsonpickle/jsonpickle-2.2.0.ebuild
index 0b1bb08720e9..7edc0a633a62 100644
--- a/dev-python/jsonpickle/jsonpickle-2.2.0.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-2.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]