[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/

["Sam James" <sam@gentoo.org>]

commit:     6cfab692a4eef1b616f6b5fda4592f289e62b42a
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Wed Feb  7 07:09:32 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> 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 " * $* ..."; }