[jhbuild/wip/mcatanzaro/core-apps: 22/37] 3.20: Move dependencies of gnome-boxes to core-deps

[Michael Catanzaro <mcatanzaro src gnome org>]

commit be4ecedaa8c9eee7d3fd5ced7fc25cdd285f8787
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Jan 17 19:46:44 2016 -0600

    3.20: Move dependencies of gnome-boxes to core-deps

 modulesets/gnome-apps-3.20.modules             |  108 +--------------------
 modulesets/gnome-suites-core-deps-3.20.modules |  123 ++++++++++++++++++++++--
 2 files changed, 116 insertions(+), 115 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.20.modules b/modulesets/gnome-apps-3.20.modules
index bbab3ac..8859555 100644
--- a/modulesets/gnome-apps-3.20.modules
+++ b/modulesets/gnome-apps-3.20.modules
@@ -11,18 +11,12 @@
       href="git://anongit.freedesktop.org/git/"/>
   <repository type="git" name="github.com"
       href="git://github.com/"/>
-  <repository type="git" name="git.libvirt.org"
-      href="git://libvirt.org/"/>
-  <repository type="git" name="fedorahosted.org"
-      href="git://git.fedorahosted.org/git/"/>
   <repository type="git" name="wayland"
       href="git://anongit.freedesktop.org/git/wayland"/>
 
 <!-- tarball repos -->
   <repository type="tarball" name="gnome.org"
     href="https://download.gnome.org/sources/"/>
-  <repository type="tarball" name="spice"
-      href="http://www.spice-space.org/download/"/>
   <repository type="tarball" name="ftp.gnu.org"
       href="http://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="qqwing"
@@ -132,18 +126,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-vnc" autogenargs="--with-gtk=3.0 --enable-vala --disable-werror">
-    <branch/>
-    <dependencies>
-      <dep package="cairo"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="pulseaudio"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="guile">
     <if condition-set="freebsd">
       <autogenargs value="BDW_GC_CFLAGS=' ' BDW_GC_LIBS='-lgc-threaded'"/>
@@ -229,47 +211,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgovirt">
-    <branch/>
-    <dependencies>
-      <dep package="librest"/>
-      <dep package="intltool"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libosinfo"
-             autogenargs="--enable-tests=no --enable-werror=no">
-    <branch repo="fedorahosted.org" module="libosinfo.git"/>
-    <dependencies>
-      <dep package="libsoup"/>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="vala"/>
-      <dep package="wget"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libvirt-glib" autogenargs="--enable-werror=no">
-    <branch repo="git.libvirt.org" module="libvirt-glib.git"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="libvirt"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="phodav">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libsoup"/>
-      <dep package="avahi"/>
-      <dep package="libxml2"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="qqwing">
     <branch repo="qqwing"
             module="qqwing-${version}.tar.gz"
@@ -281,54 +222,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="usbredir">
-    <branch repo="spice"
-            module="usbredir/usbredir-0.7.tar.bz2"
-            version="0.7"
-            hash="sha256:0a63a0712b5dc62be9cca44f97270fea5d1ec1fe7dde0c11dc74a01c8e2006aa"/>
-    <dependencies>
-      <dep package="libusb1"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-webdav --enable-static">
-    <if condition-set="freebsd">
-      <autogenargs value="SSL_CFLAGS=' ' SSL_LIBS='-lssl'"/>
-    </if>
-    <branch repo="spice"
-            module="gtk/spice-gtk-0.29.tar.bz2"
-            version="0.29"
-            hash="sha256:44c7e22713246a2054c3c3b6e0280fd4c1fdbd2c8d33e5eb95bcda4748d5e973"
-            size="1277160"/>
-    <dependencies>
-      <dep package="cairo"/>
-      <dep package="cyrus-sasl"/>
-      <dep package="glib"/>
-      <dep package="gtk-doc"/>
-      <dep package="gtk+"/>
-      <dep package="libjpeg"/>
-      <dep package="openssl"/>
-      <dep package="opus"/>
-      <dep package="phodav"/>
-      <dep package="pixman"/>
-      <dep package="pulseaudio"/>
-      <dep package="spice-protocol"/>
-      <dep package="usbredir"/>
-      <dep package="vala"/>
-      <dep package="zlib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="spice-protocol">
-    <branch repo="spice"
-            module="releases/spice-protocol-0.12.9.tar.bz2"
-            version="0.12.9"
-            hash="sha256:290cf834dd156014d229b474e98006265ab9c5f63b4c471ea3b2cf8b2ff37876"
-            size="71766"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
-
   <autotools id="gdl">
     <branch/>
     <dependencies>
@@ -582,6 +475,7 @@
       <dep package="glib"/>
       <dep package="libxml2"/>
       <dep package="gtk-vnc"/>
+      <dep package="libgovirt"/>
       <dep package="libosinfo"/>
       <dep package="libusb1"/>
       <dep package="libvirt-glib"/>
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index b5de8d0..788401a 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -24,6 +24,12 @@
     href="git://linuxwacom.git.sourceforge.net/"/>
 <repository type="git" name="quvi"
     href="git://repo.or.cz/"/>
+<repository type="git" name="git.libvirt.org"
+    href="git://libvirt.org/"/>
+<repository type="git" name="fedorahosted.org"
+    href="git://git.fedorahosted.org/git/"/>
+<repository type="tarball" name="spice"
+    href="http://www.spice-space.org/download/"/>
 
 <!-- tarball repos -->
 <repository type="tarball" name="cairo.org"
@@ -735,6 +741,18 @@
     </suggests>
   </autotools>
 
+  <autotools id="gtk-vnc" autogenargs="--with-gtk=3.0 --enable-vala --disable-werror">
+    <branch/>
+    <dependencies>
+      <dep package="cairo"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="pulseaudio"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gupnp"
              autogenargs="--with-context-manager=network-manager">
     <branch />
@@ -968,6 +986,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgovirt">
+    <branch/>
+    <dependencies>
+      <dep package="librest"/>
+      <dep package="intltool"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libgusb">
     <branch repo="github.com" checkoutdir="libgusb" module="hughsie/libgusb.git"/>
     <dependencies>
@@ -1064,6 +1091,18 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libosinfo"
+             autogenargs="--enable-tests=no --enable-werror=no">
+    <branch repo="fedorahosted.org" module="libosinfo.git"/>
+    <dependencies>
+      <dep package="libsoup"/>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="vala"/>
+      <dep package="wget"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libpeas"
              autogenargs="--enable-python3">
     <branch/>
@@ -1148,6 +1187,16 @@
     </suggests>
   </autotools>
 
+  <autotools id="libvirt-glib" autogenargs="--enable-werror=no">
+    <branch repo="git.libvirt.org" module="libvirt-glib.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libvirt"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libwacom">
     <branch repo="sourceforge.net"
             module="linuxwacom/files/libwacom/libwacom-${version}.tar.bz2" version="0.13"
@@ -1286,6 +1335,16 @@
             size="1455359"/>
   </autotools>
 
+  <autotools id="phodav">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="avahi"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
   <!-- Python 3 build of pygobject -->
   <autotools id="pygobject" autogenargs="--with-python=python3">
     <branch/>
@@ -1298,6 +1357,52 @@
     </dependencies>
   </autotools>
 
+  <autotools id="sound-theme-freedesktop">
+    <branch repo="people.freedesktop.org"
+            module="~mccann/dist/sound-theme-freedesktop-0.8.tar.bz2"
+            version="0.8"
+            hash="sha256:cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14"
+            size="478237"/>
+  </autotools>
+
+  <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-webdav --enable-static">
+    <if condition-set="freebsd">
+      <autogenargs value="SSL_CFLAGS=' ' SSL_LIBS='-lssl'"/>
+    </if>
+    <branch repo="spice"
+            module="gtk/spice-gtk-0.29.tar.bz2"
+            version="0.29"
+            hash="sha256:44c7e22713246a2054c3c3b6e0280fd4c1fdbd2c8d33e5eb95bcda4748d5e973"
+            size="1277160"/>
+    <dependencies>
+      <dep package="cairo"/>
+      <dep package="cyrus-sasl"/>
+      <dep package="glib"/>
+      <dep package="gtk-doc"/>
+      <dep package="gtk+"/>
+      <dep package="libjpeg"/>
+      <dep package="openssl"/>
+      <dep package="opus"/>
+      <dep package="phodav"/>
+      <dep package="pixman"/>
+      <dep package="pulseaudio"/>
+      <dep package="spice-protocol"/>
+      <dep package="usbredir"/>
+      <dep package="vala"/>
+      <dep package="zlib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="spice-protocol">
+    <branch repo="spice"
+            module="releases/spice-protocol-0.12.9.tar.bz2"
+            version="0.12.9"
+            hash="sha256:290cf834dd156014d229b474e98006265ab9c5f63b4c471ea3b2cf8b2ff37876"
+            size="71766"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
   <autotools id="telepathy-glib" autogenargs="--enable-vala-bindings --disable-fatal-warnings">
     <pkg-config>telepathy-glib.pc</pkg-config>
     <branch repo="telepathy.freedesktop.org"/>
@@ -1313,14 +1418,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="sound-theme-freedesktop">
-    <branch repo="people.freedesktop.org"
-            module="~mccann/dist/sound-theme-freedesktop-0.8.tar.bz2"
-            version="0.8"
-            hash="sha256:cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14"
-            size="478237"/>
-  </autotools>
-
   <autotools id="telepathy-logger" autogenargs="--disable-Werror">
     <pkg-config>telepathy-logger-0.2.pc</pkg-config>
     <branch repo="telepathy.freedesktop.org"/>
@@ -1394,6 +1491,16 @@
     </dependencies>
   </autotools>
 
+  <autotools id="usbredir">
+    <branch repo="spice"
+            module="usbredir/usbredir-0.7.tar.bz2"
+            version="0.7"
+            hash="sha256:0a63a0712b5dc62be9cca44f97270fea5d1ec1fe7dde0c11dc74a01c8e2006aa"/>
+    <dependencies>
+      <dep package="libusb1"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="vala" autogenargs="--enable-vapigen" supports-non-srcdir-builds="no">
     <pkg-config>libvala-0.32.pc</pkg-config>
     <branch />