7 files changed, 225 insertions, 35 deletions
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 86b73ce028ae..c3622369c956 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,9 +1,10 @@
-DIST rich-10.16.0.tar.gz 16280103 BLAKE2B af66398a4bc6e3e5503418721906679dc6f964b6dcbb56195f64d0ef4f504d9e0002f8b727c4fba7b42dda8790a03bb12a85150b99d5294712e38dea2800f841 SHA512 48c9e4d0b733cf79e9bceac284ca3cf37c14f52c0f3590f08acd9b0ea791da0200753f3cbae13a619b9c42fdb1167d55724c80123e2935bf2ed7133a15639ac8
-DIST rich-10.16.1.tar.gz 16280385 BLAKE2B dda2e6a64f9ecfe99fdda3a2e24c6a859e25eca48ebc2af63dbea3c8b90f977e10253721e85b876165c9f51c52ceed057e77b08cf2c77c28de67b8a2c49c4617 SHA512 341aa3fdb7fe608d15c867eb50f36fcc250e041a256e4bee86f0c69e7e0f9239c84be88833dad56f05edeb09a734d64f423b9080bd13b88c3a59d958e8ff1f4c
+AUX rich-11.1.0-pypy3.patch 4348 BLAKE2B 3969d19dad3258d95da3f4bb05bef998e7d401ea39574038f573ddb82f6a8820a2daf11e7f1b33306a38641e5c4ed298a91ff6d1c410a8cbac5dd1d4a5bf1bef SHA512 f56c7cc7520ab9de7803983dcad46cb79351ca3e8cf169728cae783de0f2d1bac974099e6ae577bf2e1b668a7827ea58a3d363e12b3beb2c1d5f181009ef1366
 DIST rich-10.16.2.tar.gz 16282443 BLAKE2B ccc7292e265770880539d6a1a6b2e819b45e2e3d4d152f1a16c56f2da74c9a472ae49ea0a4a677ad71c4dd087fade2c415484073b4b2cd86869ad7c43c32b162 SHA512 9cb8b0c8105589db22d7efdc47cbfa20531cd184f07855db4bfafb667299c7d3e520b19e3b33e7818affb7a5674805849ee9f2e770927e285ccd7f4f838982c3
 DIST rich-11.0.0.tar.gz 16293684 BLAKE2B bd38f84a7e0623dc9474bdc369b452fc668cd4756f00f6dd1b185f95dffb3d55f6b95a7f6dfaed5ee1ec5f2d9514af6080835b9ffd010f150005b15afb761d97 SHA512 bf8218ff43a101c4624baff1ecc316eb95912d0b634c41293b44de135ea4c6ead0fa2c6a96ab1403ce4dd80961915dbe7753415a74c7d41fc1f2d227113e9ff3
-EBUILD rich-10.16.0.ebuild 743 BLAKE2B 3f9b348de8da37dae056fdb7ac0284fda112d940a3b8e8a91cef075567f9d3243be1869d17eaeb570b64b113a5e3dbd523423c852971f464de55ff948a1b3687 SHA512 c9a18a846ec538dc6cf9f8763084d17e1c560b2ec9e62845c29ed85156362e497e79b447850e7a2b04a5ab67f732534aa037aca441d6be6b43a3b0bbf7f3004e
-EBUILD rich-10.16.1.ebuild 824 BLAKE2B 064c0fe120f736cd9e063c5ba9f6392eec3020f5d08dc3fd0b604400f71b51b4cb58c2e8c2429d2598958d2bc68c20025845a2a3f2e0a9c9afd004c2047ab80b SHA512 b767c2bb0533d719a96c186d8c244cd8cc80b8a7a61d61ad2369cadfbae43bbdf4197b9a621e222469592816789a08e9181321362a1f8433cb11475703023890
-EBUILD rich-10.16.2.ebuild 1080 BLAKE2B 6742e4db58498f8cfca5907b168ba9d507234e7f1dbc2255c9ff32e9716731a87c1c77b1130063c7cba84aaf9266e3306a01b8a47aabb34334c3e9e6be600cd3 SHA512 d94fff24a57819c7c411de54695c17eed8c51fd16de702785b314589c45640893aff81e476d4f197eb00ca389e7a7d7a78e9265866ec3b63a6be9e3ab0bb3f17
+DIST rich-11.1.0.gh.tar.gz 16295117 BLAKE2B 1d326edea18b1eaad633665c2e50aa789f9eba19ee9b4cb50b94a160a69d12604fdf87d57ffbc903835b6e1e745fe17e0c521801b515ae73c8a44bf9ef17b6c2 SHA512 9da2015a66e0924bdd04deebd8fe8e963151d0a912f78320f8de8e61d656a693595c4feb0ce2436610602308d690ed96c8d10b5c81a9fc12a350b2e40907dbcb
+EBUILD rich-10.16.2-r1.ebuild 1068 BLAKE2B 66f3d38d863fdee5f75219b9b567303d1278772a1126dd4431b9da150f1a84853de0a864107706687bbaac546b30bdef0313165de88abbd13d95265e9c36951e SHA512 92bf2fc9c6449e444201b88dfb616211eb1f1e619237d9585ab8c2bb4b9698940b2b364ecab5579b12d12cbe38fba622ae73bc4cc768e286a63ebda325dfef5b
+EBUILD rich-10.16.2.ebuild 1072 BLAKE2B 3a85a0b5333b724420adc2a8ff611f4200fa15bba5473c4cb99a188263e09d0e162d21ce77e72dd76e05ebe266b79d7cf14c9d72d91a8ac00ea81be4e4dc09ca SHA512 18e887a517b7b921ea17beffab5bd65f691047a89fcb3ff6cd594a595fbf92b7f854e3d2ef6e3c2dc2f9529858b910990490f489225fbbffeacad79db7dad2cd
+EBUILD rich-11.0.0-r1.ebuild 1066 BLAKE2B 489b7e3f2d249e1ec6109f789874a15fc98bbec8e9f1444a2cb160e4cbaa01124776e40642f837dd803f123564cb5540daeedd14f00369c93d38e6d10411b78d SHA512 d2f0876e2fc18b6b798808e303fdd74bc044f2269de2b00da6461f43a831e9475ebbc6542ce0cc7b99c32d8fc21dbc5fee339030b90a255f1080bfb8c707050c
 EBUILD rich-11.0.0.ebuild 1078 BLAKE2B 27f15447f6ede675694532b5d37bf07514cc25bb5dfcb17bf476c9db511a665c6a262f47b96f474cb4ded18efdfb23f1e1b7a8727b3a926959b06f1f346548ff SHA512 0e242ae01743c40d31a47ae340923366df509679d87d87adf6c0878563379038a12adf8e212788370196c524b97e3958c4b170cec74a73e420d099c650fc53ce
+EBUILD rich-11.1.0.ebuild 1125 BLAKE2B 794f8e97600b1d96f76aee438dfbf0489916d1a44d7bfb151ee89cd15aeca6b24457624a9004d88ce396242cab0131d775e96d1a6a25084008aba3a304a51038 SHA512 5591f6952d42c86378fbbf884f73f656fb9389ab3398dfb649c191626a8effb6f0485fcf1602efc0a5e94a376f5dee8ae8669cd8b1ec3f2e7c91871f75e0c90c
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/files/rich-11.1.0-pypy3.patch b/dev-python/rich/files/rich-11.1.0-pypy3.patch
new file mode 100644
index 000000000000..09a7f8022e26
--- /dev/null
+++ b/dev-python/rich/files/rich-11.1.0-pypy3.patch
@@ -0,0 +1,129 @@
+From 8e3a0be6fbb9186fa45cc42ec833d0895d2313ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 1 Feb 2022 12:24:18 +0100
+Subject: [PATCH 1/2] Fix test_syntax not to use identity comparison on string
+
+Fix test_syntax to compare strings via "==" rather than "is", in order
+to fix test failure on PyPy3.
+---
+ CHANGELOG.md         | 4 ++++
+ CONTRIBUTORS.md      | 1 +
+ tests/test_syntax.py | 2 +-
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index 4997ae3..17f3028 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
+ 
+ - Add support for US spelling of "gray" in ANSI color names https://github.com/Textualize/rich/issues/1890
+ 
++### Fixed
++
++- Fixed `test_syntax.py::test_from_path_lexer_override` test failure on PyPy3 https://github.com/Textualize/rich/pull/1904
++
+ ## [11.1.0] - 2022-01-28
+ 
+ ### Added
+diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
+index c29cd79..06e0618 100644
+--- a/CONTRIBUTORS.md
++++ b/CONTRIBUTORS.md
+@@ -27,3 +27,4 @@ The following people have contributed to the development of Rich:
+ - [Nicolas Simonds](https://github.com/0xDEC0DE)
+ - [Gabriele N. Tornetta](https://github.com/p403n1x87)
+ - [Patrick Arminio](https://github.com/patrick91)
++- [Michał Górny](https://github.com/mgorny)
+diff --git a/tests/test_syntax.py b/tests/test_syntax.py
+index 46d0126..e5d904f 100644
+--- a/tests/test_syntax.py
++++ b/tests/test_syntax.py
+@@ -277,7 +277,7 @@ def test_from_path_lexer_override():
+     try:
+         os.write(fh, b"import this\n")
+         syntax = Syntax.from_path(path, lexer="rust")
+-        assert syntax.lexer.name is "Rust"
++        assert syntax.lexer.name == "Rust"
+         assert syntax.code == "import this\n"
+     finally:
+         os.remove(path)
+-- 
+2.35.1
+
+From f15dc3ea0b59d5fc04341d3f634f0e61c05a84db Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 1 Feb 2022 15:10:32 +0100
+Subject: [PATCH 2/2] Fix test_inspect failures on PyPy3
+
+Mark the test_inspect tests failing on PyPy3 due to different output
+to be skipped appropriately.
+---
+ CHANGELOG.md          | 2 +-
+ tests/test_inspect.py | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index 17f3028..1a75bf3 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
+ 
+ ### Fixed
+ 
+-- Fixed `test_syntax.py::test_from_path_lexer_override` test failure on PyPy3 https://github.com/Textualize/rich/pull/1904
++- Fixed test failures on PyPy3 https://github.com/Textualize/rich/pull/1904
+ 
+ ## [11.1.0] - 2022-01-28
+ 
+diff --git a/tests/test_inspect.py b/tests/test_inspect.py
+index 63c5f06..b4c1d2a 100644
+--- a/tests/test_inspect.py
++++ b/tests/test_inspect.py
+@@ -32,6 +32,11 @@ skip_py310 = pytest.mark.skipif(
+     reason="rendered differently on py3.10",
+ )
+ 
++skip_pypy3 = pytest.mark.skipif(
++    hasattr(sys, "pypy_version_info"),
++    reason="rendered differently on pypy3",
++)
++
+ 
+ def render(obj, methods=False, value=False, width=50) -> str:
+     console = Console(file=io.StringIO(), width=width, legacy_windows=False)
+@@ -81,6 +86,7 @@ def test_render():
+     assert expected == result
+ 
+ 
++@skip_pypy3
+ def test_inspect_text():
+     expected = (
+         "╭──────────────── <class 'str'> ─────────────────╮\n"
+@@ -98,6 +104,7 @@ def test_inspect_text():
+ 
+ @skip_py36
+ @skip_py37
++@skip_pypy3
+ def test_inspect_empty_dict():
+     expected = (
+         "╭──────────────── <class 'dict'> ────────────────╮\n"
+@@ -119,6 +126,7 @@ def test_inspect_empty_dict():
+     assert render({}).startswith(expected)
+ 
+ 
++@skip_pypy3
+ def test_inspect_builtin_function():
+     expected = (
+         "╭────────── <built-in function print> ───────────╮\n"
+@@ -237,6 +245,7 @@ def test_inspect_integer_with_methods():
+ 
+ @skip_py36
+ @skip_py37
++@skip_pypy3
+ def test_broken_call_attr():
+     class NotCallable:
+         __call__ = 5  # Passes callable() but isn't really callable
+-- 
+2.35.1
+
diff --git a/dev-python/rich/rich-10.16.0.ebuild b/dev-python/rich/rich-10.16.0.ebuild
deleted file mode 100644
index 05ddc3dab2e6..000000000000
--- a/dev-python/rich/rich-10.16.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/willmcgugan/rich"
-SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-10.16.1.ebuild b/dev-python/rich/rich-10.16.2-r1.ebuild
index f5d5e30308cd..bd629c2ce249 100644
--- a/dev-python/rich/rich-10.16.1.ebuild
+++ b/dev-python/rich/rich-10.16.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=poetry
 PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 inherit distutils-r1 optfeature
 
 DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
@@ -23,6 +23,12 @@ RDEPEND="
 distutils_enable_tests pytest
 
 python_test() {
+	local EPYTEST_DESELECT=(
+		# check for exact color render string, which changes across pygments bumps
+		tests/test_syntax.py::test_python_render
+		tests/test_syntax.py::test_python_render_simple
+		tests/test_syntax.py::test_python_render_indent_guides
+	)
 	epytest -p no:pytest-qt
 }
 
diff --git a/dev-python/rich/rich-10.16.2.ebuild b/dev-python/rich/rich-10.16.2.ebuild
index 23da7333ab91..5de214aa8a7a 100644
--- a/dev-python/rich/rich-10.16.2.ebuild
+++ b/dev-python/rich/rich-10.16.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/rich-11.0.0-r1.ebuild b/dev-python/rich/rich-11.0.0-r1.ebuild
new file mode 100644
index 000000000000..91c410066f0a
--- /dev/null
+++ b/dev-python/rich/rich-11.0.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/Textualize/rich"
+SRC_URI="https://github.com/Textualize/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# check for exact color render string, which changes across pygments bumps
+		tests/test_syntax.py::test_python_render
+		tests/test_syntax.py::test_python_render_simple
+		tests/test_syntax.py::test_python_render_indent_guides
+	)
+	epytest -p no:pytest-qt
+}
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rich/rich-11.1.0.ebuild b/dev-python/rich/rich-11.1.0.ebuild
new file mode 100644
index 000000000000..7fab6ef8c8cf
--- /dev/null
+++ b/dev-python/rich/rich-11.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/Textualize/rich"
+SRC_URI="
+	https://github.com/Textualize/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pypy3.patch
+)
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# check for exact color render string, which changes across pygments bumps
+		tests/test_syntax.py::test_python_render
+		tests/test_syntax.py::test_python_render_simple
+		tests/test_syntax.py::test_python_render_indent_guides
+	)
+	epytest -p no:pytest-qt
+}
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}