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/, dev-python/pypy3/files/
Date: Tue, 25 Apr 2017 21:49:57
Message-Id: 1493156959.7523d3ebbbdec0ea5bccedce6185a5454e01a39e.mgorny@gentoo
1 commit: 7523d3ebbbdec0ea5bccedce6185a5454e01a39e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 25 15:58:49 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 25 21:49:19 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7523d3eb
7
8 dev-python/pypy3: Bump 9999 to EAPI 6
9
10 dev-python/pypy3/files/2.5.0-shared-lib.patch | 4 ++--
11 dev-python/pypy3/pypy3-9999.ebuild | 14 +++++++-------
12 2 files changed, 9 insertions(+), 9 deletions(-)
13
14 diff --git a/dev-python/pypy3/files/2.5.0-shared-lib.patch b/dev-python/pypy3/files/2.5.0-shared-lib.patch
15 index ddd74730f3d..b5c877bd58b 100644
16 --- a/dev-python/pypy3/files/2.5.0-shared-lib.patch
17 +++ b/dev-python/pypy3/files/2.5.0-shared-lib.patch
18 @@ -1,6 +1,6 @@
19 diff -ur pypy-2.5.0-src.orig/rpython/translator/platform/posix.py pypy-2.5.0-src/rpython/translator/platform/posix.py
20 ---- rpython/translator/platform/posix.py 2015-02-03 05:12:49.000000000 +0800
21 -+++ rpython/translator/platform/posix.py 2015-03-22 07:36:01.420116684 +0800
22 +--- a/rpython/translator/platform/posix.py 2015-02-03 05:12:49.000000000 +0800
23 ++++ b/rpython/translator/platform/posix.py 2015-03-22 07:36:01.420116684 +0800
24 @@ -183,7 +183,7 @@
25 'int main(int argc, char* argv[]) '
26 '{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@')
27
28 diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
29 index de0ab069fb8..f22d4d75d87 100644
30 --- a/dev-python/pypy3/pypy3-9999.ebuild
31 +++ b/dev-python/pypy3/pypy3-9999.ebuild
32 @@ -1,14 +1,14 @@
33 # Copyright 1999-2017 Gentoo Foundation
34 # Distributed under the terms of the GNU General Public License v2
35
36 -EAPI=5
37 +EAPI=6
38
39 # pypy3 needs to be built using python 2
40 PYTHON_COMPAT=( python2_7 pypy )
41 EHG_PROJECT="pypy"
42 EHG_REPO_URI="https://bitbucket.org/pypy/pypy"
43 EHG_REVISION="py3k"
44 -inherit check-reqs eutils mercurial multilib multiprocessing pax-utils \
45 +inherit check-reqs mercurial multiprocessing pax-utils \
46 python-any-r1 toolchain-funcs versionator
47
48 DESCRIPTION="A fast, compliant alternative implementation of the Python (3.3) language"
49 @@ -83,9 +83,9 @@ src_unpack() {
50 }
51
52 src_prepare() {
53 - epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
54 - "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
55 - "${FILESDIR}"/2.5.0-shared-lib.patch # 517002
56 + eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
57 + eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
58 + eapply "${FILESDIR}"/2.5.0-shared-lib.patch # 517002
59
60 sed -e "s^@EPREFIX@^${EPREFIX}^" \
61 -e "s^@libdir@^$(get_libdir)^" \
62 @@ -93,10 +93,10 @@ src_prepare() {
63
64 # apply CPython stdlib patches
65 pushd lib-python/3 > /dev/null || die
66 - epatch "${FILESDIR}"/5.7.1_all_distutils_cxx.patch
67 + eapply "${FILESDIR}"/5.7.1_all_distutils_cxx.patch
68 popd > /dev/null || die
69
70 - epatch_user
71 + eapply_user
72 }
73
74 src_configure() {