mgorny 14/11/04 15:04:44 Modified: pypy-2.4.0.ebuild ChangeLog Added: pypy-2.3.1-r2.ebuild Removed: pypy-2.3.1-r1.ebuild Log: Fix gdbm support, bug #519696. Add subslots in deps. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.2 dev-python/pypy/pypy-2.4.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild?r1=1.1&r2=1.2 Index: pypy-2.4.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pypy-2.4.0.ebuild 20 Oct 2014 02:15:46 -0000 1.1 +++ pypy-2.4.0.ebuild 4 Nov 2014 15:04:44 -0000 1.2 @@ -1,6 +1,6 @@ # 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.4.0.ebuild,v 1.1 2014/10/20 02:15:46 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild,v 1.2 2014/11/04 15:04:44 mgorny Exp $ EAPI=5 @@ -19,19 +19,20 @@ #KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" KEYWORDS="" -IUSE="bzip2 doc +jit ncurses sandbox shadowstack sqlite sse2 tk" +IUSE="bzip2 doc gdbm +jit ncurses sandbox shadowstack sqlite sse2 tk" -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 ) +RDEPEND=">=sys-libs/zlib-1.1.3:0= + virtual/libffi:0= + virtual/libintl:0= + dev-libs/expat:0= + dev-libs/openssl:0= + bzip2? ( app-arch/bzip2:0= ) + gdbm? ( sys-libs/gdbm:0= ) + ncurses? ( sys-libs/ncurses:5= ) + sqlite? ( dev-db/sqlite:3= ) tk? ( - dev-lang/tk:0 - dev-tcltk/tix + dev-lang/tk:0= + dev-tcltk/tix:0= ) !dev-python/pypy-bin:0" DEPEND="${RDEPEND} @@ -139,6 +140,10 @@ dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy dodoc README.rst + if ! use gdbm; then + rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \ + "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die + fi if ! use sqlite; then rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \ "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \ @@ -167,8 +172,12 @@ || die "Generation of Grammar and PatternGrammar pickles failed" # Generate cffi cache +# Please keep in sync with pypy/tool/release/package.py! "${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)" "${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)" + if use gdbm; then + "${PYTHON}" -c "import gdbm" || die "Failed to import gdbm (cffi)" + fi if use sqlite; then "${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)" fi 1.72 dev-python/pypy/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.72&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.72&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?r1=1.71&r2=1.72 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- ChangeLog 20 Oct 2014 02:15:46 -0000 1.71 +++ ChangeLog 4 Nov 2014 15:04:44 -0000 1.72 @@ -1,6 +1,12 @@ # 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.71 2014/10/20 02:15:46 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.72 2014/11/04 15:04:44 mgorny Exp $ + +*pypy-2.3.1-r2 (04 Nov 2014) + + 04 Nov 2014; Michał Górny <[email protected]> +pypy-2.3.1-r2.ebuild, + -pypy-2.3.1-r1.ebuild, pypy-2.4.0.ebuild: + Fix gdbm support, bug #519696. Add subslots in deps. *pypy-2.4.0 (20 Oct 2014) 1.1 dev-python/pypy/pypy-2.3.1-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.3.1-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.3.1-r2.ebuild?rev=1.1&content-type=text/plain Index: pypy-2.3.1-r2.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.3.1-r2.ebuild,v 1.1 2014/11/04 15:04:44 mgorny Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 pypy ) inherit check-reqs eutils multilib multiprocessing pax-utils \ python-any-r1 toolchain-funcs vcs-snapshot versionator DESCRIPTION="A fast, compliant alternative implementation of the Python language" HOMEPAGE="http://pypy.org/"; SRC_URI="https://bitbucket.org/${PN}/${PN}/get/release-${PV}.tar.bz2 -> ${P}-src.tar.bz2" LICENSE="MIT" SLOT="0/$(get_version_component_range 1-2 ${PV})" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="bzip2 doc gdbm +jit ncurses sandbox shadowstack sqlite sse2 tk" RDEPEND=">=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= dev-libs/openssl:0= bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:5= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0" 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" \ "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \ "${FILESDIR}"/2.3.1-shared-lib.patch # 517002 pushd lib-python/2.7 > /dev/null || die epatch "${FILESDIR}/2.3-21_all_distutils_c++.patch" popd > /dev/null || die 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=( --shared $(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" doins -r include lib_pypy lib-python pypy-c libpypy-c.so fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so" dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy dodoc README.rst if ! use gdbm; then rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \ "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die fi if ! use sqlite; then rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \ "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \ "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die fi if ! use tk; then rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \ "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \ "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die fi # Install docs use doc && dohtml -r pypy/doc/_build/html/ einfo "Generating caches and byte-compiling ..." python_export pypy EPYTHON PYTHON PYTHON_SITEDIR local PYTHON=${ED%/}${INSDESTTREE}/pypy-c local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" echo "EPYTHON='${EPYTHON}'" > epython.py python_domodule epython.py # 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 # Please keep in sync with pypy/tool/release/package.py! "${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)" "${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)" if use gdbm; then "${PYTHON}" -c "import gdbm" || die "Failed to import gdbm (cffi)" fi if use sqlite; then "${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)" fi if use tk; then "${PYTHON}" -c "import _tkinter" || die "Failed to import _tkinter (cffi)" fi # Cleanup temporary objects find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die # compile the installed modules python_optimize "${ED%/}${INSDESTTREE}" }
