Version bump, drop old

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

7 files changed, 22 insertions, 364 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index f32fa5a7335d..d3d9451d6bad 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.428 2014/07/23 15:18:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.429 2014/09/24 13:25:05 pacho Exp $
+
+*evolution-3.12.6 (24 Sep 2014)
+
+  24 Sep 2014; Pacho Ramos <pacho@gentoo.org> +evolution-3.12.6.ebuild,
+  -evolution-3.10.4-r1.ebuild, -evolution-3.12.3-r1.ebuild,
+  -files/evolution-3.10.4-imap-crash.patch,
+  -files/evolution-3.10.4-main-ui.patch,
+  -files/evolution-3.10.4-nntp-outbox.patch:
+  Version bump, drop old
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> evolution-3.12.4.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 5986dde89524..f6edda50c0cd 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -8,34 +8,19 @@ 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.10.4-imap-crash.patch 1240 SHA256 c1753fda7e4e6b2c52d6e0297388dd06167d4bcdf807c5076927a6da1a91c0e5 SHA512 c6fd41fcca214c2e1261aeb70283449119f8ec9a9d349fcfc6a37d67d74b50b5e60c141d8a97d90586c7b9db70cea15280bbef2f38e2ccb6c65e4270fc2f9cb1 WHIRLPOOL 42f356f9f63c964ec8721cff8610e2a08fa81af7482ecb5fda1f201517c1362fe2c84abd574f2218e632bcb1020a388e45a37577ddf8f740d7a549572afcf102
-AUX evolution-3.10.4-main-ui.patch 2617 SHA256 f6f4582fe4765cdd51991fabbc9360d789747fc136ad3068b65d3b66830d5dc0 SHA512 52b067b02691d7214b87c88b1346b19f92a049c546041f69b98b2e9f00f7dca996bfce136bbab6189d209b4a0446f046a99c5bc28369366e9d8cc5db0994001f WHIRLPOOL 44666e6f12b1798068423a57ef7b5577f68f6fe1215537248b99fcf844cb89b3095983ff46c0c078325b4d636852533fb945dd82683b1e782d21fb2f5df4bf68
-AUX evolution-3.10.4-nntp-outbox.patch 2627 SHA256 24a1912151a391d817d26e7b21dc716eb16028ca7759e85255d5faed3e13909f SHA512 51f4c802cd92bc1d6a55c5561993c28a85e366a2f30e17f2c6787d99f66e893711c540242eb29fc7f820a60ea05946e2197d42c4d5a543672f0da780f8db3e0c WHIRLPOOL 776dfbe1bd5ab24c66de051ee12cf0e3293d78765362313fd4b8b3b726a6d3f421d23e0f3944569f7cb3259558711b491f9eb5d81df9cbce0d07f973f7151af9
 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.10.4.tar.xz 12351064 SHA256 ac60557f264f211e6a7bc0ced919041c154e4c7b9c79600516aee7acc1d03e40 SHA512 8f0004cf02c5dc161c0ba6c8da9e5c33c3284eda34d922ff59b1ff79ccdb8e96641065ebfa608df028f305187a9777e93e9736cf63f60e52d359dae316817659 WHIRLPOOL 07611ec335e9553825b34cc2970553ca0b0e9e494b4399cdbe1d45eb326894a703081f82a0e4a6f6ae3103f6f46d57fadef967d4dda0c1da7866bd4bf17652d3
-DIST evolution-3.12.3.tar.xz 12123820 SHA256 980988cf3d1f537102f4a3143a2c251ac812666b8f0936afd6bdde0fe5a96fea SHA512 8db318a469d732380f0020d9bb99e21c1b8eda61584a83cd7c602c7f41643a49f951dfdc5c5cceb41f7842d7b209ac0eab3cb4401a2fdec0c903cbb4ecf0e01c WHIRLPOOL 54bf983d19a3efe21a07b3bc3a49821cc9c5e1daf54378220be7d44f7badd6fe870a11d1651240fd480cde04535a0c59086720920478285a3d20ab697581428c
 DIST evolution-3.12.4.tar.xz 12135060 SHA256 4e52f46038a859179a2a20c13d2bf9ad6ea240f03ec9e54661f813b0582905a2 SHA512 1fd7479560a25d3b239457c18622ca0d9f1dac383aa51799abe77aac65fcc2812a4bdb21223b04da1554ec4255da833b3ff68cfce8990ed3363e432df649d59a WHIRLPOOL 1210e19a2d345d1361f89c9166751ccd5af503774eee2a313db94767cc6be55fcb816a87cd8926294cd855d6826ec464f25e59ec02f7f91b25cbee273d2fff87
+DIST evolution-3.12.6.tar.xz 11334980 SHA256 5f17a564a3c0351c1d0823551f80579ef611d51ab9db1e7f8d2ad7ed126bf76d SHA512 0f66157fdb3874291541e554c34fecb5c163fb7ba6fa64ad312fb8e642c364bbcbda7044804236eeac76b3b166933b971dac653811c492df6f9bfe3df21d108a WHIRLPOOL de1bda3da5657fac45f148da2283a44780880f82812931d9d493f195120a6f39ea53971cd460216619a431dd85c82cb001fe93dd2583ff1ddf8c9ec9267388b9
 EBUILD evolution-2.32.3-r1.ebuild 6164 SHA256 eccfbb24f84fdee7528af0973e475f92e7049b85e59bfbbcc4e58b67747e8e49 SHA512 4f84b8ab0e6188a4162199d7ed1e319702f2831cb1907452d7d02b82e5eaf19f439d99e39f05852ff81ffcdd75b6da5036c04e3d177afd45bdb475ad4ec5de33 WHIRLPOOL 95416087ca1f2677f145d2bbabfb2c6d4d7a0497d03d0fa76aa7a1d5abadb0136d796a7c6c5048745c4fb33448dea5fd744b8eda22a0a7e2b99c5076a0c5401c
-EBUILD evolution-3.10.4-r1.ebuild 4603 SHA256 5702ee191c8231dd55851e75ebe315f52c121aa2e2c4be80ffadfaddf6bc9aa0 SHA512 756becbfa5c9341df202ac7f3f6a489a44dfc036fb9bc61e0382ae489006dcf27eb062cbcda03ecb8ade8a3c111a692180d66fe5f5ba34fb4ada32ddabd33e4a WHIRLPOOL ddcf1ecfa03010e1e68b4c66a4d71993c97c3f9095df05657f5b6ab1e95eafdaaa7825383ae2d879e82a2dbeafc13f550df5607631e7953166be6f2fcf0f912b
-EBUILD evolution-3.12.3-r1.ebuild 4433 SHA256 526bc252a20f6232bb56096096ed5ff2fd1a67224ab01928518e1379581bff60 SHA512 2fbe626d75eb088d1fa2d2d8d701d93e9a4cf4e3795f325db316d00b63a5ffb075a9408f3b9e4c27b21dc86cde6f22e9d157752e78742d34602ba6e7d214cbfc WHIRLPOOL 2ca2cb91f5aee843e97241ef0b51d3d7cdd09b6e42dbaddae6a76ac35d435e60693f5a917135f38db10820dd45776936117fb3bdcfe0b4f3ee1e141a635ef5ec
 EBUILD evolution-3.12.4.ebuild 4453 SHA256 cb5b2f5b25dff618d43dc0f7498f2e8b8b161036d7a382952568f206608745fd SHA512 12a008f043c3d8e26473726467a5055f55d4e8440704d2105527f7ae8439ff7623de9a5ae07767e16e893409e4f590ca3011f2be5663690179d20b8b9e899e57 WHIRLPOOL 54319617b0651fc8037f9645698bdca5d11e82d29e6cfbc3197c0099f8941392577cb947e926c5251fddc9af3a5fdb4e470b9b1892897c0ec61b9db2b801a8fd
-MISC ChangeLog 92849 SHA256 c315c6f4e9caa73c8457a28e52f7466ff54df5fdb9dc287affc8519c03f1b49c SHA512 2c83793384e8311de9ef4fea85e6a8af8f5e827a79ffed3ca51613d48edf8b437f2321a4e485cc7303b663c8caaf445afccd231510dbccb4e0cee6f08d00b235 WHIRLPOOL 02ee42b881f49b5141b780710792470715dd304991e4534a1d967f8be547da827822abf58efe337c5b87515e8fbc010474bb3636b5ef428581b0d431120d6d2b
+EBUILD evolution-3.12.6.ebuild 4612 SHA256 01819fab3ec6eb4f1dfe96f87bc1bd533780c7b4f9eedf16022ade34f122aa75 SHA512 16e7b1a7ea9f7b6e5c3a07e876d04974faeef89df9282fda954c18fa692df71b6e2d93c47262bd8b4b29554b7aca0bd1b4d913df6ca6ab4593f0c8449882e023 WHIRLPOOL 20d5d9d5f0a68076f65fdbff8d021957ff980f3c82db599ac1f4c7097e6d409b172cf11196275020b91ddd5ea10f894957da2f4acc21412c446e726460ca0552
+MISC ChangeLog 93172 SHA256 519140941c6c86a8d49b2ac7b35f7c9aff97783746ad81bef2579accb4428450 SHA512 a1f49ba52b584b80196890ebca1fa8f1e491bbf668d4886d6f3e815878c706093272e00a4911551d20f1b8b68adaa0dd0a917b53418bad6095a133f5fa96e174 WHIRLPOOL 706443f90cef3aad74c372e7614de8a5e13cdee6c644db5afdfad72a6ab4da6b900dbffdfe362a8f0d9af63cb6649fada8491694c7badf5c3de52e9c25a5e191
 MISC metadata.xml 1153 SHA256 afcc365511132cc5c54957c0700e3ff9525c920cdf0f8cbddd304351494ca6a3 SHA512 dcd0d5d8eab6ca1e478f6a5ad7d2d41dc6717370ed895d7eff313d69486f77c92a0f94a912908bb23e59f82998fd528d456d6e7649338061bba4a6c451de3167 WHIRLPOOL c7347b0bab5e6d0338a5fda7f7e8f1787e7b07b36d31231180b8034dbdc36fe05428fc782dac9cff638632e879ba138b74c2dc37eb543e7149740bfab1d73707
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9JWAAoJELp701BxlEWfZF0P/jswTXqtvi6xZaCT8KlHArKv
-htrbBT2kL2cNOGE2Ow3tXekKNybP6IdpzNaTcqKnjU87GT/Mk3Rg6fNbeRcHq9ai
-CIJ21+Wrl62paTkElat/flAl0JEciR8fAsPu/SfKqI30oCNKNGKuQnfINTVLZuRT
-z9BJClrzkQVXEpAza4J7WBXvRydkOGbAMkPwmc4P9f2NZhWgkLQgW8NzLX+ovCT6
-y95b9E70Eofp7maAn+qKJDhZ8i2n8sKUt3XNSBIuHtyDnAGj0P5JeMcKFFm65ZQJ
-BbbKaOvw3HUojqDwzk1VdG2WJjJcHnbI4ncFAwtQKwQ3AyueI6jxxA8IHIQ06yRU
-wk4QhFXE0GMYVgIAzr2h+PbKdl5K2vFwVkTxv+d+YxaOM0H72Qp3FIu0HvCWhdwu
-qs7WGWnC1A4fYR2UoXhe9q5Xk81B13nMes5UPBjVAtrGuMwAMRViq+APeLtuXZAt
-m675ssPDoDD2DotvqqCx6K+uC8uuK2Qjcqup62ohtkgEdSM5c4jfp7jkczIBy5QL
-cvchjRTGbvpblJqaKWPmg7i1DZfOsBX0inWUGtbi0y2Lvi71NGCltrqXxwY4997Z
-FVQf1DTaJLIRHspFDmJ5DYUQHVgYi+TQ+72sg/v5AQgvQE1/G4dttJj8429k3OsB
-hQGkh4XN4eyz7y51c1cP
-=O0OA
+iEYEAREIAAYFAlQixjIACgkQCaWpQKGI+9S3hgCfSqViDO3ZC43wM/+15qbAhKA+
+7HsAn0IRPlQucdPkQNu9UTu7DvV6cSDh
+=xYyT
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-3.10.4-r1.ebuild b/mail-client/evolution/evolution-3.10.4-r1.ebuild
deleted file mode 100644
index 1dd21062d00b..000000000000
--- a/mail-client/evolution/evolution-3.10.4-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.10.4-r1.ebuild,v 1.3 2014/03/18 21:53:03 pacho 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://wiki.gnome.org/Apps/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 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
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=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}:=[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-2.0.1: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: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-3.10.0
-		x11-libs/mx:1.0 )
-	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.8: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"
-
-	# Run EMailFormatter in the main/UI thread (from 3.8 branch)
-	epatch "${FILESDIR}/${P}-main-ui.patch"
-
-	# NNTP Messages are silently dropped from Outbox (from 3.8 branch)
-	epatch "${FILESDIR}/${P}-nntp-outbox.patch"
-
-	# Crash creating a new folder (from 3.8 branch)
-	epatch "${FILESDIR}/${P}-imap-crash.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 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/evolution-3.12.3-r1.ebuild b/mail-client/evolution/evolution-3.12.6.ebuild
index 9df5e9ba2284..0f0ce5a62337 100644
--- a/mail-client/evolution/evolution-3.12.3-r1.ebuild
+++ b/mail-client/evolution/evolution-3.12.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.12.3-r1.ebuild,v 1.2 2014/06/30 09:50:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.12.6.ebuild,v 1.1 2014/09/24 13:25:05 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -23,6 +23,8 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
+# FIXME: You need to have gnome-icon-theme or adwaita-icon-theme installed
+# (last one not yet in the tree)
 COMMON_DEPEND="
 	>=app-crypt/gcr-3.4
 	>=dev-libs/glib-2.36:2
@@ -93,14 +95,14 @@ x-scheme-handler/https=firefox.desktop
 file from /usr/share/applications if you use a different browser)."
 
 src_prepare() {
-	# Reason?
+	# Fix relink issues in src_install
 	ELTCONF="--reverse-deps"
 
 	#eautoreconf # See https://bugzilla.gnome.org/701904
 
 	gnome2_src_prepare
 
-	# Fix compilation flags crazyness
+	# Fix compilation flags crazyness, upstream bug #653157
 	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
 		-i configure || die "CPPFLAGS sed failed"
 }
@@ -113,6 +115,7 @@ src_configure() {
 		--disable-image-inline \
 		--disable-pst-import \
 		--enable-canberra \
+		--enable-gnome-desktop \
 		$(use_enable bogofilter) \
 		$(use_enable highlight text-highlight) \
 		$(use_enable map contact-maps) \
diff --git a/mail-client/evolution/files/evolution-3.10.4-imap-crash.patch b/mail-client/evolution/files/evolution-3.10.4-imap-crash.patch
deleted file mode 100644
index 4d9d59961a68..000000000000
--- a/mail-client/evolution/files/evolution-3.10.4-imap-crash.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5e4b28e2fae285fa632ab189707489e0df8d79aa Mon Sep 17 00:00:00 2001
-From: Fabiano Fidêncio <fidencio@redhat.com>
-Date: Tue, 21 Jan 2014 14:48:54 +0000
-Subject: Bug #722698 - Crash creating a new folder
-
----
-diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
-index b15041a..cd7f67e 100644
---- a/mail/em-folder-tree.c
-+++ b/mail/em-folder-tree.c
-@@ -1108,15 +1108,27 @@ folder_tree_dispose (GObject *object)
- {
- 	EMFolderTreePrivate *priv;
- 	GtkTreeModel *model;
-+	GtkTreeSelection *selection;
- 
- 	priv = EM_FOLDER_TREE_GET_PRIVATE (object);
- 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (object));
-+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (object));
- 
- 	if (priv->loaded_row_id != 0) {
- 		g_signal_handler_disconnect (model, priv->loaded_row_id);
- 		priv->loaded_row_id = 0;
- 	}
- 
-+	if (priv->loading_row_id != 0) {
-+		g_signal_handler_disconnect (model, priv->loading_row_id);
-+		priv->loading_row_id = 0;
-+	}
-+
-+	if (priv->selection_changed_handler_id != 0) {
-+		g_signal_handler_disconnect (selection, priv->selection_changed_handler_id);
-+		priv->selection_changed_handler_id = 0;
-+	}
-+
- 	if (priv->autoscroll_id != 0) {
- 		g_source_remove (priv->autoscroll_id);
- 		priv->autoscroll_id = 0;
---
-cgit v0.9.2
diff --git a/mail-client/evolution/files/evolution-3.10.4-main-ui.patch b/mail-client/evolution/files/evolution-3.10.4-main-ui.patch
deleted file mode 100644
index 086fdad0b50e..000000000000
--- a/mail-client/evolution/files/evolution-3.10.4-main-ui.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 37a95e0e6b74fa9fe1692c788983142d8d4774d4 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 10 Feb 2014 14:59:24 +0000
-Subject: Bug #724023 - Run EMailFormatter in the main/UI thread
-
-Any GtkWidget creation or manipulation should be done exclusively
-from the main/UI thread, thus make sure it is done that way.
-Of course, evolution can freeze for a little time (depends on the message
-size), until its formatting is done. It's unnoticeable with usual messages.
----
-diff --git a/em-format/e-mail-part-attachment-bar.c b/em-format/e-mail-part-attachment-bar.c
-index 5cebd9b..57f49be 100644
---- a/em-format/e-mail-part-attachment-bar.c
-+++ b/em-format/e-mail-part-attachment-bar.c
-@@ -60,12 +60,7 @@ e_mail_part_attachment_bar_class_init (EMailPartAttachmentBarClass *class)
- static void
- e_mail_part_attachment_bar_init (EMailPartAttachmentBar *part)
- {
--	GtkTreeModel *tree_model;
--
- 	part->priv = E_MAIL_PART_ATTACHMENT_BAR_GET_PRIVATE (part);
--
--	tree_model = e_attachment_store_new ();
--	part->priv->store = E_ATTACHMENT_STORE (tree_model);
- }
- 
- EMailPart *
-@@ -84,6 +79,18 @@ e_mail_part_attachment_bar_get_store (EMailPartAttachmentBar *part)
- {
- 	g_return_val_if_fail (E_IS_MAIL_PART_ATTACHMENT_BAR (part), NULL);
- 
-+	if (!part->priv->store) {
-+		GtkTreeModel *tree_model;
-+
-+		/* Create the store only on demand. The EMailParser runs in a dedicated
-+		   thread, but the EAttachmentStore is a GtkWidget descendant, which should
-+		   be manipulated only from the main/UI thread, thus postpone its creating
-+		   until it's really needed, which might be during the EMailFormatter run,
-+		   which runs from the main/UI thread. */
-+		tree_model = e_attachment_store_new ();
-+		part->priv->store = E_ATTACHMENT_STORE (tree_model);
-+	}
-+
- 	return part->priv->store;
- }
- 
-diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c
-index bfbedc3..615bce3 100644
---- a/mail/e-mail-request.c
-+++ b/mail/e-mail-request.c
-@@ -365,9 +365,12 @@ mail_request_send_async (SoupRequest *request,
- 			simple, handle_contact_photo_request,
- 			G_PRIORITY_DEFAULT, cancellable);
- 	} else {
--		g_simple_async_result_run_in_thread (
--			simple, handle_mail_request,
--			G_PRIORITY_DEFAULT, cancellable);
-+		/* Process e-mail mail requests in this thread, which should be
-+		   the main/UI thread, because any EMailFormatter can create
-+		   GtkWidget-s, or manipulate with them, which should be always
-+		   done in the main/UI thread. */
-+		handle_mail_request (simple, G_OBJECT (request), cancellable);
-+		g_simple_async_result_complete_in_idle (simple);
- 	}
- 
- 	g_object_unref (simple);
---
-cgit v0.9.2
diff --git a/mail-client/evolution/files/evolution-3.10.4-nntp-outbox.patch b/mail-client/evolution/files/evolution-3.10.4-nntp-outbox.patch
deleted file mode 100644
index 574591e098f8..000000000000
--- a/mail-client/evolution/files/evolution-3.10.4-nntp-outbox.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 9de8f573e9eba07a096c7f97f97bb5ac876278c8 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 10 Feb 2014 16:57:28 +0000
-Subject: Bug #722041 - NNTP Messages are silently dropped from Outbox
-
----
-diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
-index 4f3dbd3..4db5dae 100644
---- a/libemail-engine/mail-ops.c
-+++ b/libemail-engine/mail-ops.c
-@@ -682,22 +682,18 @@ mail_send_message (struct _send_queue_msg *m,
- 	info = camel_message_info_new (NULL);
- 	camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN, ~0);
- 
--	for (header = xev; header; header = header->next) {
-+	for (header = xev; header && !local_error; header = header->next) {
- 		gchar *uri;
- 
- 		if (strcmp (header->name, "X-Evolution-PostTo") != 0)
- 			continue;
- 
--		/* TODO: don't lose errors */
--
- 		uri = g_strstrip (g_strdup (header->value));
--		/* FIXME Not passing a GCancellable or GError here. */
- 		folder = e_mail_session_uri_to_folder_sync (
--			m->session, uri, 0, NULL, NULL);
-+			m->session, uri, 0, cancellable, &local_error);
- 		if (folder != NULL) {
--			/* FIXME Not passing a GCancellable or GError here. */
- 			camel_folder_append_message_sync (
--				folder, message, info, NULL, NULL, NULL);
-+				folder, message, info, NULL, cancellable, &local_error);
- 			g_object_unref (folder);
- 			folder = NULL;
- 		}
-@@ -707,7 +703,7 @@ mail_send_message (struct _send_queue_msg *m,
- 	/* post process */
- 	mail_tool_restore_xevolution_headers (message, xev);
- 
--	if (driver) {
-+	if (local_error == NULL && driver) {
- 		camel_filter_driver_filter_message (
- 			driver, message, info, NULL, NULL,
- 			NULL, "", cancellable, &local_error);
-@@ -735,10 +731,9 @@ mail_send_message (struct _send_queue_msg *m,
- 		}
- 	}
- 
--	if (provider == NULL
--	    || !(provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER)) {
-+	if (local_error == NULL && (provider == NULL
-+	    || !(provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER))) {
- 		CamelFolder *local_sent_folder;
--		GError *local_error = NULL;
- 
- 		local_sent_folder = e_mail_session_get_local_folder (
- 			m->session, E_MAIL_LOCAL_FOLDER_SENT);
-@@ -798,6 +793,7 @@ mail_send_message (struct _send_queue_msg *m,
- 					_("Failed to append to "
- 					"local 'Sent' folder: %s"),
- 					local_error->message);
-+				g_clear_error (&local_error);
- 			}
- 		}
- 	}
-@@ -836,7 +832,7 @@ mail_send_message (struct _send_queue_msg *m,
- 		camel_folder_synchronize_sync (queue, FALSE, NULL, NULL);
- 	}
- 
--	if (err->len > 0) {
-+	if (local_error == NULL && err->len > 0) {
- 		/* set the culmulative exception report */
- 		g_set_error (
- 			&local_error, CAMEL_ERROR,
---
-cgit v0.9.2