1 |
commit: e6909a80057d5fda729c7def7a018d098cecbbdd |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 23 16:21:12 2020 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 23 16:21:27 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6909a80 |
7 |
|
8 |
sys-cluster/cinder: just remove oauth2client |
9 |
|
10 |
Closes: https://bugs.gentoo.org/718982 |
11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
12 |
RepoMan-Options: --force |
13 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
14 |
|
15 |
sys-cluster/cinder/Manifest | 2 - |
16 |
sys-cluster/cinder/cinder-15.0.1.ebuild | 213 --------------------- |
17 |
...inder-15.1.0.ebuild => cinder-15.1.0-r1.ebuild} | 4 +- |
18 |
3 files changed, 2 insertions(+), 217 deletions(-) |
19 |
|
20 |
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest |
21 |
index 10c760cfb7f..5d499e2aa6b 100644 |
22 |
--- a/sys-cluster/cinder/Manifest |
23 |
+++ b/sys-cluster/cinder/Manifest |
24 |
@@ -1,5 +1,3 @@ |
25 |
-DIST cinder-15.0.1.tar.gz 5516811 BLAKE2B 081b3a6175303c783ff23122d409814812fdab2a7955174cd90b57ea62c055c1e39936d8e8a38e21fc2820e7069e0afc91fa46a490f539f518f33302067b4acd SHA512 7a63f25bcd6beedc60bb4a6b976d8b1f862b445a6d858e2fbbf53f4ff425d8bee094af354883a46c6226349d7557d45a649cd745e79a445e32b759b24294116f |
26 |
DIST cinder-15.1.0.tar.gz 5504663 BLAKE2B 19097821729c99f0a13f0c30c9fa2c8647fe4c6ae01790b59b264fad282f1051e5e3f3275720114b1575afcbef517baab89a34ce75b7ef54d6515c204907f28a SHA512 1c6c88854994d440c3818d26533ea075adfcfc4b8642b2796d1ac90a5feec5e3c8d64d06f433840afcf2d9d4f5a50ba256808b74495e0e735a3f0a19bdc838e3 |
27 |
-DIST cinder.conf.sample-15.0.1 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a |
28 |
DIST cinder.conf.sample-15.1.0 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a |
29 |
DIST cinder.conf.sample-2019.2.9999 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a |
30 |
|
31 |
diff --git a/sys-cluster/cinder/cinder-15.0.1.ebuild b/sys-cluster/cinder/cinder-15.0.1.ebuild |
32 |
deleted file mode 100644 |
33 |
index 8c8f4a9cfe8..00000000000 |
34 |
--- a/sys-cluster/cinder/cinder-15.0.1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,213 +0,0 @@ |
37 |
-# Copyright 1999-2020 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=7 |
41 |
- |
42 |
-PYTHON_COMPAT=( python3_{6,7} ) |
43 |
-inherit distutils-r1 eutils linux-info user |
44 |
- |
45 |
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes" |
46 |
-HOMEPAGE="https://launchpad.net/cinder" |
47 |
- |
48 |
-if [[ ${PV} == *9999 ]];then |
49 |
- inherit git-r3 |
50 |
- SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV}" |
51 |
- EGIT_REPO_URI="https://github.com/openstack/cinder.git" |
52 |
- EGIT_BRANCH="stable/train" |
53 |
-else |
54 |
- SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV} |
55 |
- https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
56 |
- KEYWORDS="amd64 ~arm64 x86" |
57 |
-fi |
58 |
- |
59 |
-LICENSE="Apache-2.0" |
60 |
-SLOT="0" |
61 |
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt" |
62 |
-RESTRICT="!test? ( test )" |
63 |
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )" |
64 |
- |
65 |
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] |
66 |
- !~dev-python/pbr-2.1.0" |
67 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
68 |
- ${CDEPEND} |
69 |
- app-admin/sudo" |
70 |
- |
71 |
-RDEPEND=" |
72 |
- ${CDEPEND} |
73 |
- >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] |
74 |
- >=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}] |
75 |
- >=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}] |
76 |
- !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}] |
77 |
- !~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}] |
78 |
- >=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}] |
79 |
- >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}] |
80 |
- >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] |
81 |
- >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}] |
82 |
- >=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}] |
83 |
- >=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}] |
84 |
- >=dev-python/lxml-3.4.1[${PYTHON_USEDEP}] |
85 |
- !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] |
86 |
- >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] |
87 |
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] |
88 |
- >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}] |
89 |
- >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}] |
90 |
- >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}] |
91 |
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] |
92 |
- >=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}] |
93 |
- >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] |
94 |
- >=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}] |
95 |
- >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}] |
96 |
- >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}] |
97 |
- >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}] |
98 |
- >=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}] |
99 |
- !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] |
100 |
- >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}] |
101 |
- !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}] |
102 |
- >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}] |
103 |
- >=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}] |
104 |
- >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}] |
105 |
- >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] |
106 |
- >=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}] |
107 |
- >=dev-python/paste-2.0.2[${PYTHON_USEDEP}] |
108 |
- >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] |
109 |
- >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] |
110 |
- <dev-python/prettytable-0.8[${PYTHON_USEDEP}] |
111 |
- >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}] |
112 |
- >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}] |
113 |
- >=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}] |
114 |
- >=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}] |
115 |
- >=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}] |
116 |
- >=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}] |
117 |
- >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}] |
118 |
- >=dev-python/pytz-2013.6[${PYTHON_USEDEP}] |
119 |
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] |
120 |
- !~dev-python/requests-2.20.0[${PYTHON_USEDEP}] |
121 |
- >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] |
122 |
- !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] |
123 |
- >=dev-python/routes-2.3.1[${PYTHON_USEDEP}] |
124 |
- >=dev-python/taskflow-3.2.0[${PYTHON_USEDEP}] |
125 |
- >=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}] |
126 |
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}] |
127 |
- sqlite? ( |
128 |
- >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] |
129 |
- !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}] |
130 |
- !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}] |
131 |
- !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}] |
132 |
- !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}] |
133 |
- ) |
134 |
- mysql? ( |
135 |
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] |
136 |
- !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] |
137 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
138 |
- !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}] |
139 |
- !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}] |
140 |
- !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}] |
141 |
- !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}] |
142 |
- ) |
143 |
- postgres? ( |
144 |
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] |
145 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
146 |
- !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}] |
147 |
- !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}] |
148 |
- !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}] |
149 |
- !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}] |
150 |
- ) |
151 |
- >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}] |
152 |
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] |
153 |
- ~dev-python/suds-0.6[${PYTHON_USEDEP}] |
154 |
- >=dev-python/webob-1.7.1[${PYTHON_USEDEP}] |
155 |
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] |
156 |
- >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}] |
157 |
- >=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}] |
158 |
- >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}] |
159 |
- >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}] |
160 |
- >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}] |
161 |
- >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}] |
162 |
- >=dev-python/cryptography-2.1[${PYTHON_USEDEP}] |
163 |
- >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}] |
164 |
- iscsi? ( |
165 |
- tgt? ( sys-block/tgt ) |
166 |
- sys-block/open-iscsi |
167 |
- ) |
168 |
- lvm? ( sys-fs/lvm2 ) |
169 |
- memcached? ( net-misc/memcached ) |
170 |
- app-emulation/qemu |
171 |
- sys-fs/sysfsutils" |
172 |
-# qemu is needed for image conversion |
173 |
- |
174 |
-#PATCHES=( |
175 |
-#) |
176 |
- |
177 |
-pkg_pretend() { |
178 |
- linux-info_pkg_setup |
179 |
- CONFIG_CHECK_MODULES="" |
180 |
- if use tcp; then |
181 |
- CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP " |
182 |
- fi |
183 |
- if use rdma; then |
184 |
- CONFIG_CHECK_MODULES+="INFINIBAND_ISER " |
185 |
- fi |
186 |
- if use infiniband; then |
187 |
- CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS" |
188 |
- fi |
189 |
- if linux_config_exists; then |
190 |
- for module in ${CONFIG_CHECK_MODULES}; do |
191 |
- linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" |
192 |
- done |
193 |
- fi |
194 |
-} |
195 |
- |
196 |
-pkg_setup() { |
197 |
- enewgroup cinder |
198 |
- enewuser cinder -1 -1 /var/lib/cinder cinder |
199 |
-} |
200 |
- |
201 |
-python_prepare_all() { |
202 |
- sed -i '/^hacking/d' test-requirements.txt || die |
203 |
- # only used for docs |
204 |
- sed -i '/^sphinx-feature-classification/d' requirements.txt || die |
205 |
- distutils-r1_python_prepare_all |
206 |
-} |
207 |
- |
208 |
-python_test() { |
209 |
- # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727 |
210 |
- nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7" |
211 |
-} |
212 |
- |
213 |
-python_install_all() { |
214 |
- distutils-r1_python_install_all |
215 |
- keepdir /etc/cinder |
216 |
- dodir /etc/cinder/rootwrap.d |
217 |
- |
218 |
- for svc in api scheduler volume; do |
219 |
- newinitd "${FILESDIR}/cinder.initd" cinder-${svc} |
220 |
- done |
221 |
- |
222 |
- insinto /etc/cinder |
223 |
- insopts -m0640 -o cinder -g cinder |
224 |
- doins "etc/cinder/api-httpd.conf" |
225 |
- doins "etc/cinder/logging_sample.conf" |
226 |
- doins "etc/cinder/rootwrap.conf" |
227 |
- doins "etc/cinder/api-paste.ini" |
228 |
- doins "etc/cinder/resource_filters.json" |
229 |
- newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample" |
230 |
- insinto /etc/cinder/rootwrap.d |
231 |
- doins "etc/cinder/rootwrap.d/volume.filters" |
232 |
- |
233 |
- dodir /var/log/cinder |
234 |
- fowners cinder:cinder /var/log/cinder |
235 |
- |
236 |
- #add sudoers definitions for user nova |
237 |
- insinto /etc/sudoers.d/ |
238 |
- insopts -m 0440 -o root -g root |
239 |
- newins "${FILESDIR}/cinder.sudoersd" cinder |
240 |
- # stupid python |
241 |
- rm -r "${ED}"/usr/etc |
242 |
-} |
243 |
- |
244 |
-pkg_postinst() { |
245 |
- if use iscsi ; then |
246 |
- elog "Cinder needs tgtd to be installed and running to work with iscsi" |
247 |
- elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf" |
248 |
- fi |
249 |
-} |
250 |
|
251 |
diff --git a/sys-cluster/cinder/cinder-15.1.0.ebuild b/sys-cluster/cinder/cinder-15.1.0-r1.ebuild |
252 |
similarity index 98% |
253 |
rename from sys-cluster/cinder/cinder-15.1.0.ebuild |
254 |
rename to sys-cluster/cinder/cinder-15.1.0-r1.ebuild |
255 |
index dd0bb4f9d5b..7e28298f02b 100644 |
256 |
--- a/sys-cluster/cinder/cinder-15.1.0.ebuild |
257 |
+++ b/sys-cluster/cinder/cinder-15.1.0-r1.ebuild |
258 |
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then |
259 |
else |
260 |
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV} |
261 |
https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
262 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
263 |
+ KEYWORDS="amd64 ~arm64 x86" |
264 |
fi |
265 |
|
266 |
LICENSE="Apache-2.0" |
267 |
@@ -32,6 +32,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
268 |
${CDEPEND} |
269 |
app-admin/sudo" |
270 |
|
271 |
+# >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] # do not include, upstream depricated |
272 |
RDEPEND=" |
273 |
${CDEPEND} |
274 |
>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] |
275 |
@@ -47,7 +48,6 @@ RDEPEND=" |
276 |
>=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}] |
277 |
>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}] |
278 |
!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] |
279 |
- >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] |
280 |
>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] |
281 |
>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}] |
282 |
>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}] |