From 20a4b5d41d1d23b15fe35fa8ec7e84fafd9de3d5 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 2 Sep 2014 18:06:17 +0000
Subject: [PATCH] flac: cleanup

* don't include the tools for secondary architectures.
---
 media-libs/flac/flac-1.3.0.recipe | 33 ++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/media-libs/flac/flac-1.3.0.recipe b/media-libs/flac/flac-1.3.0.recipe
index 1fa598f90..6135d24ad 100644
--- a/media-libs/flac/flac-1.3.0.recipe
+++ b/media-libs/flac/flac-1.3.0.recipe
@@ -10,7 +10,7 @@ stereo) just like you would an MP3 file.
 HOMEPAGE="http://flac.sourceforge.net/" 
 SRC_URI="http://downloads.xiph.org/releases/flac/flac-1.3.0.tar.xz"
 CHECKSUM_SHA256="fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc"
-REVISION="1"
+REVISION="2"
 
 LICENSE="GNU LGPL v2.1
 	GNU GPL v2
@@ -24,17 +24,21 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	flac$secondaryArchSuffix = $portVersion compat >= 1
-	libFLAC$secondaryArchSuffix = 1.3.0 compat >= 1
-	cmd:flac$secondaryArchSuffix
-	cmd:metaflac$secondaryArchSuffix 
-	lib:libFLAC++$secondaryArchSuffix
-	lib:libFLAC$secondaryArchSuffix
+	lib:libFLAC++$secondaryArchSuffix = 8.3.0 compat >= 8
+	lib:libFLAC$secondaryArchSuffix = 6.3.0 compat >= 6
 	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:flac$secondaryArchSuffix
+		cmd:metaflac$secondaryArchSuffix 
+		"
+fi
 	
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libiconv$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
 	"
 	
 BUILD_REQUIRES="
@@ -55,6 +59,7 @@ BUILD_PREREQUIRES="
 	cmd:gawk
 	cmd:perl
 	cmd:find
+	cmd:gettext
 	"
 
 BUILD()
@@ -69,9 +74,11 @@ BUILD()
 INSTALL()
 {
 	make install
-		
-	prepareInstalledDevelLibs libFLAC
-	prepareInstalledDevelLibs libFLAC++
+
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir $documentationDir
+	fi		
+	prepareInstalledDevelLibs libFLAC libFLAC++
 	fixPkgconfig
 	
 	# devel package
@@ -96,13 +103,11 @@ TEST()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	flac${secondaryArchSuffix}_devel = $portVersion
-	libFLAC${secondaryArchSuffix}_devel = $portVersion
-	devel:flac$secondaryArchSuffix = 8.3.0 compat >= 8
+	flac${secondaryArchSuffix}_devel = $portVersion compat >= 1
 	devel:libFLAC$secondaryArchSuffix = 8.3.0 compat >= 8
-	devel:libFLAC++$secondaryArchSuffix = 8.3.0 compat >= 8
+	devel:libFLAC++$secondaryArchSuffix = 6.3.0 compat >= 6
 	"
 
 REQUIRES_devel="
-	libFLAC$secondaryArchSuffix == $portVersion
+	flac$secondaryArchSuffix == $portVersion base
 	"