[jhbuild] 3.20: Move anjuta and gda to gnome-world

[Michael Catanzaro <mcatanzaro src gnome org>]

commit add1dc80529dca544d7bfedacf9d61d6d425320e
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Jan 17 20:43:25 2016 -0600

    3.20: Move anjuta and gda to gnome-world

 modulesets/gnome-apps-3.20.modules |   50 ------------------------------------
 modulesets/gnome-world.modules     |   35 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 50 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.20.modules b/modulesets/gnome-apps-3.20.modules
index 7c40a54..7b5c94e 100644
--- a/modulesets/gnome-apps-3.20.modules
+++ b/modulesets/gnome-apps-3.20.modules
@@ -106,35 +106,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgda-5.2" autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi 
--disable-vala --disable-gdaui-vala">
-    <if condition-set="freebsd">
-      <autogenargs value="LIBCRYPTO_CFLAGS=' ' LIBCRYPTO_LIBS='-lcrypto' --with-bdb=/usr/local 
--with-bdb-libdir-name=lib/db5 --with-bdb-includedir-name=include/db5"/>
-    </if>
-    <branch checkoutdir="libgda-5.2" module="libgda" revision="LIBGDA_5.2"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="libxml2"/>
-      <dep package="openssl"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libgda"
-             autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi --enable-vala 
--enable-gdaui-vala">
-    <if condition-set="freebsd">
-      <autogenargs value="LIBCRYPTO_CFLAGS=' ' LIBCRYPTO_LIBS='-lcrypto' --with-bdb=/usr/local 
--with-bdb-libdir-name=lib/db5 --with-bdb-includedir-name=include/db5"/>
-    </if>
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="libxml2"/>
-      <dep package="openssl"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gdl">
     <branch/>
     <dependencies>
@@ -271,26 +242,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="anjuta">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gtk+"/>
-      <dep package="vte"/>
-      <dep package="gdl"/>
-      <dep package="libgda-5.2"/>
-      <dep package="gtksourceview"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-    <suggests>
-      <dep package="glade"/>
-      <dep package="devhelp"/>
-      <dep package="vala"/>
-    </suggests>
-  </autotools>
-
   <autotools id="brasero">
     <if condition-unset="linux">
       <autogenargs value="--disable-inotify"/>
@@ -809,7 +760,6 @@
     <dependencies>
       <dep package="meta-gnome-games"/>
       <dep package="accerciser"/>
-      <dep package="anjuta"/>
       <dep package="brasero"/>
       <dep package="dconf-editor"/>
       <dep package="devhelp"/>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 6707253..4e77a51 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -3346,4 +3346,39 @@
     </dependencies>
   </autotools>
 
+  <autotools id="anjuta">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gtk+"/>
+      <dep package="vte"/>
+      <dep package="gdl"/>
+      <dep package="libgda"/>
+      <dep package="gtksourceview"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+    <suggests>
+      <dep package="glade"/>
+      <dep package="devhelp"/>
+      <dep package="vala"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="libgda"
+             autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi --enable-vala 
--enable-gdaui-vala">
+    <if condition-set="freebsd">
+      <autogenargs value="LIBCRYPTO_CFLAGS=' ' LIBCRYPTO_LIBS='-lcrypto' --with-bdb=/usr/local 
--with-bdb-libdir-name=lib/db5 --with-bdb-includedir-name=include/db5"/>
+    </if>
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libxml2"/>
+      <dep package="openssl"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>