1 |
arfrever 10/12/31 21:27:49 |
2 |
|
3 |
Modified: ChangeLog jinja-2.5.5.ebuild |
4 |
Log: |
5 |
Fix building with Jython. |
6 |
|
7 |
(Portage version: 2.2.0_alpha11_p1/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.43 dev-python/jinja/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/jinja/ChangeLog?rev=1.43&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/jinja/ChangeLog?rev=1.43&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/jinja/ChangeLog?r1=1.42&r2=1.43 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v |
19 |
retrieving revision 1.42 |
20 |
retrieving revision 1.43 |
21 |
diff -u -r1.42 -r1.43 |
22 |
--- ChangeLog 27 Dec 2010 21:09:47 -0000 1.42 |
23 |
+++ ChangeLog 31 Dec 2010 21:27:49 -0000 1.43 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for dev-python/jinja |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.42 2010/12/27 21:09:47 ranger Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.43 2010/12/31 21:27:49 arfrever Exp $ |
29 |
+ |
30 |
+ 31 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
31 |
+ jinja-2.5.5.ebuild: |
32 |
+ Fix building with Jython. |
33 |
|
34 |
27 Dec 2010; Brent Baude <ranger@g.o> jinja-2.5.5.ebuild: |
35 |
Marking jinja-2.5.5 ppc64 for bug 347109 |
36 |
|
37 |
|
38 |
|
39 |
1.8 dev-python/jinja/jinja-2.5.5.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/jinja/jinja-2.5.5.ebuild?rev=1.8&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/jinja/jinja-2.5.5.ebuild?rev=1.8&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/jinja/jinja-2.5.5.ebuild?r1=1.7&r2=1.8 |
44 |
|
45 |
Index: jinja-2.5.5.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.5.5.ebuild,v |
48 |
retrieving revision 1.7 |
49 |
retrieving revision 1.8 |
50 |
diff -u -r1.7 -r1.8 |
51 |
--- jinja-2.5.5.ebuild 27 Dec 2010 21:09:47 -0000 1.7 |
52 |
+++ jinja-2.5.5.ebuild 31 Dec 2010 21:27:49 -0000 1.8 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.5.5.ebuild,v 1.7 2010/12/27 21:09:47 ranger Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.5.5.ebuild,v 1.8 2010/12/31 21:27:49 arfrever Exp $ |
58 |
|
59 |
EAPI="3" |
60 |
SUPPORT_PYTHON_ABIS="1" |
61 |
@@ -28,10 +28,21 @@ |
62 |
|
63 |
S="${WORKDIR}/${MY_P}" |
64 |
|
65 |
-DISTUTILS_GLOBAL_OPTIONS=("--with-debugsupport") |
66 |
DOCS="CHANGES" |
67 |
PYTHON_MODNAME="jinja2" |
68 |
|
69 |
+set_global_options() { |
70 |
+ if [[ "$(python_get_implementation)" != "Jython" ]]; then |
71 |
+ DISTUTILS_GLOBAL_OPTIONS=("--with-debugsupport") |
72 |
+ else |
73 |
+ DISTUTILS_GLOBAL_OPTIONS=() |
74 |
+ fi |
75 |
+} |
76 |
+ |
77 |
+distutils_src_compile_pre_hook() { |
78 |
+ set_global_options |
79 |
+} |
80 |
+ |
81 |
src_compile(){ |
82 |
distutils_src_compile |
83 |
|
84 |
@@ -42,6 +53,14 @@ |
85 |
fi |
86 |
} |
87 |
|
88 |
+distutils_src_test_pre_hook() { |
89 |
+ set_global_options |
90 |
+} |
91 |
+ |
92 |
+distutils_src_install_pre_hook() { |
93 |
+ set_global_options |
94 |
+} |
95 |
+ |
96 |
src_install(){ |
97 |
distutils_src_install |
98 |
python_clean_installation_image |