[jhbuild] upstrean pycairo is now called py2cairo for python 2 libs

[Craig Keogh <cskeogh src gnome org>]

commit 5c740754d90fbb49d68902fb2abeac22729b81bb
Author: John (J5) Palmieri <johnp redhat com>
Date:   Thu Aug 11 09:45:59 2011 -0400

    upstrean pycairo is now called py2cairo for python 2 libs
    
    * we are mostly focused on python 2 right now so we only build
       the python 2 cairo packages for now
    
    https://bugzilla.gnome.org/show_bug.cgi?id=656400

 modulesets/gnome-apps-3.2.modules             |    6 +++---
 modulesets/gnome-suites-core-deps-3.2.modules |   12 ++++++------
 modulesets/gnome-world-3.2.modules            |    6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.2.modules b/modulesets/gnome-apps-3.2.modules
index b6babad..bd93660 100644
--- a/modulesets/gnome-apps-3.2.modules
+++ b/modulesets/gnome-apps-3.2.modules
@@ -405,7 +405,7 @@
     <dependencies>
       <dep package="pygobject"/>
       <dep package="gtk+-2"/>
-      <dep package="pycairo"/>
+      <dep package="py2cairo"/>
     </dependencies>
   </autotools>
 
@@ -917,7 +917,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="pygtk"/>
-      <dep package="pycairo"/>
+      <dep package="py2cairo"/>
     </dependencies>
     <suggests>
       <dep package="gnome-python-desktop"/>
@@ -959,7 +959,7 @@
       <dep package="intltool"/>
       <dep package="libwnck-2"/>
       <dep package="pyatspi2"/>
-      <dep package="pycairo"/>
+      <dep package="py2cairo"/>
       <dep package="pygtk"/>
       <dep package="gnome-python-desktop"/> <!-- for wnck -->
       <dep package="pyxdg"/>
diff --git a/modulesets/gnome-suites-core-deps-3.2.modules b/modulesets/gnome-suites-core-deps-3.2.modules
index c0b360b..3e23f77 100644
--- a/modulesets/gnome-suites-core-deps-3.2.modules
+++ b/modulesets/gnome-suites-core-deps-3.2.modules
@@ -1057,17 +1057,17 @@
     </after>
   </tarball>
 
-  <autotools id="pycairo">
-    <pkg-config>pycairo.pc</pkg-config>
-    <branch module="releases/pycairo-1.8.2.tar.gz" version="1.8.2"
+  <waf id="py2cairo" waf-command="./waf">
+    <pkg-config>py2cairo.pc</pkg-config>
+    <branch module="releases/py2cairo-1.10.0.tar.bz2" version="1.10.0"
             repo="cairo.org"
-            hash="sha256:77a8cbe388fd66825056744f2fc5c58b3afc247748bc2c777751cc0c2eb30a2f"
-            md5sum="bbfc0c2fef08dfb0c5b8baa5f0b67a87" size="519064">
+            hash="sha256:d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431"
+            md5sum="20337132c4ab06c1146ad384d55372c5" size="402070">
     </branch>
     <dependencies>
       <dep package="cairo"/>
     </dependencies>
-  </autotools>
+  </waf>
 
   <autotools id="pygobject">
     <branch revision="pygobject-2-28"/>
diff --git a/modulesets/gnome-world-3.2.modules b/modulesets/gnome-world-3.2.modules
index 8fdbd8b..6f666d3 100644
--- a/modulesets/gnome-world-3.2.modules
+++ b/modulesets/gnome-world-3.2.modules
@@ -807,7 +807,7 @@
     <branch/>
     <dependencies>
       <dep package="pygtk"/>
-      <dep package="pycairo"/>
+      <dep package="py2cairo"/>
       <dep package="gstreamer"/>
       <dep package="gst-python"/>
       <dep package="gnonlin"/>
@@ -1172,7 +1172,7 @@
            checkoutdir="labyrinth"/>
    <dependencies>
      <dep package="pygtk"/>
-     <dep package="pycairo"/>
+     <dep package="py2cairo"/>
    </dependencies>
  </autotools>
 
@@ -1908,7 +1908,7 @@
             module="lp:gnome-activity-journal"
             checkoutdir="gnome-activity-journal"/>
     <dependencies>
-      <dep package="pycairo"/>
+      <dep package="py2cairo"/>
       <dep package="pygtk"/>
       <dep package="fungtk"/>
       <dep package="dbus-python"/>