gentoo Easter resync : 12.04.2020

6 files changed, 9 insertions, 115 deletions

diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index bea4ce4626dd..5289e1c42b14 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,9 +1,4 @@
-AUX astroid-2.1.0-no-pytest-runner.patch 474 BLAKE2B fde7f34aa9e1feefb29bf0a993bdd451523ccfa30bcd8726d36c4b159d849536445599f8f794e6cac71e71ff6b68e8cd3af4d3d5ad1ecdf9936977ec92e29536 SHA512 9c8ff2d8b2ae67620fe38d9f454c77216c2291a7f2aa59d9c78abd5a76f72aabd8154b12055aacbbabdc10fc466f57e09ed5527f796df8e6a5a15bfefaa4f0f0
 AUX astroid-2.3.3-no-pytest-runner.patch 405 BLAKE2B dc496ac27938fa316f59f3058a8f2f17ca397225ae09a1adde80c8da50cd68572052a733ff08d5fcc602d3c38722a16f3f8395608955d9b56c8f1c122541c4fb SHA512 be925b49c4ef04f9b554e446410904dca1529a8aa61a8fe9ca869e1c1a177ca86e7632c62c0f1025caa69e58ce23ff7f342198ba9fb85ec1bde164fb63e285d0
-DIST astroid-1.4.8.tar.gz 184091 BLAKE2B 7180b98c757c8681dd0abaed1e79d2c58ce676aff07b539af8776d589ff23770335d0ba4ce5c9b3940b0428dd10174e7c6eff66aeb500e6ac561734e27975be0 SHA512 54bb20edf5518b417470a2d63210802b267fe727f9d30e1ac5000db00a7894739b1c4249468fb55df81b55d382f3a5bbe019876141f7ee4d94040fd699dc0c2c
-DIST astroid-2.2.5.tar.gz 281829 BLAKE2B 2cc341caac381fb44b0302e8057a6e2105a6a82dbf807f8a59598e15c5658cc30d4c32e3b58ebbc94c4559f2b2274373f5ed6c4b86b4e8eff86dd91a5520e7ce SHA512 71c8c26314f666e2b9519a83dd9476fbfe0ad7d72f5308f6a94b83c5442dc695bc3e51155df45586ff2ff0eec522a02286d00ac566d542f0b82e5e0d0d7d9c65
 DIST astroid-2.3.3.tar.gz 297350 BLAKE2B 7ac5cf028fa0263998271d23128b1bfd127fedafab2f6b3cc465867b9668942e1edc79bed62eb34bcce31b6892e4c5a31dbdd68d20fb92a1f134dc9e78a76920 SHA512 72011f3eb312ea7ce7dd55f7615972f6bfc152d8f16f9052b405f44fe17e594d5da22e0502b4c3034881b9783be9e808509d4ded3d679182ddf6d34eb90748f1
-EBUILD astroid-1.4.8.ebuild 1080 BLAKE2B c1303883d70844547493b689ce6dac72f4234875b6cc22a628f328bf292c675e6d6e171fcb52be7b7ccba22148edc91e9285e02a5e95fd0eedc28007ccde3c04 SHA512 9aea729dcb9babbed9a912b4512940f863e27115b9ede4b63b4744279106450581c0b00eacaec1fb691d5d7ad7e8fe155b80e0bf6058fc6f4d138e5a9a83c12d
-EBUILD astroid-2.2.5.ebuild 1312 BLAKE2B 56ff2f3fed59bba1f55c28e6ef15fedb9412e7f982762e502875afc7c1ed37ae87a911e2b58641f4fa3271b6cc8a9798c6125926beb4b577d15331b955bd7d76 SHA512 58d7fad12ee4e3ab48dfded72c5c8128ee934b6a49ce636fd75c7e0e3b6e8bc29bfc6664a0d334c9aeb167ea307c568a6e4d0b671b72dc75cab15adbee40cc8e
-EBUILD astroid-2.3.3.ebuild 1338 BLAKE2B 0f63a6c7a7e6e92215103e313da96cc539531d800afe85f179b8ca9aec01507fabc5a0608d158aad7b26d77b7a0535e3fa77ae6a047bf4c8fb0de16932538532 SHA512 3d9d9df54402be3d1be8b38dd2abb676c689ad32b5fbdec02258918548308b572e88f1d1effebb1ebe68fb9a8a06f5e6a68865b22ee09920a966dc5d25143f0e
-MISC metadata.xml 1122 BLAKE2B 29f5f5eb980aa5e9035316854d7b69a803bf8507cd8f2b97880ef3a0be3e200936ddc3679e480741cf82203b704cd6c7b1610d31e9173dc3f8b97ebec6a6c844 SHA512 34a45382d84c03057ba59b40905138c2e048da4d602e5a26dab4b156c1a3697369e11ef66f451f3f823ec827f3771eb58c077c056f9609e5b55a27841fd5bf9d
+EBUILD astroid-2.3.3-r2.ebuild 1419 BLAKE2B 58a8ff2ac83e43c980dbd1cccfc2addf994817267c94fbb12dc33cc8fce57f49e42af5ea934c4e2c92273b82ce181a37b602a3047da2392a586c8c5ccc509c17 SHA512 0f28599a319172926d3c522bc75fdad347a4e77e943d898dd797e9f08844b1e1beff1395c8eb2231338df3a1fe6a90dc81500513c52340cade63dfd376f717ec
+MISC metadata.xml 1147 BLAKE2B 6fd688ecaf19f5de658caecd0e4a5b5b451ece67b0e55afc8fc65cae8f99f0a2cb09c5e70b2cf3b68a4748ee10a417dfcd93569cc35e866aec7404d6ec9ecac4 SHA512 5eab195b147e8e1551871f537d61d0a4460ff8be0420c7e1661f6774f7fe8ace43f665f64d61677bdf890788d8a53206ac54350a8c6b73f87ba9a6edd44d56da
diff --git a/dev-python/astroid/astroid-1.4.8.ebuild b/dev-python/astroid/astroid-1.4.8.ebuild
deleted file mode 100644
index beeff5e00711..000000000000
--- a/dev-python/astroid/astroid-1.4.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://bitbucket.org/logilab/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 ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
-IUSE="test"
-
-# still broken
-RESTRICT=test
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]"
-DEPEND="
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-#	test? (
-#		${RDEPEND}
-#		>=dev-python/pylint-1.4.0[${PYTHON_USEDEP}]
-#		dev-python/pytest[${PYTHON_USEDEP}]
-#		$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
-#	)"
-# Required for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
-}
diff --git a/dev-python/astroid/astroid-2.2.5.ebuild b/dev-python/astroid/astroid-2.2.5.ebuild
deleted file mode 100644
index 88949dd0eea3..000000000000
--- a/dev-python/astroid/astroid-2.2.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.3.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}/${PN}-2.1.0-no-pytest-runner.patch"
-)
-
-python_prepare_all() {
-	# Disable failing tests
-
-	# no idea why this test fails
-	sed -i -e "s/test_knownValues_get_builtin_module_part/_&/" \
-		astroid/tests/unittest_modutils.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	${EPYTHON} -m pytest -v --pyarg astroid/tests || die "tests failed"
-}
diff --git a/dev-python/astroid/astroid-2.3.3.ebuild b/dev-python/astroid/astroid-2.3.3-r2.ebuild
index bf9cf97da4d2..f472f8238809 100644
--- a/dev-python/astroid/astroid-2.3.3.ebuild
+++ b/dev-python/astroid/astroid-2.3.3-r2.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 )"
 
@@ -21,7 +21,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
 	>=dev-python/typed-ast-1.3.0[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -44,10 +44,13 @@ python_prepare_all() {
 	sed -i -e "s/test_knownValues_get_builtin_module_part/_&/" \
 		astroid/tests/unittest_modutils.py || die
 
+	sed -r -e 's:"wrapt(~|=)=.+":"wrapt":' \
+		-i astroid/__pkginfo__.py || die
+
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	"${EPYTHON}" -m pytest -v --pyarg astroid/tests \
+	"${EPYTHON}" -m pytest -v --pyargs astroid/tests \
 		|| die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/astroid/files/astroid-2.1.0-no-pytest-runner.patch b/dev-python/astroid/files/astroid-2.1.0-no-pytest-runner.patch
deleted file mode 100644
index 94eda1725457..000000000000
--- a/dev-python/astroid/files/astroid-2.1.0-no-pytest-runner.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2ad90aac..4628a40f 100644
---- a/setup.py
-+++ b/setup.py
-@@ -42,7 +42,6 @@ def install():
-                  install_requires = install_requires,
-                  extras_require=extras_require,
-                  packages=find_packages(exclude=['astroid.tests']) + ['astroid.brain'],
--                 setup_requires=['pytest-runner'],
-                  test_suite='test',
-                  tests_require=['pytest'],
-                  )
diff --git a/dev-python/astroid/metadata.xml b/dev-python/astroid/metadata.xml
index 0ca30562d0fd..fb791107494a 100644
--- a/dev-python/astroid/metadata.xml
+++ b/dev-python/astroid/metadata.xml
@@ -16,6 +16,7 @@
   attributes for different usages. They include some support for static
   inference and local name scopes. Furthermore, astng builds partial
   trees by inspecting living objects.</longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">astroid</remote-id>
     <remote-id type="bitbucket">logilab/astroid</remote-id>