| 1 |
commit: 99aaee53d4f3f580b511255ae8cd5181211be32d |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 28 03:49:54 2018 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 28 04:13:05 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99aaee53 |
| 7 |
|
| 8 |
app-admin/glance: remove ocata |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
app-admin/glance/Manifest | 1 - |
| 13 |
app-admin/glance/files/glance.initd | 16 ++-- |
| 14 |
app-admin/glance/files/glance.initd-2 | 15 ---- |
| 15 |
app-admin/glance/files/glance.initd-r2 | 17 ---- |
| 16 |
app-admin/glance/glance-14.0.0-r1.ebuild | 135 ---------------------------- |
| 17 |
app-admin/glance/glance-14.0.0.ebuild | 135 ---------------------------- |
| 18 |
app-admin/glance/glance-15.0.0.ebuild | 4 +- |
| 19 |
app-admin/glance/glance-2017.1.9999.ebuild | 136 ----------------------------- |
| 20 |
app-admin/glance/glance-2017.2.9999.ebuild | 4 +- |
| 21 |
9 files changed, 9 insertions(+), 454 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest |
| 24 |
index 4f6beea940c..0824f911194 100644 |
| 25 |
--- a/app-admin/glance/Manifest |
| 26 |
+++ b/app-admin/glance/Manifest |
| 27 |
@@ -1,2 +1 @@ |
| 28 |
-DIST glance-14.0.0.tar.gz 1788173 BLAKE2B 91834050aea925325a61f99c817e9d289270de30b88c53430b6b9c5845dbfc943678db734b9592657eb7ab8c49d5d6a7c110411c45c1fd82d8c829db67ef174b SHA512 4d0b6654dc6a9848e164422d138d4f6c1ec3711a7eb56a3c437202aa5c8cf86bf341201c9007b2f12173189f18beb73eadbaaade936ececf705a31e8b6eac155 |
| 29 |
DIST glance-15.0.0.tar.gz 1803491 BLAKE2B 70e0f1f7eab6aa0066d16e30e9325ac45d9c0eb9df875e3b26e90463e10299d6c7c272c0b070137f27332bdfcb33abeda68e3375e2562c83942ca72fcb24de38 SHA512 beb5744f9e8b296356cb731c79f1efd7b60408c1282e8a64ab7d414929c447c4f2ff0562a0d59c0a05f828d420ba190946866543a37dbd2df73ae322cbcabab5 |
| 30 |
|
| 31 |
diff --git a/app-admin/glance/files/glance.initd b/app-admin/glance/files/glance.initd |
| 32 |
index 1ece1ad58f8..57274ac2dfe 100644 |
| 33 |
--- a/app-admin/glance/files/glance.initd |
| 34 |
+++ b/app-admin/glance/files/glance.initd |
| 35 |
@@ -1,21 +1,15 @@ |
| 36 |
#!/sbin/openrc-run |
| 37 |
-# Copyright 1999-2014 Gentoo Foundation |
| 38 |
+# Copyright 1999-2018 Gentoo Foundation |
| 39 |
# Distributed under the terms of the GNU General Public License v2 |
| 40 |
|
| 41 |
description="Starts ${SVCNAME} service for OpenStack" |
| 42 |
|
| 43 |
-command=/usr/bin/${SVCNAME} |
| 44 |
+command=/usr/bin/${RC_SVCNAME} |
| 45 |
+command_user="${GLANCE_USER:-glance}" |
| 46 |
command_background=yes |
| 47 |
-pidfile=/var/run/glance/${SVCNAME}.pid |
| 48 |
-required_files=/etc/glance/${SVCNAME}.conf |
| 49 |
- |
| 50 |
-start_stop_daemon_args="--quiet --user ${GLANCE_USER:-glance}" |
| 51 |
+pidfile=/run/${RC_SVCNAME}.pid |
| 52 |
+required_files=/etc/glance/${RC_SVCNAME}.conf |
| 53 |
|
| 54 |
depend() { |
| 55 |
need net |
| 56 |
} |
| 57 |
- |
| 58 |
-start_pre() { |
| 59 |
- checkpath --directory --owner ${GLANCE_USER:-glance}:${GLANCE_GROUP:-glance} --mode 0755 ${GLANCE_RUN:-/var/run/glance} |
| 60 |
-} |
| 61 |
- |
| 62 |
|
| 63 |
diff --git a/app-admin/glance/files/glance.initd-2 b/app-admin/glance/files/glance.initd-2 |
| 64 |
deleted file mode 100644 |
| 65 |
index 4d4849f77e7..00000000000 |
| 66 |
--- a/app-admin/glance/files/glance.initd-2 |
| 67 |
+++ /dev/null |
| 68 |
@@ -1,15 +0,0 @@ |
| 69 |
-#!/sbin/openrc-run |
| 70 |
-# Copyright 1999-2017 Gentoo Foundation |
| 71 |
-# Distributed under the terms of the GNU General Public License v2 |
| 72 |
- |
| 73 |
-description="Starts ${SVCNAME} service for OpenStack" |
| 74 |
- |
| 75 |
-command=/usr/bin/${RC_SVCNAME} |
| 76 |
-command_user="${GLANCE_USER:-glance}" |
| 77 |
-command_background=yes |
| 78 |
-pidfile=/run/${RC_SVCNAME}.pid |
| 79 |
-required_files=/etc/glance/${RC_SVCNAME}.conf |
| 80 |
- |
| 81 |
-depend() { |
| 82 |
- need net |
| 83 |
-} |
| 84 |
|
| 85 |
diff --git a/app-admin/glance/files/glance.initd-r2 b/app-admin/glance/files/glance.initd-r2 |
| 86 |
deleted file mode 100644 |
| 87 |
index 338de069750..00000000000 |
| 88 |
--- a/app-admin/glance/files/glance.initd-r2 |
| 89 |
+++ /dev/null |
| 90 |
@@ -1,17 +0,0 @@ |
| 91 |
-#!/sbin/openrc-run |
| 92 |
-# Copyright 1999-2017 Gentoo Foundation |
| 93 |
-# Distributed under the terms of the GNU General Public License v2 |
| 94 |
- |
| 95 |
-description="Starts ${RC_SVCNAME} service for OpenStack" |
| 96 |
- |
| 97 |
-command=/usr/bin/${RC_SVCNAME} |
| 98 |
-command_user="${GLANCE_USER:-glance}" |
| 99 |
-command_background=yes |
| 100 |
-pidfile=/run/${RC_SVCNAME}.pid |
| 101 |
-required_files=/etc/glance/${RC_SVCNAME}.conf |
| 102 |
- |
| 103 |
-start_stop_daemon_args="--quiet" |
| 104 |
- |
| 105 |
-depend() { |
| 106 |
- need net |
| 107 |
-} |
| 108 |
|
| 109 |
diff --git a/app-admin/glance/glance-14.0.0-r1.ebuild b/app-admin/glance/glance-14.0.0-r1.ebuild |
| 110 |
deleted file mode 100644 |
| 111 |
index 02f04305b64..00000000000 |
| 112 |
--- a/app-admin/glance/glance-14.0.0-r1.ebuild |
| 113 |
+++ /dev/null |
| 114 |
@@ -1,135 +0,0 @@ |
| 115 |
-# Copyright 1999-2017 Gentoo Foundation |
| 116 |
-# Distributed under the terms of the GNU General Public License v2 |
| 117 |
- |
| 118 |
-EAPI=6 |
| 119 |
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) |
| 120 |
- |
| 121 |
-inherit distutils-r1 user |
| 122 |
- |
| 123 |
-DESCRIPTION="Services for discovering, registering, and retrieving VM images" |
| 124 |
-HOMEPAGE="https://launchpad.net/glance" |
| 125 |
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
| 126 |
- |
| 127 |
-LICENSE="Apache-2.0" |
| 128 |
-SLOT="0" |
| 129 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
| 130 |
-IUSE="doc mysql postgres +sqlite +swift" |
| 131 |
-REQUIRED_USE="|| ( mysql postgres sqlite )" |
| 132 |
- |
| 133 |
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" |
| 134 |
-DEPEND=" |
| 135 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 136 |
- ${CDEPEND}" |
| 137 |
- |
| 138 |
-#note to self, wsgiref is a python builtin, no need to package it |
| 139 |
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}] |
| 140 |
- |
| 141 |
-RDEPEND=" |
| 142 |
- ${CDEPEND} |
| 143 |
- sqlite? ( |
| 144 |
- >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] |
| 145 |
- <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] |
| 146 |
- ) |
| 147 |
- mysql? ( |
| 148 |
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] |
| 149 |
- !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] |
| 150 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
| 151 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
| 152 |
- ) |
| 153 |
- postgres? ( |
| 154 |
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] |
| 155 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
| 156 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
| 157 |
- ) |
| 158 |
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] |
| 159 |
- >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] |
| 160 |
- >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] |
| 161 |
- !~dev-python/routes-2.0[${PYTHON_USEDEP}] |
| 162 |
- !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] |
| 163 |
- !~dev-python/routes-2.3[${PYTHON_USEDEP}] |
| 164 |
- >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] |
| 165 |
- >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] |
| 166 |
- >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}] |
| 167 |
- >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}] |
| 168 |
- >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] |
| 169 |
- >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] |
| 170 |
- >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] |
| 171 |
- !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] |
| 172 |
- >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] |
| 173 |
- >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] |
| 174 |
- >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] |
| 175 |
- >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] |
| 176 |
- >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}] |
| 177 |
- !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}] |
| 178 |
- >=dev-python/taskflow-2.7.0.0[${PYTHON_USEDEP}] |
| 179 |
- >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] |
| 180 |
- >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] |
| 181 |
- >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}] |
| 182 |
- >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}] |
| 183 |
- <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}] |
| 184 |
- dev-python/paste[${PYTHON_USEDEP}] |
| 185 |
- >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] |
| 186 |
- !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}] |
| 187 |
- <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}] |
| 188 |
- >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] |
| 189 |
- >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] |
| 190 |
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
| 191 |
- >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] |
| 192 |
- >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] |
| 193 |
- >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] |
| 194 |
- >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] |
| 195 |
- >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] |
| 196 |
- >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] |
| 197 |
- >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] |
| 198 |
- !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] |
| 199 |
- >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] |
| 200 |
- >=dev-python/glance_store-0.18.0[${PYTHON_USEDEP}] |
| 201 |
- >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}] |
| 202 |
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] |
| 203 |
- >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] |
| 204 |
- !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] |
| 205 |
- >=dev-python/cursive-0.1.1[${PYTHON_USEDEP}] |
| 206 |
- >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] |
| 207 |
- >=dev-python/monotonic-0.6[${PYTHON_USEDEP}] |
| 208 |
-" |
| 209 |
- |
| 210 |
-#PATCHES=( |
| 211 |
-#) |
| 212 |
- |
| 213 |
-pkg_setup() { |
| 214 |
- enewgroup glance |
| 215 |
- enewuser glance -1 -1 /var/lib/glance glance |
| 216 |
-} |
| 217 |
- |
| 218 |
-python_prepare_all() { |
| 219 |
- sed -i '/xattr/d' test-requirements.txt || die |
| 220 |
- sed -i '/pysendfile/d' test-requirements.txt || die |
| 221 |
- sed -i '/^hacking/d' test-requirements.txt || die |
| 222 |
- distutils-r1_python_prepare_all |
| 223 |
-} |
| 224 |
- |
| 225 |
-python_compile_all() { |
| 226 |
- use doc && "${PYTHON}" setup.py build_sphinx |
| 227 |
-} |
| 228 |
- |
| 229 |
-python_install_all() { |
| 230 |
- distutils-r1_python_install_all |
| 231 |
- |
| 232 |
- for svc in api glare registry scrubber; do |
| 233 |
- newinitd "${FILESDIR}/glance.initd" glance-${svc} |
| 234 |
- done |
| 235 |
- |
| 236 |
- diropts -m 0750 -o glance -g glance |
| 237 |
- dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber |
| 238 |
- keepdir /etc/glance |
| 239 |
- keepdir /var/log/glance |
| 240 |
- keepdir /var/lib/glance/images |
| 241 |
- keepdir /var/lib/glance/scrubber |
| 242 |
- |
| 243 |
- insinto /etc/glance |
| 244 |
- insopts -m 0640 -o glance -g glance |
| 245 |
- doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta* |
| 246 |
- |
| 247 |
- use doc && local HTML_DOCS=( doc/build/html/. ) |
| 248 |
- distutils-r1_python_install_all |
| 249 |
-} |
| 250 |
|
| 251 |
diff --git a/app-admin/glance/glance-14.0.0.ebuild b/app-admin/glance/glance-14.0.0.ebuild |
| 252 |
deleted file mode 100644 |
| 253 |
index d968f2a9e32..00000000000 |
| 254 |
--- a/app-admin/glance/glance-14.0.0.ebuild |
| 255 |
+++ /dev/null |
| 256 |
@@ -1,135 +0,0 @@ |
| 257 |
-# Copyright 1999-2017 Gentoo Foundation |
| 258 |
-# Distributed under the terms of the GNU General Public License v2 |
| 259 |
- |
| 260 |
-EAPI=6 |
| 261 |
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) |
| 262 |
- |
| 263 |
-inherit distutils-r1 user |
| 264 |
- |
| 265 |
-DESCRIPTION="Services for discovering, registering, and retrieving VM images" |
| 266 |
-HOMEPAGE="https://launchpad.net/glance" |
| 267 |
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
| 268 |
- |
| 269 |
-LICENSE="Apache-2.0" |
| 270 |
-SLOT="0" |
| 271 |
-KEYWORDS="amd64 ~arm64 x86" |
| 272 |
-IUSE="doc mysql postgres +sqlite +swift" |
| 273 |
-REQUIRED_USE="|| ( mysql postgres sqlite )" |
| 274 |
- |
| 275 |
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" |
| 276 |
-DEPEND=" |
| 277 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 278 |
- ${CDEPEND}" |
| 279 |
- |
| 280 |
-#note to self, wsgiref is a python builtin, no need to package it |
| 281 |
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}] |
| 282 |
- |
| 283 |
-RDEPEND=" |
| 284 |
- ${CDEPEND} |
| 285 |
- sqlite? ( |
| 286 |
- >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] |
| 287 |
- <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] |
| 288 |
- ) |
| 289 |
- mysql? ( |
| 290 |
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] |
| 291 |
- !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] |
| 292 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
| 293 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
| 294 |
- ) |
| 295 |
- postgres? ( |
| 296 |
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] |
| 297 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
| 298 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
| 299 |
- ) |
| 300 |
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] |
| 301 |
- >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] |
| 302 |
- >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] |
| 303 |
- !~dev-python/routes-2.0[${PYTHON_USEDEP}] |
| 304 |
- !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] |
| 305 |
- !~dev-python/routes-2.3[${PYTHON_USEDEP}] |
| 306 |
- >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] |
| 307 |
- >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] |
| 308 |
- >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}] |
| 309 |
- >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}] |
| 310 |
- >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] |
| 311 |
- >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] |
| 312 |
- >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] |
| 313 |
- !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] |
| 314 |
- >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] |
| 315 |
- >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] |
| 316 |
- >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] |
| 317 |
- >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] |
| 318 |
- >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}] |
| 319 |
- !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}] |
| 320 |
- >=dev-python/taskflow-2.7.0.0[${PYTHON_USEDEP}] |
| 321 |
- >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] |
| 322 |
- >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] |
| 323 |
- >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}] |
| 324 |
- >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}] |
| 325 |
- <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}] |
| 326 |
- dev-python/paste[${PYTHON_USEDEP}] |
| 327 |
- >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] |
| 328 |
- !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}] |
| 329 |
- <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}] |
| 330 |
- >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] |
| 331 |
- >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] |
| 332 |
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
| 333 |
- >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] |
| 334 |
- >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] |
| 335 |
- >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] |
| 336 |
- >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] |
| 337 |
- >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] |
| 338 |
- >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] |
| 339 |
- >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] |
| 340 |
- !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] |
| 341 |
- >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] |
| 342 |
- >=dev-python/glance_store-0.18.0[${PYTHON_USEDEP}] |
| 343 |
- >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}] |
| 344 |
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] |
| 345 |
- >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] |
| 346 |
- !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] |
| 347 |
- >=dev-python/cursive-0.1.1[${PYTHON_USEDEP}] |
| 348 |
- >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] |
| 349 |
- >=dev-python/monotonic-0.6[${PYTHON_USEDEP}] |
| 350 |
-" |
| 351 |
- |
| 352 |
-#PATCHES=( |
| 353 |
-#) |
| 354 |
- |
| 355 |
-pkg_setup() { |
| 356 |
- enewgroup glance |
| 357 |
- enewuser glance -1 -1 /var/lib/glance glance |
| 358 |
-} |
| 359 |
- |
| 360 |
-python_prepare_all() { |
| 361 |
- sed -i '/xattr/d' test-requirements.txt || die |
| 362 |
- sed -i '/pysendfile/d' test-requirements.txt || die |
| 363 |
- sed -i '/^hacking/d' test-requirements.txt || die |
| 364 |
- distutils-r1_python_prepare_all |
| 365 |
-} |
| 366 |
- |
| 367 |
-python_compile_all() { |
| 368 |
- use doc && "${PYTHON}" setup.py build_sphinx |
| 369 |
-} |
| 370 |
- |
| 371 |
-python_install_all() { |
| 372 |
- distutils-r1_python_install_all |
| 373 |
- |
| 374 |
- for svc in api glare registry scrubber; do |
| 375 |
- newinitd "${FILESDIR}/glance.initd" glance-${svc} |
| 376 |
- done |
| 377 |
- |
| 378 |
- diropts -m 0750 -o glance -g glance |
| 379 |
- dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber |
| 380 |
- keepdir /etc/glance |
| 381 |
- keepdir /var/log/glance |
| 382 |
- keepdir /var/lib/glance/images |
| 383 |
- keepdir /var/lib/glance/scrubber |
| 384 |
- |
| 385 |
- insinto /etc/glance |
| 386 |
- insopts -m 0640 -o glance -g glance |
| 387 |
- doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta* |
| 388 |
- |
| 389 |
- use doc && local HTML_DOCS=( doc/build/html/. ) |
| 390 |
- distutils-r1_python_install_all |
| 391 |
-} |
| 392 |
|
| 393 |
diff --git a/app-admin/glance/glance-15.0.0.ebuild b/app-admin/glance/glance-15.0.0.ebuild |
| 394 |
index b32fcd4c7e8..56945afeb41 100644 |
| 395 |
--- a/app-admin/glance/glance-15.0.0.ebuild |
| 396 |
+++ b/app-admin/glance/glance-15.0.0.ebuild |
| 397 |
@@ -1,4 +1,4 @@ |
| 398 |
-# Copyright 1999-2017 Gentoo Foundation |
| 399 |
+# Copyright 1999-2018 Gentoo Foundation |
| 400 |
# Distributed under the terms of the GNU General Public License v2 |
| 401 |
|
| 402 |
EAPI=6 |
| 403 |
@@ -125,7 +125,7 @@ python_compile_all() { |
| 404 |
python_install_all() { |
| 405 |
distutils-r1_python_install_all |
| 406 |
|
| 407 |
- newinitd "${FILESDIR}/glance.initd-2" glance-api |
| 408 |
+ newinitd "${FILESDIR}/glance.initd" glance-api |
| 409 |
|
| 410 |
diropts -m 0750 -o glance -g glance |
| 411 |
dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber |
| 412 |
|
| 413 |
diff --git a/app-admin/glance/glance-2017.1.9999.ebuild b/app-admin/glance/glance-2017.1.9999.ebuild |
| 414 |
deleted file mode 100644 |
| 415 |
index abe2dce6724..00000000000 |
| 416 |
--- a/app-admin/glance/glance-2017.1.9999.ebuild |
| 417 |
+++ /dev/null |
| 418 |
@@ -1,136 +0,0 @@ |
| 419 |
-# Copyright 1999-2017 Gentoo Foundation |
| 420 |
-# Distributed under the terms of the GNU General Public License v2 |
| 421 |
- |
| 422 |
-EAPI=6 |
| 423 |
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) |
| 424 |
- |
| 425 |
-inherit distutils-r1 git-r3 user |
| 426 |
- |
| 427 |
-DESCRIPTION="Services for discovering, registering, and retrieving VM images" |
| 428 |
-HOMEPAGE="https://launchpad.net/glance" |
| 429 |
-EGIT_REPO_URI="https://github.com/openstack/glance.git" |
| 430 |
-EGIT_BRANCH="stable/ocata" |
| 431 |
- |
| 432 |
-LICENSE="Apache-2.0" |
| 433 |
-SLOT="0" |
| 434 |
-KEYWORDS="" |
| 435 |
-IUSE="doc mysql postgres +sqlite +swift" |
| 436 |
-REQUIRED_USE="|| ( mysql postgres sqlite )" |
| 437 |
- |
| 438 |
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" |
| 439 |
-DEPEND=" |
| 440 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 441 |
- ${CDEPEND}" |
| 442 |
- |
| 443 |
-#note to self, wsgiref is a python builtin, no need to package it |
| 444 |
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}] |
| 445 |
- |
| 446 |
-RDEPEND=" |
| 447 |
- ${CDEPEND} |
| 448 |
- sqlite? ( |
| 449 |
- >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] |
| 450 |
- <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] |
| 451 |
- ) |
| 452 |
- mysql? ( |
| 453 |
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] |
| 454 |
- !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] |
| 455 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
| 456 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
| 457 |
- ) |
| 458 |
- postgres? ( |
| 459 |
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] |
| 460 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
| 461 |
- <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
| 462 |
- ) |
| 463 |
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] |
| 464 |
- >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] |
| 465 |
- >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] |
| 466 |
- !~dev-python/routes-2.0[${PYTHON_USEDEP}] |
| 467 |
- !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] |
| 468 |
- !~dev-python/routes-2.3[${PYTHON_USEDEP}] |
| 469 |
- >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] |
| 470 |
- >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] |
| 471 |
- >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}] |
| 472 |
- >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}] |
| 473 |
- >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] |
| 474 |
- >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] |
| 475 |
- >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] |
| 476 |
- !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] |
| 477 |
- >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] |
| 478 |
- >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] |
| 479 |
- >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] |
| 480 |
- >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] |
| 481 |
- >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}] |
| 482 |
- !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}] |
| 483 |
- >=dev-python/taskflow-2.7.0.0[${PYTHON_USEDEP}] |
| 484 |
- >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] |
| 485 |
- >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] |
| 486 |
- >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}] |
| 487 |
- >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}] |
| 488 |
- <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}] |
| 489 |
- dev-python/paste[${PYTHON_USEDEP}] |
| 490 |
- >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] |
| 491 |
- !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}] |
| 492 |
- <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}] |
| 493 |
- >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] |
| 494 |
- >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] |
| 495 |
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
| 496 |
- >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] |
| 497 |
- >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] |
| 498 |
- >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] |
| 499 |
- >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] |
| 500 |
- >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] |
| 501 |
- >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] |
| 502 |
- >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] |
| 503 |
- !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] |
| 504 |
- >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] |
| 505 |
- >=dev-python/glance_store-0.18.0[${PYTHON_USEDEP}] |
| 506 |
- >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}] |
| 507 |
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] |
| 508 |
- >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] |
| 509 |
- !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] |
| 510 |
- >=dev-python/cursive-0.1.1[${PYTHON_USEDEP}] |
| 511 |
- >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] |
| 512 |
- >=dev-python/monotonic-0.6[${PYTHON_USEDEP}] |
| 513 |
-" |
| 514 |
- |
| 515 |
-#PATCHES=( |
| 516 |
-#) |
| 517 |
- |
| 518 |
-pkg_setup() { |
| 519 |
- enewgroup glance |
| 520 |
- enewuser glance -1 -1 /var/lib/glance glance |
| 521 |
-} |
| 522 |
- |
| 523 |
-python_prepare_all() { |
| 524 |
- sed -i '/xattr/d' test-requirements.txt || die |
| 525 |
- sed -i '/pysendfile/d' test-requirements.txt || die |
| 526 |
- sed -i '/^hacking/d' test-requirements.txt || die |
| 527 |
- distutils-r1_python_prepare_all |
| 528 |
-} |
| 529 |
- |
| 530 |
-python_compile_all() { |
| 531 |
- use doc && "${PYTHON}" setup.py build_sphinx |
| 532 |
-} |
| 533 |
- |
| 534 |
-python_install_all() { |
| 535 |
- distutils-r1_python_install_all |
| 536 |
- |
| 537 |
- for svc in api glare registry scrubber; do |
| 538 |
- newinitd "${FILESDIR}/glance.initd-r2" glance-${svc} |
| 539 |
- done |
| 540 |
- |
| 541 |
- diropts -m 0750 -o glance -g glance |
| 542 |
- dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber |
| 543 |
- keepdir /etc/glance |
| 544 |
- keepdir /var/log/glance |
| 545 |
- keepdir /var/lib/glance/images |
| 546 |
- keepdir /var/lib/glance/scrubber |
| 547 |
- |
| 548 |
- insinto /etc/glance |
| 549 |
- insopts -m 0640 -o glance -g glance |
| 550 |
- doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta* |
| 551 |
- |
| 552 |
- use doc && local HTML_DOCS=( doc/build/html/. ) |
| 553 |
- distutils-r1_python_install_all |
| 554 |
-} |
| 555 |
|
| 556 |
diff --git a/app-admin/glance/glance-2017.2.9999.ebuild b/app-admin/glance/glance-2017.2.9999.ebuild |
| 557 |
index 71b923e6de6..34a29aa8cf5 100644 |
| 558 |
--- a/app-admin/glance/glance-2017.2.9999.ebuild |
| 559 |
+++ b/app-admin/glance/glance-2017.2.9999.ebuild |
| 560 |
@@ -1,4 +1,4 @@ |
| 561 |
-# Copyright 1999-2017 Gentoo Foundation |
| 562 |
+# Copyright 1999-2018 Gentoo Foundation |
| 563 |
# Distributed under the terms of the GNU General Public License v2 |
| 564 |
|
| 565 |
EAPI=6 |
| 566 |
@@ -126,7 +126,7 @@ python_compile_all() { |
| 567 |
python_install_all() { |
| 568 |
distutils-r1_python_install_all |
| 569 |
|
| 570 |
- newinitd "${FILESDIR}/glance.initd-2" glance-api |
| 571 |
+ newinitd "${FILESDIR}/glance.initd" glance-api |
| 572 |
|
| 573 |
diropts -m 0750 -o glance -g glance |
| 574 |
dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber |
Archives