From f4c4fadca0f269d7e2bc305f37e4d43af016d02b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 17 Sep 2020 16:07:08 +0200 Subject: [PATCH] dev-python/pypy: Fix PYTHON path for byte-compiling modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../pypy/{pypy-7.3.1-r2.ebuild => pypy-7.3.1-r3.ebuild} | 7 ++++++- .../{pypy-7.3.2_rc2.ebuild => pypy-7.3.2_rc2-r1.ebuild} | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) rename dev-python/pypy/{pypy-7.3.1-r2.ebuild => pypy-7.3.1-r3.ebuild} (96%) rename dev-python/pypy/{pypy-7.3.2_rc2.ebuild => pypy-7.3.2_rc2-r1.ebuild} (96%) diff --git a/dev-python/pypy/pypy-7.3.1-r2.ebuild b/dev-python/pypy/pypy-7.3.1-r3.ebuild similarity index 96% rename from dev-python/pypy/pypy-7.3.1-r2.ebuild rename to dev-python/pypy/pypy-7.3.1-r3.ebuild index 59902f3b0a51d..8508153c294f1 100644 --- a/dev-python/pypy/pypy-7.3.1-r2.ebuild +++ b/dev-python/pypy/pypy-7.3.1-r3.ebuild @@ -166,7 +166,9 @@ src_install() { fi local -x EPYTHON=pypy - local -x PYTHON=${ED}${dest}/pypy-c + local -x PYTHON=${ED}${dest}/pypy-c-${PV} + # temporarily copy to build tree to facilitate module builds + cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die echo "EPYTHON='${EPYTHON}'" > epython.py || die python_moduleinto /usr/lib/pypy2.7/site-packages @@ -174,4 +176,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/pypy/pypy-7.3.2_rc2.ebuild b/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild similarity index 96% rename from dev-python/pypy/pypy-7.3.2_rc2.ebuild rename to dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild index d6556f35ca7b3..a5a678ffa9d0b 100644 --- a/dev-python/pypy/pypy-7.3.2_rc2.ebuild +++ b/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild @@ -159,7 +159,9 @@ src_install() { fi local -x EPYTHON=pypy - local -x PYTHON=${ED}${dest}/pypy-c + local -x PYTHON=${ED}${dest}/pypy-c-${PV} + # temporarily copy to build tree to facilitate module builds + cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die echo "EPYTHON='${EPYTHON}'" > epython.py || die python_moduleinto /usr/lib/pypy2.7/site-packages @@ -167,4 +169,7 @@ src_install() { einfo "Byte-compiling Python standard library..." python_optimize "${ED}${dest}" + + # remove to avoid collisions + rm "${PYTHON}" || die }