| 1 |
floppym 12/12/01 23:28:31 |
| 2 |
|
| 3 |
Modified: pypy-1.9-r2.ebuild pypy-1.8-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix module compilation and simpify PYTHONPATH for grammar pickle generation. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-python/pypy/pypy-1.9-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-1.9-r2.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-1.9-r2.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-1.9-r2.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: pypy-1.9-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.9-r2.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- pypy-1.9-r2.ebuild 1 Dec 2012 10:42:15 -0000 1.1 |
| 23 |
+++ pypy-1.9-r2.ebuild 1 Dec 2012 23:28:31 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.9-r2.ebuild,v 1.1 2012/12/01 10:42:15 mgorny Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.9-r2.ebuild,v 1.2 2012/12/01 23:28:31 floppym Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -112,13 +112,12 @@ |
| 33 |
fi |
| 34 |
|
| 35 |
# Generate Grammar and PatternGrammar pickles. |
| 36 |
- PYTHONPATH="${ED}${INSDESTTREE}/lib_pypy/__extensions__:${ED}${INSDESTTREE}/lib_pypy:${ED}${INSDESTTREE}/lib-python/modified-2.7:${ED}${INSDESTTREE}/lib-python/2.7" \ |
| 37 |
- "${PYTHON}" \ |
| 38 |
- -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ |
| 39 |
+ PYTHONPATH="${ED}${INSDESTTREE}/lib-python/2.7" |
| 40 |
+ "${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ |
| 41 |
|| die "Generation of Grammar and PatternGrammar pickles failed" |
| 42 |
|
| 43 |
# compile the installed modules |
| 44 |
- python_optimize |
| 45 |
+ python_optimize "${ED}${INSDESTTREE}" |
| 46 |
|
| 47 |
echo "EPYTHON='${EPYTHON}'" > epython.py |
| 48 |
python_domodule epython.py |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.2 dev-python/pypy/pypy-1.8-r2.ebuild |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-1.8-r2.ebuild?rev=1.2&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-1.8-r2.ebuild?rev=1.2&content-type=text/plain |
| 56 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-1.8-r2.ebuild?r1=1.1&r2=1.2 |
| 57 |
|
| 58 |
Index: pypy-1.8-r2.ebuild |
| 59 |
=================================================================== |
| 60 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.8-r2.ebuild,v |
| 61 |
retrieving revision 1.1 |
| 62 |
retrieving revision 1.2 |
| 63 |
diff -u -r1.1 -r1.2 |
| 64 |
--- pypy-1.8-r2.ebuild 1 Dec 2012 10:42:15 -0000 1.1 |
| 65 |
+++ pypy-1.8-r2.ebuild 1 Dec 2012 23:28:31 -0000 1.2 |
| 66 |
@@ -1,6 +1,6 @@ |
| 67 |
# Copyright 1999-2012 Gentoo Foundation |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.8-r2.ebuild,v 1.1 2012/12/01 10:42:15 mgorny Exp $ |
| 70 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.8-r2.ebuild,v 1.2 2012/12/01 23:28:31 floppym Exp $ |
| 71 |
|
| 72 |
EAPI=5 |
| 73 |
|
| 74 |
@@ -99,13 +99,12 @@ |
| 75 |
fi |
| 76 |
|
| 77 |
# Generate Grammar and PatternGrammar pickles. |
| 78 |
- PYTHONPATH="${ED}${INSDESTTREE}/lib_pypy/__extensions__:${ED}${INSDESTTREE}/lib_pypy:${ED}${INSDESTTREE}/lib-python/modified-2.7:${ED}${INSDESTTREE}/lib-python/2.7" \ |
| 79 |
- "${PYTHON}" \ |
| 80 |
- -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ |
| 81 |
+ PYTHONPATH="${ED}${INSDESTTREE}/lib-python/2.7" |
| 82 |
+ "${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ |
| 83 |
|| die "Generation of Grammar and PatternGrammar pickles failed" |
| 84 |
|
| 85 |
# compile the installed modules |
| 86 |
- python_optimize |
| 87 |
+ python_optimize "${ED}${INSDESTTREE}" |
| 88 |
|
| 89 |
echo "EPYTHON='${EPYTHON}'" > epython.py |
| 90 |
python_domodule epython.py |
| 91 |
|
| 92 |
|
| 93 |
|
| 94 |
1.27 dev-python/pypy/ChangeLog |
| 95 |
|
| 96 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.27&view=markup |
| 97 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.27&content-type=text/plain |
| 98 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?r1=1.26&r2=1.27 |
| 99 |
|
| 100 |
Index: ChangeLog |
| 101 |
=================================================================== |
| 102 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v |
| 103 |
retrieving revision 1.26 |
| 104 |
retrieving revision 1.27 |
| 105 |
diff -u -r1.26 -r1.27 |
| 106 |
--- ChangeLog 1 Dec 2012 10:42:15 -0000 1.26 |
| 107 |
+++ ChangeLog 1 Dec 2012 23:28:31 -0000 1.27 |
| 108 |
@@ -1,6 +1,10 @@ |
| 109 |
# ChangeLog for dev-python/pypy |
| 110 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 111 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.26 2012/12/01 10:42:15 mgorny Exp $ |
| 112 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.27 2012/12/01 23:28:31 floppym Exp $ |
| 113 |
+ |
| 114 |
+ 01 Dec 2012; Mike Gilbert <floppym@g.o> pypy-1.8-r2.ebuild, |
| 115 |
+ pypy-1.9-r2.ebuild: |
| 116 |
+ Fix module compilation and simpify PYTHONPATH for grammar pickle generation. |
| 117 |
|
| 118 |
*pypy-1.8-r2 (01 Dec 2012) |
| 119 |
*pypy-1.9-r2 (01 Dec 2012) |
Archives