gentoo auto-resync : 11:12:2022 - 09:22:24

5 files changed, 37 insertions, 63 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 28f2fa16c96b..74d99da76a7d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index f59a90a1f047..e111abab5f0f 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,10 +1,9 @@
 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.4.1.tar.gz 563745 BLAKE2B 3ac35c90757eb525e7e7953f63a8798a0087470e4a94161987f3c382b6be43240aa8b5c44f279d23d841dbf9e4536f38d3f5e2f63234538a00fe6b6e0ee9c680 SHA512 68f8a7345c606b8ad4511b34e2d76383faf8831202c9429ab24eeb215073984f00f580c83a7f5e348f7d4104d3c82bd6f4661939801444e463c3fcf64c8240bd
-DIST nagstamon-3.6.0.tar.gz 573998 BLAKE2B 6cc1e7918d8a7a53255fbd1661b8a41c0f3f414341da64724e566ceb95378590ed325fea757fffcdccf33533c8e34ca235036b47323f89bfcb3d06007a0cf43e SHA512 4da9b20c518129857ff86fa4aa4aa7507fce6c5b43fc917a4b8681d36e69f267045ab35c2f6922bde55536bf55e753f61b4fc184165e2f6d9eb6cb9b00703c69
+DIST nagstamon-3.10.1.tar.gz 574520 BLAKE2B 104d082a610c26af47d61b911094c51e3981947e19ed026bc725e479382bcec2b3d36c36400c379c738c970e1cb36183859e1dd132e1fe78c30be3f20688287f SHA512 83da92cc0d5ceaf7abbf2f2e289a2e83cbcb3bb4239d12f594da7543942a3945cfae68cfa9ecc33aa619967d1d35e1b88d4bb76398364c2f9754174fdd62649c
 DIST nagstamon-3.8.0.tar.gz 585689 BLAKE2B 8ab52762bac4797ded3834a94a382174855504b8e39224938f8f720a4aaaf4b3885fb487504ed09d973210b90f612852964bdcc87a6b2dc7c6b07bebfdeacffe SHA512 d34d1c52ddadbafcd583a5e61f7f305ffc8f722d8c007bbefeee6501475f01612e810154bc5815abe27e9c43e4e695a8ec189dcc5b2b487840d79f92eb3edc43
-EBUILD nagstamon-3.4.1-r1.ebuild 1511 BLAKE2B 96d5d67c73d8398fd72f1d9261cbe46d04005262ab43b7627900444520360e4c148f475908067fe26fca3cda577828ff2988db09cd42bad810e7a27b6b90255a SHA512 8079a99e4094a34723d2513a41e5ace06811e367693b31c5474cef3c38ddcfd0ab396f29cc409582c8ea10132f4f9b17106d08a140fa39fb7d8a6a270c076bd0
-EBUILD nagstamon-3.6.0.ebuild 1548 BLAKE2B 4f0922dba9329ce92b126e786b1f8ccc7d9f229b297f9e3d29049fed93c73469d6fc1ee5d69f2badecb0c11434d46a75f8153c20a043ec69504c5a0806af4ea9 SHA512 a8af930643b7dcdd166e8ee14983b05f3f9583ae62478ee9fd045056cb7dc3e8c7a3234387734d3b6ebbe84ea0a9ac8820ca4e9b136de3235ddfa1fbcf85c27c
+EBUILD nagstamon-3.10.1.ebuild 1637 BLAKE2B 61e655948465083e2976f27812c1fb0aa1457c02f2eab06e350e51c0641eb62e86ea123b4e31715b3accfddd09f2d1dc9d49e66d123c3130814d36cbed0c84b2 SHA512 f29af85c0ebf2ce37dc0b61e83d892ee65430fbc926fdb85bd2a51a062d9e1ff63a13cd78d6a44d2935fb1ef823b04cd8e9e158849c1612f107298c536f5dbbc
 EBUILD nagstamon-3.8.0.ebuild 1547 BLAKE2B 010c505e57844be3fc1ac01c7a16e42f1f67833b4af176fd66ea83069c6329c2912515cd7809e84f66badb867560c72d9355ef71da04cb455e5475239f70ffa6 SHA512 cde2ed5b48d0be5a1182eb99abe7dab3681ad04b5eeb97fa07cd8715407bc5b374a28d556565f052f6a5d2239c28ff3bd159c03bf5bcbbc5befb845a4d9e9353
 MISC metadata.xml 524 BLAKE2B 4c3356f78441905ea0100c68e3dc806032b4bfa3173b908b9f66c8ac196db9d3928dfac4dd68b1e0a25d7718bdc1209a7196a5d0adced5631f6f5c9734554866 SHA512 9ad5a7226bca2718b698c6af71d98ee34c0f7f422112d7ebb21c55c4f68bc021229d48a0aaa514304d84968cce1ca659f91632857faa35af18e465a989490981
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.6.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.10.1.ebuild
index adf94467dd0c..ec3c7f25e642 100644
--- a/net-analyzer/nagstamon/nagstamon-3.6.0.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-3.10.1.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+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/-}"
 
@@ -18,7 +20,7 @@ SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -36,11 +38,12 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
 	dev-python/requests-kerberos[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pylint[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PN}-3.0-setup.patch" )
+PATCHES=( "${FILESDIR}/${PN}-3.10.1-setup.patch" )
 
 src_prepare() {
 	default_src_prepare
diff --git a/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild
deleted file mode 100644
index 1ab07d830d90..000000000000
--- a/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,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.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/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/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
-}