diff --git a/dev-util/ccache/ccache-4.8.3.ebuild b/dev-util/ccache/ccache-4.8.3.ebuild index 554266100f5b1..8c1e04988bf3b 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 108c29bbdd7ac..73795e42934ef 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 68cf3874b6643..ae1a041c29531 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 7f604f0016ef9..631d671794d8e 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 " * $* ..."; }