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 05CC0138334 for ; Wed, 1 Jan 2020 16:04:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3102DE0B17; Wed, 1 Jan 2020 16:04:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 08723E0B17 for ; Wed, 1 Jan 2020 16:04:23 +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 30D7B34DE0B for ; Wed, 1 Jan 2020 16:04:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71B48A5 for ; Wed, 1 Jan 2020 16:04:19 +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: <1577894651.e4ab61354585af32f432b167bd17c9faffee3b88.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-exe/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy-exe/pypy-exe-7.3.0.ebuild X-VCS-Directories: dev-python/pypy-exe/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e4ab61354585af32f432b167bd17c9faffee3b88 X-VCS-Branch: master Date: Wed, 1 Jan 2020 16:04:19 +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: 4ef30599-2e02-418c-b5dc-b3d96aad3218 X-Archives-Hash: 58d820327cd280665331eda94dd38d84 commit: e4ab61354585af32f432b167bd17c9faffee3b88 Author: Michał Górny gentoo org> AuthorDate: Wed Jan 1 15:00:32 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Jan 1 16:04:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ab6135 dev-python/pypy-exe: Fix using pypy for build Now that pypy target is removed, we can't use it via eclass. Make the ebuild call it directly instead. Signed-off-by: Michał Górny gentoo.org> dev-python/pypy-exe/pypy-exe-7.3.0.ebuild | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild index c8701c10e59..0b1e0997bb9 100644 --- a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild +++ b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 pypy ) +PYTHON_COMPAT=( python2_7 ) inherit check-reqs pax-utils python-any-r1 toolchain-funcs MY_P=pypy2.7-v${PV/_/} @@ -26,7 +26,8 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0= !dev-python/pypy-exe-bin:${PV}" # don't enforce the dep on pypy with USE=low-memory since it's going # to cause either collisions or circular dep on itself -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" !low-memory? ( || ( dev-python/pypy @@ -39,7 +40,9 @@ DEPEND="${RDEPEND} check_env() { if use low-memory; then - if ! python_is_installed pypy; then + if ! has_version -b dev-python/pypy && + ! has_version -b dev-python/pypy-bin + then eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy" eerror "being installed. Please install it using e.g.:" eerror @@ -67,18 +70,21 @@ pkg_setup() { if [[ ${MERGE_TYPE} != binary ]]; then check_env - if python_is_installed pypy; then - if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then + if has_version -b dev-python/pypy || + has_version -b dev-python/pypy-bin + then + if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || + use low-memory + then einfo "Using already-installed PyPy to perform the translation." - local EPYTHON=pypy + EPYTHON=pypy else einfo "Using ${EPYTHON} to perform the translation. Please note that upstream" einfo "recommends using PyPy for that. If you wish to do so, please unset" einfo "the EPYTHON variable." + python-any-r1_pkg_setup fi fi - - python-any-r1_pkg_setup fi } @@ -130,10 +136,10 @@ src_configure() { ) done - local interp=( "${PYTHON}" ) + local interp=( "${EPYTHON}" ) if use low-memory; then interp=( env PYPY_GC_MAX_DELTA=200MB - "${PYTHON}" --jit loop_longevity=300 ) + "${EPYTHON}" --jit loop_longevity=300 ) fi # translate into the C sources