gentoo resync : 19.03.2019

3 files changed, 3 insertions, 21 deletions

diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 148f5d155747..b340f218f22a 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,9 +1,8 @@
-AUX astroid-2.1.0-fix-tests.patch 636 BLAKE2B 5a4735a5e5b804dea467f714f03138d832ff31318ef479de7723537433750e831137d8a400aebfaabaf931c9d0a46d208238bfc362a3e108852b7f5a3d1e68ef SHA512 781d4682e2d0e7885033e20c0baed755e6b8df3a6557e985e130b94c88eeb7908bf5f2ae81dccd73dd5725221ce882070a45a8c0ee7970b3e4fdb403aa2dccdb
 AUX astroid-2.1.0-no-pytest-runner.patch 474 BLAKE2B fde7f34aa9e1feefb29bf0a993bdd451523ccfa30bcd8726d36c4b159d849536445599f8f794e6cac71e71ff6b68e8cd3af4d3d5ad1ecdf9936977ec92e29536 SHA512 9c8ff2d8b2ae67620fe38d9f454c77216c2291a7f2aa59d9c78abd5a76f72aabd8154b12055aacbbabdc10fc466f57e09ed5527f796df8e6a5a15bfefaa4f0f0
 DIST astroid-1.4.8.tar.gz 184091 BLAKE2B 7180b98c757c8681dd0abaed1e79d2c58ce676aff07b539af8776d589ff23770335d0ba4ce5c9b3940b0428dd10174e7c6eff66aeb500e6ac561734e27975be0 SHA512 54bb20edf5518b417470a2d63210802b267fe727f9d30e1ac5000db00a7894739b1c4249468fb55df81b55d382f3a5bbe019876141f7ee4d94040fd699dc0c2c
 DIST astroid-1.6.5.tar.gz 255688 BLAKE2B 7547e4c537f73ef77b61fba1ab8640c7cd50014ae52e4e4b8f8209a000c55bbdbb1ddcd3fb90d078f99a34d4a4779adabc8ad71af40c3a4547fe3e0d814b328c SHA512 f51f275c9f04809c8993d187cb62fadc84003ddc954d371356474dbe6b719868406fd9188c560f5b658b8b44bb6a4d3ee0785e809e789ca117e2bcbdb58aec53
-DIST astroid-2.1.0.tar.gz 276196 BLAKE2B f09ef4629bb29d0492f1f6ddafd1c0f4d4ef09df5612f3a9a811b09dec7a8c6294a44458e79223232f467a70434022cc23b4745515199beaf4727bd0591bccb3 SHA512 ca200d51613782a85c3f164e9ef55bac1de288c45e7662645ef080cc84a88e34499b2a924b130e9215418842c25352bb948c02d569ac45c251ac37bc57f0dcd8
+DIST astroid-2.2.5.tar.gz 281829 BLAKE2B 2cc341caac381fb44b0302e8057a6e2105a6a82dbf807f8a59598e15c5658cc30d4c32e3b58ebbc94c4559f2b2274373f5ed6c4b86b4e8eff86dd91a5520e7ce SHA512 71c8c26314f666e2b9519a83dd9476fbfe0ad7d72f5308f6a94b83c5442dc695bc3e51155df45586ff2ff0eec522a02286d00ac566d542f0b82e5e0d0d7d9c65
 EBUILD astroid-1.4.8.ebuild 1093 BLAKE2B 89692333f08a4c9b3b46086a20ef4e6cc186cfef6e9530b1ccd0eb6515fa74117fce8fbd1c55710323957a3f2eec57310b752e791d59a06a06926b8909d46140 SHA512 8e076be66daad2fae26351d89f3c61c6d41523ad7240c78a0e3c184fc1db634c708ca7348137d0eff11bfa20959084d7a97b0a9791caaf164c877984ebb90473
 EBUILD astroid-1.6.5.ebuild 2018 BLAKE2B 3a1bf455d17fc76abbce1b6739d4c81bc1a06fdc1d36e3b06187175cdf3825442221089a48f81b434a9daff92b4d727e3e885555ce1eb2e2dcc92263ce573da1 SHA512 61cd00a454cf0c0c092a0cac9db03bdb87eae1da854991ee4524ec749b143e05c432c83312aff0e1e9be4ef6c678a3a60b4e81769dbb267783de3af7db96d964
-EBUILD astroid-2.1.0.ebuild 1358 BLAKE2B b2b8028692a723be3fb5a640f121439654d9b6599f4a615c8a2cfd3e57dd747d43a3df323d49a7dca9863dd8dde6b055b9df6f5d783c147e34a6300a3ccf33b2 SHA512 9b9d150aca933b3e110631b4194df2293af705a0522fef5e2f80ea972b07f761eca69790c1da0f58579d4285d30bf16eed988b41ff32bda2bc104379de20a3e7
+EBUILD astroid-2.2.5.ebuild 1270 BLAKE2B dd5e91127318dbdb050111dd52f93bc9dcc83c05ce433c8b1eb0032c28798e2ea386145a35a34206958cc5194142939957e7e9294544a1c77d9469fd5f3b4f37 SHA512 41bfc6d995f44b0ed42ecdb4375b970e96d096d64c2db5d318ff033fa0e13bce48a029985270f092a6624d0e3184f9a79640a9cfb52c5e1280db6583fb3198c7
 MISC metadata.xml 1122 BLAKE2B 29f5f5eb980aa5e9035316854d7b69a803bf8507cd8f2b97880ef3a0be3e200936ddc3679e480741cf82203b704cd6c7b1610d31e9173dc3f8b97ebec6a6c844 SHA512 34a45382d84c03057ba59b40905138c2e048da4d602e5a26dab4b156c1a3697369e11ef66f451f3f823ec827f3771eb58c077c056f9609e5b55a27841fd5bf9d
diff --git a/dev-python/astroid/astroid-2.1.0.ebuild b/dev-python/astroid/astroid-2.2.5.ebuild
index 5b0bb04f7bb9..76a004ab8c66 100644
--- a/dev-python/astroid/astroid-2.1.0.ebuild
+++ b/dev-python/astroid/astroid-2.2.5.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/wrapt[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '<=dev-python/typed-ast-1.2.0[${PYTHON_USEDEP}]' python3_5 python3_6)"
+	>=dev-python/typed-ast-1.3.0[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
@@ -33,7 +33,6 @@ DEPEND="
 	)"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.1.0-fix-tests.patch"
 	"${FILESDIR}/${PN}-2.1.0-no-pytest-runner.patch"
 )
 
diff --git a/dev-python/astroid/files/astroid-2.1.0-fix-tests.patch b/dev-python/astroid/files/astroid-2.1.0-fix-tests.patch
deleted file mode 100644
index 32e75225507b..000000000000
--- a/dev-python/astroid/files/astroid-2.1.0-fix-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-typed_ast doesn't support py37 yet and disables its support under py37.
-However, when dev-python/types-ast is installed, the test suite mistakenly
-thinks that it has to test typed_ast-related things and fails.
-diff --git a/astroid/tests/unittest_nodes.py b/astroid/tests/unittest_nodes.py
-index 56b195c2..762f1af2 100644
---- a/astroid/tests/unittest_nodes.py
-+++ b/astroid/tests/unittest_nodes.py
-@@ -49,6 +49,8 @@ try:
- except ImportError:
-     HAS_TYPED_AST = False
- 
-+if sys.version_info[:2] >= (3, 7):
-+    HAS_TYPED_AST = False
- 
- class AsStringTest(resources.SysPathSetup, unittest.TestCase):
-     def test_tuple_as_string(self):