| 1 |
commit: bd4722d474a3e99d83511c713705cb003e03bd19 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 15 10:06:56 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 15 10:08:55 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4722d4 |
| 7 |
|
| 8 |
dev-python/pypy3: Fix cross-phase function calls |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/596626 |
| 11 |
|
| 12 |
dev-python/pypy3/pypy3-5.8.0.ebuild | 26 ++++++++++++++------------ |
| 13 |
dev-python/pypy3/pypy3-5.9.0.ebuild | 26 ++++++++++++++------------ |
| 14 |
dev-python/pypy3/pypy3-9999.ebuild | 26 ++++++++++++++------------ |
| 15 |
3 files changed, 42 insertions(+), 36 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-python/pypy3/pypy3-5.8.0.ebuild b/dev-python/pypy3/pypy3-5.8.0.ebuild |
| 18 |
index e2f58d805be..b286c989e72 100644 |
| 19 |
--- a/dev-python/pypy3/pypy3-5.8.0.ebuild |
| 20 |
+++ b/dev-python/pypy3/pypy3-5.8.0.ebuild |
| 21 |
@@ -41,23 +41,25 @@ DEPEND="${RDEPEND} |
| 22 |
|
| 23 |
S="${WORKDIR}/${MY_P}-src" |
| 24 |
|
| 25 |
-pkg_pretend() { |
| 26 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
| 27 |
- if use low-memory; then |
| 28 |
- CHECKREQS_MEMORY="1750M" |
| 29 |
- use amd64 && CHECKREQS_MEMORY="3500M" |
| 30 |
- else |
| 31 |
- CHECKREQS_MEMORY="3G" |
| 32 |
- use amd64 && CHECKREQS_MEMORY="6G" |
| 33 |
- fi |
| 34 |
- |
| 35 |
- check-reqs_pkg_pretend |
| 36 |
+check_env() { |
| 37 |
+ if use low-memory; then |
| 38 |
+ CHECKREQS_MEMORY="1750M" |
| 39 |
+ use amd64 && CHECKREQS_MEMORY="3500M" |
| 40 |
+ else |
| 41 |
+ CHECKREQS_MEMORY="3G" |
| 42 |
+ use amd64 && CHECKREQS_MEMORY="6G" |
| 43 |
fi |
| 44 |
+ |
| 45 |
+ check-reqs_pkg_pretend |
| 46 |
+} |
| 47 |
+ |
| 48 |
+pkg_pretend() { |
| 49 |
+ [[ ${MERGE_TYPE} != binary ]] && check_env |
| 50 |
} |
| 51 |
|
| 52 |
pkg_setup() { |
| 53 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 54 |
- pkg_pretend |
| 55 |
+ check_env |
| 56 |
|
| 57 |
# unset to allow forcing pypy below :) |
| 58 |
use low-memory && local EPYTHON= |
| 59 |
|
| 60 |
diff --git a/dev-python/pypy3/pypy3-5.9.0.ebuild b/dev-python/pypy3/pypy3-5.9.0.ebuild |
| 61 |
index 1c93d21dd75..86dc37a6b60 100644 |
| 62 |
--- a/dev-python/pypy3/pypy3-5.9.0.ebuild |
| 63 |
+++ b/dev-python/pypy3/pypy3-5.9.0.ebuild |
| 64 |
@@ -41,23 +41,25 @@ DEPEND="${RDEPEND} |
| 65 |
|
| 66 |
S="${WORKDIR}/${MY_P}-src" |
| 67 |
|
| 68 |
-pkg_pretend() { |
| 69 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
| 70 |
- if use low-memory; then |
| 71 |
- CHECKREQS_MEMORY="1750M" |
| 72 |
- use amd64 && CHECKREQS_MEMORY="3500M" |
| 73 |
- else |
| 74 |
- CHECKREQS_MEMORY="3G" |
| 75 |
- use amd64 && CHECKREQS_MEMORY="6G" |
| 76 |
- fi |
| 77 |
- |
| 78 |
- check-reqs_pkg_pretend |
| 79 |
+check_env() { |
| 80 |
+ if use low-memory; then |
| 81 |
+ CHECKREQS_MEMORY="1750M" |
| 82 |
+ use amd64 && CHECKREQS_MEMORY="3500M" |
| 83 |
+ else |
| 84 |
+ CHECKREQS_MEMORY="3G" |
| 85 |
+ use amd64 && CHECKREQS_MEMORY="6G" |
| 86 |
fi |
| 87 |
+ |
| 88 |
+ check-reqs_pkg_pretend |
| 89 |
+} |
| 90 |
+ |
| 91 |
+pkg_pretend() { |
| 92 |
+ [[ ${MERGE_TYPE} != binary ]] && check_env |
| 93 |
} |
| 94 |
|
| 95 |
pkg_setup() { |
| 96 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 97 |
- pkg_pretend |
| 98 |
+ check_env |
| 99 |
|
| 100 |
# unset to allow forcing pypy below :) |
| 101 |
use low-memory && local EPYTHON= |
| 102 |
|
| 103 |
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild |
| 104 |
index 1175a210c98..cb2f562dfff 100644 |
| 105 |
--- a/dev-python/pypy3/pypy3-9999.ebuild |
| 106 |
+++ b/dev-python/pypy3/pypy3-9999.ebuild |
| 107 |
@@ -43,23 +43,25 @@ DEPEND="${RDEPEND} |
| 108 |
# Who would care about predictable directory names? |
| 109 |
S="${WORKDIR}/pypy3-v${PV%_*}-src" |
| 110 |
|
| 111 |
-pkg_pretend() { |
| 112 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
| 113 |
- if use low-memory; then |
| 114 |
- CHECKREQS_MEMORY="1750M" |
| 115 |
- use amd64 && CHECKREQS_MEMORY="3500M" |
| 116 |
- else |
| 117 |
- CHECKREQS_MEMORY="3G" |
| 118 |
- use amd64 && CHECKREQS_MEMORY="6G" |
| 119 |
- fi |
| 120 |
- |
| 121 |
- check-reqs_pkg_pretend |
| 122 |
+check_env() { |
| 123 |
+ if use low-memory; then |
| 124 |
+ CHECKREQS_MEMORY="1750M" |
| 125 |
+ use amd64 && CHECKREQS_MEMORY="3500M" |
| 126 |
+ else |
| 127 |
+ CHECKREQS_MEMORY="3G" |
| 128 |
+ use amd64 && CHECKREQS_MEMORY="6G" |
| 129 |
fi |
| 130 |
+ |
| 131 |
+ check-reqs_pkg_pretend |
| 132 |
+} |
| 133 |
+ |
| 134 |
+pkg_pretend() { |
| 135 |
+ [[ ${MERGE_TYPE} != binary ]] && check_env |
| 136 |
} |
| 137 |
|
| 138 |
pkg_setup() { |
| 139 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 140 |
- pkg_pretend |
| 141 |
+ check_env |
| 142 |
|
| 143 |
# unset to allow forcing pypy below :) |
| 144 |
use low-memory && local EPYTHON= |
Archives