From 5dec04bbb4cd84fa7b9147dfe8996496ab646ea8 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [feature/flatten]" Date: Fri, 25 Sep 2020 22:44:50 +0000 Subject: Updating liguros repo --- .../PyQt5-python2/PyQt5-python2-5.14.2-r1.ebuild | 1 + dev-python/iniconfig/iniconfig-1.0.0.ebuild | 2 +- dev-python/notify2/notify2-0.3.1-r2.ebuild | 33 ++++ dev-python/pypy-exe/Manifest | 2 +- dev-python/pypy-exe/pypy-exe-7.3.2.ebuild | 162 ++++++++++++++++ dev-python/pypy-exe/pypy-exe-7.3.2_rc2.ebuild | 162 ---------------- dev-python/pypy/Manifest | 2 +- dev-python/pypy/pypy-7.3.2.ebuild | 175 +++++++++++++++++ dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild | 175 ----------------- dev-python/pypy3-exe/Manifest | 4 +- dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild | 151 +++++++++++++++ dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild | 152 +++++++++++++++ dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2.ebuild | 151 --------------- .../pypy3-exe/pypy3-exe-7.3.2_rc2_p37.ebuild | 152 --------------- dev-python/pypy3/Manifest | 4 +- dev-python/pypy3/pypy3-7.3.2.ebuild | 207 +++++++++++++++++++++ dev-python/pypy3/pypy3-7.3.2_p37.ebuild | 178 ++++++++++++++++++ dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild | 207 --------------------- dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild | 178 ------------------ dev-python/pytest/pytest-6.0.1.ebuild | 2 +- 20 files changed, 1067 insertions(+), 1033 deletions(-) create mode 100644 dev-python/notify2/notify2-0.3.1-r2.ebuild create mode 100644 dev-python/pypy-exe/pypy-exe-7.3.2.ebuild delete mode 100644 dev-python/pypy-exe/pypy-exe-7.3.2_rc2.ebuild create mode 100644 dev-python/pypy/pypy-7.3.2.ebuild delete mode 100644 dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild create mode 100644 dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild create mode 100644 dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild delete mode 100644 dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2.ebuild delete mode 100644 dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2_p37.ebuild create mode 100644 dev-python/pypy3/pypy3-7.3.2.ebuild create mode 100644 dev-python/pypy3/pypy3-7.3.2_p37.ebuild delete mode 100644 dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild delete mode 100644 dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild (limited to 'dev-python') diff --git a/dev-python/PyQt5-python2/PyQt5-python2-5.14.2-r1.ebuild b/dev-python/PyQt5-python2/PyQt5-python2-5.14.2-r1.ebuild index 1799e01f1a9c..d3f61ce7177e 100644 --- a/dev-python/PyQt5-python2/PyQt5-python2-5.14.2-r1.ebuild +++ b/dev-python/PyQt5-python2/PyQt5-python2-5.14.2-r1.ebuild @@ -57,6 +57,7 @@ REQUIRED_USE=" QT_PV="5.12:5" RDEPEND=" + !dev-python/PyQt5[python_targets_python2_7] ${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/enum34[${PYTHON_USEDEP}] diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild index 60d5234aff69..4cde9be78827 100644 --- a/dev-python/iniconfig/iniconfig-1.0.0.ebuild +++ b/dev-python/iniconfig/iniconfig-1.0.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]" diff --git a/dev-python/notify2/notify2-0.3.1-r2.ebuild b/dev-python/notify2/notify2-0.3.1-r2.ebuild new file mode 100644 index 000000000000..1a165cade8b1 --- /dev/null +++ b/dev-python/notify2/notify2-0.3.1-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit distutils-r1 virtualx + +DESCRIPTION="Python interface to DBus notifications." +HOMEPAGE="https://bitbucket.org/takluyver/pynotify2" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="examples" + +RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]" +BDEPEND="test? ( sys-apps/dbus[X] )" + +python_test() { + virtx ${EPYTHON} test_notify2.py +} + +python_install_all() { + if use examples; then + rm examples/notify2.py || die + dodoc -r examples + fi + distutils-r1_python_install_all +} diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest index 0fb812e22b21..7ae8a9113a1d 100644 --- a/dev-python/pypy-exe/Manifest +++ b/dev-python/pypy-exe/Manifest @@ -1,2 +1,2 @@ DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1 -DIST pypy2.7-v7.3.2rc2-src.tar.bz2 21145693 BLAKE2B e722111435f81d00ecb5cec83e78e17676a042703fe83c049456fa6e5debdb1c09cc3f1fd71bcd8a8469da373a7c8131c252b3f139959a442f4cfa2b7f202c6f SHA512 ba7cccdaff1616ad0090cb0942ad35eda025a758be4d6b4e978bce19fb8cb8840136297fb924127a7e99f02c09665bde7eaf714e1744b9b32612973355459ad4 +DIST pypy2.7-v7.3.2-src.tar.bz2 21142873 BLAKE2B e6bcd2dc28ef740962d053753ccd172e3895fc83fe23a319c003248e0986f9805839daddd13a0f480f1e9ee813979742699cb0bc8c42b6b05c193fedf67aea4f SHA512 b40d93d615a27e3a035007307a8ab2b49ff90f3047af914b268a80feb8219d372eca14c04a8b0dea91efb992653457b7c6d088c784de32c414cc48879f2d15fc diff --git a/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild new file mode 100644 index 000000000000..730593111889 --- /dev/null +++ b/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) +inherit check-reqs pax-utils python-any-r1 toolchain-funcs + +MY_P=pypy2.7-v${PV/_/} +DESCRIPTION="PyPy executable (build from source)" +HOMEPAGE="https://pypy.org/" +SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2" +S="${WORKDIR}/${MY_P}-src" + +LICENSE="MIT" +SLOT="${PV}" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2" + +RDEPEND=">=sys-libs/zlib-1.1.3:0= + dev-libs/libffi:0= + virtual/libintl:0= + dev-libs/expat:0= + bzip2? ( app-arch/bzip2:0= ) + ncurses? ( sys-libs/ncurses:0= ) + !dev-python/pypy-exe-bin:${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 + dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_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_configure() { + tc-export CC + + local jit_backend + if use jit; then + jit_backend='--jit-backend=' + + # We only need the explicit sse2 switch for x86. + # On other arches we can rely on autodetection which uses + # compiler macros. Plus, --jit-backend= doesn't accept all + # the modern values... + + if use x86; then + if use cpu_flags_x86_sse2; then + jit_backend+=x86 + else + jit_backend+=x86-without-sse2 + fi + else + jit_backend+=auto + fi + fi + + local args=( + --no-shared + $(usex jit -Ojit -O2) + + ${jit_backend} + + pypy/goal/targetpypystandalone + ) + + # Avoid linking against libraries disabled by use flags + local opts=( + bzip2:bz2 + ncurses:_minimal_curses + ) + + local opt + for opt in "${opts[@]}"; do + local flag=${opt%:*} + local mod=${opt#*:} + + args+=( + $(usex ${flag} --withmod --withoutmod)-${mod} + ) + done + + local interp=( "${EPYTHON}" ) + if use low-memory; then + interp=( env PYPY_GC_MAX_DELTA=200MB + "${EPYTHON}" --jit loop_longevity=300 ) + fi + + # translate into the C sources + # we're going to make them ourselves since otherwise pypy does not + # free up the unneeded memory before spawning the compiler + set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}" + echo -e "\033[1m${@}\033[0m" + "${@}" || die "translation failed" +} + +src_compile() { + emake -C "${T}"/usession*-0/testing_1 +} + +src_install() { + local dest=/usr/lib/pypy2.7 + exeinto "${dest}" + newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PV} + insinto "${dest}"/include/${PV} + doins include/pypy_* + pax-mark m "${ED}${dest}/pypy-c-${PV}" +} diff --git a/dev-python/pypy-exe/pypy-exe-7.3.2_rc2.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.2_rc2.ebuild deleted file mode 100644 index 07e3be2ee5c4..000000000000 --- a/dev-python/pypy-exe/pypy-exe-7.3.2_rc2.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit check-reqs pax-utils python-any-r1 toolchain-funcs - -MY_P=pypy2.7-v${PV/_/} -DESCRIPTION="PyPy executable (build from source)" -HOMEPAGE="https://pypy.org/" -SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2" -S="${WORKDIR}/${MY_P}-src" - -LICENSE="MIT" -SLOT="${PV}" -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2" - -RDEPEND=">=sys-libs/zlib-1.1.3:0= - dev-libs/libffi:0= - virtual/libintl:0= - dev-libs/expat:0= - bzip2? ( app-arch/bzip2:0= ) - ncurses? ( sys-libs/ncurses:0= ) - !dev-python/pypy-exe-bin:${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 - dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_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_configure() { - tc-export CC - - local jit_backend - if use jit; then - jit_backend='--jit-backend=' - - # We only need the explicit sse2 switch for x86. - # On other arches we can rely on autodetection which uses - # compiler macros. Plus, --jit-backend= doesn't accept all - # the modern values... - - if use x86; then - if use cpu_flags_x86_sse2; then - jit_backend+=x86 - else - jit_backend+=x86-without-sse2 - fi - else - jit_backend+=auto - fi - fi - - local args=( - --no-shared - $(usex jit -Ojit -O2) - - ${jit_backend} - - pypy/goal/targetpypystandalone - ) - - # Avoid linking against libraries disabled by use flags - local opts=( - bzip2:bz2 - ncurses:_minimal_curses - ) - - local opt - for opt in "${opts[@]}"; do - local flag=${opt%:*} - local mod=${opt#*:} - - args+=( - $(usex ${flag} --withmod --withoutmod)-${mod} - ) - done - - local interp=( "${EPYTHON}" ) - if use low-memory; then - interp=( env PYPY_GC_MAX_DELTA=200MB - "${EPYTHON}" --jit loop_longevity=300 ) - fi - - # translate into the C sources - # we're going to make them ourselves since otherwise pypy does not - # free up the unneeded memory before spawning the compiler - set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}" - echo -e "\033[1m${@}\033[0m" - "${@}" || die "translation failed" -} - -src_compile() { - emake -C "${T}"/usession*-0/testing_1 -} - -src_install() { - local dest=/usr/lib/pypy2.7 - exeinto "${dest}" - newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PV} - insinto "${dest}"/include/${PV} - doins include/pypy_* - pax-mark m "${ED}${dest}/pypy-c-${PV}" -} diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest index 6c73fdd19560..0030cac3508d 100644 --- a/dev-python/pypy/Manifest +++ b/dev-python/pypy/Manifest @@ -1,4 +1,4 @@ DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1 -DIST pypy2.7-v7.3.2rc2-src.tar.bz2 21145693 BLAKE2B e722111435f81d00ecb5cec83e78e17676a042703fe83c049456fa6e5debdb1c09cc3f1fd71bcd8a8469da373a7c8131c252b3f139959a442f4cfa2b7f202c6f SHA512 ba7cccdaff1616ad0090cb0942ad35eda025a758be4d6b4e978bce19fb8cb8840136297fb924127a7e99f02c09665bde7eaf714e1744b9b32612973355459ad4 +DIST pypy2.7-v7.3.2-src.tar.bz2 21142873 BLAKE2B e6bcd2dc28ef740962d053753ccd172e3895fc83fe23a319c003248e0986f9805839daddd13a0f480f1e9ee813979742699cb0bc8c42b6b05c193fedf67aea4f SHA512 b40d93d615a27e3a035007307a8ab2b49ff90f3047af914b268a80feb8219d372eca14c04a8b0dea91efb992653457b7c6d088c784de32c414cc48879f2d15fc DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f DIST python-gentoo-patches-2.7.18-r1.tar.xz 15500 BLAKE2B 7008b29827dbbd80d4ab8f010ccf9efced99c6b4b9109e4430c0ba269ce53529cb6fedd832502c8d2d3aa21938749cc3591c2545b21c0a59a6e60f8598e84ccc SHA512 e656ab07281fd932b92165674619bbf55ecf410d2937ae4ae771d490b4532540498cc731d30d19c1e8aafd1f64df8a406bbfbb46ea985b3dcd8edb89a0b7f20f diff --git a/dev-python/pypy/pypy-7.3.2.ebuild b/dev-python/pypy/pypy-7.3.2.ebuild new file mode 100644 index 000000000000..894219fffb45 --- /dev/null +++ b/dev-python/pypy/pypy-7.3.2.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit pax-utils python-utils-r1 + +MY_P=pypy2.7-v${PV/_/} +# note: remember to update this to newest dev-lang/python:2.7 on bump +PATCHSET="python-gentoo-patches-2.7.18-r1" + +DESCRIPTION="A fast, compliant alternative implementation of the Python language" +HOMEPAGE="https://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="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk" + +RDEPEND=" + || ( + dev-python/pypy-exe:${PV}[bzip2?,ncurses?] + dev-python/pypy-exe-bin:${PV} + ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + gdbm? ( sys-libs/gdbm:0= ) + sqlite? ( dev-db/sqlite:3= ) + tk? ( + dev-lang/tk:0= + dev-tcltk/tix:0= + ) + ! /dev/null || die + # TODO: cpy turkish locale patch now fixes C code + # probably needs better port to pypy, if it is broken there + eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch + eapply -p2 "${WORKDIR}/${PATCHSET}"/0010-use_pyxml.patch + popd > /dev/null || die + + # this test relies on pypy-c hardcoding correct build time paths + sed -i -e 's:test_executable_without_cwd:_&:' \ + lib-python/2.7/test/test_subprocess.py || die + # requires Internet + sed -i -e '/class NetworkedTests/i@unittest.skip("Requires networking")' \ + lib-python/2.7/test/test_ssl.py || die + + eapply_user +} + +src_compile() { + # copy over to make sys.prefix happy + cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PV} pypy-c || die + cp -p "${BROOT}"/usr/lib/pypy2.7/include/${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 + + 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_build_scripts = { +# "_ssl": "_ssl_build.py", +# "sqlite3": "_sqlite3_build.py", +# "audioop": "_audioop_build.py", +# "tk": "_tkinter/tklib_build.py", +# "curses": "_curses_build.py" if sys.platform != "win32" else None, +# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, +# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, +# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, +# "resource": "_resource_build.py" if sys.platform != "win32" else None, + cffi_targets=( 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 + + # Cleanup temporary objects + find -name "_cffi_*.[co]" -delete || die + find -type d -empty -delete || die +} + +src_test() { + # (unset) + local -x PYTHONDONTWRITEBYTECODE= + + 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-${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/${PV}/*; do + dosym "${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-${PV} + # temporarily copy to build tree to facilitate module builds + cp -p "${BROOT}${dest}/pypy-c-${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.2_rc2-r1.ebuild b/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild deleted file mode 100644 index a5a678ffa9d0..000000000000 --- a/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pax-utils python-utils-r1 - -MY_P=pypy2.7-v${PV/_/} -# note: remember to update this to newest dev-lang/python:2.7 on bump -PATCHSET="python-gentoo-patches-2.7.18-r1" - -DESCRIPTION="A fast, compliant alternative implementation of the Python language" -HOMEPAGE="https://pypy.org/" -SRC_URI="https://downloads.python.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="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk" - -RDEPEND=" - || ( - dev-python/pypy-exe:${PV}[bzip2?,ncurses?] - dev-python/pypy-exe-bin:${PV} - ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) - ! /dev/null || die - # TODO: cpy turkish locale patch now fixes C code - # probably needs better port to pypy, if it is broken there - eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch - eapply -p2 "${WORKDIR}/${PATCHSET}"/0010-use_pyxml.patch - popd > /dev/null || die - - # this test relies on pypy-c hardcoding correct build time paths - sed -i -e 's:test_executable_without_cwd:_&:' \ - lib-python/2.7/test/test_subprocess.py || die - # requires Internet - sed -i -e '/class NetworkedTests/i@unittest.skip("Requires networking")' \ - lib-python/2.7/test/test_ssl.py || die - - eapply_user -} - -src_compile() { - # copy over to make sys.prefix happy - cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PV} pypy-c || die - cp -p "${BROOT}"/usr/lib/pypy2.7/include/${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 - - 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_build_scripts = { -# "_ssl": "_ssl_build.py", -# "sqlite3": "_sqlite3_build.py", -# "audioop": "_audioop_build.py", -# "tk": "_tkinter/tklib_build.py", -# "curses": "_curses_build.py" if sys.platform != "win32" else None, -# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, -# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, -# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, -# "resource": "_resource_build.py" if sys.platform != "win32" else None, - cffi_targets=( 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 - - # Cleanup temporary objects - find -name "_cffi_*.[co]" -delete || die - find -type d -empty -delete || die -} - -src_test() { - # (unset) - local -x PYTHONDONTWRITEBYTECODE= - - 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-${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/${PV}/*; do - dosym "${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-${PV} - # temporarily copy to build tree to facilitate module builds - cp -p "${BROOT}${dest}/pypy-c-${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/Manifest b/dev-python/pypy3-exe/Manifest index 39001d40e360..18cd2160f098 100644 --- a/dev-python/pypy3-exe/Manifest +++ b/dev-python/pypy3-exe/Manifest @@ -1,3 +1,3 @@ DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56 -DIST pypy3.6-v7.3.2rc2-src.tar.bz2 22750248 BLAKE2B 6a8a3c4306cb5c796ee89f3d9ece61f5d669515ae9edf4961f43c7779123554cda0f3b433f8264d3d08e531ef5fe660b494135321a11f441ae1de97ce0abb332 SHA512 a89184314d04bad646cf2e2151e2d5f27ca23a68f25e22b5c2e4f07745671e70c71d869be1c61248ee839632f7151b597fe79eb5af814967a1ae97f2c2cdb8ee -DIST pypy3.7-v7.3.2rc2-src.tar.bz2 25066853 BLAKE2B 286ec0909d4b9ba9039cd9ca234a90832e99369f5e7e36a486d219661631efac186e02146dd5bc5a51521fcfdd0047c3fa5a6dbffd20cebe8ff7c209d02fec53 SHA512 c8e5dc5ded2989aa3a6b635e040c23bb8e2812101ce22a104f251e0abaa3320b61f2f611ece58d6b8a8ae9f1cbc8ca22c920f3491dd5653bcb0e05264fd54a4f +DIST pypy3.6-v7.3.2-src.tar.bz2 22736022 BLAKE2B e2338ac3f7af06b987c43e93eab9ff14d46262143472b0393b30b011fff67d33add45d8198cee7109354e09c52a2540938abeef364b0cf12f2891ca9c7aac2a4 SHA512 ed861a57d6edf1548c061d10295313a05d0ac54fe68a8755211ff76fa2dc78d7b1479c6152dc5d0d1cdce4e247c240c1a2edf59ec8a53d0004ec7713514c9c35 +DIST pypy3.7-v7.3.2-src.tar.bz2 25060911 BLAKE2B 35ecfee4c64e13539827c65a61e0cd359de4046f77553629cdf63479327c6ad86afd1443caa7a911a6271f496f0f3caf1b919ce91de717d0a71d008927b7f77b SHA512 563a9cf63e818b95aeb14c25b55bb5fb0bf8283f0b9f2bdd9a8833989beb651681f53f52368fb9db2c75fb60be0456eec87d48b557740b57847c4104003cb288 diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild new file mode 100644 index 000000000000..b8f0cf85d05b --- /dev/null +++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# pypy3 needs to be built using python 2 +PYTHON_COMPAT=( python2_7 ) +inherit check-reqs pax-utils python-any-r1 toolchain-funcs + +MY_P=pypy3.6-v${PV/_/} +DESCRIPTION="PyPy3 executable (build from source)" +HOMEPAGE="https://pypy.org/" +SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2" +S="${WORKDIR}/${MY_P}-src" + +LICENSE="MIT" +SLOT="${PV}" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2" + +RDEPEND=">=sys-libs/zlib-1.1.3:0= + dev-libs/libffi:0= + virtual/libintl:0= + dev-libs/expat:0= + bzip2? ( app-arch/bzip2:0= ) + ncurses? ( sys-libs/ncurses:0= ) + !dev-python/pypy3-exe-bin:${PV}" +DEPEND="${RDEPEND}" +BDEPEND=" + low-memory? ( dev-python/pypy ) + !low-memory? ( + || ( + dev-python/pypy + ( + dev-lang/python:2.7 + dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] + ) + ) + )" + +check_env() { + if use low-memory; then + CHECKREQS_MEMORY="1750M" + use amd64 && CHECKREQS_MEMORY="3500M" + else + CHECKREQS_MEMORY="3G" + use amd64 && CHECKREQS_MEMORY="6G" + fi + + check-reqs_pkg_pretend +} + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && check_env +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]]; then + check_env + + # unset to allow forcing pypy below :) + use low-memory && EPYTHON= + if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] && + { has_version -b dev-python/pypy || + has_version -b dev-python/pypy-bin; } + then + einfo "Using PyPy to perform the translation." + EPYTHON=pypy + else + einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream" + einfo "recommends using PyPy for that. If you wish to do so, please install" + einfo "dev-python/pypy and ensure that EPYTHON variable is unset." + python-any-r1_pkg_setup + fi + fi +} + +src_configure() { + tc-export CC + + local jit_backend + if use jit; then + jit_backend='--jit-backend=' + + # We only need the explicit sse2 switch for x86. + # On other arches we can rely on autodetection which uses + # compiler macros. Plus, --jit-backend= doesn't accept all + # the modern values... + + if use x86; then + if use cpu_flags_x86_sse2; then + jit_backend+=x86 + else + jit_backend+=x86-without-sse2 + fi + else + jit_backend+=auto + fi + fi + + local args=( + --no-shared + $(usex jit -Ojit -O2) + + ${jit_backend} + + pypy/goal/targetpypystandalone + ) + + # Avoid linking against libraries disabled by use flags + local opts=( + bzip2:bz2 + ncurses:_minimal_curses + ) + + local opt + for opt in "${opts[@]}"; do + local flag=${opt%:*} + local mod=${opt#*:} + + args+=( + $(usex ${flag} --withmod --withoutmod)-${mod} + ) + done + + local interp=( "${EPYTHON}" ) + if use low-memory; then + interp=( env PYPY_GC_MAX_DELTA=200MB + "${EPYTHON}" --jit loop_longevity=300 ) + fi + + # translate into the C sources + # we're going to make them ourselves since otherwise pypy does not + # free up the unneeded memory before spawning the compiler + set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}" + echo -e "\033[1m${@}\033[0m" + "${@}" || die "translation failed" +} + +src_compile() { + emake -C "${T}"/usession*-0/testing_1 +} + +src_install() { + local dest=/usr/lib/pypy3.6 + exeinto "${dest}" + newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV} + insinto "${dest}"/include/${PV} + doins include/pypy_* + pax-mark m "${ED}${dest}/pypy3-c-${PV}" +} diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild new file mode 100644 index 000000000000..ab30f5451bf1 --- /dev/null +++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# pypy3 needs to be built using python 2 +PYTHON_COMPAT=( python2_7 ) +inherit check-reqs pax-utils python-any-r1 toolchain-funcs + +PYPY_PV=${PV%_p37} +MY_P=pypy3.7-v${PYPY_PV/_/} +DESCRIPTION="PyPy3 executable (build from source)" +HOMEPAGE="https://pypy.org/" +SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2" +S="${WORKDIR}/${MY_P}-src" + +LICENSE="MIT" +SLOT="${PV}" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2" + +RDEPEND=">=sys-libs/zlib-1.1.3:0= + dev-libs/libffi:0= + virtual/libintl:0= + dev-libs/expat:0= + bzip2? ( app-arch/bzip2:0= ) + ncurses? ( sys-libs/ncurses:0= ) + !dev-python/pypy3-exe-bin:${PV}" +DEPEND="${RDEPEND}" +BDEPEND=" + low-memory? ( dev-python/pypy ) + !low-memory? ( + || ( + dev-python/pypy + ( + dev-lang/python:2.7 + dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] + ) + ) + )" + +check_env() { + if use low-memory; then + CHECKREQS_MEMORY="1750M" + use amd64 && CHECKREQS_MEMORY="3500M" + else + CHECKREQS_MEMORY="3G" + use amd64 && CHECKREQS_MEMORY="6G" + fi + + check-reqs_pkg_pretend +} + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && check_env +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]]; then + check_env + + # unset to allow forcing pypy below :) + use low-memory && EPYTHON= + if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] && + { has_version -b dev-python/pypy || + has_version -b dev-python/pypy-bin; } + then + einfo "Using PyPy to perform the translation." + EPYTHON=pypy + else + einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream" + einfo "recommends using PyPy for that. If you wish to do so, please install" + einfo "dev-python/pypy and ensure that EPYTHON variable is unset." + python-any-r1_pkg_setup + fi + fi +} + +src_configure() { + tc-export CC + + local jit_backend + if use jit; then + jit_backend='--jit-backend=' + + # We only need the explicit sse2 switch for x86. + # On other arches we can rely on autodetection which uses + # compiler macros. Plus, --jit-backend= doesn't accept all + # the modern values... + + if use x86; then + if use cpu_flags_x86_sse2; then + jit_backend+=x86 + else + jit_backend+=x86-without-sse2 + fi + else + jit_backend+=auto + fi + fi + + local args=( + --no-shared + $(usex jit -Ojit -O2) + + ${jit_backend} + + pypy/goal/targetpypystandalone + ) + + # Avoid linking against libraries disabled by use flags + local opts=( + bzip2:bz2 + ncurses:_minimal_curses + ) + + local opt + for opt in "${opts[@]}"; do + local flag=${opt%:*} + local mod=${opt#*:} + + args+=( + $(usex ${flag} --withmod --withoutmod)-${mod} + ) + done + + local interp=( "${EPYTHON}" ) + if use low-memory; then + interp=( env PYPY_GC_MAX_DELTA=200MB + "${EPYTHON}" --jit loop_longevity=300 ) + fi + + # translate into the C sources + # we're going to make them ourselves since otherwise pypy does not + # free up the unneeded memory before spawning the compiler + set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}" + echo -e "\033[1m${@}\033[0m" + "${@}" || die "translation failed" +} + +src_compile() { + emake -C "${T}"/usession*-0/testing_1 +} + +src_install() { + local dest=/usr/lib/pypy3.7 + exeinto "${dest}" + newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV} + insinto "${dest}"/include/${PYPY_PV} + doins include/pypy_* + pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}" +} diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2.ebuild deleted file mode 100644 index 24b904343e13..000000000000 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# pypy3 needs to be built using python 2 -PYTHON_COMPAT=( python2_7 ) -inherit check-reqs pax-utils python-any-r1 toolchain-funcs - -MY_P=pypy3.6-v${PV/_/} -DESCRIPTION="PyPy3 executable (build from source)" -HOMEPAGE="https://pypy.org/" -SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2" -S="${WORKDIR}/${MY_P}-src" - -LICENSE="MIT" -SLOT="${PV}" -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2" - -RDEPEND=">=sys-libs/zlib-1.1.3:0= - dev-libs/libffi:0= - virtual/libintl:0= - dev-libs/expat:0= - bzip2? ( app-arch/bzip2:0= ) - ncurses? ( sys-libs/ncurses:0= ) - !dev-python/pypy3-exe-bin:${PV}" -DEPEND="${RDEPEND}" -BDEPEND=" - low-memory? ( dev-python/pypy ) - !low-memory? ( - || ( - dev-python/pypy - ( - dev-lang/python:2.7 - dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] - ) - ) - )" - -check_env() { - if use low-memory; then - CHECKREQS_MEMORY="1750M" - use amd64 && CHECKREQS_MEMORY="3500M" - else - CHECKREQS_MEMORY="3G" - use amd64 && CHECKREQS_MEMORY="6G" - fi - - check-reqs_pkg_pretend -} - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && check_env -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - check_env - - # unset to allow forcing pypy below :) - use low-memory && EPYTHON= - if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] && - { has_version -b dev-python/pypy || - has_version -b dev-python/pypy-bin; } - then - einfo "Using PyPy to perform the translation." - EPYTHON=pypy - else - einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream" - einfo "recommends using PyPy for that. If you wish to do so, please install" - einfo "dev-python/pypy and ensure that EPYTHON variable is unset." - python-any-r1_pkg_setup - fi - fi -} - -src_configure() { - tc-export CC - - local jit_backend - if use jit; then - jit_backend='--jit-backend=' - - # We only need the explicit sse2 switch for x86. - # On other arches we can rely on autodetection which uses - # compiler macros. Plus, --jit-backend= doesn't accept all - # the modern values... - - if use x86; then - if use cpu_flags_x86_sse2; then - jit_backend+=x86 - else - jit_backend+=x86-without-sse2 - fi - else - jit_backend+=auto - fi - fi - - local args=( - --no-shared - $(usex jit -Ojit -O2) - - ${jit_backend} - - pypy/goal/targetpypystandalone - ) - - # Avoid linking against libraries disabled by use flags - local opts=( - bzip2:bz2 - ncurses:_minimal_curses - ) - - local opt - for opt in "${opts[@]}"; do - local flag=${opt%:*} - local mod=${opt#*:} - - args+=( - $(usex ${flag} --withmod --withoutmod)-${mod} - ) - done - - local interp=( "${EPYTHON}" ) - if use low-memory; then - interp=( env PYPY_GC_MAX_DELTA=200MB - "${EPYTHON}" --jit loop_longevity=300 ) - fi - - # translate into the C sources - # we're going to make them ourselves since otherwise pypy does not - # free up the unneeded memory before spawning the compiler - set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}" - echo -e "\033[1m${@}\033[0m" - "${@}" || die "translation failed" -} - -src_compile() { - emake -C "${T}"/usession*-0/testing_1 -} - -src_install() { - local dest=/usr/lib/pypy3.6 - exeinto "${dest}" - newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV} - insinto "${dest}"/include/${PV} - doins include/pypy_* - pax-mark m "${ED}${dest}/pypy3-c-${PV}" -} diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2_p37.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2_p37.ebuild deleted file mode 100644 index 8c73602fa5f8..000000000000 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2_p37.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# pypy3 needs to be built using python 2 -PYTHON_COMPAT=( python2_7 ) -inherit check-reqs pax-utils python-any-r1 toolchain-funcs - -PYPY_PV=${PV%_p37} -MY_P=pypy3.7-v${PYPY_PV/_/} -DESCRIPTION="PyPy3 executable (build from source)" -HOMEPAGE="https://pypy.org/" -SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2" -S="${WORKDIR}/${MY_P}-src" - -LICENSE="MIT" -SLOT="${PV}" -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2" - -RDEPEND=">=sys-libs/zlib-1.1.3:0= - dev-libs/libffi:0= - virtual/libintl:0= - dev-libs/expat:0= - bzip2? ( app-arch/bzip2:0= ) - ncurses? ( sys-libs/ncurses:0= ) - !dev-python/pypy3-exe-bin:${PV}" -DEPEND="${RDEPEND}" -BDEPEND=" - low-memory? ( dev-python/pypy ) - !low-memory? ( - || ( - dev-python/pypy - ( - dev-lang/python:2.7 - dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] - ) - ) - )" - -check_env() { - if use low-memory; then - CHECKREQS_MEMORY="1750M" - use amd64 && CHECKREQS_MEMORY="3500M" - else - CHECKREQS_MEMORY="3G" - use amd64 && CHECKREQS_MEMORY="6G" - fi - - check-reqs_pkg_pretend -} - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && check_env -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - check_env - - # unset to allow forcing pypy below :) - use low-memory && EPYTHON= - if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] && - { has_version -b dev-python/pypy || - has_version -b dev-python/pypy-bin; } - then - einfo "Using PyPy to perform the translation." - EPYTHON=pypy - else - einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream" - einfo "recommends using PyPy for that. If you wish to do so, please install" - einfo "dev-python/pypy and ensure that EPYTHON variable is unset." - python-any-r1_pkg_setup - fi - fi -} - -src_configure() { - tc-export CC - - local jit_backend - if use jit; then - jit_backend='--jit-backend=' - - # We only need the explicit sse2 switch for x86. - # On other arches we can rely on autodetection which uses - # compiler macros. Plus, --jit-backend= doesn't accept all - # the modern values... - - if use x86; then - if use cpu_flags_x86_sse2; then - jit_backend+=x86 - else - jit_backend+=x86-without-sse2 - fi - else - jit_backend+=auto - fi - fi - - local args=( - --no-shared - $(usex jit -Ojit -O2) - - ${jit_backend} - - pypy/goal/targetpypystandalone - ) - - # Avoid linking against libraries disabled by use flags - local opts=( - bzip2:bz2 - ncurses:_minimal_curses - ) - - local opt - for opt in "${opts[@]}"; do - local flag=${opt%:*} - local mod=${opt#*:} - - args+=( - $(usex ${flag} --withmod --withoutmod)-${mod} - ) - done - - local interp=( "${EPYTHON}" ) - if use low-memory; then - interp=( env PYPY_GC_MAX_DELTA=200MB - "${EPYTHON}" --jit loop_longevity=300 ) - fi - - # translate into the C sources - # we're going to make them ourselves since otherwise pypy does not - # free up the unneeded memory before spawning the compiler - set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}" - echo -e "\033[1m${@}\033[0m" - "${@}" || die "translation failed" -} - -src_compile() { - emake -C "${T}"/usession*-0/testing_1 -} - -src_install() { - local dest=/usr/lib/pypy3.7 - exeinto "${dest}" - newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV} - insinto "${dest}"/include/${PYPY_PV} - doins include/pypy_* - pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}" -} diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest index 39001d40e360..18cd2160f098 100644 --- a/dev-python/pypy3/Manifest +++ b/dev-python/pypy3/Manifest @@ -1,3 +1,3 @@ DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56 -DIST pypy3.6-v7.3.2rc2-src.tar.bz2 22750248 BLAKE2B 6a8a3c4306cb5c796ee89f3d9ece61f5d669515ae9edf4961f43c7779123554cda0f3b433f8264d3d08e531ef5fe660b494135321a11f441ae1de97ce0abb332 SHA512 a89184314d04bad646cf2e2151e2d5f27ca23a68f25e22b5c2e4f07745671e70c71d869be1c61248ee839632f7151b597fe79eb5af814967a1ae97f2c2cdb8ee -DIST pypy3.7-v7.3.2rc2-src.tar.bz2 25066853 BLAKE2B 286ec0909d4b9ba9039cd9ca234a90832e99369f5e7e36a486d219661631efac186e02146dd5bc5a51521fcfdd0047c3fa5a6dbffd20cebe8ff7c209d02fec53 SHA512 c8e5dc5ded2989aa3a6b635e040c23bb8e2812101ce22a104f251e0abaa3320b61f2f611ece58d6b8a8ae9f1cbc8ca22c920f3491dd5653bcb0e05264fd54a4f +DIST pypy3.6-v7.3.2-src.tar.bz2 22736022 BLAKE2B e2338ac3f7af06b987c43e93eab9ff14d46262143472b0393b30b011fff67d33add45d8198cee7109354e09c52a2540938abeef364b0cf12f2891ca9c7aac2a4 SHA512 ed861a57d6edf1548c061d10295313a05d0ac54fe68a8755211ff76fa2dc78d7b1479c6152dc5d0d1cdce4e247c240c1a2edf59ec8a53d0004ec7713514c9c35 +DIST pypy3.7-v7.3.2-src.tar.bz2 25060911 BLAKE2B 35ecfee4c64e13539827c65a61e0cd359de4046f77553629cdf63479327c6ad86afd1443caa7a911a6271f496f0f3caf1b919ce91de717d0a71d008927b7f77b SHA512 563a9cf63e818b95aeb14c25b55bb5fb0bf8283f0b9f2bdd9a8833989beb651681f53f52368fb9db2c75fb60be0456eec87d48b557740b57847c4104003cb288 diff --git a/dev-python/pypy3/pypy3-7.3.2.ebuild b/dev-python/pypy3/pypy3-7.3.2.ebuild new file mode 100644 index 000000000000..2887cb39e844 --- /dev/null +++ b/dev-python/pypy3/pypy3-7.3.2.ebuild @@ -0,0 +1,207 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) +inherit pax-utils python-any-r1 toolchain-funcs + +MY_P=pypy3.6-v${PV/_/} + +DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language" +HOMEPAGE="https://pypy.org/" +SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2" +S="${WORKDIR}/${MY_P}-src" + +LICENSE="MIT" +# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' +SLOT="0/pypy36-pp73" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk" +RESTRICT="!test? ( test )" + +RDEPEND=" + || ( + dev-python/pypy3-exe:${PV}[bzip2?,ncurses?] + dev-python/pypy3-exe-bin:${PV} + ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + gdbm? ( sys-libs/gdbm:0= ) + sqlite? ( dev-db/sqlite:3= ) + tk? ( + dev-lang/tk:0= + dev-tcltk/tix:0= + ) + ! /dev/null || die + eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch + popd > /dev/null || die + + # see http://buildbot.pypy.org/summary?branch=py3.6&builder=pypy-c-jit-linux-x86-64 + sed -i -e 's:test_jumpy:_&:' \ + lib-python/3/test/test_dis.py || die + sed -i -e 's:test_get_and_set_scheduler_and_param:_&:' \ + lib-python/3/test/test_posix.py || die + sed -i -e 's:test_auto_history:_&:' \ + -e 's:test_history_size:_&:' \ + lib-python/3/test/test_readline.py || die + sed -i -e 's:test_eval_bytes_invalid_escape:_&:' \ + -e 's:test_eval_str_invalid_escape:_&:' \ + lib-python/3/test/test_string_literals.py || die + sed -i -e 's:test_jump_out_of_async_for_block:_&:' \ + -e 's:test_jump_over_async_for_block_before_else:_&:' \ + -e 's:test_no_jump_.*wards_into_async_for_block:_&:' \ + -e 's:test_no_jump_into_async_for_block_before_else:_&:' \ + -e 's:test_no_jump_from_yield:_&:' \ + lib-python/3/test/test_sys_settrace.py || die + sed -i -e 's:test_circular_imports:_&:' \ + lib-python/3/test/test_threaded_import.py || die + + # the first one's broken by sandbox, the second by our env + sed -i -e 's:test_empty_env:_&:' \ + -e 's:test_executable(:_&:' \ + -e 's:test_executable_without_cwd:_&:' \ + lib-python/3/test/test_subprocess.py || die + + # XXX + sed -i -e 's:test_locale:_&:' \ + lib-python/3/test/test_format.py || die + sed -i -e 's:test_decompressor_bug_28275:_&:' \ + lib-python/3/test/test_lzma.py || die + + eapply_user +} + +src_configure() { + tc-export CC +} + +src_compile() { + # copy over to make sys.prefix happy + cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die + cp -p "${BROOT}"/usr/lib/pypy3.6/include/${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 pypy3-c + + einfo "Generating caches and CFFI modules ..." + + # Generate Grammar and PatternGrammar pickles. + ./pypy3-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_build_scripts = { +# "_blake2": "_blake2/_blake2_build.py", +# "_ssl": "_ssl_build.py", +# "sqlite3": "_sqlite3_build.py", +# "audioop": "_audioop_build.py", +# "tk": "_tkinter/tklib_build.py", +# "curses": "_curses_build.py" if sys.platform != "win32" else None, +# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, +# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, +# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, +# "resource": "_resource_build.py" if sys.platform != "win32" else None, +# "lzma": "_lzma_build.py", +# "_decimal": "_decimal_build.py", +# "_sha3": "_sha3/_sha3_build.py", + cffi_targets=( blake2/_blake2 sha3/_sha3 ssl + audioop syslog pwdgrp resource lzma decimal ) + 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-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" + done + + # 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. + "${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die +} + +src_install() { + local dest=/usr/lib/pypy3.6 + einfo "Installing PyPy ..." + dosym pypy3-c-${PV} "${dest}/pypy3-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/pypy3.6/include/${PV}/*; do + dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}" + done + + dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3 + dodoc README.rst + + if ! use gdbm; then + rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die + fi + if ! use sqlite; then + rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \ + "${ED}${dest}"/lib_pypy/_sqlite3* \ + "${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die + fi + if ! use tk; then + rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \ + "${ED}${dest}"/lib_pypy/_tkinter \ + "${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die + fi + + local -x EPYTHON=pypy3 + local -x PYTHON=${ED}${dest}/pypy3-c-${PV} + # temporarily copy to build tree to facilitate module builds + cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_moduleinto /usr/lib/pypy3.6/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.2_p37.ebuild b/dev-python/pypy3/pypy3-7.3.2_p37.ebuild new file mode 100644 index 000000000000..b64450341d4b --- /dev/null +++ b/dev-python/pypy3/pypy3-7.3.2_p37.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) +inherit pax-utils python-any-r1 toolchain-funcs + +PYPY_PV=${PV%_p37} +MY_P=pypy3.7-v${PYPY_PV/_/} + +DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language" +HOMEPAGE="https://pypy.org/" +SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2" +S="${WORKDIR}/${MY_P}-src" + +LICENSE="MIT" +# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' +SLOT="0/pypy37-pp73" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk" +# pypy3.7 is in alpha state and a lot of tests are failing +RESTRICT="test" + +RDEPEND=" + || ( + dev-python/pypy3-exe:${PV}[bzip2?,ncurses?] + dev-python/pypy3-exe-bin:${PV} + ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + gdbm? ( sys-libs/gdbm:0= ) + sqlite? ( dev-db/sqlite:3= ) + tk? ( + dev-lang/tk:0= + dev-tcltk/tix:0= + ) + ! /dev/null || die + eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch + popd > /dev/null || die + + eapply_user +} + +src_configure() { + tc-export CC +} + +src_compile() { + # copy over to make sys.prefix happy + cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die + cp -p "${BROOT}"/usr/lib/pypy3.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 pypy3-c + + einfo "Generating caches and CFFI modules ..." + + # Generate Grammar and PatternGrammar pickles. + ./pypy3-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_build_scripts = { +# "_blake2": "_blake2/_blake2_build.py", +# "_ssl": "_ssl_build.py", +# "sqlite3": "_sqlite3_build.py", +# "audioop": "_audioop_build.py", +# "tk": "_tkinter/tklib_build.py", +# "curses": "_curses_build.py" if sys.platform != "win32" else None, +# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, +# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, +# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, +# "resource": "_resource_build.py" if sys.platform != "win32" else None, +# "lzma": "_lzma_build.py", +# "_decimal": "_decimal_build.py", +# "_sha3": "_sha3/_sha3_build.py", + cffi_targets=( blake2/_blake2 sha3/_sha3 ssl + audioop syslog pwdgrp resource lzma decimal ) + 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-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" + done + + # 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-c -vv lib-python || die +} + +src_install() { + local dest=/usr/lib/pypy3.7 + einfo "Installing PyPy ..." + dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-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/pypy3.7/include/${PYPY_PV}/*; do + dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}" + done + + dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3 + dodoc README.rst + + if ! use gdbm; then + rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die + fi + if ! use sqlite; then + rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \ + "${ED}${dest}"/lib_pypy/_sqlite3* \ + "${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die + fi + if ! use tk; then + rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \ + "${ED}${dest}"/lib_pypy/_tkinter \ + "${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die + fi + + local -x EPYTHON=pypy3 + local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV} + # temporarily copy to build tree to facilitate module builds + cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_moduleinto /usr/lib/pypy3.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/pypy3-7.3.2_rc2-r1.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild deleted file mode 100644 index acb328c4e725..000000000000 --- a/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit pax-utils python-any-r1 toolchain-funcs - -MY_P=pypy3.6-v${PV/_/} - -DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language" -HOMEPAGE="https://pypy.org/" -SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2" -S="${WORKDIR}/${MY_P}-src" - -LICENSE="MIT" -# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' -SLOT="0/pypy36-pp73" -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk" -RESTRICT="!test? ( test )" - -RDEPEND=" - || ( - dev-python/pypy3-exe:${PV}[bzip2?,ncurses?] - dev-python/pypy3-exe-bin:${PV} - ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) - ! /dev/null || die - eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch - popd > /dev/null || die - - # see http://buildbot.pypy.org/summary?branch=py3.6&builder=pypy-c-jit-linux-x86-64 - sed -i -e 's:test_jumpy:_&:' \ - lib-python/3/test/test_dis.py || die - sed -i -e 's:test_get_and_set_scheduler_and_param:_&:' \ - lib-python/3/test/test_posix.py || die - sed -i -e 's:test_auto_history:_&:' \ - -e 's:test_history_size:_&:' \ - lib-python/3/test/test_readline.py || die - sed -i -e 's:test_eval_bytes_invalid_escape:_&:' \ - -e 's:test_eval_str_invalid_escape:_&:' \ - lib-python/3/test/test_string_literals.py || die - sed -i -e 's:test_jump_out_of_async_for_block:_&:' \ - -e 's:test_jump_over_async_for_block_before_else:_&:' \ - -e 's:test_no_jump_.*wards_into_async_for_block:_&:' \ - -e 's:test_no_jump_into_async_for_block_before_else:_&:' \ - -e 's:test_no_jump_from_yield:_&:' \ - lib-python/3/test/test_sys_settrace.py || die - sed -i -e 's:test_circular_imports:_&:' \ - lib-python/3/test/test_threaded_import.py || die - - # the first one's broken by sandbox, the second by our env - sed -i -e 's:test_empty_env:_&:' \ - -e 's:test_executable(:_&:' \ - -e 's:test_executable_without_cwd:_&:' \ - lib-python/3/test/test_subprocess.py || die - - # XXX - sed -i -e 's:test_locale:_&:' \ - lib-python/3/test/test_format.py || die - sed -i -e 's:test_decompressor_bug_28275:_&:' \ - lib-python/3/test/test_lzma.py || die - - eapply_user -} - -src_configure() { - tc-export CC -} - -src_compile() { - # copy over to make sys.prefix happy - cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die - cp -p "${BROOT}"/usr/lib/pypy3.6/include/${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 pypy3-c - - einfo "Generating caches and CFFI modules ..." - - # Generate Grammar and PatternGrammar pickles. - ./pypy3-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_build_scripts = { -# "_blake2": "_blake2/_blake2_build.py", -# "_ssl": "_ssl_build.py", -# "sqlite3": "_sqlite3_build.py", -# "audioop": "_audioop_build.py", -# "tk": "_tkinter/tklib_build.py", -# "curses": "_curses_build.py" if sys.platform != "win32" else None, -# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, -# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, -# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, -# "resource": "_resource_build.py" if sys.platform != "win32" else None, -# "lzma": "_lzma_build.py", -# "_decimal": "_decimal_build.py", -# "_sha3": "_sha3/_sha3_build.py", - cffi_targets=( blake2/_blake2 sha3/_sha3 ssl - audioop syslog pwdgrp resource lzma decimal ) - 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-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" - done - - # 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. - "${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die -} - -src_install() { - local dest=/usr/lib/pypy3.6 - einfo "Installing PyPy ..." - dosym pypy3-c-${PV} "${dest}/pypy3-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/pypy3.6/include/${PV}/*; do - dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}" - done - - dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3 - dodoc README.rst - - if ! use gdbm; then - rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die - fi - if ! use sqlite; then - rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \ - "${ED}${dest}"/lib_pypy/_sqlite3* \ - "${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die - fi - if ! use tk; then - rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \ - "${ED}${dest}"/lib_pypy/_tkinter \ - "${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die - fi - - local -x EPYTHON=pypy3 - local -x PYTHON=${ED}${dest}/pypy3-c-${PV} - # temporarily copy to build tree to facilitate module builds - cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die - - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_moduleinto /usr/lib/pypy3.6/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.2_rc2_p37-r1.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild deleted file mode 100644 index d750cf9c4b2b..000000000000 --- a/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit pax-utils python-any-r1 toolchain-funcs - -PYPY_PV=${PV%_p37} -MY_P=pypy3.7-v${PYPY_PV/_/} - -DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language" -HOMEPAGE="https://pypy.org/" -SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2" -S="${WORKDIR}/${MY_P}-src" - -LICENSE="MIT" -# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' -SLOT="0/pypy37-pp73" -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk" -# pypy3.7 is in alpha state and a lot of tests are failing -RESTRICT="test" - -RDEPEND=" - || ( - dev-python/pypy3-exe:${PV}[bzip2?,ncurses?] - dev-python/pypy3-exe-bin:${PV} - ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) - ! /dev/null || die - eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch - popd > /dev/null || die - - eapply_user -} - -src_configure() { - tc-export CC -} - -src_compile() { - # copy over to make sys.prefix happy - cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die - cp -p "${BROOT}"/usr/lib/pypy3.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 pypy3-c - - einfo "Generating caches and CFFI modules ..." - - # Generate Grammar and PatternGrammar pickles. - ./pypy3-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_build_scripts = { -# "_blake2": "_blake2/_blake2_build.py", -# "_ssl": "_ssl_build.py", -# "sqlite3": "_sqlite3_build.py", -# "audioop": "_audioop_build.py", -# "tk": "_tkinter/tklib_build.py", -# "curses": "_curses_build.py" if sys.platform != "win32" else None, -# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, -# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, -# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, -# "resource": "_resource_build.py" if sys.platform != "win32" else None, -# "lzma": "_lzma_build.py", -# "_decimal": "_decimal_build.py", -# "_sha3": "_sha3/_sha3_build.py", - cffi_targets=( blake2/_blake2 sha3/_sha3 ssl - audioop syslog pwdgrp resource lzma decimal ) - 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-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" - done - - # 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-c -vv lib-python || die -} - -src_install() { - local dest=/usr/lib/pypy3.7 - einfo "Installing PyPy ..." - dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-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/pypy3.7/include/${PYPY_PV}/*; do - dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}" - done - - dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3 - dodoc README.rst - - if ! use gdbm; then - rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die - fi - if ! use sqlite; then - rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \ - "${ED}${dest}"/lib_pypy/_sqlite3* \ - "${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die - fi - if ! use tk; then - rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \ - "${ED}${dest}"/lib_pypy/_tkinter \ - "${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die - fi - - local -x EPYTHON=pypy3 - local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV} - # temporarily copy to build tree to facilitate module builds - cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die - - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_moduleinto /usr/lib/pypy3.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/pytest/pytest-6.0.1.ebuild b/dev-python/pytest/pytest-6.0.1.ebuild index aa58c52f6107..0a1072c6a94b 100644 --- a/dev-python/pytest/pytest-6.0.1.ebuild +++ b/dev-python/pytest/pytest-6.0.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86" IUSE="test" RESTRICT="!test? ( test )" -- cgit v1.3.1