Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/bpytop/files/, sys-process/bpytop/
Date: Fri, 29 Jan 2021 03:10:37
Message-Id: 1611889825.4e681e56df20722f7f313d51168a8bacf13909cc.chutzpah@gentoo
1 commit: 4e681e56df20722f7f313d51168a8bacf13909cc
2 Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
3 AuthorDate: Fri Jan 29 03:10:25 2021 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 29 03:10:25 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e681e56
7
8 sys-process/bpytop-1.0.61: Fix patch
9
10 Copyright: Sony Interactive Entertainment Inc.
11 Package-Manager: Portage-3.0.14, Repoman-3.0.2
12 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
13
14 sys-process/bpytop/bpytop-1.0.61.ebuild | 10 ++--------
15 sys-process/bpytop/files/bpytop-1.0.61-tests.patch | 20 ++++++++++++++++++++
16 2 files changed, 22 insertions(+), 8 deletions(-)
17
18 diff --git a/sys-process/bpytop/bpytop-1.0.61.ebuild b/sys-process/bpytop/bpytop-1.0.61.ebuild
19 index 3d2f869c509..0dd9a9cadf0 100644
20 --- a/sys-process/bpytop/bpytop-1.0.61.ebuild
21 +++ b/sys-process/bpytop/bpytop-1.0.61.ebuild
22 @@ -3,7 +3,7 @@
23
24 EAPI=7
25
26 -PYTHON_COMPAT=( python3_{6..9} pypy3 )
27 +PYTHON_COMPAT=( python3_{6..9} )
28 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
29 inherit distutils-r1
30
31 @@ -23,11 +23,5 @@ RDEPEND="
32 distutils_enable_tests pytest
33
34 PATCHES=(
35 - "${FILESDIR}/bpytop-1.0.51-tests.patch"
36 + "${FILESDIR}/bpytop-1.0.61-tests.patch"
37 )
38 -
39 -src_install() {
40 - insinto "/usr/share/${PN}/themes"
41 - doins bpytop-themes/*.theme
42 - distutils-r1_src_install
43 -}
44
45 diff --git a/sys-process/bpytop/files/bpytop-1.0.61-tests.patch b/sys-process/bpytop/files/bpytop-1.0.61-tests.patch
46 new file mode 100644
47 index 00000000000..51cef1ce639
48 --- /dev/null
49 +++ b/sys-process/bpytop/files/bpytop-1.0.61-tests.patch
50 @@ -0,0 +1,20 @@
51 +diff --git a/bpytop.py b/bpytop.py
52 +index 38d6e8b..12e4853 100755
53 +--- a/bpytop.py
54 ++++ b/bpytop.py
55 +@@ -65,10 +65,11 @@ args.add_argument("-v", "--version", action="store_true", help = "show versio
56 + args.add_argument("--debug", action="store_true", help = "start with loglevel set to DEBUG overriding value set in config")
57 + stdargs = args.parse_args()
58 +
59 +-if stdargs.version:
60 +- print(f'bpytop version: {VERSION}\n'
61 +- f'psutil version: {".".join(str(x) for x in psutil.version_info)}')
62 +- raise SystemExit(0)
63 ++if __name__ == "__main__":
64 ++ if stdargs.version:
65 ++ print(f'bpytop version: {VERSION}\n'
66 ++ f'psutil version: {".".join(str(x) for x in psutil.version_info)}')
67 ++ raise SystemExit(0)
68 +
69 + ARG_BOXES: str = stdargs.boxes
70 + LOW_COLOR: bool = stdargs.low_color