From a03db20b9001d8e73a7eb226e9ba05085a71687e Mon Sep 17 00:00:00 2001
From: Artur Jamro <artur.jamro@gmail.com>
Date: Fri, 3 Jan 2014 22:49:17 +0000
Subject: [PATCH] IlmBase and OpenEXR recipes: provided some fixes

---
 media-libs/ilmbase/ilmbase-2.1.0.recipe | 18 +++++++++---------
 media-libs/openexr/openexr-2.1.0.recipe | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/media-libs/ilmbase/ilmbase-2.1.0.recipe b/media-libs/ilmbase/ilmbase-2.1.0.recipe
index f902c61ab..e3f497dce 100644
--- a/media-libs/ilmbase/ilmbase-2.1.0.recipe
+++ b/media-libs/ilmbase/ilmbase-2.1.0.recipe
@@ -64,15 +64,15 @@ INSTALL()
 	make install
 	
 	# prepare development lib links
-	prepareInstalledDevelLibs libHalf
-	prepareInstalledDevelLibs libIex
-	prepareInstalledDevelLibs libIexMath
-	prepareInstalledDevelLibs libIlmThread
-	prepareInstalledDevelLibs libImath
-	prepareInstalledDevelLibs libIex-2_1
-	prepareInstalledDevelLibs libIexMath-2_1
-	prepareInstalledDevelLibs libIlmThread-2_1
-	prepareInstalledDevelLibs libImath-2_1
+	prepareInstalledDevelLibs libHalf \
+							libIex \
+							libIexMath \
+							libIlmThread \
+							libImath \
+							libIex-2_1 \
+							libIexMath-2_1 \
+							libIlmThread-2_1 \
+							libImath-2_1
 	
 	fixPkgconfig
 	
diff --git a/media-libs/openexr/openexr-2.1.0.recipe b/media-libs/openexr/openexr-2.1.0.recipe
index f5046cbed..777db4078 100644
--- a/media-libs/openexr/openexr-2.1.0.recipe
+++ b/media-libs/openexr/openexr-2.1.0.recipe
@@ -29,6 +29,7 @@ PATCHES="openexr-2.1.0.patch"
 
 PROVIDES="
 	openexr$secondaryArchSuffix = $portVersion
+	lib:libIlmImf$secondaryArchSuffix = $portVersion
 	lib:libIlmImf_Imf_2_1$secondaryArchSuffix = $portVersion
 	cmd:exrenvmap$secondaryArchSuffix = $portVersion
 	cmd:exrheader$secondaryArchSuffix = $portVersion
@@ -73,7 +74,7 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:aclocal
 	cmd:libtoolize
-	cmd:pkg_config
+	cmd:pkg_config$secondaryArchSuffix
 	"
 	
 BUILD()
@@ -94,20 +95,19 @@ INSTALL()
 	make install
 	
 	# prepare development documentation
-	devDocDir=$developDocDir
-	mkdir -p $devDocDir
-	mv $dataDir/doc $devDocDir
+	mkdir -p $developDocDir
+	mv $dataDir/doc $developDocDir
 	
 	# prepare autom4te script
-	aclocalDir=$developDir
-	mkdir -p $aclocalDir
-	mv $dataDir/aclocal $aclocalDir
+	mkdir -p $developDir
+	mv $dataDir/aclocal $developDir
 	
 	#clear empty directory
 	rmdir $dataDir
 	
 	# prepare development lib links
-	prepareInstalledDevelLibs libIlmImf
+	prepareInstalledDevelLibs libIlmImf-Imf_2_1 \
+							libIlmImf
 	
 	fixPkgconfig
 	
@@ -120,7 +120,7 @@ INSTALL()
 PROVIDES_devel="
 	openexr${secondaryArchSuffix}_devel = $portVersion
 	devel:libIlmImf$secondaryArchSuffix = $portVersion
-	doc:libIlmImf$secondaryArchSuffix = $portVersion
+	devel:libIlmImf_Imf_2_1$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
 	openexr$secondaryArchSuffix == $portVersion base