gentoo resync : 12.07.2021

3 files changed, 6 insertions, 93 deletions

diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 3073c3f90ac2..6357d05e7e88 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,8 +1,6 @@
 AUX disable-update-check.patch 992 BLAKE2B d06bc123aef2aec89bb4cca40334183aa5b6d198fcf9abffd15ad60f1c7c43f1e9a3103ebb5f2f743c83cc9d09cdf610c4e5d5caea89523f9ed37f3a4801e774 SHA512 02b06b01f8e3782da632677aa84b9131cb33dae3270677a1a4b0af3c139d100fa54c90c412d1e608e08859facb31e04768927e4862cfc4d9cfcbd061020a5dac
 DIST glances-3.1.6.2.tar.gz 6775046 BLAKE2B 3f65acbb69f8fc4323cbfbd30e79a0d30a9e38e9ff52ea0dc2286213daa66929e6abfccec34e94704fb87f6931f2a17fb30205c14da91f36b37617431bf58363 SHA512 2c62a82ebbc0d562d65f6e1ab39bac14a4b13d13e5fcbb1e98c119d6ea375387ef33b78cd911804504e3fdaa94260de27c211ed1132aae61f10fef8ff8a80fec
-DIST glances-3.1.7.tar.gz 6804822 BLAKE2B 7ae78e126da0aa0bfd604836fc66761224a0eedac119b5e74e27e133a27912deff0c2323dfa0b76c49bd542d995a1f60cf688df1792e69d0401d1192dcff14f6 SHA512 b6ebf3b8d0bc60cf77c30fa8dc24c9ad851eab8415e6ae7f50454d96e7bb14866197599d9e5ea9623375f4dca0ca86f017957f2e6a1a9c8b761c6b499b6db82a
-DIST glances-3.2.0.tar.gz 6851053 BLAKE2B f4a4c4c4d824616e977ef3564a62e9b5bfc7e9695fe3807303b16eddb2e8d6952ea8be47918e04024f35c45111785720c8bba04c3a0abc061ad58c65332b4df0 SHA512 fdb8ff473461108d33d0d28df9b05cb49e7d294572352aa7f87018de70f2c02514ad5692f2bcb8da2b4a7517d6d80f25a1bb341339108caeafc82242ab30110a
+DIST glances-3.2.1.tar.gz 6851329 BLAKE2B 3f8eb91a0957961d0ed2465d8025d25158303cc8332b7a976c2af0bbd671405aae3b71b1d3a63eeb86ddb0d6e500b955bb0e1e5a93c0ba0b88835f88872eb979 SHA512 e2f8a46a9bc3b2e3aa16d0716b34e06991029df9dec4c29ef70c65b5fb7c96dee3c71cc565b551e35a31aa1c7e1a92538b158c2e660d15b22defad8ae04c4eb3
 EBUILD glances-3.1.6.2.ebuild 2687 BLAKE2B ca3ed19299ceba3335e62ada116093489a26367bfd6167a0128e17ce0b0356745cde6bd16c4ed763597f28bf00df12b74ad864a0cbb7124ac087ef540f0f635d SHA512 053e8cebcd8b57b5f17ea13f9245eaa4b3d7c97280ace37b1c58a75e74f9f8ed7099504d86350e4a5303b26159bc9b324abccab800b940c85807f85d4a4bd3f2
-EBUILD glances-3.1.7.ebuild 2692 BLAKE2B e2536844a80c71b611d001b4e9ad2251ca44c395973a4a5ac8adcbffee240142de0347853246831e47c29c85052f97603d7f26fc4d105f37b90755c7cbdefdad SHA512 848df2006873620e12a3422b08d84f8104a66770297ee7f13aa89b63fb76fbc983998b0f440e2ed18cb544a751188bf061017b4edb1511fac5bba682c457809d
-EBUILD glances-3.2.0.ebuild 2692 BLAKE2B e2536844a80c71b611d001b4e9ad2251ca44c395973a4a5ac8adcbffee240142de0347853246831e47c29c85052f97603d7f26fc4d105f37b90755c7cbdefdad SHA512 848df2006873620e12a3422b08d84f8104a66770297ee7f13aa89b63fb76fbc983998b0f440e2ed18cb544a751188bf061017b4edb1511fac5bba682c457809d
+EBUILD glances-3.2.1.ebuild 2733 BLAKE2B 393a144a7bf121db50759bb0640a9ef5e6baf94eca10e438ab7fcabdb2ea3bf5266213d5966c05ac08353dfb71713e6483cf6827f370366f1290ac51e4e710b1 SHA512 742c0881b94a3d3e29659505b0dd9e910c923c0436cc2bd250221ef932de52cb723411d6a48c89e9c7493e34daa9a338b99e2272f87025cf1b7a476f5cb46dce
 MISC metadata.xml 856 BLAKE2B e3d750f1586383ffabb204739bd0636a1b7729b4b704f03f03b356afd540482571780aa4de84620ac2aa4e832e4250867228e59cb5ed3f0f6867e7bc65104246 SHA512 8315a7896acc1068a2f7a6efa2a99078090677f685a90bd2c5220c043fd25e03d137ea0aeea1cd3660544f139970508037e9447cfb08d82fdb4023c856709e73
diff --git a/sys-process/glances/glances-3.2.0.ebuild b/sys-process/glances/glances-3.2.0.ebuild
deleted file mode 100644
index 6978c8ab74ca..000000000000
--- a/sys-process/glances/glances-3.2.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-PYTHON_REQ_USE="ncurses"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.4.3[${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}/disable-update-check.patch"
-)
-
-distutils_enable_tests setup.py
-distutils_enable_sphinx docs --no-autodoc
-
-pkg_setup() {
-	linux-info_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_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 "Quicklook CPU info" dev-python/py-cpuinfo
-	optfeature "Docker monitoring support" dev-python/docker-py
-	#optfeature "Export module" \
-	#	unpackaged/bernhard \
-	#	unpackaged/cassandra-driver \
-	#	unpackaged/potsdb \
-	#	dev-python/couchdb-python \
-	#	dev-python/elasticsearch-py \
-	#	dev-python/influxdb \
-	#	dev-python/kafka-python \
-	#	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-3.1.7.ebuild b/sys-process/glances/glances-3.2.1.ebuild
index 6978c8ab74ca..1ed7716ee7bb 100644
--- a/sys-process/glances/glances-3.1.7.ebuild
+++ b/sys-process/glances/glances-3.2.1.ebuild
@@ -15,10 +15,12 @@ SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 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"
 IUSE=""
 
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
 
 # PYTHON_USEDEP omitted on purpose