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

[Hans de Graaff]

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@g.o</email>
     <name>Christian Ruppert</name>
   </maintainer>
+  <maintainer type="person">
+    <email>graaff@g.o</email>
+    <name>Hans de Graaff</name>
+  </maintainer>
   <maintainer type="project">
     <email>sysadmin@g.o</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
+}