From 401101f9c8077911929d3f2b60a37098460a5d89 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Mar 2022 23:59:54 +0000 Subject: gentoo resync : 25.03.2022 --- dev-python/pypy-exe/Manifest | 5 +- dev-python/pypy-exe/pypy-exe-7.3.6.ebuild | 178 ------------------------------ dev-python/pypy-exe/pypy-exe-7.3.8.ebuild | 2 +- 3 files changed, 2 insertions(+), 183 deletions(-) delete mode 100644 dev-python/pypy-exe/pypy-exe-7.3.6.ebuild (limited to 'dev-python/pypy-exe') diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest index e11f611004bf..de793f667912 100644 --- a/dev-python/pypy-exe/Manifest +++ b/dev-python/pypy-exe/Manifest @@ -1,7 +1,4 @@ -DIST pypy2.7-gentoo-patches-7.3.6.tar.xz 7904 BLAKE2B 6a809f8f1fd59c18627abaf81b47fa5948d39d5ece86fa416944c1c6585ec5d43b56f4228479a6afdca9788a0ecfdc83fceb4eeea25f289c1dc0b2dbda79b882 SHA512 01fe42cdf94b559ed787e253325f7df0add62e30e77c6b6e4c0301c81ff624a31167d95b39d24d72f28441468d571112f424957de38e7f26ecdbfe0f33617296 DIST pypy2.7-gentoo-patches-7.3.8.tar.xz 7428 BLAKE2B 5362c34929e2053fc9a806e9894f35cce02ba1ebfad66cc64acc200ade4317934ee50dbc072194d19e201dea2a678abd609001ffe7e39bd6890a3b26c9d6d00e SHA512 6a7bfadac8f638e69419a6a1536af595a63bb2b4e3028da6423bd164d3df5399901b217468b1b374a5162ca8d2e5a61c4a19996f9e63109ed414a1aedcaac5d6 -DIST pypy2.7-v7.3.6-src.tar.bz2 21621891 BLAKE2B a2d18ae9d455747484de491df228e7f26af46fc3bc1fd1c16ceba79eba5a3a3272d48312c9da112ae9310722b5af33098f28a7dc15d7ff4760886a8c974692a2 SHA512 df914f5e1a1f5ae5c1ea11cd8e29482309af4dce041cf2ae6d7b35a35717fec903be70f56e5f1ddbc9fd370cbe29f6896d25eb2cd10c493c352c80b279070ba3 DIST pypy2.7-v7.3.8-src.tar.bz2 23279006 BLAKE2B 7b2f5bfaffb99d3444f355039f743a21016dea22cc78cd5feca05eb12ce0e5ed39dafd22a8726994d0aff789e68b506197680e7181087313d2c5cd17b674ae4d SHA512 6ff90fad998c25aec5823e61d65266c169e89cba2ee2e3b6d0864d34d69a6b9fe7ad4d591bc8b38a48c5c22ea3dd468d3188cd34e03746c258752eaa24ac3ae2 -EBUILD pypy-exe-7.3.6.ebuild 4304 BLAKE2B 23387e2cabe080c84c97fddd49d750c173d0e4f73206c1bd5da7b5bab2f18d52b4ec02e01f79da17a5d6b01ad98a3933df996659f126e07143a06d9dd08da76f SHA512 7f3ab03fb5d0631079244afaff23064d84d02f4409fa0000a36b570ad6a63f438381cb4a5e94320e794725c31dbc4d614f6e8de71217ff01533f3caf67d3d529 -EBUILD pypy-exe-7.3.8.ebuild 4306 BLAKE2B 405a50a34adc6817abdee55d687a8808da1f7684fa83acd14c1a744bfa350e666a4b21dd4f3005dc1e0c202a9779546895050d00c0e27459cbbb952052477ddc SHA512 b2878588958bff974bad1bd3fb090146a1198549678a892f9ce43d568288050009cdaa98444b643d8f6d6664b108caa5ca5e9432987708df2cd1e3bba4831924 +EBUILD pypy-exe-7.3.8.ebuild 4304 BLAKE2B f43f62bfec5b1b28710c0020d24fe303c8bb66a305ab0f0a7091ae6828ded8bd1321b03beb429c6771d7d54ef9fac0e03467906db9bc144c5ef713dac17fb486 SHA512 04c045e764b54631267bf9f5aa76e999cd6b8a262998ce2c9170c2b70c705aee0d8273d2c822cfd1cccbd608fd093d5583895c84e236f0a5db82baab15e1658e MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d diff --git a/dev-python/pypy-exe/pypy-exe-7.3.6.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.6.ebuild deleted file mode 100644 index 9807092f95bc..000000000000 --- a/dev-python/pypy-exe/pypy-exe-7.3.6.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit check-reqs pax-utils python-any-r1 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" - -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/pypy-exe-bin:${PYPY_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}" -BDEPEND=" - !low-memory? ( - || ( - dev-python/pypy - dev-lang/python:2.7 - ) - )" - -check_env() { - if use low-memory; 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 - eerror " $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin" - eerror - eerror "before attempting to build dev-python/pypy-exe[low-memory]." - die "dev-python/pypy needs to be installed for USE=low-memory" - fi - - 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 - - use low-memory && EPYTHON= - if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] && - { has_version -b dev-python/pypy || - has_version -b dev-python/pypy-bin; } - then - einfo "Using already-installed PyPy to perform the translation." - 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 -} - -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/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}" -} diff --git a/dev-python/pypy-exe/pypy-exe-7.3.8.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.8.ebuild index d051d82c202b..ad86981676ac 100644 --- a/dev-python/pypy-exe/pypy-exe-7.3.8.ebuild +++ b/dev-python/pypy-exe/pypy-exe-7.3.8.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src" LICENSE="MIT" SLOT="${PYPY_PV}" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +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= -- cgit v1.2.3