From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 53248139694 for ; Tue, 25 Apr 2017 21:49:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F14421C054; Tue, 25 Apr 2017 21:49:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C97B221C054 for ; Tue, 25 Apr 2017 21:49:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 70E1334165C for ; Tue, 25 Apr 2017 21:49:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4ED557442 for ; Tue, 25 Apr 2017 21:49:33 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1493156952.d97c60b5c1273e8e6b9899d54522ef5dbdd3866b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy/files/, dev-python/pypy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy/files/2.5.0-shared-lib.patch dev-python/pypy/pypy-9999.ebuild X-VCS-Directories: dev-python/pypy/ dev-python/pypy/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: d97c60b5c1273e8e6b9899d54522ef5dbdd3866b X-VCS-Branch: master Date: Tue, 25 Apr 2017 21:49:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6cb35602-a391-46ac-bab6-8bcf820d48ca X-Archives-Hash: ac86c0be982133e85ec6e046c8f61feb commit: d97c60b5c1273e8e6b9899d54522ef5dbdd3866b Author: Michał Górny gentoo org> AuthorDate: Mon Apr 24 17:20:47 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Apr 25 21:49:12 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d97c60b5 dev-python/pypy: Bump 9999 to EAPI 6 dev-python/pypy/files/2.5.0-shared-lib.patch | 4 ++-- dev-python/pypy/pypy-9999.ebuild | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dev-python/pypy/files/2.5.0-shared-lib.patch b/dev-python/pypy/files/2.5.0-shared-lib.patch index ddd74730f3d..b5c877bd58b 100644 --- a/dev-python/pypy/files/2.5.0-shared-lib.patch +++ b/dev-python/pypy/files/2.5.0-shared-lib.patch @@ -1,6 +1,6 @@ diff -ur pypy-2.5.0-src.orig/rpython/translator/platform/posix.py pypy-2.5.0-src/rpython/translator/platform/posix.py ---- rpython/translator/platform/posix.py 2015-02-03 05:12:49.000000000 +0800 -+++ rpython/translator/platform/posix.py 2015-03-22 07:36:01.420116684 +0800 +--- a/rpython/translator/platform/posix.py 2015-02-03 05:12:49.000000000 +0800 ++++ b/rpython/translator/platform/posix.py 2015-03-22 07:36:01.420116684 +0800 @@ -183,7 +183,7 @@ 'int main(int argc, char* argv[]) ' '{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@') diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild index c6a8bd08960..c4d67f9bbc1 100644 --- a/dev-python/pypy/pypy-9999.ebuild +++ b/dev-python/pypy/pypy-9999.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 pypy ) EHG_REPO_URI="https://bitbucket.org/pypy/pypy" -inherit check-reqs eutils mercurial multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator +inherit check-reqs mercurial multiprocessing pax-utils python-any-r1 toolchain-funcs versionator # note: remember to update this to newest dev-lang/python:2.7 on bump CPY_PATCHSET_VERSION="2.7.13-0" @@ -93,9 +93,9 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \ - "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \ - "${FILESDIR}"/2.5.0-shared-lib.patch # 517002 + eapply "${FILESDIR}/4.0.0-gentoo-path.patch" + eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" + eapply "${FILESDIR}"/2.5.0-shared-lib.patch # 517002 sed -e "s^@EPREFIX@^${EPREFIX}^" \ -e "s^@libdir@^$(get_libdir)^" \ @@ -105,11 +105,11 @@ src_prepare() { pushd lib-python/2.7 > /dev/null || die # TODO: cpy turkish locale patch now fixes C code # probably needs better port to pypy, if it is broken there - epatch "${FILESDIR}"/5.7.1_all_distutils_cxx.patch \ - "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch + eapply "${FILESDIR}"/5.7.1_all_distutils_cxx.patch + eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch popd > /dev/null || die - epatch_user + eapply_user } src_configure() { @@ -220,7 +220,7 @@ src_install() { fi # Install docs - use doc && dohtml -r pypy/doc/_build/html/ + use doc && dodoc -r pypy/doc/_build/html einfo "Generating caches and byte-compiling ..."