Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/glance/
Date: Fri, 20 Oct 2017 23:20:15
Message-Id: 1508541583.ad32d85d3d96cfef5573e554a7fbc09813ec2871.prometheanfire@gentoo
1 commit: ad32d85d3d96cfef5573e554a7fbc09813ec2871
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 20 23:18:00 2017 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 20 23:19:43 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad32d85d
7
8 app-admin/glance: cleanup newton
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 app-admin/glance/Manifest | 1 -
13 app-admin/glance/glance-13.0.0.ebuild | 140 -----------------------------
14 app-admin/glance/glance-2016.2.9999.ebuild | 139 ----------------------------
15 3 files changed, 280 deletions(-)
16
17 diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
18 index ae8443bcea5..01923d22400 100644
19 --- a/app-admin/glance/Manifest
20 +++ b/app-admin/glance/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST glance-13.0.0.tar.gz 1742124 SHA256 3ef3594018469ba36425afafa61ae31487b6025e6f8d9d14febcedfa7136160f SHA512 2f49af5c462a10f8132bb50ad62a45026e77db1324384299551cfe2097b166ccb6fab82eacb092ab6c157f27cdb7253062e62881af795b15d8fd400c1fa096d8 WHIRLPOOL 0c859bbe9e87d2658118bdc111fd052ef088489d83d30574ec07271a50674d18b93d80de05a6282f7d43a8630d980340445b7eeee926bda84572df40086e5e5c
23 DIST glance-14.0.0.tar.gz 1788173 SHA256 360a9ef92121ed355ea812478933ac4b020adc6ae3bb5440b05cbdf06a2f9f46 SHA512 4d0b6654dc6a9848e164422d138d4f6c1ec3711a7eb56a3c437202aa5c8cf86bf341201c9007b2f12173189f18beb73eadbaaade936ececf705a31e8b6eac155 WHIRLPOOL 40c7959e052cb3f1d93f3542669b3009b83004cce7dbdcbe67651e69af93e01969f70f4586a022ffc60127ce70037d4887ab0d8de4e11de98519bef578632265
24 DIST glance-15.0.0.tar.gz 1803491 SHA256 6e0305e5bdc8f22dca083809e86cf82c430d1cb0164364dbc68263e36676e565 SHA512 beb5744f9e8b296356cb731c79f1efd7b60408c1282e8a64ab7d414929c447c4f2ff0562a0d59c0a05f828d420ba190946866543a37dbd2df73ae322cbcabab5 WHIRLPOOL dfb8ec280a161c09a03f2495b9ec26ec8b2a18f14fca0cad13d6c581a735858893bc0dce2de2bbe317ad61cb7fbca5de7d05d6bb85cb7e6949acd49baf91eb8f
25
26 diff --git a/app-admin/glance/glance-13.0.0.ebuild b/app-admin/glance/glance-13.0.0.ebuild
27 deleted file mode 100644
28 index 35bf1ea85a7..00000000000
29 --- a/app-admin/glance/glance-13.0.0.ebuild
30 +++ /dev/null
31 @@ -1,140 +0,0 @@
32 -# Copyright 1999-2016 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
37 -
38 -inherit distutils-r1 user
39 -
40 -DESCRIPTION="Services for discovering, registering, and retrieving VM images"
41 -HOMEPAGE="https://launchpad.net/glance"
42 -SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
43 -
44 -LICENSE="Apache-2.0"
45 -SLOT="0"
46 -KEYWORDS="amd64 ~arm64 x86"
47 -IUSE="doc mysql postgres +sqlite +swift"
48 -REQUIRED_USE="|| ( mysql postgres sqlite )"
49 -
50 -CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
51 -DEPEND="
52 - dev-python/setuptools[${PYTHON_USEDEP}]
53 - ${CDEPEND}"
54 -
55 -#note to self, wsgiref is a python builtin, no need to package it
56 -#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
57 -
58 -RDEPEND="
59 - ${CDEPEND}
60 - sqlite? (
61 - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
62 - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
63 - )
64 - mysql? (
65 - >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
66 - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
67 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
68 - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
69 - )
70 - postgres? (
71 - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
72 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
73 - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
74 - )
75 - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
76 - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
77 - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
78 - !~dev-python/routes-2.0[${PYTHON_USEDEP}]
79 - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
80 - !~dev-python/routes-2.3[${PYTHON_USEDEP}]
81 - >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
82 - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
83 - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
84 - >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
85 - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
86 - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
87 - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
88 - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
89 - >=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
90 - >=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
91 - >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
92 - !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
93 - >=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}]
94 - >=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
95 - >=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
96 - !~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
97 - !~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
98 - >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
99 - >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
100 - <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
101 - dev-python/paste[${PYTHON_USEDEP}]
102 - >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
103 - !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
104 - <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
105 - >=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
106 - !~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
107 - >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
108 - >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
109 - >=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
110 - !~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
111 - !~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
112 - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
113 - >=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
114 - >=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
115 - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
116 - >=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
117 - >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
118 - !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
119 - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
120 - >=dev-python/glance_store-0.18.0[${PYTHON_USEDEP}]
121 - >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
122 - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
123 - >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
124 - !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
125 - >=dev-python/cursive-0.1.1[${PYTHON_USEDEP}]
126 - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
127 - >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
128 -"
129 -
130 -#PATCHES=(
131 -#)
132 -
133 -pkg_setup() {
134 - enewgroup glance
135 - enewuser glance -1 -1 /var/lib/glance glance
136 -}
137 -
138 -python_prepare_all() {
139 - sed -i '/xattr/d' test-requirements.txt || die
140 - sed -i '/pysendfile/d' test-requirements.txt || die
141 - sed -i '/^hacking/d' test-requirements.txt || die
142 - distutils-r1_python_prepare_all
143 -}
144 -
145 -python_compile_all() {
146 - use doc && "${PYTHON}" setup.py build_sphinx
147 -}
148 -
149 -python_install() {
150 - distutils-r1_python_install
151 -
152 - for svc in api glare registry scrubber; do
153 - newinitd "${FILESDIR}/glance.initd" glance-${svc}
154 - done
155 -
156 - diropts -m 0750 -o glance -g glance
157 - dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
158 - keepdir /etc/glance
159 - keepdir /var/log/glance
160 - keepdir /var/lib/glance/images
161 - keepdir /var/lib/glance/scrubber
162 -
163 - insinto /etc/glance
164 - insopts -m 0640 -o glance -g glance
165 - doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
166 -}
167 -
168 -python_install_all() {
169 - use doc && local HTML_DOCS=( doc/build/html/. )
170 - distutils-r1_python_install_all
171 -}
172
173 diff --git a/app-admin/glance/glance-2016.2.9999.ebuild b/app-admin/glance/glance-2016.2.9999.ebuild
174 deleted file mode 100644
175 index 3de083614ab..00000000000
176 --- a/app-admin/glance/glance-2016.2.9999.ebuild
177 +++ /dev/null
178 @@ -1,139 +0,0 @@
179 -# Copyright 1999-2016 Gentoo Foundation
180 -# Distributed under the terms of the GNU General Public License v2
181 -
182 -EAPI=6
183 -PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
184 -
185 -inherit distutils-r1 git-r3 user
186 -
187 -DESCRIPTION="Services for discovering, registering, and retrieving VM images"
188 -HOMEPAGE="https://launchpad.net/glance"
189 -EGIT_REPO_URI="https://github.com/openstack/glance.git"
190 -EGIT_BRANCH="stable/newton"
191 -
192 -LICENSE="Apache-2.0"
193 -SLOT="0"
194 -KEYWORDS=""
195 -IUSE="doc mysql postgres +sqlite +swift"
196 -REQUIRED_USE="|| ( mysql postgres sqlite )"
197 -
198 -CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
199 -DEPEND="
200 - dev-python/setuptools[${PYTHON_USEDEP}]
201 - ${CDEPEND}"
202 -
203 -#note to self, wsgiref is a python builtin, no need to package it
204 -#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
205 -
206 -RDEPEND="
207 - ${CDEPEND}
208 - sqlite? (
209 - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
210 - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
211 - )
212 - mysql? (
213 - >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
214 - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
215 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
216 - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
217 - )
218 - postgres? (
219 - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
220 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
221 - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
222 - )
223 - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
224 - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
225 - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
226 - !~dev-python/routes-2.0[${PYTHON_USEDEP}]
227 - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
228 - !~dev-python/routes-2.3[${PYTHON_USEDEP}]
229 - >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
230 - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
231 - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
232 - >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
233 - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
234 - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
235 - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
236 - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
237 - >=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
238 - >=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
239 - >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
240 - !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
241 - >=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}]
242 - >=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
243 - >=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
244 - !~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
245 - !~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
246 - >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
247 - >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
248 - <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
249 - dev-python/paste[${PYTHON_USEDEP}]
250 - >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
251 - !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
252 - <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
253 - >=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
254 - !~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
255 - >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
256 - >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
257 - >=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
258 - !~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
259 - !~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
260 - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
261 - >=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
262 - >=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
263 - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
264 - >=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
265 - >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
266 - !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
267 - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
268 - >=dev-python/glance_store-0.18.0[${PYTHON_USEDEP}]
269 - >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
270 - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
271 - >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
272 - !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
273 - >=dev-python/cursive-0.1.1[${PYTHON_USEDEP}]
274 - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
275 - >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
276 -"
277 -
278 -#PATCHES=(
279 -#)
280 -
281 -pkg_setup() {
282 - enewgroup glance
283 - enewuser glance -1 -1 /var/lib/glance glance
284 -}
285 -
286 -python_prepare_all() {
287 - sed -i '/xattr/d' test-requirements.txt || die
288 - sed -i '/pysendfile/d' test-requirements.txt || die
289 - sed -i '/^hacking/d' test-requirements.txt || die
290 - distutils-r1_python_prepare_all
291 -}
292 -
293 -python_compile_all() {
294 - use doc && "${PYTHON}" setup.py build_sphinx
295 -}
296 -
297 -python_install_all() {
298 - distutils-r1_python_install_all
299 -
300 - for svc in api glare registry scrubber; do
301 - newinitd "${FILESDIR}/glance.initd" glance-${svc}
302 - done
303 -
304 - diropts -m 0750 -o glance -g glance
305 - dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
306 - keepdir /etc/glance
307 - keepdir /var/log/glance
308 - keepdir /var/lib/glance/images
309 - keepdir /var/lib/glance/scrubber
310 -
311 - insinto /etc/glance
312 - insopts -m 0640 -o glance -g glance
313 - doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
314 -
315 - use doc && local HTML_DOCS=( doc/build/html/. )
316 - distutils-r1_python_install_all
317 -}