gentoo resync : 20.03.2022

7 files changed, 17 insertions, 164 deletions

diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index c3622369c956..8f58af1cf818 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,10 +1,6 @@
-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
-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
+AUX rich-11.1.0-pypy3.patch 2986 BLAKE2B 29f1c880febeb774666f27ebd333f0ee93eb8804f5ffd596d45244b23c45af14ab6291cd766b5446f13bc59ae574891281c85bcda6b347fec2cf4a6d6c742891 SHA512 0978f0af54893d8f28943fe2daac873447d61fc2799e088f156d44f6927f94129ad5d7fdec5b6a36a7d89c1dc5b3b04dceb2e8dbc1c3a69064685560d51222d2
+DIST rich-11.2.0.gh.tar.gz 16300346 BLAKE2B 520f512a7e26613a4cc881834f8c150963b84a6dc3a43029dde6d64d1e405d82422b9c6f0098293b6f9bdb55749c7929426dad14840c9a287889c1a6a70f6bf2 SHA512 ec1178a6a320a48f589ead5163e974725f79ae63ddf9a2deb66400e43619ade8d366dbef6b524e66e603647a957b8e26266845a0bcb85912fd9ad2a81dd92f5e
+DIST rich-12.0.0.gh.tar.gz 14727980 BLAKE2B b9f7761ab1084765f804fd22f9fb18e659f91b917bb452217752683f6d61320d2703eee28de3be3bd70009fc06d04165528393c4c0ec32a49b1dc7e94989a224 SHA512 4e47e48709180ef844bcf1cd516b22de8a4f22c5121ca0582a2cff7297d97afe63232926d518cd2bf4d6d1a7cea362ab12e71eedacce6b6d378ef1a1528d9e4c
+EBUILD rich-11.2.0.ebuild 1125 BLAKE2B e26b876bc97c0844fb95f221eb0a82f7b59a18d633c4514a376dbc0bda68aa7cd4a0aaf61011f22bc2945b4292e4dff65a5a7c55607f569d120aadaed079fee2 SHA512 2745e1b93ce8024596923269e0263427c149a654b3082ba6df45e59fee1bd11734d3ef0f85011acb8e427106a5f84dbe4bf0944ca5f40013f6e32427a334b927
+EBUILD rich-12.0.0.ebuild 1081 BLAKE2B 20aa21c4eaeb5e2b9b7c7fe701743a00e2d2f7811b657b89b07c021624df6738bdb6c2eb1c9c3da2827524c7e7e77dd7fdc423d8eac93eb9e80bdcd6d375fb8b SHA512 d26e8692de7610fee7751c6d2620ee442dbb3a00e73d39aff1df1bc5a01f2424cd5640e72d32f87576a869ba60cb71298dc20cc27bdf598175b8c5cb61ab6a99
 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
index 09a7f8022e26..e1ff1f3496d0 100644
--- a/dev-python/rich/files/rich-11.1.0-pypy3.patch
+++ b/dev-python/rich/files/rich-11.1.0-pypy3.patch
@@ -11,30 +11,6 @@ to fix test failure on PyPy3.
  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
@@ -63,19 +39,6 @@ to be skipped appropriately.
  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
diff --git a/dev-python/rich/rich-10.16.2-r1.ebuild b/dev-python/rich/rich-10.16.2-r1.ebuild
deleted file mode 100644
index bd629c2ce249..000000000000
--- a/dev-python/rich/rich-10.16.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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/willmcgugan/rich"
-SRC_URI="https://github.com/willmcgugan/${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-10.16.2.ebuild b/dev-python/rich/rich-10.16.2.ebuild
deleted file mode 100644
index 5de214aa8a7a..000000000000
--- a/dev-python/rich/rich-10.16.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022 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 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.0.0.ebuild b/dev-python/rich/rich-11.0.0.ebuild
deleted file mode 100644
index 17a1b08bfda1..000000000000
--- a/dev-python/rich/rich-11.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022 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/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.0.0-r1.ebuild b/dev-python/rich/rich-11.2.0.ebuild
index 91c410066f0a..8379546de6af 100644
--- a/dev-python/rich/rich-11.0.0-r1.ebuild
+++ b/dev-python/rich/rich-11.2.0.ebuild
@@ -4,16 +4,20 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
+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}.tar.gz"
+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"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
@@ -22,6 +26,10 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/rich-11.1.0-pypy3.patch
+)
+
 python_test() {
 	local EPYTEST_DESELECT=(
 		# check for exact color render string, which changes across pygments bumps
diff --git a/dev-python/rich/rich-11.1.0.ebuild b/dev-python/rich/rich-12.0.0.ebuild
index 7fab6ef8c8cf..e156699e5e9c 100644
--- a/dev-python/rich/rich-11.1.0.ebuild
+++ b/dev-python/rich/rich-12.0.0.ebuild
@@ -5,6 +5,7 @@ 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"
@@ -25,10 +26,6 @@ RDEPEND="
 
 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