1 |
commit: 03cf8281f29033edc0d628249e641526848a4ebc |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 3 06:55:42 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 3 06:55:42 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03cf8281 |
7 |
|
8 |
dev-python/pypy3-exe: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pypy3-exe/Manifest | 4 - |
13 |
dev-python/pypy3-exe/pypy3-exe-7.3.4.ebuild | 167 ------------------------ |
14 |
dev-python/pypy3-exe/pypy3-exe-7.3.5_rc3.ebuild | 167 ------------------------ |
15 |
3 files changed, 338 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest |
18 |
index 0d154c1abd8..758e7aa4aab 100644 |
19 |
--- a/dev-python/pypy3-exe/Manifest |
20 |
+++ b/dev-python/pypy3-exe/Manifest |
21 |
@@ -1,6 +1,2 @@ |
22 |
-DIST pypy3.7-gentoo-patches-7.3.4.tar.xz 8464 BLAKE2B 6d458a41e87eabeb2920b28752fe5cc49bbfc9c5f03d2fc1321362fbd02e9dfb3b41c99cb765b7f2644b9c49c5c60f879ad1c60a66bc991462edb50215b1802d SHA512 1282cf2fa9054209ceb5a91e0b4adcd86de33a326230fabe154b572d5e798d81e93d136e815f1c2816fbfdd5071fcfc175585d4fa5ae93145938bb4cf1d2baa7 |
23 |
DIST pypy3.7-gentoo-patches-7.3.5.tar.xz 8164 BLAKE2B 0f8707fda16c0358c1d3a2a60d83046bc5c6186906e07d0e2441d26da4c5d2e7978aa9013be211daf0a1bfddbb10f96745ba4be84b61903e177f4d906045ed67 SHA512 95d3acb11c811e4342ba3a56e925433614c5affb6a1fc873ecd2f2cfd55459424088b928f46bcb9a6f0e467fb77905af387ad04bad45a37b928fe0ea320ac33e |
24 |
-DIST pypy3.7-gentoo-patches-7.3.5rc3.tar.xz 4872 BLAKE2B 15970c21eb209407af5234719755dd5ddfce95f5b7dd5d525126045d71a00f22d56f26e54a85b94e54dd286334a39cb08abf681e56d466547be206322cf319ac SHA512 4a946560daaba8214f3f5cf828128293bc9aa0eec7d0000e184b3791165f255a7169ee63f9a569a1faed9e8095f593ac7982d49a07f93e085b41be50b275ce3f |
25 |
-DIST pypy3.7-v7.3.4-src.tar.bz2 25344083 BLAKE2B e88dd0cfcc6123dbf894f603162ebe43675c96b992d15c29e14a611a166b8da8d1d2f3298e65e5794b295215440cb88f31d252fcdaef1a0dab52777c24212a49 SHA512 c570d34f284f41dcd8dd909216c69831dd83b8501423c7635a4fe506fb16fd3705cf87975a664735e52d0b805a0432267d611a993437d17aac3defe4b9ea4401 |
26 |
DIST pypy3.7-v7.3.5-src.tar.bz2 25350766 BLAKE2B 34d5c83284271b184f71492dbd65b8760cc0fcdec71e41ef48b9561280dd67ef4c37fdd70759d0b95114d127446fc0ea5d04feb99022c1a725233862b2028834 SHA512 253d2efc81d55fb392ab810741e3a633f664e1908b2c26db7a8830c971655cca6be1b8d34581d13aa2d738a4a4c8ba23c2c90333b6e03d4608372e8013ea723b |
27 |
-DIST pypy3.7-v7.3.5rc3-src.tar.bz2 25255084 BLAKE2B 10a7c6c9879b2956726e9457e6939cf7597136dcc54bd8d6c20311468ed622697c151fb6209d49fda21e0710d0c3d18f702f43b01720341b7967663b007b1f09 SHA512 6ec569cf80741a540f39687e3cc1c4bf18c4cd038ed1b0782a333ab03e5f85ca221e3af4549d2332c78fcab5a430bd59a5ab14f9fa333624f6f1b9441049b5c3 |
28 |
|
29 |
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.4.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.4.ebuild |
30 |
deleted file mode 100644 |
31 |
index 3b5b032c10e..00000000000 |
32 |
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.4.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,167 +0,0 @@ |
35 |
-# Copyright 1999-2021 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-# pypy3 needs to be built using python 2 |
41 |
-PYTHON_COMPAT=( python2_7 ) |
42 |
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs |
43 |
- |
44 |
-PYPY_PV=${PV%_p37*} |
45 |
-MY_P=pypy3.7-v${PYPY_PV/_/} |
46 |
-PATCHSET="pypy3.7-gentoo-patches-${PV/_p37}" |
47 |
- |
48 |
-DESCRIPTION="PyPy3 executable (build from source)" |
49 |
-HOMEPAGE="https://www.pypy.org/" |
50 |
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2 |
51 |
- https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz" |
52 |
-S="${WORKDIR}/${MY_P}-src" |
53 |
- |
54 |
-LICENSE="MIT" |
55 |
-SLOT="${PV%_p*}" |
56 |
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" |
57 |
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2" |
58 |
- |
59 |
-RDEPEND=">=sys-libs/zlib-1.1.3:0= |
60 |
- dev-libs/libffi:0= |
61 |
- virtual/libintl:0= |
62 |
- dev-libs/expat:0= |
63 |
- bzip2? ( app-arch/bzip2:0= ) |
64 |
- ncurses? ( sys-libs/ncurses:0= ) |
65 |
- !dev-python/pypy3-exe-bin:${PV%_p*}" |
66 |
-DEPEND="${RDEPEND}" |
67 |
-BDEPEND=" |
68 |
- low-memory? ( dev-python/pypy ) |
69 |
- !low-memory? ( |
70 |
- || ( |
71 |
- dev-python/pypy |
72 |
- dev-lang/python:2.7 |
73 |
- ) |
74 |
- )" |
75 |
- |
76 |
-check_env() { |
77 |
- if use low-memory; then |
78 |
- CHECKREQS_MEMORY="1750M" |
79 |
- use amd64 && CHECKREQS_MEMORY="3500M" |
80 |
- else |
81 |
- CHECKREQS_MEMORY="3G" |
82 |
- use amd64 && CHECKREQS_MEMORY="6G" |
83 |
- fi |
84 |
- |
85 |
- check-reqs_pkg_pretend |
86 |
-} |
87 |
- |
88 |
-pkg_pretend() { |
89 |
- [[ ${MERGE_TYPE} != binary ]] && check_env |
90 |
-} |
91 |
- |
92 |
-pkg_setup() { |
93 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
94 |
- check_env |
95 |
- |
96 |
- # unset to allow forcing pypy below :) |
97 |
- use low-memory && EPYTHON= |
98 |
- if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] && |
99 |
- { has_version -b dev-python/pypy || |
100 |
- has_version -b dev-python/pypy-bin; } |
101 |
- then |
102 |
- einfo "Using PyPy to perform the translation." |
103 |
- EPYTHON=pypy |
104 |
- else |
105 |
- einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream" |
106 |
- einfo "recommends using PyPy for that. If you wish to do so, please install" |
107 |
- einfo "dev-python/pypy and ensure that EPYTHON variable is unset." |
108 |
- python-any-r1_pkg_setup |
109 |
- fi |
110 |
- fi |
111 |
-} |
112 |
- |
113 |
-src_prepare() { |
114 |
- local PATCHES=( |
115 |
- "${WORKDIR}/${PATCHSET}" |
116 |
- ) |
117 |
- default |
118 |
-} |
119 |
- |
120 |
-src_configure() { |
121 |
- tc-export CC |
122 |
- |
123 |
- local jit_backend |
124 |
- if use jit; then |
125 |
- jit_backend='--jit-backend=' |
126 |
- |
127 |
- # We only need the explicit sse2 switch for x86. |
128 |
- # On other arches we can rely on autodetection which uses |
129 |
- # compiler macros. Plus, --jit-backend= doesn't accept all |
130 |
- # the modern values... |
131 |
- |
132 |
- if use x86; then |
133 |
- if use cpu_flags_x86_sse2; then |
134 |
- jit_backend+=x86 |
135 |
- else |
136 |
- jit_backend+=x86-without-sse2 |
137 |
- fi |
138 |
- else |
139 |
- jit_backend+=auto |
140 |
- fi |
141 |
- fi |
142 |
- |
143 |
- local args=( |
144 |
- --no-shared |
145 |
- $(usex jit -Ojit -O2) |
146 |
- |
147 |
- ${jit_backend} |
148 |
- |
149 |
- pypy/goal/targetpypystandalone |
150 |
- ) |
151 |
- |
152 |
- # Avoid linking against libraries disabled by use flags |
153 |
- local opts=( |
154 |
- bzip2:bz2 |
155 |
- ncurses:_minimal_curses |
156 |
- ) |
157 |
- |
158 |
- local opt |
159 |
- for opt in "${opts[@]}"; do |
160 |
- local flag=${opt%:*} |
161 |
- local mod=${opt#*:} |
162 |
- |
163 |
- args+=( |
164 |
- $(usex ${flag} --withmod --withoutmod)-${mod} |
165 |
- ) |
166 |
- done |
167 |
- |
168 |
- local interp=( "${EPYTHON}" ) |
169 |
- if use low-memory; then |
170 |
- interp=( env PYPY_GC_MAX_DELTA=200MB |
171 |
- "${EPYTHON}" --jit loop_longevity=300 ) |
172 |
- fi |
173 |
- |
174 |
- if [[ ${EPYTHON} != pypy ]]; then |
175 |
- # reuse bundled pycparser to avoid external dep |
176 |
- mkdir -p "${T}"/pymod/cffi || die |
177 |
- : > "${T}"/pymod/cffi/__init__.py || die |
178 |
- cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die |
179 |
- local -x PYTHONPATH=${T}/pymod:${PYTHONPATH} |
180 |
- fi |
181 |
- |
182 |
- # translate into the C sources |
183 |
- # we're going to build them ourselves since otherwise pypy does not |
184 |
- # free up the unneeded memory before spawning the compiler |
185 |
- set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}" |
186 |
- echo -e "\033[1m${@}\033[0m" |
187 |
- "${@}" || die "translation failed" |
188 |
-} |
189 |
- |
190 |
-src_compile() { |
191 |
- emake -C "${T}"/usession*-0/testing_1 |
192 |
-} |
193 |
- |
194 |
-src_install() { |
195 |
- local dest=/usr/lib/pypy3.7 |
196 |
- exeinto "${dest}" |
197 |
- newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV} |
198 |
- insinto "${dest}"/include/${PYPY_PV} |
199 |
- doins include/pypy_* |
200 |
- pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}" |
201 |
-} |
202 |
|
203 |
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.5_rc3.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.5_rc3.ebuild |
204 |
deleted file mode 100644 |
205 |
index 70dd2bacbc8..00000000000 |
206 |
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.5_rc3.ebuild |
207 |
+++ /dev/null |
208 |
@@ -1,167 +0,0 @@ |
209 |
-# Copyright 1999-2021 Gentoo Authors |
210 |
-# Distributed under the terms of the GNU General Public License v2 |
211 |
- |
212 |
-EAPI=7 |
213 |
- |
214 |
-# pypy3 needs to be built using python 2 |
215 |
-PYTHON_COMPAT=( python2_7 ) |
216 |
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs |
217 |
- |
218 |
-PYPY_PV=${PV%_p*} |
219 |
-MY_P=pypy3.7-v${PYPY_PV/_} |
220 |
-PATCHSET="pypy3.7-gentoo-patches-${PV/_}" |
221 |
- |
222 |
-DESCRIPTION="PyPy3 executable (build from source)" |
223 |
-HOMEPAGE="https://www.pypy.org/" |
224 |
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2 |
225 |
- https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz" |
226 |
-S="${WORKDIR}/${MY_P}-src" |
227 |
- |
228 |
-LICENSE="MIT" |
229 |
-SLOT="${PYPY_PV}" |
230 |
-KEYWORDS="" |
231 |
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2" |
232 |
- |
233 |
-RDEPEND=">=sys-libs/zlib-1.1.3:0= |
234 |
- dev-libs/libffi:0= |
235 |
- virtual/libintl:0= |
236 |
- dev-libs/expat:0= |
237 |
- bzip2? ( app-arch/bzip2:0= ) |
238 |
- ncurses? ( sys-libs/ncurses:0= ) |
239 |
- !dev-python/pypy3-exe-bin:${PYPY_PV}" |
240 |
-DEPEND="${RDEPEND}" |
241 |
-BDEPEND=" |
242 |
- low-memory? ( dev-python/pypy ) |
243 |
- !low-memory? ( |
244 |
- || ( |
245 |
- dev-python/pypy |
246 |
- dev-lang/python:2.7 |
247 |
- ) |
248 |
- )" |
249 |
- |
250 |
-check_env() { |
251 |
- if use low-memory; then |
252 |
- CHECKREQS_MEMORY="1750M" |
253 |
- use amd64 && CHECKREQS_MEMORY="3500M" |
254 |
- else |
255 |
- CHECKREQS_MEMORY="3G" |
256 |
- use amd64 && CHECKREQS_MEMORY="6G" |
257 |
- fi |
258 |
- |
259 |
- check-reqs_pkg_pretend |
260 |
-} |
261 |
- |
262 |
-pkg_pretend() { |
263 |
- [[ ${MERGE_TYPE} != binary ]] && check_env |
264 |
-} |
265 |
- |
266 |
-pkg_setup() { |
267 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
268 |
- check_env |
269 |
- |
270 |
- # unset to allow forcing pypy below :) |
271 |
- use low-memory && EPYTHON= |
272 |
- if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] && |
273 |
- { has_version -b dev-python/pypy || |
274 |
- has_version -b dev-python/pypy-bin; } |
275 |
- then |
276 |
- einfo "Using PyPy to perform the translation." |
277 |
- EPYTHON=pypy |
278 |
- else |
279 |
- einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream" |
280 |
- einfo "recommends using PyPy for that. If you wish to do so, please install" |
281 |
- einfo "dev-python/pypy and ensure that EPYTHON variable is unset." |
282 |
- python-any-r1_pkg_setup |
283 |
- fi |
284 |
- fi |
285 |
-} |
286 |
- |
287 |
-src_prepare() { |
288 |
- local PATCHES=( |
289 |
- "${WORKDIR}/${PATCHSET}" |
290 |
- ) |
291 |
- default |
292 |
-} |
293 |
- |
294 |
-src_configure() { |
295 |
- tc-export CC |
296 |
- |
297 |
- local jit_backend |
298 |
- if use jit; then |
299 |
- jit_backend='--jit-backend=' |
300 |
- |
301 |
- # We only need the explicit sse2 switch for x86. |
302 |
- # On other arches we can rely on autodetection which uses |
303 |
- # compiler macros. Plus, --jit-backend= doesn't accept all |
304 |
- # the modern values... |
305 |
- |
306 |
- if use x86; then |
307 |
- if use cpu_flags_x86_sse2; then |
308 |
- jit_backend+=x86 |
309 |
- else |
310 |
- jit_backend+=x86-without-sse2 |
311 |
- fi |
312 |
- else |
313 |
- jit_backend+=auto |
314 |
- fi |
315 |
- fi |
316 |
- |
317 |
- local args=( |
318 |
- --no-shared |
319 |
- $(usex jit -Ojit -O2) |
320 |
- |
321 |
- ${jit_backend} |
322 |
- |
323 |
- pypy/goal/targetpypystandalone |
324 |
- ) |
325 |
- |
326 |
- # Avoid linking against libraries disabled by use flags |
327 |
- local opts=( |
328 |
- bzip2:bz2 |
329 |
- ncurses:_minimal_curses |
330 |
- ) |
331 |
- |
332 |
- local opt |
333 |
- for opt in "${opts[@]}"; do |
334 |
- local flag=${opt%:*} |
335 |
- local mod=${opt#*:} |
336 |
- |
337 |
- args+=( |
338 |
- $(usex ${flag} --withmod --withoutmod)-${mod} |
339 |
- ) |
340 |
- done |
341 |
- |
342 |
- local interp=( "${EPYTHON}" ) |
343 |
- if use low-memory; then |
344 |
- interp=( env PYPY_GC_MAX_DELTA=200MB |
345 |
- "${EPYTHON}" --jit loop_longevity=300 ) |
346 |
- fi |
347 |
- |
348 |
- if [[ ${EPYTHON} != pypy ]]; then |
349 |
- # reuse bundled pycparser to avoid external dep |
350 |
- mkdir -p "${T}"/pymod/cffi || die |
351 |
- : > "${T}"/pymod/cffi/__init__.py || die |
352 |
- cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die |
353 |
- local -x PYTHONPATH=${T}/pymod:${PYTHONPATH} |
354 |
- fi |
355 |
- |
356 |
- # translate into the C sources |
357 |
- # we're going to build them ourselves since otherwise pypy does not |
358 |
- # free up the unneeded memory before spawning the compiler |
359 |
- set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}" |
360 |
- echo -e "\033[1m${@}\033[0m" |
361 |
- "${@}" || die "translation failed" |
362 |
-} |
363 |
- |
364 |
-src_compile() { |
365 |
- emake -C "${T}"/usession*-0/testing_1 |
366 |
-} |
367 |
- |
368 |
-src_install() { |
369 |
- local dest=/usr/lib/pypy3.7 |
370 |
- exeinto "${dest}" |
371 |
- newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV} |
372 |
- insinto "${dest}"/include/${PYPY_PV} |
373 |
- doins include/pypy_* |
374 |
- pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}" |
375 |
-} |