Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-exe/
Date: Sat, 04 Jan 2020 15:01:58
Message-Id: 1578150108.1d9634f14b12fdc731701e9edb5458f64a79b3a4.mgorny@gentoo
1 commit: 1d9634f14b12fdc731701e9edb5458f64a79b3a4
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 4 14:59:15 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 4 15:01:48 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d9634f1
7
8 dev-python/pypy-exe: Fix interpreter choice conditional
9
10 Closes: https://bugs.gentoo.org/704756
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 dev-python/pypy-exe/pypy-exe-7.3.0.ebuild | 24 +++++++++++-------------
14 1 file changed, 11 insertions(+), 13 deletions(-)
15
16 diff --git a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
17 index 0b1e0997bb9..720c1dc86a9 100644
18 --- a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
19 +++ b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
20 @@ -70,20 +70,18 @@ pkg_setup() {
21 if [[ ${MERGE_TYPE} != binary ]]; then
22 check_env
23
24 - if has_version -b dev-python/pypy ||
25 - has_version -b dev-python/pypy-bin
26 + use low-memory && local EPYTHON=
27 + if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
28 + { has_version -b dev-python/pypy ||
29 + has_version -b dev-python/pypy-bin; }
30 then
31 - if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] ||
32 - use low-memory
33 - then
34 - einfo "Using already-installed PyPy to perform the translation."
35 - EPYTHON=pypy
36 - else
37 - einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
38 - einfo "recommends using PyPy for that. If you wish to do so, please unset"
39 - einfo "the EPYTHON variable."
40 - python-any-r1_pkg_setup
41 - fi
42 + einfo "Using already-installed PyPy to perform the translation."
43 + EPYTHON=pypy
44 + else
45 + einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
46 + einfo "recommends using PyPy for that. If you wish to do so, please unset"
47 + einfo "the EPYTHON variable."
48 + python-any-r1_pkg_setup
49 fi
50 fi
51 }