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: Fri, 01 Nov 2019 08:07:25
Message-Id: 1572595414.2c98eddaecac40c1263021f6a246de2ea5d6af3f.mgorny@gentoo
1 commit: 2c98eddaecac40c1263021f6a246de2ea5d6af3f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 1 07:49:24 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 1 08:03:34 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c98edda
7
8 dev-python/pypy: Drop 7.1.1
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/pypy/Manifest | 1 -
13 dev-python/pypy/pypy-7.1.1.ebuild | 286 --------------------------------------
14 2 files changed, 287 deletions(-)
15
16 diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
17 index 41aeb208617..6b99efadd91 100644
18 --- a/dev-python/pypy/Manifest
19 +++ b/dev-python/pypy/Manifest
20 @@ -1,3 +1,2 @@
21 -DIST pypy2.7-v7.1.1-src.tar.bz2 20027876 BLAKE2B a411d7312ed3b9be9297e7ff4cc569530529272156117ca037bbe29ad477e7ce3b8903d13c6a5a35e9867a8ccbfaa418061a7b37317b4b713508c429a41ffe9a SHA512 f998931ecf4f9aeee24f0fed95589716175971816c00e50bc53de6de0cfe2a8537b89c1aee636d15faecf91df8c29943295485686185f5247a3e0913fa514f48
22 DIST pypy2.7-v7.2.0-src.tar.bz2 20219532 BLAKE2B 225e2cebdfa3ceb310f2a047b1d9e1d375b181c10707822890f39fc0a5ec9e6ddd7a8cf6e073074067960b766a0a813294042513a08b8e7e02b011f612e17917 SHA512 8f724490f9fa06686c8e25ddd3592b260bbffae460395de4c7d29d983780ce9b8925fa87434aac6446aac2034381cc1a13074faf252f5d1ac466a252f219f1ae
23 DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
24
25 diff --git a/dev-python/pypy/pypy-7.1.1.ebuild b/dev-python/pypy/pypy-7.1.1.ebuild
26 deleted file mode 100644
27 index 7a956b9f4a0..00000000000
28 --- a/dev-python/pypy/pypy-7.1.1.ebuild
29 +++ /dev/null
30 @@ -1,286 +0,0 @@
31 -# Copyright 1999-2019 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=7
35 -
36 -PYTHON_COMPAT=( python2_7 pypy )
37 -inherit check-reqs pax-utils python-any-r1 toolchain-funcs
38 -
39 -# note: remember to update this to newest dev-lang/python:2.7 on bump
40 -CPY_PATCHSET_VERSION="2.7.15"
41 -MY_P=pypy2.7-v${PV}
42 -
43 -DESCRIPTION="A fast, compliant alternative implementation of the Python language"
44 -HOMEPAGE="http://pypy.org/"
45 -SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
46 - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
47 -
48 -LICENSE="MIT"
49 -# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
50 -# pypy 7.0.0: install directory changed to 'pypy2.7'
51 -SLOT="0/41-py27"
52 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
53 -IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
54 -
55 -RDEPEND=">=sys-libs/zlib-1.1.3:0=
56 - virtual/libffi:0=
57 - virtual/libintl:0=
58 - dev-libs/expat:0=
59 - !libressl? ( dev-libs/openssl:0=[-bindist] )
60 - libressl? ( dev-libs/libressl:0= )
61 - bzip2? ( app-arch/bzip2:0= )
62 - gdbm? ( sys-libs/gdbm:0= )
63 - ncurses? ( sys-libs/ncurses:0= )
64 - sqlite? ( dev-db/sqlite:3= )
65 - tk? (
66 - dev-lang/tk:0=
67 - dev-tcltk/tix:0=
68 - )
69 - !dev-python/pypy-bin:0"
70 -# don't enforce the dep on pypy with USE=low-memory since it's going
71 -# to cause either collisions or circular dep on itself
72 -DEPEND="${RDEPEND}
73 - !low-memory? (
74 - || (
75 - dev-python/pypy
76 - dev-python/pypy-bin
77 - (
78 - dev-lang/python:2.7
79 - dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
80 - )
81 - )
82 - )"
83 -
84 -S="${WORKDIR}/${MY_P}-src"
85 -
86 -check_env() {
87 - if use low-memory; then
88 - if ! python_is_installed pypy; then
89 - eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
90 - eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
91 - eerror
92 - eerror " $ emerge -1v dev-python/pypy-bin"
93 - eerror
94 - eerror "before attempting to build dev-python/pypy[low-memory]."
95 - die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
96 - fi
97 -
98 - CHECKREQS_MEMORY="1750M"
99 - use amd64 && CHECKREQS_MEMORY="3500M"
100 - else
101 - CHECKREQS_MEMORY="3G"
102 - use amd64 && CHECKREQS_MEMORY="6G"
103 - fi
104 -
105 - check-reqs_pkg_pretend
106 -}
107 -
108 -pkg_pretend() {
109 - [[ ${MERGE_TYPE} != binary ]] && check_env
110 -}
111 -
112 -pkg_setup() {
113 - if [[ ${MERGE_TYPE} != binary ]]; then
114 - check_env
115 -
116 - if python_is_installed pypy; then
117 - if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
118 - einfo "Using already-installed PyPy to perform the translation."
119 - local EPYTHON=pypy
120 - else
121 - einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
122 - einfo "recommends using PyPy for that. If you wish to do so, please unset"
123 - einfo "the EPYTHON variable."
124 - fi
125 - fi
126 -
127 - python-any-r1_pkg_setup
128 - fi
129 -}
130 -
131 -src_prepare() {
132 - eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
133 - eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
134 - eapply "${FILESDIR}"/5.9.0-shared-lib.patch # 517002
135 -
136 - sed -e "s^@EPREFIX@^${EPREFIX}^" \
137 - -i lib-python/2.7/distutils/command/install.py || die
138 -
139 - # apply CPython stdlib patches
140 - pushd lib-python/2.7 > /dev/null || die
141 - # TODO: cpy turkish locale patch now fixes C code
142 - # probably needs better port to pypy, if it is broken there
143 - eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
144 - eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
145 - popd > /dev/null || die
146 -
147 - eapply_user
148 -}
149 -
150 -src_configure() {
151 - tc-export CC
152 -
153 - local jit_backend
154 - if use jit; then
155 - jit_backend='--jit-backend='
156 -
157 - # We only need the explicit sse2 switch for x86.
158 - # On other arches we can rely on autodetection which uses
159 - # compiler macros. Plus, --jit-backend= doesn't accept all
160 - # the modern values...
161 -
162 - if use x86; then
163 - if use cpu_flags_x86_sse2; then
164 - jit_backend+=x86
165 - else
166 - jit_backend+=x86-without-sse2
167 - fi
168 - else
169 - jit_backend+=auto
170 - fi
171 - fi
172 -
173 - local args=(
174 - --shared
175 - $(usex jit -Ojit -O2)
176 - $(usex sandbox --sandbox '')
177 -
178 - ${jit_backend}
179 -
180 - pypy/goal/targetpypystandalone
181 - )
182 -
183 - # Avoid linking against libraries disabled by use flags
184 - local opts=(
185 - bzip2:bz2
186 - ncurses:_minimal_curses
187 - )
188 -
189 - local opt
190 - for opt in "${opts[@]}"; do
191 - local flag=${opt%:*}
192 - local mod=${opt#*:}
193 -
194 - args+=(
195 - $(usex ${flag} --withmod --withoutmod)-${mod}
196 - )
197 - done
198 -
199 - local interp=( "${PYTHON}" )
200 - if use low-memory; then
201 - interp=( env PYPY_GC_MAX_DELTA=200MB
202 - "${PYTHON}" --jit loop_longevity=300 )
203 - fi
204 -
205 - # translate into the C sources
206 - # we're going to make them ourselves since otherwise pypy does not
207 - # free up the unneeded memory before spawning the compiler
208 - set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
209 - echo -e "\033[1m${@}\033[0m"
210 - "${@}" || die "translation failed"
211 -}
212 -
213 -src_compile() {
214 - emake -C "${T}"/usession*-0/testing_1
215 -
216 - # copy back to make sys.prefix happy
217 - cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
218 - pax-mark m pypy-c libpypy-c.so
219 -
220 - einfo "Generating caches and CFFI modules ..."
221 -
222 - # Generate Grammar and PatternGrammar pickles.
223 - ./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
224 - || die "Generation of Grammar and PatternGrammar pickles failed"
225 -
226 - # Generate cffi modules
227 - # Please keep in sync with pypy/tool/build_cffi_imports.py!
228 -#cffi_build_scripts = {
229 -# "sqlite3": "_sqlite3_build.py",
230 -# "audioop": "_audioop_build.py",
231 -# "tk": "_tkinter/tklib_build.py",
232 -# "curses": "_curses_build.py" if sys.platform != "win32" else None,
233 -# "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
234 -# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
235 -# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
236 -# "resource": "_resource_build.py" if sys.platform != "win32" else None,
237 - cffi_targets=( audioop syslog pwdgrp resource )
238 - use gdbm && cffi_targets+=( gdbm )
239 - use ncurses && cffi_targets+=( curses )
240 - use sqlite && cffi_targets+=( sqlite3 )
241 - use tk && cffi_targets+=( tkinter/tklib )
242 -
243 - local t
244 - # all modules except tkinter output to .
245 - # tkinter outputs to the correct dir ...
246 - cd lib_pypy || die
247 - for t in "${cffi_targets[@]}"; do
248 - # tkinter doesn't work via -m
249 - ../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
250 - done
251 -
252 - # Cleanup temporary objects
253 - find -name "_cffi_*.[co]" -delete || die
254 - find -type d -empty -delete || die
255 -}
256 -
257 -src_test() {
258 - # (unset)
259 - local -x PYTHONDONTWRITEBYTECODE=
260 -
261 - local ignored_tests=(
262 - # network
263 - --ignore=lib-python/2.7/test/test_urllibnet.py
264 - --ignore=lib-python/2.7/test/test_urllib2net.py
265 - # lots of free space
266 - --ignore=lib-python/2.7/test/test_zipfile64.py
267 - # no module named 'worker' -- a lot
268 - --ignore=lib-python/2.7/test/test_xpickle.py
269 - )
270 -
271 - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
272 - "${ignored_tests[@]}" lib-python || die
273 -}
274 -
275 -src_install() {
276 - local dest=/usr/lib/pypy2.7
277 - einfo "Installing PyPy ..."
278 - exeinto "${dest}"
279 - doexe pypy-c libpypy-c.so
280 - pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
281 - insinto "${dest}"
282 - # preserve mtimes to avoid obsoleting caches
283 - insopts -p
284 - doins -r include lib_pypy lib-python
285 - dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
286 - dodoc README.rst
287 -
288 - if ! use gdbm; then
289 - rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
290 - "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
291 - fi
292 - if ! use sqlite; then
293 - rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
294 - "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
295 - "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
296 - fi
297 - if ! use tk; then
298 - rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
299 - "${ED%/}${dest}"/lib_pypy/_tkinter \
300 - "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
301 - fi
302 -
303 - local -x PYTHON=${ED%/}${dest}/pypy-c
304 - # we can't use eclass function since PyPy is dumb and always gives
305 - # paths relative to the interpreter
306 - local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
307 - python_export pypy EPYTHON
308 -
309 - echo "EPYTHON='${EPYTHON}'" > epython.py || die
310 - python_domodule epython.py
311 -
312 - einfo "Byte-compiling Python standard library..."
313 -
314 - # compile the installed modules
315 - python_optimize "${ED%/}${dest}"
316 -}