app-admin/glance: 19.0.2 stable amd64/x86 with cleanup

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>

diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 505b122a84d69d4b85fc8907430bca84a961f341..bd6305d150d3240b4fee82c558ce5071dc10504e 100644 (file)
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,2 +1 @@
-DIST glance-19.0.1.tar.gz 1943385 BLAKE2B 5e2530a05a171f640499a3e595ad15be29e95a10e6f22a186514cc73c4fc77d0ae5bf00a3d43616e8cb53ccde748a6560dd448db631c86343b2667c0dc6719a1 SHA512 b672d84d709149191103ed54cca91d604b43460b1bd6ab56263c1b8c382d1c4261ebfd58ca9e233ee50b248327bcbfd7bfd47fee57c8c08a9635b2ca0c0cffe4
 DIST glance-19.0.2.tar.gz 1943984 BLAKE2B 2fc0d30a11a056b02471e1d038f85b327632b02b7ee177fc4b44e571be9713905cd5bfc6c3d8103edb7a04bf5c51dcc1edc31ce81f25951df84236ad5a6898c6 SHA512 cd0e88f8bba81536eb95f49d1e3f029d8951b2c81208fcd6c32dc877ce51df6026521a6829705e97c8aacd2bc6e4f5eddeae98dfea0c41e00c7f6757dbcfbfa2

diff --git a/app-admin/glance/glance-19.0.1.ebuild b/app-admin/glance/glance-19.0.1.ebuild
deleted file mode 100644 (file)
index de55f1e..0000000
--- a/app-admin/glance/glance-19.0.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-
-if [[ ${PV} == *9999 ]];then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/openstack/glance.git"
-       EGIT_BRANCH="stable/train"
-else
-       SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-       KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc mysql postgres +sqlite +swift"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/pbr-2.1.0"
-DEPEND="
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       ${CDEPEND}"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
-       ${CDEPEND}
-       >=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-       sqlite? (
-               >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-       )
-       mysql? (
-               >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-               !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-       )
-       postgres? (
-               >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-       )
-       >=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
-       !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-       !~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-       >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-       >=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
-       >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-       >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
-       >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-       >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-       >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-       >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-       >=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-       >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
-       >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
-       <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
-       >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-       >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-       >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-       >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-       >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-       >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-       !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-       >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-       >=dev-python/glance_store-1.0.0[${PYTHON_USEDEP}]
-       >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-       >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-       >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-       >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/castellan-0.17.0[${PYTHON_USEDEP}]
-       acct-user/glance
-       acct-group/glance
-"
-
-python_prepare_all() {
-       sed -i '/xattr/d' test-requirements.txt || die
-       sed -i '/pysendfile/d' test-requirements.txt || die
-       sed -i '/^hacking/d' test-requirements.txt || die
-       distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-       if [ ! -z ${EGIT_BRANCH+x} ]; then
-               use doc && "${PYTHON}" setup.py build_sphinx
-       fi
-}
-
-python_install_all() {
-       distutils-r1_python_install_all
-
-       newinitd "${FILESDIR}/glance.initd" glance-api
-
-       diropts -m 0750 -o glance -g glance
-       dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
-       keepdir /etc/glance
-       keepdir /var/log/glance
-       keepdir /var/lib/glance/images
-       keepdir /var/lib/glance/scrubber
-
-       insinto /etc/glance
-       insopts -m 0640 -o glance -g glance
-       doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
-
-       use doc && local HTML_DOCS=( doc/build/html/. )
-       distutils-r1_python_install_all
-       rm -r "${ED}"/usr/etc
-}

diff --git a/app-admin/glance/glance-19.0.2.ebuild b/app-admin/glance/glance-19.0.2.ebuild
index 3a95ba49d66b329d8ab82ceee64646f778c6f029..de55f1ee957145fb63f8e72dd8973a7130d20294 100644 (file)
--- a/app-admin/glance/glance-19.0.2.ebuild
+++ b/app-admin/glance/glance-19.0.2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
        EGIT_BRANCH="stable/train"
 else
        SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-       KEYWORDS="~amd64 ~arm64 ~x86"
+       KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"