[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/

[Christian Ruppert]

commit:     0ccc9825c244b72495d258ba3d383221b0a4ba1f
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Sep 28 18:18:48 2017 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 09:32:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ccc9825

net-analyzer/nagstamon: remove unused file

Closes: https://github.com/gentoo/gentoo/pull/5816

 net-analyzer/nagstamon/files/nagstamon.desktop | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/net-analyzer/nagstamon/files/nagstamon.desktop b/net-analyzer/nagstamon/files/nagstamon.desktop
deleted file mode 100644
index d853e1aae7b..00000000000
--- a/net-analyzer/nagstamon/files/nagstamon.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Nagstamon
-GenericName=Nagios status monitor
-Comment=Quick status overview of your Nagios monitoring system
-Exec=nagstamon
-Icon=/usr/share/nagstamon/resources/nagstamon.png
-Terminal=false
-Categories=Network;Monitor;
-StartupNotify=true

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/

[Conrad Kostecki]

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:

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/

[Hans de Graaff]

commit:     f85a8343e5f36a3d2b7dc61c621ac4ed1efc5b08
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 08:41:42 2023 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 15:40:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85a8343

net-analyzer/nagstamon: fix build with setuptools 66

Closes: https://bugs.gentoo.org/891331
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch
index 62f6cdbc2a47..28bb98e1b49a 100644
--- a/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch
+++ b/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch
@@ -1,8 +1,11 @@
---- a/setup.py	2022-12-11 07:36:25.144000930 +0100
-+++ b/setup.py	2022-12-11 07:37:00.856204252 +0100
-@@ -47,7 +47,7 @@
+--- a/setup.py	2023-01-29 09:29:13.885165525 +0100
++++ b/setup.py	2023-01-29 09:30:32.585630680 +0100
+@@ -45,9 +45,9 @@
+     else:
+         DIST, DIST_VERSION, DIST_NAME = platform.dist()
      NAME = NAME.lower()
- VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION
+-VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION
++VERSION = AppInfo.VERSION.replace('-', '.')
  
 -NAGSTAMON_SCRIPT = 'nagstamon.py'
 +NAGSTAMON_SCRIPT = 'nagstamon'

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/

[Hans de Graaff]

commit:     0b4c26a35d00358456aa78cdc2f27f824463118c
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 07:46:13 2023 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 09:21:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b4c26a3

net-analyzer/nagstamon: remove unused patch

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 .../nagstamon/files/nagstamon-3.8-setup.patch      | 28 ----------------------
 1 file changed, 28 deletions(-)

diff --git a/net-analyzer/nagstamon/files/nagstamon-3.8-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.8-setup.patch
deleted file mode 100644
index 637ef0c25616..000000000000
--- a/net-analyzer/nagstamon/files/nagstamon-3.8-setup.patch
+++ /dev/null
@@ -1,28 +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,13 +130,8 @@ setup(name=NAME,
-       packages=['Nagstamon',
-                 'Nagstamon.QUI',
-                 'Nagstamon.Servers',
-                 'Nagstamon.Servers.Alertmanager',
--                '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']),

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/

[Conrad Kostecki]

commit:     fc9f5edf9c90a4026fc67a252ae28ebce451dfd8
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Nov 25 19:59:57 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 23:11:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc9f5edf

net-analyzer/nagstamon: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../nagstamon/files/nagstamon-3.12.0-setup.patch   | 27 ----------------------
 1 file changed, 27 deletions(-)

diff --git a/net-analyzer/nagstamon/files/nagstamon-3.12.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.12.0-setup.patch
deleted file mode 100644
index f9fe785df978..000000000000
--- a/net-analyzer/nagstamon/files/nagstamon-3.12.0-setup.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/setup.py	2023-01-29 09:29:13.885165525 +0100
-+++ b/setup.py	2023-01-29 09:30:32.585630680 +0100
-@@ -45,9 +45,9 @@
-     else:
-         DIST, DIST_VERSION, DIST_NAME = platform.dist()
-     NAME = NAME.lower()
- #VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION
- VERSION = AppInfo.VERSION.replace('-', '.')
--NAGSTAMON_SCRIPT = 'nagstamon.py'
-+NAGSTAMON_SCRIPT = 'nagstamon'
- 
- from setuptools import setup
- 
-@@ -120,12 +120,7 @@
-                 'Nagstamon.Servers',
-                 'Nagstamon.Servers.Alertmanager',
-                 'Nagstamon.Servers.Centreon',
--                '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/*.*',
-                                   'resources/qui/*',