Version bump, drop old

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

6 files changed, 16 insertions, 343 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index f32fa5a7335d..d3d9451d6bad 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,15 @@
 # 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.428 2014/07/23 15:18:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.429 2014/09/24 13:25:05 pacho Exp $
+
+*evolution-3.12.6 (24 Sep 2014)
+
+  24 Sep 2014; Pacho Ramos <pacho@gentoo.org> +evolution-3.12.6.ebuild,
+  -evolution-3.10.4-r1.ebuild, -evolution-3.12.3-r1.ebuild,
+  -files/evolution-3.10.4-imap-crash.patch,
+  -files/evolution-3.10.4-main-ui.patch,
+  -files/evolution-3.10.4-nntp-outbox.patch:
+  Version bump, drop old
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> evolution-3.12.4.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/mail-client/evolution/evolution-3.10.4-r1.ebuild b/mail-client/evolution/evolution-3.10.4-r1.ebuild
deleted file mode 100644
index 1dd21062d00b..000000000000
--- a/mail-client/evolution/evolution-3.10.4-r1.ebuild
+++ /dev/null
@@ -1,154 +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.10.4-r1.ebuild,v 1.3 2014/03/18 21:53:03 pacho 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 gstreamer highlight kerberos ldap map spamassassin 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
-COMMON_DEPEND="
-	>=dev-libs/glib-2.34:2
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gtk+-3.4.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-gnome-2.40.3: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 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	kerberos? ( virtual/krb5:= )
-	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() {
-	# Reason?
-	ELTCONF="--reverse-deps"
-
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-
-	# Run EMailFormatter in the main/UI thread (from 3.8 branch)
-	epatch "${FILESDIR}/${P}-main-ui.patch"
-
-	# NNTP Messages are silently dropped from Outbox (from 3.8 branch)
-	epatch "${FILESDIR}/${P}-nntp-outbox.patch"
-
-	# Crash creating a new folder (from 3.8 branch)
-	epatch "${FILESDIR}/${P}-imap-crash.patch"
-
-	#eautoreconf # See https://bugzilla.gnome.org/701904
-
-	gnome2_src_prepare
-
-	# Fix compilation flags crazyness
-	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 \
-		$(use_enable bogofilter) \
-		$(use_enable gstreamer audio-inline) \
-		$(use_enable highlight text-highlight) \
-		$(use_enable map contact-maps) \
-		$(use_enable spamassassin) \
-		$(use_enable ssl nss) \
-		$(use_enable ssl smime) \
-		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
-		$(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() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/evolution-3.12.3-r1.ebuild b/mail-client/evolution/evolution-3.12.6.ebuild
index 9df5e9ba2284..0f0ce5a62337 100644
--- a/mail-client/evolution/evolution-3.12.3-r1.ebuild
+++ b/mail-client/evolution/evolution-3.12.6.ebuild
@@ -1,6 +1,6 @@
 # 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.3-r1.ebuild,v 1.2 2014/06/30 09:50:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.12.6.ebuild,v 1.1 2014/09/24 13:25:05 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -23,6 +23,8 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
 
 # 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
@@ -93,14 +95,14 @@ x-scheme-handler/https=firefox.desktop
 file from /usr/share/applications if you use a different browser)."
 
 src_prepare() {
-	# Reason?
+	# Fix relink issues in src_install
 	ELTCONF="--reverse-deps"
 
 	#eautoreconf # See https://bugzilla.gnome.org/701904
 
 	gnome2_src_prepare
 
-	# Fix compilation flags crazyness
+	# Fix compilation flags crazyness, upstream bug #653157
 	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
 		-i configure || die "CPPFLAGS sed failed"
 }
@@ -113,6 +115,7 @@ src_configure() {
 		--disable-image-inline \
 		--disable-pst-import \
 		--enable-canberra \
+		--enable-gnome-desktop \
 		$(use_enable bogofilter) \
 		$(use_enable highlight text-highlight) \
 		$(use_enable map contact-maps) \
diff --git a/mail-client/evolution/files/evolution-3.10.4-imap-crash.patch b/mail-client/evolution/files/evolution-3.10.4-imap-crash.patch
deleted file mode 100644
index 4d9d59961a68..000000000000
--- a/mail-client/evolution/files/evolution-3.10.4-imap-crash.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5e4b28e2fae285fa632ab189707489e0df8d79aa Mon Sep 17 00:00:00 2001
-From: Fabiano Fidêncio <fidencio@redhat.com>
-Date: Tue, 21 Jan 2014 14:48:54 +0000
-Subject: Bug #722698 - Crash creating a new folder
-
----
-diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
-index b15041a..cd7f67e 100644
---- a/mail/em-folder-tree.c
-+++ b/mail/em-folder-tree.c
-@@ -1108,15 +1108,27 @@ folder_tree_dispose (GObject *object)
- {
- 	EMFolderTreePrivate *priv;
- 	GtkTreeModel *model;
-+	GtkTreeSelection *selection;
- 
- 	priv = EM_FOLDER_TREE_GET_PRIVATE (object);
- 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (object));
-+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (object));
- 
- 	if (priv->loaded_row_id != 0) {
- 		g_signal_handler_disconnect (model, priv->loaded_row_id);
- 		priv->loaded_row_id = 0;
- 	}
- 
-+	if (priv->loading_row_id != 0) {
-+		g_signal_handler_disconnect (model, priv->loading_row_id);
-+		priv->loading_row_id = 0;
-+	}
-+
-+	if (priv->selection_changed_handler_id != 0) {
-+		g_signal_handler_disconnect (selection, priv->selection_changed_handler_id);
-+		priv->selection_changed_handler_id = 0;
-+	}
-+
- 	if (priv->autoscroll_id != 0) {
- 		g_source_remove (priv->autoscroll_id);
- 		priv->autoscroll_id = 0;
---
-cgit v0.9.2
diff --git a/mail-client/evolution/files/evolution-3.10.4-main-ui.patch b/mail-client/evolution/files/evolution-3.10.4-main-ui.patch
deleted file mode 100644
index 086fdad0b50e..000000000000
--- a/mail-client/evolution/files/evolution-3.10.4-main-ui.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 37a95e0e6b74fa9fe1692c788983142d8d4774d4 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 10 Feb 2014 14:59:24 +0000
-Subject: Bug #724023 - Run EMailFormatter in the main/UI thread
-
-Any GtkWidget creation or manipulation should be done exclusively
-from the main/UI thread, thus make sure it is done that way.
-Of course, evolution can freeze for a little time (depends on the message
-size), until its formatting is done. It's unnoticeable with usual messages.
----
-diff --git a/em-format/e-mail-part-attachment-bar.c b/em-format/e-mail-part-attachment-bar.c
-index 5cebd9b..57f49be 100644
---- a/em-format/e-mail-part-attachment-bar.c
-+++ b/em-format/e-mail-part-attachment-bar.c
-@@ -60,12 +60,7 @@ e_mail_part_attachment_bar_class_init (EMailPartAttachmentBarClass *class)
- static void
- e_mail_part_attachment_bar_init (EMailPartAttachmentBar *part)
- {
--	GtkTreeModel *tree_model;
--
- 	part->priv = E_MAIL_PART_ATTACHMENT_BAR_GET_PRIVATE (part);
--
--	tree_model = e_attachment_store_new ();
--	part->priv->store = E_ATTACHMENT_STORE (tree_model);
- }
- 
- EMailPart *
-@@ -84,6 +79,18 @@ e_mail_part_attachment_bar_get_store (EMailPartAttachmentBar *part)
- {
- 	g_return_val_if_fail (E_IS_MAIL_PART_ATTACHMENT_BAR (part), NULL);
- 
-+	if (!part->priv->store) {
-+		GtkTreeModel *tree_model;
-+
-+		/* Create the store only on demand. The EMailParser runs in a dedicated
-+		   thread, but the EAttachmentStore is a GtkWidget descendant, which should
-+		   be manipulated only from the main/UI thread, thus postpone its creating
-+		   until it's really needed, which might be during the EMailFormatter run,
-+		   which runs from the main/UI thread. */
-+		tree_model = e_attachment_store_new ();
-+		part->priv->store = E_ATTACHMENT_STORE (tree_model);
-+	}
-+
- 	return part->priv->store;
- }
- 
-diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c
-index bfbedc3..615bce3 100644
---- a/mail/e-mail-request.c
-+++ b/mail/e-mail-request.c
-@@ -365,9 +365,12 @@ mail_request_send_async (SoupRequest *request,
- 			simple, handle_contact_photo_request,
- 			G_PRIORITY_DEFAULT, cancellable);
- 	} else {
--		g_simple_async_result_run_in_thread (
--			simple, handle_mail_request,
--			G_PRIORITY_DEFAULT, cancellable);
-+		/* Process e-mail mail requests in this thread, which should be
-+		   the main/UI thread, because any EMailFormatter can create
-+		   GtkWidget-s, or manipulate with them, which should be always
-+		   done in the main/UI thread. */
-+		handle_mail_request (simple, G_OBJECT (request), cancellable);
-+		g_simple_async_result_complete_in_idle (simple);
- 	}
- 
- 	g_object_unref (simple);
---
-cgit v0.9.2
diff --git a/mail-client/evolution/files/evolution-3.10.4-nntp-outbox.patch b/mail-client/evolution/files/evolution-3.10.4-nntp-outbox.patch
deleted file mode 100644
index 574591e098f8..000000000000
--- a/mail-client/evolution/files/evolution-3.10.4-nntp-outbox.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 9de8f573e9eba07a096c7f97f97bb5ac876278c8 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 10 Feb 2014 16:57:28 +0000
-Subject: Bug #722041 - NNTP Messages are silently dropped from Outbox
-
----
-diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
-index 4f3dbd3..4db5dae 100644
---- a/libemail-engine/mail-ops.c
-+++ b/libemail-engine/mail-ops.c
-@@ -682,22 +682,18 @@ mail_send_message (struct _send_queue_msg *m,
- 	info = camel_message_info_new (NULL);
- 	camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN, ~0);
- 
--	for (header = xev; header; header = header->next) {
-+	for (header = xev; header && !local_error; header = header->next) {
- 		gchar *uri;
- 
- 		if (strcmp (header->name, "X-Evolution-PostTo") != 0)
- 			continue;
- 
--		/* TODO: don't lose errors */
--
- 		uri = g_strstrip (g_strdup (header->value));
--		/* FIXME Not passing a GCancellable or GError here. */
- 		folder = e_mail_session_uri_to_folder_sync (
--			m->session, uri, 0, NULL, NULL);
-+			m->session, uri, 0, cancellable, &local_error);
- 		if (folder != NULL) {
--			/* FIXME Not passing a GCancellable or GError here. */
- 			camel_folder_append_message_sync (
--				folder, message, info, NULL, NULL, NULL);
-+				folder, message, info, NULL, cancellable, &local_error);
- 			g_object_unref (folder);
- 			folder = NULL;
- 		}
-@@ -707,7 +703,7 @@ mail_send_message (struct _send_queue_msg *m,
- 	/* post process */
- 	mail_tool_restore_xevolution_headers (message, xev);
- 
--	if (driver) {
-+	if (local_error == NULL && driver) {
- 		camel_filter_driver_filter_message (
- 			driver, message, info, NULL, NULL,
- 			NULL, "", cancellable, &local_error);
-@@ -735,10 +731,9 @@ mail_send_message (struct _send_queue_msg *m,
- 		}
- 	}
- 
--	if (provider == NULL
--	    || !(provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER)) {
-+	if (local_error == NULL && (provider == NULL
-+	    || !(provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER))) {
- 		CamelFolder *local_sent_folder;
--		GError *local_error = NULL;
- 
- 		local_sent_folder = e_mail_session_get_local_folder (
- 			m->session, E_MAIL_LOCAL_FOLDER_SENT);
-@@ -798,6 +793,7 @@ mail_send_message (struct _send_queue_msg *m,
- 					_("Failed to append to "
- 					"local 'Sent' folder: %s"),
- 					local_error->message);
-+				g_clear_error (&local_error);
- 			}
- 		}
- 	}
-@@ -836,7 +832,7 @@ mail_send_message (struct _send_queue_msg *m,
- 		camel_folder_synchronize_sync (queue, FALSE, NULL, NULL);
- 	}
- 
--	if (err->len > 0) {
-+	if (local_error == NULL && err->len > 0) {
- 		/* set the culmulative exception report */
- 		g_set_error (
- 			&local_error, CAMEL_ERROR,
---
-cgit v0.9.2