gentoo christmass resync : 25.12.2020

3 files changed, 2 insertions, 52 deletions

diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 99ffbcf95dd2..c2a69914a6e0 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,7 +1,5 @@
 DIST cmd2-1.3.11.tar.gz 657770 BLAKE2B 829023a4ebd2c2034dbbcd276720476ef9e19a0869bdd2dcc18f2b7cb58bf7c9874b9c56c60d6ba15f7458327d768bce5f07890054361b58574697cf8408cfd6 SHA512 bd640a38723cfb7886b74631ded288fee87026fe718db48ea71a1eb3cb61cea514dda2c4ccd1df95b5ade3c8f8a4a14be3dd9d6722c59260a5fe7c4dfba30f24
-DIST cmd2-1.3.8.tar.gz 643320 BLAKE2B ca9eb089c4d1a5922d3f762e9fe118168349c807b770265d2e565a183447b938f08da578e0dc7de4a59a52fc39df2b53a63c84c1d86efd75c0ba58950bbe9a9a SHA512 af2b56234e0b257c4de564d46f4be83b56c37fd903ee737e825779558e44a9b60164bac1c0bc35a79c8aa1ba80155331c496c310e5ecad94f984673a30ef6976
 DIST cmd2-1.4.0.tar.gz 660494 BLAKE2B 1a7d5efef704cf3011affa99303233ad9d16e09d16bbe9319324599e6d69b1a664556e9ed406f2a34bfc6021a6d1607a44fd4df9cedbd6688826e0bfe8d91b77 SHA512 1f35e9773578a1d2ea1255cd697754b126c1e90486e84319c0f86ee409ed22bfbc267ff1d3b9af1072985337c9cbc51eac4e288281146d9c20b54c8b364f1547
-EBUILD cmd2-1.3.11.ebuild 1235 BLAKE2B 52cfa28ff67f559ed4af995bc77dd001c6f8f0c6239f70c52eca0077f1547b13c871b93b45fd1e3775bc7c8c5747fb9bffa47497cd7a6093d96351d6af5fea9d SHA512 9fdd2a70ad330ab564cb36ae8ad9727a893a0a67d5159b0e5fe8d893cf0889049e5256522b138de8ec9e2a96493600075814f77b139dad80c358e888c3688b57
-EBUILD cmd2-1.3.8.ebuild 1231 BLAKE2B 94e7f09cb9e2fc73c5e831ab193be8a723cc66fba42dcbdbba7f51e2733f6b736ba6117366a81eb35fffcf80329201ad4a1280ea1dd189ee3b96c926c268c2b1 SHA512 4a746cb023b3ce7afcc383bfa1a4abae0e5be4b0bb3ea90649e474fecb2a16b7c7767b636a3c8ab7150ec75c3d2dba80a07e055720d7f900020a5ccfb6f10879
+EBUILD cmd2-1.3.11.ebuild 1231 BLAKE2B 94e7f09cb9e2fc73c5e831ab193be8a723cc66fba42dcbdbba7f51e2733f6b736ba6117366a81eb35fffcf80329201ad4a1280ea1dd189ee3b96c926c268c2b1 SHA512 4a746cb023b3ce7afcc383bfa1a4abae0e5be4b0bb3ea90649e474fecb2a16b7c7767b636a3c8ab7150ec75c3d2dba80a07e055720d7f900020a5ccfb6f10879
 EBUILD cmd2-1.4.0.ebuild 1137 BLAKE2B c467d24e0ec9fae72f2b91f64a40752c82500e15b2bdcbeb8abaf4edae92ce5eeab2e3a23794b84d2f605af7b3d73f21258e0a7ed7918b1e014796a460ae8485 SHA512 6cbb1e031fea9e97e3414229edddbf3b6b309dd09595258a70effd7e5b2b81956368c3310b23a5a001b4e97251125d460755630c786b9c48ff2586c959f880a9
 MISC metadata.xml 521 BLAKE2B 0246c37d4e3d54c54b632fc75eb51b0b6e1ff3fcf6be8218a958c9483fb0248bfa3238ed31ab9631f41b12bdef71704649423bd2b44a322ec0b4cfb20a6026f2 SHA512 6a94c23d403d07e6d8e980e4c11ed1a1a0de4707417d60b539a4acc50312d1a9604d9d7ee55dd232c51c8fa6fc24f10bd28e9cc80e2a6f143086da448f78f924
diff --git a/dev-python/cmd2/cmd2-1.3.11.ebuild b/dev-python/cmd2/cmd2-1.3.11.ebuild
index 878df1db58b3..cc2ca4a9c220 100644
--- a/dev-python/cmd2/cmd2-1.3.11.ebuild
+++ b/dev-python/cmd2/cmd2-1.3.11.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 ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/cmd2/cmd2-1.3.8.ebuild b/dev-python/cmd2/cmd2-1.3.8.ebuild
deleted file mode 100644
index cc2ca4a9c220..000000000000
--- a/dev-python/cmd2/cmd2-1.3.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-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 ~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}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:test_which_editor_good:_&:' tests/test_cmd2.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}