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