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-cluster/cinder: cinder-2014.2.9999.ebuild cinder-2014.2.2.ebuild ChangeLog cinder-2014.2.1.ebuild cinder-9999.ebuild
Date: Sun, 08 Feb 2015 02:15:36
Message-Id: 20150208021529.75DA0114A3@oystercatcher.gentoo.org
1 prometheanfire 15/02/08 02:15:29
2
3 Modified: cinder-2014.2.9999.ebuild ChangeLog
4 Added: cinder-2014.2.2.ebuild
5 Removed: cinder-2014.2.1.ebuild cinder-9999.ebuild
6 Log:
7 bup
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-cluster/cinder/cinder-2014.2.9999.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/cinder-2014.2.9999.ebuild?rev=1.4&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/cinder-2014.2.9999.ebuild?rev=1.4&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/cinder-2014.2.9999.ebuild?r1=1.3&r2=1.4
17
18 Index: cinder-2014.2.9999.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.9999.ebuild,v
21 retrieving revision 1.3
22 retrieving revision 1.4
23 diff -u -r1.3 -r1.4
24 --- cinder-2014.2.9999.ebuild 9 Dec 2014 01:32:14 -0000 1.3
25 +++ cinder-2014.2.9999.ebuild 8 Feb 2015 02:15:29 -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-cluster/cinder/cinder-2014.2.9999.ebuild,v 1.3 2014/12/09 01:32:14 prometheanfire Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.9999.ebuild,v 1.4 2015/02/08 02:15:29 prometheanfire Exp $
32
33 EAPI=5
34 PYTHON_COMPAT=( python2_7 )
35 @@ -23,27 +23,31 @@
36 >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
37 <dev-python/pbr-1.0[${PYTHON_USEDEP}]
38 app-admin/sudo
39 - test? ( >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
40 - <dev-python/hacking-0.10[${PYTHON_USEDEP}]
41 - >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
42 - >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
43 - >=dev-python/mock-1.0[${PYTHON_USEDEP}]
44 - >=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
45 - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
46 - postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )
47 - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
48 - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
49 - <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
50 - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
51 - >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
52 - !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
53 - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
54 - >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] )"
55 + test? (
56 + ${RDEPEND}
57 + >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
58 + <dev-python/hacking-0.10[${PYTHON_USEDEP}]
59 + >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
60 + >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
61 + >=dev-python/mock-1.0[${PYTHON_USEDEP}]
62 + >=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
63 + mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
64 + postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )
65 + >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
66 + !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
67 + <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
68 + >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
69 + >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
70 + !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
71 + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
72 + >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
73 + )"
74
75 RDEPEND="
76 >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
77 >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
78 >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
79 + <dev-python/eventlet-0.16.0[${PYTHON_USEDEP}]
80 >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
81 >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
82 >=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
83 @@ -52,8 +56,10 @@
84 >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
85 >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
86 >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
87 + <dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}]
88 >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
89 !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
90 + <dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
91 >=dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}]
92 >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
93 >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
94 @@ -61,6 +67,7 @@
95 >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
96 >=dev-python/python-barbicanclient-2.1.0[${PYTHON_USEDEP}]
97 !~dev-python/python-barbicanclient-3.0.0[${PYTHON_USEDEP}]
98 + <dev-python/python-barbicanclient-3.0.2[${PYTHON_USEDEP}]
99 >=dev-python/python-glanceclient-0.14.0[${PYTHON_USEDEP}]
100 >=dev-python/python-novaclient-2.18.0[${PYTHON_USEDEP}]
101 >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
102 @@ -69,48 +76,24 @@
103 >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
104 !~dev-python/routes-2.0[${PYTHON_USEDEP}]
105 >=dev-python/taskflow-0.4[${PYTHON_USEDEP}]
106 + <dev-python/taskflow-0.7.0[${PYTHON_USEDEP}]
107 >=dev-python/rtslib-fb-2.1.39[${PYTHON_USEDEP}]
108 >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
109 sqlite? (
110 - || (
111 - (
112 - >=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
113 - <=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
114 - )
115 - (
116 - >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
117 - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
118 - )
119 - )
120 + >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
121 + <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
122 )
123 mysql? (
124 dev-python/mysql-python
125 - || (
126 - (
127 - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
128 - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
129 - )
130 - (
131 - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
132 - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
133 - )
134 - )
135 + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
136 + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
137 )
138 postgres? (
139 dev-python/psycopg:2
140 - || (
141 - (
142 - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
143 - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
144 - )
145 - (
146 - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
147 - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
148 - )
149 - )
150 + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
151 + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
152 )
153 - >=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
154 - !~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
155 + ~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
156 >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
157 >=dev-python/suds-0.4[${PYTHON_USEDEP}]
158 >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
159 @@ -119,8 +102,7 @@
160 || ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt )
161 sys-block/open-iscsi )
162 lvm? ( sys-fs/lvm2 )
163 - sys-fs/sysfsutils
164 -"
165 + sys-fs/sysfsutils"
166
167 PATCHES=( )
168
169
170
171
172 1.50 sys-cluster/cinder/ChangeLog
173
174 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/ChangeLog?rev=1.50&view=markup
175 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/ChangeLog?rev=1.50&content-type=text/plain
176 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/ChangeLog?r1=1.49&r2=1.50
177
178 Index: ChangeLog
179 ===================================================================
180 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v
181 retrieving revision 1.49
182 retrieving revision 1.50
183 diff -u -r1.49 -r1.50
184 --- ChangeLog 13 Jan 2015 03:31:44 -0000 1.49
185 +++ ChangeLog 8 Feb 2015 02:15:29 -0000 1.50
186 @@ -1,6 +1,13 @@
187 # ChangeLog for sys-cluster/cinder
188 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
189 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.49 2015/01/13 03:31:44 prometheanfire Exp $
190 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.50 2015/02/08 02:15:29 prometheanfire Exp $
191 +
192 +*cinder-2014.2.2 (08 Feb 2015)
193 +
194 + 08 Feb 2015; Matthew Thode <prometheanfire@g.o>
195 + +cinder-2014.2.2.ebuild, -cinder-2014.2.1.ebuild, -cinder-9999.ebuild,
196 + cinder-2014.2.9999.ebuild:
197 + bup
198
199 13 Jan 2015; Matthew Thode <prometheanfire@g.o>
200 -cinder-2014.1.3.ebuild, -cinder-2014.1.9999.ebuild, -cinder-2014.2.ebuild:
201
202
203
204 1.1 sys-cluster/cinder/cinder-2014.2.2.ebuild
205
206 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/cinder-2014.2.2.ebuild?rev=1.1&view=markup
207 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/cinder-2014.2.2.ebuild?rev=1.1&content-type=text/plain
208
209 Index: cinder-2014.2.2.ebuild
210 ===================================================================
211 # Copyright 1999-2015 Gentoo Foundation
212 # Distributed under the terms of the GNU General Public License v2
213 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.2.ebuild,v 1.1 2015/02/08 02:15:29 prometheanfire Exp $
214
215 EAPI=5
216 PYTHON_COMPAT=( python2_7 )
217
218 inherit distutils-r1 eutils linux-info user
219
220 DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
221 HOMEPAGE="https://launchpad.net/cinder"
222 SRC_URI="http://launchpad.net/${PN}/juno/${PV}/+download/${P}.tar.gz"
223
224 LICENSE="Apache-2.0"
225 SLOT="0"
226 KEYWORDS="~amd64 ~x86"
227 IUSE="+api +scheduler +volume iscsi lvm mysql postgres sqlite test"
228 REQUIRED_USE="|| ( mysql postgres sqlite )"
229
230 #sudo is a build dep because I want the sudoers.d directory to exist, lazy.
231 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
232 >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
233 <dev-python/pbr-1.0[${PYTHON_USEDEP}]
234 app-admin/sudo
235 test? (
236 ${RDEPEND}
237 >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
238 <dev-python/hacking-0.10[${PYTHON_USEDEP}]
239 >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
240 >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
241 >=dev-python/mock-1.0[${PYTHON_USEDEP}]
242 >=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
243 mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
244 postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )
245 >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
246 !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
247 <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
248 >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
249 >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
250 !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
251 >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
252 >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
253 )"
254
255 RDEPEND="
256 >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
257 >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
258 >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
259 <dev-python/eventlet-0.16.0[${PYTHON_USEDEP}]
260 >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
261 >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
262 >=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
263 >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
264 >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
265 >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
266 >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
267 >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
268 <dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}]
269 >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
270 !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
271 <dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
272 >=dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}]
273 >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
274 >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
275 dev-python/paste[${PYTHON_USEDEP}]
276 >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
277 >=dev-python/python-barbicanclient-2.1.0[${PYTHON_USEDEP}]
278 !~dev-python/python-barbicanclient-3.0.0[${PYTHON_USEDEP}]
279 <dev-python/python-barbicanclient-3.0.2[${PYTHON_USEDEP}]
280 >=dev-python/python-glanceclient-0.14.0[${PYTHON_USEDEP}]
281 >=dev-python/python-novaclient-2.18.0[${PYTHON_USEDEP}]
282 >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
283 >=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
284 !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
285 >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
286 !~dev-python/routes-2.0[${PYTHON_USEDEP}]
287 >=dev-python/taskflow-0.4[${PYTHON_USEDEP}]
288 <dev-python/taskflow-0.7.0[${PYTHON_USEDEP}]
289 >=dev-python/rtslib-fb-2.1.39[${PYTHON_USEDEP}]
290 >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
291 sqlite? (
292 >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
293 <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
294 )
295 mysql? (
296 dev-python/mysql-python
297 >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
298 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
299 )
300 postgres? (
301 dev-python/psycopg:2
302 >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
303 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
304 )
305 ~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
306 >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
307 >=dev-python/suds-0.4[${PYTHON_USEDEP}]
308 >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
309 >=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
310 iscsi? (
311 || ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt )
312 sys-block/open-iscsi )
313 lvm? ( sys-fs/lvm2 )
314 sys-fs/sysfsutils"
315
316 PATCHES=( )
317
318 pkg_setup() {
319 linux-info_pkg_setup
320 CONFIG_CHECK_MODULES="ISCSI_TCP"
321 if linux_config_exists; then
322 for module in ${CONFIG_CHECK_MODULES}; do
323 linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
324 done
325 fi
326 enewgroup cinder
327 enewuser cinder -1 -1 /var/lib/cinder cinder
328 }
329
330 #python_compile_all() { leave for next attempt
331 # use doc && emake -C doc html
332 #}
333
334 python_test() {
335 # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
336 nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
337 }
338
339 python_install() {
340 distutils-r1_python_install
341 keepdir /etc/cinder
342 dodir /etc/cinder/rootwrap.d
343
344 for svc in api scheduler volume; do
345 newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
346 done
347
348 insinto /etc/cinder
349 newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
350 newins "${S}/etc/cinder/api-paste.ini" "api-paste.ini"
351 newins "${S}/etc/cinder/logging_sample.conf" "logging_sample.conf"
352 newins "${S}/etc/cinder/policy.json" "policy.json"
353 newins "${S}/etc/cinder/rootwrap.conf" "rootwrap.conf"
354 insinto /etc/cinder/rootwrap.d
355 newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
356
357 dodir /var/log/cinder
358 fowners cinder:cinder /var/log/cinder
359
360 #add sudoers definitions for user nova
361 insinto /etc/sudoers.d/
362 insopts -m 0440 -o root -g root
363 newins "${FILESDIR}/cinder.sudoersd" cinder
364 }