gentoo resync : 12.05.2022

6 files changed, 35 insertions, 116 deletions

diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 7407a4298d57..64b2a791fa95 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,10 +1,9 @@
-AUX rich-11.1.0-pypy3.patch 2986 BLAKE2B 29f1c880febeb774666f27ebd333f0ee93eb8804f5ffd596d45244b23c45af14ab6291cd766b5446f13bc59ae574891281c85bcda6b347fec2cf4a6d6c742891 SHA512 0978f0af54893d8f28943fe2daac873447d61fc2799e088f156d44f6927f94129ad5d7fdec5b6a36a7d89c1dc5b3b04dceb2e8dbc1c3a69064685560d51222d2
-DIST rich-12.0.0.gh.tar.gz 14727980 BLAKE2B b9f7761ab1084765f804fd22f9fb18e659f91b917bb452217752683f6d61320d2703eee28de3be3bd70009fc06d04165528393c4c0ec32a49b1dc7e94989a224 SHA512 4e47e48709180ef844bcf1cd516b22de8a4f22c5121ca0582a2cff7297d97afe63232926d518cd2bf4d6d1a7cea362ab12e71eedacce6b6d378ef1a1528d9e4c
-DIST rich-12.0.1.gh.tar.gz 14857207 BLAKE2B 8e6419904ef0ba91d4b15059630f63769a28323600cb212f07c2a239201489e2078b8c4c792f486bde75efd9d09afe832fa2e2235ac91433ee24b33fcda02e68 SHA512 61077663b46a7e615b29df3b75b15ef97979c804abd283cc26f217ee8128b74a514fd7b92831d1d8928f768d2ec8230d8cd1da733106b424704a3187ee18ce95
-DIST rich-12.1.0.gh.tar.gz 14883003 BLAKE2B f11642b5a90934e95dd7d71707617c8a3a1680644dafa9535f86ed5648f14389cddd968c329d4d94649c15123dd00045e0e9e7bb3314be3e6bbc72ba67c100e1 SHA512 6144af9b8843592d586e1c54d5bd97b6974a2510746319c7c0e961f04515ab837088bde2d0876e1a3d33eff40f4dfd8babc3c3f8123f6a4472b7a3eca580d131
 DIST rich-12.2.0.gh.tar.gz 14884722 BLAKE2B fb3720724d2441cddd85ac22249aa232bd31f664019f9eb02e10fda913b98c0220a4fadff47fc0f6884ff77b7ee9f98a96e036fb76d0492e0c040d752a9e9c79 SHA512 8f8108557ca21e41b35c03242d203c229f7af0d7abf5b394fc894e71ae098bbc14e046b166e5452d7a9f9d7d6e8cc0e13784d64cd721d2f7acec9f624d14db77
-EBUILD rich-12.0.0.ebuild 1073 BLAKE2B 15d0093718071cba002ceb3182731e6640de13764975b4db1ea7c5d0109cae6d94e8cecd8a851dc8e75df48be31abb5fbd4a1ecf39ff7bd09feacf38e2cd11fc SHA512 2e84abde77b619b115c365cc19083462afc23f8fb9af3db3457670db14ce9bf56aeb8dcc9ea3adeaf412faef390cc28622d78ab9f0ed4abaf9b71c837673f921
-EBUILD rich-12.0.1.ebuild 1081 BLAKE2B 20aa21c4eaeb5e2b9b7c7fe701743a00e2d2f7811b657b89b07c021624df6738bdb6c2eb1c9c3da2827524c7e7e77dd7fdc423d8eac93eb9e80bdcd6d375fb8b SHA512 d26e8692de7610fee7751c6d2620ee442dbb3a00e73d39aff1df1bc5a01f2424cd5640e72d32f87576a869ba60cb71298dc20cc27bdf598175b8c5cb61ab6a99
-EBUILD rich-12.1.0.ebuild 929 BLAKE2B cb244334040e91a1b6e1cf367294422a19343e796d8f41c487b6e4c2bc8adda2090537d091425181499cc0d8e71799f48d8c9934b41ce70e71b349e4ff51763f SHA512 6b4ea7312d7c9b431c06b64400478ae4231584255fef4af4ffb926ef8d3ae5e94ea9f24365a4716fe037d58e07d38956576decb98746390831a4decf398d0cc0
-EBUILD rich-12.2.0.ebuild 954 BLAKE2B 9a2d614556dd960b7d919c5abb6698eb870b9b87f248fe1f2987d44db5d91b03972499631027f88ff075c326f85120dfa1b922c53ff78c03d8b056afc4c4d09d SHA512 8fb82c99f810611079d0b7affbef20306a939817a9c2a93101053d626148242183df332310674ac0a83b563dae96532265cc28b39b1c63bc343264d29484e96b
+DIST rich-12.3.0.gh.tar.gz 14889665 BLAKE2B baa098e25768b4b84a269547c7726d281f67e333c0993513223dfdda7023001ea78b6edd10218726ae888e7216e18c6c4d5b9711268d083dfd0a41c3162658c9 SHA512 6df0ac70ffac7aca5726c9ea29c6eeada1ff955539842a1352eaa7f7e95c4c7ec57f4e2eaca6808e522d7e455efa80df2ccc3e20188f4646ad0e18294b59f744
+DIST rich-12.4.0.gh.tar.gz 14890620 BLAKE2B fe38abeec7f896053fc2f13259694dd90378db5318683243cf7b13add91c356992b9e4faa475aa282af70694b14e7c82e54c292bd3bcb4411d460dc831310b26 SHA512 dec7903854b29d13b31d3b17a592cd6b94ea1fb6626f7d8abae57927e8cd8021a51cf060b0f431d6fd8a358ae6938038f5aad0c695afa121e05ab3e97aa61006
+DIST rich-12.4.1.gh.tar.gz 14890981 BLAKE2B 7eb8424ca5e3a985e6d000ed2c74784dba104237a67315c59d3f3cdf71a7196621566b9f40f7ca0e9f74d6bcd1daae781ee2aef871f5fbf738d3209ae13dba4a SHA512 ee02526c5e717976c2b4a8e750dc9f87d5b2d15a9b144aabb8e84de01ba4df78985ad5ed6bbcf9f6e42a76a63cab6da76c05da917aa8c09d678858fa148db76c
+EBUILD rich-12.2.0.ebuild 946 BLAKE2B 37b8aaf2777692d89a64830d815a1bf70389358690062d1c3321ad776ab862616c7a44bf59320d95222e21c50ec7aab0587773dc37cb346b2075afbf3d30f30c SHA512 0adabfe89691b8568c40ca368434e4f9dbcc979c1c6907450a46a3dd35a2c4a74d93cfddc3d2256678156a562a5210beae9b76882adc320e5ec0b4fba93e3946
+EBUILD rich-12.3.0.ebuild 1093 BLAKE2B 91d6d48b2b249ed81190972917ccf910555999096d05d8d9960d9782d5cd63131c7cf7af2a4e2ca12545ae8e051eaf9c9e26bcb9818ecbdaa95a713e374156da SHA512 cf7aaa3a950adf6cfc561b2bfdc7c0327255371a660b2ffe180cb01c7f62d446642bbe65dc7e98b30b4d0480f93a2a317940fafd4d5202fca9b64009c28e17e7
+EBUILD rich-12.4.0.ebuild 1093 BLAKE2B 91d6d48b2b249ed81190972917ccf910555999096d05d8d9960d9782d5cd63131c7cf7af2a4e2ca12545ae8e051eaf9c9e26bcb9818ecbdaa95a713e374156da SHA512 cf7aaa3a950adf6cfc561b2bfdc7c0327255371a660b2ffe180cb01c7f62d446642bbe65dc7e98b30b4d0480f93a2a317940fafd4d5202fca9b64009c28e17e7
+EBUILD rich-12.4.1.ebuild 1108 BLAKE2B 80cb4cf1fa8261a1b13a136ff50389ed99772a58c6776e689bda28abe4bc609b87ddd1c9bff2c5574e6914bf1dd2a59617346f4b5fc9c7ecdfeb67fa5ef4d995 SHA512 cae445c45ac2398917231d5bb4e8296a7709f573b1fec380eb92c4fe10d34d50581d7349dca1242e641037bc2781554467735fe4323f45f781660ceedee1d6c1
 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
deleted file mode 100644
index e1ff1f3496d0..000000000000
--- a/dev-python/rich/files/rich-11.1.0-pypy3.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-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/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/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-12.2.0.ebuild b/dev-python/rich/rich-12.2.0.ebuild
index 443575a92837..88b8c0685694 100644
--- a/dev-python/rich/rich-12.2.0.ebuild
+++ b/dev-python/rich/rich-12.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/rich-12.1.0.ebuild b/dev-python/rich/rich-12.3.0.ebuild
index 4cbcc9174b3c..6fb3f685440a 100644
--- a/dev-python/rich/rich-12.1.0.ebuild
+++ b/dev-python/rich/rich-12.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
@@ -30,6 +30,11 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
+EPYTEST_DESELECT=(
+	# broken with =dev-python/pygments-2.12.0
+	tests/test_console.py::test_size_can_fall_back_to_std_descriptors
+)
+
 python_test() {
 	local -x COLUMNS=80
 	epytest -p no:pytest-qt
diff --git a/dev-python/rich/rich-12.0.1.ebuild b/dev-python/rich/rich-12.4.0.ebuild
index e156699e5e9c..6fb3f685440a 100644
--- a/dev-python/rich/rich-12.0.1.ebuild
+++ b/dev-python/rich/rich-12.4.0.ebuild
@@ -17,22 +17,26 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
 	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
+	dev-python/pygments[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8)
+"
 
 distutils_enable_tests pytest
 
+EPYTEST_DESELECT=(
+	# broken with =dev-python/pygments-2.12.0
+	tests/test_console.py::test_size_can_fall_back_to_std_descriptors
+)
+
 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
-	)
+	local -x COLUMNS=80
 	epytest -p no:pytest-qt
 }
 
diff --git a/dev-python/rich/rich-12.0.0.ebuild b/dev-python/rich/rich-12.4.1.ebuild
index 50baff679d98..9bbc80387ecd 100644
--- a/dev-python/rich/rich-12.0.0.ebuild
+++ b/dev-python/rich/rich-12.4.1.ebuild
@@ -17,21 +17,24 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
 	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
+	dev-python/pygments[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8)
+"
 
 distutils_enable_tests pytest
 
 python_test() {
+	local -x COLUMNS=80
 	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
+		# broken with =dev-python/pygments-2.12.0
+		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
 	)
 	epytest -p no:pytest-qt
 }