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: Wed, 23 May 2018 18:05:40
Message-Id: 1527098721.e56d0b4bf370d845129130c100cc97421a6b618f.prometheanfire@gentoo
1 commit: e56d0b4bf370d845129130c100cc97421a6b618f
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 23 18:03:50 2018 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Wed May 23 18:05:21 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e56d0b4b
7
8 app-admin/glance: 16.0.1 stable with cleanup
9
10 Package-Manager: Portage-2.3.36, Repoman-2.3.9
11
12 app-admin/glance/Manifest | 1 -
13 app-admin/glance/glance-16.0.0.ebuild | 145 ----------------------------------
14 app-admin/glance/glance-16.0.1.ebuild | 2 +-
15 3 files changed, 1 insertion(+), 147 deletions(-)
16
17 diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
18 index 11492e63f2d..41c40aa2348 100644
19 --- a/app-admin/glance/Manifest
20 +++ b/app-admin/glance/Manifest
21 @@ -1,3 +1,2 @@
22 DIST glance-15.0.1.tar.gz 1815463 BLAKE2B ec6e51340fc4d737e2bd777baf03163a0b515d19c1dc8e5203918e07b304a9539f47ba763207e26def985c6a384d21250ffe1386b433d8b606b55d3d70e4431a SHA512 2da3ada256424a7817d0c49aac0940443cbefcfff3df77a623d7099badf356808b5df59f109ac233f84ac561b7310d3b8d53cafd6c9955a8e2b296a1655cedd3
23 -DIST glance-16.0.0.tar.gz 1956293 BLAKE2B 457f18412885287d8a3ea1b702af0e7b826eeeaf93ce8b1b7456a42d3a84594cfe270670ac35e9c63d8fbb464a3ed0db823a6949fbfa37f993b260681222d9c1 SHA512 20ff8ba74eee3a5b69f7e357f69870398e96341831bea56bbad61314d3eff9d6767dfd48634d04f96cfbc4cc96c7eff3ab900748461ecaa14e2cf329aec40481
24 DIST glance-16.0.1.tar.gz 1957403 BLAKE2B a58a37b1926432ff227ebbd2b8538d25276085c4183244f930cdb6432ce00ed3927130ede24faeb9ebd25489f649c7f6542d71b9fe9614859ed3953bded13ab2 SHA512 dad883c308cfa6799bd5fc4111585af2bd7f2c5a20126976d1044e2bf573f94756f2ecea87f3b04fe611f80602709e0501c0efceed5061d0c752416b6255a2a2
25
26 diff --git a/app-admin/glance/glance-16.0.0.ebuild b/app-admin/glance/glance-16.0.0.ebuild
27 deleted file mode 100644
28 index 4d76fb8c4b2..00000000000
29 --- a/app-admin/glance/glance-16.0.0.ebuild
30 +++ /dev/null
31 @@ -1,145 +0,0 @@
32 -# Copyright 1999-2018 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 -
43 -if [[ ${PV} == *9999 ]];then
44 - inherit git-r3
45 - EGIT_REPO_URI="https://github.com/openstack/glance.git"
46 - EGIT_BRANCH="stable/queens"
47 -else
48 - SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
49 - KEYWORDS="amd64 ~arm64 x86"
50 -fi
51 -
52 -LICENSE="Apache-2.0"
53 -SLOT="0"
54 -IUSE="doc mysql postgres +sqlite +swift"
55 -REQUIRED_USE="|| ( mysql postgres sqlite )"
56 -
57 -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
58 - !~dev-python/pbr-2.1.0"
59 -DEPEND="
60 - dev-python/setuptools[${PYTHON_USEDEP}]
61 - ${CDEPEND}"
62 -
63 -#note to self, wsgiref is a python builtin, no need to package it
64 -#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
65 -
66 -RDEPEND="
67 - ${CDEPEND}
68 - >=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
69 - sqlite? (
70 - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
71 - !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
72 - !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
73 - !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
74 - !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
75 - )
76 - mysql? (
77 - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
78 - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
79 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
80 - !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
81 - !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
82 - !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
83 - !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
84 - )
85 - postgres? (
86 - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
87 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
88 - !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
89 - !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
90 - !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
91 - !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
92 - )
93 - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
94 - !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
95 - <dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
96 - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
97 - >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
98 - >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
99 - >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
100 - >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
101 - >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
102 - >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
103 - >=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
104 - >=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
105 - >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
106 - >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
107 - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
108 - >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
109 - >=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
110 - >=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
111 - >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
112 - >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
113 - >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
114 - <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
115 - >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
116 - >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
117 - <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
118 - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
119 - >=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
120 - >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
121 - >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
122 - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
123 - >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
124 - >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
125 - >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
126 - >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
127 - >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
128 - !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
129 - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
130 - >=dev-python/glance_store-0.22.0[${PYTHON_USEDEP}]
131 - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
132 - >=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
133 - !~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
134 - >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
135 - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
136 - >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
137 -"
138 -
139 -#PATCHES=(
140 -#)
141 -
142 -pkg_setup() {
143 - enewgroup glance
144 - enewuser glance -1 -1 /var/lib/glance glance
145 -}
146 -
147 -python_prepare_all() {
148 - sed -i '/xattr/d' test-requirements.txt || die
149 - sed -i '/pysendfile/d' test-requirements.txt || die
150 - sed -i '/^hacking/d' test-requirements.txt || die
151 - distutils-r1_python_prepare_all
152 -}
153 -
154 -python_compile_all() {
155 - use doc && "${PYTHON}" setup.py build_sphinx
156 -}
157 -
158 -python_install_all() {
159 - distutils-r1_python_install_all
160 -
161 - newinitd "${FILESDIR}/glance.initd" glance-api
162 -
163 - diropts -m 0750 -o glance -g glance
164 - dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
165 - keepdir /etc/glance
166 - keepdir /var/log/glance
167 - keepdir /var/lib/glance/images
168 - keepdir /var/lib/glance/scrubber
169 -
170 - insinto /etc/glance
171 - insopts -m 0640 -o glance -g glance
172 - doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
173 -
174 - use doc && local HTML_DOCS=( doc/build/html/. )
175 - distutils-r1_python_install_all
176 -}
177
178 diff --git a/app-admin/glance/glance-16.0.1.ebuild b/app-admin/glance/glance-16.0.1.ebuild
179 index a3a068b143c..4d76fb8c4b2 100644
180 --- a/app-admin/glance/glance-16.0.1.ebuild
181 +++ b/app-admin/glance/glance-16.0.1.ebuild
182 @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
183 EGIT_BRANCH="stable/queens"
184 else
185 SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
186 - KEYWORDS="~amd64 ~arm64 ~x86"
187 + KEYWORDS="amd64 ~arm64 x86"
188 fi
189
190 LICENSE="Apache-2.0"