gentoo resync : 23.09.2020

5 files changed, 4 insertions, 115 deletions

diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index aeee8965c44c..73e088fb4adb 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -4,13 +4,10 @@ AUX ujson-1.35-sort_keys-segfault.patch 2360 BLAKE2B 774cd15a52a333456e0f7a4996d
 AUX ujson-1.35-standard-handling-of-none.patch 2563 BLAKE2B 55a2ad075f7ed348ec4f92727e9bfab2c41a734412706102e1b0df8c04f969d4273354cdb570b3334a4bcb7ec3cdef7c1c836405345165e129ab82a0f53f8f35 SHA512 3d3b7a3dc3d055c4c3cc94acdced6d5b154bfe23ff371230924f5ac7ea982997b2d404dc643c53e606c76b41a5d8c41d506d3f5d3adcc6cd61633f7dbaf3e30e
 AUX ujson-1.35-test-depricationwarning.patch 369 BLAKE2B 9fbc92d557049d8790b664ef60a908b99f6cd657c5ade674979f1b05e4c61dbb514eba09d3727c6c61eddc5b08fde5043cdd2af0477c996d9fe9bb43a4838380 SHA512 71fc8012f1701a35def3d7533d8d8d4133550dd57bd22b11e1dcd2806d25e185678f047cc1fe61a35132ed1d546d1411d452bb0e7af66aefe9b53a99b5ef3c66
 AUX ujson-1.35-use-static-where-possible.patch 19904 BLAKE2B dcf5691a43dd068635f6be23b9dc5c3a7ff2d9a66c836dc75954f7625f7aef4d55e06e90f3c030f8bc2f4db80b34cb540e09183939880bbf32225bc23c58f3fa SHA512 fe96f88cde477bfdc63ad5cf360ab6c63e2cf00c192a8d70d80340b7e39820ca53554a775c8f32b7ca43259e9f299fe38ebaf4aa64ef12c035bf23085f5b5789
-AUX ujson-3.0.0-pypy3-test.patch 2694 BLAKE2B 415ba9375614c69aa4397aa0401e6093043d2f847ee68287b2f3fc497ee0bd98fb3974cae86e8bf9b0af69d088250b90871b5597bf046cb803ceeb5a64d6f60a SHA512 d59021415229142e673059bd18d313ac3886b70f39dc9e53bf592d4b796ceedd096468adb5c5aeaadf99c2cad2d2d6188ebdbe5b32aeeb83ba9cd1890327226b
 DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
-DIST ujson-3.0.0.tar.gz 7128523 BLAKE2B b19525edf1528e3b2a43cb08ecbf7b5d070f2455fb0bbffbe4b866bbaca91df09d7f4d46509dfb92d825095d4b922fc866fa36e051fa0e27af60fe558c69c854 SHA512 058675627c1275df1dbada02fca3750e544e25c0d0842b4a4268a664456cae1869423d832b7e4af40e56168b687ec711adf124e9ab34b7c06a244b61f7e2fdfc
 DIST ujson-3.1.0.tar.gz 7128419 BLAKE2B 544afb68e23fe942a6bb241f6948998d61a42d61799dff257f139510e4e97e9bba5c4742e1ed1f0b0e78dfcde0589f0b255c92fc5f3059b6cdd86279aabfe141 SHA512 c40953a4b5b55e894e42fccded618a9f2ed771904e1d1e90a28f4691a53fbd8b2fab3dc98a36b6e0637d2ef40ac87ebf9f2d8fce33cd3bc4e68bf7c18c7a33c3
 DIST ujson-3.2.0.tar.gz 7128952 BLAKE2B 7e4c409eb8e87d542d37595439ded5c85e934e87a18987e18dce5ab0aebd5f9431b8a2c12ebaa467da928c3158d03325a40a9ae65230e39c93106d65b098c407 SHA512 8915e17acbd9650964dc9ae4f8a89021af921fac8f77f5456fdb8c0d6ceaa02767891d070c515c926deef76efb210a969c573e387ae62c15b2c8be761f6adb70
-EBUILD ujson-1.35-r1.ebuild 918 BLAKE2B b6924b75688ae427d726f11bb6acc73ea26cd5554a4d4c505c44e17aaa149be62673aa5c47677caf42c3e03b47f730c6abf37a44e6e51e3baae3212929fb44ad SHA512 5085de8190dac63d4e951d7fca160de6b1d68708ea6f1293f193f1dc93a34a48e5b9193d7e683535e2ea4a06c5cc3cfec3ef085ca8ca03179b2b5cfa3d8fc448
-EBUILD ujson-3.0.0.ebuild 631 BLAKE2B 88b9cbbced507463e6aee7342f0d76b5468edabf2f009d7852cf153025b6749679cc339812f32465a34879df11428f7f3aeb3ab6baf2aa78a57798e015055ed5 SHA512 390ec9c2d42d22f229463fcf3659e96bc025cd0eb6dde344e4e45c85a9fd9828adb07903a98d6b20fdf9c4a834b13cbbc4c9b991da7958e30eb9eb8defa89450
-EBUILD ujson-3.1.0.ebuild 583 BLAKE2B 37bc5a98c5e8fa348177255ae571d320ca247794eeca5d55b2b88d1a104d87aee32b90178a0cbcf61e8e3be55c5e9501e1279c51b3b7f37da324d7470f044394 SHA512 91b25f5311c437ced258f23724660d1b77ad39ea3671d7c0326f1ae0c8cd486c29af5e56870ab0907e5d5137c5a60e4b27211a02c7a1e03ac96313194eb54ca4
+EBUILD ujson-1.35-r1.ebuild 916 BLAKE2B b2edaafecfbdb678a1c9ef17d65d4e03557bd2485ada4b8ea1d72fa89795be9b1b6fa18da8f2749b114d9bbd44733be1309263fc2444e227eaaadc8f5598b2b7 SHA512 bab8dc178469c09f459a4f83b0f8403914137a372ca31fe5f200d85871617aec439a223453cc6b77cd3ceda0ad7322ce272f30811dde02169257f5675b2cf432
+EBUILD ujson-3.1.0.ebuild 581 BLAKE2B d9d0f77fbbce79d1d304a1d92e34bca57ee0aee64128512a279e61bb32045beef379605a15a16644ec05c1b20999e87ea2ca8cb7c1b99b548040f48ea92cae74 SHA512 848f4200133797f1bcca94f07dd089f8f1f2b8f83253b6f4fb260c0a13dd568dd8c15cda7a0fb524dbffec632b66dff15ce1508fa2421189707d4a2a0ecc33e0
 EBUILD ujson-3.2.0.ebuild 585 BLAKE2B f045597ecb0e5505804161e10b1b43ab2d1fe8942e4d98e219dc6ce6e5ef270db2a3a8ee3458fc3fc3315ab545018086e40bef54af6af4ce8441ec9a75e650b1 SHA512 75d47578b8abfe2ff26273cfd8f7472338e3d55cbb011762f5a15f6a2abc52ee1b53a50fbb420850a831709e25731d90c73f539e86bcdb1ce6458a5f21453815
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/files/ujson-3.0.0-pypy3-test.patch b/dev-python/ujson/files/ujson-3.0.0-pypy3-test.patch
deleted file mode 100644
index 3bee41bc938a..000000000000
--- a/dev-python/ujson/files/ujson-3.0.0-pypy3-test.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From c9a5ee46a1112d5f7e51defebeefb1e0ab43111e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 12 Jun 2020 15:04:57 +0200
-Subject: [PATCH 1/3] Do not depend on specific exception messages in tests
-
-Fix test_encode_raises_allow_nan() not to depend on specific exception
-messages.  This fixes test failures on PyPy which just happens to use
-different error messages.
----
- tests/test_ujson.py | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/tests/test_ujson.py b/tests/test_ujson.py
-index 72018a0..1d41de5 100644
---- a/tests/test_ujson.py
-+++ b/tests/test_ujson.py
-@@ -614,18 +614,17 @@ def test_dumps_raises(test_input, expected_exception, expected_message):
- 
- 
- @pytest.mark.parametrize(
--    "test_input, expected_exception, expected_message",
-+    "test_input, expected_exception",
-     [
--        (float("nan"), OverflowError, "Invalid value when encoding double"),
--        (float("inf"), OverflowError, "Invalid value when encoding double"),
--        (-float("inf"), OverflowError, "Invalid value when encoding double"),
--        (12839128391289382193812939, OverflowError, "int too big to convert"),
-+        (float("nan"), OverflowError),
-+        (float("inf"), OverflowError),
-+        (-float("inf"), OverflowError),
-+        (12839128391289382193812939, OverflowError),
-     ],
- )
--def test_encode_raises_allow_nan(test_input, expected_exception, expected_message):
-+def test_encode_raises_allow_nan(test_input, expected_exception):
-     with pytest.raises(expected_exception) as e:
-         ujson.dumps(test_input, allow_nan=False)
--    assert str(e.value) == expected_message
- 
- 
- @pytest.mark.parametrize(
--- 
-2.27.0
-
-From 66cc0ad8a76d1bef848e36d9bdcaf476047b5605 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 12 Jun 2020 15:08:27 +0200
-Subject: [PATCH 2/3] Skip GC tests on PyPy
-
----
- tests/test_ujson.py | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/tests/test_ujson.py b/tests/test_ujson.py
-index 1d41de5..fe20174 100644
---- a/tests/test_ujson.py
-+++ b/tests/test_ujson.py
-@@ -215,6 +215,9 @@ def test_encode_dict_conversion():
-     assert test_input == ujson.decode(output)
- 
- 
-+@pytest.mark.skipif(
-+    hasattr(sys, "pypy_version_info"), reason="PyPy uses incompatible GC"
-+)
- def test_encode_dict_values_ref_counting():
-     import gc
- 
-@@ -226,6 +229,9 @@ def test_encode_dict_values_ref_counting():
-     assert ref_count == sys.getrefcount(value)
- 
- 
-+@pytest.mark.skipif(
-+    hasattr(sys, "pypy_version_info"), reason="PyPy uses incompatible GC"
-+)
- def test_encode_dict_key_ref_counting():
-     import gc
- 
--- 
-2.27.0
-
diff --git a/dev-python/ujson/ujson-1.35-r1.ebuild b/dev-python/ujson/ujson-1.35-r1.ebuild
index e2968cdabfaa..c729688ffb8a 100644
--- a/dev-python/ujson/ujson-1.35-r1.ebuild
+++ b/dev-python/ujson/ujson-1.35-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ujson/ujson-3.0.0.ebuild b/dev-python/ujson/ujson-3.0.0.ebuild
deleted file mode 100644
index f865939a1276..000000000000
--- a/dev-python/ujson/ujson-3.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
-HOMEPAGE="https://pypi.org/project/ujson/"
-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="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytz[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pypy3-test.patch
-)
diff --git a/dev-python/ujson/ujson-3.1.0.ebuild b/dev-python/ujson/ujson-3.1.0.ebuild
index 580474477867..dacad4fa08c6 100644
--- a/dev-python/ujson/ujson-3.1.0.ebuild
+++ b/dev-python/ujson/ujson-3.1.0.ebuild
@@ -12,7 +12,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="test"
 RESTRICT="!test? ( test )"