[jhbuild] 3.16: Move libcanberra to -sysdeps

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

commit 1fcdb27cb2d05dec1f8c5e587513c49c22200ac8
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Oct 22 21:56:00 2014 +0100

    3.16: Move libcanberra to -sysdeps
    
    Latest release is more than 2 years old

 modulesets/gnome-suites-core-deps-3.16.modules |   20 --------------------
 modulesets/gnome-sysdeps-3.16.modules          |    6 ++++++
 2 files changed, 6 insertions(+), 20 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index 9bea823..66407f9 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -953,26 +953,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libcanberra" autogen-sh="configure" autogenargs="--with-systemdsystemunitdir=no">
-    <pkg-config>libcanberra-gtk.pc</pkg-config>
-    <branch repo="0pointer.de"
-            
module="http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-0.30.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/libcanberra-0.30.tar.xz";
-            version="0.30"
-            hash="sha256:c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72">
-    </branch>
-    <dependencies>
-      <dep package="gtk-doc"/>
-      <dep package="libvorbis"/>
-      <dep package="libtool-ltdl"/>
-    </dependencies>
-    <after>
-      <dep package="gtk+"/>
-      <dep package="gtk+-2"/>
-      <dep package="pulseaudio"/>
-      <dep package="gstreamer"/>
-    </after>
-  </autotools>
-
  <autotools id="libchamplain">
    <branch/>
    <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.16.modules b/modulesets/gnome-sysdeps-3.16.modules
index fcb68b8..36527b5 100644
--- a/modulesets/gnome-sysdeps-3.16.modules
+++ b/modulesets/gnome-sysdeps-3.16.modules
@@ -308,6 +308,12 @@
             version="0.17"/>
   </systemmodule>
 
+  <systemmodule id="libcanberra">
+    <pkg-config>libcanberra-gtk.pc</pkg-config>
+    <branch repo="system"
+            version="0.30"/>
+  </systemmodule>
+
   <systemmodule id="libmusicbrainz">
     <pkg-config>libmusicbrainz5.pc</pkg-config>
     <branch repo="system"