Bump to 3.2.1 from the gnome overlay. Add a patch to fix building when clutter-gtk:0.10 is installed. Switch to EAPI4 and add a REQUIRED_USE. Update the CPPFLAGS sed for configure.ac changes.

In addition, fix clutter dependencies in existing evolution ebuilds.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

9 files changed, 247 insertions, 20 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 327526c7f4e5..98ec44ab65c9 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.349 2011/10/30 16:26:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.350 2011/10/31 07:35:16 tetromino Exp $
+
+*evolution-3.2.1 (31 Oct 2011)
+
+  31 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-2.32.2-r3.ebuild, evolution-2.32.3.ebuild,
+  evolution-2.32.3-r1.ebuild, evolution-3.0.3.ebuild, +evolution-3.2.1.ebuild,
+  +files/evolution-3.2.1-reorder-mx-clutter-gtk.patch, metadata.xml:
+  Bump to 3.2.1 from the gnome overlay. Add a patch to fix building when
+  clutter-gtk:0.10 is installed. Switch to EAPI4 and add a REQUIRED_USE. Update
+  the CPPFLAGS sed for configure.ac changes.
+  In addition, fix clutter dependencies in existing evolution ebuilds.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org> evolution-2.32.3.ebuild:
   alpha/ia64/sparc stable wrt #385699
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index df2e0bca461e..e189b3487b6f 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,25 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX evolution-2.32.0-wrong-lafile-usage.patch 634 RMD160 e14b9b17faacc3590419f7f1de78cd0f76323d58 SHA1 221fbd2112d206e52e741018c7ff2a3434819d18 SHA256 79e169a86b658bbd339fe79585f908f0eee4cfeef972be0731faa742a769deb8
 AUX evolution-2.32.1-libnotify-0.7.patch 2239 RMD160 b0d8f2e830e32d9bc227978074f7e9975ae1307a SHA1 64c1f4ed1311cead4071e7543704ee8eeca4e418 SHA256 73746e65a3ba190ace8bd1e5fc9d52f6a67556fac0ba8727d7705ffe74e3ce0d
 AUX evolution-2.32.2-mime-handler.patch 4169 RMD160 8ec9bd24fcaa9cff0b2e865a85a430a3ea0856ca SHA1 e974601ec51a8e79db14520d18282af893cf89c9 SHA256 ba6db000b4c38b53462c0281146e504b7212b84a6d7f5f482b375674042ff846
 AUX evolution-2.32.2-smime-fix.patch 2444 RMD160 e3f5c36d800bd7d0578f1696efe2582eb55db123 SHA1 e4ad555a982a5cd334df95d3420404dddb334d4d SHA256 3e5fae0d34cec92f01c1e66d5fdac858f39619bfcb00f8f74231c04571892362
+AUX evolution-3.2.1-reorder-mx-clutter-gtk.patch 1308 RMD160 9d6db86c94ea6f5ed9a4a1e15901f6d7c942e165 SHA1 5f26590d80512f754f7547b20e620345a3efaed0 SHA256 d05f8b29a58defb11d08fb576028b198116f069d2edae6c9545a667e35d57a40
 DIST evolution-2.32.2-patches-r1.tar.bz2 15387 RMD160 1b5279f83c5d6048294a4b320b3bbc03bcb91485 SHA1 d6a6c18eaf2cb94256971e8b4444fe7c7ba20851 SHA256 466783eadc50e06c7c34c6e5a93ddc87b3af15456f28b40e52c2e785fb324b8e
 DIST evolution-2.32.2.tar.bz2 31929154 RMD160 1d68825111309600093c8d4718e1cc001635e61d SHA1 48f25fffda1ac9c209fd02162ca298df5c03b05f SHA256 1831c7f5f00b4755869cf84ef3e3f79c4705a33e0659e72b6c1ffa4a59d4a4bb
 DIST evolution-2.32.3-patches.tar.xz 11784 RMD160 34e536268814b2c41fd081321f3435ea10af620c SHA1 2f9af7d7f9489099daefceb7ea7f2948fa1314a5 SHA256 eadfcd9d1663206f1d15457358afa7901f095894d782d4043ffd762b242eded6
 DIST evolution-2.32.3.tar.bz2 31966138 RMD160 1b64d00a38cf8ad5c273cc4f4aee73124fe818af SHA1 cc2a2126ef4192193dce50c43c5bb6fc0a57fcde SHA256 33ab38780e9abb71506230e331e9c3534444b5ed3f17046f0b6371a00df686fb
 DIST evolution-3.0.3.tar.xz 25755880 RMD160 0cf0457ac4654e277cff0e174d29cc3dc96e0924 SHA1 c0ea8a8551e1937f5ede665d0a34ff8ea773d839 SHA256 37fadcd459b74960fccf805f627ff869e315367690af8809ce956ec7e23294f7
-EBUILD evolution-2.32.2-r3.ebuild 5596 RMD160 f900315ddabce559450ac0992e394094e405f2b7 SHA1 b366e6f5aa7d4d0447a1c37dd1a30e59a04d6ce2 SHA256 1f276b6d907f921d50dc4d0d1b19b0a1771834581735de29f39968ff43c489c7
-EBUILD evolution-2.32.3-r1.ebuild 5729 RMD160 40605e84a04e118c9da9fa3b306412b02b4cfdbc SHA1 44d0cfdffe99493a37012d878f02bbab3a94ff0e SHA256 432a3c3a61f3638ab272840689b45bc1ba441a60e16f3e50c6e770ec3ece687a
-EBUILD evolution-2.32.3.ebuild 5455 RMD160 abebd0391836c9b0a0dc117f4f00719f95c7a83e SHA1 ee1d6d68b58ef6d6af40cbbca3d99f97a9398f38 SHA256 25dd9414d218683458b55698c6d91d25829e57311551f96fcea307af7aacbca5
-EBUILD evolution-3.0.3.ebuild 5273 RMD160 df52e4b4df69de3822512d1606170e8cdcc86099 SHA1 e6795629d7df052e4b45bf59efe437a5871e91e7 SHA256 a11443c6385032fd8868ff838b95573856c4b01e120c2b5a44e4153cd3af10c4
-MISC ChangeLog 79251 RMD160 2b1afdfbb0f345c1ad165794bc399b805b7ba561 SHA1 b822e7b3298df09de33b65827e2f8e6c480d4bef SHA256 2e4eecc33afd61eda21e71dd467807bbf24e1308445aa38bf57bc010ec79d472
-MISC metadata.xml 977 RMD160 5c829eaa573329f537d7d1b042b11185481046d6 SHA1 919fd156ebe38465ad7cea6b35e1f43aa6e25786 SHA256 3a5374d12556f024da2da451eb7015accced023642d375ab715e072dc0c0837a
+DIST evolution-3.2.1.tar.xz 11472552 RMD160 32ae1274c938627df2ae971b244e3a65968a1eb9 SHA1 3e74817a299adb5830cc076094e9f7fe74a0a1c1 SHA256 244d4fcf57d59b3fe0bcedddc65da5f508b253cb64159e6ddb2bddedf8d7e19a
+EBUILD evolution-2.32.2-r3.ebuild 5654 RMD160 46af147b3192f290dc2472bbf15c559024300e55 SHA1 ac29a4c7c11c1304742b817f3fb1d058778bf9ae SHA256 bde531ffbbf6310b3d6e6ecf610ae1ed3ec4fd80f1a1563c4b58576ed4928f08
+EBUILD evolution-2.32.3-r1.ebuild 5792 RMD160 c3c12978d1cd4f7934b82b295f343cbf9ee236a7 SHA1 21e1e52e89402c305264515663bea91472aa1b94 SHA256 c03d2bc14217600c2d1460cf96484dfd00ea2792dfcc8cb9aa6d1f00432e3ee0
+EBUILD evolution-2.32.3.ebuild 5516 RMD160 b69b8d0a635f9139f7d4b000899e9e8a44c57165 SHA1 29fb979aeae93033f730ec43bbd43c150533ea3a SHA256 eec74965763fc67d48ad3e7fff6fdc82fbeaeda07ae8990142ebf5cc8024c0ed
+EBUILD evolution-3.0.3.ebuild 5278 RMD160 49024daabeda81845380959879330cd7fab9ad63 SHA1 8d83709999883511e0813957c694c77a126d116e SHA256 8a50d0f87adcc1a1d66f024dea53d68f079a3430a18b6931bf57463ba5d19d91
+EBUILD evolution-3.2.1.ebuild 5368 RMD160 56fc0308b83a6b74ed2564ada2e0f01bd90a1dfd SHA1 41705a4de148ba84e939f1594ef518d83b33dd22 SHA256 1bc4892b7a7dd63bfe4524c049a9ef145e544979efd5c12e1a5469acde2e1fa9
+MISC ChangeLog 79817 RMD160 6952e41a72c1b8ddefaaa5c8729d9f3417619e9f SHA1 fb12ad872050ce0a8bd0ba1f51d9b3e9cf43e628 SHA256 d0dda13aff6c0f7a5b3c6e93a5ae5b0f618bb3884a820457ecd8b9062f0b0d08
+MISC metadata.xml 1097 RMD160 b1d9ba9ac1576e4e70d144b4db37c221ca6290dd SHA1 5f659a37f0021e82eb8fe9572d87d2af2ffe212c SHA256 fd96c4817ed5c032a35790835aa072abbee8188b443e43f591badb35f8b38147
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6tetIACgkQuQc30/atMkBA5wCgnJ4ZOALBmjfMaKCi84ahJjO9
-0ncAoJCfa/dkgZIMqU7QJvyp0VCGzX3e
-=SpZN
+iF4EAREIAAYFAk6uT7sACgkQdjK8w9WeBnCfjwD/Ru9MMPC1eVOZOWeR8Kn7oXUL
+C07BZ8KZvRGEPVDnE5oA/1WWBhC9AsIR7NJ4VlLIUljuJBxI0zRnlKLE2RcN1Vhb
+=aYdc
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.32.2-r3.ebuild b/mail-client/evolution/evolution-2.32.2-r3.ebuild
index e5930c0e49f4..00eb8435b387 100644
--- a/mail-client/evolution/evolution-2.32.2-r3.ebuild
+++ b/mail-client/evolution/evolution-2.32.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild,v 1.6 2011/10/05 17:49:25 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild,v 1.7 2011/10/31 07:35:16 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -46,7 +46,10 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
 	>=x11-themes/gnome-icon-theme-2.30.2.1
 	>=dev-libs/libgdata-0.4
 
-	clutter? ( media-libs/clutter:1.0[gtk] )
+	clutter? (
+		>=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} )
diff --git a/mail-client/evolution/evolution-2.32.3-r1.ebuild b/mail-client/evolution/evolution-2.32.3-r1.ebuild
index 7e47aeb01c0e..bbd27912472b 100644
--- a/mail-client/evolution/evolution-2.32.3-r1.ebuild
+++ b/mail-client/evolution/evolution-2.32.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.1 2011/10/08 21:25:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.2 2011/10/31 07:35:16 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -47,7 +47,10 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
 	>=x11-themes/gnome-icon-theme-2.30.2.1
 	>=dev-libs/libgdata-0.4
 
-	clutter? ( media-libs/clutter:1.0[gtk] )
+	clutter? (
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		x11-libs/mx:1.0 )
 	connman? ( net-misc/connman )
 	crypt? ( || (
 				  ( >=app-crypt/gnupg-2.0.1-r2
diff --git a/mail-client/evolution/evolution-2.32.3.ebuild b/mail-client/evolution/evolution-2.32.3.ebuild
index 17bfc83835b4..1c0af7aa2534 100644
--- a/mail-client/evolution/evolution-2.32.3.ebuild
+++ b/mail-client/evolution/evolution-2.32.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3.ebuild,v 1.6 2011/10/30 16:26:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3.ebuild,v 1.7 2011/10/31 07:35:16 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -47,7 +47,10 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
 	>=x11-themes/gnome-icon-theme-2.30.2.1
 	>=dev-libs/libgdata-0.4
 
-	clutter? ( media-libs/clutter:1.0[gtk] )
+	clutter? (
+		>=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} )
diff --git a/mail-client/evolution/evolution-3.0.3.ebuild b/mail-client/evolution/evolution-3.0.3.ebuild
index 9314d17a4f03..d48a103ba8dd 100644
--- a/mail-client/evolution/evolution-3.0.3.ebuild
+++ b/mail-client/evolution/evolution-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.0.3.ebuild,v 1.1 2011/09/30 18:45:22 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.0.3.ebuild,v 1.2 2011/10/31 07:35:16 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -50,7 +50,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28:2
 	clutter? (
 		>=media-libs/clutter-1.0.0:1.0
 		>=media-libs/clutter-gtk-0.90:1.0
-		x11-libs/mx )
+		x11-libs/mx:1.0 )
 	connman? ( net-misc/connman )
 	crypt? ( || (
 		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
diff --git a/mail-client/evolution/evolution-3.2.1.ebuild b/mail-client/evolution/evolution-3.2.1.ebuild
new file mode 100644
index 000000000000..6954a709b887
--- /dev/null
+++ b/mail-client/evolution/evolution-3.2.1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.1.ebuild,v 1.1 2011/10/31 07:35:16 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="python? 2:2.4"
+
+inherit autotools eutils flag-o-matic gnome2 python
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+LICENSE="GPL-2 LGPL-2 OPENLDAP"
+SLOT="2.0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="clutter connman crypt doc +gnome-online-accounts gstreamer kerberos ldap map networkmanager python ssl"
+
+# 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] )"
+
+# contacts-map plugin requires libchaimplain and geoclue
+# glade-3 support is for maintainers only per configure.ac
+# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571)
+# pst is not mature enough and changes API/ABI frequently
+COMMON_DEPEND=">=dev-libs/glib-2.28:2
+	>=x11-libs/cairo-1.9.15[glib]
+	>=x11-libs/gtk+-3.0.2:3
+	>=gnome-base/gnome-desktop-2.91.3:3
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=dev-libs/libgweather-2.90.0:2
+	>=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.1.2:4.0
+	>=gnome-base/gconf-2:2
+	dev-libs/atk
+	>=dev-libs/libxml2-2.7.3:2
+	>=net-libs/libsoup-gnome-2.31.2:2.4
+	>=x11-misc/shared-mime-info-0.22
+	>=x11-themes/gnome-icon-theme-2.30.2.1
+	>=dev-libs/libgdata-0.9.1
+
+	x11-libs/libSM
+	x11-libs/libICE
+
+	clutter? (
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		x11-libs/mx:1.0 )
+	connman? ( net-misc/connman )
+	crypt? ( || (
+		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
+		=app-crypt/gnupg-1.4* ) )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10:0.10
+		>=media-libs/gst-plugins-base-0.10:0.10 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2 )
+	map? (
+		>=app-misc/geoclue-0.11.1
+		media-libs/libchamplain:0.10 )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	ssl? (
+		>=dev-libs/nspr-4.6.1
+		>=dev-libs/nss-3.11 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/pkgconfig-0.16
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	sys-devel/bison
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.9.1
+	app-text/docbook-xml-dtd:4.1.2
+	>=gnome-base/gnome-common-2.12
+	>=dev-util/gtk-doc-am-1.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2.12
+#	>=dev-util/gtk-doc-am-1.9
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/evolution-exchange-2.32"
+
+# contact maps require clutter
+# NM and connman support cannot coexist
+REQUIRED_USE="map? ( clutter )
+	connman? ( !networkmanager )
+	networkmanager? ( !connman )"
+
+pkg_setup() {
+	ELTCONF="--reverse-deps"
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
+	G2CONF="${G2CONF}
+		--without-glade-catalog
+		--without-kde-applnk-path
+		--enable-plugins=experimental
+		--disable-image-inline
+		--disable-mono
+		--disable-pst-import
+		--enable-canberra
+		--enable-weather
+		$(use_enable ssl nss)
+		$(use_enable ssl smime)
+		$(use_enable networkmanager nm)
+		$(use_enable connman)
+		$(use_enable gnome-online-accounts goa)
+		$(use_enable gstreamer audio-inline)
+		$(use_enable map contact-maps)
+		$(use_enable python)
+		$(use_with clutter)
+		$(use_with ldap openldap)
+		$(use_with kerberos krb5 ${EPREFIX}/usr)"
+
+	# 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.
+
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	if use ssl ; then
+		G2CONF="${G2CONF} --enable-nss=yes"
+	else
+		G2CONF="${G2CONF}
+			--without-nspr-libs
+			--without-nspr-includes
+			--without-nss-libs
+			--without-nss-includes"
+	fi
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=663077, requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.2.1-reorder-mx-clutter-gtk.patch"
+	eautoreconf
+
+	gnome2_src_prepare
+
+	# Fix compilation flags crazyness
+	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure || die "CPPFLAGS sed failed"
+}
+
+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/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch b/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch
new file mode 100644
index 000000000000..6df8f2bf21b2
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch
@@ -0,0 +1,34 @@
+From 1c036f9a0a922f68fbbf09540a14173465e51a1e Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 31 Oct 2011 02:15:54 -0400
+Subject: [PATCH] reorder mx-1.0 and clutter-gtk-1.0 in PKG_CHECK_MODULES:q
+
+clutter-gtk-1.0 installs headers in /usr/include/clutter-gtk-1.0/clutter-gtk;
+clutter-gtk-0.10 installs headers in /usr/include/clutter-1.0/clutter-gtk
+
+To ensure that clutter-gtk-1.0's headers (and not 0.10's) are used,
+-I/usr/include/clutter-gtk-1.0 must come before -I/usr/include/clutter-1.0
+in CLUTTER_CFLAGS. And that means clutter-gtk-1.0 must come before mx-1.0
+in PKG_CHECK_MODULES.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663077
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5c2c5ed..b5c74ee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -596,7 +596,7 @@ AC_ARG_WITH([clutter],
+ AC_MSG_RESULT($with_clutter)
+ 
+ if test "x$with_clutter" = "xyes"; then
+-   PKG_CHECK_MODULES(CLUTTER, [mx-1.0 clutter-gtk-1.0 >= clutter_gtk_minimum_version clutter-1.0 >= 1.0.0])
++   PKG_CHECK_MODULES(CLUTTER, [clutter-gtk-1.0 >= clutter_gtk_minimum_version mx-1.0 clutter-1.0 >= 1.0.0])
+ 
+    AC_DEFINE(HAVE_CLUTTER, 1, [Clutter available])
+    AM_CONDITIONAL(ENABLE_CLUTTER, true)
+-- 
+1.7.7.1
+
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
index 632bfb247a0f..303024bbcab4 100644
--- a/mail-client/evolution/metadata.xml
+++ b/mail-client/evolution/metadata.xml
@@ -8,6 +8,8 @@
 		'networkmanager' USE flag to be disabled).</flag>
 		<flag name="crypt">Enable GPG encryption support using
 			<pkg>app-crypt/gnupg</pkg> and <pkg>app-crypt/pinentry</pkg></flag>
+		<flag name="gnome-online-accounts">Enable using
+			<pkg>net-libs/gnome-online-accounts</pkg> for authorization</flag>
 		<flag name="ldap">Enable support for fetching contacts from an LDAP or
 			Active Directory server using <pkg>net-nds/openldap</pkg></flag>
 		<flag name="map">Enable support for displaying contacts on a map inside