Gentoo Archives: gentoo-commits

From: "Sebastian Pipping (sping)" <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/python: python-3.1.2-r4.ebuild python-2.5.4-r4.ebuild python-2.6.6-r1.ebuild ChangeLog python-2.6.5-r3.ebuild python-2.4.6.ebuild python-2.7.ebuild
Date: Sat, 27 Nov 2010 12:50:38
Message-Id: 20101127125014.4D47120051@flycatcher.gentoo.org
1 sping 10/11/27 12:50:14
2
3 Modified: python-3.1.2-r4.ebuild python-2.5.4-r4.ebuild
4 python-2.6.6-r1.ebuild ChangeLog
5 python-2.6.5-r3.ebuild python-2.4.6.ebuild
6 python-2.7.ebuild
7 Log:
8 dev-lang/python: Disable auto-bumping of active Python version by removing eselect_python_update() and its invocation as explained and announced on gentoo-dev
9
10 (Portage version: 2.1.9.24/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.10 dev-lang/python/python-3.1.2-r4.ebuild
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.1.2-r4.ebuild?rev=1.10&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.1.2-r4.ebuild?rev=1.10&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.1.2-r4.ebuild?r1=1.9&r2=1.10
18
19 Index: python-3.1.2-r4.ebuild
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r4.ebuild,v
22 retrieving revision 1.9
23 retrieving revision 1.10
24 diff -u -r1.9 -r1.10
25 --- python-3.1.2-r4.ebuild 15 Aug 2010 23:14:30 -0000 1.9
26 +++ python-3.1.2-r4.ebuild 27 Nov 2010 12:50:14 -0000 1.10
27 @@ -1,6 +1,6 @@
28 # Copyright 1999-2010 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r4.ebuild,v 1.9 2010/08/15 23:14:30 jer Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r4.ebuild,v 1.10 2010/11/27 12:50:14 sping Exp $
32
33 EAPI="3"
34
35 @@ -274,19 +274,7 @@
36 fi
37 }
38
39 -eselect_python_update() {
40 - local eselect_python_options
41 - [[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
42 -
43 - # Create python3 symlink.
44 - eselect python update --python3 > /dev/null
45 -
46 - eselect python update ${eselect_python_options}
47 -}
48 -
49 pkg_postinst() {
50 - eselect_python_update
51 -
52 python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
53
54 if [[ "$(eselect python show)" == "python2."* ]]; then
55 @@ -319,7 +307,5 @@
56 }
57
58 pkg_postrm() {
59 - eselect_python_update
60 -
61 python_mod_cleanup $(python_get_libdir)
62 }
63
64
65
66 1.24 dev-lang/python/python-2.5.4-r4.ebuild
67
68 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild?rev=1.24&view=markup
69 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild?rev=1.24&content-type=text/plain
70 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild?r1=1.23&r2=1.24
71
72 Index: python-2.5.4-r4.ebuild
73 ===================================================================
74 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v
75 retrieving revision 1.23
76 retrieving revision 1.24
77 diff -u -r1.23 -r1.24
78 --- python-2.5.4-r4.ebuild 10 Jul 2010 13:06:28 -0000 1.23
79 +++ python-2.5.4-r4.ebuild 27 Nov 2010 12:50:14 -0000 1.24
80 @@ -1,6 +1,6 @@
81 # Copyright 1999-2010 Gentoo Foundation
82 # Distributed under the terms of the GNU General Public License v2
83 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.23 2010/07/10 13:06:28 arfrever Exp $
84 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.24 2010/11/27 12:50:14 sping Exp $
85
86 EAPI="1"
87
88 @@ -284,19 +284,7 @@
89 fi
90 }
91
92 -eselect_python_update() {
93 - local eselect_python_options
94 - [[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
95 -
96 - # Create python2 symlink.
97 - eselect python update --python2 > /dev/null
98 -
99 - eselect python update ${eselect_python_options}
100 -}
101 -
102 pkg_postinst() {
103 - eselect_python_update
104 -
105 python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
106
107 if [[ "${python_updater_warning}" == "1" ]]; then
108 @@ -313,7 +301,5 @@
109 }
110
111 pkg_postrm() {
112 - eselect_python_update
113 -
114 python_mod_cleanup $(python_get_libdir)
115 }
116
117
118
119 1.4 dev-lang/python/python-2.6.6-r1.ebuild
120
121 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild?rev=1.4&view=markup
122 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild?rev=1.4&content-type=text/plain
123 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild?r1=1.3&r2=1.4
124
125 Index: python-2.6.6-r1.ebuild
126 ===================================================================
127 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild,v
128 retrieving revision 1.3
129 retrieving revision 1.4
130 diff -u -r1.3 -r1.4
131 --- python-2.6.6-r1.ebuild 27 Oct 2010 12:49:29 -0000 1.3
132 +++ python-2.6.6-r1.ebuild 27 Nov 2010 12:50:14 -0000 1.4
133 @@ -1,6 +1,6 @@
134 # Copyright 1999-2010 Gentoo Foundation
135 # Distributed under the terms of the GNU General Public License v2
136 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild,v 1.3 2010/10/27 12:49:29 djc Exp $
137 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild,v 1.4 2010/11/27 12:50:14 sping Exp $
138
139 EAPI="2"
140
141 @@ -278,19 +278,7 @@
142 fi
143 }
144
145 -eselect_python_update() {
146 - local eselect_python_options
147 - [[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
148 -
149 - # Create python2 symlink.
150 - eselect python update --python2 > /dev/null
151 -
152 - eselect python update ${eselect_python_options}
153 -}
154 -
155 pkg_postinst() {
156 - eselect_python_update
157 -
158 python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
159
160 if [[ "${python_updater_warning}" == "1" ]]; then
161 @@ -307,7 +295,5 @@
162 }
163
164 pkg_postrm() {
165 - eselect_python_update
166 -
167 python_mod_cleanup $(python_get_libdir)
168 }
169
170
171
172 1.501 dev-lang/python/ChangeLog
173
174 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?rev=1.501&view=markup
175 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?rev=1.501&content-type=text/plain
176 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?r1=1.500&r2=1.501
177
178 Index: ChangeLog
179 ===================================================================
180 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v
181 retrieving revision 1.500
182 retrieving revision 1.501
183 diff -u -r1.500 -r1.501
184 --- ChangeLog 27 Oct 2010 13:07:07 -0000 1.500
185 +++ ChangeLog 27 Nov 2010 12:50:14 -0000 1.501
186 @@ -1,6 +1,13 @@
187 # ChangeLog for dev-lang/python
188 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
189 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.500 2010/10/27 13:07:07 djc Exp $
190 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.501 2010/11/27 12:50:14 sping Exp $
191 +
192 + 27 Nov 2010; Sebastian Pipping <sping@g.o> python-2.4.6.ebuild,
193 + python-2.5.4-r4.ebuild, python-2.6.5-r3.ebuild, python-2.6.6-r1.ebuild,
194 + python-2.7.ebuild, python-3.1.2-r4.ebuild:
195 + Disable auto-bumping of active Python version by removing
196 + eselect_python_update() and its invocation as explained and announced on
197 + gentoo-dev
198
199 27 Oct 2010; Dirkjan Ochtman <djc@g.o> -python-2.6.4-r1.ebuild,
200 -python-2.6.5-r2.ebuild, -python-3.1.2-r3.ebuild:
201
202
203
204 1.9 dev-lang/python/python-2.6.5-r3.ebuild
205
206 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.5-r3.ebuild?rev=1.9&view=markup
207 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.5-r3.ebuild?rev=1.9&content-type=text/plain
208 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.5-r3.ebuild?r1=1.8&r2=1.9
209
210 Index: python-2.6.5-r3.ebuild
211 ===================================================================
212 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r3.ebuild,v
213 retrieving revision 1.8
214 retrieving revision 1.9
215 diff -u -r1.8 -r1.9
216 --- python-2.6.5-r3.ebuild 11 Aug 2010 22:32:00 -0000 1.8
217 +++ python-2.6.5-r3.ebuild 27 Nov 2010 12:50:14 -0000 1.9
218 @@ -1,6 +1,6 @@
219 # Copyright 1999-2010 Gentoo Foundation
220 # Distributed under the terms of the GNU General Public License v2
221 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r3.ebuild,v 1.8 2010/08/11 22:32:00 josejx Exp $
222 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.5-r3.ebuild,v 1.9 2010/11/27 12:50:14 sping Exp $
223
224 EAPI="2"
225
226 @@ -276,19 +276,7 @@
227 fi
228 }
229
230 -eselect_python_update() {
231 - local eselect_python_options
232 - [[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
233 -
234 - # Create python2 symlink.
235 - eselect python update --python2 > /dev/null
236 -
237 - eselect python update ${eselect_python_options}
238 -}
239 -
240 pkg_postinst() {
241 - eselect_python_update
242 -
243 python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
244
245 if [[ "${python_updater_warning}" == "1" ]]; then
246 @@ -305,7 +293,5 @@
247 }
248
249 pkg_postrm() {
250 - eselect_python_update
251 -
252 python_mod_cleanup $(python_get_libdir)
253 }
254
255
256
257 1.42 dev-lang/python/python-2.4.6.ebuild
258
259 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.4.6.ebuild?rev=1.42&view=markup
260 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.4.6.ebuild?rev=1.42&content-type=text/plain
261 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.4.6.ebuild?r1=1.41&r2=1.42
262
263 Index: python-2.4.6.ebuild
264 ===================================================================
265 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v
266 retrieving revision 1.41
267 retrieving revision 1.42
268 diff -u -r1.41 -r1.42
269 --- python-2.4.6.ebuild 10 Jul 2010 13:06:28 -0000 1.41
270 +++ python-2.4.6.ebuild 27 Nov 2010 12:50:14 -0000 1.42
271 @@ -1,6 +1,6 @@
272 # Copyright 1999-2010 Gentoo Foundation
273 # Distributed under the terms of the GNU General Public License v2
274 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.41 2010/07/10 13:06:28 arfrever Exp $
275 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.6.ebuild,v 1.42 2010/11/27 12:50:14 sping Exp $
276
277 EAPI="1"
278
279 @@ -269,19 +269,7 @@
280 fi
281 }
282
283 -eselect_python_update() {
284 - local eselect_python_options
285 - [[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
286 -
287 - # Create python2 symlink.
288 - eselect python update --python2 > /dev/null
289 -
290 - eselect python update ${eselect_python_options}
291 -}
292 -
293 pkg_postinst() {
294 - eselect_python_update
295 -
296 # Python 2.4 partially doesn't respect $(get_libdir).
297 python_mod_optimize -f -x "/(site-packages|test|tests)/" /usr/lib/python${SLOT}
298
299 @@ -299,8 +287,6 @@
300 }
301
302 pkg_postrm() {
303 - eselect_python_update
304 -
305 # Python 2.4 partially doesn't respect $(get_libdir).
306 python_mod_cleanup /usr/lib/python${SLOT}
307 }
308
309
310
311 1.5 dev-lang/python/python-2.7.ebuild
312
313 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.ebuild?rev=1.5&view=markup
314 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.ebuild?rev=1.5&content-type=text/plain
315 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.ebuild?r1=1.4&r2=1.5
316
317 Index: python-2.7.ebuild
318 ===================================================================
319 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.ebuild,v
320 retrieving revision 1.4
321 retrieving revision 1.5
322 diff -u -r1.4 -r1.5
323 --- python-2.7.ebuild 31 Jul 2010 19:14:08 -0000 1.4
324 +++ python-2.7.ebuild 27 Nov 2010 12:50:14 -0000 1.5
325 @@ -1,6 +1,6 @@
326 # Copyright 1999-2010 Gentoo Foundation
327 # Distributed under the terms of the GNU General Public License v2
328 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.ebuild,v 1.4 2010/07/31 19:14:08 arfrever Exp $
329 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.ebuild,v 1.5 2010/11/27 12:50:14 sping Exp $
330
331 EAPI="2"
332
333 @@ -290,19 +290,7 @@
334 fi
335 }
336
337 -eselect_python_update() {
338 - local eselect_python_options
339 - [[ "$(eselect python show)" == "python2."* ]] && eselect_python_options="--python2"
340 -
341 - # Create python2 symlink.
342 - eselect python update --python2 > /dev/null
343 -
344 - eselect python update ${eselect_python_options}
345 -}
346 -
347 pkg_postinst() {
348 - eselect_python_update
349 -
350 python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
351
352 if [[ "${python_updater_warning}" == "1" ]]; then
353 @@ -319,7 +307,5 @@
354 }
355
356 pkg_postrm() {
357 - eselect_python_update
358 -
359 python_mod_cleanup $(python_get_libdir)
360 }