[jhbuild] pycairo: py3cairo -> pycairo, py2cairo -> pycairo-python2

[Christoph Reiter <creiter src gnome org>]

commit 07ba4d389ae739194a0e82d528a7a51bec077a75
Author: Christoph Reiter <creiter src gnome org>
Date:   Sun Apr 15 13:25:10 2018 +0200

    pycairo: py3cairo -> pycairo, py2cairo -> pycairo-python2
    
    It's the same project again

 modulesets/gnome-apps-latest.modules             |    2 +-
 modulesets/gnome-suites-core-deps-latest.modules |    4 ++--
 modulesets/gnome-world.modules                   |   12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/modulesets/gnome-apps-latest.modules b/modulesets/gnome-apps-latest.modules
index 0ef1142..44d6352 100644
--- a/modulesets/gnome-apps-latest.modules
+++ b/modulesets/gnome-apps-latest.modules
@@ -174,7 +174,7 @@
       <dep package="pyatspi2"/>
       <dep package="yelp-tools"/>
       <dep package="gtk+-3"/>
-      <dep package="py3cairo"/>
+      <dep package="pycairo"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index d602b10..8eed745 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -1711,7 +1711,7 @@ the module and we will just change it to use a tarball anyway.
     </suggests>
   </autotools>
 
-  <distutils id="py3cairo" python3="1">
+  <distutils id="pycairo" python3="1">
     <branch repo="github-tar"
             version="1.16.1"
             module="pygobject/pycairo/releases/download/v${version}/pycairo-${version}.tar.gz"
@@ -1724,7 +1724,7 @@ the module and we will just change it to use a tarball anyway.
     <branch repo="gitlab.gnome.org" module="GNOME/pygobject.git"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="py3cairo"/>
+      <dep package="pycairo"/>
       <dep package="python3-devel"/>
       <dep package="gobject-introspection"/>
     </dependencies>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 090f1ae..1e7b4b8 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -766,7 +766,7 @@
     </dependencies>
   </autotools>
 
-  <distutils id="py2cairo">
+  <distutils id="pycairo-python2">
     <branch repo="github.com" module="pygobject/pycairo.git"
             checkoutdir="pycairo-python2"/>
   </distutils>
@@ -776,7 +776,7 @@
     <branch module="pygobject" checkoutdir="pygobject-python2"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="py2cairo"/>
+      <dep package="pycairo-python2"/>
       <dep package="python2-devel"/>
       <dep package="gobject-introspection"/>
     </dependencies>
@@ -787,7 +787,7 @@
     <dependencies>
       <dep package="pygobject2"/>
       <dep package="gtk+-2"/>
-      <dep package="py2cairo"/>
+      <dep package="pycairo-python2"/>
     </dependencies>
   </autotools>
 
@@ -810,7 +810,7 @@
   <distutils id="dogtail">
     <branch repo="fedorahosted.org" module="dogtail.git"/>
     <dependencies>
-      <dep package="py2cairo"/>
+      <dep package="pycairo-python2"/>
       <dep package="pyatspi2-python2"/>
       <dep package="pygobject-python2"/>
       <dep package="pygtk"/>
@@ -1245,7 +1245,7 @@
       <dep package="gst-plugins-ugly"/>
       <dep package="gst-python"/>
       <dep package="gtk+-3"/>
-      <dep package="py3cairo"/>
+      <dep package="pycairo"/>
       <dep package="pygobject"/>
     </dependencies>
   </meson>
@@ -2241,7 +2241,7 @@
     <branch repo="launchpad.net"
             module="gnome-activity-journal"/>
     <dependencies>
-      <dep package="py2cairo"/>
+      <dep package="pycairo-python2"/>
       <dep package="pygtk"/>
       <dep package="fungtk"/>
       <dep package="dbus-python"/>