Fix musepack hybrid build.

media-libs/libcuefile/libcuefile-r475.recipe

@@ -2,6 +2,7 @@ SUMMARY="Cue File library from Musepack"
 DESCRIPTION="A library to work with CUE files
 "
 ARCHITECTURES="x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 REVISION="1"
 HOMEPAGE="https://www.musepack.net"
 LICENSE="GNU LGPL v2.1"
@@ -13,33 +14,33 @@ CHECKSUM_SHA256="b681ca6772b3f64010d24de57361faecf426ee6182f5969fcf29b3f649133fe
 PATCHES="libcuefile-$portVersion.patchset"
 
 PROVIDES="
-	libcuefile = $portVersion
-	lib:libcuefile = 0.0.0 compat = 0
+	libcuefile$secondaryArchSuffix = $portVersion
+	lib:libcuefile$secondaryArchSuffix = 0.0.0 compat = 0
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:cmake
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
 "
 
 PROVIDES_devel="
-	libcuefile_devel = $portVersion
-	devel:libcuefile
+	libcuefile${secondaryArchSuffix}_devel = $portVersion
+	devel:libcuefile$secondaryArchSuffix
 "
 
 REQUIRES_devel="
-	libcuefile == $portVersion base
+	libcuefile$secondaryArchSuffix == $portVersion base
 "
 
 BUILD()
 {
-	cmake . -DCMAKE_INSTALL_PREFIX=$prefix
+	cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DLIB_SUFFIX=$secondaryArchSubDir
 	make $jobArgs
 }
 

media-libs/libreplaygain/libreplaygain-r475.recipe

@@ -3,6 +3,7 @@ DESCRIPTION="libreplaygain calculates the perceived loudness of audio and \
 suggests dB adjustments according to the ReplayGain standard.
 "
 ARCHITECTURES="x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 REVISION="1"
 HOMEPAGE="https://www.musepack.net"
 LICENSE="GNU LGPL v2.1"
@@ -13,33 +14,33 @@ SOURCE_DIR="libreplaygain_r475"
 CHECKSUM_SHA256="8258bf785547ac2cda43bb195e07522f0a3682f55abe97753c974609ec232482"
 
 PROVIDES="
-	libreplaygain = $portVersion
-	lib:libreplaygain = 1.0.0 compat = 1
+	libreplaygain$secondaryArchSuffix = $portVersion
+	lib:libreplaygain$secondaryArchSuffix = 1.0.0 compat = 1
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:cmake
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
 "
 
 PROVIDES_devel="
-	libreplaygain_devel = $portVersion
-	devel:libreplaygain
+	libreplaygain_devel$secondaryArchSuffix = $portVersion
+	devel:libreplaygain$secondaryArchSuffix
 "
 
 REQUIRES_devel="
-	libreplaygain == $portVersion base
+	libreplaygain$secondaryArchSuffix == $portVersion base
 "
 
 BUILD()
 {
-	cmake . -DCMAKE_INSTALL_PREFIX=$prefix
+	cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DLIB_SUFFIX=$secondaryArchSubDir
 	make $jobArgs
 }
 

media-sound/musepack_tools/musepack_tools-r475.recipe

@@ -5,6 +5,7 @@ optimized for transparent compression of stereo audio at bitrates of 160–180 \
 MPEGplus, MPEG+ or MP+.
 "
 ARCHITECTURES="x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 REVISION="1"
 HOMEPAGE="https://www.musepack.net"
 LICENSE="
@@ -20,7 +21,7 @@ SOURCE_DIR="musepack_src_r475"
 PATCHES="musepack_tools-r475.patchset"
 
 PROVIDES="
-	musepack_tools = $portVersion
+	musepack_tools$secondaryArchSuffix = $portVersion
 	cmd:mpc2sv8
 	cmd:mpcchap
 	cmd:mpccut
@@ -28,34 +29,34 @@ PROVIDES="
 	cmd:mpcenc
 	cmd:mpcgain
 	cmd:wavcmp
-	lib:libmpcdec
+	lib:libmpcdec$secondaryArchSuffix
 "
 
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libcuefile
-	lib:libreplaygain
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libcuefile$secondaryArchSuffix
+	lib:libreplaygain$secondaryArchSuffix
 "
 
 BUILD_REQUIRES="
-	devel:libreplaygain
-	devel:libcuefile
+	devel:libreplaygain$secondaryArchSuffix
+	devel:libcuefile$secondaryArchSuffix
 "
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:cmake
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
 "
 
 PROVIDES_devel="
-	musepack_tools_devel = $portVersion
-	devel:libmpcdec
+	musepack_tools_devel$secondaryArchSuffix = $portVersion
+	devel:libmpcdec$secondaryArchSuffix
 "
 
 REQUIRES_devel="
-	musepack_tools == $portVersion base
+	musepack_tools$secondaryArchSuffix == $portVersion base
 "
 
 BUILD()
@@ -70,9 +71,10 @@ INSTALL()
 {
 	make install
 
-	mkdir -p $developDir
-	mv $prefix/include $includeDir
+	mkdir -p $includeDir
+	mv $prefix/include/* $includeDir
 	rm -r $includeDir/mpc/.svn
+	rmdir $prefix/include
 
 	mkdir -p $libDir
 	cp libmpcdec/libmpcdec.so $libDir/libmpcdec.so