1 |
mgorny 12/12/01 09:56:06 |
2 |
|
3 |
Modified: python-2.7.3-r3.ebuild python-2.5.4-r5.ebuild |
4 |
python-3.2.3-r2.ebuild python-3.3.0-r1.ebuild |
5 |
python-3.1.5-r1.ebuild python-2.6.8-r1.ebuild |
6 |
ChangeLog |
7 |
Log: |
8 |
Use python-any-r1 to clearly enforce build-time Python dependency. |
9 |
|
10 |
(Portage version: 2.2.0_alpha143/cvs/Linux x86_64, signed Manifest commit with key 42B9401D) |
11 |
|
12 |
Revision Changes Path |
13 |
1.3 dev-lang/python/python-2.7.3-r3.ebuild |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.3-r3.ebuild?rev=1.3&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.3-r3.ebuild?rev=1.3&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.3-r3.ebuild?r1=1.2&r2=1.3 |
18 |
|
19 |
Index: python-2.7.3-r3.ebuild |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.3-r3.ebuild,v |
22 |
retrieving revision 1.2 |
23 |
retrieving revision 1.3 |
24 |
diff -u -r1.2 -r1.3 |
25 |
--- python-2.7.3-r3.ebuild 30 Nov 2012 23:57:44 -0000 1.2 |
26 |
+++ python-2.7.3-r3.ebuild 1 Dec 2012 09:56:06 -0000 1.3 |
27 |
@@ -1,12 +1,15 @@ |
28 |
# Copyright 1999-2012 Gentoo Foundation |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.3-r3.ebuild,v 1.2 2012/11/30 23:57:44 mgorny Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.3-r3.ebuild,v 1.3 2012/12/01 09:56:06 mgorny Exp $ |
32 |
|
33 |
EAPI="2" |
34 |
WANT_AUTOMAKE="none" |
35 |
WANT_LIBTOOL="none" |
36 |
|
37 |
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs |
38 |
+# Bootstrapping Python 2 requires Python 2. |
39 |
+PYTHON_COMPAT=( python{2_5,2_6,2_7} ) |
40 |
+ |
41 |
+inherit autotools eutils flag-o-matic multilib pax-utils python-any-r1 toolchain-funcs |
42 |
|
43 |
MY_P="Python-${PV}" |
44 |
PATCHSET_REVISION="1" |
45 |
@@ -50,6 +53,7 @@ |
46 |
) |
47 |
!!<sys-apps/portage-2.1.9" |
48 |
DEPEND="${RDEPEND} |
49 |
+ ${PYTHON_DEPS} |
50 |
virtual/pkgconfig |
51 |
>=sys-devel/autoconf-2.65 |
52 |
!sys-devel/gcc[libffi]" |
53 |
@@ -73,6 +77,8 @@ |
54 |
ewarn "You might need to migrate your databases." |
55 |
fi |
56 |
fi |
57 |
+ |
58 |
+ python-any-r1_pkg_setup |
59 |
} |
60 |
|
61 |
src_prepare() { |
62 |
@@ -197,7 +203,7 @@ |
63 |
} |
64 |
|
65 |
src_compile() { |
66 |
- emake EPYTHON="python${PV%%.*}" || die "emake failed" |
67 |
+ default |
68 |
|
69 |
# Work around bug 329499. See also bug 413751. |
70 |
pax-mark m python |
71 |
|
72 |
|
73 |
|
74 |
1.3 dev-lang/python/python-2.5.4-r5.ebuild |
75 |
|
76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild?rev=1.3&view=markup |
77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild?rev=1.3&content-type=text/plain |
78 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild?r1=1.2&r2=1.3 |
79 |
|
80 |
Index: python-2.5.4-r5.ebuild |
81 |
=================================================================== |
82 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild,v |
83 |
retrieving revision 1.2 |
84 |
retrieving revision 1.3 |
85 |
diff -u -r1.2 -r1.3 |
86 |
--- python-2.5.4-r5.ebuild 30 Nov 2012 23:57:44 -0000 1.2 |
87 |
+++ python-2.5.4-r5.ebuild 1 Dec 2012 09:56:06 -0000 1.3 |
88 |
@@ -1,10 +1,13 @@ |
89 |
# Copyright 1999-2012 Gentoo Foundation |
90 |
# Distributed under the terms of the GNU General Public License v2 |
91 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild,v 1.2 2012/11/30 23:57:44 mgorny Exp $ |
92 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild,v 1.3 2012/12/01 09:56:06 mgorny Exp $ |
93 |
|
94 |
EAPI="1" |
95 |
|
96 |
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs |
97 |
+# Bootstrapping Python 2 requires Python 2. |
98 |
+PYTHON_COMPAT=( python{2_5,2_6,2_7} ) |
99 |
+ |
100 |
+inherit autotools eutils flag-o-matic multilib pax-utils python-any-r1 toolchain-funcs |
101 |
|
102 |
MY_P="Python-${PV}" |
103 |
|
104 |
@@ -45,6 +48,7 @@ |
105 |
) |
106 |
doc? ( dev-python/python-docs:${SLOT} )" |
107 |
DEPEND="${RDEPEND} |
108 |
+ ${PYTHON_DEPS} |
109 |
virtual/pkgconfig" |
110 |
RDEPEND+=" !build? ( app-misc/mime-types )" |
111 |
PDEPEND="app-admin/eselect-python |
112 |
@@ -59,6 +63,8 @@ |
113 |
ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module" |
114 |
ewarn "is provided by dev-python/bsddb3." |
115 |
fi |
116 |
+ |
117 |
+ python-any-r1_pkg_setup |
118 |
} |
119 |
|
120 |
src_unpack() { |
121 |
|
122 |
|
123 |
|
124 |
1.3 dev-lang/python/python-3.2.3-r2.ebuild |
125 |
|
126 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild?rev=1.3&view=markup |
127 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild?rev=1.3&content-type=text/plain |
128 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild?r1=1.2&r2=1.3 |
129 |
|
130 |
Index: python-3.2.3-r2.ebuild |
131 |
=================================================================== |
132 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild,v |
133 |
retrieving revision 1.2 |
134 |
retrieving revision 1.3 |
135 |
diff -u -r1.2 -r1.3 |
136 |
--- python-3.2.3-r2.ebuild 30 Nov 2012 23:57:44 -0000 1.2 |
137 |
+++ python-3.2.3-r2.ebuild 1 Dec 2012 09:56:06 -0000 1.3 |
138 |
@@ -1,12 +1,15 @@ |
139 |
# Copyright 1999-2012 Gentoo Foundation |
140 |
# Distributed under the terms of the GNU General Public License v2 |
141 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild,v 1.2 2012/11/30 23:57:44 mgorny Exp $ |
142 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild,v 1.3 2012/12/01 09:56:06 mgorny Exp $ |
143 |
|
144 |
EAPI="3" |
145 |
WANT_AUTOMAKE="none" |
146 |
WANT_LIBTOOL="none" |
147 |
|
148 |
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs |
149 |
+# Bootstrapping Python 3 requires any Python version. |
150 |
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} ) |
151 |
+ |
152 |
+inherit autotools eutils flag-o-matic multilib pax-utils python-any-r1 toolchain-funcs |
153 |
|
154 |
MY_P="Python-${PV}" |
155 |
PATCHSET_REVISION="0" |
156 |
@@ -40,6 +43,7 @@ |
157 |
xml? ( >=dev-libs/expat-2.1 ) |
158 |
)" |
159 |
DEPEND="${RDEPEND} |
160 |
+ ${PYTHON_DEPS} |
161 |
virtual/pkgconfig |
162 |
>=sys-devel/autoconf-2.65 |
163 |
!sys-devel/gcc[libffi]" |
164 |
|
165 |
|
166 |
|
167 |
1.3 dev-lang/python/python-3.3.0-r1.ebuild |
168 |
|
169 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild?rev=1.3&view=markup |
170 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild?rev=1.3&content-type=text/plain |
171 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild?r1=1.2&r2=1.3 |
172 |
|
173 |
Index: python-3.3.0-r1.ebuild |
174 |
=================================================================== |
175 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild,v |
176 |
retrieving revision 1.2 |
177 |
retrieving revision 1.3 |
178 |
diff -u -r1.2 -r1.3 |
179 |
--- python-3.3.0-r1.ebuild 30 Nov 2012 23:57:44 -0000 1.2 |
180 |
+++ python-3.3.0-r1.ebuild 1 Dec 2012 09:56:06 -0000 1.3 |
181 |
@@ -1,12 +1,15 @@ |
182 |
# Copyright 1999-2012 Gentoo Foundation |
183 |
# Distributed under the terms of the GNU General Public License v2 |
184 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild,v 1.2 2012/11/30 23:57:44 mgorny Exp $ |
185 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild,v 1.3 2012/12/01 09:56:06 mgorny Exp $ |
186 |
|
187 |
EAPI="3" |
188 |
WANT_AUTOMAKE="none" |
189 |
WANT_LIBTOOL="none" |
190 |
|
191 |
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs |
192 |
+# Bootstrapping Python 3 requires any Python version. |
193 |
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} ) |
194 |
+ |
195 |
+inherit autotools eutils flag-o-matic multilib pax-utils python-any-r1 toolchain-funcs |
196 |
|
197 |
MY_P="Python-${PV}" |
198 |
PATCHSET_REVISION="1" |
199 |
@@ -40,6 +43,7 @@ |
200 |
xml? ( >=dev-libs/expat-2.1 ) |
201 |
)" |
202 |
DEPEND="${RDEPEND} |
203 |
+ ${PYTHON_DEPS} |
204 |
virtual/pkgconfig |
205 |
>=sys-devel/autoconf-2.65 |
206 |
!sys-devel/gcc[libffi]" |
207 |
|
208 |
|
209 |
|
210 |
1.3 dev-lang/python/python-3.1.5-r1.ebuild |
211 |
|
212 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild?rev=1.3&view=markup |
213 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild?rev=1.3&content-type=text/plain |
214 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild?r1=1.2&r2=1.3 |
215 |
|
216 |
Index: python-3.1.5-r1.ebuild |
217 |
=================================================================== |
218 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild,v |
219 |
retrieving revision 1.2 |
220 |
retrieving revision 1.3 |
221 |
diff -u -r1.2 -r1.3 |
222 |
--- python-3.1.5-r1.ebuild 30 Nov 2012 23:57:44 -0000 1.2 |
223 |
+++ python-3.1.5-r1.ebuild 1 Dec 2012 09:56:06 -0000 1.3 |
224 |
@@ -1,12 +1,15 @@ |
225 |
# Copyright 1999-2012 Gentoo Foundation |
226 |
# Distributed under the terms of the GNU General Public License v2 |
227 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild,v 1.2 2012/11/30 23:57:44 mgorny Exp $ |
228 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild,v 1.3 2012/12/01 09:56:06 mgorny Exp $ |
229 |
|
230 |
EAPI="3" |
231 |
WANT_AUTOMAKE="none" |
232 |
WANT_LIBTOOL="none" |
233 |
|
234 |
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs |
235 |
+# Bootstrapping Python 3 requires any Python version. |
236 |
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} ) |
237 |
+ |
238 |
+inherit autotools eutils flag-o-matic multilib pax-utils python-any-r1 toolchain-funcs |
239 |
|
240 |
MY_P="Python-${PV}" |
241 |
PATCHSET_REVISION="0" |
242 |
@@ -40,6 +43,7 @@ |
243 |
xml? ( >=dev-libs/expat-2.1 ) |
244 |
)" |
245 |
DEPEND="${RDEPEND} |
246 |
+ ${PYTHON_DEPS} |
247 |
virtual/pkgconfig |
248 |
>=sys-devel/autoconf-2.61 |
249 |
!sys-devel/gcc[libffi]" |
250 |
@@ -162,7 +166,7 @@ |
251 |
} |
252 |
|
253 |
src_compile() { |
254 |
- emake || die "emake failed" |
255 |
+ default |
256 |
|
257 |
# Work around bug 329499. See also bug 413751. |
258 |
pax-mark m python |
259 |
|
260 |
|
261 |
|
262 |
1.3 dev-lang/python/python-2.6.8-r1.ebuild |
263 |
|
264 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild?rev=1.3&view=markup |
265 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild?rev=1.3&content-type=text/plain |
266 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild?r1=1.2&r2=1.3 |
267 |
|
268 |
Index: python-2.6.8-r1.ebuild |
269 |
=================================================================== |
270 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild,v |
271 |
retrieving revision 1.2 |
272 |
retrieving revision 1.3 |
273 |
diff -u -r1.2 -r1.3 |
274 |
--- python-2.6.8-r1.ebuild 30 Nov 2012 23:57:44 -0000 1.2 |
275 |
+++ python-2.6.8-r1.ebuild 1 Dec 2012 09:56:06 -0000 1.3 |
276 |
@@ -1,12 +1,15 @@ |
277 |
# Copyright 1999-2012 Gentoo Foundation |
278 |
# Distributed under the terms of the GNU General Public License v2 |
279 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild,v 1.2 2012/11/30 23:57:44 mgorny Exp $ |
280 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild,v 1.3 2012/12/01 09:56:06 mgorny Exp $ |
281 |
|
282 |
EAPI="2" |
283 |
WANT_AUTOMAKE="none" |
284 |
WANT_LIBTOOL="none" |
285 |
|
286 |
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs |
287 |
+# Bootstrapping Python 2 requires Python 2. |
288 |
+PYTHON_COMPAT=( python{2_5,2_6,2_7} ) |
289 |
+ |
290 |
+inherit autotools eutils flag-o-matic multilib pax-utils python-any-r1 toolchain-funcs |
291 |
|
292 |
MY_P="Python-${PV}" |
293 |
PATCHSET_REVISION="0" |
294 |
@@ -49,6 +52,7 @@ |
295 |
) |
296 |
!!<sys-apps/portage-2.1.9" |
297 |
DEPEND="${RDEPEND} |
298 |
+ ${PYTHON_DEPS} |
299 |
virtual/pkgconfig |
300 |
>=sys-devel/autoconf-2.61 |
301 |
!sys-devel/gcc[libffi]" |
302 |
@@ -72,6 +76,8 @@ |
303 |
ewarn "You might need to migrate your databases." |
304 |
fi |
305 |
fi |
306 |
+ |
307 |
+ python-any-r1_pkg_setup |
308 |
} |
309 |
|
310 |
src_prepare() { |
311 |
@@ -183,7 +189,7 @@ |
312 |
} |
313 |
|
314 |
src_compile() { |
315 |
- emake EPYTHON="python${PV%%.*}" || die "emake failed" |
316 |
+ default |
317 |
|
318 |
# Work around bug 329499. See also bug 413751. |
319 |
pax-mark m python |
320 |
|
321 |
|
322 |
|
323 |
1.624 dev-lang/python/ChangeLog |
324 |
|
325 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?rev=1.624&view=markup |
326 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?rev=1.624&content-type=text/plain |
327 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?r1=1.623&r2=1.624 |
328 |
|
329 |
Index: ChangeLog |
330 |
=================================================================== |
331 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v |
332 |
retrieving revision 1.623 |
333 |
retrieving revision 1.624 |
334 |
diff -u -r1.623 -r1.624 |
335 |
--- ChangeLog 30 Nov 2012 23:57:44 -0000 1.623 |
336 |
+++ ChangeLog 1 Dec 2012 09:56:06 -0000 1.624 |
337 |
@@ -1,6 +1,11 @@ |
338 |
# ChangeLog for dev-lang/python |
339 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
340 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.623 2012/11/30 23:57:44 mgorny Exp $ |
341 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.624 2012/12/01 09:56:06 mgorny Exp $ |
342 |
+ |
343 |
+ 01 Dec 2012; Michał Górny <mgorny@g.o> python-2.5.4-r5.ebuild, |
344 |
+ python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, |
345 |
+ python-3.2.3-r2.ebuild, python-3.3.0-r1.ebuild: |
346 |
+ Use python-any-r1 to clearly enforce build-time Python dependency. |
347 |
|
348 |
30 Nov 2012; Michał Górny <mgorny@g.o> python-2.5.4-r5.ebuild, |
349 |
python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, |