gentoo resync : 28.04.2021

2 files changed, 37 insertions, 35 deletions

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,
+ )
+ 
+