From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 25 Apr 2020 11:37:10 +0100
Subject: gentoo resync : 25.04.2020

---
 dev-python/pypy3/Manifest           |  2 +-
 dev-python/pypy3/pypy3-7.3.1.ebuild | 40 +++++++++++++++----------------------
 2 files changed, 17 insertions(+), 25 deletions(-)

(limited to 'dev-python/pypy3')

diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index de02edd13298..76f57157acdf 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -6,5 +6,5 @@ AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773
 DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
 EBUILD pypy3-7.3.0.ebuild 7358 BLAKE2B bef55c6f65e06d4b49199c394edbd5485262294d9d634853fb6d216c4353d7dda427512905bf4838518f70b4b1949ad214f9fd04c942dc88e8512d657d2860d1 SHA512 18e43cd8a90a6046aa638bb3fa157342255b23e33dcb186de4f482dda9f328aad099ebe3be4967903170a58c28d7054906de1acd73a9a7581c78e5679cf0a11f
-EBUILD pypy3-7.3.1.ebuild 7360 BLAKE2B 605796832b1a0a1502e5971f71787fe5461df70d2fae21b62b51ab8c6cfefd78cabcf54d0baaa3b85b8ce29bbff4723def84886211214a000018ef7db5bb2ece SHA512 9b994d56e7d4c1dae592ca1b3a1dbbf43c9b7ada8406fb996d6b14cc5b0c65c1cfd9f8917511cfacfc31216a80bceb279333cc9ebdfd6e353d51e642e5e6121f
+EBUILD pypy3-7.3.1.ebuild 6830 BLAKE2B 5c97bd58a22995bb16d2a37d66188506c112dcba3ee11ee27c086586873f557bd8e137c819d41e93a09e3ef06c6a75ea9be77790e6e8891d34b51b5aaa468c46 SHA512 db90600d7ec4dc23e1628ded592ba254c9974a6b57f46a979fb4a3e33609f3e83abe8e3721c84353902af83decad8d0b61cfc1e89fed26a406c017f01d28bfb0
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3/pypy3-7.3.1.ebuild b/dev-python/pypy3/pypy3-7.3.1.ebuild
index ef18fb89b9f4..693635092afb 100644
--- a/dev-python/pypy3/pypy3-7.3.1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.1.ebuild
@@ -57,50 +57,27 @@ src_prepare() {
 	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
 	popd > /dev/null || die
 
-	# tests are copied from cpython and apparently not adjusted to pypy3
-	# or marked XFAIL
+	# see http://buildbot.pypy.org/summary?branch=py3.6&builder=pypy-c-jit-linux-x86-64
 	sed -i -e 's:test_runeval_step:_&:' \
 		lib-python/3/test/test_bdb.py || die
-	sed -i -e 's:test_set_nomemory:_&:' \
-		-e '/class PyMemDebugTests/i@unittest.skip("Broken on pypy3")' \
-		lib-python/3/test/test_capi.py || die
 	sed -i -e 's:test_crashing_decode_handler:_&:' \
 		lib-python/3/test/test_codeccallbacks.py || die
-	sed -i -e 's:test_unicode:_&:' \
-		lib-python/3/test/test_dbm_gnu.py || die
 	sed -i -e 's:test_jumpy:_&:' \
 		lib-python/3/test/test_dis.py || die
-	sed -i -e 's:test_generator_doesnt_retain_old_exc:_&:' \
-		-e 's:test_generator_finalizing_and_exc_info:_&:' \
-		-e 's:test_generator_leaking:_&:' \
-		lib-python/3/test/test_exceptions.py || die
-	sed -i -e 's:test_locale:_&:' \
-		lib-python/3/test/test_format.py || die
 	sed -i -e 's:test_ast_line_numbers:_&:' \
 		-e 's:test_backslashes_in_string_part:_&:' \
 		lib-python/3/test/test_fstring.py || die
-	sed -i -e 's:test_decompressor_bug_28275:_&:' \
-		lib-python/3/test/test_lzma.py || die
 	sed -i -e 's:test_listdir_bytes_like:_&:' \
-		-e 's:test_putenv:_&:' \
 		lib-python/3/test/test_posix.py || die
 	sed -i -e 's:test_auto_history:_&:' \
 		-e 's:test_history_size:_&:' \
 		lib-python/3/test/test_readline.py || die
-	sed -i -e 's:CheckDMLDoesNotAutoCommitBefore:_&:' \
-		-e 's:CheckImmediateTransactionalDDL:_&:' \
-		-e 's:CheckTransactionalDDL:_&:' \
-		lib-python/3/sqlite3/test/transactions.py || die
 	sed -i -e 's:test_pha_optional:_&:' \
 		-e 's:test_pha_required:_&:' \
 		lib-python/3/test/test_ssl.py || die
 	sed -i -e 's:test_eval_bytes_invalid_escape:_&:' \
 		-e 's:test_eval_str_invalid_escape:_&:' \
 		lib-python/3/test/test_string_literals.py || die
-	# the first one's broken by sandbox, the second by our env
-	sed -i -e 's:test_empty_env:_&:' \
-		-e 's:test_executable:_&:' \
-		lib-python/3/test/test_subprocess.py || die
 	sed -i -e 's:test_jump_out_of_async_for_block:_&:' \
 		-e 's:test_jump_over_async_for_block_before_else:_&:' \
 		-e 's:test_no_jump_.*wards_into_async_for_block:_&:' \
@@ -110,6 +87,21 @@ src_prepare() {
 	sed -i -e 's:test_circular_imports:_&:' \
 		lib-python/3/test/test_threaded_import.py || die
 
+	# fixed in git
+	sed -i -e 's:test_SOCK_CLOEXEC:_&:' \
+		lib-python/3/test/test_socket.py || die
+
+	# the first one's broken by sandbox, the second by our env
+	sed -i -e 's:test_empty_env:_&:' \
+		-e 's:test_executable:_&:' \
+		lib-python/3/test/test_subprocess.py || die
+
+	# XXX
+	sed -i -e 's:test_locale:_&:' \
+		lib-python/3/test/test_format.py || die
+	sed -i -e 's:test_decompressor_bug_28275:_&:' \
+		lib-python/3/test/test_lzma.py || die
+
 	eapply_user
 }
 
-- 
cgit v1.2.3