* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/, net-analyzer/nagstamon/
@ 2016-08-30 17:41 Christian Ruppert
0 siblings, 0 replies; 8+ messages in thread
From: Christian Ruppert @ 2016-08-30 17:41 UTC (permalink / raw
To: gentoo-commits
commit: 60531c074938c4734403e010536fdd3c4987397a
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 17:39:23 2016 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 17:39:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60531c07
net-analyzer/nagstamon: Version bump to 2.0
Package-Manager: portage-2.3.0
net-analyzer/nagstamon/Manifest | 1 +
.../nagstamon/files/nagstamon-2.0-setup.patch | 25 ++++++++++
net-analyzer/nagstamon/nagstamon-2.0.ebuild | 57 ++++++++++++++++++++++
3 files changed, 83 insertions(+)
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index d4177be..e7e9204 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,2 +1,3 @@
DIST Nagstamon-1.0.1.tar.gz 455110 SHA256 e60a2b1fef842deb8377ace02df6791f3dcc5683d9dae4323de3f5f1f8a9893b SHA512 040f3ac03c4945b25345f36d4749903238e05001f40f2777afe5277588aababb24212b538890c4b0ff0e1edef9a950804deb93fb2111bc25c8a773a84b69c353 WHIRLPOOL 8d040c7bb1573451ec0bb7439f0795b8ec6003d292429d3a96a07bb68d0617b23838677c93183d22a9cea10620152b51a3e7d4940642560986d5890f98b13822
+DIST Nagstamon-2.0.tar.gz 532668 SHA256 ff2172d467be6c9c68913aed05978949330ac7d069581b81c050eb4f90ff6443 SHA512 c8190a38b6a215dbfe07281b54d9effe2d79eb4c3219a868852514d921798b0097575423d7f7116ee1d49a949f0e9760ac536cb7aebfe49fa1676033670a71bd WHIRLPOOL 7c3652ff3773e5a09c460d43ba490239efa46be5e4fa63fd0f8194e65f05832877aade5d504a080f98023e1d17be5fbacfeeafcf49ad633b4bf2285d2d8cf8db
DIST Nagstamon-b7a91e68ca93ead4e5cfef22e2226c1ff9c7b52c.tar.gz 7021698 SHA256 0f3a6552d033ce91a5070ddb7570ce83c99f74b4e13f8e504f6d3fafc7b3f6a3 SHA512 f24d561127d6ae82acd084fbc4d7eeec6a31f0d37b123e42565347cd8eb2e8cac4f6c9ed77c50f8d16cc7f94fdf771404397ac7f847e7a7a094a7bb53c3fadab WHIRLPOOL 45d03e134687a7716a148d4cbff716cc8e933aef51eb9cdc46403f08243cc66afeb431eac2e1f18c8f0683ca4d5cf2bf8f9fd677f4d4df0f6e55a7b26b7ddda0
diff --git a/net-analyzer/nagstamon/files/nagstamon-2.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-2.0-setup.patch
new file mode 100644
index 00000000..3a58227
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-2.0-setup.patch
@@ -0,0 +1,25 @@
+diff --git a/setup.py b/setup.py
+index 467bb42..24644a3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -35,7 +35,7 @@ if platform.system() not in ['Windows', 'Darwin']:
+ NAME = NAME.lower()
+ VERSION = AppInfo.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
+ import os.path
+@@ -134,10 +134,7 @@ setup(name=NAME,
+ 'Nagstamon.thirdparty.Xlib.ext',
+ 'Nagstamon.thirdparty.Xlib.protocol',
+ 'Nagstamon.thirdparty.Xlib.support',
+- 'Nagstamon.thirdparty.Xlib.xobject',
+- 'Nagstamon.thirdparty.keyring',
+- 'Nagstamon.thirdparty.keyring.backends',
+- 'Nagstamon.thirdparty.keyring.util'],
++ 'Nagstamon.thirdparty.Xlib.xobject',],
+ 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/nagstamon-2.0.ebuild b/net-analyzer/nagstamon/nagstamon-2.0.ebuild
new file mode 100644
index 00000000..851bca1
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-2.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit eutils python-r1 distutils-r1
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_}"
+
+DESCRIPTION="status monitor for the desktop"
+HOMEPAGE="http://nagstamon.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# TODO: secretstorage
+# TODO: Xlib - https://github.com/python-xlib/python-xlib/tree/master/Xlib
+RDEPEND="dev-python/PyQt5[gui,multimedia,svg,widgets]
+ dev-python/beautifulsoup:4
+ dev-python/dbus-python
+ dev-python/keyring
+ dev-python/requests
+ dev-python/psutil
+ dev-python/setuptools"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES="${FILESDIR}/${P}-setup.patch"
+
+src_prepare() {
+ default_src_prepare
+
+ mv ${PN}.py ${PN} || die
+
+# rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+ rm -rf "${S}/Nagstamon/thirdparty/keyring/" || die
+}
+
+pkg_preinst() {
+ if has_version "<net-analyzer/nagstamon-2.0"; then
+ OLD_NAGSTAMON_VERSION=yup
+ fi
+}
+
+pkg_postinst() {
+ if [ -n "${OLD_NAGSTAMON_VERSION}" ]; then
+ ewarn "WARNING: It is recommend to move your old Nagstamon 1.x ~/.nagstamon/ away and start from scratch!"
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/, net-analyzer/nagstamon/
@ 2016-10-20 7:51 Christian Ruppert
0 siblings, 0 replies; 8+ messages in thread
From: Christian Ruppert @ 2016-10-20 7:51 UTC (permalink / raw
To: gentoo-commits
commit: d456352a852692a372d6e277b091e2635f90dabe
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 07:50:34 2016 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 07:51:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d456352a
net-analyzer/nagstamon: Version bump
Package-Manager: portage-2.3.2
net-analyzer/nagstamon/Manifest | 2 +-
.../nagstamon/files/nagstamon-2.0-EWMH.patch | 38 ----------------------
...stamon-2.0-r1.ebuild => nagstamon-2.0.1.ebuild} | 3 +-
3 files changed, 2 insertions(+), 41 deletions(-)
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index e7e9204..d4aa701 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,3 +1,3 @@
DIST Nagstamon-1.0.1.tar.gz 455110 SHA256 e60a2b1fef842deb8377ace02df6791f3dcc5683d9dae4323de3f5f1f8a9893b SHA512 040f3ac03c4945b25345f36d4749903238e05001f40f2777afe5277588aababb24212b538890c4b0ff0e1edef9a950804deb93fb2111bc25c8a773a84b69c353 WHIRLPOOL 8d040c7bb1573451ec0bb7439f0795b8ec6003d292429d3a96a07bb68d0617b23838677c93183d22a9cea10620152b51a3e7d4940642560986d5890f98b13822
-DIST Nagstamon-2.0.tar.gz 532668 SHA256 ff2172d467be6c9c68913aed05978949330ac7d069581b81c050eb4f90ff6443 SHA512 c8190a38b6a215dbfe07281b54d9effe2d79eb4c3219a868852514d921798b0097575423d7f7116ee1d49a949f0e9760ac536cb7aebfe49fa1676033670a71bd WHIRLPOOL 7c3652ff3773e5a09c460d43ba490239efa46be5e4fa63fd0f8194e65f05832877aade5d504a080f98023e1d17be5fbacfeeafcf49ad633b4bf2285d2d8cf8db
+DIST Nagstamon-2.0.1.tar.gz 535814 SHA256 3d4b22190d47250b175a4a70b12391c694ba2399832320887e5909e1ce3dfd7b SHA512 f9c8ab928a78f289693ae58cd3dde6fa75dd66dc931dbec6a4affc35bd96f16c39a03cb441575c9ca42e810ae5962fc7226513b8cc2a17871e0365aa3a207db6 WHIRLPOOL fb1ab6f9c3ccef81f4d62f238bf998d98186ff24d44e2a41554a13f82a783e8a14a1ac21d046f179ef62347dd252cb34d818d032c0ef78d7f742fd45acbec033
DIST Nagstamon-b7a91e68ca93ead4e5cfef22e2226c1ff9c7b52c.tar.gz 7021698 SHA256 0f3a6552d033ce91a5070ddb7570ce83c99f74b4e13f8e504f6d3fafc7b3f6a3 SHA512 f24d561127d6ae82acd084fbc4d7eeec6a31f0d37b123e42565347cd8eb2e8cac4f6c9ed77c50f8d16cc7f94fdf771404397ac7f847e7a7a094a7bb53c3fadab WHIRLPOOL 45d03e134687a7716a148d4cbff716cc8e933aef51eb9cdc46403f08243cc66afeb431eac2e1f18c8f0683ca4d5cf2bf8f9fd677f4d4df0f6e55a7b26b7ddda0
diff --git a/net-analyzer/nagstamon/files/nagstamon-2.0-EWMH.patch b/net-analyzer/nagstamon/files/nagstamon-2.0-EWMH.patch
deleted file mode 100644
index f7e62bc..00000000
--- a/net-analyzer/nagstamon/files/nagstamon-2.0-EWMH.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8ea1a9336b6239ead43ea7c4b767052e10745fe8 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Wed, 31 Aug 2016 20:19:20 +0200
-Subject: [PATCH] Initialize EWMH as soon as possible, #296
-
-Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
----
- Nagstamon/QUI/__init__.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Nagstamon/QUI/__init__.py b/Nagstamon/QUI/__init__.py
-index 930cb68..d41b786 100644
---- a/Nagstamon/QUI/__init__.py
-+++ b/Nagstamon/QUI/__init__.py
-@@ -898,6 +898,10 @@ class StatusWindow(QWidget):
- # immediately hide to avoid flicker on Windows and OSX
- self.hide()
-
-+ # ewmh.py in thirdparty directory needed to keep floating statusbar on all desktops in Linux
-+ if not platform.system() in NON_LINUX:
-+ self.ewmh = EWMH()
-+
- # avoid quitting when using Qt.Tool flag and closing settings dialog
- APP.setQuitOnLastWindowClosed(False)
-
-@@ -1080,10 +1084,6 @@ class StatusWindow(QWidget):
- # start with priority 0 = lowest
- self.worker_thread.start(0)
-
-- # ewmh.py in thirdparty directory needed to keep floating statusbar on all desktops in Linux
-- if not platform.system() in NON_LINUX:
-- self.ewmh = EWMH()
--
- # finally show up
- self.set_mode()
-
---
-2.7.3
diff --git a/net-analyzer/nagstamon/nagstamon-2.0-r1.ebuild b/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild
similarity index 93%
rename from net-analyzer/nagstamon/nagstamon-2.0-r1.ebuild
rename to net-analyzer/nagstamon/nagstamon-2.0.1.ebuild
index 7337ca2..5f0b32d 100644
--- a/net-analyzer/nagstamon/nagstamon-2.0-r1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild
@@ -33,8 +33,7 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_PN}"
-PATCHES="${FILESDIR}/${P}-setup.patch
- ${FILESDIR}/${P}-EWMH.patch"
+PATCHES="${FILESDIR}/${PN}-2.0-setup.patch"
src_prepare() {
default_src_prepare
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/, net-analyzer/nagstamon/
@ 2017-09-14 11:14 Christian Ruppert
0 siblings, 0 replies; 8+ messages in thread
From: Christian Ruppert @ 2017-09-14 11:14 UTC (permalink / raw
To: gentoo-commits
commit: 2dd0bda4630437875239bd75dbe79f826e90dbcf
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 14 11:12:54 2017 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 11:12:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd0bda4
net-analyzer/nagstamon: Version bump to 3.0
Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --force
net-analyzer/nagstamon/Manifest | 1 +
.../nagstamon/files/nagstamon-3.0-setup.patch | 27 ++++++++++++
net-analyzer/nagstamon/nagstamon-3.0.ebuild | 50 ++++++++++++++++++++++
3 files changed, 78 insertions(+)
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index d4aa70190a2..80be04be2c6 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,3 +1,4 @@
DIST Nagstamon-1.0.1.tar.gz 455110 SHA256 e60a2b1fef842deb8377ace02df6791f3dcc5683d9dae4323de3f5f1f8a9893b SHA512 040f3ac03c4945b25345f36d4749903238e05001f40f2777afe5277588aababb24212b538890c4b0ff0e1edef9a950804deb93fb2111bc25c8a773a84b69c353 WHIRLPOOL 8d040c7bb1573451ec0bb7439f0795b8ec6003d292429d3a96a07bb68d0617b23838677c93183d22a9cea10620152b51a3e7d4940642560986d5890f98b13822
DIST Nagstamon-2.0.1.tar.gz 535814 SHA256 3d4b22190d47250b175a4a70b12391c694ba2399832320887e5909e1ce3dfd7b SHA512 f9c8ab928a78f289693ae58cd3dde6fa75dd66dc931dbec6a4affc35bd96f16c39a03cb441575c9ca42e810ae5962fc7226513b8cc2a17871e0365aa3a207db6 WHIRLPOOL fb1ab6f9c3ccef81f4d62f238bf998d98186ff24d44e2a41554a13f82a783e8a14a1ac21d046f179ef62347dd252cb34d818d032c0ef78d7f742fd45acbec033
+DIST Nagstamon-3.0.tar.gz 541842 SHA256 cf606078cdec66081d6b63a0d6dbc2c13cbeb1408df09d57c1bf4742b6eebd70 SHA512 21558b8bdd9464b4d6cfb1cb3cf759775595e108fa5ac81286d51c32415bcfbd8b3c439aa95433682867f0bb73669a4b051085a92c236f5eb9e48b84f2910fbe WHIRLPOOL 85f46f1933d451a881c5c5c7d8af27194cf155f2784be53d37f397513113e5ad398c377ba18edbd4c28eac06231f8788a2c4945f4fd1395b86b941ed879ac247
DIST Nagstamon-b7a91e68ca93ead4e5cfef22e2226c1ff9c7b52c.tar.gz 7021698 SHA256 0f3a6552d033ce91a5070ddb7570ce83c99f74b4e13f8e504f6d3fafc7b3f6a3 SHA512 f24d561127d6ae82acd084fbc4d7eeec6a31f0d37b123e42565347cd8eb2e8cac4f6c9ed77c50f8d16cc7f94fdf771404397ac7f847e7a7a094a7bb53c3fadab WHIRLPOOL 45d03e134687a7716a148d4cbff716cc8e933aef51eb9cdc46403f08243cc66afeb431eac2e1f18c8f0683ca4d5cf2bf8f9fd677f4d4df0f6e55a7b26b7ddda0
diff --git a/net-analyzer/nagstamon/files/nagstamon-3.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.0-setup.patch
new file mode 100644
index 00000000000..26bb22fec4d
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-3.0-setup.patch
@@ -0,0 +1,27 @@
+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/nagstamon-3.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.0.ebuild
new file mode 100644
index 00000000000..866cc9000c9
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils python-r1 distutils-r1
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_p/-}"
+
+DESCRIPTION="status monitor for the desktop"
+DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
+HOMEPAGE="https://nagstamon.ifw-dresden.de"
+SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/keyring[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/secretstorage[${PYTHON_USEDEP}]
+ >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
+ dev-python/requests-kerberos[${PYTHON_USEDEP}]
+ dev-python/typing[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES="${FILESDIR}/${P}-setup.patch"
+
+src_prepare() {
+ default_src_prepare
+
+ mv ${PN}.py ${PN} || die
+
+ rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/, net-analyzer/nagstamon/
@ 2017-09-21 7:23 Christian Ruppert
0 siblings, 0 replies; 8+ messages in thread
From: Christian Ruppert @ 2017-09-21 7:23 UTC (permalink / raw
To: gentoo-commits
commit: 3598a23dc078b05ad6cc24b3355c82bbec6cf915
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 21 07:20:34 2017 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Thu Sep 21 07:20:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3598a23d
net-analyzer/nagstamon: Cleanup
Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --force
net-analyzer/nagstamon/Manifest | 2 -
.../files/nagstamon-0.9.11_rc1-resources.patch | 13 -----
net-analyzer/nagstamon/nagstamon-1.0.1.ebuild | 66 ---------------------
.../nagstamon/nagstamon-1.0.1_p20150222.ebuild | 67 ----------------------
4 files changed, 148 deletions(-)
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 80be04be2c6..6cb9a432069 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,4 +1,2 @@
-DIST Nagstamon-1.0.1.tar.gz 455110 SHA256 e60a2b1fef842deb8377ace02df6791f3dcc5683d9dae4323de3f5f1f8a9893b SHA512 040f3ac03c4945b25345f36d4749903238e05001f40f2777afe5277588aababb24212b538890c4b0ff0e1edef9a950804deb93fb2111bc25c8a773a84b69c353 WHIRLPOOL 8d040c7bb1573451ec0bb7439f0795b8ec6003d292429d3a96a07bb68d0617b23838677c93183d22a9cea10620152b51a3e7d4940642560986d5890f98b13822
DIST Nagstamon-2.0.1.tar.gz 535814 SHA256 3d4b22190d47250b175a4a70b12391c694ba2399832320887e5909e1ce3dfd7b SHA512 f9c8ab928a78f289693ae58cd3dde6fa75dd66dc931dbec6a4affc35bd96f16c39a03cb441575c9ca42e810ae5962fc7226513b8cc2a17871e0365aa3a207db6 WHIRLPOOL fb1ab6f9c3ccef81f4d62f238bf998d98186ff24d44e2a41554a13f82a783e8a14a1ac21d046f179ef62347dd252cb34d818d032c0ef78d7f742fd45acbec033
DIST Nagstamon-3.0.tar.gz 541842 SHA256 cf606078cdec66081d6b63a0d6dbc2c13cbeb1408df09d57c1bf4742b6eebd70 SHA512 21558b8bdd9464b4d6cfb1cb3cf759775595e108fa5ac81286d51c32415bcfbd8b3c439aa95433682867f0bb73669a4b051085a92c236f5eb9e48b84f2910fbe WHIRLPOOL 85f46f1933d451a881c5c5c7d8af27194cf155f2784be53d37f397513113e5ad398c377ba18edbd4c28eac06231f8788a2c4945f4fd1395b86b941ed879ac247
-DIST Nagstamon-b7a91e68ca93ead4e5cfef22e2226c1ff9c7b52c.tar.gz 7021698 SHA256 0f3a6552d033ce91a5070ddb7570ce83c99f74b4e13f8e504f6d3fafc7b3f6a3 SHA512 f24d561127d6ae82acd084fbc4d7eeec6a31f0d37b123e42565347cd8eb2e8cac4f6c9ed77c50f8d16cc7f94fdf771404397ac7f847e7a7a094a7bb53c3fadab WHIRLPOOL 45d03e134687a7716a148d4cbff716cc8e933aef51eb9cdc46403f08243cc66afeb431eac2e1f18c8f0683ca4d5cf2bf8f9fd677f4d4df0f6e55a7b26b7ddda0
diff --git a/net-analyzer/nagstamon/files/nagstamon-0.9.11_rc1-resources.patch b/net-analyzer/nagstamon/files/nagstamon-0.9.11_rc1-resources.patch
deleted file mode 100644
index 9d8941d3832..00000000000
--- a/net-analyzer/nagstamon/files/nagstamon-0.9.11_rc1-resources.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Nagstamon/nagstamon.py b/Nagstamon/nagstamon.py
-index 0e016ef..7dca409 100755
---- a/Nagstamon/nagstamon.py
-+++ b/Nagstamon/nagstamon.py
-@@ -86,6 +86,8 @@ except Exception, err:
- Resources = path
- break
-
-+Resources = "/usr/share/nagstamon/resources"
-+
- # initialize GUI and actions
- # if modules are not available from central python install try the ones in the same directory
- from Nagstamon import GUI
diff --git a/net-analyzer/nagstamon/nagstamon-1.0.1.ebuild b/net-analyzer/nagstamon/nagstamon-1.0.1.ebuild
deleted file mode 100644
index e967ec06824..00000000000
--- a/net-analyzer/nagstamon/nagstamon-1.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-MY_PN="Nagstamon"
-MY_P="${MY_PN}-${PV/_}"
-
-DESCRIPTION="Nagstamon is a systray monitor for displaying realtime status of a Nagios box"
-HOMEPAGE="http://nagstamon.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome sound"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
- dev-python/keyring[${PYTHON_USEDEP}]
- gnome-base/librsvg
- gnome? ( dev-python/egg-python[${PYTHON_USEDEP}] )
- sound? ( media-sound/sox )"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_prepare() {
- epatch "${FILESDIR}/nagstamon-0.9.11_rc1-resources.patch"
-
- rm Nagstamon/resources/LICENSE
-}
-
-src_install() {
- # setup.py is broken
- cd Nagstamon/
-
- doman resources/nagstamon.1
- rm resources/nagstamon.1
-
- newbin ../nagstamon.py nagstamon
-
- insinto /usr/share/${PN}/resources
- doins resources/*
-
- domenu "${FILESDIR}"/${PN}.desktop
-
- nagstamon_install() {
- insinto $(python_get_sitedir)/${MY_PN}
- doins {GUI,Config,Objects,Custom,Actions}.py
- touch "${D}/$(python_get_sitedir)/${MY_PN}/__init__.py" || die
- doins -r Server/ thirdparty/
- }
-
- python_foreach_impl nagstamon_install
-
- python_replicate_script "${D}/usr/bin/nagstamon"
-}
diff --git a/net-analyzer/nagstamon/nagstamon-1.0.1_p20150222.ebuild b/net-analyzer/nagstamon/nagstamon-1.0.1_p20150222.ebuild
deleted file mode 100644
index 9a51798a0e5..00000000000
--- a/net-analyzer/nagstamon/nagstamon-1.0.1_p20150222.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-MY_PN="Nagstamon"
-MY_P="${MY_PN}-${PV/_}"
-MY_SHA="b7a91e68ca93ead4e5cfef22e2226c1ff9c7b52c"
-
-DESCRIPTION="Nagstamon is a systray monitor for displaying realtime status of a Nagios box"
-HOMEPAGE="http://nagstamon.sourceforge.net"
-SRC_URI="https://github.com/HenriWahl/${PN}/archive/${MY_SHA}.tar.gz -> ${MY_PN}-${MY_SHA}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome sound"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
- dev-python/keyring[${PYTHON_USEDEP}]
- gnome-base/librsvg
- gnome? ( dev-python/egg-python[${PYTHON_USEDEP}] )
- sound? ( media-sound/sox )"
-
-S="${WORKDIR}/${MY_PN}-${MY_SHA}/Nagstamon"
-
-src_prepare() {
- epatch "${FILESDIR}/nagstamon-0.9.11_rc1-resources.patch"
-
- rm Nagstamon/resources/LICENSE
-}
-
-src_install() {
- # setup.py is broken
- cd Nagstamon/
-
- doman resources/nagstamon.1
- rm resources/nagstamon.1
-
- newbin ../nagstamon.py nagstamon
-
- insinto /usr/share/${PN}/resources
- doins resources/*
-
- domenu "${FILESDIR}"/${PN}.desktop
-
- nagstamon_install() {
- insinto $(python_get_sitedir)/${MY_PN}
- doins {GUI,Config,Objects,Custom,Actions}.py
- touch "${D}/$(python_get_sitedir)/${MY_PN}/__init__.py" || die
- doins -r Server/ thirdparty/
- }
-
- python_foreach_impl nagstamon_install
-
- python_replicate_script "${D}/usr/bin/nagstamon"
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/, net-analyzer/nagstamon/
@ 2020-09-05 8:17 Hans de Graaff
0 siblings, 0 replies; 8+ messages in thread
From: Hans de Graaff @ 2020-09-05 8:17 UTC (permalink / raw
To: gentoo-commits
commit: b133cb91601a776c9bb7ae20266c00a75545df87
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 08:15:35 2020 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 08:17:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b133cb91
net-analyzer/nagstamon: add python 3.7, 3.8
Also become co-maintainer.
Closes: https://bugs.gentoo.org/718424
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
.../files/nagstamon-3.4.1-unknown-version-id.patch | 14 ++++++
net-analyzer/nagstamon/metadata.xml | 4 ++
net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild | 53 ++++++++++++++++++++++
3 files changed, 71 insertions(+)
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
new file mode 100644
index 00000000000..a71d9d97e5b
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-3.4.1-unknown-version-id.patch
@@ -0,0 +1,14 @@
+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:
diff --git a/net-analyzer/nagstamon/metadata.xml b/net-analyzer/nagstamon/metadata.xml
index 596c2d8745d..7efaea2acc4 100644
--- a/net-analyzer/nagstamon/metadata.xml
+++ b/net-analyzer/nagstamon/metadata.xml
@@ -5,6 +5,10 @@
<email>idl0r@gentoo.org</email>
<name>Christian Ruppert</name>
</maintainer>
+ <maintainer type="person">
+ <email>graaff@gentoo.org</email>
+ <name>Hans de Graaff</name>
+ </maintainer>
<maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
diff --git a/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild
new file mode 100644
index 00000000000..20cc127f8e0
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-r1 distutils-r1
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_p/-}"
+
+DESCRIPTION="status monitor for the desktop"
+DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
+HOMEPAGE="https://nagstamon.ifw-dresden.de"
+SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/keyring[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/secretstorage[${PYTHON_USEDEP}]
+ >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
+ dev-python/requests-kerberos[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0-setup.patch" "${FILESDIR}/${PN}-3.4.1-unknown-version-id.patch" )
+
+src_prepare() {
+ default_src_prepare
+
+ # pre-compressed already
+ rm Nagstamon/resources/nagstamon.1.gz || die
+ sed -i -e 's:\(nagstamon\.1\)\.gz:\1:' setup.py || die
+
+ mv ${PN}.py ${PN} || die
+
+ rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/, net-analyzer/nagstamon/
@ 2021-11-19 6:54 Hans de Graaff
0 siblings, 0 replies; 8+ messages in thread
From: Hans de Graaff @ 2021-11-19 6:54 UTC (permalink / raw
To: gentoo-commits
commit: a55321207e3e0e1de40a294161973f7544016176
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 06:18:49 2021 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 06:54:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5532120
net-analyzer/nagstamon: add 3.8.0
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
net-analyzer/nagstamon/Manifest | 1 +
.../nagstamon/files/nagstamon-3.8-setup.patch | 28 +++++++++++
net-analyzer/nagstamon/nagstamon-3.8.0.ebuild | 55 ++++++++++++++++++++++
3 files changed, 84 insertions(+)
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index de821af81873..9d6155c96c43 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,2 +1,3 @@
DIST Nagstamon-3.4.1.tar.gz 563745 BLAKE2B 3ac35c90757eb525e7e7953f63a8798a0087470e4a94161987f3c382b6be43240aa8b5c44f279d23d841dbf9e4536f38d3f5e2f63234538a00fe6b6e0ee9c680 SHA512 68f8a7345c606b8ad4511b34e2d76383faf8831202c9429ab24eeb215073984f00f580c83a7f5e348f7d4104d3c82bd6f4661939801444e463c3fcf64c8240bd
DIST nagstamon-3.6.0.tar.gz 573998 BLAKE2B 6cc1e7918d8a7a53255fbd1661b8a41c0f3f414341da64724e566ceb95378590ed325fea757fffcdccf33533c8e34ca235036b47323f89bfcb3d06007a0cf43e SHA512 4da9b20c518129857ff86fa4aa4aa7507fce6c5b43fc917a4b8681d36e69f267045ab35c2f6922bde55536bf55e753f61b4fc184165e2f6d9eb6cb9b00703c69
+DIST nagstamon-3.8.0.tar.gz 585689 BLAKE2B 8ab52762bac4797ded3834a94a382174855504b8e39224938f8f720a4aaaf4b3885fb487504ed09d973210b90f612852964bdcc87a6b2dc7c6b07bebfdeacffe SHA512 d34d1c52ddadbafcd583a5e61f7f305ffc8f722d8c007bbefeee6501475f01612e810154bc5815abe27e9c43e4e695a8ec189dcc5b2b487840d79f92eb3edc43
diff --git a/net-analyzer/nagstamon/files/nagstamon-3.8-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.8-setup.patch
new file mode 100644
index 000000000000..637ef0c25616
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-3.8-setup.patch
@@ -0,0 +1,28 @@
+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']),
diff --git a/net-analyzer/nagstamon/nagstamon-3.8.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.8.0.ebuild
new file mode 100644
index 000000000000..dbacd751d085
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-3.8.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit python-r1 distutils-r1
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_p/-}"
+
+DESCRIPTION="status monitor for the desktop"
+DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
+HOMEPAGE="https://nagstamon.de"
+SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
+ dev-python/PySocks[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/keyring[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/secretstorage[${PYTHON_USEDEP}]
+ >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
+ dev-python/requests-kerberos[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-3.8-setup.patch" )
+
+src_prepare() {
+ default_src_prepare
+
+ # pre-compressed already
+ rm Nagstamon/resources/nagstamon.1.gz || die
+ sed -i -e 's:\(nagstamon\.1\)\.gz:\1:' setup.py || die
+
+ mv ${PN}.py ${PN} || die
+
+ rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/, net-analyzer/nagstamon/
@ 2022-12-11 8:11 Hans de Graaff
0 siblings, 0 replies; 8+ messages in thread
From: Hans de Graaff @ 2022-12-11 8:11 UTC (permalink / raw
To: gentoo-commits
commit: 19da14a45d6ffd2015a9b65493ea789ba39d6607
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 07:06:15 2022 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 08:11:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19da14a4
net-analyzer/nagstamon: add 3.10.1
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
net-analyzer/nagstamon/Manifest | 1 +
.../nagstamon/files/nagstamon-3.10.1-setup.patch | 25 ++++++++++
net-analyzer/nagstamon/nagstamon-3.10.1.ebuild | 58 ++++++++++++++++++++++
3 files changed, 84 insertions(+)
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 9d6155c96c43..09a104e4144f 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,3 +1,4 @@
DIST Nagstamon-3.4.1.tar.gz 563745 BLAKE2B 3ac35c90757eb525e7e7953f63a8798a0087470e4a94161987f3c382b6be43240aa8b5c44f279d23d841dbf9e4536f38d3f5e2f63234538a00fe6b6e0ee9c680 SHA512 68f8a7345c606b8ad4511b34e2d76383faf8831202c9429ab24eeb215073984f00f580c83a7f5e348f7d4104d3c82bd6f4661939801444e463c3fcf64c8240bd
+DIST nagstamon-3.10.1.tar.gz 574520 BLAKE2B 104d082a610c26af47d61b911094c51e3981947e19ed026bc725e479382bcec2b3d36c36400c379c738c970e1cb36183859e1dd132e1fe78c30be3f20688287f SHA512 83da92cc0d5ceaf7abbf2f2e289a2e83cbcb3bb4239d12f594da7543942a3945cfae68cfa9ecc33aa619967d1d35e1b88d4bb76398364c2f9754174fdd62649c
DIST nagstamon-3.6.0.tar.gz 573998 BLAKE2B 6cc1e7918d8a7a53255fbd1661b8a41c0f3f414341da64724e566ceb95378590ed325fea757fffcdccf33533c8e34ca235036b47323f89bfcb3d06007a0cf43e SHA512 4da9b20c518129857ff86fa4aa4aa7507fce6c5b43fc917a4b8681d36e69f267045ab35c2f6922bde55536bf55e753f61b4fc184165e2f6d9eb6cb9b00703c69
DIST nagstamon-3.8.0.tar.gz 585689 BLAKE2B 8ab52762bac4797ded3834a94a382174855504b8e39224938f8f720a4aaaf4b3885fb487504ed09d973210b90f612852964bdcc87a6b2dc7c6b07bebfdeacffe SHA512 d34d1c52ddadbafcd583a5e61f7f305ffc8f722d8c007bbefeee6501475f01612e810154bc5815abe27e9c43e4e695a8ec189dcc5b2b487840d79f92eb3edc43
diff --git a/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch
new file mode 100644
index 000000000000..62f6cdbc2a47
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch
@@ -0,0 +1,25 @@
+--- 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 @@
+ NAME = NAME.lower()
+ VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION
+
+-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/*',
diff --git a/net-analyzer/nagstamon/nagstamon-3.10.1.ebuild b/net-analyzer/nagstamon/nagstamon-3.10.1.ebuild
new file mode 100644
index 000000000000..ec3c7f25e642
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-3.10.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10,11} )
+
+inherit python-r1 distutils-r1
+
+distutils_enable_tests pytest
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_p/-}"
+
+DESCRIPTION="status monitor for the desktop"
+DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
+HOMEPAGE="https://nagstamon.de"
+SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
+ dev-python/PySocks[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/keyring[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/secretstorage[${PYTHON_USEDEP}]
+ >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
+ dev-python/requests-kerberos[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pylint[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-3.10.1-setup.patch" )
+
+src_prepare() {
+ default_src_prepare
+
+ # pre-compressed already
+ rm Nagstamon/resources/nagstamon.1.gz || die
+ sed -i -e 's:\(nagstamon\.1\)\.gz:\1:' setup.py || die
+
+ mv ${PN}.py ${PN} || die
+
+ rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/, net-analyzer/nagstamon/
@ 2024-02-26 7:22 Hans de Graaff
0 siblings, 0 replies; 8+ messages in thread
From: Hans de Graaff @ 2024-02-26 7:22 UTC (permalink / raw
To: gentoo-commits
commit: f6d9b829974f097aded9ab1ce1cd61c37bfc9caf
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 07:22:10 2024 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 07:22:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6d9b829
net-analyzer/nagstamon: add 3.14.0
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
net-analyzer/nagstamon/Manifest | 1 +
.../nagstamon/files/nagstamon-3.14.0-setup.patch | 24 +++++++
net-analyzer/nagstamon/nagstamon-3.14.0.ebuild | 74 ++++++++++++++++++++++
3 files changed, 99 insertions(+)
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 11d813a00005..ff966dc10895 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1 +1,2 @@
DIST nagstamon-3.12.0.tar.gz 581087 BLAKE2B 1f54decdd6cf1fdba8abd7f97102cd84d9f38e68391c31f413860d7c80410e38ee8929cf4d1bfbf7cca1fa54b9088409a47ba669c6ff78d8edecb3313a7e5690 SHA512 029d3dcf5ea5a512940b8e6ed0d3a146e727b3c8ffcbd530fc28f4a896a1a801bb0029a33b62e311c1b0c281810bd001f323c9e3e4c4fc9199bacc7b962ff794
+DIST nagstamon-3.14.0.tar.gz 585452 BLAKE2B a05c6a5a4a2b1e98d2831bef8000f81e306807f0706915d73bcf04f67a070fbd1787d0f98f8650b08bcd94a13b13f21c2b36ef79ee820bb526ff7074b5b5d996 SHA512 6896b0c1a58f1ee6f597ff5022d3bd675760a2c7a0403fc72f0e5c7edde6e2177f0eddb2af5a66e0fbe6166d85394fdcedc92cc0e64e0ac469681a380879a0ab
diff --git a/net-analyzer/nagstamon/files/nagstamon-3.14.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.14.0-setup.patch
new file mode 100644
index 000000000000..1bb994201637
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-3.14.0-setup.patch
@@ -0,0 +1,24 @@
+--- a/setup.py 2023-01-29 09:29:13.885165525 +0100
++++ b/setup.py 2023-01-29 09:30:32.585630680 +0100
+@@ -45,6 +45,6 @@
+ #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/*',
diff --git a/net-analyzer/nagstamon/nagstamon-3.14.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.14.0.ebuild
new file mode 100644
index 000000000000..5f85aa5424c7
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-3.14.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit desktop distutils-r1 virtualx
+
+distutils_enable_tests pytest
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_p/-}"
+
+DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
+HOMEPAGE="https://nagstamon.de"
+SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/lxml[${PYTHON_USEDEP}]
+ || (
+ dev-python/PyQt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
+ dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
+ )
+ dev-python/PySocks[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/keyring[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/secretstorage[${PYTHON_USEDEP}]
+ >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
+ dev-python/requests-kerberos[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pylint[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${PN}-3.14.0-setup.patch" )
+
+src_prepare() {
+ default_src_prepare
+
+ # pre-compressed already
+ rm Nagstamon/resources/nagstamon.1.gz || die
+ sed -e 's:\(nagstamon\.1\)\.gz:\1:' \
+ -e '/share/ s:^:#:' \
+ -i setup.py || die
+
+ mv ${PN}.py ${PN} || die
+
+ rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+}
+
+python_test() {
+ virtx epytest
+}
+
+distutils-r1_python_install_all() {
+ default
+
+ doman Nagstamon/resources/nagstamon.1
+ domenu Nagstamon/resources/nagstamon.desktop
+ doicon Nagstamon/resources/nagstamon.svg
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-02-26 7:22 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-20 7:51 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/, net-analyzer/nagstamon/ Christian Ruppert
-- strict thread matches above, loose matches on Subject: below --
2024-02-26 7:22 Hans de Graaff
2022-12-11 8:11 Hans de Graaff
2021-11-19 6:54 Hans de Graaff
2020-09-05 8:17 Hans de Graaff
2017-09-21 7:23 Christian Ruppert
2017-09-14 11:14 Christian Ruppert
2016-08-30 17:41 Christian Ruppert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox