gentoo resync : 03.11.2019

5 files changed, 37 insertions, 273 deletions

diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 1222c93c5987..c3d010482830 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -1,14 +1,11 @@
 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 060cdfaea2c4b0e607b7f9548a161e0df8d741d8a70ece28eeccc646aaf659b8ae6f425089380b908a588e2a0ca2ed521995ef3f3aa3bfeb58ecfb0083b3584b SHA512 e67c0bb96d3c66ceecdc11a3984dbeb65a4473020ee2d4e5b093fe987f1540dd7a5cc6982be6303e7e8c49a53e02883277597d00342312a0f8144a84ff132bae
-AUX 7.0.0_all_distutils_cxx.patch 16381 BLAKE2B 776394aa16d35563d56677ed956d107933ce954ae470db55dec44b3f9a054203b93e2d43ae0aee4388b664cb83013a7e67cd787ef8e464dce440ce702624a9d8 SHA512 6fb7b0a0fc9bc552f78460de2ee5867c8a4ca11c4254572ffebae3db92829572091bfe3f46f99c1188a28827bb4ea5bde8b9efbb285cc64608a4f21875d74d14
+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 python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
-DIST pypy3-bin-7.1.1-amd64+bzip2+jit+ncurses.tar.lz 11031375 BLAKE2B e01ac298d3c8ed06742429b36739223fd0dbf87a9df4d302349401aeda06dbaf5cd8b972ebe997a1e4130a378d63ab69ed25b3ded4b9608db5d59fbaef8d04f6 SHA512 e5ccf27683dc81a683df52f04092167774f3a9c9dd3a38347dc9d5cec181148885ed342165b16689d44533511cb58bfcfa397a5e51869649086fa362a3bebc98
-DIST pypy3-bin-7.1.1-amd64+bzip2+ncurses.tar.lz 6915836 BLAKE2B 0f3f2210e7f6e73872d32b2c01a911b52ad2a8c8987034709d9e4c72cfe11e422eea7b6522b19b3717876307d9fbbfbdfcc008dc2e3771dea083eeb61c202e6e SHA512 7fe6a19f56d7cdc142b368154e17af8936b8b730102c4a1c8a6b756a13b643d1375a51f45a0a3d345f7a8a23b75a81d35a6aa810129d231bf2091e156f69a914
-DIST pypy3-bin-7.1.1-x86+bzip2+jit+ncurses+sse2.tar.lz 8540485 BLAKE2B a7de0db24e4bc56d54cbc03d618f8e08932e23a1fe5a1ab227600c244e222a6dae723c72fbd5cdd059c3e3f52bd355c4c9ee18506f6b39961bd1473358d35bd3 SHA512 f3355109bc073e220a33e8763c2d2ccf152d223d3850bb85aac71c19170ce4b118a84f258a829c486209f3c3014264384b158de17c9a0156c24afcf5b130a8e0
-DIST pypy3-bin-7.1.1-x86+bzip2+ncurses+sse2.tar.lz 5523574 BLAKE2B 44f760842b0f232f7f5fb7a2fe3f60ff1f832dec3b0c16d1fd27ab36d09c12d6be8aa6727a880c3400506ea415317ddfb982439c1a581a03909099eeb6ea8cf6 SHA512 df664a7afa5bdd329d19046c81e362782c4f9358add2b7e54100df10a23434b9a341ec504ac1d49b2b017917937ab23ffd3cf723f86b65d7080789f795f5a4d3
-DIST pypy3-bin-7.1.1-x86+bzip2+ncurses.r1.tar.lz 5550959 BLAKE2B 72b1f84f0c70b07bd622b4d9ba67b165ce047037acc9a4fb46427b07db8793610f71dc389fc5cede209663c7d36750faf6247d5b6eb3be006c6cc58e4a94b0eb SHA512 3c522a9cf0e94aa8c14e9982a09231517c2c2b46e73a9c69bc6c43c44afefa3958de8879ac0fff2d43f8a0fc79117bdee645599d8e1d6a0def9806b44a4b1bc9
-DIST pypy3-bin-7.1.1-x86+bzip2+ncurses.tar.lz 5545191 BLAKE2B 2afc40968977cd6956cb305a829811640e8437f0a811435a20ec694181286c94c820fd4148e3b6323a014ff391400d5265a7c1ee8b918c3db91ac02b44f3d585 SHA512 a1dad750491c5f524217986817a046c5c7a97b2b250a1d24b6a077d2d8067e249966cd331a5336fa2960a3d317c1aa83196c3e3b2f4a0734d79fe43cd9b55032
-DIST pypy3.6-v7.1.1-src.tar.bz2 23171982 BLAKE2B be43528bc6f3e02d146016a4969bd8c7a9e880a3bd3b77f441aac6d22ef67700f71e0171ec000066bd2c0bd506db64af69d6b75b59a92222dd0353ee70e6629b SHA512 17e78f9c7080d597a6283d8e8247d1ca78f09a14ff221db8c3d90d255b5befc73102b317ca34a80979e544d5ee72f3e5e649f89d185a085f4cc15012da4d0473
-EBUILD pypy3-bin-7.1.1-r1.ebuild 5726 BLAKE2B 273bc2fc7a031821f7c52a644f5a995751f59d11eb2f61fa3732af9f4f76bcb87ac90c2d1949f8bd089f6f6b25654f3e8d5c4d47f8cd92a1af9eaf734c8b7fd3 SHA512 61cd3ace61262da6b07fdd7a399c0e00c01327ca07bca34faa85e8d59d2af123b11eb1d09e05407a202f9400c6042179574948b5a9ab81ba68c1e2b80a3ad963
-EBUILD pypy3-bin-7.1.1.ebuild 5723 BLAKE2B 5b65d80f0bae857db38ac6ba36f55fdece5c8f833504f4ef896b012434d5469a4228b4b790c4735ecaf66c6d0c733db6321f75814d3dff230bc614241588225a SHA512 d70f254db7483b55ff7addc62bda682cc0b4ddfb526b3bc93442100e2109d028fd0355eff759899b7b9fd3a8aad6ac3b475d23bfbfd68cf98d8aff09f29c719b
+DIST pypy3-bin-7.2.0-amd64+bzip2+jit+ncurses.tar.lz 11429130 BLAKE2B 41de1efcfc72704a3b8fcee1fa0ca030bca0dc07b75856dbc9ee5a9e40c6298406360d3342dffde38131f6d708a6dc07d3708d6e6478dc95d7c6a6ece2d7b86b SHA512 7a97797a961e12d5498dadb5bc87ad9d43a9e9dea88a7617236dba79230f5f0cc02ab8ab21a60c279cca4a341dd3d814d50d4029b94be1f525bf7b9294d19269
+DIST pypy3-bin-7.2.0-amd64+bzip2+ncurses.tar.lz 7174734 BLAKE2B c2f916433a6105a04c70f6b53c43dc479b64f26794a75a6e6b7122fb7d2f4f825c47d2eb82cf95ecb795e494879718aad88661b2fe12faa87b737cbcd20b5a47 SHA512 c4a635b6b819a104ff1b1f3b39363c9bb5cab4299cff2fb6e78c64984691d3116b8378e8a47500f9c626bbf48c4a3a8d26fa23fe2daa945bcc3dc97db9b4a8c9
+DIST pypy3-bin-7.2.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8662494 BLAKE2B bf37ac682098c49efba0f05999ce70368c91cbc0012cdcde86303424fd225eb50a8b6fa058e0c3a9511c2668da47a042f1b836f9142ed4b112db43da3addd6ce SHA512 6fc0d15e5d82ab06937ca099d1ea2f77d00a6d4e1b4c6d9637c39944c0f077ae0c5eb0edb7c6746aaafb76cb0e8a0458340c888e340df2c8438515f55a38017e
+DIST pypy3-bin-7.2.0-x86+bzip2+ncurses+sse2.tar.lz 5625900 BLAKE2B d6642cc8b37f9c032ed23da41c5597bd41615c55312bee5b0de3e8543fb74ecf2504c74d9d3c8a51c0fc42285812835cab70d6f8a5a5f15f0d7b637260e0a656 SHA512 1014ea6d37cfa7a6cb60eb47b6a0e959036aaa5c774852484a57f75d4e5450fb50c1b170f571a1288ba70d710b0731e946773cb05751eca6478b4fffb185dc94
+DIST pypy3.6-v7.2.0-src.tar.bz2 21850076 BLAKE2B 756ea3034fe8971c979ec83c9cbfac55a680f3ef03b276475aa4318f3480ae5ede609b8413412df64db553a33979670498b1f97184f3b57406619c9db7f01127 SHA512 bcbb53062a473d504bcc082cf6286f6169c83d1f38d22c4d7c4e46ddc32bca9d91e71194637e6650db5bec02b29fe262b22fe236d627b6bc3e6e0c59c66c07cc
+EBUILD pypy3-bin-7.2.0-r1.ebuild 5532 BLAKE2B b73d564bf4975f4dac88f598ec8d92c205100747d037b41104e1cedfcc7bc5cd2a2cecae7131bec777e136ed84780e16f2d1be604ee9d33586b15b596dd56fab SHA512 ef447b184cfe2833d6efde461d32d0fc93d905b5bf81194480e1eca5a639d6bc7fd5bae314d67b970a31f98e78988443b65dd4b78b4d844aa252c589b4c355dc
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch b/dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch
index 17409fa89a42..135e496f2536 100644
--- a/dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch
+++ b/dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch
@@ -39,7 +39,7 @@ index 77a1827d4b..255603967f 100644
          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.5'):
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy3.6'):
 +                # override paths for system-wide install
 +                name = 'gentoo'
 +            else:
diff --git a/dev-python/pypy3-bin/files/7.0.0_all_distutils_cxx.patch b/dev-python/pypy3-bin/files/7.2.0-distutils-cxx.patch
index a9099e5c9dc3..89a38050c804 100644
--- a/dev-python/pypy3-bin/files/7.0.0_all_distutils_cxx.patch
+++ b/dev-python/pypy3-bin/files/7.2.0-distutils-cxx.patch
@@ -1,43 +1,5 @@
-From 5c396fb8b644e5de82d9b54cdb088ea673e16e14 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 25 Apr 2017 17:42:33 +0200
-Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5/7.0.0
-
-https://bugs.python.org/issue1222585
----
- lib-python/3/_osx_support.py                | 10 ++--
- lib-python/3/distutils/cygwinccompiler.py   | 21 ++++++--
- lib-python/3/distutils/sysconfig_cpython.py | 25 ++++++++--
- lib-python/3/distutils/sysconfig_pypy.py    | 34 ++++++++++---
- lib-python/3/distutils/unixccompiler.py     | 54 +++++++++++----------
- lib_pypy/_sysconfigdata.py                  |  1 +
- 6 files changed, 100 insertions(+), 45 deletions(-)
-
-diff --git a/lib-python/3/_osx_support.py b/lib-python/3/_osx_support.py
-index 13fcd8b8d2..0525be1cbc 100644
---- a/lib-python/3/_osx_support.py
-+++ b/lib-python/3/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # configuration variables that may contain universal build flags,
- # like "-arch" or "-isdkroot", that may need customization for
- # the user environment
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
--                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
--                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
--                            'PY_CORE_CFLAGS')
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
-+                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
-+                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
- 
- # configuration variables that may contain compiler calls
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
- 
- # prefix added to original configuration variable names
- _INITPRE = '_OSX_SUPPORT_INITIAL_'
 diff --git a/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py
-index c879646c0f..a6157fbd5f 100644
+index 1c36990..ead3174 100644
 --- a/lib-python/3/distutils/cygwinccompiler.py
 +++ b/lib-python/3/distutils/cygwinccompiler.py
 @@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
@@ -97,10 +59,10 @@ index c879646c0f..a6157fbd5f 100644
          # Maybe we should also append -mthreads, but then the finished
          # dlls need another dll (mingwm10.dll see Mingw32 docs)
 diff --git a/lib-python/3/distutils/sysconfig_cpython.py b/lib-python/3/distutils/sysconfig_cpython.py
-index 573724ddd7..0a04f33a86 100644
+index b8340f1..a8c5473 100644
 --- a/lib-python/3/distutils/sysconfig_cpython.py
 +++ b/lib-python/3/distutils/sysconfig_cpython.py
-@@ -173,9 +173,12 @@ def customize_compiler(compiler):
+@@ -170,9 +170,12 @@ def customize_compiler(compiler):
                  _osx_support.customize_compiler(_config_vars)
                  _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
  
@@ -116,7 +78,7 @@ index 573724ddd7..0a04f33a86 100644
  
          if 'CC' in os.environ:
              newcc = os.environ['CC']
-@@ -190,19 +193,27 @@ def customize_compiler(compiler):
+@@ -187,19 +190,27 @@ def customize_compiler(compiler):
              cxx = os.environ['CXX']
          if 'LDSHARED' in os.environ:
              ldshared = os.environ['LDSHARED']
@@ -145,7 +107,7 @@ index 573724ddd7..0a04f33a86 100644
          if 'AR' in os.environ:
              ar = os.environ['AR']
          if 'ARFLAGS' in os.environ:
-@@ -211,13 +222,17 @@ def customize_compiler(compiler):
+@@ -208,13 +219,17 @@ def customize_compiler(compiler):
              archiver = ar + ' ' + ar_flags
  
          cc_cmd = cc + ' ' + cflags
@@ -165,7 +127,7 @@ index 573724ddd7..0a04f33a86 100644
  
          compiler.shared_lib_extension = shlib_suffix
 diff --git a/lib-python/3/distutils/sysconfig_pypy.py b/lib-python/3/distutils/sysconfig_pypy.py
-index bf1748e300..70dfd72a1a 100644
+index bf1748e..70dfd72 100644
 --- a/lib-python/3/distutils/sysconfig_pypy.py
 +++ b/lib-python/3/distutils/sysconfig_pypy.py
 @@ -145,36 +145,52 @@ def customize_compiler(compiler):
@@ -247,7 +209,7 @@ index bf1748e300..70dfd72a1a 100644
  
          compiler.shared_lib_extension = shlib_suffix
 diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py
-index 32030ed150..1db3d5498b 100644
+index 2944ceb..cf2f219 100644
 --- a/lib-python/3/distutils/unixccompiler.py
 +++ b/lib-python/3/distutils/unixccompiler.py
 @@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
@@ -331,7 +293,7 @@ index 32030ed150..1db3d5498b 100644
                  if sys.platform == 'darwin':
                      linker = _osx_support.compiler_fixup(linker, ld_args)
 diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py
-index 2ceafe80bf..ee3f802c41 100644
+index 4d2b0bc..5ed9641 100644
 --- a/lib_pypy/_sysconfigdata.py
 +++ b/lib_pypy/_sysconfigdata.py
 @@ -15,6 +15,7 @@ build_time_vars = {
@@ -342,6 +304,3 @@ index 2ceafe80bf..ee3f802c41 100644
      'EXT_SUFFIX': so_ext,
      'SHLIB_SUFFIX': ".so",
      'AR': "ar",
--- 
-2.20.1
-
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.1.1-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.1.1-r1.ebuild
deleted file mode 100644
index 453ae142dbd3..000000000000
--- a/dev-python/pypy3-bin/pypy3-bin-7.1.1-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Test runner needs Python 2.
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
-MY_P=pypy3.6-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.6 (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.r1.tar.lz )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71-py36"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	>=sys-libs/glibc-2.28
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils
-	test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib/pypy3.6/pypy3-c
-	usr/lib/pypy3.6/libpypy3-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/7.0.0_all_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
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy3-c libpypy3-c.so
-
-	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 = {
-#    "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",
-#    "ssl": "_ssl_build.py",
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop curses syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	einfo "Please disregard the import errors during CFFI cache generation."
-	einfo "They come from modules not built yet."
-
-	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=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy3.6/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
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.1.1.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.2.0-r1.ebuild
index 0f8954a4f842..53f4a07681af 100644
--- a/dev-python/pypy3-bin/pypy3-bin-7.1.1.ebuild
+++ b/dev-python/pypy3-bin/pypy3-bin-7.2.0-r1.ebuild
@@ -10,8 +10,8 @@ inherit pax-utils python-any-r1 unpacker
 BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
 MY_P=pypy3.6-v${PV}
 
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.6 (binary package)"
-HOMEPAGE="http://pypy.org/"
+DESCRIPTION="Pre-built version of PyPy3"
+HOMEPAGE="https://pypy.org/"
 SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
 	amd64? (
 		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
@@ -22,19 +22,16 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
 			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
 			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
 		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-		)
 	)"
 
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71-py36"
+SLOT="0/72-py36"
 KEYWORDS="~amd64 ~x86"
 IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
+RESTRICT="!test? ( test )"
+# Supported variants
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
 
 RDEPEND="
 	app-arch/bzip2:0/1
@@ -67,7 +64,7 @@ QA_PREBUILT="
 src_prepare() {
 	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
+	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
 
 	sed -e "s^@EPREFIX@^${EPREFIX}^" \
 		-i lib-python/3/distutils/command/install.py || die
@@ -98,12 +95,14 @@ src_compile() {
 	# 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,
+#    "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",
@@ -117,9 +116,6 @@ src_compile() {
 	use sqlite && cffi_targets+=( sqlite3 )
 	use tk && cffi_targets+=( tkinter/tklib )
 
-	einfo "Please disregard the import errors during CFFI cache generation."
-	einfo "They come from modules not built yet."
-
 	local t
 	# all modules except tkinter output to .
 	# tkinter outputs to the correct dir ...
@@ -148,7 +144,7 @@ src_install() {
 	einfo "Installing PyPy ..."
 	exeinto "${dest}"
 	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
+	pax-mark m "${ED}${dest}/pypy3-c" "${ED}${dest}/libpypy3-c.so"
 	insinto "${dest}"
 	# preserve mtimes to avoid obsoleting caches
 	insopts -p
@@ -157,22 +153,22 @@ src_install() {
 	dodoc README.rst
 
 	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
+		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
+		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
+		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
 
 	einfo "Generating caches and byte-compiling ..."
 
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
+	local -x PYTHON=${ED}${dest}/pypy3-c
 	# we can't use eclass function since PyPy is dumb and always gives
 	# paths relative to the interpreter
 	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
@@ -184,5 +180,5 @@ src_install() {
 	einfo "Byte-compiling Python standard library..."
 
 	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
+	python_optimize "${ED}${dest}"
 }