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