[gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     488aa8a8e8a0da5124285c4df250435c76eaa4de
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 20 05:48:04 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Apr 20 07:11:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=488aa8a8

mail-client/evolution: 3.4.0 → 3.4.1

---
 ...on-3.4.0.1-r1.ebuild => evolution-3.4.1.ebuild} |    7 +--
 .../files/evolution-3.4.0.1-spam-detection.patch   |   65 --------------------
 2 files changed, 2 insertions(+), 70 deletions(-)

diff --git a/mail-client/evolution/evolution-3.4.0.1-r1.ebuild b/mail-client/evolution/evolution-3.4.1.ebuild
similarity index 96%
rename from mail-client/evolution/evolution-3.4.0.1-r1.ebuild
rename to mail-client/evolution/evolution-3.4.1.ebuild
index 2d08333..b7a1837 100644
--- a/mail-client/evolution/evolution-3.4.0.1-r1.ebuild
+++ b/mail-client/evolution/evolution-3.4.1.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit eutils flag-o-matic gnome2 python
+inherit autotools eutils flag-o-matic gnome2 python
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -39,7 +39,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
 	>=dev-libs/libgweather-2.90.0:2
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=x11-libs/libnotify-0.7
-	>=gnome-extra/evolution-data-server-3.4[gnome-online-accounts?,weather]
+	>=gnome-extra/evolution-data-server-${PV}[gnome-online-accounts?,weather]
 	>=gnome-extra/gtkhtml-4.1.2:4.0
 	>=gnome-base/gconf-2:2
 	dev-libs/atk
@@ -150,9 +150,6 @@ src_prepare() {
 		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
 		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"
 
-	# Upstream patch to fix spam auto-detection
-	epatch "${FILESDIR}/${P}-spam-detection.patch"
-
 	gnome2_src_prepare
 
 	# Fix compilation flags crazyness

diff --git a/mail-client/evolution/files/evolution-3.4.0.1-spam-detection.patch b/mail-client/evolution/files/evolution-3.4.0.1-spam-detection.patch
deleted file mode 100644
index 7218b24..0000000
--- a/mail-client/evolution/files/evolution-3.4.0.1-spam-detection.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 1436abc060444cfba9f1d7a9cc050bd6307b5449 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 2 Apr 2012 12:40:50 +0200
-Subject: [PATCH] Bug #672916 - Spam is not detected automatically
-
----
- libemail-engine/e-mail-session.c |   28 ++++++++++++----------------
- 1 files changed, 12 insertions(+), 16 deletions(-)
-
-diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
-index 193756f..0b1625f 100644
---- a/libemail-engine/e-mail-session.c
-+++ b/libemail-engine/e-mail-session.c
-@@ -860,6 +860,18 @@ mail_session_constructed (GObject *object)
- 		settings, "junk-default-plugin",
- 		object, "junk-filter-name",
- 		G_SETTINGS_BIND_DEFAULT);
-+
-+	camel_session_set_check_junk (
-+		CAMEL_SESSION (session), g_settings_get_boolean (
-+		settings, "junk-check-incoming"));
-+	g_signal_connect (
-+		settings, "changed",
-+		G_CALLBACK (mail_session_check_junk_notify), session);
-+
-+	mail_config_reload_junk_headers (session);
-+
-+	e_proxy_setup_proxy (session->priv->proxy);
-+
- 	g_object_unref (settings);
- }
- 
-@@ -1545,7 +1557,6 @@ e_mail_session_class_init (EMailSessionClass *class)
- static void
- e_mail_session_init (EMailSession *session)
- {
--	GSettings *settings;
- 	GHashTable *junk_filters;
- 
- 	junk_filters = g_hash_table_new (
-@@ -1565,21 +1576,6 @@ e_mail_session_init (EMailSession *session)
- 
- 	/* Initialize the EAccount setup. */
- 	e_account_writable (NULL, E_ACCOUNT_SOURCE_SAVE_PASSWD);
--
--	settings = g_settings_new ("org.gnome.evolution.mail");
--
--	camel_session_set_check_junk (
--		CAMEL_SESSION (session), g_settings_get_boolean (
--		settings, "junk-check-incoming"));
--	g_signal_connect (
--		settings, "changed",
--		G_CALLBACK (mail_session_check_junk_notify), session);
--
--	mail_config_reload_junk_headers (session);
--
--	e_proxy_setup_proxy (session->priv->proxy);
--
--	g_object_unref (settings);
- }
- 
- EMailSession *
--- 
-1.7.8.5
-