[jhbuild] Revert "3.22: drop nemiver, gdl"

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

commit 3bd90b7a1578c97db244d4fe085319e3af5b1e6d
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Jul 1 21:51:21 2016 +0100

    Revert "3.22: drop nemiver, gdl"
    
    master builds fine. If the tarball doesnt build should be fixed
    in the release tarballs scripts
    
    This reverts commit 53a2c1f8bd8ec39568c3e36955211b50e63d7ee0.

 modulesets/gnome-apps-3.22.modules |   37 ++++++++++++++++++++++++++++++++++++
 modulesets/gnome-world.modules     |   36 -----------------------------------
 2 files changed, 37 insertions(+), 36 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.22.modules b/modulesets/gnome-apps-3.22.modules
index a897422..a7f42ea 100644
--- a/modulesets/gnome-apps-3.22.modules
+++ b/modulesets/gnome-apps-3.22.modules
@@ -78,6 +78,24 @@
     </suggests>
   </autotools>
 
+  <autotools id="gdl">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="librsvg"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gdlmm">
+    <branch/>
+    <dependencies>
+      <dep package="gdl"/>
+      <dep package="glibmm"/>
+      <dep package="gtkmm"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gegl">
     <branch/>
     <dependencies>
@@ -535,6 +553,24 @@
     </dependencies>
   </autotools>
 
+  <autotools id="nemiver"
+             autogenargs="--enable-gsettings=yes">
+    <branch/>
+    <dependencies>
+      <dep package="boost"/>
+      <dep package="gdb"/>
+      <dep package="gdlmm"/>
+      <dep package="gtkmm"/>
+      <dep package="glibmm"/>
+      <dep package="gtksourceviewmm"/>
+      <dep package="vte"/>
+      <dep package="libgtop"/>
+      <dep package="libxml2"/>
+      <dep package="ghex"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="polari">
     <branch/>
     <dependencies>
@@ -834,6 +870,7 @@
       <dep package="gnome-todo"/>
       <dep package="gnome-tweak-tool"/>
       <dep package="nautilus-sendto"/>
+      <dep package="nemiver"/>
       <dep package="polari"/>
       <dep package="seahorse"/>
       <dep package="vinagre"/>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 97c3854..2e721f7 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -3354,40 +3354,4 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gdl">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="librsvg"/>
-      <dep package="gtk+"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gdlmm">
-    <branch/>
-    <dependencies>
-      <dep package="gdl"/>
-      <dep package="glibmm"/>
-      <dep package="gtkmm"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="nemiver"
-             autogenargs="--enable-gsettings=yes">
-    <branch/>
-    <dependencies>
-      <dep package="boost"/>
-      <dep package="gdb"/>
-      <dep package="gdlmm"/>
-      <dep package="gtkmm"/>
-      <dep package="glibmm"/>
-      <dep package="gtksourceviewmm"/>
-      <dep package="vte"/>
-      <dep package="libgtop"/>
-      <dep package="libxml2"/>
-      <dep package="ghex"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-  </autotools>
-
 </moduleset>