mgorny 14/11/04 15:08:24 Modified: pypy-bin-2.4.0.ebuild ChangeLog Added: pypy-bin-2.3.1-r1.ebuild Removed: pypy-bin-2.3.1.ebuild Log: Fix gdbm support, bug #519696. Add subslots to cffi-deps to force rebuilding of modules. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.2 dev-python/pypy-bin/pypy-bin-2.4.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild?r1=1.1&r2=1.2 Index: pypy-bin-2.4.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pypy-bin-2.4.0.ebuild 20 Oct 2014 08:32:50 -0000 1.1 +++ pypy-bin-2.4.0.ebuild 4 Nov 2014 15:08:24 -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-bin/pypy-bin-2.4.0.ebuild,v 1.1 2014/10/20 08:32:50 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild,v 1.2 2014/11/04 15:08:24 mgorny Exp $ EAPI=5 @@ -61,7 +61,7 @@ #KEYWORDS="~amd64" # Needs some more sanity checks before it gets unleashed on users KEYWORDS="" -IUSE="doc +jit shadowstack sqlite sse2 test tk" +IUSE="doc gdbm +jit shadowstack sqlite sse2 test tk" # yep, world would be easier if people started filling subslots... RDEPEND=" @@ -72,10 +72,11 @@ sys-libs/glibc:2.2 sys-libs/ncurses:5 sys-libs/zlib:0 - sqlite? ( dev-db/sqlite:3 ) + gdbm? ( sys-libs/gdbm:0= ) + sqlite? ( dev-db/sqlite:3= ) tk? ( - dev-lang/tk:0 - dev-tcltk/tix + dev-lang/tk:0= + dev-tcltk/tix:0= ) !dev-python/pypy:0" DEPEND="app-arch/xz-utils @@ -130,6 +131,10 @@ dosym ../$(get_libdir)/pypy/libpypy-c.so /usr/$(get_libdir)/libpypy-c.so 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 \ @@ -158,8 +163,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.23 dev-python/pypy-bin/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy-bin/ChangeLog?rev=1.23&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy-bin/ChangeLog?rev=1.23&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy-bin/ChangeLog?r1=1.22&r2=1.23 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ChangeLog 20 Oct 2014 08:32:50 -0000 1.22 +++ ChangeLog 4 Nov 2014 15:08:24 -0000 1.23 @@ -1,6 +1,13 @@ # ChangeLog for dev-python/pypy-bin # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.22 2014/10/20 08:32:50 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.23 2014/11/04 15:08:24 mgorny Exp $ + +*pypy-bin-2.3.1-r1 (04 Nov 2014) + + 04 Nov 2014; Michał Górny <[email protected]> +pypy-bin-2.3.1-r1.ebuild, + -pypy-bin-2.3.1.ebuild, pypy-bin-2.4.0.ebuild: + Fix gdbm support, bug #519696. Add subslots to cffi-deps to force rebuilding + of modules. *pypy-bin-2.4.0 (20 Oct 2014) 1.1 dev-python/pypy-bin/pypy-bin-2.3.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.3.1-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.3.1-r1.ebuild?rev=1.1&content-type=text/plain Index: pypy-bin-2.3.1-r1.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-bin/pypy-bin-2.3.1-r1.ebuild,v 1.1 2014/11/04 15:08:24 mgorny Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 pypy pypy2_0 ) inherit eutils multilib pax-utils python-any-r1 vcs-snapshot versionator BINHOST="http://pypy.aliceinwire.net/pypy-bin/"; DESCRIPTION="A fast, compliant alternative implementation of the Python language (binary package)" HOMEPAGE="http://pypy.org/"; SRC_URI="https://www.bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2 amd64? ( jit? ( shadowstack? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz -> ${P}-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz ) ) jit? ( !shadowstack? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.xz -> ${P}-r1-amd64+bzip2+jit+ncurses.tar.xz ) ) !jit? ( !shadowstack? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz -> ${P}-r1-amd64+bzip2+ncurses.tar.xz ) ) ) x86? ( sse2? ( jit? ( shadowstack? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz -> ${P}-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz ) ) jit? ( !shadowstack? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz -> ${P}-r1-x86+bzip2+jit+ncurses+sse2.tar.xz ) ) !jit? ( !shadowstack? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz -> ${P}-r1-x86+bzip2+ncurses+sse2.tar.xz ) ) ) !sse2? ( !jit? ( !shadowstack? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz -> ${P}-r1-x86+bzip2+ncurses.tar.xz ) ) ) )" # Supported variants REQUIRED_USE="!jit? ( !shadowstack ) x86? ( !sse2? ( !jit !shadowstack ) )" LICENSE="MIT" SLOT="0/$(get_version_component_range 1-2 ${PV})" KEYWORDS="~amd64 ~x86" IUSE="doc gdbm +jit shadowstack sqlite sse2 test tk" # yep, world would be easier if people started filling subslots... RDEPEND=" app-arch/bzip2:0 dev-libs/expat:0 dev-libs/libffi:0 dev-libs/openssl:0 sys-libs/glibc:2.2 sys-libs/ncurses:5 sys-libs/zlib:0 gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0" DEPEND="app-arch/xz-utils doc? ( ${PYTHON_DEPS} dev-python/sphinx ) test? ( ${RDEPEND} )" PDEPEND="app-admin/python-updater" S=${WORKDIR}/pypy-${PV}-src pkg_setup() { use doc && 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" 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() { # Tadaam! PyPy compiled! mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die mv "${WORKDIR}"/${P}*/include/*.h include/ || die mv pypy/module/cpyext/include/*.h include/ || die use doc && emake -C pypy/doc/ html #needed even without jit :( also needed in both compile and install phases pax-mark m 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 dosym ../$(get_libdir)/pypy/libpypy-c.so /usr/$(get_libdir)/libpypy-c.so 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}" }
