Adjusted dbus dependency (bug #154521). Pruning old ebuilds/patches.

(Portage version: 2.1.2_rc1-r7)
 (Unsigned Manifest commit)

13 files changed, 0 insertions, 560 deletions

diff --git a/mail-client/evolution/files/digest-evolution-2.4.2.1 b/mail-client/evolution/files/digest-evolution-2.4.2.1
deleted file mode 100644
index a62a87a833a2..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.4.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cee3e0ac6ca43e5060468c3b938bea72 evolution-2.4.2.1.tar.bz2 11503590
-RMD160 cb72e939fbd651a43ae09e0341f47e6ebf490c56 evolution-2.4.2.1.tar.bz2 11503590
-SHA256 eae8fed13de8eee9f60606ec0e645876e4b9a1e9bb30d21dace54e3995ca5f40 evolution-2.4.2.1.tar.bz2 11503590
diff --git a/mail-client/evolution/files/digest-evolution-2.8.0-r1 b/mail-client/evolution/files/digest-evolution-2.8.0-r1
deleted file mode 100644
index 8b7e069d7086..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.8.0-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-MD5 fdcdaa4f6c11cb3b42078262838967d7 evolution-2.8.0.tar.bz2 12821926
-RMD160 ba73d9529a02f2ea6db8c8f2c7da3041276e1d5c evolution-2.8.0.tar.bz2 12821926
-SHA256 1d83cbea7ef5b86df5eea5f553a0c3be3d157ed20bb8469b467f30cf18bb3320 evolution-2.8.0.tar.bz2 12821926
diff --git a/mail-client/evolution/files/digest-evolution-2.8.1-r1 b/mail-client/evolution/files/digest-evolution-2.8.1-r1
deleted file mode 100644
index 94690e15dbe4..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.8.1-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-MD5 6a08d1121bc126c4ed7035ab94a09871 evolution-2.8.1.tar.bz2 12873039
-RMD160 8a06f9a3d1a402d3e92edf1de623b07b09322059 evolution-2.8.1.tar.bz2 12873039
-SHA256 91d3e7c7fd961959fc01abcd7bb18747bfd8fe8b90bd91f03b4392b11f0e3a7b evolution-2.8.1.tar.bz2 12873039
diff --git a/mail-client/evolution/files/evolution-2.0.3-gentoo_etc_services.patch b/mail-client/evolution/files/evolution-2.0.3-gentoo_etc_services.patch
deleted file mode 100644
index 41b20cb9302e..000000000000
--- a/mail-client/evolution/files/evolution-2.0.3-gentoo_etc_services.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur evolution-2.0.3/camel/providers/imap/camel-imap-store.c evolution-2.0.3-patched/camel/providers/imap/camel-imap-store.c
---- evolution-2.0.3/camel/providers/imap/camel-imap-store.c	2004-12-06 15:46:51.000000000 +0800
-+++ evolution-2.0.3-patched/camel/providers/imap/camel-imap-store.c	2004-12-30 00:26:50.274319864 +0800
-@@ -534,7 +534,7 @@
- 		serv = g_alloca(16);
- 		sprintf(serv, "%d", service->url->port);
- 	} else {
--		serv = "imap";
-+		serv = "imap2";
- 		port = IMAP_PORT;
- 	}
- 	
-diff -ur evolution-2.0.3/camel/providers/pop3/camel-pop3-store.c evolution-2.0.3-patched/camel/providers/pop3/camel-pop3-store.c
---- evolution-2.0.3/camel/providers/pop3/camel-pop3-store.c	2004-12-06 15:46:51.000000000 +0800
-+++ evolution-2.0.3-patched/camel/providers/pop3/camel-pop3-store.c	2004-12-30 00:28:05.128940232 +0800
-@@ -159,7 +159,7 @@
- 		serv = g_alloca(16);
- 		sprintf(serv, "%d", service->url->port);
- 	} else {
--		serv = "pop3";
-+		serv = "pop-3";
- 		port = "110";
- 	}
- 		
-diff -ur evolution-2.0.3/camel/providers/smtp/camel-smtp-transport.c evolution-2.0.3-patched/camel/providers/smtp/camel-smtp-transport.c
---- evolution-2.0.3/camel/providers/smtp/camel-smtp-transport.c	2004-12-06 15:46:52.000000000 +0800
-+++ evolution-2.0.3-patched/camel/providers/smtp/camel-smtp-transport.c	2004-12-30 00:27:21.094634464 +0800
-@@ -263,7 +263,7 @@
- 			tcp_stream = camel_tcp_stream_ssl_new_raw (service->session, service->url->host, STARTTLS_FLAGS);
- 		} else {
- 			if (service->url->port == 0) {
--				serv = "smtps";
-+				serv = "ssmtp";
- 				port = "465";
- 			}
- 			tcp_stream = camel_tcp_stream_ssl_new (service->session, service->url->host, SSL_PORT_FLAGS);
diff --git a/mail-client/evolution/files/evolution-2.2.3-linking-fix.patch b/mail-client/evolution/files/evolution-2.2.3-linking-fix.patch
deleted file mode 100644
index c62eacd913c1..000000000000
--- a/mail-client/evolution/files/evolution-2.2.3-linking-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- evolution-2.2.3/calendar/gui/Makefile.am	2005-01-07 06:38:57.000000000 -0500
-+++ evolution-2.2.3.new/calendar/gui/Makefile.am	2005-07-19 17:30:27.000000000 -0400
-@@ -216,6 +216,7 @@
- libevolution_calendar_la_LIBADD =					\
- 	$(top_builddir)/widgets/menus/libmenus.la			\
- 	$(top_builddir)/shell/libeshell.la				\
-+	$(top_builddir)/mail/libevolution-mail.la			\
- 	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
- 	$(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la		\
- 	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la	\
---- evolution-2.2.3/Makefile.am	2005-02-25 13:02:09.000000000 -0500
-+++ evolution-2.2.3.new/Makefile.am	2005-07-19 18:00:43.000000000 -0400
-@@ -40,10 +40,10 @@
- 	filter			\
- 	$(SMIME_DIR)		\
- 	addressbook		\
--	calendar		\
--        art                     \
- 	composer		\
- 	mail			\
-+	calendar		\
-+        art                     \
- 	plugins			\
- 	ui			\
- 	views			\
---- evolution-2.2.1.1/mail/Makefile.am	2005-01-24 22:06:54.000000000 -0500
-+++ evolution-2.2.1.1.new/mail/Makefile.am	2005-07-18 21:59:53.000000000 -0400
-@@ -197,6 +197,7 @@
- 	$(top_builddir)/filter/libfilter.la			\
- 	$(top_builddir)/widgets/menus/libmenus.la		\
- 	$(top_builddir)/addressbook/util/libeabutil.la		\
-+	$(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \
- 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
- 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
- 	$(SMIME_LIB)						\
diff --git a/mail-client/evolution/files/evolution-2.3.8-gentoo.patch b/mail-client/evolution/files/evolution-2.3.8-gentoo.patch
deleted file mode 100644
index 15f9ef8bb3ff..000000000000
--- a/mail-client/evolution/files/evolution-2.3.8-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -NurdB evolution-2.3.8/widgets/misc/e-canvas-background.c evolution-2.3.8-patched/widgets/misc/e-canvas-background.c
---- evolution-2.3.8/widgets/misc/e-canvas-background.c	2005-08-22 05:52:55.000000000 -0500
-+++ evolution-2.3.8-patched/widgets/misc/e-canvas-background.c	2005-09-01 23:13:54.000000000 -0500
-@@ -427,6 +427,7 @@
- ecb_style_set (ECanvasBackground *ecb, GtkStyle *previous_style)
- {
- 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (ecb);
-+	g_return_if_fail (ecb->priv->gc != NULL);
- 	gdk_gc_set_foreground (ecb->priv->gc, &GTK_WIDGET(item->canvas)->style->base[GTK_STATE_NORMAL]);
- 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (ecb));
- }
diff --git a/mail-client/evolution/files/evolution-2.4.2.1-link.patch b/mail-client/evolution/files/evolution-2.4.2.1-link.patch
deleted file mode 100644
index 6215f0f0534e..000000000000
--- a/mail-client/evolution/files/evolution-2.4.2.1-link.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- evolution-2.4.2.1/widgets/misc/Makefile.am	2005-07-11 04:44:02.000000000 -0400
-+++ evolution-2.4.2.1.new/widgets/misc/Makefile.am	2005-12-08 12:56:16.000000000 -0500
-@@ -156,6 +156,7 @@
- test_calendar_LDADD = 						\
- 	./libemiscwidgets.la					\
- 	$(top_builddir)/e-util/libeutil.la			\
-+	$(top_builddir)/widgets/table/libetable.la              \
- 	$(E_WIDGETS_LIBS)
- 
- # test-dateedit
-@@ -166,6 +167,7 @@
- test_dateedit_LDADD = 			\
- 	./libemiscwidgets.la		\
- 	$(top_builddir)/e-util/libeutil.la	\
-+	$(top_builddir)/widgets/table/libetable.la              \
- 	$(E_WIDGETS_LIBS)
- 
- # test-dropdown-button
-@@ -176,6 +178,7 @@
- test_dropdown_button_LDADD =	\
- 	./libemiscwidgets.la	\
- 	$(top_builddir)/e-util/libeutil.la  \
-+	$(top_builddir)/widgets/table/libetable.la              \
- 	$(E_WIDGETS_LIBS)
- 
- # test-multi-config-dialog
-@@ -186,6 +189,7 @@
- test_multi_config_dialog_LDADD = 	\
- 	./libemiscwidgets.la		\
- 	$(top_builddir)/e-util/libeutil.la	\
-+	$(top_builddir)/widgets/table/libetable.la              \
- 	$(E_WIDGETS_LIBS)
- 
- # test-info-label
-@@ -196,6 +200,7 @@
- test_info_label_LDADD = 		\
- 	./libemiscwidgets.la	\
- 	$(top_builddir)/e-util/libeutil.la	\
-+	$(top_builddir)/widgets/table/libetable.la              \
- 	$(E_WIDGETS_LIBS)
- 
- BUILT_SOURCES = $(MARSHAL_GENERATED)
---- evolution-2.4.2.1/shell/Makefile.am	2005-08-18 00:35:30.000000000 -0400
-+++ evolution-2.4.2.1.new/shell/Makefile.am	2005-12-08 13:08:53.000000000 -0500
-@@ -142,6 +142,7 @@
- 	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la	\
- 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
- 	$(top_builddir)/e-util/libeutil.la				\
-+	$(top_builddir)/widgets/table/libetable.la			\
- 	$(TZDIALOG_LIBS)						\
- 	$(SHELL_LIBS)
- 
---- evolution-2.4.2.1/calendar/gui/alarm-notify/Makefile.am	2005-08-25 06:26:28.000000000 -0400
-+++ evolution-2.4.2.1.new/calendar/gui/alarm-notify/Makefile.am	2005-12-08 13:24:09.000000000 -0500
-@@ -50,6 +50,7 @@
- 	$(top_builddir)/e-util/libeutil.la				\
- 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
- 	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
-+	$(top_builddir)/widgets/table/libetable.la			\
- 	$(CAMEL_LIBS)							\
- 	$(EVOLUTION_CALENDAR_LIBS)
- 
---- evolution-2.4.2.1/tools/Makefile.am	2005-08-10 06:38:36.000000000 -0400
-+++ evolution-2.4.2.1.new/tools/Makefile.am	2005-12-08 13:49:46.000000000 -0500
-@@ -40,6 +40,7 @@
- killev_LDADD =							\
- 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
- 	$(top_builddir)/e-util/libeutil.la			\
-+	$(top_builddir)/widgets/table/libetable.la		\
- 	$(E_UTIL_LIBS)
- 
- CLEANFILES = evolution-addressbook-clean $(BUILT_SOURCES)
diff --git a/mail-client/evolution/files/evolution-2.8.0-64-bit.patch b/mail-client/evolution/files/evolution-2.8.0-64-bit.patch
deleted file mode 100644
index 0860f297a09a..000000000000
--- a/mail-client/evolution/files/evolution-2.8.0-64-bit.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/a11y/calendar/ea-gnome-calendar.c evolution-2.7.91.64-bit/a11y/calendar/ea-gnome-calendar.c
---- evolution-2.7.91.orig/a11y/calendar/ea-gnome-calendar.c	2004-10-29 05:56:35.000000000 -0400
-+++ evolution-2.7.91.64-bit/a11y/calendar/ea-gnome-calendar.c	2006-08-24 13:18:28.000000000 -0400
-@@ -29,6 +29,7 @@
- #include <gtk/gtknotebook.h>
- #include <libecal/e-cal-time-util.h>
- #include <libgnome/gnome-i18n.h>
-+#include <libedataserver/e-data-server-util.h>
- 
- static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/addressbook/gui/widgets/e-minicard.c evolution-2.7.91.64-bit/addressbook/gui/widgets/e-minicard.c
---- evolution-2.7.91.orig/addressbook/gui/widgets/e-minicard.c	2006-07-22 07:14:49.000000000 -0400
-+++ evolution-2.7.91.64-bit/addressbook/gui/widgets/e-minicard.c	2006-08-24 13:18:28.000000000 -0400
-@@ -40,6 +40,7 @@
- #include "e-minicard-view.h"
- #include "e-contact-editor.h"
- #include <e-util/e-icon-factory.h>
-+#include <e-util/e-html-utils.h>
- #include <libebook/e-destination.h>
- #include "a11y/addressbook/ea-addressbook.h"
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/calendar/gui/dialogs/memo-page.h evolution-2.7.91.64-bit/calendar/gui/dialogs/memo-page.h
---- evolution-2.7.91.orig/calendar/gui/dialogs/memo-page.h	2006-07-22 07:14:51.000000000 -0400
-+++ evolution-2.7.91.64-bit/calendar/gui/dialogs/memo-page.h	2006-08-24 13:18:28.000000000 -0400
-@@ -53,6 +53,8 @@
- GtkType   memo_page_get_type  (void);
- MemoPage *memo_page_construct (MemoPage *epage);
- MemoPage *memo_page_new       (BonoboUIComponent *uic, CompEditorPageFlags flags);
-+void memo_page_set_show_categories (MemoPage *page, gboolean state);
-+void memo_page_set_classification (MemoPage *page, ECalComponentClassification class);
- 
- G_END_DECLS
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/calendar/gui/e-calendar-view.h evolution-2.7.91.64-bit/calendar/gui/e-calendar-view.h
---- evolution-2.7.91.orig/calendar/gui/e-calendar-view.h	2006-08-07 00:47:42.000000000 -0400
-+++ evolution-2.7.91.64-bit/calendar/gui/e-calendar-view.h	2006-08-24 13:18:28.000000000 -0400
-@@ -166,6 +166,12 @@
- 					       gboolean new);
- 
- gboolean	e_calendar_view_get_tooltips (ECalendarViewEventData *data);
-+void e_calendar_view_move_tip (GtkWidget *widget, int x, int y);
-+#ifdef ENABLE_CAIRO
-+void draw_curved_rectangle (cairo_t *cr, double x0, double y0,
-+			double rect_width, double rect_height,
-+			double radius);
-+#endif
- G_END_DECLS
- 
- #endif
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/calendar/gui/e-cal-model-tasks.h evolution-2.7.91.64-bit/calendar/gui/e-cal-model-tasks.h
---- evolution-2.7.91.orig/calendar/gui/e-cal-model-tasks.h	2005-10-03 02:16:51.000000000 -0400
-+++ evolution-2.7.91.64-bit/calendar/gui/e-cal-model-tasks.h	2006-08-24 13:18:28.000000000 -0400
-@@ -63,6 +63,7 @@
- 
- void            e_cal_model_tasks_mark_task_complete (ECalModelTasks *model, gint model_row);
- void e_cal_model_tasks_update_due_tasks (ECalModelTasks *model);
-+void e_cal_model_tasks_mark_task_incomplete (ECalModelTasks *model, gint model_row);
- 
- G_END_DECLS
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/calendar/gui/e-day-view.c evolution-2.7.91.64-bit/calendar/gui/e-day-view.c
---- evolution-2.7.91.orig/calendar/gui/e-day-view.c	2006-08-07 00:47:43.000000000 -0400
-+++ evolution-2.7.91.64-bit/calendar/gui/e-day-view.c	2006-08-24 13:18:28.000000000 -0400
-@@ -65,6 +65,7 @@
- #include "calendar-commands.h"
- #include "calendar-config.h"
- #include "goto.h"
-+#include "e-calendar-view.h"
- #include "e-cal-model-calendar.h"
- #include "e-day-view-time-item.h"
- #include "e-day-view-top-item.h"
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/calendar/gui/e-meeting-store.c evolution-2.7.91.64-bit/calendar/gui/e-meeting-store.c
---- evolution-2.7.91.orig/calendar/gui/e-meeting-store.c	2006-04-22 00:39:20.000000000 -0400
-+++ evolution-2.7.91.64-bit/calendar/gui/e-meeting-store.c	2006-08-24 13:18:28.000000000 -0400
-@@ -1472,7 +1472,7 @@
- guint
- e_meeting_store_get_num_queries (EMeetingStore *store)
- {
--	g_return_if_fail (E_IS_MEETING_STORE (store));
-+	g_return_val_if_fail (E_IS_MEETING_STORE (store), 0);
- 
- 	return store->priv->num_queries;
- }
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/calendar/gui/e-week-view.c evolution-2.7.91.64-bit/calendar/gui/e-week-view.c
---- evolution-2.7.91.orig/calendar/gui/e-week-view.c	2006-07-22 07:14:51.000000000 -0400
-+++ evolution-2.7.91.64-bit/calendar/gui/e-week-view.c	2006-08-24 13:18:28.000000000 -0400
-@@ -69,6 +69,7 @@
- #include "e-week-view-layout.h"
- #include "e-week-view-main-item.h"
- #include "e-week-view-titles-item.h"
-+#include "e-calendar-view.h"
- #include "misc.h"
- #include <e-util/e-icon-factory.h>
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/calendar/gui/gnome-cal.h evolution-2.7.91.64-bit/calendar/gui/gnome-cal.h
---- evolution-2.7.91.orig/calendar/gui/gnome-cal.h	2006-07-22 07:14:51.000000000 -0400
-+++ evolution-2.7.91.64-bit/calendar/gui/gnome-cal.h	2006-08-24 13:18:29.000000000 -0400
-@@ -198,6 +198,7 @@
- 						 const char* comp_uid,
- 						 const char* comp_rid);
- 
-+GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal);
- G_END_DECLS
- 
- #endif
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/composer/e-msg-composer.c evolution-2.7.91.64-bit/composer/e-msg-composer.c
---- evolution-2.7.91.orig/composer/e-msg-composer.c	2006-08-07 00:47:43.000000000 -0400
-+++ evolution-2.7.91.64-bit/composer/e-msg-composer.c	2006-08-24 13:18:29.000000000 -0400
-@@ -63,6 +63,7 @@
- 
- #include <libgnome/gnome-exec.h>
- #include <libgnome/gnome-i18n.h>
-+#include <libgnome/gnome-help.h>
- #include <libgnomeui/gnome-uidefs.h>
- #include <libgnomeui/gnome-window-icon.h>
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/e-util/e-profile-event.c evolution-2.7.91.64-bit/e-util/e-profile-event.c
---- evolution-2.7.91.orig/e-util/e-profile-event.c	2006-02-08 06:43:02.000000000 -0500
-+++ evolution-2.7.91.64-bit/e-util/e-profile-event.c	2006-08-24 13:18:29.000000000 -0400
-@@ -133,12 +133,6 @@
- 
- 	e_event_emit((EEvent *)epe, "event", (EEventTarget *)t);
- }
--#else
--#undef e_profile_event_emit
--void
--e_profile_event_emit(const char *id, const char *uid, guint32 flags)
--{
--}
- #endif
- 
- /* ********************************************************************** */
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/e-util/e-util.h evolution-2.7.91.64-bit/e-util/e-util.h
---- evolution-2.7.91.orig/e-util/e-util.h	2006-07-22 07:14:52.000000000 -0400
-+++ evolution-2.7.91.64-bit/e-util/e-util.h	2006-08-24 13:18:52.000000000 -0400
-@@ -29,6 +29,7 @@
- #include <limits.h>
- #include <gconf/gconf-client.h>
- #include <cairo.h>
-+#include <gtk/gtk.h>
- 
- #ifdef __cplusplus
- extern "C" {
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/mail/em-folder-view.c evolution-2.7.91.64-bit/mail/em-folder-view.c
---- evolution-2.7.91.orig/mail/em-folder-view.c	2006-07-22 07:14:53.000000000 -0400
-+++ evolution-2.7.91.64-bit/mail/em-folder-view.c	2006-08-24 13:18:29.000000000 -0400
-@@ -69,6 +69,8 @@
- #include <gtkhtml/gtkhtml.h>
- #include <gtkhtml/gtkhtml-stream.h>
- 
-+#include <libedataserver/e-data-server-util.h>
-+
- #include "menus/gal-view-etable.h"
- #include "menus/gal-view-factory-etable.h"
- #include "menus/gal-view-instance.h"
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/mail/em-format-html-display.c evolution-2.7.91.64-bit/mail/em-format-html-display.c
---- evolution-2.7.91.orig/mail/em-format-html-display.c	2006-08-07 00:47:44.000000000 -0400
-+++ evolution-2.7.91.64-bit/mail/em-format-html-display.c	2006-08-24 13:18:29.000000000 -0400
-@@ -42,6 +42,7 @@
- #include <gtkhtml/gtkhtml-embedded.h>
- #include <gtkhtml/gtkhtml-search.h>
- 
-+#include <gtk/gtk.h>
- #include <gtk/gtkeventbox.h>
- #include <gtk/gtkvbox.h>
- #include <gtk/gtkhbox.h>
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/plugins/mono/mono-plugin.c evolution-2.7.91.64-bit/plugins/mono/mono-plugin.c
---- evolution-2.7.91.orig/plugins/mono/mono-plugin.c	2005-12-17 13:47:10.000000000 -0500
-+++ evolution-2.7.91.64-bit/plugins/mono/mono-plugin.c	2006-08-24 13:18:29.000000000 -0400
-@@ -8,6 +8,7 @@
- #include <mono/metadata/object.h>
- #include <mono/metadata/appdomain.h>
- #include <mono/metadata/assembly.h>
-+#include <mono/metadata/threads.h>
- #include <mono/jit/jit.h>
- 
- #define d(x)
diff --git a/mail-client/evolution/files/evolution-2.8.0-blank-reply.patch b/mail-client/evolution/files/evolution-2.8.0-blank-reply.patch
deleted file mode 100644
index 6ad938bb234f..000000000000
--- a/mail-client/evolution/files/evolution-2.8.0-blank-reply.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.0.orig/mail/em-folder-view.c evolution-2.8.0/mail/em-folder-view.c
---- evolution-2.8.0.orig/mail/em-folder-view.c	2006-09-02 02:43:04.000000000 -0400
-+++ evolution-2.8.0/mail/em-folder-view.c	2006-09-06 12:24:49.000000000 -0400
-@@ -1486,7 +1486,7 @@
- 
- 	if (gtk_html_command(((EMFormatHTML *)emfv->preview)->html, "is-selection-active")
- 	    && (html = gtk_html_get_selection_html (((EMFormatHTML *)emfv->preview)->html, &len))
--	    && len) {
-+	    && len && html[0]) {
- 		CamelMimeMessage *msg, *src;
- 		struct _camel_header_raw *header;
- 		
diff --git a/mail-client/evolution/files/evolution-2.8.0-fix-message-deletion.patch b/mail-client/evolution/files/evolution-2.8.0-fix-message-deletion.patch
deleted file mode 100644
index f53f23c6e8f4..000000000000
--- a/mail-client/evolution/files/evolution-2.8.0-fix-message-deletion.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- evolution-2.8.0/mail/em-folder-view.c.fix-message-deletion	2006-09-21 16:34:27.000000000 -0400
-+++ evolution-2.8.0/mail/em-folder-view.c	2006-09-21 16:34:40.000000000 -0400
-@@ -957,16 +957,9 @@
- 	count = em_folder_view_mark_selected(emfv, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED);
- 	
- 	if (count == 1) {
--		if (!emfv->list->threaded && !message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0) && emfv->hide_deleted)
-+		if (!message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0) && emfv->hide_deleted)
- 			message_list_select (emfv->list, MESSAGE_LIST_SELECT_PREVIOUS, 0, 0);
--		else if (emfv->list->threaded) {
--			if (emfv->hide_deleted)
--				message_list_select_uid (emfv->list, "");
--			else 
--				message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0);
--		}
- 	}
--
- }
- 
- static void
diff --git a/mail-client/evolution/files/evolution-2.8.0-includes.patch b/mail-client/evolution/files/evolution-2.8.0-includes.patch
deleted file mode 100644
index e6c8a8ff957d..000000000000
--- a/mail-client/evolution/files/evolution-2.8.0-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.7.91.orig/widgets/misc/e-attachment-bar.h evolution-2.7.91.includes/widgets/misc/e-attachment-bar.h
---- evolution-2.7.91.orig/widgets/misc/e-attachment-bar.h	2006-05-31 23:30:06.000000000 -0400
-+++ evolution-2.7.91.includes/widgets/misc/e-attachment-bar.h	2006-08-24 12:19:22.000000000 -0400
-@@ -82,6 +82,7 @@
- GSList *e_attachment_bar_get_selected (EAttachmentBar *bar);
- void e_attachment_bar_set_width(EAttachmentBar *bar, int bar_width);
- GSList * e_attachment_bar_get_all_attachments (EAttachmentBar *bar);
-+void e_attachment_bar_create_attachment_cache (EAttachment *attachment);
- 
- #ifdef __cplusplus
- }
diff --git a/mail-client/evolution/files/evolution-2.8.1-64-bit.patch b/mail-client/evolution/files/evolution-2.8.1-64-bit.patch
deleted file mode 100644
index 2c59dbfbc9da..000000000000
--- a/mail-client/evolution/files/evolution-2.8.1-64-bit.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/a11y/calendar/ea-gnome-calendar.c evolution-2.8.1/a11y/calendar/ea-gnome-calendar.c
---- evolution-2.8.1.orig/a11y/calendar/ea-gnome-calendar.c	2006-09-30 01:24:35.000000000 -0400
-+++ evolution-2.8.1/a11y/calendar/ea-gnome-calendar.c	2006-10-13 12:12:10.000000000 -0400
-@@ -30,6 +30,7 @@
- #include <libecal/e-cal-time-util.h>
- #include <libedataserver/e-data-server-util.h>
- #include <libgnome/gnome-i18n.h>
-+#include <libedataserver/e-data-server-util.h>
- 
- static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/addressbook/gui/widgets/e-minicard.c evolution-2.8.1/addressbook/gui/widgets/e-minicard.c
---- evolution-2.8.1.orig/addressbook/gui/widgets/e-minicard.c	2006-10-02 02:25:24.000000000 -0400
-+++ evolution-2.8.1/addressbook/gui/widgets/e-minicard.c	2006-10-13 12:12:10.000000000 -0400
-@@ -41,6 +41,7 @@
- #include "e-contact-editor.h"
- #include <e-util/e-html-utils.h>
- #include <e-util/e-icon-factory.h>
-+#include <e-util/e-html-utils.h>
- #include <libebook/e-destination.h>
- #include "a11y/addressbook/ea-addressbook.h"
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/calendar/gui/e-cal-model-tasks.h evolution-2.8.1/calendar/gui/e-cal-model-tasks.h
---- evolution-2.8.1.orig/calendar/gui/e-cal-model-tasks.h	2006-09-30 01:24:36.000000000 -0400
-+++ evolution-2.8.1/calendar/gui/e-cal-model-tasks.h	2006-10-13 12:12:10.000000000 -0400
-@@ -64,6 +64,7 @@
- void            e_cal_model_tasks_mark_task_complete (ECalModelTasks *model, gint model_row);
- void            e_cal_model_tasks_mark_task_incomplete (ECalModelTasks *model, gint model_row);
- void e_cal_model_tasks_update_due_tasks (ECalModelTasks *model);
-+void e_cal_model_tasks_mark_task_incomplete (ECalModelTasks *model, gint model_row);
- 
- G_END_DECLS
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/calendar/gui/e-day-view.c evolution-2.8.1/calendar/gui/e-day-view.c
---- evolution-2.8.1.orig/calendar/gui/e-day-view.c	2006-08-07 00:47:43.000000000 -0400
-+++ evolution-2.8.1/calendar/gui/e-day-view.c	2006-10-13 12:12:10.000000000 -0400
-@@ -65,6 +65,7 @@
- #include "calendar-commands.h"
- #include "calendar-config.h"
- #include "goto.h"
-+#include "e-calendar-view.h"
- #include "e-cal-model-calendar.h"
- #include "e-day-view-time-item.h"
- #include "e-day-view-top-item.h"
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/calendar/gui/e-meeting-store.c evolution-2.8.1/calendar/gui/e-meeting-store.c
---- evolution-2.8.1.orig/calendar/gui/e-meeting-store.c	2006-04-22 00:39:20.000000000 -0400
-+++ evolution-2.8.1/calendar/gui/e-meeting-store.c	2006-10-13 12:12:10.000000000 -0400
-@@ -1472,7 +1472,7 @@
- guint
- e_meeting_store_get_num_queries (EMeetingStore *store)
- {
--	g_return_if_fail (E_IS_MEETING_STORE (store));
-+	g_return_val_if_fail (E_IS_MEETING_STORE (store), 0);
- 
- 	return store->priv->num_queries;
- }
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/calendar/gui/e-week-view.c evolution-2.8.1/calendar/gui/e-week-view.c
---- evolution-2.8.1.orig/calendar/gui/e-week-view.c	2006-09-30 01:24:36.000000000 -0400
-+++ evolution-2.8.1/calendar/gui/e-week-view.c	2006-10-13 12:12:10.000000000 -0400
-@@ -69,6 +69,7 @@
- #include "e-week-view-layout.h"
- #include "e-week-view-main-item.h"
- #include "e-week-view-titles-item.h"
-+#include "e-calendar-view.h"
- #include "misc.h"
- #include <e-util/e-icon-factory.h>
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/calendar/gui/gnome-cal.h evolution-2.8.1/calendar/gui/gnome-cal.h
---- evolution-2.8.1.orig/calendar/gui/gnome-cal.h	2006-09-30 01:24:36.000000000 -0400
-+++ evolution-2.8.1/calendar/gui/gnome-cal.h	2006-10-13 12:12:10.000000000 -0400
-@@ -200,6 +200,7 @@
- 
- GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal);
- 
-+GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal);
- G_END_DECLS
- 
- #endif
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/composer/e-msg-composer.c evolution-2.8.1/composer/e-msg-composer.c
---- evolution-2.8.1.orig/composer/e-msg-composer.c	2006-09-30 01:24:40.000000000 -0400
-+++ evolution-2.8.1/composer/e-msg-composer.c	2006-10-13 12:12:10.000000000 -0400
-@@ -64,6 +64,7 @@
- #include <libgnome/gnome-exec.h>
- #include <libgnome/gnome-help.h>
- #include <libgnome/gnome-i18n.h>
-+#include <libgnome/gnome-help.h>
- #include <libgnomeui/gnome-uidefs.h>
- #include <libgnomeui/gnome-window-icon.h>
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/e-util/e-profile-event.c evolution-2.8.1/e-util/e-profile-event.c
---- evolution-2.8.1.orig/e-util/e-profile-event.c	2006-02-08 06:43:02.000000000 -0500
-+++ evolution-2.8.1/e-util/e-profile-event.c	2006-10-13 12:12:10.000000000 -0400
-@@ -133,12 +133,6 @@
- 
- 	e_event_emit((EEvent *)epe, "event", (EEventTarget *)t);
- }
--#else
--#undef e_profile_event_emit
--void
--e_profile_event_emit(const char *id, const char *uid, guint32 flags)
--{
--}
- #endif
- 
- /* ********************************************************************** */
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/e-util/e-util.h evolution-2.8.1/e-util/e-util.h
---- evolution-2.8.1.orig/e-util/e-util.h	2006-09-02 02:42:18.000000000 -0400
-+++ evolution-2.8.1/e-util/e-util.h	2006-10-13 12:12:10.000000000 -0400
-@@ -29,6 +29,7 @@
- #include <limits.h>
- #include <gconf/gconf-client.h>
- #include <cairo.h>
-+#include <gtk/gtk.h>
- 
- #ifdef __cplusplus
- extern "C" {
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/mail/em-format-html-display.c evolution-2.8.1/mail/em-format-html-display.c
---- evolution-2.8.1.orig/mail/em-format-html-display.c	2006-09-30 02:22:49.000000000 -0400
-+++ evolution-2.8.1/mail/em-format-html-display.c	2006-10-13 12:12:14.000000000 -0400
-@@ -42,6 +42,7 @@
- #include <gtkhtml/gtkhtml-embedded.h>
- #include <gtkhtml/gtkhtml-search.h>
- 
-+#include <gtk/gtk.h>
- #include <gtk/gtkeventbox.h>
- #include <gtk/gtkvbox.h>
- #include <gtk/gtkhbox.h>
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/plugins/mono/mono-plugin.c evolution-2.8.1/plugins/mono/mono-plugin.c
---- evolution-2.8.1.orig/plugins/mono/mono-plugin.c	2005-12-17 13:47:10.000000000 -0500
-+++ evolution-2.8.1/plugins/mono/mono-plugin.c	2006-10-13 12:12:14.000000000 -0400
-@@ -8,6 +8,7 @@
- #include <mono/metadata/object.h>
- #include <mono/metadata/appdomain.h>
- #include <mono/metadata/assembly.h>
-+#include <mono/metadata/threads.h>
- #include <mono/jit/jit.h>
- 
- #define d(x)
diff --git a/mail-client/evolution/files/evolution-2.8.1-filter-bar-crash.patch b/mail-client/evolution/files/evolution-2.8.1-filter-bar-crash.patch
deleted file mode 100644
index 26badb75a5a3..000000000000
--- a/mail-client/evolution/files/evolution-2.8.1-filter-bar-crash.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/widgets/misc/e-filter-bar.c evolution-2.8.1/widgets/misc/e-filter-bar.c
---- evolution-2.8.1.orig/widgets/misc/e-filter-bar.c	2006-09-30 01:24:50.000000000 -0400
-+++ evolution-2.8.1/widgets/misc/e-filter-bar.c	2006-10-13 15:31:15.000000000 -0400
-@@ -120,7 +120,7 @@
- 			
- 			efb->current_query = rule;
- 			g_object_ref (rule);
--			g_signal_emit_by_name (efb, "query_changed");
-+			g_signal_emit_by_name (efb, "search_activated");
- 
- 			gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED]));
- 			gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED]));
-@@ -684,6 +684,8 @@
- 					view_id = xml_get_prop_int (node, "view_id");
- 					scope = xml_get_prop_int (node, "searchscope");
- 					item_id = xml_get_prop_int (node, "item_id");
-+					if (item_id == -1)
-+						item_id = 0;
- 
- 					if (scope == E_FILTERBAR_CURRENT_FOLDER_ID)
- 						is_cur_folder = TRUE;
-@@ -770,7 +772,9 @@
- 						gtk_widget_modify_text (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, NULL);		
- 						gtk_widget_modify_base (((ESearchBar *)efb)->icon_entry, GTK_STATE_NORMAL, NULL);
- 						e_search_bar_paint (esb);
--						efb->current_query = NULL;
-+						efb->current_query = (FilterRule *)efb->option_rules->pdata[item_id - efb->option_base];
-+						if (efb->config && efb->current_query)
-+							efb->config (efb, efb->current_query, item_id, "", efb->config_data);						
- 					}
- 					
- 					xmlFree (text);