gentoo auto-resync : 26:12:2022 - 20:08:29

3 files changed, 0 insertions, 43 deletions

diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index e111abab5f0f..365e14534a33 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,6 +1,4 @@
-AUX nagstamon-3.0-setup.patch 1139 BLAKE2B f399c6c600785629c7c90b1de396c17805882554f3d4d9e0932cbf0c8761496cccac57b068b7a7c161bcde11223db2ed4a0c5563a15267f13d3553147044ca0f SHA512 7ec4f621e1dc91cb941811aaacb6322fee8024d39dfa65e39b3a19631a3ef7c78d4fcd4d8df5630b76904e3c415290b35ac777c4d0e863ce83e15832d061ea4d
 AUX nagstamon-3.10.1-setup.patch 974 BLAKE2B f74093c6e66129843ba7702602fda6f0b4004c02253405c1e48df0391aca898cafe9a3858c1d5bb4fb739bc80ec227fc05aaff5ee62f56dc104c99f7761b05ba SHA512 e5a65c40c5cda55fb3a118bc39cf8a35efa684cffc657838292c0fdad31bf965395965b6ff5e3b536bad52c28646b6a6f6274bb1e7551bc58c323f4215cc4b1e
-AUX nagstamon-3.4.1-unknown-version-id.patch 745 BLAKE2B 9e9f4619f98cfdea4a0f90fbf5d0b3c34c9e940449752110018a9b72a5817e0445f79cc30a9f720a390d40f09e0a28d491f692c6cd7515eb42f4035af54d483d SHA512 d4100c8f334309fd8711e2113c8e00d00fde124328e0ecd3c50762ff2be1b53b3832995922924170f7c695cdcfb48ba0100fda93a046ea802c56a4a917f77d43
 AUX nagstamon-3.8-setup.patch 1190 BLAKE2B 39eec86dc7fcd69d0e6ef5c3b986e1e1c3096bed7e9e60eb1b7986bd83b9542805cd78a46813ba8af566243d4890565c5670c4fa41fc209f3e261a61bc5108aa SHA512 172a11999da5aaba979c800278a2524c9f3de269f7c3b2dd994ea0f658d48ab6891723ba1e03296cbdd4f979b2ca84b391a763bf19279f22588b570be677a3c5
 DIST nagstamon-3.10.1.tar.gz 574520 BLAKE2B 104d082a610c26af47d61b911094c51e3981947e19ed026bc725e479382bcec2b3d36c36400c379c738c970e1cb36183859e1dd132e1fe78c30be3f20688287f SHA512 83da92cc0d5ceaf7abbf2f2e289a2e83cbcb3bb4239d12f594da7543942a3945cfae68cfa9ecc33aa619967d1d35e1b88d4bb76398364c2f9754174fdd62649c
 DIST nagstamon-3.8.0.tar.gz 585689 BLAKE2B 8ab52762bac4797ded3834a94a382174855504b8e39224938f8f720a4aaaf4b3885fb487504ed09d973210b90f612852964bdcc87a6b2dc7c6b07bebfdeacffe SHA512 d34d1c52ddadbafcd583a5e61f7f305ffc8f722d8c007bbefeee6501475f01612e810154bc5815abe27e9c43e4e695a8ec189dcc5b2b487840d79f92eb3edc43
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: