diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-02-28 19:24:00 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-02-28 19:24:00 +0000 |
| commit | 74a418c1bef8d7b83f3d03f68f7ba5b4473659b8 (patch) | |
| tree | 7518afed753af0e839ab151da6619e7897b97c15 /dev-python | |
| parent | Remove old. (diff) | |
| download | gentoo-2-74a418c1bef8d7b83f3d03f68f7ba5b4473659b8.tar.gz gentoo-2-74a418c1bef8d7b83f3d03f68f7ba5b4473659b8.tar.bz2 gentoo-2-74a418c1bef8d7b83f3d03f68f7ba5b4473659b8.zip | |
Apply patch from Arfrever for bug 406129. Tested by Ian Delaney.
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/pypy/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pypy/pypy-1.7-r2.ebuild | 5 | ||||
| -rw-r--r-- | dev-python/pypy/pypy-1.8-r1.ebuild | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog index ce9bd556f9c3..9eedca0e5e28 100644 --- a/dev-python/pypy/ChangeLog +++ b/dev-python/pypy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pypy # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.16 2012/02/16 13:53:54 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.17 2012/02/28 19:24:00 floppym Exp $ + + 28 Feb 2012; Mike Gilbert <floppym@gentoo.org> pypy-1.7-r2.ebuild, + pypy-1.8-r1.ebuild: + Apply patch from Arfrever for bug 406129. Tested by Ian Delaney. 16 Feb 2012; Dirkjan Ochtman <djc@gentoo.org> pypy-1.8-r1.ebuild: Add fake xml useflag for dependencies (suggested by Arfrever). diff --git a/dev-python/pypy/pypy-1.7-r2.ebuild b/dev-python/pypy/pypy-1.7-r2.ebuild index 6921f9d14b60..26c119356c6e 100644 --- a/dev-python/pypy/pypy-1.7-r2.ebuild +++ b/dev-python/pypy/pypy-1.7-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7-r2.ebuild,v 1.4 2012/02/14 02:16:50 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7-r2.ebuild,v 1.5 2012/02/28 19:24:00 floppym Exp $ EAPI="4" @@ -88,6 +88,9 @@ src_install() { rm -fr "${ED}${INSPATH}/lib-python/modified-2.7/sqlite3" rm -f "${ED}${INSPATH}/lib_pypy/_sqlite3.py" fi + + # Generate Grammar and PatternGrammar pickles. + PYTHONPATH="${ED}${INSPATH}/lib_pypy/__extensions__:${ED}${INSPATH}/lib_pypy:${ED}${INSPATH}/lib-python/modified-2.7:${ED}${INSPATH}/lib-python/2.7" "${ED}${INSPATH}/pypy-c" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" || die "Generation of Grammar and PatternGrammar pickles failed" } src_test() { diff --git a/dev-python/pypy/pypy-1.8-r1.ebuild b/dev-python/pypy/pypy-1.8-r1.ebuild index e021bc8b4729..d998d17b0208 100644 --- a/dev-python/pypy/pypy-1.8-r1.ebuild +++ b/dev-python/pypy/pypy-1.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.8-r1.ebuild,v 1.2 2012/02/16 13:53:54 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.8-r1.ebuild,v 1.3 2012/02/28 19:24:00 floppym Exp $ EAPI="4" @@ -92,6 +92,9 @@ src_install() { rm -fr "${ED}${INSPATH}/lib-python/modified-2.7/sqlite3" rm -f "${ED}${INSPATH}/lib_pypy/_sqlite3.py" fi + + # Generate Grammar and PatternGrammar pickles. + PYTHONPATH="${ED}${INSPATH}/lib_pypy/__extensions__:${ED}${INSPATH}/lib_pypy:${ED}${INSPATH}/lib-python/modified-2.7:${ED}${INSPATH}/lib-python/2.7" "${ED}${INSPATH}/pypy-c" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" || die "Generation of Grammar and PatternGrammar pickles failed" } src_test() { |