gentoo resync : 25.08.2020

4 files changed, 11 insertions, 47 deletions

diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index ed4ca9e27977..7bb09a849cb4 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,7 +1,5 @@
-DIST cmd2-0.10.1.tar.gz 574301 BLAKE2B f97a60cfeb6f3ba411e64f1f8bc7d51cbefbdc7821764b3a0d65e83d1ec7158f8e585f0585ec6798472b35cb3533f3a35b9113d531d657fc6abd116fe905f75b SHA512 b7cb5b6c191ead56af3b83b19400440f0313b70568a1c838ca3f7d96c9312c36660dee42ae6e59db460afef99366498931f379d75d8a5d0860aff300c0a53380
-DIST cmd2-1.0.2.tar.gz 580329 BLAKE2B 38ab275d651849a5d609bb5e9848eb5b2fd52a88ce121311889909348448809e6b23aa26ad3e170ef97029f25b24794a33976b029928a2fe65c21e6d2f3cad29 SHA512 547757724987cc310daf60595f2c07e7355c4b35007d3ce9fa52c4dc5e83e1b27a7f646ff161cf7d2aac76a396f3ecbac3a738c09f1c01804d513b40e0c0fdfd
-DIST cmd2-1.1.0.tar.gz 605311 BLAKE2B 0816c3975b45c4845f234a746037319213af8860ea8996b6d05e2412e26649be6770d21dab330387037f6284b1f440a29b727c1ac4fed969fc8dbb2f9ac389be SHA512 b8065ec217a588725eb1787d2aedac8c49b8b8196c12848038f91cba73f23e960fbfe5d4b8631b2a57eb1aeaa1a206683b8b71545c1171d6d3101f03fefc0f0b
-EBUILD cmd2-0.10.1.ebuild 1017 BLAKE2B 13f997a9f9782fd3bb1ba1290f9eb563ebea97dcf82bf68a39e333bde66c3ccd894b70c46c2a88d7bc811a0f5e6cba364b386a75db9ebf5379a772530b116d37 SHA512 bf5c6dfc2378c97f93b4f53bc6bc0db59fbd9ddd632683ccad07fc1b8ff301809ee6f2bcc01c87d2953339d064425e8aa4aafc5f81ac36c44191d83ff02d7ec3
-EBUILD cmd2-1.0.2.ebuild 1136 BLAKE2B 48405c71a3be4f53fd60e9df2617c649b986f4f47578386f6bac8132f1a76760a8f4d820a2690ef615c406ea847000d374002f93408452b707c464413bd22bca SHA512 a22251a8f274a414e34d1d880491ab78f5d6a0a8e25f3bd3d628c31c8228d7b6e57b384e075a86c44cbd851b1b2284d8cc13bb7552f30187723379af1de397b2
-EBUILD cmd2-1.1.0.ebuild 1136 BLAKE2B 48405c71a3be4f53fd60e9df2617c649b986f4f47578386f6bac8132f1a76760a8f4d820a2690ef615c406ea847000d374002f93408452b707c464413bd22bca SHA512 a22251a8f274a414e34d1d880491ab78f5d6a0a8e25f3bd3d628c31c8228d7b6e57b384e075a86c44cbd851b1b2284d8cc13bb7552f30187723379af1de397b2
+DIST cmd2-1.2.1.tar.gz 623518 BLAKE2B 69aebdb6350c453001b6101988d9b0d3d96ca7970c54cd59d3aad6e01b3e7133d62b57cb44588cec786ea21818d8c5983e5bc64510e8c6f07627505f14c28651 SHA512 5f7259111ed8f5719c230c33f6131c8464f5500ba14869d26e9f52850ea619c2b97ed950774930d9e19621e98c64b50c67eaff34277cd81463b60f8dcf6f04a3
+DIST cmd2-1.3.4.tar.gz 641801 BLAKE2B 0d85cad11613aec5d58d9130f4edb46b038abe3ba02aa84570cb5c34100d02f7b5d0fa92cbc49a71d3be19b15f5b380e42d4eac28a609fac4f1e9d0c8b85fc34 SHA512 a8fcb7448e5afde392921ad15c0848c3396b91922f10fcee925721860ee74f678fbf43d334091e201b9e6612e4d70825762a03a870f2e4aa1f82a43b37c5800c
+EBUILD cmd2-1.2.1.ebuild 1231 BLAKE2B 94e7f09cb9e2fc73c5e831ab193be8a723cc66fba42dcbdbba7f51e2733f6b736ba6117366a81eb35fffcf80329201ad4a1280ea1dd189ee3b96c926c268c2b1 SHA512 4a746cb023b3ce7afcc383bfa1a4abae0e5be4b0bb3ea90649e474fecb2a16b7c7767b636a3c8ab7150ec75c3d2dba80a07e055720d7f900020a5ccfb6f10879
+EBUILD cmd2-1.3.4.ebuild 1237 BLAKE2B 6ba444387e36ebcc11511c30b0f8cf9577ed63744081deb292a411a2ca195b1c58200f496841390305945d6f0bb31cd993ee98f7ea992e2a51c3adf0cd157f57 SHA512 6ad20be1300967b792426b458dfbb8d7578edf96e8dcc4e592188a62a3e997e2b869bdf04009dc367ebdd53a40ff73d020e3d0683f378263efb5b3be51dd8254
 MISC metadata.xml 521 BLAKE2B 0246c37d4e3d54c54b632fc75eb51b0b6e1ff3fcf6be8218a958c9483fb0248bfa3238ed31ab9631f41b12bdef71704649423bd2b44a322ec0b4cfb20a6026f2 SHA512 6a94c23d403d07e6d8e980e4c11ed1a1a0de4707417d60b539a4acc50312d1a9604d9d7ee55dd232c51c8fa6fc24f10bd28e9cc80e2a6f143086da448f78f924
diff --git a/dev-python/cmd2/cmd2-0.10.1.ebuild b/dev-python/cmd2/cmd2-0.10.1.ebuild
deleted file mode 100644
index e4ce45c0ea6b..000000000000
--- a/dev-python/cmd2/cmd2-0.10.1.ebuild
+++ /dev/null
@@ -1,40 +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="amd64 arm arm64 hppa ~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}]
-"
-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
-}
diff --git a/dev-python/cmd2/cmd2-1.1.0.ebuild b/dev-python/cmd2/cmd2-1.2.1.ebuild
index 0a10ae6eda41..cc2ca4a9c220 100644
--- a/dev-python/cmd2/cmd2-1.1.0.ebuild
+++ b/dev-python/cmd2/cmd2-1.2.1.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}]
@@ -20,6 +20,9 @@ RDEPEND="
 	>=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}]
diff --git a/dev-python/cmd2/cmd2-1.0.2.ebuild b/dev-python/cmd2/cmd2-1.3.4.ebuild
index 0a10ae6eda41..cdd3428887c2 100644
--- a/dev-python/cmd2/cmd2-1.0.2.ebuild
+++ b/dev-python/cmd2/cmd2-1.3.4.ebuild
@@ -20,6 +20,9 @@ RDEPEND="
 	>=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}]