commit: bd4722d474a3e99d83511c713705cb003e03bd19 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Oct 15 10:06:56 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Oct 15 10:08:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4722d4
dev-python/pypy3: Fix cross-phase function calls Closes: https://bugs.gentoo.org/596626 dev-python/pypy3/pypy3-5.8.0.ebuild | 26 ++++++++++++++------------ dev-python/pypy3/pypy3-5.9.0.ebuild | 26 ++++++++++++++------------ dev-python/pypy3/pypy3-9999.ebuild | 26 ++++++++++++++------------ 3 files changed, 42 insertions(+), 36 deletions(-) diff --git a/dev-python/pypy3/pypy3-5.8.0.ebuild b/dev-python/pypy3/pypy3-5.8.0.ebuild index e2f58d805be..b286c989e72 100644 --- 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 1c93d21dd75..86dc37a6b60 100644 --- 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 1175a210c98..cb2f562dfff 100644 --- 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=
