From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0991D138334 for ; Sat, 5 Jan 2019 13:40:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC631E0A89; Sat, 5 Jan 2019 13:40:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 76E5CE0A89 for ; Sat, 5 Jan 2019 13:40:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64652335D06 for ; Sat, 5 Jan 2019 13:40:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB7F550B for ; Sat, 5 Jan 2019 13:39:56 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1546695588.5e614e855fa28cb172af1304a66392bc7253d078.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy/Manifest dev-python/pypy/pypy-5.10.0.ebuild X-VCS-Directories: dev-python/pypy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 5e614e855fa28cb172af1304a66392bc7253d078 X-VCS-Branch: master Date: Sat, 5 Jan 2019 13:39:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f8f039db-64d6-4b1d-88cf-73f910f2efde X-Archives-Hash: 3872bb6460265f30f129413596859d92 commit: 5e614e855fa28cb172af1304a66392bc7253d078 Author: Michał Górny gentoo org> AuthorDate: Sat Jan 5 13:27:05 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jan 5 13:39:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e614e85 dev-python/pypy: Remove 5.10.0 Signed-off-by: Michał Górny gentoo.org> dev-python/pypy/Manifest | 1 - dev-python/pypy/pypy-5.10.0.ebuild | 275 ------------------------------------- 2 files changed, 276 deletions(-) diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest index 222168a0e5c..40d382a050f 100644 --- a/dev-python/pypy/Manifest +++ b/dev-python/pypy/Manifest @@ -1,3 +1,2 @@ -DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559bb3a0383445387a0c48f951d75d009c57806eb600a141a84a7cb800e2f53fe091367cbb0b23192bc52b995cb65246c076 SHA512 11892418d753ddc59e928a5f59b3406b7c22b8689ad6995eeb183182dbb5184117e68bb567c770ffa60a14d6763550d658e260584e65da5025ed481f48501379 DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1 diff --git a/dev-python/pypy/pypy-5.10.0.ebuild b/dev-python/pypy/pypy-5.10.0.ebuild deleted file mode 100644 index 286b7be69e1..00000000000 --- a/dev-python/pypy/pypy-5.10.0.ebuild +++ /dev/null @@ -1,275 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 pypy ) -inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator - -# note: remember to update this to newest dev-lang/python:2.7 on bump -CPY_PATCHSET_VERSION="2.7.14-0" -MY_P=pypy2-v${PV} - -DESCRIPTION="A fast, compliant alternative implementation of the Python language" -HOMEPAGE="http://pypy.org/" -SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2 - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz" - -LICENSE="MIT" -# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")' -SLOT="0/41" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk" - -RDEPEND=">=sys-libs/zlib-1.1.3:0= - virtual/libffi:0= - virtual/libintl:0= - dev-libs/expat:0= - !libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) - bzip2? ( app-arch/bzip2:0= ) - gdbm? ( sys-libs/gdbm:0= ) - ncurses? ( sys-libs/ncurses:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) - !dev-python/pypy-bin:0" -# 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} - !low-memory? ( - || ( - dev-python/pypy - dev-python/pypy-bin - ( - dev-lang/python:2.7 - dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] - ) - ) - )" - -S="${WORKDIR}/${MY_P}-src" - -check_env() { - if use low-memory; then - if ! python_is_installed pypy; then - eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy" - eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:" - eerror - eerror " $ emerge -1v dev-python/pypy-bin" - eerror - eerror "before attempting to build dev-python/pypy[low-memory]." - die "dev-python/pypy-bin (or 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 - - if python_is_installed pypy; then - if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then - einfo "Using already-installed PyPy to perform the translation." - local 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." - fi - fi - - python-any-r1_pkg_setup - fi -} - -src_prepare() { - eapply "${FILESDIR}/4.0.0-gentoo-path.patch" - eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" - eapply "${FILESDIR}"/5.9.0-shared-lib.patch # 517002 - - sed -e "s^@EPREFIX@^${EPREFIX}^" \ - -e "s^@libdir@^$(get_libdir)^" \ - -i lib-python/2.7/distutils/command/install.py || die - - # apply CPython stdlib patches - pushd lib-python/2.7 > /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 "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch - popd > /dev/null || die - - eapply_user -} - -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=( - --shared - $(usex jit -Ojit -O2) - $(usex sandbox --sandbox '') - - ${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=( "${PYTHON}" ) - if use low-memory; then - interp=( env PYPY_GC_MAX_DELTA=200MB - "${PYTHON}" --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 - - # copy back to make sys.prefix happy - cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die - pax-mark m pypy-c libpypy-c.so - - 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 = { -# "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=( 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 - - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die -} - -src_install() { - local dest=/usr/$(get_libdir)/pypy - einfo "Installing PyPy ..." - exeinto "${dest}" - doexe pypy-c libpypy-c.so - pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so" - insinto "${dest}" - # preserve mtimes to avoid obsoleting caches - insopts -p - doins -r include lib_pypy lib-python - dosym ../$(get_libdir)/pypy/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 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/$(get_libdir)/pypy/site-packages - python_export pypy EPYTHON - - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - einfo "Byte-compiling Python standard library..." - - # compile the installed modules - python_optimize "${ED%/}${dest}" -}