Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/glance/
Date: Tue, 13 Mar 2018 14:29:35
Message-Id: 1520951358.8d057a82469200affbf0b17f6c6d9024ea48dbc0.prometheanfire@gentoo
1 commit: 8d057a82469200affbf0b17f6c6d9024ea48dbc0
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 13 14:21:31 2018 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 13 14:29:18 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d057a82
7
8 app-admin/glance: 15.0.1 stable amd64 and x86 with cleanup
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 app-admin/glance/Manifest | 1 -
13 app-admin/glance/glance-15.0.0.ebuild | 143 ----------------------------------
14 app-admin/glance/glance-15.0.1.ebuild | 2 +-
15 3 files changed, 1 insertion(+), 145 deletions(-)
16
17 diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
18 index e274f427b0f..d00c51f8205 100644
19 --- a/app-admin/glance/Manifest
20 +++ b/app-admin/glance/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST glance-15.0.0.tar.gz 1803491 BLAKE2B 70e0f1f7eab6aa0066d16e30e9325ac45d9c0eb9df875e3b26e90463e10299d6c7c272c0b070137f27332bdfcb33abeda68e3375e2562c83942ca72fcb24de38 SHA512 beb5744f9e8b296356cb731c79f1efd7b60408c1282e8a64ab7d414929c447c4f2ff0562a0d59c0a05f828d420ba190946866543a37dbd2df73ae322cbcabab5
23 DIST glance-15.0.1.tar.gz 1815463 BLAKE2B ec6e51340fc4d737e2bd777baf03163a0b515d19c1dc8e5203918e07b304a9539f47ba763207e26def985c6a384d21250ffe1386b433d8b606b55d3d70e4431a SHA512 2da3ada256424a7817d0c49aac0940443cbefcfff3df77a623d7099badf356808b5df59f109ac233f84ac561b7310d3b8d53cafd6c9955a8e2b296a1655cedd3
24 DIST glance-16.0.0.tar.gz 1956293 BLAKE2B 457f18412885287d8a3ea1b702af0e7b826eeeaf93ce8b1b7456a42d3a84594cfe270670ac35e9c63d8fbb464a3ed0db823a6949fbfa37f993b260681222d9c1 SHA512 20ff8ba74eee3a5b69f7e357f69870398e96341831bea56bbad61314d3eff9d6767dfd48634d04f96cfbc4cc96c7eff3ab900748461ecaa14e2cf329aec40481
25
26 diff --git a/app-admin/glance/glance-15.0.0.ebuild b/app-admin/glance/glance-15.0.0.ebuild
27 deleted file mode 100644
28 index 601d8f56ec2..00000000000
29 --- a/app-admin/glance/glance-15.0.0.ebuild
30 +++ /dev/null
31 @@ -1,143 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
37 -
38 -inherit distutils-r1 user
39 -
40 -DESCRIPTION="Services for discovering, registering, and retrieving VM images"
41 -HOMEPAGE="https://launchpad.net/glance"
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="doc mysql postgres +sqlite +swift"
48 -REQUIRED_USE="|| ( mysql postgres sqlite )"
49 -
50 -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
51 - !~dev-python/pbr-2.1.0"
52 -DEPEND="
53 - dev-python/setuptools[${PYTHON_USEDEP}]
54 - ${CDEPEND}"
55 -
56 -#note to self, wsgiref is a python builtin, no need to package it
57 -#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
58 -
59 -RDEPEND="
60 - ${CDEPEND}
61 - sqlite? (
62 - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
63 - !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
64 - !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
65 - !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
66 - !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
67 - )
68 - mysql? (
69 - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
70 - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
71 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
72 - !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
73 - !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
74 - !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
75 - !~dev-python/sqlalchemy-1.1.8[${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.5[${PYTHON_USEDEP}]
81 - !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
82 - !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
83 - !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
84 - )
85 - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
86 - !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
87 - <dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
88 - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
89 - >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
90 - >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
91 - >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
92 - >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
93 - >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
94 - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
95 - >=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
96 - !~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
97 - !~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
98 - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
99 - >=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
100 - >=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
101 - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
102 - >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
103 - !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
104 - >=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
105 - >=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
106 - >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
107 - >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
108 - >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
109 - <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
110 - dev-python/paste[${PYTHON_USEDEP}]
111 - >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
112 - !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
113 - <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
114 - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
115 - >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
116 - >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
117 - >=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
118 - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
119 - !~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
120 - >=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
121 - >=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
122 - !~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
123 - >=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
124 - >=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
125 - >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
126 - !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
127 - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
128 - >=dev-python/glance_store-0.22.0[${PYTHON_USEDEP}]
129 - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
130 - >=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
131 - !~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
132 - >=dev-python/cursive-0.1.2[${PYTHON_USEDEP}]
133 - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
134 - >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
135 -"
136 -
137 -#PATCHES=(
138 -#)
139 -
140 -pkg_setup() {
141 - enewgroup glance
142 - enewuser glance -1 -1 /var/lib/glance glance
143 -}
144 -
145 -python_prepare_all() {
146 - sed -i '/xattr/d' test-requirements.txt || die
147 - sed -i '/pysendfile/d' test-requirements.txt || die
148 - sed -i '/^hacking/d' test-requirements.txt || die
149 - distutils-r1_python_prepare_all
150 -}
151 -
152 -python_compile_all() {
153 - use doc && "${PYTHON}" setup.py build_sphinx
154 -}
155 -
156 -python_install_all() {
157 - distutils-r1_python_install_all
158 -
159 - newinitd "${FILESDIR}/glance.initd" glance-api
160 -
161 - diropts -m 0750 -o glance -g glance
162 - dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
163 - keepdir /etc/glance
164 - keepdir /var/log/glance
165 - keepdir /var/lib/glance/images
166 - keepdir /var/lib/glance/scrubber
167 -
168 - insinto /etc/glance
169 - insopts -m 0640 -o glance -g glance
170 - doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
171 -
172 - use doc && local HTML_DOCS=( doc/build/html/. )
173 - distutils-r1_python_install_all
174 -}
175
176 diff --git a/app-admin/glance/glance-15.0.1.ebuild b/app-admin/glance/glance-15.0.1.ebuild
177 index 408b991b18c..affe9f8be82 100644
178 --- a/app-admin/glance/glance-15.0.1.ebuild
179 +++ b/app-admin/glance/glance-15.0.1.ebuild
180 @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
181 EGIT_BRANCH="stable/pike"
182 else
183 SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
184 - KEYWORDS="~amd64 ~arm64 ~x86"
185 + KEYWORDS="amd64 ~arm64 x86"
186 fi
187
188 LICENSE="Apache-2.0"