diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2017-10-15 12:06:56 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2017-10-15 12:08:55 +0200 |
| commit | bd4722d474a3e99d83511c713705cb003e03bd19 (patch) | |
| tree | 2ccd6d10ee85e597c139f0be352b47a553651d1f | |
| parent | dev-python/pypy: Fix cross-phase function calls (diff) | |
| download | gentoo-bd4722d4.tar.gz gentoo-bd4722d4.tar.bz2 gentoo-bd4722d4.zip | |
dev-python/pypy3: Fix cross-phase function calls
Closes: https://bugs.gentoo.org/596626
| -rw-r--r-- | dev-python/pypy3/pypy3-5.8.0.ebuild | 26 | ||||
| -rw-r--r-- | dev-python/pypy3/pypy3-5.9.0.ebuild | 26 | ||||
| -rw-r--r-- | 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 e2f58d805be1..b286c989e72b 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 1c93d21dd755..86dc37a6b60a 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 1175a210c989..cb2f562dfff9 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= |