[jhbuild] 3.24: Remove gtk+-2

[Michael Catanzaro <mcatanzaro src gnome org>]

commit fdbdda7b046cae78312bd29320e7606cd3103f79
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Dec 11 15:41:56 2016 -0600

    3.24: Remove gtk+-2
    
    Its only dependency is gnome-themes-standard, and it's an optional
    dependency, so move it to world.

 modulesets/gnome-suites-core-3.24.modules      |    2 +-
 modulesets/gnome-suites-core-deps-3.24.modules |   19 -------------------
 modulesets/gnome-world.modules                 |   18 ++++++++++++++++++
 3 files changed, 19 insertions(+), 20 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.24.modules b/modulesets/gnome-suites-core-3.24.modules
index 1dcf1e2..92ef3ae 100644
--- a/modulesets/gnome-suites-core-3.24.modules
+++ b/modulesets/gnome-suites-core-3.24.modules
@@ -390,7 +390,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-themes-standard">
+  <autotools id="gnome-themes-standard" autogenargs="--disable-gtk2-engine">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index e00165b..3f3e8b8 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -837,25 +837,6 @@
     </suggests>
   </autotools>
 
-  <!-- Deprecated -->
-  <autotools id="gtk+-2">
-    <if condition-set="quartz">
-      <autogenargs value="--with-backend=quartz"/>
-    </if>
-    <branch checkoutdir="gtk+-2" module="gtk+" revision="gtk-2-24"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="pango"/>
-      <dep package="atk"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-    <suggests>
-      <dep package="shared-mime-info"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gtk-doc">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index a75e367..99ec9b0 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -3424,4 +3424,22 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gtk+-2">
+    <if condition-set="quartz">
+      <autogenargs value="--with-backend=quartz"/>
+    </if>
+    <branch checkoutdir="gtk+-2" module="gtk+" revision="gtk-2-24"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="pango"/>
+      <dep package="atk"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+    <suggests>
+      <dep package="shared-mime-info"/>
+    </suggests>
+  </autotools>
+
 </moduleset>