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/
Date: Sun, 20 Feb 2022 14:19:30
Message-Id: 1645366756.bca25f03415999970423901cdbc6c2efb29f84ba.mgorny@gentoo
1 commit: bca25f03415999970423901cdbc6c2efb29f84ba
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 20 14:16:17 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 20 14:19:16 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bca25f03
7
8 dev-python/pypy: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/pypy/Manifest | 4 -
13 dev-python/pypy/pypy-7.3.8_rc1.ebuild | 164 ----------------------------------
14 dev-python/pypy/pypy-7.3.8_rc2.ebuild | 164 ----------------------------------
15 3 files changed, 332 deletions(-)
16
17 diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
18 index d02ba55f2a12..dacc54da215f 100644
19 --- a/dev-python/pypy/Manifest
20 +++ b/dev-python/pypy/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/pypy-7.3.8_rc1.ebuild b/dev-python/pypy/pypy-7.3.8_rc1.ebuild
32 deleted file mode 100644
33 index baea47fe59a1..000000000000
34 --- a/dev-python/pypy/pypy-7.3.8_rc1.ebuild
35 +++ /dev/null
36 @@ -1,164 +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 -inherit pax-utils python-utils-r1
43 -
44 -PYPY_PV=${PV%_p*}
45 -MY_P=pypy2.7-v${PYPY_PV/_}
46 -PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
47 -
48 -DESCRIPTION="A fast, compliant alternative implementation of the Python language"
49 -HOMEPAGE="https://www.pypy.org/"
50 -SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
51 - https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
52 -S="${WORKDIR}/${MY_P}-src"
53 -
54 -LICENSE="MIT"
55 -# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
56 -SLOT="0/73"
57 -KEYWORDS=""
58 -IUSE="bzip2 gdbm +jit ncurses sqlite tk"
59 -
60 -RDEPEND="
61 - || (
62 - >=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
63 - >=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
64 - )
65 - dev-libs/openssl:0=
66 - gdbm? ( sys-libs/gdbm:0= )
67 - sqlite? ( dev-db/sqlite:3= )
68 - tk? (
69 - dev-lang/tk:0=
70 - dev-tcltk/tix:0=
71 - )
72 - !<dev-python/pypy-bin-7.3.0:0"
73 -DEPEND="${RDEPEND}"
74 -
75 -src_prepare() {
76 - local PATCHES=(
77 - "${WORKDIR}/${PATCHSET}"
78 - )
79 - default
80 -
81 - sed -e "s^@EPREFIX@^${EPREFIX}^" \
82 - -i lib-python/2.7/distutils/command/install.py || die
83 -}
84 -
85 -src_compile() {
86 - # copy over to make sys.prefix happy
87 - cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
88 - cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
89 - # (not installed by pypy)
90 - rm pypy/module/cpyext/include/_numpypy/numpy/README || die
91 - mv pypy/module/cpyext/include/* include/ || die
92 - mv pypy/module/cpyext/parse/*.h include/ || die
93 - pax-mark m pypy-c
94 -
95 - # verify the subslot
96 - local soabi=$(./pypy-c -c 'import sysconfig; print sysconfig.get_config_var("SOABI")')
97 - [[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
98 -
99 - einfo "Generating caches and CFFI modules ..."
100 -
101 - # Generate Grammar and PatternGrammar pickles.
102 - ./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
103 - || die "Generation of Grammar and PatternGrammar pickles failed"
104 -
105 - # Generate cffi modules
106 - # Please keep in sync with pypy/tool/build_cffi_imports.py!
107 - cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource )
108 - use gdbm && cffi_targets+=( gdbm )
109 - use ncurses && cffi_targets+=( curses )
110 - use sqlite && cffi_targets+=( sqlite3 )
111 - use tk && cffi_targets+=( tkinter/tklib )
112 -
113 - local t
114 - # all modules except tkinter output to .
115 - # tkinter outputs to the correct dir ...
116 - cd lib_pypy || die
117 - for t in "${cffi_targets[@]}"; do
118 - # tkinter doesn't work via -m
119 - ../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
120 - done
121 -
122 - # Verify that CFFI module list is up-to-date
123 - local expected_cksum=2d3acf18
124 - local local_cksum=$(../pypy-c -c '
125 -from pypy_tools.build_cffi_imports import cffi_build_scripts as x;
126 -import binascii, json;
127 -print("%08x" % (binascii.crc32(json.dumps(x)),))')
128 - if [[ ${local_cksum} != ${expected_cksum} ]]; then
129 - die "Please verify cffi_targets and update checksum to ${local_cksum}"
130 - fi
131 -
132 - # Cleanup temporary objects
133 - find -name "_cffi_*.[co]" -delete || die
134 - find -type d -empty -delete || die
135 -}
136 -
137 -src_test() {
138 - # (unset)
139 - local -x PYTHONDONTWRITEBYTECODE=
140 - local -x COLUMNS=80
141 -
142 - local ignored_tests=(
143 - # network
144 - --ignore=lib-python/2.7/test/test_urllibnet.py
145 - --ignore=lib-python/2.7/test/test_urllib2net.py
146 - # lots of free space
147 - --ignore=lib-python/2.7/test/test_zipfile64.py
148 - )
149 -
150 - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
151 - "${ignored_tests[@]}" lib-python || die
152 -}
153 -
154 -src_install() {
155 - local dest=/usr/lib/pypy2.7
156 - einfo "Installing PyPy ..."
157 - dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
158 - insinto "${dest}"
159 - # preserve mtimes to avoid obsoleting caches
160 - insopts -p
161 - doins -r include lib_pypy lib-python
162 -
163 - # replace copied headers with symlinks
164 - for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
165 - dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
166 - done
167 -
168 - dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
169 - dodoc README.rst
170 -
171 - if ! use gdbm; then
172 - rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
173 - "${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
174 - fi
175 - if ! use sqlite; then
176 - rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
177 - "${ED}${dest}"/lib_pypy/_sqlite3.py \
178 - "${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
179 - fi
180 - if ! use tk; then
181 - rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
182 - "${ED}${dest}"/lib_pypy/_tkinter \
183 - "${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
184 - fi
185 -
186 - local -x EPYTHON=pypy
187 - local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
188 - # temporarily copy to build tree to facilitate module builds
189 - cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
190 -
191 - echo "EPYTHON='${EPYTHON}'" > epython.py || die
192 - python_moduleinto /usr/lib/pypy2.7/site-packages
193 - python_domodule epython.py
194 -
195 - einfo "Byte-compiling Python standard library..."
196 - python_optimize "${ED}${dest}"
197 -
198 - # remove to avoid collisions
199 - rm "${PYTHON}" || die
200 -}
201
202 diff --git a/dev-python/pypy/pypy-7.3.8_rc2.ebuild b/dev-python/pypy/pypy-7.3.8_rc2.ebuild
203 deleted file mode 100644
204 index baea47fe59a1..000000000000
205 --- a/dev-python/pypy/pypy-7.3.8_rc2.ebuild
206 +++ /dev/null
207 @@ -1,164 +0,0 @@
208 -# Copyright 1999-2022 Gentoo Authors
209 -# Distributed under the terms of the GNU General Public License v2
210 -
211 -EAPI=8
212 -
213 -inherit pax-utils python-utils-r1
214 -
215 -PYPY_PV=${PV%_p*}
216 -MY_P=pypy2.7-v${PYPY_PV/_}
217 -PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
218 -
219 -DESCRIPTION="A fast, compliant alternative implementation of the Python language"
220 -HOMEPAGE="https://www.pypy.org/"
221 -SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
222 - https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
223 -S="${WORKDIR}/${MY_P}-src"
224 -
225 -LICENSE="MIT"
226 -# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
227 -SLOT="0/73"
228 -KEYWORDS=""
229 -IUSE="bzip2 gdbm +jit ncurses sqlite tk"
230 -
231 -RDEPEND="
232 - || (
233 - >=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
234 - >=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
235 - )
236 - dev-libs/openssl:0=
237 - gdbm? ( sys-libs/gdbm:0= )
238 - sqlite? ( dev-db/sqlite:3= )
239 - tk? (
240 - dev-lang/tk:0=
241 - dev-tcltk/tix:0=
242 - )
243 - !<dev-python/pypy-bin-7.3.0:0"
244 -DEPEND="${RDEPEND}"
245 -
246 -src_prepare() {
247 - local PATCHES=(
248 - "${WORKDIR}/${PATCHSET}"
249 - )
250 - default
251 -
252 - sed -e "s^@EPREFIX@^${EPREFIX}^" \
253 - -i lib-python/2.7/distutils/command/install.py || die
254 -}
255 -
256 -src_compile() {
257 - # copy over to make sys.prefix happy
258 - cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
259 - cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
260 - # (not installed by pypy)
261 - rm pypy/module/cpyext/include/_numpypy/numpy/README || die
262 - mv pypy/module/cpyext/include/* include/ || die
263 - mv pypy/module/cpyext/parse/*.h include/ || die
264 - pax-mark m pypy-c
265 -
266 - # verify the subslot
267 - local soabi=$(./pypy-c -c 'import sysconfig; print sysconfig.get_config_var("SOABI")')
268 - [[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
269 -
270 - einfo "Generating caches and CFFI modules ..."
271 -
272 - # Generate Grammar and PatternGrammar pickles.
273 - ./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
274 - || die "Generation of Grammar and PatternGrammar pickles failed"
275 -
276 - # Generate cffi modules
277 - # Please keep in sync with pypy/tool/build_cffi_imports.py!
278 - cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource )
279 - use gdbm && cffi_targets+=( gdbm )
280 - use ncurses && cffi_targets+=( curses )
281 - use sqlite && cffi_targets+=( sqlite3 )
282 - use tk && cffi_targets+=( tkinter/tklib )
283 -
284 - local t
285 - # all modules except tkinter output to .
286 - # tkinter outputs to the correct dir ...
287 - cd lib_pypy || die
288 - for t in "${cffi_targets[@]}"; do
289 - # tkinter doesn't work via -m
290 - ../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
291 - done
292 -
293 - # Verify that CFFI module list is up-to-date
294 - local expected_cksum=2d3acf18
295 - local local_cksum=$(../pypy-c -c '
296 -from pypy_tools.build_cffi_imports import cffi_build_scripts as x;
297 -import binascii, json;
298 -print("%08x" % (binascii.crc32(json.dumps(x)),))')
299 - if [[ ${local_cksum} != ${expected_cksum} ]]; then
300 - die "Please verify cffi_targets and update checksum to ${local_cksum}"
301 - fi
302 -
303 - # Cleanup temporary objects
304 - find -name "_cffi_*.[co]" -delete || die
305 - find -type d -empty -delete || die
306 -}
307 -
308 -src_test() {
309 - # (unset)
310 - local -x PYTHONDONTWRITEBYTECODE=
311 - local -x COLUMNS=80
312 -
313 - local ignored_tests=(
314 - # network
315 - --ignore=lib-python/2.7/test/test_urllibnet.py
316 - --ignore=lib-python/2.7/test/test_urllib2net.py
317 - # lots of free space
318 - --ignore=lib-python/2.7/test/test_zipfile64.py
319 - )
320 -
321 - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
322 - "${ignored_tests[@]}" lib-python || die
323 -}
324 -
325 -src_install() {
326 - local dest=/usr/lib/pypy2.7
327 - einfo "Installing PyPy ..."
328 - dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
329 - insinto "${dest}"
330 - # preserve mtimes to avoid obsoleting caches
331 - insopts -p
332 - doins -r include lib_pypy lib-python
333 -
334 - # replace copied headers with symlinks
335 - for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
336 - dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
337 - done
338 -
339 - dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
340 - dodoc README.rst
341 -
342 - if ! use gdbm; then
343 - rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
344 - "${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
345 - fi
346 - if ! use sqlite; then
347 - rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
348 - "${ED}${dest}"/lib_pypy/_sqlite3.py \
349 - "${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
350 - fi
351 - if ! use tk; then
352 - rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
353 - "${ED}${dest}"/lib_pypy/_tkinter \
354 - "${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
355 - fi
356 -
357 - local -x EPYTHON=pypy
358 - local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
359 - # temporarily copy to build tree to facilitate module builds
360 - cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
361 -
362 - echo "EPYTHON='${EPYTHON}'" > epython.py || die
363 - python_moduleinto /usr/lib/pypy2.7/site-packages
364 - python_domodule epython.py
365 -
366 - einfo "Byte-compiling Python standard library..."
367 - python_optimize "${ED}${dest}"
368 -
369 - # remove to avoid collisions
370 - rm "${PYTHON}" || die
371 -}