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 B943A158094 for ; Mon, 29 Aug 2022 05:10:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5B9EE0877; Mon, 29 Aug 2022 05:10:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 CD064E0877 for ; Mon, 29 Aug 2022 05:10:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 E4C25340F6D for ; Mon, 29 Aug 2022 05:09:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FD785A3 for ; Mon, 29 Aug 2022 05:09:58 +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: <1661749379.22ca49b09225a22e5cfad9a25b2dce7ad9aa6342.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: 22ca49b09225a22e5cfad9a25b2dce7ad9aa6342 X-VCS-Branch: master Date: Mon, 29 Aug 2022 05:09:58 +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: 70bdcd7a-eae8-441e-bc6c-7e2d0de318ae X-Archives-Hash: f5b8b61118aa6e4f26fa28da35460207 commit: 22ca49b09225a22e5cfad9a25b2dce7ad9aa6342 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Aug 29 05:00:02 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Aug 29 05:02:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22ca49b0 x11-terms/kitty: sync live Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty/kitty-9999.ebuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index 92a0509aac27..3ee9cbb30121 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit optfeature multiprocessing python-single-r1 toolchain-funcs xdg +inherit edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg if [[ ${PV} == 9999 ]] ; then inherit git-r3 @@ -32,6 +32,7 @@ RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )" # dlopen: fontconfig,libglvnd RDEPEND=" ${PYTHON_DEPS} + dev-libs/openssl:= media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 @@ -67,9 +68,10 @@ BDEPEND=" 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 "/num_workers =/s/=.*/= $(makeopts_jobs)/" \ -e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \ -i setup.py || die @@ -92,8 +94,7 @@ src_compile() { tc-export CC export PKGCONFIG_EXE=$(tc-getPKG_CONFIG) - local setup=( - ${EPYTHON} setup.py linux-package + local conf=( --disable-link-time-optimization --ignore-compiler-warnings --libdir-name=$(get_libdir) @@ -102,16 +103,15 @@ src_compile() { --verbose ) - echo "${setup[*]}" - "${setup[@]}" || die "setup.py failed to compile ${PN}" + 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 } src_test() { - PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \ - ${EPYTHON} test.py || die + KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty } src_install() {