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 B2819158086 for ; Tue, 9 Nov 2021 10:34:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D12B82BC0B2; Tue, 9 Nov 2021 10:34:04 +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 EBF452BC0B5 for ; Tue, 9 Nov 2021 10:34:03 +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 7AC85342CD5 for ; Tue, 9 Nov 2021 10:34:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EAD5C1B3 for ; Tue, 9 Nov 2021 10:33:59 +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: <1636453512.3f2f086f8a4264cfda77b242565fc259a854017f.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/Manifest dev-python/pypy3-exe/pypy3-exe-7.3.5.ebuild dev-python/pypy3-exe/pypy3-exe-7.3.6.ebuild X-VCS-Directories: dev-python/pypy3-exe/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3f2f086f8a4264cfda77b242565fc259a854017f X-VCS-Branch: master Date: Tue, 9 Nov 2021 10:33:59 +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: 29d338da-1b76-4565-95b8-340dd0b5af3e X-Archives-Hash: 538bfc302b1b87602e435966b78a4deb commit: 3f2f086f8a4264cfda77b242565fc259a854017f Author: Michał Górny gentoo org> AuthorDate: Tue Nov 9 10:25:12 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Nov 9 10:25:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f2f086f dev-python/pypy3-exe: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/pypy3-exe/Manifest | 4 - dev-python/pypy3-exe/pypy3-exe-7.3.5.ebuild | 167 ---------------------------- dev-python/pypy3-exe/pypy3-exe-7.3.6.ebuild | 166 --------------------------- 3 files changed, 337 deletions(-) diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest index 58374bab582..44d6013d0c6 100644 --- a/dev-python/pypy3-exe/Manifest +++ b/dev-python/pypy3-exe/Manifest @@ -1,6 +1,2 @@ -DIST pypy3.7-gentoo-patches-7.3.5.tar.xz 8164 BLAKE2B 0f8707fda16c0358c1d3a2a60d83046bc5c6186906e07d0e2441d26da4c5d2e7978aa9013be211daf0a1bfddbb10f96745ba4be84b61903e177f4d906045ed67 SHA512 95d3acb11c811e4342ba3a56e925433614c5affb6a1fc873ecd2f2cfd55459424088b928f46bcb9a6f0e467fb77905af387ad04bad45a37b928fe0ea320ac33e -DIST pypy3.7-v7.3.5-src.tar.bz2 25350766 BLAKE2B 34d5c83284271b184f71492dbd65b8760cc0fcdec71e41ef48b9561280dd67ef4c37fdd70759d0b95114d127446fc0ea5d04feb99022c1a725233862b2028834 SHA512 253d2efc81d55fb392ab810741e3a633f664e1908b2c26db7a8830c971655cca6be1b8d34581d13aa2d738a4a4c8ba23c2c90333b6e03d4608372e8013ea723b -DIST pypy3.8-gentoo-patches-7.3.6.tar.xz 4392 BLAKE2B 757581efb1cd0e44279177a4a3d69ba2d34991c702247794cbfd8ee7a31dc6ad70ca41175689fbd31990286a3c60aec9bb5ce189cee1224f20d1f3452fbb958a SHA512 2ee6bc687a50fc1fb9ec5700fdfc4313c5f9b76a8e4da627cc8265e11cdbe8af2c92681207a1c9d869e89e1922c765410dd7790d0a39eadd00a6c2339bc1cfbe DIST pypy3.8-gentoo-patches-7.3.7.tar.xz 4396 BLAKE2B adc33a02ada4d22eae0484292ec6cc295805d9f254b7a9110c622628aa40011621a1833ca62d3251e4e5056c406f648e7ad0439bd60e77c38808dd9df46973a5 SHA512 1cda8467de2d749d98fa20d7d200b5f96dae0ca68cf44a054d03f3f148bc3946ba1f1c474ac0336560f79c78b3eddcd4ba24386e83de283c83475b8e4b75bdf8 -DIST pypy3.8-v7.3.6-src.tar.bz2 24377230 BLAKE2B ca5890ded9b3d3bd4ee25911594bafec13b4226dee7f3464ad4386f01011870fac823ddbc1aebf7a813e3ad158baac24df631baf86a7e44ef6efdc7ae2763555 SHA512 2617e444f5ff73bb8ddea58b18849bedcc007feaeb748e9006a3c36401ab26d1c4aaf51eb148654d6bb8221f2e6624c45d3a75124c8912ca59756dfaa14a7068 DIST pypy3.8-v7.3.7-src.tar.bz2 24375444 BLAKE2B 44fe19ee63d95243c499ecb0b84e77873c73da93320b1e028a5c6c4b167441d223812dc66b16e070308cba48c4d8774738f827319cce9d1769b3f4346e15487c SHA512 9e6701cc441d5535968656cfb0cfa9076c364f9ba32bc6f0ef64f06ab343281e2458dbe88791c0e02401457fbf80d367f397fc904f6146bff68e04a15e05fda2 diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.5.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.5.ebuild deleted file mode 100644 index 883701eb144..00000000000 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.5.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# pypy3 needs to be built using python 2 -PYTHON_COMPAT=( python2_7 ) -inherit check-reqs pax-utils python-any-r1 toolchain-funcs - -PYPY_PV=${PV%_p*} -MY_P=pypy3.7-v${PYPY_PV/_} -PATCHSET="pypy3.7-gentoo-patches-${PV/_}" - -DESCRIPTION="PyPy3 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" - -RDEPEND=">=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= ) - !dev-python/pypy3-exe-bin:${PYPY_PV}" -DEPEND="${RDEPEND}" -BDEPEND=" - low-memory? ( dev-python/pypy ) - !low-memory? ( - || ( - dev-python/pypy - dev-lang/python:2.7 - ) - )" - -check_env() { - 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() { - 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 -} - -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=( "${EPYTHON}" ) - 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/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/pypy3.7 - exeinto "${dest}" - newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV} - insinto "${dest}"/include/${PYPY_PV} - doins include/pypy_* - pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}" -} diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.6.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.6.ebuild deleted file mode 100644 index c8cc24bbcba..00000000000 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.6.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# pypy3 needs to be built using python 2 -PYTHON_COMPAT=( python2_7 ) -inherit check-reqs pax-utils python-any-r1 toolchain-funcs - -PYPY_PV=${PV%_p*} -MY_P=pypy3.8-v${PYPY_PV/_} -PATCHSET="pypy3.8-gentoo-patches-${PV/_}" - -DESCRIPTION="PyPy3 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" - -RDEPEND=">=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= ) - !dev-python/pypy3-exe-bin:${PYPY_PV}" -DEPEND="${RDEPEND}" -BDEPEND=" - low-memory? ( dev-python/pypy ) - !low-memory? ( - || ( - dev-python/pypy - dev-lang/python:2.7 - ) - )" - -check_env() { - 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() { - 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 -} - -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=( "${EPYTHON}" ) - 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/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() { - cd "${T}"/usession*-0 || die - newbin testing_1/pypy3-c pypy3-c-${PYPY_PV} - insinto /usr/include/pypy3.8/${PYPY_PV} - doins pypy_*.h - pax-mark m "${ED}/usr/bin/pypy3-c-${PYPY_PV}" -}