[jhbuild] 3.8: Switch pyatspi2 to python 3, create pyatspi2-python2

[Joanmarie Diggs <joanied src gnome org>]

commit fd901267f0eb8959c61f4ea141b20241bc72bea5
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sat Nov 10 18:18:46 2012 -0500

    3.8: Switch pyatspi2 to python 3, create pyatspi2-python2

 modulesets/gnome-apps-3.8.modules  |   15 +++++++++++++--
 modulesets/gnome-world-3.8.modules |    2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.8.modules b/modulesets/gnome-apps-3.8.modules
index 539bf5a..332547b 100644
--- a/modulesets/gnome-apps-3.8.modules
+++ b/modulesets/gnome-apps-3.8.modules
@@ -473,9 +473,20 @@
     <branch repo="opalvoip.sf.net" module="ptlib/branches/v2_10"/>
   </autotools>
 
-  <autotools id="pyatspi2">
+  <autotools id="pyatspi2" autogenargs="--with-python=python3" >
     <branch/>
     <dependencies>
+      <dep package="pygobject"/>
+    </dependencies>
+    <suggests>
+      <dep package="at-spi2-core"/>
+    </suggests>
+  </autotools>
+
+  <!-- Python 2 build of pyatspi2, needed for Accerciser and Dogtail -->
+  <autotools id="pyatspi2-python2" autogenargs="--with-python=python2">
+    <branch module="pyatspi2" checkoutdir="pyatspi2-python2"/>
+    <dependencies>
       <dep package="pygobject-python2"/>
     </dependencies>
     <suggests>
@@ -613,7 +624,7 @@
       <dep package="at-spi2-atk"/> <!-- to make accerciser's gui accessible -->
       <dep package="intltool"/>
       <dep package="pygobject-python2"/>
-      <dep package="pyatspi2"/>
+      <dep package="pyatspi2-python2"/>
       <dep package="yelp-tools"/>
       <dep package="gtk+"/>
     </dependencies>
diff --git a/modulesets/gnome-world-3.8.modules b/modulesets/gnome-world-3.8.modules
index 178a592..1c8fe98 100644
--- a/modulesets/gnome-world-3.8.modules
+++ b/modulesets/gnome-world-3.8.modules
@@ -600,7 +600,7 @@
     <branch repo="fedorahosted.org" module="dogtail.git"/>
     <dependencies>
       <dep package="py2cairo"/>
-      <dep package="pyatspi2"/>
+      <dep package="pyatspi2-python2"/>
       <dep package="pygobject-python2"/>
       <dep package="pygtk"/>
     </dependencies>