gentoo Easter resync : 12.04.2020

5 files changed, 13 insertions, 57 deletions

diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index f4a8974b2839..19d79f2145a1 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,11 +1,7 @@
-DIST parso-0.5.1.tar.gz 388060 BLAKE2B 429ab40501d38e982cf77e0dbbfa4d8677dd1e2400945436b8eced608a41015b7028f586cf9af6057e441765f0a1db519a642ceadaba14620a92f452ce709871 SHA512 a04ef9bbe156bc28ac9fa64d091d3f1dcc9cf4b15a3c109cd33de1c4d34d0bf741016b88b6c12d456e953253942b7d522e0b793c9a00e9fb06de27ab0667c7fc
 DIST parso-0.5.2.tar.gz 390495 BLAKE2B 257de5853cad74803d9b45ae4820c96933d09ebe7c09d30a98ccb1d40d1473d8ef55f9be692278012f3d6f57066600ae14817d20bbde2258f2362702f3056f93 SHA512 d8a2b8c4f30eec676f9cb36afc86b4f80d8397ce4d82a2452598116ae50cb861a1eea6543a51898f4c94acb13b8345833283a353f19ae27242b6e993c02f0ef7
-DIST parso-0.6.0.tar.gz 390815 BLAKE2B 3f1def6bd7d88f09e943c9e75e653dc5ed74652188ad5480065467e393769efdfc19645f4ae49725837cb9b903c2b1589d0715a7173655e9b97899ea9c987aee SHA512 1382b5005ea7e19c3d4f8910b47e9b730e61045fdb16d833a43a7eded8bd568a7528f1822bf193d3c110a5496f53a540ca5028dd10bfd4a59193d58a7e457014
 DIST parso-0.6.1.tar.gz 390866 BLAKE2B 3dbbef687f194f41bc7fdeb7c78930802ee5a97150d2585eb8949ac74ac640e897b8f04b29f2768df920aa5d54ec80f1aac3b84f996ef0ea957ddccf9da77cf0 SHA512 98cc20a3378c89b870df5e5df52f2c2091c1a133ea9701141ed90edbb05c5b8ddf30dcc19069cc19666f34e37f8ca64e37bfd701314adb24b0a10ab197862cf1
 DIST parso-0.6.2.tar.gz 391060 BLAKE2B 476b91286dc69161558dbb82f2e5eaf1b7f9ded6de467d97c74ec7e08a7e956cfbb67bd64e6ed975fddeaa64a616bf714f069e7185a3af8140aeaa2eda2de729 SHA512 da011c6fbab3ca2157c8934086cc0db0b7a37f5cd67debe70f56429f409de8762b124948ee75ac65779b806d8aaab759ee790eacb580910f3609ffd280dba2a8
-EBUILD parso-0.5.1-r1.ebuild 653 BLAKE2B 3e812b5c5882e6b482c1a3dba3df575f06ded2fa3e8b174691ef5e92074aed573d5c3dcb243d4f9b337c96861cbb8ed0be9356854aaf98afc1caccbbcbddac4e SHA512 8b23fd80b995261ad8332c74c7290ab5a6b4195e70f57a3cc0c04c9d2e3ccbb409a135b01843537c83a4b6845a9b088d8be9a2d77d60565ed75d76946d7d2c42
-EBUILD parso-0.5.2.ebuild 654 BLAKE2B ce78d5998aac228edf3fa84a778b552ccd8d5fcb394b4db865193b5629de519c911a0e632d373e6c0464568a1805b1183310a21e5d550ebdbdba3c798416ae93 SHA512 adcd9d76a2ebd0ca5e16b9557576a11415576728c90d87fddc72cd6ad4d195edbee27264ae274a8d06864c96a166e722a6b7d48d19296facea7694444b49fb42
-EBUILD parso-0.6.0.ebuild 604 BLAKE2B aa9d9111d014c3ac9c1ddb86b62f82c3b8cc20642d53f4e68c1fd5a4878dd288a691b7747b7e79cbecaf3b05562eb33818f017f13ec4d66f7c1fc155d9b3abe0 SHA512 13dcf99522427e95619814eb0ef5cc15788097a476a481fb3def7f20666b18e6f1005f9c790c579e2123e9934f81a1c77bbf8f708c31a6e4839b6c775c90fe2e
-EBUILD parso-0.6.1.ebuild 793 BLAKE2B b6ed3d1e234a4e3acb5682c4b708b856070eddc8e846fd86864ee149033aeec9faa416c076f20212e12047f4644faea5a34e947ba11905621a97cdd7be422b22 SHA512 c9009a9519f46091048b18deaa672d6e68f86de516287662558b8699b1afac0a62127dfaeb272f2e91d40dce51d5ae3e8e83999885ccb4c6bed47eef874af0c0
+EBUILD parso-0.5.2.ebuild 740 BLAKE2B 58006962dc3210fc8f3e507c5d699f700ab60ae0655eeb59137d44981c6ad9b607507d8f76bc55be4db0cd7f97a347b5b46003a67cb453d0d75ee16a40da225f SHA512 0c641807ac7c7f87baa760d4fdb6e3825857835de9478a387e8c8edd7dacdaeee8fffde32e6644fc9d61c55612a37453c13af8febf9fe54e42e11047775771ed
+EBUILD parso-0.6.1.ebuild 789 BLAKE2B 6d2e677dcb103af8de97e28753b244067bd799db3baf04614b8d559284afa08f861294aa747ef7ac359400cde5d6d7e92a31672f09792dce3bbcbad4a52eff86 SHA512 f9f0805a8ce9538c1901a1772a1d7bda92ef68bd4fe2e04b273c6356dce2001103b76af7e89c05c04da10795d512add51f6780be083c0625d0e7464c06e54267
 EBUILD parso-0.6.2.ebuild 793 BLAKE2B b6ed3d1e234a4e3acb5682c4b708b856070eddc8e846fd86864ee149033aeec9faa416c076f20212e12047f4644faea5a34e947ba11905621a97cdd7be422b22 SHA512 c9009a9519f46091048b18deaa672d6e68f86de516287662558b8699b1afac0a62127dfaeb272f2e91d40dce51d5ae3e8e83999885ccb4c6bed47eef874af0c0
 MISC metadata.xml 377 BLAKE2B 0ac7d9c46c0b591fe46ff373bcb8942261cf0b819d9397500928546c4b07541c958edb116ecf1ff79f0a83c2f02784b019e7d64bd8a82bdfb397ef70fbbaa0c3 SHA512 7d719c633f81372caafbfb0a913fa455fd1d150210ea09713a0888b38d18ccae646b17bbe32a66b931016ee6e4bc826a1670a033466c945a2591e77f9d6d7b7c
diff --git a/dev-python/parso/parso-0.5.1-r1.ebuild b/dev-python/parso/parso-0.5.1-r1.ebuild
deleted file mode 100644
index 751ea4f20069..000000000000
--- a/dev-python/parso/parso-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} 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="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/parso/parso-0.5.2.ebuild b/dev-python/parso/parso-0.5.2.ebuild
index ea0a29896512..74075aabd3a5 100644
--- a/dev-python/parso/parso-0.5.2.ebuild
+++ b/dev-python/parso/parso-0.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,11 +13,15 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
+
+src_prepare() {
+	# tests rely on specific exception messages and fail occasionally
+	# upstream suggested skipping them
+	rm test/test_python_errors.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/parso/parso-0.6.0.ebuild b/dev-python/parso/parso-0.6.0.ebuild
deleted file mode 100644
index 98d5de60277f..000000000000
--- a/dev-python/parso/parso-0.6.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} 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="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/parso/parso-0.6.1.ebuild b/dev-python/parso/parso-0.6.1.ebuild
index d9dff2d95d49..10c7b0e69627 100644
--- a/dev-python/parso/parso-0.6.1.ebuild
+++ b/dev-python/parso/parso-0.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"