From 1d9634f14b12fdc731701e9edb5458f64a79b3a4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 4 Jan 2020 15:59:15 +0100 Subject: [PATCH] dev-python/pypy-exe: Fix interpreter choice conditional MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/704756 Signed-off-by: Michał Górny --- dev-python/pypy-exe/pypy-exe-7.3.0.ebuild | 24 +++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild index 0b1e0997bb91..720c1dc86a96 100644 --- a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild +++ b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild @@ -70,20 +70,18 @@ pkg_setup() { if [[ ${MERGE_TYPE} != binary ]]; then check_env - if has_version -b dev-python/pypy || - has_version -b dev-python/pypy-bin + use low-memory && local EPYTHON= + if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] && + { has_version -b dev-python/pypy || + has_version -b dev-python/pypy-bin; } then - if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || - use low-memory - then - einfo "Using already-installed PyPy to perform the translation." - EPYTHON=pypy - else - einfo "Using ${EPYTHON} to perform the translation. Please note that upstream" - einfo "recommends using PyPy for that. If you wish to do so, please unset" - einfo "the EPYTHON variable." - python-any-r1_pkg_setup - fi + einfo "Using already-installed PyPy to perform the translation." + EPYTHON=pypy + else + einfo "Using ${EPYTHON} to perform the translation. Please note that upstream" + einfo "recommends using PyPy for that. If you wish to do so, please unset" + einfo "the EPYTHON variable." + python-any-r1_pkg_setup fi fi } -- 2.26.2