| 1 |
commit: 36d52f13055cc08e3227277f71602cad1d2ff376 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 4 06:46:06 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 4 07:50:05 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d52f13 |
| 7 |
|
| 8 |
x11-terms/kitty: sync live |
| 9 |
|
| 10 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 11 |
|
| 12 |
x11-terms/kitty/kitty-9999.ebuild | 17 ++++++++++++++--- |
| 13 |
1 file changed, 14 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild |
| 16 |
index f47b4d2c18f8..dd602a094037 100644 |
| 17 |
--- a/x11-terms/kitty/kitty-9999.ebuild |
| 18 |
+++ b/x11-terms/kitty/kitty-9999.ebuild |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
-# Copyright 1999-2021 Gentoo Authors |
| 21 |
+# Copyright 1999-2022 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
EAPI=8 |
| 25 |
@@ -38,6 +38,7 @@ RDEPEND=" |
| 26 |
sys-libs/zlib:= |
| 27 |
x11-libs/libxkbcommon[X?] |
| 28 |
x11-misc/xkeyboard-config |
| 29 |
+ ~x11-terms/kitty-shell-integration-${PV} |
| 30 |
~x11-terms/kitty-terminfo-${PV} |
| 31 |
X? ( x11-libs/libX11 ) |
| 32 |
wayland? ( dev-libs/wayland )" |
| 33 |
@@ -70,6 +71,17 @@ src_prepare() { |
| 34 |
-i kitty_tests/check_build.py || die |
| 35 |
use X || sed "/glfw_path('x11')/s/x11/wayland/" -i kitty_tests/glfw.py || die |
| 36 |
|
| 37 |
+ # --shell-integration="enabled no-rc" is the intended way to set |
| 38 |
+ # no-rc by default, but setup.py's replacer currently fails |
| 39 |
+ # (no-rc prevents modifying users .bashrc without asking, and it's |
| 40 |
+ # unnecessary given shell-integration package uses /etc/bash/bashrc.d) |
| 41 |
+ sed -i "/shell_integration:/s/'enabled'/&,'no-rc'/" kitty/options/types.py || die |
| 42 |
+ |
| 43 |
+ # test relies on 'who' command which typically works but have 1 VM |
| 44 |
+ # where it didn't only under portage/sandbox, needs investigation but |
| 45 |
+ # disable for now |
| 46 |
+ rm kitty_tests/utmp.py || die |
| 47 |
+ |
| 48 |
# skip docs for live version |
| 49 |
[[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die |
| 50 |
} |
| 51 |
@@ -79,14 +91,13 @@ src_compile() { |
| 52 |
export PKGCONFIG_EXE=$(tc-getPKG_CONFIG) |
| 53 |
|
| 54 |
local setup=( |
| 55 |
- ${EPYTHON} setup.py |
| 56 |
+ ${EPYTHON} setup.py linux-package |
| 57 |
--disable-link-time-optimization |
| 58 |
--ignore-compiler-warnings |
| 59 |
--libdir-name=$(get_libdir) |
| 60 |
--update-check-interval=0 |
| 61 |
--verbose |
| 62 |
$(usev debug --debug) |
| 63 |
- linux-package |
| 64 |
) |
| 65 |
|
| 66 |
echo "${setup[*]}" |
Archives