libfaac: fix hybrid support

media-libs/faac/faac-1.28.recipe

@@ -5,7 +5,7 @@ FAAC is an MPEG-4 and MPEG-2 AAC encoder.
 HOMEPAGE="http://www.audiocoding.com/"
 SRC_URI="http://downloads.sourceforge.net/faac/faac-1.28.tar.bz2"
 CHECKSUM_SHA256="aac475e59d38ae9e29bff760e26bf72b507ccec037a6837cc33e3ac1db3ef352"
-REVISION="1"
+REVISION="2"
 
 LICENSE="GNU GPL v2"
 COPYRIGHT="Copyright (C) 2003 Krzysztof Nikiel"
@@ -15,12 +15,12 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
 PROVIDES="
 	faac${secondaryArchSuffix} = $portVersion
-	lib:libfaac
-	cmd:faac
+	lib:libfaac$secondaryArchSuffix
+	cmd:faac$secondaryArchSuffix
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 
 BUILD_REQUIRES="
@@ -39,7 +39,18 @@ BUILD_PREREQUIRES="
 
 SOURCE_DIR="faac-${portVersion}"
 
-PATCHES="faac-${portVersion}.patch"
+#PATCHES="faac-${portVersion}.patch"
+
+PATCH()
+{
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in
+
+	if [ "$targetArchitecture" = x86_gcc2 ]; then
+		sed -i 's/-lstdc++/-lstdc++.r4/' configure.in frontend/Makefile.am
+	else
+		sed -i 's/-lstdc++//' configure.in frontend/Makefile.am
+	fi
+}
 
 BUILD()
 {