| 1 |
commit: 4bd15b43a94a36344204afb52c3105ce1a9e55a0 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 18:39:24 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 19:06:13 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bd15b43 |
| 7 |
|
| 8 |
media-libs/fontconfig: limit multilib features |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
media-libs/fontconfig/fontconfig-2.13.93.ebuild | 4 ++-- |
| 13 |
media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild | 4 ++-- |
| 14 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-libs/fontconfig/fontconfig-2.13.93.ebuild b/media-libs/fontconfig/fontconfig-2.13.93.ebuild |
| 17 |
index deaa7fcd009a..1c12de903df3 100644 |
| 18 |
--- a/media-libs/fontconfig/fontconfig-2.13.93.ebuild |
| 19 |
+++ b/media-libs/fontconfig/fontconfig-2.13.93.ebuild |
| 20 |
@@ -98,9 +98,9 @@ multilib_src_configure() { |
| 21 |
esac |
| 22 |
|
| 23 |
local myeconfargs=( |
| 24 |
- $(use_enable doc docbook) |
| 25 |
+ $(multilib_native_use_enable doc docbook) |
| 26 |
$(use_enable static-libs static) |
| 27 |
- --enable-docs |
| 28 |
+ $(multilib_native_enable docs) |
| 29 |
--localstatedir="${EPREFIX}"/var |
| 30 |
--with-default-fonts="${EPREFIX}"/usr/share/fonts |
| 31 |
--with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}" |
| 32 |
|
| 33 |
diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild |
| 34 |
index 49b2629b5331..96da5cf7b37c 100644 |
| 35 |
--- a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild |
| 36 |
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild |
| 37 |
@@ -104,11 +104,11 @@ multilib_src_configure() { |
| 38 |
esac |
| 39 |
|
| 40 |
local myeconfargs=( |
| 41 |
- $(use_enable doc docbook) |
| 42 |
+ $(multilib_native_use_enable doc docbook) |
| 43 |
$(use_enable static-libs static) |
| 44 |
|
| 45 |
# man pages. We split out the docbook parts into its own flag. |
| 46 |
- --enable-docs |
| 47 |
+ $(multilib_native_enable docs) |
| 48 |
# We handle this ourselves. |
| 49 |
--disable-cache-build |
| 50 |
# See comment above *DEPEND. We use Expat instead. |
Archives