Version bump for gnome-3.6. Drop old.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

7 files changed, 74 insertions, 251 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index d0d83a4c552f..589909619a1f 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.376 2012/11/26 16:19:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.377 2012/12/19 05:52:12 tetromino Exp $
+
+*evolution-3.6.2-r1 (19 Dec 2012)
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/evolution-3.2.1-reorder-mx-clutter-gtk.patch,
+  -evolution-3.2.3-r1.ebuild, -files/evolution-3.2.3-g_thread_init.patch,
+  -files/evolution-3.2.3-gmodule-explicit.patch,
+  -files/evolution-3.2.3-gtkhtml-4.4.patch, +evolution-3.6.2-r1.ebuild:
+  Version bump for gnome-3.6. Drop old.
 
   26 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   evolution-3.2.3-r1.ebuild, evolution-3.4.4.ebuild:
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index f65008a1ffde..296b16c4bf16 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -7,28 +7,25 @@ AUX evolution-2.32.2-mime-handler.patch 4169 SHA256 ba6db000b4c38b53462c0281146e
 AUX evolution-2.32.2-smime-fix.patch 2444 SHA256 3e5fae0d34cec92f01c1e66d5fdac858f39619bfcb00f8f74231c04571892362 SHA512 c5ebb166720cce7b42fe36d3cfd392500e3075c620487b0b7a30f21630bb26116ea9111190dacc992acdf85e4d95941f2307744bfb2c9e929d55827a880297f1 WHIRLPOOL 16464ac6f8c160b04de3f6aee59ad59208726a3eaa00791065707bc78cfbf459b6b9056bb5a627463941b01a7ae4fd51c5a7255184fe342991a2d7add8d8fca3
 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-3.2.1-reorder-mx-clutter-gtk.patch 1308 SHA256 d05f8b29a58defb11d08fb576028b198116f069d2edae6c9545a667e35d57a40 SHA512 a94b579f60bf0ea5eeaa8f2950bb826ab399edf374bf6cf467ee22ece0f5766e629a85fcb8a72987b3ba1cb318312c69788e043e49eb07a7bd80710bed7a6b34 WHIRLPOOL b7facc048a072b4493c753a3bb45b3e70dea15bfef85eb8efce299606463d944d3f297721795f4a7004a4b13b11e4ed9b2d3d35807c7b628a8665a502ea354ab
-AUX evolution-3.2.3-g_thread_init.patch 2335 SHA256 20b87e3fea68863fcda9dc57d6ccf74ce7e2c9f5b8e7d6f30032c034f0975116 SHA512 1db698b2042c2b0e4cd98eeb90baf2a18c5c61fe742fa6af7ee9ceb4f7ae54a94f17362e1da231fd46ab34de4e610b03d18d5097c1008070aaa3a2dd897e04f4 WHIRLPOOL 5b009bd86e85a729e89524935ca20e037f1f6689edd3dd3151b42955b00874a8ac4ed60c18d01c483ed79cb1904a939e758e3489fb63aaf4cca03866e53651d4
-AUX evolution-3.2.3-gmodule-explicit.patch 727 SHA256 0fadbfec6a35ac569432007464ad165b51d65b16fcf95cd09c6a25a542880f54 SHA512 80736939e1bc3ad5859ded851ad767f0df392ff84e461746d3cf2acef7b0cdc252b86a90aeb7ff9dc2973f5a2cddc27f1b55e2d2b24c87db45007fb535808055 WHIRLPOOL 9ac7b19abda1692bf9c8cae23dc2a3ecc30d75a897dcf1344b63e62cad12c0613bf1697542b2c37d91b69cc14e61c8ba6596b9657188ea4c3e343568149a0c89
-AUX evolution-3.2.3-gtkhtml-4.4.patch 900 SHA256 ee98a29f0dac28ad67fee72c4372f4edaa4dbe4b6a8627606784f20c1cdf440c SHA512 c02ae6285fc5c53fe2cf9aab15640489290f3d37343a3b6c9cd7d378a5beb1e398dd7a84e8d80c9a06144b0d100715ab6d15a588cda2e44de45ad44e3c243d3c WHIRLPOOL 32354d725413ffa13bcd547340584e7ee5b06ec79435a0c81f1183f6dcf78222d32bd6519cba4b5ab6584a40c9e226916a1bbc4fbb4886aba7455ba09322ce55
 AUX evolution-3.3.91-spamassassin-paths.patch 2223 SHA256 9f2ea27193ff299dd130f562c5b9eb44ddf7825c357db11c72e49bf792f97680 SHA512 9878295882d80d8933fdd8456aed9bd03d118a20b2cff5f364b412337ecd8dd1c4788de5b84db5d35d1ba97097d54b137fc07740764ccc136b2ea7a68687a045 WHIRLPOOL aa6db1419a2516f885ef3bce64723ee03079eb8f3f4a1da35bfed0787ffebfbb37afa66dab534be6885e9759c513ab2e7c5d2729348b8c22d9410cd40de0d5b4
 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.2.3.tar.xz 12419112 SHA256 a25d523e775c022ec9e68d7b989316e7252b687d70b9db2f60b72bb833099e9d SHA512 751bf3eaca2215ee9a3adfd41c2396b92ee4831763d5b5f1be555189b1ab1b476fa223e2ad34990145952babf54384611cef2e08ecf0df2ee30b59ba0481a23c WHIRLPOOL 58ceedf4863ff0f7fba596c8fa493308a9f4fd45d3a31f101316880bd15597b17aeac168fc2fecddaef387ac144a0c3dd2b14d78a1d3495d1ba3d601f7972169
 DIST evolution-3.4.4.tar.xz 11899620 SHA256 7e541d0894c1d48b89820b6466edafe40215f8cdb45b1c0e9635cc15f49ecb9a SHA512 b72100c39016c2e9436b2e2318918e57e8945dc850b9b47a6738c17b6b25048bcb29269b5e3a481939b493147b537a0158adf0f32aec98268489ccfa1fa7be6b WHIRLPOOL 0c621797311158cbd0e9322fb2af615bc123ff84c5c31470afd00c6ed9c12402b54ef0cec02cb87880843ca778e0cc451d9e72fc9b4a3b259ee5f185c6686f22
+DIST evolution-3.6.2-gentoo-patches.tar.xz 20740 SHA256 0f69f5355d07d0e80f0279559a08f7f4bdc0ec815cf5cc26dfd4de23f8293c39 SHA512 ddb841ed5308565e9e150d03cd0477dd90ad5ba0892cf0f23209e3d1adafa17417471386c8b16cd118810d3f96ec31c3dbf3a608ce890c7b0510ee6d52bb0600 WHIRLPOOL ac08e25a46aac56e42a2ab27595f2052ae1360b8ebd161aa5c4e674c605af37a4becb08cb7545a110a85d4a6edd247704814fc2992c97541b8375f5fdbb02498
+DIST evolution-3.6.2.tar.xz 12006684 SHA256 40b326c63abc33ccc1393c9e3b60c747234ab14a46fc4690255b523942ea8983 SHA512 31299782e7e8dcdd7002fc81425fc19fd4af221a734d8fdcee652b38d41745e7817bf48e53707157fe7e88f46aa02c79b7024c8e30ecdbd7755587abc03191a9 WHIRLPOOL 794091d521615060ab05b8191b4154a39f501d244b39c6e2a46d0de68631b582839c93b85ab99484b8247de3749ceb02eb471290fb5b266aa67ed0d645d630ed
 EBUILD evolution-2.32.3-r1.ebuild 6013 SHA256 e810c8d93f88425b83a7f99f799e1b71deeab8874c9c80c83c95c5e1e094451a SHA512 59f7cdf82202b3fc827b02db30a69def78840999456b4ed5de7e16ee4c38db27f591ebdf1bdce0b9acf6e5ed3e6f7d85db24bbee5c060dac551cd4314aa349f9 WHIRLPOOL 8e68f9edc12bfac580dfc566a873a505d277d25428d2958e911ef26455d147895dcb8af3f180ebc7a340774b3b7e0e3ee96908f9f7082d7bb0004bf29cea3692
-EBUILD evolution-3.2.3-r1.ebuild 5742 SHA256 298c84db2aa537d7570f102d92e211c4227fb9ea491635a30f2ebd792d511f91 SHA512 981b69f483284763c2f7ef7fa254201ed929fc1d4b31b8ab458c0cffe05e94ebe40c980b1e9e04372faa7cd158a7374032b958bca3bb0ea6da45dedefaa5ccec WHIRLPOOL eca982eaca2f7e0d2f207975d307826d7e0869f81dd57d26df964607905c660d9c9f4c27df3cf7e8c58e1688b5ec295cf7a0eebc178036f3f90b2b521a2bef34
 EBUILD evolution-3.4.4.ebuild 5513 SHA256 a567c62ac7ee9fc2e4cd1b07ad3b23d633a2dbd9c273ecaec431c588634ba092 SHA512 1d258dc1ec8d0389a41f9de5cb595a2bfd1309f068752d520e34a8aba26d5f39eb802509329c09bfa6db622a6ca9f8f0f27547507d455ee91b77fe33635fa0e9 WHIRLPOOL 9225b9b446e60470224f07cfea1a3fc75b09ca80d2137dab9b47687b8486ea3d4d4b79df61016e68906828dbe0b6ce899eaa58e1e5f5d6e654a642d4eedf89e8
-MISC ChangeLog 84986 SHA256 a8b5477b3f57a3f6abb9c0d29d83f6b459d7c0d1a00403af15c9c12157ef606e SHA512 eb744b553f89c7cc5c9a5c20529254965668e9ca5d9e6009ba00041c2f209e0dc7cad28b0e14fc5d4b2e89631d5d05ac21ae81f28981da09834a048afea98cd8 WHIRLPOOL c6423c1f42047cc88fb6a16cab9fa5f77dbfee64d3f1d776088e288de8905d65d826ec62e7f35851299283f9ead7cd0fdd8577694e993471eeacf543c27538e9
+EBUILD evolution-3.6.2-r1.ebuild 4886 SHA256 60727cc11f1dc5959ed69fa5551435ae27ec424186e4dc990eaaf02a47a9f64a SHA512 1e4d6265fc2d161a7ce5aae4026d00a18678b09df6e4fc5da1632f9899b000e600eaf5947ffd0b345155c0f280a879ba5e340116f77d83560cbca67e9ca020cb WHIRLPOOL 649846f4e5d11f0fe277691878517244632d5c4e816e99a93e1444c9ba3cec8fb903c903ab98ca9e5eb0114158c115e96ef32cc544f89dd06d2cbca926159cfc
+MISC ChangeLog 85371 SHA256 86f346834fcd95628fc17e4f0ec6bf40bad8c0efb3d14643965d39386f44cbf6 SHA512 2e2f4e2ec315bfe0d8fd5ad561af8830e648a7351c13dbc4316b0e869472b78e00ff3f50a3f65f4256b4cf9db407f287d2e8c0b6b627352ce4d45b62da3470ed WHIRLPOOL 93b088e1608b0529709d6527bde859f8d747c4b2a45d7f50402df7cda24a1b6e822f2dd126a9bdd85156ca73565d00f5f6b8378b1cf7d3b994809890beb7d401
 MISC metadata.xml 1097 SHA256 fd96c4817ed5c032a35790835aa072abbee8188b443e43f591badb35f8b38147 SHA512 7214c362d0304fe50699b9b9489155e6d3c1b8a85e0d625e733ad036837938ed844e9ed0b25743252946ceb891a9db3db1580738f4312ba4056c88c2ba35a2a1 WHIRLPOOL a80537a65b1dbf887b49c02aa9d9182ed91bc87a7674f48d33c6178c14c206f7dfaa314970a62e4da83417c3d8271e4f47eeab222c4fa2b8f737f243811c1d6d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQs5auAAoJEJ0WA1zPCt1h+7IIAI9/nA5yOoAzYeW+6Ki3Yp36
-PoMl1EU0/aamXH1WYwbPuisoh0dYo6Sjiyifo9h+urNGszDuxFCcz/kKHv5spKFy
-y5NxCqIRBOw8IG5YrdZz2WRgLYN3j9p+rW0b4nIbehbf3nkA5gpe8U5nfBwBToWU
-/IfFNTiSrjwe9Ov3F56YtVm8preLY+mojAl25MbBMtYkcmloy1gwEZIK0LCLHwfE
-t2TTjuMTxpytMFs8PhRFDIoeGBwyeaHNmozkcCpOk2BoGiHUhu+mlZxuKVcN1G3N
-LaO3WmUeAxhkD3th0f1qN3H9EVzddlbmcrghuG96N6ZDXM0WzP8KnQmh6DjqenE=
-=K+hM
+iQEcBAEBCAAGBQJQ0VYNAAoJEJ0WA1zPCt1hzK8IALms/vRkmANCQIWmrwIqzZW0
+RytXCePqBrpo0kvzofFTYJgqkw3FZPovz0Q0wgiMxdoDCG1jdi2E7GMMbE6kpbho
+2Yq7XHlgQ0Ongf69/ReVIDlfkrktHNPvwfVybxTeZqDJa9dy3v7C2nvKrfzeFcde
+f7Yj8KoXcWqFqQm1d83mfbrauoJlg9JNebo+qf1qE/vpbu3y1tBwR2ChZUnu+vbd
+s7nV2ZGII5MTEC9Md3jjrodijkVHDYY4q1NrpjbmFKv0cr4rEfNMrCzXNq9H0fIo
+qmm+jq5ghKKK6t9TexYTA4iEqLeeb+KNHAqahifsHS7BgAombFoQHvt2YHBuYxA=
+=qbT7
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-3.2.3-r1.ebuild b/mail-client/evolution/evolution-3.6.2-r1.ebuild
index a3311e64b0a4..166e03eb9f46 100644
--- a/mail-client/evolution/evolution-3.2.3-r1.ebuild
+++ b/mail-client/evolution/evolution-3.6.2-r1.ebuild
@@ -1,130 +1,108 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.3-r1.ebuild,v 1.6 2012/11/26 16:19:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.6.2-r1.ebuild,v 1.1 2012/12/19 05:52:12 tetromino Exp $
 
-EAPI=4
-GCONF_DEBUG=no
-GNOME2_LA_PUNT=yes
-PYTHON_DEPEND="python? 2:2.5"
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils flag-o-matic gnome2 python
+inherit autotools eutils flag-o-matic gnome2
 
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
 HOMEPAGE="http://projects.gnome.org/evolution/"
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-gentoo-patches.tar.xz"
 
 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
 LICENSE="|| ( LGPL-2 LGPL-3 ) CCPL-Attribution-ShareAlike-3.0 FDL-1.3+ OPENLDAP"
 SLOT="2.0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="clutter connman crypt +gnome-online-accounts gstreamer kerberos ldap map networkmanager python ssl"
+IUSE="crypt +gnome-online-accounts gstreamer kerberos ldap map ssl"
+KEYWORDS="~amd64 ~ppc ~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] )"
 
-# 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
+# also supports gstreamer 1.0
+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
-	>=dev-libs/libgweather-2.90.0:2
+	>=dev-libs/libgweather-3.5.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
+	>=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.31.2:2.4
+	>=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.9.1
+	>=dev-libs/libgdata-0.10:=
+	>=net-libs/webkit-gtk-1.8.0
+	!=net-libs/webkit-gtk-1.9.90
 
 	x11-libs/libSM
 	x11-libs/libICE
 
-	clutter? (
+	map? (
 		>=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 )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
 	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 )
+	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 )
+		>=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 )"
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )"
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=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"
+	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"
 
-# contact maps require clutter
-# NM and connman support cannot coexist
-REQUIRED_USE="map? ( clutter )
-	connman? ( !networkmanager )
-	networkmanager? ( !connman )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
 	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}
+		--disable-schemas-compile
 		--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)
-		pythonpath=$(PYTHON -2 -a)
-		$(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"
@@ -135,25 +113,24 @@ src_prepare() {
 			--without-nss-libs
 			--without-nss-includes"
 	fi
+	G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+
+	# Fix paths for Gentoo spamassassin executables
+	epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=663077, requires eautoreconf
-	epatch "${FILESDIR}"/${PN}-3.2.1-reorder-mx-clutter-gtk.patch
-	# Fix build failure with glib-2.32
-	epatch "${FILESDIR}"/${P}-gmodule-explicit.patch
-	epatch "${FILESDIR}"/${P}-g_thread_init.patch
-	# Fix crashes and linking failure with gtkhtml-4.4
-	epatch "${FILESDIR}"/${P}-gtkhtml-4.4.patch
-
-	# Fix >=sys-devel/automake-1.12 compability wrt #421307
-	sed -i \
-		-e '/PROG_MKDIR_P/s:AM:AC:' \
-		-e 's:mkdir_p:MKDIR_P:' \
-		-e '/AM_INIT_AUTOMAKE/s:-Werror ::' \
-		m4/po.m4 po/Makefile.in.in configure.ac || die
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
+		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"
 
+	# Lots of crash and UI fixes, will be in 3.6.3
+	epatch ../patches/*.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() {
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
deleted file mode 100644
index 6df8f2bf21b2..000000000000
--- a/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/files/evolution-3.2.3-g_thread_init.patch b/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch
deleted file mode 100644
index 915de364caf6..000000000000
--- a/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From ed7f672fa38aa1528e9eca5419176e0f8a9583f6 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 24 Oct 2011 09:42:48 +0200
-Subject: [PATCH] Call g_thread_init() conditionally
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 3.2.3]
----
- capplet/anjal-settings-main.c         |    2 ++
- capplet/settings/mail-guess-servers.c |    2 ++
- plugins/backup-restore/backup.c       |    2 ++
- shell/main.c                          |    2 ++
- 4 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
-index 2bc3268..c810db3 100644
---- a/capplet/anjal-settings-main.c
-+++ b/capplet/anjal-settings-main.c
-@@ -168,8 +168,10 @@ main (gint argc,
- 	if (!gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error))
- 		g_error ("%s", error->message);
- 
-+	#if !GLIB_CHECK_VERSION(2,31,0)
- 	if (!g_thread_get_initialized ())
- 		g_thread_init (NULL);
-+	#endif
- 
- 	e_passwords_init ();
- 	categories_icon_theme_hack ();
-diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c
-index 0b14494..0b15271 100644
---- a/capplet/settings/mail-guess-servers.c
-+++ b/capplet/settings/mail-guess-servers.c
-@@ -343,7 +343,9 @@ main (gint argc,
-       gchar **argv)
- {
- 	EmailProvider *provider;
-+	#if !GLIB_CHECK_VERSION(2,31,0)
- 	g_thread_init (NULL);
-+	#endif
- 	g_type_init ();
- 
- 	provider = g_new0 (EmailProvider, 1);
-diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
-index 370608a..1e0ecb5 100644
---- a/plugins/backup-restore/backup.c
-+++ b/plugins/backup-restore/backup.c
-@@ -691,7 +691,9 @@ main (gint argc,
- 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- 	textdomain (GETTEXT_PACKAGE);
- 
-+	#if !GLIB_CHECK_VERSION(2,31,0)
- 	g_thread_init (NULL);
-+	#endif
- 
- 	gtk_init_with_args (
- 		&argc, &argv, NULL, options, (gchar *) GETTEXT_PACKAGE, &error);
-diff --git a/shell/main.c b/shell/main.c
-index 36e67d1..f0afc5a 100644
---- a/shell/main.c
-+++ b/shell/main.c
-@@ -509,8 +509,10 @@ main (gint argc,
- 	textdomain (GETTEXT_PACKAGE);
- 
- 	g_type_init ();
-+	#if !GLIB_CHECK_VERSION(2,31,0)
- 	if (!g_thread_get_initialized ())
- 		g_thread_init (NULL);
-+	#endif
- 
- 	/* do not require Gtk+ for --force-shutdown */
- 	if (argc == 2 && argv[1] && g_str_equal (argv[1], "--force-shutdown")) {
--- 
-1.7.8.5
-
diff --git a/mail-client/evolution/files/evolution-3.2.3-gmodule-explicit.patch b/mail-client/evolution/files/evolution-3.2.3-gmodule-explicit.patch
deleted file mode 100644
index 74cb319030f3..000000000000
--- a/mail-client/evolution/files/evolution-3.2.3-gmodule-explicit.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d459b0885f427588ff5d45c84065a1534034d966 Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau <teuf@gnome.org>
-Date: Tue, 13 Dec 2011 09:09:05 -0500
-Subject: [PATCH] Bug 665782 - configure.ac: Add gmodule-2.0 to GNOME_PLATFORM
-
----
- configure.ac |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 128bd1f..047ffee 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -242,6 +242,7 @@ dnl Check for base dependencies early.
- dnl **********************************
- PKG_CHECK_MODULES([GNOME_PLATFORM],
- 	[gio-2.0 >= glib_minimum_version
-+	 gmodule-2.0 >= glib_minimum_version
- 	 cairo-gobject
- 	 gtk+-3.0 >= gtk_minimum_version
- 	 gail-3.0 >= gtk_minimum_version
--- 
-1.7.8.5
-
diff --git a/mail-client/evolution/files/evolution-3.2.3-gtkhtml-4.4.patch b/mail-client/evolution/files/evolution-3.2.3-gtkhtml-4.4.patch
deleted file mode 100644
index 24b6cf98ba88..000000000000
--- a/mail-client/evolution/files/evolution-3.2.3-gtkhtml-4.4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 739cec4c2bfb1a89fd512315f573ef2313040c31 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 20 Apr 2012 01:39:35 -0400
-Subject: [PATCH] gtkhtml_editor_file_chooser_dialog_run() was removed in
- gtkhtml-4.4
-
-It is no longer needed with gtk+-3.2.
----
- composer/e-composer-actions.c |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
-index 163270f..cd50f7a 100644
---- a/composer/e-composer-actions.c
-+++ b/composer/e-composer-actions.c
-@@ -218,8 +218,7 @@ action_save_as_cb (GtkAction *action,
- 	gtk_window_set_icon_name (
- 		GTK_WINDOW (dialog), "mail-message-new");
- 
--	response = gtkhtml_editor_file_chooser_dialog_run (
--		GTKHTML_EDITOR (composer), dialog);
-+	response = gtk_dialog_run (GTK_DIALOG (dialog));
- 
- 	if (response != GTK_RESPONSE_OK)
- 		goto exit;
--- 
-1.7.8.5
-