gentoo resync : 03.07.2021

3 files changed, 2 insertions, 44 deletions

diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 684a97a8b818..9921d7a8017b 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,3 @@
-DIST cliff-3.7.0.tar.gz 81853 BLAKE2B aab3ad056c13232978e93b380d9d0d48748778f403b4200c09f92bcedc6c2806213d81612aa453277e2c99acc5959ad666ac888d4a0726f50a5c0f04be0e9fdd SHA512 d3cf3ecc6778bbc676e47ebfcbc6be4ee120dd864684da58e476f52d021b5932bf9361ce2aa6a8ee4d68845ba79ec7a9174cfa7f21fa3fa16a945b96c968cc26
 DIST cliff-3.8.0.tar.gz 81862 BLAKE2B 3a8219f822fdf14e1de56204b0f536a92d27be5a99fb628f3aed5b569a1e703d4711bdded28fa42c0692316454847ba3338baac8efae873540652e46d155227a SHA512 002e3ddfb254c5369582cc28572856a8b4ad05d598a7f8aa690add69f49cabb12ef2ef17b6c1553792aaee785b7c1703b05dd9d4889271cd5eba5629fad3d09b
-EBUILD cliff-3.7.0.ebuild 1162 BLAKE2B 437d306a8b53ed989eb8118c33f8216cdbe2643a48f8f444492b50ec96113ff376c7709434eb9017521e2d5f83673f88b440ed2b112fcf67cde91a39d9d3db0e SHA512 61dfc0762c58b4dcc8ee498a5f3f6199786a33d35ff1563edc7af5c2f106af832b60a2dd9dfd080d65cbec0f265174790ee63f5d6bc9022c657d2bd0172d3e7d
-EBUILD cliff-3.8.0.ebuild 1166 BLAKE2B e89da7bdd0205270da5e3fc9e42c6465004edf82c46933f4024a5ad039db7ffc29f93351266442031a89c6b3c5484e7220427cd819dec08feea5beefca6c8a83 SHA512 1931493eea1badeca99161b6fcaaddafc7d4106204e3e9cfc8e6de861976d5e6cc5643d020701b5f96c255b88533ea7699c56a5f904f5ddeceefde5058b6014c
+EBUILD cliff-3.8.0.ebuild 1162 BLAKE2B 437d306a8b53ed989eb8118c33f8216cdbe2643a48f8f444492b50ec96113ff376c7709434eb9017521e2d5f83673f88b440ed2b112fcf67cde91a39d9d3db0e SHA512 61dfc0762c58b4dcc8ee498a5f3f6199786a33d35ff1563edc7af5c2f106af832b60a2dd9dfd080d65cbec0f265174790ee63f5d6bc9022c657d2bd0172d3e7d
 MISC metadata.xml 766 BLAKE2B d1e77f1b381c58cc9d5c004cbc5062bc8b024bbd416ce4f3e44d6fc817252980193d7f3990b4f0248d23d763dc62a489fbc68093eacf8e3e7fd82cb596b6fcf5 SHA512 bdeca590929247212b707d2faf686d70102aae0fefd4904a9bd091e041d926740df1fe0556b485d0947c7ff879c190341fbc3cbca535aa0e2140104a8b618f1b
diff --git a/dev-python/cliff/cliff-3.7.0.ebuild b/dev-python/cliff/cliff-3.7.0.ebuild
deleted file mode 100644
index 0fbb09d634f2..000000000000
--- a/dev-python/cliff/cliff-3.7.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
diff --git a/dev-python/cliff/cliff-3.8.0.ebuild b/dev-python/cliff/cliff-3.8.0.ebuild
index fab20af93f82..0fbb09d634f2 100644
--- a/dev-python/cliff/cliff-3.8.0.ebuild
+++ b/dev-python/cliff/cliff-3.8.0.ebuild
@@ -16,7 +16,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 ~amd64-linux ~x86-linux"
+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}]