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

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

diff --git a/dev-python/pypy/pypy-5.8.0.ebuild b/dev-python/pypy/pypy-5.8.0.ebuild
index 8317a80f148014fc18dd13b31a6ec99f099257e4..ff7d02e64a20d4168795e931a71a5b240bb657cd 100644 (file)
--- a/dev-python/pypy/pypy-5.8.0.ebuild
+++ b/dev-python/pypy/pypy-5.8.0.ebuild
@@ -43,33 +43,35 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}-src"
 
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               if use low-memory; then
-                       if ! python_is_installed pypy; then
-                               eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-                               eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-                               eerror
-                               eerror "  $ emerge -1v dev-python/pypy-bin"
-                               eerror
-                               eerror "before attempting to build dev-python/pypy[low-memory]."
-                               die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-                       fi
-
-                       CHECKREQS_MEMORY="1750M"
-                       use amd64 && CHECKREQS_MEMORY="3500M"
-               else
-                       CHECKREQS_MEMORY="3G"
-                       use amd64 && CHECKREQS_MEMORY="6G"
+check_env() {
+       if use low-memory; then
+               if ! python_is_installed pypy; then
+                       eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+                       eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+                       eerror
+                       eerror "  $ emerge -1v dev-python/pypy-bin"
+                       eerror
+                       eerror "before attempting to build dev-python/pypy[low-memory]."
+                       die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
                fi
 
-               check-reqs_pkg_pretend
+               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
 
                if python_is_installed pypy; then
                        if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then

diff --git a/dev-python/pypy/pypy-5.9.0.ebuild b/dev-python/pypy/pypy-5.9.0.ebuild
index 0ac7919c6ef2af64e4adda62c981f829b453c72b..3eff562c4ad6b2cb0d8997cd3b542d35fe6ee037 100644 (file)
--- a/dev-python/pypy/pypy-5.9.0.ebuild
+++ b/dev-python/pypy/pypy-5.9.0.ebuild
@@ -43,33 +43,35 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}-src"
 
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               if use low-memory; then
-                       if ! python_is_installed pypy; then
-                               eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-                               eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-                               eerror
-                               eerror "  $ emerge -1v dev-python/pypy-bin"
-                               eerror
-                               eerror "before attempting to build dev-python/pypy[low-memory]."
-                               die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-                       fi
-
-                       CHECKREQS_MEMORY="1750M"
-                       use amd64 && CHECKREQS_MEMORY="3500M"
-               else
-                       CHECKREQS_MEMORY="3G"
-                       use amd64 && CHECKREQS_MEMORY="6G"
+check_env() {
+       if use low-memory; then
+               if ! python_is_installed pypy; then
+                       eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+                       eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+                       eerror
+                       eerror "  $ emerge -1v dev-python/pypy-bin"
+                       eerror
+                       eerror "before attempting to build dev-python/pypy[low-memory]."
+                       die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
                fi
 
-               check-reqs_pkg_pretend
+               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
 
                if python_is_installed pypy; then
                        if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then

diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index f028a5b6e80d70aa58a717d24f67f66db76f0726..62d8a0f73b85ae7f31d7486e31ed56c31b5ec084 100644 (file)
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -44,33 +44,35 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}-src"
 
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               if use low-memory; then
-                       if ! python_is_installed pypy; then
-                               eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-                               eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-                               eerror
-                               eerror "  $ emerge -1v dev-python/pypy-bin"
-                               eerror
-                               eerror "before attempting to build dev-python/pypy[low-memory]."
-                               die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-                       fi
-
-                       CHECKREQS_MEMORY="1750M"
-                       use amd64 && CHECKREQS_MEMORY="3500M"
-               else
-                       CHECKREQS_MEMORY="3G"
-                       use amd64 && CHECKREQS_MEMORY="6G"
+check_env() {
+       if use low-memory; then
+               if ! python_is_installed pypy; then
+                       eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+                       eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+                       eerror
+                       eerror "  $ emerge -1v dev-python/pypy-bin"
+                       eerror
+                       eerror "before attempting to build dev-python/pypy[low-memory]."
+                       die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
                fi
 
-               check-reqs_pkg_pretend
+               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
 
                if python_is_installed pypy; then
                        if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then