gentoo resync : 16.09.2020

4 files changed, 74 insertions, 1 deletions

diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index a3c5e77bcd64..a14e8e95be1b 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,5 +1,6 @@
 AUX nagstamon-2.0-setup.patch 1095 BLAKE2B 6dfc2516266a1cc70b527573fd941a7cc41d9487d49cfc1cd775baa35334e76af67c48ca653a469a57b946f3e9e4fcf7632e1e02f2378fba3af066f670f3ecbd SHA512 93f98a8e590bd46f8745f5ec9b4ea363a4c4fd7810013aa329bdc4fce12d3f8bfcea46412aea7c87188b4cf2634d002c9f91f09e12870c4686cb0646f6c6a428
 AUX nagstamon-3.0-setup.patch 1139 BLAKE2B f399c6c600785629c7c90b1de396c17805882554f3d4d9e0932cbf0c8761496cccac57b068b7a7c161bcde11223db2ed4a0c5563a15267f13d3553147044ca0f SHA512 7ec4f621e1dc91cb941811aaacb6322fee8024d39dfa65e39b3a19631a3ef7c78d4fcd4d8df5630b76904e3c415290b35ac777c4d0e863ce83e15832d061ea4d
+AUX nagstamon-3.4.1-unknown-version-id.patch 745 BLAKE2B 9e9f4619f98cfdea4a0f90fbf5d0b3c34c9e940449752110018a9b72a5817e0445f79cc30a9f720a390d40f09e0a28d491f692c6cd7515eb42f4035af54d483d SHA512 d4100c8f334309fd8711e2113c8e00d00fde124328e0ecd3c50762ff2be1b53b3832995922924170f7c695cdcfb48ba0100fda93a046ea802c56a4a917f77d43
 DIST Nagstamon-2.0.1.tar.gz 535814 BLAKE2B f366a0b5d2f2e4c7168bbb996b68aea7f9ea2f248c25505f8e2ca553d4c275260eec8fdad27b7c1187826cca0cebc7c027491a4f7b6acb24ddf604b6b6a8a930 SHA512 f9c8ab928a78f289693ae58cd3dde6fa75dd66dc931dbec6a4affc35bd96f16c39a03cb441575c9ca42e810ae5962fc7226513b8cc2a17871e0365aa3a207db6
 DIST Nagstamon-3.0.2.tar.gz 542005 BLAKE2B 090875cabbf22feea5cfe0eab0934b503d68df0f49c0a2e8056ccfed8251f278e149da5d0f8002cc5c96ffddd5b89a3ad997d90790e33c9cf1b9ffd9e32a83c0 SHA512 8b05b74adc7399b84cfb66d4c55ff80b2a37af7612496578bdc72ce00f712c8eae087204d00e7d7f1e1d35377f7bb8460d5cf337e315943a48a4ad5108e8d14f
 DIST Nagstamon-3.2.1.tar.gz 545190 BLAKE2B ce8b6624a3b1b61e307281ba193d07850bd5d104205d21e2967c1f65c0fdb217be2b2422d0312cfccaba766b814cb1f298a2ed62d07b7377530fd2ef3200a46f SHA512 c3ddda8d046d08514f7633b9129abebdc039e7faee5a618ef8ef77fc2c518bad798572fb549eb9ab9ef96377cd390e159934f268d9bd97c071c4895682bff8e6
@@ -7,5 +8,6 @@ DIST Nagstamon-3.4.1.tar.gz 563745 BLAKE2B 3ac35c90757eb525e7e7953f63a8798a00874
 EBUILD nagstamon-2.0.1.ebuild 1184 BLAKE2B e3266f765f3cd0a6bb64e3b851358d152cf6bc107125ac21fc334c8b8ce56551ce4f01c9cf786f81fadbce2e1b479e6656dd6c2194147088f9f166f41e0f5733 SHA512 69d8101e5720eb8dfc4ccb2997a274e995623b948357ef5c20fb3c7e5c9bd372e1f51299b09d508ba033debd9284cd68108cee62d8c35302641b71003097f608
 EBUILD nagstamon-3.0.2-r1.ebuild 1333 BLAKE2B cfcfe7586f8054838a94b512251ba0b465b0707ec76712a029b668f1ff5a4c398f096c24a01017cf0487207c8dbda75656653a429af70441f28b9977ad01d7d1 SHA512 978fd5089009961b2b83581c75148bd75386d5bf932ab67e4a1e563d890eaeb7e3fadcd8e9b5a7b0e0f7872554b38a19ceaede2dba561058d9e0e7b066e77aaf
 EBUILD nagstamon-3.2.1.ebuild 1462 BLAKE2B db3f9a87f8dab49ac77a04bdceae82394eda91a428e511bc9477699f001ec87d10a4d0dfb37fc750fcb7ecd655df42d3f81e15b4fb20e988d24ce27bd3c0e62d SHA512 05d3aa0f8fcf3b29780a39d9468b2fe84c99ebafa6c2f75108e9b9e7bac4eac2359123250b3fc604214d28267091162f1ebcb87a49b1a0598985910c71312740
+EBUILD nagstamon-3.4.1-r1.ebuild 1513 BLAKE2B 524f32c56676fb6987fe8b45130ba2b1735e66e68475e67262ad3c23da64754ded6fa4967e2b495d5c6a8c020a75dde7393673fe969cb7c61637ef8c83df6695 SHA512 82acafffb46dfac73b280d6510e3aab9a346bbc4df4a3728702a2e8e6d71849f2517edc072c33156f9cdd62d1d5c8b6841df536625fd94f629ac6394b3acc2b3
 EBUILD nagstamon-3.4.1.ebuild 1462 BLAKE2B db3f9a87f8dab49ac77a04bdceae82394eda91a428e511bc9477699f001ec87d10a4d0dfb37fc750fcb7ecd655df42d3f81e15b4fb20e988d24ce27bd3c0e62d SHA512 05d3aa0f8fcf3b29780a39d9468b2fe84c99ebafa6c2f75108e9b9e7bac4eac2359123250b3fc604214d28267091162f1ebcb87a49b1a0598985910c71312740
-MISC metadata.xml 525 BLAKE2B ad9c68b36b1260f907ceb8f50389fd0e035d441d33e99c71bb8dd493cda5cdaaa4e2ec32746d2b96d15b776d9de03070e411515f34e90c93063dd4b6b803c155 SHA512 5a1bf5be48ee8d28b501dceea33c65791b13cf0301c6bb170e4fe5ecd7b771cc28d3e9a49b82440770800854146961069cb26529ed5fe3e2c9a796329b085c64
+MISC metadata.xml 639 BLAKE2B e0a9b21009ad9110cea206a357a2c8ee91190f9d36b3ce4bdfb4333ad085a88aea62f64e189859a4b217434959703607d7a812f2537f0a95d83b5b1aebe9acee SHA512 3f31d45f7e1e3a2e8d20e9cfe989f07fb79d5852a70709ff18b6eea9556fa03f2aa4d106fda459a5397da9160b29e56fd760e7ac9675dde04ee67dec4303d869
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 000000000000..a71d9d97e5b1
--- /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 596c2d8745d0..7efaea2acc46 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 000000000000..5d9bbdc7b188
--- /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
+}