gentoo auto-resync : 07:08:2024 - 12:37:20

4 files changed, 15 insertions, 139 deletions

diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 96d30d4dc4b2..0886246239fc 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,10 +1,8 @@
 AUX glances-3.4.0.3-disable-update-check.patch 1520 BLAKE2B 070fa7fce954451b318f9291bfb3f1e46d0fbcd9297587811d361f3584e745c1d4d889d201fe75c6c9fb21e2d8eda470da215bbe8e8cbcd22d553379a489ea22 SHA512 7c24f3ca744792ff9bcfc963c1ea03345d54eb8fb48d2d02fb13b14a3eb23c2ba25f0c0fe744b598f60b4c6dd197f7a7b08fc569662add04a0a9ef1415b84776
 AUX glances-4.0.6-disable-update-check.patch 1379 BLAKE2B ca1b269e272ca0160a022599b3a464a3f6747955b5795a33057df65055fceaa3ebb84abf184a3c4278ab1f8be1d84d68e17185e85bc899634947c2d32de174c7 SHA512 3bc5cefa22b55d9b9e26208c6424672964e5d959940343c6dec823a7abb1cd32d0380c7774cd4becb44436bac2a487e0f8c8689fa7d5e837e0789788f3767241
 AUX glances-4.0.6-doc-install-path.patch 691 BLAKE2B 447b2a7f570f46d66aa4bddbc07ac264eb704dc7c77cfdea82787ff99e3c2f73a06bf67f07191bfb89fffef672d6f63de4bb26991ad074d02cc93de96c389d25 SHA512 c64c8ca54b2c614d1b53149d66936270059a62e6b75f16a09fd7777c0098d65877ed0b2d8b689c2e6a292fc4c6b6d52df8c71e7474c2d637d3ccce282da244c2
-DIST glances-3.4.0.3.gh.tar.gz 6472143 BLAKE2B 5437d3daefd4d36e9b84481543cf8189964006d566a77506099bfe7748d37409d5fb2a3a8eb52c8eeef0efa469c2ca92db7a37a44625969aec822d1adf46dbb3 SHA512 f4960d7d23b52e249069b41fd9b20a4d6f56006a6998b1bfd341ef00628fa92c14503885ebbea6adeee6f926a6c6fb440c288e2c772d4536b2c2b49e4124a7a0
-DIST glances-3.4.0.5.gh.tar.gz 6473711 BLAKE2B 510f379946eec914998cba32ffd66c6037bd85246cdae059d336b4a3330ba6e521aa3fef2099d88f08dbf3ed7e7c8537235850ad8f6882840fb811bcd8a82147 SHA512 aca140fedc2acc97ae4901722e0406acb8bea6eac5295d95499860a522e74d29ecbc4cfb28fecfd4a2879f4ee44175bd4efd2429b9d7e302b4a182caabd6a5f8
 DIST glances-4.0.6.gh.tar.gz 6622650 BLAKE2B 82290999d94ea46bb5671a6eb2959cbb4246dd231fddbb6ad72108d7270faf5a3da5f73f25d1bdb8987a6db79d7a07eb05581fa7b4d7406df97cffb274e20387 SHA512 d5bb804aff6dbc5147a185cb613ca9f402b43fc2d9bef1e80dfd90db3fe11f445aade0d73e987a9a3665c4bf4f210dd3d1a98e9b53e028ef4e49a9111b527f0d
-EBUILD glances-3.4.0.3.ebuild 2860 BLAKE2B c981375963346db80bd1430ae80923b96ae9ee6853468627eddd495969dddec477089b37dbdc9123bbfa2ddf6a07aa56401f195f1dc2f8c561665e39ed4736d2 SHA512 1105967eeafbdfc175f074d7c586f3b355e32b552f6a1dfd20a5d292abb9cf5fd87ac96488a0067f6ca21ff41ea6e61d2e98c069979f869aeef988a48fb364c2
-EBUILD glances-3.4.0.5.ebuild 2865 BLAKE2B dde77cec4fc4ffcaf0867ccff6e009940ac885e2f17ffab23a5286d32d2f0715aaa303a1b3a5ad24a68b273474d07b32f29dfe89d773f417a44aaef261950179 SHA512 0cb41656dd71f1e015fe6a6f0d5817fc3140086377191d5a9627bef031197479441bdd3600b3cb83483020c5375294c6e8f5891270516094b115be2217c9feed
-EBUILD glances-4.0.6.ebuild 1721 BLAKE2B bd6b6e5e06d0f243722713ec8855ba8fdb43e38aa60174c7223a4756644a50b9467f3a1f241facaade4f371e286a049d7a6c0c6d622f643f77d6a887c5e80702 SHA512 d61b0cb57f2b2ef6212b338b8bc931ab4127af921d248a767ec2344a7411ee9165004358273527956c965a73be495805e7083714a976350728028c7c04dc9833
+DIST glances-4.1.2.1.gh.tar.gz 6579592 BLAKE2B 2c22bd5bc4c1a162b92dcb016363dcf789c13b0fbeaab091f0f84d5538885b7c7e20347620491cc248242e25f81806119d82395ee72623ca2a80ffab78cddf56 SHA512 a440e6fb39c6aac3fa846e49268170e2a7c1a331a7b319dbe9d5cadf8aa9975146a5fae7d99abc085a9f9aadc739281073f5a99f95f456132a2e78b14898f340
+EBUILD glances-4.0.6.ebuild 1716 BLAKE2B 4deb43a38281b3cea9b952455891e821bd92e4b6ee463cbb23df4856b89b99e7a58bcc4aa1c0182d1fe409aef1c3efc336b32ceb2e0e6c10d7ba8d197e75791f SHA512 72180210928d1ccd3cd44954819ef4a59052ab9afdaff46ea0daabe41b050d1bdb65adbff83012108fbf7919131a17431e4978f8e8b0da6d8574ce26da1a1cf2
+EBUILD glances-4.1.2.1.ebuild 1938 BLAKE2B 669ac7f61354282d08d87292922410471a285c62b8ae41c0c78b19cbe189e0edc0fb52ceb8f60decd310d4ae4fe92c7eb99102c06d0c1b847cb13a5578920f99 SHA512 b645986fb52d170365c2c2c5a8bb08c2efd0e618d87f588fabfaa897257e54f593ac21831e959b4298e95476c5fa871066c09d72b39beb8e1a5aed988697b7ca
 MISC metadata.xml 854 BLAKE2B 2490007fac08af17714511646730b34390bcbffe42db3cb1fe39ab5f4dd3f7e5979e58732d26863194c9ca3ef1daafb5242184a432eb08d70590a4dea9761be5 SHA512 8de66d9b8bc3c603f95ab355869bd0f6720652711462021af5efbda012fbefeacc155f2c29613fe33095edc9b2699e28a692284fca14bfd4166c329dfa78138a
diff --git a/sys-process/glances/glances-3.4.0.3.ebuild b/sys-process/glances/glances-3.4.0.3.ebuild
deleted file mode 100644
index 454c939d0c47..000000000000
--- a/sys-process/glances/glances-3.4.0.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE="ncurses"
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 linux-info optfeature
-
-DESCRIPTION="CLI curses based monitoring tool"
-HOMEPAGE="https://github.com/nicolargo/glances"
-SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	')
-"
-
-# PYTHON_USEDEP omitted on purpose
-BDEPEND="doc? ( dev-python/sphinx-rtd-theme )"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.0.3-disable-update-check.patch"
-)
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs --no-autodoc
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-python_prepare_all() {
-	# Remove duplicate entries of a prebuilt doc build and
-	# ensure install of the file glances.conf in /etc/${PN}
-	sed \
-		-e '/share\/doc\/glances/d' \
-		-e "s/'CONTRIBUTING.md',//" \
-		-e "s:'conf/glances.conf':('${EPREFIX}/etc/glances', ['conf/glances.conf':g" \
-		-i setup.py || die
-	sed -i "s/, 'irq']/]/" unitest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" unitest.py || echo "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	# add an intended file from original data set from setup.py to DOCS
-	local DOCS=( README.rst CONTRIBUTING.md conf/glances.conf )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	#optfeature "Action script feature" dev-python/pystache
-	optfeature "Autodiscover mode" dev-python/zeroconf
-	optfeature "Cloud support" dev-python/requests
-	optfeature "Docker monitoring support" dev-python/docker
-	#optfeature "Export module" \
-	#	unpackaged/bernhard \
-	#	unpackaged/cassandra-driver \
-	#	unpackaged/potsdb \
-	#	dev-python/couchdb-python \
-	#	dev-python/elasticsearch-py \
-	#	dev-python/influxdb \
-	#	dev-python/pika \
-	#	dev-python/paho-mqtt \
-	#	dev-python/prometheus-client \
-	#	dev-python/pyzmq \
-	#	dev-python/statsd
-	#optfeature "Nvidia GPU monitoring" unpackaged/nvidia-ml-py3
-	optfeature "SVG graph support" dev-python/pygal
-	optfeature "IP plugin" dev-python/netifaces
-	optfeature "RAID monitoring" dev-python/pymdstat
-	#optfeature "SMART support" unpackaged/pySMART.smartx
-	optfeature "RAID support" dev-python/pymdstat
-	optfeature "SNMP support" dev-python/pysnmp
-	#optfeature "sparklines plugin" unpackaged/sparklines
-	optfeature "Web server mode" dev-python/bottle dev-python/requests
-	optfeature "WIFI plugin" net-wireless/python-wifi
-}
diff --git a/sys-process/glances/glances-4.0.6.ebuild b/sys-process/glances/glances-4.0.6.ebuild
index 2988ea7d7c95..5d5f32ec09d1 100644
--- a/sys-process/glances/glances-4.0.6.ebuild
+++ b/sys-process/glances/glances-4.0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/sys-process/glances/glances-3.4.0.5.ebuild b/sys-process/glances/glances-4.1.2.1.ebuild
index 532fd4e5dbc8..cecf27b778a1 100644
--- a/sys-process/glances/glances-3.4.0.5.ebuild
+++ b/sys-process/glances/glances-4.1.2.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="ncurses"
 DISTUTILS_USE_PEP517=setuptools
 
@@ -21,9 +21,9 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/defusedxml[${PYTHON_USEDEP}]
+		dev-python/orjson[${PYTHON_USEDEP}]
 		dev-python/packaging[${PYTHON_USEDEP}]
 		>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
 	')
 "
 
@@ -33,7 +33,8 @@ BDEPEND="doc? ( dev-python/sphinx-rtd-theme )"
 CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.4.0.3-disable-update-check.patch"
+	"${FILESDIR}/${PN}-4.0.6-disable-update-check.patch"
+	"${FILESDIR}/${PN}-4.0.6-doc-install-path.patch"
 )
 
 distutils_enable_tests unittest
@@ -44,53 +45,26 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
-python_prepare_all() {
-	# Remove duplicate entries of a prebuilt doc build and
-	# ensure install of the file glances.conf in /etc/${PN}
-	sed \
-		-e '/share\/doc\/glances/d' \
-		-e "s/'CONTRIBUTING.md',//" \
-		-e "s:'conf/glances.conf':('${EPREFIX}/etc/glances', ['conf/glances.conf':g" \
-		-i setup.py || die
-	sed -i "s/, 'irq']/]/" unitest.py || die
-	distutils-r1_python_prepare_all
-}
+src_prepare() {
+	# the version is tagged 4.1.2.1 but upstream seemingly forgot to
+	# update the version, hack around it for now
+	sed -i "/__version__/s/4.1.2/${PV}/" glances/__init__.py || die
 
-python_test() {
-	"${EPYTHON}" unitest.py || echo "tests failed with ${EPYTHON}"
+	distutils-r1_src_prepare
 }
 
-python_install_all() {
-	# add an intended file from original data set from setup.py to DOCS
-	local DOCS=( README.rst CONTRIBUTING.md conf/glances.conf )
-	distutils-r1_python_install_all
+python_test() {
+	"${EPYTHON}" unittest-core.py || die "tests failed with ${EPYTHON}"
 }
 
 pkg_postinst() {
-	#optfeature "Action script feature" dev-python/pystache
 	optfeature "Autodiscover mode" dev-python/zeroconf
 	optfeature "Cloud support" dev-python/requests
 	optfeature "Docker monitoring support" dev-python/docker
-	#optfeature "Export module" \
-	#	unpackaged/bernhard \
-	#	unpackaged/cassandra-driver \
-	#	unpackaged/potsdb \
-	#	dev-python/couchdb-python \
-	#	dev-python/elasticsearch-py \
-	#	dev-python/influxdb \
-	#	dev-python/pika \
-	#	dev-python/paho-mqtt \
-	#	dev-python/prometheus-client \
-	#	dev-python/pyzmq \
-	#	dev-python/statsd
-	#optfeature "Nvidia GPU monitoring" unpackaged/nvidia-ml-py3
 	optfeature "SVG graph support" dev-python/pygal
 	optfeature "IP plugin" dev-python/netifaces
 	optfeature "RAID monitoring" dev-python/pymdstat
-	#optfeature "SMART support" unpackaged/pySMART.smartx
 	optfeature "RAID support" dev-python/pymdstat
 	optfeature "SNMP support" dev-python/pysnmp
-	#optfeature "sparklines plugin" unpackaged/sparklines
-	optfeature "Web server mode" dev-python/bottle dev-python/requests
 	optfeature "WIFI plugin" net-wireless/python-wifi
 }