From 797d39d80b0582f7ddef7cd72fa9153a036bb35d Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Fri, 20 Apr 2018 11:09:00 +0000
Subject: [PATCH] vala: Add commandBinDir. Add 2 libs to the debuginfo package.

---
 dev-lang/vala/vala-0.40.4.recipe | 39 ++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/dev-lang/vala/vala-0.40.4.recipe b/dev-lang/vala/vala-0.40.4.recipe
index 449334208..66c4807fb 100644
--- a/dev-lang/vala/vala-0.40.4.recipe
+++ b/dev-lang/vala/vala-0.40.4.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 COPYRIGHT="2006-2018 Jürg Billeter
 	2006-2018 Raffaele Sandrini"
 LICENSE="GNU LGPL v2.1"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.gnome.org/sources/vala/${portVersion%.*}/vala-$portVersion.tar.xz"
 CHECKSUM_SHA256="379354a2a2f7ee5c4d6e0f5e88b0e32620dcd5f51972baf6d90d9f18eb689198"
 PATCHES="vala-$portVersion.patchset"
@@ -15,22 +15,29 @@ PATCHES="vala-$portVersion.patchset"
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 libVersion="0.0.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 portVers="${portVersion%.*}"
 
 PROVIDES="
 	vala$secondaryArchSuffix = $portVersion
-	cmd:vala$secondaryArchSuffix
-	cmd:vala_$portVers$secondaryArchSuffix
-	cmd:vala_gen_introspect$secondaryArchSuffix
-	cmd:vala_gen_introspect_$portVers$secondaryArchSuffix
-	cmd:valac$secondaryArchSuffix
-	cmd:valac_$portVers$secondaryArchSuffix
-	cmd:valadoc$secondaryArchSuffix
-	cmd:valadoc_$portVers$secondaryArchSuffix
-	cmd:vapigen$secondaryArchSuffix
-	cmd:vapigen_$portVers$secondaryArchSuffix
+	cmd:vala$commandSuffix
+	cmd:vala_$portVers$commandSuffix
+	cmd:vala_gen_introspect$commandSuffix
+	cmd:vala_gen_introspect_$portVers$commandSuffix
+	cmd:valac$commandSuffix
+	cmd:valac_$portVers$commandSuffix
+	cmd:valadoc$commandSuffix
+	cmd:valadoc_$portVers$commandSuffix
+	cmd:vapigen$commandSuffix
+	cmd:vapigen_$portVers$commandSuffix
 	lib:libvala_$portVers$secondaryArchSuffix = $libVersionCompat
 	lib:libvaladoc_$portVers$secondaryArchSuffix = $libVersionCompat
 	devel:libvala_$portVers$secondaryArchSuffix = $libVersionCompat
@@ -77,11 +84,13 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage vala$secondaryArchSuffix \
-	"$binDir"/valac-$portVers \
-	"$binDir"/valadoc-$portVers \
-	"$binDir"/vapigen-$portVers \
+	"$commandBinDir"/valac-$portVers \
+	"$commandBinDir"/valadoc-$portVers \
+	"$commandBinDir"/vapigen-$portVers \
 	"$libDir"/libvala-$portVers.so.$libVersion \
 	"$libDir"/libvaladoc-$portVers.so.$libVersion \
+	"$libDir"/vala-$portVers/gen-introspect-$portVers \
+	"$libDir"/vala-$portVers/libvalaccodegen.so \
 	"$libDir"/valadoc/doclets/devhelp/libdoclet.so \
 	"$libDir"/valadoc/doclets/gtkdoc/libdoclet.so \
 	"$libDir"/valadoc/doclets/html/libdoclet.so \
@@ -89,7 +98,7 @@ defineDebugInfoPackage vala$secondaryArchSuffix \
 BUILD()
 {
 	autoreconf -fi
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir"
 	make $jobArgs
 }