gentoo resync : 16.02.1018

6 files changed, 36 insertions, 6 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index ffaabbdd4d42..d8555a02cedb 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest
index 6c4769ffe777..b5412a89a20b 100644
--- a/gnome-base/gnome-extra-apps/Manifest
+++ b/gnome-base/gnome-extra-apps/Manifest
@@ -1,3 +1,3 @@
 EBUILD gnome-extra-apps-3.24.2.ebuild 2335 BLAKE2B 2bafe0766ef3e641f0a7281defcfdb2b75b05b222a5098a552d0a5cd9b4ba7925c82a3fa8889bca4183360a39d7a4a5840c1343e30bf92495f2a1e76b9829645 SHA512 671d41127a5144a31985b96e9768312cb4e4cdfd9a5e45269a18bd3c6d7bae4dc644b265dc358181017542131a8c5f77825cee5c884673f2ee1605b921489f95
-EBUILD gnome-extra-apps-3.26.2.ebuild 2602 BLAKE2B 91ce08bd256637451ac3233f3edc63f2239ee947d55810d79d20ba6db7f6f0a2d9443f52cfcabc3c493e1b22df2fd48bf2acfa5a88c920bd73f190aa8d6c9989 SHA512 4146aeca0ade2e5b7a73cc2948e975951d9460e038e8bd99d22b3bda852f937ec5f48f77f0bee83d28c66d54782c6507ac71f4db508108d7aabd4a64da8a693e
+EBUILD gnome-extra-apps-3.26.2.ebuild 2637 BLAKE2B f42ca87dd439b9913d695c027d76b9f4370dd3d5f18fc87fbac45bfde6f8586c0cee39756baf14354bd0cdd7edbe678923c1f451086aa9da60b5f5e0f1bf367e SHA512 983291ebfa7eb1e732d921c9146a759e91ebc8ba6f154e2c0360d71b40e38d7f22ab99ad10e94bd64cf67f2015bace8cf62b11dba981bb8d16d3cf5fae8db9de
 MISC metadata.xml 617 BLAKE2B ee89ac320ee9fa2c6a29d3d8b86df05a734781bfb5e538f9f84a85c9467672901713d94347acbef958c8c5733f9a0a07f0b008bf84f2daa2df5390bf8225eb66 SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild
index 2930116ade94..46363ec22016 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild
@@ -67,9 +67,10 @@ RDEPEND="
 	share? ( >=gnome-extra/gnome-user-share-3.18.3 )
 	shotwell? ( >=media-gfx/shotwell-0.26 )
 	tracker? (
-		>=app-misc/tracker-1.12
+		>=app-misc/tracker-2.0.1
+		>=app-misc/tracker-miners-2.0.2
 		>=media-gfx/gnome-photos-${PV}
-		>=media-sound/gnome-music-3.24.2 )
+		>=media-sound/gnome-music-3.26.1 )
 " # tracker and gnome-music versions kept back for now, to handle tracker-2 migration separately
 DEPEND=""
 S=${WORKDIR}
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index 62b74a9898b0..ba8b1b2037f5 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -1,3 +1,4 @@
+AUX 3.12.0-vala-0.42-compat.patch 811 BLAKE2B 1f50e441d0483d3748db1ed7d18e581df2887160a16afe7bb8a47890e162349cd5611070ea11ceef1273c8d4865b7f5ead6bfad14a171ca5d21d32d7a8811468 SHA512 12e16ca43044ca96a4f5abdd3d982bfd705e17df2630505154ad1592dbb8ce1bad66c4624a992084a1533d58fd96c178a5d4c147c79a5074183ceaaf54dde998
 DIST libgnome-keyring-3.12.0.tar.xz 435092 BLAKE2B 16e02ce3509b98e325658fc64e5731a872a050a9bf1b39dc81347a53aaee2fd4726ab9b0a41c7451249954a01144488e720f8356e77dda5bc9da5f78416d30e1 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd
-EBUILD libgnome-keyring-3.12.0-r1.ebuild 1721 BLAKE2B 42e63beac806452b7844461f540d05be0d9d30feda9fc01969ead3605ede65ad7ddd71d4909718291761e6572e84c215336fc11c405a5713539bd2676c25220d SHA512 1b68dd1e87d2d91f3211f02b20fb714fa83dfd466a147397c10704c05766073ffe78a6b592ee8068345999eaf2670f8bc4669e6f379914a8c6e01758b1420f81
+EBUILD libgnome-keyring-3.12.0-r1.ebuild 1865 BLAKE2B ff35f2c9306b7d9c63bd23e172c990ca50e5aaa6d4869e78335670258e439cd6b96459a18f8a5dcde1d247ae377f67a8ebaefacbe865db3efb2324624e3e946c SHA512 d5596e04d4de901ada204b567166735d758b6088b94e6ff888b1158df2318f9c2621188348f164cae5ae08c386078196554924d710cb40f29e0cd9f652572307
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch b/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch
new file mode 100644
index 000000000000..dd420c86732e
--- /dev/null
+++ b/gnome-base/libgnome-keyring/files/3.12.0-vala-0.42-compat.patch
@@ -0,0 +1,25 @@
+From 3766bcc482f9e02fb5f9c183e814833ad1fbf08a Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 8 Jan 2019 12:19:36 +0100
+Subject: [PATCH] Fix vapi build with vala 0.42
+
+---
+ library/GnomeKeyring-1.0.metadata | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/library/GnomeKeyring-1.0.metadata b/library/GnomeKeyring-1.0.metadata
+index 04662fb..d8451b9 100644
+--- a/library/GnomeKeyring-1.0.metadata
++++ b/library/GnomeKeyring-1.0.metadata
+@@ -54,7 +54,7 @@ set_info skip=false
+ set_network_password skip=false
+ store_password skip=false
+ store_password_sync skip=false
+-unlock skip=false
++@unlock skip=false
+ 
+ find_items*.callback type_arguments="GnomeKeyring.Found"
+ find_network_password*.callback type_arguments="GnomeKeyring.NetworkPasswordData"
+-- 
+2.18.1
+
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
index 9ff7fcf6a720..fb64bd0550b9 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -31,11 +31,14 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
+	test? ( $(python_gen_any_dep '
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]') )
 	vala? ( $(vala_depend) )
 "
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PV}-vala-0.42-compat.patch
 	use vala && vala_src_prepare
 	gnome2_src_prepare