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