gentoo auto-resync : 13:08:2022 - 14:24:01

4 files changed, 2 insertions, 95 deletions

diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index a7df13ccbbf1..b7fe939d112c 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,6 +1,3 @@
-AUX cmd2-2.4.1-py311.patch 1303 BLAKE2B 611d6270470b838cbe7551ac1019323217e7f3d68efe9c17d81a09a2124707f63af51ef5ed7adf0b3e8e6548dc7c55f5d1be29258f5e44d1be03d59ba583b482 SHA512 1e7893e4c2c0286dfe29d7688200a1878069cad46ded7d4ba8921944d47a5e3626324a5cb59ba38ecb20d8bfa87ecd5e5105295595982a33f44a3cd4ae1fe887
-DIST cmd2-2.4.1.tar.gz 676903 BLAKE2B 10b27d7658ee366d44d5fd13a4daf3adb65537043e0475e4c30b5a3b5e142cae982515f033e52fbd63bbce583ffc64e7b0a032d4cc0bbca76303720ecb2a8232 SHA512 862ff0ed301dc8fd588fb564602b32c9e8dee1dcae9965b0ed4605acc98b63ca5767b28c0030410395fb34ea1a0c7cf966972c19b75b93c1a3a3b90b582279fb
 DIST cmd2-2.4.2.tar.gz 677598 BLAKE2B 38b767e70d42125639578a906a6bd0ac737ee1e3be2951b122f91a1a2bfe366ea23db2d7d7350842b667aca7614a3520057f689cb1c253d1c4b11e164c2ee4a1 SHA512 d70d264671db2783526c589199ff74cc70d53a4fbaa1d78636a508dbf8216aefab17f5764bf25b2b86e9c1413e0e61977819fbb0dec59d3209195df522d3fa5f
-EBUILD cmd2-2.4.1.ebuild 1546 BLAKE2B c0cc684936461acf7ea790dac74b03c186674ee6a7650a8826c676487bb82f53a4debcc663ec5152473566a962fc89226239c7e4b762a6448c3e8d98d67e5d02 SHA512 5f7769893acad0d1bc677c5304c1ae14fc7dfcb0132c70762bb61e18aaba5ccb176e6ce0e383ca4e237750635f1ac206943aed82f42a5c1a7ee551938949d3eb
-EBUILD cmd2-2.4.2.ebuild 1506 BLAKE2B 23a67b03214ab67ad0f0f3b442e0ea3819686d557b6af6aadccaf8ca508db20811f5c1fd2061efb60aa4579ca1a212df6247fe72182db7554c1b578f1f162d99 SHA512 5920d3cfbd0c9472d4360b800dc84e8c4b19c558056fbc88ca7a5fec58bdbf9267933cd30b462dbbacaf94601ada12003762ef4c9ff83b33e0eb18ed043456c1
+EBUILD cmd2-2.4.2.ebuild 1501 BLAKE2B 0af67b5f00b54ac36cc557dca49f4574ae327fcd0c714d047677d6fbf619c649984d55f3beee9c0d73d52f13d5c022d8e163d73f751a037613bc73eac8471345 SHA512 5ca4a1205a2d34fb9b932d572f7492b5c1ac884e20d175a1449534c17f9e95bacbd357bf13fb3b4cd373c39c56149e4f3c2d624c333ac011b37325936f78e55d
 MISC metadata.xml 522 BLAKE2B 39d319b6a64a7b54568a3fbd3d7db9adf7719b690a8f086018ce41f0595db157b1f7825ce28afb4fb0d748ca0d6dc21d79e480361b69b4bf29c0efc2d2540bba SHA512 57315c23dd64534085502e59f0b8ca01ef8088d5a2b16ed807631a1f36a523768960754b00619e802333552c405e2984e314d91003f7a624da6f1eb8e8e4b98a
diff --git a/dev-python/cmd2/cmd2-2.4.1.ebuild b/dev-python/cmd2/cmd2-2.4.1.ebuild
deleted file mode 100644
index d14b273ef06b..000000000000
--- a/dev-python/cmd2/cmd2-2.4.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="
-	https://github.com/python-cmd2/cmd2/
-	https://pypi.org/project/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 ~riscv ~s390 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).
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py311.patch
-)
-
-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
-}
-
-python_test() {
-	epytest -p no:pytest-qt || die
-}
diff --git a/dev-python/cmd2/cmd2-2.4.2.ebuild b/dev-python/cmd2/cmd2-2.4.2.ebuild
index 72245e3bb12b..ea9f98775b36 100644
--- a/dev-python/cmd2/cmd2-2.4.2.ebuild
+++ b/dev-python/cmd2/cmd2-2.4.2.ebuild
@@ -17,7 +17,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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/cmd2/files/cmd2-2.4.1-py311.patch b/dev-python/cmd2/files/cmd2-2.4.1-py311.patch
deleted file mode 100644
index c0e9da528a08..000000000000
--- a/dev-python/cmd2/files/cmd2-2.4.1-py311.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c02bb7dce587886fe380704a8c6a6009eb677a74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 21 May 2022 15:41:11 +0200
-Subject: [PATCH] Fixed duplicate subparser name in
- test_add_parser_custom_completer
-
-If I'm not mistaken, the use of the same name for both subparsers was
-not intentional but a typo.  In Python 3.11, this is an error and causes
-the test to fail.
-
-Fixes #1228
----
- tests/test_argparse_completer.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_argparse_completer.py b/tests/test_argparse_completer.py
-index 135d3de4..14c8c1de 100644
---- a/tests/test_argparse_completer.py
-+++ b/tests/test_argparse_completer.py
-@@ -1371,5 +1371,5 @@ def test_add_parser_custom_completer():
-     no_custom_completer_parser = subparsers.add_parser(name="no_custom_completer")
-     assert no_custom_completer_parser.get_ap_completer_type() is None  # type: ignore[attr-defined]
- 
--    custom_completer_parser = subparsers.add_parser(name="no_custom_completer", ap_completer_type=CustomCompleter)
-+    custom_completer_parser = subparsers.add_parser(name="custom_completer", ap_completer_type=CustomCompleter)
-     assert custom_completer_parser.get_ap_completer_type() is CustomCompleter  # type: ignore[attr-defined]