gentoo resync : 06.04.2022

4 files changed, 2 insertions, 122 deletions

diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 5d52213e3a1f..b0e285643cf1 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,6 +1,3 @@
-DIST keystoneauth1-4.4.0.tar.gz 266308 BLAKE2B 471b6662c27b5cc36dfde76e17f6855d5e840280a05c5c23bbda97b2e75b8fbc44e815994de514a475424476ed4d627930f993ed5fc7109fa3a2a99acf42dde2 SHA512 208b02c8df8a5cbdad1ca66c665d547b375eac2fa0d3aeb6dea3f9ed7ba0e799568e4407b8771df5a362d4275fb6a9b2fe2e3a9287b3817da43463356bc593a3
 DIST keystoneauth1-4.5.0.tar.gz 266418 BLAKE2B cd56e6d62e185ded667b2e9a53478e65fdea7eea203e3598193b34137297a5b75e315433882a08d16f360936208eb55c6d4e5c80e64161f1ce00db2633e59d7a SHA512 eebf9f15624d4544351b26e80af4023dab3a60ad2848b14c1cf6ab4deab50d2c9812747f3e737aacd9e49eacaff3960d8cb1432067d2648d7d2552fdad907457
-EBUILD keystoneauth-4.4.0-r1.ebuild 1796 BLAKE2B 05d8f80e43c39615fc80c06af39d269a652c6c79e29dff0c16e77eb2bfe61a04b68a83f41ebf8ec0cd0d73030a0987ff168b439c70e2a8bfd895861bc3791ad4 SHA512 ec0028c09785bf6cbacec676580c7a6e46757b9c74f7b95eb9ed24390dd92dc59b1f31a49b3ceb57d76ebcba3ece6f64467a03b690d677f7535a40c845bdfa13
-EBUILD keystoneauth-4.4.0.ebuild 1774 BLAKE2B 16762466eb36990fd9c88270f55dd24c6d615762be75aaa3111654a9b7ff2e25b287a3c4568287d579868286cec19cebb6d17ec3215597cbe7fef99832d84d6d SHA512 20d8cfac67b9b6d3b054fcb9c42264cb23488267ad3f3f55e8bf9195cf072ca96f6a57edfeaf11ee3b9ee12d7b8d533423d0dd294696f305f1ec53972b801296
-EBUILD keystoneauth-4.5.0.ebuild 1795 BLAKE2B f25b46ccd0d4aa806cef0c8ec8d70e0f38c2a23f04cbf5958dfd6cdb49f9ec06ce235ad96ec28da432fa40e385191f09cee63a2b8eb2164fc80d26c94144c1de SHA512 6a60a114eda593f1d93defbfced5e2469ec13af6fad61046ec2f550d19fbe3ada56db087d7c8d13a0e22d51ddc4d03723f9cb7ff249155f71b719a12730063bb
+EBUILD keystoneauth-4.5.0.ebuild 1792 BLAKE2B 8d6e3f459551b0c39eb6b262f247385671cdfa6bedf68ae7fe05f0f72ab7c2a12ec148b37a876a0973adbf09d011c2ad7317429dccc1134940b615a7860559db SHA512 c3b0c4d2ad7e9f7fc855a792d40b8efa8dfbc5074f1ad27e6dbd3df76001f02d3f2425e0ef73aec232feab45307cde4ac2576a3cd342f381051b32d7995ed1d3
 MISC metadata.xml 518 BLAKE2B 8a84b6a7146096e67c0517623f0680cbe7772a48d8167b1aaf34dd12f7f626c84e60c0a15b3d90ae9df6483c33d7b51fc5cbf51d35e4f409e04573eb8fe18d1b SHA512 9a5b7fe8f29deed8ed59d6b3a96cfbacd5b566d6aa6eabd55545f02521d3dcc7ef7347632cdbead0735d28004ffe55a18550ee45cf8634253900f0190f140434
diff --git a/dev-python/keystoneauth/keystoneauth-4.4.0-r1.ebuild b/dev-python/keystoneauth/keystoneauth-4.4.0-r1.ebuild
deleted file mode 100644
index 3ca12335eaae..000000000000
--- a/dev-python/keystoneauth/keystoneauth-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud"
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-CDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# relies on specific test runner name
-	sed -i -e 's:run\.py:unittest_or_fail.py:' \
-		keystoneauth1/tests/unit/test_session.py || die
-	# remove the test that requires hacking
-	rm keystoneauth1/tests/unit/test_hacking_checks.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild b/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild
deleted file mode 100644
index b9dd7b905ece..000000000000
--- a/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud"
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-RDEPEND="${CDEPEND}
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]"
-BDEPEND="${CDEPEND}
-	test? (
-		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# relies on specific test runner name
-	sed -i -e 's:run\.py:unittest_or_fail.py:' \
-		keystoneauth1/tests/unit/test_session.py || die
-	# remove the test that requires hacking
-	rm keystoneauth1/tests/unit/test_hacking_checks.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/keystoneauth/keystoneauth-4.5.0.ebuild b/dev-python/keystoneauth/keystoneauth-4.5.0.ebuild
index 3be77a24f5f4..af58d970b6dd 100644
--- a/dev-python/keystoneauth/keystoneauth-4.5.0.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.5.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 CDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]