From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 27AFA15800F for ; Tue, 31 Jan 2023 13:46:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05240E0BF1; Tue, 31 Jan 2023 13:46:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D02FFE0BF3 for ; Tue, 31 Jan 2023 13:46:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CA0D340CCC for ; Tue, 31 Jan 2023 13:46:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A003D897 for ; Tue, 31 Jan 2023 13:46:26 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1675172686.b342ef89ebd510fffd2e91c7b7b288e53f7f06da.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/kitty/kitty-9999.ebuild X-VCS-Directories: x11-terms/kitty/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: b342ef89ebd510fffd2e91c7b7b288e53f7f06da X-VCS-Branch: master Date: Tue, 31 Jan 2023 13:46:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 96a6a45d-e049-40fd-b327-30e953b48e79 X-Archives-Hash: 61d6dd2e1c93b2fc840eadf013255650 commit: b342ef89ebd510fffd2e91c7b7b288e53f7f06da Author: Ionen Wolkens gentoo org> AuthorDate: Tue Jan 31 13:42:10 2023 +0000 Commit: Ionen Wolkens gentoo 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 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 }