Commit missing patch

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

3 files changed, 98 insertions, 5 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 01be8aa9099e..bb41e6f5b56c 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.444 2015/07/19 11:11:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.445 2015/07/19 11:14:26 pacho Exp $
+
+  19 Jul 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/evolution-3.16.4-contacts-gmail.patch:
+  Commit missing patch
 
 *evolution-3.16.4 (19 Jul 2015)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 2d5d493d18d9..3a2bf299c6f4 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX evolution-3.16.4-contacts-gmail.patch 3210 SHA256 a961f0a30d3256408c30a3626f741575c4aa1176cdaeb30417a623f99bc30389 SHA512 f93738d717bf03c13e91fe77a8864a9f296e5a3ac861d53dfc77ed04d4d2cc3b36676b357aa831e3f7f12b047dae2fa74f1896b3b081e8082cf97c30296b93ca WHIRLPOOL 0eaac18a3843e2b4bdc9230ccdde731a2bc6959c5f41567a688c4a0b773c91d599a8064b5f41f9d37828dba7003a6f91ccddee8128249c7b510b8185e665cea0
 DIST evolution-3.12.11.tar.xz 11360812 SHA256 f9ec78ae7b9aadb7efc76777c4c93a98f7c61be2a4cfaaf351dd051604e981f5 SHA512 aef832fbfd6d7449f234e9cb0fdfabc2b75373220e37f5bc58379a2e91a3eacc39e6f8f37078c46adc11d5aa8f2d466974b8dcdcf88a68e68e7ad4a5f659a49c WHIRLPOOL 34a83a6a9be6c2e65fad3732fd86a523282fb8a1cb876da33595cec92c6c16fb8144ad6188381be9c58a301cc4e52fce04e577fd663ebfe31b0f96678126edbc
 DIST evolution-3.16.3.tar.xz 11877676 SHA256 cdc25d9c0c7749d9049d480a8fcde870b1991523bf7009ba101990df543207d6 SHA512 fd81e351ae9a482b48429b04ab41d53f25ad36823765dcd4c5810d8134788d7bdda35e78fdb453686ea7b6eca999f70cd4352486ef38da96a3a927fff3b2b98e WHIRLPOOL 96ea257e30b763db4fdf0ae39e3dc60e8845b3ad021538d2ab62dd1c0bf448f009bf39a89e695cbd1f6af08e18486d9968c6a7bac2772c6cd9ca4e38d356aee8
 DIST evolution-3.16.4.tar.xz 11946404 SHA256 60d90c4f36cc05f925f50dc7e8dcc4f83edd6d9b5476f14e75c1d10ce7fbd67f SHA512 d985cfdf5729e7442a9df4f69f486e617e98f59b7781ffb18dbf0424d5843e3046508b0bde0fbc083648b0b995cd0e534e68b9cc1e11cf21bca58791665480da WHIRLPOOL bce88813f90bbb1aec904ed6ee9163881a5a643b8bb2838f9dce47ac18ee457d9c930966bb12f0642d02177cbff1b98ef1a352297e3b5be0d633a7fadf89ce6b
 EBUILD evolution-3.12.11.ebuild 4476 SHA256 d0d1e92084c0f5523311d7aaf30e309154d549c3c304546fc1d4ea7baea2b320 SHA512 fd7b10e5f67944469655f3fcdcce68cc55b361b151ae2b2ee92d8eb56d21c2781841c6c061a7f2b851325e456d5abca7cfb88943f750db8208c5c0666e435bec WHIRLPOOL 30d8bfcb0dc5b04fdb38a6d869e5b5f70038e3f74c4f41a382915517801c5340541c1e6b99e23c3f49826f6056d10c768f5682d7fff73eaf1484cfd5f3e382e2
 EBUILD evolution-3.16.3.ebuild 4632 SHA256 a351c1080a0f82ec0d77073ca86763ecfe3033788d4131779c77ecb35cf313b5 SHA512 14ee60a41426abf1700033484cf48ec9cb789639d66c490a48ccac4f6bad74ba0c6849828661934d1c53883c507443712801fc8e8446f654344c3411d315fda9 WHIRLPOOL df77d9f29a56878d49d001819ab6da2e466123afa54c6bee3e0e718ab669c4f8dafd5164282f59265624d00707fd0802d3887c190261051d923b72e63dabd85a
 EBUILD evolution-3.16.4.ebuild 4632 SHA256 07b8171d0954a58943c7bfe728a2738f7bf8191fae84b8b265d5b1068ffc559f SHA512 b22e329189f18ca5fc852d73aee2d27fe5ee2aaa0f46f9f9dcc286b657670853cfa125eb40cebd0d191a99286d4f5854f3113532deb41c25aeaf0db3ab634209 WHIRLPOOL 462118e6ff3dee6f8173ba36de6bf37606061937c87a7941c091d5611e95aee196346f449dfea9fd3e1911a4d4c47c09f325c630001bb6533508e63ca0143d1f
-MISC ChangeLog 95730 SHA256 c59e7dd39c95f2a87ed96147d70e36b98c39f98ae72d7365f17ee8832dcbc8e4 SHA512 50e2f8a592eb3dd7e65c7628e6057c6add89c531b00f6836ba7fdc2fdb5445df0dba4f8e2ed145a9cd52c762cd63d271989e5f83aee5f353e75f3a04ff19d2e6 WHIRLPOOL 6858d8d34fabe81e7dfbc0c93c5bbc3bd1f44da741f7b56cca0aed95fdd058af597e000eb999ad10c8de0e3450b4d0b274582e2017458c00ad862664f23bc952
+MISC ChangeLog 95848 SHA256 48ac7d0e28c6d9967396e841a534156875cbb3a307cfee1a9404119736fbde15 SHA512 43e8c8e466158e7ee2f70b3ffe38a68a964d4e6c2fb94e0f69d1fd6f55f0986cc5ec70c13c73a6958bf4847a805ed075279d5f27a8b8b2648316f4dd19108946 WHIRLPOOL a66f4efa447bee894cbdc9146cca08452db88ca020d1a23e7b2aeec0033f2bbe176d71bc23e0fd33f7717fbcd693b3dfbe89c739eed35564373e7c91eaa4b1be
 MISC metadata.xml 883 SHA256 f60f9acddc3fc3442d75f7dfe115749d26bcd8a71f6d901fd8f490a617af0fba SHA512 bbb688663853426dd2a7e61be994c0d43d8d7f9f7b0d72fd0e6fc6759c6383713d206dbb38be53293fe91d7f453459df714da3efca6e5e67bb9f82a23d9e0ecb WHIRLPOOL c7636885e213530029e6772543b5fd831e0a61287452cecfc25e3ff19c2120f12fdd956c84b97005cf96d1e622fab26807a575aee0db9efb64ef98629e89c2b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWrhfwACgkQCaWpQKGI+9SdIwCeNu7Sb1exCg8ospUaa+eVTWXU
-P1wAnA/S4nzpEjWGoXdosuaCImXygMpz
-=kyaR
+iEYEAREIAAYFAlWrhpQACgkQCaWpQKGI+9REwgCfcIpORyMKuhwR9PDqghLh5e/t
+W8gAn1gQpIbz6d1NTS8o2RbbpNw6ZBFd
+=7zIX
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/files/evolution-3.16.4-contacts-gmail.patch b/mail-client/evolution/files/evolution-3.16.4-contacts-gmail.patch
new file mode 100644
index 000000000000..70d686ecf3ce
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.16.4-contacts-gmail.patch
@@ -0,0 +1,88 @@
+From 53dc4e4d1551750905e6b6f1407eb3ee0b0e2a82 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 13 Jul 2015 22:13:57 +0200
+Subject: Do not create Contacts source for GMail accounts
+
+The Contacts part requires OAUTH2, which will be supported once
+bug #749974 is done. Till then, do not allow auto-adding Contacts
+source for GMail accounts, to not confuse users with error message
+about it not being able to open.
+
+diff --git a/modules/mail-config/e-mail-config-google-summary.c b/modules/mail-config/e-mail-config-google-summary.c
+index c5ac1ba..164aae4 100644
+--- a/modules/mail-config/e-mail-config-google-summary.c
++++ b/modules/mail-config/e-mail-config-google-summary.c
+@@ -29,12 +29,17 @@
+ #define GOOGLE_HELP_URI \
+ 	"http://support.google.com/mail/bin/answer.py?hl=en&answer=77695"
+ 
++/* Once EDS will directly support OAUTH2, this can be enabled/removed again */
++/* #define EDS_SUPPORTS_OAUTH2 */
++
+ struct _EMailConfigGoogleSummaryPrivate {
+ 	ESource *collection_source;
+ 
+ 	/* Widgets (not referenced) */
+ 	GtkWidget *calendar_toggle;
++#ifdef EDS_SUPPORTS_OAUTH2
+ 	GtkWidget *contacts_toggle;
++#endif
+ 
+ 	gboolean applicable;
+ };
+@@ -130,8 +135,12 @@ mail_config_google_summary_commit_changes_cb (EMailConfigSummaryPage *page,
+ 	toggle_button = GTK_TOGGLE_BUTTON (extension->priv->calendar_toggle);
+ 	calendar_active = gtk_toggle_button_get_active (toggle_button);
+ 
++#ifdef EDS_SUPPORTS_OAUTH2
+ 	toggle_button = GTK_TOGGLE_BUTTON (extension->priv->contacts_toggle);
+ 	contacts_active = gtk_toggle_button_get_active (toggle_button);
++#else
++	contacts_active = FALSE;
++#endif
+ 
+ 	/* If the user declined both Calendar and Contacts, do nothing. */
+ 	if (!calendar_active && !contacts_active)
+@@ -264,6 +273,7 @@ mail_config_google_summary_constructed (GObject *object)
+ 	extension->priv->calendar_toggle = widget;  /* not referenced */
+ 	gtk_widget_show (widget);
+ 
++#ifdef EDS_SUPPORTS_OAUTH2
+ 	text = _("Add Google Con_tacts to this account");
+ 	widget = gtk_check_button_new_with_mnemonic (text);
+ 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+@@ -271,11 +281,16 @@ mail_config_google_summary_constructed (GObject *object)
+ 	gtk_grid_attach (GTK_GRID (container), widget, 0, 2, 1, 1);
+ 	extension->priv->contacts_toggle = widget;  /* not referenced */
+ 	gtk_widget_show (widget);
++#endif
+ 
+ 	text = _("You may need to enable IMAP access");
+ 	widget = gtk_link_button_new_with_label (GOOGLE_HELP_URI, text);
+ 	gtk_widget_set_margin_left (widget, 12);
++#ifdef EDS_SUPPORTS_OAUTH2
+ 	gtk_grid_attach (GTK_GRID (container), widget, 0, 3, 1, 1);
++#else
++	gtk_grid_attach (GTK_GRID (container), widget, 0, 2, 1, 1);
++#endif
+ 	gtk_widget_show (widget);
+ 
+ 	source = extension->priv->collection_source;
+@@ -291,10 +306,14 @@ mail_config_google_summary_constructed (GObject *object)
+ 		collection_extension, "calendar-enabled",
+ 		G_BINDING_SYNC_CREATE);
+ 
++#ifdef EDS_SUPPORTS_OAUTH2
+ 	e_binding_bind_property (
+ 		extension->priv->contacts_toggle, "active",
+ 		collection_extension, "contacts-enabled",
+ 		G_BINDING_SYNC_CREATE);
++#else
++	g_object_set (G_OBJECT (collection_extension), "contacts-enabled", FALSE, NULL);
++#endif
+ }
+ 
+ static void
+-- 
+cgit v0.10.2
+