Remove old

Package-Manager: portage-2.1.2.9

11 files changed, 11 insertions, 929 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 6319d2643865..f40e9b5138fd 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.179 2007/06/02 02:51:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.180 2007/06/02 03:12:34 leio Exp $
+
+  02 Jun 2007; <leio@gentoo.org>
+  -files/evolution-2.8.2.1-sig-handlers.patch, -evolution-2.8.2.1.ebuild,
+  -evolution-2.8.2.1-r1.ebuild, -evolution-2.8.3-r1.ebuild,
+  -evolution-2.10.0.ebuild:
+  Remove old
 
   02 Jun 2007; Brent Baude <ranger@gentoo.org> evolution-2.8.3-r2.ebuild:
   Marking evolution-2.8.3-r2 ppc stable for bug #171107
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 8446dcf0f0f7..f0214c2d7703 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -30,10 +30,6 @@ AUX evolution-2.8.2.1-pilot-link-as-needed.patch 594 RMD160 621f459ae77f8a98dd5b
 MD5 673ffa9d140881b086ec73c13d9abdc9 files/evolution-2.8.2.1-pilot-link-as-needed.patch 594
 RMD160 621f459ae77f8a98dd5bb503b40a82595c71fe21 files/evolution-2.8.2.1-pilot-link-as-needed.patch 594
 SHA256 fe54434610d0779328b2e8ad843342d347a6b1e0b0d077a1c19041dc63b08f57 files/evolution-2.8.2.1-pilot-link-as-needed.patch 594
-AUX evolution-2.8.2.1-sig-handlers.patch 1357 RMD160 cd50a106b1e05831f21ac1aece2aa7a0e568738b SHA1 9d736d39ad6529469c6d52dcb5ba0e7e06ed9e5e SHA256 e983f8705959f2d52cb4259cbda4cc6892280265b29a0192189dec38e7e03fc6
-MD5 7b85e3ca755762e4c060557cfd2124b9 files/evolution-2.8.2.1-sig-handlers.patch 1357
-RMD160 cd50a106b1e05831f21ac1aece2aa7a0e568738b files/evolution-2.8.2.1-sig-handlers.patch 1357
-SHA256 e983f8705959f2d52cb4259cbda4cc6892280265b29a0192189dec38e7e03fc6 files/evolution-2.8.2.1-sig-handlers.patch 1357
 AUX evolution-2.8.3-missing-groupwise-feature.patch 429 RMD160 2ca3bfa4bce41eb1e7fa4f298dfd000fe6f4cb6b SHA1 ccb5ba7fcd0a1fc71c965674355b4b0122956eb3 SHA256 88a4e262ef67d3465e4a06b11be2f23e7872b445f85a3c4e9ef41436b20182b4
 MD5 4431d899b1e6fff9d8ea9e3b23f33af7 files/evolution-2.8.3-missing-groupwise-feature.patch 429
 RMD160 2ca3bfa4bce41eb1e7fa4f298dfd000fe6f4cb6b files/evolution-2.8.3-missing-groupwise-feature.patch 429
@@ -54,16 +50,10 @@ AUX evolution-2.9.91-cal-reply.patch 1679 RMD160 c8bc0e84a77b43a705ad00c7db5b93a
 MD5 6d4ba6287ad008ef6c396d7d70efa36e files/evolution-2.9.91-cal-reply.patch 1679
 RMD160 c8bc0e84a77b43a705ad00c7db5b93a1f1dcaabc files/evolution-2.9.91-cal-reply.patch 1679
 SHA256 5837a56bf1079f2e703d6cc5316425f583ae4975a977a2ec80684962f1be826f files/evolution-2.9.91-cal-reply.patch 1679
-DIST evolution-2.10.0.tar.bz2 15525569 RMD160 ab12f69a0588d932399405982bd2561392f87aac SHA1 c1d42323250672c70655288eab83de70003b9470 SHA256 46035f6ea64c9310d6f5c9ebe0cdd851e3a3d6748d0e7d545e088dd2682251c7
 DIST evolution-2.10.1.tar.bz2 15689020 RMD160 5323bc17906ad10ac6e7c5709ebac2cbc5df684b SHA1 582bdc1e7ffaa1c89ebfd09d8d932398055c8588 SHA256 d396190136e6322c2ae820993467bf41a8e188f9597ccf00e3411560280b5cda
 DIST evolution-2.5.5.1-bf-junk.tar.bz2 10771 RMD160 7ae764761607d50024fbec32680bc57e04ac7879 SHA1 465205cf50770b72641995ec59617010dadaf204 SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045
 DIST evolution-2.6.2.tar.bz2 12394719 RMD160 72133312fb9cceae74d9f0e570dd898d5119a10b SHA1 08a6a9bf3754fff71cbdf82857337b1edc13ef46 SHA256 a69c45e9deae3a2eea06af08eacb9266e6cdcd452dd600ad96c2de23effa56f5
-DIST evolution-2.8.2.1.tar.bz2 12921518 RMD160 9198236aded4c8b905eb990b725d01d399308491 SHA1 ccd38cddd96a0ed0375b315eb1e8dc536ef8bc90 SHA256 4fb4b7b987a8e0677b270b44d567e7821007f2b1c4af236c66d81f35a5b4c144
 DIST evolution-2.8.3.tar.bz2 12931527 RMD160 cbf86ecbee7619f54ea6e60780d5c182208c5bf3 SHA1 afde414298d65ec344f52648c1915629bf7b79c3 SHA256 08819f459185de7f36ac43702bb5314d1b2a9fae33db9ac4c5d9dfb3aaabca90
-EBUILD evolution-2.10.0.ebuild 6637 RMD160 a806f52113fa497ef176db0327bc2597b03cc05c SHA1 7a77e17e07999ee9a7bf334b483fb1b53f7a0ff4 SHA256 0127cc97d98b1b7be5f69cb92a1807dcb58938fd95e1cb9966811db9436677e8
-MD5 f2b6eca3df024ccdea44bb6b1b51b35f evolution-2.10.0.ebuild 6637
-RMD160 a806f52113fa497ef176db0327bc2597b03cc05c evolution-2.10.0.ebuild 6637
-SHA256 0127cc97d98b1b7be5f69cb92a1807dcb58938fd95e1cb9966811db9436677e8 evolution-2.10.0.ebuild 6637
 EBUILD evolution-2.10.1.ebuild 6669 RMD160 3649fbc0637d11e23ae126d256ffc98de0d6d944 SHA1 85c7a0c705c71514d8664281af22241dab36bac1 SHA256 f6cc46d3f90f6d6b0228b5462e63a05a72309aca37c62d2176f49fa8f55f7d02
 MD5 15e25471874c6520e117937deb5a8236 evolution-2.10.1.ebuild 6669
 RMD160 3649fbc0637d11e23ae126d256ffc98de0d6d944 evolution-2.10.1.ebuild 6669
@@ -72,48 +62,24 @@ EBUILD evolution-2.6.2-r1.ebuild 6093 RMD160 80ba324287a41d60582fc9983d74d55ad97
 MD5 7ec60cee6b484082d89e292811a06d2b evolution-2.6.2-r1.ebuild 6093
 RMD160 80ba324287a41d60582fc9983d74d55ad9781ef0 evolution-2.6.2-r1.ebuild 6093
 SHA256 2b82e23e800e9856955cb39b1f3fd91caae4def71b7e58aa11c4388b44cec9a3 evolution-2.6.2-r1.ebuild 6093
-EBUILD evolution-2.8.2.1-r1.ebuild 6261 RMD160 faf21f934ade0cc3901563c9b5ae93105c89b31f SHA1 c7b8860ae25304413381f2b57d5fb33be3363448 SHA256 3768aef8697d6dae5cee71c289f726a7655cbb98b135b3459891cd28fac3c708
-MD5 4b5cabad9a16505c285697f43676460b evolution-2.8.2.1-r1.ebuild 6261
-RMD160 faf21f934ade0cc3901563c9b5ae93105c89b31f evolution-2.8.2.1-r1.ebuild 6261
-SHA256 3768aef8697d6dae5cee71c289f726a7655cbb98b135b3459891cd28fac3c708 evolution-2.8.2.1-r1.ebuild 6261
-EBUILD evolution-2.8.2.1.ebuild 6156 RMD160 0cb4f219cef4533ce3c0f7c63bbad9be4b9eae9a SHA1 168bcd61976c41a7f647ddc93f57759ab263ddbb SHA256 6dd30410a5733f12ed3a55f4de1c278e93b9d94e2286e332cb3b87b1281b0978
-MD5 fc2bc5c399f2c202b07aed889e88df10 evolution-2.8.2.1.ebuild 6156
-RMD160 0cb4f219cef4533ce3c0f7c63bbad9be4b9eae9a evolution-2.8.2.1.ebuild 6156
-SHA256 6dd30410a5733f12ed3a55f4de1c278e93b9d94e2286e332cb3b87b1281b0978 evolution-2.8.2.1.ebuild 6156
-EBUILD evolution-2.8.3-r1.ebuild 6622 RMD160 26988b75fcd8264975701cad78bc69b8ddc6c4b3 SHA1 2b6600af25f27aac436c7725d899d29cebdcd29f SHA256 f7c1cc01084ef119d5bca42345c90943ff99826f92d7afa9a04a1dd0adcace4b
-MD5 f2a3101c8a4999257d8a994cb2c87f71 evolution-2.8.3-r1.ebuild 6622
-RMD160 26988b75fcd8264975701cad78bc69b8ddc6c4b3 evolution-2.8.3-r1.ebuild 6622
-SHA256 f7c1cc01084ef119d5bca42345c90943ff99826f92d7afa9a04a1dd0adcace4b evolution-2.8.3-r1.ebuild 6622
 EBUILD evolution-2.8.3-r2.ebuild 6864 RMD160 5cbc94fca510ee008884ba409b1ad8704f84c109 SHA1 6f7fb1b3dcad118aa184e00d5ad9afd733565c01 SHA256 e1d81ca2d7f6498433cb5b3294923802b42628e74c0093af2e210293f74720d6
 MD5 d1302bd49fb30d84905a5608c3db314c evolution-2.8.3-r2.ebuild 6864
 RMD160 5cbc94fca510ee008884ba409b1ad8704f84c109 evolution-2.8.3-r2.ebuild 6864
 SHA256 e1d81ca2d7f6498433cb5b3294923802b42628e74c0093af2e210293f74720d6 evolution-2.8.3-r2.ebuild 6864
-MISC ChangeLog 43594 RMD160 fc6d0fe9821f48427919e053ff32ce8047702e9b SHA1 605b6685471ca899c385b9e13ef58d15aec3a7fb SHA256 b1b5f1cf7abbbcef5dbad7a5bb18bc99ecfdfbcf4e6fa151b35a2bf8e6f7eacd
-MD5 2fdd6dbf51c9bf9537003d160db596a7 ChangeLog 43594
-RMD160 fc6d0fe9821f48427919e053ff32ce8047702e9b ChangeLog 43594
-SHA256 b1b5f1cf7abbbcef5dbad7a5bb18bc99ecfdfbcf4e6fa151b35a2bf8e6f7eacd ChangeLog 43594
+MISC ChangeLog 43801 RMD160 b9e9f0c4811b97b1eb8c62b37f32c76213a210ae SHA1 1b31707a781a439e70959b59da32f60353899cd3 SHA256 0507b4b54b5d07cd5fa8da0b74f3654fb3576eaf1e3d3e6c2b444721e3af7a94
+MD5 4ad5cd2f52515db5186f029eee0c58b0 ChangeLog 43801
+RMD160 b9e9f0c4811b97b1eb8c62b37f32c76213a210ae ChangeLog 43801
+SHA256 0507b4b54b5d07cd5fa8da0b74f3654fb3576eaf1e3d3e6c2b444721e3af7a94 ChangeLog 43801
 MISC metadata.xml 228 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf SHA1 a7000d8d92e63e8b0bcb2531adea06af0fb4ceac SHA256 2f477aca2b0940f4b8d5a5817f1def0daa79846e5d3cb9b6c832a02ee7be298a
 MD5 adc1e2cec38f3e23b706de11a2ac0d92 metadata.xml 228
 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf metadata.xml 228
 SHA256 2f477aca2b0940f4b8d5a5817f1def0daa79846e5d3cb9b6c832a02ee7be298a metadata.xml 228
-MD5 f8d4aba59d751576bb8b1210d5b9c0bd files/digest-evolution-2.10.0 536
-RMD160 20927d7c2ffb555e659935abb3a8da6e834c761e files/digest-evolution-2.10.0 536
-SHA256 055cde66f45f8cf2ca1958819b0d8550283dac9720747cb0d885c88b9c10deae files/digest-evolution-2.10.0 536
 MD5 15e064d2c80d95f3e2c421565b189394 files/digest-evolution-2.10.1 536
 RMD160 4b6ec6f57cb10327c8db85e871bdf59d30dfcf4a files/digest-evolution-2.10.1 536
 SHA256 d3595d7bce8e08c27d1fede8e6795e9c5c72704b41d78dc8a7c8a7242f229199 files/digest-evolution-2.10.1 536
 MD5 f58ca96f6e0006d63acada5e98d62982 files/digest-evolution-2.6.2-r1 533
 RMD160 94fb86de744f42bcae39b6f5a0d6276ed559014e files/digest-evolution-2.6.2-r1 533
 SHA256 730a2ffe0655db234cb17adecb91357a37e42064f41dc64cccfb7ab2fda0614d files/digest-evolution-2.6.2-r1 533
-MD5 69f24fe63512a4a3c5568d92cc01df88 files/digest-evolution-2.8.2.1 539
-RMD160 bc777ef9751d4b4bf1b3d795245872dbcd8f878f files/digest-evolution-2.8.2.1 539
-SHA256 d973eab10ec33eb05052ae144c088a0a9ee7c983c5c9d62a9096c1dcbc780561 files/digest-evolution-2.8.2.1 539
-MD5 69f24fe63512a4a3c5568d92cc01df88 files/digest-evolution-2.8.2.1-r1 539
-RMD160 bc777ef9751d4b4bf1b3d795245872dbcd8f878f files/digest-evolution-2.8.2.1-r1 539
-SHA256 d973eab10ec33eb05052ae144c088a0a9ee7c983c5c9d62a9096c1dcbc780561 files/digest-evolution-2.8.2.1-r1 539
-MD5 4baf69f8a0985f0b493a39c1e5f2920e files/digest-evolution-2.8.3-r1 533
-RMD160 0aca45717cdcb1e57839b1826d465c3f96ebd8b5 files/digest-evolution-2.8.3-r1 533
-SHA256 4a580168c5f139e4e65dec026d9c27358a0caad314d78b403d51b38e6fb7a424 files/digest-evolution-2.8.3-r1 533
 MD5 4baf69f8a0985f0b493a39c1e5f2920e files/digest-evolution-2.8.3-r2 533
 RMD160 0aca45717cdcb1e57839b1826d465c3f96ebd8b5 files/digest-evolution-2.8.3-r2 533
 SHA256 4a580168c5f139e4e65dec026d9c27358a0caad314d78b403d51b38e6fb7a424 files/digest-evolution-2.8.3-r2 533
diff --git a/mail-client/evolution/evolution-2.10.0.ebuild b/mail-client/evolution/evolution-2.10.0.ebuild
deleted file mode 100644
index 170a5e9e5abf..000000000000
--- a/mail-client/evolution/evolution-2.10.0.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.10.0.ebuild,v 1.3 2007/04/22 10:00:32 pva Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.9"
-inherit eutils flag-o-matic alternatives gnome2 autotools
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}
-	bogofilter? ( mirror://gentoo/${PN}-2.5.5.1-bf-junk.tar.bz2 )"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-# gstreamer for audio-inline, when it uses 0.10
-IUSE="bogofilter crypt dbus debug doc hal ipv6 kerberos krb4 ldap mono networkmanager nntp pda profile spell ssl"
-
-# Pango dependency required to avoid font rendering problems
-RDEPEND=">=x11-themes/gnome-icon-theme-1.2
-	dev-libs/atk
-	>=gnome-extra/gtkhtml-3.14.0
-	>=dev-libs/glib-2.10
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/evolution-data-server-1.9.4
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=net-libs/libsoup-2.2.96
-	>=x11-libs/pango-1.8.1
-	x11-libs/libnotify
-	hal? ( >=sys-apps/hal-0.5.4 )
-	pda? (
-		>=app-pda/gnome-pilot-2
-		>=app-pda/gnome-pilot-conduits-2 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	dbus? ( || (
-		dev-libs/dbus-glib
-		~sys-apps/dbus-0.62 ) )
-	networkmanager? ( net-misc/networkmanager )
-	mono? ( >=dev-lang/mono-1 )
-	bogofilter? ( mail-filter/bogofilter )
-	!bogofilter? ( mail-filter/spamassassin )"
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.10
-#		>=media-libs/gst-plugins-base-0.10 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35.5
-	sys-devel/gettext
-	sys-devel/bison
-	app-text/scrollkeeper
-	>=gnome-base/gnome-common-2.12.0
-	>=app-text/gnome-doc-utils-0.9.1
-	doc? ( >=dev-util/gtk-doc-0.6 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-
-pkg_setup() {
-	G2CONF="--disable-default-binary \
-		--without-kde-applnk-path        \
-		$(use_enable ssl nss)            \
-		$(use_enable ssl smime)          \
-		$(use_enable ipv6)               \
-		$(use_enable mono)               \
-		$(use_enable nntp)               \
-		$(use_enable pda pilot-conduits) \
-		$(use_enable profile profiling)  \
-		$(use_with ldap openldap)        \
-		$(use_with kerberos krb5 /usr)"
-
-	# We need a graphical pinentry frontend to be able to ask for the GPG
-	# password from inside evolution, bug 160302
-	if use crypt && has_version '>=app-crypt/gnupg-2.0.1-r2'; then
-		if ! built_with_use -o app-crypt/pinentry gtk qt3; then
-			die "You must build app-crypt/pinentry with GTK or QT3 support"
-		fi
-	fi
-
-	if use krb4 && ! built_with_use virtual/krb5 krb4; then
-		ewarn
-		ewarn "In order to add kerberos 4 support, you have to emerge"
-		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
-		ewarn
-		ewarn "Skipping for now."
-		ewarn
-		G2CONF="${G2CONF} --without-krb4"
-	else
-		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
-	fi
-
-	# Plug-ins to install. Normally we would want something similar to
-	# --enable-plugins=all (plugins_base + plugins_standard), except for some
-	# special cases.
-	local plugins="calendar-file calendar-http calendar-weather \
-		itip-formatter plugin-manager default-source addressbook-file \
-		startup-wizard print-message mark-all-read groupwise-features \
-		groupwise-account-setup hula-account-setup mail-account-disable \
-		publish-calendar caldav imap-features \
-		bbdb subject-thread save-calendar select-one-source copy-tool \
-		mail-to-task mark-calendar-offline mailing-list-actions \
-		new-mail-notify default-mailer import-ics-attachments"
-
-	# For dev releases, add experimental plugins
-	plugins="${plugins} backup-restore folder-unsubscribe mail-to-meeting \
-		prefer-plain save-attachments"
-
-	if use bogofilter; then
-		plugins="${plugins} bf-junk-plugin"
-	else
-		plugins="${plugins} sa-junk-plugin"
-	fi
-
-	# The special cases
-
-	# remove this due to bug #128035 re-enable later if it doesn't dep on
-	# gstreamer-0.8
-	# use gstreamer && plugins="${plugins} audio-inline"
-	use dbus && plugins="${plugins} new-mail-notify"
-	use mono && plugins="${plugins} mono"
-
-	if built_with_use gnome-extra/evolution-data-server ldap; then
-		plugins="${plugins} exchange-operations"
-	fi
-
-	local pluginlist=""
-	for p in $plugins; do
-		[ "x$pluginlist" != "x" ] && pluginlist="${pluginlist},"
-		pluginlist="${pluginlist}${p}"
-	done
-
-	G2CONF="${G2CONF} --enable-plugins=${pluginlist}"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Accept the list of plugins separated by commas instead of spaces.
-	epatch "${FILESDIR}"/${PN}-2.3.7-configure_plugins.patch
-
-	# Fix 64-bit warnings
-	epatch "${FILESDIR}"/${PN}-2.8.1.1-64-bit.patch
-
-	# Fix linking against pilot-link wiht --as-needed; bug #154453
-	epatch "${FILESDIR}"/${PN}-2.8.2.1-pilot-link-as-needed.patch
-
-	# Fix "reply to meeting" buffer overruns
-	epatch "${FILESDIR}"/${PN}-2.9.91-cal-reply.patch
-
-	# Add bogofilter junk plugin source
-	use bogofilter && epatch "${FILESDIR}"/${PN}-2.9.2-bf-junk.patch.gz
-
-	# certificate filtering for clueless users (and even for those who know)
-	epatch ${FILESDIR}/${PN}-2.8.2.1-certificate-manager-filtering.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -i -e "s|mozilla-nss|nss|
-			s|mozilla-nspr|nspr|" ${S}/configure
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9][0-9]"
-	elog "To change the default browser if you are not using GNOME, do:"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	elog ""
-	elog "Replace 'mozilla %s' with which ever browser you use."
-}
diff --git a/mail-client/evolution/evolution-2.8.2.1-r1.ebuild b/mail-client/evolution/evolution-2.8.2.1-r1.ebuild
deleted file mode 100644
index 9094280a1320..000000000000
--- a/mail-client/evolution/evolution-2.8.2.1-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.2.1-r1.ebuild,v 1.3 2007/03/18 01:50:55 genone Exp $
-
-inherit eutils flag-o-matic alternatives gnome2 autotools
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}
-	bogofilter? ( mirror://gentoo/${PN}-2.5.5.1-bf-junk.tar.bz2 )"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-# 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.9.90
-	>=dev-libs/glib-2.10
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/evolution-data-server-1.7.90
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeprint-2.7
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=net-libs/libsoup-2.2.96
-	>=x11-libs/pango-1.8.1
-	x11-libs/libnotify
-	hal? ( >=sys-apps/hal-0.5.4 )
-	pda? (
-		>=app-pda/gnome-pilot-2
-		>=app-pda/gnome-pilot-conduits-2 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	dbus? ( || (
-		dev-libs/dbus-glib
-		~sys-apps/dbus-0.62 ) )
-	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
-	sys-devel/gettext
-	sys-devel/bison
-	app-text/scrollkeeper
-	>=gnome-base/gnome-common-2.12.0
-	doc? ( >=dev-util/gtk-doc-0.6 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-
-pkg_setup() {
-	G2CONF="--disable-default-binary \
-		--without-kde-applnk-path        \
-		$(use_enable ssl nss)            \
-		$(use_enable ssl smime)          \
-		$(use_enable ipv6)               \
-		$(use_enable mono)               \
-		$(use_enable nntp)               \
-		$(use_enable pda pilot-conduits) \
-		$(use_enable profile profiling)  \
-		$(use_with ldap openldap)        \
-		$(use_with kerberos krb5 /usr)"
-
-	if use krb4 && ! built_with_use virtual/krb5 krb4; then
-		ewarn
-		ewarn "In order to add kerberos 4 support, you have to emerge"
-		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
-		ewarn
-		ewarn "Skipping for now."
-		ewarn
-		G2CONF="${G2CONF} --without-krb4"
-	else
-		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
-	fi
-
-	# Plug-ins to install. Normally we would want something similar to
-	# --enable-plugins=all (plugins_base + plugins_standard), except for some
-	# special cases.
-	local plugins="calendar-file calendar-http calendar-weather \
-		itip-formatter plugin-manager default-source addressbook-file \
-		startup-wizard print-message mark-all-read groupwise-features \
-		groupwise-account-setup hula-account-setup mail-account-disable \
-		publish-calendar caldav \
-		bbdb subject-thread save-calendar select-one-source copy-tool \
-		mail-to-task mark-calendar-offline 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() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-
-	gnome2_omf_fix help/omf.make
-
-	# Accept the list of plugins separated by commas instead of spaces.
-	epatch ${FILESDIR}/${PN}-2.3.7-configure_plugins.patch
-
-	# Move evo to URI-based saving
-	epatch ${FILESDIR}/${PN}-2.8.0-uri.patch.gz
-
-	# Fix 64-bit warnings
-	epatch ${FILESDIR}/${PN}-2.8.1.1-64-bit.patch
-
-	# Fix two images in preview crash; bug #163372
-	epatch "${FILESDIR}"/${P}-sig-handlers.patch
-
-	# Fix linking against pilot-link wiht --as-needed; bug #154453
-	epatch "${FILESDIR}"/${P}-pilot-link-as-needed.patch
-
-	# Add bogofilter junk plugin source
-	use bogofilter && epatch ${FILESDIR}/${PN}-2.8.2.1-bf-junk.patch.gz
-
-
-	eaclocal || die
-	_elibtoolize --copy --force || die
-	eautoheader || die
-	eautomake || die
-	intltoolize --force || die
-	eautoconf || die
-}
-
-src_compile() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -i -e "s|mozilla-nss|nss|
-			s|mozilla-nspr|nspr|" ${S}/configure
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
-	elog "To change the default browser if you are not using GNOME, do:"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	elog ""
-	elog "Replace 'mozilla %s' with which ever browser you use."
-}
diff --git a/mail-client/evolution/evolution-2.8.2.1.ebuild b/mail-client/evolution/evolution-2.8.2.1.ebuild
deleted file mode 100644
index 6c7193ea4aab..000000000000
--- a/mail-client/evolution/evolution-2.8.2.1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.2.1.ebuild,v 1.11 2007/03/18 01:50:55 genone Exp $
-
-inherit eutils flag-o-matic alternatives gnome2 autotools
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}
-	bogofilter? ( mirror://gentoo/${PN}-2.5.5.1-bf-junk.tar.bz2 )"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-# 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.9.90
-	>=dev-libs/glib-2.10
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/evolution-data-server-1.7.90
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeprint-2.7
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=net-libs/libsoup-2.2.96
-	>=x11-libs/pango-1.8.1
-	x11-libs/libnotify
-	hal? ( >=sys-apps/hal-0.5.4 )
-	pda? (
-		>=app-pda/gnome-pilot-2
-		>=app-pda/gnome-pilot-conduits-2 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	dbus? ( || (
-		dev-libs/dbus-glib
-		~sys-apps/dbus-0.62 ) )
-	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
-	sys-devel/gettext
-	sys-devel/bison
-	app-text/scrollkeeper
-	>=gnome-base/gnome-common-2.12.0
-	doc? ( >=dev-util/gtk-doc-0.6 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-
-pkg_setup() {
-	G2CONF="--disable-default-binary \
-		--without-kde-applnk-path        \
-		$(use_enable ssl nss)            \
-		$(use_enable ssl smime)          \
-		$(use_enable ipv6)               \
-		$(use_enable mono)               \
-		$(use_enable nntp)               \
-		$(use_enable pda pilot-conduits) \
-		$(use_enable profile profiling)  \
-		$(use_with ldap openldap)        \
-		$(use_with kerberos krb5 /usr)"
-
-	if use krb4 && ! built_with_use virtual/krb5 krb4; then
-		ewarn
-		ewarn "In order to add kerberos 4 support, you have to emerge"
-		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
-		ewarn
-		ewarn "Skipping for now."
-		ewarn
-		G2CONF="${G2CONF} --without-krb4"
-	else
-		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
-	fi
-
-	# Plug-ins to install. Normally we would want something similar to
-	# --enable-plugins=all (plugins_base + plugins_standard), except for some
-	# special cases.
-	local plugins="calendar-file calendar-http calendar-weather \
-		itip-formatter plugin-manager default-source addressbook-file \
-		startup-wizard print-message mark-all-read groupwise-features \
-		groupwise-account-setup hula-account-setup mail-account-disable \
-		publish-calendar caldav \
-		bbdb subject-thread save-calendar select-one-source copy-tool \
-		mail-to-task mark-calendar-offline 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() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-
-	gnome2_omf_fix help/omf.make
-
-	# Accept the list of plugins separated by commas instead of spaces.
-	epatch ${FILESDIR}/${PN}-2.3.7-configure_plugins.patch
-
-	# Move evo to URI-based saving
-	epatch ${FILESDIR}/${PN}-2.8.0-uri.patch.gz
-
-	# Fix 64-bit warnings
-	epatch ${FILESDIR}/${PN}-2.8.1.1-64-bit.patch
-
-	# Fix linking against pilot-link wiht --as-needed; bug #154453
-	epatch "${FILESDIR}"/${P}-pilot-link-as-needed.patch
-
-	# Add bogofilter junk plugin source
-	use bogofilter && epatch ${FILESDIR}/${PN}-2.8.2.1-bf-junk.patch.gz
-
-
-	eaclocal || die
-	_elibtoolize --copy --force || die
-	eautoheader || die
-	eautomake || die
-	intltoolize --force || die
-	eautoconf || die
-}
-
-src_compile() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -i -e "s|mozilla-nss|nss|
-			s|mozilla-nspr|nspr|" ${S}/configure
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
-	elog "To change the default browser if you are not using GNOME, do:"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	elog ""
-	elog "Replace 'mozilla %s' with which ever browser you use."
-}
diff --git a/mail-client/evolution/evolution-2.8.3-r1.ebuild b/mail-client/evolution/evolution-2.8.3-r1.ebuild
deleted file mode 100644
index dd89d404e31e..000000000000
--- a/mail-client/evolution/evolution-2.8.3-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.3-r1.ebuild,v 1.4 2007/03/22 20:24:25 zmedico Exp $
-
-inherit eutils flag-o-matic alternatives gnome2 autotools
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-SRC_URI="${SRC_URI}
-	bogofilter? ( mirror://gentoo/${PN}-2.5.5.1-bf-junk.tar.bz2 )"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-# 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.9.90
-	>=dev-libs/glib-2.10
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/evolution-data-server-1.7.90
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeprint-2.7
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=net-libs/libsoup-2.2.96
-	>=x11-libs/pango-1.8.1
-	x11-libs/libnotify
-	hal? ( >=sys-apps/hal-0.5.4 )
-	pda? (
-		>=app-pda/gnome-pilot-2
-		>=app-pda/gnome-pilot-conduits-2 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	dbus? ( || (
-		dev-libs/dbus-glib
-		~sys-apps/dbus-0.62 ) )
-	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
-	sys-devel/gettext
-	sys-devel/bison
-	app-text/scrollkeeper
-	>=gnome-base/gnome-common-2.12.0
-	doc? ( >=dev-util/gtk-doc-0.6 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-
-pkg_setup() {
-	G2CONF="--disable-default-binary \
-		--without-kde-applnk-path        \
-		$(use_enable ssl nss)            \
-		$(use_enable ssl smime)          \
-		$(use_enable ipv6)               \
-		$(use_enable mono)               \
-		$(use_enable nntp)               \
-		$(use_enable pda pilot-conduits) \
-		$(use_enable profile profiling)  \
-		$(use_with ldap openldap)        \
-		$(use_with kerberos krb5 /usr)"
-
-	# 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 \
-		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() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-
-	gnome2_omf_fix help/omf.make
-
-	# Accept the list of plugins separated by commas instead of spaces.
-	epatch ${FILESDIR}/${PN}-2.3.7-configure_plugins.patch
-
-	# Move evo to URI-based saving
-	epatch ${FILESDIR}/${PN}-2.8.0-uri.patch.gz
-
-	# Fix 64-bit warnings
-	epatch ${FILESDIR}/${PN}-2.8.1.1-64-bit.patch
-
-	# Fix settings OK button.  Bug #166740
-	epatch "${FILESDIR}"/${P}-missing-groupwise-feature.patch
-
-	# Fix linking against pilot-link wiht --as-needed; bug #154453
-	epatch "${FILESDIR}"/${PN}-2.8.2.1-pilot-link-as-needed.patch
-
-	# Add bogofilter junk plugin source
-	use bogofilter && epatch ${FILESDIR}/${PN}-2.8.2.1-bf-junk.patch.gz
-
-
-	eaclocal || die
-	_elibtoolize --copy --force || die
-	eautoheader || die
-	eautomake || die
-	intltoolize --force || die
-	eautoconf || die
-}
-
-src_compile() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -i -e "s|mozilla-nss|nss|
-			s|mozilla-nspr|nspr|" ${S}/configure
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
-	elog "To change the default browser if you are not using GNOME, do:"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	elog ""
-	elog "Replace 'mozilla %s' with which ever browser you use."
-}
diff --git a/mail-client/evolution/files/digest-evolution-2.10.0 b/mail-client/evolution/files/digest-evolution-2.10.0
deleted file mode 100644
index 87f223fb9d99..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.10.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 68d32e518f235bea9d768ae55e91bffc evolution-2.10.0.tar.bz2 15525569
-RMD160 ab12f69a0588d932399405982bd2561392f87aac evolution-2.10.0.tar.bz2 15525569
-SHA256 46035f6ea64c9310d6f5c9ebe0cdd851e3a3d6748d0e7d545e088dd2682251c7 evolution-2.10.0.tar.bz2 15525569
-MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771
diff --git a/mail-client/evolution/files/digest-evolution-2.8.2.1 b/mail-client/evolution/files/digest-evolution-2.8.2.1
deleted file mode 100644
index 645792cdb704..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.8.2.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-MD5 3c860b732d4087843da4bbf5fc8f03b6 evolution-2.8.2.1.tar.bz2 12921518
-RMD160 9198236aded4c8b905eb990b725d01d399308491 evolution-2.8.2.1.tar.bz2 12921518
-SHA256 4fb4b7b987a8e0677b270b44d567e7821007f2b1c4af236c66d81f35a5b4c144 evolution-2.8.2.1.tar.bz2 12921518
diff --git a/mail-client/evolution/files/digest-evolution-2.8.2.1-r1 b/mail-client/evolution/files/digest-evolution-2.8.2.1-r1
deleted file mode 100644
index 645792cdb704..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.8.2.1-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-MD5 3c860b732d4087843da4bbf5fc8f03b6 evolution-2.8.2.1.tar.bz2 12921518
-RMD160 9198236aded4c8b905eb990b725d01d399308491 evolution-2.8.2.1.tar.bz2 12921518
-SHA256 4fb4b7b987a8e0677b270b44d567e7821007f2b1c4af236c66d81f35a5b4c144 evolution-2.8.2.1.tar.bz2 12921518
diff --git a/mail-client/evolution/files/digest-evolution-2.8.3-r1 b/mail-client/evolution/files/digest-evolution-2.8.3-r1
deleted file mode 100644
index 4d2af2ebbaa9..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.8.3-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771
-MD5 099876b347b114ec08ce6998b4a48d8c evolution-2.8.3.tar.bz2 12931527
-RMD160 cbf86ecbee7619f54ea6e60780d5c182208c5bf3 evolution-2.8.3.tar.bz2 12931527
-SHA256 08819f459185de7f36ac43702bb5314d1b2a9fae33db9ac4c5d9dfb3aaabca90 evolution-2.8.3.tar.bz2 12931527
diff --git a/mail-client/evolution/files/evolution-2.8.2.1-sig-handlers.patch b/mail-client/evolution/files/evolution-2.8.2.1-sig-handlers.patch
deleted file mode 100644
index 5945f92506f0..000000000000
--- a/mail-client/evolution/files/evolution-2.8.2.1-sig-handlers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -up -ruN evolution-2.8.2.1.orig/mail/em-format-html-display.c evolution-2.8.2.1/mail/em-format-html-display.c
---- evolution-2.8.2.1.orig/mail/em-format-html-display.c	2006-10-16 08:38:58.000000000 -0400
-+++ evolution-2.8.2.1/mail/em-format-html-display.c	2007-01-29 12:48:30.000000000 -0500
-@@ -181,6 +181,7 @@ struct _attach_puri {
- 	int fit_width;
- 	int fit_height;
- 	GtkImage *image;
-+	GtkWidget *event_box;
- 
- 	/* Signed / Encrypted */
-         camel_cipher_validity_sign_t sign;
-@@ -1689,6 +1690,11 @@ efhd_image_unallocate (struct _EMFormatP
- {
- 	struct _attach_puri *info = (struct _attach_puri *) puri;
- 	g_signal_handlers_disconnect_by_func(info->html, efhd_image_resized, info);
-+
-+	g_signal_handlers_disconnect_by_func(info->event_box, efhd_image_popup, info);
-+	g_signal_handlers_disconnect_by_func(info->event_box, efhd_change_cursor, info);
-+	g_signal_handlers_disconnect_by_func(info->event_box, efhd_attachment_popup_menu, info);
-+	g_signal_handlers_disconnect_by_func(info->event_box, efhd_image_fit_width, info);
- }
- 
- static gboolean
-@@ -1721,6 +1727,7 @@ efhd_attachment_image(EMFormatHTML *efh,
- 	}
- 
- 	box = gtk_event_box_new();
-+	info->event_box = box;
- 	gtk_container_add((GtkContainer *)box, (GtkWidget *)info->image);
- 	gtk_widget_show_all(box);
- 	gtk_container_add((GtkContainer *)eb, box);