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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0C97B158020 for ; Tue, 22 Nov 2022 13:00:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2682AE0B43; Tue, 22 Nov 2022 13:00:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 09017E0B43 for ; Tue, 22 Nov 2022 13:00:40 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 13A31341183 for ; Tue, 22 Nov 2022 13:00:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3EDB074D for ; Tue, 22 Nov 2022 13:00:37 +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: <1669122013.62ba6f2e5398cf7cdc8341690bb75cbbf8cc124f.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: 62ba6f2e5398cf7cdc8341690bb75cbbf8cc124f X-VCS-Branch: master Date: Tue, 22 Nov 2022 13:00:37 +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: 9bc0de0b-7b12-499e-8d93-61f148d31660 X-Archives-Hash: 134091ac69eefc3a219dedee976b0fd0 commit: 62ba6f2e5398cf7cdc8341690bb75cbbf8cc124f Author: Ionen Wolkens gentoo org> AuthorDate: Tue Nov 22 12:37:28 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Nov 22 13:00:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62ba6f2e x11-terms/kitty: adjust live further for go-module.eclass This is not fully a Go package, there's just a helper tool written in Go. But go-module sets some broad assumptions that everything is Go even if we were to use GO_OPTIONAL (it's tempting to simply not use the eclass, only need to set a few variables + BDEPEND if we're not going to use EGO_SUM). Also quote EPYTHON while here, technically should never have spaces per definition but let's not rely on this too much for eclasses. Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty/kitty-9999.ebuild | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index 914583b0f335..d9660ea7b4f4 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -66,6 +66,9 @@ BDEPEND=" wayland? ( dev-util/wayland-scanner )" [[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )" +# override go-module.eclass' .* to only consider the Go written binary +QA_FLAGS_IGNORED="usr/bin/kitty-tool" + src_unpack() { if [[ ${PV} == 9999 ]]; then git-r3_src_unpack @@ -108,8 +111,8 @@ src_compile() { --verbose ) - edo ${EPYTHON} setup.py linux-package "${conf[@]}" - use test && edo ${EPYTHON} setup.py build-launcher "${conf[@]}" + edo "${EPYTHON}" setup.py linux-package "${conf[@]}" + use test && edo "${EPYTHON}" setup.py build-launcher "${conf[@]}" [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die rm -r linux-package/share/terminfo || die @@ -125,6 +128,11 @@ src_install() { fperms +x /usr/bin/kitty \ /usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty} + + # go-module.eclass force-restricts strip, allow except for Go + # note: placebo given this is not respected by portage (bug #697960) + dostrip / + dostrip -x /usr/bin/kitty-tool } pkg_postinst() {