[jhbuild] 3.24: evolution components use cmake now

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 1b65a391ef37c03566ad3c1a216997510ac9a9ec
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Oct 10 12:53:24 2016 +0100

    3.24: evolution components use cmake now

 modulesets/gnome-apps-3.24.modules             |    5 +++--
 modulesets/gnome-suites-core-deps-3.24.modules |   13 ++++---------
 modulesets/gnome-world.modules                 |    8 ++++----
 3 files changed, 11 insertions(+), 15 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.24.modules b/modulesets/gnome-apps-3.24.modules
index dbccb62..5e72ba5 100644
--- a/modulesets/gnome-apps-3.24.modules
+++ b/modulesets/gnome-apps-3.24.modules
@@ -304,7 +304,8 @@
     </suggests>
   </autotools>
 
-  <autotools id="evolution" autogenargs="--disable-libcryptui --disable-pst-import">
+  <cmake id="evolution"
+         cmakeargs="-DENABLE_LIBCRYPTUI=OFF -DENABLE_PST_IMPORT=OFF">
     <branch/>
     <dependencies>
       <dep package="atk"/>
@@ -342,7 +343,7 @@
       <dep package="geoclue"/>
       <dep package="geocode-glib"/>
     </suggests>
-  </autotools>
+  </cmake>
 
   <autotools id="ghex">
     <branch/>
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index 2b71105..94584b6 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -276,15 +276,10 @@
     </dependencies>
   </autotools>
 
-  <autotools id="evolution-data-server"
-             supports-non-srcdir-builds="no"
-             autogenargs="--enable-vala-bindings --disable-strict --disable-uoa --disable-google-auth"
-             uninstall-before-install="true">
-    <!-- We uninstall the old copy before installing, because the our usage
-         of DESTDIR and libtool's relinking interfere and cause camel providers
-         to link against the install version of libcamel. -->
+  <cmake id="evolution-data-server"
+         cmakeargs="-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON -DENABLE_UOA=OFF 
-DENABLE_GOOGLE_AUTH=OFF">
     <if condition-set="freebsd">
-      <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
+      <cmakeargs value="-DDB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
     </if>
     <branch/>
     <dependencies>
@@ -307,7 +302,7 @@
     <suggests>
       <dep package="nss"/>
     </suggests>
-  </autotools>
+  </cmake>
 
   <autotools id="folks"
              autogenargs="--enable-eds-backend --disable-libsocialweb-backend --disable-fatal-warnings"
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index d012188..205e9ba 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -2349,7 +2349,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="evolution-mapi">
+  <cmake id="evolution-mapi">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
@@ -2357,9 +2357,9 @@
       <dep package="evolution"/>
       <dep package="libmapi"/>
     </dependencies>
-  </autotools>
+  </cmake>
 
-  <autotools id="evolution-ews">
+  <cmake id="evolution-ews">
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -2371,7 +2371,7 @@
       <dep package="sqlite3"/>
       <dep package="libical"/>
     </dependencies>
-  </autotools>
+  </cmake>
 
   <autotools id="libglade">
     <branch/>