gentoo resync : 25.04.2020

4 files changed, 7 insertions, 16 deletions

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 85c0fbe34ce2..c4bdedfc6a13 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,6 +1,6 @@
-AUX spyder-4.1.1-build.patch 1503 BLAKE2B 06d768f741703df74bf9183c6a80e4507a6e0afaf6eeae3cbf8f5f00dbf5f07a02d7f0f7639f5e91f412b1d08c7de58347b2a336b262ab2dd2bf0982978a1ee4 SHA512 ee372db7b1dfa4c77feaee6b9def35c4238df00cc8cd7de1ba5a309672ce1b60b2e84f9e9eae552d08f26dd73cd3cd1789e65344bd8e13e87764413340d7a480
-AUX spyder-4.1.1-py3-only.patch 2100 BLAKE2B 95223b087b2d85b5069822d96cc185f1e4005ff75d8a894a4684dc0a2ca11e2807ea912b0732dabc7ea5069fd3547ad30932cb92f5ce899c2313c6c784723046 SHA512 ec8361268d511888ac19326ff558198f39415237d528910ffb6ececba49a2d5bfacdf81f3f6deb299ac9375908ab371fa115211e77366409c87aa3e64b971466
-DIST spyder-4.1.1.tar.gz 11135335 BLAKE2B fc253ea266b368f372f2f0de30120d58c0e5c6e4cf474ccec0884c5fd3557cbd929eb17c0b9f2ee04745861499e12f54e61566507d844c9cf804bef65b3438d4 SHA512 e778dbac4c3f3462c32c9117ce6f6a8e5f2c8df5317695d76bf7a61995cac7be2e224cb751eda337b32442c9a32a7d53f8779a9288f15ad8d1a7aac9d328237c
-DIST spyder-docs-7c0b590.tar.gz 2257637 BLAKE2B 7e9528fde453631227ece3bd8c9163a0b3daadf3a83160b5475f943c49e7a559ff33dfe03531240b99571c535887ecff8459116d566dd7c739c74c4165e00060 SHA512 4d9548cc69db85ae6e93cac64e680460da6f9e76bf8b1265b31fbd4925786d29427de40bf06fd52ba807b0bb8f6c224e35b809c0e015a77013deb383e6d666f8
-EBUILD spyder-4.1.1-r2.ebuild 6640 BLAKE2B 04d660c26824cd29ae71a36d0222ced95fe893a3cbc3fc9ccc00b1be7f892f9c38232dc3d67e194ef1ed49d8e9f813e912b616a2df23cf652979103872de8a7b SHA512 2da67ff185108334c662769bc3d6afb2e7e57c951f7c77a5729aa946e6ad5d3233db181fde187a2d2675c063b7c1e8c92203f05681b7d9e0c478c6bd0634f8cf
+AUX spyder-4.1.2-build.patch 1503 BLAKE2B 06d768f741703df74bf9183c6a80e4507a6e0afaf6eeae3cbf8f5f00dbf5f07a02d7f0f7639f5e91f412b1d08c7de58347b2a336b262ab2dd2bf0982978a1ee4 SHA512 ee372db7b1dfa4c77feaee6b9def35c4238df00cc8cd7de1ba5a309672ce1b60b2e84f9e9eae552d08f26dd73cd3cd1789e65344bd8e13e87764413340d7a480
+AUX spyder-4.1.2-py3-only.patch 2100 BLAKE2B 95223b087b2d85b5069822d96cc185f1e4005ff75d8a894a4684dc0a2ca11e2807ea912b0732dabc7ea5069fd3547ad30932cb92f5ce899c2313c6c784723046 SHA512 ec8361268d511888ac19326ff558198f39415237d528910ffb6ececba49a2d5bfacdf81f3f6deb299ac9375908ab371fa115211e77366409c87aa3e64b971466
+DIST spyder-4.1.2.tar.gz 11125567 BLAKE2B 38591301fa9d97836341c9e86134fee1515ce901f42aeb45f606f23f5da7411e45e98e872dda0f0de4504e062eb6aa188d3db15181074220e69624a6b28dd8f6 SHA512 a0aeb1f7eb66f2efd5bb7da6ed7401668ca76e968b9b651882567664925be22ba0748914477876e2c62761442c57fa69c19a9fc6556251ac6db83bcd6088d000
+DIST spyder-docs-1022fd8.tar.gz 3539049 BLAKE2B 6d54a990ab681e9ed8a5f1a03e59e86c29eb94af18f29dd6c3b8b782230974cf057d25993b0e0358d0f32aba3fd8740dc94fb173766c094e7954d9f39456e6a5 SHA512 84935fb0665e1981c319484ba97096bf6996cc618d073417d06f3dfb703366429be333203af3ff2fe124cf00cc72e416fbc97734be4e21e9200b104fea167933
+EBUILD spyder-4.1.2.ebuild 6247 BLAKE2B c77d86448735692612dd7e7119d832e1f9eed85b51a0ce40970b6db8ae33ef1a88cfcecc159384f5741a0f0d222ad9fb484005d635665675002ba13190e40331 SHA512 5d5e8196ee3c69d358cd7bad4c90bdacb3aaf6cae37c350c3c58eb2a6ef1745894d18dbc277d1845e9a59fc750736cbf9847d050d35792de32921b2018e21326
 MISC metadata.xml 1526 BLAKE2B 2a2231f8512f9681558b1e53ac7a9bec850a210a82cb9771baca1088763b22cdcecdc0b0f2f5f9d93241cdee3ccbe3a71a7dc92a1772b53c1e8c499be432893d SHA512 3ff5cc8b66cb53ea1fb30076ca1e0c83b71f844f99d46f7bc7e6f95d3bbe33d44d3b0564be1ac85e76449bf20b6b3672a8757c6774445472ed386253e91cb9b7
diff --git a/dev-python/spyder/files/spyder-4.1.1-build.patch b/dev-python/spyder/files/spyder-4.1.2-build.patch
index 7463550fc165..7463550fc165 100644
--- a/dev-python/spyder/files/spyder-4.1.1-build.patch
+++ b/dev-python/spyder/files/spyder-4.1.2-build.patch
diff --git a/dev-python/spyder/files/spyder-4.1.1-py3-only.patch b/dev-python/spyder/files/spyder-4.1.2-py3-only.patch
index afdc92a1e122..afdc92a1e122 100644
--- a/dev-python/spyder/files/spyder-4.1.1-py3-only.patch
+++ b/dev-python/spyder/files/spyder-4.1.2-py3-only.patch
diff --git a/dev-python/spyder/spyder-4.1.1-r2.ebuild b/dev-python/spyder/spyder-4.1.2.ebuild
index 7d3574a82574..a16c87621ebe 100644
--- a/dev-python/spyder/spyder-4.1.1-r2.ebuild
+++ b/dev-python/spyder/spyder-4.1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit eutils xdg distutils-r1 virtualx
 
 # Commit of documentation to fetch
-DOCS_PV="7c0b590"
+DOCS_PV="1022fd8"
 
 DESCRIPTION="The Scientific Python Development Environment"
 HOMEPAGE="
@@ -33,7 +33,7 @@ RDEPEND="
 	dev-python/keyring[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
 	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/parso-0.5.2[${PYTHON_USEDEP}]
+	~dev-python/parso-0.5.2[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
 	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
@@ -82,11 +82,6 @@ python_prepare_all() {
 	# move docs into workdir
 	mv ../spyder-docs-${DOCS_PV}* docs || die
 
-	# allow newer parso: https://bugs.gentoo.org/715148
-	sed -i -e 's/parso =0.5.2/parso >=0.5.2/g' requirements/conda.txt || die
-	sed -i -e 's/parso==0.5.2/parso>=0.5.2/g' setup.py || die
-	sed -i -e 's/=0.5.2/>=0.5.2/g' spyder/dependencies.py || die
-
 	# some tests still depend on QtPy[webkit] which is going to be removed
 	# spyder itself works fine without webkit
 	rm spyder/widgets/tests/test_browser.py || die
@@ -113,10 +108,6 @@ python_prepare_all() {
 	sed -i -e 's:test_dependencies_for_binder_in_sync:_&:' \
 		spyder/tests/test_dependencies_in_sync.py || die
 
-	# Fatal Python error: Segmentation fault
-	sed -i -e 's:test_copy_path:_&:' \
-		spyder/plugins/explorer/widgets/tests/test_explorer.py || die
-
 	# No idea why this fails, no error just stops and dumps core
 	sed -i -e 's:test_arrayeditor_edit_complex_array:_&:' \
 		spyder/plugins/variableexplorer/widgets/tests/test_arrayeditor.py || die