Gentoo Archives: gentoo-commits

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