From 1ae24229354741506f003b64893c6aeaa064d16e Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sat, 26 Mar 2016 08:47:18 +0000
Subject: [PATCH] vala: bump to version 0.32.0.

* Bump version using the exact copy of the patch for 0.30.1 since
  there are no offset mismatches.
* Add !x86_gcc2 to secondary arch.
* Replace hard-coded 0.32 by ${portVersion%.*} to reduce future diffs.
* Use vala_x86_common instead of vala_common_x86 and ajust provides
  and requires. (No other package is using vala so this fix is safe.)
* Iron INSTALL() to get rid of the empty data/aclocal/ in vala since
  {vala,vapigen}.m4 are in vala{,_x86}_common.
* Add "-e" to sed as some OSes have strict/picky implementations.
---
 ...a-0.30.1.patchset => vala-0.32.0.patchset} |  0
 ...{vala-0.30.1.recipe => vala-0.32.0.recipe} | 29 ++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)
 rename dev-lang/vala/patches/{vala-0.30.1.patchset => vala-0.32.0.patchset} (100%)
 rename dev-lang/vala/{vala-0.30.1.recipe => vala-0.32.0.recipe} (68%)

diff --git a/dev-lang/vala/patches/vala-0.30.1.patchset b/dev-lang/vala/patches/vala-0.32.0.patchset
similarity index 100%
rename from dev-lang/vala/patches/vala-0.30.1.patchset
rename to dev-lang/vala/patches/vala-0.32.0.patchset
diff --git a/dev-lang/vala/vala-0.30.1.recipe b/dev-lang/vala/vala-0.32.0.recipe
similarity index 68%
rename from dev-lang/vala/vala-0.30.1.recipe
rename to dev-lang/vala/vala-0.32.0.recipe
index 9392a0e16..281ee1392 100644
--- a/dev-lang/vala/vala-0.30.1.recipe
+++ b/dev-lang/vala/vala-0.32.0.recipe
@@ -8,13 +8,13 @@ COPYRIGHT="2006-2016 Jürg Billeter
 	2006-2016 Raffaele Sandrini"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
-SOURCE_URI="https://download.gnome.org/sources/vala/0.30/vala-$portVersion.tar.xz"
-CHECKSUM_SHA256="23add78e5c6a5e6df019d4a885c9c79814c9e0b957519ec8a4f4d826c4e5df2c"
+SOURCE_URI="https://download.gnome.org/sources/vala/${portVersion%.*}/vala-$portVersion.tar.xz"
+CHECKSUM_SHA256="07a2aa4ede040789b4b5af817a42249d703bfe8affccb7732ca2b53d00c1fb6e"
 SOURCE_DIR="vala-$portVersion"
 PATCHES="vala-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86"
+SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
 PROVIDES="
 	vala$secondaryArchSuffix = $portVersion
@@ -23,20 +23,20 @@ PROVIDES="
 	cmd:vapicheck$secondaryArchSuffix
 	cmd:vapigen$secondaryArchSuffix
 	cmd:vala_gen_introspect$secondaryArchSuffix
-	cmd:vala_0.30$secondaryArchSuffix
-	cmd:vala_gen_introspect_0.30$secondaryArchSuffix
-	cmd:valac_0.30$secondaryArchSuffix
-	cmd:vapicheck_0.30$secondaryArchSuffix
-	cmd:vapigen_0.30$secondaryArchSuffix
-	lib:libvala_0.30$secondaryArchSuffix
+	cmd:vala_${portVersion%.*}$secondaryArchSuffix
+	cmd:vala_gen_introspect_${portVersion%.*}$secondaryArchSuffix
+	cmd:valac_${portVersion%.*}$secondaryArchSuffix
+	cmd:vapicheck_${portVersion%.*}$secondaryArchSuffix
+	cmd:vapigen_${portVersion%.*}$secondaryArchSuffix
+	lib:libvala_${portVersion%.*}$secondaryArchSuffix
 	"
 PROVIDES_common="
-	vala_common$secondaryArchSuffix = $portVersion
+	vala${secondaryArchSuffix}_common = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	glib2${secondaryArchSuffix} >= 2.32.0
-	vala_common$secondaryArchSuffix == $portVersion
+	vala${secondaryArchSuffix}_common == $portVersion
 	lib:libffi$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
@@ -46,10 +46,10 @@ REQUIRES_common="
 	"
 
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	glib2${secondaryArchSuffix}_devel >= 2.32.0
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:awk
 	cmd:bison
@@ -82,10 +82,13 @@ INSTALL()
 		$dataDir/aclocal/vapigen.m4 \
 		$dataDir/aclocal/vala.m4 \
 		$dataDir/vala/Makefile.vapigen
+
+	# Avoid having an empty data/aclocal/ in vala$secondaryArchSuffix
+	rmdir $dataDir/aclocal
 }
 
 TEST()
 {
-	sed -i 's/-lm/-lroot/g' $sourceDir/tests/testrunner.sh
+	sed -i -e 's/-lm/-lroot/g' $sourceDir/tests/testrunner.sh
 	make check
 }