gentoo resync : 28.11.2020

3 files changed, 2 insertions, 64 deletions

diff --git a/dev-python/oslo-vmware/Manifest b/dev-python/oslo-vmware/Manifest
index 069d7f6a843d..93d311371547 100644
--- a/dev-python/oslo-vmware/Manifest
+++ b/dev-python/oslo-vmware/Manifest
@@ -1,7 +1,5 @@
 DIST oslo.vmware-2.32.2.tar.gz 334130 BLAKE2B ba1fcec92812613fc202afd8d5eab3c4de65f2451bf17dbae383dd6176a0fda73d1661c1d066e3c9fa24686562c46b0b8927f359632d8f2f94c9d3d185ef802d SHA512 2f18f38590221a14e876607ccb9b8d1b5f25cca1e714c3256980b1f818ac1a1d2f9d3f1418bee7289b1efe01bfff1ae17f76663eb4a96a90e4d17a05dc39e91f
-DIST oslo.vmware-3.3.1.tar.gz 334352 BLAKE2B 54fecc7ea66aa36091938ae47f4cf9c59eba9ae06644ee77d7a1caff11d59c4a2da2ed93c908735b9e8478e9bfcfde5db49a16134f78d898026cf447a4251d1e SHA512 db816da1c472ae861a3a28e17bf87c70fcb41c8f982bc461ce9e9c1c5607b84e5a72321f5f4761c6646c3b72335e450872f872d90980030d8f014e1f1d08ec46
 DIST oslo.vmware-3.7.0.tar.gz 334704 BLAKE2B f3dd399a1cc53904070f687e1d16915097ed78147270e32c3ce71ff7621c19229a5ad1ff345bafa794567a41d83bfa613f87e07ee08f04b90b62d403be0cba63 SHA512 e9a1b0303b7208fd8071ba5c2a677ec09568cd837489d329667f9e4eb93b5aa56490fa1cda9b7927f6ee071c5b44f302742f80bfeab9812d38c3c6376b5d117f
 EBUILD oslo-vmware-2.32.2.ebuild 2303 BLAKE2B d8fce2f54cdca73a9df23990888f3daab9c11a6ae08caf9bd22e2abd36d1996cbfe657e6624d821bfaa5415c356cac906b2a4d093b54cab995d1d29f064d7a1d SHA512 2a54eda44ed89ef024ac776356a4881db247fefefe289ba9833bb0813f5121d8d91f88de700d376a8d2952f677953aa2447786365428f4aeaccb07e80da82f87
-EBUILD oslo-vmware-3.3.1.ebuild 1971 BLAKE2B 1f5bccfdbede69b046ef2e503e03adbb066657fa606348329b9cc4d6d11e34da7f80662869de06a8bbf78e3fc0c3c96df7d50e51ff3b840cc7aef7b647a173ff SHA512 4ed31fd80192c60b8230009b0698b2cb5998a090d5b9b1fdd8c134252fd43318c00ea86fe6b9ce0e3e35d9c26f27828bec2427ada929dda14f16c88ad86b4e44
-EBUILD oslo-vmware-3.7.0.ebuild 1331 BLAKE2B bd6fc6a41664b0512c5cc8013e2439a46e5c385679a63cbe28daa33528b2e9560a34fa523ce1d191192d9d0d97ec2d1433a5309789cffa6c0252e90131ba9b41 SHA512 8db69d2ab0d467e9258e1976dcc3bbc6e9d661a9a17324e673727fd83f4d5d6bf100d803e49bbaf349cd35774cf15d7090282418040d242785d70e45a81cb0bc
+EBUILD oslo-vmware-3.7.0.ebuild 1329 BLAKE2B 6000318631a4f9106b3a37eba7e3f4b41027b3d7b171e5d2bc00626b049065ea5e4645bc74a8a27f5ee9401e95245083512dfb287db2c2d762a35fa151db10fb SHA512 13efca58e6627be24a2fe8aff647726fe045eaac4f27c0ae117221c929ea345fd3ce8a2a2551444a22df4a67ec5320429360d4a346fd13910524bc393870b7ef
 MISC metadata.xml 593 BLAKE2B 12ae5b1880121a203586e9d26052867916f2732343a66ad6e4348d7ce42da481ce8bcf145c812758e125b9fb381c4cab20fba42f8a90270e8d5c113844ec2d98 SHA512 f5e0c0510412e6d1c8436b6496870b0c9400ee1c91915f0cfb77a7276d0a39c248da1dbf2641597a4f4ece5a8641a1c2973788544062defca3b0b6127a6e033b
diff --git a/dev-python/oslo-vmware/oslo-vmware-3.3.1.ebuild b/dev-python/oslo-vmware/oslo-vmware-3.3.1.ebuild
deleted file mode 100644
index bce097ed10c8..000000000000
--- a/dev-python/oslo-vmware/oslo-vmware-3.3.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo VMware library for OpenStack projects"
-HOMEPAGE="https://pypi.org/project/oslo.vmware/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.vmware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-"
-python_prepare() {
-	sed -i '/^suds-jurko/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-vmware/oslo-vmware-3.7.0.ebuild b/dev-python/oslo-vmware/oslo-vmware-3.7.0.ebuild
index 78931690dd45..f1b82506ed5a 100644
--- a/dev-python/oslo-vmware/oslo-vmware-3.7.0.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-3.7.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.vmware-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]