1 |
commit: 6aa3a4ed37e4a477fdc200e2e50176e8477cf8b9 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 28 08:21:08 2019 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 28 08:23:59 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aa3a4ed |
7 |
|
8 |
sys-process/glances: bump to 3.1.3 |
9 |
|
10 |
EAPI=7 |
11 |
new distutils magic for simpler ebuild |
12 |
|
13 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
14 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
15 |
|
16 |
sys-process/glances/Manifest | 1 + |
17 |
sys-process/glances/files/3.1.3-fix-test.patch | 28 +++++++++ |
18 |
sys-process/glances/glances-3.1.3.ebuild | 83 ++++++++++++++++++++++++++ |
19 |
3 files changed, 112 insertions(+) |
20 |
|
21 |
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest |
22 |
index d71fbb42e35..37e30b9d8a2 100644 |
23 |
--- a/sys-process/glances/Manifest |
24 |
+++ b/sys-process/glances/Manifest |
25 |
@@ -2,3 +2,4 @@ DIST Glances-2.11.1.tar.gz 5665685 BLAKE2B 5de75e7770cc01a0ddd6fcb0583e5d23c02e5 |
26 |
DIST glances-3.1.0.tar.gz 6688798 BLAKE2B 9ae2e6a4944d1af871b88ea325bc23cad24f11e70ff4871eeb6e4a510eb3a1e6f03fa5fa2cfde30d8b9aa0c32137aacb51d2dcb335c7ee6729e8d5913ec4e999 SHA512 a888cafa5987ab7a88caa0248e0cb3d9f65466d71ee8f1ca63565c5a8a59282be77c14f29afb2302fba0e79294c39e96384791cd89d23aa7727bfd4f20e2814d |
27 |
DIST glances-3.1.1.tar.gz 6737781 BLAKE2B ffd20d6ee994428dccb9b4aea481c9c3f618f0f7895098ff9be3cda206c1dc82b924eef002d13d9a93b53c28ba4faa8d88cfdb5f0691097cf31d89b7e3237d50 SHA512 d42ced74c9dc5150ff7242b61aaba94fd6009e150f637cadd4b6c9a7fc7b8028ea2e8835ae0ecf66bd12321cbc3f68e75cd526c97f5aecad6cf6df578e1b222f |
28 |
DIST glances-3.1.2.tar.gz 6740649 BLAKE2B 109ce18d045aafd921ccfff64aaab12a8106fbf44bb8a1ca352d544244d5fcf911f85158964c84142e279112e8add3f7bbcc1eff22fb5b3e05b40c94d13e960e SHA512 f9b839532d2b53edb9dfeac9abe8f5a9e314b7bdf34e54083614c02262bb15f0db745762f06b609071d2a6fead8b52eed16b6f5a569904ef56dafb41b85b991b |
29 |
+DIST glances-3.1.3.tar.gz 6759527 BLAKE2B 6f164dde0c67d58d32495b7b9b331255b3c599784518c92e3a2a456a1de9ddece8342e846923a7d6d3b6965ce5dd283f3f8eae5351bdfd8b1eda1b7969609c6e SHA512 7fcbfff9e94721de2dba5ce2e7a2899fab877283819dedd8e1d8c868f4fd6cb584887979379f7b7a50c0f3b2fec1e147db06afff267a8e8fa40ba189246beb79 |
30 |
|
31 |
diff --git a/sys-process/glances/files/3.1.3-fix-test.patch b/sys-process/glances/files/3.1.3-fix-test.patch |
32 |
new file mode 100644 |
33 |
index 00000000000..5e087ce96ba |
34 |
--- /dev/null |
35 |
+++ b/sys-process/glances/files/3.1.3-fix-test.patch |
36 |
@@ -0,0 +1,28 @@ |
37 |
+From abf64ffde31113f5f46ef286703ff061fc57395f Mon Sep 17 00:00:00 2001 |
38 |
+From: nicolargo <nicolas@×××××××××.com> |
39 |
+Date: Sat, 12 Oct 2019 11:45:36 +0200 |
40 |
+Subject: [PATCH] Correct unitest |
41 |
+ |
42 |
+--- |
43 |
+ glances/plugins/glances_plugin.py | 7 ++++--- |
44 |
+ 1 file changed, 4 insertions(+), 3 deletions(-) |
45 |
+ |
46 |
+diff --git a/glances/plugins/glances_plugin.py b/glances/plugins/glances_plugin.py |
47 |
+index 6a1c8606..23a76f80 100644 |
48 |
+--- a/glances/plugins/glances_plugin.py |
49 |
++++ b/glances/plugins/glances_plugin.py |
50 |
+@@ -86,10 +86,11 @@ def __init__(self, |
51 |
+ self.stats_history = self.init_stats_history() |
52 |
+ |
53 |
+ # Init the limits (configuration keys) dictionnary |
54 |
+- logger.debug('Load section {} in {}'.format(self.plugin_name, |
55 |
+- config.config_file_paths())) |
56 |
+ self._limits = dict() |
57 |
+- self.load_limits(config=config) |
58 |
++ if config is not None: |
59 |
++ logger.debug('Load section {} in {}'.format(self.plugin_name, |
60 |
++ config.config_file_paths())) |
61 |
++ self.load_limits(config=config) |
62 |
+ |
63 |
+ # Init the actions |
64 |
+ self.actions = GlancesActions(args=args) |
65 |
|
66 |
diff --git a/sys-process/glances/glances-3.1.3.ebuild b/sys-process/glances/glances-3.1.3.ebuild |
67 |
new file mode 100644 |
68 |
index 00000000000..123e7d05a15 |
69 |
--- /dev/null |
70 |
+++ b/sys-process/glances/glances-3.1.3.ebuild |
71 |
@@ -0,0 +1,83 @@ |
72 |
+# Copyright 1999-2019 Gentoo Authors |
73 |
+# Distributed under the terms of the GNU General Public License v2 |
74 |
+ |
75 |
+EAPI=7 |
76 |
+ |
77 |
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
78 |
+PYTHON_REQ_USE="ncurses" |
79 |
+ |
80 |
+inherit distutils-r1 eutils linux-info |
81 |
+ |
82 |
+DESCRIPTION="CLI curses based monitoring tool" |
83 |
+HOMEPAGE="https://github.com/nicolargo/glances" |
84 |
+SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
85 |
+ |
86 |
+LICENSE="LGPL-3" |
87 |
+SLOT="0" |
88 |
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
89 |
+IUSE="" |
90 |
+ |
91 |
+RDEPEND="dev-python/future[${PYTHON_USEDEP}] |
92 |
+ >=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]" |
93 |
+ |
94 |
+CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS" |
95 |
+ |
96 |
+PATCHES=( "${FILESDIR}/${PV}-fix-test.patch" ) |
97 |
+ |
98 |
+distutils_enable_tests unittest |
99 |
+distutils_enable_sphinx docs --no-autodoc |
100 |
+ |
101 |
+pkg_setup() { |
102 |
+ echo $DISTUTILS_USE_SETUPTOOLS |
103 |
+ linux-info_pkg_setup |
104 |
+} |
105 |
+ |
106 |
+python_prepare_all() { |
107 |
+ # Remove duplicate entries of a prebuilt doc build and |
108 |
+ # ensure install of the file glances.conf in /etc/${PN} |
109 |
+ sed \ |
110 |
+ -e '/share\/doc\/glances/d' \ |
111 |
+ -e "s/'CONTRIBUTING.md',//" \ |
112 |
+ -e "s:'conf/glances.conf':('${EPREFIX}/etc/glances', ['conf/glances.conf':g" \ |
113 |
+ -i setup.py || die |
114 |
+ |
115 |
+ distutils-r1_python_prepare_all |
116 |
+} |
117 |
+ |
118 |
+python_install_all() { |
119 |
+ # add an intended file from original data set from setup.py to DOCS |
120 |
+ local DOCS=( README.rst CONTRIBUTING.md conf/glances.conf ) |
121 |
+ distutils-r1_python_install_all |
122 |
+} |
123 |
+ |
124 |
+pkg_postinst() { |
125 |
+ optfeature "Action script feature" dev-python/pystache |
126 |
+ optfeature "Autodiscover mode" dev-python/zeroconf |
127 |
+ optfeature "Cloud support" dev-python/requests |
128 |
+ optfeature "Quicklook CPU info" dev-python/py-cpuinfo |
129 |
+ optfeature "Docker monitoring support" dev-python/docker-py |
130 |
+ #optfeature "Export module" \ |
131 |
+ # unpackaged/bernhard \ |
132 |
+ # unpackaged/cassandra-driver \ |
133 |
+ # unpackaged/potsdb \ |
134 |
+ # dev-python/couchdb-python \ |
135 |
+ # dev-python/elasticsearch-py \ |
136 |
+ # dev-python/influxdb \ |
137 |
+ # dev-python/kafka-python \ |
138 |
+ # dev-python/pika \ |
139 |
+ # dev-python/paho-mqtt \ |
140 |
+ # dev-python/prometheus_client \ |
141 |
+ # dev-python/pyzmq \ |
142 |
+ # dev-python/statsd |
143 |
+ optfeature "Folder monitoring" dev-python/scandir |
144 |
+ #optfeature "Nvidia GPU monitoring" unpackaged/nvidia-ml-py3 |
145 |
+ optfeature "SVG graph support" dev-python/pygal |
146 |
+ optfeature "IP plugin" dev-python/netifaces |
147 |
+ optfeature "RAID monitoring" dev-python/pymdstat |
148 |
+ #optfeature "SMART support" unpackaged/pySMART.smartx |
149 |
+ optfeature "RAID support" dev-python/pymdstat |
150 |
+ optfeature "SNMP support" dev-python/pysnmp |
151 |
+ #optfeature "sparklines plugin" unpackaged/sparklines |
152 |
+ optfeature "Web server mode" dev-python/bottle dev-python/requests |
153 |
+ optfeature "WIFI plugin" net-wireless/python-wifi |
154 |
+} |