Removing Gnome 2.14

(Portage version: 2.1.3.4)

7 files changed, 7 insertions, 688 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index aeeb54d954db..d4acf91c186f 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.191 2007/08/11 15:00:05 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.192 2007/08/11 16:37:34 leio Exp $
+
+  11 Aug 2007; Mart Raudsepp <leio@gentoo.org>
+  -files/evolution-2.5.5.1-sideview.patch,
+  -files/evolution-2.6.2-as-needed.patch, -evolution-2.6.2-r1.ebuild,
+  -evolution-2.10.1.ebuild:
+  Removing Gnome 2.14
 
   11 Aug 2007; Andrej Kacian <ticho@gentoo.org> evolution-2.10.2.ebuild:
   Stable on x86, bug #185823.
diff --git a/mail-client/evolution/evolution-2.10.1.ebuild b/mail-client/evolution/evolution-2.10.1.ebuild
deleted file mode 100644
index 778922a657fe..000000000000
--- a/mail-client/evolution/evolution-2.10.1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.10.1.ebuild,v 1.3 2007/07/08 05:00:26 mr_bones_ Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.9"
-inherit eutils flag-o-matic alternatives gnome2 autotools
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}
-	bogofilter? ( mirror://gentoo/${PN}-2.5.5.1-bf-junk.tar.bz2 )"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-# gstreamer for audio-inline, when it uses 0.10
-IUSE="bogofilter crypt dbus debug doc hal ipv6 kerberos krb4 ldap mono networkmanager nntp pda profile spell ssl"
-
-# Pango dependency required to avoid font rendering problems
-RDEPEND=">=x11-themes/gnome-icon-theme-1.2
-	dev-libs/atk
-	>=gnome-extra/gtkhtml-3.14.0
-	>=dev-libs/glib-2.10
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/evolution-data-server-1.9.4
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeprint-2.7
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=net-libs/libsoup-2.2.96
-	>=x11-libs/pango-1.8.1
-	x11-libs/libnotify
-	hal? ( >=sys-apps/hal-0.5.4 )
-	pda? (
-		>=app-pda/gnome-pilot-2
-		>=app-pda/gnome-pilot-conduits-2 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	dbus? ( dev-libs/dbus-glib )
-	networkmanager? ( net-misc/networkmanager )
-	mono? ( >=dev-lang/mono-1 )
-	bogofilter? ( mail-filter/bogofilter )
-	!bogofilter? ( mail-filter/spamassassin )"
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.10
-#		>=media-libs/gst-plugins-base-0.10 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35.5
-	sys-devel/gettext
-	sys-devel/bison
-	app-text/scrollkeeper
-	>=gnome-base/gnome-common-2.12.0
-	>=app-text/gnome-doc-utils-0.9.1
-	doc? ( >=dev-util/gtk-doc-0.6 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-pkg_setup() {
-	G2CONF="--disable-default-binary \
-		--without-kde-applnk-path        \
-		$(use_enable ssl nss)            \
-		$(use_enable ssl smime)          \
-		$(use_enable ipv6)               \
-		$(use_enable mono)               \
-		$(use_enable nntp)               \
-		$(use_enable pda pilot-conduits) \
-		$(use_enable profile profiling)  \
-		$(use_with ldap openldap)        \
-		$(use_with kerberos krb5 /usr)"
-
-	# We need a graphical pinentry frontend to be able to ask for the GPG
-	# password from inside evolution, bug 160302
-	if use crypt && has_version '>=app-crypt/gnupg-2.0.1-r2'; then
-		if ! built_with_use -o app-crypt/pinentry gtk qt3; then
-			die "You must build app-crypt/pinentry with GTK or QT3 support"
-		fi
-	fi
-
-	if use krb4 && ! built_with_use virtual/krb5 krb4; then
-		ewarn
-		ewarn "In order to add kerberos 4 support, you have to emerge"
-		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
-		ewarn
-		ewarn "Skipping for now."
-		ewarn
-		G2CONF="${G2CONF} --without-krb4"
-	else
-		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
-	fi
-
-	# Plug-ins to install. Normally we would want something similar to
-	# --enable-plugins=all (plugins_base + plugins_standard), except for some
-	# special cases.
-	local plugins="calendar-file calendar-http calendar-weather \
-		itip-formatter plugin-manager default-source addressbook-file \
-		startup-wizard print-message mark-all-read groupwise-features \
-		groupwise-account-setup hula-account-setup mail-account-disable \
-		publish-calendar caldav imap-features \
-		bbdb subject-thread save-calendar select-one-source copy-tool \
-		mail-to-task mark-calendar-offline mailing-list-actions \
-		new-mail-notify default-mailer import-ics-attachments"
-
-	# For dev releases, add experimental plugins
-	plugins="${plugins} backup-restore folder-unsubscribe mail-to-meeting \
-		prefer-plain save-attachments"
-
-	if use bogofilter; then
-		plugins="${plugins} bf-junk-plugin"
-	else
-		plugins="${plugins} sa-junk-plugin"
-	fi
-
-	# The special cases
-
-	# remove this due to bug #128035 re-enable later if it doesn't dep on
-	# gstreamer-0.8
-	# use gstreamer && plugins="${plugins} audio-inline"
-	use dbus && plugins="${plugins} new-mail-notify"
-	use mono && plugins="${plugins} mono"
-
-	if built_with_use gnome-extra/evolution-data-server ldap; then
-		plugins="${plugins} exchange-operations"
-	fi
-
-	local pluginlist=""
-	for p in $plugins; do
-		[ "x$pluginlist" != "x" ] && pluginlist="${pluginlist},"
-		pluginlist="${pluginlist}${p}"
-	done
-
-	G2CONF="${G2CONF} --enable-plugins=${pluginlist}"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Accept the list of plugins separated by commas instead of spaces.
-	epatch "${FILESDIR}"/${PN}-2.3.7-configure_plugins.patch
-
-	# Fix 64-bit warnings
-	epatch "${FILESDIR}"/${PN}-2.8.1.1-64-bit.patch
-
-	# Fix linking against pilot-link wiht --as-needed; bug #154453
-	epatch "${FILESDIR}"/${PN}-2.8.2.1-pilot-link-as-needed.patch
-
-	# Fix "reply to meeting" buffer overruns
-	epatch "${FILESDIR}"/${PN}-2.9.91-cal-reply.patch
-
-	# Add bogofilter junk plugin source
-	use bogofilter && epatch "${FILESDIR}"/${PN}-2.9.2-bf-junk.patch.gz
-
-	# certificate filtering for clueless users (and even for those who know)
-	epatch ${FILESDIR}/${PN}-2.8.2.1-certificate-manager-filtering.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -i -e "s|mozilla-nss|nss|
-			s|mozilla-nspr|nspr|" ${S}/configure
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9][0-9]"
-	elog "To change the default browser if you are not using GNOME, do:"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	elog ""
-	elog "Replace 'mozilla %s' with which ever browser you use."
-}
diff --git a/mail-client/evolution/evolution-2.6.2-r1.ebuild b/mail-client/evolution/evolution-2.6.2-r1.ebuild
deleted file mode 100644
index 800771a2a6c9..000000000000
--- a/mail-client/evolution/evolution-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.6.2-r1.ebuild,v 1.13 2007/08/02 06:10:24 mr_bones_ Exp $
-
-inherit eutils flag-o-matic alternatives gnome2 autotools
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}
-	bogofilter? ( mirror://gentoo/${PN}-2.5.5.1-bf-junk.tar.bz2 )"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="bogofilter crypt dbus debug doc gstreamer hal ipv6 kerberos krb4 ldap mono nntp pda profile spell ssl widescreen"
-
-# Pango dependency required to avoid font rendering problems
-
-# evolution-data-server dep is 1.5 because in the e-utils directories,
-# the includes reference locations only present in eds > 1.5.
-# See also bug #148431.
-
-RDEPEND=">=x11-themes/gnome-icon-theme-1.2
-	dev-libs/atk
-	>=gnome-extra/gtkhtml-3.9.90
-	>=dev-libs/glib-2
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libbonobo-2
-	=gnome-extra/evolution-data-server-1.6*
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=net-libs/libsoup-2.2
-	>=x11-libs/pango-1.8.1
-	hal? ( >=sys-apps/hal-0.5.4 )
-	pda? (
-		>=app-pda/gnome-pilot-2
-		>=app-pda/gnome-pilot-conduits-2 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? ( >=dev-libs/nspr-4.6.1
-		   >=dev-libs/nss-3.11 )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10 )
-	dbus? ( dev-libs/dbus-glib )
-	mono? ( >=dev-lang/mono-1 )
-	bogofilter? ( mail-filter/bogofilter )
-	!bogofilter? ( mail-filter/spamassassin )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.30
-	sys-devel/gettext
-	sys-devel/bison
-	app-text/scrollkeeper
-	>=gnome-base/gnome-common-2.12.0
-	doc? ( >=dev-util/gtk-doc-0.6 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-pkg_setup() {
-	G2CONF="--disable-default-binary \
-		--without-kde-applnk-path        \
-		$(use_enable ssl nss)            \
-		$(use_enable ssl smime)          \
-		$(use_enable ipv6)               \
-		$(use_enable mono)               \
-		$(use_enable nntp)               \
-		$(use_enable pda pilot-conduits) \
-		$(use_enable profile profiling)  \
-		$(use_with ldap openldap)        \
-		$(use_with kerberos krb5 /usr)"
-
-	if use krb4 && ! built_with_use virtual/krb5 krb4; then
-		ewarn
-		ewarn "In order to add kerberos 4 support, you have to emerge"
-		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
-		ewarn
-		ewarn "Skipping for now."
-		ewarn
-		G2CONF="${G2CONF} --without-krb4"
-	else
-		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
-	fi
-
-	# Plug-ins to install. Normally we would want something similar to
-	# --enable-plugins=all (plugins_base + plugins_standard), except for some
-	# special cases.
-	local plugins="calendar-file calendar-http calendar-weather \
-		itip-formatter plugin-manager default-source addressbook-file \
-		startup-wizard print-message mark-all-read groupwise-features \
-		groupwise-account-setup hula-account-setup mail-account-disable \
-		publish-calendar caldav \
-		bbdb subject-thread save-calendar select-one-source copy-tool \
-		mail-to-task mark-calendar-offline audio-inline mailing-list-actions \
-		new-mail-notify default-mailer import-ics-attachments"
-
-	if use bogofilter; then
-		plugins="${plugins} bf-junk-plugin"
-	else
-		plugins="${plugins} sa-junk-plugin"
-	fi
-
-	# The special cases
-
-	# remove this due to bug #128035 re-enable later if it doesn't dep on
-	# gstreamer-0.8
-	# use gstreamer && plugins="${plugins} audio-inline"
-	use dbus && plugins="${plugins} new-mail-notify"
-	use mono && plugins="${plugins} mono"
-
-	if built_with_use gnome-extra/evolution-data-server ldap; then
-		plugins="${plugins} exchange-operations"
-	fi
-
-	local pluginlist=""
-	for p in $plugins; do
-		[ "x$pluginlist" != "x" ] && pluginlist="${pluginlist},"
-		pluginlist="${pluginlist}${p}"
-	done
-
-	G2CONF="${G2CONF} --enable-plugins=${pluginlist}"
-}
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	use bogofilter && unpack ${PN}-2.5.5.1-bf-junk.tar.bz2
-	cd "${S}"
-
-	gnome2_omf_fix help/omf.make
-
-	# Accept the list of plugins separated by commas instead of spaces.
-	epatch ${FILESDIR}/${PN}-2.3.7-configure_plugins.patch
-
-	# Add bogofilter junk plugin source
-	use bogofilter && epatch ${WORKDIR}/${PN}-2.5.5.1-bf-junk.patch
-
-	# Add widescreen mode, if requested
-	use widescreen && epatch ${FILESDIR}/${PN}-2.5.5.1-sideview.patch
-
-	# Fix --as-needed
-	epatch ${FILESDIR}/${P}-as-needed.patch
-
-	eaclocal || die
-	_elibtoolize --copy --force || die
-	eautoheader || die
-	eautomake || die
-	intltoolize --force || die
-	eautoconf || die
-}
-
-src_compile() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -i -e "s|mozilla-nss|nss|
-			s|mozilla-nspr|nspr|" ${S}/configure
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
-	elog "To change the default browser if you are not using GNOME, do:"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	elog ""
-	elog "Replace 'mozilla %s' with which ever browser you use."
-}
diff --git a/mail-client/evolution/files/digest-evolution-2.10.1 b/mail-client/evolution/files/digest-evolution-2.10.1
deleted file mode 100644
index 74c5ed527c2f..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.10.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 16051c6cbb617cb04665e402566e0976 evolution-2.10.1.tar.bz2 15689020
-RMD160 5323bc17906ad10ac6e7c5709ebac2cbc5df684b evolution-2.10.1.tar.bz2 15689020
-SHA256 d396190136e6322c2ae820993467bf41a8e188f9597ccf00e3411560280b5cda evolution-2.10.1.tar.bz2 15689020
-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
diff --git a/mail-client/evolution/files/digest-evolution-2.6.2-r1 b/mail-client/evolution/files/digest-evolution-2.6.2-r1
deleted file mode 100644
index 8b55786da215..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.6.2-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 24b97cf70a3c1e9e34f6e328e6910ab1 evolution-2.6.2.tar.bz2 12394719
-RMD160 72133312fb9cceae74d9f0e570dd898d5119a10b evolution-2.6.2.tar.bz2 12394719
-SHA256 a69c45e9deae3a2eea06af08eacb9266e6cdcd452dd600ad96c2de23effa56f5 evolution-2.6.2.tar.bz2 12394719
diff --git a/mail-client/evolution/files/evolution-2.5.5.1-sideview.patch b/mail-client/evolution/files/evolution-2.5.5.1-sideview.patch
deleted file mode 100644
index 8eb0e288f606..000000000000
--- a/mail-client/evolution/files/evolution-2.5.5.1-sideview.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-diff -u -ruN evolution-2.5.5.1.orig/mail/em-folder-browser.c evolution-2.5.5.1/mail/em-folder-browser.c
---- evolution-2.5.5.1.orig/mail/em-folder-browser.c	2006-01-16 06:12:24.000000000 -0500
-+++ evolution-2.5.5.1/mail/em-folder-browser.c	2006-01-21 00:12:22.000000000 -0500
-@@ -114,6 +114,8 @@
- 	guint folder_changed_id;
- 
- 	EMMenu *menu;		/* toplevel menu manager */
-+
-+	int show_wide:1;
- };
- 
- static void emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int state);
-@@ -220,7 +222,9 @@
- 		gtk_box_pack_start((GtkBox *)emfb, (GtkWidget *)emfb->search, FALSE, TRUE, 0);
- 	}
- 
--	emfb->vpane = gtk_vpaned_new();
-+	emfb->priv->show_wide = gconf_client_get_bool(mail_config_get_gconf_client(), "/apps/evolution/mail/display/show_wide", NULL);
-+	emfb->vpane = emfb->priv->show_wide?gtk_hpaned_new():gtk_vpaned_new();
-+
- 	g_signal_connect(emfb->vpane, "realize", G_CALLBACK(emfb_pane_realised), emfb);
- 	emfb->priv->vpane_resize_id = g_signal_connect(emfb->vpane, "button_release_event", G_CALLBACK(emfb_pane_button_release_event), emfb);
- 
-@@ -375,6 +379,33 @@
- 	/* FIXME: need to update menu's to reflect ui changes */
- }
- 
-+void em_folder_browser_show_wide(EMFolderBrowser *emfb, gboolean state)
-+{
-+	GtkWidget *w;
-+
-+	if ((emfb->priv->show_wide ^ state) == 0
-+	    || emfb->view.list == NULL
-+	    || emfb->view.preview_active == 0) {
-+		emfb->priv->show_wide = state;
-+		return;
-+	}
-+
-+	emfb->priv->show_wide = state;
-+
-+	w = emfb->priv->show_wide?gtk_hpaned_new():gtk_vpaned_new();
-+
-+	g_signal_handler_disconnect(emfb->vpane, emfb->priv->vpane_resize_id);
-+	g_signal_connect(w, "realize", G_CALLBACK(emfb_pane_realised), emfb);
-+	emfb->priv->vpane_resize_id = g_signal_connect(w, "button_release_event", G_CALLBACK(emfb_pane_button_release_event), emfb);
-+
-+	gtk_widget_show(w);
-+	gtk_box_pack_start_defaults((GtkBox *)emfb, w);
-+	gtk_widget_reparent((GtkWidget *)emfb->view.list, w);
-+	gtk_widget_reparent((GtkWidget *)emfb->priv->preview, w);
-+	gtk_widget_destroy(emfb->vpane);
-+	emfb->vpane = w;
-+}
-+
- /* ********************************************************************** */
- 
- /* FIXME: Need to separate system rules from user ones */
-@@ -942,6 +973,21 @@
- }
- 
- static void
-+emfb_show_wide(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data)
-+{
-+	GConfClient *gconf;
-+	EMFolderBrowser *emfb = data;
-+
-+	if (type != Bonobo_UIComponent_STATE_CHANGED)
-+		return;
-+
-+	gconf = mail_config_get_gconf_client ();
-+	gconf_client_set_bool(gconf, "/apps/evolution/mail/display/show_wide", state[0] != '0', NULL);
-+
-+	em_folder_browser_show_wide(emfb, state[0] != '0');
-+}
-+
-+static void
- emfb_list_scrolled (MessageList *ml, EMFolderBrowser *emfb)
- {
- 	EMFolderView *emfv = (EMFolderView *) emfb;
-@@ -1220,6 +1266,12 @@
- 		bonobo_ui_component_add_listener(uic, "ViewThreaded", emfb_view_threaded, emfv);
- 		message_list_set_threaded(emfv->list, state);
- 
-+		/* Show wide display */
-+		state = gconf_client_get_bool(gconf, "/apps/evolution/mail/display/show_wide", NULL);
-+		bonobo_ui_component_set_prop(uic, "/commands/ViewWide", "state", state ? "1" : "0", NULL);
-+		bonobo_ui_component_add_listener(uic, "ViewWide", emfb_show_wide, emfv);
-+		em_folder_browser_show_wide((EMFolderBrowser *)emfv, state);
-+
- 		/* FIXME: Selection state */
- 
- 		/* FIXME: property menu customisation */
-diff -u -ruN evolution-2.5.5.1.orig/mail/em-folder-browser.h evolution-2.5.5.1/mail/em-folder-browser.h
---- evolution-2.5.5.1.orig/mail/em-folder-browser.h	2005-05-16 03:53:53.000000000 -0400
-+++ evolution-2.5.5.1/mail/em-folder-browser.h	2006-01-21 00:12:22.000000000 -0500
-@@ -51,6 +51,7 @@
- GtkWidget *em_folder_browser_new(void);
- 
- void em_folder_browser_show_preview(EMFolderBrowser *emfv, gboolean state);
-+void em_folder_browser_show_wide(EMFolderBrowser *emfv, gboolean state);
- 
- #ifdef __cplusplus
- }
-diff -u -ruN evolution-2.5.5.1.orig/mail/evolution-mail.schemas.in.in evolution-2.5.5.1/mail/evolution-mail.schemas.in.in
---- evolution-2.5.5.1.orig/mail/evolution-mail.schemas.in.in	2006-01-02 06:38:59.000000000 -0500
-+++ evolution-2.5.5.1/mail/evolution-mail.schemas.in.in	2006-01-21 00:12:22.000000000 -0500
-@@ -360,6 +360,20 @@
-     </schema>
- 
-     <schema>
-+      <key>/schemas/apps/evolution/mail/display/show_wide</key>
-+      <applyto>/apps/evolution/mail/display/show_wide</applyto>
-+      <owner>evolution-mail</owner>
-+      <type>bool</type>
-+      <default>false</default>
-+      <locale name="C">
-+         <short>Use side-by-side or vertical layout</short>
-+         <long>
-+	  If the &quot;Preview&quot; pane is on, then show it side-by-side rather than vertically.
-+         </long>
-+      </locale>
-+    </schema>
-+
-+    <schema>
-       <key>/schemas/apps/evolution/mail/display/fonts/variable</key>
-       <applyto>/apps/evolution/mail/display/fonts/variable</applyto>
-       <owner>evolution-mail</owner>
-diff -u -ruN evolution-2.5.5.1.orig/shell/apps_evolution_shell.schemas.in.in evolution-2.5.5.1/shell/apps_evolution_shell.schemas.in.in
---- evolution-2.5.5.1.orig/shell/apps_evolution_shell.schemas.in.in	2005-03-21 16:40:25.000000000 -0500
-+++ evolution-2.5.5.1/shell/apps_evolution_shell.schemas.in.in	2006-01-21 00:12:22.000000000 -0500
-@@ -131,6 +131,18 @@
-     </schema>
- 
-     <schema>
-+      <key>/schemas/apps/evolution/shell/view_defaults/sidebar_visible</key>
-+      <applyto>/apps/evolution/shell/view_defaults/sidebar_visible</applyto>
-+      <owner>evolution</owner>
-+      <type>bool</type>
-+      <default>TRUE</default>
-+      <locale name="C">
-+        <short>Sidebar is visible</short>
-+        <long>Whether the sidebar should be visible.</long>
-+      </locale>
-+    </schema>
-+
-+    <schema>
-       <key>/schemas/apps/evolution/shell/view_defaults/component_id</key>
-       <applyto>/apps/evolution/shell/view_defaults/component_id</applyto>
-       <owner>evolution</owner>
-diff -u -ruN evolution-2.5.5.1.orig/shell/e-shell-window.c evolution-2.5.5.1/shell/e-shell-window.c
---- evolution-2.5.5.1.orig/shell/e-shell-window.c	2006-01-09 02:51:27.000000000 -0500
-+++ evolution-2.5.5.1/shell/e-shell-window.c	2006-01-21 00:12:22.000000000 -0500
-@@ -745,6 +745,15 @@
- 				      visible ? "0" : "1",
- 				      NULL);
- 
-+	visible = gconf_client_get_bool (gconf_client,
-+						 "/apps/evolution/shell/view_defaults/sidebar_visible",
-+						 NULL);
-+	bonobo_ui_component_set_prop (e_shell_window_peek_bonobo_ui_component (window),
-+				      "/commands/ViewSidebar",
-+				      "state",
-+				      visible ? "1" : "0",
-+				      NULL);
-+
- 	button_id = 0;
- 	xml = g_string_new("");
- 	for (p = e_component_registry_peek_list (registry); p != NULL; p = p->next) {
-@@ -803,6 +812,9 @@
- 	gtk_box_pack_start (GTK_BOX (contents_vbox), priv->status_bar, FALSE, TRUE, 0);
- 	gtk_widget_show (contents_vbox);
- 
-+	if (!visible)
-+		gtk_widget_hide (priv->sidebar);
-+
- 	/* We only display this when a menu item is actually selected.  */
- 	gtk_widget_hide (priv->menu_hint_label);
- 
-@@ -810,7 +822,6 @@
- 	g_object_unref (gconf_client);
- }
- 
--
- /* GObject methods.  */
- 
- static void
-@@ -1094,6 +1105,19 @@
- 		g_free (prop);
- 	}
- 
-+	prop = bonobo_ui_component_get_prop (e_shell_window_peek_bonobo_ui_component (window),
-+					     "/commands/ViewSidebar",
-+					     "state",
-+					     NULL);
-+	if (prop) {
-+		visible = prop[0] == '1';
-+		gconf_client_set_bool (client,
-+				       "/apps/evolution/shell/view_defaults/sidebar_visible",
-+				       visible,
-+				       NULL);
-+		g_free (prop);
-+	}
-+
- 	g_object_unref (client);
- }
- 
-diff -u -ruN evolution-2.5.5.1.orig/shell/e-shell-window.h evolution-2.5.5.1/shell/e-shell-window.h
---- evolution-2.5.5.1.orig/shell/e-shell-window.h	2006-01-02 06:39:13.000000000 -0500
-+++ evolution-2.5.5.1/shell/e-shell-window.h	2006-01-21 00:12:22.000000000 -0500
-@@ -52,7 +52,7 @@
- 
- 
- #include "e-shell.h"
--
-+#include "e-sidebar.h"
- 
- GType  e_shell_window_get_type  (void);
- 
-diff -u -ruN evolution-2.5.5.1.orig/ui/evolution-mail-global.xml evolution-2.5.5.1/ui/evolution-mail-global.xml
---- evolution-2.5.5.1.orig/ui/evolution-mail-global.xml	2006-01-16 06:12:29.000000000 -0500
-+++ evolution-2.5.5.1/ui/evolution-mail-global.xml	2006-01-21 00:12:22.000000000 -0500
-@@ -35,6 +35,10 @@
-      accel="*Control*m"
-      type="toggle"/>
- 
-+    <cmd name="ViewWide"
-+      _tip="Show message side-by-side with list"
-+      type="toggle"/>
-+ 
-   </commands>
- 
-   <keybindings>
-@@ -52,6 +56,7 @@
-     <submenu name="View" _label="_View">
-       <placeholder name="ViewPreview">
-         <menuitem name="ViewPreview" verb="" _label="Message _Preview"/>
-+        <menuitem name="ViewWide" verb="" _label="_View Side By Side"/>
-       </placeholder>
- 
-       <separator f="" name="emailglobal"/>
-diff -u -ruN evolution-2.5.5.1.orig/ui/evolution.xml evolution-2.5.5.1/ui/evolution.xml
---- evolution-2.5.5.1.orig/ui/evolution.xml	2006-01-16 06:12:29.000000000 -0500
-+++ evolution-2.5.5.1/ui/evolution.xml	2006-01-21 00:13:47.000000000 -0500
-@@ -31,6 +31,9 @@
-     <cmd name="ViewStatusBar" _label="_View Status Bar" type="toggle"
-       _tip="View/Hide the Status Bar" state="1"/>
- 
-+    <cmd name="ViewSidebar" _label="_Sidebar" type="toggle"
-+      _tip="Change the visibility of the sidebar" state="1"/>
-+
-     <cmd name="HelpSubmitBug" _label="Submit Bug Report"
-       _tip="Submit a bug report using Bug Buddy"/>
- 
-@@ -112,6 +115,7 @@
-       <placeholder name="ViewBegin"/>
-       <submenu name="Window" _label="_Window"/>
-       <menuitem name="ViewToolbar" id="ViewToolbar" verb=""/>
-+      <menuitem name="ViewSidebar" id="ViewSidebar" verb=""/>
-       <menuitem name="ViewStatusBar" id="ViewStatusBar"/>
-       <placeholder name="ViewPreview"/>
-       <submenu name="Buttons" _label="_Switcher Appearance">
diff --git a/mail-client/evolution/files/evolution-2.6.2-as-needed.patch b/mail-client/evolution/files/evolution-2.6.2-as-needed.patch
deleted file mode 100644
index c2deaf65b738..000000000000
--- a/mail-client/evolution/files/evolution-2.6.2-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -ruN evolution-2.6.2.orig/addressbook/printing/Makefile.am evolution-2.6.2/addressbook/printing/Makefile.am
---- evolution-2.6.2.orig/addressbook/printing/Makefile.am	2003-11-07 00:51:41.000000000 -0500
-+++ evolution-2.6.2/addressbook/printing/Makefile.am	2006-07-01 15:23:44.000000000 -0400
-@@ -39,6 +39,7 @@
- 
- contact_print_test_LDADD =	\
- 	libecontactprint.la					\
-+	$(top_builddir)/e-util/libeutil.la		\
- 	$(top_builddir)/addressbook/util/libeabutil.la		\
- 	$(EVOLUTION_ADDRESSBOOK_LIBS)
-