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

Gentoo Archives: gentoo-commits

From: "Matt Thode (prometheanfire)" <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/glance: glance-9999.ebuild ChangeLog
Date: Fri, 01 Aug 2014 05:12:17
Message-Id: 20140801051210.CC9E52004E@flycatcher.gentoo.org
1 prometheanfire 14/08/01 05:12:09
2
3 Modified: glance-9999.ebuild ChangeLog
4 Log:
5 updating git master glance
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
8
9 Revision Changes Path
10 1.12 app-admin/glance/glance-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-9999.ebuild?rev=1.12&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-9999.ebuild?rev=1.12&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-9999.ebuild?r1=1.11&r2=1.12
15
16 Index: glance-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-admin/glance/glance-9999.ebuild,v
19 retrieving revision 1.11
20 retrieving revision 1.12
21 diff -u -r1.11 -r1.12
22 --- glance-9999.ebuild 26 Jul 2014 23:15:35 -0000 1.11
23 +++ glance-9999.ebuild 1 Aug 2014 05:12:09 -0000 1.12
24 @@ -1,86 +1,127 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-9999.ebuild,v 1.11 2014/07/26 23:15:35 prometheanfire Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-9999.ebuild,v 1.12 2014/08/01 05:12:09 prometheanfire Exp $
29
30 EAPI=5
31 PYTHON_COMPAT=( python2_7 )
32
33 -inherit git-2 distutils-r1
34 +inherit git-2 distutils-r1 user
35
36 DESCRIPTION="Provides services for discovering, registering, and retrieving
37 virtual machine images with Openstack"
38 HOMEPAGE="https://launchpad.net/glance"
39 EGIT_REPO_URI="https://github.com/openstack/glance.git"
40 -EGIT_BRANCH="master"
41
42 LICENSE="Apache-2.0"
43 SLOT="0"
44 KEYWORDS=""
45 -IUSE="ldap mysql postgres +sqlite +swift"
46 -REQUIRED_USE="|| ( ldap mysql postgres sqlite )"
47 +IUSE="doc mysql postgres +sqlite +swift test"
48 +REQUIRED_USE="|| ( mysql postgres sqlite )"
49
50 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
51 -RDEPEND="${DEPEND}
52 - dev-python/boto[${PYTHON_USEDEP}]
53 - dev-python/anyjson[${PYTHON_USEDEP}]
54 - >=dev-python/eventlet-0.9.12[${PYTHON_USEDEP}]
55 - >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
56 - dev-python/httplib2[${PYTHON_USEDEP}]
57 - dev-python/iso8601[${PYTHON_USEDEP}]
58 - >=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
59 - <dev-python/jsonschema-1[${PYTHON_USEDEP}]
60 - dev-python/kombu[${PYTHON_USEDEP}]
61 - dev-python/lxml[${PYTHON_USEDEP}]
62 - >=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
63 - <dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
64 - dev-python/passlib[${PYTHON_USEDEP}]
65 - dev-python/paste[${PYTHON_USEDEP}]
66 - dev-python/pastedeploy[${PYTHON_USEDEP}]
67 - dev-python/pycrypto[${PYTHON_USEDEP}]
68 - >=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
69 - dev-python/python-glanceclient[${PYTHON_USEDEP}]
70 - dev-python/routes[${PYTHON_USEDEP}]
71 - >=dev-python/sqlalchemy-migrate-0.7[${PYTHON_USEDEP}]
72 - >=dev-python/webob-1.2[${PYTHON_USEDEP}]
73 - swift? (
74 - >=dev-python/python-swiftclient-1.2[${PYTHON_USEDEP}]
75 - )
76 - sqlite? (
77 - >=dev-python/sqlalchemy-0.8.0[sqlite,${PYTHON_USEDEP}]
78 - !~dev-python/sqlalchemy-0.9.5[sqlite,${PYTHON_USEDEP}]
79 - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
80 - )
81 - mysql? (
82 - dev-python/mysql-python
83 - >=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
84 - !~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
85 - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
86 - )
87 - postgres? (
88 +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
89 + >=dev-python/pbr-0.6.0[${PYTHON_USEDEP}]
90 + <dev-python/pbr-1.0[${PYTHON_USEDEP}]
91 + test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
92 + <dev-python/hacking-0.9[${PYTHON_USEDEP}]
93 + >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
94 + >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
95 + >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
96 + >=dev-python/mock-1.0[${PYTHON_USEDEP}]
97 + >=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
98 + >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
99 + <dev-python/sphinx-1.2[${PYTHON_USEDEP}]
100 + >=dev-python/requests-1.1[${PYTHON_USEDEP}]
101 + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
102 + >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
103 + >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
104 + dev-python/mysql-python[${PYTHON_USEDEP}]
105 + dev-python/psycopg[${PYTHON_USEDEP}]
106 + ~dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
107 + dev-python/qpid-python[${PYTHON_USEDEP}]
108 + >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
109 + dev-python/oslo-sphinx[${PYTHON_USEDEP}] )"
110 +
111 +#note to self, wsgiref is a python builtin, no need to package it
112 +#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
113 +
114 +RDEPEND=">=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
115 + sqlite? (
116 + >=dev-python/sqlalchemy-0.8.0[sqlite,${PYTHON_USEDEP}]
117 + !~dev-python/sqlalchemy-0.9.5[sqlite,${PYTHON_USEDEP}]
118 + <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
119 + )
120 + mysql? (
121 + dev-python/mysql-python
122 + >=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
123 + !~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
124 + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
125 + )
126 + postgres? (
127 dev-python/psycopg:2
128 - >=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
129 - !~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
130 - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
131 - )
132 - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
133 + >=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
134 + !~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
135 + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
136 + )
137 + >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
138 + >=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
139 + >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
140 + >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
141 + >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
142 + >=dev-python/boto-2.12.0[${PYTHON_USEDEP}]
143 + !~dev-python/boto-2.13.0[${PYTHON_USEDEP}]
144 + >=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
145 + >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
146 + >=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
147 + >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
148 + >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
149 + >=dev-python/oslo-config-1.2.1[${PYTHON_USEDEP}]
150 + >=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
151 + swift? (
152 + >=dev-python/python-swiftclient-1.6[${PYTHON_USEDEP}]
153 + )
154 + dev-python/paste[${PYTHON_USEDEP}]
155 + >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
156 + <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
157 + >=dev-python/python-cinderclient-1.0.6[${PYTHON_USEDEP}]
158 + >=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
159 + >=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
160 + >=dev-python/six-1.6.0[${PYTHON_USEDEP}]
161 + >=dev-python/oslo-messaging-1.3.0[${PYTHON_USEDEP}]
162 + >=dev-python/oslo-vmware-0.2[${PYTHON_USEDEP}]"
163 +
164 +PATCHES=( "${FILESDIR}"/${PN}-2013.2-sphinx_mapping.patch )
165 +
166 +pkg_setup() {
167 + enewgroup glance
168 + enewuser glance -1 -1 /var/lib/glance glance
169 +}
170 +
171 +python_compile_all() {
172 + use doc && "${PYTHON}" setup.py build_sphinx
173 +}
174 +
175 +python_test() {
176 + # https://bugs.launchpad.net/glance/+bug/1251105
177 + # https://bugs.launchpad.net/glance/+bug/1242501
178 + nosetests glance/ || die "tests failed under python2.7"
179 +}
180
181 python_install() {
182 distutils-r1_python_install
183 - newconfd "${FILESDIR}/glance.confd" glance
184 - newinitd "${FILESDIR}/glance.initd" glance
185
186 - for function in api registry scrubber; do
187 - dosym /etc/init.d/glance /etc/init.d/glance-${function}
188 + for svc in api registry scrubber; do
189 + newinitd "${FILESDIR}/glance.initd" glance-${svc}
190 done
191
192 - diropts -m 0750
193 - dodir /var/run/glance /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
194 + diropts -m 0750 -o glance -g glance
195 + dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
196 keepdir /etc/glance
197 keepdir /var/log/glance
198 keepdir /var/lib/glance/images
199 keepdir /var/lib/glance/scrubber
200 - insinto /etc/glance
201
202 + insinto /etc/glance
203 + insopts -m 0640 -o glance -g glance
204 doins "etc/glance-api-paste.ini"
205 doins "etc/glance-api.conf"
206 doins "etc/glance-cache.conf"
207 @@ -91,3 +132,8 @@
208 doins "etc/policy.json"
209 doins "etc/schema-image.json"
210 }
211 +
212 +python_install_all() {
213 + use doc && local HTML_DOCS=( doc/build/html/. )
214 + distutils-r1_python_install_all
215 +}
216
217
218
219 1.47 app-admin/glance/ChangeLog
220
221 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/ChangeLog?rev=1.47&view=markup
222 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/ChangeLog?rev=1.47&content-type=text/plain
223 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/ChangeLog?r1=1.46&r2=1.47
224
225 Index: ChangeLog
226 ===================================================================
227 RCS file: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v
228 retrieving revision 1.46
229 retrieving revision 1.47
230 diff -u -r1.46 -r1.47
231 --- ChangeLog 26 Jul 2014 23:15:35 -0000 1.46
232 +++ ChangeLog 1 Aug 2014 05:12:09 -0000 1.47
233 @@ -1,6 +1,9 @@
234 # ChangeLog for app-admin/glance
235 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
236 -# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.46 2014/07/26 23:15:35 prometheanfire Exp $
237 +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.47 2014/08/01 05:12:09 prometheanfire Exp $
238 +
239 + 01 Aug 2014; Matthew Thode <prometheanfire@g.o> glance-9999.ebuild:
240 + updating git master glance
241
242 26 Jul 2014; Matthew Thode <prometheanfire@g.o> glance-2014.1.1.ebuild,
243 glance-2014.1.9999.ebuild, glance-9999.ebuild:
Report Message
Find on MARC Find on Google Groups