[gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/, dev-python/spyder/files/

[Andreas Sturmlechner]

commit:     13dda237851240c5a2eec610612e7458d0face48
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Feb 26 19:07:02 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 21:56:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13dda237

dev-python/spyder: Clean up spyder-3.x.x versions

Bug: https://bugs.gentoo.org/709866

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-python/spyder/Manifest                         |   6 +-
 dev-python/spyder/files/spyder-3.2.4-build.patch   | 130 ---------------------
 dev-python/spyder/files/spyder-3.2.8-build.patch   | 129 --------------------
 dev-python/spyder/files/spyder-3.3.0-build.patch   |  49 --------
 dev-python/spyder/files/spyder-3.3.1-build.patch   |  49 --------
 .../spyder/files/spyder-4.0.1-py3-only.patch       |  56 +++++++++
 dev-python/spyder/metadata.xml                     |   3 -
 dev-python/spyder/spyder-3.2.4.ebuild              |  62 ----------
 dev-python/spyder/spyder-3.2.8.ebuild              |  81 -------------
 dev-python/spyder/spyder-3.3.0.ebuild              |  74 ------------
 dev-python/spyder/spyder-3.3.1.ebuild              |  74 ------------
 ...{spyder-4.0.1.ebuild => spyder-4.0.1-r1.ebuild} |  22 +---
 12 files changed, 63 insertions(+), 672 deletions(-)

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 24947a0ce42..aaa6df24d22 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,6 +1,2 @@
-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.1-docs.tar.gz 2257654 BLAKE2B a1d245c018d551e639d5acc862e09132ba80411c745430a5d16ff137c12919ec0b6e32d180aa629ba8dce3776826d754a4e843647b642086565e7a00c6dca94a SHA512 a62a1fd39833d827a2f9be357a2ed82eca37cc096a20a91030af8746d401b517d76a4f6a036c76eaa8355a88db6b2be8009e6b58d5539b57c43091677e93e62c
 DIST spyder-4.0.1.tar.gz 10783565 BLAKE2B 5d264991b9bfc8118ef91f929269a300932cb0078b70c54613836c4337dc41214aa4ab81dacb4a535aaa6dea6b1eb591e25c7071664dc102e218373a0d7f8824 SHA512 9249a3b4a73ebe7a485d75fe2bea68bfa106c8ad0710120a6e05a43e3e2a65f9076904d1104180e925ab282b1d9da712c3509e0a5a7cfe3bd5ea8a95a1617bdd
+DIST spyder-docs-7c0b590.tar.gz 2257637 BLAKE2B 7e9528fde453631227ece3bd8c9163a0b3daadf3a83160b5475f943c49e7a559ff33dfe03531240b99571c535887ecff8459116d566dd7c739c74c4165e00060 SHA512 4d9548cc69db85ae6e93cac64e680460da6f9e76bf8b1265b31fbd4925786d29427de40bf06fd52ba807b0bb8f6c224e35b809c0e015a77013deb383e6d666f8

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 2a1fee52131..00000000000
--- 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 b21c77d660b..00000000000
--- 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 f6037237e0c..00000000000
--- 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 1561dbdcc1e..00000000000
--- 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.1-py3-only.patch b/dev-python/spyder/files/spyder-4.0.1-py3-only.patch
new file mode 100644
index 00000000000..df5f0c4ad1c
--- /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 91250b2b501..46303e6157d 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -28,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 c3313327ca4..00000000000
--- 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 21993629d5f..00000000000
--- 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 300204dd1e1..00000000000
--- 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 300204dd1e1..00000000000
--- 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.1.ebuild b/dev-python/spyder/spyder-4.0.1-r1.ebuild
similarity index 94%
rename from dev-python/spyder/spyder-4.0.1.ebuild
rename to dev-python/spyder/spyder-4.0.1-r1.ebuild
index 21369ad1977..438470ebe1e 100644
--- a/dev-python/spyder/spyder-4.0.1.ebuild
+++ b/dev-python/spyder/spyder-4.0.1-r1.ebuild
@@ -5,10 +5,10 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 
-inherit eutils distutils-r1 virtualx xdg-utils
+inherit eutils xdg distutils-r1 virtualx
 
 # Commit of documentation to fetch
-DOCS_PV="6177401"
+DOCS_PV="7c0b590"
 
 DESCRIPTION="The Scientific Python Development Environment"
 HOMEPAGE="
@@ -16,7 +16,7 @@ HOMEPAGE="
 	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 -> ${P}-docs.tar.gz"
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -65,7 +65,8 @@ DEPEND="test? (
 # 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 )
+PATCHES=( "${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-py3-only.patch" )
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/doc --no-autodoc
@@ -116,14 +117,8 @@ python_test() {
 	virtx pytest -vv
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
-	dosym spyder3 /usr/bin/spyder
-}
-
 pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
+	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
@@ -145,8 +140,3 @@ pkg_postinst() {
 		# spyder-reports not yet updated to >=spyder-4.0.0
 		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}