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 25BC2158099 for ; Tue, 21 Nov 2023 06:35:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 697EB2BC015; Tue, 21 Nov 2023 06:35:40 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4D5CF2BC015 for ; Tue, 21 Nov 2023 06:35: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 76EAA335D6A for ; Tue, 21 Nov 2023 06:35:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A76F71318 for ; Tue, 21 Nov 2023 06:35: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: <1700548462.94f677f3d2a7db54368a9c0e777b5787747525a8.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-0.31.0.ebuild 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: 94f677f3d2a7db54368a9c0e777b5787747525a8 X-VCS-Branch: master Date: Tue, 21 Nov 2023 06:35: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: e7e73bba-f4f9-4a1c-939d-d1b83c9895e3 X-Archives-Hash: ee84edd997d142c27e20407bc0597acf commit: 94f677f3d2a7db54368a9c0e777b5787747525a8 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Nov 21 06:27:07 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Nov 21 06:34:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94f677f3 x11-terms/kitty: use go-env.eclass Still not fond of go-module.eclass in mixed projects, but this one does a straight forward job and no reason not to use it. May have been interesting if it handled GOFLAGS too, but ah well. tc-export CC is redundant but it's needed by kitty regardless of go, so keep it in a separate block to avoid confusion/removal. Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty/kitty-0.31.0.ebuild | 7 +++++-- x11-terms/kitty/kitty-9999.ebuild | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/x11-terms/kitty/kitty-0.31.0.ebuild b/x11-terms/kitty/kitty-0.31.0.ebuild index 9090e9ba7a22..40e4c5d20049 100644 --- a/x11-terms/kitty/kitty-0.31.0.ebuild +++ b/x11-terms/kitty/kitty-0.31.0.ebuild @@ -4,7 +4,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg +inherit edo go-env optfeature multiprocessing +inherit python-single-r1 toolchain-funcs xdg if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -124,9 +125,11 @@ src_prepare() { src_compile() { tc-export CC + local -x PKGCONFIG_EXE=$(tc-getPKG_CONFIG) + + go-env_set_compile_environment local -x GOFLAGS="-p=$(makeopts_jobs) -v -x" use ppc64 && [[ $(tc-endian) == big ]] || GOFLAGS+=" -buildmode=pie" - local -x PKGCONFIG_EXE=$(tc-getPKG_CONFIG) local conf=( --disable-link-time-optimization diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index 9090e9ba7a22..40e4c5d20049 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -4,7 +4,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg +inherit edo go-env optfeature multiprocessing +inherit python-single-r1 toolchain-funcs xdg if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -124,9 +125,11 @@ src_prepare() { src_compile() { tc-export CC + local -x PKGCONFIG_EXE=$(tc-getPKG_CONFIG) + + go-env_set_compile_environment local -x GOFLAGS="-p=$(makeopts_jobs) -v -x" use ppc64 && [[ $(tc-endian) == big ]] || GOFLAGS+=" -buildmode=pie" - local -x PKGCONFIG_EXE=$(tc-getPKG_CONFIG) local conf=( --disable-link-time-optimization