Drop old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 11 insertions, 439 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 5899695c0a67..8bc324b6b9f3 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.405 2013/08/30 22:49:16 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.406 2013/11/18 20:06:38 pacho Exp $
+
+  18 Nov 2013; Pacho Ramos <pacho@gentoo.org> -evolution-3.6.4.ebuild,
+  -evolution-3.8.4-r1.ebuild, -files/evolution-3.3.91-spamassassin-paths.patch,
+  -files/evolution-3.8.4-pop3-removal.patch:
+  Drop old
 
   30 Aug 2013; Gilles Dartiguelongue <eva@gentoo.org> evolution-3.6.4.ebuild,
   -evolution-3.8.4.ebuild, evolution-3.8.4-r1.ebuild, evolution-3.8.5.ebuild:
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index c130ece1c3d4..1c97b482df8a 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -8,23 +8,17 @@ AUX evolution-2.32.2-smime-fix.patch 2444 SHA256 3e5fae0d34cec92f01c1e66d5fdac85
 AUX evolution-2.32.3-g_thread_init.patch 2810 SHA256 2162851b365ceb0bf3f7963d21951156bd7dd58c875dbaf33b6714d1a3df1c68 SHA512 8b527b871e405f7541e1c67a4bd85f536b42f92874bb99268c4bec022d73f1e9238144893f37c48a640e719d8a31b578a743a3dd759d28ea5809d988b8482240 WHIRLPOOL 8eb7c0065f89817f20d987ba06b6e343743c105375646d9a15c10b76cde2a363b7b0f754382668a2698a47a6d44a575fd341367d773d5f94e47e19fba62b9b38
 AUX evolution-2.32.3-gmodule-explicit.patch 808 SHA256 92e12766bcbe6e9dc46720c93ece116c4abd28a15798eb976ad0deb96da6e29c SHA512 853bd8c1da4c36cd19ecb2fba289576dac2ed150d23e038af53579e64258e2d35b1f8fabf6b9cd7736d4a7835cd59cb0eab395da8c84bfb94826bd579b59a5ab WHIRLPOOL a662c1b0237fefeff2c93b7f048b8374d35e8447e0e3ae2a862097dddaef39f771eb5b611abf44670b7184e1b2078f5d04d26ea868772b53d9f63f1cc2cef4b5
 AUX evolution-2.32.3-libxml2-2.9.patch 1649 SHA256 1c9551df454b3fd824c8b9e1e0e0c6ef155d77b8b0a92a1f417aa219648363d8 SHA512 f9037337ada708a45820d08385989f55e115189fa779aad52b4a6e7358b480b855e803ea9b58f09304268267f6593838ba526f0653e549a06757140070be9a3f WHIRLPOOL 453e60c595ff4cfec59b7f3ccaddb77b625025f49946d17e561e5604c59cad056b9193345ef78957a113ea880cc3b894881446d68707b572029b82692722f1e0
-AUX evolution-3.3.91-spamassassin-paths.patch 2223 SHA256 9f2ea27193ff299dd130f562c5b9eb44ddf7825c357db11c72e49bf792f97680 SHA512 9878295882d80d8933fdd8456aed9bd03d118a20b2cff5f364b412337ecd8dd1c4788de5b84db5d35d1ba97097d54b137fc07740764ccc136b2ea7a68687a045 WHIRLPOOL aa6db1419a2516f885ef3bce64723ee03079eb8f3f4a1da35bfed0787ffebfbb37afa66dab534be6885e9759c513ab2e7c5d2729348b8c22d9410cd40de0d5b4
-AUX evolution-3.8.4-pop3-removal.patch 2337 SHA256 e352078e0c75930b8372401b5e87f866a775fdf5c2185af845d9caed5b122ac9 SHA512 fdca180ed552c9c2729bfa8d8cef2cb19c69026340e5f156baf4ff8254dee6484514946e8322ac6c3a3f37525d0c1305db33b23218345d1005ee45bd03d687ec WHIRLPOOL c2bdb1401dd471814fd9bc5e787ba67cfdc75bcca9d63f8541b7e68d316afaba46de95b44d7a89540e0830f76e592ce446be7a506ab3105cfe1477f1e6f112f0
 DIST evolution-2.32.3-patches.tar.xz 11784 SHA256 eadfcd9d1663206f1d15457358afa7901f095894d782d4043ffd762b242eded6 SHA512 f8514ffc5079ba91448277365fadcec3f4ec949fdef8a5eebd1d529aaa73736721c405088eea363bbf5fc9cac6f8799ed329b53c5369e6acf93ac16eb8d2e7ac WHIRLPOOL 1a9fb503c921705d58ab89aa24495cb85cbd00df8ff6f2fd1f79750213759ee4d4856efe5bf7bd927eff3e250b2c06c0aec448d69fc974bc17a47fb67a49f8bc
 DIST evolution-2.32.3.tar.bz2 31966138 SHA256 33ab38780e9abb71506230e331e9c3534444b5ed3f17046f0b6371a00df686fb SHA512 7241954f4e6ab87151e2c4af0bd33d5f428ab5e01f935aafbfaf50714a495fe01fe54c3f3c6498d514880bf1c5271d491a523d79b2928827490204b9eee4c0d3 WHIRLPOOL 982ca39ff6c02adbd168a8c82a164636eaf908e0e4905195d321187199339a8e9725fa91b7d8d95b3ff5d32a9b7faf0a4a9da8d651915b4d1581788f722fb8c9
-DIST evolution-3.6.4.tar.xz 12401324 SHA256 7bf7054d85b7d1bd0e62d69f15ef80dbe781f57359bf91e7c427cd93378ba4a1 SHA512 a7e162289ac7b29f748c3f3bb65b17b1362831131b5b5aed32f763259b6b54ba7d38d7a59f4df778384fbf2c90e2d4807299c0dc05f576df19ae6a9abf72e4e2 WHIRLPOOL bd86b79c45b8d01557999729b1dc12ab49e5791651c2ae885b30a0ef50a3e78670ca055eb0e242f8aa40f78c1edf8beab3f33a49d57532f0912c48cc58349123
-DIST evolution-3.8.4.tar.xz 12324844 SHA256 d5cfd0cb68ed8bf6e9515a5a44f566e3d26d3813a22ee6e5b0f86029039b1766 SHA512 3d074ad1678067a673ff715090b9543c4a108ff571d28c08e10936d4572648327dc1d6cd5d0eb10133202a589e407e8e9c535247921c699792899ceabeaa678b WHIRLPOOL 15cad220f5a130ff1a95c10492b07c3aec82f82c9f5948b9e8b8f8593496aa17e46bd505641d002a1611d16d2c575cb959c1776c91d7b9896cea536489251598
 DIST evolution-3.8.5.tar.xz 12325444 SHA256 26ef047425826a7672f0db7f3d4eef908e68bae47a9e0756883079c445e4326d SHA512 d0b12f587a210754f108db7f1e43e2d8be8e7c0c5dd5a708ccae66989c1043501a7d5be3cbb9ef283a95c430fa06ee957fbf30c8e941bb0fa414cbc4e46d7606 WHIRLPOOL f25ce768fede4acd2f65e4ff32490eb70634056314a52edc13ceca38c6a83b1f0ae5d11b66c79e61562794e5ee2a61f071ce42b6e9a2b218fc57f8a7c1bb129d
 EBUILD evolution-2.32.3-r1.ebuild 6164 SHA256 eccfbb24f84fdee7528af0973e475f92e7049b85e59bfbbcc4e58b67747e8e49 SHA512 4f84b8ab0e6188a4162199d7ed1e319702f2831cb1907452d7d02b82e5eaf19f439d99e39f05852ff81ffcdd75b6da5036c04e3d177afd45bdb475ad4ec5de33 WHIRLPOOL 95416087ca1f2677f145d2bbabfb2c6d4d7a0497d03d0fa76aa7a1d5abadb0136d796a7c6c5048745c4fb33448dea5fd744b8eda22a0a7e2b99c5076a0c5401c
-EBUILD evolution-3.6.4.ebuild 4769 SHA256 8f4d81f1a149aa406a500051e7fc908325be4e3c46a58c0b7e9931b928883208 SHA512 83c9e9e3892becae4cd811baf47883a114f30f1fa8691e97c9ee6417992dfa8b4fb9fd0c14ccad8a2b6d513a123f90cffa35dee4d38ff1ed1a0e807e4492f68d WHIRLPOOL d94c9afef1d9eb41c97ea71c34ca195702669200b0b1b9ad425f14263ec04ca4702380e4d6bc9045f442f9bf35ff327148192fba77c0db6e30d5163a084ccd67
-EBUILD evolution-3.8.4-r1.ebuild 4569 SHA256 c051774dfd876777197c00f97a3e9c2e0b1c6eb01f47010e151b104aa5251b06 SHA512 63b80902c04042f277f01df0d20a885f70f8949b069ffe37efdd015bdaaadab7bdaa60d5a9c598fdd2ae526c4c11ca5834d84bf67fd98de27ae1645b8de74b6f WHIRLPOOL 72b20fbb0136570508a8af2230601eccc0b7f19832798db4e5330d6e2a6ebf5d1b9dfa8bdbd5433d55bc4a0c70695ab535fa61a137d7798bb394d43784882965
 EBUILD evolution-3.8.5.ebuild 4444 SHA256 13f5f0d15057a51667ef357b50b1bc5fd80a08e8d1b02d3155df5305bf6df95a SHA512 405e41a99a68011b69d74a1c8acc4a42b2e84410c7edd7ae76b0a2d2468768b2071e7bedf23d09f66b74bc33c1921d1caceb31efc11f8a21cc0c40dcc3d1aa1d WHIRLPOOL 14338697a5609fbbfe46bfdff9b670eb852d143767b625ea3109b07ff5bdd803d1a9395a495aaacc81535f0d60e9acfeff95e8fc1458cf24c226b91ba19542ee
-MISC ChangeLog 89761 SHA256 53607d700203ab90bbd4931608726096db489fd778f53444aa5dd0c6aeff5023 SHA512 6237428f498bc32328ccbd8726bf260cd6ffc56cc7d9d0c4e8d7d3c333c94d25e0da08ef3bf77b294b2471fbf6a122b93e881e297ee25c8b390a6aa7d1085eed WHIRLPOOL fff8d3d8725561fcf6c748fea2692ac616b102c720449fd9d2bb4d7574d2dad3ccd686cca446aded775d9d92a996833f29fbe36d596ee9ff747596ccc729e993
+MISC ChangeLog 89971 SHA256 6500c32d0e84f3692569864991b4e154aab7f7389ad264e4057588059f2cc11c SHA512 c1e5a6a166bea2016e06c5b8019807b91e2adff26eb60001b4f88be6aeb8c1431628d26fae803f8cf166e699a391581c4c09ddcaa12e861c33f98bd5a14dc443 WHIRLPOOL 4e206c224c47a543b418364d0e2a9e6cfff62bbacaf1e8224376b9ae51a0708697e55ef9443b0f1e54e7623915b343ced6bf764e7e4b6df7b985aa051dce30bf
 MISC metadata.xml 1273 SHA256 57d501a14b07828c2c839e5fe5c97f7bcf765e507b2d1a264c104eab4819215f SHA512 856175453a5f7c376c687ed229ff0dcc9c2dd840d3b6f5c1617f58d227fdfeabe944dcc8229d2fc1fa32f698337368fe1d3e76fe6d7c841d4fe68a5afbe8db8c WHIRLPOOL ef128b4d25b0e2b02cfd76105409e60ca2fa0ca89ccf1c08f088e202dcc1b780452b70c6e7e5363b8157eef39785285945c796de99a09d4547c5a13ba7d9c36d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIhIW0ACgkQ1fmVwcYIWAb33wCfcUfvBSKNV6TeQR6uk0SWRm6i
-I98AoNtgRYPkyjOE/1WONvcHWZ3QQv+K
-=U3x5
+iEYEAREIAAYFAlKKc08ACgkQCaWpQKGI+9TiNQCeOy3ABlLvsseDEdOIS/eZdDHS
+Oy4AnRsVQ7X8BM9YNMW8usqPExwvOjCl
+=/SHT
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-3.6.4.ebuild b/mail-client/evolution/evolution-3.6.4.ebuild
deleted file mode 100644
index 7c84fb118837..000000000000
--- a/mail-client/evolution/evolution-3.6.4.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.6.4.ebuild,v 1.4 2013/08/30 22:49:16 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic gnome2 versionator
-
-MY_MAJORV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-IUSE="crypt +gnome-online-accounts gstreamer kerberos ldap map ssl +weather"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gtk+-3.4.0:3
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=x11-libs/libnotify-0.7:=
-	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather?]
-	=gnome-extra/evolution-data-server-${MY_MAJORV}*
-	>=gnome-extra/gtkhtml-4.5.2:4.0
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.6
-	>=dev-libs/libxml2-2.7.3:2
-	>=net-libs/libsoup-gnome-2.38.1:2.4
-	>=x11-misc/shared-mime-info-0.22
-	>=x11-themes/gnome-icon-theme-2.30.2.1
-	>=dev-libs/libgdata-0.10:=
-	>=net-libs/webkit-gtk-1.8.0:3
-	!=net-libs/webkit-gtk-1.9.90:3
-
-	x11-libs/libSM
-	x11-libs/libICE
-
-	map? (
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		x11-libs/mx:1.0 )
-	crypt? ( || (
-		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
-		=app-crypt/gnupg-1.4* ) )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	map? (
-		>=app-misc/geoclue-0.12.0
-		>=media-libs/libchamplain-0.12:0.12 )
-	ssl? (
-		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.5.0:2= )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-
-	app-text/yelp-tools
-	>=gnome-base/gnome-common-2.12"
-# eautoreconf needs:
-#	app-text/yelp-tools
-#	>=gnome-base/gnome-common-2.12
-RDEPEND="${COMMON_DEPEND}
-	app-text/highlight
-	!<gnome-extra/evolution-exchange-2.32"
-
-src_prepare() {
-	ELTCONF="--reverse-deps"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-
-	# Fix paths for Gentoo spamassassin executables
-	epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
-
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
-		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"
-
-	gnome2_src_prepare
-
-	# Fix compilation flags crazyness
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "CPPFLAGS sed failed"
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
-	gnome2_src_configure \
-		--disable-schemas-compile \
-		--without-glade-catalog \
-		--without-kde-applnk-path \
-		--disable-image-inline \
-		--disable-pst-import \
-		--enable-canberra \
-		$(use_enable ssl nss) \
-		$(use_enable ssl smime) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable gstreamer audio-inline) \
-		$(use_enable map contact-maps) \
-		$(use_with ldap openldap) \
-		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
-		$(usex ssl --enable-nss=yes "--without-nspr-libs
-			--without-nspr-includes
-			--without-nss-libs
-			--without-nss-includes") \
-		$(use_enable weather) \
-		ITSTOOL=$(type -P true)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "To change the default browser if you are not using GNOME, edit"
-	elog "~/.local/share/applications/mimeapps.list so it includes the"
-	elog "following content:"
-	elog ""
-	elog "[Default Applications]"
-	elog "x-scheme-handler/http=firefox.desktop"
-	elog "x-scheme-handler/https=firefox.desktop"
-	elog ""
-	elog "(replace firefox.desktop with the name of the appropriate .desktop"
-	elog "file from /usr/share/applications if you use a different browser)."
-	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-3.8.4-r1.ebuild b/mail-client/evolution/evolution-3.8.4-r1.ebuild
deleted file mode 100644
index fdd24d22cfd7..000000000000
--- a/mail-client/evolution/evolution-3.8.4-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.8.4-r1.ebuild,v 1.3 2013/08/30 22:49:16 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic readme.gentoo gnome2 #autotools
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://live.gnome.org/Evolution http://projects.gnome.org/evolution/"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-IUSE="+bogofilter crypt +gnome-online-accounts gstreamer highlight kerberos ldap map spamassassin ssl +weather"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-COMMON_DEPEND="
-	>=dev-libs/glib-2.34:2
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gtk+-3.4.0:3
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=x11-libs/libnotify-0.7:=
-	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather?]
-	>=gnome-extra/gtkhtml-4.5.2:4.0
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.6
-	>=dev-libs/libxml2-2.7.3:2
-	>=net-libs/libsoup-gnome-2.40.3:2.4
-	>=x11-misc/shared-mime-info-0.22
-	>=x11-themes/gnome-icon-theme-2.30.2.1
-	>=dev-libs/libgdata-0.10:=
-	>=net-libs/webkit-gtk-1.10.0:3
-
-	x11-libs/libSM
-	x11-libs/libICE
-
-	crypt? ( || (
-		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
-		=app-crypt/gnupg-1.4* ) )
-	map? (
-		>=app-misc/geoclue-0.12.0
-		>=media-libs/libchamplain-0.12:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		~sci-geosciences/geocode-glib-0.99.0
-		x11-libs/mx:1.0 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	ssl? (
-		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.5.0:2= )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#	app-text/yelp-tools
-#	>=gnome-base/gnome-common-2.12
-RDEPEND="${COMMON_DEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	highlight? ( app-text/highlight )
-	spamassassin? ( mail-filter/spamassassin )
-	!gnome-extra/evolution-exchange
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-src_prepare() {
-	# Reason?
-	ELTCONF="--reverse-deps"
-
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-
-	# Old POP3 mails can be removed before getting them, upstream bug #705446
-	epatch "${FILESDIR}/${P}-pop3-removal.patch"
-
-	#eautoreconf # See https://bugzilla.gnome.org/701904
-
-	gnome2_src_prepare
-
-	# Fix compilation flags crazyness
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "CPPFLAGS sed failed"
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
-	gnome2_src_configure \
-		--without-glade-catalog \
-		--disable-image-inline \
-		--disable-pst-import \
-		--enable-canberra \
-		$(use_enable bogofilter) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable gstreamer audio-inline) \
-		$(use_enable highlight text-highlight) \
-		$(use_enable map contact-maps) \
-		$(use_enable spamassassin) \
-		$(use_enable ssl nss) \
-		$(use_enable ssl smime) \
-		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
-		$(use_with ldap openldap) \
-		$(usex ssl --enable-nss=yes "--without-nspr-libs
-			--without-nspr-includes
-			--without-nss-libs
-			--without-nss-includes") \
-		$(use_enable weather) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.patch b/mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.patch
deleted file mode 100644
index 3078fb9eebd7..000000000000
--- a/mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2f4ddb9f4d4262afbf8f60dd601a639ae33e05c6 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 16 Mar 2012 01:56:14 -0400
-Subject: [PATCH] Use correct Gentoo paths for spamassassin executables
-
----
- ...org.gnome.evolution.spamassassin.gschema.xml.in |    4 ++--
- modules/spamassassin/evolution-spamassassin.c      |    8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/data/org.gnome.evolution.spamassassin.gschema.xml.in b/data/org.gnome.evolution.spamassassin.gschema.xml.in
-index 85d43d4..07fabd3 100644
---- a/data/org.gnome.evolution.spamassassin.gschema.xml.in
-+++ b/data/org.gnome.evolution.spamassassin.gschema.xml.in
-@@ -16,12 +16,12 @@
-       <_description>Use SpamAssassin daemon and client (spamc/spamd).</_description>
-     </key>
-     <key name="spamc-binary" type="s">
--      <default>'/usr/bin/spamc'</default>
-+      <default>'@EPREFIX@/usr/bin/spamc'</default>
-       <_summary>SpamAssassin client binary</_summary>
-       <_description>SpamAssassin client binary</_description>
-     </key>
-     <key name="spamd-binary" type="s">
--      <default>'/usr/bin/spamd'</default>
-+      <default>'@EPREFIX@/usr/sbin/spamd'</default>
-       <_summary>SpamAssassin daemon binary</_summary>
-       <_description>SpamAssassin daemon binary</_description>
-     </key>
-diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c
-index 7f595ca..a92e02d 100644
---- a/modules/spamassassin/evolution-spamassassin.c
-+++ b/modules/spamassassin/evolution-spamassassin.c
-@@ -35,19 +35,19 @@
- 	((obj), E_TYPE_SPAM_ASSASSIN, ESpamAssassin))
- 
- #ifndef SPAMASSASSIN_BINARY
--#define SPAMASSASSIN_BINARY "/usr/bin/spamassassin"
-+#define SPAMASSASSIN_BINARY "@EPREFIX@/usr/bin/spamassassin"
- #endif
- 
- #ifndef SA_LEARN_BINARY
--#define SA_LEARN_BINARY "/usr/bin/sa-learn"
-+#define SA_LEARN_BINARY "@EPREFIX@/usr/bin/sa-learn"
- #endif
- 
- #ifndef SPAMC_BINARY
--#define SPAMC_BINARY "/usr/bin/spamc"
-+#define SPAMC_BINARY "@EPREFIX@/usr/bin/spamc"
- #endif
- 
- #ifndef SPAMD_BINARY
--#define SPAMD_BINARY "/usr/bin/spamd"
-+#define SPAMD_BINARY "@EPREFIX@/usr/sbin/spamd"
- #endif
- 
- /* For starting our own daemon. */
--- 
-1.7.8.5
-
diff --git a/mail-client/evolution/files/evolution-3.8.4-pop3-removal.patch b/mail-client/evolution/files/evolution-3.8.4-pop3-removal.patch
deleted file mode 100644
index 052f1d5b7f4a..000000000000
--- a/mail-client/evolution/files/evolution-3.8.4-pop3-removal.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 8b8ddbd16eeb3217a7a15b59e8f966b61d989977 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 08 Aug 2013 05:48:49 +0000
-Subject: Bug #705446 - Old POP3 mails can be removed before getting them
-
----
-diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
-index dccd001..643b82c 100644
---- a/libemail-engine/mail-ops.c
-+++ b/libemail-engine/mail-ops.c
-@@ -348,7 +348,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
- 			g_object_ref (fm->destination);
- 		}
- 
--		if (!local_error) {
-+		if (!local_error && !g_cancellable_is_cancelled (cancellable)) {
- 			folder_uids = camel_folder_get_uids (folder);
- 			cache_uids = camel_uid_cache_get_new_uids (cache, folder_uids);
- 
-@@ -373,11 +373,26 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
- 					g_cancellable_reset (m->cancellable);
- 
- 				if (!success) {
-+					GPtrArray *uncached_uids;
-+					GHashTable *uncached_hash;
-+
-+					uncached_uids = camel_folder_get_uncached_uids (folder, cache_uids, NULL);
-+					uncached_hash = g_hash_table_new (g_str_hash, g_str_equal);
-+
-+					for (i = 0; uncached_uids && i < uncached_uids->len; i++) {
-+						g_hash_table_insert (uncached_hash, uncached_uids->pdata[i], uncached_uids->pdata[i]);
-+					}
-+
- 					/* re-enter known UIDs, thus they are not
- 					 * re-fetched next time */
- 					for (i = 0; i < cache_uids->len; i++) {
--						camel_uid_cache_save_uid (cache, cache_uids->pdata[i]);
-+						/* skip uncached UIDs */
-+						if (!g_hash_table_lookup (uncached_hash, cache_uids->pdata[i]))
-+							camel_uid_cache_save_uid (cache, cache_uids->pdata[i]);
- 					}
-+
-+					g_hash_table_destroy (uncached_hash);
-+					camel_folder_free_uids (folder, uncached_uids);
- 				}
- 
- 				/* save the cache of uids that we've just downloaded */
-@@ -433,9 +448,18 @@ exit:
- 
- 	/* also disconnect if not a local delivery mbox;
- 	 * there is no need to keep the connection alive forever */
--	if (!is_local_delivery)
-+	if (!is_local_delivery) {
-+		gboolean was_cancelled;
-+
-+		was_cancelled = g_cancellable_is_cancelled (cancellable);
-+
-+		/* pity, but otherwise it doesn't disconnect */
-+		if (was_cancelled)
-+			g_cancellable_reset (cancellable);
-+
- 		camel_service_disconnect_sync (
--			service, TRUE, cancellable, NULL);
-+			service, !was_cancelled, cancellable, NULL);
-+	}
- 
- 	g_object_unref (session);
- }
---
-cgit v0.9.2