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 4B34D138337 for ; Thu, 14 Feb 2019 22:07:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10690E089E; Thu, 14 Feb 2019 22:07:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA7D6E089E for ; Thu, 14 Feb 2019 22:07:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 EC8AB335C6F for ; Thu, 14 Feb 2019 22:07:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4832E543 for ; Thu, 14 Feb 2019 22:07:28 +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: <1550182034.3f800b11b5bc78d8b3d00634c05cc45374d643c7.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy/pypy-9999.ebuild X-VCS-Directories: dev-python/pypy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3f800b11b5bc78d8b3d00634c05cc45374d643c7 X-VCS-Branch: master Date: Thu, 14 Feb 2019 22:07:28 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 26da08c2-56b5-4347-a41b-c7c4f9661b6f X-Archives-Hash: 3ae06a02d50c6d97d2d610c229dc9f1a commit: 3f800b11b5bc78d8b3d00634c05cc45374d643c7 Author: Michał Górny gentoo org> AuthorDate: Thu Feb 14 13:03:04 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Feb 14 22:07:14 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f800b11 dev-python/pypy: Sync live ebuild Signed-off-by: Michał Górny gentoo.org> dev-python/pypy/pypy-9999.ebuild | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild index 11f050a7d0a..762e9c5e7e9 100644 --- a/dev-python/pypy/pypy-9999.ebuild +++ b/dev-python/pypy/pypy-9999.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python2_7 pypy ) EHG_REPO_URI="https://bitbucket.org/pypy/pypy" -inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs versionator +inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs # note: remember to update this to newest dev-lang/python:2.7 on bump -CPY_PATCHSET_VERSION="2.7.14-0" -MY_P=pypy2-v${PV} +CPY_PATCHSET_VERSION="2.7.15" +MY_P=pypy2.7-v${PV} DESCRIPTION="A fast, compliant alternative implementation of the Python language" HOMEPAGE="http://pypy.org/" @@ -18,7 +18,8 @@ SRC_URI=" LICENSE="MIT" # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")' -SLOT="0/41" +# pypy 7.0.0: install directory changed to 'pypy2.7' +SLOT="0/41-py27" KEYWORDS="" IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk" @@ -104,20 +105,15 @@ src_unpack() { } src_prepare() { - eapply "${FILESDIR}/4.0.0-gentoo-path.patch" eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" eapply "${FILESDIR}"/5.9.0-shared-lib.patch # 517002 - sed -e "s^@EPREFIX@^${EPREFIX}^" \ - -e "s^@libdir@^$(get_libdir)^" \ - -i lib-python/2.7/distutils/command/install.py || die - # apply CPython stdlib patches 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 eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch - eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch + eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch popd > /dev/null || die eapply_user @@ -249,7 +245,7 @@ src_test() { } src_install() { - local dest=/usr/$(get_libdir)/pypy + local dest=/usr/lib/pypy2.7 einfo "Installing PyPy ..." exeinto "${dest}" doexe pypy-c libpypy-c.so @@ -258,7 +254,7 @@ src_install() { # preserve mtimes to avoid obsoleting caches insopts -p doins -r include lib_pypy lib-python - dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy + dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy dodoc README.rst if ! use gdbm; then @@ -279,7 +275,7 @@ src_install() { local -x PYTHON=${ED%/}${dest}/pypy-c # we can't use eclass function since PyPy is dumb and always gives # paths relative to the interpreter - local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages + local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages python_export pypy EPYTHON echo "EPYTHON='${EPYTHON}'" > epython.py || die