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 6288D15838C for ; Sun, 21 Jan 2024 06:21:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9EF5BE29B2; Sun, 21 Jan 2024 06:21:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 7B0C4E29B1 for ; Sun, 21 Jan 2024 06:21:57 +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 BC6BA343292 for ; Sun, 21 Jan 2024 06:21:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DFA7514C5 for ; Sun, 21 Jan 2024 06:21:53 +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: <1705818103.3a53c494bef0ef3149c0bd4a9185f4e81f8b672b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3_10-exe/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy3_10-exe/Manifest dev-python/pypy3_10-exe/pypy3_10-exe-7.3.13_p3.ebuild dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14.ebuild X-VCS-Directories: dev-python/pypy3_10-exe/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3a53c494bef0ef3149c0bd4a9185f4e81f8b672b X-VCS-Branch: master Date: Sun, 21 Jan 2024 06:21:53 +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: 81eefac1-af7a-4038-afee-eed7a6dec9b7 X-Archives-Hash: 21e5b9251535035a35235813744697fc commit: 3a53c494bef0ef3149c0bd4a9185f4e81f8b672b Author: Michał Górny gentoo org> AuthorDate: Sun Jan 21 05:16:28 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Jan 21 06:21:43 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a53c494 dev-python/pypy3_10-exe: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/pypy3_10-exe/Manifest | 3 - .../pypy3_10-exe/pypy3_10-exe-7.3.13_p3.ebuild | 132 --------------------- dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14.ebuild | 132 --------------------- 3 files changed, 267 deletions(-) diff --git a/dev-python/pypy3_10-exe/Manifest b/dev-python/pypy3_10-exe/Manifest index b1b2a134217b..94d4aea4032a 100644 --- a/dev-python/pypy3_10-exe/Manifest +++ b/dev-python/pypy3_10-exe/Manifest @@ -1,7 +1,4 @@ -DIST pypy3.10-gentoo-patches-7.3.13_p3.tar.xz 9780 BLAKE2B a72cfc6723ad914f012309eac7606a37f2e6dd2c5f83c049c0d68466dae45a366536f2065c1ccdc9516339cb8949b146e410ab04b1cbbff3b9d62620a039040d SHA512 c1beb5c661dd0c0d94bebb23b82972ac9442caf777c377923c31b3f82b007396d0c3ef9874fc01cf765986cc7c6a941628f7e377a732a0706e99e3acb6fc5db6 -DIST pypy3.10-gentoo-patches-7.3.14.tar.xz 4772 BLAKE2B 3866dd6a86f88bf10d5a9a639defea0dbe3cb301ccb23d015b147a220f0e32041dc46497e43ad03c1c486291bb56752d77eaa2703e164e58f4f6af3e6b1e2433 SHA512 5da998beefaabe1307a16f1d9d4239453b9017aaabefbdb34d70ce339bfb9f8b7a258cdfcba74e0241bf140b3d2aae500710309d1dddb667154be7c482e88daa DIST pypy3.10-gentoo-patches-7.3.14_p1.tar.xz 5176 BLAKE2B 9cc684a9257a2855e44bed01d01020c0009dc966ff6fee7a789439e19814b1bfacc5fa0da166c8cb886f0dbadba365f6c6e2c520a4f5116e90ac637748e31e73 SHA512 11e468c2cab5e2234ffc68d98407bf7a676ea3b495a7e9ad7481f47fd39e2b1868b695da81b4edcee74cb8f01e997b72e994f18826331695427d80b2e43e926b DIST pypy3.10-gentoo-patches-7.3.15.tar.xz 4760 BLAKE2B 9131794293aa15cbafbc245727b5b60183606bb0273b05f4ebf8d24b525c3d6a39c8fe6f2c38487cda4a47d5defbdbb494c7786ee25a9ddc23cc9f209e5fc3cd SHA512 d2780be7ce91524bb71a47d51d9e9ad9a6aa5bd6c19903c90391cf7e6d4c9a96a98f414d22e9da7af67960ab9639f9a0f58f103c90ca9d694dcdfc4f0982bd6b -DIST pypy3.10-v7.3.13-src.tar.bz2 23067819 BLAKE2B 6e2bfd83bcf16feef006dad39ab6d8f452418ee6bc4043edaa590db702f39275e775004bdba762736a901da94cb5274cd34f2811461048d46ac0f4af04158702 SHA512 16fbc76558152b3eadca999d56197a6bf906cbb7bb75035ccd3501372af0f0c22533d22ba231a40b7c02afa11f0d692a6ae85ba6d5e1607b737b8c68209b7c43 DIST pypy3.10-v7.3.14-src.tar.bz2 23828709 BLAKE2B 15b3197953ff6271ddc9aad317f06094e1744111b7236447f029299dcc8a8ee089a8d91eec46d634489e0e89c94c0b18fda97dee51b3030ac62b0beeea7d6413 SHA512 4162d60d3869cfc87b1850266b9c7147413d3a7184a3c0c2edf1d1270ba3dff2db8047c7f2b5bbdd4c4d5136823adc078a5d45d575715984bab6633d1462f694 DIST pypy3.10-v7.3.15-src.tar.bz2 23934723 BLAKE2B 12b438729547faa81bc31c429e166d4bfab2b4e76cb16a687886903ad83e3369e0532297222eafbc8b0f4ae006d87cbe15b2c360ad828fd9a44124067aa788ff SHA512 84f9a30484cf0b0bcf3ef1f71ce2ecae02a51b6609acc4f6edd4096302c9940541dc947f3f0767216d83d261f8db85ea43760af8ce3c9137c70aabe5571d1249 diff --git a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.13_p3.ebuild b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.13_p3.ebuild deleted file mode 100644 index f92799a2e6b8..000000000000 --- a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.13_p3.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit check-reqs flag-o-matic pax-utils toolchain-funcs - -PYPY_PV=${PV%_p*} -PYVER=3.10 -MY_P="pypy${PYVER}-v${PYPY_PV/_}" -PATCHSET="pypy${PYVER}-gentoo-patches-${PV}" - -DESCRIPTION="PyPy3.10 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="+jit low-memory ncurses cpu_flags_x86_sse2" - -RDEPEND=" - app-arch/bzip2:0= - dev-libs/expat:0= - dev-libs/libffi:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libintl:0= - ncurses? ( sys-libs/ncurses:0= ) - !dev-python/pypy3-exe-bin:${SLOT} -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - dev-python/pypy - virtual/pkgconfig -" - -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() { - [[ ${MERGE_TYPE} != binary ]] && check_env -} - -src_prepare() { - local PATCHES=( - "${WORKDIR}/${PATCHSET}" - ) - default -} - -src_configure() { - tc-export CC - - # Yes, yuck, but it's being worked on upstream (bug #918971). - # https://foss.heptapod.net/pypy/pypy/-/issues/4042 - append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types) - - 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 - --withmod-bz2 - $(usex ncurses --with{,out}mod-_minimal_curses) - ) - - local interp=( pypy ) - if use low-memory; then - local -x PYPY_GC_MAX_DELTA=200MB - interp+=( --jit loop_longevity=300 ) - 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/pypy${PYVER}-c" "pypy${PYVER}-c-${PYPY_PV}" - insinto "/usr/include/pypy${PYVER}/${PYPY_PV}" - doins *.h - pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" -} diff --git a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14.ebuild b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14.ebuild deleted file mode 100644 index 9eec2da0971d..000000000000 --- a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit check-reqs flag-o-matic pax-utils toolchain-funcs - -PYPY_PV=${PV%_p*} -PYVER=3.10 -MY_P="pypy${PYVER}-v${PYPY_PV/_}" -PATCHSET="pypy${PYVER}-gentoo-patches-${PV}" - -DESCRIPTION="PyPy3.10 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="+jit low-memory ncurses cpu_flags_x86_sse2" - -RDEPEND=" - app-arch/bzip2:0= - dev-libs/expat:0= - dev-libs/libffi:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libintl:0= - ncurses? ( sys-libs/ncurses:0= ) - !dev-python/pypy3-exe-bin:${SLOT} -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - dev-python/pypy - virtual/pkgconfig -" - -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() { - [[ ${MERGE_TYPE} != binary ]] && check_env -} - -src_prepare() { - local PATCHES=( - "${WORKDIR}/${PATCHSET}" - ) - default -} - -src_configure() { - tc-export CC - - # Yes, yuck, but it's being worked on upstream (bug #918971). - # https://foss.heptapod.net/pypy/pypy/-/issues/4042 - append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types) - - 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 - --withmod-bz2 - $(usex ncurses --with{,out}mod-_minimal_curses) - ) - - local interp=( pypy ) - if use low-memory; then - local -x PYPY_GC_MAX_DELTA=200MB - interp+=( --jit loop_longevity=300 ) - 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/pypy${PYVER}-c" "pypy${PYVER}-c-${PYPY_PV}" - insinto "/usr/include/pypy${PYVER}/${PYPY_PV}" - doins *.h - pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" -}