Gentoo Archives: gentoo-commits

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