gentoo resync : 18.08.2019

3 files changed, 50 insertions, 2 deletions

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 9564203d2902..df56fec6e7e8 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -2,6 +2,7 @@ AUX 2.1.8-doc-options.patch 2121 BLAKE2B 08344eae558de800f1081c7a12a3b373915adf9
 AUX 2.1.8-fix-library-symlinks.patch 2937 BLAKE2B f26621b37fbd3f4e58289b8182bf56afcef760d6aceaa5b286389676c27dc529f62b5b4be26dd7ba28d6cbe865cf1d0e3e0b0c76bd4e026cfeff25b63b7d98a3 SHA512 0ddadfebdd8f3b8275b9f16c110e63c557549cc903e0fe8b2df4975fb69d3c529bfa6e7a4f7e78dfca2845b6b6b561a5d608bc139e74d45788d0bed477bb5eaf
 AUX 2.1.8-prevent-stack-smashing.patch 1669 BLAKE2B 8c0e603f8c2aafe0cb2b381feaf5c7f87afdfde764f1940735617cbad12afc02e25df9b9a848a580d4e5b969cd0f55b889ba50f5618c33cb9f9e5966d82ea996 SHA512 0d7374605e6221f14877539db2e17d4536ce45adc25d76adfb78043d3d699a291a213aeccd4e0bc4338a10454bb93c47270cfc525b258bf2a1029e856c1b47a9
 AUX 2.1.8-test-fix.patch 1674 BLAKE2B 5e0ff6c8d8ece11ec49c818521fbb248c13e09b14860b33e93229f41db36779aebeb3b398fc3d4c590332280cd98e756787755c54b2a600e031abe45746fbe26 SHA512 588eacbe421355b252cb98d00ef67b0205b6c9437e58ff893da822732d338cf453583b0cde3b71940c5dd24d562b0aa32cd7c0f7bd978c382eddb77527adc3f2
+AUX 2.1.8-vala-0.44-compat.patch 1597 BLAKE2B d26e88039d9aca0544c5e5fd510f8b5d5235f44ca79927aacdee83987b74196433106c26194134651d2fc44e97ea02dc91c565b43322d07f7a1dcb36b0c5ea84 SHA512 7d5940f240b6bbf62e248b165835ae08f95edf9038cc761bb972f756a1870f08d8cde1841cf3830dce0a3ec09d95cc6d24d54b603b40856dde614bbf3886dd84
 DIST tracker-2.1.8.tar.xz 2585924 BLAKE2B 8548f6a615c3357eb2f1a1656d81f50816cef2f59e23fe7bd2111eeade8b3e5c0a33abf1bc830a0baa9c1c1d74ee92d3e44da00cd6f65ab853ef04eb2f57a69e SHA512 447e519699bbb0c9802230629667a87ce39ec3f6bb9c605063319d5e6a019c95a76762fdc889b1a11280be08b8520f22f097f9c9779dcd7a6c7cf239b4da2696
-EBUILD tracker-2.1.8.ebuild 2843 BLAKE2B 85cb8f73d9ddb9044e4f755ff7613b1d17503ef1437fdfca5171e05c868ec7e2e4a58c9997b895b9ac3f52b55697583b86be4888ffc3bf8ce28fffe70fc4b6cf SHA512 dd969c28428448457191c233a0dfced6cb0e920ab11ae9d6cbf0e53a2691b8d9bcfe3f0d99e6d895b04bb62ae6d72e33e4b516e992c0fe763e0295cdc575a4ef
+EBUILD tracker-2.1.8.ebuild 2917 BLAKE2B b92781992ff10c60b9663e4d1366a168d6b7ea3c9678d59af89aceb7756a6ec46facf2cefc778de7e5f73d475e9998910a732fc941bc7584d5e3588b03c8c489 SHA512 79a21bd45e9b869d0bc854751180a72da4e70f405551c7b693a56ceded7908a18ad1f88f561b1e26239651796c9f97503df82cd25b3569d81f94dd266254dc4a
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch b/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch
new file mode 100644
index 000000000000..85a7eeadc2ba
--- /dev/null
+++ b/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch
@@ -0,0 +1,46 @@
+From e93ea9167dc4185b6c29b27abdab55b6bcd06c74 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Wed, 1 May 2019 13:38:34 +0200
+Subject: [PATCH] g-ir-merge: Avoid recursive includes
+
+Ensure the namespace is not part of the includes. This is a kludge and
+shouldn't ever happen, except it does (in continuous, induced by vala).
+
+The next big thing that would happen here is a rewrite of libtracker-sparql
+vala bits so we don't need this merging anymore, so I won't put much
+thought on it.
+---
+ utils/g-ir-merge/g-ir-merge | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/utils/g-ir-merge/g-ir-merge b/utils/g-ir-merge/g-ir-merge
+index ad79c2d29..321032a4a 100755
+--- a/utils/g-ir-merge/g-ir-merge
++++ b/utils/g-ir-merge/g-ir-merge
+@@ -89,12 +89,12 @@ def parse_inputs(files):
+     return includes, namespaces, c_includes
+ 
+ 
+-def merge_includes(all_includes):
++def merge_includes(all_includes, namespace):
+     merged = {}
+     for element in all_includes:
+         name = element.get('name')
+         version = element.get('version')
+-        if name not in merged:
++        if name not in merged and name != namespace:
+             merged[name] = element
+     return list(merged.values())
+ 
+@@ -153,7 +153,7 @@ def main():
+ 
+     all_includes, all_namespaces, all_c_includes = parse_inputs(args.files)
+ 
+-    includes = merge_includes(all_includes)
++    includes = merge_includes(all_includes, args.namespace)
+ 
+     namespace_contents, identifier_prefixes, symbol_prefixes, shared_libraries \
+         = merge_namespaces(all_namespaces)
+-- 
+2.20.1
+
diff --git a/app-misc/tracker/tracker-2.1.8.ebuild b/app-misc/tracker/tracker-2.1.8.ebuild
index 3bce3d5c2174..a709313c84a7 100644
--- a/app-misc/tracker/tracker-2.1.8.ebuild
+++ b/app-misc/tracker/tracker-2.1.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python3_{5,6,7} )
-VALA_MAX_API_VERSION="0.42"
+VALA_MAX_API_VERSION="0.44"
 
 inherit bash-completion-r1 eapi7-ver gnome.org linux-info meson python-any-r1 systemd vala xdg
 
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/59
 	"${FILESDIR}"/${PV}-prevent-stack-smashing.patch
 	"${FILESDIR}"/${PV}-fix-library-symlinks.patch
+	"${FILESDIR}"/${PV}-vala-0.44-compat.patch # upstream commit e93ea9167dc
 )
 
 function inotify_enabled() {