gentoo (leap year) resync : 29.02.2020

14 files changed, 214 insertions, 758 deletions

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 96429eb62226..6785d1d2171c 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,16 +1,6 @@
-AUX spyder-3.2.4-build.patch 5706 BLAKE2B 60eea8e3dcb3bd6a5b80e2b30322ad7d514ca4011a6edefb325e468d692f790beadb8598f2d24b20d2015e77c9eb10388c3354b3417c96a5a2bdc5e02f4a0c38 SHA512 41fa116652af0b2a93e25e1c39c450c9bc5cc7bf76afde75e8b53845d7fa8be822c6763ca48ea4cbcb64e72cac927c832233bb681c9950a272da517234464123
-AUX spyder-3.2.8-build.patch 5652 BLAKE2B f4d9fca3670d8c2f3e8dc3e58b00ffe1bb49bdb9ded28db865e1005a8cc86755b32bbf53dcb618e759f116c2cc3a13b58b7c501d9dfaf2723e564372934a4d1c SHA512 e1d758be7b9c5221ec317b9e254e959bc0d6ce6bc01259c4291dcffbc0000fbaaca7660cc3b18a7ee14ea49f2addcde2e00bfdf251dcadb34b6cbb35984f95f1
-AUX spyder-3.3.0-build.patch 2228 BLAKE2B 915d17e7e61d37e1556f6de8aa594a2c338988223e3fc153ddbcbc13509e9b9459b52f1da786a2a0da5537e6ca66bc1ec99359308266c5afe8e78c99bcd307e2 SHA512 f65d34701fcdc4548ae8791c6aa63562dc5048fef7365fc50524e462b55b4e99ad5e71926d760dc326787355357116a89b5db040af59c6651a158593b3555f2e
-AUX spyder-3.3.1-build.patch 2207 BLAKE2B 74e44757aa6e5c9466b9fd49be6ad3d5527f60910de98248d61ca5af85535fd1a65525a849d57d84f807f72a4b178c04427838abe58d035b1bf74b4b5b03536c SHA512 8483c386c4df251661dd871f51c1ce0abdb499528261c1e0c157b14e1c4022b843ab916518abe072d4a48dfa8316de13e83b587815188310f584e765105569d4
-AUX spyder-4.0.0_beta1-build.patch 2215 BLAKE2B a556684e19cd204670f12364f4b0c6da6444c7b0f95af15115d760bdd244de6180610337e0cac79628dd26e06085dd1bbaf4dcba8c012afa26ea44e4794b6b18 SHA512 9c41203efbaf4ca83b61eec27719499b29fe69cbd32d5fe16fb934bc8d8a89af5dee521c526b058f68925a82912451d67cb6d2e88e8eaa0700c3042ef508b174
-DIST spyder-3.2.4.tar.gz 3345797 BLAKE2B 2df946f257fee7e87dd922b6ed3b3c0fa02438560cb7fa4087f25498eb134bfc8c342a0a928be37f08448dfea2917380a8521ead13954091b1854616012ace91 SHA512 46e89c68545695d1e64aaafdd2ed724b152a41088f1bfa645b8c66d8ae6bcc2d86e9830cd3f16edfb8027aad5786dfb67f2a8371839dd515df8ebe34446716e6
-DIST spyder-3.2.8.tar.gz 3414627 BLAKE2B 95f85f719eba20eb9fed5183cfac582b040abc93724df512188d14167a1663c5be9906dfc499feda9f8b0d7a713c093dbf98e4f20f732e0e9669397e1b7c8482 SHA512 03dea90632af510cfc8c4cc684068213a54dac9eef671f04c83663dd40eb480a4b818e2d040efa7a78a0d17044018aa76f2931abbf344eb684094fc7a86ddf5e
-DIST spyder-3.3.0.tar.gz 2782654 BLAKE2B e85ef52109c723d6b1b011f0e81ab3a46d3e0e6ba72fd34a1eda9ed650c9e03532e8fd72e05365367f62035a6f03d6ec32d35314c54438bf639070c7bebfb4d6 SHA512 53a2b438afe245092eda4d202d2453b5b93d6682aafcdb00bf251ddcdb30cee2d81d8adadbe23fa36f64fa5f917b327690cb8f9e2cf5c0da2841b5eda648a26f
-DIST spyder-3.3.1.tar.gz 2786730 BLAKE2B d906b5750cb620db41aec514a64d132b9ee5a992047828faffe11af5abd22d0cec7b876dfe79c6d378804373e8db5c661214f5730833e7599bf13b80d4dc16d6 SHA512 91d648a2717b5d5386115ba800fdd98884e609b213007dbaa09c7d16335f1b9ec3d0bc6b32d1677db8c2704e990e70eaa04d6d1efc800008cddfa511105e9c68
-DIST spyder-4.0.0b1.tar.gz 2986758 BLAKE2B 7fa918a569ed26d1d71ea7bce725f1b7d5db54badf3fb7bad1265d93f2ebdf25b1246acefb4f8517a6f34968bf8f12331958afcf72fc3c162e0d06d9dc4d4c72 SHA512 5751434b7ffac4d1e0c535f8a842656c3a306ed3d8a275a06a0eb57d3cd9bb36d01341723159292cba8616fcadc7157387fdb334b2ab0efbc1bb6b920102015a
-EBUILD spyder-3.2.4.ebuild 1658 BLAKE2B 555e0c53bfb8a5e036d4b6a243c82c724e9db332cc619702d430402140eb557d5a7d5569b8d57ec55634d50455d0167599f636f44e4efabcebc5e77b8ef52f65 SHA512 6078fb492ebada12f02fb7fde976f71e630a5170e7b2d857ab670ce975ea56033c1fbd3506ae9e61ac154273e45d435561be8fd9fed7129733a474bd64e9068e
-EBUILD spyder-3.2.8.ebuild 2516 BLAKE2B e08a262255f8833e0e59733fdccd7c931ce570859c6045120b90cfa6f67e6ffdae463dee54397f565fca2efd8cbb6b8797f8219c3e5039983d69ff4fc62999e7 SHA512 a8cc91c90aa9a2cd0a3289b42bc7133b4010fe26cc93560cff7240d5d2f58f534c552c7f7602dfc6da09b42a96d2fb571d578349b61f484ca86fc943ebf71cdc
-EBUILD spyder-3.3.0.ebuild 2398 BLAKE2B ab72c384cd51bdbadb87bf96e3be91088f7aa1d96ff1e74499d980326d47cf57b3e5284fb9c2771aad843c25edf7e83806beb06788e80ec3dc9a9b894b059c69 SHA512 b4c7922fc340e05aad0b99ddcdc08218797f664bca6e9a54b6dc398f47d53107548249e83a4b957ebb6a3918e2be6a706fd66ae10c4de9114b7ba0ee68346378
-EBUILD spyder-3.3.1.ebuild 2398 BLAKE2B ab72c384cd51bdbadb87bf96e3be91088f7aa1d96ff1e74499d980326d47cf57b3e5284fb9c2771aad843c25edf7e83806beb06788e80ec3dc9a9b894b059c69 SHA512 b4c7922fc340e05aad0b99ddcdc08218797f664bca6e9a54b6dc398f47d53107548249e83a4b957ebb6a3918e2be6a706fd66ae10c4de9114b7ba0ee68346378
-EBUILD spyder-4.0.0_beta1.ebuild 2453 BLAKE2B ea5096e533b650d279c803e083cc26716378d9e59434e75a51c310116d3faf7e3040467a227bb8c4baff532a7ce2c946ae603345da88c1f78adca9ef5e14f5ac SHA512 a3cee247168990dbf67f3f9a2c8d7f5cf0e9e10d16e6ebb91cd178ac044ed2e3357195462cd08af374ad68e9319e401dfc7616934f87836273630722ecd53617
-MISC metadata.xml 1371 BLAKE2B 1b79aa84224554c57dc9ba4cfb888a9d18ed1b5fc99b6912de2603ac9c7866a4abb0a43a8a86df516b2b5ef3c4a0cdb18c20ea648e59002635affbdc813e2589 SHA512 8af58f099e6a7d97bd266c2d09b44ef51ec71a3ae51d61caf49968d6ecb8d830e4003171080011d390e9a27fd3010f95f22e9555a702f26e6635a4e1e02db537
+AUX spyder-4.0.1-build.patch 1503 BLAKE2B 06d768f741703df74bf9183c6a80e4507a6e0afaf6eeae3cbf8f5f00dbf5f07a02d7f0f7639f5e91f412b1d08c7de58347b2a336b262ab2dd2bf0982978a1ee4 SHA512 ee372db7b1dfa4c77feaee6b9def35c4238df00cc8cd7de1ba5a309672ce1b60b2e84f9e9eae552d08f26dd73cd3cd1789e65344bd8e13e87764413340d7a480
+AUX spyder-4.0.1-py3-only.patch 2182 BLAKE2B b14e63a4bbde01aff8f629ec7fea5ca61790ba1ceecd858700f705baddb94c77083377fc980c4f5e95c315d2b1c7bdf6f700829848b36fd90ca0d69e17b33c36 SHA512 9abdd6e8f02ecb32fd7def4f6825920d4e5650a22d78cc98171af805d0cd5510a328632f43b44c234fcb4f35cb4efa538b5c716e2cf1029ead585b40e16b9903
+DIST spyder-4.0.1.tar.gz 10783565 BLAKE2B 5d264991b9bfc8118ef91f929269a300932cb0078b70c54613836c4337dc41214aa4ab81dacb4a535aaa6dea6b1eb591e25c7071664dc102e218373a0d7f8824 SHA512 9249a3b4a73ebe7a485d75fe2bea68bfa106c8ad0710120a6e05a43e3e2a65f9076904d1104180e925ab282b1d9da712c3509e0a5a7cfe3bd5ea8a95a1617bdd
+DIST spyder-docs-7c0b590.tar.gz 2257637 BLAKE2B 7e9528fde453631227ece3bd8c9163a0b3daadf3a83160b5475f943c49e7a559ff33dfe03531240b99571c535887ecff8459116d566dd7c739c74c4165e00060 SHA512 4d9548cc69db85ae6e93cac64e680460da6f9e76bf8b1265b31fbd4925786d29427de40bf06fd52ba807b0bb8f6c224e35b809c0e015a77013deb383e6d666f8
+EBUILD spyder-4.0.1-r1.ebuild 5912 BLAKE2B 2eb84c632488e71d4f34e4cc8f8e17d49cab93c36db86641b9c2b9961fc3932e8f5b8b9344c0ba7f22637da47d938a0df41d0dae4e82918846d88c3e854f3448 SHA512 502fed93839653e2036ae93b6477d1a88cc919f2433400da8ef5a43363a40a594066b9b4f4882d3d72346683746b1f9a109239a208b14f24baa870721d61f302
+MISC metadata.xml 1526 BLAKE2B 2a2231f8512f9681558b1e53ac7a9bec850a210a82cb9771baca1088763b22cdcecdc0b0f2f5f9d93241cdee3ccbe3a71a7dc92a1772b53c1e8c499be432893d SHA512 3ff5cc8b66cb53ea1fb30076ca1e0c83b71f844f99d46f7bc7e6f95d3bbe33d44d3b0564be1ac85e76449bf20b6b3672a8757c6774445472ed386253e91cb9b7
diff --git a/dev-python/spyder/files/spyder-3.2.4-build.patch b/dev-python/spyder/files/spyder-3.2.4-build.patch
deleted file mode 100644
index 2a1fee52131b..000000000000
--- a/dev-python/spyder/files/spyder-3.2.4-build.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- spyder-3.2.3.orig/setup.py	2017-08-29 00:42:56.000000000 +0200
-+++ spyder-3.2.3/setup.py	2017-09-16 20:57:08.610147911 +0200
-@@ -77,13 +77,7 @@
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/pixmaps', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
--                          ('share/pixmaps', ['img_src/spyder.png'])]
-+        data_files = [('share/pixmaps', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
-                                    'img_src/spyder_reset.ico'])]
-@@ -106,102 +100,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}
--
--
--#==============================================================================
--# Sphinx build (documentation)
--#==============================================================================
--def get_html_help_exe():
--    """Return HTML Help Workshop executable path (Windows only)"""
--    if os.name == 'nt':
--        hhc_base = r'C:\Program Files%s\HTML Help Workshop\hhc.exe'
--        for hhc_exe in (hhc_base % '', hhc_base % ' (x86)'):
--            if osp.isfile(hhc_exe):
--                return hhc_exe
--        else:
--            return
--
--try:
--    from sphinx import setup_command
--
--    class MyBuild(build):
--        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
--                       + build.user_options
--        def __init__(self, *args, **kwargs):
--            build.__init__(self, *args, **kwargs)
--            self.no_doc = False
--        def with_doc(self):
--            setup_dir = os.path.dirname(os.path.abspath(__file__))
--            is_doc_dir = os.path.isdir(os.path.join(setup_dir, 'doc'))
--            install_obj = self.distribution.get_command_obj('install')
--            return (is_doc_dir and not self.no_doc and not install_obj.no_doc)
--        sub_commands = build.sub_commands + [('build_doc', with_doc)]
--    CMDCLASS['build'] = MyBuild
--
--
--    class MyInstall(install):
--        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
--                       + install.user_options
--        def __init__(self, *args, **kwargs):
--            install.__init__(self, *args, **kwargs)
--            self.no_doc = False
--    CMDCLASS['install'] = MyInstall
--
--
--    class MyBuildDoc(setup_command.BuildDoc):
--        def run(self):
--            build = self.get_finalized_command('build')
--            sys.path.insert(0, os.path.abspath(build.build_lib))
--            dirname = self.distribution.get_command_obj('build').build_purelib
--            self.builder_target_dir = osp.join(dirname, 'spyder', 'doc')
--
--            if not osp.exists(self.builder_target_dir):
--                os.mkdir(self.builder_target_dir)
--
--            hhc_exe = get_html_help_exe()
--            self.builder = "html" if hhc_exe is None else "htmlhelp"
--
--            try:
--                setup_command.BuildDoc.run(self)
--            except UnicodeDecodeError:
--                print("ERROR: unable to build documentation because Sphinx "\
--                      "do not handle source path with non-ASCII characters. "\
--                      "Please try to move the source package to another "\
--                      "location (path with *only* ASCII characters).",
--                      file=sys.stderr)
--            sys.path.pop(0)
--
--            # Building chm doc, if HTML Help Workshop is installed
--            if hhc_exe is not None:
--                fname = osp.join(self.builder_target_dir, 'Spyderdoc.chm')
--                subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
--                if osp.isfile(fname):
--                    dest = osp.join(dirname, 'spyder')
--                    try:
--                        shutil.move(fname, dest)
--                    except shutil.Error:
--                        print("Unable to replace %s" % dest)
--                    shutil.rmtree(self.builder_target_dir)
--
--    CMDCLASS['build_doc'] = MyBuildDoc
--except ImportError:
--    print('WARNING: unable to build documentation because Sphinx '\
--          'is not installed', file=sys.stderr)
--
--
--#==============================================================================
- # Main scripts
- #==============================================================================
- # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
-@@ -261,8 +159,7 @@
-                    'Programming Language :: Python :: 3',
-                    'Development Status :: 5 - Production/Stable',
-                    'Topic :: Scientific/Engineering',
--                   'Topic :: Software Development :: Widget Sets'],
--      cmdclass=CMDCLASS)
-+                   'Topic :: Software Development :: Widget Sets'])
- 
- 
- #==============================================================================
diff --git a/dev-python/spyder/files/spyder-3.2.8-build.patch b/dev-python/spyder/files/spyder-3.2.8-build.patch
deleted file mode 100644
index b21c77d660be..000000000000
--- a/dev-python/spyder/files/spyder-3.2.8-build.patch
+++ /dev/null
@@ -1,129 +0,0 @@
---- spyder-3.2.8/setup.py       2018-03-23 14:00:00.000000000 +0100
-+++ spyder-3.2.8/setup.py       2018-03-23 14:00:00.000000001 +0100
-@@ -77,12 +77,7 @@
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/icons', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
-+        data_files = [('share/applications', ['scripts/spyder.desktop']),
-                           ('share/icons', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
-@@ -106,102 +101,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}
--
--
--#==============================================================================
--# Sphinx build (documentation)
--#==============================================================================
--def get_html_help_exe():
--    """Return HTML Help Workshop executable path (Windows only)"""
--    if os.name == 'nt':
--        hhc_base = r'C:\Program Files%s\HTML Help Workshop\hhc.exe'
--        for hhc_exe in (hhc_base % '', hhc_base % ' (x86)'):
--            if osp.isfile(hhc_exe):
--                return hhc_exe
--        else:
--            return
--
--try:
--    from sphinx import setup_command
--
--    class MyBuild(build):
--        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
--                       + build.user_options
--        def __init__(self, *args, **kwargs):
--            build.__init__(self, *args, **kwargs)
--            self.no_doc = False
--        def with_doc(self):
--            setup_dir = os.path.dirname(os.path.abspath(__file__))
--            is_doc_dir = os.path.isdir(os.path.join(setup_dir, 'doc'))
--            install_obj = self.distribution.get_command_obj('install')
--            return (is_doc_dir and not self.no_doc and not install_obj.no_doc)
--        sub_commands = build.sub_commands + [('build_doc', with_doc)]
--    CMDCLASS['build'] = MyBuild
--
--
--    class MyInstall(install):
--        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
--                       + install.user_options
--        def __init__(self, *args, **kwargs):
--            install.__init__(self, *args, **kwargs)
--            self.no_doc = False
--    CMDCLASS['install'] = MyInstall
--
--
--    class MyBuildDoc(setup_command.BuildDoc):
--        def run(self):
--            build = self.get_finalized_command('build')
--            sys.path.insert(0, os.path.abspath(build.build_lib))
--            dirname = self.distribution.get_command_obj('build').build_purelib
--            self.builder_target_dir = osp.join(dirname, 'spyder', 'doc')
--
--            if not osp.exists(self.builder_target_dir):
--                os.mkdir(self.builder_target_dir)
--
--            hhc_exe = get_html_help_exe()
--            self.builder = "html" if hhc_exe is None else "htmlhelp"
--
--            try:
--                setup_command.BuildDoc.run(self)
--            except UnicodeDecodeError:
--                print("ERROR: unable to build documentation because Sphinx "\
--                      "do not handle source path with non-ASCII characters. "\
--                      "Please try to move the source package to another "\
--                      "location (path with *only* ASCII characters).",
--                      file=sys.stderr)
--            sys.path.pop(0)
--
--            # Building chm doc, if HTML Help Workshop is installed
--            if hhc_exe is not None:
--                fname = osp.join(self.builder_target_dir, 'Spyderdoc.chm')
--                subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
--                if osp.isfile(fname):
--                    dest = osp.join(dirname, 'spyder')
--                    try:
--                        shutil.move(fname, dest)
--                    except shutil.Error:
--                        print("Unable to replace %s" % dest)
--                    shutil.rmtree(self.builder_target_dir)
--
--    CMDCLASS['build_doc'] = MyBuildDoc
--except ImportError:
--    print('WARNING: unable to build documentation because Sphinx '\
--          'is not installed', file=sys.stderr)
--
--
--#==============================================================================
- # Main scripts
- #==============================================================================
- # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
-@@ -261,8 +160,7 @@
-                    'Programming Language :: Python :: 3',
-                    'Development Status :: 5 - Production/Stable',
-                    'Topic :: Scientific/Engineering',
--                   'Topic :: Software Development :: Widget Sets'],
--      cmdclass=CMDCLASS)
-+                   'Topic :: Software Development :: Widget Sets'])
- 
- 
- #==============================================================================
diff --git a/dev-python/spyder/files/spyder-3.3.0-build.patch b/dev-python/spyder/files/spyder-3.3.0-build.patch
deleted file mode 100644
index f6037237e0c0..000000000000
--- a/dev-python/spyder/files/spyder-3.3.0-build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -r -U3 spyder-3.3.0.orig/setup.py spyder-3.3.0/setup.py
---- spyder-3.3.0.orig/setup.py	2018-06-27 11:28:24.000000000 +0700
-+++ spyder-3.3.0/setup.py	2018-08-07 23:26:17.609046673 +0700
-@@ -75,12 +75,7 @@
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/icons', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
-+        data_files = [('share/applications', ['scripts/spyder.desktop']),
-                           ('share/icons', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
-@@ -104,21 +99,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
-@@ -178,8 +158,7 @@
-                    'Programming Language :: Python :: 3',
-                    'Development Status :: 5 - Production/Stable',
-                    'Topic :: Scientific/Engineering',
--                   'Topic :: Software Development :: Widget Sets'],
--      cmdclass=CMDCLASS)
-+                   'Topic :: Software Development :: Widget Sets'])
- 
- 
- #==============================================================================
diff --git a/dev-python/spyder/files/spyder-3.3.1-build.patch b/dev-python/spyder/files/spyder-3.3.1-build.patch
deleted file mode 100644
index 1561dbdcc1e1..000000000000
--- a/dev-python/spyder/files/spyder-3.3.1-build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -r -U3 spyder-3.3.1.orig/setup.py spyder-3.3.1/setup.py
---- spyder-3.3.1.orig/setup.py	2018-08-10 10:46:02.000000000 +0700
-+++ spyder-3.3.1/setup.py	2018-08-14 19:16:10.921323804 +0700
-@@ -83,12 +83,7 @@
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/icons', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
-+        data_files = [('share/applications', ['scripts/spyder.desktop']),
-                           ('share/icons', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
-@@ -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-4.0.0_beta1-build.patch b/dev-python/spyder/files/spyder-4.0.1-build.patch
index 2b0f9bc699f3..7463550fc165 100644
--- a/dev-python/spyder/files/spyder-4.0.0_beta1-build.patch
+++ b/dev-python/spyder/files/spyder-4.0.1-build.patch
@@ -1,20 +1,6 @@
 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
-@@ -83,12 +83,7 @@
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/icons', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
-+        data_files = [('share/applications', ['scripts/spyder.desktop']),
-                           ('share/icons', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
 @@ -112,21 +107,6 @@
  
  
diff --git a/dev-python/spyder/files/spyder-4.0.1-py3-only.patch b/dev-python/spyder/files/spyder-4.0.1-py3-only.patch
new file mode 100644
index 000000000000..df5f0c4ad1c6
--- /dev/null
+++ b/dev-python/spyder/files/spyder-4.0.1-py3-only.patch
@@ -0,0 +1,56 @@
+diff --git a/setup.py b/setup.py
+index a492549..b77f758 100644
+--- a/setup.py
++++ b/setup.py
+@@ -31,13 +31,6 @@ import shutil
+ from distutils.core import setup
+ from distutils.command.install_data import install_data
+ 
+-
+-#==============================================================================
+-# Check for Python 3
+-#==============================================================================
+-PY3 = sys.version_info[0] == 3
+-
+-
+ #==============================================================================
+ # Minimal Python version sanity check
+ # Taken from the notebook setup.py -- Modified BSD License
+@@ -87,13 +80,8 @@ def get_subpackages(name):
+ def get_data_files():
+     """Return data_files in a platform dependent manner"""
+     if sys.platform.startswith('linux'):
+-        if PY3:
+-            data_files = [('share/applications', ['scripts/spyder3.desktop']),
+-                          ('share/icons', ['img_src/spyder3.png']),
+-                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
+-        else:
+-            data_files = [('share/applications', ['scripts/spyder.desktop']),
+-                          ('share/icons', ['img_src/spyder.png'])]
++        data_files = [('share/applications', ['scripts/spyder.desktop']),
++                      ('share/pixmaps', ['img_src/spyder.png'])]
+     elif os.name == 'nt':
+         data_files = [('scripts', ['img_src/spyder.ico',
+                                    'img_src/spyder_reset.ico'])]
+@@ -115,10 +103,7 @@ def get_packages():
+ # platforms due to a bug in pip installation process
+ # See spyder-ide/spyder#1158.
+ SCRIPTS = ['%s_win_post_install.py' % NAME]
+-if PY3 and sys.platform.startswith('linux'):
+-    SCRIPTS.append('spyder3')
+-else:
+-    SCRIPTS.append('spyder')
++SCRIPTS.append('spyder')
+ 
+ 
+ #==============================================================================
+@@ -246,8 +231,7 @@ if 'setuptools' in sys.modules:
+ 
+     setup_args['entry_points'] = {
+         'gui_scripts': [
+-            '{} = spyder.app.start:main'.format(
+-                'spyder3' if PY3 else 'spyder')
++            '{} = spyder.app.start:main'.format('spyder')
+         ]
+     }
+ 
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index b6e901261f71..46303e6157dd 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -9,6 +9,14 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <maintainer type="person">
+    <email>andrewammerlaan@riseup.net</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
     Spyder is a powerful scientific environment written in Python,
     for Python,and designed by and for scientists, engineers and data analysts.
@@ -20,9 +28,6 @@
     including NumPy, SciPy, Pandas, IPython, QtConsole, Matplotlib, SymPy, and more,
     and can be extended further with full plugin support.
   </longdescription>
-  <use>
-    <flag name="webengine">Build bindings for the QtWebEngine module</flag>
-  </use>
   <upstream>
     <remote-id type="pypi">spyder</remote-id>
     <remote-id type="bitbucket">spyder-ide/spyderlib</remote-id>
diff --git a/dev-python/spyder/spyder-3.2.4.ebuild b/dev-python/spyder/spyder-3.2.4.ebuild
deleted file mode 100644
index c3313327ca4b..000000000000
--- a/dev-python/spyder/spyder-3.2.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Python IDE with matlab-like features"
-HOMEPAGE="
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/
-	https://pythonhosted.org/spyder/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc hdf5"
-
-RDEPEND="
-	dev-python/QtPy[${PYTHON_USEDEP},svg,webkit]
-	dev-python/qtconsole[${PYTHON_USEDEP}]
-	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/pep8[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.3.0
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-# Courtesy of Arfrever
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build doc doc/html || die "Generation of documentation failed"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript scripts/${PN} ${PN}${EPYTHON:6:1}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-	doicon spyder/images/spyder.svg
-	make_desktop_entry spyder Spyder spyder "Development;IDE"
-}
diff --git a/dev-python/spyder/spyder-3.2.8.ebuild b/dev-python/spyder/spyder-3.2.8.ebuild
deleted file mode 100644
index 21993629d5f4..000000000000
--- a/dev-python/spyder/spyder-3.2.8.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils distutils-r1 xdg-utils
-
-DESCRIPTION="Python IDE with matlab-like features"
-HOMEPAGE="
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/
-	https://pythonhosted.org/spyder/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc hdf5 +webengine webkit"
-REQUIRED_USE="webengine? ( !webkit )"
-
-RDEPEND="
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/pep8[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.3.0[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
-	dev-python/qtconsole[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},svg,webengine?,webkit?]
-	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-# Based on the courtesy of Arfrever
-PATCHES=( "${FILESDIR}"/${PN}-3.2.8-build.patch )
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build doc doc/html || die "Generation of documentation failed"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript scripts/${PN} ${PN}${EPYTHON:6:1}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-	doicon spyder/images/spyder.svg
-	make_desktop_entry spyder Spyder spyder "Development;IDE"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	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" sci-libs/scipy
-		optfeature "Run Cython files in the IPython console" dev-python/cython
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/dev-python/spyder/spyder-3.3.0.ebuild b/dev-python/spyder/spyder-3.3.0.ebuild
deleted file mode 100644
index 300204dd1e12..000000000000
--- a/dev-python/spyder/spyder-3.3.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils distutils-r1 xdg-utils
-
-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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hdf5 +webengine webkit"
-REQUIRED_USE="webengine? ( !webkit )"
-
-RDEPEND="
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
-	dev-python/qtconsole[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},svg,webengine?,webkit?]
-	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/numpydoc[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-1.0"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Based on the courtesy of Arfrever
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript scripts/${PN} ${PN}${EPYTHON:6:1}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doicon spyder/images/spyder.svg
-	make_desktop_entry spyder Spyder spyder "Development;IDE"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	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" sci-libs/scipy
-		optfeature "Run Cython files in the IPython console" dev-python/cython
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/dev-python/spyder/spyder-3.3.1.ebuild b/dev-python/spyder/spyder-3.3.1.ebuild
deleted file mode 100644
index 300204dd1e12..000000000000
--- a/dev-python/spyder/spyder-3.3.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils distutils-r1 xdg-utils
-
-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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hdf5 +webengine webkit"
-REQUIRED_USE="webengine? ( !webkit )"
-
-RDEPEND="
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
-	dev-python/qtconsole[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},svg,webengine?,webkit?]
-	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/numpydoc[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-1.0"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Based on the courtesy of Arfrever
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript scripts/${PN} ${PN}${EPYTHON:6:1}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doicon spyder/images/spyder.svg
-	make_desktop_entry spyder Spyder spyder "Development;IDE"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	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" sci-libs/scipy
-		optfeature "Run Cython files in the IPython console" dev-python/cython
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/dev-python/spyder/spyder-4.0.0_beta1.ebuild b/dev-python/spyder/spyder-4.0.0_beta1.ebuild
deleted file mode 100644
index 7800f95826ff..000000000000
--- a/dev-python/spyder/spyder-4.0.0_beta1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils distutils-r1 xdg-utils
-MY_P=${P/_beta/b}
-
-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="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hdf5 +webengine webkit"
-REQUIRED_USE="webengine? ( !webkit )"
-
-RDEPEND="
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.11.0[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
-	dev-python/qtconsole[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},svg,webengine?,webkit?]
-	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/numpydoc[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-1.0"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Based on the courtesy of Arfrever
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript scripts/${PN} ${PN}${EPYTHON:6:1}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doicon spyder/images/spyder.svg
-	make_desktop_entry spyder Spyder spyder "Development;IDE"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	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" sci-libs/scipy
-		optfeature "Run Cython files in the IPython console" dev-python/cython
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/dev-python/spyder/spyder-4.0.1-r1.ebuild b/dev-python/spyder/spyder-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..43bba250f2c4
--- /dev/null
+++ b/dev-python/spyder/spyder-4.0.1-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit eutils xdg distutils-r1 virtualx
+
+# Commit of documentation to fetch
+DOCS_PV="7c0b590"
+
+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${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"
+
+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-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	dev-python/intervaltree[${PYTHON_USEDEP}]
+	~dev-python/jedi-0.14.1[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
+	>=dev-python/psutil-0.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pylint-0.25[${PYTHON_USEDEP}]
+	>=dev-python/python-language-server-0.31.2[${PYTHON_USEDEP}]
+	<dev-python/python-language-server-0.32.0[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/qdarkstyle-2.7[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-4.6.0[${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.8.1[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-2.0.0[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/coverage[${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-lazy-fixture[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}] )"
+
+# Based on the courtesy of Arfrever
+# This patch removes a call to update-desktop-database during build
+# This fails because access is denied to this command during build
+PATCHES=( "${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-py3-only.patch" )
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/doc --no-autodoc
+
+python_prepare_all() {
+	# move docs into workdir
+	mv ../spyder-docs-${DOCS_PV}* docs || 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
+	rm spyder/plugins/onlinehelp/tests/test_pydocgui.py || die
+	rm spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
+	rm spyder/plugins/ipythonconsole/tests/test_ipython_config_dialog.py || die
+	rm spyder/plugins/help/tests/test_widgets.py || die
+	rm spyder/plugins/help/tests/test_plugin.py  || die
+	rm spyder/app/tests/test_mainwindow.py || die
+
+	# skip uri (online) tests
+	rm spyder/plugins/editor/widgets/tests/test_goto.py || die
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.py || die
+
+	# Assertion error, looks like an online test
+	rm spyder/utils/tests/test_vcs.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
+
+	# Assertion error, can't connect/remember inside ebuild environment
+	sed -i -e 's:test_connection_dialog_remembers_input_with_password:_&:' \
+		-e 's:test_connection_dialog_remembers_input_with_ssh_passphrase:_&:' \
+			spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
+
+	# Assertion error (pytest-qt), maybe we can't do shortcuts inside ebuild environment?
+	sed -i -e 's:test_transform_to_uppercase_shortcut:_&:' \
+		-e 's:test_transform_to_lowercase_shortcut:_&:' \
+		-e 's:test_go_to_line_shortcut:_&:' \
+		-e 's:test_delete_line_shortcut:_&:' \
+			spyder/plugins/editor/widgets/tests/test_shortcuts.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	virtx pytest -vv
+}
+
+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" sci-libs/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 and spyder-vim do 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
+}