commit: 35ac56d0683de8ad8ab4316b109ef77a88a77300 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Mar 10 22:50:43 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Mar 10 22:50:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ac56d0
media-libs/fontconfig: fix commands in global scope Closes: https://bugs.gentoo.org/788070 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 6 +++--- media-libs/fontconfig/fontconfig-2.13.93.ebuild | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild index 6b51d5adc5b4..ddf062068696 100644 --- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild +++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -54,8 +54,6 @@ PATCHES=( "${FILESDIR}"/${P}-proper_homedir.patch ) -MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) ) - pkg_setup() { DOC_CONTENTS="Please make fontconfig configuration changes using \`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be @@ -102,6 +100,8 @@ multilib_src_configure() { } multilib_src_install() { + MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) ) + default # avoid calling this multiple times, bug #459210 diff --git a/media-libs/fontconfig/fontconfig-2.13.93.ebuild b/media-libs/fontconfig/fontconfig-2.13.93.ebuild index 329ec7d1678e..a88e04398db3 100644 --- a/media-libs/fontconfig/fontconfig-2.13.93.ebuild +++ b/media-libs/fontconfig/fontconfig-2.13.93.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -110,6 +110,8 @@ multilib_src_configure() { } multilib_src_install() { + MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) ) + default # avoid calling this multiple times, bug #459210
