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 039A1158020 for ; Tue, 22 Nov 2022 14:39:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B943E0C37; Tue, 22 Nov 2022 14:39:06 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 36A17E0C37 for ; Tue, 22 Nov 2022 14:39:06 +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 5ECD234122C for ; Tue, 22 Nov 2022 14:39:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC54B621 for ; Tue, 22 Nov 2022 14:39:03 +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: <1669127749.c49ea4647556e0f547d203b66472ac8498a95867.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: c49ea4647556e0f547d203b66472ac8498a95867 X-VCS-Branch: master Date: Tue, 22 Nov 2022 14:39:03 +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: b74518d1-a1ce-4607-824b-029dc0334b24 X-Archives-Hash: 25438dbb85f2330d15f91efebb0281da commit: c49ea4647556e0f547d203b66472ac8498a95867 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Nov 22 14:04:15 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Nov 22 14:35:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c49ea464 x11-terms/kitty: revamp seds in live Not that much clearer, but makes iwdevtools' qa-sed happier by not doing seds that are expected to do nothing (and so easier to track if these need updates). Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty/kitty-9999.ebuild | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index 06e7d84c2b81..66de305b3f00 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -82,13 +82,22 @@ src_unpack() { src_prepare() { default - # seds unfortunately feel easier on maintainenance than patches here - sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \ - -e "$(usev !X '/gl_libs =/s/=.*/= []/')" \ - -e "/num_workers =/s/=.*/= $(makeopts_jobs)/" \ - -e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \ - -e "s/ld_flags.append('-s')/pass/" \ - -i setup.py || die + # sed unfortunately feels easier on maintainenance than patches here + local sedargs=( + -e "/num_workers =/s/=.*/= $(makeopts_jobs)/" + -e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' + -e "s/ld_flags.append('-s')/pass/" + ) + + # kitty is often popular on wayland-only setups, try to allow this + use !X && sedargs+=( -e '/gl_libs =/s/=.*/= []/' ) #857918 + use !X || use !wayland && + sedargs+=( -e "s/'x11 wayland'/'$(usex X x11 wayland)'/" ) + + # skip docs for live version, missing dependencies + [[ ${PV} == 9999 ]] && sedargs+=( -e '/exists.*_build/,/docs(ddir)/d' ) + + 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 @@ -96,8 +105,6 @@ src_prepare() { # test may fail/hang depending on environment and shell initialization scripts rm kitty_tests/{shell_integration,ssh}.py || die - # skip docs for live version - [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die } src_compile() {