gentoo resync : 20.03.2021

4 files changed, 2 insertions, 107 deletions

diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index a83c694565be..9ecece38b3c9 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,7 +1,3 @@
-DIST jsonpickle-1.5.0.tar.gz 106088 BLAKE2B dcd35979a428180f10611638c831b083d9b8307729a0b19fe89b283c30ecac58477bd6a66e89c31e214dd2f100385d9933dc00d506e1f9bbb4b6ea9c3a0eaed3 SHA512 7828ded98173cb10908a9d60fa6b3f358add360d738cd85a90f012ca24b15c6bbb19c611027bdb0a4d25fe0649978ae59ff08fb7b717ef503a9916152aa6f849
-DIST jsonpickle-1.5.2.tar.gz 110239 BLAKE2B 3d4ee457a3f45dd1a6d1004d3fce66c95057958ec172227a7590631e479bd3a63dafe2ece04f5a0a78b9e283f61d949f5c359e4dd9270e162a3060e1032fc562 SHA512 609effeb5553c7c273aa621a8e86b4e630754eab1a948c505a08c98ff13e7f2622a0eb71374c03b69cf8e07c9a3b06fc9d282efba299a720b342424d642cfc6e
 DIST jsonpickle-2.0.0.tar.gz 110336 BLAKE2B 574dab58418c5225a9364836d04eaabf3384e9dab404d191846a4bb41e9c8bbb51243a6a231ec8baf05ff9be337e12b5c96c46b74a327e9f05653ca81bf6ccf2 SHA512 acba11e5dfce116b27edfe0fdccdd74755e299aa43f873dd1ce547d947b58f14c1059c21d04007b5be0857f7ce69fe5355fb2edc47a99cc2217fe00297ca78d3
-EBUILD jsonpickle-1.5.0.ebuild 1441 BLAKE2B 3e53b617db74e0562b01e2a501cebc92cdf2d3ec58f197300d00eb2914ebbbde79165c85173cc984f77018b59aec611c73564139f1898d1f1bd0019973537d43 SHA512 375c0138302140a53373b6e5e1095812348b5d7bd994797866f2fab66839e6df894a4748c18ca7a2e0ec5b3932a234ba4fbe700035c0180746120b50fdc6a82e
-EBUILD jsonpickle-1.5.2.ebuild 1334 BLAKE2B 476fd2eaf2c6bad9c1ed6358332a2351563eb5181347877c8df34e0a010539949f412d988a617b63ab88c0c7a1c5ebdd3ab4f4583b6c571ec2fcedf412558e5f SHA512 56cdd4b511c519860bed8aa4ba2c592ddf96b10f4959f269e1436b86e4ef67873f3ab02bfcc6ec3b4e0ced1d2472aa9cf9110ac5932fda2cf7beb021d92cd135
-EBUILD jsonpickle-2.0.0.ebuild 1334 BLAKE2B 476fd2eaf2c6bad9c1ed6358332a2351563eb5181347877c8df34e0a010539949f412d988a617b63ab88c0c7a1c5ebdd3ab4f4583b6c571ec2fcedf412558e5f SHA512 56cdd4b511c519860bed8aa4ba2c592ddf96b10f4959f269e1436b86e4ef67873f3ab02bfcc6ec3b4e0ced1d2472aa9cf9110ac5932fda2cf7beb021d92cd135
+EBUILD jsonpickle-2.0.0.ebuild 1332 BLAKE2B 39fa4fab94851065890cf91626fef0676522962727a436b3c0b17fbeffc8bda61a7864612c6e56eaea8fb8dff3ed122ee05f1d45a2dadeef71157471ca69b6d9 SHA512 a6d934dbfaf4bdd7363caa3f83c08a4201983e7103bf520e0bc12ef56fcf690425db18b363203dfa691cf864bc865eb0fc0ef7c97022ed7f96a97891725bb111
 MISC metadata.xml 411 BLAKE2B 7c2473bf3bca8eb7efab35c7aba77ca20a40e1c46f3acdafdc75f7484bdfd5af7061f297042707db0407da1622ca4fb587273b9db80c75f85df9c8b8f504bc30 SHA512 8120766a306055c9b9a79ec95ffddd619c0b423e566a7654803cf7f3446d27a75f713de94414344fdb756efe2eb59a6f1dfa91c994ea7636db41fd49489a0650
diff --git a/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild b/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
deleted file mode 100644
index 6e5f3a477d2a..000000000000
--- a/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
+++ /dev/null
@@ -1,52 +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=bdepend
-inherit distutils-r1
-
-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 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# There are optional json backends serializer/deserializers in addition to those selected here
-# jsonlib, yajl.
-RDEPEND="
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7})
-"
-# toml via setuptools_scm[toml]
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx "docs/source"
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# too many dependencies
-	rm tests/pandas_test.py || die
-	sed -e '/pandas/ d' -i tests/runtests.py || die
-	# broken with gmpy
-	rm tests/ecdsa_test.py || die
-
-	sed -i -e 's:--flake8 --black --cov --cov-append::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv tests || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpickle/jsonpickle-1.5.2.ebuild b/dev-python/jsonpickle/jsonpickle-1.5.2.ebuild
deleted file mode 100644
index cfb3bc401537..000000000000
--- a/dev-python/jsonpickle/jsonpickle-1.5.2.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_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-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 ~x86 ~amd64-linux ~x86-linux"
-
-# There are optional json backends serializer/deserializers in addition to those selected here
-# jsonlib, yajl.
-RDEPEND="
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)
-"
-# toml via setuptools_scm[toml]
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx "docs/source"
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# too many dependencies
-	rm tests/pandas_test.py || die
-	# broken with gmpy
-	rm tests/ecdsa_test.py || die
-
-	sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv tests || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild b/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
index cfb3bc401537..629cee7b6893 100644
--- a/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 # There are optional json backends serializer/deserializers in addition to those selected here
 # jsonlib, yajl.