Drop old (#508854)

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

11 files changed, 11 insertions, 815 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index c06a717bfc1a..86427d42a7bb 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.431 2014/11/11 11:42:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.432 2014/11/13 12:47:00 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -evolution-2.32.3-r1.ebuild,
+  -evolution-3.12.7.ebuild, -files/evolution-2.32.0-wrong-lafile-usage.patch,
+  -files/evolution-2.32.1-libnotify-0.7.patch,
+  -files/evolution-2.32.2-mime-handler.patch,
+  -files/evolution-2.32.2-smime-fix.patch,
+  -files/evolution-2.32.3-g_thread_init.patch,
+  -files/evolution-2.32.3-gmodule-explicit.patch,
+  -files/evolution-2.32.3-libxml2-2.9.patch, metadata.xml:
+  Drop old (#508854)
 
 *evolution-3.12.8 (11 Nov 2014)
 
diff --git a/mail-client/evolution/evolution-2.32.3-r1.ebuild b/mail-client/evolution/evolution-2.32.3-r1.ebuild
deleted file mode 100644
index 1a79630d57e3..000000000000
--- a/mail-client/evolution/evolution-2.32.3-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.19 2013/03/03 14:31:22 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit autotools eutils flag-o-matic gnome2 python versionator
-
-MY_MAJORV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) GPL-2+ LGPL-2 FDL-1.2+ OPENLDAP"
-SLOT="2.0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="clutter connman crypt gstreamer kerberos ldap networkmanager python ssl"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
-
-# contacts-map plugin requires libchaimplain and geoclue
-# glade-3 support is for maintainers only per configure.ac
-# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571)
-# pst is not mature enough and changes API/ABI frequently
-
-RDEPEND=">=dev-libs/glib-2.25.12:2
-	>=x11-libs/gtk+-2.20.0:2
-	>=dev-libs/libunique-1.1.2:1
-	>=gnome-base/gnome-desktop-2.26:2
-	>=dev-libs/libgweather-2.25.3:2
-	<dev-libs/libgweather-2.91:2
-	media-libs/libcanberra[gtk]
-	>=x11-libs/libnotify-0.3
-	>=gnome-extra/evolution-data-server-${PV}[weather]
-	=gnome-extra/evolution-data-server-${MY_MAJORV}*
-	>=gnome-extra/gtkhtml-3.31.90:3.14
-	>=gnome-base/gconf-2:2
-	dev-libs/atk
-	>=dev-libs/libxml2-2.7.3:2
-	>=net-libs/libsoup-2.4:2.4
-	>=media-gfx/gtkimageview-1.6
-	>=x11-misc/shared-mime-info-0.22
-	>=x11-themes/gnome-icon-theme-2.30.2.1
-	>=dev-libs/libgdata-0.4
-
-	clutter? (
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		x11-libs/mx:1.0 )
-	connman? ( net-misc/connman )
-	crypt? ( || (
-				  ( >=app-crypt/gnupg-2.0.1-r2
-					${PINENTRY_DEPEND} )
-				  =app-crypt/gnupg-1.4* ) )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-2 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )
-
-	!<gnome-extra/evolution-exchange-2.32"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.5
-	sys-devel/gettext
-	sys-devel/bison
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.9.1
-	app-text/docbook-xml-dtd:4.1.2
-	>=gnome-base/gnome-common-2.12
-	>=dev-util/gtk-doc-am-1.9"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2.12
-
-pkg_setup() {
-	python_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	ELTCONF="--reverse-deps"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-	G2CONF="${G2CONF}
-		--without-kde-applnk-path
-		--enable-plugins=experimental
-		--enable-image-inline
-		--enable-canberra
-		--enable-weather
-		$(use_enable ssl nss)
-		$(use_enable ssl smime)
-		$(use_enable networkmanager nm)
-		$(use_enable connman)
-		$(use_enable gstreamer audio-inline)
-		--disable-profiling
-		--disable-pst-import
-		$(use_enable python)
-		pythonpath=$(PYTHON -2 -a)
-		$(use_with clutter)
-		$(use_with ldap openldap)
-		$(use_with kerberos krb5 /usr)
-		--disable-contacts-map
-		--without-glade-catalog
-		--disable-mono
-		--disable-gtk3"
-
-	# dang - I've changed this to do --enable-plugins=experimental.  This will
-	# autodetect new-mail-notify and exchange, but that cannot be helped for the
-	# moment.  They should be changed to depend on a --enable-<foo> like mono
-	# is.  This cleans up a ton of crap from this ebuild.
-
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF}
-			--without-nspr-libs
-			--without-nspr-includes
-			--without-nss-libs
-			--without-nss-includes"
-	fi
-
-	# NM and connman support cannot coexist
-	if use networkmanager && use connman ; then
-		ewarn "It is not possible to enable both ConnMan and NetworkManager, disabling connman..."
-		G2CONF="${G2CONF} --disable-connman"
-	fi
-
-	epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-0.7.patch
-
-	# Fix invalid use of la file in contact-editor, upstream bug #635002
-	epatch "${FILESDIR}/${PN}-2.32.0-wrong-lafile-usage.patch"
-
-	# Fix compilation with --disable-smime, bug #356471
-	epatch "${FILESDIR}/${PN}-2.32.2-smime-fix.patch"
-
-	# Fix desktop file to work with latest glib
-	epatch "${FILESDIR}/${PN}-2.32.2-mime-handler.patch"
-
-	# Apply multiple backports from master fixing important bugs
-	epatch "${WORKDIR}/${P}-patches"/*.patch
-
-	# Fix build failure with glib-2.32, bug #412111
-	epatch "${FILESDIR}/${P}-gmodule-explicit.patch"
-	epatch "${FILESDIR}/${P}-g_thread_init.patch"
-
-	# Support both old and new-buf libxml2 APIs, bug #459546
-	epatch "${FILESDIR}/${P}-libxml2-2.9.patch"
-
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -e 's|mozilla-nss|nss|' \
-			-e 's|mozilla-nspr|nspr|' \
-			-i configure.ac configure || die "sed 2 failed"
-	fi
-
-	# Drop -Werror, bug #442242
-	sed -i -e 's/-Werror //' configure.ac || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version gnome-base/gnome-control-center; then
-		elog "To change the default browser if you are not using GNOME, edit"
-		elog "~/.local/share/applications/mimeapps.list so it includes the"
-		elog "following content:"
-		elog ""
-		elog "[Default Applications]"
-		elog "x-scheme-handler/http=firefox.desktop"
-		elog "x-scheme-handler/https=firefox.desktop"
-		elog ""
-		elog "(replace firefox.desktop with the name of the appropriate .desktop"
-		elog "file from /usr/share/applications if you use a different browser)."
-		elog ""
-		elog "Junk filters are now a run-time choice. You will get a choice of"
-		elog "bogofilter or spamassassin based on which you have installed"
-		elog ""
-		elog "You have to install one of these for the spam filtering to actually work"
-	fi
-}
diff --git a/mail-client/evolution/evolution-3.12.7.ebuild b/mail-client/evolution/evolution-3.12.7.ebuild
deleted file mode 100644
index 29d8486bfc04..000000000000
--- a/mail-client/evolution/evolution-3.12.7.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.12.7.ebuild,v 1.1 2014/10/15 15:51:48 leio Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic readme.gentoo gnome2 #autotools
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# FIXME: You need to have gnome-icon-theme or adwaita-icon-theme installed
-# (last one not yet in the tree)
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.4
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gtk+-3.8.0:3
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=x11-libs/libnotify-0.7:=
-	>=gnome-extra/evolution-data-server-${PV}:=[weather?]
-	>=gnome-extra/gtkhtml-4.5.2:4.0
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.6
-	>=dev-libs/libxml2-2.7.3:2
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-misc/shared-mime-info-0.22
-	>=x11-themes/gnome-icon-theme-2.30.2.1
-	>=dev-libs/libgdata-0.10:=
-	>=net-libs/webkit-gtk-2.0.1:3
-
-	x11-libs/libSM
-	x11-libs/libICE
-
-	crypt? ( || (
-		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
-		=app-crypt/gnupg-1.4* ) )
-	map? (
-		>=app-misc/geoclue-0.12.0:0
-		>=media-libs/libchamplain-0.12:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-3.10.0
-		x11-libs/mx:1.0 )
-	spell? ( app-text/gtkspell:3 )
-	ldap? ( >=net-nds/openldap-2:= )
-	ssl? (
-		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.8:2= )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#	app-text/yelp-tools
-#	>=gnome-base/gnome-common-2.12
-RDEPEND="${COMMON_DEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	highlight? ( app-text/highlight )
-	spamassassin? ( mail-filter/spamassassin )
-	!gnome-extra/evolution-exchange
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-src_prepare() {
-	# Fix relink issues in src_install
-	ELTCONF="--reverse-deps"
-
-	#eautoreconf # See https://bugzilla.gnome.org/701904
-
-	gnome2_src_prepare
-
-	# Fix compilation flags crazyness, upstream bug #653157
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "CPPFLAGS sed failed"
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
-	gnome2_src_configure \
-		--without-glade-catalog \
-		--disable-image-inline \
-		--disable-pst-import \
-		--enable-canberra \
-		--enable-gnome-desktop \
-		$(use_enable bogofilter) \
-		$(use_enable highlight text-highlight) \
-		$(use_enable map contact-maps) \
-		$(use_enable spamassassin) \
-		$(use_enable spell gtkspell) \
-		$(use_enable ssl nss) \
-		$(use_enable ssl smime) \
-		$(use_with ldap openldap) \
-		$(usex ssl --enable-nss=yes "--without-nspr-libs
-			--without-nspr-includes
-			--without-nss-libs
-			--without-nss-includes") \
-		$(use_enable weather) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-
-	gnome2_src_install
-
-	# Problems with prelink:
-	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
-	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
-	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
-	doenvd "${T}"/99${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/files/evolution-2.32.0-wrong-lafile-usage.patch b/mail-client/evolution/files/evolution-2.32.0-wrong-lafile-usage.patch
deleted file mode 100644
index 9f0993d43ecc..000000000000
--- a/mail-client/evolution/files/evolution-2.32.0-wrong-lafile-usage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
-index 486d71e..763808b 100644
---- a/addressbook/gui/contact-editor/Makefile.am
-+++ b/addressbook/gui/contact-editor/Makefile.am
-@@ -33,7 +33,7 @@ libecontacteditor_la_LIBADD =						\
- 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
- 	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la	\
- 	$(top_builddir)/addressbook/printing/libecontactprint.la	\
--	$(top_builddir)/widgets/menus/.libs/libmenus.la	\
-+	$(top_builddir)/widgets/menus/libmenus.la	\
- 	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
- 	$(GNOME_PLATFORM_LIBS)
- 
diff --git a/mail-client/evolution/files/evolution-2.32.1-libnotify-0.7.patch b/mail-client/evolution/files/evolution-2.32.1-libnotify-0.7.patch
deleted file mode 100644
index 7e2474b47742..000000000000
--- a/mail-client/evolution/files/evolution-2.32.1-libnotify-0.7.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- calendar/gui/alarm-notify/alarm-queue.c
-+++ calendar/gui/alarm-notify/alarm-queue.c
-@@ -40,6 +40,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- #include "alarm.h"
-@@ -1606,7 +1609,12 @@
- 			body = g_strdup_printf ("%s %s", start_str, time_str);
- 	}
- 
--	n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL);
-+	n = notify_notification_new (summary, body, "stock_appointment-reminder"
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+	);
-+#else
-+	, NULL);
-+#endif
- 	if (!notify_notification_show(n, NULL))
- 	    g_warning ("Could not send notification to daemon\n");
- 
---- plugins/mail-notification/mail-notification.c
-+++ plugins/mail-notification/mail-notification.c
-@@ -47,6 +47,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- #define GCONF_KEY_ROOT			"/apps/evolution/eplugin/mail-notification/"
-@@ -564,9 +567,14 @@
- 
- 			notify  = notify_notification_new (
- 				_("New email"), safetext,
--				"mail-unread", NULL);
-+				"mail-unread"
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+				);
-+#else
-+				, NULL);
- 			notify_notification_attach_to_status_icon (
- 				notify, status_icon);
-+#endif
- 
- 			/* Check if actions are supported */
- 			if (can_support_actions ()) {
---- plugins/publish-calendar/publish-calendar.c
-+++ plugins/publish-calendar/publish-calendar.c
-@@ -46,6 +46,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- static GtkListStore *store = NULL;
-@@ -150,8 +153,13 @@
- 				return;
- 			}
- 
--			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name, NULL);
-+			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+			);
-+#else
-+			, NULL);
- 			notify_notification_attach_to_status_icon (notify, status_icon);
-+#endif
- 			notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
- 			notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
- 			g_timeout_add (500, show_notify_cb, NULL);
diff --git a/mail-client/evolution/files/evolution-2.32.2-mime-handler.patch b/mail-client/evolution/files/evolution-2.32.2-mime-handler.patch
deleted file mode 100644
index fdbda5ce3d5a..000000000000
--- a/mail-client/evolution/files/evolution-2.32.2-mime-handler.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-commit 61999b493fc4266300eab2907909867e73e4cc1e
-Author: Milan Crha <mcrha@redhat.com>
-Date:   Wed Oct 20 15:24:29 2010 +0200
-
-    Bug #631451 - Add handlers for x-scheme-handler/mailto
-
-diff --git a/data/evolution.desktop.in.in b/data/evolution.desktop.in.in
-index d69738e..5fdad27 100644
---- a/data/evolution.desktop.in.in
-+++ b/data/evolution.desktop.in.in
-@@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Product=Evolution
- X-GNOME-Bugzilla-Component=BugBuddyBugs
- X-GNOME-Bugzilla-Version=@BASE_VERSION@.x
- X-GNOME-Bugzilla-OtherBinaries=e-addressbook-factory;e-calendar-factory
--MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822;
-+MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;
-diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c
-index 367d9166..01d1bd2 100644
---- a/modules/mailto-handler/evolution-mailto-handler.c
-+++ b/modules/mailto-handler/evolution-mailto-handler.c
-@@ -30,7 +30,9 @@
- 	((obj), E_TYPE_MAILTO_HANDLER, EMailtoHandler))
- 
- #define MAILTO_COMMAND \
--	"evolution --component=mail %s"
-+	"evolution --component=mail"
-+
-+#define MAILTO_HANDLER "x-scheme-handler/mailto"
- 
- typedef struct _EMailtoHandler EMailtoHandler;
- typedef struct _EMailtoHandlerClass EMailtoHandlerClass;
-@@ -63,13 +65,18 @@ mailto_handler_get_shell (EMailtoHandler *extension)
- }
- 
- static gboolean
--mailto_handler_is_evolution (const gchar *mailto_command)
-+mailto_handler_is_evolution (/*const*/ GAppInfo *app_info)
- {
- 	gint argc;
- 	gchar **argv;
- 	gchar *basename;
- 	gboolean is_evolution;
-+	const gchar *mailto_command;
-+
-+	if (app_info == NULL)
-+		return FALSE;
- 
-+	mailto_command = g_app_info_get_commandline (app_info);
- 	if (mailto_command == NULL)
- 		return FALSE;
- 
-@@ -174,14 +181,14 @@ mailto_handler_check (EMailtoHandler *extension)
- 	EShell *shell;
- 	EShellSettings *shell_settings;
- 	gboolean check_mailto_handler = TRUE;
--	gchar *mailto_command = NULL;
-+	GAppInfo *app_info = NULL;
-+	GError *error = NULL;
- 
- 	shell = mailto_handler_get_shell (extension);
- 	shell_settings = e_shell_get_shell_settings (shell);
- 
- 	g_object_get (
- 		shell_settings,
--		"mailto-handler-command", &mailto_command,
- 		"mailto-handler-check", &check_mailto_handler,
- 		NULL);
- 
-@@ -189,25 +196,37 @@ mailto_handler_check (EMailtoHandler *extension)
- 	if (!check_mailto_handler)
- 		goto exit;
- 
-+	app_info = g_app_info_get_default_for_type (MAILTO_HANDLER, FALSE);
-+
- 	/* Is Evolution already handling "mailto" URIs? */
--	if (mailto_handler_is_evolution (mailto_command))
-+	if (mailto_handler_is_evolution (app_info))
- 		goto exit;
- 
- 	/* Does the user want Evolution to handle them? */
- 	if (!mailto_handler_prompt (extension))
- 		goto exit;
- 
-+	if (app_info)
-+		g_object_unref (app_info);
-+
- 	/* Configure Evolution to be the "mailto" URI handler. */
-+	app_info = g_app_info_create_from_commandline (
-+		MAILTO_COMMAND,
-+		_("Evolution"),
-+		G_APP_INFO_CREATE_SUPPORTS_URIS,
-+		&error);
- 
--	g_object_set (
--		shell_settings,
--		"mailto-handler-command", MAILTO_COMMAND,
--		"mailto-handler-enabled", TRUE,
--		"mailto-handler-needs-terminal", FALSE,
--		NULL);
-+	if (app_info && !error)
-+		g_app_info_set_as_default_for_type (app_info, MAILTO_HANDLER, &error);
- 
- exit:
--	g_free (mailto_command);
-+	if (app_info)
-+		g_object_unref (app_info);
-+
-+	if (error) {
-+		g_warning ("Failed to register as default handler: %s", error->message);
-+		g_error_free (error);
-+	}
- }
- 
- static void
-@@ -226,18 +245,6 @@ mailto_handler_constructed (GObject *object)
- 		"mailto-handler-check",
- 		"/apps/evolution/mail/prompts/checkdefault");
- 
--	e_shell_settings_install_property_for_key (
--		"mailto-handler-command",
--		"/desktop/gnome/url-handlers/mailto/command");
--
--	e_shell_settings_install_property_for_key (
--		"mailto-handler-enabled",
--		"/desktop/gnome/url-handlers/mailto/enabled");
--
--	e_shell_settings_install_property_for_key (
--		"mailto-handler-needs-terminal",
--		"/desktop/gnome/url-handlers/mailto/needs_terminal");
--
- 	g_signal_connect_swapped (
- 		shell, "event::ready-to-start",
- 		G_CALLBACK (mailto_handler_check), extension);
diff --git a/mail-client/evolution/files/evolution-2.32.2-smime-fix.patch b/mail-client/evolution/files/evolution-2.32.2-smime-fix.patch
deleted file mode 100644
index d42f6a3a9f7a..000000000000
--- a/mail-client/evolution/files/evolution-2.32.2-smime-fix.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- mail/em-account-editor.c~	2010-12-27 15:57:03.000000000 +0100
-+++ mail/em-account-editor.c	2011-03-27 17:57:40.000000000 +0200
-@@ -68,7 +68,7 @@
- #include "mail-ops.h"
- #include "mail-mt.h"
- 
--#if defined (HAVE_NSS)
-+#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
- #include "smime/gui/e-cert-selector.h"
- #endif
- 
-@@ -1202,7 +1202,7 @@
- 	return folder;
- }
- 
--#if defined (HAVE_NSS)
-+#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
- static void
- smime_changed (EMAccountEditor *emae)
- {
-@@ -3072,7 +3072,7 @@
- emae_security_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
- {
- 	EMAccountEditor *emae = data;
--#if defined (HAVE_NSS)
-+#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
- 	EMAccountEditorPrivate *priv = emae->priv;
- #endif
- 	GtkWidget *w;
-@@ -3092,7 +3092,7 @@
- 	emae_account_toggle (emae, "pgp_no_imip_sign", E_ACCOUNT_PGP_NO_IMIP_SIGN, builder);
- 	emae_account_toggle (emae, "pgp_always_trust", E_ACCOUNT_PGP_ALWAYS_TRUST, builder);
- 
--#if defined (HAVE_NSS)
-+#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
- 	/* TODO: this should handle its entry separately? */
- 	priv->smime_sign_key = emae_account_entry (emae, "smime_sign_key", E_ACCOUNT_SMIME_SIGN_KEY, builder);
- 	priv->smime_sign_key_select = (GtkButton *)e_builder_get_widget (builder, "smime_sign_key_select");
---- mail/em-format-html-display.c~	2010-10-14 23:18:47.000000000 +0200
-+++ mail/em-format-html-display.c	2011-03-27 17:58:58.000000000 +0200
-@@ -50,7 +50,7 @@
- #include <e-util/e-dialog-utils.h>
- #include <e-util/e-icon-factory.h>
- 
--#ifdef HAVE_NSS
-+#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
- #include "certificate-viewer.h"
- #include "e-cert-db.h"
- #endif
-@@ -171,7 +171,7 @@
- 	po->widget = NULL;
- }
- 
--#ifdef HAVE_NSS
-+#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
- static void
- efhd_xpkcs7mime_viewcert_clicked (GtkWidget *button,
-                                   struct _smime_pobject *po)
---- modules/addressbook/e-book-shell-backend.c~	2010-11-10 19:55:36.000000000 +0100
-+++ modules/addressbook/e-book-shell-backend.c	2011-03-27 17:59:56.000000000 +0200
-@@ -317,6 +317,7 @@
- 		autocompletion_config_new,
- 		200);
- 
-+#ifdef ENABLE_SMIME
- 	preferences_window = e_shell_get_preferences_window (shell);
- 	e_preferences_window_add_page (
- 		E_PREFERENCES_WINDOW (preferences_window),
-@@ -325,6 +326,7 @@
- 		_("Certificates"),
- 		certificate_manager_config_new,
- 		700);
-+#endif
- 
- 	return FALSE;
- }
diff --git a/mail-client/evolution/files/evolution-2.32.3-g_thread_init.patch b/mail-client/evolution/files/evolution-2.32.3-g_thread_init.patch
deleted file mode 100644
index 28741f226376..000000000000
--- a/mail-client/evolution/files/evolution-2.32.3-g_thread_init.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 363aef1952cc3fffaa6c7d49d3c793c77a7dc70c Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 24 Oct 2011 09:42:48 +0200
-Subject: [PATCH] Call g_thread_init() conditionally
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.32]
----
- calendar/gui/alarm-notify/notify-main.c |    2 ++
- capplet/anjal-settings-main.c           |    2 ++
- capplet/settings/mail-guess-servers.c   |    2 ++
- plugins/backup-restore/backup.c         |    2 ++
- shell/main.c                            |    2 ++
- 5 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
-index 6104610..3ee8e9c 100644
---- a/calendar/gui/alarm-notify/notify-main.c
-+++ b/calendar/gui/alarm-notify/notify-main.c
-@@ -87,7 +87,9 @@ main (gint argc, gchar **argv)
- 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- 	textdomain (GETTEXT_PACKAGE);
- 
-+	#if !GLIB_CHECK_VERSION(2,31,0)
- 	g_thread_init (NULL);
-+	#endif
- 
- #ifdef G_OS_WIN32
- 	path = g_build_path (";", _e_get_bindir (), g_getenv ("PATH"), NULL);
-diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
-index 7b6e252..f338863 100644
---- a/capplet/anjal-settings-main.c
-+++ b/capplet/anjal-settings-main.c
-@@ -247,8 +247,10 @@ main (gint argc, gchar *argv[])
- 		g_error_free(error);
- 	}
- 
-+	#if !GLIB_CHECK_VERSION(2,31,0)
- 	if (!g_thread_get_initialized ())
- 		g_thread_init (NULL);
-+	#endif
- 
- 	client = gconf_client_get_default();
- 
-diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c
-index 69e0d8d..bb2fb9d 100644
---- a/capplet/settings/mail-guess-servers.c
-+++ b/capplet/settings/mail-guess-servers.c
-@@ -325,7 +325,9 @@ gint
- main (gint argc, gchar **argv)
- {
- 	EmailProvider *provider;
-+	#if !GLIB_CHECK_VERSION(2,31,0)
- 	g_thread_init (NULL);
-+	#endif
- 	g_type_init ();
- 
- 	provider = g_new0(EmailProvider, 1);
-diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
-index e90c73d..f23c562 100644
---- a/plugins/backup-restore/backup.c
-+++ b/plugins/backup-restore/backup.c
-@@ -663,7 +663,9 @@ main (gint argc, gchar **argv)
- 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- 	textdomain (GETTEXT_PACKAGE);
- 
-+	#if !GLIB_CHECK_VERSION(2,31,0)
- 	g_thread_init (NULL);
-+	#endif
- 
- 	gtk_init_with_args (
- 		&argc, &argv, NULL, options, (gchar *) GETTEXT_PACKAGE, &error);
-diff --git a/shell/main.c b/shell/main.c
-index 3ab9d7e..788c91b 100644
---- a/shell/main.c
-+++ b/shell/main.c
-@@ -520,8 +520,10 @@ main (gint argc, gchar **argv)
- 	}
- 
- 	g_type_init ();
-+	#if !GLIB_CHECK_VERSION(2,31,0)
- 	if (!g_thread_get_initialized ())
- 		g_thread_init (NULL);
-+	#endif
- 
- 	#ifdef HAVE_ICAL_UNKNOWN_TOKEN_HANDLING
- 	ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN);
--- 
-1.7.8.5
-
diff --git a/mail-client/evolution/files/evolution-2.32.3-gmodule-explicit.patch b/mail-client/evolution/files/evolution-2.32.3-gmodule-explicit.patch
deleted file mode 100644
index 691cef031fc0..000000000000
--- a/mail-client/evolution/files/evolution-2.32.3-gmodule-explicit.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d4091974aec007fb7130e1ba21be76b2c9590a98 Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau <teuf@gnome.org>
-Date: Tue, 13 Dec 2011 09:09:05 -0500
-Subject: [PATCH] Bug 665782 - configure.ac: Add gmodule-2.0 to GNOME_PLATFORM
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.32]
----
- configure.ac |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ab40e36..7878160 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -303,6 +303,7 @@ dnl Check for base dependencies early.
- dnl **********************************
- PKG_CHECK_MODULES([GNOME_PLATFORM],
- 	[gio-2.0 >= glib_minimum_version
-+	 gmodule-2.0 >= glib_minimum_version
- 	 $GTK >= $gtk_minimum_version
- 	 $GAIL >= $gail_minimum_version
- 	 gconf-2.0 >= gconf_minimum_version
--- 
-1.7.8.5
-
diff --git a/mail-client/evolution/files/evolution-2.32.3-libxml2-2.9.patch b/mail-client/evolution/files/evolution-2.32.3-libxml2-2.9.patch
deleted file mode 100644
index 57f833cc9cea..000000000000
--- a/mail-client/evolution/files/evolution-2.32.3-libxml2-2.9.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- plugins/caldav/caldav-browse-server.c.ori	2013-03-02 12:33:59.220751490 -0300
-+++ plugins/caldav/caldav-browse-server.c	2013-03-02 16:47:55.601296985 -0300
-@@ -63,6 +63,18 @@
- 
- typedef void (*process_message_cb) (GObject *dialog, const gchar *msg_path, guint status_code, const gchar *msg_body, gpointer user_data);
- 
-+static gconstpointer
-+compat_libxml_output_buffer_get_content (xmlOutputBufferPtr buf,
-+					gsize *out_len)
-+{
-+#ifdef LIBXML2_NEW_BUFFER
-+	*out_len = xmlOutputBufferGetSize (buf);
-+	return xmlOutputBufferGetContent (buf);
-+#else
-+	*out_len = buf->buffer->use;
-+	return buf->buffer->content;
-+#endif
-+}
- static void send_xml_message (xmlDocPtr doc, gboolean depth_1, const gchar *url, GObject *dialog, process_message_cb cb, gpointer cb_user_data, const gchar *info);
- 
- static gchar *
-@@ -953,6 +965,8 @@
- 	SoupSession *session;
- 	SoupMessage *message;
- 	xmlOutputBufferPtr buf;
-+	gconstpointer content;
-+	gsize length;
- 	guint poll_id;
- 	struct poll_data *pd;
- 
-@@ -977,9 +991,11 @@
- 	xmlNodeDumpOutput (buf, doc, xmlDocGetRootElement (doc), 0, 1, NULL);
- 	xmlOutputBufferFlush (buf);
- 
-+	content = compat_libxml_output_buffer_get_content (buf, &length);
-+
- 	soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION);
- 	soup_message_headers_append (message->request_headers, "Depth", depth_1 ? "1" : "0");
--	soup_message_set_request (message, "application/xml", SOUP_MEMORY_COPY, (const gchar *) buf->buffer->content, buf->buffer->use);
-+	soup_message_set_request (message, "application/xml", SOUP_MEMORY_COPY, content, length);
- 
- 	/* Clean up the memory */
- 	xmlOutputBufferClose (buf);
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
index 9092489fa323..cfd0a3170188 100644
--- a/mail-client/evolution/metadata.xml
+++ b/mail-client/evolution/metadata.xml
@@ -4,7 +4,6 @@
 	<herd>gnome</herd>
 	<use>
 		<flag name="bogofilter">Build <pkg>mail-filter/bogofilter</pkg> plugin</flag>
-		<flag name="clutter">Build with clutter support for animation effects</flag>
 		<flag name="crypt">Enable GPG encryption support using
 			<pkg>app-crypt/gnupg</pkg> and <pkg>app-crypt/pinentry</pkg></flag>
 		<flag name="highlight">Enable text highlighting
@@ -13,9 +12,6 @@
 			Active Directory server using <pkg>net-nds/openldap</pkg></flag>
 		<flag name="map">Enable support for displaying contacts on a map inside
 			evolution using <pkg>media-libs/libchamplain</pkg></flag>
-		<flag name="networkmanager">Allows Evolution to automagically toggle
-			online/offline mode by talking to <pkg>net-misc/networkmanager</pkg>
-			and getting the current network state</flag>
 		<flag name="spamassassin">Build <pkg>mail-filter/spamassassin</pkg>
 			plugin</flag>
 		<flag name="weather">Enable optional weather calendar support</flag>