[gnome-modulesets] resync with current 3.12 modulesets



commit ee7af57721d34b02a3773166021cd3fdcbd72e75
Author: Javier Jardón <javier jardon codethink co uk>
Date:   Wed Apr 2 12:50:18 2014 +0100

    resync with current 3.12 modulesets

 gnome-apps.modules      |  257 +++--
 gnome-core-deps.modules |  366 ++++--
 gnome-core.modules      |  214 +++-
 gnome-sysdeps.modules   |  100 ++-
 gnome-world.modules     | 3322 +++++++++++++++++++++++++++++++++++++++--------
 5 files changed, 3391 insertions(+), 868 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index 4ea7529..2b94eb0 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -27,16 +27,16 @@
       href="http://www.spice-space.org/download/"/>
   <repository type="tarball" name="libvirt.org"
       href="http://libvirt.org/sources/"/>
-  <repository type="tarball" name="xiph.org"
-        href="http://downloads.xiph.org/releases/"/>
   <repository type="tarball" name="ftp.gnu.org"
       href="http://ftp.gnu.org/gnu/"/>
   <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/"/>
 
-  <include href="gnome-suites-core-3.10.modules"/>
+  <include href="gnome-suites-core-3.12.modules"/>
 
-  <!-- NOTE: gnome-suites-core-3.10 and gnome-suites-core-deps-3.10
+  <!-- NOTE: gnome-suites-core-* and gnome-suites-core-deps-*
        are supposed to remain self-contained. If apps have dependencies
        that are not covered there, add them in here
     -->
@@ -45,7 +45,7 @@
     <branch/>
   </autotools>
 
-  <autotools id="gegl" autogenargs="--disable-docs">
+  <autotools id="gegl">
     <branch revision="gegl-0-2"/>
     <dependencies>
       <dep package="babl"/>
@@ -66,18 +66,10 @@
       <dep package="libxml2"/>
       <dep package="glib"/>
       <dep package="WebKit"/>
-      <dep package="zeitgeist"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="celt">
-    <branch repo="xiph.org"
-            module="celt/celt-0.5.1.3.tar.gz"
-            version="0.5.1.3"
-            hash="sha256:fc2e5b68382eb436a38c3104684a6c494df9bde133c139fbba3ddb5d7eaa6a2e"
-            size="440772"/>
-    <dependencies>
     </dependencies>
+    <suggests>
+      <dep package="zeitgeist"/>
+    </suggests>
   </autotools>
 
   <autotools id="libvirt" autogenargs="--with-yajl">
@@ -100,6 +92,7 @@
       <dep package="gnome-online-accounts"/>
       <dep package="grilo"/>
       <dep package="libgdata"/>
+      <dep package="libgfbgraph"/>
       <dep package="libzapojit"/>
       <dep package="tracker"/>
     </dependencies>
@@ -116,6 +109,9 @@
       <dep package="libgweather"/>
       <dep package="gjs"/>
     </dependencies>
+    <suggests>
+      <dep package="dogtail"/>
+    </suggests>
   </autotools>
 
   <autotools id="ghex">
@@ -211,6 +207,7 @@
              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"/>
@@ -228,15 +225,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="mash">
-    <branch repo="github.com" module="clutter-project/mash.git"/>
-    <dependencies>
-      <dep package="clutter"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="pyatspi2" autogenargs="--with-python=python3" >
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="pygobject"/>
     </dependencies>
@@ -246,49 +236,37 @@
   </autotools>
 
   <autotools id="speech-dispatcher" autogenargs="--with-espeak">
-    <branch repo="speech-dispatcher" module="speech-dispatcher-0.8-beta1.tar.gz" version="0.8-beta1"
-            hash="sha256:eb60069f291008717c429aff210afe6075c24b68b8de75fe16d9298e85cbac5c"
-            size="1229374"/>
+    <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="spice-protocol">
+  <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-static">
     <branch repo="spice"
-            module="releases/spice-protocol-0.12.5.tar.bz2"
-            version="0.12.5"
-            hash="sha256:feacb14940cdcc10214ec8cdc2198d880e54eb206e6d65a9bddf8360b27f7bf9"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
-
-  <autotools id="spice-server" autogenargs="--disable-smartcard --without-sasl --disable-client">
-    <branch repo="spice"
-            module="releases/spice-0.12.2.tar.bz2"
-            version="0.12.2"
-            hash="sha256:5654fac02f5568088ea01979088d539f4e95551568dd709ec197e965cf8612d5"
-            size="1685684"/>
-    <dependencies>
-      <dep package="spice-protocol"/>
-      <dep package="celt"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala">
-    <branch repo="spice"
-            module="gtk/spice-gtk-0.20.tar.bz2"
-            version="0.20"
-            hash="sha256:b1355823b0ceb2e118c1f9a9a602ccab78e1e2edf2d93f71fa42d3bc85ca75df"
-            size="1210694">
+            module="gtk/spice-gtk-0.23.tar.bz2"
+            version="0.23"
+            hash="sha256:bfdfa6cb12c40327b63167fe7191ce94e7f2a272473c87df31790c25d60cc81d"
+            size="1224546">
+       <patch file="spice-gtk-0.23-fix-disable-static-builds.patch" strip="1"/>
     </branch>
     <dependencies>
-      <dep package="celt"/>
+      <dep package="cairo"/>
       <dep package="cyrus-sasl"/>
-      <dep package="spice-protocol"/>
+      <dep package="glib"/>
+      <dep package="gtk-doc"/>
       <dep package="gtk+"/>
+      <dep package="libjpeg"/>
+      <dep package="openssl"/>
+      <dep package="opus"/>
+      <dep package="pixman"/>
+      <dep package="pulseaudio"/>
       <dep package="vala"/>
+      <dep package="zlib"/>
     </dependencies>
   </autotools>
 
@@ -321,9 +299,25 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgfbgraph">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="json-glib"/>
+      <dep package="librest"/>
+      <dep package="libsoup"/>
+      <dep package="gnome-online-accounts"/>
+    </dependencies>
+  </autotools>
+
   <cmake id="libgit2"
          cmakeargs="-DTHREADSAFE:BOOL=1">
-    <branch repo="github.com" module="libgit2/libgit2.git" checkoutdir="libgit2" revision="master"/>
+    <branch repo="tarball.github.com"
+            module="libgit2/libgit2/archive/v${version}.tar.gz"
+            version="0.20.0"
+            hash="509ab8091623df5b745cd13682539ca2dc2372051d3418355a7acc5b4a20c2f1"
+            checkoutdir="libgit2">
+    </branch>
   </cmake>
 
   <autotools id="libgit2-glib">
@@ -370,6 +364,7 @@
   <autotools id="gnome-maps">
     <branch/>
     <dependencies>
+      <dep package="clutter-gtk"/>
       <dep package="gjs"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -405,7 +400,7 @@
   </autotools>
 
   <autotools id="gnome-color-manager">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="exiv2"/>
       <dep package="glib"/>
@@ -420,9 +415,6 @@
       <dep package="yelp-tools"/>
       <!-- and libtiff -->
     </dependencies>
-    <suggests>
-      <dep package="mash"/>
-    </suggests>
   </autotools>
 
   <autotools id="gnome-devel-docs">
@@ -433,7 +425,7 @@
   </autotools>
 
   <autotools id="rygel">
-    <branch revision="rygel-0-20"/>
+    <branch/>
     <dependencies>
       <dep package="vala"/>
       <dep package="gupnp"/>
@@ -445,10 +437,20 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-sound-recorder">
+    <branch/>
+    <dependencies>
+      <dep package="gjs"/>
+      <dep package="glib"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
 <!-- Featured Apps -->
 
   <autotools id="anjuta">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -470,6 +472,7 @@
   <autotools id="cheese">
     <branch/>
     <dependencies>
+      <dep package="appdata-tools"/>
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
@@ -477,7 +480,6 @@
       <dep package="gst-plugins-bad"/>
       <dep package="gst-plugins-base"/>
       <dep package="gst-plugins-good"/>
-      <dep package="gudev"/>
       <dep package="clutter-gst"/>
       <dep package="clutter-gtk"/>
       <dep package="libcanberra"/>
@@ -485,6 +487,9 @@
       <dep package="gnome-video-effects"/>
       <dep package="librsvg"/>
       <dep package="gnome-desktop"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -578,11 +583,12 @@
       <dep package="libvirt-glib"/>
       <dep package="gtk+"/>
       <dep package="spice-gtk"/>
-      <dep package="clutter-gtk"/>
       <dep package="vala"/>
-      <dep package="gudev"/>
       <dep package="tracker"/>
       <dep package="gnome-themes-standard"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -604,9 +610,6 @@
     <branch/>
     <dependencies>
       <dep package="accountsservice"/>
-      <dep package="cheese"/>
-      <dep package="clutter-gtk"/>
-      <dep package="clutter-gst"/>
       <dep package="geoclue"/>
       <dep package="gdm"/>
       <dep package="glib"/>
@@ -617,8 +620,10 @@
       <dep package="iso-codes"/>
       <dep package="libgweather"/>
       <dep package="libpwquality"/>
-      <dep package="network-manager-applet"/>
-      <dep package="NetworkManager"/>
+      <if condition-set="linux">
+        <dep package="network-manager-applet"/>
+        <dep package="NetworkManager"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="upower"/>
@@ -653,7 +658,7 @@
   </autotools>
 
   <autotools id="five-or-more">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -664,7 +669,7 @@
   </autotools>
 
   <autotools id="four-in-a-row">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -675,7 +680,7 @@
   </autotools>
 
   <autotools id="gnome-chess">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -687,7 +692,7 @@
   </autotools>
 
   <autotools id="gnome-klotski">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -696,8 +701,20 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-logs">
+    <branch/>
+    <dependencies>
+      <dep package="appdata-tools"/>
+      <dep package="intltool"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="gtk+"/>
+      <dep package="libsystemd-journal"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-mahjongg">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -708,18 +725,36 @@
   </autotools>
 
   <autotools id="gnome-mines">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
+      <dep package="gnome-themes-standard"/>
       <dep package="gtk+"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-music">
+    <branch/>
+    <dependencies>
+      <dep package="dbus-python"/>
+      <dep package="gnome-icon-theme-symbolic"/>
+      <dep package="gnome-themes-standard"/>
+      <dep package="gobject-introspection"/>
+      <dep package="grilo"/>
+      <dep package="grilo-plugins"/>
+      <dep package="gtk+"/>
+      <dep package="gvfs"/>
+      <dep package="intltool"/>
+      <dep package="pygobject"/>
+      <dep package="tracker"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-nibbles">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -758,7 +793,7 @@
   </autotools>
 
   <autotools id="gnome-photos">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="gegl"/>
       <dep package="cairo"/>
@@ -770,13 +805,15 @@
       <dep package="gnome-online-accounts"/>
       <dep package="gnome-online-miners"/>
       <dep package="gobject-introspection"/>
+      <dep package="grilo"/>
+      <dep package="grilo-plugins"/>
       <dep package="gtk+"/>
       <dep package="tracker"/>
     </dependencies>
   </autotools>
 
   <autotools id="gnome-robots">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -787,7 +824,7 @@
   </autotools>
 
   <autotools id="gnome-sudoku">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -797,7 +834,7 @@
   </autotools>
 
   <autotools id="gnome-tetravex">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -811,13 +848,13 @@
     <branch/>
     <dependencies>
       <dep package="gtk+"/>
-      <dep package="pygobject-python2"/>
+      <dep package="pygobject"/>
       <dep package="gsettings-desktop-schemas"/>
     </dependencies>
   </autotools>
 
   <autotools id="iagno">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -829,7 +866,7 @@
   </autotools>
 
   <autotools id="lightsoff">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -841,7 +878,7 @@
   </autotools>
 
   <autotools id="quadrapassel">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -855,7 +892,7 @@
   </autotools>
 
   <autotools id="swell-foop">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -867,7 +904,7 @@
   </autotools>
 
   <autotools id="tali">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -886,6 +923,19 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-software">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="gtk+"/>
+      <dep package="libnotify"/>
+      <dep package="libsoup"/>
+      <dep package="PackageKit"/>
+      <dep package="sqlite3"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="nautilus-sendto">
     <branch/>
     <dependencies>
@@ -900,7 +950,8 @@
     </suggests>
   </autotools>
 
-  <autotools id="nemiver">
+  <autotools id="nemiver"
+             autogenargs="--enable-gsettings=yes">
     <branch/>
     <dependencies>
       <dep package="boost"/>
@@ -933,6 +984,17 @@
     </suggests>
   </autotools>
 
+  <autotools id="polari">
+    <branch/>
+    <dependencies>
+      <dep package="gjs"/>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="telepathy-glib"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="seahorse">
     <branch/>
     <dependencies>
@@ -956,6 +1018,7 @@
   <autotools id="vinagre">
     <branch/>
     <dependencies>
+      <dep package="appdata-tools"/>
       <dep package="intltool"/>
       <dep package="libxml2"/>
       <dep package="gtk+"/>
@@ -972,6 +1035,9 @@
   </autotools>
 
   <autotools id="brasero">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-inotify"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -1000,6 +1066,14 @@
     </dependencies>
   </autotools>
 
+  <autotools id="jhbuild">
+    <branch/>
+    <dependencies>
+      <dep package="gnome-common"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
 <!-- Meta Modules -->
 
   <!-- Tested applications: these are built continuously by build.gnome.org
@@ -1030,21 +1104,26 @@
       <dep package="gnome-initial-setup"/>
       <dep package="gnome-getting-started-docs"/>
       <dep package="gnome-klotski"/>
+      <dep package="gnome-logs"/>
       <dep package="gnome-mahjongg"/>
       <dep package="gnome-maps"/>
       <dep package="gnome-mines"/>
       <dep package="gnome-nettool"/>
       <dep package="gnome-nibbles"/>
+      <dep package="gnome-photos"/>
       <dep package="gnome-robots"/>
+      <dep package="gnome-software"/>
+      <dep package="gnome-sound-recorder"/>
       <dep package="gnome-sudoku"/>
-      <dep package="gnome-photos"/>
       <dep package="gnome-tetravex"/>
+      <dep package="gnome-tweak-tool"/>
       <dep package="gnome-weather"/>
       <dep package="iagno"/>
       <dep package="lightsoff"/>
       <dep package="nautilus-sendto"/>
       <dep package="nemiver"/>
       <dep package="orca"/>
+      <dep package="polari"/>
       <dep package="quadrapassel"/>
       <dep package="rygel"/>
       <dep package="seahorse"/>
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index 0040431..62518ca 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -28,10 +28,10 @@
     href="git://repo.or.cz/"/>
 
 <!-- tarball repos -->
+<repository type="tarball" name="0pointer.de"
+    href="http://0pointer.de/lennart/projects/"/>
 <repository type="tarball" name="iso-codes"
     href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
-<repository type="tarball" name="github.com/metabrainz"
-    href="https://github.com/downloads/metabrainz/"/>
 <repository type="tarball" name="sourceforge.net"
     href="http://prdownloads.sourceforge.net/sourceforge/"/>
 <repository type="tarball" name="webkitgtk.org"
@@ -40,8 +40,6 @@
     href="http://freedesktop.org/software/"/>
 <repository type="tarball" name="people.freedesktop.org"
     href="http://people.freedesktop.org/"/>
-<repository type="tarball" name="cairo.org"
-    href="http://cairographics.org/"/>
 <repository type="tarball" name="icon-theme.freedesktop.org"
     href="http://icon-theme.freedesktop.org/releases/"/>
 <repository type="tarball" name="libopenraw.freedesktop.org"
@@ -74,34 +72,50 @@
       href="http://www.kernel.org"/>
 <repository type="tarball" name="ftp.gnu.org"
     href="http://ftp.gnu.org/gnu/"/>
+<repository type="tarball" name="libndp"
+    href="http://libndp.org/files/"/>
 
-<include href="gnome-sysdeps-3.10.modules"/>
+<include href="gnome-sysdeps-3.12.modules"/>
 
 <!-- Please try to keep organized alphabetically by section -->
 
 <!-- Build dependencies of gnome-suites-core -->
 
-  <autotools id="cairo" autogenargs="--enable-gl">
-    <pkg-config>cairo.pc</pkg-config>
-    <branch module="releases/cairo-${version}.tar.xz"
-            version="1.12.14"
-            repo="cairo.org"
-            hash="sha256:96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13">
-    </branch>
+  <autotools id="appdata-tools">
+    <branch repo="people.freedesktop.org"
+            module="~hughsient/releases/appdata-tools-${version}.tar.xz"
+            version="0.1.7"
+            hash="sha256:3d704715aa105cdfa50b1dfbdc352445a2ceafd26ba01ff3260b0bcbf3d726c8"
+            size="265164"/>
+<!--
+    <branch repo="github.com" checkoutdir="appdata-tools" module="hughsie/appdata-tools.git"/>
+-->
     <dependencies>
-      <dep package="fontconfig"/>
-      <dep package="gtk-doc"/>
-      <dep package="pixman"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="glib-networking"/>
+      <dep package="libsoup"/>
     </dependencies>
+    <suggests>
+      <dep package="libxslt"/>
+    </suggests>
   </autotools>
 
   <autotools id="geoclue">
-    <branch repo="git.freedesktop.org" branch="2.0.x"/>
+    <if condition-unset="linux">
+      <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-wifi-source"/>
+    </if>
+    <branch repo="git.freedesktop.org"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="geoip"/>
       <dep package="json-glib"/>
       <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <if condition-set="linux">
+        <dep package="ModemManager"/>
+        <dep package="NetworkManager"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -123,7 +137,7 @@
   </autotools>
 
   <autotools id="gcr">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
@@ -131,6 +145,7 @@
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
       <dep package="p11-kit"/>
+      <dep package="vala"/>
     </dependencies>
   </autotools>
 
@@ -152,10 +167,10 @@
   <autotools id="iso-codes">
     <pkg-config>iso-codes.pc</pkg-config>
     <branch repo="iso-codes"
-            module="iso-codes-3.33.tar.bz2"
-            version="3.33"
-            hash="sha256:682a8df2ea1d970093e8a9f37d6a32293c3b48e458a295862905a83a1b098853"
-            size="6349976"/>
+            module="iso-codes-3.51.tar.xz"
+            version="3.51"
+            hash="sha256:5222f79d92ac021a56c7080616c13655c50f7b1ff1a31ec0308da14a684ad77f"
+            size="3626932"/>
   </autotools>
 
   <autotools id="hicolor-icon-theme" supports-non-srcdir-builds="no"
@@ -180,6 +195,7 @@
     <pkg-config>libgdata.pc</pkg-config>
     <branch/>
     <dependencies>
+      <dep package="json-glib"/>
       <dep package="gcr"/>
       <dep package="glib"/>
       <dep package="gnome-online-accounts"/>
@@ -201,19 +217,24 @@
     </dependencies>
   </autotools>
 
-  <cmake id="libmusicbrainz"
-         cmakeargs="-DLIB_SUFFIX=${libsuffix}">
-    <pkg-config>libmusicbrainz5.pc</pkg-config>
-    <branch repo="github.com/metabrainz"
-            module="libmusicbrainz/libmusicbrainz-5.0.1.tar.gz"
-            version="5.0.1"
-            hash="sha256:1ca75e1c5059a3620b0d82633b1f468acc2a65fcc4305f844ec44f6fb5db82d5"
-            size="109119">
-    </branch>
+  <autotools id="libmediaart" autogenargs="--disable-qt">
+    <branch/>
     <dependencies>
-      <dep package="neon"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="gtk-doc"/>
+      <dep package="vala"/>
     </dependencies>
-  </cmake>
+  </autotools>
+
+  <autotools id="libndp">
+    <pkg-config>libndp.pc</pkg-config>
+    <branch module="libndp-${version}.tar.gz"
+            version="1.2"
+            repo="libndp"
+            hash="sha256:38403566cad3eabea04450847ebcdfee520f39497291d35e0c071230f941526a">
+    </branch>
+  </autotools>
 
   <autotools id="libqmi">
     <branch repo="git.freedesktop.org" module="libqmi.git"/>
@@ -259,27 +280,37 @@
     </dependencies>
   </autotools>
 
-  <autotools id="cogl" autogenargs="--enable-wayland-egl-platform --enable-wayland-egl-server 
--enable-kms-egl-platform --enable-xlib-egl-platform">
+  <autotools id="cogl" autogenargs="--enable-xlib-egl-platform --enable-cogl-gst">
+    <if condition-set="wayland">
+      <autogenargs value="--enable-wayland-egl-platform --enable-wayland-egl-server 
--enable-kms-egl-platform"/>
+    </if>
     <pkg-config>cogl-1.0.pc</pkg-config>
-    <branch revision="cogl-1.16"/>
+    <branch revision="cogl-1.18"/>
     <dependencies>
-      <dep package="gbm"/>
       <dep package="glib"/>
       <dep package="gtk-doc"/>
       <dep package="libdrm"/>
       <dep package="libXcomposite"/>
       <dep package="xcb-dri2" />
       <dep package="pango"/>
-      <dep package="wayland"/>
-      <dep package="wayland-egl"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <if condition-set="wayland">
+        <dep package="wayland"/>
+        <dep package="wayland-egl"/>
+        <dep package="gbm"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="gobject-introspection"/>
     </suggests>
   </autotools>
 
-  <autotools id="clutter" autogenargs="--enable-installed-tests --enable-wayland-backend 
--enable-wayland-compositor --enable-evdev-input --enable-egl-backend">
-    <branch revision="clutter-1.16"/>
+  <autotools id="clutter" autogenargs="--enable-installed-tests --enable-egl-backend">
+    <if condition-set="wayland">
+      <autogenargs value="--enable-wayland-backend --enable-wayland-compositor --enable-evdev-input"/>
+    </if>
+    <branch revision="clutter-1.18"/>
     <dependencies>
       <dep package="cogl"/>
       <dep package="atk"/>
@@ -287,13 +318,17 @@
       <dep package="cairo"/>
       <dep package="json-glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="wayland"/>
-      <dep package="libxkbcommon"/>
-      <dep package="libevdev"/>
+      <if condition-set="wayland">
+        <dep package="wayland"/>
+        <dep package="libxkbcommon"/>
+        <dep package="libinput"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="gdk-pixbuf"/>
-      <dep package="gudev"/>
+      <if condition-set="wayland">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -310,7 +345,7 @@
   </autotools>
 
   <autotools id="glib" autogenargs="--enable-installed-tests">
-    <branch revision="glib-2-38"/>
+    <branch/>
     <dependencies>
       <dep package="gtk-doc"/>
       <dep package="libffi"/>
@@ -320,14 +355,18 @@
            extension points -->
       <dep package="gvfs"/>
       <dep package="glib-networking"/>
+      <dep package="dconf"/>
     </suggests>
     <after>
       <dep package="shared-mime-info"/>
     </after>
   </autotools>
 
-  <autotools id="gtk+" autogenargs="--enable-x11-backend --enable-wayland-backend --enable-broadway-backend 
--enable-installed-tests">
-    <branch revision="gtk-3-10"/>
+  <autotools id="gtk+" autogenargs="--enable-x11-backend --enable-broadway-backend --enable-installed-tests">
+    <if condition-set="wayland">
+      <autogenargs value="--enable-wayland-backend"/>
+    </if>
+    <branch/>
     <dependencies>
       <dep package="atk"/>
       <dep package="glib"/>
@@ -337,8 +376,10 @@
       <dep package="gtk-doc"/>
       <dep package="gobject-introspection"/>
       <dep package="at-spi2-atk"/>
-      <dep package="libxkbcommon"/>
-      <dep package="wayland"/>
+      <if condition-set="wayland">
+        <dep package="libxkbcommon"/>
+        <dep package="wayland"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="shared-mime-info"/>
@@ -367,10 +408,16 @@
     </dependencies>
   </autotools>
 
-  <autotools id="fontconfig" autogenargs="--disable-docs">
-    <branch repo="git.freedesktop.org"/>
+  <autotools id="fontconfig"
+    autogenargs="--disable-docs --with-default-fonts=${prefix}/share/fonts 
--with-add-fonts=/usr/local/share/fonts,/usr/share/fonts">
+    <pkg-config>fontconfig.pc</pkg-config>
+    <branch repo="freedesktop.org"
+            module="fontconfig/release/fontconfig-${version}.tar.bz2"
+            version="2.11.0"
+            hash="sha256:cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467"/>
     <dependencies>
-      <dep package="gperf"/>
+      <dep package="freetype2"/>
+      <dep package="libxml2"/>
     </dependencies>
   </autotools>
 
@@ -397,6 +444,20 @@
   <autotools id="clutter-gst">
     <branch revision="clutter-gst-2.0"/>
     <dependencies>
+      <dep package="cogl"/>
+      <dep package="clutter"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+    <suggests>
+      <dep package="gobject-introspection"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="clutter-gst3">
+    <branch revision="master" module="clutter-gst" checkoutdir="clutter-gst3"/>
+    <dependencies>
+      <dep package="cogl"/>
       <dep package="clutter"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -410,7 +471,9 @@
     <branch repo="freedesktop.org"
             module="farstream/releases/farstream/farstream-${version}.tar.gz"
             version="0.2.2"
-            hash="sha256:ffd3c536372781713956eeb28644a6e9ee6e3bab034bee65af6bbb61213cb080"/>
+            hash="sha256:ffd3c536372781713956eeb28644a6e9ee6e3bab034bee65af6bbb61213cb080">
+      <patch file="farstream.netinet-in.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="libnice"/>
     </dependencies>
@@ -461,19 +524,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnutls">
-    <pkg-config>gnutls.pc</pkg-config>
-    <branch module="gnutls/gnutls-${version}.tar.xz"
-            version="3.0.26"
-            repo="ftp.gnu.org"
-            hash="sha256:a80b55fd9b2fc7c5c7bca4f9fac2caff17880412849823e314393a905bd50ed3">
-    </branch>
-    <dependencies>
-      <dep package="libtasn1" />
-      <dep package="p11-kit" />
-    </dependencies>
-  </autotools>
-
   <autotools id="grilo">
     <branch/>
     <dependencies>
@@ -484,6 +534,8 @@
       <dep package="gtk+"/>
       <dep package="vala"/>
       <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="totem-pl-parser"/>
     </suggests>
   </autotools>
 
@@ -502,11 +554,12 @@
       <dep package="sqlite3"/>
       <dep package="libgcrypt"/>
       <dep package="tracker"/>
+      <dep package="libmediaart"/>
     </suggests>
   </autotools>
 
   <autotools id="gtksourceview" autogenargs="--enable-compile-warnings=maximum">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxml2"/>
@@ -547,7 +600,7 @@
   </autotools>
 
   <autotools id="gobject-introspection">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="bison"/>
       <dep package="flex"/>
@@ -558,11 +611,17 @@
   </autotools>
 
   <autotools id="gjs" autogenargs="--enable-installed-tests">
-    <branch revision="gnome-3-10"/>
+    <if condition-set="coverage">
+      <autogenargs value="--enable-coverage"/>
+    </if>
+    <branch/>
     <dependencies>
       <dep package="dbus-glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="js17"/>
+      <dep package="js24"/>
+      <if condition-set="coverage">
+        <dep package="lcov"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -582,7 +641,6 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gstreamer"
-            revision="1.2"
             checkoutdir="gstreamer"/>
     <dependencies>
       <dep package="glib"/>
@@ -596,7 +654,6 @@
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-base"
-            revision="1.2"
             checkoutdir="gst-plugins-base"/>
     <dependencies>
       <dep package="gstreamer"/>
@@ -604,7 +661,9 @@
       <dep package="iso-codes"/>
     </dependencies>
     <suggests>
-      <dep package="gudev"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -612,7 +671,6 @@
              autogenargs="--disable-fatal-warnings"
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
-            revision="1.2"
             module="gst-plugins-good"
             checkoutdir="gst-plugins-good"/>
     <dependencies>
@@ -627,7 +685,9 @@
     <suggests>
       <dep package="pulseaudio"/>
       <dep package="gdk-pixbuf"/>
-      <dep package="gudev"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -635,7 +695,6 @@
              autogenargs="--disable-fatal-warnings"
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
-            revision="1.2"
             checkoutdir="gst-plugins-bad"
             module="gst-plugins-bad"/>
     <dependencies>
@@ -714,7 +773,9 @@
     </dependencies>
     <suggests>
       <dep package="gobject-introspection"/>
-      <dep package="NetworkManager"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -729,10 +790,10 @@
 
   <autotools id="itstool">
     <branch repo="itstool.org"
-            module="itstool-1.2.0.tar.bz2"
-            version="1.2.0"
-            hash="sha256:46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa"
-            size="82479"/>
+            module="itstool-2.0.2.tar.bz2"
+            version="2.0.2"
+            hash="sha256:bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a"
+            size="96748"/>
   </autotools>
 
   <autotools id="java-gnome" autogen-sh="configure" skip-autogen="never">
@@ -766,6 +827,22 @@
     </dependencies>
   </autotools>
 
+  <autotools id="js24" check-target="false"
+      autogenargs="--enable-threadsafe --with-system-nspr --enable-debug --disable-tests --disable-strip 
--enable-ctypes --enable-system-ffi --disable-intl-api">
+    <pkg-config>mozjs-24.pc</pkg-config>
+    <branch repo="ftp.mozilla.org"
+            module="pub/mozilla.org/js/mozjs-24.2.0.tar.bz2"
+            version="24.2.0"
+            hash="sha256:e62f3f331ddd90df1e238c09d61a505c516fe9fd8c5c95336611d191d18437d8"
+            checkoutdir="js24-24.2.0">
+      <patch file="js24-buildapi.patch" strip="1"/>
+      <patch file="js24-prettyprinters.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="nspr"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="json-glib" autogenargs="--enable-installed-tests">
     <branch/>
     <dependencies>
@@ -776,6 +853,25 @@
     </suggests>
   </autotools>
 
+  <autotools id="libcanberra" autogen-sh="configure" autogenargs="--with-systemdsystemunitdir=no">
+    <pkg-config>libcanberra-gtk.pc</pkg-config>
+    <branch repo="0pointer.de"
+            module="libcanberra/libcanberra-${version}.tar.xz"
+            version="0.30"
+            hash="sha256:c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72">
+    </branch>
+    <dependencies>
+      <dep package="gtk-doc"/>
+      <dep package="libvorbis"/>
+    </dependencies>
+    <after>
+      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
+      <dep package="pulseaudio"/>
+      <dep package="gstreamer"/>
+    </after>
+  </autotools>
+
  <autotools id="libchamplain">
    <branch/>
    <dependencies>
@@ -931,10 +1027,10 @@
 
   <autotools id="p11-kit" supports-non-srcdir-builds="no">
     <branch repo="p11-glue.freedesktop.org"
-            module="p11-kit-0.19.1.tar.gz"
-            version="0.19.1"
-            hash="sha256:94fbed372c11d0a404762aad966e54eb4f44c1d5b871a1b79a1a3b4cf36ed256"
-            size="1026230" />
+            module="p11-kit-0.20.1.tar.gz"
+            version="0.20.1"
+            hash="sha256:524548f0a3bfa1b5712721165b49f0300fb244c907533677e88a9c9743eb4a53"
+            size="1175729" />
   </autotools>
 
   <autotools id="poppler" autogenargs="--enable-xpdf-headers --enable-poppler-glib" 
makeargs="POPPLER_GLIB_DISABLE_DEPRECATED=">
@@ -968,8 +1064,7 @@
 
   <autotools id="telepathy-glib" autogenargs="--enable-vala-bindings --disable-fatal-warnings">
     <pkg-config>telepathy-glib.pc</pkg-config>
-    <branch repo="telepathy.freedesktop.org"
-            revision="telepathy-glib-0.22"/>
+    <branch repo="telepathy.freedesktop.org"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus"/>
@@ -984,11 +1079,15 @@
 
   <autotools id="telepathy-logger" autogenargs="--disable-Werror">
     <pkg-config>telepathy-logger-0.2.pc</pkg-config>
-    <branch repo="telepathy.freedesktop.org"
-            revision="telepathy-logger-0.8"/>
+    <branch repo="telepathy.freedesktop.org"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk-doc"/>
+      <dep package="libxml2"/>
+      <dep package="sqlite3"/>
       <dep package="telepathy-glib"/>
     </dependencies>
   </autotools>
@@ -1005,19 +1104,22 @@
     </dependencies>
     <suggests>
       <dep package="libgcrypt"/>
-      <dep package="libquvi-0.9"/>
+      <!-- <dep package="libquvi-0.9"/> -->
     </suggests>
   </autotools>
 
   <!-- evolution miner broken:
        https://bugzilla.gnome.org/show_bug.cgi?id=678235 -->
   <autotools id="tracker"
-             autogenargs="--enable-miner-firefox=no --enable-miner-thunderbird=no 
--enable-miner-evolution=no --enable-miner-flickr=no --disable-nautilus-extension --disable-tracker-needle 
--disable-tracker-preferences --disable-tracker-search-bar --disable-tracker-explorer 
--with-unicode-support=libicu"
+             autogenargs="--enable-miner-firefox=no --enable-miner-thunderbird=no 
--enable-miner-evolution=no --disable-nautilus-extension --disable-tracker-needle 
--disable-tracker-preferences --with-unicode-support=libicu"
              check-target="false">
-    <branch revision="tracker-0.16"/>
+    <branch/>
     <dependencies>
+      <dep package="glib"/>
       <dep package="libicu"/>
-      <dep package="intltool"/>
+      <dep package="libmediaart"/>
+      <dep package="libpng"/>
+      <dep package="libuuid"/>
       <dep package="sqlite3"/>
       <dep package="vala"/>
     </dependencies>
@@ -1025,18 +1127,21 @@
       <dep package="libsecret"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
-      <dep package="NetworkManager"/>
       <dep package="upower"/>
       <dep package="libgsf"/>
       <dep package="gdk-pixbuf"/>
       <dep package="poppler"/>
       <dep package="totem-pl-parser"/>
       <dep package="dconf"/>
+      <dep package="libosinfo"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+      </if>
     </suggests>
   </autotools>
 
   <autotools id="vala" autogenargs="--enable-vapigen" supports-non-srcdir-builds="no">
-    <pkg-config>libvala-0.20.pc</pkg-config>
+    <pkg-config>libvala-0.24.pc</pkg-config>
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -1062,10 +1167,23 @@
   </autotools>
 
   <autotools id="libevdev" autogenargs="--disable-gcov">
-    <branch repo="git.freedesktop.org" checkoutdir="libevdev" module="libevdev"/>
+    <branch repo="freedesktop.org"
+            checkoutdir="libevdev"
+            module="libevdev/libevdev-${version}.tar.xz"
+            version="1.0"
+            hash="sha256:6e6d1e307eff03f1c939c9af532228b19030fc896a9257a8abfa6e9b7dc91803"/>
+  </autotools>
+
+  <autotools id="libinput">
+    <branch repo="git.freedesktop.org" checkoutdir="libinput" module="wayland/libinput.git" />
+    <dependencies>
+      <dep package="libevdev"/>
+      <dep package="libudev"/>
+      <dep package="mtdev"/>
+    </dependencies>
   </autotools>
 
-  <autotools id="libxkbcommon" autogenargs="--with-xkb-config-root=/usr/share/X11/xkb">
+  <autotools id="libxkbcommon" autogenargs="--with-xkb-config-root=/usr/share/X11/xkb --disable-x11">
     <branch repo="github.com" checkoutdir="libxkbcommon" module="xkbcommon/libxkbcommon.git"/>
     <dependencies>
       <dep package="xorg-macros"/>
@@ -1111,15 +1229,15 @@
              autogenargs="--enable-introspection">
     <pkg-config>webkitgtk-3.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
-            module="webkitgtk-2.2.6.tar.xz" version="2.2.6"
-            hash="sha256:157ee7377ae97a27bb3b9bd2733d9353979632543c3d078b6578aeeb1319bf06"
-            size="9400300">
+            module="webkitgtk-2.3.92.tar.xz" version="2.3.92"
+            hash="sha256:bde8f6bcccf6df720fdfdf6151397b7e7af94110cc5229edccf329718804f021"
+            size="9826992">
     </branch>
     <dependencies>
       <dep package="at-spi2-core"/>
       <dep package="cairo"/>
       <dep package="fontconfig"/>
-      <dep package="geoclue1"/>
+      <dep package="geoclue"/>
       <dep package="libxml2"/>
       <dep package="gst-plugins-base"/>
       <dep package="gtk+"/>
@@ -1143,7 +1261,7 @@
   </autotools>
 
  <autotools id="vte" autogenargs="--with-gtk=3.0 --enable-introspection=yes">
-    <branch revision="vte-0-34"/>
+    <branch revision="vte-0-36"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -1188,22 +1306,28 @@
     <branch repo="gitorious.org" checkoutdir="libgusb" module="gusb/gusb.git"/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="vala"/>
     </dependencies>
   </autotools>
 
   <autotools id="colord" autogenargs="--disable-examples --disable-strict --disable-bash-completion">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-gusb --disable-udev --with-systemdsystemunitdir=no 
--disable-systemd-login"/>
+    </if>
     <branch repo="github.com" checkoutdir="colord" module="hughsie/colord.git"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus"/>
-      <dep package="gudev"/>
       <dep package="libusb1"/>
-      <dep package="libgusb"/>
       <dep package="sqlite3"/>
       <dep package="lcms2"/>
       <dep package="gobject-introspection"/>
       <!-- and cups -->
       <!-- and sane -->
+      <if condition-set="linux">
+        <dep package="libgusb"/>
+        <dep package="gudev"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="polkit"/>
@@ -1231,22 +1355,28 @@
   </autotools>
 
   <autotools id="libpwquality">
+    <if condition-unset="linux">
+      <!-- uses PAM features not in XSSO spec -->
+      <autogenargs value="--disable-pam"/>
+    </if>
     <branch repo="libpwquality"
             module="https://fedorahosted.org/releases/l/i/libpwquality/libpwquality-1.2.2.tar.bz2"; 
version="1.2.2"
             hash="sha256:9689627283b43d20ca74ca822404ee486242e3e528fa95bf7016d37ff46e0696"
-            size="362081"/>
+            size="362081">
+      <patch file="libpwquality.libintl-link.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="cracklib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="ibus"
-             autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf --disable-ui"
-             makeargs="CFLAGS=-Wno-error">
+  <autotools id="ibus" autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf 
--disable-ui GSETTINGS_SCHEMA_CONVERT=/usr/bin/false">
     <branch repo="ibus"
             module="ibus-${version}.tar.gz"
-            version="1.5.3"
-            hash="sha256:2afc6371c24873f0e37554ef07effd022042f8eca6cb649d1bb02d8c57528b8c">
+            version="1.5.5"
+            size="2063794"
+            hash="sha256:02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec">
+      <patch file="ibus.skip-dconf-update-if-DESTDIR-is-set.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="dbus"/>
@@ -1319,24 +1449,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libquvi-scripts-0.9" autogen-template="%(srcdir)s/bootstrap.sh &amp;&amp; 
%(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
-    <branch repo="quvi" module="libquvi-scripts.git" checkoutdir="libquvi-scripts-0.9"/>
-  </autotools>
-
-  <autotools id="libquvi-0.9" autogen-template="%(srcdir)s/bootstrap.sh &amp;&amp; %(srcdir)s/configure 
--prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
-    <branch repo="quvi" module="libquvi.git" checkoutdir="libquvi-0.9"/>
-    <dependencies>
-      <dep package="libquvi-scripts-0.9"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="quvi-tool-0.9" autogen-template="%(srcdir)s/bootstrap.sh &amp;&amp; %(srcdir)s/configure 
--prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
-    <branch repo="quvi" module="quvi-tool.git" checkoutdir="quvi-tool-0.9"/>
-    <dependencies>
-      <dep package="libquvi-0.9"/>
-    </dependencies>
-  </autotools>
-
   <!-- Deprecated dependencies -->
 
   <autotools id="gtk+-2">
diff --git a/gnome-core.modules b/gnome-core.modules
index a3c81d3..3416763 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -24,7 +24,7 @@
   <repository type="tarball" name="kernel.org"
       href="http://www.kernel.org"/>
 
-<include href="gnome-suites-core-deps-3.10.modules"/>
+<include href="gnome-suites-core-deps-3.12.modules"/>
 
 <!-- Please try to keep organized alphabetically by section -->
 
@@ -32,7 +32,7 @@
 <!-- Core User Shell -->
 
   <autotools id="at-spi2-core">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
@@ -41,7 +41,7 @@
   </autotools>
 
   <autotools id="at-spi2-atk">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
@@ -52,7 +52,7 @@
   </autotools>
 
   <autotools id="dconf">
-    <branch revision="dconf-0-18"/>
+    <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
@@ -103,7 +103,7 @@
   </autotools>
 
   <autotools id="gnome-online-accounts">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="WebKit"/>
@@ -116,7 +116,7 @@
   </autotools>
 
   <autotools id="gnome-control-center" supports-non-srcdir-builds="no">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="accountsservice"/>
       <dep package="clutter-gtk"/>
@@ -126,7 +126,6 @@
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gnome-bluetooth"/>
       <dep package="gnome-desktop"/>
       <dep package="gnome-menus"/>
       <dep package="gnome-online-accounts"/>
@@ -139,25 +138,31 @@
       <dep package="libgtop"/>
       <dep package="libnotify"/>
       <dep package="libpwquality"/>
-      <dep package="libwacom"/>
       <dep package="libxml2"/>
-      <dep package="network-manager-applet"/>
       <dep package="polkit"/>
       <dep package="pulseaudio"/>
       <dep package="smbclient"/>
       <dep package="sound-theme-freedesktop"/>
       <dep package="upower"/>
+      <dep package="grilo"/>
+      <if condition-set="linux">
+        <dep package="gnome-bluetooth"/>
+        <dep package="network-manager-applet"/>
+        <dep package="libwacom"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="cups"/>
       <dep package="cheese"/>
       <dep package="gstreamer"/>
-      <dep package="NetworkManager"/>
-      <dep package="network-manager-applet"/>
-      <dep package="ModemManager"/>
       <dep package="ibus-pinyin"/>
       <dep package="ibus-anthy"/>
       <dep package="ibus-hangul"/>
+      <if condition-set="linux">
+        <dep package="network-manager-applet"/>
+        <dep package="ModemManager"/>
+        <dep package="NetworkManager"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -229,7 +234,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-packagekit" autogenargs="--enable-strict=no">
+  <autotools id="gnome-packagekit">
     <branch/>
     <dependencies>
       <dep package="PackageKit"/>
@@ -238,15 +243,16 @@
       <dep package="gnome-menus"/>
       <dep package="libcanberra"/>
       <dep package="gnome-control-center"/>
-      <dep package="upower"/>
     </dependencies>
     <suggests>
-      <dep package="gudev"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
   <autotools id="gnome-session">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gl"/>
@@ -266,7 +272,10 @@
   </autotools>
 
   <autotools id="gnome-settings-daemon">
-    <branch revision="gnome-3-10"/>
+    <if condition-unset="linux">
+      <autogenargs value="--disable-rfkill --disable-gudev"/>
+    </if>
+    <branch/>
     <dependencies>
       <dep package="colord"/>
       <dep package="geoclue"/>
@@ -275,20 +284,22 @@
       <dep package="gnome-desktop"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gtk+"/>
-      <dep package="gudev"/>
       <dep package="intltool"/>
       <dep package="libcanberra"/>
       <dep package="libgweather"/>
       <dep package="libnotify"/>
       <dep package="librsvg"/>
-      <dep package="libwacom"/>
       <dep package="PackageKit"/>
       <dep package="polkit"/>
       <dep package="pulseaudio"/>
       <dep package="upower"/>
       <dep package="ibus"/>
-      <dep package="xorg-wacom"/>
       <dep package="cups"/>
+      <if condition-set="linux">
+        <dep package="libwacom"/>
+        <dep package="xorg-wacom"/>
+        <dep package="gudev"/>
+      </if>
     </dependencies>
     <suggests>
       <!-- <dep package="xkbfile"/> -->
@@ -296,7 +307,10 @@
   </autotools>
 
   <autotools id="gnome-shell" autogenargs="--enable-compile-warnings=maximum">
-    <branch revision="gnome-3-10"/>
+    <if condition-unset="linux">
+      <autogenargs value="--disable-networkmanager"/>
+    </if>
+    <branch/>
     <dependencies>
       <dep package="accountsservice"/>
       <dep package="caribou"/>
@@ -305,7 +319,6 @@
       <dep package="gdm"/> <!-- runtime dependency on Gdm-1.0.typelib-->
       <dep package="gjs"/>
       <dep package="glib"/>
-      <dep package="gnome-bluetooth"/>
       <dep package="gnome-desktop"/>
       <dep package="gnome-icon-theme"/>
       <dep package="gnome-icon-theme-symbolic"/>
@@ -318,8 +331,6 @@
       <dep package="libcroco"/>
       <dep package="libsoup"/>
       <dep package="mutter"/>
-      <dep package="NetworkManager"/>
-      <dep package="network-manager-applet"/>
       <dep package="polkit"/>
       <dep package="pulseaudio"/>
       <dep package="startup-notification"/>
@@ -327,11 +338,18 @@
       <dep package="telepathy-logger"/>
       <dep package="upower"/>
       <dep package="gcr"/>
+      <if condition-set="linux">
+        <dep package="gnome-bluetooth"/>
+        <dep package="NetworkManager"/>
+        <dep package="network-manager-applet"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
-      <dep package="mutter-wayland"/>
+      <if condition-set="wayland">
+        <dep package="mutter-wayland"/>
+      </if>
     </suggests>
     <after>
       <dep package="librsvg"/>
@@ -339,7 +357,7 @@
   </autotools>
 
   <autotools id="gnome-themes-standard">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="cantarell-fonts"/>
@@ -365,16 +383,20 @@
       <dep package="glib"/>
       <dep package="dbus"/>
       <dep package="libsoup"/>
-      <dep package="udisks"/>
+      <if condition-set="linux">
+        <dep package="udisks"/>
+      </if>
     </dependencies>
     <suggests>
-      <dep package="gudev"/>
       <dep package="libgphoto2"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
   <autotools id="glib-networking" autogenargs="--enable-installed-tests">
-    <branch revision="glib-2-38"/>
+    <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="intltool"/>
@@ -398,8 +420,9 @@
   </autotools>
 
   <autotools id="mutter" autogenargs="--enable-compile-warnings=maximum">
-    <branch revision="gnome-3-10"/>
+    <branch />
     <dependencies>
+      <dep package="upower"/>
       <dep package="clutter"/>
       <dep package="gdk-pixbuf"/>
       <dep package="gobject-introspection"/>
@@ -423,8 +446,10 @@
       <dep package="gtk+"/>
       <dep package="intltool"/>
       <dep package="libcanberra"/>
+      <dep package="libsystemd-login"/>
       <dep package="libXinerama"/>
       <dep package="startup-notification"/>
+      <dep package="upower"/>
       <dep package="wayland"/>
       <dep package="zenity"/>
       <dep package="xwayland"/>
@@ -435,7 +460,7 @@
     </suggests>
   </autotools>
   <autotools id="network-manager-applet"
-             autogenargs="--enable-more-warnings=no --disable-migration">
+             autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
     <branch revision="nma-0-9-8"/>
     <dependencies>
       <dep package="glib"/>
@@ -456,32 +481,44 @@
 
   <autotools id="pulseaudio"
              autogenargs="--disable-hal --disable-oss-output --disable-esound --disable-gconf --disable-gtk3 
--enable-bluez5">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-bluez4 --disable-bluez5"/>
+    </if>
     <branch repo="pulseaudio.freedesktop.org"/>
     <dependencies>
       <dep package="alsa"/>
       <dep package="avahi"/>
-      <dep package="bluez"/>
       <dep package="dbus"/>
       <dep package="json"/>
+      <dep package="libcap"/>
       <dep package="libsndfile"/>
       <dep package="libtool-ltdl"/>
-      <dep package="libudev"/>
       <dep package="glib"/>
-      <dep package="sbc"/>
       <dep package="speex"/>
+      <if condition-set="linux">
+        <dep package="bluez"/>
+        <dep package="libudev"/>
+        <dep package="sbc"/>
+      </if>
     </dependencies>
     <after>
       <dep package="polkit"/>
     </after>
   </autotools>
 
-  <autotools id="telepathy-mission-control" autogenargs="--disable-Werror">
-    <branch repo="telepathy.freedesktop.org"
-            revision="telepathy-mission-control-5.16"/>
+  <!-- mc 5.16 doesn't build against upower 1.0 -->
+  <autotools id="telepathy-mission-control" autogenargs="--disable-Werror --disable-upower">
+    <branch repo="telepathy.freedesktop.org" revision="telepathy-mission-control-5.16"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
+      <dep package="glib"/>
+      <dep package="gtk-doc"/>
+      <dep package="libxslt"/>
       <dep package="telepathy-glib"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -533,15 +570,17 @@
       <dep package="enchant"/>
       <dep package="geoclue"/>
       <dep package="geocode-glib"/>
-      <dep package="gudev"/>
       <dep package="iso-codes"/>
       <dep package="libchamplain"/>
-      <dep package="NetworkManager"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
   <autotools id="eog">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -566,7 +605,7 @@
   </autotools>
 
   <autotools id="epiphany">
-    <branch revision="gnome-3-10" />
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="iso-codes"/>
@@ -609,10 +648,14 @@
   </autotools>
 
   <autotools id="gnome-calculator" supports-non-srcdir-builds="no">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
+      <dep package="glib"/>
       <dep package="gtk+"/>
+      <dep package="gtksourceview"/>
+      <dep package="libxml2"/>
+      <dep package="vala"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
@@ -705,7 +748,7 @@
   </autotools>
 
   <autotools id="gnome-terminal" autogenargs="--disable-migration">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
       <dep package="dconf"/>
       <dep package="intltool"/>
@@ -715,7 +758,11 @@
       <dep package="libuuid"/>
       <dep package="vte"/>
       <dep package="yelp-tools"/>
+      <dep package="nautilus"/>
     </dependencies>
+    <suggests>
+      <dep package="gnome-shell"/>
+    </suggests>
   </autotools>
 
   <autotools id="gnome-user-docs">
@@ -772,20 +819,28 @@
   </autotools>
 
   <autotools id="totem">
-    <branch revision="gnome-3-10"/>
+    <branch/>
     <dependencies>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
+      <dep package="appdata-tools"/>
+      <dep package="cairo"/>
+      <dep package="clutter"/>
+      <dep package="clutter-gst"/>
+      <dep package="clutter-gtk"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="gnome-icon-theme"/>
+      <dep package="grilo"/>
+      <dep package="grilo-plugins"/>
+      <dep package="gsettings-desktop-schemas"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="gst-plugins-good"/>
       <dep package="gst-plugins-bad"/>
+      <dep package="gtk+"/>
+      <dep package="intltool"/>
       <dep package="iso-codes"/>
-      <dep package="totem-pl-parser"/>
       <dep package="libpeas"/>
-      <dep package="clutter-gst"/>
-      <dep package="clutter-gtk"/>
-      <dep package="grilo-plugins"/>
+      <dep package="totem-pl-parser"/>
       <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
@@ -817,6 +872,9 @@
   </autotools>
 
   <autotools id="gnome-user-share">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-bluetooth"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="avahi"/>
@@ -824,8 +882,10 @@
       <dep package="dbus-glib"/>
       <dep package="libcanberra"/>
       <dep package="libnotify"/>
-      <dep package="gnome-bluetooth"/>
       <dep package="nautilus"/>
+      <if condition-set="linux">
+        <dep package="gnome-bluetooth"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -843,8 +903,10 @@
       <dep package="libgcrypt"/>
       <dep package="libnotify"/>
       <dep package="libsecret"/>
-      <dep package="NetworkManager"/>
       <dep package="telepathy-glib"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -866,6 +928,7 @@
             hash="sha256:feef22586e1aac28f61ba22ae836fab7a758501395a532e1a009c50e03de1789"
             size="990656"/>
     <dependencies>
+      <dep package="libusb1"/>
     </dependencies>
   </autotools>
 
@@ -898,11 +961,14 @@
              autogenargs="--with-udev-dir=${libdir}/udev --with-systemdsystemunitdir=no --with-crypto=gnutls 
--disable-wimax --disable-more-warnings">
     <branch repo="git.freedesktop.org"
                  module="NetworkManager/NetworkManager.git"
-            checkoutdir="NetworkManager"
-            revision="nm-0-9-8"/>
+            checkoutdir="NetworkManager"/>
     <dependencies>
+      <dep package="libndp"/>
       <dep package="libnl"/>
+      <dep package="libnl-genl"/>
+      <dep package="libnl-route"/>
       <dep package="glib"/>
+      <dep package="iptables"/>
       <dep package="dbus-glib"/>
       <dep package="libgcrypt"/>
       <dep package="libuuid"/>
@@ -917,6 +983,13 @@
   </autotools>
 
   <autotools id="PackageKit" autogenargs="--disable-tests --disable-qt --disable-browser-plugin" 
makeargs="CFLAGS=-Wno-error">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-systemd --disable-systemd-updates"/>
+    </if>
+    <if condition-set="bsd">
+      <autogenargs value="--enable-ports"/>
+    </if>
+
     <branch repo="packagekit.gitorious.org" checkoutdir="PackageKit" module="packagekit.git"/>
     <dependencies>
       <dep package="glib"/>
@@ -925,13 +998,18 @@
       <dep package="dbus-glib"/>
     </dependencies>
     <suggests>
-      <dep package="gudev"/>
-      <dep package="NetworkManager"/>
       <dep package="polkit"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+        <dep package="NetworkManager"/>
+      </if>
     </suggests>
   </autotools>
 
   <autotools id="polkit">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-test"/>
+    </if>
     <branch repo="git.freedesktop.org"/>
     <dependencies>
       <dep package="glib"/>
@@ -954,15 +1032,17 @@
     </dependencies>
   </autotools>
 
-  <autotools id="upower" autogenargs="--enable-strict=no">
-    <branch repo="git.freedesktop.org" revision="0.9"/>
+  <autotools id="upower">
+    <branch repo="git.freedesktop.org" />
     <dependencies>
       <dep package="polkit"/>
       <dep package="dbus-glib"/>
       <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="gudev"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -988,7 +1068,6 @@
       <dep package="gnome-calculator"/>
       <dep package="gnome-contacts"/>
       <dep package="gnome-dictionary"/>
-      <dep package="gnome-disk-utility"/>
       <dep package="gnome-font-viewer"/>
       <dep package="gnome-screenshot"/>
       <dep package="gnome-system-log"/>
@@ -999,6 +1078,10 @@
       <dep package="sushi"/>
       <dep package="totem"/>
       <dep package="yelp"/>
+      <if condition-set="linux">
+        <!-- udisks dependency -->
+        <dep package="gnome-disk-utility"/>
+      </if>
     </dependencies>
   </metamodule>
 
@@ -1009,7 +1092,6 @@
     <dependencies>
       <dep package="dconf"/>
       <dep package="evolution-data-server"/>
-      <dep package="gnome-bluetooth"/>
       <dep package="gnome-control-center"/>
       <dep package="gnome-icon-theme"/>
       <dep package="gnome-icon-theme-symbolic"/>
@@ -1052,15 +1134,17 @@
       <dep package="ConsoleKit"/>
       <dep package="dbus"/>
       <dep package="gdm"/>
-      <dep package="NetworkManager"/>
       <dep package="PackageKit"/>
       <dep package="polkit"/>
       <dep package="upower"/>
-      <dep package="udisks"/>
       <dep package="cups"/>
       <!-- <dep package="systemd"/> -->
       <!-- <dep package="xorg-x11-server"/> -->
       <!-- <dep package="plymouth"/> -->
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+        <dep package="udisks"/>
+      </if>
     </dependencies>
   </metamodule>
 
@@ -1097,7 +1181,6 @@
       <dep package="gstreamer"/>
       <dep package="libnotify"/>
       <dep package="libpeas"/>
-      <dep package="NetworkManager"/>
       <dep package="PackageKit"/>
       <dep package="polkit"/>
       <dep package="telepathy-glib"/>
@@ -1108,6 +1191,9 @@
       <dep package="gtkmm"/>
       <dep package="java-gnome"/>
       <dep package="seed"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+      </if>
     </dependencies>
   </metamodule>
 
diff --git a/gnome-sysdeps.modules b/gnome-sysdeps.modules
index 1d8f2e6..26d04f5 100644
--- a/gnome-sysdeps.modules
+++ b/gnome-sysdeps.modules
@@ -42,6 +42,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="cairo">
+    <pkg-config>cairo.pc</pkg-config>
+    <branch repo="system"
+            version="1.12.2"/>
+  </systemmodule>
+
   <systemmodule id="cairomm">
     <pkg-config>cairomm-1.0.pc</pkg-config>
     <branch repo="system"
@@ -159,6 +165,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="freetype2">
+    <pkg-config>freetype2.pc</pkg-config>
+    <branch repo="system"
+            version="2.4.9"/>
+  </systemmodule>
+
   <systemmodule id="gbm">
     <pkg-config>gbm.pc</pkg-config>
     <branch repo="system"/>
@@ -177,11 +189,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="geoclue1">
-    <pkg-config>geoclue.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="gettext">
     <branch repo="system" version="0.16"/>
     <systemdependencies>
@@ -210,6 +217,12 @@
             version="2.6.6"/>
   </systemmodule>
 
+  <systemmodule id="gnutls">
+    <pkg-config>gnutls.pc</pkg-config>
+    <branch repo="system"
+            version="2.12.8"/>
+  </systemmodule>
+
   <systemmodule id="gpgme">
     <branch repo="system"
             version="1.0.0"/>
@@ -268,6 +281,13 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="iptables">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="iptables"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="js185">
     <pkg-config>mozjs185.pc</pkg-config>
     <branch repo="system"/>
@@ -285,12 +305,26 @@
             version="2.2"/>
   </systemmodule>
 
+  <systemmodule id="lcov">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path"
+           name="lcov"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="libatasmart">
     <pkg-config>libatasmart.pc</pkg-config>
     <branch repo="system"
             version="0.17"/>
   </systemmodule>
 
+  <systemmodule id="libmusicbrainz">
+    <pkg-config>libmusicbrainz5.pc</pkg-config>
+    <branch repo="system"
+            version="5.0"/>
+  </systemmodule>
+
   <systemmodule id="libX11">
     <pkg-config>x11.pc</pkg-config>
     <branch repo="system"/>
@@ -370,10 +404,11 @@
     <branch repo="system" version="2.8.0"/>
   </systemmodule>
 
-  <systemmodule id="libcanberra">
-    <pkg-config>libcanberra.pc</pkg-config>
-    <branch repo="system"
-            version="0.30"/>
+  <systemmodule id="libcap">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="sys/capability.h"/>
+    </systemdependencies>
   </systemmodule>
 
   <systemmodule id="libdb">
@@ -438,6 +473,18 @@
             version="3.2.7"/>
   </systemmodule>
 
+  <systemmodule id="libnl-genl">
+    <pkg-config>libnl-genl-3.0.pc</pkg-config>
+    <branch repo="system"
+            version="3.2.7"/>
+  </systemmodule>
+
+  <systemmodule id="libnl-route">
+    <pkg-config>libnl-route-3.0.pc</pkg-config>
+    <branch repo="system"
+            version="3.2.7"/>
+  </systemmodule>
+
   <systemmodule id="liboauth">
     <pkg-config>oauth.pc</pkg-config>
     <branch repo="system"
@@ -465,6 +512,18 @@
             version="1.0.21"/>
   </systemmodule>
 
+  <systemmodule id="libsystemd-journal">
+    <pkg-config>libsystemd-journal.pc</pkg-config>
+    <branch repo="system"
+            version="201"/>
+  </systemmodule>
+
+  <systemmodule id="libsystemd-login">
+    <pkg-config>libsystemd-login.pc</pkg-config>
+    <branch repo="system"
+            version="201"/>
+  </systemmodule>
+
   <systemmodule id="libtasn1">
     <pkg-config>libtasn1.pc</pkg-config>
     <branch repo="system"
@@ -531,7 +590,7 @@
   <systemmodule id="libxklavier">
     <pkg-config>libxklavier.pc</pkg-config>
     <branch repo="system"
-            version="5.2.1"/>
+            version="5.0"/>
   </systemmodule>
 
   <systemmodule id="libxml2">
@@ -566,11 +625,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="neon">
-    <pkg-config>neon.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="nss">
     <pkg-config>nss.pc</pkg-config>
     <branch repo="system"
@@ -583,6 +637,12 @@
             version="4.9.2"/>
   </systemmodule>
 
+  <systemmodule id="mtdev">
+    <pkg-config>mtdev.pc</pkg-config>
+    <branch repo="system"
+            version="1.1.1"/>
+  </systemmodule>
+
   <systemmodule id="openldap">
     <branch repo="system"/>
     <systemdependencies>
@@ -773,6 +833,11 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="zlib">
+    <pkg-config>zlib.pc</pkg-config>
+    <branch repo="system" version="1.2"/>
+  </systemmodule>
+
   <systemmodule id="libarchive">
     <pkg-config>libarchive.pc</pkg-config>
     <branch repo="system"
@@ -793,4 +858,9 @@
     <pkg-config>gtkspell3-3.0.pc</pkg-config>
     <branch repo="system"/>
   </systemmodule>
+
+  <systemmodule id="opus">
+    <pkg-config>opus.pc</pkg-config>
+    <branch repo="system" version="1.0"/>
+  </systemmodule>
 </moduleset>
diff --git a/gnome-world.modules b/gnome-world.modules
index 4ea7529..710fd6f 100644
--- a/gnome-world.modules
+++ b/gnome-world.modules
@@ -3,1055 +3,3231 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <!-- vim:set ts=2 expandtab: -->
 <moduleset>
-
-<!-- git repos -->
   <repository type="git" name="git.gnome.org" default="yes"
       href="git://git.gnome.org/"/>
+  <repository type="svn" name="svn.abisource.com"
+      href="http://svn.abisource.com/"/>
+  <repository type="cvs" name="cairo.freedesktop.org"
+      cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/cairo"
+      password=""/>
+  <repository type="git" name="gstreamer.freedesktop.org"
+      href="git://anongit.freedesktop.org/gstreamer/"/>
+  <repository type="git" name="fprint.freedesktop.org"
+      href="git://anongit.freedesktop.org/libfprint/"/>
+  <repository type="cvs" name="elysium-project.sf.net"
+      cvsroot=":pserver:anonymous elysium-project cvs sourceforge net:/cvsroot/elysium-project"
+      password=""/>
+  <repository type="cvs" name="refdbg.sf.net"
+      cvsroot=":pserver:anonymous refdbg cvs sourceforge net:/cvsroot/refdbg"
+      password=""/>
+  <repository type="svn" name="osiris.chipx86.com"
+      href="http://osiris.chipx86.com/svn/osiris-misc/"/>
+  <repository type="git" name="github.com"
+    href="git://github.com/"/>
+  <repository type="svn" name="svn.tinymail.org"
+    href="https://svn.tinymail.org/svn/tinymail/"; />
+  <repository type="git" name="git.maemo.org"
+    href="https://git.maemo.org/"; />
   <repository type="git" name="git.freedesktop.org"
       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="bzr" name="launchpad.net"
+      href="lp:"/>
+  <repository type="bzr" name="bzr.burtonini.com"
+      href="http://burtonini.com/bzr/"/>
+  <repository type="svn" name="elisa.code.fluendo.com"
+      href="https://code.fluendo.com/elisa/svn/"/>
+  <repository type="svn" name="pigment.code.fluendo.com"
+      href="https://code.fluendo.com/pigment/svn/"/>
+  <repository type="git" name="git.kernel.org"
+      href="git://git.kernel.org/pub/scm/"/>
+  <repository type="mtn" name="pidgin.im"
+      server="pidgin.im" database="pidgin.im.mtn"
+      defbranch="im.pidgin.pidgin"/>
+  <repository type="git" name="git.savannah.nongnu.org"
+      href="git://git.savannah.nongnu.org/"/>
+  <repository type="svn" name="svn.fluendo.com"
+      href="https://core.fluendo.com/gstreamer/svn/";
+      trunk-template="trunk/%(module)s"
+      branches-template="branches/%(branch)"
+      tags-template="tags/%(tag)" />
+  <repository type="svn" name="svn.thomas.apestaart.org"
+      href="http://thomas.apestaart.org/moap/svn/"/>
+  <repository type="git" name="git.capuchin.gnome.org"
+    href="http://www.gnome.org/~sebp/git/"/>
+  <repository type="svn" name="hotwire.googlecode.com"
+      href="http://hotwire-shell.googlecode.com/svn/"/>
+  <repository type="svn" name="labyrinth.googlecode.com"
+      href="http://labyrinth.googlecode.com/svn/"/>
+  <repository type="hg" name="hg.circular-chaos.org"
+    href="http://hg.circular-chaos.org"; />
+  <repository type="svn" name="transmissionbt.com"
+    href="svn://svn.m0k.org/Transmission/" />
+  <repository type="cvs" name="ldtp.freedesktop.org"
+      cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/ldtp"
+      password=""/>
+  <repository type="svn" name="svn.async.com.br"
+      href="svn://svn.async.com.br/"/>
+  <repository type="svn" name="flumotion.code.fluendo.com"
+      href="https://code.fluendo.com/flumotion/svn/"/>
+  <repository type="tarball" name="matchbox-project.org"
+      href="http://matchbox-project.org/sources/"/>
+  <repository type="git" name="fishsoup.net"
+      href="git://git.fishsoup.net/"/>
+  <repository type="git" name="diracvideo.org"
+    href="git://diracvideo.org/git/"/>
+  <repository type="svn" name="liferea.svn.sourceforge.net"
+      href="http://liferea.svn.sourceforge.net/svnroot/"/>
+  <repository type="cvs" name="cvs.claws-mail"
+      cvsroot=":ext:cvs scm dotsrc org:/srv/cvs/claws-mail"
+      password=""/>
+  <repository type="git" name="git.xfce.org"
+      href="git://git.xfce.org"/>
+  <repository type="git" name="git.dronelabs.com"
+      href="git://git.dronelabs.com"/>
+  <repository type="git" name="git.moblin.org"
+      href="git://git.moblin.org"/>
+  <repository type="git" name="git.ardour.org"
+      href="git://git.ardour.org/"/>
+  <repository type="git" name="gitorious.org"
+      href="git://gitorious.org/"/>
+  <repository type="tarball" name="samba.org"
+      href="https://ftp.samba.org/pub/"/>
+  <repository type="tarball" name="sourceforge.net"
+      href="http://prdownloads.sourceforge.net/sourceforge/"/>
+  <repository type="svn" name="xchat.sf.net"
+      href="https://xchat.svn.sourceforge.net/svnroot/";
+      trunk-template="%(module)s"
+      branches-template="%(branch)s"
+      tags-template="%(tag)s"/>
+  <repository type="tarball" name="openchange.org"
+      href="http://tracker.openchange.org/attachments/download/"/>
+  <repository type="tarball" name="gnome.org"
+      href="http://download.gnome.org/sources/"/>
+  <repository type="git" name="yorba.org"
+      href="git://yorba.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"/>
-  <repository type="git" name="github-01org"
-    href="git://github.com/01org/"/>
-
-<!-- tarball repos -->
-  <repository type="tarball" name="gnome.org"
-    href="http://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="xiph.org"
-        href="http://downloads.xiph.org/releases/"/>
-  <repository type="tarball" name="ftp.gnu.org"
-      href="http://ftp.gnu.org/gnu/"/>
-  <repository type="tarball" name="speech-dispatcher"
-      href="http://devel.freebsoft.org/pub/projects/speechd/"/>
+  <repository type="svn" name="opalvoip.sf.net"
+      href="https://svn.code.sf.net/p/opalvoip/code/"/>
+  <repository type="svn" name="valgrind.org"
+      href="svn://svn.valgrind.org/valgrind/"/>
+
+  <repository type="tarball" name="dbus"
+    href="http://dbus.freedesktop.org/releases/"/>
+  <repository type="tarball" name="mono.net"
+    href="http://download.mono-project.com/sources/"/>
+  <repository type="tarball" name="launchpad.net/tarball"
+      href="https://launchpad.net/"/>
+  <repository type="tarball" name="monogithub"
+    href="https://github.com/downloads/mono/dbus-sharp/"/>
+  <repository type="tarball" name="github.com/metabrainz"
+      href="https://github.com/downloads/metabrainz/"/>
+  <repository type="tarball" name="downloads.sourceforge.net"
+      href="http://downloads.sourceforge.net/"/>
+
+  <include href="gnome-apps-3.12.modules"/>
+
+  <autotools id="alacarte">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gnome-menus"/>
+      <dep package="pygtk"/>
+    </dependencies>
+  </autotools>
 
-  <include href="gnome-suites-core-3.10.modules"/>
+  <autotools id="dbus-python">
+    <branch module="dbus-python/dbus-python-0.83.1.tar.gz" version="0.83.1"
+            repo="dbus"
+            hash="sha256:ce283806f1af4f2322e183a276528a880b503c74972932bd09f06bdb7fcc1b99"
+            size="533391"/>
+    <dependencies>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+    <suggests>
+      <dep package="pygobject-python2"/>
+    </suggests>
+  </autotools>
 
-  <!-- NOTE: gnome-suites-core-3.10 and gnome-suites-core-deps-3.10
-       are supposed to remain self-contained. If apps have dependencies
-       that are not covered there, add them in here
-    -->
+  <autotools id="easytag">
+    <branch/>
+    <dependencies>
+      <dep package="appdata-tools"/>
+      <dep package="glib"/>
+      <!-- GTK+ 3 support is still experimental. -->
+      <dep package="gtk+-2"/>
+      <dep package="intltool"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+    <suggests>
+      <dep package="flac"/>
+      <!-- <dep package="id3tag" -->
+      <!-- <dep package="id3lib" -->
+      <dep package="libvorbis"/>
+      <dep package="speex"/>
+      <dep package="taglib"/>
+      <dep package="wavpack"/>
+    </suggests>
+  </autotools>
 
-  <autotools id="babl">
+  <autotools id="gconf"
+             autogenargs="--enable-gtk --with-gtk=3.0 --disable-orbit">
     <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="libxml2"/>
+      <dep package="gtk+"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+    <suggests>
+      <dep package="polkit"/>
+    </suggests>
   </autotools>
 
-  <autotools id="gegl" autogenargs="--disable-docs">
-    <branch revision="gegl-0-2"/>
+  <cmake id="geary">
+    <branch/>
     <dependencies>
-      <dep package="babl"/>
       <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="pango"/>
-      <dep package="librsvg"/>
+      <dep package="gmime"/>
+      <dep package="gnome-keyring"/>
+      <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+      <dep package="libgee"/>
+      <dep package="libnotify"/>
+      <dep package="libunique"/>
+      <dep package="sqlite3"/>
+      <dep package="vala"/>
+      <dep package="WebKit"/>
     </dependencies>
-  </autotools>
+  </cmake>
 
-  <autotools id="bijiben">
+  <cmake id="corebird"
+         cmakeargs="-DPREFIX=${prefix}">
+     <branch repo="github.com" checkoutdir="corebird" module="baedert/corebird.git"/>
+     <dependencies>
+       <dep package="intltool"/>
+       <dep package="vala"/>
+       <dep package="glib-networking"/>
+       <dep package="librsvg"/>
+       <dep package="gtk+"/>
+     </dependencies>
+  </cmake>
+
+  <autotools id="gnome-calendar">
     <branch/>
     <dependencies>
-      <dep package="tracker"/>
+      <dep package="clutter"/>
       <dep package="clutter-gtk"/>
+      <dep package="evolution-data-server"/>
+      <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-chat">
+    <branch/>
+    <dependencies>
       <dep package="glib"/>
-      <dep package="WebKit"/>
-      <dep package="zeitgeist"/>
+      <dep package="gtk+"/>
+      <dep package="telepathy-glib"/>
+      <dep package="telepathy-logger"/>
     </dependencies>
   </autotools>
 
-  <autotools id="celt">
-    <branch repo="xiph.org"
-            module="celt/celt-0.5.1.3.tar.gz"
-            version="0.5.1.3"
-            hash="sha256:fc2e5b68382eb436a38c3104684a6c494df9bde133c139fbba3ddb5d7eaa6a2e"
-            size="440772"/>
+  <autotools id="gnome-desktop-2" autogenargs="--with-gnome-distributor=JHBuild">
+    <branch revision="gnome-2-32" checkoutdir="gnome-desktop-2" module="gnome-desktop"/>
     <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="gtk+-2"/>
+      <dep package="gconf"/>
+      <dep package="startup-notification"/>
+      <dep package="rarian"/>
+      <dep package="gnome-doc-utils"/>
+      <dep package="gvfs"/> <!-- gvfs-copy used in autogen.sh -->
     </dependencies>
   </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>
+  <autotools id="gnome-doc-utils" supports-parallel-builds="no">
+    <branch/>
     <dependencies>
-      <dep package="device-mapper"/>
-      <dep package="libnl"/>
-      <dep package="yajl"/>
+      <dep package="gettext"/>
+      <dep package="gnome-common"/>
+      <dep package="libxslt"/>
+      <dep package="libxml2"/>
+      <dep package="intltool"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-online-miners">
+  <autotools id="gtkglarea">
     <branch/>
     <dependencies>
+      <dep package="gtk+-2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gxml">
+    <branch/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
       <dep package="glib"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="grilo"/>
-      <dep package="libgdata"/>
-      <dep package="libzapojit"/>
-      <dep package="tracker"/>
+      <dep package="libgee"/>
+      <dep package="libxml2"/>
+      <dep package="vala"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-weather">
+  <autotools id="cairo-gtk-engine">
+    <branch repo="cairo.freedesktop.org"/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="cairo"/>
+    </dependencies>
+  </autotools>
+
+  <waf id="hamster-applet">
     <branch/>
     <dependencies>
-      <dep package="gdk-pixbuf"/>
+      <dep package="intltool"/>
+      <dep package="pygtk"/>
+      <dep package="py2cairo"/>
+      <dep package="gnome-control-center"/>
+    </dependencies>
+  </waf>
+
+  <autotools id="libbtctl">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgee-0.6">
+    <pkg-config>gee-1.0.pc</pkg-config>
+    <branch module="libgee"
+            revision="0.6"
+            checkoutdir="libgee-0.6"/>
+    <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgnome-keyring">
+    <branch/>
+    <dependencies>
+      <dep package="gnome-common"/>
       <dep package="intltool"/>
-      <dep package="libgweather"/>
-      <dep package="gjs"/>
+      <dep package="dbus"/>
+      <dep package="libgcrypt"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libunique-1">
+    <branch module="libunique/1.1/libunique-1.1.6.tar.bz2" repo="gnome.org"
+            version="1.1.6" checkoutdir="libunique-1.1.6"
+            hash="sha256:e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb"
+            md5sum="7955769ef31f1bc4f83446dbb3625e6d" size="335534"/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libwnck-2">
+    <branch revision="gnome-2-30" checkoutdir="libwnck-2" module="libwnck"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk+-2"/>
+      <dep package="startup-notification"/>
     </dependencies>
   </autotools>
 
-  <autotools id="ghex">
+  <distutils id="meld">
     <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="intltool"/>
-      <dep package="yelp-tools"/>
+      <dep package="gtksourceview"/>
+      <dep package="pygobject"/>
+    </dependencies>
+  </distutils>
+
+  <autotools id="gnome-phone-manager">
+    <branch checkoutdir="gnome-phone-manager" module="phonemgr"/>
+    <dependencies>
+      <dep package="dbus-glib"/>
+      <dep package="gconf"/>
+      <dep package="gtk+"/>
+      <dep package="gnome-bluetooth"/>
+      <dep package="gnokii"/>
+      <dep package="gtkspell"/>
+      <dep package="evolution-data-server"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gtkhtml">
+  <autotools id="gtkhtml2">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="enchant"/>
-      <dep package="iso-codes"/>
-      <dep package="libsoup"/>
-      <dep package="gnome-icon-theme"/>
+      <dep package="gtk+-2"/>
+      <dep package="libxml2"/>
     </dependencies>
   </autotools>
 
- <autotools id="gtksourceviewmm">
+  <autotools id="gnome-vfs-monikers">
     <branch/>
     <dependencies>
-      <dep package="gtksourceview"/>
-      <dep package="gtkmm"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-vnc" autogenargs="--with-gtk=3.0 --enable-vala --disable-werror">
+  <autotools id="gnome-python-extras">
     <branch/>
     <dependencies>
-      <dep package="cairo"/>
-      <dep package="gdk-pixbuf"/>
+      <dep package="pygtk"/>
+      <dep package="gtkhtml2"/>
+      <dep package="gdl"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="nautilus-actions">
+    <branch/>
+    <dependencies>
+      <dep package="nautilus"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="nautilus-open-terminal">
+    <branch/>
+    <dependencies>
+      <dep package="nautilus"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="nautilus-vcs">
+    <branch/>
+    <dependencies>
+      <dep package="nautilus"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gedit-plugins">
+    <branch/>
+    <dependencies>
+      <dep package="gedit"/>
+      <dep package="gucharmap"/>
+      <dep package="zeitgeist"/>
+    </dependencies>
+    <suggests>
+      <dep package="dbus-python"/>
+    </suggests>
+  </autotools>
+
+  <tarball id="libinfinity" version="0.5.0" autogenargs="--with-gtk3">
+    <source href="http://releases.0x539.de/libinfinity/libinfinity-0.5.0.tar.gz";
+            hash="sha256:171cb4933090ee0d2be9648c387ca607148d4df4bb35535e7e1766ce2da42692"
+            md5sum="2b25de033c3a4c9975340300b09b84b0" size="1399866"/>
+    <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="pulseaudio"/>
+      <dep package="libxml2"/>
+      <dep package="gnutls"/>
+    </dependencies>
+  </tarball>
+
+  <autotools id="gedit-collaboration">
+    <branch/>
+    <dependencies>
+      <dep package="gedit"/>
+      <dep package="libinfinity"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-code-assistance">
+    <branch/>
+    <dependencies>
       <dep package="vala"/>
     </dependencies>
   </autotools>
 
-  <autotools id="guile">
-    <pkg-config>guile-2.0.pc</pkg-config>
-    <branch repo="ftp.gnu.org"
-            module="guile/guile-2.0.7.tar.xz"
-            version="2.0.7"
-            hash="sha256:6f278fa699685382ae51ba8bfad5840959e0af6414f3ad803d61131567bfa338"
-            size="4396724"/>
+  <autotools id="gedit-code-assistance">
+    <branch/>
     <dependencies>
-      <dep package="libunistring"/>
-      <dep package="gc"/>
+      <dep package="gnome-code-assistance"/>
+      <dep package="gedit"/>
+      <dep package="libgee"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gupnp-av">
-    <branch />
+  <autotools id="giggle">
+    <branch/>
     <dependencies>
+      <dep package="gtk+"/>
       <dep package="glib"/>
-      <dep package="gupnp"/>
+      <dep package="gtksourceview"/>
+      <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
-      <dep package="gobject-introspection"/>
+      <dep package="evolution-data-server"/>
+      <dep package="vte"/>
     </suggests>
   </autotools>
 
-  <autotools id="gupnp-dlna">
-    <branch />
+  <autotools id="memprof">
+    <branch/>
+  </autotools>
+
+  <autotools id="sawfish">
+    <branch/>
     <dependencies>
-      <dep package="libxml2"/>
+      <dep package="rep-gtk"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="rep-gtk">
+    <branch/>
+    <dependencies>
+      <dep package="librep"/>
+      <dep package="gtk+-2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="librep">
+    <branch/>
+  </autotools>
+
+  <autotools id="libdmapsharing">
+    <branch/>
+    <dependencies>
+      <dep package="avahi"/>
       <dep package="glib"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
+      <dep package="libgee"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-openmax" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gst-openmax"/>
+    <dependencies>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gst-plugins-bad-0.10"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libva">
+    <branch repo="git.freedesktop.org"
+            module="vaapi/libva"/>
+  </autotools>
+
+  <autotools id="gstreamer-vaapi">
+    <branch repo="gitorious.org" module="vaapi/gstreamer-vaapi"/>
+    <dependencies>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="libva"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libva-intel-driver">
+    <branch repo="git.freedesktop.org"
+            checkoutdir="libva-intel-driver"
+            module="vaapi/intel-driver"
+            revision="v1.0-branch"/>
+    <dependencies>
+      <dep package="libva"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libva-vdpau-driver">
+    <branch repo="git.freedesktop.org"
+            checkoutdir="libva-vdpau-driver"
+            module="vaapi/vdpau-driver"/>
+    <dependencies>
+      <dep package="libva"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libva-xvba-driver">
+    <branch repo="git.freedesktop.org"
+            checkoutdir="libva-xvba-driver"
+            module="vaapi/xvba-driver"/>
+    <dependencies>
+      <dep package="libva"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-bad-0.10"
+             autogenargs="--disable-tests --disable-fatal-warnings"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-bad"
+            revision="0.10" checkoutdir="gst-plugins-bad-0.10"/>
+    <dependencies>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-ugly-0.10" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-ugly"
+            revision="0.10" checkoutdir="gst-plugins-ugly-0.10"/>
+    <dependencies>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="yasm"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-gl" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-gl"/>
+    <dependencies>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-ffmpeg" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-ffmpeg"
+            revision="0.10"/>
+    <dependencies>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-libav"
+             autogenargs="--disable-fatal-warnings">
+    <branch repo="gstreamer.freedesktop.org"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-python">
+    <branch repo="gstreamer.freedesktop.org"/>
+    <dependencies>
+      <dep package="pygobject-python2"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-python-0.10"
+             makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS="
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-python"
+            revision="0.10"/>
+    <dependencies>
+      <dep package="pygobject2"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libfprint">
+    <branch repo="fprint.freedesktop.org" module="libfprint"/>
+    <dependencies>
+      <dep package="libusb1"/>
+      <dep package="nss"/>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="fprintd">
+    <branch repo="fprint.freedesktop.org" module="fprintd"/>
+    <dependencies>
+      <dep package="libfprint"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="planner">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+-2"/>
+      <dep package="libglade"/>
+      <dep package="gconf"/>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
     </dependencies>
     <suggests>
-      <dep package="gst-plugins-good"/>
+      <dep package="pygtk"/>
+      <dep package="pygobject2"/>
     </suggests>
- </autotools>
+  </autotools>
 
-  <autotools id="libgda" autogenargs="--with-java=no --disable-tools">
+  <autotools id="balsa">
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="libxml2"/>
-      <dep package="openssl"/>
-      <dep package="vala"/>
+      <dep package="gtk+-2"/>
+      <dep package="gmime"/>
+      <dep package="libgnome-keyring"/>
+      <dep package="gconf"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libosinfo"
-             autogenargs="--enable-tests=no --enable-werror=no">
-    <branch repo="fedorahosted.org" module="libosinfo.git"/>
+  <autotools id="pan">
+    <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="vala"/>
-      <dep package="wget"/>
+      <dep package="gtk+-2"/>
+      <dep package="libxml2"/>
+      <dep package="gtkspell"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libvirt-glib" autogenargs="--enable-werror=no">
-    <branch repo="git.libvirt.org" module="libvirt-glib.git"/>
+  <!-- Python 2 build of pygobject, until everything gets ported to Python 3 -->
+  <autotools id="pygobject-python2" autogenargs="--with-python=python2">
+    <branch module="pygobject" checkoutdir="pygobject-python2"/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="py2cairo"/>
+      <dep package="python2-devel"/>
       <dep package="gobject-introspection"/>
-      <dep package="libvirt"/>
-      <dep package="vala"/>
     </dependencies>
   </autotools>
 
-  <autotools id="mash">
-    <branch repo="github.com" module="clutter-project/mash.git"/>
+  <autotools id="pygtk">
+    <branch/>
     <dependencies>
-      <dep package="clutter"/>
+      <dep package="pygobject2"/>
+      <dep package="gtk+-2"/>
+      <dep package="py2cairo"/>
     </dependencies>
   </autotools>
 
-  <autotools id="pyatspi2" autogenargs="--with-python=python3" >
-    <branch revision="gnome-3-10"/>
+  <distutils id="pyspi">
+    <branch/>
     <dependencies>
-      <dep package="pygobject"/>
+    </dependencies>
+  </distutils>
+
+  <autotools id="pyatspi2-python2" autogenargs="--with-python=python2">
+    <branch module="pyatspi2" checkoutdir="pyatspi2-python2"/>
+    <dependencies>
+      <dep package="pygobject-python2"/>
     </dependencies>
     <suggests>
       <dep package="at-spi2-core"/>
     </suggests>
   </autotools>
 
-  <autotools id="speech-dispatcher" autogenargs="--with-espeak">
-    <branch repo="speech-dispatcher" module="speech-dispatcher-0.8-beta1.tar.gz" version="0.8-beta1"
-            hash="sha256:eb60069f291008717c429aff210afe6075c24b68b8de75fe16d9298e85cbac5c"
-            size="1229374"/>
+  <distutils id="dogtail">
+    <branch repo="fedorahosted.org" module="dogtail.git"/>
     <dependencies>
-      <dep package="dotconf"/>
-      <dep package="espeak"/>
+      <dep package="py2cairo"/>
+      <dep package="pyatspi2-python2"/>
+      <dep package="pygobject-python2"/>
+      <dep package="pygtk"/>
     </dependencies>
+  </distutils>
+
+  <autotools id="tinymail" autogenargs="--with-platform=gnome-desktop">
+    <branch repo="svn.tinymail.org" module="trunk"  checkoutdir="tinymail" />
   </autotools>
 
-  <autotools id="spice-protocol">
-    <branch repo="spice"
-            module="releases/spice-protocol-0.12.5.tar.bz2"
-            version="0.12.5"
-            hash="sha256:feacb14940cdcc10214ec8cdc2198d880e54eb206e6d65a9bddf8360b27f7bf9"/>
+  <autotools id="modest" autogenargs="--with-platform=gnome">
+    <branch repo="git.maemo.org" module="projects/modest" />
     <dependencies>
+      <dep package="tinymail"/>
     </dependencies>
   </autotools>
 
-  <autotools id="spice-server" autogenargs="--disable-smartcard --without-sasl --disable-client">
-    <branch repo="spice"
-            module="releases/spice-0.12.2.tar.bz2"
-            version="0.12.2"
-            hash="sha256:5654fac02f5568088ea01979088d539f4e95551568dd709ec197e965cf8612d5"
-            size="1685684"/>
+  <autotools id="libpanelappletmm">
+    <branch/>
     <dependencies>
-      <dep package="spice-protocol"/>
-      <dep package="celt"/>
+      <dep package="gtkmm"/>
+      <dep package="gnome-panel"/>
     </dependencies>
   </autotools>
 
-  <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala">
-    <branch repo="spice"
-            module="gtk/spice-gtk-0.20.tar.bz2"
-            version="0.20"
-            hash="sha256:b1355823b0ceb2e118c1f9a9a602ccab78e1e2edf2d93f71fa42d3bc85ca75df"
-            size="1210694">
-    </branch>
+  <autotools id="libgdamm">
+    <branch/>
     <dependencies>
-      <dep package="celt"/>
-      <dep package="cyrus-sasl"/>
-      <dep package="spice-protocol"/>
-      <dep package="gtk+"/>
-      <dep package="vala"/>
+      <dep package="gtkmm"/>
+      <dep package="libgda"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gdl">
+  <autotools id="libgda-uimm">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
-      <dep package="librsvg"/>
-      <dep package="gtk+"/>
+      <dep package="gtkmm"/>
+      <dep package="libgdamm"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gdlmm">
+  <autotools id="gtkmm_hello">
     <branch/>
     <dependencies>
-      <dep package="gdl"/>
-      <dep package="glibmm"/>
       <dep package="gtkmm"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libzapojit">
+ <autotools id="gtksourceviewmm">
     <branch/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="json-glib"/>
-      <dep package="librest"/>
-      <dep package="libsoup"/>
-      <dep package="gnome-online-accounts"/>
+      <dep package="gtksourceview"/>
+      <dep package="gtkmm"/>
     </dependencies>
   </autotools>
 
-  <cmake id="libgit2"
-         cmakeargs="-DTHREADSAFE:BOOL=1">
-    <branch repo="github.com" module="libgit2/libgit2.git" checkoutdir="libgit2" revision="master"/>
-  </cmake>
+  <autotools id="goocanvasmm">
+    <branch/>
+    <dependencies>
+      <dep package="goocanvas"/>
+      <dep package="gtkmm"/>
+    </dependencies>
+  </autotools>
 
-  <autotools id="libgit2-glib">
+  <autotools id="libnotifymm">
+    <branch />
+    <dependencies>
+      <dep package="libnotify"/>
+      <dep package="gtkmm"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="cluttermm">
     <branch/>
     <dependencies>
-      <dep package="libgit2"/>
-      <dep package="glib"/>
+      <dep package="clutter"/>
+      <dep package="pangomm"/>
+      <dep package="atkmm"/>
     </dependencies>
   </autotools>
 
-  <!-- Apps start here -->
+  <autotools id="clutter-gtkmm">
+    <branch/>
+    <dependencies>
+      <dep package="clutter-gtk"/>
+      <dep package="gtkmm"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="clutter-box2dmm">
+    <branch/>
+    <dependencies>
+      <dep package="clutter-box2d"/>
+      <dep package="cluttermm"/>
+    </dependencies>
+  </autotools>
 
-  <autotools id="accerciser">
+  <autotools id="gstreamermm">
+    <branch/>
+    <dependencies>
+      <dep package="gtkmm"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+    <suggests>
+      <dep package="gst-plugins-good"/>
+      <dep package="gst-libav"/>
+      <dep package="gst-plugins-ugly"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gstreamermm-plugins-good">
+    <branch/>
+    <dependencies>
+      <dep package="gst-plugins-good"/>
+      <dep package="gstreamermm"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="geglmm">
+    <branch/>
+    <dependencies>
+      <dep package="glibmm"/>
+      <dep package="gegl"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="regexxer">
     <branch/>
     <dependencies>
-      <dep package="at-spi2-atk"/> <!-- to make accerciser's gui accessible -->
       <dep package="intltool"/>
-      <dep package="pygobject"/>
-      <dep package="pyatspi2"/>
-      <dep package="yelp-tools"/>
-      <dep package="gtk+"/>
-      <dep package="py3cairo"/>
+      <dep package="gtkmm"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-documents">
+  <autotools id="libsoupmm">
     <branch/>
     <dependencies>
-      <dep package="evince"/>
-      <dep package="gjs"/>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
-      <dep package="gnome-desktop"/>
-      <dep package="tracker"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="gnome-online-miners"/>
-      <dep package="libgdata"/>
-      <dep package="liboauth"/>
-      <dep package="libzapojit"/>
+      <dep package="glibmm"/>
+      <dep package="libsoup"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-maps">
+  <autotools id="gnet" autogenargs="--enable-glib2">
     <branch/>
     <dependencies>
-      <dep package="gjs"/>
       <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
-      <dep package="gnome-desktop"/>
-      <dep package="libchamplain"/>
-      <dep package="geocode-glib"/>
-      <dep package="geoclue"/>
-      <dep package="gnome-themes-standard"/>
-      <dep package="gnome-icon-theme-symbolic"/>
     </dependencies>
   </autotools>
 
-  <autotools id="devhelp">
+  <autotools id="gnomeicu">
+    <branch/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="at-poke">
+    <branch/>
+    <dependencies>
+      <dep package="libglade"/>
+      <dep package="gtk+-2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-mount" autogenargs="--enable-nautilus-extension">
     <branch/>
     <dependencies>
+      <dep package="libgnome-keyring"/>
+      <dep package="dbus"/>
+      <dep package="gtk+-2"/>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="WebKit"/>
+      <dep package="libglade"/>
+      <dep package="nautilus"/>
     </dependencies>
   </autotools>
 
-  <autotools id="glade">
+  <autotools id="libsexy">
+    <branch repo="osiris.chipx86.com" module="trunk/libsexy"/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="libxml2"/>
+      <dep package="iso-codes"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="sodipodi">
     <branch/>
     <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="libgnomeprintui"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
+  <tarball id="gob2" version="2.0.20">
+    <source href="http://ftp.5z.com/pub/gob/gob2-2.0.20.tar.gz";
+            hash="sha256:d1d727aa860f1fff7b84ef242acd88b89aa93a52e220e254eafb6198ae8dab54"
+            md5sum="0c5ab18305fc37902d202a253fdb28b1" size="284820"/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </tarball>
+
+  <autotools id="libgnetwork">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gconf"/>
       <dep package="intltool"/>
-      <dep package="gnome-common"/>
-      <dep package="gtk-doc" />
-      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgircclient">
+    <branch/>
+    <dependencies>
+      <dep package="libgnetwork"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="galeon">
+    <branch/>
+    <dependencies>
+      <dep package="mozilla"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="xchat">
+    <branch repo="xchat.sf.net" module="xchat" />
+    <dependencies>
+      <dep package="gtk+-2"/>
       <dep package="libxml2"/>
-      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-color-manager">
-    <branch revision="gnome-3-10"/>
+  <autotools id="camorama">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="gconf"/>
+      <dep package="libglade"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtk-engines-cleanice">
+    <branch repo="elysium-project.sf.net"/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtranslator">
+    <branch/>
     <dependencies>
-      <dep package="exiv2"/>
       <dep package="glib"/>
-      <dep package="gnome-desktop"/>
       <dep package="gtk+"/>
       <dep package="intltool"/>
-      <dep package="lcms2"/>
-      <dep package="libcanberra"/>
-      <dep package="libexif"/>
-      <dep package="vte"/>
-      <dep package="colord-gtk"/>
-      <dep package="yelp-tools"/>
-      <!-- and libtiff -->
+      <dep package="libxml2"/>
+      <dep package="gtksourceview"/>
+      <dep package="gsettings-desktop-schemas"/>
     </dependencies>
-    <suggests>
-      <dep package="mash"/>
-    </suggests>
   </autotools>
 
-  <autotools id="gnome-devel-docs">
+  <autotools id="gnome-spell">
     <branch/>
     <dependencies>
-      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="rygel">
-    <branch revision="rygel-0-20"/>
+  <autotools id="gnome-cups-manager">
+    <branch/>
     <dependencies>
-      <dep package="vala"/>
-      <dep package="gupnp"/>
-      <dep package="gupnp-av"/>
-      <dep package="gupnp-dlna"/>
-      <dep package="libgee"/>
-      <dep package="tracker"/>
-      <dep package="valadoc"/>
+      <dep package="libgnomecups"/>
+      <dep package="libglade"/>
     </dependencies>
   </autotools>
 
-<!-- Featured Apps -->
+  <autotools id="bakery">
+    <branch/>
+    <dependencies>
+      <dep package="libxml++"/>
+      <dep package="gtkmm"/>
+    </dependencies>
+  </autotools>
 
-  <autotools id="anjuta">
-    <branch revision="gnome-3-10"/>
+  <autotools id="gnome-hello">
+    <branch/>
     <dependencies>
-      <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gdk-pixbuf"/>
       <dep package="gtk+"/>
-      <dep package="vte"/>
-      <dep package="gdl"/>
-      <dep package="libgda"/>
-      <dep package="gtksourceview"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="loudmouth">
+    <branch repo="github.com" module="m5h/loudmouth.git" checkoutdir="loudmouth" />
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gnutls"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gossip">
+    <branch/>
+    <dependencies>
+      <dep package="loudmouth"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="conglomerate">
+    <branch/>
+    <dependencies>
+      <dep package="libxslt"/>
+      <dep package="gconf"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-network">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtetrinet">
+    <branch/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="glom">
+    <branch/>
+    <dependencies>
+      <dep package="libxml++"/>
+      <dep package="libgdamm"/>
+      <dep package="iso-codes"/>
+      <dep package="gtksourceviewmm"/>
+      <dep package="goocanvasmm"/>
+      <dep package="libepc"/>
+      <dep package="evince"/>
+      <dep package="pygobject-python2"/>
       <dep package="yelp-tools"/>
     </dependencies>
-    <suggests>
-      <dep package="glade"/>
-      <dep package="devhelp"/>
-      <dep package="vala"/>
-    </suggests>
   </autotools>
 
-  <autotools id="cheese">
+  <autotools id="gnome-schedule">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
+      <dep package="pygtk"/>
+      <dep package="yelp"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="nautilus-python" supports-non-srcdir-builds="no">
+    <branch/>
+    <dependencies>
+      <dep package="nautilus"/>
+      <dep package="pygtk"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="atomix">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="istanbul">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="gnome-python-extras"/>
+      <dep package="pygtk"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-python-0.10"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="muine">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="gstreamer-0.10"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnonlin"
+             makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS=">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gnonlin"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-editing-services">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-editing-services"/>
+    <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-bad"/>
       <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
-      <dep package="gudev"/>
+      <dep package="gst-plugins-bad"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="pitivi">
+    <branch/>
+    <dependencies>
+      <dep package="clutter"/>
       <dep package="clutter-gst"/>
       <dep package="clutter-gtk"/>
+      <dep package="glib"/>
+      <dep package="gnonlin"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-editing-services"/>
+      <dep package="gst-libav"/>
+      <dep package="gst-plugins-bad"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-good"/>
+      <dep package="gst-plugins-ugly"/>
+      <dep package="gst-python"/>
+      <dep package="gtk+"/>
+      <dep package="py2cairo"/>
+      <dep package="pygobject-python2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libcm">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="xchat-gnome">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="gconf"/>
+      <dep package="gnome-doc-utils"/>
+    </dependencies>
+    <suggests>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
       <dep package="libcanberra"/>
-      <dep package="vala"/>
-      <dep package="gnome-video-effects"/>
-      <dep package="librsvg"/>
-      <dep package="gnome-desktop"/>
+      <dep package="libnotify"/>
+    </suggests>
+  </autotools>
+
+ <autotools id="refdbg" autogen-sh="autoreconf">
+    <branch repo="refdbg.sf.net"/>
+    <dependencies>
+      <dep package="glib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="evolution" autogenargs="--disable-pst-import">
+  <autotools id="libipoddevice">
+    <branch/>
+    <dependencies>
+      <dep package="dbus-glib"/>
+      <dep package="libgtop"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-main-menu">
+    <branch/>
+    <dependencies>
+      <dep package="gnome-panel"/>
+      <dep package="NetworkManager"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-scan">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="gconf"/>
+      <dep package="gegl"/>
+      <dep package="gimp"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gimmie">
+    <branch/>
+    <dependencies>
+      <dep package="gnome-panel"/>
+      <dep package="pygtk"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-games-extra-data">
+    <branch/>
+  </autotools>
+
+  <autotools id="xdg-user-dirs-gtk">
     <branch/>
     <dependencies>
-      <dep package="bogofilter"/>
-      <dep package="evolution-data-server"/>
-      <dep package="gnome-desktop"/>
-      <dep package="gnome-icon-theme"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="gstreamer"/>
       <dep package="gtk+"/>
-      <dep package="gtkhtml"/>
-      <dep package="highlight"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="dia">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libepc">
+    <branch/>
+    <dependencies>
       <dep package="intltool"/>
-      <dep package="libcanberra"/>
-      <dep package="libgdata"/>
-      <dep package="libgweather"/>
-      <dep package="libical"/>
       <dep package="libsoup"/>
-      <dep package="libxml2"/>
+      <dep package="avahi"/>
+      <dep package="gnutls"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="clutter-box2d">
+    <branch/>
+    <dependencies>
+      <dep package="clutter"/>
+    </dependencies>
+  </autotools>
+
+  <metamodule id="meta-clutter-core">
+    <dependencies>
+      <dep package="clutter"/>
+    </dependencies>
+  </metamodule>
+
+  <metamodule id="meta-clutter-suite">
+    <dependencies>
+      <dep package="meta-clutter-core"/>
+      <dep package="clutter-gst"/>
+      <dep package="clutter-gtk"/>
+    </dependencies>
+  </metamodule>
+
+  <autotools id="gupnp-tools">
+    <branch />
+    <dependencies>
+      <dep package="gupnp"/>
+      <dep package="gtk+-2"/>
+      <dep package="gnome-icon-theme"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="rhythmbox-gupnp" autogenargs="--with-rhythmbox=../rhythmbox">
+    <branch repo="gitorious.org" module="gupnp/rhythmbox-gupnp"/>
+    <dependencies>
+      <dep package="rhythmbox"/>
+      <dep package="gupnp-av"/>
+      <dep package="gtk+-2"/>
+    </dependencies>
+  </autotools>
+
+  <metamodule id="meta-gupnp">
+    <dependencies>
+      <dep package="gssdp"/>
+      <dep package="gupnp"/>
+      <dep package="gupnp-av"/>
+      <dep package="gupnp-tools"/>
+      <dep package="rhythmbox-gupnp"/>
+    </dependencies>
+  </metamodule>
+
+  <autotools id="elisa">
+    <branch repo="elisa.code.fluendo.com" module="trunk" />
+    <dependencies>
+      <dep package="pygtk"/>
+      <dep package="pigment"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="pigment">
+    <branch repo="pigment.code.fluendo.com" module="trunk" />
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="pygtk"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-lirc-properties">
+    <branch />
+    <dependencies>
+      <dep package="gnome-doc-utils"/>
+      <dep package="polkit"/>
+      <dep package="pygtk"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="bluez-gnome">
+    <branch repo="git.kernel.org" module="bluetooth/bluez-gnome.git" checkoutdir="bluez-gnome"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="dbus-glib"/>
+      <dep package="gtk+-2"/>
+      <dep package="gconf"/>
       <dep package="libnotify"/>
-      <dep package="shared-mime-info"/>
-      <dep package="spamassassin"/>
-      <dep package="yelp-tools"/>
+      <dep package="dbus"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="pidgin">
+    <branch repo="pidgin.im"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="glib"/>
+      <dep package="gtk+-2"/>
+      <dep package="evolution-data-server"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-keyring-manager" autogenargs="--disable-more-warnings">
+    <branch/>
+    <dependencies>
+      <dep package="libgnome-keyring"/>
+      <dep package="gconf"/>
+      <dep package="gnome-doc-utils"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtkmm-documentation">
+    <branch/>
+    <dependencies>
+      <dep package="gtkmm"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtkmm-utils">
+    <branch repo="git.savannah.nongnu.org" module="gtkmm-utils" checkoutdir="gtkmm-utils" />
+    <dependencies>
+      <dep package="gtkmm"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="paperbox">
+    <branch/>
+    <dependencies>
+      <dep package="gtkmm"/>
+      <dep package="gtkmm-utils"/>
+      <dep package="goocanvas"/>
+      <dep package="dbus-glib"/>
+      <dep package="tracker"/>
     </dependencies>
-    <suggests>
-      <dep package="geoclue"/>
-      <dep package="geocode-glib"/>
-    </suggests>
   </autotools>
 
-  <autotools id="file-roller">
+  <tarball id="ndesk-dbus" version="0.6.0">
+    <source href="http://www.ndesk.org/archive/dbus-sharp/ndesk-dbus-0.6.0.tar.gz";
+            hash="sha256:252322f18e906ba7e64cecd0baec08d1a0109206777a5507a713e12def126424"
+            md5sum="5157ba105c9ac491f6e900bc78d1791f" size="122303"/>
+    <dependencies>
+      <dep package="mono"/>
+    </dependencies>
+  </tarball>
+
+  <tarball id="ndesk-dbus-glib" version="0.4.1">
+    <source href="http://www.ndesk.org/archive/dbus-sharp/ndesk-dbus-glib-0.4.1.tar.gz";
+            hash="sha256:0a6d5fe7be55b6301615d71b89507b712f287b4ba498b798301333ffabe06769"
+            md5sum="7faf8770b214956fa9de009def550826" size="85471"/>
+    <dependencies>
+      <dep package="ndesk-dbus"/>
+    </dependencies>
+  </tarball>
+
+  <autotools id="monkey-bubble">
     <branch/>
     <dependencies>
-      <dep package="file"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="libxml2"/>
+      <dep package="gconf"/>
+      <dep package="librsvg"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="mono-tools">
+    <branch repo="github.com" module="mono/mono-tools.git" checkoutdir="mono-tools"/>
+    <dependencies>
+      <dep package="mono"/>
+      <dep package="gtk-sharp"/>
+      <!-- <dep package="gecko-sharp"/> -->
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtksourceview-sharp">
+    <branch repo="github.com" module="mono/gtksourceview2-sharp.git" checkoutdir="gtksourceview2-sharp"/>
+    <dependencies>
+      <dep package="mono"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="monodevelop">
+    <branch repo="github.com" module="mono/monodevelop.git" checkoutdir="monodevelop"/>
+    <dependencies>
+      <dep package="desktop-file-utils"/>
+      <dep package="mono"/>
+      <dep package="gtk-sharp"/>
+      <dep package="gtksourceview-sharp"/>
+      <!-- <dep package="gecko-sharp"/> -->
+    </dependencies>
+  </autotools>
+
+  <autotools id="gsf-sharp">
+    <branch repo="github.com" module="mono/gsf-sharp.git" checkoutdir="gsf-sharp"/>
+    <dependencies>
+      <dep package="libgsf"/>
+      <dep package="gtk-sharp"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="evolution-sharp">
+    <branch/>
+    <dependencies>
+      <dep package="evolution-data-server"/>
+      <dep package="gtk-sharp"/>
+    </dependencies>
+  </autotools>
+
+ <autotools id="netspeed">
+   <branch/>
+   <dependencies>
+     <dep package="gtk+-2"/>
+     <dep package="gnome-panel"/>
+   </dependencies>
+ </autotools>
+
+ <tarball id="liboil" version="0.3.17">
+   <pkg-config>liboil-0.3.pc</pkg-config>
+   <source href="http://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz";
+           hash="sha256:105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69"
+           size="912563"/>
+ </tarball>
+
+ <autotools id="gst-fluendo-mp3"
+            autogenargs="--with-liboil=yes">
+   <branch repo="svn.fluendo.com" />
+   <dependencies>
+     <dep package="liboil"/>
+     <dep package="gstreamer-0.10"/>
+     <dep package="gst-plugins-base-0.10"/>
+   </dependencies>
+ </autotools>
+
+ <autotools id="gst-fluendo-mpegdemux">
+   <branch repo="svn.fluendo.com" />
+   <dependencies>
+     <dep package="gstreamer-0.10"/>
+     <dep package="gst-plugins-base-0.10"/>
+   </dependencies>
+ </autotools>
+
+ <autotools id="eog-plugins">
+   <branch/>
+   <dependencies>
+     <dep package="eog"/>
+   </dependencies>    
+   <suggests>
+     <dep package="gsettings-desktop-schemas"/>
+     <dep package="libchamplain"/>
+     <dep package="libgdata"/>
+     <dep package="pygobject-python2"/>
+   </suggests>
+ </autotools>
+
+ <autotools id="moap">
+   <branch repo="svn.thomas.apestaart.org" 
+           module="trunk" 
+           checkoutdir="moap"/>
+ </autotools>
+
+ <autotools id="capuchin">
+   <branch/>
+   <dependencies>
+     <dep package="dbus"/>
+     <dep package="ndesk-dbus"/>
+     <dep package="mono"/>
+   </dependencies>
+ </autotools>
+
+ <autotools id="capuchin-glib">
+   <branch repo="git.capuchin.gnome.org"
+           module="capuchin-glib.git" checkoutdir="capuchin-glib"/>
+   <dependencies>
+     <dep package="dbus-glib"/>
+   </dependencies>
+ </autotools>
+
+ <distutils id="hotwire">
+   <branch repo="hotwire.googlecode.com"
+           module="trunk"
+           checkoutdir="hotwire"/>
+   <dependencies>
+     <dep package="pygtk"/>
+     <dep package="desktop-file-utils"/>
+   </dependencies>
+ </distutils>
+
+ <autotools id="labyrinth">
+   <branch repo="labyrinth.googlecode.com"
+           module="trunk"
+           checkoutdir="labyrinth"/>
+   <dependencies>
+     <dep package="pygtk"/>
+     <dep package="py2cairo"/>
+   </dependencies>
+ </autotools>
+
+ <autotools id="d-feet" autogenargs="--disable-tests">
+   <branch/>
+   <dependencies>
+     <dep package="pygobject"/>
+     <dep package="glib"/>
+     <dep package="gtk+"/>
+   </dependencies>
+ </autotools>
+
+  <autotools id="notify-sharp" autogen-sh="autoreconf">
+    <branch repo="hg.circular-chaos.org"/>
+    <dependencies>
+      <dep package="mono"/>
+      <dep package="gtk-sharp"/>
+      <dep package="ndesk-dbus"/>
+      <dep package="ndesk-dbus-glib"/>
+   </dependencies>
+  </autotools>
+
+  <autotools id="tasque">
+    <branch/>
+    <dependencies>
+      <dep package="mono"/>
+      <dep package="gtk-sharp"/>
+      <dep package="ndesk-dbus"/>
+      <dep package="ndesk-dbus-glib"/>
+      <dep package="notify-sharp"/>
+      <dep package="evolution-sharp"/>
+    </dependencies>
+  </autotools>
+
+  <tarball id="gnokii" version="0.6.26">
+    <source href="http://www.gnokii.org/download/gnokii/gnokii-0.6.26.tar.bz2";
+            md5sum="dcb81aa203f9ae4167b5045b7b8177e1" size="2059415"/>
+    <suggests>
       <dep package="glib"/>
+      <dep package="gtk+-2"/>
+    </suggests>
+  </tarball>
+
+  <tarball id="gtkspell" version="2.0.16">
+    <source href="http://sourceforge.net/projects/gtkspell/files/2.0.16/gtkspell-2.0.16.tar.gz";
+            hash="sha256:8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02"
+            md5sum="f75dcc9338f182c571b321d37c606a94" size="351277"/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="pango"/>
+      <dep package="gtk-doc"/>
+    </dependencies>
+  </tarball>
+
+  <autotools id="transmission">
+    <branch repo="transmissionbt.com"
+            module="trunk"
+            checkoutdir="transmission"/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="intltool"/>
+    </dependencies>
+    <suggests>
+      <dep package="dbus-glib"/>
+      <dep package="libnotify"/>
+    </suggests>
+  </autotools> 
+
+  <autotools id="goocanvas">
+    <branch/>
+    <dependencies>
       <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="pygoocanvas">
+    <branch/>
+    <dependencies>
+      <dep package="goocanvas"/>
+      <dep package="pygtk"/>
+    </dependencies>
+  </autotools>
+
+  <!-- Conduit needs this to integrate with data from Evolution out of the box. -->
+  <repository type="tarball" name="skyhouseconsulting.com"
+      href="http://vobject.skyhouseconsulting.com/"/>
+  <distutils id="python-vobject">
+    <branch repo="skyhouseconsulting.com" module="vobject-0.4.9.tar.gz" version="0.4.9"
+      hash="sha256:48741afdd8d7f98e2d1d1240764afaa2e38828df5f41e33e969370ab837de358"
+      md5sum="55ab1fc3797b90eb556a6b0d2054cfd4" size="51765" />
+    <dependencies/>
+  </distutils>
+
+  <autotools id="conduit">
+    <branch/>
+    <dependencies>
+      <dep package="pygoocanvas"/>
+      <dep package="python-vobject"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="ldtp">
+    <branch repo="ldtp.freedesktop.org" module="ldtp"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <distutils id="postr">
+   <branch/>
+   <dependencies>
+     <dep package="pygtk"/>
+     <dep package="nautilus-python"/>
+   </dependencies>
+  </distutils>
+
+  <distutils id="zebu">
+    <branch repo="bzr.burtonini.com" module="zebu" checkoutdir="zebu"/>
+   <dependencies>
+     <dep package="pygtk"/>
+   </dependencies>
+  </distutils>
+
+  <distutils id="kiwi">
+    <branch repo="svn.async.com.br" module="kiwi/trunk" checkoutdir="kiwi"/>
+    <dependencies>
+      <dep package="pygtk"/>
+    </dependencies>
+  </distutils>
+
+  <!-- This is probably too difficult to build in jhbuild.
+  <repository type="tarball" name="twistedmatrix.com"
+      href="http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/"/>
+  <distutils id="twisted-core">
+    <branch repo="twistedmatrix.com" module="TwistedCore-2.5.0.tar.bz2"
+      version="2.5.0" md5sum="cf8d8d73c3b58b79c6a16b5fc23d5b61" size="2049409" />
+    <dependencies/>
+  </distutils>
+  -->
+
+  <autotools id="flumotion">
+    <branch repo="flumotion.code.fluendo.com" module="flumotion/trunk" checkoutdir="flumotion"/>
+    <dependencies>
+      <dep package="kiwi"/>
+      <dep package="gst-python-0.10"/>
+      <!-- <dep package="twisted-core"/> -->
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-sound-theme">
+    <branch/>
+    <dependencies>
+      <dep package="gnome-common"/>
       <dep package="intltool"/>
-      <dep package="nautilus"/>
-      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gedit">
+  <autotools id="devilspie">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="libwnck-2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="murrine">
     <branch/>
     <dependencies>
+      <dep package="gtk+-2"/>
       <dep package="intltool"/>
-      <dep package="libpeas"/>
-      <dep package="yelp-tools"/>
-      <dep package="gtksourceview"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="python-devel"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gtk-css-engine">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libfakekey">
+    <branch repo="matchbox-project.org"
+            module="libfakekey/0.1/libfakekey-0.1.tar.bz2" version="0.1"
+            size="203504" md5sum="83dbde4d77e8baf0176fe4291d8a2303"/>
+  </autotools>
+
+  <autotools id="gir-repository">
+    <branch/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="iso-codes"/>
-      <dep package="enchant"/>
+      <dep package="gnome-keyring"/>
+      <dep package="poppler"/>
+      <dep package="libnotify"/>
+      <dep package="gssdp"/>
+      <dep package="gupnp"/>
     </suggests>
   </autotools>
 
-  <autotools id="gitg">
-    <branch/>
+  <autotools id="dee">
+    <branch repo="launchpad.net"
+            module="dee"/>
     <dependencies>
-      <dep package="gtk+"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="gtksourceview"/>
+      <dep package="gtk-doc"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gwibber"
+             autogenargs="--disable-unity">
+    <branch repo="launchpad.net"
+            module="gwibber"/>
+    <dependencies>
+      <dep package="dee"/>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <dep package="gsettings-desktop-schemas"/>
+      <dep package="gtk+"/>
+      <dep package="gtkspell-3"/>
       <dep package="json-glib"/>
-      <dep package="libgee"/>
-      <dep package="libgit2-glib"/>
-      <dep package="libpeas"/>
+      <dep package="libgee-0.6"/>
+      <dep package="libnotify"/>
+      <dep package="libsoup"/>
+      <dep package="pygobject-python2"/>
       <dep package="vala"/>
-      <dep package="WebKit"/>
-      <dep package="gtkspell-3"/>
+    </dependencies>
+  </autotools>
+
+  <!-- ########## Ubuntu Netbook Remix Modules ########## -->
+
+  <autotools id="maximus">
+    <branch repo="launchpad.net"
+            module="maximus"/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="gconf"/>
+      <dep package="libwnck-2"/>
+      <dep package="libfakekey"/>
+    </dependencies>
+  </autotools>
+
+ <autotools id="window-picker-applet">
+    <branch repo="launchpad.net"
+            module="window-picker-applet"/>
+    <dependencies>
+      <dep package="gnome-panel"/>
+      <dep package="gconf"/>
+      <dep package="libwnck-2"/>
+      <dep package="gtk+-2"/>
+    </dependencies>
+  </autotools>
+
+ <autotools id="go-home-applet">
+    <branch repo="launchpad.net"
+            module="go-home-applet"/>
+    <dependencies>
+      <dep package="gnome-panel"/>
+      <dep package="gnome-desktop-2"/>
+      <dep package="gconf"/>
+      <dep package="libwnck-2"/>
+      <dep package="gtk+-2"/>
+    </dependencies>
+  </autotools>
+
+ <autotools id="netbook-remix-launcher">
+    <branch repo="launchpad.net"
+            module="netbook-remix-launcher"/>
+    <dependencies>
+      <dep package="clutter-gtk"/>
+      <dep package="clutter"/>
+      <dep package="startup-notification"/>
+      <dep package="gnome-desktop-2"/>
+      <dep package="gnome-menus"/>
+      <dep package="libwnck-2"/>
+      <dep package="gconf"/>
+      <dep package="gtk+-2"/>
+      <dep package="pango"/>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+ <autotools id="desktop-switcher">
+   <branch repo="launchpad.net"
+           module="desktop-switcher"/>
+   <dependencies>
+     <dep package="gtk+-2"/>
+     <dep package="gconf"/>
+   </dependencies>
+ </autotools>
+
+  <metamodule id="meta-netbook-remix">
+    <dependencies>
+      <dep package="netbook-remix-launcher"/>
+      <dep package="maximus"/>
+      <dep package="window-picker-applet"/>
+      <dep package="go-home-applet"/>
+      <dep package="desktop-switcher"/>
+    </dependencies>
+  </metamodule>
+
+  <!-- ########## End of Ubuntu Netbook Remix Modules ########## -->
+
+  <autotools id="almanah">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="gconf"/>
+      <dep package="sqlite3"/>
     </dependencies>
     <suggests>
-      <dep package="glade"/>
-      <dep package="pygobject"/>
+      <dep package="gtkspell-3"/>
     </suggests>
   </autotools>
 
-  <autotools id="gnome-boxes" autogenargs="--enable-vala">
+  <autotools id="gst-rtsp-server-0.10">
+    <branch repo="gstreamer.freedesktop.org" module="gst-rtsp-server"
+            revision="0.10" checkoutdir="gst-rtsp-server-0.10"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-rtsp-server">
+    <branch repo="gstreamer.freedesktop.org" module="gst-rtsp-server"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-dvb-daemon">
+   <branch />
+   <dependencies>
+     <dep package="glib"/>
+     <dep package="gstreamer-0.10"/>
+     <dep package="gst-rtsp-server-0.10"/>
+     <dep package="vala"/>
+     <dep package="gst-plugins-good-0.10"/>
+     <dep package="gst-plugins-bad-0.10"/>
+     <dep package="libgee-0.6"/>
+     <dep package="sqlite3"/>
+     <dep package="pygobject2"/>
+     <dep package="gst-python-0.10"/>
+   </dependencies>
+  </autotools>
+
+  <autotools id="nautilus-cd-burner">
     <branch/>
     <dependencies>
+      <dep package="nautilus"/>
+    </dependencies>
+  </autotools>
+
+ <autotools id="quick-lounge-applet">
+    <branch />
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="gnome-panel"/>
+      <dep package="gnome-menus"/>
+    </dependencies>
+  </autotools>
+
+ <autotools id="gpointing-device-settings">
+    <branch />
+    <dependencies>
       <dep package="glib"/>
-      <dep package="libxml2"/>
-      <dep package="gtk-vnc"/>
-      <dep package="libosinfo"/>
-      <dep package="libvirt-glib"/>
-      <dep package="gtk+"/>
-      <dep package="spice-gtk"/>
-      <dep package="clutter-gtk"/>
-      <dep package="vala"/>
-      <dep package="gudev"/>
-      <dep package="tracker"/>
-      <dep package="gnome-themes-standard"/>
+      <dep package="gtk+-2"/>
+      <dep package="gconf"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-clocks">
+  <autotools id="moserial">
     <branch/>
     <dependencies>
       <dep package="vala"/>
-      <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-      <dep package="gnome-desktop"/>
-      <dep package="libgweather"/>
-      <dep package="libnotify"/>
-      <dep package="geocode-glib"/>
-      <dep package="yelp-tools"/>
+      <dep package="gconf"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-initial-setup">
+  <autotools id="gparted">
     <branch/>
     <dependencies>
-      <dep package="accountsservice"/>
-      <dep package="cheese"/>
-      <dep package="clutter-gtk"/>
-      <dep package="clutter-gst"/>
-      <dep package="geoclue"/>
-      <dep package="gdm"/>
+      <dep package="gtkmm"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="niepce">
+    <branch/>
+    <dependencies>
+      <dep package="glibmm"/>
+      <dep package="gtkmm"/>
+      <dep package="gconf"/>
+      <dep package="sqlite3"/>
+      <dep package="gegl"/>
+      <dep package="geglmm"/>
+      <dep package="libxml2"/>
+      <dep package="babl"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="liferea">
+    <branch repo="liferea.svn.sourceforge.net"
+            module="liferea/trunk/liferea"
+            checkoutdir="liferea"/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gnome-keyring"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="gstreamer"/>
-      <dep package="iso-codes"/>
-      <dep package="libgweather"/>
-      <dep package="libpwquality"/>
-      <dep package="network-manager-applet"/>
+      <dep package="pango"/>
+      <dep package="gconf"/>
+      <dep package="libxml2"/>
+      <dep package="sqlite3"/>
+      <dep package="libsoup"/>
+      <dep package="libunique-1"/>
+      <dep package="WebKit"/>
+    </dependencies>
+    <suggests>
+      <dep package="dbus"/>
       <dep package="NetworkManager"/>
+      <dep package="libnotify"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="krb5-auth-dialog">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="dbus-glib"/>
+      <dep package="glib"/>
+      <dep package="gconf"/>
     </dependencies>
     <suggests>
-      <dep package="upower"/>
-      <dep package="gnome-getting-started-docs"/>
+      <dep package="libnotify"/>
     </suggests>
   </autotools>
 
-  <autotools id="gnome-getting-started-docs">
+  <!-- ########## Pimplico Modules ########## -->
+
+  <autotools id="contacts">
     <branch/>
     <dependencies>
-      <dep package="yelp-tools"/>
+      <dep package="gtk+-2"/>
+      <dep package="evolution-data-server"/>
+      <dep package="gconf"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-video-effects">
+  <autotools id="dates">
     <branch/>
     <dependencies>
-      <dep package="gstreamer"/>
+      <dep package="gtk+-2"/>
+      <dep package="evolution-data-server"/>
+      <dep package="gconf"/>
     </dependencies>
   </autotools>
 
-  <autotools id="aisleriot"
-             autogenargs="--with-platform=gtk-only">
+  <autotools id="tasks">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-      <dep package="librsvg"/>
-      <dep package="guile"/>
+      <dep package="gtk+-2"/>
+      <dep package="evolution-data-server"/>
     </dependencies>
+    <suggests>
+      <dep package="libunique-1"/>
+    </suggests>
   </autotools>
 
-  <autotools id="five-or-more">
-    <branch revision="gnome-3-10"/>
+  <metamodule id="meta-pimlico">
+    <dependencies>
+     <dep package="contacts"/>
+     <dep package="dates"/>
+     <dep package="tasks"/>
+    </dependencies>
+  </metamodule>
+
+  <!-- ########## End of Pimplico Modules ########## -->
+
+  <autotools id="claws-mail"
+             autogenargs="--disable-libetpan">
+    <branch repo="cvs.claws-mail" revision="gtk2" module="claws" checkoutdir="claws-mail"/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="glib"/>
+      <dep package="enchant"/>
+    </dependencies>
+    <suggests>
+      <dep package="startup-notification"/>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="midori">
+    <branch repo="git.xfce.org" branch="kalikiana/midori"/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="WebKit"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+    </dependencies>
+    <suggests>
+      <dep package="libunique-1"/>
+      <dep package="libnotify"/>
+      <dep package="sqlite3"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="librsvgmm">
+    <branch/>
     <dependencies>
-      <dep package="intltool"/>
       <dep package="librsvg"/>
+      <dep package="glibmm"/>
+      <dep package="cairomm"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libvtemm">
+    <branch/>
+    <dependencies>
+      <dep package="mm-common"/>
+      <dep package="glibmm"/>
+      <dep package="gtkmm"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-pilot">
+    <branch/>
+    <dependencies>
       <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-      <dep package="yelp-tools"/>
+      <dep package="libxml2"/>
+      <dep package="gnome-panel"/>
+      <dep package="gconf"/>
+      <dep package="dbus-glib"/>
+      <dep package="gudev"/>
     </dependencies>
   </autotools>
 
-  <autotools id="four-in-a-row">
-    <branch revision="gnome-3-10"/>
+  <tarball id="qt" version="4.5.2" autogenargs="-opensource -confirm-license">
+    <source href="http://get.qt.nokia.com/qt/source/qt-x11-opensource-src-4.5.2.tar.gz";
+            hash="sha256:4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2"
+            md5sum="d8bcc070a58db25c228b7729ffad4550" size="125803421" />
     <dependencies>
-      <dep package="intltool"/>
-      <dep package="librsvg"/>
+      <dep package="glib"/>
+    </dependencies>
+  </tarball>
+
+  <!-- qlom is a Qt-based viewer for Glom databases, using libglom. -->
+  <autotools id="qlom">
+    <branch repo="github.com" module="amigadave/qlom.git" checkoutdir="qlom" />
+    <dependencies>
+      <dep package="qt"/>
+      <dep package="glom"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="ethos">
+    <branch repo="git.dronelabs.com" />
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+-2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="emerillon">
+    <branch />
+    <dependencies>
+      <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-      <dep package="yelp-tools"/>
+      <dep package="libchamplain"/>
+      <dep package="libpeas"/>
+      <dep package="librest"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-chess">
-    <branch revision="gnome-3-10"/>
+  <autotools id="glabels">
+    <branch/>
     <dependencies>
-      <dep package="intltool"/>
-      <dep package="librsvg"/>
+      <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="vala"/>
-      <dep package="yelp-tools"/>
-      <dep package="glu"/>
+      <dep package="libxml2"/>
+      <dep package="pango"/>
+      <dep package="cairo"/>
+      <dep package="librsvg"/>
+    </dependencies>
+  </autotools>
+
+  <waf id="ardour" waf-command="./waf">
+    <branch repo="git.ardour.org" module="ardour/ardour.git"/>
+    <dependencies>
+      <dep package="glibmm"/>
+      <dep package="gtkmm"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </waf>
+
+  <autotools id="hyena">
+    <branch/>
+    <dependencies>
+      <dep package="gtk-sharp"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-klotski">
-    <branch revision="gnome-3-10"/>
+  <autotools id="pdfmod">
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="librsvg"/>
-      <dep package="gtk+"/>
-      <dep package="yelp-tools"/>
+      <dep package="gtk-sharp"/>
+      <dep package="poppler"/>
+      <dep package="hyena"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="couchdb-glib">
+    <branch/>
+    <dependencies>
+      <dep package="libsoup"/>
+      <dep package="dbus-glib"/>
+      <dep package="json-glib"/>
+      <dep package="libgnome-keyring"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-mahjongg">
-    <branch revision="gnome-3-10"/>
+  <autotools id="telegnome">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+-2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="grilo-mediaserver2">
+    <branch/>
+    <dependencies>
+      <dep package="grilo"/>
+      <dep package="glib"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+  </autotools>
+
+  <!-- Desktop: deprecated libraries -->
+
+  <autotools id="libgail-gnome">
+    <branch/>
+    <dependencies>
+      <dep package="gnome-panel"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgnomecups">
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="librsvg"/>
-      <dep package="vala"/>
-      <dep package="yelp-tools"/>
+      <dep package="glib"/>
+      <dep package="gnome-common"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-mines">
-    <branch revision="gnome-3-10"/>
+  <autotools id="libgnomeprint">
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="librsvg"/>
-      <dep package="gtk+"/>
-      <dep package="vala"/>
-      <dep package="yelp-tools"/>
+      <dep package="glib"/>
+      <dep package="gnome-common"/>
+      <dep package="pango"/>
+      <dep package="libgnomecups"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-nibbles">
-    <branch revision="gnome-3-10"/>
+  <autotools id="libgnomeprintui">
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="librsvg"/>
-      <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-      <dep package="yelp-tools"/>
-      <dep package="clutter"/>
-      <dep package="clutter-gtk"/>
+      <dep package="libgnomeprint"/>
+      <dep package="gtk+-2"/>
+      <dep package="gnome-icon-theme"/>
     </dependencies>
   </autotools>
 
-  <autotools id="dleyna-core">
-    <branch repo="github-01org"/>
+  <!-- Platform: deprecated libraries -->
+
+  <tarball id="audiofile" version="0.2.7" supports-non-srcdir-builds="no">
+    <source href="http://www.68k.org/~michael/audiofile/audiofile-0.2.7.tar.gz";
+            hash="sha256:a61c4036c2600a645843f16bec4be166093a9df5f15b02c85291213aa9cf15a2"
+            md5sum="a39be317a7b1971b408805dc5e371862" size="502448"/>
+  </tarball>
+
+  <autotools id="esound">
+    <branch/>
     <dependencies>
-      <dep package="gupnp"/>
+      <dep package="audiofile"/>
     </dependencies>
   </autotools>
 
-  <autotools id="dleyna-connector-dbus">
-    <branch repo="github-01org"/>
+  <distutils id="fungtk">
+    <branch repo="launchpad.net"
+            module="fungtk"/>
+    <dependencies>
+    </dependencies>
+  </distutils>
+
+  <distutils id="gnome-activity-journal">
+    <branch repo="launchpad.net"
+            module="gnome-activity-journal"/>
+    <dependencies>
+      <dep package="py2cairo"/>
+      <dep package="pygtk"/>
+      <dep package="fungtk"/>
+      <dep package="dbus-python"/>
+    </dependencies>
+  </distutils>
+
+  <autotools id="mousetrap">
+    <branch/>
     <dependencies>
-      <dep package="dleyna-core"/>
+      <dep package="pygtk"/>
     </dependencies>
   </autotools>
 
-  <autotools id="dleyna-renderer">
-    <branch repo="github-01org"/>
+  <autotools id="anjuta-extras">
+    <branch/>
     <dependencies>
-      <dep package="dleyna-connector-dbus"/>
-      <dep package="dleyna-core"/>
-      <dep package="gssdp"/>
-      <dep package="gupnp"/>
-      <dep package="gupnp-av"/>
-      <dep package="gupnp-dlna"/>
+      <dep package="anjuta"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-photos">
-    <branch revision="gnome-3-10"/>
+  <autotools id="clutter-gst-0.10">
+    <branch module="clutter-gst" checkoutdir="clutter-gst-0.10" revision="clutter-gst-1.6"/>
     <dependencies>
-      <dep package="gegl"/>
-      <dep package="cairo"/>
+      <dep package="clutter"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+    </dependencies>
+    <suggests>
+      <dep package="gobject-introspection"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="ease">
+    <branch/>
+    <dependencies>
+      <dep package="vala"/>
+      <dep package="libgee-0.6"/>
       <dep package="clutter-gtk"/>
-      <dep package="dleyna-renderer"/>
-      <dep package="gdk-pixbuf"/>
+      <dep package="clutter-gst-0.10"/>
+      <dep package="json-glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="genius">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-2"/>
       <dep package="glib"/>
-      <dep package="gnome-desktop"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="gnome-online-miners"/>
-      <dep package="gobject-introspection"/>
+    </dependencies>
+    <suggests>
+    </suggests>
+  </autotools>
+
+  <autotools id="samba4" skip-autogen="never" autogen-sh="configure"
+             supports-non-srcdir-builds="no">
+    <branch repo="samba.org"
+            module="samba/samba-4.0.8.tar.gz" version="4.0.8"
+            hash="sha256:5c6d4ff8249ad4377dc2e854de6744ce0058d1ff28ece6008f5152e922993a88"
+            md5sum="03819bc1132e417feac1b39299365b73" size="22076951">
+    </branch>
+  </autotools>
+
+  <autotools id="talloc"
+             skip-autogen="never" autogen-sh="configure"
+             makeargs="tallocdir='$(srcdir)'"
+             makeinstallargs="install tallocdir='$(srcdir)'">
+    <branch repo="samba.org"
+            module="samba/samba-4.0.8.tar.gz" version="4.0.8"
+            hash="sha256:5c6d4ff8249ad4377dc2e854de6744ce0058d1ff28ece6008f5152e922993a88"
+            md5sum="03819bc1132e417feac1b39299365b73" size="22076951"
+            source-subdir="lib/talloc">
+    </branch>
+  </autotools>
+
+  <autotools id="tdb" skip-autogen="never" autogen-sh="configure">
+    <branch repo="samba.org"
+            module="samba/samba-4.0.8.tar.gz" version="4.0.8"
+            hash="sha256:5c6d4ff8249ad4377dc2e854de6744ce0058d1ff28ece6008f5152e922993a88"
+            md5sum="03819bc1132e417feac1b39299365b73" size="22076951"
+            source-subdir="lib/tdb">
+    </branch>
+  </autotools>
+
+  <autotools id="tevent" skip-autogen="never" autogen-sh="configure">
+    <branch repo="samba.org"
+            module="samba/samba-4.0.8.tar.gz" version="4.0.8"
+            hash="sha256:5c6d4ff8249ad4377dc2e854de6744ce0058d1ff28ece6008f5152e922993a88"
+            md5sum="03819bc1132e417feac1b39299365b73" size="22076951"
+            source-subdir="lib/tevent">
+    </branch>
+  </autotools>
+
+  <autotools id="ldb" skip-autogen="never" autogen-sh="configure">
+    <branch repo="samba.org"
+            module="samba/samba-4.0.8.tar.gz" version="4.0.8"
+            hash="sha256:5c6d4ff8249ad4377dc2e854de6744ce0058d1ff28ece6008f5152e922993a88"
+            md5sum="03819bc1132e417feac1b39299365b73" size="22076951"
+            source-subdir="source4/lib/ldb">
+    </branch>
+  </autotools>
+
+  <autotools id="libmapi" skip-autogen="never" autogen-sh="configure"
+             supports-non-srcdir-builds="no">
+    <branch repo="openchange.org"
+            module="142/openchange-0.11-TRANSPORTER.tar.gz" version="0.11"
+            hash="sha256:d6e69d967337e7967d7b1aee61ca8ff48dde7140c66b681f2eb9b246157eed0b"
+            md5sum="7e5d2de7399f429048390a04aa8c5e79" size="1920597"/>
+    <dependencies>
+      <dep package="tdb"/>
+      <dep package="talloc"/>
+      <dep package="tevent"/>
+      <dep package="ldb"/>
+      <dep package="samba4"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="evolution-kolab">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gconf"/>
       <dep package="gtk+"/>
-      <dep package="tracker"/>
+      <dep package="intltool"/>
+      <dep package="gmime"/>
+      <dep package="evolution-data-server"/>
+      <dep package="evolution"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-robots">
-    <branch revision="gnome-3-10"/>
+  <autotools id="evolution-mapi">
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="librsvg"/>
-      <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-      <dep package="yelp-tools"/>
+      <dep package="evolution-data-server"/>
+      <dep package="evolution"/>
+      <dep package="libmapi"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-sudoku">
-    <branch revision="gnome-3-10"/>
+  <autotools id="evolution-ews">
+    <branch/>
     <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libsoup"/>
       <dep package="intltool"/>
+      <dep package="evolution-data-server"/>
+      <dep package="evolution"/>
+      <dep package="sqlite3"/>
+      <dep package="libical"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libglade">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="network-manager-pptp">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="dbus-glib"/>
       <dep package="gtk+"/>
-      <dep package="pygobject"/>
-      <dep package="yelp-tools"/>
+      <dep package="gconf"/>
+      <dep package="gnome-keyring"/>
+      <dep package="NetworkManager"/>
+      <dep package="libnotify"/>
+      <dep package="network-manager-applet"/>
+   </dependencies>
+  </autotools>
+
+  <autotools id="network-manager-openvpn">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="dbus-glib"/>
+      <dep package="gtk+"/>
+      <dep package="gconf"/>
+      <dep package="gnome-keyring"/>
+      <dep package="NetworkManager"/>
+      <dep package="libnotify"/>
+      <dep package="network-manager-applet"/>
+   </dependencies>
+  </autotools>
+
+  <autotools id="network-manager-vpnc">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="dbus-glib"/>
+      <dep package="gtk+"/>
+      <dep package="gconf"/>
+      <dep package="gnome-keyring"/>
+      <dep package="NetworkManager"/>
+      <dep package="libnotify"/>
+      <dep package="network-manager-applet"/>
+   </dependencies>
+  </autotools>
+
+  <autotools id="network-manager-openconnect">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="dbus-glib"/>
+      <dep package="gtk+"/>
+      <dep package="gconf"/>
+      <dep package="gnome-keyring"/>
+      <dep package="NetworkManager"/>
+      <dep package="libnotify"/>
+      <dep package="network-manager-applet"/>
+   </dependencies>
+  </autotools>
+
+  <autotools id="gtkparasite-2">
+    <branch repo="github.com" module="chipx86/gtkparasite.git" checkoutdir="gtkparasite-2"/>
+    <dependencies>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-tetravex">
-    <branch revision="gnome-3-10"/>
+  <autotools id="gtkparasite">
+    <branch/>
     <dependencies>
-      <dep package="intltool"/>
-      <dep package="librsvg"/>
       <dep package="gtk+"/>
-      <dep package="vala"/>
-      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-tweak-tool">
+  <autotools id="gst-plugins-ugly"
+             autogenargs="--disable-fatal-warnings"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            checkoutdir="gst-plugins-ugly"
+            module="gst-plugins-ugly"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="linux-user-chroot">
+    <branch/>
+  </autotools>
+
+  <autotools id="ostree" autogenargs="--with-libarchive --enable-installed-tests">
+    <branch/>
+    <dependencies>
+      <dep package="libsoup"/>
+      <dep package="libarchive"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-continuous">
+    <branch/>
+    <dependencies>
+      <dep package="ostree"/>
+      <dep package="gjs"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgsystem">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-desktop-testing">
     <branch/>
     <dependencies>
+      <dep package="glib"/>
+      <dep package="libgsystem"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="latexila">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="pygobject-python2"/>
+      <dep package="gtksourceview"/>
       <dep package="gsettings-desktop-schemas"/>
+      <dep package="vala"/>
+      <dep package="libgee-0.6"/>
+      <dep package="enchant"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="iagno">
-    <branch revision="gnome-3-10"/>
+  <autotools id="tumbler">
+    <branch repo="git.xfce.org"
+            module="xfce/tumbler"/>
     <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk-doc"/>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+    <suggests>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="libgsf"/>
+      <dep package="poppler"/>
+    </suggests>
+  </autotools>
+
+  <!-- ########## Gnome Flashback Modules ########## -->
+
+  <autotools id="gnome-panel">
+    <branch/>
+    <dependencies>
+      <dep package="gconf"/>
       <dep package="intltool"/>
+      <dep package="gnome-desktop"/>
+      <dep package="libwnck"/>
+      <dep package="evolution-data-server"/>
+      <dep package="gnome-menus"/>
+      <dep package="dbus-glib"/>
       <dep package="librsvg"/>
-      <dep package="gtk+"/>
+      <dep package="libgweather"/>
       <dep package="libcanberra"/>
-      <dep package="vala"/>
       <dep package="yelp-tools"/>
     </dependencies>
+    <suggests>
+      <dep package="polkit"/>
+    </suggests>
   </autotools>
 
-  <autotools id="lightsoff">
-    <branch revision="gnome-3-10"/>
+  <autotools id="metacity">
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="vala"/>
-      <dep package="clutter"/>
-      <dep package="clutter-gtk"/>
-      <dep package="yelp-tools"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gtk+-2"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="intltool"/>
+      <dep package="libcanberra"/>
+      <dep package="zenity"/>
     </dependencies>
   </autotools>
 
-  <autotools id="quadrapassel">
-    <branch revision="gnome-3-10"/>
+  <autotools id="notification-daemon">
+    <branch/>
     <dependencies>
-      <dep package="intltool"/>
+      <dep package="dbus"/>
+      <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="librsvg"/>
       <dep package="libcanberra"/>
-      <dep package="clutter"/>
-      <dep package="clutter-gtk"/>
-      <dep package="vala"/>
-      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="swell-foop">
-    <branch revision="gnome-3-10"/>
+  <autotools id="gnome-screensaver">
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
-      <dep package="clutter"/>
-      <dep package="clutter-gtk"/>
-      <dep package="vala"/>
-      <dep package="yelp-tools"/>
+      <dep package="dbus-glib"/>
+      <dep package="gnome-menus"/>
+      <dep package="gnome-desktop"/>
+      <dep package="libgnomekbd"/>
     </dependencies>
+    <suggests>
+      <dep package="libnotify"/>
+    </suggests>
   </autotools>
 
-  <autotools id="tali">
-    <branch revision="gnome-3-10"/>
+ <autotools id="polkit-gnome" autogenargs="--with-gtk=3.0">
+    <branch checkoutdir="polkit-gnome" module="PolicyKit-gnome"/>
     <dependencies>
+      <dep package="polkit"/>
+      <dep package="gtk+"/>
       <dep package="intltool"/>
-      <dep package="librsvg"/>
+    </dependencies>
+  </autotools>
+
+  <metamodule id="meta-gnome-flashback">
+    <dependencies>
+      <dep package="gnome-panel"/>
+      <dep package="metacity"/>
+      <dep package="notification-daemon"/>
+    </dependencies>
+  </metamodule>
+
+  <!-- ########## End of Gnome Flashback Modules ########## -->
+
+  <autotools id="librsync">
+    <branch repo="downloads.sourceforge.net"
+            module="librsync/librsync-0.9.7.tar.gz"
+            version="0.9.7"
+            hash="sha256:6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6"
+            size="453802"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <distutils id="duplicity">
+    <branch repo="launchpad.net/tarball"
+            module="duplicity/0.6-series/0.6.15/+download/duplicity-0.6.15.tar.gz"
+            version="0.6.15"
+            hash="sha256:69f30388334b84db43ed4eb7838896a73cf53d62718c692a88ab3d3963e1dfad"
+            size="304916"/>
+    <dependencies>
+      <dep package="pygobject2"/>
+      <dep package="librsync"/>
+    </dependencies>
+  </distutils>
+
+  <!-- Other useful deps that you can install are:  -->
+  <!--   libjpeg                                    -->
+  <!--   libpng                                     -->
+  <!--   OpenEXR (see http://www.openexr.com/)      -->
+  <!--   libsdl                                     -->
+  <!--   enscript                                   -->
+  <!--   libavcodec                                 -->
+  <!-- Those are not managed by jhbuild             -->
+  <autotools id="gnome-applets" autogenargs="--without-hal --enable-mixer-applet --enable-mini-commander">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gnome-panel"/>
+      <dep package="libgtop"/>
+      <dep package="libgnomekbd"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gucharmap"/>
+      <dep package="libgweather"/>
+      <dep package="gdk-pixbuf"/>
       <dep package="gtk+"/>
-      <dep package="yelp-tools"/>
+      <dep package="glib"/>
+      <dep package="gconf"/>
+      <dep package="libxklavier" />
+      <dep package="libwnck"/>
+      <dep package="libnotify"/>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+      <dep package="pygobject2"/>
+      <dep package="gnome-icon-theme"/>
+      <dep package="libxml2"/>
+      <dep package="polkit"/>
+      <dep package="NetworkManager"/>
     </dependencies>
+    <after>
+      <dep package="gnome-control-center"/>
+    </after>
   </autotools>
 
-  <autotools id="gnome-nettool">
+  <autotools id="gnome-search-tool">
     <branch/>
     <dependencies>
+      <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="libgtop"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="nautilus-sendto">
+  <autotools id="goffice">
     <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="dbus-glib"/>
-      <dep package="evolution-data-server"/>
-      <dep package="nautilus"/>
+      <dep package="libgsf"/>
+      <dep package="libxml2"/>
+      <dep package="pango"/>
+      <dep package="librsvg"/>
+      <dep package="cairo"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gstreamer-0.10"
+             autogenargs="--disable-tests --disable-fatal-warnings"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gstreamer"
+            revision="0.10"
+            checkoutdir="gstreamer-0.10"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libxml2"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-base-0.10"
+             autogenargs="--with-gtk=3.0 --disable-tests --disable-gnome_vfs"
+             makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS="
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-plugins-base"
+            revision="0.10"
+            checkoutdir="gst-plugins-base-0.10"/>
+    <dependencies>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gtk+"/>
     </dependencies>
     <suggests>
-      <dep package="gupnp-av"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
+    </suggests>
+  </autotools>
+
+  <autotools id="gst-plugins-good-0.10" autogenargs="--with-gtk=3.0 --disable-tests --disable-examples" 
makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS=" 
supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-good" revision="0.10"/>
+    <dependencies>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="flac"/>
+      <dep package="libv4l"/>
+      <dep package="libvpx"/>
+      <dep package="taglib"/>
+      <dep package="wavpack"/>
+    </dependencies>
+    <suggests>
+      <dep package="pulseaudio"/>
+      <dep package="gdk-pixbuf"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </suggests>
   </autotools>
 
-  <autotools id="nemiver">
+  <autotools id="gtk-sharp" autogen-sh="bootstrap-2.12">
+    <branch repo="github.com" module="mono/gtk-sharp.git" checkoutdir="gtk-sharp"
+            revision="gtk-sharp-2-12-branch"/>
+    <dependencies>
+      <dep package="mono"/>
+      <dep package="gtk+-2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libxml++">
     <branch/>
     <dependencies>
-      <dep package="boost"/>
-      <dep package="gdb"/>
-      <dep package="gdlmm"/>
-      <dep package="gtkmm"/>
+      <dep package="libxml2"/>
       <dep package="glibmm"/>
-      <dep package="gtksourceviewmm"/>
-      <dep package="vte"/>
-      <dep package="libgtop"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="mono">
+    <branch module="mono/mono-2.10.9.tar.bz2" version="2.10.9"
+            repo="mono.net"
+            hash="sha256:4c12b6169ae3589a054bbabc448c13d356ff548376c0eda885ec9d440ef2599a"
+            size="34038017"/>
+    <dependencies>
+      <dep package="libgdiplus"/>
+      <dep package="sqlite3"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="mono-addins">
+    <branch module="mono-addins/mono-addins-0.4.tar.bz2" version="0.4"
+            repo="mono.net"
+            hash="sha256:d0fa0eec4e95c8cdfefc8961d7666d6137064df1b599a6489acf17e22fbc3e2e"
+            size="304402"/>
+    <dependencies>
+      <dep package="mono"/>
+      <dep package="gtk-sharp"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="dbus-sharp">
+    <branch repo="monogithub" module="dbus-sharp-0.7.0.tar.gz" version="0.7.0"
+            hash="sha256:92529aef9063f477d1975947c6388c63d03234018f45d007c07716dd3e21dd41"
+            size="127651">
+      <patch file="dbus-sharp-0.7.0-pkgconfig.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="dbus"/>
+      <dep package="mono"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="dbus-sharp-glib">
+    <branch repo="monogithub"
+            module="dbus-sharp-glib-0.5.0.tar.gz"
+            version="0.5.0"
+            hash="256:f4fd663957f06ac5f0322beab264c5498bf6408f7435d0387950b4cb7996180e"
+            size="95405"/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-sharp">
+    <branch repo="gnome.org"
+            module="gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2"
+            version="2.24.2"
+            hash="sha256:122b1e03966d63ec3389decf5440fb94285907d1b6be48352dcf6aca292cf7b0"
+            size="421281"/>
+    <dependencies>
+      <dep package="mono"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="opal" autogenargs="--disable-vpb">
+    <branch repo="opalvoip.sf.net" module="opal/branches/v3_10"/>
+    <dependencies>
+      <dep package="ptlib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="ptlib">
+    <branch repo="opalvoip.sf.net" module="ptlib/branches/v2_10"/>
+  </autotools>
+
+  <autotools id="valgrind" autogen-sh="autoreconf">
+    <branch repo="valgrind.org" module="trunk"/>
+  </autotools>
+
+  <repository type="tarball" name="taglib-sharp"
+      href="download.banshee.fm/"/>
+
+  <autotools id="taglib-sharp" autogenargs="--disable-docs">
+    <branch module="taglib-sharp/2.0.3.7/taglib-sharp-2.0.3.7.tar.gz" version="2.0.3.7"
+        repo="taglib-sharp"
+        hash="sha256:cf9515928bd25b37816cd78ef8a2e0f6d14ebabdafe344214b02034791e895fa"
+        size="2287272"/>
+    <dependencies>
+      <dep package="mono"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="wv">
+    <branch repo="downloads.sourceforge.net"
+            module="wvware/wv-1.2.4.tar.gz"
+            version="1.2.4"
+            hash="sha256:673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6"
+            size="629554"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libgsf"/>
       <dep package="libxml2"/>
-      <dep package="ghex"/>
-      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="orca">
-    <branch/>
+  <autotools id="abiword">
+    <branch repo="svn.abisource.com"/>
     <dependencies>
+      <dep package="cairo"/>
+      <dep package="glib"/>
       <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"/>
+      <dep package="libxml2"/>
+      <dep package="libgsf"/>
+      <dep package="wv"/>
     </dependencies>
     <suggests>
-      <dep package="speech-dispatcher"/>
+      <dep package="enchant"/>
+      <dep package="goffice"/>
+      <dep package="gucharmap"/>
     </suggests>
   </autotools>
 
-  <autotools id="seahorse">
+  <autotools id="banshee" autogenargs="--disable-daap --disable-boo --disable-ipod --disable-mtp">
     <branch/>
     <dependencies>
-      <dep package="vala"/>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
+      <dep package="gconf"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gst-plugins-good-0.10"/>
+      <dep package="mono"/>
+      <dep package="gtk-sharp"/>
+      <dep package="taglib-sharp"/>
+      <dep package="mono-addins"/>
+      <dep package="dbus-sharp"/>
+      <dep package="dbus-sharp-glib"/>
+      <dep package="sqlite3"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="deja-dup">
+    <branch repo="launchpad.net"
+            module="deja-dup/26"
+            checkoutdir="deja-dup/"/>
+    <dependencies>
+      <dep package="duplicity"/>
       <dep package="glib"/>
-      <dep package="libsoup"/>
+      <dep package="gtk+"/>
+      <dep package="libnotify"/>
       <dep package="libsecret"/>
-      <dep package="gcr"/>
+      <dep package="vala"/>
       <dep package="yelp-tools"/>
-      <dep package="gpgme"/>
-      <dep package="gnupg"/>
     </dependencies>
     <suggests>
-      <dep package="avahi"/>
-      <dep package="libxml2"/>
+      <dep package="nautilus"/>
     </suggests>
   </autotools>
 
-  <autotools id="vinagre">
+  <autotools id="f-spot">
     <branch/>
     <dependencies>
+      <dep package="gtk-sharp"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gthumb">
+    <branch/>
+    <dependencies>
+      <dep package="clutter"/>
+      <dep package="glib"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gtk+"/>
+      <dep package="libgnome-keyring"/>
+      <dep package="librsvg"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gimp" autogenargs="--disable-print --without-gnomevfs">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-2"/>
       <dep package="intltool"/>
+      <dep package="gegl"/>
+    </dependencies>
+    <suggests>
+      <dep package="iso-codes"/>
+      <dep package="WebKit"/>
+      <dep package="librsvg"/>
+      <dep package="poppler"/>
+      <dep package="libgnome-keyring"/>
+      <dep package="dbus-glib"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gnome-media">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="gconf"/>
+      <dep package="libcanberra"/>
+      <dep package="libxml2"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="libgnome-media-profiles"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnote">
+    <branch/>
+    <dependencies>
+      <dep package="glibmm"/>
       <dep package="libxml2"/>
+      <dep package="libxml++"/>
+      <dep package="gtkmm"/>
+    </dependencies>
+    <suggests>
+      <dep package="libpanelappletmm"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gnumeric">
+    <branch/>
+    <dependencies>
+      <dep package="goffice"/>
+      <dep package="gtk+"/>
+      <dep package="libgsf"/>
+      <dep package="libxml2"/>
+      <dep package="pygobject-python2"/>
+      <dep package="pango"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="inkscape">
+    <branch repo="launchpad.net"
+            module="inkscape"
+            checkoutdir="inkscape/"/>
+    <dependencies>
+      <dep package="gtkmm"/>
+      <dep package="libxslt"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgdiplus">
+    <branch module="libgdiplus/libgdiplus-1.2.6.tar.bz2" version="1.2.6"
+            repo="mono.net"
+            hash="sha256:5eb1a7a8d3b75c751eac6075239469059238082aee1963bc6a172b3073046cfe"
+            size="2897855">
+    </branch>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgnome-media-profiles">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="gconf"/>
+      <dep package="gst-plugins-base-0.10"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="rarian" supports-non-srcdir-builds="no">
+    <!-- Always build rarian due to some distributions providing rarian-compat
+                  package. (see https://bugzilla.gnome.org/show_bug.cgi?id=670917)
+         rarian can be sysdeps again when GNOME bug 671042 is fixed. -->
+    <!-- <pkg-config>rarian.pc</pkg-config> -->
+    <branch repo="gnome.org"
+            module="rarian/0.8/rarian-0.8.1.tar.bz2"
+            version="0.8.1"
+            hash="sha256:aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"
+            size="324441"/>
+    <dependencies>
+      <dep package="libxslt"/>
+      <dep package="intltool"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="simple-scan">
+    <branch repo="launchpad.net"
+            module="~simple-scan-team/simple-scan/trunk"
+            checkoutdir="simple-scan/"/>
+    <dependencies>
+      <dep package="cairo"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gtk-vnc"/>
-      <dep package="libsecret"/>
       <dep package="vala"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </dependencies>
     <suggests>
+      <dep package="colord"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="ekiga">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="gtk+-2"/>
+      <dep package="libxml2"/>
+      <dep package="libboost"/>
+      <dep package="libXv"/>
+      <dep package="opal" />
+      <dep package="evolution-data-server"/>
+    </dependencies>
+    <suggests>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
       <dep package="avahi"/>
-      <dep package="spice-gtk"/>
-      <dep package="telepathy-glib"/>
-      <dep package="vte"/>
+      <dep package="libsoup"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
     </suggests>
   </autotools>
 
-  <autotools id="brasero">
+  <autotools id="gnome-power-manager">
     <branch/>
     <dependencies>
+      <dep package="intltool"/>
       <dep package="glib"/>
+      <dep package="dbus-glib"/>
       <dep package="gtk+"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="libgnome-keyring"/>
+      <dep package="gnome-doc-utils"/>
+      <dep package="upower"/>
+      <dep package="libnotify"/>
       <dep package="libcanberra"/>
+      <dep package="gnome-control-center"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="pygobject2" autogenargs="--disable-introspection">
+    <pkg-config>pygobject-2.0.pc</pkg-config>
+    <branch repo="gnome.org"
+            module="pygobject/2.28/pygobject-2.28.6.tar.bz2"
+            version="2.28.6"
+            hash="sha256:e4bfe017fa845940184c82a4d8949db3414cb29dfc84815fb763697dc85bdcee"
+            size="888240"/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="rhythmbox">
+    <branch/>
+    <dependencies>
+      <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="grilo"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gtk+"/>
+      <dep package="json-glib"/>
       <dep package="libnotify"/>
+      <dep package="libpeas"/>
+      <dep package="libsoup"/>
       <dep package="libxml2"/>
+      <dep package="pygobject-python2"/>
+      <dep package="totem-pl-parser"/>
       <dep package="yelp-tools"/>
+      <if condition-set="linux">
+        <dep package="gudev"/>
+      </if>
     </dependencies>
     <suggests>
-      <dep package="nautilus"/>
-      <dep package="totem-pl-parser"/>
-      <dep package="tracker"/>
+      <dep package="avahi"/>
+      <dep package="brasero"/>
+      <dep package="libdmapsharing"/>
+      <dep package="libgnome-keyring"/>
+      <dep package="vala"/>
+      <dep package="WebKit"/>
     </suggests>
   </autotools>
 
-  <autotools id="weston" autogenargs="--disable-setuid-install">
-    <branch repo="wayland"/>
+  <autotools id="libunique">
+    <pkg-config>unique-3.0.pc</pkg-config>
+    <branch module="libunique/3.0/libunique-3.0.2.tar.bz2" repo="gnome.org"
+            version="3.0.2" checkoutdir="libunique-3.0.2"
+            hash="sha256:50269a87c7aabf1e25f01b3bbb280133138ffd7b6776289894c614a4b6ca968d"
+            size="342778"/>
     <dependencies>
-      <dep package="wayland"/>
-      <dep package="cairo"/>
-      <dep package="libxkbcommon"/>
-      <dep package="mesa-libGLES"/>
+      <dep package="gtk+"/>
+      <dep package="dbus-glib"/>
     </dependencies>
   </autotools>
 
-<!-- Meta Modules -->
+  <autotools id="shotwell">
+    <branch repo="yorba.org" module="shotwell"/>
+    <dependencies>
+      <dep package="desktop-file-utils"/>
+      <dep package="gexiv2"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gudev"/>
+      <dep package="json-glib"/>
+      <dep package="libgee-0.6"/>
+      <dep package="libraw"/>
+      <dep package="librest"/>
+      <dep package="libsoup"/>
+      <dep package="libunique"/>
+      <dep package="libxml2"/>
+      <dep package="sqlite3"/>
+      <dep package="vala"/>
+      <dep package="WebKit"/>
+    </dependencies>
+  </autotools>
 
-  <!-- Tested applications: these are built continuously by build.gnome.org
-       build slaves, and by default for anyone using JHBuild.
-  -->
-  <metamodule id="meta-gnome-apps-tested">
+  <autotools id="sound-juicer">
+    <branch/>
     <dependencies>
-      <dep package="accerciser"/>
-      <dep package="aisleriot"/>
-      <dep package="anjuta"/>
-      <dep package="bijiben"/>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="yelp-tools"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-good"/>
       <dep package="brasero"/>
-      <dep package="cheese"/>
-      <dep package="devhelp"/>
-      <dep package="evolution"/>
-      <dep package="file-roller"/>
-      <dep package="five-or-more"/>
-      <dep package="four-in-a-row"/>
-      <dep package="gedit"/>
-      <dep package="gitg"/>
-      <dep package="glade"/>
-      <dep package="gnome-boxes"/>
-      <dep package="gnome-clocks"/>
-      <dep package="gnome-chess"/>
-      <dep package="gnome-color-manager"/>
-      <dep package="gnome-documents"/>
-      <dep package="gnome-devel-docs"/>
-      <dep package="gnome-initial-setup"/>
-      <dep package="gnome-getting-started-docs"/>
-      <dep package="gnome-klotski"/>
-      <dep package="gnome-mahjongg"/>
-      <dep package="gnome-maps"/>
-      <dep package="gnome-mines"/>
-      <dep package="gnome-nettool"/>
-      <dep package="gnome-nibbles"/>
-      <dep package="gnome-robots"/>
-      <dep package="gnome-sudoku"/>
-      <dep package="gnome-photos"/>
-      <dep package="gnome-tetravex"/>
-      <dep package="gnome-weather"/>
-      <dep package="iagno"/>
-      <dep package="lightsoff"/>
-      <dep package="nautilus-sendto"/>
-      <dep package="nemiver"/>
-      <dep package="orca"/>
-      <dep package="quadrapassel"/>
-      <dep package="rygel"/>
-      <dep package="seahorse"/>
-      <dep package="swell-foop"/>
-      <dep package="tali"/>
-      <dep package="vinagre"/>
+      <dep package="libmusicbrainz"/>
+      <dep package="libcanberra"/>
     </dependencies>
-  </metamodule>
+  </autotools>
+
+  <autotools id="tomboy">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk-sharp"/>
+      <dep package="dbus-sharp"/>
+      <dep package="dbus-sharp-glib"/>
+      <dep package="gnome-doc-utils"/>
+      <dep package="gnome-sharp"/>
+      <dep package="mono-addins"/>
+    </dependencies>
+    <suggests>
+      <dep package="gtkspell"/>
+    </suggests>
+  </autotools>
 
 </moduleset>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]