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