Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/keystone/
Date: Mon, 31 May 2021 21:00:37
Message-Id: 1622494724.9cd38edfd3767895c15b2522d10430d722e74021.mgorny@gentoo
1 commit: 9cd38edfd3767895c15b2522d10430d722e74021
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 31 20:58:44 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon May 31 20:58:44 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cd38edf
7
8 sys-auth/keystone: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-auth/keystone/Manifest | 3 -
13 sys-auth/keystone/keystone-17.0.0.ebuild | 156 --------------------------
14 sys-auth/keystone/keystone-2020.1.9999.ebuild | 156 --------------------------
15 3 files changed, 315 deletions(-)
16
17 diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
18 index c43b020ccd3..3a07855f118 100644
19 --- a/sys-auth/keystone/Manifest
20 +++ b/sys-auth/keystone/Manifest
21 @@ -1,6 +1,3 @@
22 -DIST keystone-17.0.0.tar.gz 1607717 BLAKE2B d59ccc651fa5363442ad6c1f3b2f2c2f6393468502e41d3aca7a9f4bd1d27fb558101ed37d051dcf7cdd77edb04df5ec1a739346dd889a5c873a607383897d25 SHA512 9d52a49fdcf1e891ae936ca221815576985a0f9a252960628dfbed18ca80c3f2af5a6311d7cf7c3d868ff4b02187515702ec297db1b2d49314662c46edf5c080
23 DIST keystone-18.0.0.tar.gz 1679326 BLAKE2B 714df5a1d7c6d601d1743a2dd3bac57c1006aeb9361241edf4205c583b6df6763411c27aa0d420aa94ee2a8cc581678013cc27ae8a97747f903d61fc852afb6e SHA512 48aa9aae46e0f61596222aa37def152cdb48876afb7edc1eadf84ea91c8bd2f6bfd645d64e9bfb82cf9d041d7ae432c34d25e34130b32b4815d9a73cea903ffc
24 -DIST keystone.conf.sample-17.0.0 105293 BLAKE2B f0e685f99ca3b6cdfb9ccd0b41709bd6c51cb4aa79d20fa12773f96cd6ecad730691cf7fb2384b0ab44787d6e2825c5f147310ca19d82a2adb6cd2ab623b52f2 SHA512 fc7e7272b1a0f8703fe8ec8f93208573b84a2121b55de919beb05c7bb7dd3542c71983dfdc73b7cb618eb68167e6c6a51aa8384839ae3503c677e17ff030f383
25 DIST keystone.conf.sample-18.0.0 107458 BLAKE2B c1d826acdd671638fc4542864811bda8baa237cfbf24438fa0cedc12e6f29047178cfb1b837c0aef035410848ce3e473e58b51f0eadee4c61eb75f214c65c35a SHA512 6488a1c3eac0d1376db0950cda65c62ba04dc03d896a6c0465ea09b870e5d077ed5012a84657defb9f63db25ce320c884f72c4083e4a233f18930120194ba73b
26 -DIST keystone.conf.sample-2020.1.9999 105293 BLAKE2B f0e685f99ca3b6cdfb9ccd0b41709bd6c51cb4aa79d20fa12773f96cd6ecad730691cf7fb2384b0ab44787d6e2825c5f147310ca19d82a2adb6cd2ab623b52f2 SHA512 fc7e7272b1a0f8703fe8ec8f93208573b84a2121b55de919beb05c7bb7dd3542c71983dfdc73b7cb618eb68167e6c6a51aa8384839ae3503c677e17ff030f383
27 DIST keystone.conf.sample-2020.2.9999 105293 BLAKE2B f0e685f99ca3b6cdfb9ccd0b41709bd6c51cb4aa79d20fa12773f96cd6ecad730691cf7fb2384b0ab44787d6e2825c5f147310ca19d82a2adb6cd2ab623b52f2 SHA512 fc7e7272b1a0f8703fe8ec8f93208573b84a2121b55de919beb05c7bb7dd3542c71983dfdc73b7cb618eb68167e6c6a51aa8384839ae3503c677e17ff030f383
28
29 diff --git a/sys-auth/keystone/keystone-17.0.0.ebuild b/sys-auth/keystone/keystone-17.0.0.ebuild
30 deleted file mode 100644
31 index e3914fff6d7..00000000000
32 --- a/sys-auth/keystone/keystone-17.0.0.ebuild
33 +++ /dev/null
34 @@ -1,156 +0,0 @@
35 -# Copyright 1999-2020 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -PYTHON_COMPAT=( python3_7 )
40 -
41 -inherit distutils-r1
42 -
43 -DESCRIPTION="The Openstack authentication, authorization, and service catalog"
44 -HOMEPAGE="https://launchpad.net/keystone"
45 -if [[ ${PV} == *9999 ]];then
46 - inherit git-r3
47 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/ussuri/keystone.conf.sample -> keystone.conf.sample-${PV}"
48 - EGIT_REPO_URI="https://github.com/openstack/keystone.git"
49 - EGIT_BRANCH="stable/ussuri"
50 -else
51 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/ussuri/keystone.conf.sample -> keystone.conf.sample-${PV}
52 - https://tarballs.openstack.org/${PN}/${P}.tar.gz"
53 - KEYWORDS="amd64 ~arm64 x86"
54 -fi
55 -
56 -LICENSE="Apache-2.0"
57 -SLOT="0"
58 -IUSE="+sqlite ldap memcached mongo mysql postgres test"
59 -RESTRICT="!test? ( test )"
60 -REQUIRED_USE="|| ( mysql postgres sqlite )"
61 -
62 -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
63 - !~dev-python/pbr-2.1.0"
64 -DEPEND="
65 - dev-python/setuptools[${PYTHON_USEDEP}]
66 - ${CDEPEND}"
67 -RDEPEND="
68 - ${CDEPEND}
69 - >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
70 - >=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
71 - >=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}]
72 - >=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
73 - sqlite? (
74 - >=dev-python/sqlalchemy-1.1.0[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.1.0[${PYTHON_USEDEP}]
80 - )
81 - postgres? (
82 - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
83 - >=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
84 - )
85 - >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
86 - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
87 - >=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
88 - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
89 - >=dev-python/keystonemiddleware-7.0.0[${PYTHON_USEDEP}]
90 - >=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
91 - >=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
92 - >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
93 - >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
94 - >=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
95 - >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
96 - >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
97 - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
98 - >=dev-python/oslo-log-3.44.0[${PYTHON_USEDEP}]
99 - >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
100 - >=dev-python/oslo-policy-3.0.2[${PYTHON_USEDEP}]
101 - >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
102 - !~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
103 - >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
104 - >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
105 - >=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
106 - >=dev-python/pysaml2-4.5.0[${PYTHON_USEDEP}]
107 - >=dev-python/pyjwt-1.6.1[${PYTHON_USEDEP}]
108 - >=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
109 - >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
110 - >=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
111 - !~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
112 - >=dev-python/msgpack-0.5.0[${PYTHON_USEDEP}]
113 - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
114 - >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
115 - memcached? (
116 - >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
117 - )
118 - mongo? (
119 - >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
120 - !~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
121 - )
122 - ldap? (
123 - >=dev-python/python-ldap-3.1.0[${PYTHON_USEDEP}]
124 - >=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}]
125 - )
126 - || (
127 - www-servers/uwsgi[python,${PYTHON_USEDEP}]
128 - www-apache/mod_wsgi[${PYTHON_USEDEP}]
129 - www-servers/gunicorn[${PYTHON_USEDEP}]
130 - )
131 - acct-user/keystone
132 - acct-group/keystone"
133 -
134 -python_prepare_all() {
135 - # it's in git, but not in the tarball.....
136 - sed -i '/^hacking/d' test-requirements.txt || die
137 - mkdir -p ${PN}/tests/tmp/ || die
138 - sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
139 - sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
140 - # allow useage of renamed msgpack
141 - sed -i '/^msgpack/d' requirements.txt || die
142 - distutils-r1_python_prepare_all
143 -}
144 -
145 -python_test() {
146 - nosetests -I 'test_keystoneclient*' \
147 - -e test_static_translated_string_is_Message \
148 - -e test_get_token_id_error_handling \
149 - -e test_provider_token_expiration_validation \
150 - -e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
151 -}
152 -
153 -python_install_all() {
154 - distutils-r1_python_install_all
155 -
156 - diropts -m 0750
157 - keepdir /etc/keystone /var/log/keystone
158 - insinto /etc/keystone
159 - insopts -m0640 -okeystone -gkeystone
160 - newins "${DISTDIR}/keystone.conf.sample-${PV}" keystone.conf.sample
161 - doins etc/logging.conf.sample
162 - doins etc/default_catalog.templates
163 -# doins etc/policy.v3cloudsample.json
164 - insinto /etc/keystone/httpd
165 - doins httpd/*
166 -
167 - fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
168 - # stupid python doing stupid things
169 - rm -r "${ED}"/usr/etc
170 -}
171 -
172 -pkg_postinst() {
173 - elog "You might want to run:"
174 - elog "emerge --config =${CATEGORY}/${PF}"
175 - elog "if this is a new install."
176 - elog "If you have not already configured your openssl installation"
177 - elog "please do it by modifying /etc/ssl/openssl.cnf"
178 - elog "BEFORE issuing the configuration command."
179 - elog "Otherwise default values will be used."
180 -}
181 -
182 -pkg_config() {
183 - if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
184 - einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
185 - read
186 - "${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
187 - else
188 - einfo "keystone PKI certificates directory already present, skipping configuration"
189 - fi
190 -}
191
192 diff --git a/sys-auth/keystone/keystone-2020.1.9999.ebuild b/sys-auth/keystone/keystone-2020.1.9999.ebuild
193 deleted file mode 100644
194 index a3c3e079613..00000000000
195 --- a/sys-auth/keystone/keystone-2020.1.9999.ebuild
196 +++ /dev/null
197 @@ -1,156 +0,0 @@
198 -# Copyright 1999-2020 Gentoo Authors
199 -# Distributed under the terms of the GNU General Public License v2
200 -
201 -EAPI=7
202 -PYTHON_COMPAT=( python3_7 )
203 -
204 -inherit distutils-r1
205 -
206 -DESCRIPTION="The Openstack authentication, authorization, and service catalog"
207 -HOMEPAGE="https://launchpad.net/keystone"
208 -if [[ ${PV} == *9999 ]];then
209 - inherit git-r3
210 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/ussuri/keystone.conf.sample -> keystone.conf.sample-${PV}"
211 - EGIT_REPO_URI="https://github.com/openstack/keystone.git"
212 - EGIT_BRANCH="stable/ussuri"
213 -else
214 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/ussuri/keystone.conf.sample -> keystone.conf.sample-${PV}
215 - https://tarballs.openstack.org/${PN}/${P}.tar.gz"
216 - KEYWORDS="~amd64 ~arm64 ~x86"
217 -fi
218 -
219 -LICENSE="Apache-2.0"
220 -SLOT="0"
221 -IUSE="+sqlite ldap memcached mongo mysql postgres test"
222 -RESTRICT="!test? ( test )"
223 -REQUIRED_USE="|| ( mysql postgres sqlite )"
224 -
225 -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
226 - !~dev-python/pbr-2.1.0"
227 -DEPEND="
228 - dev-python/setuptools[${PYTHON_USEDEP}]
229 - ${CDEPEND}"
230 -RDEPEND="
231 - ${CDEPEND}
232 - >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
233 - >=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
234 - >=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}]
235 - >=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
236 - sqlite? (
237 - >=dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
238 - )
239 - mysql? (
240 - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
241 - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
242 - >=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
243 - )
244 - postgres? (
245 - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
246 - >=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
247 - )
248 - >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
249 - >=dev-python/stevedore-1.20.0[${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-7.0.0[${PYTHON_USEDEP}]
253 - >=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
254 - >=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
255 - >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
256 - >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
257 - >=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
258 - >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
259 - >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
260 - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
261 - >=dev-python/oslo-log-3.44.0[${PYTHON_USEDEP}]
262 - >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
263 - >=dev-python/oslo-policy-3.0.2[${PYTHON_USEDEP}]
264 - >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
265 - !~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
266 - >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
267 - >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
268 - >=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
269 - >=dev-python/pysaml2-4.5.0[${PYTHON_USEDEP}]
270 - >=dev-python/pyjwt-1.6.1[${PYTHON_USEDEP}]
271 - >=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
272 - >=dev-python/jsonschema-2.6.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.5.0[${PYTHON_USEDEP}]
276 - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
277 - >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
278 - memcached? (
279 - >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
280 - )
281 - mongo? (
282 - >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
283 - !~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
284 - )
285 - ldap? (
286 - >=dev-python/python-ldap-3.1.0[${PYTHON_USEDEP}]
287 - >=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}]
288 - )
289 - || (
290 - www-servers/uwsgi[python,${PYTHON_USEDEP}]
291 - www-apache/mod_wsgi[${PYTHON_USEDEP}]
292 - www-servers/gunicorn[${PYTHON_USEDEP}]
293 - )
294 - acct-user/keystone
295 - acct-group/keystone"
296 -
297 -python_prepare_all() {
298 - # it's in git, but not in the tarball.....
299 - sed -i '/^hacking/d' test-requirements.txt || die
300 - mkdir -p ${PN}/tests/tmp/ || die
301 - sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
302 - sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
303 - # allow useage of renamed msgpack
304 - sed -i '/^msgpack/d' requirements.txt || die
305 - distutils-r1_python_prepare_all
306 -}
307 -
308 -python_test() {
309 - nosetests -I 'test_keystoneclient*' \
310 - -e test_static_translated_string_is_Message \
311 - -e test_get_token_id_error_handling \
312 - -e test_provider_token_expiration_validation \
313 - -e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
314 -}
315 -
316 -python_install_all() {
317 - distutils-r1_python_install_all
318 -
319 - diropts -m 0750
320 - keepdir /etc/keystone /var/log/keystone
321 - insinto /etc/keystone
322 - insopts -m0640 -okeystone -gkeystone
323 - newins "${DISTDIR}/keystone.conf.sample-${PV}" keystone.conf.sample
324 - doins etc/logging.conf.sample
325 - doins etc/default_catalog.templates
326 -# doins etc/policy.v3cloudsample.json
327 - insinto /etc/keystone/httpd
328 - doins httpd/*
329 -
330 - fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
331 - # stupid python doing stupid things
332 - rm -r "${ED}"/usr/etc
333 -}
334 -
335 -pkg_postinst() {
336 - elog "You might want to run:"
337 - elog "emerge --config =${CATEGORY}/${PF}"
338 - elog "if this is a new install."
339 - elog "If you have not already configured your openssl installation"
340 - elog "please do it by modifying /etc/ssl/openssl.cnf"
341 - elog "BEFORE issuing the configuration command."
342 - elog "Otherwise default values will be used."
343 -}
344 -
345 -pkg_config() {
346 - if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
347 - einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
348 - read
349 - "${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
350 - else
351 - einfo "keystone PKI certificates directory already present, skipping configuration"
352 - fi
353 -}