1 |
arfrever 10/07/04 21:14:58 |
2 |
|
3 |
Modified: python-2.4.6.ebuild python-2.5.4-r4.ebuild |
4 |
python-2.6.5-r2.ebuild python-3.1.2-r3.ebuild |
5 |
Log: |
6 |
Synchronize ebuilds. |
7 |
|
8 |
Revision Changes Path |
9 |
1.40 dev-lang/python/python-2.4.6.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.4.6.ebuild?rev=1.40&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.4.6.ebuild?rev=1.40&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.4.6.ebuild?r1=1.39&r2=1.40 |
14 |
|
15 |
Index: python-2.4.6.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v |
18 |
retrieving revision 1.39 |
19 |
retrieving revision 1.40 |
20 |
diff -u -r1.39 -r1.40 |
21 |
--- python-2.4.6.ebuild 25 May 2010 17:09:38 -0000 1.39 |
22 |
+++ python-2.4.6.ebuild 4 Jul 2010 21:14:58 -0000 1.40 |
23 |
@@ -1,13 +1,12 @@ |
24 |
# Copyright 1999-2010 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.39 2010/05/25 17:09:38 arfrever Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.40 2010/07/04 21:14:58 arfrever Exp $ |
28 |
|
29 |
EAPI="1" |
30 |
|
31 |
inherit autotools eutils flag-o-matic multilib python toolchain-funcs |
32 |
|
33 |
MY_P="Python-${PV}" |
34 |
-S="${WORKDIR}/${MY_P}" |
35 |
|
36 |
PATCHSET_REVISION="0" |
37 |
|
38 |
@@ -31,7 +30,6 @@ |
39 |
sys-libs/db:4.3 |
40 |
sys-libs/db:4.2 |
41 |
) ) |
42 |
- doc? ( dev-python/python-docs:${SLOT} ) |
43 |
gdbm? ( sys-libs/gdbm ) |
44 |
ncurses? ( |
45 |
>=sys-libs/ncurses-5.2 |
46 |
@@ -39,14 +37,16 @@ |
47 |
) |
48 |
ssl? ( dev-libs/openssl ) |
49 |
tk? ( >=dev-lang/tk-8.0 ) |
50 |
- )" |
51 |
-# xml? ( dev-libs/expat ) |
52 |
+ ) |
53 |
+ doc? ( dev-python/python-docs:${SLOT} )" |
54 |
DEPEND="${RDEPEND}" |
55 |
RDEPEND+=" !build? ( app-misc/mime-types )" |
56 |
PDEPEND="app-admin/python-updater" |
57 |
|
58 |
PROVIDE="virtual/python" |
59 |
|
60 |
+S="${WORKDIR}/${MY_P}" |
61 |
+ |
62 |
pkg_setup() { |
63 |
python_pkg_setup |
64 |
|
65 |
@@ -187,8 +187,7 @@ |
66 |
# Otherwise test_import fails. |
67 |
python_enable_pyc |
68 |
|
69 |
- # Skip all tests that fail during emerge but pass without emerge: |
70 |
- # (See bug #67970) |
71 |
+ # Skip failing tests. |
72 |
local skip_tests="cookielib distutils global hotshot mimetools minidom mmap posix sax strptime subprocess syntax tcl time urllib urllib2" |
73 |
|
74 |
for test in ${skip_tests}; do |
75 |
|
76 |
|
77 |
|
78 |
1.22 dev-lang/python/python-2.5.4-r4.ebuild |
79 |
|
80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild?rev=1.22&view=markup |
81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild?rev=1.22&content-type=text/plain |
82 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild?r1=1.21&r2=1.22 |
83 |
|
84 |
Index: python-2.5.4-r4.ebuild |
85 |
=================================================================== |
86 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v |
87 |
retrieving revision 1.21 |
88 |
retrieving revision 1.22 |
89 |
diff -u -r1.21 -r1.22 |
90 |
--- python-2.5.4-r4.ebuild 25 May 2010 17:09:38 -0000 1.21 |
91 |
+++ python-2.5.4-r4.ebuild 4 Jul 2010 21:14:58 -0000 1.22 |
92 |
@@ -1,13 +1,12 @@ |
93 |
# Copyright 1999-2010 Gentoo Foundation |
94 |
# Distributed under the terms of the GNU General Public License v2 |
95 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.21 2010/05/25 17:09:38 arfrever Exp $ |
96 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.22 2010/07/04 21:14:58 arfrever Exp $ |
97 |
|
98 |
EAPI="1" |
99 |
|
100 |
inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs |
101 |
|
102 |
MY_P="Python-${PV}" |
103 |
-S="${WORKDIR}/${MY_P}" |
104 |
|
105 |
PATCHSET_REVISION="3" |
106 |
|
107 |
@@ -36,7 +35,6 @@ |
108 |
sys-libs/db:4.3 |
109 |
sys-libs/db:4.2 |
110 |
) ) |
111 |
- doc? ( dev-python/python-docs:${SLOT} ) |
112 |
gdbm? ( sys-libs/gdbm ) |
113 |
ncurses? ( |
114 |
>=sys-libs/ncurses-5.2 |
115 |
@@ -46,7 +44,8 @@ |
116 |
ssl? ( dev-libs/openssl ) |
117 |
tk? ( >=dev-lang/tk-8.0 ) |
118 |
xml? ( >=dev-libs/expat-2 ) |
119 |
- )" |
120 |
+ ) |
121 |
+ doc? ( dev-python/python-docs:${SLOT} )" |
122 |
DEPEND="${RDEPEND} |
123 |
dev-util/pkgconfig" |
124 |
RDEPEND+=" !build? ( app-misc/mime-types )" |
125 |
@@ -54,6 +53,8 @@ |
126 |
|
127 |
PROVIDE="virtual/python" |
128 |
|
129 |
+S="${WORKDIR}/${MY_P}" |
130 |
+ |
131 |
pkg_setup() { |
132 |
python_pkg_setup |
133 |
|
134 |
@@ -202,8 +203,7 @@ |
135 |
# Otherwise test_import fails. |
136 |
python_enable_pyc |
137 |
|
138 |
- # Skip all tests that fail during emerge but pass without emerge: |
139 |
- # (See bug #67970) |
140 |
+ # Skip failing tests. |
141 |
local skip_tests="distutils global mimetools minidom mmap posix pyexpat sax strptime subprocess syntax tcl time urllib urllib2 xml_etree" |
142 |
|
143 |
# test_ctypes fails with PAX kernel (bug #234498). |
144 |
|
145 |
|
146 |
|
147 |
1.13 dev-lang/python/python-2.6.5-r2.ebuild |
148 |
|
149 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild?rev=1.13&view=markup |
150 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild?rev=1.13&content-type=text/plain |
151 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild?r1=1.12&r2=1.13 |
152 |
|
153 |
Index: python-2.6.5-r2.ebuild |
154 |
=================================================================== |
155 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild,v |
156 |
retrieving revision 1.12 |
157 |
retrieving revision 1.13 |
158 |
diff -u -r1.12 -r1.13 |
159 |
--- python-2.6.5-r2.ebuild 22 Jun 2010 13:09:38 -0000 1.12 |
160 |
+++ python-2.6.5-r2.ebuild 4 Jul 2010 21:14:58 -0000 1.13 |
161 |
@@ -1,13 +1,12 @@ |
162 |
# Copyright 1999-2010 Gentoo Foundation |
163 |
# Distributed under the terms of the GNU General Public License v2 |
164 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild,v 1.12 2010/06/22 13:09:38 fauli Exp $ |
165 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r2.ebuild,v 1.13 2010/07/04 21:14:58 arfrever Exp $ |
166 |
|
167 |
EAPI="2" |
168 |
|
169 |
inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs |
170 |
|
171 |
MY_P="Python-${PV}" |
172 |
-S="${WORKDIR}/${MY_P}" |
173 |
|
174 |
PATCHSET_REVISION="4" |
175 |
|
176 |
@@ -38,7 +37,6 @@ |
177 |
sys-libs/db:4.3 |
178 |
sys-libs/db:4.2 |
179 |
) ) |
180 |
- doc? ( dev-python/python-docs:${SLOT} ) |
181 |
gdbm? ( sys-libs/gdbm ) |
182 |
ncurses? ( |
183 |
>=sys-libs/ncurses-5.2 |
184 |
@@ -48,7 +46,8 @@ |
185 |
ssl? ( dev-libs/openssl ) |
186 |
tk? ( >=dev-lang/tk-8.0 ) |
187 |
xml? ( >=dev-libs/expat-2 ) |
188 |
- )" |
189 |
+ ) |
190 |
+ doc? ( dev-python/python-docs:${SLOT} )" |
191 |
DEPEND="${RDEPEND} |
192 |
dev-util/pkgconfig |
193 |
!sys-devel/gcc[libffi]" |
194 |
@@ -57,6 +56,8 @@ |
195 |
|
196 |
PROVIDE="virtual/python" |
197 |
|
198 |
+S="${WORKDIR}/${MY_P}" |
199 |
+ |
200 |
pkg_setup() { |
201 |
python_pkg_setup |
202 |
|
203 |
@@ -193,8 +194,7 @@ |
204 |
# Otherwise test_import fails. |
205 |
python_enable_pyc |
206 |
|
207 |
- # Skip all tests that fail during emerge but pass without emerge: |
208 |
- # (See bug #67970) |
209 |
+ # Skip failing tests. |
210 |
local skip_tests="distutils httpservers minidom pyexpat sax tcl" |
211 |
|
212 |
# test_ctypes fails with PAX kernel (bug #234498). |
213 |
|
214 |
|
215 |
|
216 |
1.13 dev-lang/python/python-3.1.2-r3.ebuild |
217 |
|
218 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.1.2-r3.ebuild?rev=1.13&view=markup |
219 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.1.2-r3.ebuild?rev=1.13&content-type=text/plain |
220 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.1.2-r3.ebuild?r1=1.12&r2=1.13 |
221 |
|
222 |
Index: python-3.1.2-r3.ebuild |
223 |
=================================================================== |
224 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r3.ebuild,v |
225 |
retrieving revision 1.12 |
226 |
retrieving revision 1.13 |
227 |
diff -u -r1.12 -r1.13 |
228 |
--- python-3.1.2-r3.ebuild 4 Jun 2010 19:09:40 -0000 1.12 |
229 |
+++ python-3.1.2-r3.ebuild 4 Jul 2010 21:14:58 -0000 1.13 |
230 |
@@ -1,13 +1,12 @@ |
231 |
# Copyright 1999-2010 Gentoo Foundation |
232 |
# Distributed under the terms of the GNU General Public License v2 |
233 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r3.ebuild,v 1.12 2010/06/04 19:09:40 phajdan.jr Exp $ |
234 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r3.ebuild,v 1.13 2010/07/04 21:14:58 arfrever Exp $ |
235 |
|
236 |
EAPI="3" |
237 |
|
238 |
inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs |
239 |
|
240 |
MY_P="Python-${PV}" |
241 |
-S="${WORKDIR}/${MY_P}" |
242 |
|
243 |
PATCHSET_REVISION="5" |
244 |
|
245 |
@@ -27,7 +26,6 @@ |
246 |
virtual/libffi |
247 |
virtual/libintl |
248 |
!build? ( |
249 |
- doc? ( dev-python/python-docs:${SLOT} ) |
250 |
gdbm? ( sys-libs/gdbm ) |
251 |
ncurses? ( |
252 |
>=sys-libs/ncurses-5.2 |
253 |
@@ -37,7 +35,8 @@ |
254 |
ssl? ( dev-libs/openssl ) |
255 |
tk? ( >=dev-lang/tk-8.0 ) |
256 |
xml? ( >=dev-libs/expat-2 ) |
257 |
- )" |
258 |
+ ) |
259 |
+ doc? ( dev-python/python-docs:${SLOT} )" |
260 |
DEPEND="${RDEPEND} |
261 |
dev-util/pkgconfig |
262 |
!sys-devel/gcc[libffi]" |
263 |
@@ -50,6 +49,8 @@ |
264 |
|
265 |
PROVIDE="virtual/python" |
266 |
|
267 |
+S="${WORKDIR}/${MY_P}" |
268 |
+ |
269 |
pkg_setup() { |
270 |
python_pkg_setup |
271 |
} |
272 |
@@ -188,8 +189,7 @@ |
273 |
# Otherwise test_import fails. |
274 |
python_enable_pyc |
275 |
|
276 |
- # Skip all tests that fail during emerge but pass without emerge: |
277 |
- # (See bug #67970) |
278 |
+ # Skip failing tests. |
279 |
local skip_tests="distutils" |
280 |
|
281 |
# test_ctypes fails with PAX kernel (bug #234498). |