[jhbuild] 3.16: Move libvirt to -sysdeps

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

commit 9a33fa415aefffc35de58e50d5566ee47ee0f3e9
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Oct 22 23:50:46 2014 +0100

    3.16: Move libvirt to -sysdeps
    
    1.0.6 is available in modern distros

 modulesets/gnome-apps-3.16.modules    |   15 ---------------
 modulesets/gnome-sysdeps-3.16.modules |   13 ++++++-------
 2 files changed, 6 insertions(+), 22 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.16.modules b/modulesets/gnome-apps-3.16.modules
index c536c77..70c7a34 100644
--- a/modulesets/gnome-apps-3.16.modules
+++ b/modulesets/gnome-apps-3.16.modules
@@ -25,8 +25,6 @@
     href="https://download.gnome.org/sources/"/>
   <repository type="tarball" name="spice"
       href="http://www.spice-space.org/download/"/>
-  <repository type="tarball" name="libvirt.org"
-      href="http://libvirt.org/sources/"/>
   <repository type="tarball" name="ftp.gnu.org"
       href="http://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="qqwing"
@@ -86,19 +84,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="libvirt" autogenargs="--with-yajl">
-    <branch repo="libvirt.org"
-            module="libvirt-1.0.6.tar.gz"
-            version="1.0.6"
-            hash="sha256:a188eb2056d7936c4c9605f4d435b9097880ec359e10be6546f2c9fa665de67d">
-    </branch>
-    <dependencies>
-      <dep package="device-mapper"/>
-      <dep package="libnl"/>
-      <dep package="yajl"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-online-miners">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.16.modules b/modulesets/gnome-sysdeps-3.16.modules
index 88f13ab..0e33b9f 100644
--- a/modulesets/gnome-sysdeps-3.16.modules
+++ b/modulesets/gnome-sysdeps-3.16.modules
@@ -595,6 +595,12 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libvirt">
+    <pkg-config>libvirt.pc</pkg-config>
+    <branch repo="system"
+            version="1.0.6"/>
+  </systemmodule>
+
   <systemmodule id="libvorbis">
     <pkg-config>vorbisfile.pc</pkg-config>
     <branch repo="system"/>
@@ -854,13 +860,6 @@
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="yajl">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="c_include" name="yajl/yajl_common.h"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="yasm">
     <branch repo="system"/>
     <systemdependencies>