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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D8BCA158020 for ; Thu, 24 Nov 2022 20:16:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B3E3E097A; Thu, 24 Nov 2022 20:16:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E3C78E097A for ; Thu, 24 Nov 2022 20:16:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B3799340DB1 for ; Thu, 24 Nov 2022 20:16:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA6A2703 for ; Thu, 24 Nov 2022 20:16:20 +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: <1669320978.7e2f4e57d797f7d5d200fc0545e7377cf3f4add1.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-exe/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy3-exe/pypy3-exe-7.3.10_rc3.ebuild X-VCS-Directories: dev-python/pypy3-exe/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7e2f4e57d797f7d5d200fc0545e7377cf3f4add1 X-VCS-Branch: master Date: Thu, 24 Nov 2022 20:16:20 +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: 9c8fe5d2-d13d-4acc-885b-d414e85332de X-Archives-Hash: c3ec1b6eb38e19995241698568635ab7 commit: 7e2f4e57d797f7d5d200fc0545e7377cf3f4add1 Author: Michał Górny gentoo org> AuthorDate: Thu Nov 24 19:54:32 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Nov 24 20:16:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2f4e57 dev-python/pypy3-exe: Stop using python-any-r1 and CPython 2.7 Stop using python-any-r1.eclass to unblock the way towards removing python2_7 support from it. Remove support for translation using CPython 2.7, require dev-python/pypy unconditionally. Signed-off-by: Michał Górny gentoo.org> dev-python/pypy3-exe/pypy3-exe-7.3.10_rc3.ebuild | 44 ++++-------------------- 1 file changed, 6 insertions(+), 38 deletions(-) diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.10_rc3.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.10_rc3.ebuild index 805ec9fcf901..6df29312cc6a 100644 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.10_rc3.ebuild +++ b/dev-python/pypy3-exe/pypy3-exe-7.3.10_rc3.ebuild @@ -3,9 +3,7 @@ EAPI=8 -# pypy3 needs to be built using python 2 -PYTHON_COMPAT=( python2_7 ) -inherit check-reqs pax-utils python-any-r1 toolchain-funcs +inherit check-reqs pax-utils toolchain-funcs PYPY_PV=${PV%_p*} MY_P=pypy3.9-v${PYPY_PV/_} @@ -37,13 +35,7 @@ DEPEND=" ${RDEPEND} " BDEPEND=" - low-memory? ( dev-python/pypy ) - !low-memory? ( - || ( - dev-python/pypy - dev-lang/python:2.7 - ) - ) + dev-python/pypy " check_env() { @@ -63,24 +55,7 @@ pkg_pretend() { } pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - check_env - - # unset to allow forcing pypy below :) - use low-memory && EPYTHON= - if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] && - { has_version -b dev-python/pypy || - has_version -b dev-python/pypy-bin; } - then - einfo "Using PyPy to perform the translation." - EPYTHON=pypy - else - einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream" - einfo "recommends using PyPy for that. If you wish to do so, please install" - einfo "dev-python/pypy and ensure that EPYTHON variable is unset." - python-any-r1_pkg_setup - fi - fi + [[ ${MERGE_TYPE} != binary ]] && check_env } src_prepare() { @@ -124,17 +99,10 @@ src_configure() { $(usex ncurses --with{,out}mod-_minimal_curses) ) - local interp=( "${EPYTHON}" ) + local interp=( pypy ) if use low-memory; then - interp=( env PYPY_GC_MAX_DELTA=200MB - "${EPYTHON}" --jit loop_longevity=300 ) - fi - - if [[ ${EPYTHON} != pypy ]]; then - # reuse bundled pycparser to avoid external dep - mkdir -p "${T}"/pymod || die - cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/pycparser || die - local -x PYTHONPATH=${T}/pymod:${PYTHONPATH} + local -x PYPY_GC_MAX_DELTA=200MB + interp+=( --jit loop_longevity=300 ) fi # translate into the C sources