app-admin/glance: new version

Closes: https://bugs.gentoo.org/815442
Closes: https://bugs.gentoo.org/799500
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>

2 files changed, 34 insertions, 39 deletions

diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 3c93096a2..53b510110 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1 +1 @@
-DIST glance-22.0.0.tar.gz 2064255 BLAKE2B 28322f6c8b90ef0d54d2bb1ee7b6c7ff1a9e29bf92b2a7bacf0819ecbc1ae30d13b0b79b882feb9f8efb2724c90a52e731d3192ab395bb94f433e2530d08196b SHA512 5dc4ad3bf127b52853c336b2551e02896203d6037408716590545e3b8d34f34bd5ec5aa15842cc76edb9c34851a980e39ed6c92426cf2915bd5aeac7b11c82b9
+DIST glance-23.0.0.tar.gz 2095878 BLAKE2B 9c47dc3005828d1d6e8e194d641abea67d1fc05cb4fd76a4f70c8906a036df2c5501984e1f81050e0c8719410b6226a699ead8b91a9ae14a9a5cd491743d3adf SHA512 97c11c95c8957fece373f009644e192468b0e2f74bd8ed78e5a99c549890a432c96e4a8a85c66bbcdac1278b3a2db1c3b7a01f779cfcf939a830557414f8cc14
diff --git a/app-admin/glance/glance-22.0.0.ebuild b/app-admin/glance/glance-23.0.0.ebuild
index 8d978dd5f..e80aed76d 100644
--- a/app-admin/glance/glance-22.0.0.ebuild
+++ b/app-admin/glance/glance-23.0.0.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_8 )
 
 inherit distutils-r1
@@ -12,6 +11,7 @@ DESCRIPTION="Services for discovering, registering, and retrieving VM images"
 HOMEPAGE="
 	https://launchpad.net/glance
 	https://github.com/openstack/glance
+	https://opendev.org/openstack/glance
 "
 SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 
@@ -20,41 +20,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="mysql postgres +sqlite +swift"
 
-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}]
-	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-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
 	>=dev-python/defusedxml-0.6.0[${PYTHON_USEDEP}]
 	sqlite? (
 		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
@@ -71,7 +38,6 @@ RDEPEND="
 	>=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.9.6[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
@@ -87,7 +53,6 @@ RDEPEND="
 	>=dev-python/keystonemiddleware-5.17.0[${PYTHON_USEDEP}]
 	>=dev-python/WSME-0.8.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}]
@@ -99,7 +64,7 @@ RDEPEND="
 	>=dev-python/oslo-messaging-5.29.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-3.6.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-3.8.1[${PYTHON_USEDEP}]
 	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
 	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/glance_store-2.3.0[${PYTHON_USEDEP}]
@@ -112,6 +77,36 @@ RDEPEND="
 	acct-user/glance
 	acct-group/glance
 "
+DEPEND="${RDEPEND}"
+BDEPEND="
+	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/testrepository-0.0.18[${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.8.4[${PYTHON_USEDEP}]
+		>=dev-python/xattr-0.9.2[${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}]
+	)
+"
+
+REQUIRED_USE="
+	|| ( mysql postgres sqlite )
+	test? ( mysql )
+"
+
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	sed -i '/xattr/d' test-requirements.txt || die