Gentoo Archives: gentoo-commits

From: "Matt Thode (prometheanfire)" <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-auth/keystone: keystone-2014.2.9999.ebuild keystone-2014.2.2.ebuild ChangeLog keystone-9999.ebuild
Date: Sun, 08 Feb 2015 01:59:16
Message-Id: 20150208015911.EA7021149F@oystercatcher.gentoo.org
1 prometheanfire 15/02/08 01:59:11
2
3 Modified: keystone-2014.2.9999.ebuild
4 keystone-2014.2.2.ebuild ChangeLog
5 Removed: keystone-9999.ebuild
6 Log:
7 fixing deps
8
9 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
10
11 Revision Changes Path
12 1.4 sys-auth/keystone/keystone-2014.2.9999.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild?rev=1.4&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild?rev=1.4&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild?r1=1.3&r2=1.4
17
18 Index: keystone-2014.2.9999.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild,v
21 retrieving revision 1.3
22 retrieving revision 1.4
23 diff -u -r1.3 -r1.4
24 --- keystone-2014.2.9999.ebuild 9 Dec 2014 01:16:29 -0000 1.3
25 +++ keystone-2014.2.9999.ebuild 8 Feb 2015 01:59:11 -0000 1.4
26 @@ -1,6 +1,6 @@
27 -# Copyright 1999-2014 Gentoo Foundation
28 +# Copyright 1999-2015 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild,v 1.3 2014/12/09 01:16:29 prometheanfire Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild,v 1.4 2015/02/08 01:59:11 prometheanfire Exp $
32
33 EAPI=5
34
35 @@ -19,47 +19,52 @@
36 IUSE="+sqlite mysql postgres ldap test"
37 REQUIRED_USE="|| ( mysql postgres sqlite )"
38
39 -#todo, seperate out rdepend via use flags
40 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
41 +DEPEND="
42 + dev-python/setuptools[${PYTHON_USEDEP}]
43 >=dev-python/pbr-0.6[${PYTHON_USEDEP}]
44 !~dev-python/pbr-0.7[${PYTHON_USEDEP}]
45 <dev-python/pbr-1.0[${PYTHON_USEDEP}]
46 - test? ( ${RDEPEND}
47 - >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
48 - <dev-python/hacking-0.10[${PYTHON_USEDEP}]
49 - >=dev-python/bashate-0.2[${PYTHON_USEDEP}]
50 - dev-lang/python[sqlite]
51 - >=dev-python/python-memcached-1.48[${PYTHON_USEDEP}]
52 - >=dev-python/pymongo-2.4[${PYTHON_USEDEP}]
53 - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}]
54 - >=dev-python/ldappool-1.0[${PYTHON_USEDEP}]
55 - )
56 - dev-python/pysaml2[${PYTHON_USEDEP}]
57 - >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
58 - >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
59 - >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
60 - >=dev-python/mock-1.0[${PYTHON_USEDEP}]
61 - >=dev-python/oslotest-1.1.0[${PYTHON_USEDEP}]
62 - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
63 - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
64 - <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
65 - >=dev-python/webtest-2.0[${PYTHON_USEDEP}]
66 - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
67 - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
68 - >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
69 - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
70 - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
71 - >=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
72 - !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
73 - >=dev-python/keyring-2.1[${PYTHON_USEDEP}]
74 - !~dev-python/keyring-3.3[${PYTHON_USEDEP}]
75 - >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
76 - >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
77 - >=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
78 - >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
79 + test? (
80 + ${RDEPEND}
81 + >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
82 + <dev-python/hacking-0.10[${PYTHON_USEDEP}]
83 + >=dev-python/bashate-0.2[${PYTHON_USEDEP}]
84 + dev-lang/python[sqlite]
85 + >=dev-python/python-memcached-1.48[${PYTHON_USEDEP}]
86 + >=dev-python/pymongo-2.4[${PYTHON_USEDEP}]
87 + ldap? (
88 + dev-python/python-ldap[${PYTHON_USEDEP}]
89 + >=dev-python/ldappool-1.0[${PYTHON_USEDEP}]
90 + )
91 + dev-python/pysaml2[${PYTHON_USEDEP}]
92 + >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
93 + >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
94 + >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
95 + >=dev-python/mock-1.0[${PYTHON_USEDEP}]
96 + >=dev-python/oslotest-1.1.0[${PYTHON_USEDEP}]
97 + >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
98 + !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
99 + <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
100 + >=dev-python/webtest-2.0[${PYTHON_USEDEP}]
101 + >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
102 + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
103 + >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
104 + !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
105 + >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
106 + >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
107 + >=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
108 + !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
109 + >=dev-python/keyring-2.1[${PYTHON_USEDEP}]
110 + !~dev-python/keyring-3.3[${PYTHON_USEDEP}]
111 + >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
112 + >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
113 + >=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
114 + >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
115 )"
116 -RDEPEND=">=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
117 +RDEPEND="
118 + >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
119 >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
120 + <dev-python/eventlet-0.16.0[${PYTHON_USEDEP}]
121 >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
122 >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
123 >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
124 @@ -68,45 +73,20 @@
125 !~dev-python/routes-2.0[${PYTHON_USEDEP}]
126 >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
127 sqlite? (
128 - || (
129 - (
130 - >=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
131 - <=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
132 - )
133 - (
134 - >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
135 - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
136 - )
137 - )
138 + >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
139 + <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
140 )
141 mysql? (
142 dev-python/mysql-python
143 - || (
144 - (
145 - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
146 - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
147 - )
148 - (
149 - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
150 - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
151 - )
152 - )
153 + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
154 + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
155 )
156 postgres? (
157 dev-python/psycopg:2
158 - || (
159 - (
160 - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
161 - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
162 - )
163 - (
164 - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
165 - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
166 - )
167 - )
168 + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
169 + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
170 )
171 - >=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
172 - !~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
173 + ~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
174 dev-python/passlib[${PYTHON_USEDEP}]
175 >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
176 >=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]
177 @@ -114,7 +94,9 @@
178 >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
179 >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
180 !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
181 + <dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
182 >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
183 + <dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}]
184 >=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
185 >=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}]
186 >=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}]
187
188
189
190 1.3 sys-auth/keystone/keystone-2014.2.2.ebuild
191
192 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/keystone-2014.2.2.ebuild?rev=1.3&view=markup
193 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/keystone-2014.2.2.ebuild?rev=1.3&content-type=text/plain
194 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/keystone-2014.2.2.ebuild?r1=1.2&r2=1.3
195
196 Index: keystone-2014.2.2.ebuild
197 ===================================================================
198 RCS file: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.2.ebuild,v
199 retrieving revision 1.2
200 retrieving revision 1.3
201 diff -u -r1.2 -r1.3
202 --- keystone-2014.2.2.ebuild 8 Feb 2015 01:26:26 -0000 1.2
203 +++ keystone-2014.2.2.ebuild 8 Feb 2015 01:59:11 -0000 1.3
204 @@ -1,6 +1,6 @@
205 # Copyright 1999-2015 Gentoo Foundation
206 # Distributed under the terms of the GNU General Public License v2
207 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.2.ebuild,v 1.2 2015/02/08 01:26:26 prometheanfire Exp $
208 +# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.2.ebuild,v 1.3 2015/02/08 01:59:11 prometheanfire Exp $
209
210 EAPI=5
211
212 @@ -18,8 +18,8 @@
213 IUSE="+sqlite mysql postgres ldap test"
214 REQUIRED_USE="|| ( mysql postgres sqlite )"
215
216 -#todo, seperate out rdepend via use flags
217 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
218 +DEPEND="
219 + dev-python/setuptools[${PYTHON_USEDEP}]
220 >=dev-python/pbr-0.6[${PYTHON_USEDEP}]
221 !~dev-python/pbr-0.7[${PYTHON_USEDEP}]
222 <dev-python/pbr-1.0[${PYTHON_USEDEP}]
223 @@ -60,8 +60,10 @@
224 >=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
225 >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
226 )"
227 -RDEPEND=">=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
228 +RDEPEND="
229 + >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
230 >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
231 + <dev-python/eventlet-0.16.0[${PYTHON_USEDEP}]
232 >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
233 >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
234 >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
235 @@ -70,45 +72,20 @@
236 !~dev-python/routes-2.0[${PYTHON_USEDEP}]
237 >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
238 sqlite? (
239 - || (
240 - (
241 - >=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
242 - <=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
243 - )
244 - (
245 - >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
246 - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
247 - )
248 - )
249 + >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
250 + <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
251 )
252 mysql? (
253 dev-python/mysql-python
254 - || (
255 - (
256 - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
257 - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
258 - )
259 - (
260 - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
261 - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
262 - )
263 - )
264 + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
265 + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
266 )
267 postgres? (
268 dev-python/psycopg:2
269 - || (
270 - (
271 - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
272 - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
273 - )
274 - (
275 - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
276 - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
277 - )
278 - )
279 + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
280 + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
281 )
282 - >=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
283 - !~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
284 + ~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
285 dev-python/passlib[${PYTHON_USEDEP}]
286 >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
287 >=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]
288 @@ -116,7 +93,9 @@
289 >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
290 >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
291 !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
292 + <dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
293 >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
294 + <dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}]
295 >=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
296 >=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}]
297 >=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}]
298
299
300
301 1.87 sys-auth/keystone/ChangeLog
302
303 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/ChangeLog?rev=1.87&view=markup
304 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/ChangeLog?rev=1.87&content-type=text/plain
305 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/ChangeLog?r1=1.86&r2=1.87
306
307 Index: ChangeLog
308 ===================================================================
309 RCS file: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v
310 retrieving revision 1.86
311 retrieving revision 1.87
312 diff -u -r1.86 -r1.87
313 --- ChangeLog 8 Feb 2015 01:26:26 -0000 1.86
314 +++ ChangeLog 8 Feb 2015 01:59:11 -0000 1.87
315 @@ -1,6 +1,10 @@
316 # ChangeLog for sys-auth/keystone
317 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
318 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.86 2015/02/08 01:26:26 prometheanfire Exp $
319 +# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.87 2015/02/08 01:59:11 prometheanfire Exp $
320 +
321 + 08 Feb 2015; Matthew Thode <prometheanfire@g.o> -keystone-9999.ebuild,
322 + keystone-2014.2.2.ebuild, keystone-2014.2.9999.ebuild:
323 + fixing deps
324
325 08 Feb 2015; Matthew Thode <prometheanfire@g.o>
326 keystone-2014.2.2.ebuild: