[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/

[Ionen Wolkens]

commit:     b342ef89ebd510fffd2e91c7b7b288e53f7f06da
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 13:42:10 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 13:44:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b342ef89

x11-terms/kitty: sync live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-terms/kitty/kitty-9999.ebuild | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/x11-terms/kitty/kitty-9999.ebuild 
b/x11-terms/kitty/kitty-9999.ebuild
index 90f8d00348ee..9d20478938f2 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -13,6 +13,7 @@ else
        inherit verify-sig
        SRC_URI="
                
https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
+               https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
                verify-sig? ( 
https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )"
        
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
        KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
@@ -76,14 +77,16 @@ src_unpack() {
                cd "${S}" || die
                edo go mod vendor
        else
-               verify-sig_src_unpack
+               use verify-sig &&
+                       verify-sig_verify_detached 
"${DISTDIR}"/${P}.tar.xz{,.sig}
+               default
        fi
 }
 
 src_prepare() {
        default
 
-       # sed unfortunately feels easier on maintainenance than patches here
+       # sed unfortunately feels easier on maintenance than patches here
        local sedargs=(
                -e "/num_workers =/s/=.*/= $(makeopts_jobs)/"
                -e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//'
@@ -100,11 +103,15 @@ src_prepare() {
 
        sed -i setup.py "${sedargs[@]}" || die
 
-       # test relies on 'who' command which doesn't detect users with 
pid-sandbox
-       rm kitty_tests/utmp.py || die
-
-       # test may fail/hang depending on environment and shell initialization 
scripts
-       rm kitty_tests/{shell_integration,ssh}.py || die
+       local skiptests=(
+               # relies on 'who' command which doesn't detect users with 
pid-sandbox
+               kitty_tests/utmp.py
+               # may fail/hang depending on environment and shell 
initialization
+               kitty_tests/{shell_integration,ssh}.py
+               # relies on /proc/self/fd and gets confused when ran from here
+               tools/utils/tpmfile_test.go
+       )
+       use !test || rm "${skiptests[@]}" || die
 }
 
 src_compile() {
@@ -144,7 +151,6 @@ src_install() {
 pkg_postinst() {
        xdg_pkg_postinst
 
-       optfeature "in-terminal image display with kitty icat" 
media-gfx/imagemagick
        optfeature "audio-based terminal bell support" media-libs/libcanberra
        optfeature "opening links from the terminal" x11-misc/xdg-utils
 }