[jhbuild] 3.2: gnome-keyring no longer builds with GTK+2.0

[Stefan Walter <stefw src gnome org>]

commit 1dd01a91ba4190f352df4f485198479ba2a024e3
Author: Stef Walter <stefw collabora co uk>
Date:   Fri Jul 8 21:46:18 2011 +0200

    3.2: gnome-keyring no longer builds with GTK+2.0

 modulesets/gnome-apps-3.2.modules        |   14 +-------------
 modulesets/gnome-suites-core-3.2.modules |    2 +-
 modulesets/gnome-world-3.2.modules       |    8 ++++----
 3 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.2.modules b/modulesets/gnome-apps-3.2.modules
index 1b4c1ee..18ba291 100644
--- a/modulesets/gnome-apps-3.2.modules
+++ b/modulesets/gnome-apps-3.2.modules
@@ -123,18 +123,6 @@
     </after>
   </autotools>
 
-  <autotools id="gnome-keyring-2" autogenargs="--with-gtk=2.0">
-    <branch checkoutdir="gnome-keyring-2" module="gnome-keyring"/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="dbus"/>
-      <dep package="glib"/>
-      <dep package="gtk+-2"/>
-      <dep package="libgcrypt"/>
-      <dep package="libtasn1"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="goffice">
     <branch/>
     <dependencies>
@@ -582,7 +570,7 @@
       <dep package="gtkhtml2"/>
       <dep package="librsvg"/>
       <dep package="poppler"/>
-      <dep package="gnome-keyring-2"/>
+      <dep package="libgnome-keyring"/>
       <dep package="dbus-glib"/>
       <dep package="pygtk"/>
     </suggests>
diff --git a/modulesets/gnome-suites-core-3.2.modules b/modulesets/gnome-suites-core-3.2.modules
index 15fc322..4608f7f 100644
--- a/modulesets/gnome-suites-core-3.2.modules
+++ b/modulesets/gnome-suites-core-3.2.modules
@@ -158,7 +158,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-keyring" autogenargs="--with-gtk=3.0">
+  <autotools id="gnome-keyring">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
diff --git a/modulesets/gnome-world-3.2.modules b/modulesets/gnome-world-3.2.modules
index 71568fe..39a6c77 100644
--- a/modulesets/gnome-world-3.2.modules
+++ b/modulesets/gnome-world-3.2.modules
@@ -346,7 +346,7 @@
       <dep package="glib"/>
       <dep package="gtk+-2"/>
       <dep package="gmime"/>
-      <dep package="gnome-keyring-2"/>
+      <dep package="libgnome-keyring"/>
       <dep package="gconf"/>
     </dependencies>
   </autotools>
@@ -544,7 +544,7 @@
   <autotools id="gnome-mount" autogenargs="--enable-nautilus-extension">
     <branch/>
     <dependencies>
-      <dep package="gnome-keyring-2"/>
+      <dep package="libgnome-keyring"/>
       <dep package="dbus"/>
       <dep package="gtk+-2"/>
       <dep package="intltool"/>
@@ -1019,7 +1019,7 @@
   <autotools id="gnome-keyring-manager" autogenargs="--disable-more-warnings">
     <branch/>
     <dependencies>
-      <dep package="gnome-keyring-2"/>
+      <dep package="libgnome-keyring"/>
       <dep package="gconf"/>
       <dep package="gnome-doc-utils"/>
     </dependencies>
@@ -1768,7 +1768,7 @@
       <dep package="libsoup"/>
       <dep package="dbus-glib"/>
       <dep package="json-glib"/>
-      <dep package="gnome-keyring-2"/>
+      <dep package="libgnome-keyring"/>
     </dependencies>
   </autotools>