patrick     14/03/12 08:21:43

  Modified:             ChangeLog
  Added:                pypy-2.2.1.ebuild
  Log:
  Bump for #479832, patch by Ian Delaney.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.54                 dev-python/pypy/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.54&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.54&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?r1=1.53&r2=1.54

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ChangeLog   11 Mar 2014 20:01:04 -0000      1.53
+++ ChangeLog   12 Mar 2014 08:21:43 -0000      1.54
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pypy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.53 2014/03/11 
20:01:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.54 2014/03/12 
08:21:43 patrick Exp $
+
+*pypy-2.2.1 (12 Mar 2014)
+
+  12 Mar 2014; Patrick Lauer <patr...@gentoo.org>
+  +files/2.1-distutils-fix_handling_of_executables_and_flags.patch,
+  +pypy-2.2.1.ebuild:
+  Bump for #479832, patch by Ian Delaney.
 
   11 Mar 2014; Pacho Ramos <pa...@gentoo.org> metadata.xml:
   Cleanup due #239126



1.1                  dev-python/pypy/pypy-2.2.1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.2.1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.2.1.ebuild?rev=1.1&content-type=text/plain

Index: pypy-2.2.1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.2.1.ebuild,v 1.1 
2014/03/12 08:21:43 patrick Exp $

EAPI=5

PYTHON_COMPAT=( python2_7 pypy2_0 pypy2_2 )
inherit check-reqs eutils multilib multiprocessing pax-utils \
        python-any-r1 toolchain-funcs versionator

DESCRIPTION="A fast, compliant alternative implementation of the Python 
language"
HOMEPAGE="http://pypy.org/";
SRC_URI="mirror://bitbucket/pypy/pypy/downloads/${P}-src.tar.bz2"

LICENSE="MIT"
SLOT=$(get_version_component_range 1-2 ${PV})
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 doc +jit ncurses sandbox shadowstack sqlite sse2"

RDEPEND=">=sys-libs/zlib-1.1.3
        virtual/libffi
        virtual/libintl
        dev-libs/expat
        dev-libs/openssl
        bzip2? ( app-arch/bzip2 )
        ncurses? ( sys-libs/ncurses )
        sqlite? ( dev-db/sqlite:3 )"
DEPEND="${RDEPEND}
        doc? ( dev-python/sphinx )
        ${PYTHON_DEPS}"
PDEPEND="app-admin/python-updater"

S="${WORKDIR}/${P}-src"

pkg_pretend() {
        CHECKREQS_MEMORY="2G"
        use amd64 && CHECKREQS_MEMORY="4G"
        check-reqs_pkg_pretend
}

pkg_setup() {
        pkg_pretend
        python-any-r1_pkg_setup
}

src_prepare() {
        epatch "${FILESDIR}/1.9-scripts-location.patch"
        epatch 
"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
        epatch 
"${FILESDIR}/2.1-distutils-fix_handling_of_executables_and_flags.patch"

        epatch_user
}

src_compile() {
        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 sse2; then
                                jit_backend+=x86
                        else
                                jit_backend+=x86-without-sse2
                        fi
                else
                        jit_backend+=auto
                fi
        fi

        local args=(
                $(usex jit -Ojit -O2)
                $(usex shadowstack --gcrootfinder=shadowstack '')
                $(usex sandbox --sandbox '')

                ${jit_backend}
                --make-jobs=$(makeopts_jobs)

                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

        set -- "${PYTHON}" rpython/bin/rpython --batch "${args[@]}"
        echo -e "\033[1m${@}\033[0m"
        "${@}" || die "compile error"

        use doc && emake -C pypy/doc/ html
        pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
}

src_test() {
        # (unset)
        local -x PYTHONDONTWRITEBYTECODE

        ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
}

src_install() {
        einfo "Installing PyPy ..."
        insinto "/usr/$(get_libdir)/pypy${SLOT}"
        doins -r include lib_pypy lib-python pypy-c
        fperms a+x ${INSDESTTREE}/pypy-c
        pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
        dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
        dodoc README.rst

        if ! use sqlite; then
                rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 || die
                rm "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py || die
        fi

        # Install docs
        use doc && dohtml -r pypy/doc/_build/html/

        einfo "Generating caches and byte-compiling ..."

        python_export pypy-c${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
        local PYTHON=${ED%/}${INSDESTTREE}/pypy-c

        echo "EPYTHON='${EPYTHON}'" > epython.py
        python_domodule epython.py

        # Note: call portage helpers before this line.
        # PYTHONPATH confuses them and will result in random failures.

        local -x 
PYTHONPATH="${ED%/}${INSDESTTREE}/lib_pypy:${ED%/}${INSDESTTREE}/lib-python/2.7"

        # Generate Grammar and PatternGrammar pickles.
        "${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; 
lib2to3.patcomp.PatternCompiler()" \
                || die "Generation of Grammar and PatternGrammar pickles failed"

        # Generate cffi cache
        "${PYTHON}" -c "import _curses" || die "Failed to import _curses"
        if use sqlite; then
                "${PYTHON}" -c "import _sqlite3" || die "Failed to import 
_sqlite3"
        fi

        # compile the installed modules
        python_optimize "${ED%/}${INSDESTTREE}"
}




Reply via email to