[gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-exe/

[Michał Górny]

commit:     1d9634f14b12fdc731701e9edb5458f64a79b3a4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  4 14:59:15 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan  4 15:01:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d9634f1

dev-python/pypy-exe: Fix interpreter choice conditional

Closes: https://bugs.gentoo.org/704756
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 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 0b1e0997bb9..720c1dc86a9 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
 }