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 0D66B158003 for ; Wed, 7 Dec 2022 16:00:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C3D9E086D; Wed, 7 Dec 2022 16:00:04 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 17F71E086D for ; Wed, 7 Dec 2022 16:00:04 +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 C6C69340E82 for ; Wed, 7 Dec 2022 16:00:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D6877D0 for ; Wed, 7 Dec 2022 15:59: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: <1670428790.8225f6fa65a60f52ada5a2806fee5a714ac3377b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy3/Manifest dev-python/pypy3/pypy3-7.3.10_rc3.ebuild dev-python/pypy3/pypy3-7.3.9_p9.ebuild X-VCS-Directories: dev-python/pypy3/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8225f6fa65a60f52ada5a2806fee5a714ac3377b X-VCS-Branch: master Date: Wed, 7 Dec 2022 15:59: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: db7c1be1-7f75-46b6-89ea-55a7f084e95b X-Archives-Hash: 3b84425f43f9a3c556bf2dd25f9390a2 commit: 8225f6fa65a60f52ada5a2806fee5a714ac3377b Author: Michał Górny gentoo org> AuthorDate: Wed Dec 7 15:55:02 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Dec 7 15:59:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8225f6fa dev-python/pypy3: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/pypy3/Manifest | 4 - dev-python/pypy3/pypy3-7.3.10_rc3.ebuild | 189 ---------------------------- dev-python/pypy3/pypy3-7.3.9_p9.ebuild | 209 ------------------------------- 3 files changed, 402 deletions(-) diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest index 48e3c7c5f639..4c1972bf2684 100644 --- a/dev-python/pypy3/Manifest +++ b/dev-python/pypy3/Manifest @@ -1,6 +1,2 @@ DIST pypy3.9-gentoo-patches-7.3.10.tar.xz 10012 BLAKE2B 45186cf6e8608995af6c0d763a2d676d862ba886acb3a0e0f0056309123d0db75240a175ecf90e24889a139f228dffc788872a5ca84736f4ce0901eda0acb789 SHA512 e6c39666f34bb7e2db72f153fad2d89421b30c04de88812637027a7e8a73bccc7620a7296b2b205464ad7fd0c911bc7a7f0dc0fc504dc8d163f7087b8b0c61b3 -DIST pypy3.9-gentoo-patches-7.3.10rc3.tar.xz 8712 BLAKE2B 65c5461b4830cd8ee29512d9ce5f7ac9e629710b5177a568f52657e92eefe7d7f1ba3321bd3ee91e94bbccd090ae9b14180617b059b761b0497b1825d66e65f6 SHA512 61fe98885fdd17c03c16316930f277f804dd6a2aa70a9c51ac5287d16c0b53eac58d0db2a55b28bdea1b0ac2a04d9a408343e321f44c57037b747dd76569d3a2 -DIST pypy3.9-gentoo-patches-7.3.9_p9.tar.xz 16508 BLAKE2B 30e61ebccb4949c5da6f1837df0e4474eda99c2b2262994b41ce9a5de58b543562010a28d20abb4d1c53c866d668c717802afd617efbcca142610a67cf1a48da SHA512 20d72fe0b7592f6f326faf8f989dacc4c6204203b270f033ff528bc845e68ea2092fa0a16176e91e882d028f549e6622c609e1566d3bc018b34178de76c48992 DIST pypy3.9-v7.3.10-src.tar.bz2 23416039 BLAKE2B 1b13e8bbe6c38c4b9183a632063aeed593986bc7906cfe527fa7534d29f9b1ae0f1e6d3795ff73be19f5737c3fd9d1b3cc2777f30d9237d853e4266bea60a5bb SHA512 1ed3fc9cdda7f3144141fc6a37b124e7141cb3f294ce8b5ca3c3aa30a3c58715e168879decaa796c890a9a287c82c2dbabb81db5f6b8d17f4215d7d3261fe9a8 -DIST pypy3.9-v7.3.10rc3-src.tar.bz2 23453446 BLAKE2B eefedc5d49602f19c9d39f20f060ddb4f00bd49681fee64fa98a7c7a3856df7f4ae4e17e51a3fa37137d049b463855ce7e2c95abd9878665b66fc9b90a91ec6c SHA512 d831c8c716f40514e54845ec7ab6b3ecf1af74bc66504196dda251d66feff4e206c77535484ef1747dc390db2bdc2be38e9be3401831b321ea043016e42c2a27 -DIST pypy3.9-v7.3.9-src.tar.bz2 26976726 BLAKE2B bf1ed21c575901abac020120aaff07ab57f1404713211b19cbd1eb4d6ffc675b7933be8c6fffc2b69ab467963d6598534cd5aa90c02feddad596611d2a6b6581 SHA512 83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a diff --git a/dev-python/pypy3/pypy3-7.3.10_rc3.ebuild b/dev-python/pypy3/pypy3-7.3.10_rc3.ebuild deleted file mode 100644 index c6b9c98cbd92..000000000000 --- a/dev-python/pypy3/pypy3-7.3.10_rc3.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit pax-utils python-utils-r1 toolchain-funcs - -PYPY_PV=${PV%_p*} -MY_P=pypy3.9-v${PYPY_PV/_rc/rc} -PATCHSET="pypy3.9-gentoo-patches-${PV/_rc/rc}" - -DESCRIPTION="A fast, compliant alternative implementation of the Python (3.9) language" -HOMEPAGE=" - https://www.pypy.org/ - https://foss.heptapod.net/pypy/pypy/ -" -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" -# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' -# also check pypy/interpreter/pycode.py -> pypy_incremental_magic -SLOT="0/pypy39-pp73-336" -KEYWORDS="" -IUSE="+ensurepip gdbm +jit ncurses sqlite tk" -# many tests are failing upstream -# see https://buildbot.pypy.org/summary?branch=py3.9 -RESTRICT="test" - -RDEPEND=" - || ( - >=dev-python/pypy3-exe-${PYPY_PV}:3.9-${PYPY_PV}[bzip2(+),ncurses?] - >=dev-python/pypy3-exe-bin-${PYPY_PV}:3.9-${PYPY_PV} - ) - dev-lang/python-exec[python_targets_pypy3(-)] - dev-libs/openssl:0= - ensurepip? ( dev-python/ensurepip-wheels ) - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) -" -DEPEND=" - ${RDEPEND} -" - -src_prepare() { - local PATCHES=( - "${WORKDIR}/${PATCHSET}" - ) - default - - eapply_user -} - -src_configure() { - tc-export CC -} - -src_compile() { - mkdir bin || die - # switch to the layout expected for cffi module builds - mkdir include/pypy3.9 || die - # copy over to make sys.prefix happy - cp -p "${BROOT}"/usr/bin/pypy3.9-c-${PYPY_PV} pypy3.9-c || die - cp -p "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/* include/pypy3.9/ || die - # (not installed by pypy-exe) - rm pypy/module/cpyext/include/_numpypy/numpy/README || die - mv pypy/module/cpyext/include/* include/pypy3.9/ || die - mv pypy/module/cpyext/parse/*.h include/pypy3.9/ || die - pax-mark m pypy3.9-c - - # verify the subslot - local soabi=$( - ./pypy3.9-c - <<-EOF - import importlib.util - import sysconfig - soabi = sysconfig.get_config_var("SOABI") - magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff - print(f"{soabi}-{magic}") - EOF - ) - [[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}" - - # Add epython.py to the distribution - echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die - - einfo "Generating caches and CFFI modules ..." - - # Generate Grammar and PatternGrammar pickles. - ./pypy3.9-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed" - import lib2to3.pygram - import lib2to3.patcomp - lib2to3.patcomp.PatternCompiler() - EOF - - # Generate cffi modules - # Please keep in sync with pypy/tool/build_cffi_imports.py! - # (NB: we build CFFI modules first to avoid error log when importing - # build_cffi_imports). - cffi_targets=( pypy_util blake2/_blake2 sha3/_sha3 ssl - audioop syslog pwdgrp resource lzma posixshmem ) - use gdbm && cffi_targets+=( gdbm ) - use ncurses && cffi_targets+=( curses ) - use sqlite && cffi_targets+=( sqlite3 ) - use tk && cffi_targets+=( tkinter/tklib ) - - local t - # all modules except tkinter output to . - # tkinter outputs to the correct dir ... - cd lib_pypy || die - for t in "${cffi_targets[@]}"; do - # tkinter doesn't work via -m - ../pypy3.9-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" - done - - # Verify that CFFI module list is up-to-date - local expected_cksum=63d4659f - local local_cksum=$( - ../pypy3.9-c - <<-EOF - import binascii - import json - from pypy_tools.build_cffi_imports import cffi_build_scripts as x - print("%08x" % (binascii.crc32(json.dumps(x).encode()),)) - EOF - ) - if [[ ${local_cksum} != ${expected_cksum} ]]; then - die "Please verify cffi_targets and update checksum to ${local_cksum}" - fi - - # Cleanup temporary objects - find -name "*_cffi.[co]" -delete || die - find -type d -empty -delete || die -} - -src_install() { - einfo "Installing PyPy ..." - dodir /usr/bin - dosym pypy3.9-c-${PYPY_PV} /usr/bin/pypy3.9 - dosym pypy3.9 /usr/bin/pypy3 - insinto /usr/lib/pypy3.9 - # preserve mtimes to avoid obsoleting caches - insopts -p - doins -r lib-python/3/. lib_pypy/. - insinto /usr/include - doins -r include/pypy3.9 - - # replace copied headers with symlinks - for x in "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/*; do - dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.9/${x##*/}" - done - - dodoc README.rst - - local dest=/usr/lib/pypy3.9 - rm -r "${ED}${dest}"/ensurepip/_bundled || die - if ! use ensurepip; then - rm -r "${ED}${dest}"/ensurepip || die - fi - if ! use gdbm; then - rm -r "${ED}${dest}"/_gdbm* || die - fi - if ! use sqlite; then - rm -r "${ED}${dest}"/sqlite3 \ - "${ED}${dest}"/_sqlite3* \ - "${ED}${dest}"/test/test_sqlite.py || die - fi - if ! use tk; then - rm -r "${ED}${dest}"/{idlelib,tkinter} \ - "${ED}${dest}"/_tkinter \ - "${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die - fi - - local -x EPYTHON=pypy3 - local -x PYTHON=${ED}/usr/bin/pypy3.9-c-${PYPY_PV} - # temporarily copy to build tree to facilitate module builds - cp -p "${BROOT}/usr/bin/pypy3.9-c-${PYPY_PV}" "${PYTHON}" || die - - einfo "Byte-compiling Python standard library..." - python_optimize "${ED}${dest}" - - # remove to avoid collisions - rm "${PYTHON}" || die -} diff --git a/dev-python/pypy3/pypy3-7.3.9_p9.ebuild b/dev-python/pypy3/pypy3-7.3.9_p9.ebuild deleted file mode 100644 index b8fada825778..000000000000 --- a/dev-python/pypy3/pypy3-7.3.9_p9.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python2_7 ) -inherit pax-utils python-any-r1 toolchain-funcs - -PYPY_PV=${PV%_p*} -MY_P=pypy3.9-v${PYPY_PV/_rc/rc} -PATCHSET="pypy3.9-gentoo-patches-${PV/_rc/rc}" - -DESCRIPTION="A fast, compliant alternative implementation of the Python (3.9) language" -HOMEPAGE=" - https://www.pypy.org/ - https://foss.heptapod.net/pypy/pypy/ -" -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" -# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' -# also check pypy/interpreter/pycode.py -> pypy_incremental_magic -SLOT="0/pypy39-pp73-336" -KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="+ensurepip gdbm +jit ncurses sqlite test tk" -# many tests are failing upstream -# see https://buildbot.pypy.org/summary?branch=py3.9 -RESTRICT="test" - -RDEPEND=" - || ( - >=dev-python/pypy3-exe-${PYPY_PV}_p3:3.9-${PYPY_PV}[bzip2(+),ncurses?] - >=dev-python/pypy3-exe-bin-${PYPY_PV}_p3:3.9-${PYPY_PV} - ) - dev-lang/python-exec[python_targets_pypy3(-)] - dev-libs/openssl:0= - ensurepip? ( dev-python/ensurepip-wheels ) - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) -" -DEPEND=" - ${RDEPEND} - test? ( - ${PYTHON_DEPS} - !!dev-python/pytest-forked - ) -" - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - local PATCHES=( - "${WORKDIR}/${PATCHSET}" - ) - default - - eapply_user -} - -src_configure() { - tc-export CC -} - -src_compile() { - mkdir bin || die - # switch to the layout expected for cffi module builds - mkdir include/pypy3.9 || die - # copy over to make sys.prefix happy - cp -p "${BROOT}"/usr/bin/pypy3.9-c-${PYPY_PV} pypy3.9-c || die - cp -p "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/* include/pypy3.9/ || die - # (not installed by pypy-exe) - rm pypy/module/cpyext/include/_numpypy/numpy/README || die - mv pypy/module/cpyext/include/* include/pypy3.9/ || die - mv pypy/module/cpyext/parse/*.h include/pypy3.9/ || die - pax-mark m pypy3.9-c - - # verify the subslot - local soabi=$( - ./pypy3.9-c - <<-EOF - import importlib.util - import sysconfig - soabi = sysconfig.get_config_var("SOABI") - magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff - print(f"{soabi}-{magic}") - EOF - ) - [[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}" - - # Add epython.py to the distribution - echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die - - einfo "Generating caches and CFFI modules ..." - - # Generate Grammar and PatternGrammar pickles. - ./pypy3.9-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed" - import lib2to3.pygram - import lib2to3.patcomp - lib2to3.patcomp.PatternCompiler() - EOF - - # Generate cffi modules - # Please keep in sync with pypy/tool/build_cffi_imports.py! - # (NB: we build CFFI modules first to avoid error log when importing - # build_cffi_imports). - cffi_targets=( pypy_util blake2/_blake2 sha3/_sha3 ssl - audioop syslog pwdgrp resource lzma posixshmem ) - use gdbm && cffi_targets+=( gdbm ) - use ncurses && cffi_targets+=( curses ) - use sqlite && cffi_targets+=( sqlite3 ) - use tk && cffi_targets+=( tkinter/tklib ) - - local t - # all modules except tkinter output to . - # tkinter outputs to the correct dir ... - cd lib_pypy || die - for t in "${cffi_targets[@]}"; do - # tkinter doesn't work via -m - ../pypy3.9-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" - done - - # Verify that CFFI module list is up-to-date - local expected_cksum=63d4659f - local local_cksum=$( - ../pypy3.9-c - <<-EOF - import binascii - import json - from pypy_tools.build_cffi_imports import cffi_build_scripts as x - print("%08x" % (binascii.crc32(json.dumps(x).encode()),)) - EOF - ) - if [[ ${local_cksum} != ${expected_cksum} ]]; then - die "Please verify cffi_targets and update checksum to ${local_cksum}" - fi - - # Cleanup temporary objects - find -name "*_cffi.[co]" -delete || die - find -type d -empty -delete || die -} - -src_test() { - # (unset) - local -x PYTHONDONTWRITEBYTECODE= - local -x COLUMNS=80 - - # Test runner requires Python 2 too. However, it spawns PyPy3 - # internally so that we end up testing the correct interpreter. - # (--deselect for failing doctests) - "${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3.9-c -vv lib-python || die -} - -src_install() { - einfo "Installing PyPy ..." - dodir /usr/bin - dosym pypy3.9-c-${PYPY_PV} /usr/bin/pypy3.9 - dosym pypy3.9 /usr/bin/pypy3 - insinto /usr/lib/pypy3.9 - # preserve mtimes to avoid obsoleting caches - insopts -p - doins -r lib-python/3/. lib_pypy/. - insinto /usr/include - doins -r include/pypy3.9 - - # replace copied headers with symlinks - for x in "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/*; do - dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.9/${x##*/}" - done - - dodoc README.rst - - local dest=/usr/lib/pypy3.9 - rm -r "${ED}${dest}"/ensurepip/_bundled || die - if ! use ensurepip; then - rm -r "${ED}${dest}"/ensurepip || die - fi - if ! use gdbm; then - rm -r "${ED}${dest}"/_gdbm* || die - fi - if ! use sqlite; then - rm -r "${ED}${dest}"/sqlite3 \ - "${ED}${dest}"/_sqlite3* \ - "${ED}${dest}"/test/test_sqlite.py || die - fi - if ! use tk; then - rm -r "${ED}${dest}"/{idlelib,tkinter} \ - "${ED}${dest}"/_tkinter \ - "${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die - fi - - local -x EPYTHON=pypy3 - local -x PYTHON=${ED}/usr/bin/pypy3.9-c-${PYPY_PV} - # temporarily copy to build tree to facilitate module builds - cp -p "${BROOT}/usr/bin/pypy3.9-c-${PYPY_PV}" "${PYTHON}" || die - - einfo "Byte-compiling Python standard library..." - python_optimize "${ED}${dest}" - - # remove to avoid collisions - rm "${PYTHON}" || die -}