Clean up old revisions.

(Portage version: 2.2_rc25/cvs/Linux x86_64)
author: Gilles Dartiguelongue <eva@gentoo.org> 2009-03-16 22:41:03 +0000
committer: Gilles Dartiguelongue <eva@gentoo.org> 2009-03-16 22:41:03 +0000
commit: aa926622e548c337043179183f4e519dc462455b (patch)
tree: 8968b3e60366f15c33abe715c4c847ed2c0f3347 /mail-client
parent: Clean up old revisions. (diff)
download: gentoo-2-aa926622e548c337043179183f4e519dc462455b.tar.gz
gentoo-2-aa926622e548c337043179183f4e519dc462455b.tar.bz2
gentoo-2-aa926622e548c337043179183f4e519dc462455b.zip
20 files changed, 19 insertions, 2501 deletions
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index cf864601afe8..99ffaad2c300 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.260 2009/03/15 21:43:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.261 2009/03/16 22:41:03 eva Exp $
+
+  16 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/evolution-2.10.2-fbsd.patch,
+  -files/evolution-2.12.1-mail-remote-broken.patch,
+  -files/evolution-2.12.3-CVE-2008-1108.patch,
+  -files/evolution-2.12.3-CVE-2008-1109.patch,
+  -files/evolution-2.12.3-no-libsoup24.patch,
+  -files/evolution-2.22.2-CVE-2008-1108.patch,
+  -files/evolution-2.22.2-CVE-2008-1109.patch,
+  -files/evolution-2.22.2-deleted-mails.patch,
+  -files/evolution-2.24.2-mail-config-crash-fix.patch,
+  -files/evolution-2.24.2-r2-mail-config-crash-fix.patch,
+  -files/evolution-2.24.2-spamassassin-plugin-fix.patch,
+  -files/evolution-CVE-2008-0072.patch, -evolution-2.12.3-r2.ebuild,
+  -evolution-2.22.2-r1.ebuild, -evolution-2.22.2-r2.ebuild,
+  -evolution-2.24.2.ebuild, -evolution-2.24.2-r1.ebuild,
+  -evolution-2.24.2-r2.ebuild, -evolution-2.24.4.ebuild:
+  Clean up old revisions.
 
   15 Mar 2009; Markus Meier <maekke@gentoo.org> evolution-2.24.5.ebuild:
   x86 stable, bug #260063
diff --git a/mail-client/evolution/evolution-2.12.3-r2.ebuild b/mail-client/evolution/evolution-2.12.3-r2.ebuild
deleted file mode 100644
index 0fb795132616..000000000000
--- a/mail-client/evolution/evolution-2.12.3-r2.ebuild
+++ /dev/null
@@ -1,182 +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-r2.ebuild,v 1.1 2008/06/04 13:24:36 leio 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 CVE-2008-0072
-	epatch "${FILESDIR}"/${PN}-CVE-2008-0072.patch
-
-	# Fix iCalendar security issues, bug #223963
-	epatch "${FILESDIR}/${P}-CVE-2008-1108.patch"
-	epatch "${FILESDIR}/${P}-CVE-2008-1109.patch"
-
-	# Fix build with libsoup-2.4 present on system
-	epatch "${FILESDIR}"/${P}-no-libsoup24.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.22.2-r1.ebuild b/mail-client/evolution/evolution-2.22.2-r1.ebuild
deleted file mode 100644
index 19e96a9e82a2..000000000000
--- a/mail-client/evolution/evolution-2.22.2-r1.ebuild
+++ /dev/null
@@ -1,153 +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.22.2-r1.ebuild,v 1.1 2008/06/04 13:24:36 leio Exp $
-
-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"
-IUSE="crypt dbus debug hal ipv6 kerberos krb4 ldap mono networkmanager nntp pda profile spell ssl"
-
-# Pango dependency required to avoid font rendering problems
-RDEPEND=">=dev-libs/glib-2.15.3
-	>=x11-libs/gtk+-2.12
-	>=gnome-extra/evolution-data-server-2.21.92
-	>=x11-themes/gnome-icon-theme-2.20
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-extra/gtkhtml-3.17.5
-	>=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.4
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	>=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"
-
-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
-
-	# Fix timezone offsets on fbsd.  bug #183708
-	epatch "${FILESDIR}"/${PN}-2.21.3-fbsd.patch
-
-	# Fix tests, bug #216478
-	epatch "${FILESDIR}/${PN}-2.22.0-mk-doc.patch"
-
-	# Fix security issues, bug #223963
-	epatch "${FILESDIR}/${P}-CVE-2008-1108.patch"
-	epatch "${FILESDIR}/${P}-CVE-2008-1109.patch"
-}
-
-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.22.2-r2.ebuild b/mail-client/evolution/evolution-2.22.2-r2.ebuild
deleted file mode 100644
index fdac931ade9e..000000000000
--- a/mail-client/evolution/evolution-2.22.2-r2.ebuild
+++ /dev/null
@@ -1,156 +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.22.2-r2.ebuild,v 1.5 2008/08/12 14:15:31 armin76 Exp $
-
-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"
-IUSE="crypt dbus debug hal ipv6 kerberos krb4 ldap mono networkmanager nntp pda profile spell ssl"
-
-# Pango dependency required to avoid font rendering problems
-RDEPEND=">=dev-libs/glib-2.15.3
-	>=x11-libs/gtk+-2.12
-	>=gnome-extra/evolution-data-server-2.21.92
-	>=x11-themes/gnome-icon-theme-2.20
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-extra/gtkhtml-3.17.5
-	>=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.4
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	>=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"
-
-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
-
-	# Fix timezone offsets on fbsd.  bug #183708
-	epatch "${FILESDIR}"/${PN}-2.21.3-fbsd.patch
-
-	# Fix tests, bug #216478
-	epatch "${FILESDIR}/${PN}-2.22.0-mk-doc.patch"
-
-	# Fix security issues, bug #223963
-	epatch "${FILESDIR}/${P}-CVE-2008-1108.patch"
-	epatch "${FILESDIR}/${P}-CVE-2008-1109.patch"
-
-	# Leaves last deleted mail strike-through, bug #224991
-	epatch "${FILESDIR}/${P}-deleted-mails.patch"
-}
-
-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.24.2-r1.ebuild b/mail-client/evolution/evolution-2.24.2-r1.ebuild
deleted file mode 100644
index 2c7ae669be28..000000000000
--- a/mail-client/evolution/evolution-2.24.2-r1.ebuild
+++ /dev/null
@@ -1,159 +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.24.2-r1.ebuild,v 1.2 2008/12/10 18:58:44 ford_prefect Exp $
-
-inherit gnome2 flag-o-matic libtool
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-libtool-hack.patch.bz2"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="crypt dbus hal kerberos krb4 ldap mono networkmanager nntp pda profile ssl"
-
-# Pango dependency required to avoid font rendering problems
-RDEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.12
-	>=gnome-extra/evolution-data-server-2.23.91
-	>=x11-themes/gnome-icon-theme-2.20
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-extra/gtkhtml-3.23.5
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnomeui-2
-	>=dev-libs/libxml2-2
-	>=x11-misc/shared-mime-info-0.22
-	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.4
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	>=gnome-base/orbit-2.9.8
-	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"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-GCONF_DEBUG="no"
-
-pkg_setup() {
-	G2CONF="--without-kde-applnk-path
-		--enable-plugins=experimental
-		$(use_enable ssl nss)
-		$(use_enable ssl smime)
-		$(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
-
-	# Fix timezone offsets on fbsd.  bug #183708
-	epatch "${FILESDIR}"/${PN}-2.21.3-fbsd.patch
-
-	# Fix delete keyboard shortcut
-	epatch "${FILESDIR}"/${PN}-2.23.3.1-delete-key.patch
-
-	# Ugly hack, bug #235154
-	epatch "${WORKDIR}/${P}-libtool-hack.patch"
-
-	# Fix crasher in prefs, filtering bug and then some, from GNOME bug #552583
-	epatch "${FILESDIR}"/${P}-mail-config-crash-fix.patch
-
-	# Fix SpamAssassing plugin return value checking
-	epatch "${FILESDIR}"/${P}-spamassassin-plugin-fix.patch
-}
-
-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
-
-	# Bug #?
-	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.24.2-r2.ebuild b/mail-client/evolution/evolution-2.24.2-r2.ebuild
deleted file mode 100644
index 14149bfbc9a3..000000000000
--- a/mail-client/evolution/evolution-2.24.2-r2.ebuild
+++ /dev/null
@@ -1,159 +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.24.2-r2.ebuild,v 1.1 2008/12/27 19:22:51 ford_prefect Exp $
-
-inherit gnome2 flag-o-matic libtool
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-libtool-hack.patch.bz2"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="crypt dbus hal kerberos krb4 ldap mono networkmanager nntp pda profile ssl"
-
-# Pango dependency required to avoid font rendering problems
-RDEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.12
-	>=gnome-extra/evolution-data-server-2.23.91
-	>=x11-themes/gnome-icon-theme-2.20
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-extra/gtkhtml-3.23.5
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnomeui-2
-	>=dev-libs/libxml2-2
-	>=x11-misc/shared-mime-info-0.22
-	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.4
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	>=gnome-base/orbit-2.9.8
-	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"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-GCONF_DEBUG="no"
-
-pkg_setup() {
-	G2CONF="--without-kde-applnk-path
-		--enable-plugins=experimental
-		$(use_enable ssl nss)
-		$(use_enable ssl smime)
-		$(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
-
-	# Fix timezone offsets on fbsd.  bug #183708
-	epatch "${FILESDIR}"/${PN}-2.21.3-fbsd.patch
-
-	# Fix delete keyboard shortcut
-	epatch "${FILESDIR}"/${PN}-2.23.3.1-delete-key.patch
-
-	# Ugly hack, bug #235154
-	epatch "${WORKDIR}/${P}-libtool-hack.patch"
-
-	# Fix crasher in prefs, filtering bug and then some, from GNOME bug #552583
-	epatch "${FILESDIR}"/${PF}-mail-config-crash-fix.patch
-
-	# Fix SpamAssassing plugin return value checking
-	epatch "${FILESDIR}"/${P}-spamassassin-plugin-fix.patch
-}
-
-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
-
-	# Bug #?
-	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.24.2.ebuild b/mail-client/evolution/evolution-2.24.2.ebuild
deleted file mode 100644
index de4c11590248..000000000000
--- a/mail-client/evolution/evolution-2.24.2.ebuild
+++ /dev/null
@@ -1,153 +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.24.2.ebuild,v 1.2 2008/12/08 22:04:37 dang Exp $
-
-inherit gnome2 flag-o-matic libtool
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-libtool-hack.patch.bz2"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="crypt dbus debug hal ipv6 kerberos krb4 ldap mono networkmanager nntp pda profile ssl"
-
-# Pango dependency required to avoid font rendering problems
-RDEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.12
-	>=gnome-extra/evolution-data-server-2.23.91
-	>=x11-themes/gnome-icon-theme-2.20
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-extra/gtkhtml-3.23.5
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnomeui-2
-	>=dev-libs/libxml2-2
-	>=x11-misc/shared-mime-info-0.22
-	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.4
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	>=gnome-base/orbit-2.9.8
-	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"
-
-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
-
-	# Fix timezone offsets on fbsd.  bug #183708
-	epatch "${FILESDIR}"/${PN}-2.21.3-fbsd.patch
-
-	# Fix delete keyboard shortcut
-	epatch "${FILESDIR}"/${PN}-2.23.3.1-delete-key.patch
-
-	# Ugly hack, bug #235154
-	epatch "${WORKDIR}/${P}-libtool-hack.patch"
-}
-
-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
-
-	# Bug #?
-	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.24.4.ebuild b/mail-client/evolution/evolution-2.24.4.ebuild
deleted file mode 100644
index 14fb1256674f..000000000000
--- a/mail-client/evolution/evolution-2.24.4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.24.4.ebuild,v 1.1 2009/02/01 10:11:44 eva Exp $
-
-inherit gnome2 flag-o-matic libtool
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-libtool-hack.patch.bz2"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="crypt dbus hal kerberos krb4 ldap mono networkmanager nntp pda profile ssl"
-
-# Pango dependency required to avoid font rendering problems
-RDEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.12
-	>=gnome-extra/evolution-data-server-2.24.3
-	>=x11-themes/gnome-icon-theme-2.20
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-extra/gtkhtml-3.23.5
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnomeui-2
-	>=dev-libs/libxml2-2
-	>=x11-misc/shared-mime-info-0.22
-	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.4
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	>=gnome-base/orbit-2.9.8
-	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"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-GCONF_DEBUG="no"
-
-pkg_setup() {
-	G2CONF="--without-kde-applnk-path
-		--enable-plugins=experimental
-		$(use_enable ssl nss)
-		$(use_enable ssl smime)
-		$(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
-
-	# Fix timezone offsets on fbsd.  bug #183708
-	epatch "${FILESDIR}"/${PN}-2.21.3-fbsd.patch
-
-	# Fix delete keyboard shortcut
-	epatch "${FILESDIR}"/${PN}-2.23.3.1-delete-key.patch
-
-	# Ugly hack, bug #235154
-	epatch "${WORKDIR}/${P}-libtool-hack.patch"
-}
-
-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
-
-	# Bug #?
-	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.2-fbsd.patch b/mail-client/evolution/files/evolution-2.10.2-fbsd.patch
deleted file mode 100644
index c7a35e57eb1b..000000000000
--- a/mail-client/evolution/files/evolution-2.10.2-fbsd.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-2.10.2.orig/widgets/e-timezone-dialog/e-timezone-dialog.c evolution-2.10.2/widgets/e-timezone-dialog/e-timezone-dialog.c
---- evolution-2.10.2.orig/widgets/e-timezone-dialog/e-timezone-dialog.c	2007-04-09 09:10:21.000000000 -0400
-+++ evolution-2.10.2/widgets/e-timezone-dialog/e-timezone-dialog.c	2007-07-05 21:24:05.000000000 -0400
-@@ -80,7 +80,9 @@ struct _ETimezoneDialogPrivate {
- 
- #ifndef G_OS_WIN32 /* Declared properly in time.h already */
- extern char *tzname[2];
-+#ifndef __BSD_VISIBLE
- extern long timezone;
-+#endif
- extern int daylight;
- #endif
- 
-@@ -322,9 +324,20 @@ static const icaltimezone*
- get_local_timezone()
- {
- 	icaltimezone *zone;
-+	long offset;
-+#ifdef __BSD_VISIBLE
-+	time_t tt;
-+	struct tm tm;
-+#endif
- 	
- 	tzset();
--	zone =  icaltimezone_get_builtin_timezone_from_offset (-timezone, tzname[0]);
-+#ifdef __BSD_VISIBLE
-+	localtime_r (&tt, &tm);
-+	offset = tm.tm_gmtoff;
-+#else
-+	offset = -timezone;
-+#endif
-+	zone =  icaltimezone_get_builtin_timezone_from_offset (offset, tzname[0]);
- 
- 	return zone;
- }
diff --git a/mail-client/evolution/files/evolution-2.12.1-mail-remote-broken.patch b/mail-client/evolution/files/evolution-2.12.1-mail-remote-broken.patch
deleted file mode 100644
index 56e324e90ac5..000000000000
--- a/mail-client/evolution/files/evolution-2.12.1-mail-remote-broken.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old	2007-08-14 20:39:02.320171822 +0200
-+++ configure	2007-08-14 20:38:06.813953026 +0200
-@@ -35748,7 +35748,7 @@
- plugins_standard="$plugins_standard_always"
- all_plugins_standard="$plugins_standard"
- 
--plugins_experimental_always="folder-unsubscribe mail-to-meeting mail-remote save-attachments"
-+plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments"
- plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS"
- all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
- 
diff --git a/mail-client/evolution/files/evolution-2.12.3-CVE-2008-1108.patch b/mail-client/evolution/files/evolution-2.12.3-CVE-2008-1108.patch
deleted file mode 100644
index d529e6c9d723..000000000000
--- a/mail-client/evolution/files/evolution-2.12.3-CVE-2008-1108.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-Index: calendar/gui/e-itip-control.c
-===================================================================
---- calendar/gui/e-itip-control.c.orig
-+++ calendar/gui/e-itip-control.c
-@@ -650,7 +650,7 @@ find_attendee (icalcomponent *ical_comp,
- 
- static void
- write_label_piece (EItipControl *itip, ECalComponentDateTime *dt,
--		   char *buffer, int size,
-+                   GString *buffer,
- 		   const char *stext, const char *etext,
- 		   gboolean just_date)
- {
-@@ -675,13 +675,13 @@ write_label_piece (EItipControl *itip, E
- 		tmp_tm.tm_hour = tmp_tm.tm_min = tmp_tm.tm_sec = 0;
- 
- 	if (stext != NULL)
--		strcat (buffer, stext);
-+		g_string_append (buffer, stext);
- 
- 	e_time_format_date_and_time (&tmp_tm,
- 				     calendar_config_get_24_hour_format (),
- 				     FALSE, FALSE,
- 				     time_buf, sizeof (time_buf));
--	strcat (buffer, time_buf);
-+	g_string_append (buffer, time_buf);
- 
- 	if (!dt->value->is_utc && dt->tzid) {
- 		zone = icalcomponent_get_timezone (priv->top_level, dt->tzid);
-@@ -693,21 +693,21 @@ write_label_piece (EItipControl *itip, E
- 		   UTF-8. But it probably is not translated. */
- 		display_name = icaltimezone_get_display_name (zone);
- 		if (display_name && *display_name) {
--			strcat (buffer, " <font size=-1>[");
-+			g_string_append_len (buffer, " <font size=-1>[", 16);
- 
- 			/* We check if it is one of our builtin timezone names,
- 			   in which case we call gettext to translate it. */
- 			if (icaltimezone_get_builtin_timezone (display_name)) {
--				strcat (buffer, _(display_name));
-+				g_string_append_printf (buffer, "%s", _(display_name));
- 			} else {
--				strcat (buffer, display_name);
-+				g_string_append_printf (buffer, "%s", display_name);
- 			}
--			strcat (buffer, "]</font>");
-+			g_string_append_len (buffer, "]</font>", 8);
- 		}
- 	}
- 
- 	if (etext != NULL)
--		strcat (buffer, etext);
-+		g_string_append (buffer, etext);
- }
- 
- static const char *
-@@ -744,19 +744,17 @@ get_dayname (struct icalrecurrencetype *
- 
- static void
- write_recurrence_piece (EItipControl *itip, ECalComponent *comp,
--			char *buffer, int size)
-+                        GString *buffer)
- {
- 	GSList *rrules;
- 	struct icalrecurrencetype *r;
--	int len, i;
-+	int i;
- 
--	strcpy (buffer, "<b>Recurring:</b> ");
--	len = strlen (buffer);
--	buffer += len;
--	size -= len;
-+	g_string_append_len (buffer, "<b>Recurring:</b> ", 18);
- 
- 	if (!e_cal_component_has_simple_recurrence (comp)) {
--		strcpy (buffer, _("Yes. (Complex Recurrence)"));
-+		g_string_append_printf (
-+			buffer, "%s", _("Yes. (Complex Recurrence)"));
- 		return;
- 	}
- 
-@@ -772,7 +770,10 @@ write_recurrence_piece (EItipControl *it
-                  Every %d day/days" */
- 		/* For Translators : 'Every day' is event Recurring every day */
- 		/* For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit */
--		sprintf (buffer, ngettext("Every day", "Every %d days", r->interval), r->interval);
-+		g_string_append_printf (
-+			buffer, ngettext ("Every day",
-+			"Every %d days", r->interval),
-+			r->interval);
- 		break;
- 
- 	case ICAL_WEEKLY_RECURRENCE:
-@@ -782,29 +783,36 @@ write_recurrence_piece (EItipControl *it
-                          Every %d week/weeks" */			
- 			/* For Translators : 'Every week' is event Recurring every week */
- 			/* For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit */
--			sprintf (buffer, ngettext("Every week", "Every %d weeks", r->interval), r->interval);
-+			g_string_append_printf (
-+				buffer, ngettext ("Every week",
-+				"Every %d weeks", r->interval),
-+				r->interval);
- 		} else {
- 			/* For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname) */
- 			/* For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit */
--			sprintf (buffer, ngettext("Every week on ", "Every %d weeks on ", r->interval), r->interval);
-+			g_string_append_printf (
-+				buffer, ngettext ("Every week on ",
-+				"Every %d weeks on ", r->interval),
-+				r->interval);
- 
- 			for (i = 1; i < 8 && r->by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {
- 				if (i > 1)
--					strcat (buffer, ", ");
--				strcat (buffer, get_dayname (r, i - 1));
-+					g_string_append_len (buffer, ", ", 2);
-+				g_string_append (buffer, get_dayname (r, i - 1));
- 			}
- 			if (i > 1)
- 				/* For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)' */
--				strcat (buffer, _(" and "));
--			strcat (buffer, get_dayname (r, i - 1));
-+				g_string_append_printf (buffer, "%s", _(" and "));
-+			g_string_append (buffer, get_dayname (r, i - 1));
- 		}
- 		break;
- 
- 	case ICAL_MONTHLY_RECURRENCE:
- 		if (r->by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
- 			/* For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.' */
--			sprintf (buffer, _("The %s day of "),
--				 nth (r->by_month_day[0]));
-+			g_string_append_printf (
-+				buffer, _("The %s day of "),
-+				nth (r->by_month_day[0]));
- 		} else {
- 			int pos;
- 
-@@ -818,20 +826,21 @@ write_recurrence_piece (EItipControl *it
- 
- 			/* For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
- 			   eg,third monday of every month */
--			sprintf (buffer, _("The %s %s of "),
--				 nth (pos), get_dayname (r, 0));
-+			g_string_append_printf (
-+				buffer, _("The %s %s of "),
-+				nth (pos), get_dayname (r, 0));
- 		}
- 
--		len = strlen (buffer);
--		buffer += len;
--		size -= len;
-               /* For Translators: In this can also be translated as "With the period of %d
-                  month/months", where %d is a number. The entire sentence is of the form "Recurring:
-                  Every %d month/months" */		
- 		/* For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.' */
- 		/* For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
- 		 %d is a digit */
--		sprintf (buffer, ngettext("every month","every %d months", r->interval), r->interval);
-+		g_string_append_printf (
-+			buffer, ngettext ("every month",
-+			"every %d months", r->interval),
-+			r->interval);
- 		break;
- 
- 	case ICAL_YEARLY_RECURRENCE:
-@@ -840,20 +849,22 @@ write_recurrence_piece (EItipControl *it
-                  Every %d year/years" */		
- 		/* For Translators : 'Every year' is event Recurring every year */
- 		/* For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit */
--		sprintf (buffer, ngettext("Every year", "Every %d years", r->interval), r->interval);
-+		g_string_append_printf (
-+			buffer, ngettext ("Every year",
-+			"Every %d years", r->interval),
-+			r->interval);
- 		break;
- 
- 	default:
- 		g_return_if_reached ();
- 	}
- 
--	len = strlen (buffer);
--	buffer += len;
--	size -= len;
- 	if (r->count) {
- 	      /* For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit*/
- 	      /* For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit*/
--		sprintf (buffer, ngettext("a total of %d time", " a total of %d times", r->count), r->count);
-+		g_string_append_printf (
-+			buffer, ngettext ("a total of %d time",
-+			" a total of %d times", r->count), r->count);
- 	} else if (!icaltime_is_null_time (r->until)) {
- 		ECalComponentDateTime dt;
- 
-@@ -861,12 +872,12 @@ write_recurrence_piece (EItipControl *it
- 		dt.value = &r->until;
- 		dt.tzid = icaltimezone_get_tzid ((icaltimezone *)r->until.zone);
- 
--		write_label_piece (itip, &dt, buffer, size,
-+		write_label_piece (itip, &dt, buffer, 
- 				   /* For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'*/
- 				   _(", ending on "), NULL, TRUE);
- 	}
- 
--	strcat (buffer, "<br>");
-+	g_string_append_len (buffer, "<br>", 4);
- }
- 
- static void
-@@ -874,47 +885,51 @@ set_date_label (EItipControl *itip, GtkH
- 		ECalComponent *comp)
- {
- 	ECalComponentDateTime datetime;
--	static char buffer[1024];
-+	GString *buffer;
- 	gchar *str;
- 	gboolean wrote = FALSE, task_completed = FALSE;
- 	ECalComponentVType type;
- 
-+	buffer = g_string_sized_new (1024);
- 	type = e_cal_component_get_vtype (comp);
- 
--	buffer[0] = '\0';
- 	e_cal_component_get_dtstart (comp, &datetime);
- 	if (datetime.value) {
- 		/* For Translators : 'starts' is starts:date implying a task starts on what date */
- 		str = g_strdup_printf ("<b>%s:</b>", _("Starts"));
--		write_label_piece (itip, &datetime, buffer, 1024,
--				  str,
--				   "<br>", FALSE);
--		gtk_html_write (html, html_stream, buffer, strlen(buffer));
-+		write_label_piece (itip, &datetime, buffer, str, "<br>", FALSE);
-+		gtk_html_write (html, html_stream, buffer->str, buffer->len);
- 		wrote = TRUE;
- 		g_free (str);
- 	}
- 	e_cal_component_free_datetime (&datetime);
- 
--	buffer[0] = '\0';
-+	/* Reset the buffer. */
-+	g_string_truncate (buffer, 0);
-+
- 	e_cal_component_get_dtend (comp, &datetime);
- 	if (datetime.value){
- 		/* For Translators : 'ends' is ends:date implying a task ends on what date */
- 		str = g_strdup_printf ("<b>%s:</b>", _("Ends"));
--		write_label_piece (itip, &datetime, buffer, 1024, str, "<br>", FALSE);
--		gtk_html_write (html, html_stream, buffer, strlen (buffer));
-+		write_label_piece (itip, &datetime, buffer, str, "<br>", FALSE);
-+		gtk_html_write (html, html_stream, buffer->str, buffer->len);
- 		wrote = TRUE;
- 		g_free (str);
- 	}
- 	e_cal_component_free_datetime (&datetime);
- 
--	buffer[0] = '\0';
-+	/* Reset the buffer. */
-+	g_string_truncate (buffer, 0);
-+
- 	if (e_cal_component_has_recurrences (comp)) {
--		write_recurrence_piece (itip, comp, buffer, 1024);
--		gtk_html_write (html, html_stream, buffer, strlen (buffer));
-+		write_recurrence_piece (itip, comp, buffer);
-+		gtk_html_write (html, html_stream, buffer->str, buffer->len);
- 		wrote = TRUE;
- 	}
- 
--	buffer[0] = '\0';
-+	/* Reset the buffer. */
-+	g_string_truncate (buffer, 0);
-+
- 	datetime.tzid = NULL;
- 	e_cal_component_get_completed (comp, &datetime.value);
- 	if (type == E_CAL_COMPONENT_TODO && datetime.value) {
-@@ -922,20 +937,22 @@ set_date_label (EItipControl *itip, GtkH
- 		   timezone. */
- 		str = g_strdup_printf ("<b>%s:</b>", _("Completed"));
- 		datetime.value->is_utc = TRUE;
--		write_label_piece (itip, &datetime, buffer, 1024, str, "<br>", FALSE);
--		gtk_html_write (html, html_stream, buffer, strlen (buffer));
-+		write_label_piece (itip, &datetime, buffer, str, "<br>", FALSE);
-+		gtk_html_write (html, html_stream, buffer->str, buffer->len);
- 		wrote = TRUE;
- 		task_completed = TRUE;
- 		g_free (str);
- 	}
- 	e_cal_component_free_datetime (&datetime);
- 
--	buffer[0] = '\0';
-+	/* Reset the buffer. */
-+	g_string_truncate (buffer, 0);
-+
- 	e_cal_component_get_due (comp, &datetime);
- 	if (type == E_CAL_COMPONENT_TODO && !task_completed && datetime.value) {
- 		str = g_strdup_printf ("<b>%s:</b>", _("Due"));
--		write_label_piece (itip, &datetime, buffer, 1024, str, "<br>", FALSE);
--		gtk_html_write (html, html_stream, buffer, strlen (buffer));
-+		write_label_piece (itip, &datetime, buffer, str, "<br>", FALSE);
-+		gtk_html_write (html, html_stream, buffer->str, buffer->len);
- 		wrote = TRUE;
- 		g_free (str);
- 	}
-@@ -944,6 +961,8 @@ set_date_label (EItipControl *itip, GtkH
- 
- 	if (wrote)
- 		gtk_html_stream_printf (html_stream, "<br>");
-+
-+	g_string_free (buffer, TRUE);
- }
- 
- static void
diff --git a/mail-client/evolution/files/evolution-2.12.3-CVE-2008-1109.patch b/mail-client/evolution/files/evolution-2.12.3-CVE-2008-1109.patch
deleted file mode 100644
index 27645564656d..000000000000
--- a/mail-client/evolution/files/evolution-2.12.3-CVE-2008-1109.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: calendar/gui/itip-utils.c
-===================================================================
---- calendar/gui/itip-utils.c.orig
-+++ calendar/gui/itip-utils.c
-@@ -176,50 +176,16 @@ get_attendee_if_attendee_sentby_is_user 
- }
- 
- static char *
--html_new_lines_for (char *string)
-+html_new_lines_for (const char *string)
- {
--	char *html_string = (char *) malloc (sizeof (char)* (3500));
--	int length = strlen (string);
--	int index = 0;
--	char *index_ptr = string;
--	char *temp = string;
-+	gchar **lines;
-+	gchar *joined;
- 
--	/*Find the first occurence*/
--	index_ptr = strstr ((const char *)temp, "\n");
-+	lines = g_strsplit_set (string, "\n", -1);
-+	joined = g_strjoinv ("<br>", lines);
-+	g_strfreev (lines);
- 
--	/*Doesn't occur*/
--	if (index_ptr == NULL) {
--		strcpy (html_string, (const char *)string);
--		html_string[length] = '\0';
--		return html_string;
--	}
--
--	/*Split into chunks inserting <br> for \n */
--	do{
--		while (temp != index_ptr){
--			html_string[index++] = *temp;
--			temp++;
--		}
--		temp++; 
--		
--		html_string[index++] = '<';
--		html_string[index++] = 'b';
--		html_string[index++] = 'r';
--		html_string[index++] = '>';
--
--		index_ptr = strstr ((const char *)temp, "\n");
--
--	} while (index_ptr);
--
--	/*Don't leave out the last chunk*/
--	while (*temp != '\0'){
--		html_string[index++] = *temp;
--		temp++;
--	}
--		
--	html_string[index] = '\0';
--		
--	return html_string;
-+	return joined;
- }
- 
- char *
diff --git a/mail-client/evolution/files/evolution-2.12.3-no-libsoup24.patch b/mail-client/evolution/files/evolution-2.12.3-no-libsoup24.patch
deleted file mode 100644
index 22d93ce7284f..000000000000
--- a/mail-client/evolution/files/evolution-2.12.3-no-libsoup24.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Don't check for libsoup-2.4, as using its headers leads to broken compilation.
-It tried it only because the 2.2.10x series for a short time was installed as a new 2.4 in development.
-The real final libsoup-2.4 has API changes that don't work with the usage in this version (2.12.x) of evolution.
-
---- configure.in.orig	2008-04-01 21:18:44.000000000 +0300
-+++ configure.in	2008-04-01 21:28:09.000000000 +0300
-@@ -1518,14 +1518,11 @@
- AC_SUBST(LIBNOTIFY_LIBS)
- 
- dnl --- evolution-calendar flags
--PKG_CHECK_MODULES(SOUPTEMP, libsoup-2.4, have_libsoup_24="yes", have_libsoup_24="no")
--if test $have_libsoup_24 = yes; then
--    LIBSOUP_REQUIRED=2.3.0
--    LIBSOUP=libsoup-2.4
--else
--    LIBSOUP_REQUIRED=2.2.2
--    LIBSOUP=libsoup-2.2
--fi
-+dnl AC_ARG_VAR is used for keeping the diff against configure small
-+AC_ARG_VAR(SOUPTEMP_CFLAGS)
-+AC_ARG_VAR(SOUPTEMP_LIBS)
-+LIBSOUP_REQUIRED=2.2.2
-+LIBSOUP=libsoup-2.2
- 
- EVO_SET_COMPILE_FLAGS(LIBSOUP, $LIBSOUP >= $LIBSOUP_REQUIRED)
- AC_SUBST(LIBSOUP_CFLAGS)
---- configure.orig	2008-04-01 21:18:47.000000000 +0300
-+++ configure	2008-04-01 21:28:38.000000000 +0300
-@@ -1989,9 +1989,9 @@
-   LIBNOTIFY_LIBS
-               linker flags for LIBNOTIFY, overriding pkg-config
-   SOUPTEMP_CFLAGS
--              C compiler flags for SOUPTEMP, overriding pkg-config
-+
-   SOUPTEMP_LIBS
--              linker flags for SOUPTEMP, overriding pkg-config
-+
-   LIBSOUP_CFLAGS
-               C compiler flags for LIBSOUP, overriding pkg-config
-   LIBSOUP_LIBS
-@@ -37358,81 +37358,9 @@
- 
- 
- 
--pkg_failed=no
--{ echo "$as_me:$LINENO: checking for SOUPTEMP" >&5
--echo $ECHO_N "checking for SOUPTEMP... $ECHO_C" >&6; }
- 
--if test -n "$PKG_CONFIG"; then
--    if test -n "$SOUPTEMP_CFLAGS"; then
--        pkg_cv_SOUPTEMP_CFLAGS="$SOUPTEMP_CFLAGS"
--    else
--        if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  pkg_cv_SOUPTEMP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
--    fi
--else
--	pkg_failed=untried
--fi
--if test -n "$PKG_CONFIG"; then
--    if test -n "$SOUPTEMP_LIBS"; then
--        pkg_cv_SOUPTEMP_LIBS="$SOUPTEMP_LIBS"
--    else
--        if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  pkg_cv_SOUPTEMP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
--    fi
--else
--	pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        SOUPTEMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4"`
--        else
--	        SOUPTEMP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4"`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$SOUPTEMP_PKG_ERRORS" >&5
--
--	have_libsoup_24="no"
--elif test $pkg_failed = untried; then
--	have_libsoup_24="no"
--else
--	SOUPTEMP_CFLAGS=$pkg_cv_SOUPTEMP_CFLAGS
--	SOUPTEMP_LIBS=$pkg_cv_SOUPTEMP_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--	have_libsoup_24="yes"
--fi
--if test $have_libsoup_24 = yes; then
--    LIBSOUP_REQUIRED=2.3.0
--    LIBSOUP=libsoup-2.4
--else
--    LIBSOUP_REQUIRED=2.2.2
--    LIBSOUP=libsoup-2.2
--fi
-+LIBSOUP_REQUIRED=2.2.2
-+LIBSOUP=libsoup-2.2
- 
- 
- 
diff --git a/mail-client/evolution/files/evolution-2.22.2-CVE-2008-1108.patch b/mail-client/evolution/files/evolution-2.22.2-CVE-2008-1108.patch
deleted file mode 100644
index c53d17f8328f..000000000000
--- a/mail-client/evolution/files/evolution-2.22.2-CVE-2008-1108.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-Index: calendar/gui/e-itip-control.c
-===================================================================
---- calendar/gui/e-itip-control.c	(revision 35555)
-+++ calendar/gui/e-itip-control.c	(working copy)
-@@ -660,7 +660,7 @@ find_attendee (icalcomponent *ical_comp,
- 
- static void
- write_label_piece (EItipControl *itip, ECalComponentDateTime *dt,
--		   char *buffer, int size,
-+                   GString *buffer,
- 		   const char *stext, const char *etext,
- 		   gboolean just_date)
- {
-@@ -685,13 +685,13 @@ write_label_piece (EItipControl *itip, E
- 		tmp_tm.tm_hour = tmp_tm.tm_min = tmp_tm.tm_sec = 0;
- 
- 	if (stext != NULL)
--		strcat (buffer, stext);
-+		g_string_append (buffer, stext);
- 
- 	e_time_format_date_and_time (&tmp_tm,
- 				     calendar_config_get_24_hour_format (),
- 				     FALSE, FALSE,
- 				     time_buf, sizeof (time_buf));
--	strcat (buffer, time_buf);
-+	g_string_append (buffer, time_buf);
- 
- 	if (!dt->value->is_utc && dt->tzid) {
- 		zone = icalcomponent_get_timezone (priv->top_level, dt->tzid);
-@@ -703,21 +703,21 @@ write_label_piece (EItipControl *itip, E
- 		   UTF-8. But it probably is not translated. */
- 		display_name = icaltimezone_get_display_name (zone);
- 		if (display_name && *display_name) {
--			strcat (buffer, " <font size=-1>[");
-+			g_string_append_len (buffer, " <font size=-1>[", 16);
- 
- 			/* We check if it is one of our builtin timezone names,
- 			   in which case we call gettext to translate it. */
- 			if (icaltimezone_get_builtin_timezone (display_name)) {
--				strcat (buffer, _(display_name));
-+				g_string_append_printf (buffer, "%s", _(display_name));
- 			} else {
--				strcat (buffer, display_name);
-+				g_string_append_printf (buffer, "%s", display_name);
- 			}
--			strcat (buffer, "]</font>");
-+			g_string_append_len (buffer, "]</font>", 8);
- 		}
- 	}
- 
- 	if (etext != NULL)
--		strcat (buffer, etext);
-+		g_string_append (buffer, etext);
- }
- 
- static const char *
-@@ -754,19 +754,17 @@ get_dayname (struct icalrecurrencetype *
- 
- static void
- write_recurrence_piece (EItipControl *itip, ECalComponent *comp,
--			char *buffer, int size)
-+                        GString *buffer)
- {
- 	GSList *rrules;
- 	struct icalrecurrencetype *r;
--	int len, i;
-+	int i;
- 
--	strcpy (buffer, "<b>Recurring:</b> ");
--	len = strlen (buffer);
--	buffer += len;
--	size -= len;
-+	g_string_append_len (buffer, "<b>Recurring:</b> ", 18);
- 
- 	if (!e_cal_component_has_simple_recurrence (comp)) {
--		strcpy (buffer, _("Yes. (Complex Recurrence)"));
-+		g_string_append_printf (
-+			buffer, "%s", _("Yes. (Complex Recurrence)"));
- 		return;
- 	}
- 
-@@ -782,7 +780,10 @@ write_recurrence_piece (EItipControl *it
-                  Every %d day/days" */
- 		/* For Translators : 'Every day' is event Recurring every day */
- 		/* For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit */
--		sprintf (buffer, ngettext("Every day", "Every %d days", r->interval), r->interval);
-+		g_string_append_printf (
-+			buffer, ngettext ("Every day",
-+			"Every %d days", r->interval),
-+			r->interval);
- 		break;
- 
- 	case ICAL_WEEKLY_RECURRENCE:
-@@ -792,29 +793,36 @@ write_recurrence_piece (EItipControl *it
-                          Every %d week/weeks" */
- 			/* For Translators : 'Every week' is event Recurring every week */
- 			/* For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit */
--			sprintf (buffer, ngettext("Every week", "Every %d weeks", r->interval), r->interval);
-+			g_string_append_printf (
-+				buffer, ngettext ("Every week",
-+				"Every %d weeks", r->interval),
-+				r->interval);
- 		} else {
- 			/* For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname) */
- 			/* For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit */
--			sprintf (buffer, ngettext("Every week on ", "Every %d weeks on ", r->interval), r->interval);
-+			g_string_append_printf (
-+				buffer, ngettext ("Every week on ",
-+				"Every %d weeks on ", r->interval),
-+				r->interval);
- 
- 			for (i = 1; i < 8 && r->by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {
- 				if (i > 1)
--					strcat (buffer, ", ");
--				strcat (buffer, get_dayname (r, i - 1));
-+					g_string_append_len (buffer, ", ", 2);
-+				g_string_append (buffer, get_dayname (r, i - 1));
- 			}
- 			if (i > 1)
- 				/* For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)' */
--				strcat (buffer, _(" and "));
--			strcat (buffer, get_dayname (r, i - 1));
-+				g_string_append_printf (buffer, "%s", _(" and "));
-+			g_string_append (buffer, get_dayname (r, i - 1));
- 		}
- 		break;
- 
- 	case ICAL_MONTHLY_RECURRENCE:
- 		if (r->by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
- 			/* For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.' */
--			sprintf (buffer, _("The %s day of "),
--				 nth (r->by_month_day[0]));
-+			g_string_append_printf (
-+				buffer, _("The %s day of "),
-+				nth (r->by_month_day[0]));
- 		} else {
- 			int pos;
- 
-@@ -828,20 +836,21 @@ write_recurrence_piece (EItipControl *it
- 
- 			/* For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
- 			   eg,third monday of every month */
--			sprintf (buffer, _("The %s %s of "),
--				 nth (pos), get_dayname (r, 0));
-+			g_string_append_printf (
-+				buffer, _("The %s %s of "),
-+				nth (pos), get_dayname (r, 0));
- 		}
- 
--		len = strlen (buffer);
--		buffer += len;
--		size -= len;
-               /* For Translators: In this can also be translated as "With the period of %d
-                  month/months", where %d is a number. The entire sentence is of the form "Recurring:
-                  Every %d month/months" */
- 		/* For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.' */
- 		/* For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
- 		 %d is a digit */
--		sprintf (buffer, ngettext("every month","every %d months", r->interval), r->interval);
-+		g_string_append_printf (
-+			buffer, ngettext ("every month",
-+			"every %d months", r->interval),
-+			r->interval);
- 		break;
- 
- 	case ICAL_YEARLY_RECURRENCE:
-@@ -850,20 +859,22 @@ write_recurrence_piece (EItipControl *it
-                  Every %d year/years" */
- 		/* For Translators : 'Every year' is event Recurring every year */
- 		/* For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit */
--		sprintf (buffer, ngettext("Every year", "Every %d years", r->interval), r->interval);
-+		g_string_append_printf (
-+			buffer, ngettext ("Every year",
-+			"Every %d years", r->interval),
-+			r->interval);
- 		break;
- 
- 	default:
- 		g_return_if_reached ();
- 	}
- 
--	len = strlen (buffer);
--	buffer += len;
--	size -= len;
- 	if (r->count) {
- 	      /* For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit*/
- 	      /* For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit*/
--		sprintf (buffer, ngettext("a total of %d time", " a total of %d times", r->count), r->count);
-+		g_string_append_printf (
-+			buffer, ngettext ("a total of %d time",
-+			" a total of %d times", r->count), r->count);
- 	} else if (!icaltime_is_null_time (r->until)) {
- 		ECalComponentDateTime dt;
- 
-@@ -871,12 +882,12 @@ write_recurrence_piece (EItipControl *it
- 		dt.value = &r->until;
- 		dt.tzid = icaltimezone_get_tzid ((icaltimezone *)r->until.zone);
- 
--		write_label_piece (itip, &dt, buffer, size,
-+		write_label_piece (itip, &dt, buffer, 
- 				   /* For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'*/
- 				   _(", ending on "), NULL, TRUE);
- 	}
- 
--	strcat (buffer, "<br>");
-+	g_string_append_len (buffer, "<br>", 4);
- }
- 
- static void
-@@ -884,47 +895,51 @@ set_date_label (EItipControl *itip, GtkH
- 		ECalComponent *comp)
- {
- 	ECalComponentDateTime datetime;
--	static char buffer[1024];
-+	GString *buffer;
- 	gchar *str;
- 	gboolean wrote = FALSE, task_completed = FALSE;
- 	ECalComponentVType type;
- 
-+	buffer = g_string_sized_new (1024);
- 	type = e_cal_component_get_vtype (comp);
- 
--	buffer[0] = '\0';
- 	e_cal_component_get_dtstart (comp, &datetime);
- 	if (datetime.value) {
- 		/* For Translators : 'starts' is starts:date implying a task starts on what date */
- 		str = g_strdup_printf ("<b>%s:</b>", _("Starts"));
--		write_label_piece (itip, &datetime, buffer, 1024,
--				  str,
--				   "<br>", FALSE);
--		gtk_html_write (html, html_stream, buffer, strlen(buffer));
-+		write_label_piece (itip, &datetime, buffer, str, "<br>", FALSE);
-+		gtk_html_write (html, html_stream, buffer->str, buffer->len);
- 		wrote = TRUE;
- 		g_free (str);
- 	}
- 	e_cal_component_free_datetime (&datetime);
- 
--	buffer[0] = '\0';
-+	/* Reset the buffer. */
-+	g_string_truncate (buffer, 0);
-+
- 	e_cal_component_get_dtend (comp, &datetime);
- 	if (datetime.value){
- 		/* For Translators : 'ends' is ends:date implying a task ends on what date */
- 		str = g_strdup_printf ("<b>%s:</b>", _("Ends"));
--		write_label_piece (itip, &datetime, buffer, 1024, str, "<br>", FALSE);
--		gtk_html_write (html, html_stream, buffer, strlen (buffer));
-+		write_label_piece (itip, &datetime, buffer, str, "<br>", FALSE);
-+		gtk_html_write (html, html_stream, buffer->str, buffer->len);
- 		wrote = TRUE;
- 		g_free (str);
- 	}
- 	e_cal_component_free_datetime (&datetime);
- 
--	buffer[0] = '\0';
-+	/* Reset the buffer. */
-+	g_string_truncate (buffer, 0);
-+
- 	if (e_cal_component_has_recurrences (comp)) {
--		write_recurrence_piece (itip, comp, buffer, 1024);
--		gtk_html_write (html, html_stream, buffer, strlen (buffer));
-+		write_recurrence_piece (itip, comp, buffer);
-+		gtk_html_write (html, html_stream, buffer->str, buffer->len);
- 		wrote = TRUE;
- 	}
- 
--	buffer[0] = '\0';
-+	/* Reset the buffer. */
-+	g_string_truncate (buffer, 0);
-+
- 	datetime.tzid = NULL;
- 	e_cal_component_get_completed (comp, &datetime.value);
- 	if (type == E_CAL_COMPONENT_TODO && datetime.value) {
-@@ -932,20 +947,22 @@ set_date_label (EItipControl *itip, GtkH
- 		   timezone. */
- 		str = g_strdup_printf ("<b>%s:</b>", _("Completed"));
- 		datetime.value->is_utc = TRUE;
--		write_label_piece (itip, &datetime, buffer, 1024, str, "<br>", FALSE);
--		gtk_html_write (html, html_stream, buffer, strlen (buffer));
-+		write_label_piece (itip, &datetime, buffer, str, "<br>", FALSE);
-+		gtk_html_write (html, html_stream, buffer->str, buffer->len);
- 		wrote = TRUE;
- 		task_completed = TRUE;
- 		g_free (str);
- 	}
- 	e_cal_component_free_datetime (&datetime);
- 
--	buffer[0] = '\0';
-+	/* Reset the buffer. */
-+	g_string_truncate (buffer, 0);
-+
- 	e_cal_component_get_due (comp, &datetime);
- 	if (type == E_CAL_COMPONENT_TODO && !task_completed && datetime.value) {
- 		str = g_strdup_printf ("<b>%s:</b>", _("Due"));
--		write_label_piece (itip, &datetime, buffer, 1024, str, "<br>", FALSE);
--		gtk_html_write (html, html_stream, buffer, strlen (buffer));
-+		write_label_piece (itip, &datetime, buffer, str, "<br>", FALSE);
-+		gtk_html_write (html, html_stream, buffer->str, buffer->len);
- 		wrote = TRUE;
- 		g_free (str);
- 	}
-@@ -954,6 +971,8 @@ set_date_label (EItipControl *itip, GtkH
- 
- 	if (wrote)
- 		gtk_html_stream_printf (html_stream, "<br>");
-+
-+	g_string_free (buffer, TRUE);
- }
- 
- static void
diff --git a/mail-client/evolution/files/evolution-2.22.2-CVE-2008-1109.patch b/mail-client/evolution/files/evolution-2.22.2-CVE-2008-1109.patch
deleted file mode 100644
index c8b5c2c64cb8..000000000000
--- a/mail-client/evolution/files/evolution-2.22.2-CVE-2008-1109.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: calendar/gui/itip-utils.c
-===================================================================
---- calendar/gui/itip-utils.c	(revision 35555)
-+++ calendar/gui/itip-utils.c	(working copy)
-@@ -172,50 +172,16 @@ get_attendee_if_attendee_sentby_is_user 
- }
- 
- static char *
--html_new_lines_for (char *string)
-+html_new_lines_for (const char *string)
- {
--	char *html_string = (char *) malloc (sizeof (char)* (3500));
--	int length = strlen (string);
--	int index = 0;
--	char *index_ptr = string;
--	char *temp = string;
-+	gchar **lines;
-+	gchar *joined;
- 
--	/*Find the first occurence*/
--	index_ptr = strstr ((const char *)temp, "\n");
-+	lines = g_strsplit_set (string, "\n", -1);
-+	joined = g_strjoinv ("<br>", lines);
-+	g_strfreev (lines);
- 
--	/*Doesn't occur*/
--	if (index_ptr == NULL) {
--		strcpy (html_string, (const char *)string);
--		html_string[length] = '\0';
--		return html_string;
--	}
--
--	/*Split into chunks inserting <br> for \n */
--	do{
--		while (temp != index_ptr){
--			html_string[index++] = *temp;
--			temp++;
--		}
--		temp++;
--
--		html_string[index++] = '<';
--		html_string[index++] = 'b';
--		html_string[index++] = 'r';
--		html_string[index++] = '>';
--
--		index_ptr = strstr ((const char *)temp, "\n");
--
--	} while (index_ptr);
--
--	/*Don't leave out the last chunk*/
--	while (*temp != '\0'){
--		html_string[index++] = *temp;
--		temp++;
--	}
--
--	html_string[index] = '\0';
--
--	return html_string;
-+	return joined;
- }
- 
- char *
diff --git a/mail-client/evolution/files/evolution-2.22.2-deleted-mails.patch b/mail-client/evolution/files/evolution-2.22.2-deleted-mails.patch
deleted file mode 100644
index ce3efe052e8b..000000000000
--- a/mail-client/evolution/files/evolution-2.22.2-deleted-mails.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Fix for bug: evolution leaves deleted messages strike through
-http://bugzilla.gnome.org/show_bug.cgi?id=535749
-
---- branches/gnome-2-22/mail/message-list.c	2008/06/04 10:47:09	35595
-+++ branches/gnome-2-22/mail/message-list.c	2008/06/04 14:37:00	35596
-@@ -3889,19 +3889,31 @@
- 	if (expr == NULL) {
- 		uids = camel_folder_get_uids (m->folder);
- 	} else {
--		char *tmp_expr = NULL;
-+		searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex);
- 
- 		/* If m->changes is not NULL, then it means we are called from folder_changed event,
- 		   thus we will keep the selected message to be sure it doesn't disappear because
- 		   it no longer belong to our search filter. */
--		if (m->changes && m->ml->search && m->ml->cursor_uid) {
--			tmp_expr = g_strdup_printf ("(or %s (match-all (uid \"%s\")))", expr, m->ml->cursor_uid);
--			expr = tmp_expr;
--		}
-+		if (m->changes && m->ml->search && m->ml->cursor_uid && uids) {
-+			for (i = 0; i < uids->len; i++) {
-+				if (g_str_equal (m->ml->cursor_uid, uids->pdata [i]))
-+					break;
-+			}
- 
--		searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex);
-+			/* cursor_uid has been filtered out */
-+			if (i == uids->len) {
-+				gboolean was_deleted = (camel_folder_get_message_flags (m->folder, m->ml->cursor_uid) & CAMEL_MESSAGE_DELETED) != 0;
-+
-+				/* I would really like to check for CAMEL_MESSAGE_FOLDER_FLAGGED on a message,
-+				   so I would know whether it was changed locally, and then just check the changes
-+				   struct whether change came from the server, but with periodical save it doesn't
-+				   matter. So here just check whether the file was deleted and we show it based
-+				   on the flag whether we can view deleted messages or not. */
- 
--		g_free (tmp_expr);
-+				if (!was_deleted || (was_deleted && !m->hidedel))
-+					g_ptr_array_add (uids, g_strdup (m->ml->cursor_uid));
-+			}
-+		}
- 	}
- 
- 	if (camel_exception_is_set (&m->base.ex))
-@@ -4182,6 +4194,10 @@
- 	struct _regen_list_msg *m;
- 	GConfClient *gconf;
- 
-+	/* report empty search as NULL, not as one/two-space string */
-+	if (search && (strcmp (search, " ") == 0 || strcmp (search, "  ") == 0))
-+		search = NULL;
-+
- 	if (ml->folder == NULL) {
- 		if (ml->search != search) {
- 			g_free(ml->search);
---- branches/gnome-2-22/widgets/misc/e-filter-bar.c	2008/06/04 10:47:09	35595
-+++ branches/gnome-2-22/widgets/misc/e-filter-bar.c	2008/06/04 14:37:00	35596
-@@ -592,8 +592,11 @@
- 	ESearchBar *esb = E_SEARCH_BAR (object);
- 
- 	switch (property_id) {
--	case PROP_QUERY:
--		if (efb->current_query) {
-+	case PROP_QUERY: {
-+		char *text = e_search_bar_get_text (E_SEARCH_BAR (efb));
-+
-+		/* empty search text means searching turned off */
-+		if (efb->current_query && text && *text) {
- 			GString *out = g_string_new ("");
- 
- 			filter_rule_build_code (efb->current_query, out);
-@@ -602,7 +605,9 @@
- 		} else {
- 			g_value_set_string (value, NULL);
- 		}
--		break;
-+
-+		g_free (text);
-+		break; }
- 	case PROP_STATE: {
- 		/* FIXME: we should have ESearchBar save its own state to the xmlDocPtr */
- 		xmlChar *xmlbuf;
diff --git a/mail-client/evolution/files/evolution-2.24.2-mail-config-crash-fix.patch b/mail-client/evolution/files/evolution-2.24.2-mail-config-crash-fix.patch
deleted file mode 100644
index 4deb64bee159..000000000000
--- a/mail-client/evolution/files/evolution-2.24.2-mail-config-crash-fix.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- branches/gnome-2-24/mail/mail-config.c	2008/11/07 06:34:14	36759
-+++ branches/gnome-2-24/mail/mail-config.c	2008/12/08 05:56:00	36840
-@@ -778,53 +778,64 @@
- 	return (EAccount *) e_account_list_find (config->accounts, E_ACCOUNT_FIND_UID, uid);
- }
- 
-+static gboolean
-+mail_config_account_url_equal (const CamelURL *u1,
-+                               const CamelURL *u2)
-+{
-+	/* For the purpose of matching a URL to an EAccount, only compare
-+	 * the protocol, user, host and port and disregard the rest. */
-+
-+	if (g_strcmp0 (u1->protocol, u2->protocol) != 0)
-+		return FALSE;
-+
-+	if (g_strcmp0 (u1->user, u2->user) != 0)
-+		return FALSE;
-+
-+	if (g_strcmp0 (u1->host, u2->host) != 0)
-+		return FALSE;
-+
-+	return (u1->port == u2->port);
-+}
-+
- EAccount *
- mail_config_get_account_by_source_url (const char *source_url)
- {
- 	EAccount *account = NULL;
- 	EIterator *iter;
-+	CamelURL *url;
- 
- 	g_return_val_if_fail (source_url != NULL, NULL);
- 
-+	url = camel_url_new (source_url, NULL);
-+	g_return_val_if_fail (url != NULL, NULL);
-+
- 	iter = e_list_get_iterator ((EList *) config->accounts);
--	while (e_iterator_is_valid (iter)) {
--		CamelURL *url;
--		gchar *string;
-+	while (account == NULL && e_iterator_is_valid (iter)) {
-+		CamelURL *account_url;
- 
- 		account = (EAccount *) e_iterator_get (iter);
- 
- 		e_iterator_next (iter);
- 
--		if (account->source == NULL)
--			continue;
--
--		else if (account->source->url == NULL)
--			continue;
--
--		else if (*account->source->url == '\0')
-+		if ( !account || (account->source == NULL) || 
-+			(account->source->url == NULL) || (*account->source->url == '\0')) {
-+			account = NULL;
- 			continue;
-+		}
- 
--		url = camel_url_new (account->source->url, NULL);
--		if (url == NULL)
-+		account_url = camel_url_new (account->source->url, NULL);
-+		if (account_url == NULL)
- 			continue;
- 
--		/* Simplify the account URL for comparison. */
--		string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
--		if (string == NULL || strcmp (string, source_url) != 0)
-+		if (!mail_config_account_url_equal (url, account_url))
- 			account = NULL;  /* not a match */
- 
--		camel_url_free (url);
--		g_free (string);
--
--		if (account != NULL) {
--			g_object_unref (iter);
--			return account;
--		}
-+		camel_url_free (account_url);
- 	}
- 
- 	g_object_unref (iter);
- 
--	return NULL;
-+	return account;
- }
- 
- EAccount *
-@@ -832,48 +843,40 @@
- {
- 	EAccount *account = NULL;
- 	EIterator *iter;
-+	CamelURL *url;
- 
- 	g_return_val_if_fail (transport_url != NULL, NULL);
- 
-+	url = camel_url_new (transport_url, NULL);
-+	g_return_val_if_fail (url != NULL, NULL);
-+
- 	iter = e_list_get_iterator ((EList *) config->accounts);
--	while (e_iterator_is_valid (iter)) {
--		CamelURL *url;
--		gchar *string;
-+	while (account == NULL && e_iterator_is_valid (iter)) {
-+		CamelURL *account_url;
- 
- 		account = (EAccount *) e_iterator_get (iter);
- 
- 		e_iterator_next (iter);
- 
--		if (account->transport == NULL)
--			continue;
--
--		else if (account->transport->url == NULL)
--			continue;
--
--		else if (*account->transport->url == '\0')
--			continue;
-+		if ( !account || (account->transport == NULL) || 
-+			(account->transport->url == NULL) || (*account->transport->url == '\0')) {
-+				account = NULL;
-+				continue;
-+		}
- 
--		url = camel_url_new (account->transport->url, NULL);
--		if (url == NULL)
-+		account_url = camel_url_new (account->transport->url, NULL);
-+		if (account_url == NULL)
- 			continue;
- 
--		/* Simplify the account URL for comparison. */
--		string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
--		if (string == NULL || strcmp (string, transport_url) != 0)
-+		if (!mail_config_account_url_equal (url, account_url))
- 			account = NULL;  /* not a match */
- 
- 		camel_url_free (url);
--		g_free (string);
--
--		if (account != NULL) {
--			g_object_unref (iter);
--			return account;
--		}
- 	}
- 
- 	g_object_unref (iter);
- 
--	return NULL;
-+	return account;
- }
- 
- int
diff --git a/mail-client/evolution/files/evolution-2.24.2-r2-mail-config-crash-fix.patch b/mail-client/evolution/files/evolution-2.24.2-r2-mail-config-crash-fix.patch
deleted file mode 100644
index 3340a00c5ea7..000000000000
--- a/mail-client/evolution/files/evolution-2.24.2-r2-mail-config-crash-fix.patch
+++ /dev/null
@@ -1,161 +0,0 @@
---- branches/gnome-2-24/mail/mail-config.c	2008/11/07 06:34:14	36759
-+++ branches/gnome-2-24/mail/mail-config.c	2008/12/16 12:29:17	36904
-@@ -778,53 +778,67 @@
- 	return (EAccount *) e_account_list_find (config->accounts, E_ACCOUNT_FIND_UID, uid);
- }
- 
-+static gboolean
-+mail_config_account_url_equal (const CamelURL *u1,
-+                               const CamelURL *u2)
-+{
-+	/* For the purpose of matching a URL to an EAccount, only compare
-+	 * the protocol, user, host and port and disregard the rest. */
-+
-+	if (g_strcmp0 (u1->protocol, u2->protocol) != 0)
-+		return FALSE;
-+
-+	if (g_strcmp0 (u1->user, u2->user) != 0)
-+		return FALSE;
-+
-+	if (g_strcmp0 (u1->host, u2->host) != 0)
-+		return FALSE;
-+
-+	return (u1->port == u2->port);
-+}
-+
- EAccount *
- mail_config_get_account_by_source_url (const char *source_url)
- {
- 	EAccount *account = NULL;
- 	EIterator *iter;
-+	CamelURL *url;
- 
- 	g_return_val_if_fail (source_url != NULL, NULL);
- 
-+	url = camel_url_new (source_url, NULL);
-+	g_return_val_if_fail (url != NULL, NULL);
-+
- 	iter = e_list_get_iterator ((EList *) config->accounts);
--	while (e_iterator_is_valid (iter)) {
--		CamelURL *url;
--		gchar *string;
-+	while (account == NULL && e_iterator_is_valid (iter)) {
-+		CamelURL *account_url;
- 
- 		account = (EAccount *) e_iterator_get (iter);
- 
- 		e_iterator_next (iter);
- 
--		if (account->source == NULL)
--			continue;
--
--		else if (account->source->url == NULL)
--			continue;
--
--		else if (*account->source->url == '\0')
-+		if ( !account || (account->source == NULL) || 
-+			(account->source->url == NULL) || (*account->source->url == '\0')) {
-+			account = NULL;
- 			continue;
-+		}
- 
--		url = camel_url_new (account->source->url, NULL);
--		if (url == NULL)
-+		account_url = camel_url_new (account->source->url, NULL);
-+		if (account_url == NULL) {
-+			account = NULL;
- 			continue;
-+		}
- 
--		/* Simplify the account URL for comparison. */
--		string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
--		if (string == NULL || strcmp (string, source_url) != 0)
-+		if (!mail_config_account_url_equal (url, account_url))
- 			account = NULL;  /* not a match */
- 
--		camel_url_free (url);
--		g_free (string);
--
--		if (account != NULL) {
--			g_object_unref (iter);
--			return account;
--		}
-+		camel_url_free (account_url);
- 	}
- 
- 	g_object_unref (iter);
-+	camel_url_free (url);
- 
--	return NULL;
-+	return account;
- }
- 
- EAccount *
-@@ -832,48 +846,43 @@
- {
- 	EAccount *account = NULL;
- 	EIterator *iter;
-+	CamelURL *url;
- 
- 	g_return_val_if_fail (transport_url != NULL, NULL);
- 
-+	url = camel_url_new (transport_url, NULL);
-+	g_return_val_if_fail (url != NULL, NULL);
-+
- 	iter = e_list_get_iterator ((EList *) config->accounts);
--	while (e_iterator_is_valid (iter)) {
--		CamelURL *url;
--		gchar *string;
-+	while (account == NULL && e_iterator_is_valid (iter)) {
-+		CamelURL *account_url;
- 
- 		account = (EAccount *) e_iterator_get (iter);
- 
- 		e_iterator_next (iter);
- 
--		if (account->transport == NULL)
--			continue;
--
--		else if (account->transport->url == NULL)
--			continue;
--
--		else if (*account->transport->url == '\0')
--			continue;
-+		if ( !account || (account->transport == NULL) || 
-+			(account->transport->url == NULL) || (*account->transport->url == '\0')) {
-+				account = NULL;
-+				continue;
-+		}
- 
--		url = camel_url_new (account->transport->url, NULL);
--		if (url == NULL)
-+		account_url = camel_url_new (account->transport->url, NULL);
-+		if (account_url == NULL) {
-+			account = NULL;
- 			continue;
-+		}
- 
--		/* Simplify the account URL for comparison. */
--		string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
--		if (string == NULL || strcmp (string, transport_url) != 0)
-+		if (!mail_config_account_url_equal (url, account_url))
- 			account = NULL;  /* not a match */
- 
--		camel_url_free (url);
--		g_free (string);
--
--		if (account != NULL) {
--			g_object_unref (iter);
--			return account;
--		}
-+		camel_url_free (account_url);
- 	}
- 
- 	g_object_unref (iter);
-+	camel_url_free (url);
- 
--	return NULL;
-+	return account;
- }
- 
- int
diff --git a/mail-client/evolution/files/evolution-2.24.2-spamassassin-plugin-fix.patch b/mail-client/evolution/files/evolution-2.24.2-spamassassin-plugin-fix.patch
deleted file mode 100644
index b791f73408af..000000000000
--- a/mail-client/evolution/files/evolution-2.24.2-spamassassin-plugin-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- branches/gnome-2-24/plugins/sa-junk-plugin/em-junk-filter.c	2008/12/03 21:48:56	36828
-+++ branches/gnome-2-24/plugins/sa-junk-plugin/em-junk-filter.c	2008/12/03 21:52:13	36829
-@@ -250,7 +250,7 @@
- 		else
- 			res = rv_err;
- 
--		if (res != 0)
-+		if (res >= 64)
- 			g_set_error (error, EM_JUNK_ERROR, res, _("Pipe to SpamAssassin failed, error code: %d"), res);
- 
- 		return res;
diff --git a/mail-client/evolution/files/evolution-CVE-2008-0072.patch b/mail-client/evolution/files/evolution-CVE-2008-0072.patch
deleted file mode 100644
index 7c371189c486..000000000000
--- a/mail-client/evolution/files/evolution-CVE-2008-0072.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-A format string error in the "emf_multipart_encrypted()" function in
-mail/em-format.c when displaying the "Version:" field from an encrypted
-e-mail message can be exploited to execute arbitrary code via a
-specially crafted e-mail message.
-
-Successful exploitation requires that the user opens a malicious e-mail
-message.
-
-Ulf Harnhammar, Secunia Research.
-
-SA29057 and CVE-2008-0072
-
-Index: mail/em-format.c
-===================================================================
---- mail/em-format.c	(revision 35096)
-+++ mail/em-format.c	(working copy)
-@@ -1193,7 +1193,7 @@ emf_application_xpkcs7mime(EMFormat *emf
- 	opart = camel_mime_part_new();
- 	valid = camel_cipher_decrypt(context, part, opart, ex);
- 	if (valid == NULL) {
--		em_format_format_error(emf, stream, ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error"));
-+		em_format_format_error(emf, stream, "%s", ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error"));
- 		em_format_part_as(emf, stream, part, NULL);
- 	} else {
- 		if (emfc == NULL)
-@@ -1350,7 +1350,7 @@ emf_multipart_encrypted(EMFormat *emf, C
- 	if (valid == NULL) {
- 		em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP/MIME message"):_("Could not parse PGP/MIME message: Unknown error"));
- 		if (ex->desc)
--			em_format_format_error(emf, stream, ex->desc);
-+			em_format_format_error(emf, stream, "%s", ex->desc);
- 		em_format_part_as(emf, stream, part, "multipart/mixed");
- 	} else {
- 		if (emfc == NULL)
-@@ -1515,7 +1515,7 @@ emf_multipart_signed(EMFormat *emf, Came
- 		if (valid == NULL) {
- 			em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));
- 			if (ex->desc)
--				em_format_format_error(emf, stream, ex->desc);
-+				em_format_format_error(emf, stream, "%s", ex->desc);
- 			em_format_part_as(emf, stream, part, "multipart/mixed");
- 		} else {
- 			if (emfc == NULL)
-@@ -1586,7 +1586,7 @@ emf_inlinepgp_signed(EMFormat *emf, Came
- 	if (!valid) {
- 		em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));
- 		if (ex->desc)
--			em_format_format_error(emf, stream, ex->desc);
-+			em_format_format_error(emf, stream, "%s", ex->desc);
- 		em_format_format_source(emf, stream, ipart);
- 		/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
- 		camel_exception_free(ex);
-@@ -1658,7 +1658,7 @@ emf_inlinepgp_encrypted(EMFormat *emf, C
- 	if (!valid) {
- 		em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error"));
- 		if (ex->desc)
--			em_format_format_error(emf, stream, ex->desc);
-+			em_format_format_error(emf, stream, "%s", ex->desc);
- 		em_format_format_source(emf, stream, ipart);
- 		/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
- 		camel_exception_free(ex);
author	Gilles Dartiguelongue <eva@gentoo.org>	2009-03-16 22:41:03 +0000
committer	Gilles Dartiguelongue <eva@gentoo.org>	2009-03-16 22:41:03 +0000
commit	aa926622e548c337043179183f4e519dc462455b (patch)
tree	8968b3e60366f15c33abe715c4c847ed2c0f3347 /mail-client
parent	Clean up old revisions. (diff)
download	gentoo-2-aa926622e548c337043179183f4e519dc462455b.tar.gz gentoo-2-aa926622e548c337043179183f4e519dc462455b.tar.bz2 gentoo-2-aa926622e548c337043179183f4e519dc462455b.zip