dev-lang/vala/patches/vala-0.36.12.patchset

@@ -0,0 +1,84 @@
+From 3d22d5df574d2c9031ebbd007072d454cbd4007e Mon Sep 17 00:00:00 2001
+From: Kostadin Damyanov <maxmight@gmail.com>
+Date: Thu, 4 Feb 2016 05:01:46 +0200
+Subject: remove the dbus tests
+
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 41bd338..52635c0 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -316,21 +316,6 @@ TESTS = \
+ 	asynchronous/closures.vala \
+ 	asynchronous/generator.vala \
+ 	asynchronous/yield.vala \
+-	dbus/basic-types.test \
+-	dbus/arrays.test \
+-	dbus/structs.test \
+-	dbus/errors.test \
+-	dbus/async.test \
+-	dbus/async-errors.test \
+-	dbus/enum-string-marshalling.vala \
+-	dbus/signals.test \
+-	dbus/filedescriptor.test \
+-	dbus/filedescriptor-errors.test \
+-	dbus/dicts.test \
+-	dbus/bug596862.vala \
+-	dbus/bug602003.test \
+-	dbus/bug782719.test \
+-	dbus/rawvariants.test \
+ 	gir/bug651773.test \
+ 	gir/bug667751.test \
+ 	gir/bug742012.test \
+-- 
+2.15.0
+
+
+From 416e5a2e094594c4cfcdd6bc58484509b1f2d520 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Tue, 19 Dec 2017 14:43:04 +0100
+Subject: remove the gir tests
+
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 52635c0..119d5a6 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -316,12 +316,6 @@ TESTS = \
+ 	asynchronous/closures.vala \
+ 	asynchronous/generator.vala \
+ 	asynchronous/yield.vala \
+-	gir/bug651773.test \
+-	gir/bug667751.test \
+-	gir/bug742012.test \
+-	gir/bug788775.test \
+-	gir/array-fixed-length.test \
+-	gir/delegate-alias-without-target.test \
+ 	annotations/deprecated.vala \
+ 	annotations/description.vala \
+ 	annotations/noaccessormethod.test \
+-- 
+2.15.0
+
+
+From f06e57dd7e08384c3a7d605da4508dae9faa2fb2 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Tue, 19 Dec 2017 15:13:02 +0100
+Subject: remove control-flow/bug736774-2.vala test
+
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 119d5a6..d4cfd3e 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -126,7 +126,6 @@ TESTS = \
+ 	control-flow/bug665904.vala \
+ 	control-flow/bug691514.vala	\
+ 	control-flow/bug736774-1.vala \
+-	control-flow/bug736774-2.vala \
+ 	control-flow/bug790903.test \
+ 	enums/enum_only.vala \
+ 	enums/enums.vala \
+-- 
+2.15.0
+

dev-lang/vala/vala-0.36.4.recipe → dev-lang/vala/vala-0.36.12.recipe

@@ -4,50 +4,56 @@ programming language features to GNOME developers without imposing any \
 additional runtime requirements and without using a different ABI \
 compared to applications and libraries written in C."
 HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-COPYRIGHT="2006-2016 Jürg Billeter
-	2006-2016 Raffaele Sandrini"
+COPYRIGHT="2006-2018 Jürg Billeter
+	2006-2018 Raffaele Sandrini"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="https://download.gnome.org/sources/vala/${portVersion%.*}/vala-$portVersion.tar.xz"
-CHECKSUM_SHA256="e9f23ce711c1a72ce664d10946fbc5953f01b0b7f2a3562e7a01e362d86de059"
+CHECKSUM_SHA256="b4081d3d313cf9c3e8d7d795983cf8f7ed99286d1abc1b5709b0f17883387cdb"
 SOURCE_DIR="vala-$portVersion"
 PATCHES="vala-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="0.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
+portVers="${portVersion%.*}"
 
 PROVIDES="
-	vala$secondaryArchSuffix = $portVersion
+	vala$secondaryArchSuffix = $portVersionCompat
 	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:vapicheck$secondaryArchSuffix
+	cmd:vapicheck_$portVers$secondaryArchSuffix
 	cmd:vapigen$secondaryArchSuffix
-	cmd:vala_gen_introspect$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${secondaryArchSuffix}_common = $portVersion
+	cmd:vapigen_$portVers$secondaryArchSuffix
+	lib:libvala_$portVers$secondaryArchSuffix = $libVersionCompat
+	devel:libvala_$portVers$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	glib2${secondaryArchSuffix} >= 2.32.0
-	vala${secondaryArchSuffix}_common == $portVersion
+	lib:libdbus_1$secondaryArchSuffix
 	lib:libffi$secondaryArchSuffix
+	lib:libglib_2.0$secondaryArchSuffix
+	lib:libgobject_2.0$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	"
-REQUIRES_common="
-	haiku$secondaryArchSuffix
+REPLACES="
+	vala${secondaryArchSuffix}_common
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	glib2${secondaryArchSuffix}_devel >= 2.32.0
+	devel:libdbus_1$secondaryArchSuffix
+	devel:libglib_2.0$secondaryArchSuffix
+	devel:libgobject_2.0$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
@@ -64,6 +70,17 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage vala$secondaryArchSuffix \
+	$binDir/vala \
+	$binDir/vala-$portVers \
+	$binDir/valac \
+	$binDir/valac-$portVers \
+	$binDir/vapicheck \
+	$binDir/vapicheck-$portVers \
+	$binDir/vapigen \
+	$binDir/vapigen-$portVers \
+	$libDir/libvala-$portVers.so.$libVersion
+
 BUILD()
 {
 	autoreconf -fi
@@ -75,22 +92,13 @@ INSTALL()
 {
 	make install
 
-	# remove libtool library files
-	rm $libDir/lib*.la
+	rm -f $libDir/*.la
 
+	prepareInstalledDevelLib libvala-$portVers
 	fixPkgconfig
-
-	packageEntries common \
-		$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 -e 's/-lm/-lroot/g' $sourceDir/tests/testrunner.sh
 	make check
 }