gentoo resync : 24.12.2018

3 files changed, 2 insertions, 86 deletions

diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index b3df4c881294..d824bf2d8c47 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,7 +1,5 @@
 DIST Glances-2.11.1.tar.gz 5665685 BLAKE2B 5de75e7770cc01a0ddd6fcb0583e5d23c02e5188c7d6cbd55d2999be9321a1affda351094b8614d206e640e5a1338266b5c77629ec53bb280b9166f7b6a996e2 SHA512 99adccff7d1531760834b76f9a9525df0bf9a8f6f57dbd1f7c3c0515ba3b5c94f26172e19bbc7c93cecbe4bdebcca87ab3a11dd592259509eff85346780ef43a
-DIST Glances-3.0.1.tar.gz 6247919 BLAKE2B 15c59c76037d0e268687762b7539deab0a40748c27837177aa59d97c551471694e5bef6caebc818b4d17e1e5aef5c7cfccbd671e4821446b3bc9175a7ad240ea SHA512 e035de66572facffb2f4ffd85cbb23bf035128ccfb3b31b22deee779b8d7c4606e390fa7c7eeb6421375fbfbdfc451f8d9f112cbf94f36092f2e6997f8cbe9d3
 DIST Glances-3.0.2.tar.gz 6248035 BLAKE2B 1f26788d1b1b66899bcbff8478cea75c8cc376a946b20299243f6f48aee59529560863eed329f10b58650b467a2c3032a1df613d5a8b5ea1e71085b3c0222a62 SHA512 db0ec256e2ae371db8840e7e51f0395a581efa89ab233bbaa219d5c138e751373aa79afd4de6120dd0085cd3305397c84435f22068b186e4a1d5fe83fae9d914
 EBUILD glances-2.11.1.ebuild 2427 BLAKE2B 65fb327b29fdb66c8c6a39abc446cfc972008b4b7b166408b1bda1f84701eefe058d6e6786fd742bcc90df3f8fb7a7970e1b01adc9ab81ac20720a64f77069cc SHA512 e0dde60b0554d30a79e3b14391b131ccb9510d1cdd2feb21b84009dc4f457d1f372c32db633f97f0cbe500d8e270dab801d3fb535757a97ecf7034abf39de7fa
-EBUILD glances-3.0.1.ebuild 2427 BLAKE2B 3d7379de31a5ea9937f62dcd5e6ad032470f14fe418be4b9a802b4f0a0f6c4f29098c24e6ee8bc63f1107c265897bc1f81c69a1c6d3a3143fc7abc030ffcc175 SHA512 5afcbe5d815a5d833907675afda4d3856b9cd0d982ff60ca7467f3a3937926a879bdda6ebd5229d983a70903e25646f07496bc50499d55a202259ac0904f8795
-EBUILD glances-3.0.2.ebuild 2427 BLAKE2B 3d7379de31a5ea9937f62dcd5e6ad032470f14fe418be4b9a802b4f0a0f6c4f29098c24e6ee8bc63f1107c265897bc1f81c69a1c6d3a3143fc7abc030ffcc175 SHA512 5afcbe5d815a5d833907675afda4d3856b9cd0d982ff60ca7467f3a3937926a879bdda6ebd5229d983a70903e25646f07496bc50499d55a202259ac0904f8795
+EBUILD glances-3.0.2.ebuild 2426 BLAKE2B 0ec19460fa44bbad0ee133320cabfb15f8b0599dbb9eab99dc8034a59083a2eedbd879aa7a6f96080cf148f75f206be212834910a59c21633d8c9a902a128478 SHA512 67378348f4936cf9391afc89d126ae1e94c0758cb919d7e69660954abbf2f6aadfdf7f0960975cfcf339e305338031370a223bf57bba063d21a4d380b1b8ea42
 MISC metadata.xml 493 BLAKE2B 97c23025c2d239873dbdea975ab7d559895eb7373fab2bf0f47020890f5127f12bc3a5b5adc98f0538e4854886fb9ad1a4b20e2781abfb1832de9a6a436a4fe5 SHA512 10c02f8acca9afc8d09ac4ad42e8ae3f30d956fcc6ffb065feb3d43a5de8f5039d5da1115db3ada249b59993c3e4b18ea47f3178013710507b29b9cc0ccb6bec
diff --git a/sys-process/glances/glances-3.0.1.ebuild b/sys-process/glances/glances-3.0.1.ebuild
deleted file mode 100644
index 8d9c095beb96..000000000000
--- a/sys-process/glances/glances-3.0.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,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-5.4.3[${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.0.2.ebuild b/sys-process/glances/glances-3.0.2.ebuild
index 8d9c095beb96..1a06e3ac70cc 100644
--- a/sys-process/glances/glances-3.0.2.ebuild
+++ b/sys-process/glances/glances-3.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="