[gentoo-commits] repo/proj/guru:dev commit in: app-admin/glance/

[Alessandro Barbieri]

commit:     3476933ffbfca6d194a35e80377618408d78aa96
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Sep 26 18:35:28 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Sep 26 18:37:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3476933f

app-admin/glance: new version

Closes: https://bugs.gentoo.org/799467
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 app-admin/glance/Manifest                          |   2 +-
 .../{glance-21.0.0.ebuild => glance-22.0.0.ebuild} | 101 +++++++++++----------
 2 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index a291daf77..3c93096a2 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1 +1 @@
-DIST glance-21.0.0.tar.gz 2032938 BLAKE2B 9da6353d95768c8f241e8ea42def5a7a457d88ddf92c4f881649f196a57ef232ddabcf4f6816256fbd1fcb21b6e7b46811c3bf7c9b9c587fc902d008cbaf525d SHA512 83d49f96a82de0093fe3991f5138febc403964f5af1012de6e63395b82a368e08b2b7d142a889244c4261d1d019336e69050e9149d40b88e1c175f7a561e4f5d
+DIST glance-22.0.0.tar.gz 2064255 BLAKE2B 28322f6c8b90ef0d54d2bb1ee7b6c7ff1a9e29bf92b2a7bacf0819ecbc1ae30d13b0b79b882feb9f8efb2724c90a52e731d3192ab395bb94f433e2530d08196b SHA512 5dc4ad3bf127b52853c336b2551e02896203d6037408716590545e3b8d34f34bd5ec5aa15842cc76edb9c34851a980e39ed6c92426cf2915bd5aeac7b11c82b9

diff --git a/app-admin/glance/glance-21.0.0.ebuild b/app-admin/glance/glance-22.0.0.ebuild
similarity index 58%
rename from app-admin/glance/glance-21.0.0.ebuild
rename to app-admin/glance/glance-22.0.0.ebuild
index 9b3f1cfdc..8d978dd5f 100644
--- a/app-admin/glance/glance-21.0.0.ebuild
+++ b/app-admin/glance/glance-22.0.0.ebuild
@@ -1,63 +1,71 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_8 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_8 )
+
 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/victoria"
-else
-	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
+HOMEPAGE="
+	https://launchpad.net/glance
+	https://github.com/openstack/glance
+"
+SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 
+KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="mysql postgres +sqlite +swift"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+REQUIRED_USE="
+	|| ( mysql postgres sqlite )
+	test? ( mysql )
+"
+
+distutils_enable_tests pytest
 
 #note to self, wsgiref is a python builtin, no need to package it
 #>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.9.199[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-4.1.0[${PYTHON_USEDEP}]
+		>=dev-python/os-brick-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
+	)
 "
+#		>=dev-python/xattr-0.9.2[${PYTHON_USEDEP}]
+#		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/defusedxml-0.6.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.25.1[${PYTHON_USEDEP}]
 	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
@@ -65,44 +73,41 @@ RDEPEND="
 	>=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/alembic-0.9.6[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-8.1.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/oslo-context-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	!~dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-5.17.0[${PYTHON_USEDEP}]
 	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
 	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
 	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.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/six-1.11.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-4.3.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-2.4.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-3.6.2[${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-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.6.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/os-win-4.0.1[${PYTHON_USEDEP}]
 	>=dev-python/castellan-0.17.0[${PYTHON_USEDEP}]
 	acct-user/glance
 	acct-group/glance