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: Tue, 25 Apr 2017 21:49:54
Message-Id: 1493156961.0917cc23da0bfe5af58c58c37c3d1be13b7f49f1.mgorny@gentoo
1 commit: 0917cc23da0bfe5af58c58c37c3d1be13b7f49f1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 25 17:35:58 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 25 21:49:21 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0917cc23
7
8 dev-python/pypy3: Upstream has renamed the executables to pypy3-c*
9
10 dev-python/pypy3/pypy3-9999.ebuild | 14 +++++++-------
11 1 file changed, 7 insertions(+), 7 deletions(-)
12
13 diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
14 index eaa0e20886c..51238676c4f 100644
15 --- a/dev-python/pypy3/pypy3-9999.ebuild
16 +++ b/dev-python/pypy3/pypy3-9999.ebuild
17 @@ -169,8 +169,8 @@ src_compile() {
18 emake -C "${T}"/usession*-0/testing_1
19
20 # copy back to make sys.prefix happy
21 - cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
22 - pax-mark m pypy-c libpypy-c.so
23 + cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
24 + pax-mark m pypy3-c libpypy3-c.so
25
26 #use doc && emake -C pypy/doc html
27 }
28 @@ -181,18 +181,18 @@ src_test() {
29
30 # Test runner requires Python 2 too. However, it spawns PyPy3
31 # internally so that we end up testing the correct interpreter.
32 - "${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python || die
33 + "${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die
34 }
35
36 src_install() {
37 local dest=/usr/$(get_libdir)/pypy3
38 einfo "Installing PyPy ..."
39 exeinto "${dest}"
40 - doexe pypy-c libpypy-c.so
41 - pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
42 + doexe pypy3-c libpypy3-c.so
43 + pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
44 insinto "${dest}"
45 doins -r include lib_pypy lib-python
46 - dosym ../$(get_libdir)/pypy3/pypy-c /usr/bin/pypy3
47 + dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
48 dodoc README.rst
49
50 if ! use gdbm; then
51 @@ -215,7 +215,7 @@ src_install() {
52
53 einfo "Generating caches and byte-compiling ..."
54
55 - local -x PYTHON=${ED%/}${dest}/pypy-c
56 + local -x PYTHON=${ED%/}${dest}/pypy3-c
57 local -x LD_LIBRARY_PATH="${ED%/}${dest}"
58 # we can't use eclass function since PyPy is dumb and always gives
59 # paths relative to the interpreter