commit: 1e3348be2d7d8920097bf61e9d815e1afc064bcc Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Oct 15 10:03:54 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Oct 15 10:07:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e3348be
dev-python/pypy: Fix cross-phase function calls Closes: https://bugs.gentoo.org/596624 dev-python/pypy/pypy-5.8.0.ebuild | 42 ++++++++++++++++++++------------------- dev-python/pypy/pypy-5.9.0.ebuild | 42 ++++++++++++++++++++------------------- dev-python/pypy/pypy-9999.ebuild | 42 ++++++++++++++++++++------------------- 3 files changed, 66 insertions(+), 60 deletions(-) diff --git a/dev-python/pypy/pypy-5.8.0.ebuild b/dev-python/pypy/pypy-5.8.0.ebuild index 8317a80f148..ff7d02e64a2 100644 --- 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 0ac7919c6ef..3eff562c4ad 100644 --- 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 f028a5b6e80..62d8a0f73b8 100644 --- 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
