gentoo resync : 06.04.2022

3 files changed, 2 insertions, 83 deletions

diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 8ce0e0e31b0d..794fce35675e 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,4 +1,3 @@
 DIST openstacksdk-0.61.0.tar.gz 1029483 BLAKE2B 5add768f12bc42562bcdaddf0379e1f59af80b34c5a7f808aaa7469788a685b093b47a4c2a8a771f6cf426f6ac11e188fca0843aaa5173266f3c69a0ac69c4f9 SHA512 6f02486b9de8c540cf43f49f55b67dede34a24a96229d42b43aa215f6286566579f726b53732a9b3b952cee5df1fa8d3cf2f6ccc7c0ca7f9a1a96888640ff734
-EBUILD openstacksdk-0.61.0-r1.ebuild 2625 BLAKE2B f1c6a27554c53f1e77223ec3c16920ee3bd8e281499b5d9b53bb78e89e01524a650a9ca56b14d8afadb7d946af4442126dc8beba56dd331deda996b2b6ab7962 SHA512 9075a98ba1a70555f3ec2b683cf36c90c0c14d4091d827bcd260961a2c99347fba6268fb9fe9609d09bf862061f3f26675f188cd1f0b0ffc4b66f2321d580ef3
-EBUILD openstacksdk-0.61.0.ebuild 2612 BLAKE2B d991f8ee79b1dc1387a9826811c4cf71f9a42b9a71592bbe4b56ca60bf2ebf647ab3280b6e5b7a5cdbf93c01266de3cad6ac7eae2a9c9a87d6b529180eccc4be SHA512 2b3b5f023ad4b40ace4a426295cf6eaaf25f5472b26abbd0868dc419f4d96c0127fdaa4c1a0bcfb82be3d404c3f4decdd69e89151b7e29acd86feb5ae77b2df2
+EBUILD openstacksdk-0.61.0-r1.ebuild 2622 BLAKE2B 7cdd297b2b2f0bcbb710bf80c9e41545e4d5258250adcbb91342c872d34658add7827a17c6c64e1513ddf72fa4ef18a82605f1a535ba8813c651505a12efbfcb SHA512 ab1d8911500f274961686147f1e028d1974480b434bda034880bce8afb77ef160d2d7643bad5a726f3e4fc4ef75921b2c399883a5137252b77e71d0c0e6c0568
 MISC metadata.xml 517 BLAKE2B 661ad1e9eae06e7b36a5ff753e73bd4434042966cff3fd6fbc11bf70a1acc3eb8de29ad2a033d6d715e1152a5454d84077e99db3b588199b317f925864dc1403 SHA512 e6dbfbb3546c2a62b204b33ebb3bb33611079698212f098bd4da072200fe43e3bb350cc998b255ec4a15aa2ff3a04c89a9553dd7930db48e658dbcaff78526d6
diff --git a/dev-python/openstacksdk/openstacksdk-0.61.0-r1.ebuild b/dev-python/openstacksdk/openstacksdk-0.61.0-r1.ebuild
index 6e6dbaa5bb04..52ad9fbcf7da 100644
--- a/dev-python/openstacksdk/openstacksdk-0.61.0-r1.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.61.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 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}]
diff --git a/dev-python/openstacksdk/openstacksdk-0.61.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.61.0.ebuild
deleted file mode 100644
index 8d37e11c56e1..000000000000
--- a/dev-python/openstacksdk/openstacksdk-0.61.0.ebuild
+++ /dev/null
@@ -1,80 +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="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="https://github.com/openstack/openstacksdk/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-CDEPEND=">dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="${CDEPEND}
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}