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 7B03715815E for ; Wed, 7 Feb 2024 19:20:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71745E2A1D; Wed, 7 Feb 2024 19:20:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 4F3A5E2A1D for ; Wed, 7 Feb 2024 19:20:34 +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 11B74343123 for ; Wed, 7 Feb 2024 19:20:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 557E014D3 for ; Wed, 7 Feb 2024 19:20:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1707333602.6cfab692a4eef1b616f6b5fda4592f289e62b42a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/ccache/ccache-4.8.3.ebuild dev-util/ccache/ccache-4.9.1.ebuild dev-util/ccache/ccache-4.9.ebuild dev-util/ccache/files/ccache-config-3 X-VCS-Directories: dev-util/ccache/files/ dev-util/ccache/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6cfab692a4eef1b616f6b5fda4592f289e62b42a X-VCS-Branch: master Date: Wed, 7 Feb 2024 19:20:30 +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: 0625d2f5-86d3-4765-8bfa-8eaaeb4708a4 X-Archives-Hash: 00f722d1548f03590fd148a677ac0ba1 commit: 6cfab692a4eef1b616f6b5fda4592f289e62b42a Author: Eli Schwartz gmail com> AuthorDate: Wed Feb 7 07:09:32 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Feb 7 19:20:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cfab692 dev-util/ccache: use prefix.eclass to inject eprefix into ccache-config It is a slightly simpler ebuild handling, and avoids QA warnings from iwdevtools when the sed doesn't apply. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> dev-util/ccache/ccache-4.8.3.ebuild | 9 ++++----- dev-util/ccache/ccache-4.9.1.ebuild | 7 +++---- dev-util/ccache/ccache-4.9.ebuild | 7 +++---- dev-util/ccache/files/ccache-config-3 | 2 +- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dev-util/ccache/ccache-4.8.3.ebuild b/dev-util/ccache/ccache-4.8.3.ebuild index 554266100f5b..8c1e04988bf3 100644 --- a/dev-util/ccache/ccache-4.8.3.ebuild +++ b/dev-util/ccache/ccache-4.8.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ MY_DOCS_VERSION=$(ver_cut 1-2) MY_DOCS_USEFLAG="+doc" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc -inherit cmake toolchain-funcs flag-o-matic verify-sig +inherit cmake toolchain-funcs flag-o-matic prefix verify-sig DESCRIPTION="Fast compiler cache" HOMEPAGE="https://ccache.dev/" @@ -78,9 +78,8 @@ src_unpack() { src_prepare() { cmake_src_prepare - sed \ - -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ - "${FILESDIR}"/ccache-config-3 > ccache-config || die + cp "${FILESDIR}"/ccache-config-3 ccache-config || die + eprefixify ccache-config } src_configure() { diff --git a/dev-util/ccache/ccache-4.9.1.ebuild b/dev-util/ccache/ccache-4.9.1.ebuild index 108c29bbdd7a..73795e42934e 100644 --- a/dev-util/ccache/ccache-4.9.1.ebuild +++ b/dev-util/ccache/ccache-4.9.1.ebuild @@ -18,7 +18,7 @@ MY_DOCS_VERSION=$(ver_cut 1-2) MY_DOCS_USEFLAG="+doc" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc -inherit cmake toolchain-funcs flag-o-matic verify-sig +inherit cmake toolchain-funcs flag-o-matic prefix verify-sig DESCRIPTION="Fast compiler cache" HOMEPAGE="https://ccache.dev/" @@ -78,9 +78,8 @@ src_unpack() { src_prepare() { cmake_src_prepare - sed \ - -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ - "${FILESDIR}"/ccache-config-3 > ccache-config || die + cp "${FILESDIR}"/ccache-config-3 ccache-config || die + eprefixify ccache-config } src_configure() { diff --git a/dev-util/ccache/ccache-4.9.ebuild b/dev-util/ccache/ccache-4.9.ebuild index 68cf3874b664..ae1a041c2953 100644 --- a/dev-util/ccache/ccache-4.9.ebuild +++ b/dev-util/ccache/ccache-4.9.ebuild @@ -18,7 +18,7 @@ MY_DOCS_VERSION=$(ver_cut 1-2) MY_DOCS_USEFLAG="+doc" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc -inherit cmake toolchain-funcs flag-o-matic verify-sig +inherit cmake toolchain-funcs flag-o-matic prefix verify-sig DESCRIPTION="Fast compiler cache" HOMEPAGE="https://ccache.dev/" @@ -78,9 +78,8 @@ src_unpack() { src_prepare() { cmake_src_prepare - sed \ - -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ - "${FILESDIR}"/ccache-config-3 > ccache-config || die + cp "${FILESDIR}"/ccache-config-3 ccache-config || die + eprefixify ccache-config } src_configure() { diff --git a/dev-util/ccache/files/ccache-config-3 b/dev-util/ccache/files/ccache-config-3 index 7f604f0016ef..631d671794d8 100644 --- a/dev-util/ccache/files/ccache-config-3 +++ b/dev-util/ccache/files/ccache-config-3 @@ -11,7 +11,7 @@ # # Additional features to come; this provides a starting point -EPREFIX='' +EPREFIX='@GENTOO_PORTAGE_EPREFIX@' . "${EPREFIX}"/lib/gentoo/functions.sh 2>/dev/null || { ebegin() { echo " * $* ..."; }