gentoo resync : 20.10.2021

3 files changed, 2 insertions, 56 deletions

diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 49a0aeac7878..b4fdc26a8106 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,5 +1,3 @@
-DIST cmd2-2.1.2.tar.gz 660849 BLAKE2B a8c8db8036badc020b34e6d4cc62a6828a6f3788562d550826369d2ce6ddc41fdd29ab95bd56d35115a1e8c2cfdb6df97e3b25c3f414798aed9a597243b37967 SHA512 3f2edb336ec662e3b2e22abc947ffb669786142d29f0723b0d5bbf898ecff12096a91e08c4890dde79915b413c0f9a70945f1b5795ae12991e85d7ee79331d31
 DIST cmd2-2.2.0.tar.gz 667076 BLAKE2B babdf4034ea45cebce0a9b037e0bef0127c924e358c68ab6a2b95e73ed3be4577dead28d2eebce721432fefe7d2590a3e904ba84dc17bf7c06e3f777dc7b0db0 SHA512 20c204c5e5996e18face62066a179a9833c468724a947042a3b5aaf49940cad0c773ea22e7f40b8c721f7362dcefa9eb72072710072e608c4adab615332bdc22
-EBUILD cmd2-2.1.2.ebuild 1396 BLAKE2B f0db3323872e7458f585c77feca7f96c5e1493ed2ba9657886980d750fe8427310ddd7a5c108f22fc871059838d66bfb936834f524e7f10e5c2981d514822b00 SHA512 3bec60118673c4dd6d7a2390b0c95855bb4a613730417321e34a07d99f2754ced989ffc6cb7698485cfc7db9afc9a427a90d3167f0d36ea12d216e896a6bcaf4
-EBUILD cmd2-2.2.0.ebuild 1401 BLAKE2B 3c79e282225eb4c9624d802f3833194243f3dedcd49b1678ce707112e0d283e105b93ecc49b025d7713a7a7eddb12f404c23d58475977f2f063035ae913bb73f SHA512 809faecf21532bfee68d55a8f25079a41cd931d5992f43fd944f5dff8090d77555154052473b7add563876b07ad029bd57a3ef828ad8d9a3c31ee86debf8dbbb
+EBUILD cmd2-2.2.0.ebuild 1396 BLAKE2B 2a14076f2fb23f65fa8a50330df0c89c90aa33a9feb989f2782c6ec24a56556f28f7233ef0b682cdc9e4a3de1bb3d77fce380598d7cc1af9036aeea272457747 SHA512 e2c80c7bf92acff359ab6399154553d49de4314e5eb6714ec34dd7cb2657bc1c2902d0ac4dab269a9f5d087e0498ae2d51618fa8e4963c307b9c0ab3cd76f4c4
 MISC metadata.xml 522 BLAKE2B 39d319b6a64a7b54568a3fbd3d7db9adf7719b690a8f086018ce41f0595db157b1f7825ce28afb4fb0d748ca0d6dc21d79e480361b69b4bf29c0efc2d2540bba SHA512 57315c23dd64534085502e59f0b8ca01ef8088d5a2b16ed807631a1f36a523768960754b00619e802333552c405e2984e314d91003f7a624da6f1eb8e8e4b98a
diff --git a/dev-python/cmd2/cmd2-2.1.2.ebuild b/dev-python/cmd2/cmd2-2.1.2.ebuild
deleted file mode 100644
index 07dc1c91ef82..000000000000
--- a/dev-python/cmd2/cmd2-2.1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel) + which(1).
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		sys-apps/which
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e '/--cov/d' setup.cfg || die
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-2.2.0.ebuild b/dev-python/cmd2/cmd2-2.2.0.ebuild
index c892c9da8cf5..6603d301f98e 100644
--- a/dev-python/cmd2/cmd2-2.2.0.ebuild
+++ b/dev-python/cmd2/cmd2-2.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]