* [gentoo-commits] repo/gentoo:master commit in: sys-process/glances/, sys-process/glances/files/
@ 2019-12-28 8:59 Georgy Yakovlev
0 siblings, 0 replies; 3+ messages in thread
From: Georgy Yakovlev @ 2019-12-28 8:59 UTC (permalink / raw
To: gentoo-commits
commit: 56f58577c71f59a7644bb36760e7b30d55578813
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 08:58:44 2019 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 08:59:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56f58577
sys-process/glances: rebvump 3.1.3, fix tests, disable update check
Disable nagging suggestion to upgrade using pip, patch imported from debian
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
.../glances/files/disable-update-check.patch | 28 ++++++++++++++++++++++
...lances-3.1.3.ebuild => glances-3.1.3-r1.ebuild} | 7 ++++--
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/sys-process/glances/files/disable-update-check.patch b/sys-process/glances/files/disable-update-check.patch
new file mode 100644
index 00000000000..3706959c2fb
--- /dev/null
+++ b/sys-process/glances/files/disable-update-check.patch
@@ -0,0 +1,28 @@
+Description: Disable nagging suggestion to upgrade using pip
+Author: Sebastien Badia <sbadia@debian.org>
+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.1.3.ebuild b/sys-process/glances/glances-3.1.3-r1.ebuild
similarity index 95%
rename from sys-process/glances/glances-3.1.3.ebuild
rename to sys-process/glances/glances-3.1.3-r1.ebuild
index 123e7d05a15..f618736435a 100644
--- a/sys-process/glances/glances-3.1.3.ebuild
+++ b/sys-process/glances/glances-3.1.3-r1.ebuild
@@ -22,9 +22,12 @@ RDEPEND="dev-python/future[${PYTHON_USEDEP}]
CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-PATCHES=( "${FILESDIR}/${PV}-fix-test.patch" )
+PATCHES=(
+ "${FILESDIR}/disable-update-check.patch"
+ "${FILESDIR}/${PV}-fix-test.patch"
+)
-distutils_enable_tests unittest
+distutils_enable_tests setup.py
distutils_enable_sphinx docs --no-autodoc
pkg_setup() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/glances/, sys-process/glances/files/
@ 2024-05-25 21:42 John Helmert III
0 siblings, 0 replies; 3+ messages in thread
From: John Helmert III @ 2024-05-25 21:42 UTC (permalink / raw
To: gentoo-commits
commit: 984d36b88e462213d68ce11596fd4ce379e01dc9
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 21:40:47 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sat May 25 21:42:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=984d36b8
sys-process/glances: drop 3.3.0-r1
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
sys-process/glances/Manifest | 1 -
.../files/glances-3.2.5-disable-update-check.patch | 31 -------
sys-process/glances/glances-3.3.0-r1.ebuild | 95 ----------------------
3 files changed, 127 deletions(-)
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 4da0f33a02ad..0493b0632dcd 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,4 +1,3 @@
-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
DIST glances-3.4.0.5.gh.tar.gz 6473711 BLAKE2B 510f379946eec914998cba32ffd66c6037bd85246cdae059d336b4a3330ba6e521aa3fef2099d88f08dbf3ed7e7c8537235850ad8f6882840fb811bcd8a82147 SHA512 aca140fedc2acc97ae4901722e0406acb8bea6eac5295d95499860a522e74d29ecbc4cfb28fecfd4a2879f4ee44175bd4efd2429b9d7e302b4a182caabd6a5f8
DIST glances-4.0.6.gh.tar.gz 6622650 BLAKE2B 82290999d94ea46bb5671a6eb2959cbb4246dd231fddbb6ad72108d7270faf5a3da5f73f25d1bdb8987a6db79d7a07eb05581fa7b4d7406df97cffb274e20387 SHA512 d5bb804aff6dbc5147a185cb613ca9f402b43fc2d9bef1e80dfd90db3fe11f445aade0d73e987a9a3665c4bf4f210dd3d1a98e9b53e028ef4e49a9111b527f0d
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
deleted file mode 100644
index da12729eefd4..000000000000
--- a/sys-process/glances/files/glances-3.2.5-disable-update-check.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Disable nagging suggestion to upgrade using pip
-Author: Sebastien Badia <sbadia@debian.org>
-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.3.0-r1.ebuild b/sys-process/glances/glances-3.3.0-r1.ebuild
deleted file mode 100644
index 5a95082709b5..000000000000
--- a/sys-process/glances/glances-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-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}]
- ')
-"
-
-# 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.2.5-disable-update-check.patch"
-)
-
-distutils_enable_tests unittest
-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']/]/" unitest.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- "${EPYTHON}" unitest.py || die "tests failed with ${EPYTHON}"
-}
-
-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 )
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- #optfeature "Action script feature" dev-python/pystache
- optfeature "Autodiscover mode" dev-python/zeroconf
- optfeature "Cloud support" dev-python/requests
- optfeature "Docker monitoring support" dev-python/docker
- #optfeature "Export module" \
- # unpackaged/bernhard \
- # unpackaged/cassandra-driver \
- # unpackaged/potsdb \
- # dev-python/couchdb-python \
- # dev-python/elasticsearch-py \
- # dev-python/influxdb \
- # dev-python/pika \
- # dev-python/paho-mqtt \
- # dev-python/prometheus-client \
- # dev-python/pyzmq \
- # dev-python/statsd
- #optfeature "Nvidia GPU monitoring" unpackaged/nvidia-ml-py3
- optfeature "SVG graph support" dev-python/pygal
- optfeature "IP plugin" dev-python/netifaces
- optfeature "RAID monitoring" dev-python/pymdstat
- #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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/glances/, sys-process/glances/files/
@ 2024-05-25 21:42 John Helmert III
0 siblings, 0 replies; 3+ messages in thread
From: John Helmert III @ 2024-05-25 21:42 UTC (permalink / raw
To: gentoo-commits
commit: d243977905d623e4c817012d55daca18309ebdc4
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 21:32:45 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sat May 25 21:41:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2439779
sys-process/glances: add 4.0.6
Forward-port update check patch and convert (and remove) some install
path sed's into a patch.
Also drop the commented lists of unpackaged optfeature packages due to a
bunch of upstream dependency changes.
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
sys-process/glances/Manifest | 1 +
.../files/glances-4.0.6-disable-update-check.patch | 36 +++++++++++++
.../files/glances-4.0.6-doc-install-path.patch | 20 +++++++
sys-process/glances/glances-4.0.6.ebuild | 62 ++++++++++++++++++++++
4 files changed, 119 insertions(+)
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 3dfc085c818f..4da0f33a02ad 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,3 +1,4 @@
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
DIST glances-3.4.0.5.gh.tar.gz 6473711 BLAKE2B 510f379946eec914998cba32ffd66c6037bd85246cdae059d336b4a3330ba6e521aa3fef2099d88f08dbf3ed7e7c8537235850ad8f6882840fb811bcd8a82147 SHA512 aca140fedc2acc97ae4901722e0406acb8bea6eac5295d95499860a522e74d29ecbc4cfb28fecfd4a2879f4ee44175bd4efd2429b9d7e302b4a182caabd6a5f8
+DIST glances-4.0.6.gh.tar.gz 6622650 BLAKE2B 82290999d94ea46bb5671a6eb2959cbb4246dd231fddbb6ad72108d7270faf5a3da5f73f25d1bdb8987a6db79d7a07eb05581fa7b4d7406df97cffb274e20387 SHA512 d5bb804aff6dbc5147a185cb613ca9f402b43fc2d9bef1e80dfd90db3fe11f445aade0d73e987a9a3665c4bf4f210dd3d1a98e9b53e028ef4e49a9111b527f0d
diff --git a/sys-process/glances/files/glances-4.0.6-disable-update-check.patch b/sys-process/glances/files/glances-4.0.6-disable-update-check.patch
new file mode 100644
index 000000000000..aa8fbfc569bd
--- /dev/null
+++ b/sys-process/glances/files/glances-4.0.6-disable-update-check.patch
@@ -0,0 +1,36 @@
+From: John Helmert III <ajak@gentoo.org>
+Date: Sat, 25 May 2024 14:01:10 -0700
+Subject: [PATCH] disable runtime out-of-date check
+
+Signed-off-by: John Helmert III <ajak@gentoo.org>
+--- a/glances/standalone.py
++++ b/glances/standalone.py
+@@ -112,9 +112,6 @@ class GlancesStandalone:
+ # It is done in the screen.init function
+ self._quiet = args.quiet
+
+- # Check the latest Glances version
+- self.outdated = Outdated(config=config, args=args)
+-
+ @property
+ def quiet(self):
+ return self._quiet
+@@ -192,15 +189,3 @@ class GlancesStandalone:
+
+ # Exit from export modules
+ self.stats.end()
+-
+- # Check Glances version versus PyPI one
+- if self.outdated.is_outdated():
+- latest_version = self.outdated.latest_version()
+- installed_version = self.outdated.installed_version()
+- print(f"You are using Glances version {installed_version}, however version {latest_version} is available.")
+- 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"
+- )
+--
+2.45.1
+
diff --git a/sys-process/glances/files/glances-4.0.6-doc-install-path.patch b/sys-process/glances/files/glances-4.0.6-doc-install-path.patch
new file mode 100644
index 000000000000..077cd0924c4b
--- /dev/null
+++ b/sys-process/glances/files/glances-4.0.6-doc-install-path.patch
@@ -0,0 +1,20 @@
+From b90ce653b99f4efa15e27f4a71a4e251d0b34d2c Mon Sep 17 00:00:00 2001
+From: John Helmert III <ajak@gentoo.org>
+Date: Sat, 25 May 2024 14:21:50 -0700
+Subject: [PATCH] setup.py: install docs to versioned directory
+
+Signed-off-by: John Helmert III <ajak@gentoo.org>
+--- a/setup.py
++++ b/setup.py
+@@ -31,7 +31,7 @@ with builtins.open('README.rst', encoding='utf-8') as f:
+ def get_data_files():
+ return [
+ (
+- 'share/doc/glances',
++ f'share/doc/glances-{version}',
+ ['AUTHORS', 'COPYING', 'NEWS.rst', 'README.rst', "SECURITY.md", 'CONTRIBUTING.md', 'conf/glances.conf'],
+ ),
+ ('share/man/man1', ['docs/man/glances.1']),
+--
+2.45.1
+
diff --git a/sys-process/glances/glances-4.0.6.ebuild b/sys-process/glances/glances-4.0.6.ebuild
new file mode 100644
index 000000000000..2988ea7d7c95
--- /dev/null
+++ b/sys-process/glances/glances-4.0.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 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}-4.0.6-disable-update-check.patch"
+ "${FILESDIR}/${PN}-4.0.6-doc-install-path.patch"
+)
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs --no-autodoc
+
+pkg_setup() {
+ linux-info_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+python_test() {
+ "${EPYTHON}" unittest-core.py || echo "tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+ optfeature "Autodiscover mode" dev-python/zeroconf
+ optfeature "Cloud support" dev-python/requests
+ optfeature "Docker monitoring support" dev-python/docker
+ optfeature "SVG graph support" dev-python/pygal
+ optfeature "IP plugin" dev-python/netifaces
+ optfeature "RAID monitoring" dev-python/pymdstat
+ optfeature "RAID support" dev-python/pymdstat
+ optfeature "SNMP support" dev-python/pysnmp
+ optfeature "WIFI plugin" net-wireless/python-wifi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-25 21:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-28 8:59 [gentoo-commits] repo/gentoo:master commit in: sys-process/glances/, sys-process/glances/files/ Georgy Yakovlev
-- strict thread matches above, loose matches on Subject: below --
2024-05-25 21:42 John Helmert III
2024-05-25 21:42 John Helmert III
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox