Commit missing patch

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 118 insertions, 5 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index edebc34ec919..5b8e1cba1c56 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.420 2015/07/19 10:54:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.421 2015/07/19 11:13:50 pacho Exp $
+
+  19 Jul 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/evolution-data-server-3.16.4-goa-gmail.patch:
+  Commit missing patch
 
 *evolution-data-server-3.16.4 (19 Jul 2015)
 
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index ee4ab5196fa3..e44f63e234bf 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA256
 
 AUX calentry.schema 3661 SHA256 107d60463833d5ceb5f752335dd07fef303093c58a51fb03405fed5837999431 SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834 WHIRLPOOL 2255a4b0b98f55476388bb97ac5bf1bf2b7107b56c2a93f55142e7ae0892c8f93874fd0731663362bacb4ad85302a6cb8a22a7228bba0724fb45d1eb37f406a1
+AUX evolution-data-server-3.16.4-goa-gmail.patch 3672 SHA256 b370164c5dcba2d237c531e6c42c78dab29bea12500730c3db061d2b55c90d60 SHA512 3216f6739245042ff65e20b26a53abeb6d5e9fde625e7ace8d17653668e54df326487a50140e327d37349433b1683c774c78c36dd0151658ae453c76445c7356 WHIRLPOOL 6ffbddada32958d6ea7b133b1945ab84db3c05ae4a215efe1737c078f674500ed41669bb5f6b4dbc5509599f43913355c2799e2e20491cf9bbfaf4d94624c6e6
 DIST evolution-data-server-3.12.11.tar.xz 5288904 SHA256 59023d2cf92e36b69c1f83b2e56a0ba037754982a23cb06f35f6cc5de7a12201 SHA512 851b5ba6384e918593043088ac093c02f31b0b3bcb6852f2ee24159cc0c99e28713db84d76339a40073da8cbe4857222031e7150f0f99dca61eaf910d76b139f WHIRLPOOL c90345f2273ff66156fd266521521fd381e1c8d9e05311067835e729c24d5544a1bf29f0d988c6585e9caf3b7f0107645c781a15fd7b4ca3d9367f45441ce4a4
 DIST evolution-data-server-3.16.4.tar.xz 5364536 SHA256 62af92dd5563d58a2f13eceeee99cbb7201c15a60eb9e6f4f2bf69688aa07a06 SHA512 7dfb5abc663c09f3bf43b8f34dc4eaab0d16107221ae862d6e4c7b2adc8fa16983a9c619020ce4c032866bd846491db693bcf231c8bdd7fdf6bdd75c3cc327cc WHIRLPOOL 41024ce5039189e5261df9f8ed74b860d712ff55ea0d4cc42d804ae052410fd502dc55d4cfffa70640c2a8747695687840905db145630cf7e1b858554d7761de
 DIST evolution-data-server-3.16.4_pre20150704.tar.xz 4139492 SHA256 2b52f062ab20edfbb99541e87ae1936ff80c5e4ca9a0d5d7ce8459e182aa8ae7 SHA512 9a0fba7588b2700810a2d7efbe6d50b1762ac4754d43d17bd55272ae3b51362c120462dbc6cd596fbb2691a75d14896d012963a3146483ccfbf0a712f34eb59e WHIRLPOOL 12beb7ddd0bc00452bc2070521c53ffc8cf07b9b08e73f5edf8df4fbd5dfb4b37c0f7b1d6da713b370b05b84a3fd901afe70b85e1dc21c153013ed8ce93ea3e1
 EBUILD evolution-data-server-3.12.11.ebuild 3512 SHA256 24bc320d4cc842806eb2de86f343075fe2d6aeef569dbe75bbb73652d471f38b SHA512 10aa41d27ed463a1510105155bb454751b281e2037d1ca43a3b2514745dab84e875aaa46e9eb83b3680c0319edd42baf87386f6a3b038560021e0ea87552b416 WHIRLPOOL 3943ba08b8da1aa20572e03ec44ebba143d373d0795a5758ea5b544007f7eb0c24b821e53e45b85e74973fcc56b10c9fee3f43709099003647b0d69032ab7024
 EBUILD evolution-data-server-3.16.4.ebuild 3751 SHA256 074500ebf828c18e2fe3c7b0919f2e1b39b2dd3a58b5a4a9600c47a50bb7b33f SHA512 b28e8bc554bf3588b0b56db19500bbd3a0c8520d33df1da3ae4eceb5cc1a516b5ed23efb6d6fbe9548e7910d4a3c7c7f7c9cc1f88da511aecdda02c2c4a10830 WHIRLPOOL 872f3bfbb8ebd0e8ab429c35ab18368c7de54344b1f0e1f103fe6f51471ad87ab6869fe5d1a2cc2dc33cee941785fa4864e0ad13bcd0b7604c75bb889073bdb8
 EBUILD evolution-data-server-3.16.4_pre20150704.ebuild 4036 SHA256 1ddf8f12b786854d924a05be89619804636693522642308356b03c6663a1515b SHA512 ada7982cf49f3204bd9ae60918d4a08a9ad6346d02b97da9aa8834de022854c19d19308cc393de1794988831d58611d5e941f1135db2de7a884d2d7bdc66e8b4 WHIRLPOOL 448aab306fa6a8d4c737da40480405dce522c731376c82ac10b68ff8129da4493ed0d0ca264c79ccc9f15be2369efd79e3069102bf6fe456ccd0ad549b7622cc
-MISC ChangeLog 81639 SHA256 d03b543487d3e4a272620c4394591e4b3d6d21966b095a9832d28fa7e4c38c19 SHA512 fab538c6fa42db8437bf7723451d57d1bd2f8129fd32d6723beda97c10b1537051594dd715264ff50bd2ee038d6a69ff794ec8f1c0b3b377921f8bb325ba9a86 WHIRLPOOL e82b59e8e3bd107417b2106c41732d678ff0cefd28a19cd68a48ac0dba5aa5fbbaed9c7ec42504adb5c045a6e5d4296bd94fd51bd8a775c2fb39f839517979c7
+MISC ChangeLog 81764 SHA256 9687b8acf481d27b5b640661e20ad656537c795b3ff8a95a35ecc1e514e1adb2 SHA512 e8fae69b7f50373eec38360d693d29e78d87db3cc27a89fb16cb9d104c6a6f9267ea6ab3349c8b40863bb76c75b180f02a67eedce45782495486d823a3b9ed03 WHIRLPOOL a3bb775f6dbdba627c27aca0f2cf0d81310be325b87e702233ab16266a80d9ca82163bede32e8006935f77e23ee69e2d0fca743c438249fe0e405226fb13048a
 MISC metadata.xml 439 SHA256 cd08e32c2694ce3629cb25c1807eb34ffd09a7bd2f6c88580d0bc5793d217bb1 SHA512 926f4199fc00e68ca4edf20dd75cbbb85447d95b1293a610596eb65ca694ca6899ad9e1486b81e0daeea750fe82913954ae8f18f6a6e80707cbb529d8d79589d WHIRLPOOL a181bec7a6cb64bc8ae9249b95dbbc91b1ffc8a25826384a77058abe5e941f8cde62538584f358c161d9cca891da5146c4bcc9d17bc3b38a66cc42e5ae678671
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWrge8ACgkQCaWpQKGI+9T4dQCggCxMiFrWNORg7hxeIAmF94KS
-5Q8An1ryfLb/qRNop4lSvget6FB/OzCz
-=0hTX
+iEYEAREIAAYFAlWrhm8ACgkQCaWpQKGI+9T7ngCghCaLwVhuPvAqpcJv7Bt3K7C+
+VYgAoIYhTb702UW6eVRtI7YF0HSYQCDE
+=y4MO
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch
new file mode 100644
index 000000000000..c5fc44e1aa09
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch
@@ -0,0 +1,108 @@
+From c66b549c259d33e15947d89257c50d945e3020c7 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 14 Jul 2015 11:49:31 +0200
+Subject: Doesn't honor Google settings as defined in gnome-online-accounts
+
+Use mail-disabled, calendar-disabled and contacts-disabled properties,
+rather than rely on an interface addition/removal and a notification
+about the change.
+
+Reported at https://bugzilla.redhat.com/show_bug.cgi?id=1242541
+
+diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c b/modules/gnome-online-accounts/module-gnome-online-accounts.c
+index e800c23..2f9be5e 100644
+--- a/modules/gnome-online-accounts/module-gnome-online-accounts.c
++++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c
+@@ -162,50 +162,6 @@ gnome_online_accounts_provider_type_to_backend_name (GBinding *binding,
+ 	return TRUE;
+ }
+ 
+-static gboolean
+-gnome_online_accounts_object_is_non_null (GBinding *binding,
+-                                          const GValue *source_value,
+-                                          GValue *target_value,
+-                                          gpointer unused)
+-{
+-	GoaObject *goa_object = GOA_OBJECT (g_binding_get_source (binding));
+-	ESourceExtension *source_extension = E_SOURCE_EXTENSION (g_binding_get_target (binding));
+-	ESource *source;
+-	ESourceGoa *goa_extension;
+-	gpointer v_object;
+-
+-	v_object = g_value_get_object (source_value);
+-	g_value_set_boolean (target_value, v_object != NULL);
+-
+-	g_return_val_if_fail (goa_object != NULL, TRUE);
+-	g_return_val_if_fail (source_extension != NULL, TRUE);
+-
+-	source = e_source_extension_get_source (source_extension);
+-	goa_extension = e_source_get_extension (source, E_SOURCE_EXTENSION_GOA);
+-
+-	if (g_strcmp0 (g_binding_get_source_property (binding), "calendar") == 0) {
+-		gchar *uri = NULL;
+-
+-		if (v_object && GOA_IS_CALENDAR (v_object))
+-			uri = goa_calendar_dup_uri (v_object);
+-
+-		e_source_goa_set_calendar_url (goa_extension, uri);
+-
+-		g_free (uri);
+-	} else if (g_strcmp0 (g_binding_get_source_property (binding), "contacts") == 0) {
+-		gchar *uri = NULL;
+-
+-		if (v_object && GOA_IS_CONTACTS (v_object))
+-			uri = goa_contacts_dup_uri (v_object);
+-
+-		e_source_goa_set_contacts_url (goa_extension, uri);
+-
+-		g_free (uri);
+-	}
+-
+-	return TRUE;
+-}
+-
+ static GoaObject *
+ gnome_online_accounts_ref_account (EGnomeOnlineAccounts *extension,
+                                    ESource *source)
+@@ -629,29 +585,20 @@ gnome_online_accounts_config_collection (EGnomeOnlineAccounts *extension,
+ 		source_extension, "identity",
+ 		G_BINDING_SYNC_CREATE);
+ 
+-	e_binding_bind_property_full (
+-		goa_object, "calendar",
++	e_binding_bind_property (
++		goa_account, "calendar-disabled",
+ 		source_extension, "calendar-enabled",
+-		G_BINDING_SYNC_CREATE,
+-		gnome_online_accounts_object_is_non_null,
+-		NULL,
+-		NULL, (GDestroyNotify) NULL);
++		G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+ 
+-	e_binding_bind_property_full (
+-		goa_object, "contacts",
++	e_binding_bind_property (
++		goa_account, "contacts-disabled",
+ 		source_extension, "contacts-enabled",
+-		G_BINDING_SYNC_CREATE,
+-		gnome_online_accounts_object_is_non_null,
+-		NULL,
+-		NULL, (GDestroyNotify) NULL);
++		G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+ 
+-	e_binding_bind_property_full (
+-		goa_object, "mail",
++	e_binding_bind_property (
++		goa_account, "mail-disabled",
+ 		source_extension, "mail-enabled",
+-		G_BINDING_SYNC_CREATE,
+-		gnome_online_accounts_object_is_non_null,
+-		NULL,
+-		NULL, (GDestroyNotify) NULL);
++		G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+ 
+ 	g_clear_object (&goa_account);
+ 	g_clear_object (&goa_calendar);
+-- 
+cgit v0.10.2
+