gentoo resync : 15.06.2021

3 files changed, 61 insertions, 34 deletions

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index f008c6834262..0fb52d9e92bf 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -3,9 +3,9 @@ AUX spyder-4.2.1-build.patch 1232 BLAKE2B 54bef30dca6cc94a7a32fab200bceed1a01f73
 AUX spyder-5.0.0-build.patch 1147 BLAKE2B 68e62f6bd7a021d82f1da8d86c16e2289faac7f760f9bb5dc975053c7f8bb409c79b90eeaf06c5121ca5833442b61929cc640e4f25e6cc27f6118f0fa8f27b5e SHA512 e88cbbeca42ac2720f4e0888df9432d912d3907af267d3fe6a5e658d18d1242c998a70dee88fa0efe9edfcf87a46a40cf75685037d75fce1d596b708acc32096
 AUX spyder-5.0.1-doc-theme-renamed.patch 346 BLAKE2B d0f894f5f736a32e78aaaac6c9c8f051dfdf5f12b09038c047be8885d05ca149830fbebc0bcc2764bbb24033817874be0e1b2609e2a6cae591254bb139488954 SHA512 0a2e0eaee4386ab85881ff67669a4820c26a17993c85b33a6df3576a07aba1c331eef5853db1ef8a760e95c315036411f6f13880510efda20933ee3cc0600741
 DIST spyder-4.2.5.tar.gz 11539071 BLAKE2B 9d7a98da018aae934803d640995fe2dfa6bbb20bfc7140bd00f5e7a00a09c47922fefd8df84f4b217a50176ee190515da6f4cbf498a03cae68e2ac4f5ec70664 SHA512 081b047a45b7522a69b1b21a221ab5cdef47f87f36ed4423ff63297d205f924c1627517c50622acb2d10efa094bc506fed4ec88f861775d3f58e81ac6ef017ac
-DIST spyder-5.0.3.tar.gz 20586502 BLAKE2B b8223273b638b57827f17037c47bb7bf53f19978fe9db343e354f557f4da17cfa03a36c013cab68b8b91b66495316a12d9652d864b8b089a495668b667a26b8c SHA512 c9b7c3a6755bc14ae84d8cd2c4166620a6fd1e83c097e2766f9f5190057775e4e3e9ba192d9eeb1cc434be11ac392f767239ae2d98cf40d95ffda4cf7cbeb358
-DIST spyder-docs-588cdf55cceffea7a3f31d98c0720bfe7df34b72.tar.gz 75780347 BLAKE2B c344ee0798e5780bfac5a8483c2992dfdddba5222fdd4a7c5603514bc612cc7300ec0cb49ebdcce6633d0cca8a5a36cfb5a2105c7f91febb5982dc2ea40fb86c SHA512 72f4644e872c57e229da8958a125bf405fa073ff99071b3555d97d8f8f71dc7b9f0dffbe61adf886e6bf3191894c639dd408d8dc76d65bc170bf7578b5b05558
+DIST spyder-5.0.4.tar.gz 20606964 BLAKE2B 20042d3d9b10da32aafe4036332608faa4bee458f36fb9359237cf2fd0651db68d8c7fb2a1bf653a350dcbd92fde856a4d37b4a8f85a37dffc6f8f31c750cbb3 SHA512 221c7b545d932a5c70f3f179b188f6ad9c2b1c632771f6766cba32115d1df56135708adbe2417c2236dc4b4fe847a734eaf1fb2920cad5b5e94969c308792d93
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
-EBUILD spyder-4.2.5.ebuild 9322 BLAKE2B df0f65151072a0fafcad3392be2404e9a45e154bd2e9c8db1de6835b3057d8cb47193bf80c0999fe67cd75dd6a05470650ca23fb9a6be3ce1fe02b5e0f18879c SHA512 06c087701e4f93161f5671b5e2cf0c26a78038cb3c85ff15edc247565f47a738ba5f2eda9c17cf4269030f997e6a836953c56ca2a8e9619d36dc9862d2310013
-EBUILD spyder-5.0.3-r1.ebuild 7207 BLAKE2B 8e830b8f4f59e9940d21f0289ffcfe0114d09aa86af06e02d498e23d52ef047b8f7850859f435ee83fcd64b6a3ca6268d4218f23cc946c9d487d9493c3a1143e SHA512 8db811aafe765208dfa866912f79cf43d786cf92ab580de9c619f5dbc0780e29f504a9ac6169019e131c918a88b53b5e22df629374fa7c315c9bb0480f11635d
+DIST spyder-docs-b317961de7600fc906d862238f344b3a315d28b1.tar.gz 80326831 BLAKE2B 0e9bb5d52c3cc1615f74f31a2c87be9fca5431bd19975594e147b5f9f3082f16f0cdfc476402533a0950bd928fda55de6c3850ed3a2780f1439fe88e349bf0f2 SHA512 8a1fe8e88c029402743c15b720e2e889fdbb73999a1035e81e5b3f998992515e041e14d8e361e23e7ec8a02cf30706349d12e9e0b37df9d1d7554b926831af78
+EBUILD spyder-4.2.5-r1.ebuild 10176 BLAKE2B a80d3e881f43d2300d4607fff4151118d747402de298f8e3c3dd5b7aecd5987c850e60cf4c1ef5346eab40163e4117abad0a3056744c0aca777f0b5fa6f7a6fc SHA512 cf8b9310b1e7af89b78257389f6b7934c51a5f5585fa69931f2b81536f1e4089844b9a24c606d9119a66c99ca3648a3f160bedf21ce3b98714b3af7474a1d2e4
+EBUILD spyder-5.0.4-r1.ebuild 7876 BLAKE2B a3ed56a8f3807025bd117d76f121527884ee321bb8d1e3d70547d763ec87d7664c9466cb9ce1e6585bd47a81ff6e05b31eaf4c49109ba98b1f9cdf2013da2d1a SHA512 f9c16571995ebf8c03cff217c3206cd56fcfa56d3402e217bffad10afa78f298a9a4c12f8241ac1397aab942498a2b27826a84eae4a3fd739221b896a70589d8
 MISC metadata.xml 1315 BLAKE2B d6969e1a2167c283ef39b5041f58307ce0eda6a70ec0efa6aad7f0871dd9202f857af5d5a676bcc45af9f31743b856ac6c7e90e3767f82810f2c27a2b266d76a SHA512 eb59a948abca8c2920705647d09d339d09e10d27b08ed3e4ff6acdfb2cf0662fc60c3983d6bf44cfe68b11023f7c71b642b0453d0e11c1c701f281a1dfb3be08
diff --git a/dev-python/spyder/spyder-4.2.5.ebuild b/dev-python/spyder/spyder-4.2.5-r1.ebuild
index 0fac6b43bcbe..cb91fff8bf7a 100644
--- a/dev-python/spyder/spyder-4.2.5.ebuild
+++ b/dev-python/spyder/spyder-4.2.5-r1.ebuild
@@ -59,24 +59,22 @@ RDEPEND="
 	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
 	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-server-1.0.1[${PYTHON_USEDEP}]
 
 	dev-python/autopep8[${PYTHON_USEDEP}]
 	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
 	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
 	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
 	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
+	>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
 	dev-python/yapf[${PYTHON_USEDEP}]
 
-	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyls-black-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-black-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
 	>=dev-python/qdarkstyle-2.8[${PYTHON_USEDEP}]
@@ -142,6 +140,25 @@ python_prepare_all() {
 	# runs against things packaged in external-deps dir
 	rm conftest.py || die
 
+	# Use the spyder fork of pyls (python-lsp-server instead of python-language-server)
+	# The original hasn't been update in over 6 months, and spyder upstream is slow
+	# in making the switch. Because we are running into issues with outdated deps
+	# and a whole dependency mess as a result, we can no longer wait for upstream.
+	find . -name "*.py" -exec sed -i \
+		-e 's/python-language-server\[all\]>=0.36.2,<1.0.0/python-lsp-server\[all\]>=1.0.0/g' \
+		-e 's/python-language-server/python-lsp-server/g' \
+		-e 's/python_language_server/python_lsp_server/g' \
+		-e 's/python-jsonrpc-server/python-lsp-jsonrpc/g' \
+		-e 's/python_jsonrpc_server/python_lsp_jsonrpc/g' \
+		-e 's/pyls/pylsp/g' \
+		-e 's/pylsp-spyder/pyls-spyder/g' \
+		-e 's/pylsp_spyder/pyls_spyder/g' \
+		-e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
+		-e 's/pylsp-black/python-lsp-black/g' \
+		-e 's/>=0.3.2;<0.4.0/>=0.4.0/g' \
+		-e 's/>=0.36.2;<1.0.0/>=1.0.0/g' \
+		{} + || die
+
 	# do not depend on pyqt5<13
 	sed -i -e '/pyqt5/d' \
 		-e '/pyqtwebengine/d' \
diff --git a/dev-python/spyder/spyder-5.0.3-r1.ebuild b/dev-python/spyder/spyder-5.0.4-r1.ebuild
index dd013535f655..3343093b7dfa 100644
--- a/dev-python/spyder/spyder-5.0.3-r1.ebuild
+++ b/dev-python/spyder/spyder-5.0.4-r1.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit optfeature xdg distutils-r1
 
 # Commit of documentation to fetch
-DOCS_PV="588cdf55cceffea7a3f31d98c0720bfe7df34b72"
+DOCS_PV="b317961de7600fc906d862238f344b3a315d28b1"
 
 DESCRIPTION="The Scientific Python Development Environment"
 HOMEPAGE="
@@ -19,8 +19,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz ->
-		${PN}-docs-${DOCS_PV}.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz
 "
 
 LICENSE="MIT"
@@ -53,11 +52,9 @@ RDEPEND="
 	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
 	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyls-black-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.3.2[${PYTHON_USEDEP}]
-	<dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]
-	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-black-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-server-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	~dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
@@ -65,27 +62,25 @@ RDEPEND="
 	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
 	>=dev-python/qtconsole-5.1.0[${PYTHON_USEDEP}]
 	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},pyqt5(+),svg,webengine]
-	sci-libs/rtree[${PYTHON_USEDEP}]
+	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-2.0.3[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-2.0.4[${PYTHON_USEDEP}]
 	<dev-python/spyder-kernels-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
 	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
 	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
-	<dev-python/watchdog-2.0.0[${PYTHON_USEDEP}]
 "
 
-# python-language-server[all] deps
+# python-lsp-server[all] deps
 RDEPEND+="
 	dev-python/autopep8[${PYTHON_USEDEP}]
 	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
 	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
 	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
 	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
 	dev-python/yapf[${PYTHON_USEDEP}]
@@ -102,7 +97,7 @@ BDEPEND="
 		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/pytest-ordering[${PYTHON_USEDEP}]
-		dev-python/pytest-qt[${PYTHON_USEDEP}]
+		<dev-python/pytest-qt-4[${PYTHON_USEDEP}]
 		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/scipy[${PYTHON_USEDEP}]
@@ -146,15 +141,30 @@ python_prepare_all() {
 	# runs against things packaged in external-deps dir
 	rm conftest.py || die
 
+	# Use the spyder fork of pyls (python-lsp-server instead of python-language-server)
+	# The original hasn't been update in over 6 months, and spyder upstream is slow
+	# in making the switch. Because we are running into issues with outdated deps
+	# and a whole dependency mess as a result, we can no longer wait for upstream.
+	find . -name "*.py" -exec sed -i \
+		-e 's/python-language-server\[all\]>=0.36.2,<1.0.0/python-lsp-server\[all\]>=1.0.0/g' \
+		-e 's/python-language-server/python-lsp-server/g' \
+		-e 's/python_language_server/python_lsp_server/g' \
+		-e 's/python-jsonrpc-server/python-lsp-jsonrpc/g' \
+		-e 's/python_jsonrpc_server/python_lsp_jsonrpc/g' \
+		-e 's/pyls/pylsp/g' \
+		-e 's/pylsp-spyder/pyls-spyder/g' \
+		-e 's/pylsp_spyder/pyls_spyder/g' \
+		-e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
+		-e 's/pylsp-black/python-lsp-black/g' \
+		-e 's/>=0.3.2;<0.4.0/>=0.4.0/g' \
+		-e 's/>=0.36.2;<1.0.0/>=1.0.0/g' \
+		{} + || die
+
 	# do not depend on pyqt5<13
 	sed -i -e '/pyqt5/d' \
 		-e '/pyqtwebengine/d' \
 			setup.py || die
 
-	# allow use of older rtree
-	sed -i -e 's/rtree>=0.9.7/rtree/g' \
-			setup.py || die
-
 	# do not check deps, fails because we removed pyqt5 dependency above
 	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
 		spyder/tests/test_dependencies_in_sync.py || die