[gtk-osx] Fix up some Gtk2/3 dependencies.

[John Ralls <jralls src gnome org>]

commit 1951641d37dae849aa22c3bed1cbef00ee0f5fa4
Author: John Ralls <jralls ceridwen us>
Date:   Thu Sep 20 15:33:20 2012 -0700

    Fix up some Gtk2/3 dependencies.

 modulesets-unstable/gtk-osx-unsupported.modules |    6 ++++--
 modulesets-unstable/gtk-osx.modules             |    4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index 4eaf2d3..848aef7 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -108,10 +108,13 @@
   <autotools id="libgnome-keyring" autogenargs="--disable-pam --without-root-certs">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
       <dep package="libgcrypt"/>
       <dep package="libtasn1"/>
     </dependencies>
+    <after>
+      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk3"/>
+    </after>
   </autotools>
 
   <autotools id="glib-networking" autogenargs="--without-ca-certificates">
@@ -136,7 +139,6 @@
  <autotools id="libsoup">
     <branch />
     <dependencies>
-      <dep package='gconf'/>
       <dep package='sqlite'/>
       <dep package="libgnome-keyring"/>
       <dep package="glib-networking"/>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 68984c9..230b239 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -85,7 +85,6 @@
   </autotools>
 
   <autotools id="pango"
-             autogenargs="--with-included-modules=basic-coretext --disable-introspection"
              makeargs="-k -C modules; make">
     <branch />
     <dependencies>
@@ -204,7 +203,8 @@
   <autotools id="gtk-mac-integration" autogenargs="--disable-python">
     <branch/>
     <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="gtk+"/>
+      <dep package="gtk+-3.0"/>
     </after>
   </autotools>