From ddc6224614fb731089ab10c1e2a94b12c5ebcc75 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Tue, 23 Sep 2014 13:15:13 -0400
Subject: [PATCH] fontconfig: fixes from munchausen.

And a few more from me, including directory fixes for PM.
---
 .../fontconfig/fontconfig-2.11.1.recipe       | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/media-libs/fontconfig/fontconfig-2.11.1.recipe b/media-libs/fontconfig/fontconfig-2.11.1.recipe
index 902c4902b..3eb0a93df 100644
--- a/media-libs/fontconfig/fontconfig-2.11.1.recipe
+++ b/media-libs/fontconfig/fontconfig-2.11.1.recipe
@@ -11,8 +11,8 @@ COPYRIGHT="2000-2005, 2006-2007 Keith Packard
 	2009 Roozbeh Pournader
 	2008-2009 Red Hat, Inc.
 	2008 Danilo Segan
-	2012 Google, Inc."
-
+	2012 Google, Inc.
+	"
 REVISION="2"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -70,36 +70,35 @@ GLOBAL_WRITABLE_FILES="
 
 BUILD()
 {
-	export PKG_CONFIG_PATH=`finddir B_SYSTEM_DEVELOP_DIRECTORY`/lib$secondaryArchSubDir/pkgconfig
-
 	mkdir -p `finddir B_USER_CACHE_DIRECTORY`
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
 	automake
 	FONTS_DIR=`finddir B_SYSTEM_FONTS_DIRECTORY`
-	FONTS_DIR2=`finddir B_BEOS_FONTS_DIRECTORY`
+	FONTS_DIR2=`finddir B_SYSTEM_NONPACKAGED_FONTS_DIRECTORY`
 	FONTS_DIR3=`finddir B_USER_FONTS_DIRECTORY`
+	FONTS_DIR4=`finddir B_USER_NONPACKAGED_FONTS_DIRECTORY`
 	CACHE_DIR=`finddir B_USER_CACHE_DIRECTORY`
 	runConfigure ./configure \
 		--enable-libxml2 \
 		--with-default-fonts=${FONTS_DIR} \
-		--with-add-fonts=${FONTS_DIR2},${FONTS_DIR3} \
+		--with-add-fonts=${FONTS_DIR2},${FONTS_DIR3},${FONTS_DIR4} \
 		--with-cache-dir=${CACHE_DIR}
 	make $jobArgs
 }
 
 INSTALL()
 {
-	make install
+	make install RUN_FC_CACHE_TEST=false
 	
-	prepareInstalledDevelLibs libfontconfig
+	prepareInstalledDevelLibs \
+		libfontconfig
 	fixPkgconfig
 	
-	#devel package
 	packageEntries devel \
 		$developDir \
-		$manDir/man3 \
+		$manDir \
 		$docDir
 }