Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/python: python-2.7.3-r3.ebuild python-2.5.4-r5.ebuild python-3.2.3-r2.ebuild python-3.3.0-r1.ebuild python-3.1.5-r1.ebuild python-2.6.8-r1.ebuild ChangeLog
Date: Sun, 02 Dec 2012 18:22:02
Message-Id: 20121202182149.9831B2171D@flycatcher.gentoo.org
1 mgorny 12/12/02 18:21:49
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 Stop renaming python-config wrt bug #445592. Keep a symlink for compatibility.
9
10 (Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)
11
12 Revision Changes Path
13 1.4 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.4&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.3-r3.ebuild?rev=1.4&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.3&r2=1.4
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.3
23 retrieving revision 1.4
24 diff -u -r1.3 -r1.4
25 --- python-2.7.3-r3.ebuild 1 Dec 2012 09:56:06 -0000 1.3
26 +++ python-2.7.3-r3.ebuild 2 Dec 2012 18:21:49 -0000 1.4
27 @@ -1,6 +1,6 @@
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.3 2012/12/01 09:56:06 mgorny Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.3-r3.ebuild,v 1.4 2012/12/02 18:21:49 mgorny Exp $
32
33 EAPI="2"
34 WANT_AUTOMAKE="none"
35 @@ -256,7 +256,8 @@
36
37 sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
38
39 - mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
40 + # Backwards compat with Gentoo divergence.
41 + dosym python${SLOT}-config /usr/bin/python-config-${SLOT} || die
42
43 # Fix collisions between different slots of Python.
44 mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
45
46
47
48 1.4 dev-lang/python/python-2.5.4-r5.ebuild
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild?rev=1.4&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild?rev=1.4&content-type=text/plain
52 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild?r1=1.3&r2=1.4
53
54 Index: python-2.5.4-r5.ebuild
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild,v
57 retrieving revision 1.3
58 retrieving revision 1.4
59 diff -u -r1.3 -r1.4
60 --- python-2.5.4-r5.ebuild 1 Dec 2012 09:56:06 -0000 1.3
61 +++ python-2.5.4-r5.ebuild 2 Dec 2012 18:21:49 -0000 1.4
62 @@ -1,6 +1,6 @@
63 # Copyright 1999-2012 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.4-r5.ebuild,v 1.3 2012/12/01 09:56:06 mgorny Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild,v 1.4 2012/12/02 18:21:49 mgorny Exp $
67
68 EAPI="1"
69
70 @@ -243,7 +243,8 @@
71
72 emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
73
74 - mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
75 + # Backwards compat with Gentoo divergence.
76 + dosym python${SLOT}-config /usr/bin/python-config-${SLOT} || die
77
78 # Fix collisions between different slots of Python.
79 mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
80
81
82
83 1.4 dev-lang/python/python-3.2.3-r2.ebuild
84
85 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild?rev=1.4&view=markup
86 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild?rev=1.4&content-type=text/plain
87 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild?r1=1.3&r2=1.4
88
89 Index: python-3.2.3-r2.ebuild
90 ===================================================================
91 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild,v
92 retrieving revision 1.3
93 retrieving revision 1.4
94 diff -u -r1.3 -r1.4
95 --- python-3.2.3-r2.ebuild 1 Dec 2012 09:56:06 -0000 1.3
96 +++ python-3.2.3-r2.ebuild 2 Dec 2012 18:21:49 -0000 1.4
97 @@ -1,6 +1,6 @@
98 # Copyright 1999-2012 Gentoo Foundation
99 # Distributed under the terms of the GNU General Public License v2
100 -# $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 $
101 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild,v 1.4 2012/12/02 18:21:49 mgorny Exp $
102
103 EAPI="3"
104 WANT_AUTOMAKE="none"
105 @@ -234,7 +234,8 @@
106 -e "s/\(PY_LDFLAGS=\).*/\1/" \
107 -i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
108
109 - mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
110 + # Backwards compat with Gentoo divergence.
111 + dosym python${SLOT}-config /usr/bin/python-config-${SLOT} || die
112
113 # Fix collisions between different slots of Python.
114 rm -f "${ED}usr/$(get_libdir)/libpython3.so"
115
116
117
118 1.4 dev-lang/python/python-3.3.0-r1.ebuild
119
120 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild?rev=1.4&view=markup
121 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild?rev=1.4&content-type=text/plain
122 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild?r1=1.3&r2=1.4
123
124 Index: python-3.3.0-r1.ebuild
125 ===================================================================
126 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild,v
127 retrieving revision 1.3
128 retrieving revision 1.4
129 diff -u -r1.3 -r1.4
130 --- python-3.3.0-r1.ebuild 1 Dec 2012 09:56:06 -0000 1.3
131 +++ python-3.3.0-r1.ebuild 2 Dec 2012 18:21:49 -0000 1.4
132 @@ -1,6 +1,6 @@
133 # Copyright 1999-2012 Gentoo Foundation
134 # Distributed under the terms of the GNU General Public License v2
135 -# $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 $
136 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.0-r1.ebuild,v 1.4 2012/12/02 18:21:49 mgorny Exp $
137
138 EAPI="3"
139 WANT_AUTOMAKE="none"
140 @@ -224,7 +224,8 @@
141 -e "s/\(PY_LDFLAGS=\).*/\1/" \
142 -i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
143
144 - mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
145 + # Backwards compat with Gentoo divergence.
146 + dosym python${SLOT}-config /usr/bin/python-config-${SLOT} || die
147
148 # Fix collisions between different slots of Python.
149 rm -f "${ED}usr/$(get_libdir)/libpython3.so"
150
151
152
153 1.4 dev-lang/python/python-3.1.5-r1.ebuild
154
155 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild?rev=1.4&view=markup
156 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild?rev=1.4&content-type=text/plain
157 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild?r1=1.3&r2=1.4
158
159 Index: python-3.1.5-r1.ebuild
160 ===================================================================
161 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild,v
162 retrieving revision 1.3
163 retrieving revision 1.4
164 diff -u -r1.3 -r1.4
165 --- python-3.1.5-r1.ebuild 1 Dec 2012 09:56:06 -0000 1.3
166 +++ python-3.1.5-r1.ebuild 2 Dec 2012 18:21:49 -0000 1.4
167 @@ -1,6 +1,6 @@
168 # Copyright 1999-2012 Gentoo Foundation
169 # Distributed under the terms of the GNU General Public License v2
170 -# $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 $
171 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild,v 1.4 2012/12/02 18:21:49 mgorny Exp $
172
173 EAPI="3"
174 WANT_AUTOMAKE="none"
175 @@ -218,7 +218,8 @@
176
177 emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
178
179 - mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
180 + # Backwards compat with Gentoo divergence.
181 + dosym python${SLOT}-config /usr/bin/python-config-${SLOT} || die
182
183 # Fix collisions between different slots of Python.
184 mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
185
186
187
188 1.4 dev-lang/python/python-2.6.8-r1.ebuild
189
190 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild?rev=1.4&view=markup
191 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild?rev=1.4&content-type=text/plain
192 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild?r1=1.3&r2=1.4
193
194 Index: python-2.6.8-r1.ebuild
195 ===================================================================
196 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild,v
197 retrieving revision 1.3
198 retrieving revision 1.4
199 diff -u -r1.3 -r1.4
200 --- python-2.6.8-r1.ebuild 1 Dec 2012 09:56:06 -0000 1.3
201 +++ python-2.6.8-r1.ebuild 2 Dec 2012 18:21:49 -0000 1.4
202 @@ -1,6 +1,6 @@
203 # Copyright 1999-2012 Gentoo Foundation
204 # Distributed under the terms of the GNU General Public License v2
205 -# $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 $
206 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild,v 1.4 2012/12/02 18:21:49 mgorny Exp $
207
208 EAPI="2"
209 WANT_AUTOMAKE="none"
210 @@ -240,7 +240,8 @@
211
212 emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
213
214 - mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
215 + # Backwards compat with Gentoo divergence.
216 + dosym python${SLOT}-config /usr/bin/python-config-${SLOT} || die
217
218 # Fix collisions between different slots of Python.
219 mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
220
221
222
223 1.625 dev-lang/python/ChangeLog
224
225 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?rev=1.625&view=markup
226 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?rev=1.625&content-type=text/plain
227 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?r1=1.624&r2=1.625
228
229 Index: ChangeLog
230 ===================================================================
231 RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v
232 retrieving revision 1.624
233 retrieving revision 1.625
234 diff -u -r1.624 -r1.625
235 --- ChangeLog 1 Dec 2012 09:56:06 -0000 1.624
236 +++ ChangeLog 2 Dec 2012 18:21:49 -0000 1.625
237 @@ -1,6 +1,11 @@
238 # ChangeLog for dev-lang/python
239 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
240 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.624 2012/12/01 09:56:06 mgorny Exp $
241 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.625 2012/12/02 18:21:49 mgorny Exp $
242 +
243 + 02 Dec 2012; Michał Górny <mgorny@g.o> python-2.5.4-r5.ebuild,
244 + python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,
245 + python-3.2.3-r2.ebuild, python-3.3.0-r1.ebuild:
246 + Stop renaming python-config wrt bug #445592. Keep a symlink for compatibility.
247
248 01 Dec 2012; Michał Górny <mgorny@g.o> python-2.5.4-r5.ebuild,
249 python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild,