gentoo auto-resync : 13:10:2024 - 04:04:06

4 files changed, 6 insertions, 82 deletions

diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 0a7910d0c82e..1648899ca93b 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -2,8 +2,8 @@ AUX nagstamon-3.12.0-setup.patch 1086 BLAKE2B f1033b5e833a4aa48cd8555815e8b14630
 AUX nagstamon-3.14.0-setup.patch 993 BLAKE2B 455e8f093ee073cf99743ac043b5c83f45ba41db7bc85c27c40240dd1d2e34a564bbeb30e83103f41b5a72e1974b191c4024534414b603244ef72dee36dd34b3 SHA512 fa866ca9ca465887a3ac639ef35079b1ed535a65f0d99736388aa208914d15b21379012047987265226507e9feac598dfd257dcf126237bca4fc9aa3543cbb8e
 DIST nagstamon-3.12.0.tar.gz 581087 BLAKE2B 1f54decdd6cf1fdba8abd7f97102cd84d9f38e68391c31f413860d7c80410e38ee8929cf4d1bfbf7cca1fa54b9088409a47ba669c6ff78d8edecb3313a7e5690 SHA512 029d3dcf5ea5a512940b8e6ed0d3a146e727b3c8ffcbd530fc28f4a896a1a801bb0029a33b62e311c1b0c281810bd001f323c9e3e4c4fc9199bacc7b962ff794
 DIST nagstamon-3.14.0.tar.gz 585452 BLAKE2B a05c6a5a4a2b1e98d2831bef8000f81e306807f0706915d73bcf04f67a070fbd1787d0f98f8650b08bcd94a13b13f21c2b36ef79ee820bb526ff7074b5b5d996 SHA512 6896b0c1a58f1ee6f597ff5022d3bd675760a2c7a0403fc72f0e5c7edde6e2177f0eddb2af5a66e0fbe6166d85394fdcedc92cc0e64e0ac469681a380879a0ab
-EBUILD nagstamon-3.12.0-r1.ebuild 1946 BLAKE2B bba87fae070fbf9c38cab0add246b2053c24ffd73e324e4ba2115e00da21e181811a8ccc5d94c95b9071db94a295ec622b4d7faf0717318384fffb15cbfc7743 SHA512 06c572aa5f97d7d1fb8790278ff8294e9bfc7479cd1daf2212a7043f6a95b8f9111205cb37de6662fdf37b5c61a33a0a7262c73b4e6ba417d6f63f701253e4cf
+DIST nagstamon-3.16.0.tar.gz 582759 BLAKE2B 7bda897d0c796229eb14c0482d86f717ad0c314024f4501cc4c6a7575baebfc0958207772b48be3374aa0ab466a29ef7bfd860f9a4d856ef1699b48679846e08 SHA512 08c9758c35bd930a009f63534e667ae7c87c84c76ef2041bc5f95fb962b98bd88567cd734b70f19affec8dc5038263fa7201359631ab2d8ba4437676a0304708
 EBUILD nagstamon-3.12.0.ebuild 1732 BLAKE2B ea3d36f71f7609fe992084911b8cf7d07e0e5bd639ded37bd01da6b69e6b92e906f3e1618f376486d47474b9d030ebd96e07981e6cd1710a7111a50750070a63 SHA512 8cb377ce52b2bca78818fbe461b0acc33af9997811f4aaf26556571866bc42775bdc62bc8253fce3ebe31b3245177cbd846d4b96aba3f3bbd8fb164935bfc9ef
-EBUILD nagstamon-3.14.0-r1.ebuild 1946 BLAKE2B 461cf786d2e1e51a972c239e2cac28eb3ada7ae6d608b52ff5c0e9fc88e2b80083cecda8054d07ac8e877e61d62e1935376812128fcae081cf9d60edc3f3dffe SHA512 92135bc456ba6b5e40bf8c507893b57488733078c65870bcb314b98d3a3dcccb0ec2e5859876942afa2fc65bd34efecb0d3dae6eded0d3d55652638aab11ac49
-EBUILD nagstamon-3.14.0.ebuild 1946 BLAKE2B 9599823d25cbd7f23ff88e697a9911fd00cf7d5166ca17fe3ae9dad1ab39d2653c7f47d3da8eb726d7a22be4c03aebf49cd2cedd0fc2aa39f23999a6bf43bf41 SHA512 12cd76a397e6734d1f14a686e66f48cd2d1adf238be9649153e7585bc0e6f2bcbb8709bbfdb203f15a6a537461954a892f74e32caf8e5f2cb476fbd4ad671ecf
+EBUILD nagstamon-3.14.0-r1.ebuild 1951 BLAKE2B 03d7b42f41f7f1ad2d2505d007e0d8bf82c6489566a24cd4c59e75c1dd161383e60053a285172eec4f3174a3b4bc20c078b93c6779609a6ab94191cc68b6d4e5 SHA512 394c6b17e857eb6d580b5940174c65abf385035bc828a9fc7c8c359ca15333e31d508543852e17f14a7bfc26a8c85da950cddf798b09c7bdcd7dd8293dc339f8
+EBUILD nagstamon-3.16.0.ebuild 1901 BLAKE2B 46db8729dfd3198fe8a9de62d7242e4470a5b6be025f55dc63f4a5f237d874ef947696d90f1932a7d3b7c4042f6fcf32f94df65df276b7d7c543a54ab9b74b80 SHA512 43b7e3b4b4a5d631520ef542fb68c9c77bb50f441c5215bc23afeeba584108b324090e366a1ccce7c1da96c2c10d8da54570f386b378dee1e1b7adc018599f19
 MISC metadata.xml 524 BLAKE2B 4c3356f78441905ea0100c68e3dc806032b4bfa3173b908b9f66c8ac196db9d3928dfac4dd68b1e0a25d7718bdc1209a7196a5d0adced5631f6f5c9734554866 SHA512 9ad5a7226bca2718b698c6af71d98ee34c0f7f422112d7ebb21c55c4f68bc021229d48a0aaa514304d84968cce1ca659f91632857faa35af18e465a989490981
diff --git a/net-analyzer/nagstamon/nagstamon-3.12.0-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.12.0-r1.ebuild
deleted file mode 100644
index 7745a3ac4a41..000000000000
--- a/net-analyzer/nagstamon/nagstamon-3.12.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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 desktop distutils-r1 virtualx
-
-distutils_enable_tests pytest
-
-MY_PN="Nagstamon"
-MY_P="${MY_PN}-${PV/_p/-}"
-
-DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
-HOMEPAGE="https://nagstamon.de"
-SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/lxml[${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}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${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}]
-	test? ( dev-python/pylint[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${PN}-3.12.0-setup.patch" )
-
-src_prepare() {
-	default_src_prepare
-
-	# pre-compressed already
-	rm Nagstamon/resources/nagstamon.1.gz || 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.14.0-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.14.0-r1.ebuild
index 327379d4b63c..1f5e624750d9 100644
--- a/net-analyzer/nagstamon/nagstamon-3.14.0-r1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-3.14.0-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="qt6 test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-analyzer/nagstamon/nagstamon-3.14.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.16.0.ebuild
index 5f85aa5424c7..53cc8d22f9f9 100644
--- a/net-analyzer/nagstamon/nagstamon-3.14.0.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-3.16.0.ebuild
@@ -26,11 +26,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/lxml[${PYTHON_USEDEP}]
-	|| (
-	   dev-python/PyQt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
-	   dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
-	   )
+	dev-python/PyQt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
 	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/arrow[${PYTHON_USEDEP}]
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]