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 858C3158089 for ; Thu, 2 Nov 2023 12:58:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE8E62BC021; Thu, 2 Nov 2023 12:58:28 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B947B2BC021 for ; Thu, 2 Nov 2023 12:58:28 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 088F6335D3C for ; Thu, 2 Nov 2023 12:58:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46FAFAB3 for ; Thu, 2 Nov 2023 12:58:25 +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: <1698929894.adf810a55d94b861a10f262450ea13a59ec16cf6.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/Manifest dev-python/pypy-exe/pypy-exe-7.3.12.ebuild X-VCS-Directories: dev-python/pypy-exe/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: adf810a55d94b861a10f262450ea13a59ec16cf6 X-VCS-Branch: master Date: Thu, 2 Nov 2023 12:58:25 +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: e87357d2-472d-4ee0-a108-cff6e660bc77 X-Archives-Hash: 310fd7fd4f0d9e265f4f6585f85c4bd4 commit: adf810a55d94b861a10f262450ea13a59ec16cf6 Author: Michał Górny gentoo org> AuthorDate: Thu Nov 2 12:53:47 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Nov 2 12:58:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adf810a5 dev-python/pypy-exe: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/pypy-exe/Manifest | 2 - dev-python/pypy-exe/pypy-exe-7.3.12.ebuild | 177 ----------------------------- 2 files changed, 179 deletions(-) diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest index 8cef9defe619..23f106c3c88a 100644 --- a/dev-python/pypy-exe/Manifest +++ b/dev-python/pypy-exe/Manifest @@ -1,4 +1,2 @@ -DIST pypy2.7-gentoo-patches-7.3.12.tar.xz 5340 BLAKE2B 1a7375412087e8df02e69c80cee6d8246cc444a352323e6a49c1e1a0e6f5d662584c4cce194f03fc139f29de4ecf5d9f68cea5a8c19a720f1a51c1563804e19a SHA512 026a435377f0f04a526d4e0bef1ac832543f24ff2b39579e2cc7ca2cb3eae0415fcdb3c701fc4b85b0659a2ab17180a45469d79920262ed6dfd68d401df85fa1 DIST pypy2.7-gentoo-patches-7.3.13.tar.xz 5340 BLAKE2B 843a7a5e4c2fd56fc4db51ba388736c0aa6593d45b145503f6428783a9fd815a77e2a06809077effced6fccf75c0dd38527a0695211852fd2a4c61b34e40c15c SHA512 cc8f6fc69f00030609a8d79f05a60b2e185141e9fc70a53b476b60a183dd0500627023658c6a57c2412f32af1db6fae91a361a4992d84e7dfbadb7eb4a98b8a1 -DIST pypy2.7-v7.3.12-src.tar.bz2 19904555 BLAKE2B be8677c0632ef331db285938ad6ffbcb1aa70f44422a1ce5ed09b5a557e68d9185a11d1c20a4a3c6cf32ab41e623a2bc7b3ab7485bf270a9a604fb8a5769bf3f SHA512 35ec35376f1e7c1a5dea9dc5bce6819a94c2df2645806c83185487587470b47ab529c25ecb8ca200505319f40789859a2919c61902b693421e2001313b46e5f4 DIST pypy2.7-v7.3.13-src.tar.bz2 19907651 BLAKE2B ce80db193afadbc721e781cbfe3d72bfe420eef3ede408f23213ab5d87a9a42c025d3c31c742dcb55a039b618930ebc4899d704f060d294f2e492d4d754effba SHA512 deeca234abbe526102cec637dc88399f462f64ae66c38782e6f3372b484d25fa4e88b906f783ba515bed17d2e82626d1c94fd6ee9b8b64e393f9bc0f5ee2b07b diff --git a/dev-python/pypy-exe/pypy-exe-7.3.12.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.12.ebuild deleted file mode 100644 index b898c0920192..000000000000 --- a/dev-python/pypy-exe/pypy-exe-7.3.12.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit check-reqs pax-utils toolchain-funcs - -PYPY_PV=${PV%_p*} -MY_P=pypy2.7-v${PYPY_PV/_} -PATCHSET="pypy2.7-gentoo-patches-${PV/_}" - -DESCRIPTION="PyPy executable (build from source)" -HOMEPAGE="https://www.pypy.org/" -SRC_URI=" - https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2 - https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz -" -S="${WORKDIR}/${MY_P}-src" - -LICENSE="MIT" -SLOT="${PYPY_PV}" -KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2" - -DEPEND=" - >=sys-libs/zlib-1.1.3:0= - dev-libs/libffi:0= - virtual/libintl:0= - dev-libs/expat:0= - bzip2? ( app-arch/bzip2:0= ) - ncurses? ( sys-libs/ncurses:0= ) -" -RDEPEND=" - ${DEPEND} - !dev-python/pypy-exe-bin:${PYPY_PV} -" -# don't enforce the dep on dev-python/pypy with USE=low-memory -# since it's going to cause circular dep with unhelpful error message -BDEPEND=" - !low-memory? ( - || ( - dev-python/pypy - dev-lang/python:2.7 - ) - ) -" - -check_env() { - if ! has_version -b dev-python/pypy; then - if use low-memory; then - eerror "USE=low-memory requires (a prior version of) dev-python/pypy" - eerror "installed." - else - ewarn "CPython 2.7 will be used to perform the translation. Upstream" - ewarn "recommends using (a prior version of) dev-python/pypy instead." - fi - elog "You can install a prebuilt version of PyPy first using e.g.:" - elog " $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin" - - if use low-memory; then - die "dev-python/pypy needs to be installed for USE=low-memory" - fi - fi - - if use low-memory; then - CHECKREQS_MEMORY="1750M" - use amd64 && CHECKREQS_MEMORY="3500M" - else - CHECKREQS_MEMORY="3G" - use amd64 && CHECKREQS_MEMORY="6G" - fi - - check-reqs_pkg_pretend -} - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && check_env -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && check_env -} - -src_prepare() { - local PATCHES=( - "${WORKDIR}/${PATCHSET}" - ) - default -} - -src_configure() { - tc-export CC - - local jit_backend - if use jit; then - jit_backend='--jit-backend=' - - # We only need the explicit sse2 switch for x86. - # On other arches we can rely on autodetection which uses - # compiler macros. Plus, --jit-backend= doesn't accept all - # the modern values... - - if use x86; then - if use cpu_flags_x86_sse2; then - jit_backend+=x86 - else - jit_backend+=x86-without-sse2 - fi - else - jit_backend+=auto - fi - fi - - local args=( - --no-shared - $(usex jit -Ojit -O2) - - ${jit_backend} - - pypy/goal/targetpypystandalone - ) - - # Avoid linking against libraries disabled by use flags - local opts=( - bzip2:bz2 - ncurses:_minimal_curses - ) - - local opt - for opt in "${opts[@]}"; do - local flag=${opt%:*} - local mod=${opt#*:} - - args+=( - $(usex ${flag} --withmod --withoutmod)-${mod} - ) - done - - local interp - if use low-memory || has_version -b dev-python/pypy; then - einfo "Using already-installed PyPy to perform the translation." - interp=( pypy ) - if use low-memory; then - local -x PYPY_GC_MAX_DELTA=200MB - interp+=( --jit loop_longevity=300 ) - fi - else - einfo "Using CPython 2.7 to perform the translation." - interp=( python2.7 ) - - # reuse bundled pycparser to avoid external dep - mkdir -p "${T}"/pymod/cffi || die - : > "${T}"/pymod/cffi/__init__.py || die - cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die - local -x PYTHONPATH=${T}/pymod:${PYTHONPATH} - fi - - # translate into the C sources - # we're going to build them ourselves since otherwise pypy does not - # free up the unneeded memory before spawning the compiler - set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}" - echo -e "\033[1m${@}\033[0m" - "${@}" || die "translation failed" -} - -src_compile() { - emake -C "${T}"/usession*-0/testing_1 -} - -src_install() { - local dest=/usr/lib/pypy2.7 - exeinto "${dest}" - newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV} - insinto "${dest}"/include/${PYPY_PV} - doins include/pypy_* - pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}" -}