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 56E4A139694 for ; Tue, 25 Apr 2017 21:49:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 794AC21C07E; Tue, 25 Apr 2017 21:49:44 +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 4D88621C07E for ; Tue, 25 Apr 2017 21:49:44 +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 8A8AC341686 for ; Tue, 25 Apr 2017 21:49:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0AECE744B for ; Tue, 25 Apr 2017 21:49:34 +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: <1493156961.0917cc23da0bfe5af58c58c37c3d1be13b7f49f1.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy3/pypy3-9999.ebuild X-VCS-Directories: dev-python/pypy3/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0917cc23da0bfe5af58c58c37c3d1be13b7f49f1 X-VCS-Branch: master Date: Tue, 25 Apr 2017 21:49:34 +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: 0e3d595f-867d-4274-a8bb-9caa398678cf X-Archives-Hash: cfa910cf3a8a1d9663be5a1b05beedc3 commit: 0917cc23da0bfe5af58c58c37c3d1be13b7f49f1 Author: Michał Górny gentoo org> AuthorDate: Tue Apr 25 17:35:58 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Apr 25 21:49:21 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0917cc23 dev-python/pypy3: Upstream has renamed the executables to pypy3-c* dev-python/pypy3/pypy3-9999.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild index eaa0e20886c..51238676c4f 100644 --- a/dev-python/pypy3/pypy3-9999.ebuild +++ b/dev-python/pypy3/pypy3-9999.ebuild @@ -169,8 +169,8 @@ src_compile() { emake -C "${T}"/usession*-0/testing_1 # copy back to make sys.prefix happy - cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die - pax-mark m pypy-c libpypy-c.so + cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die + pax-mark m pypy3-c libpypy3-c.so #use doc && emake -C pypy/doc html } @@ -181,18 +181,18 @@ src_test() { # Test runner requires Python 2 too. However, it spawns PyPy3 # internally so that we end up testing the correct interpreter. - "${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python || die + "${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die } src_install() { local dest=/usr/$(get_libdir)/pypy3 einfo "Installing PyPy ..." exeinto "${dest}" - doexe pypy-c libpypy-c.so - pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so" + doexe pypy3-c libpypy3-c.so + pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so" insinto "${dest}" doins -r include lib_pypy lib-python - dosym ../$(get_libdir)/pypy3/pypy-c /usr/bin/pypy3 + dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3 dodoc README.rst if ! use gdbm; then @@ -215,7 +215,7 @@ src_install() { einfo "Generating caches and byte-compiling ..." - local -x PYTHON=${ED%/}${dest}/pypy-c + local -x PYTHON=${ED%/}${dest}/pypy3-c local -x LD_LIBRARY_PATH="${ED%/}${dest}" # we can't use eclass function since PyPy is dumb and always gives # paths relative to the interpreter