[jhbuild] 3.20: Move orca to gnome-suites-core

[Javier Jardón Cabezas <jjardon src gnome org>]

commit a030f99124505ee3842225054640b90240e3af2c
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Jan 8 15:48:55 2016 +0000

    3.20: Move orca to gnome-suites-core

 modulesets/gnome-apps-3.20.modules        |   40 -----------------------------
 modulesets/gnome-suites-core-3.20.modules |   16 +++++++++++
 modulesets/gnome-sysdeps-3.20.modules     |    6 ++++
 3 files changed, 22 insertions(+), 40 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.20.modules b/modulesets/gnome-apps-3.20.modules
index c82ab1f..23b72f4 100644
--- a/modulesets/gnome-apps-3.20.modules
+++ b/modulesets/gnome-apps-3.20.modules
@@ -27,8 +27,6 @@
       href="http://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="qqwing"
       href="http://ostermiller.org/qqwing/"/>
-  <repository type="tarball" name="speech-dispatcher"
-      href="http://devel.freebsoft.org/pub/projects/speechd/"/>
   <repository type="tarball" name="tarball.github.com"
     href="https://github.com/"/>
   <repository type="tarball" name="downloads.sourceforge.net"
@@ -307,16 +305,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="pyatspi2" autogenargs="--with-python=python3" >
-    <branch/>
-    <dependencies>
-      <dep package="pygobject"/>
-    </dependencies>
-    <suggests>
-      <dep package="at-spi2-core"/>
-    </suggests>
-  </autotools>
-
   <autotools id="qqwing">
     <branch repo="qqwing"
             module="qqwing-${version}.tar.gz"
@@ -328,17 +316,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="speech-dispatcher" autogenargs="--with-espeak">
-    <branch repo="speech-dispatcher"
-            module="speech-dispatcher-${version}.tar.gz"
-            version="0.8"
-            hash="sha256:0a6ce544cfbac8592a8ea08e3ab24c389153904ea51c6fd68756cea52de9efa2"/>
-    <dependencies>
-      <dep package="dotconf"/>
-      <dep package="espeak"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="usbredir">
     <branch repo="spice"
             module="usbredir/usbredir-0.7.tar.bz2"
@@ -1120,22 +1097,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="orca">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="at-spi2-atk"/> <!-- to make Orca's gui accessible -->
-      <dep package="gobject-introspection"/>
-      <dep package="intltool"/>
-      <dep package="pyatspi2"/>
-      <dep package="pygobject"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-    <suggests>
-      <dep package="speech-dispatcher"/>
-    </suggests>
-  </autotools>
-
   <autotools id="polari">
     <branch/>
     <dependencies>
@@ -1286,7 +1247,6 @@
       <dep package="lightsoff"/>
       <dep package="nautilus-sendto"/>
       <dep package="nemiver"/>
-      <dep package="orca"/>
       <dep package="polari"/>
       <dep package="quadrapassel"/>
       <dep package="rygel"/>
diff --git a/modulesets/gnome-suites-core-3.20.modules b/modulesets/gnome-suites-core-3.20.modules
index c8bcc24..14e33a6 100644
--- a/modulesets/gnome-suites-core-3.20.modules
+++ b/modulesets/gnome-suites-core-3.20.modules
@@ -814,6 +814,22 @@
     </dependencies>
   </autotools>
 
+  <autotools id="orca">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="at-spi2-atk"/> <!-- to make Orca's gui accessible -->
+      <dep package="gobject-introspection"/>
+      <dep package="intltool"/>
+      <dep package="pyatspi2"/>
+      <dep package="pygobject"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+    <suggests>
+      <dep package="speech-dispatcher"/>
+    </suggests>
+  </autotools>
+
   <autotools id="sushi">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.20.modules b/modulesets/gnome-sysdeps-3.20.modules
index 30e5ccf..389a487 100644
--- a/modulesets/gnome-sysdeps-3.20.modules
+++ b/modulesets/gnome-sysdeps-3.20.modules
@@ -1012,6 +1012,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="speech-dispatcher">
+    <pkg-config>speech-dispatcher.pc</pkg-config>
+    <branch repo="system"
+            version="0.8"/>
+  </systemmodule>
+
   <systemmodule id="speex">
     <pkg-config>speex.pc</pkg-config>
     <branch repo="system"