gentoo resync : 03.11.2019

5 files changed, 46 insertions, 93 deletions

diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index e7aa3d24ba27..aa9a7be5dc04 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,9 +1,9 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 BLAKE2B efeecabe4ff7c8b0d6c845cfaab5eacc56e92da7614a0a7cfa2260a0ae93ebcd87d79c33444d16e57382bba55bdaf49f04c844c125a0a57c67119374f47e0b9e SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733
 AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f1fe09b3016e43a572ce6f7db2f27b895690d3920d1f14d07a8055050a51a636df0fc5bb04c9cb473aaf6b73 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945
-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.6-v7.1.1-src.tar.bz2 23171982 BLAKE2B be43528bc6f3e02d146016a4969bd8c7a9e880a3bd3b77f441aac6d22ef67700f71e0171ec000066bd2c0bd506db64af69d6b75b59a92222dd0353ee70e6629b SHA512 17e78f9c7080d597a6283d8e8247d1ca78f09a14ff221db8c3d90d255b5befc73102b317ca34a80979e544d5ee72f3e5e649f89d185a085f4cc15012da4d0473
-EBUILD pypy3-7.1.1.ebuild 7530 BLAKE2B 7cce55beece09dff0a3a8c8c985de1044af979d16e33fa000a80e786cccd2e07bfcba6ce1327e302d84e577cb56a001f3b88ceb4d17d8ca2cf4f4cd5f8ef8226 SHA512 04e8fa8450614bba800f310a6480c856335391580580df357fe40ae72fe5c5384fb1d1fc311c63bb61f9c5990c49b3e7cbe4a8a6a41fdd66d8ff611246d8989e
-EBUILD pypy3-9999.ebuild 7580 BLAKE2B 25c1e8ce02965e73b3f2cb57fd67c7be6d11905f17c648ebb4b025f6916bcbea737d38a9bffed535cfae615e6e7fd3b20272e95de1f4dc5d27009be30737450b SHA512 3c0851723c8bd47dce3cfdece5373e36d7b3d80420a7fc078ebd3690750b6b72eb10295d3a255cdb189c6ba62152c1d517dc41aa79a620f8c07da430c8376dff
+DIST pypy3.6-v7.2.0-src.tar.bz2 21850076 BLAKE2B 756ea3034fe8971c979ec83c9cbfac55a680f3ef03b276475aa4318f3480ae5ede609b8413412df64db553a33979670498b1f97184f3b57406619c9db7f01127 SHA512 bcbb53062a473d504bcc082cf6286f6169c83d1f38d22c4d7c4e46ddc32bca9d91e71194637e6650db5bec02b29fe262b22fe236d627b6bc3e6e0c59c66c07cc
+EBUILD pypy3-7.2.0-r1.ebuild 7382 BLAKE2B 42377d253011d2a1643b0cb68d0d719ae530bb6fd48f64592f7907f19e5a8d4f6574388aef305cd653743a4ce07d35773fffded9ea0e4a4b22d515a102f913a6 SHA512 ee2f630e7034bd64d32989d4e0114750b047012a5c7981754da36f4ccc6ac3ea3e1a783200543ef639eb17799174fd8f9defa34b172afda23a4fa7e8b40cf889
+EBUILD pypy3-9999.ebuild 7432 BLAKE2B f7fda6aa9308f9a5e0bfa20da5ae0a825d6ec1254ab14bfecb77a6d3b7e46a3788119c9f944bf06e440028e4bab31305ef7d1a26aff8f0395eae03ab623d1006 SHA512 348c6bc2dcd474e1c2423551d8fa57578366729dcf4d0740e0bed96f5f68e99dd11ddb88aed5fe34e0449bbf7d7e1b03f87c8d4e8a2b0aed49524da5979c42d5
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy3/files/7.0.0-gentoo-path.patch b/dev-python/pypy3/files/7.0.0-gentoo-path.patch
index 17409fa89a42..135e496f2536 100644
--- a/dev-python/pypy3/files/7.0.0-gentoo-path.patch
+++ b/dev-python/pypy3/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/files/7.0.0_all_distutils_cxx.patch b/dev-python/pypy3/files/7.2.0-distutils-cxx.patch
index a9099e5c9dc3..89a38050c804 100644
--- a/dev-python/pypy3/files/7.0.0_all_distutils_cxx.patch
+++ b/dev-python/pypy3/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/pypy3-7.1.1.ebuild b/dev-python/pypy3/pypy3-7.2.0-r1.ebuild
index 344f0da4013e..b703db56d2da 100644
--- a/dev-python/pypy3/pypy3-7.1.1.ebuild
+++ b/dev-python/pypy3/pypy3-7.2.0-r1.ebuild
@@ -10,12 +10,12 @@ inherit check-reqs pax-utils python-any-r1 toolchain-funcs
 MY_P=pypy3.6-v${PV}
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
-HOMEPAGE="http://pypy.org/"
+HOMEPAGE="https://pypy.org/"
 SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
 
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71-py36"
+SLOT="0/72-py36"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 cpu_flags_x86_sse2 gdbm +jit libressl low-memory ncurses
 	sandbox sqlite tk"
@@ -88,7 +88,7 @@ src_prepare() {
 	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-	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
@@ -180,18 +180,18 @@ 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",
 #    "_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 syslog pwdgrp resource lzma decimal )
@@ -200,9 +200,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 ...
@@ -231,7 +228,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
@@ -240,22 +237,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
@@ -267,5 +264,5 @@ src_install() {
 	einfo "Byte-compiling Python standard library..."
 
 	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
+	python_optimize "${ED}${dest}"
 }
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index d6e6b0856eab..12b0e7fae866 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -13,12 +13,12 @@ inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs
 MY_P=pypy3.6-v${PV}
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
-HOMEPAGE="http://pypy.org/"
+HOMEPAGE="https://pypy.org/"
 SRC_URI=""
 
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71-py36"
+SLOT="0/72-py36"
 KEYWORDS=""
 IUSE="bzip2 cpu_flags_x86_sse2 gdbm +jit libressl low-memory ncurses
 	sandbox sqlite tk"
@@ -96,7 +96,7 @@ src_prepare() {
 	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-	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
@@ -188,18 +188,18 @@ 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",
 #    "_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 syslog pwdgrp resource lzma decimal )
@@ -208,9 +208,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 ...
@@ -239,7 +236,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
@@ -248,22 +245,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
@@ -275,5 +272,5 @@ src_install() {
 	einfo "Byte-compiling Python standard library..."
 
 	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
+	python_optimize "${ED}${dest}"
 }