commit: 1f729554b5fe009e1cbf1ad0c574f544de78c2fa Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Mon Dec 26 08:37:39 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Mon Dec 26 13:40:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f729554
net-analyzer/nagstamon: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/28807 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../nagstamon/files/nagstamon-3.0-setup.patch | 27 ---------------------- .../files/nagstamon-3.4.1-unknown-version-id.patch | 14 ----------- 2 files changed, 41 deletions(-) diff --git a/net-analyzer/nagstamon/files/nagstamon-3.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.0-setup.patch deleted file mode 100644 index 26bb22fec4df..000000000000 --- a/net-analyzer/nagstamon/files/nagstamon-3.0-setup.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/setup.py b/setup.py -index 267ced2..538c5bb 100644 ---- a/setup.py -+++ b/setup.py -@@ -37,7 +37,7 @@ if OS not in ['Windows', 'Darwin']: - NAME = NAME.lower() - VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION - --NAGSTAMON_SCRIPT = 'nagstamon.py' -+NAGSTAMON_SCRIPT = 'nagstamon' - - # workaround to get directory of Qt5 plugins to add missing 'mediaservice' folder needed for audio on OSX and Windows - from PyQt5 import QtCore -@@ -130,12 +130,7 @@ setup(name=NAME, - packages=['Nagstamon', - 'Nagstamon.QUI', - 'Nagstamon.Servers', -- 'Nagstamon.thirdparty', -- 'Nagstamon.thirdparty.Xlib', -- 'Nagstamon.thirdparty.Xlib.ext', -- 'Nagstamon.thirdparty.Xlib.protocol', -- 'Nagstamon.thirdparty.Xlib.support', -- 'Nagstamon.thirdparty.Xlib.xobject'], -+ 'Nagstamon.thirdparty',], - package_dir={'Nagstamon': 'Nagstamon'}, - package_data={'Nagstamon': ['resources/*']}, - data_files=[('%s/share/man/man1' % sys.prefix, ['Nagstamon/resources/nagstamon.1.gz']), diff --git a/net-analyzer/nagstamon/files/nagstamon-3.4.1-unknown-version-id.patch b/net-analyzer/nagstamon/files/nagstamon-3.4.1-unknown-version-id.patch deleted file mode 100644 index a71d9d97e5b1..000000000000 --- a/net-analyzer/nagstamon/files/nagstamon-3.4.1-unknown-version-id.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix for unknown VERSION_ID which is now a fatal error in python -3.7. Backported from upstream 638c7c7a22156ca7e542725d32dbbc71f2f008a9 - ---- a/Nagstamon/Helpers.py.~1~ 2020-01-24 16:12:12.000000000 +0100 -+++ b/Nagstamon/Helpers.py 2020-08-29 07:39:26.999988228 +0200 -@@ -454,7 +454,7 @@ - for property in os_release_file.read_text().splitlines(): - key, value = property.split('=', 1) - os_release_dict[key] = value.strip('"').strip("'") -- return (os_release_dict['ID'], os_release_dict['VERSION_ID'], os_release_dict['NAME']) -+ return (os_release_dict['ID'], os_release_dict.get('VERSION_ID', 'unknown'), os_release_dict['NAME']) - else: - return False - else:
