gentoo resync : 15.06.2021

5 files changed, 17 insertions, 103 deletions

diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 6c05fa7a6ba0..495505950c34 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,10 +1,7 @@
-AUX astroid-2.4.2-no-pytest-runner.patch 643 BLAKE2B 830b0d604e988701faf6c75f148ff65775bbd349ab11669ff9e50809541d45af5a575f5d8874e4260f2e300ffac2446a1f9469da21ab288f325693eebc67f5b7 SHA512 3b2819eda0bdf0847aa7153439dd2cd766aa588921f8c7acf6da85a966ba7047e19a508a208141f7be11fc3348a7757d23a1c0835e977a9fe545cbafec09eb3d
-DIST astroid-2.5.3.tar.gz 317721 BLAKE2B 66566287fa65489064056d6dba65fd7c59cbe9e4e3d88ba5a33d08dbcf6af48b6f1eb4aafb4f7483a1fc0eb6fdd92a7bc8f1991d05cd4d589fbcc6ed6f5db769 SHA512 dbf480e86023f7d093386cc68b259d5b721717638927a893b3ade0a397b212f5f24a17c753b705cf499b47e12ab255d51126b41b5af167d5c3018f5aade1abcb
 DIST astroid-2.5.6.tar.gz 345014 BLAKE2B 13916663aef712449a842e50b74ecd2e1b82817e1c128fdf9a4d5779d391deab7f806300cb6597b29920222ff041b13eb985aa395dff024af6fee628a84f883f SHA512 3d10d0f92c4b4c2d7d5e0035f23ae554b512f34ddd55b4c1c4032b328643dfe60cb4aa675a3824423fcd12baea7961847435f1894a47fafa99802f3e17a5605f
 DIST astroid-2.5.7.tar.gz 352082 BLAKE2B ca52339422da3a35cbe34e4b216dbfed3979dce96a8d5fcc508083c0ef9509c491e78dcfea281b79b07fcb7289a9f40aade0da21ca38b6abcf7025b84909a4fd SHA512 17fc185752510396fda9cce842df8ba72473e469b61c037195a9d6ff72af3ec8d3df01bdcf61d6059d4f90c95278928eba3e3380048bf5c6b4fa2a3c9b267176
-DIST astroid-2.5.tar.gz 304788 BLAKE2B 3d9304dcfff72aa8172fe88b5ee53b723b47b3e602b7c30cae15a61d0cff7d578ccfde4885b56c09c8254ca3fe185fcf297bf85184d68798eb51f1860c516db6 SHA512 eba7e757a12f89a74bff579731a157fda3c8d8dd1b5a4369791d47f7f6e321b23e167260d0988d389428222c8c98929e66ad26f379ff937e274dcd1abdb3b3d2
-EBUILD astroid-2.5.3.ebuild 1111 BLAKE2B 5834800bf11748b8c7090be868e482733daaf6ca567f288f754a352caf4a8acf2758702dfd86da744bb3c5f8e1609336de19dbfafa98956d40810b48002b02ac SHA512 a57a0365c892129fdbcc700f0258c830e0fd1a45fa354e2b17630dad27b1846765366dd5e1f4736a0b535dace1488ef2d20bf2979ec9c875727450c49c32d4f4
-EBUILD astroid-2.5.6.ebuild 1198 BLAKE2B 8a6555fcbb19261889ec9ebb482d800b001b9d916ed1001a5371225026c063440897decb2cdb51de77a5ffdbc84617572166c6e7021b8d54b23ef10148e52f0e SHA512 2d412f46f147d714719c7501cb04d4bc72bf1feb0f49a22af4cce003e8ca13efe0eb3e4f2e624ad4ffbdd113e64710c8eb7d0aa70916e56f059c1d8c909b5c1b
+DIST astroid-2.5.8.tar.gz 354281 BLAKE2B 70ee47c26b765ba9f9bd40cf120a9ce13709043738e20a08d201cdb899789c6c6bdc604aaab49c78b2888503b46321a1728cce656f39d70ce6877ac088cb9567 SHA512 ab2f413e399810e98bd61c837ac90674e7c6d8e2f4d32f3141b21bf1360c785831fc4afd347e755c97627a04cb482aa4e455897e1c02eec8c5fcd28c54c1e9fc
+EBUILD astroid-2.5.6.ebuild 1191 BLAKE2B 375a0f2a91178e9c08211ec1ab11dfff40009bece3be7466a109743db3bc78e9f0d13240e910867ddce46d49f65828632bbc4dc3f696609871b74f3d70b826cb SHA512 b548a364d9d5b94cf31712912319688a893dfe3e2a212f562b8d2f622ea22b85152d5f816996ffb8e31d898aea56f70a3aa6178df5fd4323e864743621c8d57a
 EBUILD astroid-2.5.7.ebuild 1341 BLAKE2B ee60d0e8fee5fef7bb8f53b5792c8862cc568ad6b147cee743e0c65cb12931c7fa2866ca196513b22884928d0cf7da23f86666e34e864723ca1d75e65cba5ee2 SHA512 22af5d34ed87dd6a3b14ecef3b085aac0794dd18fe215e72217d6238f202c3ba03199872a9188328ac5c72498aa1d7b9c3b5d860949ca8ff4d31e333c6480224
-EBUILD astroid-2.5.ebuild 1830 BLAKE2B a35caaaca26422269b69e090aeab58f3bbd7eaff296d19af8bbcd18ad9d321844dbbae11fb5a5e8127dc7198e29d0542a03d6d99581235be60e95670e241547f SHA512 487c40073e0b032c8e5a9f45ec562954f94d4f9d9fc2ab5799df8c576f4cea5237b91838044654dbe20d2acea5e9f7455fd3b6817292564dce31b603815ec5e2
+EBUILD astroid-2.5.8.ebuild 1196 BLAKE2B b2e9eafa9b1c3416bf83d6d8c63508f3cf84a2cf13e84e2199a785ae332fe89605300bf23a2510145ee7d7c85b4f9da0f0a9b035efda87053c3ea7dffd26949b SHA512 780fdd87fd134490ee39a19f97f8f62278235279573e1d0405449fc603e96a03e05188abcab045b802c618ae6aeed1b04c3cb842eaba015cc9370a12c7420ce7
 MISC metadata.xml 1142 BLAKE2B a10eadb6bc619901a39f827ac6a4bafaa9e17ff1a521b73d3687c38cd8d39fe9b13d3d817db89e50dadaeb19f0953b48bdcc8170e9b844869d1ee71a792b8164 SHA512 ab6d5f84c85e94c0e5543b8cd9072b6ce4b32cc1ef454ab7cb836e94b82ac85ecaf70685c30398e8710fda68a1f65417b135a296287f7c2a388e59ff4703ea35
diff --git a/dev-python/astroid/astroid-2.5.6.ebuild b/dev-python/astroid/astroid-2.5.6.ebuild
index a1a4c659cf62..74cec72405fe 100644
--- a/dev-python/astroid/astroid-2.5.6.ebuild
+++ b/dev-python/astroid/astroid-2.5.6.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${PN}-${P}
 
 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"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
diff --git a/dev-python/astroid/astroid-2.5.3.ebuild b/dev-python/astroid/astroid-2.5.8.ebuild
index 2622684a306d..347648a064cb 100644
--- a/dev-python/astroid/astroid-2.5.3.ebuild
+++ b/dev-python/astroid/astroid-2.5.8.ebuild
@@ -3,24 +3,28 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 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"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${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"
 
 # 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}]"
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
 BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
@@ -29,14 +33,15 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
 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[@]}"
+	epytest -p no:faker ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/astroid/astroid-2.5.ebuild b/dev-python/astroid/astroid-2.5.ebuild
deleted file mode 100644
index 54a703340a6d..000000000000
--- a/dev-python/astroid/astroid-2.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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"
-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
-)
-
-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/files/astroid-2.4.2-no-pytest-runner.patch b/dev-python/astroid/files/astroid-2.4.2-no-pytest-runner.patch
deleted file mode 100644
index cae04e05a33c..000000000000
--- a/dev-python/astroid/files/astroid-2.4.2-no-pytest-runner.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 016fce18..a6825d8b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -30,8 +30,6 @@ with open(os.path.join(astroid_dir, "README.rst")) as fobj:
- 
- 
- needs_pytest = set(["pytest", "test", "ptr"]).intersection(sys.argv)
--pytest_runner = ["pytest-runner"] if needs_pytest else []
--
- 
- def install():
-     return setup(
-@@ -48,7 +46,6 @@ def install():
-         install_requires=install_requires,
-         extras_require=extras_require,
-         packages=find_packages(exclude=["tests"]) + ["astroid.brain"],
--        setup_requires=pytest_runner,
-         test_suite="test",
-         tests_require=["pytest"],
-     )