gentoo resync : 03.03.2019

4 files changed, 41 insertions, 3 deletions

diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 544864f724de..4a88ecc2c987 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,4 +1,5 @@
+AUX 0.11.4-vala-0.42-compat.patch 1073 BLAKE2B 06381277531ded9adda4dc6246176de7f1d6243d05746b667071d76f9e7246d63b8a56aa51b364c02e8ef5c3aa924109d4e9c01a9b311868f66287b769443e45 SHA512 f925fe81d6422fd73aa1b0b624d8bbc7a18f029ed8e806a418c752d32a084d6c2d8b8d205e8a5d65a5a6e6f212c00165b70377f7c6e6caf1d84d7bcd31a7f0fc
 DIST folks-0.11.4.tar.xz 1972272 BLAKE2B 69fa21f9baf34a3597f8a7e3f789ab3d03ad508ec74e0e1dfaa8df09865cb99748483b4fa4aa9c219803c512a49a23e95d4c3ded5b285b0a0d2f7416a1d9bf7f SHA512 bd4088322c34b5d6e633d7d5d83dfb61eb3499014adf6fecad27231ec63509401b2867186d019a2f7c92cc3b3f2e6cfbc80e0d4700d84ce7a08d8153af3d2392
-EBUILD folks-0.11.4-r1.ebuild 2423 BLAKE2B 1f58106f9395204dc114c7f0773d18ea4b7a2c2d2eebe51ddc8cc079af8d6dd9bdf62baa6bb4d2af971dfce092921d268fd26827afc155e91aa10f9f4b543d26 SHA512 0467bd85c89c02609f15bb88db1989bbdb284bb6efaf1c6b013e9b57564bbdefef95414ada4778d4d5776ee689e24cb74d4dbcfddba0963714801586b63f805b
-EBUILD folks-0.11.4.ebuild 2287 BLAKE2B bc94e9869374962d0e233884b34251316a4a3c7751755112c6438721d682924b9c9a208aeaac69162e3834dab3f7ce844f38cc8d965628ca152ba551e294a7b1 SHA512 5a73ee4bcc651d16162a10729df1ed5b333a7a9d33293276285d133ceb3c2b867059451aca89518b7038d5d7c2a0fd19599474a3e0610d06e5f8d6ffadba7aed
+EBUILD folks-0.11.4-r1.ebuild 2480 BLAKE2B 8f775b05f7cd02a8d8470969052f3b685fdf6a349de6c81414e963e8f4c365f211ddf68fc655e77ae063591afa5acd13cbaa3bb3fae9e4483ab72cfdacc93809 SHA512 814df8c8b00c5b724e9763c8369c2df52486fc5b751895d4e5e2a9651a357e30ab0b3b7ace666700166b104586f2e8cbf7e87b1338db5581c04c834979a059c7
+EBUILD folks-0.11.4.ebuild 2315 BLAKE2B 62bf6fdc24e0b1702084e9a9b559f281a93b4b36e619b877b6f2d42149e1e83514a72339ba1a0f2b8ba858fdd95c0df1a55e89068a60e6a4665be47cbea59de1 SHA512 d8038166bd0970f3fe22df78479906c3d332da58d695e1b1238bf6f964cc939e3f03c6a40e09483f40aa4a7fbbd80e91614e70318f4b37a5e8de486f55184be1
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch b/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
new file mode 100644
index 000000000000..21b0e44ab968
--- /dev/null
+++ b/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
@@ -0,0 +1,32 @@
+From 6a5c9e7e8daf4e1361709a75719c17c8c28a6c4b Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Fri, 23 Mar 2018 17:55:11 +0100
+Subject: [PATCH] inspect: Adapt to binding change of
+ Signal.add_emission_hook() in vala 0.41
+
+https://git.gnome.org/browse/vala/commit/?id=1d4db9f276c2593f072313864c743c6dd16acf35
+
+Reviewed-by: Philip Withnall <withnall@endlessm.com>
+---
+ tools/inspect/signal-manager.vala | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tools/inspect/signal-manager.vala b/tools/inspect/signal-manager.vala
+index 4d1b6480..7c5b17a0 100644
+--- a/tools/inspect/signal-manager.vala
++++ b/tools/inspect/signal-manager.vala
+@@ -430,7 +430,11 @@ public class Folks.Inspect.SignalManager : Object
+         return false;
+ 
+       ulong hook_id = Signal.add_emission_hook (signal_id,
++#if VALA_0_42
++          detail_quark, this.emission_hook_cb);
++#else
+           detail_quark, this.emission_hook_cb, null);
++#endif
+ 
+       /* Store the hook ID so we can list or remove it later */
+       HashMap<uint, ulong> hook_ids =
+-- 
+2.18.1
+
diff --git a/dev-libs/folks/folks-0.11.4-r1.ebuild b/dev-libs/folks/folks-0.11.4-r1.ebuild
index 821d24168b25..9b5eebac778a 100644
--- a/dev-libs/folks/folks-0.11.4-r1.ebuild
+++ b/dev-libs/folks/folks-0.11.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -56,6 +56,10 @@ DEPEND="${COMMON_DEPEND}
 			>=dev-libs/glib-2.40:2 ) )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-vala-0.42-compat.patch
+)
+
 src_prepare() {
 	# Force re-generation of introspection files, otherwise it does not match installed libs
 	find -name "*.vala" -exec touch {} \; || die
diff --git a/dev-libs/folks/folks-0.11.4.ebuild b/dev-libs/folks/folks-0.11.4.ebuild
index 0eb6f1710ee3..ce7878547564 100644
--- a/dev-libs/folks/folks-0.11.4.ebuild
+++ b/dev-libs/folks/folks-0.11.4.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
+VALA_MAX_API_VERSION="0.40"
 
 inherit gnome2 vala virtualx