gentoo resync : 04.01.2022

5 files changed, 2 insertions, 126 deletions

diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 4fa776466641..1275f3e1908c 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,11 +1,7 @@
 AUX parso-0.7.1-flaky-test.patch 1307 BLAKE2B 63af3a1a0f0d31aba82de3bf9e00001257a794e8e4da752a780d44be83421ca28600c400d9f1ad4bb491c0ed94bdcf61e430880d7305378246be2a16db8ba4f7 SHA512 2101a4cc01e90cc4ce37aa1386bea2be8334834bbe0ee54540bf5645e11ebcaf8395dd8b1fdd308cc1a124ec4f1fe623f7fdd35abc3b82aaf3d9c120becdc961
 AUX parso-0.8.2-flaky-test.patch 947 BLAKE2B b6ece3214328f3121e4de8217395ac108678a37a97bea943e900e13cf44fdbeccf70f2b3bf8dda70df6cf06feb73a55f2bd2d75236898e4cf45c8b22f46b93fb SHA512 b7c5ac93d2f44a897b8d9eb59c470c82b2013f4e3ebf35e81254294f9961e8916a6d590d61ed1d8f3841e50c47cc7902e13d1e28826869afa9168e44e85a98e0
-AUX parso-0.8.2-py310-2.patch 2145 BLAKE2B f0b403c9b9ca5370b1c2ffd52d0a22d995bff03242526a4a649cd58392380c3e38cad4b251b20580b5c22ab859f4829d8ef6ad9c5faaaae3a02b39526d3d585a SHA512 6761d95f4ae0c9a8042abc3fcb42848f323337920306974802f008614c75c7c313aa9a666dd24cfe7e01c7d01f06cbd8e2d370fbc89cc08fdd8b87bcea0aec61
-AUX parso-0.8.2-py310.patch 1128 BLAKE2B f052039f8aef2913cef406c97d55e1afdcd76e46d2a64e2e2f1fd2ac1b7571950ca816213b155602f7b974d01996876a4a7bb0b92f49161d9b29e4ec98950918 SHA512 5aaff0ca295195674006f1435863ff59eac121189c938ef44428eba929a2d76daea9fffb51feebcc75502dbdfb5df7ead18d62c4ee98cb53c35129b81c562810
 DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a2e95fa3f54429633b1c12dc39a4abe237fa46eb629408006777bd1f512cf878025b55119568ac19729b8c19 SHA512 318969a7a941c4a0948e58643b07b6f5c446ea166b3a8e44a556f0677ec9a36d7dc8c6d37ca7bce3f8276ee3d7144e22fbaaeac90c738fb90f7e94a0cf8abf7d
-DIST parso-0.8.2.tar.gz 394419 BLAKE2B f4e86ae55140adc9bbfdd34a8044e7fdfbf9d318a6385ac5feedc07127061943c2d690581af144f158846e3bf6f82124046c7e625369a4055ab92a54f9210c49 SHA512 a90810ad89301d804d215392ed77593b015f13bc7ef8512302a8893b314a9e74c15e2aaa77157c8595a134d3481e8115f306f9628835271478837ec6f19e645f
 DIST parso-0.8.3.tar.gz 397648 BLAKE2B 8942408e27198075c92ef51f7a191cc7781eb3a5110119b91fd95f86e13ebe2fbfee11022a2bfec794150f60b3af8c4d5f324cb011703cd581c17f92232ae5bf SHA512 7874460053662d40c2cfcf0015e330e1c8201eeb07682e2079a636db553a82dc25b70b14ad0f0c82fb817f655359d695101a17f616abf9a39f49c61ae5fd49b1
 EBUILD parso-0.7.1-r1.ebuild 968 BLAKE2B 2477e3999525e9de62274bb1792cf441f2a7a338681e4fd999663347d54737946c6443a2f5978dbe45fec129b11e5438b294d29d7bacfe341e4cb214d9227337 SHA512 b106824ea5aaca2347acaf3ef22a0aedc64b1f914d0009b986951f8a29463d1230bd284f431de9b4bfa38a4d395bbd9960f3ac0fd0b0b45513942c98139dc672
-EBUILD parso-0.8.2.ebuild 924 BLAKE2B 178c4b75f074a885ed1c066d279369bb92d61321341bee4d6369b8fcd98744b0e0cc177423de3bd3edeeb8a5f8779ef5eabfe33a4ca28e59c98cc77c92f8745c SHA512 450f3e64a07f3ab6b24b06d2b4dab5b7277cb9ffb7203e8f2ad83d02438684205c9270e3f5f4a29e203667718b6ec7435f4c20bf7551c1713bf7e18839950bd9
-EBUILD parso-0.8.3.ebuild 710 BLAKE2B 65f4514241e40a165c4c92f8e90b5dbba331bd6c5ad001cc7403c0128f51eb00d4af1261f7c445b54eb22f5faf3687452d3d27d5f1590f68c146108891825b69 SHA512 e3d77c4ef7ce1e83c76eff0635eaa2ae179056ed7ed061f7e40671828f0b4c0b686d0aa603381667ed923fa33cee87c2492f04a6a574c1b27c2bc78949c67d7d
+EBUILD parso-0.8.3.ebuild 702 BLAKE2B ff951fe8ebe1d369872198111261cebfd1fd14c770528b72b0c62a4d448efaae418369ea1b4df4f80a695f1a3f9ad834d9ad2d8f9148cb09f2a54bd5e7d8bdec SHA512 62e54c6d14c5e7ab2561ead4d477eee0c0d168b46dacefe115f43bab8f101c9e6a8f4e8120b5ff95bb1405195f6ac916e5cea6ad9b61992ad5f7611afe31a289
 MISC metadata.xml 403 BLAKE2B be2e4f9dd7e074a3b76a591f034f679bff13b7dc36d8b206e45550276533ba752a8e04162ddf4f580a8e247d57f48a997cac34c14dc7b5ae4a3d74751fb9cac4 SHA512 10517311994816074cfcc4809206ccbdb6a9ac3430e92cf9c4dfc45d8e95a92843843e2bf1a19b97aaa3c330bb923581e4ea6cf6a88f1063f2dab8d041f6c90f
diff --git a/dev-python/parso/files/parso-0.8.2-py310-2.patch b/dev-python/parso/files/parso-0.8.2-py310-2.patch
deleted file mode 100644
index 7c6b1ad78286..000000000000
--- a/dev-python/parso/files/parso-0.8.2-py310-2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From dc41958947770849c8b3b4d344db434e2c8548cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 5 Aug 2021 09:09:28 +0200
-Subject: [PATCH] Update expected exception line numbers for Python 3.10.0rc1
-
-It seems that upstream has fixed line numbers in some of the expections
-in Python 3.10.0rc1, so update the tests accordingly.  This means that
-test_non_async_in_async() gets the correct line again,
-and test_default_except_error_postition() no longer suffers from
-the apparent off-by-one problem.
-
-This doesn't fix tests entirely with Python 3.10 but it's a step
-forward.
----
- test/test_python_errors.py | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/test/test_python_errors.py b/test/test_python_errors.py
-index cda9bd2..e847ebb 100644
---- a/test/test_python_errors.py
-+++ b/test/test_python_errors.py
-@@ -57,10 +57,10 @@ def test_non_async_in_async():
-         error, = errors
-         actual = error.message
-     assert actual in wanted
--    if sys.version_info[:2] < (3, 8):
-+    if sys.version_info[:2] not in ((3, 8), (3,9)):
-         assert line_nr == error.start_pos[0]
-     else:
--        assert line_nr == 0  # For whatever reason this is zero in Python 3.8+
-+        assert line_nr == 0  # For whatever reason this is zero in Python 3.8/3.9
- 
- 
- @pytest.mark.parametrize(
-@@ -140,13 +140,16 @@ def _get_actual_exception(code):
- 
- 
- def test_default_except_error_postition():
--    # For this error the position seemed to be one line off, but that doesn't
--    # really matter.
-+    # For this error the position seemed to be one line off in Python < 3.10,
-+    # but that doesn't really matter.
-     code = 'try: pass\nexcept: pass\nexcept X: pass'
-     wanted, line_nr = _get_actual_exception(code)
-     error, = _get_error_list(code)
-     assert error.message in wanted
--    assert line_nr != error.start_pos[0]
-+    if sys.version_info[:2] >= (3, 10):
-+        assert line_nr == error.start_pos[0]
-+    else:
-+        assert line_nr != error.start_pos[0]
-     # I think this is the better position.
-     assert error.start_pos[0] == 2
- 
--- 
-2.32.0
-
diff --git a/dev-python/parso/files/parso-0.8.2-py310.patch b/dev-python/parso/files/parso-0.8.2-py310.patch
deleted file mode 100644
index 2f3487dd2f61..000000000000
--- a/dev-python/parso/files/parso-0.8.2-py310.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From cbb61fb81955a8cdbb5cdeedc9bcfffa39a5f270 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Thu, 22 Apr 2021 21:04:49 +0200
-Subject: [PATCH] Relax a test regex to match new enum repr in Python 3.10.0a7+
- (#186)
-
-bpo-40066: Enum: adjust repr() to show only enum and member name (not value,
-nor angle brackets) and str() to show only member name.
-https://bugs.python.org/issue40066
----
- test/test_pgen2.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test_pgen2.py b/test/test_pgen2.py
-index 9b0dd34..85ccacf 100644
---- a/test/test_pgen2.py
-+++ b/test/test_pgen2.py
-@@ -339,7 +339,7 @@ def test_left_recursion():
- @pytest.mark.parametrize(
-     'grammar, error_match', [
-         ['foo: bar | baz\nbar: NAME\nbaz: NAME\n',
--         r"foo is ambiguous.*given a PythonTokenTypes\.NAME.*bar or baz"],
-+         r"foo is ambiguous.*given a (PythonTokenTypes\.)?NAME.*bar or baz"],
-         ['''foo: bar | baz\nbar: 'x'\nbaz: "x"\n''',
-          r"foo is ambiguous.*given a ReservedString\(x\).*bar or baz"],
-         ['''foo: bar | 'x'\nbar: 'x'\n''',
--- 
-2.32.0
-
diff --git a/dev-python/parso/parso-0.8.2.ebuild b/dev-python/parso/parso-0.8.2.ebuild
deleted file mode 100644
index 0d7b47040d48..000000000000
--- a/dev-python/parso/parso-0.8.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
-HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-	"${FILESDIR}"/${P}-py310-2.patch
-	"${FILESDIR}"/${P}-flaky-test.patch
-)
-
-python_test() {
-	local deselect=()
-	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
-		# py3.10 changed exception messages
-		test/test_python_errors.py::test_python_exception_matches
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/parso/parso-0.8.3.ebuild b/dev-python/parso/parso-0.8.3.ebuild
index 7a270d5a5eeb..1ed4f8130271 100644
--- a/dev-python/parso/parso-0.8.3.ebuild
+++ b/dev-python/parso/parso-0.8.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest