Skip to content

Commit

Permalink
dev-python/pypy: Fix cross-phase function calls
Browse files Browse the repository at this point in the history 
Closes: https://bugs.gentoo.org/596624
  • Loading branch information
@mgorny
mgorny committed Oct 15, 2017
1 parent 935c46e commit 1e3348b
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 60 deletions.
42 changes: 22 additions & 20 deletions dev-python/pypy/pypy-5.8.0.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
42 changes: 22 additions & 20 deletions dev-python/pypy/pypy-5.9.0.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
42 changes: 22 additions & 20 deletions dev-python/pypy/pypy-9999.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1e3348b

Please sign in to comment.