4 files changed, 39 insertions, 66 deletions
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index db639f5c5560..7b574d144fd1 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,5 +1,4 @@
-DIST cmd2-2.4.0.tar.gz 680118 BLAKE2B 09f4893db7587dce9fd59103f8a1ef54c2b61248dd4aed313a90a390bb50e8927ef7a11dc5ca3af90b5ccf36ce16e0e18f3b555cc961a8c6862f7b8131f190ae SHA512 4ecd4c71294bee86f02b39a588c42a7232309db54459c950f77734926dedc3ec273237b9615bab6ef8a499c65442e3d6f7d2e9f159ccca021db0b450435ffbc0
+AUX cmd2-2.4.1-py311.patch 1303 BLAKE2B 611d6270470b838cbe7551ac1019323217e7f3d68efe9c17d81a09a2124707f63af51ef5ed7adf0b3e8e6548dc7c55f5d1be29258f5e44d1be03d59ba583b482 SHA512 1e7893e4c2c0286dfe29d7688200a1878069cad46ded7d4ba8921944d47a5e3626324a5cb59ba38ecb20d8bfa87ecd5e5105295595982a33f44a3cd4ae1fe887
 DIST cmd2-2.4.1.tar.gz 676903 BLAKE2B 10b27d7658ee366d44d5fd13a4daf3adb65537043e0475e4c30b5a3b5e142cae982515f033e52fbd63bbce583ffc64e7b0a032d4cc0bbca76303720ecb2a8232 SHA512 862ff0ed301dc8fd588fb564602b32c9e8dee1dcae9965b0ed4605acc98b63ca5767b28c0030410395fb34ea1a0c7cf966972c19b75b93c1a3a3b90b582279fb
-EBUILD cmd2-2.4.0.ebuild 1480 BLAKE2B bfc6bc865af4ba2d333cfd54c765d5af146ef0cab8974408e29821168b24211c5593215211d4242c8021c2374b6b9721092f34d75c42490c089fe3539ae48c69 SHA512 872ff54658926538c30086fec4540ceb5d900a4553b053112f6906001a01087b6143e281cccd277c7e89f669fadc521aa8679d4f870dfea7ac7c122a2e798a03
-EBUILD cmd2-2.4.1.ebuild 1491 BLAKE2B feaa836826f429cff1402fea3418f05a82fc8ccbb4491b52b2ff03e8743b95581e52d31a5a161b095af7ce5f48df1f33557516ea11925f360c7d6c99f7f2e96d SHA512 77e05a4f02192d126b4cc6d337dc969670b50c1a43006bdca314564a27024f3e9252547aa3fa7d6d21adbe7b6dd3c844eb99f33cd50f1a1ed3a86c0a70839083
+EBUILD cmd2-2.4.1.ebuild 1546 BLAKE2B c0cc684936461acf7ea790dac74b03c186674ee6a7650a8826c676487bb82f53a4debcc663ec5152473566a962fc89226239c7e4b762a6448c3e8d98d67e5d02 SHA512 5f7769893acad0d1bc677c5304c1ae14fc7dfcb0132c70762bb61e18aaba5ccb176e6ce0e383ca4e237750635f1ac206943aed82f42a5c1a7ee551938949d3eb
 MISC metadata.xml 522 BLAKE2B 39d319b6a64a7b54568a3fbd3d7db9adf7719b690a8f086018ce41f0595db157b1f7825ce28afb4fb0d748ca0d6dc21d79e480361b69b4bf29c0efc2d2540bba SHA512 57315c23dd64534085502e59f0b8ca01ef8088d5a2b16ed807631a1f36a523768960754b00619e802333552c405e2984e314d91003f7a624da6f1eb8e8e4b98a
diff --git a/dev-python/cmd2/cmd2-2.4.0.ebuild b/dev-python/cmd2/cmd2-2.4.0.ebuild
deleted file mode 100644
index ccb5d6207f86..000000000000
--- a/dev-python/cmd2/cmd2-2.4.0.ebuild
+++ /dev/null
@@ -1,58 +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..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
-}
-
-python_test() {
-	epytest -p no:pytest-qt || die
-}
diff --git a/dev-python/cmd2/cmd2-2.4.1.ebuild b/dev-python/cmd2/cmd2-2.4.1.ebuild
index b3c095fe347b..d14b273ef06b 100644
--- a/dev-python/cmd2/cmd2-2.4.1.ebuild
+++ b/dev-python/cmd2/cmd2-2.4.1.ebuild
@@ -4,17 +4,20 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+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"
+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 ~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}]
@@ -27,12 +30,11 @@ RDEPEND="
 # 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).
+# preferred to it is available (i.e. xclip or xsel).
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		sys-apps/which
 		|| (
 			x11-misc/xclip
 			x11-misc/xsel
@@ -42,6 +44,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-py311.patch
+)
+
 src_prepare() {
 	distutils-r1_src_prepare
 	sed -i -e '/--cov/d' setup.cfg || die
diff --git a/dev-python/cmd2/files/cmd2-2.4.1-py311.patch b/dev-python/cmd2/files/cmd2-2.4.1-py311.patch
new file mode 100644
index 000000000000..c0e9da528a08
--- /dev/null
+++ b/dev-python/cmd2/files/cmd2-2.4.1-py311.patch
@@ -0,0 +1,26 @@
+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]