gentoo auto-resync : 11:06:2023 - 14:17:09

4 files changed, 44 insertions, 38 deletions

diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index d89801c82db1..7d06b62a5209 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,7 +1,7 @@
 AUX nagstamon-3.10.1-setup.patch 1087 BLAKE2B 3ad38e119cb3ed63a254bf38d2f8375ada4791eed423e1a50bc7ec5057d6d7c8b2fd896a695832aa5ad2c6c7201c83ce86896068947be917319f55f4c491084a SHA512 a07ac0cd7265fb85158d994b188797fa92924ac65ef7f6f4f56679516f5c6542c7b67488e8514db56bea9d69a50f1b09e8110809379ea664f4ddc645fd3517b2
-AUX nagstamon-3.8-setup.patch 1190 BLAKE2B 39eec86dc7fcd69d0e6ef5c3b986e1e1c3096bed7e9e60eb1b7986bd83b9542805cd78a46813ba8af566243d4890565c5670c4fa41fc209f3e261a61bc5108aa SHA512 172a11999da5aaba979c800278a2524c9f3de269f7c3b2dd994ea0f658d48ab6891723ba1e03296cbdd4f979b2ca84b391a763bf19279f22588b570be677a3c5
+AUX nagstamon-3.12.0-setup.patch 1086 BLAKE2B f1033b5e833a4aa48cd8555815e8b14630774265a5f00e7e698d7e077ee18824cb0e3f282ef3c2c430d02006f21a8a6acd9fed082999a7f615018f3c57ea5353 SHA512 9aad3f277cba45c348f6eeb058876be8fb4406abb608b33799733ef642c1105b9d940d038e8cb9ae7d332eebe235b31d81bcdc602287e91dae4b06477381e2fe
 DIST nagstamon-3.10.1.tar.gz 574520 BLAKE2B 104d082a610c26af47d61b911094c51e3981947e19ed026bc725e479382bcec2b3d36c36400c379c738c970e1cb36183859e1dd132e1fe78c30be3f20688287f SHA512 83da92cc0d5ceaf7abbf2f2e289a2e83cbcb3bb4239d12f594da7543942a3945cfae68cfa9ecc33aa619967d1d35e1b88d4bb76398364c2f9754174fdd62649c
-DIST nagstamon-3.8.0.tar.gz 585689 BLAKE2B 8ab52762bac4797ded3834a94a382174855504b8e39224938f8f720a4aaaf4b3885fb487504ed09d973210b90f612852964bdcc87a6b2dc7c6b07bebfdeacffe SHA512 d34d1c52ddadbafcd583a5e61f7f305ffc8f722d8c007bbefeee6501475f01612e810154bc5815abe27e9c43e4e695a8ec189dcc5b2b487840d79f92eb3edc43
+DIST nagstamon-3.12.0.tar.gz 581087 BLAKE2B 1f54decdd6cf1fdba8abd7f97102cd84d9f38e68391c31f413860d7c80410e38ee8929cf4d1bfbf7cca1fa54b9088409a47ba669c6ff78d8edecb3313a7e5690 SHA512 029d3dcf5ea5a512940b8e6ed0d3a146e727b3c8ffcbd530fc28f4a896a1a801bb0029a33b62e311c1b0c281810bd001f323c9e3e4c4fc9199bacc7b962ff794
 EBUILD nagstamon-3.10.1.ebuild 1633 BLAKE2B 72e9d8bb00422d39c2d15c3c38a1e0b58b004db8c9586e734a2fd8e89ed601aa97b6d147da9a7da46c97711de144c157e0a4c03e26949e9d00f6ff5f17adf35c SHA512 21f0f3386b77220a860bf2ccce7a792bafec3536d486fb6beb37664afb2a41469a0e16b834a42b5543b60bdcb856d1aacf6c8670eddf1c100cf2e3928e96ca23
-EBUILD nagstamon-3.8.0.ebuild 1545 BLAKE2B 1747ff329d36c42de12c9fbaf92c61fa4bf86387775aefe9b8cda877ba3b162bd3e55a76fca8d402546a158aaab70040ec6190710c43a066ab3e92226fc16ac6 SHA512 037fe7d31416f57cf27d74fc94278638f57f9fb52f27a42a04c483a0bd0c4d3b0f2d2dbe78f80674e2292feed347830c7b0836ebe222a6873c84d927e0bd4271
+EBUILD nagstamon-3.12.0.ebuild 1736 BLAKE2B 98ffaf365d8885680d2e082bba8e79a79c164ffcb1f5f4a6c1a7eac0fa8b83bda666e3b16d1afb92c3ceee7142ee208b9ca7803583d65893e0bde236a4421f7c SHA512 529626101c5fd75201c376aeaf3f20a318f3acec9048885b2095d1e1c86febe4f148cd25b223836b94275f256559cda7713cf07c3b7ed9a648dc80e5f8538f60
 MISC metadata.xml 524 BLAKE2B 4c3356f78441905ea0100c68e3dc806032b4bfa3173b908b9f66c8ac196db9d3928dfac4dd68b1e0a25d7718bdc1209a7196a5d0adced5631f6f5c9734554866 SHA512 9ad5a7226bca2718b698c6af71d98ee34c0f7f422112d7ebb21c55c4f68bc021229d48a0aaa514304d84968cce1ca659f91632857faa35af18e465a989490981
diff --git a/net-analyzer/nagstamon/files/nagstamon-3.12.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.12.0-setup.patch
new file mode 100644
index 000000000000..f9fe785df978
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-3.12.0-setup.patch
@@ -0,0 +1,27 @@
+--- 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/*',
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']),
diff --git a/net-analyzer/nagstamon/nagstamon-3.8.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.12.0.ebuild
index 884f21f6a670..8b74b7c671b0 100644
--- a/net-analyzer/nagstamon/nagstamon-3.8.0.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-3.12.0.ebuild
@@ -3,9 +3,12 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{10,11} )
+DISTUTILS_USE_PEP517=setuptools
 
-inherit python-r1 distutils-r1
+inherit distutils-r1
+
+distutils_enable_tests pytest
 
 MY_PN="Nagstamon"
 MY_P="${MY_PN}-${PV/_p/-}"
@@ -17,13 +20,16 @@ SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
+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/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}]
@@ -36,11 +42,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.8-setup.patch" )
+PATCHES=( "${FILESDIR}/${PN}-3.12.0-setup.patch" )
 
 src_prepare() {
 	default_src_prepare