From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1432129-garchives=archives.gentoo.org@lists.gentoo.org>
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 A1707158094
	for <garchives@archives.gentoo.org>; Tue, 30 Aug 2022 19:06:27 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id D52B9E0978;
	Tue, 30 Aug 2022 19:06:26 +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 BA16BE0968
	for <gentoo-commits@lists.gentoo.org>; Tue, 30 Aug 2022 19:06:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(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 DCB2534124B
	for <gentoo-commits@lists.gentoo.org>; Tue, 30 Aug 2022 19:06:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id ABBF45C6
	for <gentoo-commits@lists.gentoo.org>; Tue, 30 Aug 2022 19:06:23 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1661886373.4bd15b43a94a36344204afb52c3105ce1a9e55a0.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/fontconfig/fontconfig-2.13.93.ebuild media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
X-VCS-Directories: media-libs/fontconfig/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 4bd15b43a94a36344204afb52c3105ce1a9e55a0
X-VCS-Branch: master
Date: Tue, 30 Aug 2022 19:06:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 15c521a9-35f4-4e5b-bc77-ce7fc96e1491
X-Archives-Hash: 6fcaddb06b1aaf49bbef626bf75ab5aa

commit:     4bd15b43a94a36344204afb52c3105ce1a9e55a0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 18:39:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 19:06:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bd15b43

media-libs/fontconfig: limit multilib features

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/fontconfig/fontconfig-2.13.93.ebuild   | 4 ++--
 media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.13.93.ebuild b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
index deaa7fcd009a..1c12de903df3 100644
--- a/media-libs/fontconfig/fontconfig-2.13.93.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
@@ -98,9 +98,9 @@ multilib_src_configure() {
 	esac
 
 	local myeconfargs=(
-		$(use_enable doc docbook)
+		$(multilib_native_use_enable doc docbook)
 		$(use_enable static-libs static)
-		--enable-docs
+		$(multilib_native_enable docs)
 		--localstatedir="${EPREFIX}"/var
 		--with-default-fonts="${EPREFIX}"/usr/share/fonts
 		--with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}"

diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
index 49b2629b5331..96da5cf7b37c 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -104,11 +104,11 @@ multilib_src_configure() {
 	esac
 
 	local myeconfargs=(
-		$(use_enable doc docbook)
+		$(multilib_native_use_enable doc docbook)
 		$(use_enable static-libs static)
 
 		# man pages. We split out the docbook parts into its own flag.
-		--enable-docs
+		$(multilib_native_enable docs)
 		# We handle this ourselves.
 		--disable-cache-build
 		# See comment above *DEPEND. We use Expat instead.