gentoo resync : 28.04.2021

6 files changed, 150 insertions, 168 deletions

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index d1e0d64ae5d2..6c0a3be7ddfc 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,13 +1,12 @@
-AUX spyder-4.1.2-build.patch 1503 BLAKE2B 06d768f741703df74bf9183c6a80e4507a6e0afaf6eeae3cbf8f5f00dbf5f07a02d7f0f7639f5e91f412b1d08c7de58347b2a336b262ab2dd2bf0982978a1ee4 SHA512 ee372db7b1dfa4c77feaee6b9def35c4238df00cc8cd7de1ba5a309672ce1b60b2e84f9e9eae552d08f26dd73cd3cd1789e65344bd8e13e87764413340d7a480
 AUX spyder-4.1.5-doc-theme-renamed.patch 375 BLAKE2B f4c902b331e9e6f034018d781d483380e85b3277f5e8f3f64f15ebcd4673ee1a805838a10c5606aa853c1c0779c10a439bb556dd57a7427bf96aa2fce0c7b9a9 SHA512 7671f0639c8947a0cbd4ac24c0a9731cb31a7c8f2ca49ac7a9d2dc8f4b7b08aa033448c285ba71f844fc8588167bf91b44c3cadaf3fd83883160c2eddc5b7e7b
 AUX spyder-4.2.1-build.patch 1232 BLAKE2B 54bef30dca6cc94a7a32fab200bceed1a01f730f4758f03b97688d3ecf5709e8c7b37af82746452520c2f3135722b4e387f3ef9d9219e1d159b8abe937d8165f SHA512 052f249b5f6b2195a472750f42b16721de9e8020481cb57bb5e180267507df6f6b5f1a36b8a45f28b64d098c8a02a4814c1c03f1efdcd1ffedaca77a28ad8705
-DIST spyder-4.2.0.tar.gz 11840358 BLAKE2B 26e4cd9865196fb39fa5b49a17f172b3000fe27c5ab6fb1b31ed56d41f118e4016b6ed97ce8cb1b39c65031fc11413f8e426876d3dc8d5af25f12428d0e0c481 SHA512 c1460e2fe9a37c0e6107657de71205682018d87737b3eac16ec92c32d979bf727a6c8955bd2700872b6e91159d1a1efc57cdea52ffc44604fe34b78094de6e7f
+AUX spyder-5.0.0-build.patch 1147 BLAKE2B 68e62f6bd7a021d82f1da8d86c16e2289faac7f760f9bb5dc975053c7f8bb409c79b90eeaf06c5121ca5833442b61929cc640e4f25e6cc27f6118f0fa8f27b5e SHA512 e88cbbeca42ac2720f4e0888df9432d912d3907af267d3fe6a5e658d18d1242c998a70dee88fa0efe9edfcf87a46a40cf75685037d75fce1d596b708acc32096
 DIST spyder-4.2.3.tar.gz 11539371 BLAKE2B aecd2e9772c52e644e9c0503195e380fffecdfaa5aea3f00a64e98a969faf3de4e0d8eb0515cc59893f28deb7733403826e90e36006ad7f8f4d67e8ef5e64543 SHA512 9e56efab8862c21e7496d45e813d28c4e9be583275352b0a6e0a58e99f6c0234fa9862da66705839beacb971dde9b6edc253405d9d62853a3c4c9c9991844846
 DIST spyder-4.2.5.tar.gz 11539071 BLAKE2B 9d7a98da018aae934803d640995fe2dfa6bbb20bfc7140bd00f5e7a00a09c47922fefd8df84f4b217a50176ee190515da6f4cbf498a03cae68e2ac4f5ec70664 SHA512 081b047a45b7522a69b1b21a221ab5cdef47f87f36ed4423ff63297d205f924c1627517c50622acb2d10efa094bc506fed4ec88f861775d3f58e81ac6ef017ac
+DIST spyder-5.0.0.tar.gz 19967667 BLAKE2B 072d65949f83e8831a6c88ef5472401f7b6ef305dd193baea34d63ce865d49a1181d0282df2e4c0025ff928e6a0a6c13312fb69f3329343a45def6ee9f30b9d3 SHA512 c76355314c7f623fbcc99540c8ecc4b57c18f9c0551688b1e4016b4510262305837d1637df38f412314fc98abd2c359d834bf380300a46b098503db561f83177
 DIST spyder-docs-5c9c8a3317045c2d301e05b751943be9b521d129.tar.gz 66692311 BLAKE2B ec741a9cd830bc8a5776be1d52dcac9649c8abf33faec0ac8741d95625d8aeda2b8c0d2bdbef02c068a22ec62a4d5281a48e996530e1bd2e6de43b86e0a14ffe SHA512 73bd05ef31f69ebd80bb488017998536c4ed0e63a331efe743d9d858b936df287253f333d09beac6d2b249a96e8f82538d321850a64b0941db3d0141122995eb
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
-DIST spyder-docs-7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c.tar.gz 58822544 BLAKE2B 9ddd662eb0e3b2845a15bc38a0ab994fcf43824a560cf635a29e16b5eb66407706a412ea50a2f8e5c0212675df3422ece649bd1e50e3ecd1c34ee5727f8a2df9 SHA512 ab30f287733681da0b1d15656a44cd320401330309efbff8f0a89f59a15d5c57532a2eab3e8353d8c3856eac0a393385a852663d6698d0a0d309def21d13933d
-EBUILD spyder-4.2.0.ebuild 8406 BLAKE2B e634bfeccb37da403424636e1c1425ab375bbadcf34da1c9ef3b3a250fc8675a0b213259176025b7565d899bb56af260dfb2e761c07b5ba16112b1b3783afd35 SHA512 c190334f7bf444d8872207de4021422395ebb5accbb4273d17b88c29811fc45c71bd72f1a3a069659825ae3dda645b8f179bfbc7c9613020733ead734619dafe
-EBUILD spyder-4.2.3.ebuild 9616 BLAKE2B f19fe1a411bf3ed4ebebb4faa790933f1310401e97b7d3c0195cb8bd8eedc0dfd7eabeeded4bd94439cc310c9fab82c22f921b6ede55f51161f555f5c1675103 SHA512 676b5feca5dd1eb03e4f8326c027bad7abd21ab52d887d3a396afa49cad7ccf57c3f6e040820e51053f328f0d10486609f79d3e54230111bfd16387b6e4b7a3c
-EBUILD spyder-4.2.5.ebuild 9662 BLAKE2B cb575d2f12b14c208f924162b80dddb54f7f095572d602820a7c8437899ec3cbea4c3b34ebc9f967da6277952187c967eacf60ff9c850b1f8fc20610ba40fd3a SHA512 d2efa521e1ba417469389c81640081fb4e472d40eb95124e75f39c8f98e2ec7b1bbc79260e75e01e7d2d1e9c72251fdfea06d7f7daa3c28af53ad1b6742740ce
+EBUILD spyder-4.2.3.ebuild 9501 BLAKE2B 8b4a24ab55eaa8e8bb4fbf2ead29606fa2a8106de85a39812dda797e40dc76e8fac2fd721b07e23c34ef9af90039c8439d2e32374d705ed4d6c524305f50c308 SHA512 b65a386f5e8ea9061c2538111e009c74f8f2b422b2dab5140bfe5deff39a372ad96abe5c1c3c711f02fb32ed5b905d4092b4552baa1952ba274201c7ff10d619
+EBUILD spyder-4.2.5.ebuild 9549 BLAKE2B 3f2cba49588a07d818deac45b72a8ea8c711758fc97326d267d1a6b21ed8f2f87246f4aa74db55e903f63fba8ba27bddd3b55c9176c63a7e6dcbf79e5b8b9a60 SHA512 4f698fcab0f3396a73620f8702991f30d822830888d8c84005fe306fc6bb33d0b40dddb27f8351604d5585163141b401e8313b3add98654272e846be95a29541
+EBUILD spyder-5.0.0.ebuild 7715 BLAKE2B 8f17e97c549ff1cab6e6769c051bc03f3acceb3a5083f712671399adb9439be8d5107389b54db7403d9a69ecf0bdd1b498460e31b715d0c5c3a4791070c53f47 SHA512 a3b044e98998bd5ae4dbbb7642a8a3d8eea8ebb964605b0982e5fb350cf89d8bb0589edb757045634c6b6057f7b6dab1b06590a240a9abe97e743affe2c1a2a9
 MISC metadata.xml 1468 BLAKE2B fa0cb704afb02b7f48b183b39be4693662a340a2ca56910bc188b5e015b3cb9b42e727b8cc908a39d6d331b0b9b3f5eadb66750f62a55369033292f3ca1dc900 SHA512 60a052889be1543d2f3c451aa72e6bdf51ee6fb55163eea1a796e44d69b59625a368d48da8201a2909392ab5477c1e57d3d8904d978ff28d26609058772e12eb
diff --git a/dev-python/spyder/files/spyder-4.1.2-build.patch b/dev-python/spyder/files/spyder-4.1.2-build.patch
deleted file mode 100644
index 7463550fc165..000000000000
--- a/dev-python/spyder/files/spyder-4.1.2-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -r -U3 spyder-4.0.0b1.orig/setup.py spyder-4.0.0b1/setup.py
---- spyder-4.0.0b1.orig/setup.py	2018-08-12 04:35:49.000000000 +0700
-+++ spyder-4.0.0b1/setup.py	2018-08-14 20:25:32.827148778 +0700
-@@ -112,21 +107,6 @@
- 
- 
- #==============================================================================
--# Make Linux detect Spyder desktop file
--#==============================================================================
--class MyInstallData(install_data):
--    def run(self):
--        install_data.run(self)
--        if sys.platform.startswith('linux'):
--            try:
--                subprocess.call(['update-desktop-database'])
--            except:
--                print("ERROR: unable to update desktop database",
--                      file=sys.stderr)
--CMDCLASS = {'install_data': MyInstallData}
--
--
--#==============================================================================
- # Main scripts
- #==============================================================================
- # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
-@@ -210,8 +190,7 @@
-                  'Intended Audience :: Science/Research',
-                  'Intended Audience :: Developers',
-                  'Topic :: Scientific/Engineering',
--                 'Topic :: Software Development :: Widget Sets'],
--    cmdclass=CMDCLASS)
-+                 'Topic :: Software Development :: Widget Sets'])
- 
- 
- #==============================================================================
diff --git a/dev-python/spyder/files/spyder-5.0.0-build.patch b/dev-python/spyder/files/spyder-5.0.0-build.patch
new file mode 100644
index 000000000000..be849e78e49f
--- /dev/null
+++ b/dev-python/spyder/files/spyder-5.0.0-build.patch
@@ -0,0 +1,37 @@
+diff --git a/setup.py b/setup.py
+index ff4f8ec..08a4f2d 100644
+--- a/setup.py
++++ b/setup.py
+@@ -111,24 +111,6 @@ def get_packages():
+     return packages
+ 
+ 
+-# =============================================================================
+-# Make Linux detect Spyder desktop file (will not work with wheels)
+-# =============================================================================
+-class CustomInstallData(install_data):
+-
+-    def run(self):
+-        install_data.run(self)
+-        if sys.platform.startswith('linux'):
+-            try:
+-                subprocess.call(['update-desktop-database'])
+-            except:
+-                print("ERROR: unable to update desktop database",
+-                      file=sys.stderr)
+-
+-
+-CMDCLASS = {'install_data': CustomInstallData}
+-
+-
+ # =============================================================================
+ # Main scripts
+ # =============================================================================
+@@ -196,7 +178,6 @@ def run(self):
+         'Topic :: Scientific/Engineering',
+         'Topic :: Software Development :: Widget Sets',
+     ],
+-    cmdclass=CMDCLASS,
+ )
+ 
+ 
diff --git a/dev-python/spyder/spyder-4.2.3.ebuild b/dev-python/spyder/spyder-4.2.3.ebuild
index 25d5e585b49f..5edd16889371 100644
--- a/dev-python/spyder/spyder-4.2.3.ebuild
+++ b/dev-python/spyder/spyder-4.2.3.ebuild
@@ -225,28 +225,25 @@ python_test() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-		optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-		optfeature "Run Cython files in the IPython console" dev-python/cython
-		optfeature "The hdf5/h5py plugin" dev-python/h5py
-		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-		optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-		# spyder-autopep8 does not have a release (yet)
-		# and are not compatible with >=spyder-4.0.0 at the moment
-		# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
-		optfeature "Vim key bindings" dev-python/spyder-vim
-		optfeature "Unittest support" dev-python/spyder-unittest
-		optfeature "Jupyter notebook support" dev-python/spyder-notebook
-		optfeature "System terminal inside spyder" dev-python/spyder-terminal
-		# spyder-reports not yet updated to >=spyder-4.0.0
-		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-
-	elog ""
+	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+	optfeature "Run Cython files in the IPython console" dev-python/cython
+	optfeature "The hdf5/h5py plugin" dev-python/h5py
+	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+	optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+	# spyder-autopep8 does not have a release (yet)
+	# and are not compatible with >=spyder-4.0.0 at the moment
+	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+	optfeature "Vim key bindings" dev-python/spyder-vim
+	optfeature "Unittest support" dev-python/spyder-unittest
+	optfeature "Jupyter notebook support" dev-python/spyder-notebook
+	optfeature "System terminal inside spyder" dev-python/spyder-terminal
+	# spyder-reports not yet updated to >=spyder-4.0.0
+	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+	elog
 	elog "Spyder currently only works with PyQt5 as QtPy backend, PySide2 is not supported."
 	elog "Please ensure that 'eselect qtpy' is set to PyQt5."
-	elog ""
 }
diff --git a/dev-python/spyder/spyder-4.2.5.ebuild b/dev-python/spyder/spyder-4.2.5.ebuild
index 1ae8a57e1166..cc39e8e83c52 100644
--- a/dev-python/spyder/spyder-4.2.5.ebuild
+++ b/dev-python/spyder/spyder-4.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 # The warning that this is wrong is a false positive
 # Spyder has setuptools in install_requires
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -226,28 +226,25 @@ python_test() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-		optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-		optfeature "Run Cython files in the IPython console" dev-python/cython
-		optfeature "The hdf5/h5py plugin" dev-python/h5py
-		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-		optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-		# spyder-autopep8 does not have a release (yet)
-		# and are not compatible with >=spyder-4.0.0 at the moment
-		# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
-		optfeature "Vim key bindings" dev-python/spyder-vim
-		optfeature "Unittest support" dev-python/spyder-unittest
-		optfeature "Jupyter notebook support" dev-python/spyder-notebook
-		optfeature "System terminal inside spyder" dev-python/spyder-terminal
-		# spyder-reports not yet updated to >=spyder-4.0.0
-		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-
-	elog ""
+	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+	optfeature "Run Cython files in the IPython console" dev-python/cython
+	optfeature "The hdf5/h5py plugin" dev-python/h5py
+	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+	optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+	# spyder-autopep8 does not have a release (yet)
+	# and are not compatible with >=spyder-4.0.0 at the moment
+	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+	optfeature "Vim key bindings" dev-python/spyder-vim
+	optfeature "Unittest support" dev-python/spyder-unittest
+	optfeature "Jupyter notebook support" dev-python/spyder-notebook
+	optfeature "System terminal inside spyder" dev-python/spyder-terminal
+	# spyder-reports not yet updated to >=spyder-4.0.0
+	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+	elog
 	elog "Spyder currently only works with PyQt5 as QtPy backend, PySide2 is not supported."
 	elog "Please ensure that 'eselect qtpy' is set to PyQt5."
-	elog ""
 }
diff --git a/dev-python/spyder/spyder-4.2.0.ebuild b/dev-python/spyder/spyder-5.0.0.ebuild
index 7a013fecdd6a..f524585bd2e9 100644
--- a/dev-python/spyder/spyder-4.2.0.ebuild
+++ b/dev-python/spyder/spyder-5.0.0.ebuild
@@ -1,29 +1,44 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
+# The warning that this is wrong is a false positive
+# Spyder has setuptools in install_requires
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit optfeature xdg distutils-r1
 
 # Commit of documentation to fetch
-DOCS_PV="7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c"
-
-MYPV="${PV/_alpha/a}"
+DOCS_PV="78b25754c69a20643258821146e398ad5535c920"
 
 DESCRIPTION="The Scientific Python Development Environment"
 HOMEPAGE="
 	https://www.spyder-ide.org/
 	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${MYPV}.tar.gz -> ${P}.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz"
+	https://pypi.org/project/spyder/
+"
+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
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+# The test suite often hangs or does not work.
+# Technically spyder requires pyqt5<13, which
+# we do not have in ::gentoo any more. Likely
+# this is the reason many of the tests fail
+# or hang. RESTRICTing because IMO it is
+# not worth the several hours I spend every
+# single version bump checking which tests
+# do and do not work. Spyder itself works
+# fine with pyqt5>13.
+RESTRICT="test"
+
 # White space separated deps are expansion of python-language-server[all] dep
 # As the pyls ebuild does not add flags for optional runtime dependencies
 # we have to manually specify these desp instead of just depending on the [all]
@@ -32,9 +47,10 @@ RDEPEND="
 	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
+	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
 	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/ipython-4.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
 	~dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
@@ -46,7 +62,7 @@ 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.1[${PYTHON_USEDEP}]
+	>=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]
 
 	dev-python/autopep8[${PYTHON_USEDEP}]
 	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
@@ -63,30 +79,33 @@ RDEPEND="
 
 	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pyls-black-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/qdarkstyle-2.8[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	~dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}]
 	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-4.7.7[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.0.3[${PYTHON_USEDEP}]
 	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
 	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-1.10.0[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-2.0.1[${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}]
+
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
 "
 
 BDEPEND="test? (
-	<dev-python/coverage-5.0[${PYTHON_USEDEP}]
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/flaky[${PYTHON_USEDEP}]
 	dev-python/matplotlib[tk,${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/pandas[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
-	<dev-python/pytest-5.0[${PYTHON_USEDEP}]
-	<dev-python/pytest-faulthandler-2.0[${PYTHON_USEDEP}]
+	<dev-python/pytest-6.0[${PYTHON_USEDEP}]
 	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
 	dev-python/pytest-mock[${PYTHON_USEDEP}]
 	dev-python/pytest-ordering[${PYTHON_USEDEP}]
@@ -101,7 +120,7 @@ BDEPEND="test? (
 # This patch removes a call to update-desktop-database during build
 # This fails because access is denied to this command during build
 PATCHES=(
-	"${FILESDIR}/${PN}-4.1.2-build.patch"
+	"${FILESDIR}/${PN}-5.0.0-build.patch"
 	"${FILESDIR}/${PN}-4.1.5-doc-theme-renamed.patch"
 )
 
@@ -116,16 +135,21 @@ DOCS=(
 	"RELEASE.md"
 )
 
-S="${WORKDIR}/${PN}-${MYPV}"
-
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/doc dev-python/sphinx-panels dev-python/pydata-sphinx-theme dev-python/sphinx-multiversion
 
 python_prepare_all() {
+	# Fix detection of spyder-kernels
+	sed -i -e 's/>=2.0.1,<2.1.0/>=2.0.1;<2.1.0/g' \
+		spyder/dependencies.py || die
+
 	# move docs into workdir
 	mv ../spyder-docs-${DOCS_PV}* docs || die
 
-	# these deps are packaged separately: dev-python/spyder-kernels, dev-python/python-language-server
+	# these dependencies are packaged separately:
+	#    dev-python/spyder-kernels,
+	#    dev-python/python-language-server,
+	#    dev-python/qdarkstyle
 	rm external-deps/* -r || die
 	# runs against things packaged in external-deps dir
 	rm conftest.py || die
@@ -145,45 +169,6 @@ python_prepare_all() {
 	# skip online test
 	rm spyder/widgets/github/tests/test_github_backend.py || die
 
-	# KeyError: 'conda: base', need conda??
-	sed -i -e 's:test_status_bar_conda_interpreter_status:_&:' \
-		spyder/widgets/tests/test_status.py || die
-
-	# assert 2 == 1
-	sed -i -e 's:test_pylint_max_history_conf:_&:' \
-		spyder/plugins/pylint/tests/test_pylint.py || die
-
-	# https://bugs.gentoo.org/747211
-	sed -i -e 's:test_loaded_and_closed_signals:_&:' \
-		spyder/plugins/projects/tests/test_plugin.py || die
-
-	# AssertionError: assert '' == 'This is some test text!'
-	sed -i -e 's:test_tab_copies_find_to_replace:_&:' \
-		spyder/plugins/editor/widgets/tests/test_editor.py || die
-
-	# hangs till forever
-	sed -i -e 's:test_help_opens_when_show_tutorial_full:_&:' \
-		spyder/app/tests/test_mainwindow.py || die
-
-	# Assertion error, can't connect/remember inside ebuild environment
-	rm spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
-
-	# AssertionError: waitUntil timed out in 20000 miliseconds
-	sed -i -e 's:test_pdb_multiline:_&:' \
-		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
-
-	# AssertionError: assert 'if True:\n    0\n    ' == 'if True:\n    0'
-	sed -i -e 's:test_undo_return:_&:' \
-		spyder/plugins/editor/widgets/tests/test_codeeditor.py || die
-
-	# assert False is True
-	sed -i -e 's:test_range_indicator_visible_on_hover_only:_&:' \
-		spyder/plugins/editor/panels/tests/test_scrollflag.py || die
-
-	# AssertionError: waitUntil timed out in 10000 miliseconds
-	sed -i -e 's:test_get_hints:_&:' \
-		spyder/plugins/editor/widgets/tests/test_hints_and_calltips.py || die
-
 	distutils-r1_python_prepare_all
 }
 
@@ -197,23 +182,25 @@ python_test() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-		optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-		optfeature "Run Cython files in the IPython console" dev-python/cython
-		optfeature "The hdf5/h5py plugin" dev-python/h5py
-		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-		optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-		# spyder-autopep8 does not have a release (yet)
-		# and are not compatible with >=spyder-4.0.0 at the moment
-		# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
-		optfeature "Vim key bindings" dev-python/spyder-vim
-		optfeature "Unittest support" dev-python/spyder-unittest
-		optfeature "Jupyter notebook support" dev-python/spyder-notebook
-		optfeature "System terminal inside spyder" dev-python/spyder-terminal
-		# spyder-reports not yet updated to >=spyder-4.0.0
-		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+	optfeature "Run Cython files in the IPython console" dev-python/cython
+	optfeature "The hdf5/h5py plugin" dev-python/h5py
+	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+	optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+	# spyder-autopep8 does not have a release (yet)
+	# and are not compatible with >=spyder-4.0.0 at the moment
+	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+	optfeature "Vim key bindings" dev-python/spyder-vim
+	optfeature "Unittest support" dev-python/spyder-unittest
+	optfeature "Jupyter notebook support" dev-python/spyder-notebook
+	optfeature "System terminal inside spyder" dev-python/spyder-terminal
+	# spyder-reports not yet updated to >=spyder-4.0.0
+	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+	elog
+	elog "Spyder currently only works with PyQt5 as QtPy backend, PySide2 is not supported."
+	elog "Please ensure that 'eselect qtpy' is set to PyQt5."
 }