From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5730C138334 for ; Sat, 2 Jun 2018 14:14:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 524D1E086A; Sat, 2 Jun 2018 14:14:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 276B4E086A for ; Sat, 2 Jun 2018 14:14:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED5E5335C77 for ; Sat, 2 Jun 2018 14:14:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 488D0291 for ; Sat, 2 Jun 2018 14:14:47 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1527948871.32504cdd07879f891dbec667fa143abeed821871.grobian@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.0-r4.ebuild X-VCS-Directories: media-libs/fontconfig/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 32504cdd07879f891dbec667fa143abeed821871 X-VCS-Branch: master Date: Sat, 2 Jun 2018 14:14:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4ec66d3f-eb56-43c6-9a8a-1e19aeb68870 X-Archives-Hash: f967697392a9925e9a63fe00220e999f commit: 32504cdd07879f891dbec667fa143abeed821871 Author: Fabian Groffen gentoo org> AuthorDate: Sat Jun 2 14:14:02 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Jun 2 14:14:31 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32504cdd media-libs/fontconfig: use host uuid on Darwin Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild index fb9e57feeeb..c80ddcea1c0 100644 --- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild +++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild @@ -12,14 +12,14 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2" LICENSE="MIT" SLOT="1.0" [[ $(ver_cut 3) -ge 90 ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc static-libs" # Purposefully dropped the xml USE flag and libxml2 support. Expat is the # default and used by every distro. See bug #283191. RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] >=media-libs/freetype-2.9[${MULTILIB_USEDEP}] - sys-apps/util-linux[${MULTILIB_USEDEP}] + !elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) virtual/libintl[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} virtual/pkgconfig @@ -73,6 +73,13 @@ multilib_src_configure() { ;; esac + if [[ ${CHOST} == *-darwin* ]] ; then + # Darwin provides uuid in libSystem, avoid pkg-config check for + # it with some dummy values + export UUID_CFLAGS="-I/usr/include/uuid-dummy" + export UUID_LIBS="-lc" + fi + local myeconfargs=( $(use_enable doc docbook) $(use_enable static-libs static)