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 83C7B138359 for ; Thu, 17 Sep 2020 16:56:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC8B2E0849; Thu, 17 Sep 2020 16:56:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 8FFE4E0849 for ; Thu, 17 Sep 2020 16:56:27 +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 A36FF340E65 for ; Thu, 17 Sep 2020 16:56:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2181336B for ; Thu, 17 Sep 2020 16:56:24 +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: <1600361777.8940c2a7c85df010d851ac263ae3de9bbaf128d8.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-exe/, dev-python/pypy3-exe/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy3-exe/Manifest dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1-r100.ebuild dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1.ebuild X-VCS-Directories: dev-python/pypy3-exe/files/ dev-python/pypy3-exe/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8940c2a7c85df010d851ac263ae3de9bbaf128d8 X-VCS-Branch: master Date: Thu, 17 Sep 2020 16:56:24 +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: f079f02b-22e5-45c0-b4fa-c795ed26f9ab X-Archives-Hash: 29f2fdcb88f4e131ba867d44f02a58a2 commit: 8940c2a7c85df010d851ac263ae3de9bbaf128d8 Author: Michał Górny gentoo org> AuthorDate: Thu Sep 17 14:02:59 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Sep 17 16:56:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8940c2a7 dev-python/pypy3-exe: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/pypy3-exe/Manifest | 3 - .../files/pypy3-exe-7.3.0-gcc10-fno-common.patch | 25 ---- dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild | 156 --------------------- .../pypy3-exe/pypy3-exe-7.3.2_rc1-r100.ebuild | 151 -------------------- dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1.ebuild | 151 -------------------- 5 files changed, 486 deletions(-) diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest index 45dd21d0c51..39001d40e36 100644 --- a/dev-python/pypy3-exe/Manifest +++ b/dev-python/pypy3-exe/Manifest @@ -1,6 +1,3 @@ -DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56 -DIST pypy3.6-v7.3.2rc1-src.tar.bz2 22730858 BLAKE2B 41a0702d0077c0f546998b858bc8b76226fe8903f4819497aa284231edcb32bc8b047b0a2a35bacfb18ea11fb85de98b95998276c22a3f0dc716b16871b35a3a SHA512 1a6f93f7e767b0db5c40c1e06cadd781c6ddfb02ec86aa61a37f649fe1aa5cd71f7857052e5b48092e3bf8b5cbef6d6401097bf4c4e80c62f7dbdffcd20b70c0 DIST pypy3.6-v7.3.2rc2-src.tar.bz2 22750248 BLAKE2B 6a8a3c4306cb5c796ee89f3d9ece61f5d669515ae9edf4961f43c7779123554cda0f3b433f8264d3d08e531ef5fe660b494135321a11f441ae1de97ce0abb332 SHA512 a89184314d04bad646cf2e2151e2d5f27ca23a68f25e22b5c2e4f07745671e70c71d869be1c61248ee839632f7151b597fe79eb5af814967a1ae97f2c2cdb8ee -DIST pypy3.7-v7.3.2rc1-src.tar.bz2 24805791 BLAKE2B 7b16ba9f0b33d572facdf009701712fe1b2c1eb5a4187c3a9197973ef4da140c7704b3409c7c336e1027f89df340fcefc9e52c6ccac75b251aa79d67c98e49c4 SHA512 d2a5c02a541c0ae79cf8c8e1a38299351f9dd81d1a17724d9fe346d8eb4311e2566a319cf1b8a90d393bffdc11657f6fa2f6475441634e57701b00e74899baa0 DIST pypy3.7-v7.3.2rc2-src.tar.bz2 25066853 BLAKE2B 286ec0909d4b9ba9039cd9ca234a90832e99369f5e7e36a486d219661631efac186e02146dd5bc5a51521fcfdd0047c3fa5a6dbffd20cebe8ff7c209d02fec53 SHA512 c8e5dc5ded2989aa3a6b635e040c23bb8e2812101ce22a104f251e0abaa3320b61f2f611ece58d6b8a8ae9f1cbc8ca22c920f3491dd5653bcb0e05264fd54a4f diff --git a/dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch b/dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch deleted file mode 100644 index b072ee4c1e6..00000000000 --- a/dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 455e1f635110df4bdc2981a3a0abf02e3d4d21b2 Mon Sep 17 00:00:00 2001 -From: Matti Picus -Date: Wed, 26 Feb 2020 13:06:29 +0200 -Subject: [PATCH] issue 3163: the constant is defined both in vmprof_common.h and vmprof_common.c - ---- - rpython/rlib/rvmprof/src/shared/vmprof_common.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_common.h b/rpython/rlib/rvmprof/src/shared/vmprof_common.h -index b52ee5f..1b2278b 100644 ---- a/rpython/rlib/rvmprof/src/shared/vmprof_common.h -+++ b/rpython/rlib/rvmprof/src/shared/vmprof_common.h -@@ -89,7 +89,7 @@ int opened_profile(const char *interp_name, int memory, int proflines, int nativ - result is NULL. */ - #if PY_MAJOR_VERSION >= 3 && !defined(_Py_atomic_load_relaxed) - /* this was abruptly un-defined in 3.5.1 */ --void *volatile _PyThreadState_Current; -+extern void *volatile _PyThreadState_Current; - /* XXX simple volatile access is assumed atomic */ - # define _Py_atomic_load_relaxed(pp) (*(pp)) - #endif --- -libgit2 0.26.0 - diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild deleted file mode 100644 index edc7a19739c..00000000000 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2020 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 - -MY_P=pypy3.6-v${PV/_/} -DESCRIPTION="PyPy3 executable (build from source)" -HOMEPAGE="https://pypy.org/" -SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2" -S="${WORKDIR}/${MY_P}-src" - -LICENSE="MIT" -SLOT="${PV}" -KEYWORDS="amd64 ~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:${PV}" -DEPEND="${RDEPEND}" -BDEPEND=" - low-memory? ( dev-python/pypy ) - !low-memory? ( - || ( - dev-python/pypy - ( - dev-lang/python:2.7 - dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] - ) - ) - )" - -PATCHES=( - # https://bugs.gentoo.org/706760 - "${FILESDIR}"/${PN}-7.3.0-gcc10-fno-common.patch -) - -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_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 - - # translate into the C sources - # we're going to make 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.6 - exeinto "${dest}" - newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV} - insinto "${dest}"/include/${PV} - doins include/pypy_* - pax-mark m "${ED}${dest}/pypy3-c-${PV}" -} diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1-r100.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1-r100.ebuild deleted file mode 100644 index df9d87c9239..00000000000 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1-r100.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2020 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 - -MY_P=pypy3.7-v${PV/_/} -DESCRIPTION="PyPy3 executable (build from source)" -HOMEPAGE="https://pypy.org/" -SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2" -S="${WORKDIR}/${MY_P}-src" - -LICENSE="MIT" -SLOT="${PV}-py37" -KEYWORDS="~amd64 ~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:${PV}" -DEPEND="${RDEPEND}" -BDEPEND=" - low-memory? ( dev-python/pypy ) - !low-memory? ( - || ( - dev-python/pypy - ( - dev-lang/python:2.7 - dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_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_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 - - # translate into the C sources - # we're going to make 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-${PV} - insinto "${dest}"/include/${PV} - doins include/pypy_* - pax-mark m "${ED}${dest}/pypy3-c-${PV}" -} diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1.ebuild deleted file mode 100644 index 24b904343e1..00000000000 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2020 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 - -MY_P=pypy3.6-v${PV/_/} -DESCRIPTION="PyPy3 executable (build from source)" -HOMEPAGE="https://pypy.org/" -SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2" -S="${WORKDIR}/${MY_P}-src" - -LICENSE="MIT" -SLOT="${PV}" -KEYWORDS="~amd64 ~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:${PV}" -DEPEND="${RDEPEND}" -BDEPEND=" - low-memory? ( dev-python/pypy ) - !low-memory? ( - || ( - dev-python/pypy - ( - dev-lang/python:2.7 - dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_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_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 - - # translate into the C sources - # we're going to make 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.6 - exeinto "${dest}" - newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV} - insinto "${dest}"/include/${PV} - doins include/pypy_* - pax-mark m "${ED}${dest}/pypy3-c-${PV}" -}