gentoo auto-resync : 28:01:2024 - 12:57:11

5 files changed, 32 insertions, 40 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index ce1b845315a0..7ea53ccf3364 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 02d2a05a6844..7ace15a3db1e 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,7 +1,5 @@
-AUX nagstamon-3.10.1-setup.patch 1087 BLAKE2B 3ad38e119cb3ed63a254bf38d2f8375ada4791eed423e1a50bc7ec5057d6d7c8b2fd896a695832aa5ad2c6c7201c83ce86896068947be917319f55f4c491084a SHA512 a07ac0cd7265fb85158d994b188797fa92924ac65ef7f6f4f56679516f5c6542c7b67488e8514db56bea9d69a50f1b09e8110809379ea664f4ddc645fd3517b2
 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.12.0.tar.gz 581087 BLAKE2B 1f54decdd6cf1fdba8abd7f97102cd84d9f38e68391c31f413860d7c80410e38ee8929cf4d1bfbf7cca1fa54b9088409a47ba669c6ff78d8edecb3313a7e5690 SHA512 029d3dcf5ea5a512940b8e6ed0d3a146e727b3c8ffcbd530fc28f4a896a1a801bb0029a33b62e311c1b0c281810bd001f323c9e3e4c4fc9199bacc7b962ff794
-EBUILD nagstamon-3.10.1.ebuild 1576 BLAKE2B b79751c94024861584ef64e64b6093c72fc890d61073a36f2302bd6d2685321bd5726e9d82c6fc6ce22c5a573b6f3a839d379c614b314bdb448949fa4115346b SHA512 2e5b448d9fd5b99334d06b3457288587b93b02b4a57631d52c60b608a4da40322306c50f214bf6ecce980df6f1e56630fe180cc6b3bbad13d313ad6cfe5d38dd
-EBUILD nagstamon-3.12.0.ebuild 1689 BLAKE2B 1d7545e9e053fdee2bdca406020d7ff44e3d67616136a4adcb6743dd2f93c94a2f036796292f5846f818fec3866bf765369d6fca42120e846925716edd58f3be SHA512 5dda2c8ebeb56e73a8b9fe5352174ce5ac754aa4fbf7b8970c348eab43bd67c19821b3b9b2a3f27daa9d6d9d3a7d288356c3bf5d8e76ffd688310b145edf478a
+EBUILD nagstamon-3.12.0-r1.ebuild 1946 BLAKE2B bba87fae070fbf9c38cab0add246b2053c24ffd73e324e4ba2115e00da21e181811a8ccc5d94c95b9071db94a295ec622b4d7faf0717318384fffb15cbfc7743 SHA512 06c572aa5f97d7d1fb8790278ff8294e9bfc7479cd1daf2212a7043f6a95b8f9111205cb37de6662fdf37b5c61a33a0a7262c73b4e6ba417d6f63f701253e4cf
+EBUILD nagstamon-3.12.0.ebuild 1732 BLAKE2B ea3d36f71f7609fe992084911b8cf7d07e0e5bd639ded37bd01da6b69e6b92e906f3e1618f376486d47474b9d030ebd96e07981e6cd1710a7111a50750070a63 SHA512 8cb377ce52b2bca78818fbe461b0acc33af9997811f4aaf26556571866bc42775bdc62bc8253fce3ebe31b3245177cbd846d4b96aba3f3bbd8fb164935bfc9ef
 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
deleted file mode 100644
index 28bb98e1b49a..000000000000
--- a/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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/nagstamon-3.10.1.ebuild b/net-analyzer/nagstamon/nagstamon-3.12.0-r1.ebuild
index b2cdbac64489..7745a3ac4a41 100644
--- a/net-analyzer/nagstamon/nagstamon-3.10.1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-3.12.0-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit desktop distutils-r1 virtualx
 
 distutils_enable_tests pytest
 
@@ -19,13 +20,16 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+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}]
@@ -41,16 +45,30 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pylint[${PYTHON_USEDEP}] )"
 
-PATCHES=( "${FILESDIR}/${PN}-3.10.1-setup.patch" )
+PATCHES=( "${FILESDIR}/${PN}-3.12.0-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
+	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
+}
diff --git a/net-analyzer/nagstamon/nagstamon-3.12.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.12.0.ebuild
index a162f8f7d2a3..132181cc389e 100644
--- a/net-analyzer/nagstamon/nagstamon-3.12.0.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 virtualx
 
 distutils_enable_tests pytest
 
@@ -58,3 +58,7 @@ src_prepare() {
 
 	rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
 }
+
+python_test() {
+	virtx epytest
+}