gentoo resync : 23.09.2020

7 files changed, 47 insertions, 488 deletions

diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 23a0b519e5bd..8789ca89d8d6 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,15 +1,12 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 BLAKE2B efeecabe4ff7c8b0d6c845cfaab5eacc56e92da7614a0a7cfa2260a0ae93ebcd87d79c33444d16e57382bba55bdaf49f04c844c125a0a57c67119374f47e0b9e SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733
-AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B ff89983185c9249a91e32bf69903e139d75efeadcda3c1b4b11e3cc23091956bb08ebf9c9dea548cd5c895ef093455fd69b7273027bc9916658effae955c0490 SHA512 a332c6f8454186f774fd4a0b7f8b940facddb894a17df405d144b2707ece4393bd11695df5ad3bf1e274e59d9cd3bf81c02c4c55226480f0890e5d7318545e0a
 AUX 7.2.0-distutils-cxx.patch 14432 BLAKE2B 7c2f5a22457781c4b7d21954a3ffe7b1dfb55f12f890205cfe294316be86e7b206c4ce732f15fbf021c0fc87ed05a20aa57918cda869226efadb01e5fb2823a7 SHA512 7ccb64419d4ad90d03958bf6ddbb700a253fec75bceca7f9355f5f8496e1aba9ac72b09d0616600ebf8169d5ec705d6b058556905b032db8fb5abd23cf9b30e8
 AUX 7.3.1-gentoo-path.patch 1565 BLAKE2B 3c444b8112fd40de747fae75cc6d6f5ff8d2ecdafc17c76dde4d23169ecbde86ec6ca3e5a9646a719ea91ada57b8a7bf151ee3d63420730aae0a6003136551f7 SHA512 ce8258ac5c87b9c978ce780120c31848306a652d9b87ece90ba17ebbaee545806fc62e6f63538fc0cdf557c6b98eec8c0978fe4fbe3b24ea8e2ab9617c99b1ef
 AUX 7.3.2-py37-distutils-cxx.patch 14756 BLAKE2B 3524f2fbeef2b23a17c2248fbe07e0b194f2d6cc8be9c4ffec9c7a745421577d0c246a82c61afbd4af116f6ec756ce11988093e3e0a74337868530382206dd7d SHA512 e590266f1f6f5571b0056fbbf38c54bd7f07bebcdc009dbfaa3203aaeb3f70eac0f9b281df3ec04771960dea930b30ae861bb1dbc886fa28dfb8c58e484f6a8d
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
-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
-DIST pypy3.6-v7.3.2rc1-src.tar.bz2 22730858 BLAKE2B 41a0702d0077c0f546998b858bc8b76226fe8903f4819497aa284231edcb32bc8b047b0a2a35bacfb18ea11fb85de98b95998276c22a3f0dc716b16871b35a3a SHA512 1a6f93f7e767b0db5c40c1e06cadd781c6ddfb02ec86aa61a37f649fe1aa5cd71f7857052e5b48092e3bf8b5cbef6d6401097bf4c4e80c62f7dbdffcd20b70c0
-DIST pypy3.7-v7.3.2rc1-src.tar.bz2 24805791 BLAKE2B 7b16ba9f0b33d572facdf009701712fe1b2c1eb5a4187c3a9197973ef4da140c7704b3409c7c336e1027f89df340fcefc9e52c6ccac75b251aa79d67c98e49c4 SHA512 d2a5c02a541c0ae79cf8c8e1a38299351f9dd81d1a17724d9fe346d8eb4311e2566a319cf1b8a90d393bffdc11657f6fa2f6475441634e57701b00e74899baa0
-EBUILD pypy3-7.3.0.ebuild 7350 BLAKE2B e025f75151c4e084575f6d52f2b3a4cbb8e5619db81ff5b962e6c431f3dac1a9fe76b875f7da00c08715c171bed054f03c9c92737a20dc14eb9050116cb0a836 SHA512 5aaae803d0b9a166bf4f95ef5adff413e1b7671731af0d003895b2d9ccceb7580e73e5f6603b38fc4194326c984a314b4d99351436ff50a2766f66dc520e05d7
-EBUILD pypy3-7.3.1-r2.ebuild 6871 BLAKE2B 0ae1116b88d0c4b15df7e6e0450e820f870d9050c311b2ca4f73a6304dbb2dd79672c427d11f061c5576952b221b33b0a1e7da6a0ac7080e8668bfdc33129e78 SHA512 c34f6ac05f31697a373d20eae53b54593b6c1c60376be67367972b6f30101661775a05e20836f09b0e84fd4f67341eda2a929150bfea32c8fd2972c5e4086810
-EBUILD pypy3-7.3.2_rc1-r100.ebuild 12752 BLAKE2B 2c0dc9988404d8e3e00e7679537306872b119806bda3f0c813156d4a23c1a24eebb38cb3de45251626d2c15f6bae73c1edaaaf7e404d35e45b42f2843c5cad8a SHA512 429232677a75347d9467d0452e57cf8a9f1ded80c0bfc81ccb2558d8a7980b468de14a0b48672cff63002ffc8c1455c4d52c7ed80948a9a93ca9ca3c036d3a05
-EBUILD pypy3-7.3.2_rc1.ebuild 6410 BLAKE2B b168bcff6f551c98897effa8310698548463011d01835f5ad04cd340219a3a86212c1d2d0078989b43c2a85885fb80247a54949ff8c8be3a075c711c98ffc0f2 SHA512 865e8e2d64334839fa52b71590b19d89209420654300bf19e0495fc70246c8159a87ff2f258adba54cfd891ba5908030e91da719ac7580f25fbd237645ab468d
-MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
+DIST pypy3.6-v7.3.2rc2-src.tar.bz2 22750248 BLAKE2B 6a8a3c4306cb5c796ee89f3d9ece61f5d669515ae9edf4961f43c7779123554cda0f3b433f8264d3d08e531ef5fe660b494135321a11f441ae1de97ce0abb332 SHA512 a89184314d04bad646cf2e2151e2d5f27ca23a68f25e22b5c2e4f07745671e70c71d869be1c61248ee839632f7151b597fe79eb5af814967a1ae97f2c2cdb8ee
+DIST pypy3.7-v7.3.2rc2-src.tar.bz2 25066853 BLAKE2B 286ec0909d4b9ba9039cd9ca234a90832e99369f5e7e36a486d219661631efac186e02146dd5bc5a51521fcfdd0047c3fa5a6dbffd20cebe8ff7c209d02fec53 SHA512 c8e5dc5ded2989aa3a6b635e040c23bb8e2812101ce22a104f251e0abaa3320b61f2f611ece58d6b8a8ae9f1cbc8ca22c920f3491dd5653bcb0e05264fd54a4f
+EBUILD pypy3-7.3.1-r3.ebuild 7051 BLAKE2B 06171de220f62a018089cde90e190412f3e8db71163368eb0af7e8c6b6cec4c7f7d90f448683063f15e38323ae98ce5bef24e9917dfcf7ccf30baeebcbd9b708 SHA512 f82b2cb6e45768a58757070550c11056b010a4bc627195319ecca16ed7d1d1c225b08ee7eb7121c0bd9169e15403d6c8ecd5a38d5c2e7db705ae92039f367353
+EBUILD pypy3-7.3.2_rc2-r1.ebuild 6590 BLAKE2B 98d08f0608eef083f950e32baec3108488222bf4db581a64d1cd3231eaeb8daa9edaee4791eb66f26287f66b2c6d815079f63d67ee287de25bd93b69cbc384bd SHA512 6f28d8ad0772327112eceb8ccd1ad93d13b22420acf263fb980cd734694a0679f4ca86fc8e11d9db14644981cbbac6a502d6ea3b9e13f30bce31b1a5cb1d33fd
+EBUILD pypy3-7.3.2_rc2_p37-r1.ebuild 5419 BLAKE2B d0fc27f83246f05edf8b66462762252d2e040c2c6c0f57c43ed59da5bbf0c8bf57a5eeb496d8021114364f12d5ae5713f873002a4dbdc9b508208fbbb5f2cc78 SHA512 113c42cbc9f63ce45d9039c0f864792a6d3d6340dd1e06c11eed93208d2ac4804334802fce7709e98e6f4b36c468a49dc24943a35bfb5c8b11c1015132c44d34
+MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3/files/7.0.0-gentoo-path.patch b/dev-python/pypy3/files/7.0.0-gentoo-path.patch
deleted file mode 100644
index 135e496f2536..000000000000
--- a/dev-python/pypy3/files/7.0.0-gentoo-path.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 44c16c344f137cc91a145294c4124174fc25ad16 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 27 Nov 2015 17:02:42 +0100
-Subject: [PATCH] Gentoo: override paths for system-wide install based on
- sys.prefix
-
-Override all default distutils install paths to ones suitable for
-system-wide install when sys.prefix indicates we're running the Gentoo
-system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
-
-Fixes: https://bugs.gentoo.org/462306
-Fixes: https://bugs.gentoo.org/465546
-
-[updated for 7.0.0]
----
- lib-python/3/distutils/command/install.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py
-index 77a1827d4b..255603967f 100644
---- a/lib-python/3/distutils/command/install.py
-+++ b/lib-python/3/distutils/command/install.py
-@@ -50,6 +50,13 @@ INSTALL_SCHEMES = {
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-+    'gentoo': {
-+        'purelib': '$base/site-packages',
-+        'platlib': '$base/site-packages',
-+        'headers': '$base/include',
-+        'scripts': '@EPREFIX@/usr/bin',
-+        'data'   : '@EPREFIX@/usr',
-+        },
-     }
- 
- # user site schemes
-@@ -461,7 +468,11 @@ class install(Command):
-         # it's the caller's problem if they supply a bad name!
-         if (hasattr(sys, 'pypy_version_info') and
-             not name.endswith(('_user', '_home'))):
--            name = 'pypy'
-+            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy3.6'):
-+                # override paths for system-wide install
-+                name = 'gentoo'
-+            else:
-+                name = 'pypy'
-         scheme = INSTALL_SCHEMES[name]
-         for key in SCHEME_KEYS:
-             attrname = 'install_' + key
--- 
-2.21.0.rc1
-
diff --git a/dev-python/pypy3/metadata.xml b/dev-python/pypy3/metadata.xml
index ff5bc95069a0..7f4f33c6dbc9 100644
--- a/dev-python/pypy3/metadata.xml
+++ b/dev-python/pypy3/metadata.xml
@@ -5,7 +5,4 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="bitbucket">pypy/pypy</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pypy3/pypy3-7.3.1-r2.ebuild b/dev-python/pypy3/pypy3-7.3.1-r3.ebuild
index 3388f868455f..4f4f4bded682 100644
--- a/dev-python/pypy3/pypy3-7.3.1-r2.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.1-r3.ebuild
@@ -204,7 +204,9 @@ src_install() {
 	fi
 
 	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c
+	local -x PYTHON=${ED}${dest}/pypy3-c-${PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_moduleinto /usr/lib/pypy3.6/site-packages
@@ -212,4 +214,7 @@ src_install() {
 
 	einfo "Byte-compiling Python standard library..."
 	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
 }
diff --git a/dev-python/pypy3/pypy3-7.3.2_rc1-r100.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc1-r100.ebuild
deleted file mode 100644
index 2ba33e2c40c3..000000000000
--- a/dev-python/pypy3/pypy3-7.3.2_rc1-r100.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.7-v${PV/_/}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/pypy37-pp73"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		dev-python/pypy3-exe:${PV}-py37[bzip2?,ncurses?]
-		dev-python/pypy3-exe-bin:${PV}-py37
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy3-bin-7.3.0:0"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		!!dev-python/pytest-forked
-	)"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}/7.3.2-py37-distutils-cxx.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	# see http://buildbot.pypy.org/summary?branch=py3.7&builder=pypy-c-jit-linux-x86-64
-	sed -i -e 's:test_snippets(:_&:' \
-		lib-python/3/test/test_ast.py || die
-	sed -i -e 's:testConstructorErrorMessages(:_&:' \
-		lib-python/3/test/test_class.py || die
-	sed -i -e 's:test_pythonmalloc(:_&:' \
-		-e 's:test_sys_flags_set(:_&:' \
-		-e 's:test_unbuffered_output(:_&:' \
-		-e 's:test_xdev(:_&:' \
-		-e 's:test_ignore_PYTHONHASHSEED(:_&:' \
-		lib-python/3/test/test_cmd_line.py || die
-	sed -i -e 's:test_consistent_sys_path_for_module_execution(:_&:' \
-		-e 's:test_issue8202(:_&:' \
-		-e 's:test_issue8202_dash_m_file_ignored(:_&:' \
-		-e 's:test_module_in_package(:_&:' \
-		-e 's:test_module_in_package_in_zipfile(:_&:' \
-		-e 's:test_module_in_subpackage_in_zipfile(:_&:' \
-		-e 's:test_nonexisting_script(:_&:' \
-		-e 's:test_package(:_&:' \
-		-e 's:test_package_compiled(:_&:' \
-		-e 's:test_script_compiled(:_&:' \
-		lib-python/3/test/test_cmd_line_script.py || die
-	sed -i -e 's:test_incremental_errors(:_&:' \
-		lib-python/3/test/test_codecs.py || die
-	sed -i -e 's:test_ressources_gced_in_workers(:_&:' \
-		-e 's:test_submit_after_interpreter_shutdown(:_&:' \
-		lib-python/3/test/test_concurrent_futures.py || die
-	sed -i -e 's:test_for_3(:_&:' \
-		-e 's:test_func_4(:_&:' \
-		lib-python/3/test/test_coroutines.py || die
-	sed -i -e 's:test_strftime(:_&:' \
-		-e 's:test_more_strftime(:_&:' \
-		lib-python/3/test/datetimetester.py || die
-	sed -i -e 's:test_info(:_&:' \
-		-e 's:test_code_info(:_&:' \
-		-e 's:test_show_code(:_&:' \
-		-e 's:test_disassemble_recursive(:_&:' \
-		-e 's:test_disassemble_str(:_&:' \
-		-e 's:test_jumpy(:_&:' \
-		lib-python/3/test/test_dis.py || die
-	sed -i -e 's:test_generator_doesnt_retain_old_exc2(:_&:' \
-		-e 's:test_attributes(:_&:' \
-		lib-python/3/test/test_exceptions.py || die
-	sed -i -e 's:test_frozen(:_&:' \
-		lib-python/3/test/test_frozen.py || die
-	sed -i -e 's:test_ssl_raises(:_&:' \
-		-e 's:test_ssl_verified(:_&:' \
-		lib-python/3/test/test_imaplib.py || die
-	sed -i -e 's:test_script_compiled(:_&:' \
-		lib-python/3/test/test_multiprocessing_main_handling.py || die
-	sed -i -e 's:test_execve_invalid_env(:_&:' \
-		lib-python/3/test/test_os.py || die
-	sed -i -e 's:test_get_and_set_scheduler_and_param(:_&:' \
-		lib-python/3/test/test_posix.py || die
-	sed -i -e 's:test_copying(:_&:' \
-		-e 's:test_re_split(:_&:' \
-		-e 's:test_zerowidth(:_&:' \
-		-e 's:test_locale_caching(:_&:' \
-		-e 's:test_locale_compiled(:_&:' \
-		-e 's:test_match_repr(:_&:' \
-		-e 's:test_qualified_re_split(:_&:' \
-		-e 's:test_scoped_flags(:_&:' \
-		lib-python/3/test/test_re.py || die
-	sed -i -e 's:test_auto_history_disabled(:_&:' \
-		-e 's:test_auto_history_enabled(:_&:' \
-		-e 's:test_history_size(:_&:' \
-		lib-python/3/test/test_readline.py || die
-	sed -i -e 's:test_multiprocess(:_&:' \
-		lib-python/3/test/test_regrtest.py || die
-	sed -i -e 's:test_warn_on_full_buffer(:_&:' \
-		lib-python/3/test/test_signal.py || die
-	sed -i -e 's:test_get_path(:_&:' \
-		lib-python/3/test/test_site.py || die
-	sed -i -e 's:test_check_hostname(:_&:' \
-		-e 's:test_npn_protocols(:_&:' \
-		-e 's:test_sni_callback(:_&:' \
-		-e 's:test_sni_callback_raising(:_&:' \
-		lib-python/3/test/test_ssl.py || die
-	sed -i -e 's:test_invalid_placeholders(:_&:' \
-		lib-python/3/test/test_string.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
-	sed -i -e 's:test_boundary_error_message_with_large_offset(:_&:' \
-		lib-python/3/test/test_struct.py || die
-	sed -i -e 's:test_restore_signals(:_&:' \
-		lib-python/3/test/test_subprocess.py || die
-	sed -i -e 's:test_jump_out_of_async_for_block_backwards(:_&:' \
-		-e 's:test_jump_out_of_async_for_block_forwards(:_&:' \
-		-e 's:test_jump_over_async_for_block_before_else(:_&:' \
-		-e 's:test_no_jump_backwards_into_async_for_block(:_&:' \
-		-e 's:test_no_jump_forwards_into_async_for_block(:_&:' \
-		-e 's:test_no_jump_into_async_for_block_before_else(:_&:' \
-		-e 's:test_no_jump_from_yield(:_&:' \
-		lib-python/3/test/test_sys_settrace.py || die
-	sed -i -e 's:test_install_schemes(:_&:' \
-		lib-python/3/test/test_sysconfig_pypy.py || die
-	sed -i -e 's:test_circular_imports(:_&:' \
-		lib-python/3/test/test_threaded_import.py || die
-	sed -i -e 's:test_main_milliseconds(:_&:' \
-		-e 's:test_main_verbose(:_&:' \
-		-e 's:test_main_very_verbose(:_&:' \
-		-e 's:test_main_with_time_unit(:_&:' \
-		lib-python/3/test/test_timeit.py || die
-	sed -i -e 's:test_cannot_subclass(:_&:' \
-		lib-python/3/test/test_typing.py || die
-	sed -i -e 's:test_warnings(:_&:' \
-		lib-python/3/unittest/test/test_runner.py || die
-	sed -i -e 's:test_cmd_line(:_&:' \
-		-e 's:test_env_var(:_&:' \
-		-e 's:test_locale_getpreferredencoding(:_&:' \
-		-e 's:test_posix_locale(:_&:' \
-		-e 's:test_stdio(:_&:' \
-		-e 's:test_xoption(:_&:' \
-		lib-python/3/test/test_utf8_mode.py || die
-	sed -i -e 's:test_asyncgen_finalization_by_gc(:_&:' \
-		-e 's:test_asyncgen_finalization_by_gc_in_other_thread(:_&:' \
-		-e 's:test_create_connection_ipv6_scope(:_&:' \
-		lib-python/3/test/test_asyncio/test_base_events.py || die
-	sed -i -e 's:test_buffered_proto_create_connection(:_&:' \
-		lib-python/3/test/test_asyncio/test_buffered_proto.py || die
-	sed -i -e 's:test_create_connection_memory_leak(:_&:' \
-		-e 's:test_handshake_timeout(:_&:' \
-		-e 's:test_start_tls_client_reg_proto_1(:_&:' \
-		lib-python/3/test/test_asyncio/test_sslproto.py || die
-	sed -i -e 's:test_bare_create_task(:_&:' \
-		-e 's:test_current_task(:_&:' \
-		lib-python/3/test/test_asyncio/test_tasks.py || die
-	sed -i -e 's:test_asyncio_task_decimal_context(:_&:' \
-		lib-python/3/test/test_asyncio/test_context.py || die
-	sed -i -e 's:test_create_server_ssl_match_failed(:_&:' \
-		lib-python/3/test/test_asyncio/test_events.py || die
-	sed -i -e 's:test_binding(:_&:' \
-		-e 's:test_from_import_AttributeError(:_&:' \
-		-e 's:test_from_import_missing_attr_has_name_and_path(:_&:' \
-		-e 's:test_from_import_missing_attr_path_is_canonical(:_&:' \
-		lib-python/3/test/test_import/__init__.py || die
-	sed -i -e 's:test_unrelated_contents(:_&:' \
-		-e 's:test_contents(:_&:' \
-		-e 's:test_submodule_contents(:_&:' \
-		-e 's:test_submodule_contents_by_name(:_&:' \
-		-e 's:test_is_resource_good_path(:_&:' \
-		-e 's:test_is_submodule_resource(:_&:' \
-		-e 's:test_read_submodule_resource_by_name(:_&:' \
-		lib-python/3/test/test_importlib/test_resource.py || die
-	sed -i -e 's:test_non_string_keys_dict(:_&:' \
-		lib-python/3/test/test_json/test_fail.py || die
-	sed -i -e 's:test_module(:_&:' \
-		lib-python/3/test/test_warnings/__init__.py || die
-
-	# flaky
-	sed -i -e 's:test_2_join_in_forked_process(:_&:' \
-		lib-python/3/test/test_threading.py || die
-
-	# TODO
-	sed -i -e 's:test_external_target_locale_configuration(:_&:' \
-		lib-python/3/test/test_c_locale_coercion.py || die
-	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
-	sed -i -e 's:test_wrapped_exception:_&:' \
-		lib-python/3/test/_test_multiprocessing.py || die
-	sed -i -e 's:test_https_sni(:_&:' \
-		lib-python/3/test/test_urllib2_localnet.py || die
-
-	# the first one's broken by sandbox, the second by our env
-	sed -i -e 's:test_executable(:_&:' \
-		-e 's:test_executable_without_cwd(:_&:' \
-		lib-python/3/test/test_subprocess.py || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PV} pypy3-c || die
-	cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy3-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	local ignore=(
-		# failing doctests
-		lib-python/3/test/test_extcall.py
-		lib-python/3/test/test_unpack_ex.py
-
-		# segfault
-		lib-python/3/test/test_capi.py
-	)
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	# (--deselect for failing doctests)
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python \
-		${ignore[@]/#/--ignore } || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.7
-	einfo "Installing PyPy ..."
-	dosym pypy3-c-${PV} "${dest}/pypy3-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy3.7/include/${PV}/*; do
-		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy3.7/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-}
diff --git a/dev-python/pypy3/pypy3-7.3.2_rc1.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild
index 45d2ebfd2176..acb328c4e725 100644
--- a/dev-python/pypy3/pypy3-7.3.2_rc1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild
@@ -191,7 +191,9 @@ src_install() {
 	fi
 
 	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c
+	local -x PYTHON=${ED}${dest}/pypy3-c-${PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_moduleinto /usr/lib/pypy3.6/site-packages
@@ -199,4 +201,7 @@ src_install() {
 
 	einfo "Byte-compiling Python standard library..."
 	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
 }
diff --git a/dev-python/pypy3/pypy3-7.3.0.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild
index 83c31b2ebd99..d750cf9c4b2b 100644
--- a/dev-python/pypy3/pypy3-7.3.0.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild
@@ -4,21 +4,23 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1
+inherit pax-utils python-any-r1 toolchain-funcs
 
-MY_P=pypy3.6-v${PV/_/}
+PYPY_PV=${PV%_p37}
+MY_P=pypy3.7-v${PYPY_PV/_/}
 
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
 HOMEPAGE="https://pypy.org/"
 SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/pypy36-pp73"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+SLOT="0/pypy37-pp73"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
-RESTRICT="!test? ( test )"
+# pypy3.7 is in alpha state and a lot of tests are failing
+RESTRICT="test"
 
 RDEPEND="
 	|| (
@@ -45,9 +47,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
+	eapply "${FILESDIR}/7.3.2-py37-distutils-cxx.patch"
 
 	sed -e "s^@EPREFIX@^${EPREFIX}^" \
 		-i lib-python/3/distutils/command/install.py || die
@@ -57,66 +59,17 @@ 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
-	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:_&:' \
-		-e 's:test_no_jump_into_async_for_block_before_else:_&:' \
-		-e 's:test_no_jump_from_yield:_&:' \
-		lib-python/3/test/test_sys_settrace.py || die
-	sed -i -e 's:test_circular_imports:_&:' \
-		lib-python/3/test/test_threaded_import.py || die
-
 	eapply_user
 }
 
+src_configure() {
+	tc-export CC
+}
+
 src_compile() {
 	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die
-	cp -p "${BROOT}"/usr/lib/pypy3.6/include/${PV}/* include/ || die
+	cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die
+	cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/* include/ || die
 	# (not installed by pypy)
 	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
 	mv pypy/module/cpyext/include/* include/ || die
@@ -173,24 +126,25 @@ src_test() {
 
 	# Test runner requires Python 2 too. However, it spawns PyPy3
 	# internally so that we end up testing the correct interpreter.
+	# (--deselect for failing doctests)
 	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
 }
 
 src_install() {
-	local dest=/usr/lib/pypy3.6
+	local dest=/usr/lib/pypy3.7
 	einfo "Installing PyPy ..."
-	dosym pypy3-c-${PV} "${dest}/pypy3-c"
+	dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-c"
 	insinto "${dest}"
 	# preserve mtimes to avoid obsoleting caches
 	insopts -p
 	doins -r include lib_pypy lib-python
 
 	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy3.6/include/${PV}/*; do
-		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
+	for x in "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
 	done
 
-	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
+	dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
 	dodoc README.rst
 
 	if ! use gdbm; then
@@ -208,12 +162,17 @@ src_install() {
 	fi
 
 	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c
+	local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy3.6/site-packages
+	python_moduleinto /usr/lib/pypy3.7/site-packages
 	python_domodule epython.py
 
 	einfo "Byte-compiling Python standard library..."
 	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
 }