8 files changed, 190 insertions, 115 deletions
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 3eca3fef541d..d485e015cede 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,9 +1,14 @@
 AUX astroid-2.4.2-no-pytest-runner.patch 643 BLAKE2B 830b0d604e988701faf6c75f148ff65775bbd349ab11669ff9e50809541d45af5a575f5d8874e4260f2e300ffac2446a1f9469da21ab288f325693eebc67f5b7 SHA512 3b2819eda0bdf0847aa7153439dd2cd766aa588921f8c7acf6da85a966ba7047e19a508a208141f7be11fc3348a7757d23a1c0835e977a9fe545cbafec09eb3d
-AUX astroid-2.4.2-py39.patch 1723 BLAKE2B e05c71961478c4a9ea76d5edcff3d1f775fb225a98a4b6849068fd387a4061e25078c14d374f5c60260d1678f34cc9ed6db96b20567bb04a4dc089e0a611a328 SHA512 3afefb42e9bda1666820de490c6d4a8ad7c873fce2965f5a8a159bb00617fe71deda231c3f810d238af1b1f386cd4b5c9eba78f6012ff05a7b6f10e50573b5d8
-DIST astroid-2.4.2.tar.gz 310972 BLAKE2B 23ebe5ef418ce19b64eb1c0f8d711c3f0d86ae32cff112d9a99db48d20a34c73cfa97c96229fd0f0f1169720d24e2cfd0b5a327c29ea0fc0f54a57ede45fcebe SHA512 f5d759c07a13e06d3d071faacff2dc775924566aaef8bdb6e526c4ebf723b6b561f5824b711b33e33a2a69df0a2ff4cbf0f4302c9a0d55610e031e81c4a4be91
 DIST astroid-2.5.1.tar.gz 312511 BLAKE2B 85d85c045579f6bf42a4640da95836e760d1d89edaefdf94209a2fdc7f2686a27abcb1c0710cad658473a0a1516df5ad80f10c6b7c2a4f14dea36af94aa9ae5b SHA512 a0aaa95257961235abbbbc021cdb48da760f8b1856bbc0a7a8b98c53c69045cee4bfe575182a631f994765819e373b33b3a6eca052573128e8b36f2c23c250de
+DIST astroid-2.5.2.tar.gz 312789 BLAKE2B 53b286a8772fea1df149aff19f56c0d86154e616a04f4e3e459e029bd4ae54e7f41c55873e0c310c4e36b0901a39bf88d92a7748a7a46baa000f386a0d154c05 SHA512 391d6b0981b4332fd074a568d33838cbd5d71e7200a3a7ba27bc96641d12be4a6452def0bb615a54e1fa6d1f1f6863a39d56cf3e503aba42ea0d0fdddbbb9102
+DIST astroid-2.5.3.tar.gz 317721 BLAKE2B 66566287fa65489064056d6dba65fd7c59cbe9e4e3d88ba5a33d08dbcf6af48b6f1eb4aafb4f7483a1fc0eb6fdd92a7bc8f1991d05cd4d589fbcc6ed6f5db769 SHA512 dbf480e86023f7d093386cc68b259d5b721717638927a893b3ade0a397b212f5f24a17c753b705cf499b47e12ab255d51126b41b5af167d5c3018f5aade1abcb
+DIST astroid-2.5.5.tar.gz 344997 BLAKE2B 9ab06834ac05557c095efaaf348772d5d523cb5f0fc79f369319d7b15a92a6737d8464ad8a331474737bab9453519cb779dbb1bb5bbe6ab2ee8bb9a0af269c47 SHA512 ffaa6b156c6bdb3399581388bdb4d058e0182b42051c83752d2f93fdf6aafe28e26bd085d272c9ae2907978ba22a94713e959df70b891f772ffe7f891a1f0dd3
+DIST astroid-2.5.6.tar.gz 345014 BLAKE2B 13916663aef712449a842e50b74ecd2e1b82817e1c128fdf9a4d5779d391deab7f806300cb6597b29920222ff041b13eb985aa395dff024af6fee628a84f883f SHA512 3d10d0f92c4b4c2d7d5e0035f23ae554b512f34ddd55b4c1c4032b328643dfe60cb4aa675a3824423fcd12baea7961847435f1894a47fafa99802f3e17a5605f
 DIST astroid-2.5.tar.gz 304788 BLAKE2B 3d9304dcfff72aa8172fe88b5ee53b723b47b3e602b7c30cae15a61d0cff7d578ccfde4885b56c09c8254ca3fe185fcf297bf85184d68798eb51f1860c516db6 SHA512 eba7e757a12f89a74bff579731a157fda3c8d8dd1b5a4369791d47f7f6e321b23e167260d0988d389428222c8c98929e66ad26f379ff937e274dcd1abdb3b3d2
-EBUILD astroid-2.4.2-r1.ebuild 1870 BLAKE2B b6fb0fedb655a60c9771384b11adb8132d8ea9ca54e61f070e74fa029eee1888a736287a71e094b90ad304bad7f517e3cb52c4813afb4b2321d36d25eb5cab86 SHA512 3d36a5d9fb124927ba9fadb51c22356d99f190c6ede44fa933286de16c4101e45a484489d79e8617e5642ca3a74ef77b55c8cc5f71d138c3d41dc44d740f67fb
-EBUILD astroid-2.5.1.ebuild 1195 BLAKE2B dfc4ab4e910998b63dbfcf769513edcb98cbd6d16e037f1ce1d8484ecc669d09ed3047f43ad49a43ffd34c1882c632156f90a6d2f48f8d7516980a6e59a2d18e SHA512 5807b77578ead30897ae28bef16e5e696bf7663af12984f17835f22af111868d4d33ddfa2d2ddb1568f4c784afec6fb9c0f90f05c41d8e222c6c277f355d372f
+EBUILD astroid-2.5.1.ebuild 1188 BLAKE2B 426f217e98b1c7e0f175a00439169cec707833662c4ea86aa9db27c3c2483356e5e6b3296bddea524cb76d66a0c27044c906b565f4e15f65c7fafaaec43a7b6b SHA512 ab542ce2b628fe64724192b0a361e274824f5086436b3559285baa513c11a2e28b386530f922745cf7fb8e23c11ae7421866c80d1b759dd6077079a3d55d4c6b
+EBUILD astroid-2.5.2.ebuild 1196 BLAKE2B 4697f81b7d0ae35d30eb263c05e6b0da37a344bda9ce7e3ea4e422e071fdfafa6bcd1b945e84a491e11a0dd2da6a3495e6432ad19d102063eab7c4aed508fe48 SHA512 521272e87b301ca2cd535e8b18d4c98c9e9b43cc49a190115bca791f37bb397ca4cbcf407f426b333d52ddc9f849fb2a167682e799987b1a14705d4e33b866fd
+EBUILD astroid-2.5.3.ebuild 1118 BLAKE2B a312ff9ab16a144177e22fa3fee9e51a5876f484df00b3e3a931fe97e5654fc8f7dd3d9c60e1a68e124947dddcec01a0a647c9542cd330e48993c931550ce50d SHA512 30a1d16f296bc38b094cb9cd189a9ec748f22327382ac497169e92f1f6a7cb5f58546f36d870d483061c24ead1bde2dee09a19bb15724d45a7e2078071453355
+EBUILD astroid-2.5.5.ebuild 1198 BLAKE2B 8a6555fcbb19261889ec9ebb482d800b001b9d916ed1001a5371225026c063440897decb2cdb51de77a5ffdbc84617572166c6e7021b8d54b23ef10148e52f0e SHA512 2d412f46f147d714719c7501cb04d4bc72bf1feb0f49a22af4cce003e8ca13efe0eb3e4f2e624ad4ffbdd113e64710c8eb7d0aa70916e56f059c1d8c909b5c1b
+EBUILD astroid-2.5.6.ebuild 1198 BLAKE2B 8a6555fcbb19261889ec9ebb482d800b001b9d916ed1001a5371225026c063440897decb2cdb51de77a5ffdbc84617572166c6e7021b8d54b23ef10148e52f0e SHA512 2d412f46f147d714719c7501cb04d4bc72bf1feb0f49a22af4cce003e8ca13efe0eb3e4f2e624ad4ffbdd113e64710c8eb7d0aa70916e56f059c1d8c909b5c1b
 EBUILD astroid-2.5.ebuild 1830 BLAKE2B a35caaaca26422269b69e090aeab58f3bbd7eaff296d19af8bbcd18ad9d321844dbbae11fb5a5e8127dc7198e29d0542a03d6d99581235be60e95670e241547f SHA512 487c40073e0b032c8e5a9f45ec562954f94d4f9d9fc2ab5799df8c576f4cea5237b91838044654dbe20d2acea5e9f7455fd3b6817292564dce31b603815ec5e2
 MISC metadata.xml 1142 BLAKE2B a10eadb6bc619901a39f827ac6a4bafaa9e17ff1a521b73d3687c38cd8d39fe9b13d3d817db89e50dadaeb19f0953b48bdcc8170e9b844869d1ee71a792b8164 SHA512 ab6d5f84c85e94c0e5543b8cd9072b6ce4b32cc1ef454ab7cb836e94b82ac85ecaf70685c30398e8710fda68a1f65417b135a296287f7c2a388e59ff4703ea35
diff --git a/dev-python/astroid/astroid-2.4.2-r1.ebuild b/dev-python/astroid/astroid-2.4.2-r1.ebuild
deleted file mode 100644
index 6b572edf5470..000000000000
--- a/dev-python/astroid/astroid-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/astroid-2.4.2-no-pytest-runner.patch
-	"${FILESDIR}"/astroid-2.4.2-py39.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -r -e 's:"(wrapt|six|lazy_object_proxy)(~|=)=.+":"\1":' \
-		-i astroid/__pkginfo__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		--deselect
-		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
-	)
-	[[ ${EPYTHON} == python3.9 ]] && deselect+=(
-		--deselect
-		tests/unittest_brain.py::TypingBrain::test_namedtuple_few_args
-		--deselect
-		tests/unittest_brain.py::TypingBrain::test_namedtuple_few_fields
-		--deselect
-		tests/unittest_brain.py::TypingBrain::test_namedtuple_inference_nonliteral
-		--deselect
-		tests/unittest_inference.py::test_dataclasses_subscript_inference_recursion_error
-	)
-
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/astroid/astroid-2.5.1.ebuild b/dev-python/astroid/astroid-2.5.1.ebuild
index b2a9c306e3f1..1b1abcad6e4b 100644
--- a/dev-python/astroid/astroid-2.5.1.ebuild
+++ b/dev-python/astroid/astroid-2.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/astroid/astroid-2.5.2.ebuild b/dev-python/astroid/astroid-2.5.2.ebuild
new file mode 100644
index 000000000000..9bca4ed24a3a
--- /dev/null
+++ b/dev-python/astroid/astroid-2.5.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		--deselect
+		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker "${deselect[@]}"
+}
diff --git a/dev-python/astroid/astroid-2.5.3.ebuild b/dev-python/astroid/astroid-2.5.3.ebuild
new file mode 100644
index 000000000000..97a5b5965d16
--- /dev/null
+++ b/dev-python/astroid/astroid-2.5.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		--deselect
+		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker "${deselect[@]}"
+}
diff --git a/dev-python/astroid/astroid-2.5.5.ebuild b/dev-python/astroid/astroid-2.5.5.ebuild
new file mode 100644
index 000000000000..a1a4c659cf62
--- /dev/null
+++ b/dev-python/astroid/astroid-2.5.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/astroid/astroid-2.5.6.ebuild b/dev-python/astroid/astroid-2.5.6.ebuild
new file mode 100644
index 000000000000..a1a4c659cf62
--- /dev/null
+++ b/dev-python/astroid/astroid-2.5.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/astroid/files/astroid-2.4.2-py39.patch b/dev-python/astroid/files/astroid-2.4.2-py39.patch
deleted file mode 100644
index 0f838b7214a4..000000000000
--- a/dev-python/astroid/files/astroid-2.4.2-py39.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3ffe25f8e3cdb30f0dcfb68f4373370828894727 Mon Sep 17 00:00:00 2001
-From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
-Date: Tue, 4 Aug 2020 10:11:44 +0000
-Subject: [PATCH] Skip test for | in dictionaries due to PEP-584 in Python 3.9+
-
----
- tests/unittest_inference.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/tests/unittest_inference.py b/tests/unittest_inference.py
-index 76c7e879..b7bc732d 100644
---- a/tests/unittest_inference.py
-+++ b/tests/unittest_inference.py
-@@ -2455,7 +2455,6 @@ def test_binary_op_type_errors(self):
-         1 ** (lambda x: x) #@
-         {} * {} #@
-         {} - {} #@
--        {} | {} #@
-         {} >> {} #@
-         [] + () #@
-         () + [] #@
-@@ -2500,7 +2499,6 @@ def __radd__(self, other):
-             msg.format(op="**", lhs="int", rhs="function"),
-             msg.format(op="*", lhs="dict", rhs="dict"),
-             msg.format(op="-", lhs="dict", rhs="dict"),
--            msg.format(op="|", lhs="dict", rhs="dict"),
-             msg.format(op=">>", lhs="dict", rhs="dict"),
-             msg.format(op="+", lhs="list", rhs="tuple"),
-             msg.format(op="+", lhs="tuple", rhs="list"),
-@@ -2515,6 +2513,12 @@ def __radd__(self, other):
-             msg.format(op="+=", lhs="int", rhs="A"),
-             msg.format(op="+=", lhs="int", rhs="list"),
-         ]
-+
-+        # PEP-584 supports | for dictionary union
-+        if sys.version_info < (3, 9):
-+            ast_nodes.append(extract_node("{} | {} #@"))
-+            expected.append(msg.format(op="|", lhs="dict", rhs="dict"))
-+
-         for node, expected_value in zip(ast_nodes, expected):
-             errors = node.type_errors()
-             self.assertEqual(len(errors), 1)