gentoo resync : 02.09.2020

3 files changed, 21 insertions, 113 deletions

diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 9a3cc2e265b5..4bcc514ab588 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-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.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
+DIST glances-3.1.5.tar.gz 6804549 BLAKE2B a3bc71205110b0bfc285f009bbf1dea95f93a8621ca5b3c7768a1eee2af939a3605b2ec43b07da7abde079f89f4ebfe06dbaac2433de7e0379749bb001ac6d34 SHA512 20a2bc446f482506b847dd252c52edc9dcce501361742acde92d3f8a6e30e9386c8bc8c28387e981c5767e9c1fb88eba1858e243c2732e9fc4b5d64f643febd6
 EBUILD glances-3.1.4.1-r1.ebuild 2676 BLAKE2B 13c938510e7d7daab5c07184ba64cdf1a7f5507eab3551c5ce151328a6a2ac9b3379c43122d945f698f578ebf3f1e8b53f11033c1fd552a89ed95a0330bc9711 SHA512 aae1b61a2152234744f50c2c012ddcbdec3268b8851953db59db4374c5b90bd6f39a755e1893752c8ab8945dba0b36828283510a25148720935bee02b2d8226e
+EBUILD glances-3.1.5.ebuild 2682 BLAKE2B a6ddb09aaa59a3aed2f4693a35ff13789a299a2845987bacf022c6c8179fc286d349b877bd2df630fdba374ef8d5060658bdffbbd93586964e0a370e655d1997 SHA512 80d42c466bcbf771938dc64653c99a381260891839b3187cf3c486b25359c543a9b12ca364db474799de08ce29943e92d3fa4ef69e7e1eb731eb931371b9f3e0
 MISC metadata.xml 856 BLAKE2B e3d750f1586383ffabb204739bd0636a1b7729b4b704f03f03b356afd540482571780aa4de84620ac2aa4e832e4250867228e59cb5ed3f0f6867e7bc65104246 SHA512 8315a7896acc1068a2f7a6efa2a99078090677f685a90bd2c5220c043fd25e03d137ea0aeea1cd3660544f139970508037e9447cfb08d82fdb4023c856709e73
diff --git a/sys-process/glances/glances-2.11.1.ebuild b/sys-process/glances/glances-2.11.1.ebuild
deleted file mode 100644
index 05a6e6d5793e..000000000000
--- a/sys-process/glances/glances-2.11.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 eutils linux-info
-
-DESCRIPTION="CLI curses based monitoring tool"
-HOMEPAGE="https://github.com/nicolargo/glances"
-SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}
-	>=dev-python/psutil-2.0.0[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-S="${WORKDIR}/${P^}"
-
-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
-}
-
-pkg_postinst() {
-	optfeature "Action script feature" dev-python/pystache
-	optfeature "Autodiscover mode" dev-python/zeroconf
-	optfeature "Battery monitoring support" dev-python/batinfo
-	optfeature "Docker monitoring support" dev-python/docker-py
-	optfeature "Graphical/chart support" dev-python/matplotlib
-	# https://bitbucket.org/gleb_zhulik/py3sensors
-	# optfeature "Hardware monitoring support" dev-python/py3sensors
-	optfeature "IP plugin" dev-python/netifaces
-	optfeature "InfluxDB export module" dev-python/influxdb
-	optfeature "Hard drive temperature monitoring" app-admin/hddtemp
-	optfeature "Quicklook CPU info" dev-python/py-cpuinfo
-	optfeature "RAID support" dev-python/pymdstat
-	optfeature "RabbitMQ/ActiveMQ export module" dev-python/pika
-	# https://github.com/banjiewen/bernhard
-	# optfeature "Riemann export" dev-python/bernhard
-	optfeature "SNMP support" dev-python/pysnmp
-	optfeature "StatsD export module" dev-python/statsd
-	optfeature "Web server mode" dev-python/bottle
-}
diff --git a/sys-process/glances/glances-3.1.0.ebuild b/sys-process/glances/glances-3.1.5.ebuild
index 8d44d6e568d8..ddac31590a0d 100644
--- a/sys-process/glances/glances-3.1.0.ebuild
+++ b/sys-process/glances/glances-3.1.5.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="ncurses"
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 eutils linux-info
 
@@ -14,22 +15,24 @@ 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 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
 
-RDEPEND=">=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
+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} )
-"
+# 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
 }
@@ -42,29 +45,18 @@ 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
 }
 
 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 "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
@@ -82,7 +74,6 @@ pkg_postinst() {
 	#	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
@@ -90,6 +81,7 @@ pkg_postinst() {
 	#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
 }