Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/
Date: Tue, 04 Jan 2022 18:50:31
Message-Id: 1641322149.d6a30fec30651e55000cb889c484207ff4849e28.ionen@gentoo
1 commit: d6a30fec30651e55000cb889c484207ff4849e28
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 4 18:45:13 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 4 18:49:09 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a30fec
7
8 x11-terms/kitty: update live and add no-rc issue link
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 x11-terms/kitty/kitty-0.24.0.ebuild | 3 +--
13 x11-terms/kitty/kitty-9999.ebuild | 7 +------
14 2 files changed, 2 insertions(+), 8 deletions(-)
15
16 diff --git a/x11-terms/kitty/kitty-0.24.0.ebuild b/x11-terms/kitty/kitty-0.24.0.ebuild
17 index dd602a094037..e110c82bbd0b 100644
18 --- a/x11-terms/kitty/kitty-0.24.0.ebuild
19 +++ b/x11-terms/kitty/kitty-0.24.0.ebuild
20 @@ -73,8 +73,7 @@ src_prepare() {
21
22 # --shell-integration="enabled no-rc" is the intended way to set
23 # no-rc by default, but setup.py's replacer currently fails
24 - # (no-rc prevents modifying users .bashrc without asking, and it's
25 - # unnecessary given shell-integration package uses /etc/bash/bashrc.d)
26 + # https://github.com/kovidgoyal/kitty/issues/4434
27 sed -i "/shell_integration:/s/'enabled'/&,'no-rc'/" kitty/options/types.py || die
28
29 # test relies on 'who' command which typically works but have 1 VM
30
31 diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
32 index dd602a094037..a0d732aca31a 100644
33 --- a/x11-terms/kitty/kitty-9999.ebuild
34 +++ b/x11-terms/kitty/kitty-9999.ebuild
35 @@ -71,12 +71,6 @@ src_prepare() {
36 -i kitty_tests/check_build.py || die
37 use X || sed "/glfw_path('x11')/s/x11/wayland/" -i kitty_tests/glfw.py || die
38
39 - # --shell-integration="enabled no-rc" is the intended way to set
40 - # no-rc by default, but setup.py's replacer currently fails
41 - # (no-rc prevents modifying users .bashrc without asking, and it's
42 - # unnecessary given shell-integration package uses /etc/bash/bashrc.d)
43 - sed -i "/shell_integration:/s/'enabled'/&,'no-rc'/" kitty/options/types.py || die
44 -
45 # test relies on 'who' command which typically works but have 1 VM
46 # where it didn't only under portage/sandbox, needs investigation but
47 # disable for now
48 @@ -95,6 +89,7 @@ src_compile() {
49 --disable-link-time-optimization
50 --ignore-compiler-warnings
51 --libdir-name=$(get_libdir)
52 + --shell-integration="enabled no-rc"
53 --update-check-interval=0
54 --verbose
55 $(usev debug --debug)