gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-01 11:18:09 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Closes: https://bugs.gentoo.org/596624
This commit is contained in:
Michał Górny
2017-10-15 12:03:54 +02:00
parent 935c46e84a
commit 1e3348be2d
3 changed files with 66 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
dev-python/pypy/pypy-5.8.0.ebuild
View File

@@ -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

42
dev-python/pypy/pypy-5.9.0.ebuild
View File

@@ -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

42
dev-python/pypy/pypy-9999.ebuild
View File

@@ -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