gentoo resync : 06.04.2022

4 files changed, 2 insertions, 86 deletions

diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index f0be206d509d..1fe29ee2ccb5 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,7 +1,3 @@
-DIST cliff-3.10.0.tar.gz 82636 BLAKE2B bb0031a96cca3bd6f7c806c394133ca81e0fad56c65361c3643a32d96d4136228972af2b1567489b4cbb669f9008f0b1dd9eecede73b294097ab3a781ea64443 SHA512 52064ca1144cbf5e76b3654924e00a6e12c70707a3d4f7cd9c0bcee514a29c47626152cfb558d46837a967f5e0f827a2af291b4532e383fc7fc3abb616b01803
 DIST cliff-3.10.1.tar.gz 82764 BLAKE2B 88e8481d23f6ad35acac9fd17b1e4930f31ebc13211ad5bf1db441dbe4ad99faec023b6a46640d0fa3dbac4d76f4fd9d9fd3cd1e6c319cab390d502c9adff53c SHA512 2a1eb1f5311eb92ac481b35e0f703bb37171c9c7eee68a3d8322786a802d562d990ea8e3e52e924215b2ff8c3f14614f99ea403d94bfa2ea3794ab3556baa0c9
-DIST cliff-3.8.0.tar.gz 81862 BLAKE2B 3a8219f822fdf14e1de56204b0f536a92d27be5a99fb628f3aed5b569a1e703d4711bdded28fa42c0692316454847ba3338baac8efae873540652e46d155227a SHA512 002e3ddfb254c5369582cc28572856a8b4ad05d598a7f8aa690add69f49cabb12ef2ef17b6c1553792aaee785b7c1703b05dd9d4889271cd5eba5629fad3d09b
-EBUILD cliff-3.10.0.ebuild 1161 BLAKE2B 88c88e4df86f78d270210032203b64347e1b128417cff8b9865ee7af61422dbe700ae1c372c908830ef01547c4cee8d7f9c8593d27131e74fd389360e7a5a5b5 SHA512 585ca1b3755919ede05442cd7257b3f21b8d75c386922820b3937915479564797da8555171d70656f1d0fc27315e3135d451b3ecadea28112245f881797264ac
-EBUILD cliff-3.10.1.ebuild 1034 BLAKE2B ef1163f2f51e348603a03286147f0e44e7aa3609a02978e5efecee16d81b58a38f29ceb1731389f452b7c08bf6bd84a3c33bd5534d260c616121d6966c05cd93 SHA512 9bd5e94585a0720ca3fb74cfec299a25b35fe5f4b11d302dd5e99c000b41d4bcf6cb14abb3963e5a32c53e9381a3cb2c77403dd6f929d865f597daa51785c573
-EBUILD cliff-3.8.0.ebuild 1162 BLAKE2B 437d306a8b53ed989eb8118c33f8216cdbe2643a48f8f444492b50ec96113ff376c7709434eb9017521e2d5f83673f88b440ed2b112fcf67cde91a39d9d3db0e SHA512 61dfc0762c58b4dcc8ee498a5f3f6199786a33d35ff1563edc7af5c2f106af832b60a2dd9dfd080d65cbec0f265174790ee63f5d6bc9022c657d2bd0172d3e7d
+EBUILD cliff-3.10.1.ebuild 1030 BLAKE2B e6ef060072f8b3023b98bb0784df647dfaedec1bcdced3412f2a5ec05ed60f3d2a6292e0e9a91384eb6c73b17a02d5421abb39e4f922fa9faf2dc42ba1c66db4 SHA512 958f7544cde454bffed6e6362a87b534a406c27a1489e41279230c6c2749f2c8040397af07549ae417e18c0f08f65113f5b7cd1e0b52db74ead041026a133f93
 MISC metadata.xml 767 BLAKE2B d9d994960046172167f20f59073011b2defe84e94144386db5465a973050e48e05abccff88d7f84cbe9f20615eddc5b61a46920f8b27c4dc9b2587f762f3e368 SHA512 018a0bfac3f0126341207d16203fab4a666b17d8a5dcf9f101335c396797f2e724e2250910fca39e12cb6616614983a756a42dac03aa215d2a1b51af5246269b
diff --git a/dev-python/cliff/cliff-3.10.0.ebuild b/dev-python/cliff/cliff-3.10.0.ebuild
deleted file mode 100644
index 363fbe358011..000000000000
--- a/dev-python/cliff/cliff-3.10.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-# TODO: revert to rdepend once this is merged
-# https://github.com/openstack/cliff/pull/3
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/openstack/cliff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cliff/cliff-3.10.1.ebuild b/dev-python/cliff/cliff-3.10.1.ebuild
index 2a06faab3f16..984a8675bd1d 100644
--- a/dev-python/cliff/cliff-3.10.1.ebuild
+++ b/dev-python/cliff/cliff-3.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cliff/cliff-3.8.0.ebuild b/dev-python/cliff/cliff-3.8.0.ebuild
deleted file mode 100644
index 0fbb09d634f2..000000000000
--- a/dev-python/cliff/cliff-3.8.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-# TODO: revert to rdepend once this is merged
-# https://github.com/openstack/cliff/pull/3
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/openstack/cliff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest