1 |
commit: 7e2f4e57d797f7d5d200fc0545e7377cf3f4add1 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 24 19:54:32 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 24 20:16:18 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2f4e57 |
7 |
|
8 |
dev-python/pypy3-exe: Stop using python-any-r1 and CPython 2.7 |
9 |
|
10 |
Stop using python-any-r1.eclass to unblock the way towards removing |
11 |
python2_7 support from it. Remove support for translation using CPython |
12 |
2.7, require dev-python/pypy unconditionally. |
13 |
|
14 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
15 |
|
16 |
dev-python/pypy3-exe/pypy3-exe-7.3.10_rc3.ebuild | 44 ++++-------------------- |
17 |
1 file changed, 6 insertions(+), 38 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.10_rc3.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.10_rc3.ebuild |
20 |
index 805ec9fcf901..6df29312cc6a 100644 |
21 |
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.10_rc3.ebuild |
22 |
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.10_rc3.ebuild |
23 |
@@ -3,9 +3,7 @@ |
24 |
|
25 |
EAPI=8 |
26 |
|
27 |
-# pypy3 needs to be built using python 2 |
28 |
-PYTHON_COMPAT=( python2_7 ) |
29 |
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs |
30 |
+inherit check-reqs pax-utils toolchain-funcs |
31 |
|
32 |
PYPY_PV=${PV%_p*} |
33 |
MY_P=pypy3.9-v${PYPY_PV/_} |
34 |
@@ -37,13 +35,7 @@ DEPEND=" |
35 |
${RDEPEND} |
36 |
" |
37 |
BDEPEND=" |
38 |
- low-memory? ( dev-python/pypy ) |
39 |
- !low-memory? ( |
40 |
- || ( |
41 |
- dev-python/pypy |
42 |
- dev-lang/python:2.7 |
43 |
- ) |
44 |
- ) |
45 |
+ dev-python/pypy |
46 |
" |
47 |
|
48 |
check_env() { |
49 |
@@ -63,24 +55,7 @@ pkg_pretend() { |
50 |
} |
51 |
|
52 |
pkg_setup() { |
53 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
54 |
- check_env |
55 |
- |
56 |
- # unset to allow forcing pypy below :) |
57 |
- use low-memory && EPYTHON= |
58 |
- if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] && |
59 |
- { has_version -b dev-python/pypy || |
60 |
- has_version -b dev-python/pypy-bin; } |
61 |
- then |
62 |
- einfo "Using PyPy to perform the translation." |
63 |
- EPYTHON=pypy |
64 |
- else |
65 |
- einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream" |
66 |
- einfo "recommends using PyPy for that. If you wish to do so, please install" |
67 |
- einfo "dev-python/pypy and ensure that EPYTHON variable is unset." |
68 |
- python-any-r1_pkg_setup |
69 |
- fi |
70 |
- fi |
71 |
+ [[ ${MERGE_TYPE} != binary ]] && check_env |
72 |
} |
73 |
|
74 |
src_prepare() { |
75 |
@@ -124,17 +99,10 @@ src_configure() { |
76 |
$(usex ncurses --with{,out}mod-_minimal_curses) |
77 |
) |
78 |
|
79 |
- local interp=( "${EPYTHON}" ) |
80 |
+ local interp=( pypy ) |
81 |
if use low-memory; then |
82 |
- interp=( env PYPY_GC_MAX_DELTA=200MB |
83 |
- "${EPYTHON}" --jit loop_longevity=300 ) |
84 |
- fi |
85 |
- |
86 |
- if [[ ${EPYTHON} != pypy ]]; then |
87 |
- # reuse bundled pycparser to avoid external dep |
88 |
- mkdir -p "${T}"/pymod || die |
89 |
- cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/pycparser || die |
90 |
- local -x PYTHONPATH=${T}/pymod:${PYTHONPATH} |
91 |
+ local -x PYPY_GC_MAX_DELTA=200MB |
92 |
+ interp+=( --jit loop_longevity=300 ) |
93 |
fi |
94 |
|
95 |
# translate into the C sources |