diff options
28 files changed, 11 insertions, 2210 deletions
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest index b866dcc2ccfe..fd2a79609e92 100644 --- a/dev-python/pypy-exe-bin/Manifest +++ b/dev-python/pypy-exe-bin/Manifest @@ -2,7 +2,3 @@ DIST pypy-exe-7.3.6-1.amd64.xpak 13698534 BLAKE2B d47e70f5d982b273b31da94f4f9e35 DIST pypy-exe-7.3.6-1.x86.xpak 10322051 BLAKE2B d15ce84560a4e0f56446b7b514c3a20ecf84de48b89e15bed4a261946f1f3b39cfd49323e600c5c186d9bdd75a900a3688c124daa5d9dba7bf0bdb82873cc3f6 SHA512 4ac83e5334666efccc7c5d59be7838032f9082055d320fa3b44b58c18c4349c4a5ebead0c9ae11b24069f80f82081f8119ec4c00287f16b80b83b21db429cddd DIST pypy-exe-7.3.8-1.amd64.xpak 13659803 BLAKE2B 438206eb417422b749d21ba0de71611147df9d0a40b6bef12bfc068fab92e7cd39878b1f15c97b6efe3f2751b29efd2f7ee9a6d084fc405384012b3c3e327552 SHA512 2c88e383302b8c873e1dcab1d24e0fc0455f751c2e5617926e97aa2414d84a437477ab029b9ae0751c418658250f13b54cb8abc871bd543ec58e392acdf4195f DIST pypy-exe-7.3.8-1.x86.xpak 10179209 BLAKE2B e7d32ca389ab1dd92acc848caca0fb8e965f25f0ec9b3ca433984417d5979e4742926fcd5d6566eb89e19513b6fd02adcc1c5ef3305c52db84107cf14af1010a SHA512 df6086c046e6ad1da3d4d04dbc1bd6889b0ff760e6e10d4fd85c7add22cfaa31d6873dabaa18593aadc3e52d837043b3be1fec474c829debd79612adb7b0d07a -DIST pypy-exe-7.3.8_rc1-1.amd64.xpak 13739718 BLAKE2B c3da42a14872938b2a935f7ba1a3f9dcd9a4b7c20ad71270718dce032ce72e273ce571d490130a58a0b0fad62b13f3ca44ca9bc724ad14ee4d7470dbdf50b77d SHA512 9e281971bcd2be17d913f9e940b7db853961b147f050df9a2a2f3b4b8171489d65420a28e8402165f13b079b27861025c74ace56570d1d3580f20936287853cd -DIST pypy-exe-7.3.8_rc1-1.x86.xpak 10137853 BLAKE2B 8e65bcdd51b0704a30b8d013ac80d866764e3b8c66809af6b4abd0fecd707959eb1c4845087505851e9fde7e2094e0b83d6c2856c9237e6b67413045c8681cbb SHA512 46f13b018f14a9d4c85cf4d7dc64ce87ea8a4fdc547e695bd063437ba5618e2e70e7eee650555841756f7f9071de4ee46dfe9f91e90d0da790dbb0312730dd03 -DIST pypy-exe-7.3.8_rc2-1.amd64.xpak 13670807 BLAKE2B c244d8c16267a1b7dcffff8d89b9b869effb040bef9879d3fbeaede59cbb8e0cd987476b0f90b870b48f29e09ae6ee316d9dcbe2ded7e2cc62cd685a86d7c439 SHA512 8dec6b2b5fb8d66fcb8ed1d1a3d3e70a929396822cf0d24e5f61e866c611e4257458effb1b1ad10950430039c9cec16631d239629867aa586945f0d92dff27c9 -DIST pypy-exe-7.3.8_rc2-1.x86.xpak 10125981 BLAKE2B 616aef04f8562c7749ae702d72ea7182e9e36c62509601cc7531331d6e523e818ed2fe4b430ab81ee6451d04cb6494d11882b8b2c7ef2348b984ba9eb6f97011 SHA512 06b8eb127699b73b4d5bf049f226f02d831a5f6e163df9903d48efb1b001a57aabc5701cceac35d80b506dc83143009943529156609cb3724e0535b7454f374f diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.8.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.8.ebuild index 8a4403d27b04..cea4b178d7c2 100644 --- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.8.ebuild +++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.8.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}" LICENSE="MIT" SLOT="${PV%_p*}" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" RDEPEND=">=sys-libs/zlib-1.1.3:0/1 || ( diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.8_rc1.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.8_rc1.ebuild deleted file mode 100644 index 8a4403d27b04..000000000000 --- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.8_rc1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit pax-utils - -MY_P=pypy-exe-${PV}-1 -DESCRIPTION="PyPy executable (pre-built version)" -HOMEPAGE="https://www.pypy.org/" -SRC_URI=" - amd64? ( - https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak - -> ${MY_P}.amd64.xpak - ) - x86? ( - https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak - -> ${MY_P}.x86.xpak - )" -S="${WORKDIR}" - -LICENSE="MIT" -SLOT="${PV%_p*}" -KEYWORDS="" - -RDEPEND=">=sys-libs/zlib-1.1.3:0/1 - || ( - dev-libs/libffi-compat:7 - dev-libs/libffi:0/7 - ) - virtual/libintl:0/0 - dev-libs/expat:0/0 - app-arch/bzip2:0/1 - sys-libs/ncurses:0/6 - !dev-python/pypy-exe:${SLOT}" - -QA_PREBUILT=" - usr/lib/pypy2.7/pypy-c-${SLOT}" - -src_unpack() { - ebegin "Unpacking ${MY_P}.${ARCH}.xpak" - tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak") - eend ${?} || die "Unpacking ${MY_P} failed" -} - -src_install() { - insinto / - doins -r usr - fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}" - pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}" -} diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.8_rc2.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.8_rc2.ebuild deleted file mode 100644 index 8a4403d27b04..000000000000 --- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.8_rc2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit pax-utils - -MY_P=pypy-exe-${PV}-1 -DESCRIPTION="PyPy executable (pre-built version)" -HOMEPAGE="https://www.pypy.org/" -SRC_URI=" - amd64? ( - https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak - -> ${MY_P}.amd64.xpak - ) - x86? ( - https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak - -> ${MY_P}.x86.xpak - )" -S="${WORKDIR}" - -LICENSE="MIT" -SLOT="${PV%_p*}" -KEYWORDS="" - -RDEPEND=">=sys-libs/zlib-1.1.3:0/1 - || ( - dev-libs/libffi-compat:7 - dev-libs/libffi:0/7 - ) - virtual/libintl:0/0 - dev-libs/expat:0/0 - app-arch/bzip2:0/1 - sys-libs/ncurses:0/6 - !dev-python/pypy-exe:${SLOT}" - -QA_PREBUILT=" - usr/lib/pypy2.7/pypy-c-${SLOT}" - -src_unpack() { - ebegin "Unpacking ${MY_P}.${ARCH}.xpak" - tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak") - eend ${?} || die "Unpacking ${MY_P} failed" -} - -src_install() { - insinto / - doins -r usr - fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}" - pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}" -} diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest index d02ba55f2a12..dacc54da215f 100644 --- a/dev-python/pypy-exe/Manifest +++ b/dev-python/pypy-exe/Manifest @@ -1,8 +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-gentoo-patches-7.3.8rc1.tar.xz 7424 BLAKE2B 931fccd3415e0da7c0fa5a228fc1fec2006a9d12d3523222fc0618a901c161df9f149d09e354029b42ca2144bdeebbd228ec6025574d87d4b630fd0750bc4919 SHA512 c193610c46d4b02d1445073f12c3285ce053f5b860584b1c39bff48d5e800c609d40ff0eb91049cdf8f4bfdb4e7bb48d7059de98785e598349022602b97e5f2c -DIST pypy2.7-gentoo-patches-7.3.8rc2.tar.xz 7424 BLAKE2B 1d0e7e86cbc08ac3dc6f10fdb887bc4b634a9ac0aeeb39962b5cca85e05122c7dd8548848933d88f62508d3d2032f5f4abe1feea6cf06976659d142d451d0ffb SHA512 62d33bd700c28cd93617d69ccbbb3651fa794378583fdf584b2030f330b3a9bf55fba7d03539baacd9faac02e5d812b481c64b9c3f25cf304d780d162e8c3840 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 -DIST pypy2.7-v7.3.8rc1-src.tar.bz2 23267987 BLAKE2B 035aef49ff0e8b1caed24e87712364ca350fe9f51247eaf732a32458a756264a867ad1270d4edc500daba8dcf70ca8882eb7f381135961f7f48d784ffe8bc6ee SHA512 88184be129ca3698db4e04ae6d241b7c748626870400a100ee2b8bba6ae3c0508071e435adb204bd6b34642ff3c8b0b71643446a3b443cc4467d68591fd53ceb -DIST pypy2.7-v7.3.8rc2-src.tar.bz2 23272804 BLAKE2B 5ff559f603f06a44a6149dd898df3351f2de4c42219dbcf6e811e1120079e8979a3edb3c76a01a30400684bb8088eb8e15c0408b6ea0d3762eff87eca41a0021 SHA512 ab85b219d43d556d84847af116d3012706264571d6ebdc0b1242195cdc906f9a9073ce5f42e9e5b4a9d1f974fe103b64190c7f3e5b53766443a4b9b938f55d1c 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 e35d87754072..d051d82c202b 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="" +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= diff --git a/dev-python/pypy-exe/pypy-exe-7.3.8_rc1.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.8_rc1.ebuild deleted file mode 100644 index e35d87754072..000000000000 --- a/dev-python/pypy-exe/pypy-exe-7.3.8_rc1.ebuild +++ /dev/null @@ -1,178 +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 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="" -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_rc2.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.8_rc2.ebuild deleted file mode 100644 index e35d87754072..000000000000 --- a/dev-python/pypy-exe/pypy-exe-7.3.8_rc2.ebuild +++ /dev/null @@ -1,178 +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 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="" -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/Manifest b/dev-python/pypy/Manifest index d02ba55f2a12..dacc54da215f 100644 --- a/dev-python/pypy/Manifest +++ b/dev-python/pypy/Manifest @@ -1,8 +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-gentoo-patches-7.3.8rc1.tar.xz 7424 BLAKE2B 931fccd3415e0da7c0fa5a228fc1fec2006a9d12d3523222fc0618a901c161df9f149d09e354029b42ca2144bdeebbd228ec6025574d87d4b630fd0750bc4919 SHA512 c193610c46d4b02d1445073f12c3285ce053f5b860584b1c39bff48d5e800c609d40ff0eb91049cdf8f4bfdb4e7bb48d7059de98785e598349022602b97e5f2c -DIST pypy2.7-gentoo-patches-7.3.8rc2.tar.xz 7424 BLAKE2B 1d0e7e86cbc08ac3dc6f10fdb887bc4b634a9ac0aeeb39962b5cca85e05122c7dd8548848933d88f62508d3d2032f5f4abe1feea6cf06976659d142d451d0ffb SHA512 62d33bd700c28cd93617d69ccbbb3651fa794378583fdf584b2030f330b3a9bf55fba7d03539baacd9faac02e5d812b481c64b9c3f25cf304d780d162e8c3840 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 -DIST pypy2.7-v7.3.8rc1-src.tar.bz2 23267987 BLAKE2B 035aef49ff0e8b1caed24e87712364ca350fe9f51247eaf732a32458a756264a867ad1270d4edc500daba8dcf70ca8882eb7f381135961f7f48d784ffe8bc6ee SHA512 88184be129ca3698db4e04ae6d241b7c748626870400a100ee2b8bba6ae3c0508071e435adb204bd6b34642ff3c8b0b71643446a3b443cc4467d68591fd53ceb -DIST pypy2.7-v7.3.8rc2-src.tar.bz2 23272804 BLAKE2B 5ff559f603f06a44a6149dd898df3351f2de4c42219dbcf6e811e1120079e8979a3edb3c76a01a30400684bb8088eb8e15c0408b6ea0d3762eff87eca41a0021 SHA512 ab85b219d43d556d84847af116d3012706264571d6ebdc0b1242195cdc906f9a9073ce5f42e9e5b4a9d1f974fe103b64190c7f3e5b53766443a4b9b938f55d1c diff --git a/dev-python/pypy/pypy-7.3.8.ebuild b/dev-python/pypy/pypy-7.3.8.ebuild index baea47fe59a1..3ff6876b5f97 100644 --- a/dev-python/pypy/pypy-7.3.8.ebuild +++ b/dev-python/pypy/pypy-7.3.8.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src" LICENSE="MIT" # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")' SLOT="0/73" -KEYWORDS="" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="bzip2 gdbm +jit ncurses sqlite tk" RDEPEND=" @@ -41,9 +41,6 @@ src_prepare() { "${WORKDIR}/${PATCHSET}" ) default - - sed -e "s^@EPREFIX@^${EPREFIX}^" \ - -i lib-python/2.7/distutils/command/install.py || die } src_compile() { @@ -109,6 +106,11 @@ src_test() { --ignore=lib-python/2.7/test/test_urllib2net.py # lots of free space --ignore=lib-python/2.7/test/test_zipfile64.py + + # broken by expat-2.4.5 + --ignore=lib-python/2.7/test/test_minidom.py + --ignore=lib-python/2.7/test/test_xml_etree.py + --ignore=lib-python/2.7/test/test_xml_etree_c.py ) ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \ diff --git a/dev-python/pypy/pypy-7.3.8_rc1.ebuild b/dev-python/pypy/pypy-7.3.8_rc1.ebuild deleted file mode 100644 index baea47fe59a1..000000000000 --- a/dev-python/pypy/pypy-7.3.8_rc1.ebuild +++ /dev/null @@ -1,164 +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 - -PYPY_PV=${PV%_p*} -MY_P=pypy2.7-v${PYPY_PV/_} -PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}" - -DESCRIPTION="A fast, compliant alternative implementation of the Python language" -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" -# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")' -SLOT="0/73" -KEYWORDS="" -IUSE="bzip2 gdbm +jit ncurses sqlite tk" - -RDEPEND=" - || ( - >=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?] - >=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV} - ) - dev-libs/openssl:0= - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) - !<dev-python/pypy-bin-7.3.0:0" -DEPEND="${RDEPEND}" - -src_prepare() { - local PATCHES=( - "${WORKDIR}/${PATCHSET}" - ) - default - - sed -e "s^@EPREFIX@^${EPREFIX}^" \ - -i lib-python/2.7/distutils/command/install.py || die -} - -src_compile() { - # copy over to make sys.prefix happy - cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die - cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die - # (not installed by pypy) - rm pypy/module/cpyext/include/_numpypy/numpy/README || die - mv pypy/module/cpyext/include/* include/ || die - mv pypy/module/cpyext/parse/*.h include/ || die - pax-mark m pypy-c - - # verify the subslot - local soabi=$(./pypy-c -c 'import sysconfig; print sysconfig.get_config_var("SOABI")') - [[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}" - - einfo "Generating caches and CFFI modules ..." - - # Generate Grammar and PatternGrammar pickles. - ./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ - || die "Generation of Grammar and PatternGrammar pickles failed" - - # Generate cffi modules - # Please keep in sync with pypy/tool/build_cffi_imports.py! - cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource ) - 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 - ../pypy-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=2d3acf18 - local local_cksum=$(../pypy-c -c ' -from pypy_tools.build_cffi_imports import cffi_build_scripts as x; -import binascii, json; -print("%08x" % (binascii.crc32(json.dumps(x)),))') - 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 - - local ignored_tests=( - # network - --ignore=lib-python/2.7/test/test_urllibnet.py - --ignore=lib-python/2.7/test/test_urllib2net.py - # lots of free space - --ignore=lib-python/2.7/test/test_zipfile64.py - ) - - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \ - "${ignored_tests[@]}" lib-python || die -} - -src_install() { - local dest=/usr/lib/pypy2.7 - einfo "Installing PyPy ..." - dosym pypy-c-${PYPY_PV} "${dest}/pypy-c" - insinto "${dest}" - # preserve mtimes to avoid obsoleting caches - insopts -p - doins -r include lib_pypy lib-python - - # replace copied headers with symlinks - for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do - dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}" - done - - dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy - dodoc README.rst - - if ! use gdbm; then - rm -r "${ED}${dest}"/lib_pypy/gdbm.py \ - "${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die - fi - if ! use sqlite; then - rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \ - "${ED}${dest}"/lib_pypy/_sqlite3.py \ - "${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die - fi - if ! use tk; then - rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \ - "${ED}${dest}"/lib_pypy/_tkinter \ - "${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die - fi - - local -x EPYTHON=pypy - local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV} - # temporarily copy to build tree to facilitate module builds - cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die - - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_moduleinto /usr/lib/pypy2.7/site-packages - python_domodule epython.py - - einfo "Byte-compiling Python standard library..." - python_optimize "${ED}${dest}" - - # remove to avoid collisions - rm "${PYTHON}" || die -} diff --git a/dev-python/pypy/pypy-7.3.8_rc2.ebuild b/dev-python/pypy/pypy-7.3.8_rc2.ebuild deleted file mode 100644 index baea47fe59a1..000000000000 --- a/dev-python/pypy/pypy-7.3.8_rc2.ebuild +++ /dev/null @@ -1,164 +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 - -PYPY_PV=${PV%_p*} -MY_P=pypy2.7-v${PYPY_PV/_} -PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}" - -DESCRIPTION="A fast, compliant alternative implementation of the Python language" -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" -# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")' -SLOT="0/73" -KEYWORDS="" -IUSE="bzip2 gdbm +jit ncurses sqlite tk" - -RDEPEND=" - || ( - >=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?] - >=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV} - ) - dev-libs/openssl:0= - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) - !<dev-python/pypy-bin-7.3.0:0" -DEPEND="${RDEPEND}" - -src_prepare() { - local PATCHES=( - "${WORKDIR}/${PATCHSET}" - ) - default - - sed -e "s^@EPREFIX@^${EPREFIX}^" \ - -i lib-python/2.7/distutils/command/install.py || die -} - -src_compile() { - # copy over to make sys.prefix happy - cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die - cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die - # (not installed by pypy) - rm pypy/module/cpyext/include/_numpypy/numpy/README || die - mv pypy/module/cpyext/include/* include/ || die - mv pypy/module/cpyext/parse/*.h include/ || die - pax-mark m pypy-c - - # verify the subslot - local soabi=$(./pypy-c -c 'import sysconfig; print sysconfig.get_config_var("SOABI")') - [[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}" - - einfo "Generating caches and CFFI modules ..." - - # Generate Grammar and PatternGrammar pickles. - ./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ - || die "Generation of Grammar and PatternGrammar pickles failed" - - # Generate cffi modules - # Please keep in sync with pypy/tool/build_cffi_imports.py! - cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource ) - 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 - ../pypy-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=2d3acf18 - local local_cksum=$(../pypy-c -c ' -from pypy_tools.build_cffi_imports import cffi_build_scripts as x; -import binascii, json; -print("%08x" % (binascii.crc32(json.dumps(x)),))') - 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 - - local ignored_tests=( - # network - --ignore=lib-python/2.7/test/test_urllibnet.py - --ignore=lib-python/2.7/test/test_urllib2net.py - # lots of free space - --ignore=lib-python/2.7/test/test_zipfile64.py - ) - - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \ - "${ignored_tests[@]}" lib-python || die -} - -src_install() { - local dest=/usr/lib/pypy2.7 - einfo "Installing PyPy ..." - dosym pypy-c-${PYPY_PV} "${dest}/pypy-c" - insinto "${dest}" - # preserve mtimes to avoid obsoleting caches - insopts -p - doins -r include lib_pypy lib-python - - # replace copied headers with symlinks - for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do - dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}" - done - - dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy - dodoc README.rst - - if ! use gdbm; then - rm -r "${ED}${dest}"/lib_pypy/gdbm.py \ - "${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die - fi - if ! use sqlite; then - rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \ - "${ED}${dest}"/lib_pypy/_sqlite3.py \ - "${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die - fi - if ! use tk; then - rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \ - "${ED}${dest}"/lib_pypy/_tkinter \ - "${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die - fi - - local -x EPYTHON=pypy - local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV} - # temporarily copy to build tree to facilitate module builds - cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die - - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_moduleinto /usr/lib/pypy2.7/site-packages - python_domodule epython.py - - einfo "Byte-compiling Python standard library..." - python_optimize "${ED}${dest}" - - # remove to avoid collisions - rm "${PYTHON}" || die -} diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest index 1cca392ed82e..a6e72860e85d 100644 --- a/dev-python/pypy3-exe-bin/Manifest +++ b/dev-python/pypy3-exe-bin/Manifest @@ -2,9 +2,3 @@ DIST pypy3-exe-7.3.7-1.amd64.xpak 12149428 BLAKE2B 468fe50d8b607793438bc59179acb DIST pypy3-exe-7.3.7-1.x86.xpak 9221421 BLAKE2B fc24f93533127f48ffc5974dfd3eb4611442489aee6318ccb911a2f3e3d234bc44c659309006ffe55eb6de3a00915fa3aaf6dc50e4efb1adb668d0d38281cf3c SHA512 9322a25ad230615cc96b81448a0591f730a5d09b57c02259412d427290934074baeb48f58f3829d393137252d5cf1b3f0fdd3b50d9194d69ea3ab38fbe83abac DIST pypy3-exe-7.3.8-1.amd64.xpak 12480863 BLAKE2B 4db76687e1662a9674dcf2ac863cf837b27551874613ee94281cd0d2e701214fc65181ae54a52246d8d0cd01631e0a35fe0c044ea916a488e53aa6e8850c95c4 SHA512 dee849a1e066ef28ab1bedd37cc3a89a087f5cf44d2144862df7825880a1b6bd3238dbe94e4ca47a2009945cb716b8720bec42e32228afeaebd69d5ac6c1e077 DIST pypy3-exe-7.3.8-1.x86.xpak 9211472 BLAKE2B d0fd9fc64fb29367dfa017ac9654c699f11386f4a661cfad12cbb2b543f6ab4bf74a9f5131da3ae1307d03fce1d801d4b04c9bdd43c2ee42592e8658c91fae39 SHA512 5311a7aa24b8ea24ee408f3f0ff1efb14ca9875d36991f3e842819841d304a3df000679712b6e2d00095590bc684c262c44a4f9ad8e41fadaf0b0e0ffb0fc220 -DIST pypy3-exe-7.3.8_rc1-1.amd64.xpak 12424506 BLAKE2B 32d4c9a8f82ff1940608848cf497124bf628eebcc14f8a118819afca22b0055d010440c657c546449bd4fdc17d4d1933b5d236ab8a6e21cf1aea48a09412c3e6 SHA512 0e8c8b6d287bea00666f53f4fea7d339d5954ebca078ca3f30f0764ab8825da0655464c7c02bac26d6eca66e7915d97d8e4c1ba86e01a408eb9f0741e470f52c -DIST pypy3-exe-7.3.8_rc1-1.x86.xpak 9226302 BLAKE2B 98efa1ae5f77d0dfb7eb9189a0088177df80271bf41069e14e221e2d8bf645b65b518b8aed43903df5562f1cd9626583dada1c0e617e8ab0c4481d61adc4c8f1 SHA512 f42131ecb9fbea76f250f3f2772e21fd2e562df8c043eb480bfb8d16e837ea24bd8c5db7d70c5d5d97eb9f22c00f39216989876bd19efc76e3854025a5bbf317 -DIST pypy3-exe-7.3.8_rc1_p2-1.amd64.xpak 12426733 BLAKE2B b57e4cb06e539b79f08f6f7b17de855265f317d46d391eb35a8aaff2031146a7c3bcce6ece24f3d08eb47918c2be4ae4b10c7dd3eb35c6f1a409cf57c4db040b SHA512 ded505bdc02a467d60359cae79321a1b99c333cbfc242eef8a15d966c12d87806e16c9e9a98435b3759ac8eefd286946e0a1c32907620daa2ee35aef9385096b -DIST pypy3-exe-7.3.8_rc1_p2-1.x86.xpak 9212249 BLAKE2B 7de30c5cd8bc3d04fa9a7bac7251b5ef54b038a76a42df60f2aabade65b9b9f4b0199cda45c61dd2d775d8a2c964efbc1ded54a014242dee984b7922108df993 SHA512 b9dd7135f33a14f4f2684762a7590d77a4fb6c0711f7bc86570d031f1e7bd9abf69fbbf9f33a841eff04666af0f94d39f0c2aaebe1fefb7de846a9d115673abe -DIST pypy3-exe-7.3.8_rc2-1.amd64.xpak 12470636 BLAKE2B f1ca683973425631bdee50fa63f3d8daa92335bdb9f6fe4fcddabf89e1b84c66af53d237b12b57153e715a05b111ec6eb907d246604b524c6f601935587eecf7 SHA512 c11cbbfd6f58592afda4d80a8e0299478eadddc60718635a625bbe020a50f4e8cecd44f998cf4408356d0f284f7c6d228f8217aee5b8d098f26f41a512575524 -DIST pypy3-exe-7.3.8_rc2-1.x86.xpak 9223737 BLAKE2B 35a94c795f7e1d300e630356b6114a102ce6367989cbb3f0d3cc93257ed53f401768780daffb91450e482b8e1081367789a07777e3af6359e2aaa2abbaf726f9 SHA512 1a5db6dcf86f0ef05797b508adb68b15a22e518482c2e669a8962359189d26b2c02f1d76b28a0ba92853f5a6a338722f0f1a0dd089847a02cf0a256962c08ac9 diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8.ebuild index 9170699865c0..d55bb03c5536 100644 --- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8.ebuild +++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}" LICENSE="MIT" SLOT="3.9-${PV%_p*}" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" RDEPEND=">=sys-libs/zlib-1.1.3:0/1 || ( diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8_rc1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8_rc1.ebuild deleted file mode 100644 index 9170699865c0..000000000000 --- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8_rc1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pax-utils - -MY_P=pypy3-exe-${PV}-1 -DESCRIPTION="PyPy3 executable (pre-built version)" -HOMEPAGE="https://www.pypy.org/" -SRC_URI=" - amd64? ( - https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak - -> ${MY_P}.amd64.xpak - ) - x86? ( - https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak - -> ${MY_P}.x86.xpak - )" -S="${WORKDIR}" - -LICENSE="MIT" -SLOT="3.9-${PV%_p*}" -KEYWORDS="" - -RDEPEND=">=sys-libs/zlib-1.1.3:0/1 - || ( - dev-libs/libffi-compat:7 - dev-libs/libffi:0/7 - ) - virtual/libintl:0/0 - dev-libs/expat:0/0 - app-arch/bzip2:0/1 - sys-libs/ncurses:0/6 - !dev-python/pypy-exe:${SLOT}" - -PYPY_PV=${PV%_p*} -QA_PREBUILT=" - usr/bin/pypy3.9-c-${PYPY_PV}" - -src_unpack() { - ebegin "Unpacking ${MY_P}.${ARCH}.xpak" - tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak") - eend ${?} || die "Unpacking ${MY_P} failed" -} - -src_install() { - insinto / - doins -r usr - fperms +x "/usr/bin/pypy3.9-c-${PYPY_PV}" - pax-mark m "${ED}/usr/bin/pypy3.9-c-${PYPY_PV}" -} diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8_rc1_p2.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8_rc1_p2.ebuild deleted file mode 100644 index 9170699865c0..000000000000 --- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8_rc1_p2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pax-utils - -MY_P=pypy3-exe-${PV}-1 -DESCRIPTION="PyPy3 executable (pre-built version)" -HOMEPAGE="https://www.pypy.org/" -SRC_URI=" - amd64? ( - https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak - -> ${MY_P}.amd64.xpak - ) - x86? ( - https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak - -> ${MY_P}.x86.xpak - )" -S="${WORKDIR}" - -LICENSE="MIT" -SLOT="3.9-${PV%_p*}" -KEYWORDS="" - -RDEPEND=">=sys-libs/zlib-1.1.3:0/1 - || ( - dev-libs/libffi-compat:7 - dev-libs/libffi:0/7 - ) - virtual/libintl:0/0 - dev-libs/expat:0/0 - app-arch/bzip2:0/1 - sys-libs/ncurses:0/6 - !dev-python/pypy-exe:${SLOT}" - -PYPY_PV=${PV%_p*} -QA_PREBUILT=" - usr/bin/pypy3.9-c-${PYPY_PV}" - -src_unpack() { - ebegin "Unpacking ${MY_P}.${ARCH}.xpak" - tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak") - eend ${?} || die "Unpacking ${MY_P} failed" -} - -src_install() { - insinto / - doins -r usr - fperms +x "/usr/bin/pypy3.9-c-${PYPY_PV}" - pax-mark m "${ED}/usr/bin/pypy3.9-c-${PYPY_PV}" -} diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8_rc2.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8_rc2.ebuild deleted file mode 100644 index 9170699865c0..000000000000 --- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8_rc2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pax-utils - -MY_P=pypy3-exe-${PV}-1 -DESCRIPTION="PyPy3 executable (pre-built version)" -HOMEPAGE="https://www.pypy.org/" -SRC_URI=" - amd64? ( - https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak - -> ${MY_P}.amd64.xpak - ) - x86? ( - https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak - -> ${MY_P}.x86.xpak - )" -S="${WORKDIR}" - -LICENSE="MIT" -SLOT="3.9-${PV%_p*}" -KEYWORDS="" - -RDEPEND=">=sys-libs/zlib-1.1.3:0/1 - || ( - dev-libs/libffi-compat:7 - dev-libs/libffi:0/7 - ) - virtual/libintl:0/0 - dev-libs/expat:0/0 - app-arch/bzip2:0/1 - sys-libs/ncurses:0/6 - !dev-python/pypy-exe:${SLOT}" - -PYPY_PV=${PV%_p*} -QA_PREBUILT=" - usr/bin/pypy3.9-c-${PYPY_PV}" - -src_unpack() { - ebegin "Unpacking ${MY_P}.${ARCH}.xpak" - tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak") - eend ${?} || die "Unpacking ${MY_P} failed" -} - -src_install() { - insinto / - doins -r usr - fperms +x "/usr/bin/pypy3.9-c-${PYPY_PV}" - pax-mark m "${ED}/usr/bin/pypy3.9-c-${PYPY_PV}" -} diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest index cabb480dca8c..782c1546b167 100644 --- a/dev-python/pypy3-exe/Manifest +++ b/dev-python/pypy3-exe/Manifest @@ -1,9 +1,4 @@ DIST pypy3.8-gentoo-patches-7.3.7.tar.xz 4396 BLAKE2B adc33a02ada4d22eae0484292ec6cc295805d9f254b7a9110c622628aa40011621a1833ca62d3251e4e5056c406f648e7ad0439bd60e77c38808dd9df46973a5 SHA512 1cda8467de2d749d98fa20d7d200b5f96dae0ca68cf44a054d03f3f148bc3946ba1f1c474ac0336560f79c78b3eddcd4ba24386e83de283c83475b8e4b75bdf8 DIST pypy3.8-v7.3.7-src.tar.bz2 24375444 BLAKE2B 44fe19ee63d95243c499ecb0b84e77873c73da93320b1e028a5c6c4b167441d223812dc66b16e070308cba48c4d8774738f827319cce9d1769b3f4346e15487c SHA512 9e6701cc441d5535968656cfb0cfa9076c364f9ba32bc6f0ef64f06ab343281e2458dbe88791c0e02401457fbf80d367f397fc904f6146bff68e04a15e05fda2 DIST pypy3.9-gentoo-patches-7.3.8.tar.xz 1568 BLAKE2B 0011188de7b5757964bd13c49d5995a656a721acd54e1d77f7e77fac7420a2a56ca75eb42709e2304a771fa69c982fc6901e9fc9580ab8e8b35e7bb8b0cc83a6 SHA512 1064e987b7233fc55f94bd49aeeab9a9fd9322e90798439ad9a4c35020ca923fe0670e47406ab180a6f8e7afd65d03be23427d4fa43befa3c0ce172028e1a09f -DIST pypy3.9-gentoo-patches-7.3.8rc1.tar.xz 1232 BLAKE2B 9f56ed8fb2e40a5a52a30cd43973fa8ff777ffee49d07c72a1a15cac5be57b6e9531671832abb2f9d645b75e070f8fedc13197b19d680adc718bc5294be30418 SHA512 ff0aa40124270d1b4765aac99c86968ef32f26b4b59d073a59ea0883958d964fc4bed668e5b8b304f7d7c97d50040c1650788ae196d33c53e276f869ba57e841 -DIST pypy3.9-gentoo-patches-7.3.8rc1_p2.tar.xz 7252 BLAKE2B 9d7b908f8506053600694dd9e00aac4cbed9a999935a3468309103070930972751b0838eb5fc15063895f3090815aeef7e7603d5f9e21a99b65f658ccb1592e0 SHA512 c699d11e3342ef0f2ee3a5ccbb6a18a6f7ecd5513b553f1c2b0cb0aea59992603c360cf9b995a0146e08f43ff71483d94bf117a5cddbe7e83b0fadc9eafd03b7 -DIST pypy3.9-gentoo-patches-7.3.8rc2.tar.xz 1568 BLAKE2B 983ccd0d7482a4542cf2cc7d66b5c515051cd9bdcc43b56ca932ddd7fe15b13d097f0257108fb82ef2619f468fcaa2e549be0ae115ac2635e867206f1d0a4431 SHA512 a8a9e477563d5bb64c7f1f401645f783f66e0a338e6ae44f4e5a5c11152ebca1232f0ce14270f6087b855137f00ba2dc57bfcccb4935eb5fb50c34e7791bb3a7 DIST pypy3.9-v7.3.8-src.tar.bz2 26277823 BLAKE2B 343fa4a57b69936a586acb036506e25c8de3a9761eb6622ef7266c136a1dc977cabc23969917bc2369fd73b1ae6fef731d81536179107f2d731352e6f5387bf9 SHA512 aed018738af7a225f516ec37d059d539f486d9dd427fe000805147b197f496d5fcb0387e47008524753ad18224aebeb1e68f9e2093acbe37468e02bff92f7126 -DIST pypy3.9-v7.3.8rc1-src.tar.bz2 26254113 BLAKE2B fb4eca88080eee91d4ec8886abb484de11997c73d5b60c5f9acab7cd7b8cbc9d80190608bb905d82b6bcd1bbf602b6afc53257c9263458fc51a2b5f32510a164 SHA512 d1b1942fbacc7f8d642c85ceb4c4c9796e73bd5836615e2db81f4ddabf9e4f94c230f2d946ea9c49b642d41304aeed3906df1931a52ec40c56d14f1028139978 -DIST pypy3.9-v7.3.8rc2-src.tar.bz2 26277719 BLAKE2B 7853d30983e43e20ee90af9a380c0c368c7d4cc0fd58c7e4ff3db80bffabdfefb7cb31a2d39e00f99ff0f34f23be77b9d7302926baa30a348c1ffde52f641937 SHA512 40fc0dd45bf24bc9a1bfa259bce11ee706ac73dd29f66a3e2a16bb9ca5c6683d4aedaf21394875ab3facb31eb65f4d497eaa3c10ef4394251ecb4b4a85511197 diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.8.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.8.ebuild index 96e7ab01222b..8c18a537ee0f 100644 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.8.ebuild +++ b/dev-python/pypy3-exe/pypy3-exe-7.3.8.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}-src" LICENSE="MIT" SLOT="3.9-${PYPY_PV}" -KEYWORDS="" +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= diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.8_rc1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.8_rc1.ebuild deleted file mode 100644 index 96e7ab01222b..000000000000 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.8_rc1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# 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.9-v${PYPY_PV/_} -PATCHSET="pypy3.9-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="3.9-${PYPY_PV}" -KEYWORDS="" -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.9-c pypy3.9-c-${PYPY_PV} - insinto /usr/include/pypy3.9/${PYPY_PV} - doins *.h - pax-mark m "${ED}/usr/bin/pypy3.9-c-${PYPY_PV}" -} diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.8_rc1_p2.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.8_rc1_p2.ebuild deleted file mode 100644 index 96e7ab01222b..000000000000 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.8_rc1_p2.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# 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.9-v${PYPY_PV/_} -PATCHSET="pypy3.9-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="3.9-${PYPY_PV}" -KEYWORDS="" -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.9-c pypy3.9-c-${PYPY_PV} - insinto /usr/include/pypy3.9/${PYPY_PV} - doins *.h - pax-mark m "${ED}/usr/bin/pypy3.9-c-${PYPY_PV}" -} diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.8_rc2.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.8_rc2.ebuild deleted file mode 100644 index 96e7ab01222b..000000000000 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.8_rc2.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# 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.9-v${PYPY_PV/_} -PATCHSET="pypy3.9-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="3.9-${PYPY_PV}" -KEYWORDS="" -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.9-c pypy3.9-c-${PYPY_PV} - insinto /usr/include/pypy3.9/${PYPY_PV} - doins *.h - pax-mark m "${ED}/usr/bin/pypy3.9-c-${PYPY_PV}" -} diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest index fb2091d3ad10..782c1546b167 100644 --- a/dev-python/pypy3/Manifest +++ b/dev-python/pypy3/Manifest @@ -1,10 +1,4 @@ DIST pypy3.8-gentoo-patches-7.3.7.tar.xz 4396 BLAKE2B adc33a02ada4d22eae0484292ec6cc295805d9f254b7a9110c622628aa40011621a1833ca62d3251e4e5056c406f648e7ad0439bd60e77c38808dd9df46973a5 SHA512 1cda8467de2d749d98fa20d7d200b5f96dae0ca68cf44a054d03f3f148bc3946ba1f1c474ac0336560f79c78b3eddcd4ba24386e83de283c83475b8e4b75bdf8 DIST pypy3.8-v7.3.7-src.tar.bz2 24375444 BLAKE2B 44fe19ee63d95243c499ecb0b84e77873c73da93320b1e028a5c6c4b167441d223812dc66b16e070308cba48c4d8774738f827319cce9d1769b3f4346e15487c SHA512 9e6701cc441d5535968656cfb0cfa9076c364f9ba32bc6f0ef64f06ab343281e2458dbe88791c0e02401457fbf80d367f397fc904f6146bff68e04a15e05fda2 DIST pypy3.9-gentoo-patches-7.3.8.tar.xz 1568 BLAKE2B 0011188de7b5757964bd13c49d5995a656a721acd54e1d77f7e77fac7420a2a56ca75eb42709e2304a771fa69c982fc6901e9fc9580ab8e8b35e7bb8b0cc83a6 SHA512 1064e987b7233fc55f94bd49aeeab9a9fd9322e90798439ad9a4c35020ca923fe0670e47406ab180a6f8e7afd65d03be23427d4fa43befa3c0ce172028e1a09f -DIST pypy3.9-gentoo-patches-7.3.8rc1_p1.tar.xz 1720 BLAKE2B 2d72eca8525104753f67db2c55ea799c24dee1969b484f1d1cb7fb3295924a9980aa84cdf1a6045ee463a64f68893dfb4e0f161fe4e3f210a5976283a09e1e48 SHA512 1c87301fad10764b754bc852cf7216b58792a2583026bef05e6ea278ea941486cffd36eec810af2e56f99c8ed9f56e7f08b42d8bc03bd3c5d55b044411da0beb -DIST pypy3.9-gentoo-patches-7.3.8rc1_p2.tar.xz 7252 BLAKE2B 9d7b908f8506053600694dd9e00aac4cbed9a999935a3468309103070930972751b0838eb5fc15063895f3090815aeef7e7603d5f9e21a99b65f658ccb1592e0 SHA512 c699d11e3342ef0f2ee3a5ccbb6a18a6f7ecd5513b553f1c2b0cb0aea59992603c360cf9b995a0146e08f43ff71483d94bf117a5cddbe7e83b0fadc9eafd03b7 -DIST pypy3.9-gentoo-patches-7.3.8rc1_p3.tar.xz 7960 BLAKE2B 195e2f581e16f97701848efa5fd11d7852ffedfd4c2a0d3b0948f7b43440a3b45823c0a38af04dad68789a9cc0f9f023d3d5e4754d8f7469c40a4717fd3276cb SHA512 539bf4785722ba1ef5e13c9705ba9cbc60dff12190b0cc5fd8253bda51304c399aefe3b725685a7a98a9d798c3561f28351ef1087b5bc26377ffb485b588497e -DIST pypy3.9-gentoo-patches-7.3.8rc2.tar.xz 1568 BLAKE2B 983ccd0d7482a4542cf2cc7d66b5c515051cd9bdcc43b56ca932ddd7fe15b13d097f0257108fb82ef2619f468fcaa2e549be0ae115ac2635e867206f1d0a4431 SHA512 a8a9e477563d5bb64c7f1f401645f783f66e0a338e6ae44f4e5a5c11152ebca1232f0ce14270f6087b855137f00ba2dc57bfcccb4935eb5fb50c34e7791bb3a7 DIST pypy3.9-v7.3.8-src.tar.bz2 26277823 BLAKE2B 343fa4a57b69936a586acb036506e25c8de3a9761eb6622ef7266c136a1dc977cabc23969917bc2369fd73b1ae6fef731d81536179107f2d731352e6f5387bf9 SHA512 aed018738af7a225f516ec37d059d539f486d9dd427fe000805147b197f496d5fcb0387e47008524753ad18224aebeb1e68f9e2093acbe37468e02bff92f7126 -DIST pypy3.9-v7.3.8rc1-src.tar.bz2 26254113 BLAKE2B fb4eca88080eee91d4ec8886abb484de11997c73d5b60c5f9acab7cd7b8cbc9d80190608bb905d82b6bcd1bbf602b6afc53257c9263458fc51a2b5f32510a164 SHA512 d1b1942fbacc7f8d642c85ceb4c4c9796e73bd5836615e2db81f4ddabf9e4f94c230f2d946ea9c49b642d41304aeed3906df1931a52ec40c56d14f1028139978 -DIST pypy3.9-v7.3.8rc2-src.tar.bz2 26277719 BLAKE2B 7853d30983e43e20ee90af9a380c0c368c7d4cc0fd58c7e4ff3db80bffabdfefb7cb31a2d39e00f99ff0f34f23be77b9d7302926baa30a348c1ffde52f641937 SHA512 40fc0dd45bf24bc9a1bfa259bce11ee706ac73dd29f66a3e2a16bb9ca5c6683d4aedaf21394875ab3facb31eb65f4d497eaa3c10ef4394251ecb4b4a85511197 diff --git a/dev-python/pypy3/pypy3-7.3.8.ebuild b/dev-python/pypy3/pypy3-7.3.8.ebuild index a08c44184921..1882ac559133 100644 --- a/dev-python/pypy3/pypy3-7.3.8.ebuild +++ b/dev-python/pypy3/pypy3-7.3.8.ebuild @@ -20,7 +20,7 @@ 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" -KEYWORDS="" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="bzip2 gdbm +jit ncurses sqlite test tk" # many tests are failing upstream # see https://buildbot.pypy.org/summary?branch=py3.9 diff --git a/dev-python/pypy3/pypy3-7.3.8_rc1_p1.ebuild b/dev-python/pypy3/pypy3-7.3.8_rc1_p1.ebuild deleted file mode 100644 index a08c44184921..000000000000 --- a/dev-python/pypy3/pypy3-7.3.8_rc1_p1.ebuild +++ /dev/null @@ -1,183 +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/" -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" -KEYWORDS="" -IUSE="bzip2 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}: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= - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) - !<dev-python/pypy3-bin-7.3.0: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 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))') - [[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}" - - einfo "Generating caches and CFFI modules ..." - - # Generate Grammar and PatternGrammar pickles. - ./pypy3.9-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ - || die "Generation of Grammar and PatternGrammar pickles failed" - - # 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 -c ' -from pypy_tools.build_cffi_imports import cffi_build_scripts as x; -import binascii, json; -print("%08x" % (binascii.crc32(json.dumps(x).encode()),))') - 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 - 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 - - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_moduleinto "${dest}"/site-packages - python_domodule epython.py - - 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.8_rc1_p2.ebuild b/dev-python/pypy3/pypy3-7.3.8_rc1_p2.ebuild deleted file mode 100644 index a08c44184921..000000000000 --- a/dev-python/pypy3/pypy3-7.3.8_rc1_p2.ebuild +++ /dev/null @@ -1,183 +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/" -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" -KEYWORDS="" -IUSE="bzip2 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}: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= - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) - !<dev-python/pypy3-bin-7.3.0: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 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))') - [[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}" - - einfo "Generating caches and CFFI modules ..." - - # Generate Grammar and PatternGrammar pickles. - ./pypy3.9-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ - || die "Generation of Grammar and PatternGrammar pickles failed" - - # 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 -c ' -from pypy_tools.build_cffi_imports import cffi_build_scripts as x; -import binascii, json; -print("%08x" % (binascii.crc32(json.dumps(x).encode()),))') - 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 - 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 - - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_moduleinto "${dest}"/site-packages - python_domodule epython.py - - 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.8_rc1_p3.ebuild b/dev-python/pypy3/pypy3-7.3.8_rc1_p3.ebuild deleted file mode 100644 index a08c44184921..000000000000 --- a/dev-python/pypy3/pypy3-7.3.8_rc1_p3.ebuild +++ /dev/null @@ -1,183 +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/" -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" -KEYWORDS="" -IUSE="bzip2 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}: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= - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) - !<dev-python/pypy3-bin-7.3.0: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 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))') - [[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}" - - einfo "Generating caches and CFFI modules ..." - - # Generate Grammar and PatternGrammar pickles. - ./pypy3.9-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ - || die "Generation of Grammar and PatternGrammar pickles failed" - - # 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 -c ' -from pypy_tools.build_cffi_imports import cffi_build_scripts as x; -import binascii, json; -print("%08x" % (binascii.crc32(json.dumps(x).encode()),))') - 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 - 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 - - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_moduleinto "${dest}"/site-packages - python_domodule epython.py - - 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.8_rc2.ebuild b/dev-python/pypy3/pypy3-7.3.8_rc2.ebuild deleted file mode 100644 index a08c44184921..000000000000 --- a/dev-python/pypy3/pypy3-7.3.8_rc2.ebuild +++ /dev/null @@ -1,183 +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/" -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" -KEYWORDS="" -IUSE="bzip2 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}: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= - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) - !<dev-python/pypy3-bin-7.3.0: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 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))') - [[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}" - - einfo "Generating caches and CFFI modules ..." - - # Generate Grammar and PatternGrammar pickles. - ./pypy3.9-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ - || die "Generation of Grammar and PatternGrammar pickles failed" - - # 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 -c ' -from pypy_tools.build_cffi_imports import cffi_build_scripts as x; -import binascii, json; -print("%08x" % (binascii.crc32(json.dumps(x).encode()),))') - 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 - 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 - - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_moduleinto "${dest}"/site-packages - python_domodule epython.py - - einfo "Byte-compiling Python standard library..." - python_optimize "${ED}${dest}" - - # remove to avoid collisions - rm "${PYTHON}" || die -} |