From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-python/pypy/Manifest | 5 +- dev-python/pypy/files/7.3.1-gentoo-path.patch | 42 ++++++ dev-python/pypy/pypy-7.3.0.ebuild | 8 +- dev-python/pypy/pypy-7.3.1.ebuild | 182 ++++++++++++++++++++++++++ 4 files changed, 230 insertions(+), 7 deletions(-) create mode 100644 dev-python/pypy/files/7.3.1-gentoo-path.patch create mode 100644 dev-python/pypy/pypy-7.3.1.ebuild (limited to 'dev-python/pypy') diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest index e6e9d4603de9..ad16de69c4c3 100644 --- a/dev-python/pypy/Manifest +++ b/dev-python/pypy/Manifest @@ -1,7 +1,10 @@ AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 BLAKE2B 4976bf66e4e96f89e64ad79910bb7b6fc7c3929cf7b7f1a0a59e66b5bb87e600864df2556f1dccf7695223121c7271382227e16cfb8fb7851cf56be25542b7ab SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a AUX 7.0.0-gentoo-path.patch 1945 BLAKE2B 15cf6008d0032fd839e91e968eeadce5b0ab633f97cc0ce17c8c838746a83bab0255d3f009dfe42f322f512b2996608963db70e936a7c4535c8533e3f80d15f3 SHA512 8d946c79b116d8912f0b68146579b7cce70adf439023678d803c0b8085d53c8409d1fe0a66e53ecde2cd1bf22154e456b62f09561f62dab13f01c3fbdd9bb901 +AUX 7.3.1-gentoo-path.patch 1558 BLAKE2B 1decdd9362637931c7719adcfd2e95cdae2073b6280e4ec6e762ac215a74d45e9175890ecc2edd3925fbad5428fe9d23e34eaecce6ac720cbb406eef1f9ef723 SHA512 3dbda421d0c2caef1b7a276da29968c4057a401ada864aee9c333e37d146704826a7b5e58da0dd5ac52fb238a707d413c57e142fb7f95bcd8d1282a4d138d1f7 DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61 SHA512 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535 +DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f -EBUILD pypy-7.3.0.ebuild 6051 BLAKE2B 4cc01b13e8008284a0a904ec402b85d0732befb67afcab7ffcac2835a49b100720a63334f41b8391a8508bbf551709ef6945b6b4f538538d108856c8f457fff3 SHA512 7650be4508806b61af046c068f98dfcc6d6be12772a66e3bab182a37771be9ac6e1a1ede2ddd669e507702c647e60a2ef8ef13c2342970d1e70d39e661d15f26 +EBUILD pypy-7.3.0.ebuild 5894 BLAKE2B bec20881d6785b0b53a117f291d9a4ad369838042c0681c81b65a3d3d2da2532316d358c39a8f9fb4e10f8a86afa0bd01d32a374941037aa3a05f477cf3b51aa SHA512 5c831d1ea874862d101b54baaa7b7f15b9d22413f87650f3d330dcbd43b52028bbdd7d39cd5527a2984003bf69ffb4121f32807163c87359faa9edc42be79c1c +EBUILD pypy-7.3.1.ebuild 5896 BLAKE2B f9c5d0da26c17120c3d2513ab294e2d990b8dfe7496c8ceee60099d13daca96261a04b49b8b999b7131a6988e482febf02a365ae8f391e5d4cb50e79b62312b1 SHA512 d5031077e6b828b5b488e0b4c53bfc9868b7de1f1d4cf3f97e12c702fe2da0a1b5caa40be670b4dfb5302d551641073210f0f68c148d8705a7cdddaa330c388d MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294 diff --git a/dev-python/pypy/files/7.3.1-gentoo-path.patch b/dev-python/pypy/files/7.3.1-gentoo-path.patch new file mode 100644 index 000000000000..dd2c635055dd --- /dev/null +++ b/dev-python/pypy/files/7.3.1-gentoo-path.patch @@ -0,0 +1,42 @@ +From 6d439c6718625bb7dce32b0afdc6a3d5168a21e5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sat, 11 Apr 2020 07:01:27 +0200 +Subject: [PATCH] Support Gentoo install scheme + +--- + lib-python/2.7/distutils/command/install.py | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py +index 6fe62be..a4e9f0d 100644 +--- a/lib-python/2.7/distutils/command/install.py ++++ b/lib-python/2.7/distutils/command/install.py +@@ -97,6 +97,13 @@ INSTALL_SCHEMES = { + 'scripts': '$base/Scripts', + 'data' : '$base', + }, ++ 'gentoo': { ++ 'purelib': '$base/site-packages', ++ 'platlib': '$base/site-packages', ++ 'headers': '$base/include', ++ 'scripts': '@EPREFIX@/usr/bin', ++ 'data' : '@EPREFIX@/usr', ++ }, + } + + # The keys to an installation scheme; if any new types of files are to be +@@ -483,7 +490,10 @@ class install (Command): + # it's the caller's problem if they supply a bad name! + if (hasattr(sys, 'pypy_version_info') and + not name.endswith(('_user', '_home'))): +- if os.name == 'nt': ++ if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'): ++ # override paths for system-wide install ++ name = 'gentoo' ++ elif os.name == 'nt': + name = 'pypy_nt' + else: + name = 'pypy' +-- +2.26.0 + diff --git a/dev-python/pypy/pypy-7.3.0.ebuild b/dev-python/pypy/pypy-7.3.0.ebuild index fef3e9c742c7..15a4ffa99455 100644 --- a/dev-python/pypy/pypy-7.3.0.ebuild +++ b/dev-python/pypy/pypy-7.3.0.ebuild @@ -170,17 +170,13 @@ src_install() { "${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 - # we can't use eclass function since PyPy is dumb and always gives - # paths relative to the interpreter - local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages - python_export pypy EPYTHON echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_moduleinto /usr/lib/pypy2.7/site-packages python_domodule epython.py einfo "Byte-compiling Python standard library..." - - # compile the installed modules python_optimize "${ED}${dest}" } diff --git a/dev-python/pypy/pypy-7.3.1.ebuild b/dev-python/pypy/pypy-7.3.1.ebuild new file mode 100644 index 000000000000..e38b85a5caaa --- /dev/null +++ b/dev-python/pypy/pypy-7.3.1.ebuild @@ -0,0 +1,182 @@ +# 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.17-r1" + +DESCRIPTION="A fast, compliant alternative implementation of the Python language" +HOMEPAGE="https://pypy.org/" +SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${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 + # this one seems to rely on cpython gc handling (?) + sed -i -e 's:test_number_of_objects:_&:' \ + lib-python/2.7/test/test_multiprocessing.py || die + # hardcoded assumptions (?) + sed -i -e 's:test_alpn_protocols:_&:' \ + -e 's:test_default_ecdh_curve:_&:' \ + lib-python/2.7/test/test_ssl.py || die + # requires Internet + sed -i -e '/class NetworkedTests/i@unittest.skip("Requires networking")' \ + lib-python/2.7/test/test_ssl.py || die + # TODO: investigate (sandbox?) + sed -i -e 's:test__copy_to_each:_&:' \ + lib-python/2.7/test/test_pty.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 + # no module named 'worker' -- a lot + --ignore=lib-python/2.7/test/test_xpickle.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 + + 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}" +} -- cgit v1.2.3