[jhbuild] 3.22: Move e-d-s to core-deps

[Michael Catanzaro <mcatanzaro src gnome org>]

commit fecb1907a419d455ba10e91d73232ef6ff0f3f83
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Tue Aug 23 10:39:55 2016 -0500

    3.22: Move e-d-s to core-deps
    
    It's needed by folks. We don't want to build folks without e-d-s
    support, and we don't want to move folks to core.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=677727

 modulesets/gnome-suites-core-3.22.modules      |   34 ------------------------
 modulesets/gnome-suites-core-deps-3.22.modules |   32 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 34 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.22.modules b/modulesets/gnome-suites-core-3.22.modules
index e69efe5..1bdde0d 100644
--- a/modulesets/gnome-suites-core-3.22.modules
+++ b/modulesets/gnome-suites-core-3.22.modules
@@ -80,38 +80,6 @@
     </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. -->
-    <if condition-set="freebsd">
-      <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
-    </if>
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="libsoup"/>
-      <dep package="libxml2"/>
-      <dep package="gtk+"/>
-      <dep package="sqlite3"/>
-      <dep package="gcr"/>
-      <dep package="libgweather"/>
-      <dep package="libical"/>
-      <dep package="libgdata"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="liboauth"/>
-      <dep package="vala"/>
-      <dep package="libdb"/>
-      <dep package="libsecret"/>
-    </dependencies>
-    <suggests>
-      <dep package="nss"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gdm" autogenargs="--with-systemdsystemunitdir=no --with-log-dir=${prefix}/var/log/gdm">
     <if condition-unset="linux">
       <autogenargs value="--without-plymouth"/>
@@ -1342,7 +1310,6 @@
     <dependencies>
       <dep package="adwaita-icon-theme"/>
       <dep package="dconf"/>
-      <dep package="evolution-data-server"/>
       <dep package="gdm"/>
       <dep package="gnome-backgrounds"/>
       <!-- Not in utilities because the desktop file is hidden -->
@@ -1425,7 +1392,6 @@
       <!-- the platform -->
       <dep package="meta-gnome-devel-platform"/>
       <!-- and more modules -->
-      <dep package="evolution-data-server"/>
       <dep package="gstreamer"/>
       <dep package="libnotify"/>
       <dep package="libpeas"/>
diff --git a/modulesets/gnome-suites-core-deps-3.22.modules b/modulesets/gnome-suites-core-deps-3.22.modules
index d33a2c4..6e53dd5 100644
--- a/modulesets/gnome-suites-core-deps-3.22.modules
+++ b/modulesets/gnome-suites-core-deps-3.22.modules
@@ -272,6 +272,38 @@
     </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. -->
+    <if condition-set="freebsd">
+      <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
+    </if>
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="gtk+"/>
+      <dep package="sqlite3"/>
+      <dep package="gcr"/>
+      <dep package="libgweather"/>
+      <dep package="libical"/>
+      <dep package="libgdata"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="liboauth"/>
+      <dep package="vala"/>
+      <dep package="libdb"/>
+      <dep package="libsecret"/>
+    </dependencies>
+    <suggests>
+      <dep package="nss"/>
+    </suggests>
+  </autotools>
+
   <autotools id="folks"
              autogenargs="--enable-eds-backend --disable-libsocialweb-backend --disable-fatal-warnings"
              supports-non-srcdir-builds="no"