gentoo resync : 14.05.2020

6 files changed, 3 insertions, 319 deletions

diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index a9a107be669d..0f19390c6e7c 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,15 +1,8 @@
-AUX 3.1.3-fix-test.patch 1179 BLAKE2B b77a278b764bc03e2ba3ff7d8562b1b4e160e3825872e565549e7de56e72d9f9d8bc9edc5c1c5949b3af31c8982132430e7e97e5c2eae863c1aad4884036a5a8 SHA512 a9973b1635cde6f5de406497e2c6921011fff502d46f43be4fef25f6ad20ecc0538e3a03b06eb3da8f897d212bd9ec0f967ded7e806cad9c92d3ee61ebb03477
 AUX disable-update-check.patch 992 BLAKE2B d06bc123aef2aec89bb4cca40334183aa5b6d198fcf9abffd15ad60f1c7c43f1e9a3103ebb5f2f743c83cc9d09cdf610c4e5d5caea89523f9ed37f3a4801e774 SHA512 02b06b01f8e3782da632677aa84b9131cb33dae3270677a1a4b0af3c139d100fa54c90c412d1e608e08859facb31e04768927e4862cfc4d9cfcbd061020a5dac
 DIST Glances-2.11.1.tar.gz 5665685 BLAKE2B 5de75e7770cc01a0ddd6fcb0583e5d23c02e5188c7d6cbd55d2999be9321a1affda351094b8614d206e640e5a1338266b5c77629ec53bb280b9166f7b6a996e2 SHA512 99adccff7d1531760834b76f9a9525df0bf9a8f6f57dbd1f7c3c0515ba3b5c94f26172e19bbc7c93cecbe4bdebcca87ab3a11dd592259509eff85346780ef43a
 DIST glances-3.1.0.tar.gz 6688798 BLAKE2B 9ae2e6a4944d1af871b88ea325bc23cad24f11e70ff4871eeb6e4a510eb3a1e6f03fa5fa2cfde30d8b9aa0c32137aacb51d2dcb335c7ee6729e8d5913ec4e999 SHA512 a888cafa5987ab7a88caa0248e0cb3d9f65466d71ee8f1ca63565c5a8a59282be77c14f29afb2302fba0e79294c39e96384791cd89d23aa7727bfd4f20e2814d
-DIST glances-3.1.1.tar.gz 6737781 BLAKE2B ffd20d6ee994428dccb9b4aea481c9c3f618f0f7895098ff9be3cda206c1dc82b924eef002d13d9a93b53c28ba4faa8d88cfdb5f0691097cf31d89b7e3237d50 SHA512 d42ced74c9dc5150ff7242b61aaba94fd6009e150f637cadd4b6c9a7fc7b8028ea2e8835ae0ecf66bd12321cbc3f68e75cd526c97f5aecad6cf6df578e1b222f
-DIST glances-3.1.2.tar.gz 6740649 BLAKE2B 109ce18d045aafd921ccfff64aaab12a8106fbf44bb8a1ca352d544244d5fcf911f85158964c84142e279112e8add3f7bbcc1eff22fb5b3e05b40c94d13e960e SHA512 f9b839532d2b53edb9dfeac9abe8f5a9e314b7bdf34e54083614c02262bb15f0db745762f06b609071d2a6fead8b52eed16b6f5a569904ef56dafb41b85b991b
-DIST glances-3.1.3.tar.gz 6759527 BLAKE2B 6f164dde0c67d58d32495b7b9b331255b3c599784518c92e3a2a456a1de9ddece8342e846923a7d6d3b6965ce5dd283f3f8eae5351bdfd8b1eda1b7969609c6e SHA512 7fcbfff9e94721de2dba5ce2e7a2899fab877283819dedd8e1d8c868f4fd6cb584887979379f7b7a50c0f3b2fec1e147db06afff267a8e8fa40ba189246beb79
 DIST glances-3.1.4.1.tar.gz 6802041 BLAKE2B 7e27811e4721f9089e88bb2375f5b58104bdcb9a890bff4cb207800f49eaf320fa1bd777a2de1a7ce50744df2b4b79973823f9aee52a291e1af6788c95c359b0 SHA512 8e15149bde87d14d8176fe247e911a04b24900a95917e5711dfc8764ecec3238f696eea08c36bc59f68a4702e028909150e3318907f11fc53c5cc56441870ff3
 EBUILD glances-2.11.1.ebuild 2412 BLAKE2B a28fd1db66dfe73a828b4484a5bf29343ac94e52c3bcd0f3638c6527607d88f1b102102e8dd5bc7c26162050741fef337137772f456d5bea86d45cf6adfba6c1 SHA512 ef0e0bda136272a4f464b143f8ab78f5f2ef7d10ce7888847256a4f780ba4e14cfec9b0f927b400f43804323f12a32a755cd0efda8d218a546702ad572a3d58e
 EBUILD glances-3.1.0.ebuild 2685 BLAKE2B 24e18aa057e732fd6dbe5bb8f7a8e19b55a17d20f1c627fa52d353db1b4a2fca4a2f1d9ab957ac0658dc01cf253831b8801e15342da665072f459b85a575802f SHA512 d47d0700de1cbf4b2ba32e9b72f2dea4792d1bcaea7efb5869d9a0d39211845917712123c377767a4164194b9c9689806cb74123bac7d168345678656878a5ff
-EBUILD glances-3.1.1.ebuild 2778 BLAKE2B 3648c511ac03c01a8210571b3678811e45bc3baaff1567946ee22ede33b717f12fd24d673db5af2b1f0b32cd2dc51dd36e734cf3815656babc791fbb7378a5fc SHA512 dcbf7a9c7ef3159f87cb46113f9aae1a6b6a888ef52d719c63550d8b01b075227c52d56e6503aae161fa69ec3d66e696a1503a0895f087904749310e0e533003
-EBUILD glances-3.1.2.ebuild 2785 BLAKE2B 3684fd69f5c4fa4fa735114d37f1fb40b4e9704e66bf5d1e110cd488a31e9e08ea888b72e218b9573fd8c03447ce690e9b021dd749b7b54579537fff5b71e944 SHA512 08aff29c4db4b77706119f76a095813c246f15ef08539f4c87449f045e962a10748e0db83849faf63742fbdd87d687c433df23d855e56285a2e809373abd914c
-EBUILD glances-3.1.3-r1.ebuild 2634 BLAKE2B b21c93090dab1d65a847af970ef31aa1171a3081123b6c138e1a0e97c4debda283709163d6914669af106e41d9b5ac3599cb2483d502677e3c480e40681d8360 SHA512 da2a6f3c71e95520ac19153dd175939a088e23758df495cf9f85f8c0d36991d4938bd4cac48939225aca7b2e409f03bf8246af12d3f87731e15f19756944f7c6
-EBUILD glances-3.1.4.1.ebuild 2582 BLAKE2B 42ca9218aa8ebed23a81c395e92ed59bb1f3016fbac168e819aa7ebc3fb0eb647c292c707a6556b3c82d28c4aee3682cb7d2bddd6b3e6022e8af8f9f6a227f4c SHA512 08a6bc049bb8e9e9bbc0d7735d4cdd616f1b8e97defeaa2b0f95fcdb438d9535bce90c174d2ca7ae5a0ae21ffd90f8070772fb436524f4716d79d07b34b3c4ac
+EBUILD glances-3.1.4.1.ebuild 2596 BLAKE2B 7462115949d0b632e3f877cbbb3ed20c3271190c9f93c40547ba4341d8fdd86d9837c67a4f220d10b38a004f1a338ae79ac3fd457b6bc40acceef42d58680c89 SHA512 f2cdca28a6995ee65d32c5262e4b8e85b9f44ca47e791ed7b963263d43fac5472e3983325ed811c3ba58de0f21a948e5c882047c260272814b017a6f6a2ac904
 MISC metadata.xml 856 BLAKE2B e3d750f1586383ffabb204739bd0636a1b7729b4b704f03f03b356afd540482571780aa4de84620ac2aa4e832e4250867228e59cb5ed3f0f6867e7bc65104246 SHA512 8315a7896acc1068a2f7a6efa2a99078090677f685a90bd2c5220c043fd25e03d137ea0aeea1cd3660544f139970508037e9447cfb08d82fdb4023c856709e73
diff --git a/sys-process/glances/files/3.1.3-fix-test.patch b/sys-process/glances/files/3.1.3-fix-test.patch
deleted file mode 100644
index 5e087ce96ba1..000000000000
--- a/sys-process/glances/files/3.1.3-fix-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From abf64ffde31113f5f46ef286703ff061fc57395f Mon Sep 17 00:00:00 2001
-From: nicolargo <nicolas@nicolargo.com>
-Date: Sat, 12 Oct 2019 11:45:36 +0200
-Subject: [PATCH] Correct unitest
-
----
- glances/plugins/glances_plugin.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/glances/plugins/glances_plugin.py b/glances/plugins/glances_plugin.py
-index 6a1c8606..23a76f80 100644
---- a/glances/plugins/glances_plugin.py
-+++ b/glances/plugins/glances_plugin.py
-@@ -86,10 +86,11 @@ def __init__(self,
-         self.stats_history = self.init_stats_history()
- 
-         # Init the limits (configuration keys) dictionnary
--        logger.debug('Load section {} in {}'.format(self.plugin_name,
--                                                    config.config_file_paths()))
-         self._limits = dict()
--        self.load_limits(config=config)
-+        if config is not None:
-+            logger.debug('Load section {} in {}'.format(self.plugin_name,
-+                                                        config.config_file_paths()))
-+            self.load_limits(config=config)
- 
-         # Init the actions
-         self.actions = GlancesActions(args=args)
diff --git a/sys-process/glances/glances-3.1.1.ebuild b/sys-process/glances/glances-3.1.1.ebuild
deleted file mode 100644
index 62bac630f411..000000000000
--- a/sys-process/glances/glances-3.1.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 eutils linux-info
-
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? ( ${RDEPEND} )
-"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-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
-
-	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 )
-	# build docs
-	if use doc; then
-		pushd docs
-		make html
-		popd
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	esetup.py test
-}
-
-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 "Folder monitoring" dev-python/scandir
-	#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.2.ebuild b/sys-process/glances/glances-3.1.2.ebuild
deleted file mode 100644
index a1f55c2e4112..000000000000
--- a/sys-process/glances/glances-3.1.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 eutils linux-info
-
-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 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? ( ${RDEPEND} )
-"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-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
-
-	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 )
-	# build docs
-	if use doc; then
-		pushd docs
-		make html
-		popd
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	esetup.py test
-}
-
-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 "Folder monitoring" dev-python/scandir
-	#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.3-r1.ebuild b/sys-process/glances/glances-3.1.3-r1.ebuild
deleted file mode 100644
index d2dc37e71e99..000000000000
--- a/sys-process/glances/glances-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 eutils linux-info
-
-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 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-PATCHES=(
-	"${FILESDIR}/disable-update-check.patch"
-	"${FILESDIR}/${PV}-fix-test.patch"
-)
-
-distutils_enable_tests setup.py
-distutils_enable_sphinx docs --no-autodoc
-
-pkg_setup() {
-	echo $DISTUTILS_USE_SETUPTOOLS
-	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
-
-	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 "Folder monitoring" dev-python/scandir
-	#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.4.1.ebuild b/sys-process/glances/glances-3.1.4.1.ebuild
index 1c5db5097fcf..0f363179037f 100644
--- a/sys-process/glances/glances-3.1.4.1.ebuild
+++ b/sys-process/glances/glances-3.1.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/future[${PYTHON_USEDEP}]
@@ -31,7 +31,6 @@ distutils_enable_tests setup.py
 distutils_enable_sphinx docs --no-autodoc
 
 pkg_setup() {
-	echo $DISTUTILS_USE_SETUPTOOLS
 	linux-info_pkg_setup
 }
 
@@ -43,7 +42,7 @@ python_prepare_all() {
 		-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
 }