[jhbuild] have pygobject pull from master and add pygobject2 tarball project

[Craig Keogh <cskeogh src gnome org>]

commit 8878eecb377f300ed08d86f52f3fcde7d6079d69
Author: John (J5) Palmieri <johnp redhat com>
Date:   Thu Aug 11 09:53:14 2011 -0400

    have pygobject pull from master and add pygobject2 tarball project
    
    * pygobject 3.0 now parallel installs with pygobject 2.28
    * pygobject 3.0 is introspection only
    * pygobject 2.28 turns off introspection and is used to support the static
      bindings
    
    https://bugzilla.gnome.org/show_bug.cgi?id=656400

 modulesets/gnome-apps-3.2.modules             |   19 ++++++++++++++-----
 modulesets/gnome-suites-core-deps-3.2.modules |    8 ++++----
 modulesets/gnome-world-3.2.modules            |   10 +---------
 3 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.2.modules b/modulesets/gnome-apps-3.2.modules
index bd93660..037d5d0 100644
--- a/modulesets/gnome-apps-3.2.modules
+++ b/modulesets/gnome-apps-3.2.modules
@@ -60,7 +60,7 @@
             hash="sha256:381aa8d7a07541d81457c3eac0ab5b37f05272023e3af04cbebab831732ff41f"
             md5sum="b3d627f35fc527b00121925840d5cca7" size="296955" />
     <dependencies>
-      <dep package="pygobject"/>
+      <dep package="pygobject2"/>
       <dep package="librsync"/>
     </dependencies>
   </distutils>
@@ -103,7 +103,6 @@
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="gucharmap"/>
-      <dep package="pygobject"/>
       <dep package="libgweather"/>
       <dep package="gdk-pixbuf"/>
       <dep package="gtk+"/>
@@ -114,7 +113,7 @@
       <dep package="libnotify"/>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
-      <dep package="pygobject"/>
+      <dep package="pygobject2"/>
       <dep package="gnome-python"/>
       <dep package="gnome-icon-theme"/>
       <dep package="libxml2"/>
@@ -393,17 +392,27 @@
   <autotools id="pyatspi2">
     <branch/>
     <dependencies>
-      <dep package="pygobject"/>
+      <dep package="pygobject2"/>
     </dependencies>
     <suggests>
       <dep package="at-spi2-core"/>
     </suggests>
   </autotools>
 
+  <tarball id="pygobject2" version="2.28.6" autogenargs="--disable-introspection">
+    <pkg-config>pygobject-2.0</pkg-config>
+    <source href="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/pygobject-2.28.6.tar.bz2";
+            hash="sha256:e4bfe017fa845940184c82a4d8949db3414cb29dfc84815fb763697dc85bdcee"
+            md5sum="a43d783228dd32899e6908352b8308f3" size="888240"/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </tarball>
+
   <autotools id="pygtk">
     <branch/>
     <dependencies>
-      <dep package="pygobject"/>
+      <dep package="pygobject2"/>
       <dep package="gtk+-2"/>
       <dep package="py2cairo"/>
     </dependencies>
diff --git a/modulesets/gnome-suites-core-deps-3.2.modules b/modulesets/gnome-suites-core-deps-3.2.modules
index 3e23f77..172d6e2 100644
--- a/modulesets/gnome-suites-core-deps-3.2.modules
+++ b/modulesets/gnome-suites-core-deps-3.2.modules
@@ -302,7 +302,7 @@
       <dep package="dbus-glib"/>
     </dependencies>
     <suggests>
-      <dep package="pygobject"/>
+      <dep package="pygobject2"/>
     </suggests>
   </autotools>
 
@@ -1070,11 +1070,11 @@
   </waf>
 
   <autotools id="pygobject">
-    <branch revision="pygobject-2-28"/>
+    <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="pycairo"/>
+      <dep package="py2cairo"/>
+      <dep package="gobject-introspection"/>      
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-world-3.2.modules b/modulesets/gnome-world-3.2.modules
index 6f666d3..6041746 100644
--- a/modulesets/gnome-world-3.2.modules
+++ b/modulesets/gnome-world-3.2.modules
@@ -1486,7 +1486,7 @@
      <dep package="gst-plugins-bad"/>
      <dep package="libgee"/>
      <dep package="sqlite3"/>
-     <dep package="pygobject"/>
+     <dep package="pygobject2"/>
      <dep package="gst-python"/>
    </dependencies>
   </autotools>
@@ -1732,14 +1732,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="pygi">
-    <branch/>
-    <dependencies>
-      <dep package="gobject-introspection"/>
-      <dep package="pygobject"/>
-    </dependencies>
-  </autotools>
-
   <waf id="ardour" waf-command="./waf">
     <branch repo="svn.ardour.org" module="ardour2/branches/3.0" checkoutdir="ardour-3.0"/>
     <dependencies>