Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-2.1.11.5.ebuild portage-9999.ebuild portage-2.2.0_alpha110.ebuild portage-2.1.10.65.ebuild portage-2.2.0_alpha116.ebuild ChangeLog
Date: Fri, 06 Jul 2012 17:54:24
Message-Id: 20120706175412.64F0D2004B@flycatcher.gentoo.org
1 zmedico 12/07/06 17:54:12
2
3 Modified: portage-2.1.11.5.ebuild portage-9999.ebuild
4 portage-2.2.0_alpha110.ebuild
5 portage-2.1.10.65.ebuild
6 portage-2.2.0_alpha116.ebuild ChangeLog
7 Log:
8 Require python[ssl] or python-mhash for whirlpool (bug #425046).
9
10 (Portage version: 2.2.0_alpha116/cvs/Linux i686)
11
12 Revision Changes Path
13 1.2 sys-apps/portage/portage-2.1.11.5.ebuild
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.5.ebuild?rev=1.2&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.5.ebuild?rev=1.2&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.5.ebuild?r1=1.1&r2=1.2
18
19 Index: portage-2.1.11.5.ebuild
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.5.ebuild,v
22 retrieving revision 1.1
23 retrieving revision 1.2
24 diff -u -r1.1 -r1.2
25 --- portage-2.1.11.5.ebuild 5 Jul 2012 03:58:29 -0000 1.1
26 +++ portage-2.1.11.5.ebuild 6 Jul 2012 17:54:12 -0000 1.2
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/sys-apps/portage/portage-2.1.11.5.ebuild,v 1.1 2012/07/05 03:58:29 zmedico Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.5.ebuild,v 1.2 2012/07/06 17:54:12 zmedico Exp $
32
33 # Require EAPI 2 since we now require at least python-2.6 (for python 3
34 # syntax support) which also requires EAPI 2.
35 @@ -16,12 +16,15 @@
36
37 # Import of the io module in python-2.6 raises ImportError for the
38 # thread module if threading is disabled.
39 -python_dep="python3? ( =dev-lang/python-3* )
40 +python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
41 !pypy1_9? ( !python2? ( !python3? (
42 - || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] )
43 + || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
44 ) ) )
45 - pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) )
46 - python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
47 + pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
48 + python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
49 +python_dep="${python_dep_ssl//\[ssl\]}"
50 +python_dep="${python_dep//,ssl}"
51 +python_dep="${python_dep//ssl,}"
52
53 # The pysqlite blocker is for bug #282760.
54 DEPEND="${python_dep}
55 @@ -33,7 +36,8 @@
56 # quite slow, so it's not considered in the dependencies as an alternative to
57 # to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
58 # for now, don't pull in xattr deps for other kernels.
59 -RDEPEND="${python_dep}
60 +# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
61 +RDEPEND="${python_dep} || ( ${python_dep_ssl} dev-python/python-mhash )
62 !build? ( >=sys-apps/sed-4.0.5
63 >=app-shells/bash-3.2_p17
64 >=app-admin/eselect-1.2 )
65
66
67
68 1.51 sys-apps/portage/portage-9999.ebuild
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.51&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.51&content-type=text/plain
72 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.50&r2=1.51
73
74 Index: portage-9999.ebuild
75 ===================================================================
76 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
77 retrieving revision 1.50
78 retrieving revision 1.51
79 diff -u -r1.50 -r1.51
80 --- portage-9999.ebuild 23 Jun 2012 07:32:47 -0000 1.50
81 +++ portage-9999.ebuild 6 Jul 2012 17:54:12 -0000 1.51
82 @@ -1,6 +1,6 @@
83 # Copyright 1999-2012 Gentoo Foundation
84 # Distributed under the terms of the GNU General Public License v2
85 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.50 2012/06/23 07:32:47 zmedico Exp $
86 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.51 2012/07/06 17:54:12 zmedico Exp $
87
88 EAPI=3
89 inherit git-2 eutils multilib python
90 @@ -14,12 +14,15 @@
91
92 # Import of the io module in python-2.6 raises ImportError for the
93 # thread module if threading is disabled.
94 -python_dep="python3? ( =dev-lang/python-3* )
95 +python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
96 !pypy1_9? ( !python2? ( !python3? (
97 - || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] )
98 + || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
99 ) ) )
100 - pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) )
101 - python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
102 + pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
103 + python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
104 +python_dep="${python_dep_ssl//\[ssl\]}"
105 +python_dep="${python_dep//,ssl}"
106 +python_dep="${python_dep//ssl,}"
107
108 # The pysqlite blocker is for bug #282760.
109 DEPEND="${python_dep}
110 @@ -31,7 +34,8 @@
111 # quite slow, so it's not considered in the dependencies as an alternative to
112 # to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
113 # for now, don't pull in xattr deps for other kernels.
114 -RDEPEND="${python_dep}
115 +# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
116 +RDEPEND="${python_dep} || ( ${python_dep_ssl} dev-python/python-mhash )
117 !build? ( >=sys-apps/sed-4.0.5
118 >=app-shells/bash-3.2_p17
119 >=app-admin/eselect-1.2 )
120
121
122
123 1.3 sys-apps/portage/portage-2.2.0_alpha110.ebuild
124
125 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha110.ebuild?rev=1.3&view=markup
126 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha110.ebuild?rev=1.3&content-type=text/plain
127 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha110.ebuild?r1=1.2&r2=1.3
128
129 Index: portage-2.2.0_alpha110.ebuild
130 ===================================================================
131 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha110.ebuild,v
132 retrieving revision 1.2
133 retrieving revision 1.3
134 diff -u -r1.2 -r1.3
135 --- portage-2.2.0_alpha110.ebuild 13 Jun 2012 06:11:55 -0000 1.2
136 +++ portage-2.2.0_alpha110.ebuild 6 Jul 2012 17:54:12 -0000 1.3
137 @@ -1,6 +1,6 @@
138 # Copyright 1999-2012 Gentoo Foundation
139 # Distributed under the terms of the GNU General Public License v2
140 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha110.ebuild,v 1.2 2012/06/13 06:11:55 zmedico Exp $
141 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha110.ebuild,v 1.3 2012/07/06 17:54:12 zmedico Exp $
142
143 # Require EAPI 2 since we now require at least python-2.6 (for python 3
144 # syntax support) which also requires EAPI 2.
145 @@ -16,12 +16,15 @@
146
147 # Import of the io module in python-2.6 raises ImportError for the
148 # thread module if threading is disabled.
149 -python_dep="python3? ( =dev-lang/python-3* )
150 +python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
151 !pypy1_9? ( !python2? ( !python3? (
152 - || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] )
153 + || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
154 ) ) )
155 - pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) )
156 - python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
157 + pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
158 + python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
159 +python_dep="${python_dep_ssl//\[ssl\]}"
160 +python_dep="${python_dep//,ssl}"
161 +python_dep="${python_dep//ssl,}"
162
163 # The pysqlite blocker is for bug #282760.
164 DEPEND="${python_dep}
165 @@ -33,7 +36,8 @@
166 # quite slow, so it's not considered in the dependencies as an alternative to
167 # to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
168 # for now, don't pull in xattr deps for other kernels.
169 -RDEPEND="${python_dep}
170 +# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
171 +RDEPEND="${python_dep} || ( ${python_dep_ssl} dev-python/python-mhash )
172 !build? ( >=sys-apps/sed-4.0.5
173 >=app-shells/bash-3.2_p17
174 >=app-admin/eselect-1.2 )
175
176
177
178 1.9 sys-apps/portage/portage-2.1.10.65.ebuild
179
180 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.10.65.ebuild?rev=1.9&view=markup
181 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.10.65.ebuild?rev=1.9&content-type=text/plain
182 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.10.65.ebuild?r1=1.8&r2=1.9
183
184 Index: portage-2.1.10.65.ebuild
185 ===================================================================
186 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.65.ebuild,v
187 retrieving revision 1.8
188 retrieving revision 1.9
189 diff -u -r1.8 -r1.9
190 --- portage-2.1.10.65.ebuild 1 Jul 2012 16:51:55 -0000 1.8
191 +++ portage-2.1.10.65.ebuild 6 Jul 2012 17:54:12 -0000 1.9
192 @@ -1,6 +1,6 @@
193 # Copyright 1999-2012 Gentoo Foundation
194 # Distributed under the terms of the GNU General Public License v2
195 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.65.ebuild,v 1.8 2012/07/01 16:51:55 armin76 Exp $
196 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.65.ebuild,v 1.9 2012/07/06 17:54:12 zmedico Exp $
197
198 # Require EAPI 2 since we now require at least python-2.6 (for python 3
199 # syntax support) which also requires EAPI 2.
200 @@ -16,12 +16,15 @@
201
202 # Import of the io module in python-2.6 raises ImportError for the
203 # thread module if threading is disabled.
204 -python_dep="python3? ( =dev-lang/python-3* )
205 +python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
206 !pypy1_9? ( !python2? ( !python3? (
207 - || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] )
208 + || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
209 ) ) )
210 - pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) )
211 - python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
212 + pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
213 + python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
214 +python_dep="${python_dep_ssl//\[ssl\]}"
215 +python_dep="${python_dep//,ssl}"
216 +python_dep="${python_dep//ssl,}"
217
218 # The pysqlite blocker is for bug #282760.
219 DEPEND="${python_dep}
220 @@ -33,7 +36,8 @@
221 # quite slow, so it's not considered in the dependencies as an alternative to
222 # to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
223 # for now, don't pull in xattr deps for other kernels.
224 -RDEPEND="${python_dep}
225 +# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
226 +RDEPEND="${python_dep} || ( ${python_dep_ssl} dev-python/python-mhash )
227 !build? ( >=sys-apps/sed-4.0.5
228 >=app-shells/bash-3.2_p17
229 >=app-admin/eselect-1.2 )
230
231
232
233 1.2 sys-apps/portage/portage-2.2.0_alpha116.ebuild
234
235 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha116.ebuild?rev=1.2&view=markup
236 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha116.ebuild?rev=1.2&content-type=text/plain
237 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha116.ebuild?r1=1.1&r2=1.2
238
239 Index: portage-2.2.0_alpha116.ebuild
240 ===================================================================
241 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha116.ebuild,v
242 retrieving revision 1.1
243 retrieving revision 1.2
244 diff -u -r1.1 -r1.2
245 --- portage-2.2.0_alpha116.ebuild 5 Jul 2012 03:59:52 -0000 1.1
246 +++ portage-2.2.0_alpha116.ebuild 6 Jul 2012 17:54:12 -0000 1.2
247 @@ -1,6 +1,6 @@
248 # Copyright 1999-2012 Gentoo Foundation
249 # Distributed under the terms of the GNU General Public License v2
250 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha116.ebuild,v 1.1 2012/07/05 03:59:52 zmedico Exp $
251 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha116.ebuild,v 1.2 2012/07/06 17:54:12 zmedico Exp $
252
253 # Require EAPI 2 since we now require at least python-2.6 (for python 3
254 # syntax support) which also requires EAPI 2.
255 @@ -16,12 +16,15 @@
256
257 # Import of the io module in python-2.6 raises ImportError for the
258 # thread module if threading is disabled.
259 -python_dep="python3? ( =dev-lang/python-3* )
260 +python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
261 !pypy1_9? ( !python2? ( !python3? (
262 - || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] )
263 + || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
264 ) ) )
265 - pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) )
266 - python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
267 + pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
268 + python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
269 +python_dep="${python_dep_ssl//\[ssl\]}"
270 +python_dep="${python_dep//,ssl}"
271 +python_dep="${python_dep//ssl,}"
272
273 # The pysqlite blocker is for bug #282760.
274 DEPEND="${python_dep}
275 @@ -33,7 +36,8 @@
276 # quite slow, so it's not considered in the dependencies as an alternative to
277 # to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
278 # for now, don't pull in xattr deps for other kernels.
279 -RDEPEND="${python_dep}
280 +# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
281 +RDEPEND="${python_dep} || ( ${python_dep_ssl} dev-python/python-mhash )
282 !build? ( >=sys-apps/sed-4.0.5
283 >=app-shells/bash-3.2_p17
284 >=app-admin/eselect-1.2 )
285
286
287
288 1.1055 sys-apps/portage/ChangeLog
289
290 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1055&view=markup
291 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1055&content-type=text/plain
292 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1054&r2=1.1055
293
294 Index: ChangeLog
295 ===================================================================
296 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
297 retrieving revision 1.1054
298 retrieving revision 1.1055
299 diff -u -r1.1054 -r1.1055
300 --- ChangeLog 6 Jul 2012 06:42:54 -0000 1.1054
301 +++ ChangeLog 6 Jul 2012 17:54:12 -0000 1.1055
302 @@ -1,6 +1,11 @@
303 # ChangeLog for sys-apps/portage
304 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
305 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1054 2012/07/06 06:42:54 zmedico Exp $
306 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1055 2012/07/06 17:54:12 zmedico Exp $
307 +
308 + 06 Jul 2012; Zac Medico <zmedico@g.o> portage-2.1.10.65.ebuild,
309 + portage-2.1.11.5.ebuild, portage-2.2.0_alpha110.ebuild,
310 + portage-2.2.0_alpha116.ebuild, portage-9999.ebuild:
311 + Require python[ssl] or python-mhash for whirlpool (bug #425046).
312
313 06 Jul 2012; Zac Medico <zmedico@g.o> -portage-2.1.11.4.ebuild,
314 -portage-2.2.0_alpha115.ebuild:
Report Message
Find on MARC Find on Google Groups