[gentoo-commits] repo/gentoo:master commit in: sys-process/glances/files/, sys-process/glances/

2023-06-10 Thread John Helmert III
commit: ff3f341b1fb892ce25cb18411bf580991dd80117
Author: John Helmert III  gentoo  org>
AuthorDate: Sat Jun 10 18:15:56 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sat Jun 10 18:18:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff3f341b

sys-process/glances: add 3.4.0.3

Port the update check patch forward, slide python targets window
forward.

Signed-off-by: John Helmert III  gentoo.org>

 sys-process/glances/Manifest   |  1 +
 .../glances-3.4.0.3-disable-update-check.patch | 40 ++
 sys-process/glances/glances-3.4.0.3.ebuild | 93 ++
 3 files changed, 134 insertions(+)

diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 0cfd26917886..e1f2ce1b624e 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1 +1,2 @@
 DIST glances-3.3.0.gh.tar.gz 6143830 BLAKE2B 
022a8bfc93f73f2c728af21553ca36535340129cc5fb6f539d6f282e9ffc7a2b88878c04345a47479241447c0f1329123f804677383688fa5857dd1a9978dc65
 SHA512 
ee238e39e69dce3e46df560f7be1287a87a0c9002242d7b381bc971e627a4c23f6102519d7f6864998adcc9be7cf8e68461579f2a88d15db86ad75878015a843
+DIST glances-3.4.0.3.gh.tar.gz 6472143 BLAKE2B 
5437d3daefd4d36e9b84481543cf8189964006d566a77506099bfe7748d37409d5fb2a3a8eb52c8eeef0efa469c2ca92db7a37a44625969aec822d1adf46dbb3
 SHA512 
f4960d7d23b52e249069b41fd9b20a4d6f56006a6998b1bfd341ef00628fa92c14503885ebbea6adeee6f926a6c6fb440c288e2c772d4536b2c2b49e4124a7a0

diff --git 
a/sys-process/glances/files/glances-3.4.0.3-disable-update-check.patch 
b/sys-process/glances/files/glances-3.4.0.3-disable-update-check.patch
new file mode 100644
index ..79391aca3e4f
--- /dev/null
+++ b/sys-process/glances/files/glances-3.4.0.3-disable-update-check.patch
@@ -0,0 +1,40 @@
+commit cf50275006e4bdd4a08c2235e688050a4a25a7a4
+Author: John Helmert III 
+Date:   Sat Jun 10 10:38:03 2023 -0700
+
+disable out-to-date runtime check
+
+Signed-off-by: John Helmert III 
+
+diff --git a/glances/standalone.py b/glances/standalone.py
+index 8ab60e8c..b1f8c454 100644
+--- a/glances/standalone.py
 b/glances/standalone.py
+@@ -105,9 +105,6 @@ class GlancesStandalone(object):
+ # Init screen
+ self.screen = GlancesCursesStandalone(config=config, args=args)
+ 
+-# Check the latest Glances version
+-self.outdated = Outdated(config=config, args=args)
+-
+ @property
+ def quiet(self):
+ return self._quiet
+@@ -186,17 +183,3 @@ class GlancesStandalone(object):
+ 
+ # Exit from export modules
+ self.stats.end()
+-
+-# Check Glances version versus PyPI one
+-if self.outdated.is_outdated():
+-print(
+-"You are using Glances version {}, however version {} is 
available.".format(
+-self.outdated.installed_version(), 
self.outdated.latest_version()
+-)
+-)
+-print("You should consider upgrading using: pip install --upgrade 
glances")
+-print("Disable this warning temporarily using: glances 
--disable-check-update")
+-print(
+-"To disable it permanently, refer config reference at "
+-"https://glances.readthedocs.io/en/latest/config.html#syntax;
+-)

diff --git a/sys-process/glances/glances-3.4.0.3.ebuild 
b/sys-process/glances/glances-3.4.0.3.ebuild
new file mode 100644
index ..d09170272d3e
--- /dev/null
+++ b/sys-process/glances/glances-3.4.0.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE="ncurses"
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 linux-info optfeature
+
+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}.gh.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+   $(python_gen_cond_dep '
+   dev-python/defusedxml[${PYTHON_USEDEP}]
+   dev-python/packaging[${PYTHON_USEDEP}]
+   >=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]
+   dev-python/ujson[${PYTHON_USEDEP}]
+   ')
+"
+
+# PYTHON_USEDEP omitted on purpose
+BDEPEND="doc? ( dev-python/sphinx-rtd-theme )"
+
+CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.4.0.3-disable-update-check.patch"
+)
+
+distutils_enable_tests setup.py
+distutils_enable_sphinx docs --no-autodoc
+
+pkg_setup() {
+   linux-info_pkg_setup
+   python-single-r1_pkg_setup
+}
+
+python_prepare_all() {
+   # Remove duplicate entries of a prebuilt doc build and
+   # ensure install of the file glances.conf in 

[gentoo-commits] repo/gentoo:master commit in: sys-process/glances/files/, sys-process/glances/

2022-10-21 Thread John Helmert III
commit: e9190b5e72e5f6feaa7053fd04369b9a86b1f429
Author: John Helmert III  gentoo  org>
AuthorDate: Fri Oct 21 04:43:09 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Fri Oct 21 06:04:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9190b5e

sys-process/glances: drop 3.2.2, 3.2.4.2, 3.2.5, 3.2.6.4

Signed-off-by: John Helmert III  gentoo.org>

 sys-process/glances/Manifest   |  4 -
 .../glances/files/disable-update-check.patch   | 28 ---
 sys-process/glances/glances-3.2.2.ebuild   | 87 
 sys-process/glances/glances-3.2.4.2.ebuild | 93 --
 sys-process/glances/glances-3.2.5.ebuild   | 93 --
 sys-process/glances/glances-3.2.6.4.ebuild | 93 --
 6 files changed, 398 deletions(-)

diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index cc26997b8a87..cb60c08364f6 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,5 +1 @@
-DIST glances-3.2.2.tar.gz 6861708 BLAKE2B 
99ed3298724a82f036660f05cfd374f8dfa4883ef3c710dfe789ed9f9986bfe873117096564f1dd46d91cd3d0304e0cd1876d17ecd6e3aad98c7dd9df2095265
 SHA512 
e77b62e5fa6131914b56f0b5249789b3bcac0c625cd429eeb0870a14be55f15c401956c002376e5868fa1332bbb219e9bd3a5bd14c739e3404b068a063af6821
-DIST glances-3.2.4.2.tar.gz 6914758 BLAKE2B 
faab5df2689477c5b6df047a2e0d03b09981f064d13ece4e66bdabb816168e035771ed7fd8863723b57c88f47d42674ca3553b5538c0386eab32516fdc7e2a1d
 SHA512 
74d495303b8c0e421a2139167d998c56adfb09434f72faf34c46e0be07087c0a152a1a637b62badaf3b1934ee7892c1a9e205c260aa10655b0bfff91491fc5e1
-DIST glances-3.2.5.tar.gz 6913167 BLAKE2B 
8dc96e59f3cfd624211e0e30d5c5c5bc790a2fea62cd92068bfb779048d51fd95e6c83e62fd70ad2d1e8450435616803e01f7434d419b4f4187ad41fc193121a
 SHA512 
ebff1cf893ca4d3e490f4a6b72fa70df0afb4c36ac1b3fa762dcaa47206bc1e613c8d87f1b2fc5cae27636612a89b417ae91d016a129da4ac43a2a8a6f913945
-DIST glances-3.2.6.4.gh.tar.gz 6950769 BLAKE2B 
69437cce71640c4291bc9f91a6c65a05d608e91e834193fabb5b66c4a5fba92238a3aad3b972e71e8e4baff6c92045d1807e65bad43f1318a7cc077c89c4f978
 SHA512 
21e2a6dacd2181d9b84927365425d4cf7767b73f92949e778c42db68634cf655802c371418c51265c89099bbe11ed130e4b74ca0605601b7703dc0ee992f5417
 DIST glances-3.2.7.gh.tar.gz 6950597 BLAKE2B 
b76632787d39cb0f9388c00cc5838a9f553020b7ce1b502f205bbbf2255d7e2e02a2f2d629a84b23951b02a019d20b121dea7ea2cb7dec0a77b7c88ea4679cb1
 SHA512 
12edf99cf30c72a60eb7a604bce99bdac3ae290e910d0b88fc0b8b99045512dafd8d39bc61e8c768191335727ee5e2db4fa7d17ad92f63e849413a233c2ba5be

diff --git a/sys-process/glances/files/disable-update-check.patch 
b/sys-process/glances/files/disable-update-check.patch
deleted file mode 100644
index 3706959c2fbb..
--- a/sys-process/glances/files/disable-update-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Disable nagging suggestion to upgrade using pip
-Author: Sebastien Badia 
-Bug-Debian: https://bugs.debian.org/877127
-Forwarded: not-needed
-Last-Update: 2019-02-07
-
 a/glances/standalone.py
-+++ b/glances/standalone.py
-@@ -92,9 +92,6 @@
- # Init screen
- self.screen = GlancesCursesStandalone(config=config, args=args)
- 
--# Check the latest Glances version
--self.outdated = Outdated(config=config, args=args)
--
- @property
- def quiet(self):
- return self._quiet
-@@ -156,9 +153,3 @@
- 
- # Exit from export modules
- self.stats.end()
--
--# Check Glances version versus PyPI one
--if self.outdated.is_outdated():
--print("You are using Glances version {}, however version {} is 
available.".format(
--self.outdated.installed_version(), 
self.outdated.latest_version()))
--print("You should consider upgrading using: pip install --upgrade 
glances")

diff --git a/sys-process/glances/glances-3.2.2.ebuild 
b/sys-process/glances/glances-3.2.2.ebuild
deleted file mode 100644
index 9e5f97893ecb..
--- a/sys-process/glances/glances-3.2.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 linux-info optfeature
-
-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 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-   dev-python/defusedxml[${PYTHON_USEDEP}]
-   dev-python/future[${PYTHON_USEDEP}]
-   >=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
-
-# PYTHON_USEDEP omitted on purpose
-BDEPEND="doc? ( dev-python/sphinx_rtd_theme )"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-PATCHES=(
-  

[gentoo-commits] repo/gentoo:master commit in: sys-process/glances/files/, sys-process/glances/

2022-07-17 Thread John Helmert III
commit: 8b917f43e3410ff3a5a9011ca170ae9b8a3439aa
Author: John Helmert III  gentoo  org>
AuthorDate: Sun Jul 17 16:09:17 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sun Jul 17 16:09:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b917f43

sys-process/glances: add 3.2.5

Signed-off-by: John Helmert III  gentoo.org>

 sys-process/glances/Manifest   |  1 +
 .../files/glances-3.2.5-disable-update-check.patch | 31 
 sys-process/glances/glances-3.2.5.ebuild   | 93 ++
 3 files changed, 125 insertions(+)

diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 87d56e6e4083..6884b3fd3103 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,2 +1,3 @@
 DIST glances-3.2.2.tar.gz 6861708 BLAKE2B 
99ed3298724a82f036660f05cfd374f8dfa4883ef3c710dfe789ed9f9986bfe873117096564f1dd46d91cd3d0304e0cd1876d17ecd6e3aad98c7dd9df2095265
 SHA512 
e77b62e5fa6131914b56f0b5249789b3bcac0c625cd429eeb0870a14be55f15c401956c002376e5868fa1332bbb219e9bd3a5bd14c739e3404b068a063af6821
 DIST glances-3.2.4.2.tar.gz 6914758 BLAKE2B 
faab5df2689477c5b6df047a2e0d03b09981f064d13ece4e66bdabb816168e035771ed7fd8863723b57c88f47d42674ca3553b5538c0386eab32516fdc7e2a1d
 SHA512 
74d495303b8c0e421a2139167d998c56adfb09434f72faf34c46e0be07087c0a152a1a637b62badaf3b1934ee7892c1a9e205c260aa10655b0bfff91491fc5e1
+DIST glances-3.2.5.tar.gz 6913167 BLAKE2B 
8dc96e59f3cfd624211e0e30d5c5c5bc790a2fea62cd92068bfb779048d51fd95e6c83e62fd70ad2d1e8450435616803e01f7434d419b4f4187ad41fc193121a
 SHA512 
ebff1cf893ca4d3e490f4a6b72fa70df0afb4c36ac1b3fa762dcaa47206bc1e613c8d87f1b2fc5cae27636612a89b417ae91d016a129da4ac43a2a8a6f913945

diff --git a/sys-process/glances/files/glances-3.2.5-disable-update-check.patch 
b/sys-process/glances/files/glances-3.2.5-disable-update-check.patch
new file mode 100644
index ..da12729eefd4
--- /dev/null
+++ b/sys-process/glances/files/glances-3.2.5-disable-update-check.patch
@@ -0,0 +1,31 @@
+Description: Disable nagging suggestion to upgrade using pip
+Author: Sebastien Badia 
+Bug-Debian: https://bugs.debian.org/877127
+Forwarded: not-needed
+Last-Update: 2022-04-16
+
+--- a/glances/standalone.py
 b/glances/standalone.py
+@@ -107,9 +107,6 @@
+ # Init screen
+ self.screen = GlancesCursesStandalone(config=config, args=args)
+ 
+-# Check the latest Glances version
+-self.outdated = Outdated(config=config, args=args)
+-
+ @property
+ def quiet(self):
+ return self._quiet
+@@ -188,12 +185,3 @@
+ 
+ # Exit from export modules
+ self.stats.end()
+-
+-# Check Glances version versus PyPI one
+-if self.outdated.is_outdated():
+-print(
+-"You are using Glances version {}, however version {} is 
available.".format(
+-self.outdated.installed_version(), 
self.outdated.latest_version()
+-)
+-)
+-print("You should consider upgrading using: pip install --upgrade 
glances")

diff --git a/sys-process/glances/glances-3.2.5.ebuild 
b/sys-process/glances/glances-3.2.5.ebuild
new file mode 100644
index ..b19e2edb4389
--- /dev/null
+++ b/sys-process/glances/glances-3.2.5.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1 linux-info optfeature
+
+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 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+   $(python_gen_cond_dep '
+   dev-python/defusedxml[${PYTHON_USEDEP}]
+   dev-python/future[${PYTHON_USEDEP}]
+   dev-python/packaging[${PYTHON_USEDEP}]
+   >=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]
+   ')
+"
+
+# PYTHON_USEDEP omitted on purpose
+BDEPEND="doc? ( dev-python/sphinx_rtd_theme )"
+
+CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
+
+PATCHES=(
+   "${FILESDIR}/${P}-disable-update-check.patch"
+)
+
+distutils_enable_tests setup.py
+distutils_enable_sphinx docs --no-autodoc
+
+pkg_setup() {
+   linux-info_pkg_setup
+   python-single-r1_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
+   sed -i "s/, 'irq']/]/" 

[gentoo-commits] repo/gentoo:master commit in: sys-process/glances/files/, sys-process/glances/

2020-05-01 Thread Georgy Yakovlev
commit: 9329018014f73b33465bd0e87135fd526793b3db
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat May  2 04:53:13 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat May  2 04:53:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93290180

sys-process/glances: drop old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-process/glances/Manifest   |  3 -
 sys-process/glances/files/3.1.3-fix-test.patch | 28 
 sys-process/glances/glances-3.1.1.ebuild   | 97 --
 sys-process/glances/glances-3.1.2.ebuild   | 97 --
 sys-process/glances/glances-3.1.3-r1.ebuild| 86 ---
 5 files changed, 311 deletions(-)

diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index f784c481896..1ae5fb217c4 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,6 +1,3 @@
 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

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 5e087ce96ba..000
--- 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 
-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 62bac630f41..000
--- 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 

[gentoo-commits] repo/gentoo:master commit in: sys-process/glances/files/, sys-process/glances/

2019-12-28 Thread Georgy Yakovlev
commit: 6aa3a4ed37e4a477fdc200e2e50176e8477cf8b9
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Dec 28 08:21:08 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Dec 28 08:23:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aa3a4ed

sys-process/glances: bump to 3.1.3

EAPI=7
new distutils magic for simpler ebuild

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-process/glances/Manifest   |  1 +
 sys-process/glances/files/3.1.3-fix-test.patch | 28 +
 sys-process/glances/glances-3.1.3.ebuild   | 83 ++
 3 files changed, 112 insertions(+)

diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index d71fbb42e35..37e30b9d8a2 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -2,3 +2,4 @@ DIST Glances-2.11.1.tar.gz 5665685 BLAKE2B 
5de75e7770cc01a0ddd6fcb0583e5d23c02e5
 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

diff --git a/sys-process/glances/files/3.1.3-fix-test.patch 
b/sys-process/glances/files/3.1.3-fix-test.patch
new file mode 100644
index 000..5e087ce96ba
--- /dev/null
+++ b/sys-process/glances/files/3.1.3-fix-test.patch
@@ -0,0 +1,28 @@
+From abf64ffde31113f5f46ef286703ff061fc57395f Mon Sep 17 00:00:00 2001
+From: nicolargo 
+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.3.ebuild 
b/sys-process/glances/glances-3.1.3.ebuild
new file mode 100644
index 000..123e7d05a15
--- /dev/null
+++ b/sys-process/glances/glances-3.1.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="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}/${PV}-fix-test.patch" )
+
+distutils_enable_tests unittest
+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'