gentoo resync : 03.07.2021

5 files changed, 92 insertions, 3 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 9b3f59a49e12..7723d54866c9 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 14372844e872..3073c3f90ac2 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,6 +1,8 @@
 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
 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
 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
new file mode 100644
index 000000000000..6978c8ab74ca
--- /dev/null
+++ b/sys-process/glances/glances-3.2.0.ebuild
@@ -0,0 +1,87 @@
+# 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/iotop/Manifest b/sys-process/iotop/Manifest
index d694c7394ed5..b1a72a722703 100644
--- a/sys-process/iotop/Manifest
+++ b/sys-process/iotop/Manifest
@@ -3,5 +3,5 @@ AUX iotop-0.6-Ignore-invalid-lines-in-proc-status-files.patch 2826 BLAKE2B bef78
 AUX iotop-0.6-Only-split-proc-status-lines-on-the-character.patch 984 BLAKE2B c43a4feaa7293b86454a96aaddbbc3c40c6a2afc2656448cc899230abc479d702adbc5785a818754214f7524bc499f4699ac1c841b7753601c9bcd89771440ec SHA512 291ed55dcebd988e0819f28805f12392bfff3ea0686cddebdb9bec8042f981c2d94c7ac3f8d9a4ba5e8611686129c47347bd1a9484ce82a2687c651007efb937
 AUX iotop-0.6-setup.py3.patch 1151 BLAKE2B da00d36a1778173e2d77041fec584aa1ff42062932915ff2a6beb9aaeda0699fdb6a6c9903eee56e10efb9ed9d6def08a8d7fbbe714def4e8bff4504500aa55e SHA512 6b97da5ef9e78c268193ce0270328f4c4d99d30f532fe68dac9bd033bb0a5e6cdb3145b53a7670c7babdae7f170473d1f9eb23137b5950fdaceadde266b4bb73
 DIST iotop-0.6.tar.bz2 29779 BLAKE2B 6c979f7beef4e9ec6536eb5ec113ab7089ccb0b8b00dfca6181408390584dac0eae18b110c3f4837a25defd7ab2c2e9d79f1f5cad762f97519e94847951f0037 SHA512 b1047da3bc46604447cc8ab22442a3a5381e1a79a6b176fe9ee8402ee5cebb959205407a6aeaffccccde9d2f67624ff8ee6717b051838f13ab88bf3a16db3ab9
-EBUILD iotop-0.6.ebuild 950 BLAKE2B 806f41ea05a07d6b1db27a5b659948b3f87115d7bb9959eb985ccf9c6309094fdb123e7fe5b20206d0d9a780bac05a0436ef793d1af6177aa8a9a2d0b75451e5 SHA512 c3bfcbdac34a70631a77779979715c368a7895819b382b7d625cf748d459503ef2242a7b10b29ecc8678381da9a2fe300588b89865ad3898be7ddf454ac86558
+EBUILD iotop-0.6.ebuild 953 BLAKE2B 703f679633677cfaf9265589df0eba4ddba9a6e0efa0f920daee3b729d753f0ca85ad30cd54a272f2a10f0d8b674f60cd7c279438f11505d31777d952319e929 SHA512 636f2b4c8988392fb9b8f1656d2d23b95874e703436065ffb055257feeabacb3ed68860d288a68b6369e4c832c1cfe45d1278034e086dfef5da03db47cb31678
 MISC metadata.xml 359 BLAKE2B d2fa2d7b93eeb82a5494f0c92270a512083e71b60699ebdd9b860560796b21e94e77be8c5af0dcd4533bc3b6a4bc173d72cef1d5da736f7b948c83982ef91489 SHA512 12f1f2e8971ea7d83248c637e6128be106087f733af8625fea8dd7ad9c891ef38ea0eda8ed7f6cfe96a4c0b795a799c1b51301e0ae424898c413a354305c7852
diff --git a/sys-process/iotop/iotop-0.6.ebuild b/sys-process/iotop/iotop-0.6.ebuild
index fab019bffe28..3b4c580f100a 100644
--- a/sys-process/iotop/iotop-0.6.ebuild
+++ b/sys-process/iotop/iotop-0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="ncurses(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -15,7 +15,7 @@ SRC_URI="http://guichaz.free.fr/iotop/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS"