Remove old versions that are security vulnerable

(Portage version: 2.1.4.4)

11 files changed, 12 insertions, 1155 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 9f8b41a927aa..fbf2f4ab1caa 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.227 2008/03/05 19:30:32 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.228 2008/03/09 22:02:03 leio Exp $
+
+  09 Mar 2008; Mart Raudsepp <leio@gentoo.org>
+  -files/evolution-2.3.7-configure_plugins.patch,
+  -files/evolution-2.8.1.1-64-bit.patch,
+  -files/evolution-2.8.2.1-certificate-manager-filtering.patch,
+  -files/evolution-2.9.2-bf-junk.patch.gz,
+  -files/evolution-2.9.91-cal-reply.patch,
+  -files/evolution-2.10-fix-maildir-account.patch, -evolution-2.10.3.ebuild,
+  -evolution-2.12.1.ebuild, -evolution-2.12.2.ebuild,
+  -evolution-2.12.3.ebuild:
+  Remove old versions that are security vulnerable
 
   05 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   evolution-2.12.3-r1.ebuild:
diff --git a/mail-client/evolution/evolution-2.10.3.ebuild b/mail-client/evolution/evolution-2.10.3.ebuild
deleted file mode 100644
index 58065521747a..000000000000
--- a/mail-client/evolution/evolution-2.10.3.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.10.3.ebuild,v 1.11 2008/02/03 01:12:01 eva Exp $
-EAPI="1"
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.9"
-inherit eutils flag-o-matic alternatives gnome2 autotools versionator
-
-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 ~x86-fbsd"
-# gstreamer for audio-inline, when it uses 0.10
-IUSE="bogofilter crypt dbus debug doc hal ipv6 kerberos krb4 ldap mono 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.16
-	>=gnome-extra/evolution-data-server-1.10.2-r1
-	>=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:2.2
-	>=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 )
-	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 "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
-
-	# Fix timezone offsets on fbsd.  bug #183708
-	epatch "${FILESDIR}"/${PN}-2.10.2-fbsd.patch
-
-	# Maildir account configured to select files and not directories bug 133504
-	# Requires DEPEND on >=e-d-s-1.10.2-r1.
-	epatch "${FILESDIR}"/${PN}-2.10-fix-maildir-account.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
-}
-
-src_install() {
-	gnome2_src_install
-
-	dosym {/usr/libexec/evolution/$(get_version_component_range 1-2)/,/usr/bin/}csv2vcard
-	dosym {/usr/libexec/evolution/$(get_version_component_range 1-2)/,/usr/bin/}evolution-addressbook-export
-}
-
-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.12.1.ebuild b/mail-client/evolution/evolution-2.12.1.ebuild
deleted file mode 100644
index a85a2607fe3b..000000000000
--- a/mail-client/evolution/evolution-2.12.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.12.1.ebuild,v 1.14 2008/02/03 01:12:01 eva Exp $
-EAPI="1"
-
-inherit gnome2 flag-o-matic
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-# gstreamer for audio-inline, when it uses 0.10
-IUSE="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-libs/gtk+-2.10
-	>=gnome-extra/evolution-data-server-1.11.90
-	>=x11-themes/gnome-icon-theme-1.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/libbonobo-2.16
-	>=gnome-extra/gtkhtml-3.16
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnomeui-2
-	>=dev-libs/libxml2-2
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( >=sys-apps/hal-0.5.4 )
-	x11-libs/libnotify
-	pda? (
-		>=app-pda/gnome-pilot-2.0.15
-		>=app-pda/gnome-pilot-conduits-2 )
-	dev-libs/atk
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )
-	networkmanager? ( net-misc/networkmanager )
-	>=net-libs/libsoup-2.2.96:2.2
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	>=dev-libs/glib-2.10
-	>=gnome-base/orbit-2.9.8
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
-	ldap? ( >=net-nds/openldap-2 )
-	mono? ( >=dev-lang/mono-1 )"
-#	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="--without-kde-applnk-path        \
-		--enable-plugins=experimental    \
-		$(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
-
-	# 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.
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Mail-remote doesn't build
-	epatch "${FILESDIR}"/${P}-mail-remote-broken.patch
-
-	# Fix timezone offsets on fbsd.  bug #183708
-	epatch "${FILESDIR}"/${PN}-2.10.2-fbsd.patch
-
-	# Fix tests (again)
-	echo "evolution-addressbook.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-calendar.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-composer-entries.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-event-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-global.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-list.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-message.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-messagedisplay.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-memo-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-memos.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-message-composer.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-signature-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-subscribe.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-task-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-tasks.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution.xml" >> "${S}"/po/POTFILES.in
-}
-
-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
-
-	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."
-	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"
-}
diff --git a/mail-client/evolution/evolution-2.12.2.ebuild b/mail-client/evolution/evolution-2.12.2.ebuild
deleted file mode 100644
index d718f4c3be8e..000000000000
--- a/mail-client/evolution/evolution-2.12.2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.12.2.ebuild,v 1.10 2008/02/04 04:09:08 jer Exp $
-EAPI="1"
-
-inherit gnome2 flag-o-matic
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-# gstreamer for audio-inline, when it uses 0.10
-IUSE="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-libs/gtk+-2.10
-	>=gnome-extra/evolution-data-server-1.11.90
-	>=x11-themes/gnome-icon-theme-1.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/libbonobo-2.16
-	>=gnome-extra/gtkhtml-3.16
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnomeui-2
-	>=dev-libs/libxml2-2
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( >=sys-apps/hal-0.5.4 )
-	x11-libs/libnotify
-	pda? (
-		>=app-pda/gnome-pilot-2.0.15
-		>=app-pda/gnome-pilot-conduits-2 )
-	dev-libs/atk
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )
-	networkmanager? ( net-misc/networkmanager )
-	>=net-libs/libsoup-2.2.96:2.2
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	>=dev-libs/glib-2.10
-	>=gnome-base/orbit-2.9.8
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
-	ldap? ( >=net-nds/openldap-2 )
-	mono? ( >=dev-lang/mono-1 )"
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.10
-#		>=media-libs/gst-plugins-base-0.10 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.16
-	>=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="--without-kde-applnk-path        \
-		--enable-plugins=experimental    \
-		$(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
-
-	# 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.
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Mail-remote doesn't build
-	epatch "${FILESDIR}"/${PN}-2.12.1-mail-remote-broken.patch
-
-	# Fix timezone offsets on fbsd.  bug #183708
-	epatch "${FILESDIR}"/${PN}-2.10.2-fbsd.patch
-
-	# Fix tests (again)
-	echo "evolution-addressbook.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-calendar.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-composer-entries.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-event-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-global.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-list.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-message.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-messagedisplay.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-memo-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-memos.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-message-composer.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-signature-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-subscribe.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-task-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-tasks.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution.xml" >> "${S}"/po/POTFILES.in
-}
-
-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
-
-	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."
-	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"
-}
diff --git a/mail-client/evolution/evolution-2.12.3.ebuild b/mail-client/evolution/evolution-2.12.3.ebuild
deleted file mode 100644
index 655048dd57e0..000000000000
--- a/mail-client/evolution/evolution-2.12.3.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.12.3.ebuild,v 1.3 2008/02/03 01:12:01 eva Exp $
-EAPI="1"
-
-inherit gnome2 flag-o-matic
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-# gstreamer for audio-inline, when it uses 0.10
-IUSE="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-libs/gtk+-2.10
-	>=gnome-extra/evolution-data-server-1.11.90
-	>=x11-themes/gnome-icon-theme-1.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/libbonobo-2.16
-	>=gnome-extra/gtkhtml-3.16
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnomeui-2
-	>=dev-libs/libxml2-2
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( >=sys-apps/hal-0.5.4 )
-	x11-libs/libnotify
-	pda? (
-		>=app-pda/gnome-pilot-2.0.15
-		>=app-pda/gnome-pilot-conduits-2 )
-	dev-libs/atk
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )
-	networkmanager? ( net-misc/networkmanager )
-	>=net-libs/libsoup-2.2.96:2.2
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	>=dev-libs/glib-2.10
-	>=gnome-base/orbit-2.9.8
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
-	ldap? ( >=net-nds/openldap-2 )
-	mono? ( >=dev-lang/mono-1 )"
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.10
-#		>=media-libs/gst-plugins-base-0.10 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.16
-	>=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="--without-kde-applnk-path        \
-		--enable-plugins=experimental    \
-		$(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
-
-	# 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.
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Mail-remote doesn't build
-	epatch "${FILESDIR}"/${PN}-2.12.1-mail-remote-broken.patch
-
-	# Fix timezone offsets on fbsd.  bug #183708
-	epatch "${FILESDIR}"/${PN}-2.10.2-fbsd.patch
-
-	# Fix tests (again)
-	echo "evolution-addressbook.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-calendar.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-composer-entries.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-event-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-global.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-list.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-message.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-mail-messagedisplay.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-memo-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-memos.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-message-composer.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-signature-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-subscribe.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-task-editor.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution-tasks.xml" >> "${S}"/po/POTFILES.in
-	echo "evolution.xml" >> "${S}"/po/POTFILES.in
-}
-
-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
-
-	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."
-	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"
-}
diff --git a/mail-client/evolution/files/evolution-2.10-fix-maildir-account.patch b/mail-client/evolution/files/evolution-2.10-fix-maildir-account.patch
deleted file mode 100644
index 8f423a12644d..000000000000
--- a/mail-client/evolution/files/evolution-2.10-fix-maildir-account.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-   http://bugs.gentoo.org/show_bug.cgi?id=133504
-
-   2007-08-13  Milan Crha  <mcrha@redhat.com>
-
-   ** Fix for bug #352346
-
-   * em-migrate.c (em_update_accounts_2_11), (em_migrate):
-   Added function to change "spool" to "spooldir" for those
-   spools which points on directories.
-
-diff -Naur evolution-2.10.2.orig/mail/em-account-editor.c evolution-2.10.2/mail/em-account-editor.c
---- evolution-2.10.2.orig/mail/em-account-editor.c	2007-04-09 17:09:27.000000000 +0400
-+++ evolution-2.10.2/mail/em-account-editor.c	2007-08-13 14:14:21.000000000 +0400
-@@ -1665,8 +1665,18 @@
- 	}
- 	if (url->user)
- 		gtk_entry_set_text(service->username, url->user);
--	if (service->pathentry && url->path)
--		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (service->pathentry), url->path);
-+	if (service->pathentry) {
-+		GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
-+
-+		if (service->provider && (service->provider->url_flags & CAMEL_URL_NEED_PATH_DIR) == 0)
-+			action = GTK_FILE_CHOOSER_ACTION_OPEN;
-+
-+		if (action != gtk_file_chooser_get_action (GTK_FILE_CHOOSER (service->pathentry)))
-+			gtk_file_chooser_set_action (GTK_FILE_CHOOSER (service->pathentry), action);
-+
-+		if (url->path)
-+			gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (service->pathentry), url->path);
-+	}
- 
- 	tmp = camel_url_get_param(url, "use_ssl");
- 	if (tmp == NULL)
-diff -Naur evolution-2.10.2.orig/mail/em-migrate.c evolution-2.10.2/mail/em-migrate.c
---- evolution-2.10.2.orig/mail/em-migrate.c	2007-04-09 17:09:27.000000000 +0400
-+++ evolution-2.10.2/mail/em-migrate.c	2007-08-13 14:15:15.000000000 +0400
-@@ -2638,6 +2638,39 @@
- 	return 0;
- }
- 
-+static void
-+em_update_accounts_2_11 (void)
-+{
-+	EAccountList *accounts;
-+	EIterator *iter;
-+	gboolean changed = FALSE;
-+
-+	if (!(accounts = mail_config_get_accounts ()))
-+		return;
-+
-+	iter = e_list_get_iterator ((EList *) accounts);
-+	while (e_iterator_is_valid (iter)) {
-+		EAccount *account = (EAccount *) e_iterator_get (iter);
-+
-+		if (g_str_has_prefix (account->source->url, "spool://")) {
-+			if (g_file_test (account->source->url + 8, G_FILE_TEST_IS_DIR)) {
-+				char *str = g_strdup_printf ("spooldir://%s", account->source->url + 8);
-+
-+				g_free (account->source->url);
-+				account->source->url = str;
-+				changed = TRUE;
-+			}
-+		}
-+
-+		e_iterator_next (iter);
-+	}
-+
-+	g_object_unref (iter);
-+
-+	if (changed)
-+		mail_config_save_accounts ();
-+}
-+
- #endif
- 
- static int
-@@ -2780,6 +2813,10 @@
- 		
- 		g_free (path);
- 	}
-+
-+	if (major < 2 || (major == 2 && minor < 12)) {
-+		em_update_accounts_2_11 ();
-+	}
- #endif	/* !G_OS_WIN32 */
- 	return 0;
- }
-diff -Naur evolution-2.10.2.orig/mail/mail-config.glade evolution-2.10.2/mail/mail-config.glade
---- evolution-2.10.2.orig/mail/mail-config.glade	2007-04-09 17:09:27.000000000 +0400
-+++ evolution-2.10.2/mail/mail-config.glade	2007-08-13 14:15:53.000000000 +0400
-@@ -1354,7 +1354,6 @@
- 				  <property name="right_attach">2</property>
- 				  <property name="top_attach">2</property>
- 				  <property name="bottom_attach">3</property>
--				  <property name="x_options">fill</property>
- 				  <property name="y_options"></property>
- 				</packing>
- 			      </child>
diff --git a/mail-client/evolution/files/evolution-2.3.7-configure_plugins.patch b/mail-client/evolution/files/evolution-2.3.7-configure_plugins.patch
deleted file mode 100644
index 723205ffd05a..000000000000
--- a/mail-client/evolution/files/evolution-2.3.7-configure_plugins.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -NurdB evolution-2.3.7/configure.in evolution-2.3.7-patched/configure.in
---- evolution-2.3.7/configure.in	2005-08-08 07:15:03.000000000 -0500
-+++ evolution-2.3.7-patched/configure.in	2005-08-17 22:32:05.000000000 -0500
-@@ -1414,7 +1414,11 @@
- EVO_PLUGIN_RULE=$srcdir/plugin.mk
- AC_SUBST_FILE(EVO_PLUGIN_RULE)
- 
--AC_ARG_ENABLE(plugins, [  --enable-plugins=[no/base/all/experimental/list]      Enable plugins.],enable_plugins="$enableval",enable_plugins=all)
-+AC_ARG_ENABLE(plugins,
-+	[  --enable-plugins=extension1,extension2,...
-+			  build the specified plugins.
-+			  You can also use the aliases base, all, and experimental],
-+	enable_plugins="$enableval",enable_plugins=all)
- 
- dnl Add any new plugins here
- plugins_base="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 mail-account-disable $SA_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN" 
-@@ -1423,28 +1427,24 @@
- 
- plugins_experimental="backup-restore folder-unsubscribe mail-to-meeting mail-remote prefer-plain save-attachments"
- 
--case x"$enable_plugins" in
--xno)
--	plugins_enabled=""
--	msg_plugins="no (some core functionality will not be available)"
--	;;
--xall | x | xyes)
--	plugins_enabled="$plugins_base $plugins_standard"
--	msg_plugins="yes (all)"
--	;;
--xbase)
--	plugins_enabled="$plugins_base"
--	msg_plugins="yes ($plugins_base)"
--	;;
--xexperimental)
--	plugins_enabled="$plugins_base $plugins_standard $plugins_experimental"
--	msg_plugins="yes ($plugins_base $plugins_standard $plugins_experimental)"
--	;;
--*)
--	plugins_enabled="$enable_plugins"
--	msg_plugins="yes ($enable_plugins)"
--	;;
--esac
-+plugins_all="$plugins_base $plugins_standard $plugins_experimental"
-+plugins_enabled=""
-+
-+IFS="${IFS=	}"; evoext_save_ifs="$IFS"; IFS=","
-+for plugin in $enable_plugins; do
-+  if echo "$plugins_all" | egrep "(^| )$plugin(\$| )" > /dev/null; then
-+    plugins_enabled="$plugins_enabled $plugin"
-+  elif test "x$plugin" = "xall" || test "x$plugin" = "xyes"; then
-+    plugins_enabled="$plugins_enabled $plugins_base $plugins_standard"
-+  elif test "x$plugin" = "xbase"; then
-+    plugins_enabled="$plugins_enabled $plugins_base"
-+  elif test "x$plugin" = "xexperimental"; then
-+    plugins_enabled="$plugins_enabled $plugins_all"
-+  else
-+    AC_MSG_ERROR([the specified plugin $plugin does not exist])
-+  fi
-+done
-+IFS="$evoext_save_ifs"
- 
- AC_ARG_ENABLE(profiling, [  --enable-profiling=[no/yes]      Enable profiling plugin.],enable_profiling="$enableval",enable_profiling=no)
- case x"$enable_profiling" in
-@@ -1460,6 +1460,13 @@
- 	msg_plugins="$msg_plugins (and mono)"
- fi
- 
-+plugins_enabled=`echo $plugins_enabled | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
-+if test "x$plugins_enabled" = "x"; then
-+  msg_plugins="no (some core functionality will not be available)"
-+else
-+  msg_plugins="yes ($plugins_enabled)"
-+fi
-+
- AC_SUBST(plugins_enabled)
- AC_SUBST(plugins_base)
- AC_SUBST(plugins_standard)
diff --git a/mail-client/evolution/files/evolution-2.8.1.1-64-bit.patch b/mail-client/evolution/files/evolution-2.8.1.1-64-bit.patch
deleted file mode 100644
index ed26cd33762f..000000000000
--- a/mail-client/evolution/files/evolution-2.8.1.1-64-bit.patch
+++ /dev/null
@@ -1,126 +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-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.2.1-certificate-manager-filtering.patch b/mail-client/evolution/files/evolution-2.8.2.1-certificate-manager-filtering.patch
deleted file mode 100644
index 50926561d657..000000000000
--- a/mail-client/evolution/files/evolution-2.8.2.1-certificate-manager-filtering.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Index: smime/gui/certificate-manager.c
-===================================================================
---- smime/gui/certificate-manager.c	(révision 33213)
-+++ smime/gui/certificate-manager.c	(copie de travail)
-@@ -133,6 +133,8 @@
- 	const char *filename;
- 
- #ifdef USE_GTKFILECHOOSER
-+	GtkFileFilter* filter;
-+
- 	filesel = gtk_file_chooser_dialog_new (_("Select a certificate to import..."),
- 					       NULL,
- 					       GTK_FILE_CHOOSER_ACTION_OPEN,
-@@ -140,6 +142,16 @@
- 					       GTK_STOCK_OPEN, GTK_RESPONSE_OK,
- 					       NULL);
- 	gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK);
-+
-+	filter = gtk_file_filter_new();
-+	gtk_file_filter_set_name (filter, _("All PKCS12 files"));
-+	gtk_file_filter_add_mime_type (filter, "application/x-pkcs12");
-+	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
-+
-+	filter = gtk_file_filter_new ();
-+	gtk_file_filter_set_name (filter, _("All files"));
-+	gtk_file_filter_add_pattern (filter, "*");
-+	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
- #else
- 	filesel = gtk_file_selection_new (_("Select a certificate to import..."));
- #endif
-@@ -372,6 +384,8 @@
- 	const char *filename;
- 
- #ifdef USE_GTKFILECHOOSER
-+	GtkFileFilter *filter;
-+
- 	filesel = gtk_file_chooser_dialog_new (_("Select a certificate to import..."),
- 					       NULL,
- 					       GTK_FILE_CHOOSER_ACTION_OPEN,
-@@ -379,6 +393,16 @@
- 					       GTK_STOCK_OPEN, GTK_RESPONSE_OK,
- 					       NULL);
- 	gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK);
-+
-+	filter = gtk_file_filter_new();
-+	gtk_file_filter_set_name (filter, _("All email certificate files"));
-+	gtk_file_filter_add_mime_type (filter, "application/x-x509-email-cert");
-+	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
-+
-+	filter = gtk_file_filter_new ();
-+	gtk_file_filter_set_name (filter, _("All files"));
-+	gtk_file_filter_add_pattern (filter, "*");
-+	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
- #else
- 	filesel = gtk_file_selection_new (_("Select a certificate to import..."));
- #endif
-@@ -592,6 +616,8 @@
- 	const char *filename;
- 
- #ifdef USE_GTKFILECHOOSER
-+	GtkFileFilter *filter;
-+
- 	filesel = gtk_file_chooser_dialog_new (_("Select a certificate to import..."),
- 					       NULL,
- 					       GTK_FILE_CHOOSER_ACTION_OPEN,
-@@ -599,6 +625,16 @@
- 					       GTK_STOCK_OPEN, GTK_RESPONSE_OK,
- 					       NULL);
- 	gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK);
-+
-+	filter = gtk_file_filter_new();
-+	gtk_file_filter_set_name (filter, _("All CA certificate files"));
-+	gtk_file_filter_add_mime_type (filter, "application/x-x509-ca-cert");
-+	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
-+
-+	filter = gtk_file_filter_new ();
-+	gtk_file_filter_set_name (filter, _("All files"));
-+	gtk_file_filter_add_pattern (filter, "*");
-+	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
- #else
- 	filesel = gtk_file_selection_new (_("Select a certificate to import..."));
- #endif
diff --git a/mail-client/evolution/files/evolution-2.9.2-bf-junk.patch.gz b/mail-client/evolution/files/evolution-2.9.2-bf-junk.patch.gz
deleted file mode 100644
index 0e4057bd61ff..000000000000
--- a/mail-client/evolution/files/evolution-2.9.2-bf-junk.patch.gz
+++ /dev/null
diff --git a/mail-client/evolution/files/evolution-2.9.91-cal-reply.patch b/mail-client/evolution/files/evolution-2.9.91-cal-reply.patch
deleted file mode 100644
index 5a62a853a433..000000000000
--- a/mail-client/evolution/files/evolution-2.9.91-cal-reply.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN evolution-2.9.91.orig/calendar/gui/itip-utils.c evolution-2.9.91/calendar/gui/itip-utils.c
---- evolution-2.9.91.orig/calendar/gui/itip-utils.c	2007-01-08 09:50:33.000000000 -0500
-+++ evolution-2.9.91/calendar/gui/itip-utils.c	2007-02-15 17:37:12.000000000 -0500
-@@ -1476,28 +1476,28 @@ reply_to_calendar_comp (ECalComponentIti
- 		body = "<br><br><hr><br><b>______ Original Appointment ______ </b><br><br><table>";
- 
- 		if (orig_from && *orig_from){
--			char *part1 = (char *) malloc (sizeof (char) * 200);
-+			char *part1 = (char *) malloc (50 + strlen (orig_from));
- 			sprintf (part1, "<tr><td><b>From</b></td><td>:</td><td>%s</td></tr>", orig_from);
- 			body = g_strconcat (body, (gchar *)part1, NULL);
- 			g_free (part1);
- 		}
- 
- 		if (subject){
--			char *part2 = (char *) malloc (sizeof (char) * 100);
-+			char *part2 = (char *) malloc (53 + strlen (subject));
- 			sprintf (part2, "<tr><td><b>Subject</b></td><td>:</td><td>%s</td></tr>", subject);
- 			body = g_strconcat (body, (gchar *)part2, NULL);
- 			g_free (part2);
- 		}
- 			
- 		{
--			char *part3 = (char *) malloc (sizeof (char) * 100);
-+			char *part3 = (char *) malloc (54 + strlen (location));
- 			sprintf (part3, "<tr><td><b>Location</b></td><td>:</td><td>%s</td></tr>", location);
- 			body = g_strconcat (body, (gchar *)part3, NULL);
- 			g_free (part3);
- 		}
- 
- 		if (time){
--			char *part4 = (char *) malloc (sizeof (char) * 100);
-+			char *part4 = (char *) malloc (64 + strlen (time));
- 			sprintf (part4, "<tr><td><b>Time</b></td><td>:</td><td>%s</td></tr></table><br>", time);
- 			body = g_strconcat (body, (gchar *)part4, NULL);
- 			g_free (part4);