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-2015.1.9999.ebuild cinder-2015.1.1.ebuild ChangeLog
Date: Wed, 29 Jul 2015 23:38:39
Message-Id: 20150729233830.BA6EDC3@oystercatcher.gentoo.org
1 prometheanfire 15/07/29 23:38:30
2
3 Modified: cinder-2015.1.9999.ebuild ChangeLog
4 Added: cinder-2015.1.1.ebuild
5 Log:
6 bup and update of live ebuild deps
7
8 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
9
10 Revision Changes Path
11 1.6 sys-cluster/cinder/cinder-2015.1.9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/cinder-2015.1.9999.ebuild?rev=1.6&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/cinder-2015.1.9999.ebuild?rev=1.6&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/cinder-2015.1.9999.ebuild?r1=1.5&r2=1.6
16
17 Index: cinder-2015.1.9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2015.1.9999.ebuild,v
20 retrieving revision 1.5
21 retrieving revision 1.6
22 diff -u -r1.5 -r1.6
23 --- cinder-2015.1.9999.ebuild 17 Jun 2015 21:16:47 -0000 1.5
24 +++ cinder-2015.1.9999.ebuild 29 Jul 2015 23:38:30 -0000 1.6
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2015 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2015.1.9999.ebuild,v 1.5 2015/06/17 21:16:47 prometheanfire Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2015.1.9999.ebuild,v 1.6 2015/07/29 23:38:30 prometheanfire Exp $
30
31 EAPI=5
32 PYTHON_COMPAT=( python2_7 )
33 @@ -15,7 +15,7 @@
34 LICENSE="Apache-2.0"
35 SLOT="0"
36 KEYWORDS=""
37 -IUSE="+api +scheduler +volume iscsi lvm +memcached mysql postgres sqlite test"
38 +IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test"
39 REQUIRED_USE="|| ( mysql postgres sqlite )"
40
41 #sudo is a build dep because I want the sudoers.d directory to exist, lazy.
42 @@ -29,7 +29,9 @@
43 <dev-python/hacking-0.11[${PYTHON_USEDEP}]
44 >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
45 >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
46 + <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
47 >=dev-python/mock-1.0[${PYTHON_USEDEP}]
48 + <dev-python/mock-1.1.0[${PYTHON_USEDEP}]
49 >=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
50 dev-python/mysql-python[${PYTHON_USEDEP}]
51 dev-python/psycopg[${PYTHON_USEDEP}]
52 @@ -45,6 +47,7 @@
53 >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
54 <dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
55 >=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
56 + <dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
57 )"
58
59 RDEPEND="
60 @@ -131,7 +134,9 @@
61 memcached? ( net-misc/memcached )
62 sys-fs/sysfsutils"
63
64 -PATCHES=( )
65 +PATCHES=(
66 +
67 +)
68
69 pkg_setup() {
70 linux-info_pkg_setup
71
72
73
74 1.60 sys-cluster/cinder/ChangeLog
75
76 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/ChangeLog?rev=1.60&view=markup
77 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/ChangeLog?rev=1.60&content-type=text/plain
78 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/ChangeLog?r1=1.59&r2=1.60
79
80 Index: ChangeLog
81 ===================================================================
82 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v
83 retrieving revision 1.59
84 retrieving revision 1.60
85 diff -u -r1.59 -r1.60
86 --- ChangeLog 29 Jul 2015 17:47:58 -0000 1.59
87 +++ ChangeLog 29 Jul 2015 23:38:30 -0000 1.60
88 @@ -1,6 +1,12 @@
89 # ChangeLog for sys-cluster/cinder
90 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
91 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.59 2015/07/29 17:47:58 zlogene Exp $
92 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.60 2015/07/29 23:38:30 prometheanfire Exp $
93 +
94 +*cinder-2015.1.1 (29 Jul 2015)
95 +
96 + 29 Jul 2015; Matthew Thode <prometheanfire@g.o>
97 + +cinder-2015.1.1.ebuild, cinder-2015.1.9999.ebuild:
98 + bup and update of live ebuild deps
99
100 29 Jul 2015; Mikle Kolyada <zlogene@g.o> cinder-2015.1.0-r1.ebuild:
101 x86 stable wrt bug #554284
102
103
104
105 1.1 sys-cluster/cinder/cinder-2015.1.1.ebuild
106
107 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/cinder-2015.1.1.ebuild?rev=1.1&view=markup
108 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/cinder/cinder-2015.1.1.ebuild?rev=1.1&content-type=text/plain
109
110 Index: cinder-2015.1.1.ebuild
111 ===================================================================
112 # Copyright 1999-2015 Gentoo Foundation
113 # Distributed under the terms of the GNU General Public License v2
114 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2015.1.1.ebuild,v 1.1 2015/07/29 23:38:30 prometheanfire Exp $
115
116 EAPI=5
117 PYTHON_COMPAT=( python2_7 )
118
119 inherit distutils-r1 eutils linux-info user
120
121 DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
122 HOMEPAGE="https://launchpad.net/cinder"
123 SRC_URI="http://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
124
125 LICENSE="Apache-2.0"
126 SLOT="0"
127 KEYWORDS="~amd64 ~x86"
128 IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test"
129 REQUIRED_USE="|| ( mysql postgres sqlite )"
130
131 #sudo is a build dep because I want the sudoers.d directory to exist, lazy.
132 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
133 >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
134 <dev-python/pbr-1.0[${PYTHON_USEDEP}]
135 app-admin/sudo
136 test? (
137 ${RDEPEND}
138 >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
139 <dev-python/hacking-0.11[${PYTHON_USEDEP}]
140 >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
141 >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
142 <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
143 >=dev-python/mock-1.0[${PYTHON_USEDEP}]
144 <dev-python/mock-1.1.0[${PYTHON_USEDEP}]
145 >=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
146 dev-python/mysql-python[${PYTHON_USEDEP}]
147 dev-python/psycopg[${PYTHON_USEDEP}]
148 >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
149 <dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
150 >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
151 !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
152 <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
153 >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
154 >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
155 !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
156 >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
157 >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
158 <dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
159 >=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
160 <dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
161 )"
162
163 RDEPEND="
164 >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
165 >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
166 >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
167 !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
168 >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
169 >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
170 >=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
171 <dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
172 >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
173 >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
174 >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
175 >=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
176 <dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
177 >=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
178 <dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
179 >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
180 <dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
181 >=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
182 <dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
183 >=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
184 <dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
185 >=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
186 <dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
187 >=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
188 <dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
189 >=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
190 <dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
191 >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
192 <dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
193 >=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
194 <dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
195 >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
196 >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
197 dev-python/paste[${PYTHON_USEDEP}]
198 >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
199 >=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
200 <dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
201 >=dev-python/python-glanceclient-0.15.0[${PYTHON_USEDEP}]
202 <dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
203 >=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
204 <dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}]
205 >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
206 <dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
207 >=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
208 !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
209 >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
210 !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
211 >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
212 !~dev-python/routes-2.0[${PYTHON_USEDEP}]
213 >=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
214 <dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
215 >=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
216 >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
217 sqlite? (
218 >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
219 <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
220 )
221 mysql? (
222 dev-python/mysql-python
223 >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
224 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
225 )
226 postgres? (
227 dev-python/psycopg:2
228 >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
229 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
230 )
231 >=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
232 >=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
233 <dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
234 >=dev-python/suds-0.4[${PYTHON_USEDEP}]
235 >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
236 >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
237 <dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
238 >=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
239 <dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
240 iscsi? (
241 || ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt )
242 sys-block/open-iscsi )
243 lvm? ( sys-fs/lvm2 )
244 memcached? ( net-misc/memcached )
245 sys-fs/sysfsutils"
246
247 PATCHES=(
248
249 )
250
251 pkg_setup() {
252 linux-info_pkg_setup
253 CONFIG_CHECK_MODULES="ISCSI_TCP"
254 if linux_config_exists; then
255 for module in ${CONFIG_CHECK_MODULES}; do
256 linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
257 done
258 fi
259 enewgroup cinder
260 enewuser cinder -1 -1 /var/lib/cinder cinder
261 }
262
263 python_compile() {
264 distutils-r1_python_compile
265 mv cinder/test.py cinder/test.py.bak || die
266 ./tools/config/generate_sample.sh -b ./ -p cinder -o etc/cinder || die
267 mv cinder/test.py.bak cinder/test.py || die
268 }
269
270 python_test() {
271 # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
272 nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
273 }
274
275 python_install() {
276 distutils-r1_python_install
277 keepdir /etc/cinder
278 dodir /etc/cinder/rootwrap.d
279
280 for svc in api scheduler volume; do
281 newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
282 done
283
284 insinto /etc/cinder
285 newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
286 newins "${S}/etc/cinder/api-paste.ini" "api-paste.ini"
287 newins "${S}/etc/cinder/logging_sample.conf" "logging_sample.conf"
288 newins "${S}/etc/cinder/policy.json" "policy.json"
289 newins "${S}/etc/cinder/rootwrap.conf" "rootwrap.conf"
290 insinto /etc/cinder/rootwrap.d
291 newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
292
293 dodir /var/log/cinder
294 fowners cinder:cinder /var/log/cinder
295
296 #add sudoers definitions for user nova
297 insinto /etc/sudoers.d/
298 insopts -m 0440 -o root -g root
299 newins "${FILESDIR}/cinder.sudoersd" cinder
300 }