1 |
kanaka 07/09/15 18:27:58 |
2 |
|
3 |
Modified: python-2.4.4-r4.ebuild python-2.5.1-r2.ebuild |
4 |
python-2.4.4-r5.ebuild |
5 |
Log: |
6 |
Remove left hand side quotes in [[ ]] test. Don't call die if epatch fails, since this is already handled in epatch. |
7 |
(Portage version: 2.1.2.12) |
8 |
|
9 |
Revision Changes Path |
10 |
1.23 dev-lang/python/python-2.4.4-r4.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.4-r4.ebuild?rev=1.23&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.4-r4.ebuild?rev=1.23&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.4-r4.ebuild?r1=1.22&r2=1.23 |
15 |
|
16 |
Index: python-2.4.4-r4.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r4.ebuild,v |
19 |
retrieving revision 1.22 |
20 |
retrieving revision 1.23 |
21 |
diff -u -r1.22 -r1.23 |
22 |
--- python-2.4.4-r4.ebuild 11 Sep 2007 19:24:01 -0000 1.22 |
23 |
+++ python-2.4.4-r4.ebuild 15 Sep 2007 18:27:57 -0000 1.23 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2007 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r4.ebuild,v 1.22 2007/09/11 19:24:01 kanaka Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r4.ebuild,v 1.23 2007/09/15 18:27:57 kanaka Exp $ |
29 |
|
30 |
# NOTE about python-portage interactions : |
31 |
# - Do not add a pkg_setup() check for a certain version of portage |
32 |
@@ -58,10 +58,9 @@ |
33 |
cd ${S} |
34 |
|
35 |
if tc-is-cross-compiler ; then |
36 |
- [[ "$(python -V 2>&1)" != "Python ${PV}" ]] && \ |
37 |
+ [[ $(python -V 2>&1) != "Python ${PV}" ]] && \ |
38 |
die "Crosscompiling requires the same host and build versions." |
39 |
- epatch ${FILESDIR}/python-2.4.4-test-cross.patch || \ |
40 |
- die "cross patch failed" |
41 |
+ epatch ${FILESDIR}/python-2.4.4-test-cross.patch |
42 |
else |
43 |
rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch |
44 |
fi |
45 |
|
46 |
|
47 |
|
48 |
1.17 dev-lang/python/python-2.5.1-r2.ebuild |
49 |
|
50 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.5.1-r2.ebuild?rev=1.17&view=markup |
51 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.5.1-r2.ebuild?rev=1.17&content-type=text/plain |
52 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.5.1-r2.ebuild?r1=1.16&r2=1.17 |
53 |
|
54 |
Index: python-2.5.1-r2.ebuild |
55 |
=================================================================== |
56 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.1-r2.ebuild,v |
57 |
retrieving revision 1.16 |
58 |
retrieving revision 1.17 |
59 |
diff -u -r1.16 -r1.17 |
60 |
--- python-2.5.1-r2.ebuild 11 Sep 2007 19:24:01 -0000 1.16 |
61 |
+++ python-2.5.1-r2.ebuild 15 Sep 2007 18:27:57 -0000 1.17 |
62 |
@@ -1,6 +1,6 @@ |
63 |
# Copyright 1999-2007 Gentoo Foundation |
64 |
# Distributed under the terms of the GNU General Public License v2 |
65 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.1-r2.ebuild,v 1.16 2007/09/11 19:24:01 kanaka Exp $ |
66 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.1-r2.ebuild,v 1.17 2007/09/15 18:27:57 kanaka Exp $ |
67 |
|
68 |
# NOTE about python-portage interactions : |
69 |
# - Do not add a pkg_setup() check for a certain version of portage |
70 |
@@ -62,10 +62,9 @@ |
71 |
cd "${S}" |
72 |
|
73 |
if tc-is-cross-compiler ; then |
74 |
- [[ "$(python -V 2>&1)" != "Python ${PV}" ]] && \ |
75 |
+ [[ $(python -V 2>&1) != "Python ${PV}" ]] && \ |
76 |
die "Crosscompiling requires the same host and build versions." |
77 |
- epatch ${FILESDIR}/python-2.4.4-test-cross.patch || \ |
78 |
- die "cross patch failed" |
79 |
+ epatch ${FILESDIR}/python-2.4.4-test-cross.patch |
80 |
else |
81 |
rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch |
82 |
fi |
83 |
|
84 |
|
85 |
|
86 |
1.6 dev-lang/python/python-2.4.4-r5.ebuild |
87 |
|
88 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.4-r5.ebuild?rev=1.6&view=markup |
89 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.4-r5.ebuild?rev=1.6&content-type=text/plain |
90 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.4-r5.ebuild?r1=1.5&r2=1.6 |
91 |
|
92 |
Index: python-2.4.4-r5.ebuild |
93 |
=================================================================== |
94 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r5.ebuild,v |
95 |
retrieving revision 1.5 |
96 |
retrieving revision 1.6 |
97 |
diff -u -r1.5 -r1.6 |
98 |
--- python-2.4.4-r5.ebuild 11 Sep 2007 19:24:01 -0000 1.5 |
99 |
+++ python-2.4.4-r5.ebuild 15 Sep 2007 18:27:57 -0000 1.6 |
100 |
@@ -1,6 +1,6 @@ |
101 |
# Copyright 1999-2007 Gentoo Foundation |
102 |
# Distributed under the terms of the GNU General Public License v2 |
103 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r5.ebuild,v 1.5 2007/09/11 19:24:01 kanaka Exp $ |
104 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r5.ebuild,v 1.6 2007/09/15 18:27:57 kanaka Exp $ |
105 |
|
106 |
# NOTE about python-portage interactions : |
107 |
# - Do not add a pkg_setup() check for a certain version of portage |
108 |
@@ -58,10 +58,9 @@ |
109 |
cd ${S} |
110 |
|
111 |
if tc-is-cross-compiler ; then |
112 |
- [[ "$(python -V 2>&1)" != "Python ${PV}" ]] && \ |
113 |
+ [[ $(python -V 2>&1) != "Python ${PV}" ]] && \ |
114 |
die "Crosscompiling requires the same host and build versions." |
115 |
- epatch ${FILESDIR}/python-2.4.4-test-cross.patch || \ |
116 |
- die "cross patch failed" |
117 |
+ epatch ${FILESDIR}/python-2.4.4-test-cross.patch |
118 |
else |
119 |
rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch |
120 |
fi |
121 |
|
122 |
|
123 |
|
124 |
-- |
125 |
gentoo-commits@g.o mailing list |