gentoo resync : 22.01.2021

3 files changed, 7 insertions, 54 deletions

diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index ee8e9f087cd6..bcf6574b9fe9 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,6 +1,5 @@
-AUX jsonpickle-1.4.1-importlib-metadata.patch 1198 BLAKE2B c37f21cb8102eb1f6ec2bb178a0d38552bf013a4557fff990731a15eec24ced69210c38ac0abe28e7f8dd7707016bee51844faa2acc35b582a9871ca44d87104 SHA512 574ed4cb7492483c516b96b74502ba3b94d66e149000395781f2eee49b5e649bcd4d8f433e2dc257ae74b036ce314c1fd23369c1ac2ea2cdf7c89185d3abc076
-DIST jsonpickle-1.4.1.tar.gz 104564 BLAKE2B a3ad6f9c712f39153186b6ccdef515581012ad4ba1251dcb094074f2093eb4b158b9357bdf2e8668073cb21dc3bf6dd2fc3a0058c8597252c558a797432068b9 SHA512 ed6bf3472c59ba907a973c5c6f05de13dbfc75eef103796b8f8a63d388f769527f22667ca8761092d1649ff2caf5a73de0593e370df3e7fcabe06e73b265da35
 DIST jsonpickle-1.4.2.tar.gz 104745 BLAKE2B af12141c867cd3dbecace5b7bc637b554c51c245d4f584c4d94e73e694b74f66fc59a65a62b7a0af361a7a8010b9398a9b04ee838c4f76c168b21dba6f2c9542 SHA512 a6da661a69daefbc9393a4a4c88aa1da1b8bd687b6eeaed3d833ce1683bd1fa9d7943fdeecfe927e0492945ee2910b6f2d5e53ddb2b928b21f7b099ab79d45e9
-EBUILD jsonpickle-1.4.1-r2.ebuild 1460 BLAKE2B 6bfb7c132ccadded3b493b49ccaa0358c34ca8c18c80224dfb96080d9e15c02de1ca8d2fb3a61e009f1c1097577787c0f8f08fc4e42abc51b86d04423fe996e5 SHA512 d219db2ab875546fa2f4b7a39918538d251f068089e44647ddf4434f550a460a72a503b4ab9c77a021e4bc1dfc8a4e79e94b5a6915e5fdb0af85188687b91d36
+DIST jsonpickle-1.5.0.tar.gz 106088 BLAKE2B dcd35979a428180f10611638c831b083d9b8307729a0b19fe89b283c30ecac58477bd6a66e89c31e214dd2f100385d9933dc00d506e1f9bbb4b6ea9c3a0eaed3 SHA512 7828ded98173cb10908a9d60fa6b3f358add360d738cd85a90f012ca24b15c6bbb19c611027bdb0a4d25fe0649978ae59ff08fb7b717ef503a9916152aa6f849
 EBUILD jsonpickle-1.4.2.ebuild 1441 BLAKE2B ef8bfc14c6235e351bfe23125149b85c4b4ed261d971742545b2a36136637910975f74b063830784d032e2217e5ed59544a9a8803f75da61ef0681696e09dbe6 SHA512 fab8686bd27f0159b00beec66e3cf27e8deb4eea25a6a94ff67c61e90b90993e83dcf48bea3eb178e3654a628e851cc6d706941361a1a709ee3470bfe3dcc5e6
+EBUILD jsonpickle-1.5.0.ebuild 1443 BLAKE2B dd91fb08e3b02a0d3985ed2def4a62ce5eb1cadcef87c84b17f96aed887073c7eed8075bf4940dfdc19dc93f5bec4bd3025f178d72374b5a050786ed9a09b0a0 SHA512 806f4021ef0c33e45b6a0e795a333e379e3866e444cba63d50f7d6439726b5468755ed652fd1d2d485e3296cde8ee33cb6e7793044a9b53254bb3726a119a06f
 MISC metadata.xml 411 BLAKE2B 7c2473bf3bca8eb7efab35c7aba77ca20a40e1c46f3acdafdc75f7484bdfd5af7061f297042707db0407da1622ca4fb587273b9db80c75f85df9c8b8f504bc30 SHA512 8120766a306055c9b9a79ec95ffddd619c0b423e566a7654803cf7f3446d27a75f713de94414344fdb756efe2eb59a6f1dfa91c994ea7636db41fd49489a0650
diff --git a/dev-python/jsonpickle/files/jsonpickle-1.4.1-importlib-metadata.patch b/dev-python/jsonpickle/files/jsonpickle-1.4.1-importlib-metadata.patch
deleted file mode 100644
index eefb41d73d7c..000000000000
--- a/dev-python/jsonpickle/files/jsonpickle-1.4.1-importlib-metadata.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 7e5752de7d49f222cec5107aa5044fa8f8ffbb39 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Wed, 22 Apr 2020 20:38:28 +0200
-Subject: [PATCH] Use importlib.metadata from the standard library on Python
- 3.8+
-
-Fixes https://github.com/jsonpickle/jsonpickle/issues/303
----
- jsonpickle/version.py | 7 ++++++-
- setup.cfg             | 2 +-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/jsonpickle/version.py b/jsonpickle/version.py
-index 01c83c4..92b44b2 100644
---- a/jsonpickle/version.py
-+++ b/jsonpickle/version.py
-@@ -1,5 +1,10 @@
-+import sys
-+
- try:
--    import importlib_metadata as metadata
-+    if sys.version_info < (3, 8):
-+        import importlib_metadata as metadata
-+    else:
-+        from importlib import metadata
- except (ImportError, OSError):
-     metadata = None
- 
-diff --git a/setup.cfg b/setup.cfg
-index 9f0eab2..46707ec 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -36,7 +36,7 @@ packages = find:
- include_package_data = true
- python_requires = >=2.7
- install_requires = 
--	importlib_metadata
-+	importlib_metadata; python_version<"3.8"
- setup_requires = setuptools_scm[toml] >= 3.4.1
- 
- [options.extras_require]
--- 
-2.28.0
-
diff --git a/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild b/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
index c81366d06a47..1b45fa6a4c52 100644
--- a/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
@@ -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"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
@@ -35,14 +35,12 @@ BDEPEND="
 distutils_enable_sphinx "docs/source"
 distutils_enable_tests pytest
 
-PATCHES=(
-	"${FILESDIR}"/jsonpickle-1.4.1-importlib-metadata.patch
-)
-
 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