dev-python/pypy3: Fix cross-phase function calls

Closes: https://bugs.gentoo.org/596626

diff --git a/dev-python/pypy3/pypy3-5.8.0.ebuild b/dev-python/pypy3/pypy3-5.8.0.ebuild
index e2f58d805be10109f32a1b3480ba1ecf194c1fb2..b286c989e72bb44efaabf5284468c9ad5db4610b 100644 (file)
--- a/dev-python/pypy3/pypy3-5.8.0.ebuild
+++ b/dev-python/pypy3/pypy3-5.8.0.ebuild
@@ -41,23 +41,25 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}-src"
 
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               if use low-memory; then
-                       CHECKREQS_MEMORY="1750M"
-                       use amd64 && CHECKREQS_MEMORY="3500M"
-               else
-                       CHECKREQS_MEMORY="3G"
-                       use amd64 && CHECKREQS_MEMORY="6G"
-               fi
-
-               check-reqs_pkg_pretend
+check_env() {
+       if use low-memory; then
+               CHECKREQS_MEMORY="1750M"
+               use amd64 && CHECKREQS_MEMORY="3500M"
+       else
+               CHECKREQS_MEMORY="3G"
+               use amd64 && CHECKREQS_MEMORY="6G"
        fi
+
+       check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+       [[ ${MERGE_TYPE} != binary ]] && check_env
 }
 
 pkg_setup() {
        if [[ ${MERGE_TYPE} != binary ]]; then
-               pkg_pretend
+               check_env
 
                # unset to allow forcing pypy below :)
                use low-memory && local EPYTHON=

diff --git a/dev-python/pypy3/pypy3-5.9.0.ebuild b/dev-python/pypy3/pypy3-5.9.0.ebuild
index 1c93d21dd755de2d562efb5b3bb4bd98b63605b3..86dc37a6b60a962c251f842a25910456e34ad9dd 100644 (file)
--- a/dev-python/pypy3/pypy3-5.9.0.ebuild
+++ b/dev-python/pypy3/pypy3-5.9.0.ebuild
@@ -41,23 +41,25 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}-src"
 
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               if use low-memory; then
-                       CHECKREQS_MEMORY="1750M"
-                       use amd64 && CHECKREQS_MEMORY="3500M"
-               else
-                       CHECKREQS_MEMORY="3G"
-                       use amd64 && CHECKREQS_MEMORY="6G"
-               fi
-
-               check-reqs_pkg_pretend
+check_env() {
+       if use low-memory; then
+               CHECKREQS_MEMORY="1750M"
+               use amd64 && CHECKREQS_MEMORY="3500M"
+       else
+               CHECKREQS_MEMORY="3G"
+               use amd64 && CHECKREQS_MEMORY="6G"
        fi
+
+       check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+       [[ ${MERGE_TYPE} != binary ]] && check_env
 }
 
 pkg_setup() {
        if [[ ${MERGE_TYPE} != binary ]]; then
-               pkg_pretend
+               check_env
 
                # unset to allow forcing pypy below :)
                use low-memory && local EPYTHON=

diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index 1175a210c9897d3a49ac2e178dae89950d8ee3e3..cb2f562dfff9ed32ce4a4279a8161ac2ad125b65 100644 (file)
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -43,23 +43,25 @@ DEPEND="${RDEPEND}
 # Who would care about predictable directory names?
 S="${WORKDIR}/pypy3-v${PV%_*}-src"
 
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               if use low-memory; then
-                       CHECKREQS_MEMORY="1750M"
-                       use amd64 && CHECKREQS_MEMORY="3500M"
-               else
-                       CHECKREQS_MEMORY="3G"
-                       use amd64 && CHECKREQS_MEMORY="6G"
-               fi
-
-               check-reqs_pkg_pretend
+check_env() {
+       if use low-memory; then
+               CHECKREQS_MEMORY="1750M"
+               use amd64 && CHECKREQS_MEMORY="3500M"
+       else
+               CHECKREQS_MEMORY="3G"
+               use amd64 && CHECKREQS_MEMORY="6G"
        fi
+
+       check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+       [[ ${MERGE_TYPE} != binary ]] && check_env
 }
 
 pkg_setup() {
        if [[ ${MERGE_TYPE} != binary ]]; then
-               pkg_pretend
+               check_env
 
                # unset to allow forcing pypy below :)
                use low-memory && local EPYTHON=