gentoo resync : 19.07.2019

2 files changed, 39 insertions, 25 deletions

diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 08290b88b740..6335c7631d41 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,7 +1,7 @@
 DIST Glances-2.11.1.tar.gz 5665685 BLAKE2B 5de75e7770cc01a0ddd6fcb0583e5d23c02e5188c7d6cbd55d2999be9321a1affda351094b8614d206e640e5a1338266b5c77629ec53bb280b9166f7b6a996e2 SHA512 99adccff7d1531760834b76f9a9525df0bf9a8f6f57dbd1f7c3c0515ba3b5c94f26172e19bbc7c93cecbe4bdebcca87ab3a11dd592259509eff85346780ef43a
-DIST Glances-3.0.2.tar.gz 6248035 BLAKE2B 1f26788d1b1b66899bcbff8478cea75c8cc376a946b20299243f6f48aee59529560863eed329f10b58650b467a2c3032a1df613d5a8b5ea1e71085b3c0222a62 SHA512 db0ec256e2ae371db8840e7e51f0395a581efa89ab233bbaa219d5c138e751373aa79afd4de6120dd0085cd3305397c84435f22068b186e4a1d5fe83fae9d914
 DIST glances-3.1.0.tar.gz 6688798 BLAKE2B 9ae2e6a4944d1af871b88ea325bc23cad24f11e70ff4871eeb6e4a510eb3a1e6f03fa5fa2cfde30d8b9aa0c32137aacb51d2dcb335c7ee6729e8d5913ec4e999 SHA512 a888cafa5987ab7a88caa0248e0cb3d9f65466d71ee8f1ca63565c5a8a59282be77c14f29afb2302fba0e79294c39e96384791cd89d23aa7727bfd4f20e2814d
+DIST glances-3.1.1.tar.gz 6737781 BLAKE2B ffd20d6ee994428dccb9b4aea481c9c3f618f0f7895098ff9be3cda206c1dc82b924eef002d13d9a93b53c28ba4faa8d88cfdb5f0691097cf31d89b7e3237d50 SHA512 d42ced74c9dc5150ff7242b61aaba94fd6009e150f637cadd4b6c9a7fc7b8028ea2e8835ae0ecf66bd12321cbc3f68e75cd526c97f5aecad6cf6df578e1b222f
 EBUILD glances-2.11.1.ebuild 2422 BLAKE2B 823c3d94cf61f8d7a430d69822b51197757aae76355769241e5306db2ad5e45efaf3e52a31ccbc233d0013889b206c50deeb63c7d987ee9ccd86dec2b5006b2e SHA512 a6a8e69cea51daec3426ff7bb26f0653c88f82d84350cb5177a4fbfb9166cf92688dd9d65552e5c74111b6ec43afab1a170882ca76e31505ca69c49cdc2a5535
-EBUILD glances-3.0.2.ebuild 2424 BLAKE2B d2b336478529182e44135730a64e28d2e6b8cd2cb8858ee964e651966bf671d905b26930200613749a64f12b44a30890b6522503e1eb56c5e81a0453d8899edc SHA512 153dff4d314c28efa9b4de4933f45b0457b4999899111f84f8647438d824ac8baf511591af3584e0352078f711a34c682d9ac22f3e0cab8f4f882f5c18727029
 EBUILD glances-3.1.0.ebuild 2666 BLAKE2B 428fd07a27872326a4ffedded04a25b24ae09bb0f93f81cdccaee69ab0b8f82b2c7b76b5b52f3c459f177d6af61635212c9b630afa3d699ec2cde159f819c488 SHA512 32eced872c4e2322b606f64db4798f973bbeafecda0f20aa14b525d6aaf32c4ff8837681b5ae3e889400fafbe45733e15f11f48435d51dc4eabc610a133d44ee
+EBUILD glances-3.1.1.ebuild 2759 BLAKE2B 9dcbe39e40359fecc84a27eca3986b1999ce8ff044494ca075a0abdc68b728bd89f8ba008bebde189ef383445464f419f754e4c688657003d8a827c67e95bcf1 SHA512 f4734856e1ea7525bfcfd1940eb0e35065a3cfd65d521ea577d2485adb07d964a2d951f4b651a89653aba6d8badc3c2e6d3805e34f5a47954d9fbc9397996d9c
 MISC metadata.xml 493 BLAKE2B 97c23025c2d239873dbdea975ab7d559895eb7373fab2bf0f47020890f5127f12bc3a5b5adc98f0538e4854886fb9ad1a4b20e2781abfb1832de9a6a436a4fe5 SHA512 10c02f8acca9afc8d09ac4ad42e8ae3f30d956fcc6ffb065feb3d43a5de8f5039d5da1115db3ada249b59993c3e4b18ea47f3178013710507b29b9cc0ccb6bec
diff --git a/sys-process/glances/glances-3.0.2.ebuild b/sys-process/glances/glances-3.1.1.ebuild
index c805552041d8..3b83d26080fc 100644
--- a/sys-process/glances/glances-3.0.2.ebuild
+++ b/sys-process/glances/glances-3.1.1.ebuild
@@ -3,34 +3,33 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,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="mirror://pypi/G/${PN^}/${P^}.tar.gz"
+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"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
 
-DEPEND="
+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}]
 	)
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}
-	>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
+	test? ( ${RDEPEND} )
+"
 
 CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
 
-S="${WORKDIR}/${P^}"
-
 pkg_setup() {
 	linux-info_pkg_setup
 }
@@ -60,23 +59,38 @@ python_install_all() {
 	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 "Battery monitoring support" dev-python/batinfo
+	optfeature "Cloud support" dev-python/requests
+	optfeature "Quicklook CPU info" dev-python/py-cpuinfo
 	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 "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 "InfluxDB export module" dev-python/influxdb
-	optfeature "Hard drive temperature monitoring" app-admin/hddtemp
-	optfeature "Quicklook CPU info" dev-python/py-cpuinfo
+	optfeature "RAID monitoring" dev-python/pymdstat
+	#optfeature "SMART support" unpackaged/pySMART.smartx
 	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
+	#optfeature "sparklines plugin" unpackaged/sparklines
+	optfeature "Web server mode" dev-python/bottle dev-python/requests
+	optfeature "WIFI plugin" net-wireless/python-wifi
 }