Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/keystone/
Date: Sun, 28 Jan 2018 04:13:47
Message-Id: 1517112787.043b464b5deb2728e0ca1599de5a164c7dde1048.prometheanfire@gentoo
1 commit: 043b464b5deb2728e0ca1599de5a164c7dde1048
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 28 03:54:12 2018 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 28 04:13:07 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=043b464b
7
8 sys-auth/keystone: remove ocata
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 sys-auth/keystone/Manifest | 1 -
13 sys-auth/keystone/keystone-11.0.3.ebuild | 158 -------------------------
14 sys-auth/keystone/keystone-2017.1.9999.ebuild | 159 --------------------------
15 3 files changed, 318 deletions(-)
16
17 diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
18 index b5a3dfa275d..565ce9bb9f6 100644
19 --- a/sys-auth/keystone/Manifest
20 +++ b/sys-auth/keystone/Manifest
21 @@ -1,2 +1 @@
22 -DIST keystone-11.0.3.tar.gz 1373880 BLAKE2B e68ff166f726a01135050c97cde71ff58294350d14992512f61c2fe78111e5135fc69540e8031950daa5bd16602854e8dcb1a8734f000ff2b261232d3b5db99b SHA512 0468a834b1a44b27f4747aeb580f17f68b7dce0ee0cbc3693355d66e9c46383b7ad3a769b3ffa0146fac9b45a75c8a2c95aad0df4825d2be33cadb2cf6b1a659
23 DIST keystone-12.0.0.tar.gz 1491044 BLAKE2B ebe5fd423509e94d636e303825ac499cf9017a616971654ee52dead111b0fdc76379cf24554c7dd115b1d1a65b081e6931bd890613736f6bffe75e8628f94f7a SHA512 7b7e6cb56b9d22e92834ccfb31dcd6d28d7318e2d8160da93cbc48cdb72aa626021db5b38068ca76caae88e68204c3650f7ce728bc8e1791df8fc8d36072483c
24
25 diff --git a/sys-auth/keystone/keystone-11.0.3.ebuild b/sys-auth/keystone/keystone-11.0.3.ebuild
26 deleted file mode 100644
27 index 2b715799771..00000000000
28 --- a/sys-auth/keystone/keystone-11.0.3.ebuild
29 +++ /dev/null
30 @@ -1,158 +0,0 @@
31 -# Copyright 1999-2017 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=6
35 -
36 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
37 -
38 -inherit distutils-r1 user
39 -
40 -DESCRIPTION="The Openstack authentication, authorization, and service catalog"
41 -HOMEPAGE="https://launchpad.net/keystone"
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="+sqlite ldap memcached mongo mysql postgres test"
48 -REQUIRED_USE="|| ( mysql postgres sqlite )"
49 -
50 -CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
51 -DEPEND="
52 - dev-python/setuptools[${PYTHON_USEDEP}]
53 - ${CDEPEND}"
54 -RDEPEND="
55 - ${CDEPEND}
56 - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
57 - >=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
58 - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
59 - dev-python/paste[${PYTHON_USEDEP}]
60 - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
61 - !~dev-python/routes-2.0[${PYTHON_USEDEP}]
62 - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
63 - !~dev-python/routes-2.3.0[${PYTHON_USEDEP}]
64 - >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
65 - !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
66 - >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
67 - sqlite? (
68 - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
69 - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
70 - )
71 - mysql? (
72 - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
73 - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
74 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
75 - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
76 - )
77 - postgres? (
78 - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
79 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
80 - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
81 - )
82 - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
83 - >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
84 - >=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
85 - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
86 - >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
87 - >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
88 - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
89 - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
90 - !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
91 - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
92 - >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
93 - >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
94 - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
95 - >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
96 - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
97 - >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
98 - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
99 - >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
100 - >=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
101 - >=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}]
102 - <dev-python/pysaml2-4.0.3[${PYTHON_USEDEP}]
103 - >=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
104 - >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
105 - !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
106 - <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
107 - >=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
108 - !~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
109 - >=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
110 - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
111 - memcached? (
112 - >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
113 - )
114 - mongo? (
115 - >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
116 - !~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
117 - )
118 - ldap? (
119 - >=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
120 - >=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
121 - )
122 - || (
123 - www-servers/uwsgi[python,${PYTHON_USEDEP}]
124 - www-apache/mod_wsgi[${PYTHON_USEDEP}]
125 - www-servers/gunicorn[${PYTHON_USEDEP}]
126 - )"
127 -
128 -PATCHES=(
129 -)
130 -
131 -pkg_setup() {
132 - enewgroup keystone
133 - enewuser keystone -1 -1 /var/lib/keystone keystone
134 -}
135 -
136 -python_prepare_all() {
137 - # it's in git, but not in the tarball.....
138 - sed -i '/^hacking/d' test-requirements.txt || die
139 - mkdir -p ${PN}/tests/tmp/ || die
140 - cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
141 - sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
142 - sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
143 - distutils-r1_python_prepare_all
144 -}
145 -
146 -python_test() {
147 - nosetests -I 'test_keystoneclient*' \
148 - -e test_static_translated_string_is_Message \
149 - -e test_get_token_id_error_handling \
150 - -e test_provider_token_expiration_validation \
151 - -e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
152 -}
153 -
154 -python_install_all() {
155 - distutils-r1_python_install_all
156 -
157 - diropts -m 0750
158 - keepdir /etc/keystone /var/log/keystone
159 - insinto /etc/keystone
160 - insopts -m0640 -okeystone -gkeystone
161 - doins etc/keystone.conf.sample etc/logging.conf.sample
162 - doins etc/default_catalog.templates etc/policy.json
163 - doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
164 - insinto /etc/keystone/httpd
165 - doins httpd/*
166 -
167 - fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
168 -}
169 -
170 -pkg_postinst() {
171 - elog "You might want to run:"
172 - elog "emerge --config =${CATEGORY}/${PF}"
173 - elog "if this is a new install."
174 - elog "If you have not already configured your openssl installation"
175 - elog "please do it by modifying /etc/ssl/openssl.cnf"
176 - elog "BEFORE issuing the configuration command."
177 - elog "Otherwise default values will be used."
178 -}
179 -
180 -pkg_config() {
181 - if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
182 - einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
183 - read
184 - "${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
185 - else
186 - einfo "keystone PKI certificates directory already present, skipping configuration"
187 - fi
188 -}
189
190 diff --git a/sys-auth/keystone/keystone-2017.1.9999.ebuild b/sys-auth/keystone/keystone-2017.1.9999.ebuild
191 deleted file mode 100644
192 index a84d7277654..00000000000
193 --- a/sys-auth/keystone/keystone-2017.1.9999.ebuild
194 +++ /dev/null
195 @@ -1,159 +0,0 @@
196 -# Copyright 1999-2017 Gentoo Foundation
197 -# Distributed under the terms of the GNU General Public License v2
198 -
199 -EAPI=6
200 -
201 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
202 -
203 -inherit distutils-r1 git-r3 user
204 -
205 -DESCRIPTION="The Openstack authentication, authorization, and service catalog"
206 -HOMEPAGE="https://launchpad.net/keystone"
207 -EGIT_REPO_URI="https://github.com/openstack/keystone.git"
208 -EGIT_BRANCH="stable/ocata"
209 -
210 -LICENSE="Apache-2.0"
211 -SLOT="0"
212 -KEYWORDS=""
213 -IUSE="+sqlite ldap memcached mongo mysql postgres test"
214 -REQUIRED_USE="|| ( mysql postgres sqlite )"
215 -
216 -CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
217 -DEPEND="
218 - dev-python/setuptools[${PYTHON_USEDEP}]
219 - ${CDEPEND}"
220 -RDEPEND="
221 - ${CDEPEND}
222 - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
223 - >=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
224 - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
225 - dev-python/paste[${PYTHON_USEDEP}]
226 - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
227 - !~dev-python/routes-2.0[${PYTHON_USEDEP}]
228 - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
229 - !~dev-python/routes-2.3.0[${PYTHON_USEDEP}]
230 - >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
231 - !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
232 - >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
233 - sqlite? (
234 - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
235 - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
236 - )
237 - mysql? (
238 - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
239 - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
240 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
241 - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
242 - )
243 - postgres? (
244 - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
245 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
246 - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
247 - )
248 - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
249 - >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
250 - >=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
251 - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
252 - >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
253 - >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
254 - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
255 - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
256 - !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
257 - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
258 - >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
259 - >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
260 - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
261 - >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
262 - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
263 - >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
264 - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
265 - >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
266 - >=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
267 - >=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}]
268 - <dev-python/pysaml2-4.0.3[${PYTHON_USEDEP}]
269 - >=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
270 - >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
271 - !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
272 - <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
273 - >=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
274 - !~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
275 - >=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
276 - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
277 - memcached? (
278 - >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
279 - )
280 - mongo? (
281 - >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
282 - !~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
283 - )
284 - ldap? (
285 - >=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
286 - >=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
287 - )
288 - || (
289 - www-servers/uwsgi[python,${PYTHON_USEDEP}]
290 - www-apache/mod_wsgi[${PYTHON_USEDEP}]
291 - www-servers/gunicorn[${PYTHON_USEDEP}]
292 - )"
293 -
294 -#PATCHES=(
295 -#)
296 -
297 -pkg_setup() {
298 - enewgroup keystone
299 - enewuser keystone -1 -1 /var/lib/keystone keystone
300 -}
301 -
302 -python_prepare_all() {
303 - # it's in git, but not in the tarball.....
304 - sed -i '/^hacking/d' test-requirements.txt || die
305 - mkdir -p ${PN}/tests/tmp/ || die
306 - cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
307 - sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
308 - sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
309 - distutils-r1_python_prepare_all
310 -}
311 -
312 -python_test() {
313 - nosetests -I 'test_keystoneclient*' \
314 - -e test_static_translated_string_is_Message \
315 - -e test_get_token_id_error_handling \
316 - -e test_provider_token_expiration_validation \
317 - -e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
318 -}
319 -
320 -python_install_all() {
321 - distutils-r1_python_install_all
322 -
323 - diropts -m 0750
324 - keepdir /etc/keystone /var/log/keystone
325 - insinto /etc/keystone
326 - insopts -m0640 -okeystone -gkeystone
327 - doins etc/keystone.conf.sample etc/logging.conf.sample
328 - doins etc/default_catalog.templates etc/policy.json
329 - doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
330 - insinto /etc/keystone/httpd
331 - doins httpd/*
332 -
333 - fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
334 -}
335 -
336 -pkg_postinst() {
337 - elog "You might want to run:"
338 - elog "emerge --config =${CATEGORY}/${PF}"
339 - elog "if this is a new install."
340 - elog "If you have not already configured your openssl installation"
341 - elog "please do it by modifying /etc/ssl/openssl.cnf"
342 - elog "BEFORE issuing the configuration command."
343 - elog "Otherwise default values will be used."
344 -}
345 -
346 -pkg_config() {
347 - if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
348 - einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
349 - read
350 - "${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
351 - else
352 - einfo "keystone PKI certificates directory already present, skipping configuration"
353 - fi
354 -}