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/pypy3/
Date: Fri, 25 Sep 2020 12:13:51
Message-Id: 1601036017.17f643684d2e49eb2e465ad4b2ec9d40b4402850.mgorny@gentoo
1 commit: 17f643684d2e49eb2e465ad4b2ec9d40b4402850
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 25 10:00:25 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 25 12:13:37 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f64368
7
8 dev-python/pypy3: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/pypy3/Manifest | 2 -
13 dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild | 207 -------------------------
14 dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild | 178 ---------------------
15 3 files changed, 387 deletions(-)
16
17 diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
18 index 63923ccf593..18cd2160f09 100644
19 --- a/dev-python/pypy3/Manifest
20 +++ b/dev-python/pypy3/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/pypy3-7.3.2_rc2-r1.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild
29 deleted file mode 100644
30 index acb328c4e72..00000000000
31 --- a/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild
32 +++ /dev/null
33 @@ -1,207 +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 -PYTHON_COMPAT=( python2_7 )
40 -inherit pax-utils python-any-r1 toolchain-funcs
41 -
42 -MY_P=pypy3.6-v${PV/_/}
43 -
44 -DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
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 -# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
51 -SLOT="0/pypy36-pp73"
52 -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
53 -IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
54 -RESTRICT="!test? ( test )"
55 -
56 -RDEPEND="
57 - || (
58 - dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
59 - dev-python/pypy3-exe-bin:${PV}
60 - )
61 - !libressl? ( dev-libs/openssl:0= )
62 - libressl? ( dev-libs/libressl:0= )
63 - gdbm? ( sys-libs/gdbm:0= )
64 - sqlite? ( dev-db/sqlite:3= )
65 - tk? (
66 - dev-lang/tk:0=
67 - dev-tcltk/tix:0=
68 - )
69 - !<dev-python/pypy3-bin-7.3.0:0"
70 -DEPEND="${RDEPEND}
71 - test? (
72 - ${PYTHON_DEPS}
73 - !!dev-python/pytest-forked
74 - )"
75 -
76 -pkg_setup() {
77 - use test && python-any-r1_pkg_setup
78 -}
79 -
80 -src_prepare() {
81 - eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
82 - eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
83 - eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
84 -
85 - sed -e "s^@EPREFIX@^${EPREFIX}^" \
86 - -i lib-python/3/distutils/command/install.py || die
87 -
88 - # apply CPython stdlib patches
89 - pushd lib-python/3 > /dev/null || die
90 - eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
91 - popd > /dev/null || die
92 -
93 - # see http://buildbot.pypy.org/summary?branch=py3.6&builder=pypy-c-jit-linux-x86-64
94 - sed -i -e 's:test_jumpy:_&:' \
95 - lib-python/3/test/test_dis.py || die
96 - sed -i -e 's:test_get_and_set_scheduler_and_param:_&:' \
97 - lib-python/3/test/test_posix.py || die
98 - sed -i -e 's:test_auto_history:_&:' \
99 - -e 's:test_history_size:_&:' \
100 - lib-python/3/test/test_readline.py || die
101 - sed -i -e 's:test_eval_bytes_invalid_escape:_&:' \
102 - -e 's:test_eval_str_invalid_escape:_&:' \
103 - lib-python/3/test/test_string_literals.py || die
104 - sed -i -e 's:test_jump_out_of_async_for_block:_&:' \
105 - -e 's:test_jump_over_async_for_block_before_else:_&:' \
106 - -e 's:test_no_jump_.*wards_into_async_for_block:_&:' \
107 - -e 's:test_no_jump_into_async_for_block_before_else:_&:' \
108 - -e 's:test_no_jump_from_yield:_&:' \
109 - lib-python/3/test/test_sys_settrace.py || die
110 - sed -i -e 's:test_circular_imports:_&:' \
111 - lib-python/3/test/test_threaded_import.py || die
112 -
113 - # the first one's broken by sandbox, the second by our env
114 - sed -i -e 's:test_empty_env:_&:' \
115 - -e 's:test_executable(:_&:' \
116 - -e 's:test_executable_without_cwd:_&:' \
117 - lib-python/3/test/test_subprocess.py || die
118 -
119 - # XXX
120 - sed -i -e 's:test_locale:_&:' \
121 - lib-python/3/test/test_format.py || die
122 - sed -i -e 's:test_decompressor_bug_28275:_&:' \
123 - lib-python/3/test/test_lzma.py || die
124 -
125 - eapply_user
126 -}
127 -
128 -src_configure() {
129 - tc-export CC
130 -}
131 -
132 -src_compile() {
133 - # copy over to make sys.prefix happy
134 - cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die
135 - cp -p "${BROOT}"/usr/lib/pypy3.6/include/${PV}/* include/ || die
136 - # (not installed by pypy)
137 - rm pypy/module/cpyext/include/_numpypy/numpy/README || die
138 - mv pypy/module/cpyext/include/* include/ || die
139 - mv pypy/module/cpyext/parse/*.h include/ || die
140 - pax-mark m pypy3-c
141 -
142 - einfo "Generating caches and CFFI modules ..."
143 -
144 - # Generate Grammar and PatternGrammar pickles.
145 - ./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
146 - || die "Generation of Grammar and PatternGrammar pickles failed"
147 -
148 - # Generate cffi modules
149 - # Please keep in sync with pypy/tool/build_cffi_imports.py!
150 -#cffi_build_scripts = {
151 -# "_blake2": "_blake2/_blake2_build.py",
152 -# "_ssl": "_ssl_build.py",
153 -# "sqlite3": "_sqlite3_build.py",
154 -# "audioop": "_audioop_build.py",
155 -# "tk": "_tkinter/tklib_build.py",
156 -# "curses": "_curses_build.py" if sys.platform != "win32" else None,
157 -# "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
158 -# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
159 -# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
160 -# "resource": "_resource_build.py" if sys.platform != "win32" else None,
161 -# "lzma": "_lzma_build.py",
162 -# "_decimal": "_decimal_build.py",
163 -# "_sha3": "_sha3/_sha3_build.py",
164 - cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
165 - audioop syslog pwdgrp resource lzma decimal )
166 - use gdbm && cffi_targets+=( gdbm )
167 - use ncurses && cffi_targets+=( curses )
168 - use sqlite && cffi_targets+=( sqlite3 )
169 - use tk && cffi_targets+=( tkinter/tklib )
170 -
171 - local t
172 - # all modules except tkinter output to .
173 - # tkinter outputs to the correct dir ...
174 - cd lib_pypy || die
175 - for t in "${cffi_targets[@]}"; do
176 - # tkinter doesn't work via -m
177 - ../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
178 - done
179 -
180 - # Cleanup temporary objects
181 - find -name "_cffi_*.[co]" -delete || die
182 - find -type d -empty -delete || die
183 -}
184 -
185 -src_test() {
186 - # (unset)
187 - local -x PYTHONDONTWRITEBYTECODE=
188 - local -x COLUMNS=80
189 -
190 - # Test runner requires Python 2 too. However, it spawns PyPy3
191 - # internally so that we end up testing the correct interpreter.
192 - "${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
193 -}
194 -
195 -src_install() {
196 - local dest=/usr/lib/pypy3.6
197 - einfo "Installing PyPy ..."
198 - dosym pypy3-c-${PV} "${dest}/pypy3-c"
199 - insinto "${dest}"
200 - # preserve mtimes to avoid obsoleting caches
201 - insopts -p
202 - doins -r include lib_pypy lib-python
203 -
204 - # replace copied headers with symlinks
205 - for x in "${BROOT}"/usr/lib/pypy3.6/include/${PV}/*; do
206 - dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
207 - done
208 -
209 - dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
210 - dodoc README.rst
211 -
212 - if ! use gdbm; then
213 - rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
214 - fi
215 - if ! use sqlite; then
216 - rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
217 - "${ED}${dest}"/lib_pypy/_sqlite3* \
218 - "${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
219 - fi
220 - if ! use tk; then
221 - rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
222 - "${ED}${dest}"/lib_pypy/_tkinter \
223 - "${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
224 - fi
225 -
226 - local -x EPYTHON=pypy3
227 - local -x PYTHON=${ED}${dest}/pypy3-c-${PV}
228 - # temporarily copy to build tree to facilitate module builds
229 - cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die
230 -
231 - echo "EPYTHON='${EPYTHON}'" > epython.py || die
232 - python_moduleinto /usr/lib/pypy3.6/site-packages
233 - python_domodule epython.py
234 -
235 - einfo "Byte-compiling Python standard library..."
236 - python_optimize "${ED}${dest}"
237 -
238 - # remove to avoid collisions
239 - rm "${PYTHON}" || die
240 -}
241
242 diff --git a/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild
243 deleted file mode 100644
244 index d750cf9c4b2..00000000000
245 --- a/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild
246 +++ /dev/null
247 @@ -1,178 +0,0 @@
248 -# Copyright 1999-2020 Gentoo Authors
249 -# Distributed under the terms of the GNU General Public License v2
250 -
251 -EAPI=7
252 -
253 -PYTHON_COMPAT=( python2_7 )
254 -inherit pax-utils python-any-r1 toolchain-funcs
255 -
256 -PYPY_PV=${PV%_p37}
257 -MY_P=pypy3.7-v${PYPY_PV/_/}
258 -
259 -DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
260 -HOMEPAGE="https://pypy.org/"
261 -SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
262 -S="${WORKDIR}/${MY_P}-src"
263 -
264 -LICENSE="MIT"
265 -# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
266 -SLOT="0/pypy37-pp73"
267 -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
268 -IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
269 -# pypy3.7 is in alpha state and a lot of tests are failing
270 -RESTRICT="test"
271 -
272 -RDEPEND="
273 - || (
274 - dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
275 - dev-python/pypy3-exe-bin:${PV}
276 - )
277 - !libressl? ( dev-libs/openssl:0= )
278 - libressl? ( dev-libs/libressl:0= )
279 - gdbm? ( sys-libs/gdbm:0= )
280 - sqlite? ( dev-db/sqlite:3= )
281 - tk? (
282 - dev-lang/tk:0=
283 - dev-tcltk/tix:0=
284 - )
285 - !<dev-python/pypy3-bin-7.3.0:0"
286 -DEPEND="${RDEPEND}
287 - test? (
288 - ${PYTHON_DEPS}
289 - !!dev-python/pytest-forked
290 - )"
291 -
292 -pkg_setup() {
293 - use test && python-any-r1_pkg_setup
294 -}
295 -
296 -src_prepare() {
297 - eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
298 - eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
299 - eapply "${FILESDIR}/7.3.2-py37-distutils-cxx.patch"
300 -
301 - sed -e "s^@EPREFIX@^${EPREFIX}^" \
302 - -i lib-python/3/distutils/command/install.py || die
303 -
304 - # apply CPython stdlib patches
305 - pushd lib-python/3 > /dev/null || die
306 - eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
307 - popd > /dev/null || die
308 -
309 - eapply_user
310 -}
311 -
312 -src_configure() {
313 - tc-export CC
314 -}
315 -
316 -src_compile() {
317 - # copy over to make sys.prefix happy
318 - cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die
319 - cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/* include/ || die
320 - # (not installed by pypy)
321 - rm pypy/module/cpyext/include/_numpypy/numpy/README || die
322 - mv pypy/module/cpyext/include/* include/ || die
323 - mv pypy/module/cpyext/parse/*.h include/ || die
324 - pax-mark m pypy3-c
325 -
326 - einfo "Generating caches and CFFI modules ..."
327 -
328 - # Generate Grammar and PatternGrammar pickles.
329 - ./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
330 - || die "Generation of Grammar and PatternGrammar pickles failed"
331 -
332 - # Generate cffi modules
333 - # Please keep in sync with pypy/tool/build_cffi_imports.py!
334 -#cffi_build_scripts = {
335 -# "_blake2": "_blake2/_blake2_build.py",
336 -# "_ssl": "_ssl_build.py",
337 -# "sqlite3": "_sqlite3_build.py",
338 -# "audioop": "_audioop_build.py",
339 -# "tk": "_tkinter/tklib_build.py",
340 -# "curses": "_curses_build.py" if sys.platform != "win32" else None,
341 -# "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
342 -# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
343 -# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
344 -# "resource": "_resource_build.py" if sys.platform != "win32" else None,
345 -# "lzma": "_lzma_build.py",
346 -# "_decimal": "_decimal_build.py",
347 -# "_sha3": "_sha3/_sha3_build.py",
348 - cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
349 - audioop syslog pwdgrp resource lzma decimal )
350 - use gdbm && cffi_targets+=( gdbm )
351 - use ncurses && cffi_targets+=( curses )
352 - use sqlite && cffi_targets+=( sqlite3 )
353 - use tk && cffi_targets+=( tkinter/tklib )
354 -
355 - local t
356 - # all modules except tkinter output to .
357 - # tkinter outputs to the correct dir ...
358 - cd lib_pypy || die
359 - for t in "${cffi_targets[@]}"; do
360 - # tkinter doesn't work via -m
361 - ../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
362 - done
363 -
364 - # Cleanup temporary objects
365 - find -name "_cffi_*.[co]" -delete || die
366 - find -type d -empty -delete || die
367 -}
368 -
369 -src_test() {
370 - # (unset)
371 - local -x PYTHONDONTWRITEBYTECODE=
372 - local -x COLUMNS=80
373 -
374 - # Test runner requires Python 2 too. However, it spawns PyPy3
375 - # internally so that we end up testing the correct interpreter.
376 - # (--deselect for failing doctests)
377 - "${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
378 -}
379 -
380 -src_install() {
381 - local dest=/usr/lib/pypy3.7
382 - einfo "Installing PyPy ..."
383 - dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-c"
384 - insinto "${dest}"
385 - # preserve mtimes to avoid obsoleting caches
386 - insopts -p
387 - doins -r include lib_pypy lib-python
388 -
389 - # replace copied headers with symlinks
390 - for x in "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/*; do
391 - dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
392 - done
393 -
394 - dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
395 - dodoc README.rst
396 -
397 - if ! use gdbm; then
398 - rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
399 - fi
400 - if ! use sqlite; then
401 - rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
402 - "${ED}${dest}"/lib_pypy/_sqlite3* \
403 - "${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
404 - fi
405 - if ! use tk; then
406 - rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
407 - "${ED}${dest}"/lib_pypy/_tkinter \
408 - "${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
409 - fi
410 -
411 - local -x EPYTHON=pypy3
412 - local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
413 - # temporarily copy to build tree to facilitate module builds
414 - cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
415 -
416 - echo "EPYTHON='${EPYTHON}'" > epython.py || die
417 - python_moduleinto /usr/lib/pypy3.7/site-packages
418 - python_domodule epython.py
419 -
420 - einfo "Byte-compiling Python standard library..."
421 - python_optimize "${ED}${dest}"
422 -
423 - # remove to avoid collisions
424 - rm "${PYTHON}" || die
425 -}