gentoo resync : 15.01.2020

5 files changed, 6 insertions, 92 deletions

diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 0555596ed237..e6570823b1bd 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,13 +1,10 @@
-AUX ujson-1.33-test-py3.patch 1256 BLAKE2B e3a6db8f7ba82a98fd03bf4dcd70dc474150aeb289af31e279c0dfd7460c0db4cd4d5d27774f1d0865a61e405c8b33d3d9cbdc946a194a18cd9fb8213fc01c98 SHA512 f05909d1ecc51123da75de817ce52d7d24e7510ebd353c11b483f8f4bad177d7031ed84336e60647425ec24f0dddeec1966511971bdaee4abbc10d2ac11cb32b
 AUX ujson-1.35-fix-for-overflowing-long.patch 2630 BLAKE2B 39bb394773d6cf8b395701d32b4e8afc6de09c901c4e22e38ba78c37788b0e6ed69c28c3782e2a196e00ee22f21b1c93579ced48d968a5c346b6ba16ecbbe199 SHA512 1006a559fba644985663acbf3a94b8485511a0b137e96191c15f791ef1b84824dfd3d26ffb7de3bcecd011ab94e04b46e2ffbdf90766cb95c11be9c508cfc847
 AUX ujson-1.35-fix-ordering-of-orderdict.patch 4046 BLAKE2B 24d5bc9401ec44939f355aff06cabb7e2a52f8dc41dff419e48d2d84c64c40fcfc786131f9973c1ba804d110443ec8af621602ecc33ca17a47b82036bf9ebf57 SHA512 e3c392a4298f65154549f077c55da7b78d6e9085a217b3ef574ccec4d9f0466f5d0901c039afb1fb44b1e26042881abc5007eb045a3594ee365c09f46443d134
 AUX ujson-1.35-sort_keys-segfault.patch 2360 BLAKE2B 774cd15a52a333456e0f7a4996d111123aa315c41c7e6d01f2618ca459227ae74458202b899d6676a8f03e229056759d1e3c0d36a7204cfd8ce947787a010b38 SHA512 aac5b264187be10cbfb2d128f1a415fd0d841a728b7c1975232e5fe37fc042b19aae084e9c807eb5c23b1fe8306565bb2867543c08d88c2abcf474401644f114
 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
-DIST ujson-1.33.zip 197034 BLAKE2B 587e00292340d69fdda9720d66bb360ed646f8c709e279f905f7fdf2db79a2ec51856dce998fd3e2fe5b3bf067c72ad661f77154bc3d63cee4c3eea10bca29ec SHA512 0f1f66212fbf94c03e048ba64c3bd817c50443d1a29b87f6a3a38f697a050f38821be4ba36a3b17a96930c69ee92973ac31bdd41851dea071af14cd4bbaf8480
 DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
-EBUILD ujson-1.33.ebuild 1160 BLAKE2B d45318ba94420dc8d52b5368def390fc0734ab1691418a6f5ca9479547cbba5b3c78fc62a678cd3854bbd51ba3e83afab7360870ea8ad73299a71199ba790e94 SHA512 b64920ef59fcdbcce06641e7cbcbb696222f9ed82c0960f0b49d4ba02e0de741537951c06d0776147786d162a1b1518d6814e6cdb2193d76717d12c23b8e34e7
-EBUILD ujson-1.35-r1.ebuild 1000 BLAKE2B 1ebf42fb6427f3225c930b4f36299adedda1a902ba0ba980ed6995e13b2c9fa2c2799175cabcebeb8ad98dea82d2c36b7a01bba533eb014ce8185d10bdcbbb5a SHA512 45850703c1c621838d35cb1a4486c1562da3f0adf68f0bcddc7d2f5a4f8a04208c5ef889b02ce2420984c1196a066eb7d32b8eb4610cce0affedbd15aff80d74
-EBUILD ujson-1.35.ebuild 986 BLAKE2B bd3e25ae75e51bfc638d86a58cfc7b62a782e9c9907c4ac605746e514e30fc62517702aac8b46856a25a80af632c5cd2f9f7d72d6ee8edd04837167e5ebafb82 SHA512 f96d217eac09bfc694aeecdc48619b3b7948471c5b0668e38e6fdf655016fe8ccab268a4387c803595eeb06e6d317ebc7a3a1a82e2d16a509d08d2e450ed4ccb
+EBUILD ujson-1.35-r1.ebuild 995 BLAKE2B d984cc2382af805268e88f03a66406aad027071feec32d81cab14603e600d20ad78027f3c50b2921aa0ee53399cce8385cd45eb2f01521833dca3200fccac986 SHA512 9b8e7b97a26e867d9b66b129d5641d4330cc6f32924b23ce2bdc333485e971618c3c3d7f8149505921ee00a1b3f50f2894b8856f9ac7089c064bf01fd0e2af53
+EBUILD ujson-1.35.ebuild 984 BLAKE2B 771a4ee1cd391ea4032168207006c2204ed1beff5e92b85afaf9a729e331bf0d6554950dce6bd1e016e8b95f76cca9c357c5d7843b9859137ffcbac199dd2fd2 SHA512 89b7764fc440b65cabdc30a14aaf913452fab3408c40e2833b759c041f2931cd40dec552400019101269d46adbeb106fe76caed4fc5e9badcb0e4e6b5ceda115
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/files/ujson-1.33-test-py3.patch b/dev-python/ujson/files/ujson-1.33-test-py3.patch
deleted file mode 100644
index e497f396792c..000000000000
--- a/dev-python/ujson/files/ujson-1.33-test-py3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
- tests/tests.py | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/tests/tests.py b/tests/tests.py
-index d210bc6..71f8074 100644
---- a/tests/tests.py
-+++ b/tests/tests.py
-@@ -11,6 +11,7 @@ try:
- except ImportError:
-     import simplejson as json
- import math
-+import nose
- import platform
- import sys
- import time
-@@ -24,9 +25,10 @@ from functools import partial
- 
- PY3 = (sys.version_info[0] >= 3)
- 
--def _python_ver(skip_major, skip_minor=None):
-+def _skip_if_python_ver(skip_major, skip_minor=None):
-     major, minor = sys.version_info[:2]
--    return major == skip_major and (skip_minor is None or minor == skip_minor)
-+    if major == skip_major and (skip_minor is None or minor == skip_minor):
-+        raise nose.SkipTest
- 
- json_unicode = (json.dumps if sys.version_info[0] >= 3
-                 else partial(json.dumps, encoding="utf-8"))
-@@ -579,8 +581,8 @@ class UltraJSONTests(TestCase):
-         input = "-31337"
-         self.assertEquals (-31337, ujson.decode(input))
- 
--    #@unittest.skipIf(_python_ver(3), "No exception in Python 3")
-     def test_encodeUnicode4BytesUTF8Fail(self):
-+        _skip_if_python_ver(3)
-         input = "\xfd\xbf\xbf\xbf\xbf\xbf"
-         try:
-             enc = ujson.encode(input)
diff --git a/dev-python/ujson/ujson-1.33.ebuild b/dev-python/ujson/ujson-1.33.ebuild
deleted file mode 100644
index 21bf458e20fc..000000000000
--- a/dev-python/ujson/ujson-1.33.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# One test; FAIL: test_encodeToUTF8 (__main__.UltraJSONTests) under py2.5.
-# Fix and repair and re-insert if it's REALLY needed
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-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}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	app-arch/unzip"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-py3.patch
-)
-
-python_test() {
-	# See setup.py; line 72. Again "${S}" is used for reading tests
-	# Since py3_2 is first in the queue it needs its own copy
-	# or else all py2s to follow will be reading read py3 tests
-	if [[ "${EPYTHON}" =~ 'python3' ]]; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -a "${S}"/tests/ .  || die
-		2to3 -w tests/tests.py || die
-		"${PYTHON}" tests/tests.py || die
-		rm -rf tests/ || die
-	else
-		"${PYTHON}" tests/tests.py || die
-	fi
-}
diff --git a/dev-python/ujson/ujson-1.35-r1.ebuild b/dev-python/ujson/ujson-1.35-r1.ebuild
index 006979f5c980..3629c11f8079 100644
--- a/dev-python/ujson/ujson-1.35-r1.ebuild
+++ b/dev-python/ujson/ujson-1.35-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ujson/ujson-1.35.ebuild b/dev-python/ujson/ujson-1.35.ebuild
index e74f14482d79..73d5ba00ca53 100644
--- a/dev-python/ujson/ujson-1.35.ebuild
+++ b/dev-python/ujson/ujson-1.35.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1