[gnome-modulesets/gnome-3-20] Resync with current modulesets



commit 8f9949fe340865f90cb7efe18b0c69d0b5aa388f
Author: Javier Jardón <jjardon gnome org>
Date:   Thu Mar 31 18:44:14 2016 +0100

    Resync with current modulesets

 gnome-apps.modules      | 1046 +++++++++++++----------------------
 gnome-core-deps.modules | 1424 +++++++++++++++++++++++++----------------------
 gnome-core.modules      |  663 ++++++++++++++--------
 gnome-sysdeps.modules   |   89 +++-
 4 files changed, 1636 insertions(+), 1586 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index b42efab..301a3b7 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -11,147 +11,116 @@
       href="git://anongit.freedesktop.org/git/"/>
   <repository type="git" name="github.com"
       href="git://github.com/"/>
-  <repository type="git" name="git.libvirt.org"
-      href="git://libvirt.org/"/>
-  <repository type="git" name="fedorahosted.org"
-      href="git://git.fedorahosted.org/git/"/>
   <repository type="git" name="wayland"
       href="git://anongit.freedesktop.org/git/wayland"/>
+  <repository type="git" name="git.libvirt.org"
+      href="git://libvirt.org/"/>
+  <repository type="git" name="gitlab.com"
+      href="https://gitlab.com/"/>
+  <repository type="tarball" name="spice"
+      href="http://www.spice-space.org/download/"/>
 
 <!-- tarball repos -->
   <repository type="tarball" name="gnome.org"
     href="https://download.gnome.org/sources/"/>
-  <repository type="tarball" name="spice"
-      href="http://www.spice-space.org/download/"/>
   <repository type="tarball" name="ftp.gnu.org"
       href="http://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="qqwing"
       href="http://ostermiller.org/qqwing/"/>
-  <repository type="tarball" name="speech-dispatcher"
-      href="http://devel.freebsoft.org/pub/projects/speechd/"/>
   <repository type="tarball" name="tarball.github.com"
     href="https://github.com/"/>
   <repository type="tarball" name="downloads.sourceforge.net"
       href="http://downloads.sourceforge.net/"/>
+  <repository type="tarball" name="freedesktop.org"
+      href="http://freedesktop.org/software/"/>
+  <repository type="git" name="telepathy.freedesktop.org"
+      href="git://anongit.freedesktop.org/telepathy/"/>
 
   <include href="gnome-core.modules"/>
 
-  <!-- NOTE: gnome-core-* and gnome-core-deps-*
+  <!-- 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
+
+       Please try to keep organized alphabetically by section:
+
+       1) Dependencies
+       2) Normal apps
+       3) Games
+       4) Metamodules
     -->
 
-  <autotools id="babl">
-    <branch/>
-  </autotools>
+<!-- Dependencies and miscellaneous -->
 
-  <autotools id="gegl">
+  <autotools id="babl">
     <branch/>
-    <dependencies>
-      <dep package="babl"/>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="pango"/>
-      <dep package="librsvg"/>
-    </dependencies>
   </autotools>
 
-  <autotools id="bijiben">
-    <branch/>
+  <autotools id="clutter-gst">
+    <branch revision="clutter-gst-2.0"/>
     <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="tracker"/>
-      <dep package="clutter-gtk"/>
-      <dep package="gtk+"/>
-      <dep package="libxml2"/>
-      <dep package="glib"/>
-      <dep package="WebKit1"/>
-      <dep package="evolution"/>
+      <dep package="cogl"/>
+      <dep package="clutter"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
     </dependencies>
     <suggests>
-      <dep package="zeitgeist"/>
+      <dep package="gobject-introspection"/>
     </suggests>
   </autotools>
 
-  <autotools id="dconf-editor">
-    <branch/>
+  <autotools id="farstream" autogenargs="--disable-python">
+    <branch repo="freedesktop.org"
+            module="farstream/releases/farstream/farstream-${version}.tar.gz"
+            version="0.2.7"
+            hash="sha256:dad0ed43cf94e71df558c23825abe57db59d1ee8d970ffaec5e2dbc2e7acbf7d"/>
     <dependencies>
-      <dep package="appstream-glib"/>
       <dep package="glib"/>
-      <dep package="dconf"/>
-      <dep package="gtk+"/>
-      <dep package="vala"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libnice"/>
     </dependencies>
+    <suggests>
+      <dep package="gupnp-igd"/>
+    </suggests>
   </autotools>
 
-  <autotools id="gnome-calendar">
+  <autotools id="gdl">
     <branch/>
     <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="evolution-data-server"/>
-      <dep package="glib"/>
+      <dep package="intltool"/>
+      <dep package="librsvg"/>
       <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-todo">
+  <autotools id="gdlmm">
     <branch/>
     <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="evolution-data-server"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gdl"/>
+      <dep package="glibmm"/>
+      <dep package="gtkmm"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-online-miners">
+  <autotools id="gegl">
     <branch/>
     <dependencies>
+      <dep package="babl"/>
       <dep package="glib"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="grilo"/>
-      <dep package="libgdata"/>
-      <dep package="libgfbgraph"/>
-      <dep package="libzapojit"/>
-      <dep package="tracker"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-weather">
-    <if condition-set="coverage">
-      <autogenargs value="--enable-coverage"/>
-    </if>
-    <if condition-unset="dogtail">
-      <autogenargs value="--disable-dogtail"/>
-    </if>
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
+      <dep package="cairo"/>
       <dep package="gdk-pixbuf"/>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
-      <dep package="intltool"/>
-      <dep package="libgweather"/>
-      <dep package="gjs"/>
-      <if condition-set="coverage">
-        <dep package="lcov"/>
-      </if>
-      <if condition-set="dogtail">
-        <dep package="dogtail"/>
-      </if>
+      <dep package="pango"/>
+      <dep package="libjasper"/>
+      <dep package="libjpeg"/>
+      <dep package="libpng"/>
+      <dep package="libraw"/>
+      <dep package="librsvg"/>
     </dependencies>
   </autotools>
 
-  <autotools id="ghex">
+  <autotools id="gnome-devel-docs">
     <branch/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="intltool"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
@@ -164,7 +133,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-vnc" autogenargs="--with-gtk=3.0 --enable-vala --disable-werror">
+  <autotools id="gtk-vnc" autogenargs="--with-gtk=3.0 --enable-vala">
     <branch/>
     <dependencies>
       <dep package="cairo"/>
@@ -197,30 +166,19 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gupnp-av">
-    <branch />
+  <autotools id="jhbuild">
+    <branch/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="gupnp"/>
+      <dep package="gnome-common"/>
+      <dep package="yelp-tools"/>
+      <dep package="gettext-bin"/>
+      <dep package="xmlcatalog"/>
+      <dep package="pkg-config"/>
+      <dep package="python2"/>
+      <dep package="cc"/>
     </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
   </autotools>
 
-  <autotools id="gupnp-dlna">
-    <branch />
-    <dependencies>
-      <dep package="libxml2"/>
-      <dep package="glib"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-    <suggests>
-      <dep package="gst-plugins-good"/>
-    </suggests>
- </autotools>
-
   <autotools id="libgames-support">
     <branch/>
     <dependencies>
@@ -232,32 +190,25 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgda-5.2" autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi 
--disable-vala --disable-gdaui-vala">
-    <if condition-set="freebsd">
-      <autogenargs value="LIBCRYPTO_CFLAGS=' ' LIBCRYPTO_LIBS='-lcrypto' --with-bdb=/usr/local 
--with-bdb-libdir-name=lib/db5 --with-bdb-includedir-name=include/db5"/>
-    </if>
-    <branch checkoutdir="libgda-5.2" module="libgda" revision="LIBGDA_5.2"/>
+  <cmake id="libgit2"
+         cmakeargs="-DTHREADSAFE:BOOL=1">
+    <branch repo="tarball.github.com"
+            module="libgit2/libgit2/archive/v${version}.tar.gz"
+            version="0.24.0"
+            hash="sha256:1c6693f943bee3f634b9094376f93e7e03b9ca77354a33f4e903fdcb2ee8b2b0"
+            checkoutdir="libgit2-${version}">
+    </branch>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="libxml2"/>
-      <dep package="openssl"/>
-      <dep package="vala"/>
+      <dep package="libssh2"/>
     </dependencies>
-  </autotools>
+  </cmake>
 
-  <autotools id="libgda"
-             autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi --enable-vala 
--enable-gdaui-vala">
-    <if condition-set="freebsd">
-      <autogenargs value="LIBCRYPTO_CFLAGS=' ' LIBCRYPTO_LIBS='-lcrypto' --with-bdb=/usr/local 
--with-bdb-libdir-name=lib/db5 --with-bdb-includedir-name=include/db5"/>
-    </if>
+  <autotools id="libgit2-glib">
     <branch/>
     <dependencies>
+      <dep package="libgit2"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="libxml2"/>
-      <dep package="openssl"/>
-      <dep package="vala"/>
     </dependencies>
   </autotools>
 
@@ -272,7 +223,7 @@
 
   <autotools id="libosinfo"
              autogenargs="--enable-tests=no --enable-werror=no">
-    <branch repo="fedorahosted.org" module="libosinfo.git"/>
+    <branch repo="gitlab.com" module="libosinfo/libosinfo.git"/>
     <dependencies>
       <dep package="libsoup"/>
       <dep package="glib"/>
@@ -292,24 +243,28 @@
     </dependencies>
   </autotools>
 
-  <autotools id="phodav">
+  <autotools id="nautilus-sendto">
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="libsoup"/>
-      <dep package="avahi"/>
-      <dep package="libxml2"/>
+      <dep package="gtk+"/>
+      <dep package="dbus-glib"/>
+      <dep package="evolution-data-server"/>
+      <dep package="nautilus"/>
     </dependencies>
+    <suggests>
+      <dep package="gupnp-av"/>
+    </suggests>
   </autotools>
 
-  <autotools id="pyatspi2" autogenargs="--with-python=python3" >
+  <autotools id="phodav">
     <branch/>
     <dependencies>
-      <dep package="pygobject"/>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="avahi"/>
+      <dep package="libxml2"/>
     </dependencies>
-    <suggests>
-      <dep package="at-spi2-core"/>
-    </suggests>
   </autotools>
 
   <autotools id="qqwing">
@@ -323,27 +278,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="speech-dispatcher" autogenargs="--with-espeak">
-    <branch repo="speech-dispatcher"
-            module="speech-dispatcher-${version}.tar.gz"
-            version="0.8"
-            hash="sha256:0a6ce544cfbac8592a8ea08e3ab24c389153904ea51c6fd68756cea52de9efa2"/>
-    <dependencies>
-      <dep package="dotconf"/>
-      <dep package="espeak"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="usbredir">
-    <branch repo="spice"
-            module="usbredir/usbredir-0.7.tar.bz2"
-            version="0.7"
-            hash="sha256:0a63a0712b5dc62be9cca44f97270fea5d1ec1fe7dde0c11dc74a01c8e2006aa"/>
-    <dependencies>
-      <dep package="libusb1"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-webdav --enable-static">
     <if condition-set="freebsd">
       <autogenargs value="SSL_CFLAGS=' ' SSL_LIBS='-lssl'"/>
@@ -382,76 +316,43 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gdl">
-    <branch/>
+  <autotools id="telepathy-farstream" autogenargs="--disable-python">
+    <branch repo="telepathy.freedesktop.org"/>
     <dependencies>
-      <dep package="intltool"/>
-      <dep package="librsvg"/>
-      <dep package="gtk+"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gdlmm">
-    <branch/>
-    <dependencies>
-      <dep package="gdl"/>
-      <dep package="glibmm"/>
-      <dep package="gtkmm"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libzapojit">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="json-glib"/>
-      <dep package="librest"/>
-      <dep package="libsoup"/>
-      <dep package="gnome-online-accounts"/>
+      <dep package="telepathy-glib"/>
+      <dep package="farstream"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libgfbgraph">
-    <branch/>
+  <autotools id="uncrustify">
+    <branch repo="downloads.sourceforge.net"
+            module="project/uncrustify/uncrustify/uncrustify-0.61/uncrustify-0.61.tar.gz"
+            version="0.61"
+            hash="sha256:1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"
+            size="1143946"/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="json-glib"/>
-      <dep package="librest"/>
-      <dep package="libsoup"/>
-      <dep package="gnome-online-accounts"/>
+      <dep package="c++"/>
     </dependencies>
   </autotools>
 
-  <cmake id="libgit2"
-         cmakeargs="-DTHREADSAFE:BOOL=1">
-    <branch repo="tarball.github.com"
-            module="libgit2/libgit2/archive/v${version}.tar.gz"
-            version="0.23.1"
-            hash="113748018e5876bea84af5c749af25b62f58cb4ca82730dcbffaac90c87f7056"
-            checkoutdir="libgit2-${version}">
-    </branch>
-    <dependencies>
-      <dep package="libssh2"/>
-    </dependencies>
-  </cmake>
-
-  <autotools id="libgit2-glib">
-    <branch/>
+  <autotools id="usbredir">
+    <branch repo="spice"
+            module="usbredir/usbredir-0.7.tar.bz2"
+            version="0.7"
+            hash="sha256:0a63a0712b5dc62be9cca44f97270fea5d1ec1fe7dde0c11dc74a01c8e2006aa"/>
     <dependencies>
-      <dep package="libgit2"/>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
+      <dep package="libusb1-1.0.9"/>
     </dependencies>
   </autotools>
 
-  <autotools id="uncrustify">
-    <branch repo="downloads.sourceforge.net"
-            module="project/uncrustify/uncrustify/uncrustify-0.61/uncrustify-0.61.tar.gz"
-            version="0.61"
-            hash="sha256:1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"
-            size="1143946"/>
+  <autotools id="weston" autogenargs="--disable-setuid-install">
+    <branch repo="wayland"/>
     <dependencies>
-      <dep package="c++"/>
+      <dep package="wayland-protocols"/>
+      <dep package="wayland"/>
+      <dep package="cairo"/>
+      <dep package="libxkbcommon"/>
+      <dep package="mesa-libGLES"/>
     </dependencies>
   </autotools>
 
@@ -470,171 +371,103 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-documents">
+  <autotools id="bijiben">
     <branch/>
     <dependencies>
-      <dep package="evince"/>
-      <dep package="gjs"/>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
-      <dep package="gnome-desktop"/>
+      <dep package="appstream-glib"/>
       <dep package="tracker"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="gnome-online-miners"/>
-      <dep package="libgdata"/>
-      <dep package="liboauth"/>
-      <dep package="libzapojit"/>
-      <dep package="WebKit"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-maps">
-    <branch/>
-    <dependencies>
       <dep package="clutter-gtk"/>
-      <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-online-accounts"/>
-      <dep package="libgfbgraph"/>
-      <dep package="gnome-themes-standard"/>
-      <dep package="folks"/>
-      <dep package="libgee"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-multi-writer">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-      <dep package="libgusb"/>
-      <dep package="udisks"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="devhelp">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="WebKit"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="glade">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gnome-common"/>
-      <dep package="gtk-doc" />
       <dep package="gtk+"/>
       <dep package="libxml2"/>
-      <dep package="yelp-tools"/>
+      <dep package="glib"/>
+      <dep package="WebKit1"/>
+      <dep package="evolution-data-server"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-color-manager">
+  <autotools id="brasero">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-inotify"/>
+    </if>
     <branch/>
     <dependencies>
-      <dep package="exiv2"/>
       <dep package="glib"/>
-      <dep package="gnome-desktop"/>
       <dep package="gtk+"/>
-      <dep package="intltool"/>
-      <dep package="lcms2"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
       <dep package="libcanberra"/>
-      <dep package="libexif"/>
-      <dep package="vte"/>
-      <dep package="colord-gtk"/>
-      <dep package="yelp-tools"/>
-      <!-- and libtiff -->
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-devel-docs">
-    <branch/>
-    <dependencies>
+      <dep package="libnotify"/>
+      <dep package="libxml2"/>
       <dep package="yelp-tools"/>
     </dependencies>
-  </autotools>
-
-  <autotools id="rygel">
-    <branch/>
-    <dependencies>
-      <dep package="vala"/>
-      <dep package="gupnp"/>
-      <dep package="gupnp-av"/>
-      <dep package="gupnp-dlna"/>
-      <dep package="libgee"/>
+    <suggests>
+      <dep package="nautilus"/>
+      <dep package="totem-pl-parser"/>
       <dep package="tracker"/>
-      <dep package="valadoc"/>
-      <dep package="libmediaart"/>
-    </dependencies>
+    </suggests>
   </autotools>
 
-  <autotools id="gnome-sound-recorder">
+  <autotools id="dconf-editor">
     <branch/>
     <dependencies>
-      <dep package="gjs"/>
+      <dep package="appstream-glib"/>
       <dep package="glib"/>
-      <dep package="gdk-pixbuf"/>
+      <dep package="dconf"/>
       <dep package="gtk+"/>
+      <dep package="vala"/>
     </dependencies>
   </autotools>
 
-<!-- Featured Apps -->
-
-  <autotools id="anjuta">
+  <autotools id="devhelp">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="gdk-pixbuf"/>
       <dep package="gtk+"/>
-      <dep package="vte"/>
-      <dep package="gdl"/>
-      <dep package="libgda-5.2"/>
-      <dep package="gtksourceview"/>
-      <dep package="yelp-tools"/>
+      <dep package="WebKit"/>
     </dependencies>
-    <suggests>
-      <dep package="glade"/>
-      <dep package="devhelp"/>
-      <dep package="vala"/>
-    </suggests>
   </autotools>
 
-  <autotools id="cheese">
+  <autotools id="empathy">
     <branch/>
     <dependencies>
-      <dep package="appstream-glib"/>
+      <dep package="clutter"/>
+      <dep package="clutter-gst"/>
+      <dep package="clutter-gtk"/>
+      <dep package="dbus-glib"/>
       <dep package="intltool"/>
+      <dep package="farstream"/>
+      <dep package="folks"/>
+      <dep package="gcr"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="libgee"/>
+      <dep package="libsecret"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="gnutls"/>
+      <dep package="gsettings-desktop-schemas"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-bad"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
-      <dep package="clutter-gst3"/>
-      <dep package="clutter-gtk"/>
+      <dep package="gtk+"/>
       <dep package="libcanberra"/>
-      <dep package="vala"/>
-      <dep package="gnome-video-effects"/>
-      <dep package="librsvg"/>
-      <dep package="gnome-desktop"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="pulseaudio"/>
+      <dep package="telepathy-farstream"/>
+      <dep package="telepathy-glib"/>
+      <dep package="telepathy-logger"/>
+      <dep package="telepathy-mission-control"/>
+      <dep package="libnotify"/>
+      <dep package="WebKit1"/>
+    </dependencies>
+    <suggests>
+      <dep package="enchant"/>
+      <dep package="geoclue"/>
+      <dep package="geocode-glib"/>
+      <dep package="iso-codes"/>
+      <dep package="libchamplain"/>
       <if condition-set="linux">
+        <dep package="NetworkManager"/>
         <dep package="gudev"/>
       </if>
-    </dependencies>
+    </suggests>
   </autotools>
 
   <autotools id="evolution" autogenargs="--disable-autoar --disable-libcryptui --disable-pst-import">
@@ -676,56 +509,16 @@
     </suggests>
   </autotools>
 
-  <autotools id="file-roller">
+  <autotools id="ghex">
     <branch/>
     <dependencies>
-      <dep package="file"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="intltool"/>
-      <dep package="nautilus"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-
-
-  <autotools id="fwupd"
-             autogenargs="--disable-colorhug --disable-uefi">
-    <branch repo="tarball.github.com"
-            module="hughsie/fwupd/archive/${version}.tar.gz"
-            version="0.5.1"
-            hash="9640a6099c6be03e335a527b864d058a2621202a3050a3d4f9180cc81ac928f0"
-            checkoutdir="fwupd-${version}"/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="gcab"/>
-      <dep package="glib"/>
-      <dep package="gudev"/>
-      <dep package="libarchive"/>
-      <dep package="libgusb"/>
-      <dep package="libsoup"/>
-      <dep package="polkit-gobject"/>
-      <dep package="sqlite3"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gedit">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="libpeas"/>
-      <dep package="yelp-tools"/>
-      <dep package="gtksourceview"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="python-devel"/>
-    </dependencies>
-    <suggests>
-      <dep package="iso-codes"/>
-      <dep package="enchant"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gitg">
     <branch/>
     <dependencies>
@@ -739,8 +532,9 @@
       <dep package="libgit2-glib"/>
       <dep package="libpeas"/>
       <dep package="vala"/>
-      <dep package="WebKit"/>
       <dep package="gtkspell-3"/>
+      <dep package="libsoup"/>
+      <dep package="libsecret"/>
     </dependencies>
     <suggests>
       <dep package="glade"/>
@@ -748,14 +542,27 @@
     </suggests>
   </autotools>
 
+  <autotools id="glade">
+    <branch revision="glade-3-20"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gnome-common"/>
+      <dep package="gtk-doc" />
+      <dep package="gtk+"/>
+      <dep package="libxml2"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-boxes" autogenargs="--enable-vala">
-    <branch/>
+    <branch revision="gnome-3-20"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
       <dep package="gtk-vnc"/>
+      <dep package="libgovirt"/>
       <dep package="libosinfo"/>
-      <dep package="libusb1"/>
+      <dep package="libusb1-1.0.9"/>
       <dep package="libvirt-glib"/>
       <dep package="gtk+"/>
       <dep package="spice-gtk"/>
@@ -784,130 +591,248 @@
       <dep package="llvm"/>
       <dep package="pygobject"/>
       <dep package="uncrustify"/>
+      <dep package="vala"/>
       <dep package="vte"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-clocks">
+  <autotools id="gnome-calendar">
+    <branch revision="gnome-3-20"/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="evolution-data-server"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-code-assistance">
     <branch/>
     <dependencies>
       <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-dictionary">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gsound"/>
-      <dep package="gnome-desktop"/>
-      <dep package="libgweather"/>
-      <dep package="geoclue"/>
-      <dep package="geocode-glib"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-initial-setup">
+  <autotools id="gnome-multi-writer">
     <branch/>
     <dependencies>
-      <dep package="accountsservice"/>
-      <dep package="geoclue"/>
-      <dep package="gdm"/>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <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="WebKit"/>
-      <if condition-set="linux">
-        <dep package="network-manager-applet"/>
-        <dep package="NetworkManager"/>
-      </if>
+      <dep package="libcanberra"/>
+      <dep package="libgusb"/>
+      <dep package="udisks"/>
     </dependencies>
-    <suggests>
-      <dep package="upower"/>
-      <dep package="gnome-getting-started-docs"/>
-    </suggests>
   </autotools>
 
-  <autotools id="gnome-getting-started-docs">
+  <autotools id="gnome-music">
     <branch/>
     <dependencies>
+      <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"/>
+      <dep package="libmediaart"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-nettool">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libgtop"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-video-effects">
+  <autotools id="gnome-photos">
+    <branch revision="gnome-3-20"/>
+    <dependencies>
+      <dep package="babl"/>
+      <dep package="gegl"/>
+      <dep package="cairo"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gexiv2"/>
+      <dep package="glib"/>
+      <dep package="gnome-desktop"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="gnome-online-miners"/>
+      <dep package="grilo"/>
+      <dep package="grilo-plugins"/>
+      <dep package="gtk+"/>
+      <dep package="libgdata"/>
+      <dep package="libgfbgraph"/>
+      <dep package="libjpeg"/>
+      <dep package="libpng"/>
+      <dep package="tracker"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-sound-recorder">
     <branch/>
     <dependencies>
-      <dep package="gstreamer"/>
+      <dep package="gjs"/>
+      <dep package="glib"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
-  <autotools id="five-or-more">
+  <autotools id="gnome-todo">
+    <branch revision="gnome-3-20"/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="evolution-data-server"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libpeas"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-tweak-tool">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="pygobject"/>
+      <dep package="gsettings-desktop-schemas"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="nemiver"
+             autogenargs="--enable-gsettings=yes">
+    <branch/>
+    <dependencies>
+      <dep package="boost"/>
+      <dep package="gdb"/>
+      <dep package="gdlmm"/>
+      <dep package="gtkmm"/>
+      <dep package="glibmm"/>
+      <dep package="gtksourceviewmm"/>
+      <dep package="vte"/>
+      <dep package="libgtop"/>
+      <dep package="libxml2"/>
+      <dep package="ghex"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="polari">
     <branch/>
     <dependencies>
       <dep package="appstream-glib"/>
+      <dep package="gjs"/>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="m4-common"/>
+      <dep package="telepathy-glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="seahorse">
+    <branch/>
+    <dependencies>
+      <dep package="vala"/>
       <dep package="intltool"/>
-      <dep package="librsvg"/>
       <dep package="gtk+"/>
-      <dep package="libcanberra"/>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="libsecret"/>
+      <dep package="gcr"/>
       <dep package="yelp-tools"/>
+      <dep package="gpgme"/>
+      <dep package="gnupg"/>
     </dependencies>
+    <suggests>
+      <dep package="avahi"/>
+      <dep package="libxml2"/>
+    </suggests>
   </autotools>
 
-  <autotools id="four-in-a-row">
+  <autotools id="vinagre">
     <branch/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
-      <dep package="librsvg"/>
+      <dep package="libxml2"/>
       <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-      <dep package="yelp-tools"/>
+      <dep package="gtk-vnc"/>
+      <dep package="libsecret"/>
+      <dep package="vala"/>
     </dependencies>
+    <suggests>
+      <dep package="avahi"/>
+      <dep package="spice-gtk"/>
+      <dep package="telepathy-glib"/>
+      <dep package="vte"/>
+    </suggests>
   </autotools>
 
-  <autotools id="gnome-characters">
+<!-- Games -->
+
+  <autotools id="five-or-more">
     <branch/>
     <dependencies>
       <dep package="appstream-glib"/>
-      <dep package="gjs"/>
+      <dep package="intltool"/>
+      <dep package="librsvg"/>
       <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-chess">
+  <autotools id="four-in-a-row">
     <branch/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
-      <dep package="m4-common"/>
       <dep package="gtk+"/>
-      <dep package="vala"/>
+      <dep package="libcanberra"/>
       <dep package="yelp-tools"/>
-      <dep package="glu"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-klotski">
+  <autotools id="gnome-chess">
     <branch/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
+      <dep package="m4-common"/>
       <dep package="gtk+"/>
+      <dep package="vala"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-logs">
+  <autotools id="gnome-klotski">
     <branch/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
-      <dep package="gsettings-desktop-schemas"/>
+      <dep package="libgames-support"/>
+      <dep package="librsvg"/>
       <dep package="gtk+"/>
-      <dep package="libsystemd-journal"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
@@ -946,36 +871,19 @@
       <dep package="intltool"/>
       <dep package="libcanberra"/>
       <dep package="libgames-support"/>
+      <dep package="libgee"/>
       <dep package="librsvg"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-photos">
-    <branch/>
-    <dependencies>
-      <dep package="gegl"/>
-      <dep package="cairo"/>
-      <dep package="clutter-gtk"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="glib"/>
-      <dep package="gnome-desktop"/>
-      <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/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
+      <dep package="libgames-support"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
       <dep package="libcanberra"/>
@@ -1023,15 +931,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-tweak-tool">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="pygobject"/>
-      <dep package="gsettings-desktop-schemas"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="hitori">
     <branch/>
     <dependencies>
@@ -1101,7 +1000,7 @@
   </autotools>
 
   <autotools id="tali">
-    <branch/>
+    <branch revision="gnome-3-20"/>
     <dependencies>
       <dep package="appstream-glib"/>
       <dep package="intltool"/>
@@ -1111,178 +1010,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-nettool">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libgtop"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-software">
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="glib"/>
-      <dep package="gnome-desktop"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="gtk+"/>
-      <dep package="libsoup"/>
-      <dep package="PackageKit"/>
-      <dep package="sqlite3"/>
-      <if condition-set="linux">
-        <dep package="fwupd"/>
-      </if>
-    </dependencies>
-  </autotools>
-
-  <autotools id="nautilus-sendto">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="dbus-glib"/>
-      <dep package="evolution-data-server"/>
-      <dep package="nautilus"/>
-    </dependencies>
-    <suggests>
-      <dep package="gupnp-av"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="nemiver"
-             autogenargs="--enable-gsettings=yes">
-    <branch/>
-    <dependencies>
-      <dep package="boost"/>
-      <dep package="gdb"/>
-      <dep package="gdlmm"/>
-      <dep package="gtkmm"/>
-      <dep package="glibmm"/>
-      <dep package="gtksourceviewmm"/>
-      <dep package="vte"/>
-      <dep package="libgtop"/>
-      <dep package="libxml2"/>
-      <dep package="ghex"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="orca">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="at-spi2-atk"/> <!-- to make Orca's gui accessible -->
-      <dep package="gobject-introspection"/>
-      <dep package="intltool"/>
-      <dep package="pyatspi2"/>
-      <dep package="pygobject"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-    <suggests>
-      <dep package="speech-dispatcher"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="polari">
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="gjs"/>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
-      <dep package="m4-common"/>
-      <dep package="telepathy-glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="seahorse">
-    <branch/>
-    <dependencies>
-      <dep package="vala"/>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="glib"/>
-      <dep package="libsoup"/>
-      <dep package="libsecret"/>
-      <dep package="gcr"/>
-      <dep package="yelp-tools"/>
-      <dep package="gpgme"/>
-      <dep package="gnupg"/>
-    </dependencies>
-    <suggests>
-      <dep package="avahi"/>
-      <dep package="libxml2"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="vinagre">
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="intltool"/>
-      <dep package="libxml2"/>
-      <dep package="gtk+"/>
-      <dep package="gtk-vnc"/>
-      <dep package="libsecret"/>
-      <dep package="vala"/>
-    </dependencies>
-    <suggests>
-      <dep package="avahi"/>
-      <dep package="spice-gtk"/>
-      <dep package="telepathy-glib"/>
-      <dep package="vte"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="brasero">
-    <if condition-unset="linux">
-      <autogenargs value="--disable-inotify"/>
-    </if>
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="libcanberra"/>
-      <dep package="libnotify"/>
-      <dep package="libxml2"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-    <suggests>
-      <dep package="nautilus"/>
-      <dep package="totem-pl-parser"/>
-      <dep package="tracker"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="weston" autogenargs="--disable-setuid-install">
-    <branch repo="wayland"/>
-    <dependencies>
-      <dep package="wayland"/>
-      <dep package="cairo"/>
-      <dep package="libxkbcommon"/>
-      <dep package="mesa-libGLES"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="jhbuild">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-common"/>
-      <dep package="yelp-tools"/>
-      <dep package="gettext-bin"/>
-      <dep package="xmlcatalog"/>
-      <dep package="pkg-config"/>
-      <dep package="python2"/>
-      <dep package="cc"/>
-    </dependencies>
-  </autotools>
-
 <!-- Meta Modules -->
 
   <!-- Tested applications: these are built continuously by build.gnome.org
@@ -1290,62 +1017,63 @@
   -->
   <metamodule id="meta-gnome-apps-tested">
     <dependencies>
+      <dep package="meta-gnome-core-incubator"/>
+      <dep package="meta-gnome-games"/>
       <dep package="accerciser"/>
-      <dep package="aisleriot"/>
-      <dep package="anjuta"/>
-      <dep package="bijiben"/>
       <dep package="brasero"/>
-      <dep package="cheese"/>
       <dep package="dconf-editor"/>
       <dep package="devhelp"/>
+      <dep package="empathy"/>
       <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-builder"/>
-      <dep package="gnome-clocks"/>
-      <dep package="gnome-characters"/>
-      <dep package="gnome-chess"/>
-      <dep package="gnome-calendar"/>
-      <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-nettool"/>
+      <dep package="gnome-sound-recorder"/>
+      <dep package="gnome-todo"/>
+      <dep package="gnome-tweak-tool"/>
+      <dep package="nautilus-sendto"/>
+      <dep package="nemiver"/>
+      <dep package="polari"/>
+      <dep package="seahorse"/>
+      <dep package="vinagre"/>
+    </dependencies>
+  </metamodule>
+
+  <!-- GNOME Incubator: Where new core apps grow up, until they are
+       good enough to form part of the default user experience.
+  -->
+  <metamodule id="meta-gnome-core-incubator">
+    <dependencies>
+      <dep package="bijiben"/>
+      <dep package="gnome-boxes"/>
+      <dep package="gnome-calendar"/>
+      <dep package="gnome-dictionary"/>
+      <dep package="gnome-music"/>
+      <dep package="gnome-photos"/>
+    </dependencies>
+  </metamodule>
+
+  <metamodule id="meta-gnome-games">
+    <dependencies>
+      <dep package="five-or-more"/>
+      <dep package="four-in-a-row"/>
+      <dep package="gnome-chess"/>
       <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-taquin"/>
       <dep package="gnome-tetravex"/>
-      <dep package="gnome-todo"/>
-      <dep package="gnome-tweak-tool"/>
-      <dep package="gnome-weather"/>
       <dep package="hitori"/>
       <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"/>
       <dep package="swell-foop"/>
       <dep package="tali"/>
-      <dep package="vinagre"/>
     </dependencies>
   </metamodule>
 
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index be90b21..44348af 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -56,12 +56,16 @@
     href="https://github.com/"/>
 <repository type="tarball" name="libxkbcommon"
     href="http://xkbcommon.org/download/"/>
+<repository type="tarball" name="tarball.github.com"
+    href="https://github.com/"/>
+<repository type="tarball" name="pcre"
+    href="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/"/>
+<repository type="tarball" name="speech-dispatcher"
+    href="http://devel.freebsoft.org/pub/projects/speechd/"/>
 
 <include href="gnome-sysdeps.modules"/>
 
-<!-- Please try to keep organized alphabetically by section -->
-
-<!-- Build dependencies of gnome-core -->
+<!-- Please try to keep organized alphabetically -->
 
   <autotools id="appstream-glib">
     <if condition-set="freebsd">
@@ -74,6 +78,7 @@
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
+      <dep package="json-glib"/>
       <dep package="libarchive"/>
       <dep package="libsoup"/>
       <dep package="libyaml"/>
@@ -81,6 +86,23 @@
     </dependencies>
   </autotools>
 
+  <autotools id="atk">
+    <branch revision="gnome-3-20"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk-doc"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="atkmm">
+    <branch/>
+    <dependencies>
+      <dep package="glibmm"/>
+      <dep package="atk"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="cairomm" autogen-sh="configure">
     <branch module="releases/cairomm-${version}.tar.gz"
             version="1.12.0"
@@ -89,307 +111,278 @@
      </branch>
      <dependencies>
         <dep package="cairo"/>
-        <dep package="libsigc++2"/>
+        <dep package="libsigcplusplus"/>
      </dependencies>
   </autotools>
 
-  <autotools id="gcab">
+  <autotools id="cantarell-fonts">
     <branch/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="vala"/>
-      <dep package="zlib"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="geoclue" autogenargs="--with-systemdsystemunitdir=no">
-    <if condition-unset="linux">
-      <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-cdma-source"/>
-    </if>
-    <branch repo="git.freedesktop.org"/>
+  <autotools id="caribou" autogenargs="--disable-gtk2-module">
+    <branch/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="json-glib"/>
-      <dep package="libsoup"/>
-      <dep package="libxml2"/>
-      <if condition-set="linux">
-        <dep package="ModemManager"/>
-      </if>
+      <dep package="pygobject"/>
+      <dep package="gtk+"/>
+      <dep package="clutter"/>
+      <dep package="libgee"/>
+      <dep package="libxklavier"/>
+      <dep package="vala"/>
     </dependencies>
   </autotools>
 
-  <autotools id="geocode-glib">
+  <autotools id="clutter" autogenargs="--enable-installed-tests --disable-maintainer-flags">
+    <if condition-unset="quartz">
+      <autogenargs value="--enable-egl-backend"/>
+    </if>
+    <if condition-set="evdev">
+      <autogenargs value="--enable-evdev-input"/>
+    </if>
+    <if condition-set="wayland">
+      <autogenargs value="--enable-wayland-backend --enable-wayland-compositor"/>
+    </if>
+    <if condition-set="quartz">
+      <autogenargs value="--enable-quartz-backend"/>
+    </if>
     <branch/>
     <dependencies>
+      <dep package="cogl"/>
+      <dep package="atk"/>
       <dep package="glib"/>
+      <dep package="cairo"/>
       <dep package="json-glib"/>
-      <dep package="libsoup"/>
       <dep package="gobject-introspection"/>
-      <dep package="gtk-doc"/>
+      <if condition-set="evdev">
+        <dep package="libinput"/>
+        <dep package="libxkbcommon"/>
+      </if>
+      <if condition-set="wayland">
+        <dep package="wayland"/>
+        <dep package="libxkbcommon"/>
+      </if>
     </dependencies>
+    <suggests>
+      <dep package="gdk-pixbuf"/>
+      <if condition-set="wayland">
+        <dep package="gudev"/>
+      </if>
+    </suggests>
   </autotools>
 
-  <autotools id="geoip" skip-autogen="never" autogen-sh="autoreconf">
-    <pkg-config>geoip.pc</pkg-config>
-    <branch repo="github-tar"
-            version="1.6.5"
-            module="maxmind/geoip-api-c/releases/download/v${version}/GeoIP-${version}.tar.gz"
-            hash="sha256:0ae1c95e69ad627d3a45cb897f79ce0c30f13fcd4b4a0dda073be0c9552521b3">
-    </branch>
-  </autotools>
-
-  <autotools id="gcr">
-    <branch/>
+  <autotools id="clutter-gst3">
+    <branch revision="clutter-gst-3.0" module="clutter-gst" checkoutdir="clutter-gst3"/>
     <dependencies>
-      <dep package="gnome-common"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libgcrypt" />
-      <dep package="libtasn1" />
-      <dep package="p11-kit"/>
-      <dep package="vala"/>
+      <dep package="cogl"/>
+      <dep package="clutter"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
     </dependencies>
+    <suggests>
+      <dep package="gobject-introspection"/>
+    </suggests>
   </autotools>
 
-<!-- This is a special module: it's needed to build from git, but not
-     needed to build from tarballs, so it doesn't need to be in our suites
-     and it doesn't need to be an external dependency -->
-  <autotools id="gnome-common">
-    <branch/>
-  </autotools>
-
-  <autotools id="gtk-doc">
+  <autotools id="clutter-gtk">
     <branch/>
     <dependencies>
-      <dep package="libxslt"/>
-      <dep package="yelp-tools"/>
-      <dep package="libtool"/>
-      <dep package="gettext-bin"/>
-      <dep package="docbook-xsl"/>
-      <dep package="cc"/>
+      <dep package="gtk+"/>
+      <dep package="clutter"/>
     </dependencies>
   </autotools>
 
-  <autotools id="iso-codes">
-    <pkg-config>iso-codes.pc</pkg-config>
-    <branch repo="iso-codes"
-            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"
-             check-target="false">
-    <branch module="hicolor-icon-theme-0.15.tar.xz" version="0.15"
-           repo="icon-theme.freedesktop.org"
-            hash="sha256:9cc45ac3318c31212ea2d8cb99e64020732393ee7630fa6c1810af5f987033cc"
-            size="51056">
-    </branch>
-  </autotools>
-
-  <autotools id="uhttpmock">
-    <branch repo="github.com" checkoutdir="uhttpmock" module="pwithnall/uhttpmock.git"/>
+  <autotools id="cogl" autogenargs="--enable-cogl-gst --disable-maintainer-flags">
+    <if condition-set="x11">
+      <autogenargs value="--enable-xlib-egl-platform"/>
+    </if>
+    <if condition-set="wayland">
+      <autogenargs value="--enable-wayland-egl-platform --enable-wayland-egl-server 
--enable-kms-egl-platform"/>
+    </if>
+    <if condition-set="quartz">
+      <autogenargs value="--enable-gl"/>
+    </if>
+    <pkg-config>cogl-1.0.pc</pkg-config>
+    <branch revision="cogl-1.22"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="libsoup"/>
-      <dep package="m4-common"/>
+      <dep package="gtk-doc"/>
+      <dep package="pango"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <if condition-unset="quartz">
+        <dep package="libdrm"/>
+      </if>
+      <if condition-set="x11">
+        <dep package="libXcomposite"/>
+        <dep package="xcb-dri2" />
+      </if>
+      <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="libgdata">
-    <pkg-config>libgdata.pc</pkg-config>
-    <branch/>
+  <autotools id="colord" autogenargs="--disable-examples --disable-strict --disable-bash-completion 
--with-systemdsystemunitdir=no">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-gusb --disable-udev --disable-systemd-login"/>
+    </if>
+    <branch repo="github.com" checkoutdir="colord" module="hughsie/colord.git"/>
     <dependencies>
-      <dep package="json-glib"/>
-      <dep package="gcr"/>
+      <dep package="argyll"/>
       <dep package="glib"/>
-      <dep package="gnome-online-accounts"/>
+      <dep package="dbus"/>
+      <dep package="sqlite3"/>
+      <dep package="lcms2"/>
       <dep package="gobject-introspection"/>
-      <dep package="libxml2"/>
-      <dep package="libsoup"/>
-      <dep package="liboauth"/>
-      <dep package="m4-common"/>
-      <dep package="uhttpmock"/>
+      <!-- and cups -->
+      <!-- and sane -->
+      <if condition-set="linux">
+        <dep package="libgusb"/>
+        <dep package="libusb1"/>
+        <dep package="gudev"/>
+      </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
+    <suggests>
+      <dep package="polkit-gobject"/>
+    </suggests>
   </autotools>
 
-  <cmake id="libical">
-    <pkg-config>libical.pc</pkg-config>
-    <branch repo="github-tar"
-            module="libical/libical/releases/download/v1.0.1/libical-1.0.1.tar.gz"
-            version="1.0.1"
-            hash="sha256:089ce3c42d97fbd7a5d4b3c70adbdd82115dd306349c1f5c46a8fb3f8c949592"
-            size="720618"/>
-    <dependencies>
-    </dependencies>
-  </cmake>
-
-  <autotools id="libmbim">
-    <branch repo="git.freedesktop.org"
-            module="libmbim/libmbim.git"/>
+  <autotools id="colord-gtk">
+    <branch repo="github.com" checkoutdir="colord-gtk" module="hughsie/colord-gtk.git"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk-doc"/>
-      <dep package="gudev"/>
+      <dep package="gtk+"/>
+      <dep package="colord"/>
+      <dep package="vala"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libmediaart" autogenargs="--disable-qt">
+  <autotools id="folks" autogenargs="--enable-eds-backend --disable-libsocialweb-backend 
--disable-fatal-warnings"
+             uninstall-before-install="true">
     <branch/>
     <dependencies>
-      <dep package="gdk-pixbuf"/>
-      <dep package="glib"/>
-      <dep package="gtk-doc"/>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+      <dep package="libgee"/>
       <dep package="vala"/>
+      <dep package="gobject-introspection"/>
+      <dep package="telepathy-glib"/>
+      <dep package="evolution-data-server"/>
+      <dep package="shared-mime-info"/>
     </dependencies>
+    <suggests>
+      <dep package="telepathy-logger"/>
+    </suggests>
   </autotools>
 
-  <autotools id="libqmi">
-    <branch repo="git.freedesktop.org" module="libqmi.git"/>
+  <autotools id="fwupd"
+             autogenargs="--disable-colorhug --disable-uefi">
+    <branch repo="github.com" checkoutdir="fwupd" module="hughsie/fwupd"/>
     <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="gcab"/>
       <dep package="glib"/>
-      <dep package="gtk-doc"/>
+      <dep package="gudev"/>
+      <dep package="libarchive"/>
+      <dep package="libgusb"/>
+      <dep package="libsoup"/>
+      <dep package="polkit-gobject"/>
+      <dep package="sqlite3"/>
+      <dep package="gpgme"/>
+      <dep package="docbook-utils"/>
     </dependencies>
   </autotools>
 
-  <autotools id="m4-common">
-    <branch repo="github.com" module="desrt/m4-common.git"/>
-  </autotools>
-
-  <cmake id="mir" cmakeargs="-DMIR_ENABLE_TESTS=0 -DMIR_PLATFORM=mesa">
-    <branch repo="mir"
-            module="0.8/${version}/+download/mir-${version}.tar.bz2"
-            version="0.8.0"
-            hash="sha256:a907bb7e6cf4d5975bc02db8a7b0d6e2f668527e6d38ae402ec8b87a8ca0c5f1"
-            size="1047629">
-      <patch file="mir-gflags-noshutdown.patch" strip="1"/>
-      <patch file="mir-progressbar-example.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="boost"/>
-      <dep package="protobuf"/>
-      <dep package="mesa-libGLES"/>
-      <dep package="google-glog"/>
-      <dep package="google-gflags"/>
-      <dep package="gbm"/>
-      <dep package="egl"/>
-      <dep package="glm"/>
-      <dep package="lttng-ust"/>
-      <dep package="lcov"/>
-      <dep package="libudev"/>
-      <dep package="libxkbcommon"/>
-    </dependencies>
-  </cmake>
-
-  <autotools id="ModemManager"
-             autogenargs="--with-udev-base-dir=${libdir}/udev --with-systemdsystemunitdir=no 
--disable-more-warnings">
-    <branch repo="git.freedesktop.org"
-           module="ModemManager/ModemManager.git" checkoutdir="ModemManager" />
+  <autotools id="gcab">
+    <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="dbus-glib"/>
-      <dep package="gtk-doc"/>
-      <dep package="polkit-gobject"/>
-      <dep package="gudev"/>
-      <dep package="ppp"/>
-      <dep package="libmbim"/>
-      <dep package="libqmi"/>
+      <dep package="gobject-introspection"/>
+      <dep package="vala"/>
+      <dep package="zlib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="sound-theme-freedesktop">
-    <branch repo="people.freedesktop.org"
-            module="~mccann/dist/sound-theme-freedesktop-0.8.tar.bz2"
-            version="0.8"
-            hash="sha256:cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14"
-            size="478237"/>
-  </autotools>
-
-<!-- OS Core API/ABI stable dependencies -->
-
-  <autotools id="atk">
+  <autotools id="gcr">
     <branch/>
     <dependencies>
+      <dep package="gnome-common"/>
       <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gtk-doc"/>
+      <dep package="gtk+"/>
+      <dep package="libgcrypt" />
+      <dep package="libtasn1" />
+      <dep package="p11-kit"/>
+      <dep package="vala"/>
     </dependencies>
   </autotools>
 
-  <autotools id="cogl" autogenargs="--enable-xlib-egl-platform --enable-cogl-gst --disable-maintainer-flags">
-    <if condition-set="wayland">
-      <autogenargs value="--enable-wayland-egl-platform --enable-wayland-egl-server 
--enable-kms-egl-platform"/>
+  <autotools id="gdk-pixbuf" autogenargs="--enable-installed-tests">
+    <if condition-set="macos">
+      <autogenargs value="--without-libtiff"/>
     </if>
-    <pkg-config>cogl-1.0.pc</pkg-config>
-    <branch revision="cogl-1.22"/>
+    <branch/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <dep package="gtk-doc"/>
-      <dep package="libdrm"/>
-      <dep package="libXcomposite"/>
-      <dep package="xcb-dri2" />
-      <dep package="pango"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <if condition-set="wayland">
-        <dep package="wayland"/>
-        <dep package="wayland-egl"/>
-        <dep package="gbm"/>
-      </if>
+      <dep package="libjpeg"/>
+      <dep package="libpng"/>
+      <dep package="libtiff"/>
     </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
   </autotools>
 
-  <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"/>
+  <autotools id="geoclue" autogenargs="--with-systemdsystemunitdir=no">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-cdma-source"/>
     </if>
-    <branch/>
+    <branch repo="git.freedesktop.org"/>
     <dependencies>
-      <dep package="cogl"/>
-      <dep package="atk"/>
       <dep package="glib"/>
-      <dep package="cairo"/>
       <dep package="json-glib"/>
-      <dep package="gobject-introspection"/>
-      <if condition-set="wayland">
-        <dep package="wayland"/>
-        <dep package="libxkbcommon"/>
-        <dep package="libinput"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <if condition-set="linux">
+        <dep package="ModemManager"/>
       </if>
     </dependencies>
-    <suggests>
-      <dep package="gdk-pixbuf"/>
-      <if condition-set="wayland">
-        <dep package="gudev"/>
-      </if>
-    </suggests>
   </autotools>
 
-  <autotools id="gdk-pixbuf" autogenargs="--enable-installed-tests">
-    <if condition-set="macos">
-      <autogenargs value="--without-libtiff"/>
-    </if>
+  <autotools id="geocode-glib">
     <branch/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="json-glib"/>
+      <dep package="libsoup"/>
       <dep package="gobject-introspection"/>
       <dep package="gtk-doc"/>
-      <dep package="libjpeg"/>
-      <dep package="libpng"/>
-      <dep package="libtiff"/>
     </dependencies>
   </autotools>
 
+  <autotools id="geoip" skip-autogen="never" autogen-sh="autoreconf">
+    <pkg-config>geoip.pc</pkg-config>
+    <branch repo="github-tar"
+            version="1.6.5"
+            module="maxmind/geoip-api-c/releases/download/v${version}/GeoIP-${version}.tar.gz"
+            hash="sha256:0ae1c95e69ad627d3a45cb897f79ce0c30f13fcd4b4a0dda073be0c9552521b3">
+    </branch>
+  </autotools>
+
   <autotools id="glib" autogenargs="--enable-installed-tests">
     <branch/>
     <dependencies>
       <dep package="gtk-doc"/>
       <dep package="libffi"/>
+      <dep package="libpcre"/>
       <dep package="zlib"/>
     </dependencies>
     <after>
@@ -397,158 +390,66 @@
     </after>
   </autotools>
 
-  <autotools id="gtk+" autogenargs="--enable-broadway-backend --enable-installed-tests">
-    <if condition-set="x11">
-      <autogenargs value="--enable-x11-backend"/>
-    </if>
-    <if condition-set="wayland">
-      <autogenargs value="--enable-wayland-backend"/>
-    </if>
-    <if condition-set="mir">
-      <autogenargs value="--enable-mir-backend"/>
-    </if>
-    <if condition-set="quartz">
-      <autogenargs value="--enable-quartz-backend"/>
-    </if>
-    <branch/>
+  <autotools id="glibmm">
+    <branch revision="glibmm-2-48"/>
     <dependencies>
-      <dep package="atk"/>
       <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="pango"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gtk-doc"/>
-      <dep package="gobject-introspection"/>
-      <dep package="libepoxy"/>
-      <if condition-unset="quartz">
-        <dep package="at-spi2-atk"/>
-      </if>
-      <if condition-set="wayland">
-        <dep package="libxkbcommon"/>
-        <dep package="wayland"/>
-        <dep package="wayland-egl"/>
-      </if>
-      <if condition-set="mir">
-        <dep package="mir"/>
-      </if>
+      <dep package="libsigcplusplus"/>
     </dependencies>
-    <suggests>
-      <dep package="shared-mime-info"/>
-    </suggests>
   </autotools>
 
-  <autotools id="pango" autogenargs="--with-cairo --enable-installed-tests">
+<!-- This is a special module: it's needed to build from git, but not
+     needed to build from tarballs, so it doesn't need to be in our suites
+     and it doesn't need to be an external dependency -->
+  <autotools id="gnome-common">
     <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="gtk-doc"/>
-      <dep package="gobject-introspection"/>
-      <if condition-set="x11">
-        <dep package="libXft"/>
-      </if>
-      <if condition-unset="quartz">
-        <dep package="harfbuzz"/>
-        <dep package="fontconfig"/>
-      </if>
-    </dependencies>
   </autotools>
 
-  <!-- OS Core unstable dependencies -->
-
-  <autotools id="cantarell-fonts">
+  <autotools id="gnome-online-miners">
     <branch/>
     <dependencies>
-      <dep package="fontconfig"/>
+      <dep package="glib"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="grilo"/>
+      <dep package="libgdata"/>
+      <dep package="libgfbgraph"/>
+      <dep package="libzapojit"/>
+      <dep package="tracker"/>
     </dependencies>
   </autotools>
 
-  <autotools id="caribou" autogenargs="--disable-gtk2-module">
+  <autotools id="gnome-video-effects">
     <branch/>
     <dependencies>
-      <dep package="pygobject"/>
-      <dep package="gtk+"/>
-      <dep package="clutter"/>
-      <dep package="libgee"/>
-      <dep package="libxklavier"/>
-      <dep package="vala"/>
+      <dep package="gstreamer"/>
     </dependencies>
   </autotools>
 
-  <autotools id="clutter-gtk">
+  <autotools id="gjs" autogenargs="--enable-installed-tests">
+    <if condition-set="coverage">
+      <autogenargs value="--enable-coverage"/>
+    </if>
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
-      <dep package="clutter"/>
-    </dependencies>
-  </autotools>
-
-  <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="dbus-glib"/>
       <dep package="gobject-introspection"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="clutter-gst3">
-    <branch revision="clutter-gst-3.0" module="clutter-gst" checkoutdir="clutter-gst3"/>
-    <dependencies>
-      <dep package="cogl"/>
-      <dep package="clutter"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="js24"/>
+      <if condition-set="coverage">
+        <dep package="lcov"/>
+      </if>
     </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
   </autotools>
 
-  <autotools id="farstream" autogenargs="--disable-python">
-    <branch repo="freedesktop.org"
-            module="farstream/releases/farstream/farstream-${version}.tar.gz"
-            version="0.2.7"
-            hash="sha256:dad0ed43cf94e71df558c23825abe57db59d1ee8d970ffaec5e2dbc2e7acbf7d"/>
+  <autotools id="gobject-introspection"
+             autogenargs="--with-python=python3">
+    <branch revision="gnome-3-20"/>
     <dependencies>
+      <dep package="bison"/>
+      <dep package="flex"/>
       <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="libnice"/>
-    </dependencies>
-    <suggests>
-      <dep package="gupnp-igd"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="telepathy-farstream" autogenargs="--disable-python --disable-Werror">
-    <branch repo="telepathy.freedesktop.org"/>
-    <dependencies>
-      <dep package="telepathy-glib"/>
-      <dep package="farstream"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="folks" autogenargs="--enable-eds-backend --disable-libsocialweb-backend 
--disable-fatal-warnings"
-             uninstall-before-install="true">
-    <branch/>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-      <dep package="libgee"/>
-      <dep package="vala"/>
-      <dep package="gobject-introspection"/>
-      <dep package="telepathy-glib"/>
-      <dep package="evolution-data-server"/>
-      <dep package="zeitgeist"/>
-      <dep package="shared-mime-info"/>
+      <dep package="cairo"/>
+      <dep package="python3-devel"/>
     </dependencies>
-    <suggests>
-      <dep package="telepathy-logger"/>
-    </suggests>
   </autotools>
 
   <autotools id="gom">
@@ -614,86 +515,25 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtksourceview">
+  <autotools id="gspell">
     <branch/>
     <dependencies>
-      <dep package="libxml2"/>
-      <dep package="shared-mime-info"/>
       <dep package="gtk+"/>
+      <dep package="enchant"/>
+      <dep package="iso-codes"/>
       <dep package="m4-common"/>
     </dependencies>
-    <suggests>
-      <dep package="glade"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="harfbuzz" autogenargs="">
-    <branch repo="git.freedesktop.org"
-      module="harfbuzz" checkoutdir="harfbuzz"/>
-    <dependencies>
-      <dep package="c++"/>
-      <dep package="glib"/>
-      <dep package="libicu"/>
-      <dep package="ragel"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libgrss">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libsoup"/>
-      <dep package="libxml2"/>
-    </dependencies>
   </autotools>
 
-  <autotools id="librest">
-    <if condition-set="freebsd">
-      <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
-    </if>
-    <branch/>
+  <autotools id="gssdp" makeargs="CFLAGS=-Wno-error">
+    <branch />
     <dependencies>
       <dep package="glib"/>
       <dep package="libsoup"/>
-      <dep package="libxml2"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libsecret">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="libgcrypt"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="gobject-introspection">
-    <branch/>
-    <dependencies>
-      <dep package="bison"/>
-      <dep package="flex"/>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="python-devel"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gjs" autogenargs="--enable-installed-tests">
-    <if condition-set="coverage">
-      <autogenargs value="--enable-coverage"/>
-    </if>
-    <branch/>
-    <dependencies>
-      <dep package="dbus-glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="js24"/>
-      <if condition-set="coverage">
-        <dep package="lcov"/>
-      </if>
-    </dependencies>
+    </suggests>
   </autotools>
 
   <autotools id="gstreamer"
@@ -702,7 +542,7 @@
     <branch repo="gstreamer.freedesktop.org"
             module="gstreamer"
             checkoutdir="gstreamer"
-            revision="1.6"/>
+            revision="1.8"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -710,13 +550,26 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gst-plugins-bad"
+             autogenargs="--disable-fatal-warnings"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            checkoutdir="gst-plugins-bad"
+            module="gst-plugins-bad"
+            revision="1.8"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gst-plugins-base"
              autogenargs="--disable-fatal-warnings"
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-base"
             checkoutdir="gst-plugins-base"
-            revision="1.6"/>
+            revision="1.8"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gtk+"/>
@@ -735,7 +588,7 @@
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-good"
             checkoutdir="gst-plugins-good"
-            revision="1.6"/>
+            revision="1.8"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -754,57 +607,80 @@
     </suggests>
   </autotools>
 
-  <autotools id="gst-plugins-bad"
-             autogenargs="--disable-fatal-warnings"
-             supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org"
-            checkoutdir="gst-plugins-bad"
-            module="gst-plugins-bad"
-            revision="1.6"/>
-    <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="mm-common">
-    <branch/>
-  </autotools>
-
-  <autotools id="libsigc++2">
-    <branch/>
-    <dependencies>
-      <dep package="mm-common"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="glibmm">
-    <branch/>
+  <autotools id="gtk+" autogenargs="--enable-broadway-backend --enable-installed-tests">
+    <if condition-set="x11">
+      <autogenargs value="--enable-x11-backend"/>
+    </if>
+    <if condition-set="wayland">
+      <autogenargs value="--enable-wayland-backend"/>
+    </if>
+    <if condition-set="mir">
+      <autogenargs value="--enable-mir-backend"/>
+    </if>
+    <if condition-set="quartz">
+      <autogenargs value="--enable-quartz-backend"/>
+    </if>
+    <branch revision="gtk-3-20"/>
     <dependencies>
+      <dep package="atk"/>
       <dep package="glib"/>
-      <dep package="libsigc++2"/>
+      <dep package="cairo"/>
+      <dep package="pango"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gtk-doc"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libepoxy"/>
+      <if condition-unset="quartz">
+        <dep package="at-spi2-atk"/>
+      </if>
+      <if condition-set="wayland">
+        <dep package="libxkbcommon"/>
+        <dep package="wayland"/>
+        <dep package="wayland-egl"/>
+        <dep package="wayland-protocols"/>
+      </if>
+      <if condition-set="mir">
+        <dep package="mir"/>
+      </if>
     </dependencies>
+    <suggests>
+      <dep package="shared-mime-info"/>
+    </suggests>
   </autotools>
 
-  <autotools id="pangomm">
-    <branch/>
+  <!-- Deprecated -->
+  <autotools id="gtk+-2">
+    <if condition-set="quartz">
+      <autogenargs value="--with-backend=quartz"/>
+    </if>
+    <branch checkoutdir="gtk+-2" module="gtk+" revision="gtk-2-24"/>
     <dependencies>
-      <dep package="glibmm"/>
-      <dep package="cairomm"/>
+      <dep package="glib"/>
+      <dep package="cairo"/>
       <dep package="pango"/>
       <dep package="atk"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
+    <suggests>
+      <dep package="shared-mime-info"/>
+    </suggests>
   </autotools>
 
-  <autotools id="atkmm">
+  <autotools id="gtk-doc">
     <branch/>
     <dependencies>
-      <dep package="glibmm"/>
-      <dep package="atk"/>
+      <dep package="libxslt"/>
+      <dep package="yelp-tools"/>
+      <dep package="libtool"/>
+      <dep package="gettext-bin"/>
+      <dep package="docbook-xml"/>
+      <dep package="docbook-xsl"/>
+      <dep package="cc"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gtkmm">
+ <autotools id="gtkmm">
     <branch/>
     <dependencies>
       <dep package="cairomm"/>
@@ -815,14 +691,16 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gssdp" makeargs="CFLAGS=-Wno-error">
-    <branch />
+  <autotools id="gtksourceview">
+    <branch/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="shared-mime-info"/>
+      <dep package="gtk+"/>
+      <dep package="m4-common"/>
     </dependencies>
     <suggests>
-      <dep package="gobject-introspection"/>
+      <dep package="glade"/>
     </suggests>
   </autotools>
 
@@ -844,6 +722,30 @@
     </suggests>
   </autotools>
 
+  <autotools id="gupnp-av">
+    <branch />
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gupnp"/>
+    </dependencies>
+    <suggests>
+      <dep package="gobject-introspection"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gupnp-dlna">
+    <branch />
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="glib"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+    <suggests>
+      <dep package="gst-plugins-good"/>
+    </suggests>
+ </autotools>
+
   <autotools id="gupnp-igd"
              autogenargs="--disable-python">
     <branch/>
@@ -853,6 +755,91 @@
     </dependencies>
   </autotools>
 
+  <autotools id="harfbuzz" autogenargs="">
+    <branch repo="git.freedesktop.org"
+      module="harfbuzz" checkoutdir="harfbuzz"/>
+    <dependencies>
+      <dep package="c++"/>
+      <dep package="glib"/>
+      <dep package="libicu"/>
+      <dep package="ragel"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="hicolor-icon-theme" supports-non-srcdir-builds="no"
+             check-target="false">
+    <branch module="hicolor-icon-theme-0.15.tar.xz" version="0.15"
+           repo="icon-theme.freedesktop.org"
+            hash="sha256:9cc45ac3318c31212ea2d8cb99e64020732393ee7630fa6c1810af5f987033cc"
+            size="51056">
+    </branch>
+  </autotools>
+
+  <autotools id="ibus"
+             autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf --disable-ui 
GSETTINGS_SCHEMA_CONVERT=/usr/bin/false --with-python=python3">
+    <branch repo="github-tar"
+            version="1.5.10"
+            module="ibus/ibus/releases/download/${version}/ibus-${version}.tar.gz"
+            hash="sha256:1d01b7806602875a1f3004f32e1000a39be01f59731d6baf36446498e26f5594">
+    </branch>
+    <dependencies>
+      <dep package="dbus"/>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="dconf"/>
+      <dep package="iso-codes"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="ibus-anthy" autogenargs="--enable-private-png=yes">
+    <branch repo="github-tar"
+            version="1.5.6"
+            module="ibus/ibus-anthy/releases/download/${version}/ibus-anthy-${version}.tar.gz"
+            hash="sha256:035c636bc884ff3131bb75aee6ec58db938d3797344687a2eb5f18542801896e"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="ibus"/>
+      <dep package="anthy"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="ibus-hangul"
+             autogen-sh="configure">
+    <branch repo="github-tar"
+            version="1.5.0"
+            module="choehwanjin/ibus-hangul/releases/download/${version}/ibus-hangul-${version}.tar.gz"
+            hash="sha256:a22d4030bb20f73914a9d8a28c71b823123a5d1902a30f8328111af50f4f1788"/>
+    <dependencies>
+      <dep package="ibus"/>
+      <dep package="libhangul"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="ibus-libpinyin"
+             autogenargs="--disable-lua-extension --with-python=python3">
+    <branch repo="github-tar"
+            version="1.7.4"
+            module="libpinyin/ibus-libpinyin/archive/${version}.tar.gz"
+            checkoutdir="ibus-libpinyin-${version}"
+            hash="sha256:4627eab10ded24bd1a95ee56a2f7bd6a82deb94435aea674267fc40febd66f81"/>
+    <dependencies>
+      <dep package="ibus"/>
+      <dep package="libpinyin"/>
+      <dep package="sqlite3"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="iso-codes">
+    <pkg-config>iso-codes.pc</pkg-config>
+    <branch repo="iso-codes"
+            module="iso-codes-3.51.tar.xz"
+            version="3.51"
+            hash="sha256:5222f79d92ac021a56c7080616c13655c50f7b1ff1a31ec0308da14a684ad77f"
+            size="3626932"/>
+  </autotools>
+
   <autotools id="java-gnome" autogen-sh="configure" skip-autogen="never">
     <branch repo="research.operationaldynamics.com"
             module="bzr/java-gnome/mainline"/>
@@ -907,6 +894,23 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgdata">
+    <pkg-config>libgdata.pc</pkg-config>
+    <branch/>
+    <dependencies>
+      <dep package="json-glib"/>
+      <dep package="gcr"/>
+      <dep package="glib"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libxml2"/>
+      <dep package="libsoup"/>
+      <dep package="liboauth"/>
+      <dep package="m4-common"/>
+      <dep package="uhttpmock"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libgee">
     <pkg-config>gee-0.8.pc</pkg-config>
     <branch/>
@@ -917,15 +921,23 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgweather">
+  <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>
+
+  <autotools id="libgrss">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
-      <dep package="libxml2"/>
-      <dep package="geocode-glib"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
       <dep package="libsoup"/>
+      <dep package="libxml2"/>
     </dependencies>
   </autotools>
 
@@ -949,6 +961,29 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgusb">
+    <branch repo="github.com" checkoutdir="libgusb" module="hughsie/libgusb.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="vala"/>
+      <dep package="libusb1"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgweather">
+    <branch/>
+    <dependencies>
+      <dep package="m4-common"/>
+      <dep package="intltool"/>
+      <dep package="libxml2"/>
+      <dep package="geocode-glib"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libgxps">
     <branch/>
     <dependencies>
@@ -959,6 +994,36 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libinput">
+    <branch repo="git.freedesktop.org" checkoutdir="libinput" module="wayland/libinput.git" />
+    <dependencies>
+      <dep package="libevdev"/>
+      <dep package="libudev"/>
+      <dep package="libwacom"/>
+      <dep package="mtdev"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libmbim">
+    <branch repo="git.freedesktop.org"
+            module="libmbim/libmbim.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk-doc"/>
+      <dep package="gudev"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libmediaart" autogenargs="--disable-qt">
+    <branch/>
+    <dependencies>
+      <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="gtk-doc"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libnice"
              autogenargs="--enable-gupnp">
     <pkg-config>nice.pc</pkg-config>
@@ -996,6 +1061,26 @@
     </suggests>
   </autotools>
 
+  <autotools id="libqmi">
+    <branch repo="git.freedesktop.org" module="libqmi.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk-doc"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="librest">
+    <if condition-set="freebsd">
+      <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
+    </if>
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="librsvg" supports-non-srcdir-builds="no" autogenargs="--enable-vala=yes">
     <if condition-unset="gnu-elf">
       <autogenargs value="--disable-Bsymbolic"/>
@@ -1013,6 +1098,24 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libsecret">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+    <suggests>
+      <dep package="libgcrypt"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="libsigcplusplus">
+    <branch revision="libsigc++-2-8"/>
+    <dependencies>
+      <dep package="mm-common"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libsoup" autogenargs="--disable-tls-check">
     <branch/>
     <dependencies>
@@ -1028,17 +1131,154 @@
     </suggests>
   </autotools>
 
+  <autotools id="libwacom">
+    <branch repo="sourceforge.net"
+            module="linuxwacom/files/libwacom/libwacom-${version}.tar.bz2" version="0.13"
+            hash="sha256:976b8801007ac96c6512751a0ef6903b482cd361f256965c2884196c88788176"
+            size="439767"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gudev"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libzapojit">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="json-glib"/>
+      <dep package="librest"/>
+      <dep package="libsoup"/>
+      <dep package="gnome-online-accounts"/>
+    </dependencies>
+  </autotools>
+
+  <!-- Deprecated -->
+  <autotools id="libwnck">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="startup-notification"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libxkbcommon">
+    <branch repo="libxkbcommon"
+            module="http://xkbcommon.org/download/libxkbcommon-${version}.tar.xz";
+            version="0.5.0"
+            hash="sha256:90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c"
+            size="615504"/>
+    <dependencies>
+      <dep package="xkeyboard-config"/>
+      <dep package="xorg-macros"/>
+      <dep package="xorg-xproto"/>
+      <dep package="xorg-kbproto"/>
+      <dep package="libX11"/>
+      <dep package="xcb"/>
+      <dep package="xcb-xkb"/>
+    </dependencies>
+  </autotools>
+
+  <!-- GNOME’s cache for autoconf-archive.
+       Please keep this comment for greppability. -->
+  <autotools id="m4-common">
+    <branch/>
+  </autotools>
+
+  <cmake id="mir" cmakeargs="-DMIR_ENABLE_TESTS=0 -DMIR_PLATFORM=mesa">
+    <branch repo="mir"
+            module="0.8/${version}/+download/mir-${version}.tar.bz2"
+            version="0.8.0"
+            hash="sha256:a907bb7e6cf4d5975bc02db8a7b0d6e2f668527e6d38ae402ec8b87a8ca0c5f1"
+            size="1047629">
+      <patch file="mir-gflags-noshutdown.patch" strip="1"/>
+      <patch file="mir-progressbar-example.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="boost"/>
+      <dep package="protobuf"/>
+      <dep package="mesa-libGLES"/>
+      <dep package="google-glog"/>
+      <dep package="google-gflags"/>
+      <dep package="gbm"/>
+      <dep package="egl"/>
+      <dep package="glm"/>
+      <dep package="lttng-ust"/>
+      <dep package="lcov"/>
+      <dep package="libudev"/>
+      <dep package="libxkbcommon"/>
+    </dependencies>
+  </cmake>
+
+  <autotools id="mm-common">
+    <branch/>
+  </autotools>
+
   <autotools id="mobile-broadband-provider-info">
     <branch/>
   </autotools>
 
-  <!-- This should be moved to sysdeps once it's widely-available. -->
-  <autotools id="pcre2">
-    <branch repo="sourceforge.net"
-            checkoutdir="pcre2"
-            module="pcre/files/pcre2/${version}/pcre2-${version}.tar.bz2"
-            version="10.20"
-            hash="sha256:332e287101c9e9567d1ed55391b338b32f1f72c5b5ee7cc81ef2274a53ad487a"/>
+  <autotools id="ModemManager"
+             autogenargs="--with-udev-base-dir=${libdir}/udev --with-systemdsystemunitdir=no 
--disable-more-warnings">
+    <branch repo="git.freedesktop.org"
+           module="ModemManager/ModemManager.git" checkoutdir="ModemManager" />
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="dbus-glib"/>
+      <dep package="gtk-doc"/>
+      <dep package="polkit-gobject"/>
+      <dep package="gudev"/>
+      <dep package="ppp"/>
+      <dep package="libmbim"/>
+      <dep package="libqmi"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="pango" autogenargs="--with-cairo --enable-installed-tests">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="gtk-doc"/>
+      <dep package="gobject-introspection"/>
+      <if condition-set="x11">
+        <dep package="libXft"/>
+      </if>
+      <if condition-unset="quartz">
+        <dep package="harfbuzz"/>
+        <dep package="fontconfig"/>
+      </if>
+    </dependencies>
+  </autotools>
+
+  <autotools id="pangomm">
+    <branch/>
+    <dependencies>
+      <dep package="glibmm"/>
+      <dep package="cairomm"/>
+      <dep package="pango"/>
+      <dep package="atk"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="pcre2"
+             autogenargs="--enable-jit --enable-pcre2-8 --enable-pcre2-16 --enable-pcre2-32">
+    <branch repo="pcre"
+            module="pcre2-${version}.tar.bz2"
+            version="10.21"
+            hash="sha256:c66a17509328a7251782691093e75ede7484a203ebc6bed3c08122b092ccd4e0"
+            size="1455359"/>
+  </autotools>
+
+  <autotools id="pyatspi2" autogenargs="--with-python=python3" >
+    <branch/>
+    <dependencies>
+      <dep package="pygobject"/>
+    </dependencies>
+    <suggests>
+      <dep package="at-spi2-core"/>
+    </suggests>
   </autotools>
 
   <!-- Python 3 build of pygobject -->
@@ -1048,11 +1288,30 @@
       <dep package="gnome-common"/>
       <dep package="glib"/>
       <dep package="py3cairo"/>
-      <dep package="python-devel"/>
+      <dep package="python3-devel"/>
       <dep package="gobject-introspection"/>
     </dependencies>
   </autotools>
 
+  <autotools id="sound-theme-freedesktop">
+    <branch repo="people.freedesktop.org"
+            module="~mccann/dist/sound-theme-freedesktop-0.8.tar.bz2"
+            version="0.8"
+            hash="sha256:cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14"
+            size="478237"/>
+  </autotools>
+
+  <autotools id="speech-dispatcher" autogenargs="--with-espeak">
+    <branch repo="speech-dispatcher"
+            module="speech-dispatcher-${version}.tar.gz"
+            version="0.8"
+            hash="sha256:0a6ce544cfbac8592a8ea08e3ab24c389153904ea51c6fd68756cea52de9efa2"/>
+    <dependencies>
+      <dep package="dotconf"/>
+      <dep package="espeak"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="telepathy-glib" autogenargs="--enable-vala-bindings --disable-fatal-warnings">
     <pkg-config>telepathy-glib.pc</pkg-config>
     <branch repo="telepathy.freedesktop.org"/>
@@ -1068,7 +1327,7 @@
     </suggests>
   </autotools>
 
-  <autotools id="telepathy-logger" autogenargs="--disable-Werror">
+  <autotools id="telepathy-logger">
     <pkg-config>telepathy-logger-0.2.pc</pkg-config>
     <branch repo="telepathy.freedesktop.org"/>
     <dependencies>
@@ -1125,15 +1384,23 @@
       <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="uhttpmock">
+    <branch repo="github.com" checkoutdir="uhttpmock" module="pwithnall/uhttpmock.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="m4-common"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="vala" autogenargs="--enable-vapigen" supports-non-srcdir-builds="no">
-    <pkg-config>libvala-0.30.pc</pkg-config>
+    <pkg-config>libvala-0.32.pc</pkg-config>
     <branch />
     <dependencies>
       <dep package="glib"/>
@@ -1149,30 +1416,8 @@
     </dependencies>
   </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">
-    <branch repo="libxkbcommon"
-            module="http://xkbcommon.org/download/libxkbcommon-${version}.tar.xz";
-            version="0.5.0"
-            hash="sha256:90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c"
-            size="615504"/>
-    <dependencies>
-      <dep package="xkeyboard-config"/>
-      <dep package="xorg-macros"/>
-      <dep package="xorg-xproto"/>
-      <dep package="xorg-kbproto"/>
-      <dep package="libX11"/>
-      <dep package="xcb"/>
-      <dep package="xcb-xkb"/>
-    </dependencies>
+  <autotools id="wayland-protocols">
+    <branch repo="wayland.freedesktop.org"/>
   </autotools>
 
   <autotools id="wayland"
@@ -1185,22 +1430,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="xorg-xproto">
-    <pkg-config>xproto.pc</pkg-config>
-    <branch repo="xorg-tar"
-            module="releases/individual/proto/xproto-7.0.28.tar.gz" version="7.0.28"
-            size="367523"
-            hash="sha256:6cabc8ce3fa2b1a2427871167b62c24d5b08a58bd3e81ed7aaf08f2bf6dbcfed"/>
-  </autotools>
-
-  <autotools id="xtrans">
-    <pkg-config>xtrans.pc</pkg-config>
-    <branch repo="xorg-tar"
-            module="releases/individual/lib/xtrans-1.3.5.tar.gz" version="1.3.5"
-            size="227536"
-            hash="sha256:b7a577c1b6c75030145e53b4793db9c88f9359ac49e7d771d4385d21b3e5945d"/>
-  </autotools>
-
   <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release">
     <if condition-unset="x11">
       <cmakeargs value="-DENABLE_X11_TARGET=OFF"/>
@@ -1210,9 +1439,9 @@
     </if>
     <pkg-config>webkit2gtk-4.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
-            module="webkitgtk-2.11.1.tar.xz" version="2.11.1"
-            hash="sha256:2e13ca3ab384887cd687bc96aed857ba0191567e3fd579974f17b537e9cb2138"
-            size="11370708">
+            module="webkitgtk-2.12.0.tar.xz" version="2.12.0"
+            hash="sha256:a68604f8fd1bcb247d647709290226289b90c16acb1f3730538b688db8df5ea6"
+            size="11687224">
     </branch>
     <dependencies>
       <dep package="c++"/>
@@ -1260,9 +1489,26 @@
     </suggests>
   </cmake>
 
+  <autotools id="xorg-xproto">
+    <pkg-config>xproto.pc</pkg-config>
+    <branch repo="xorg-tar"
+            module="releases/individual/proto/xproto-7.0.28.tar.gz" version="7.0.28"
+            size="367523"
+            hash="sha256:6cabc8ce3fa2b1a2427871167b62c24d5b08a58bd3e81ed7aaf08f2bf6dbcfed"/>
+  </autotools>
+
+  <autotools id="xtrans">
+    <pkg-config>xtrans.pc</pkg-config>
+    <branch repo="xorg-tar"
+            module="releases/individual/lib/xtrans-1.3.5.tar.gz" version="1.3.5"
+            size="227536"
+            hash="sha256:b7a577c1b6c75030145e53b4793db9c88f9359ac49e7d771d4385d21b3e5945d"/>
+  </autotools>
+
  <autotools id="vte"
             autogenargs="--enable-introspection=yes">
-    <branch/>
+    <!-- https://bugzilla.gnome.org/show_bug.cgi?id=762780 -->
+    <branch revision="vte-0-42"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -1304,174 +1550,4 @@
     </dependencies>
   </autotools>
 
-
-  <!-- OS Core Services dependencies -->
-
-  <autotools id="libgusb">
-    <branch repo="github.com" checkoutdir="libgusb" module="hughsie/libgusb.git"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="colord" autogenargs="--disable-examples --disable-strict --disable-bash-completion 
--with-systemdsystemunitdir=no">
-    <if condition-unset="linux">
-      <autogenargs value="--disable-gusb --disable-udev --disable-systemd-login"/>
-    </if>
-    <branch repo="github.com" checkoutdir="colord" module="hughsie/colord.git"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="dbus"/>
-      <dep package="libusb1"/>
-      <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>
-      <if condition-set="systemd">
-        <dep package="libsystemd-login"/>
-      </if>
-    </dependencies>
-    <suggests>
-      <dep package="polkit-gobject"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="colord-gtk">
-    <branch repo="github.com" checkoutdir="colord-gtk" module="hughsie/colord-gtk.git"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="colord"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libwacom">
-    <branch repo="sourceforge.net"
-            module="linuxwacom/files/libwacom/libwacom-${version}.tar.bz2" version="0.13"
-            hash="sha256:976b8801007ac96c6512751a0ef6903b482cd361f256965c2884196c88788176"
-            size="439767"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gudev"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="ibus"
-             autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf --disable-ui 
GSETTINGS_SCHEMA_CONVERT=/usr/bin/false --with-python=python3">
-    <branch repo="github-tar"
-            version="1.5.10"
-            module="ibus/ibus/releases/download/${version}/ibus-${version}.tar.gz"
-            hash="sha256:1d01b7806602875a1f3004f32e1000a39be01f59731d6baf36446498e26f5594">
-    </branch>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="dconf"/>
-      <dep package="iso-codes"/>
-      <dep package="gtk+"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="ibus-libpinyin"
-             autogenargs="--disable-lua-extension --with-python=python3">
-    <branch repo="github-tar"
-            version="1.7.0"
-            module="libpinyin/ibus-libpinyin/archive/${version}.tar.gz"
-            checkoutdir="ibus-libpinyin-${version}"
-            hash="sha256:4fcdf3300afe5b6551f0a05ce3e9f7e9fb43dd73f16604cabed348b4cc7f5d36"/>
-    <dependencies>
-      <dep package="ibus"/>
-      <dep package="libpinyin"/>
-      <dep package="sqlite3"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="ibus-anthy" autogenargs="--enable-private-png=yes">
-    <branch repo="github-tar"
-            version="1.5.6"
-            module="ibus/ibus-anthy/releases/download/${version}/ibus-anthy-${version}.tar.gz"
-            hash="sha256:035c636bc884ff3131bb75aee6ec58db938d3797344687a2eb5f18542801896e"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="ibus"/>
-      <dep package="anthy"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="ibus-hangul"
-             autogen-sh="configure">
-    <branch repo="github-tar"
-            version="1.5.0"
-            module="choehwanjin/ibus-hangul/releases/download/${version}/ibus-hangul-${version}.tar.gz"
-            hash="sha256:a22d4030bb20f73914a9d8a28c71b823123a5d1902a30f8328111af50f4f1788"/>
-    <dependencies>
-      <dep package="ibus"/>
-      <dep package="libhangul"/>
-    </dependencies>
-  </autotools>
-
-  <!-- Deprecated dependencies -->
-
-  <autotools id="gtk+-2">
-    <if condition-set="quartz">
-      <autogenargs value="--with-backend=quartz"/>
-    </if>
-    <branch checkoutdir="gtk+-2" module="gtk+" revision="gtk-2-24"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="pango"/>
-      <dep package="atk"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-    <suggests>
-      <dep package="shared-mime-info"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="gtk-engines">
-    <branch revision="gtk-engines-2-22"/>
-    <dependencies>
-      <dep package="gtk+-2"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libwnck">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="startup-notification"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="zeitgeist" autogenargs="--with-session-bus-services-dir=${prefix}/share/dbus-1/services">
-    <branch repo="git.freedesktop.org"
-            module="zeitgeist/zeitgeist"
-            checkoutdir="zeitgeist"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="rapper"/>
-      <dep package="rdflib"/>
-      <dep package="sqlite3"/>
-      <dep package="vala"/>
-    </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
-      <dep package="json-glib"/>
-      <dep package="telepathy-glib"/>
-    </suggests>
-  </autotools>
 </moduleset>
diff --git a/gnome-core.modules b/gnome-core.modules
index b68589a..7543976 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -26,17 +26,28 @@
 
 <include href="gnome-core-deps.modules"/>
 
-<!-- Please try to keep organized alphabetically by section -->
+
+<!-- Please try to keep organized alphabetically by section:
+
+     1) Core User Shell (hosted on git.gnome.org)
+     2) Core Utilities (anything that's an app)
+     3) Core OS Services (non-GNOME, mostly freedesktop stuff)
+     4) Metamodules
+
+     All modules in this file should be in a metamodule.
+  -->
 
 
 <!-- Core User Shell -->
 
-  <autotools id="at-spi2-core">
+  <autotools id="adwaita-icon-theme">
     <branch/>
     <dependencies>
-      <dep package="dbus"/>
-      <dep package="glib"/>
-      <dep package="libXtst"/>
+      <dep package="hicolor-icon-theme"/>
+      <dep package="gnome-common"/>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="librsvg"/>
     </dependencies>
   </autotools>
 
@@ -51,6 +62,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="at-spi2-core">
+    <branch/>
+    <dependencies>
+      <dep package="dbus"/>
+      <dep package="glib"/>
+      <dep package="libXtst"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="dconf">
     <branch/>
     <dependencies>
@@ -62,7 +82,7 @@
 
   <autotools id="evolution-data-server"
              supports-non-srcdir-builds="no"
-             autogenargs="--enable-vala-bindings --disable-strict --disable-uoa"
+             autogenargs="--enable-vala-bindings --disable-strict --disable-uoa --disable-google-auth"
              uninstall-before-install="true">
     <!-- We uninstall the old copy before installing, because the our usage
          of DESTDIR and libtool's relinking interfere and cause camel providers
@@ -70,7 +90,7 @@
     <if condition-set="freebsd">
       <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
     </if>
-    <branch/>
+    <branch revision="gnome-3-20"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libsoup"/>
@@ -92,54 +112,92 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-bluetooth">
+  <autotools id="gdm" autogenargs="--with-systemdsystemunitdir=no --with-log-dir=${prefix}/var/log/gdm">
+    <if condition-unset="linux">
+      <autogenargs value="--without-plymouth"/>
+    </if>
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
-      <dep package="gtk-doc"/>
+      <dep package="accountsservice"/>
+      <dep package="dbus-glib"/>
+      <dep package="fontconfig"/>
       <dep package="glib"/>
-      <dep package="nautilus-sendto"/>
+      <dep package="gtk+"/>
+      <dep package="intltool"/>
+      <dep package="libcanberra"/>
+      <dep package="nss"/>
+      <dep package="pam"/>
+      <if condition-set="linux">
+        <dep package="plymouth"/>
+      </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd-daemon"/>
+        <dep package="libsystemd-login"/>
+        <dep package="libsystemd-journal"/>
+      </if>
     </dependencies>
     <suggests>
-      <dep package="geoclue"/>
+      <dep package="upower"/>
+      <dep package="yelp-tools"/>
     </suggests>
   </autotools>
 
-  <autotools id="gnome-online-accounts">
+  <autotools id="glib-networking" autogenargs="--enable-installed-tests">
+    <if condition-set="freebsd">
+      <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
+    </if>
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
-      <dep package="WebKit"/>
-      <dep package="librest"/>
-      <dep package="libsoup"/>
-      <dep package="libsecret"/>
-      <dep package="json-glib"/>
-      <dep package="libsecret"/>
-      <dep package="libxml2"/>
-      <dep package="telepathy-glib"/>
+      <dep package="glib"/>
+      <dep package="intltool"/>
+      <dep package="libproxy"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="gnutls"/>
+      <dep package="p11-kit"/>
     </dependencies>
   </autotools>
 
-  <autotools id="network-manager-applet"
-             autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
+  <autotools id="gnome-backgrounds">
     <branch/>
     <dependencies>
+      <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="dbus-glib"/>
-      <dep package="gnome-bluetooth"/>
-      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-bluetooth">
+    <branch/>
+    <dependencies>
       <dep package="gtk+"/>
-      <dep package="gudev"/>
-      <dep package="iso-codes"/>
-      <dep package="libsecret"/>
-      <dep package="NetworkManager"/>
-      <dep package="libnotify"/>
+      <dep package="gtk-doc"/>
+      <dep package="glib"/>
+      <dep package="nautilus-sendto"/>
     </dependencies>
     <suggests>
-      <dep package="mobile-broadband-provider-info"/>
+      <dep package="geoclue"/>
     </suggests>
   </autotools>
 
+  <!-- Not an app, but a service for gnome-control-center -->
+  <autotools id="gnome-color-manager">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="colord-gtk"/>
+      <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="libtiff"/>
+      <dep package="vte"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-control-center" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
@@ -178,6 +236,7 @@
     <suggests>
       <dep package="cups"/>
       <dep package="cheese"/>
+      <dep package="gnome-color-manager"/>
       <dep package="gstreamer"/>
       <dep package="ibus-libpinyin"/>
       <dep package="ibus-anthy"/>
@@ -206,14 +265,10 @@
     </dependencies>
   </autotools>
 
-  <autotools id="adwaita-icon-theme">
+  <autotools id="gnome-getting-started-docs">
     <branch/>
     <dependencies>
-      <dep package="hicolor-icon-theme"/>
-      <dep package="gnome-common"/>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="librsvg"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
@@ -241,26 +296,23 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-packagekit">
+  <autotools id="gnome-online-accounts">
     <branch/>
     <dependencies>
-      <dep package="PackageKit"/>
       <dep package="gtk+"/>
-      <dep package="libnotify"/>
-      <dep package="libcanberra"/>
+      <dep package="WebKit"/>
+      <dep package="librest"/>
+      <dep package="libsoup"/>
+      <dep package="libsecret"/>
+      <dep package="json-glib"/>
+      <dep package="libsecret"/>
+      <dep package="libxml2"/>
+      <dep package="telepathy-glib"/>
     </dependencies>
-    <suggests>
-      <if condition-set="linux">
-        <dep package="gudev"/>
-      </if>
-      <if condition-set="systemd">
-        <dep package="libsystemd-login"/>
-      </if>
-    </suggests>
   </autotools>
 
   <autotools id="gnome-session">
-    <branch/>
+    <branch revision="gnome-3-20"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gl"/>
@@ -363,6 +415,14 @@
     </after>
   </autotools>
 
+  <autotools id="gnome-shell-extensions" autogenargs="--enable-extensions=classic-mode">
+    <branch/>
+    <dependencies>
+      <dep package="gnome-shell"/>
+      <dep package="gnome-menus"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-themes-standard">
     <branch/>
     <dependencies>
@@ -374,6 +434,31 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-user-docs">
+    <branch/>
+    <dependencies>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-user-share">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-bluetooth"/>
+    </if>
+    <branch/>
+    <dependencies>
+      <dep package="avahi"/>
+      <dep package="gtk+"/>
+      <dep package="dbus-glib"/>
+      <dep package="libcanberra"/>
+      <dep package="libnotify"/>
+      <dep package="nautilus"/>
+      <if condition-set="linux">
+        <dep package="gnome-bluetooth"/>
+      </if>
+    </dependencies>
+  </autotools>
+
   <autotools id="gsettings-desktop-schemas" autogenargs="--enable-introspection=yes">
     <branch/>
     <dependencies>
@@ -408,21 +493,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="glib-networking" autogenargs="--enable-installed-tests">
-    <if condition-set="freebsd">
-      <autogenargs value="--with-ca-certificates=/usr/local/share/certs/ca-root-nss.crt"/>
-    </if>
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="intltool"/>
-      <dep package="libproxy"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="gnutls"/>
-      <dep package="p11-kit"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="mousetweaks">
     <branch/>
     <dependencies>
@@ -472,6 +542,26 @@
     </dependencies>
   </autotools>
 
+  <autotools id="network-manager-applet"
+             autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="dbus-glib"/>
+      <dep package="gnome-bluetooth"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="gudev"/>
+      <dep package="iso-codes"/>
+      <dep package="libsecret"/>
+      <dep package="NetworkManager"/>
+      <dep package="libnotify"/>
+    </dependencies>
+    <suggests>
+      <dep package="mobile-broadband-provider-info"/>
+    </suggests>
+  </autotools>
+
   <autotools id="pulseaudio"
              autogenargs="--disable-hal --disable-oss-output --disable-esound --disable-gconf --disable-gtk3 
--enable-bluez5">
     <if condition-unset="linux">
@@ -502,8 +592,22 @@
     </dependencies>
   </autotools>
 
+  <autotools id="rygel">
+    <branch revision="rygel-0-30"/>
+    <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="libmediaart"/>
+    </dependencies>
+  </autotools>
+
   <!-- mc 5.16 doesn't build against upower 1.0 -->
-  <autotools id="telepathy-mission-control" autogenargs="--disable-Werror --disable-upower">
+  <autotools id="telepathy-mission-control" autogenargs="--disable-upower">
     <branch repo="telepathy.freedesktop.org" revision="telepathy-mission-control-5.16"/>
     <dependencies>
       <dep package="dbus"/>
@@ -518,6 +622,27 @@
     </dependencies>
   </autotools>
 
+  <autotools id="vino">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libsoup"/>
+    </dependencies>
+    <suggests>
+      <dep package="avahi"/>
+      <dep package="gnutls"/>
+      <dep package="libgcrypt"/>
+      <dep package="libnotify"/>
+      <dep package="libsecret"/>
+      <dep package="telepathy-glib"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+      </if>
+    </suggests>
+  </autotools>
+
 
 <!-- Core Utilities -->
 
@@ -532,47 +657,28 @@
     </dependencies>
   </autotools>
 
-  <autotools id="empathy" autogenargs="--disable-Werror">
+  <autotools id="cheese">
     <branch/>
     <dependencies>
-      <dep package="clutter"/>
-      <dep package="clutter-gst"/>
-      <dep package="clutter-gtk"/>
-      <dep package="dbus-glib"/>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
-      <dep package="farstream"/>
-      <dep package="folks"/>
-      <dep package="gcr"/>
       <dep package="glib"/>
-      <dep package="libgee"/>
-      <dep package="libsecret"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="gnutls"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="gstreamer"/>
       <dep package="gtk+"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-bad"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-good"/>
+      <dep package="clutter-gst3"/>
+      <dep package="clutter-gtk"/>
       <dep package="libcanberra"/>
-      <dep package="libsoup"/>
-      <dep package="libxml2"/>
-      <dep package="pulseaudio"/>
-      <dep package="telepathy-farstream"/>
-      <dep package="telepathy-glib"/>
-      <dep package="telepathy-logger"/>
-      <dep package="telepathy-mission-control"/>
-      <dep package="libnotify"/>
-      <dep package="WebKit1"/>
-    </dependencies>
-    <suggests>
-      <dep package="enchant"/>
-      <dep package="geoclue"/>
-      <dep package="geocode-glib"/>
-      <dep package="iso-codes"/>
-      <dep package="libchamplain"/>
+      <dep package="vala"/>
+      <dep package="gnome-video-effects"/>
+      <dep package="librsvg"/>
+      <dep package="gnome-desktop"/>
       <if condition-set="linux">
-        <dep package="NetworkManager"/>
         <dep package="gudev"/>
       </if>
-    </suggests>
+    </dependencies>
   </autotools>
 
   <autotools id="eog">
@@ -613,15 +719,10 @@
       <dep package="avahi"/>
       <dep package="gnome-desktop"/>
       <dep package="libwnck"/>
+      <dep package="libnotify"/>
       <dep package="libsecret"/>
       <dep package="libsoup"/>
     </dependencies>
-    <suggests>
-      <dep package="enchant"/>
-      <dep package="libnotify"/>
-      <dep package="libcanberra"/>
-      <dep package="nss"/>
-    </suggests>
   </autotools>
 
   <autotools id="evince" autogenargs="--enable-introspection"
@@ -644,6 +745,33 @@
     </suggests>
   </autotools>
 
+  <autotools id="file-roller">
+    <branch/>
+    <dependencies>
+      <dep package="file"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="intltool"/>
+      <dep package="nautilus"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gedit">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="libpeas"/>
+      <dep package="yelp-tools"/>
+      <dep package="gtksourceview"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="python3-devel"/>
+    </dependencies>
+    <suggests>
+      <dep package="gspell"/>
+    </suggests>
+  </autotools>
+
   <autotools id="gnome-calculator" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
@@ -651,6 +779,7 @@
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="gtksourceview"/>
+      <dep package="libsoup"/>
       <dep package="libxml2"/>
       <dep package="m4-common"/>
       <dep package="mpfr"/>
@@ -659,6 +788,29 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-characters">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="gjs"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-clocks">
+    <branch/>
+    <dependencies>
+      <dep package="vala"/>
+      <dep package="gtk+"/>
+      <dep package="gsound"/>
+      <dep package="gnome-desktop"/>
+      <dep package="libgweather"/>
+      <dep package="geoclue"/>
+      <dep package="geocode-glib"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-contacts">
     <branch/>
     <dependencies>
@@ -678,16 +830,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-dictionary">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-disk-utility">
     <branch/>
     <dependencies>
@@ -704,6 +846,25 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-documents">
+    <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="WebKit"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-font-viewer">
     <branch/>
     <dependencies>
@@ -714,22 +875,89 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-screenshot">
+  <autotools id="gnome-initial-setup">
+    <branch/>
+    <dependencies>
+      <dep package="accountsservice"/>
+      <dep package="geoclue"/>
+      <dep package="gdm"/>
+      <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="WebKit"/>
+      <if condition-set="linux">
+        <dep package="network-manager-applet"/>
+        <dep package="NetworkManager"/>
+      </if>
+    </dependencies>
+    <suggests>
+      <dep package="upower"/>
+      <dep package="gnome-getting-started-docs"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gnome-logs">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="gtk+"/>
+      <dep package="libsystemd-journal"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-maps">
+    <branch/>
+    <dependencies>
+      <dep package="clutter-gtk"/>
+      <dep package="gjs"/>
       <dep package="glib"/>
+      <dep package="glib-networking"/>
+      <dep package="gobject-introspection"/>
       <dep package="gtk+"/>
+      <dep package="gnome-desktop"/>
+      <dep package="libchamplain"/>
+      <dep package="geocode-glib"/>
+      <dep package="geoclue"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="libgfbgraph"/>
+      <dep package="gnome-themes-standard"/>
+      <dep package="folks"/>
+      <dep package="libgee"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-system-log">
+  <autotools id="gnome-screenshot">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-software">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="glib"/>
+      <dep package="gnome-desktop"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="gtk+"/>
+      <dep package="libsoup"/>
+      <dep package="PackageKit"/>
+      <dep package="sqlite3"/>
+      <dep package="gtkspell-3"/>
+      <if condition-set="linux">
+        <dep package="fwupd"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -748,7 +976,8 @@
   </autotools>
 
   <autotools id="gnome-terminal" autogenargs="--disable-migration">
-    <branch/>
+    <!-- https://bugzilla.gnome.org/show_bug.cgi?id=762780 -->
+    <branch revision="gnome-3-18"/>
     <dependencies>
       <dep package="dconf"/>
       <dep package="intltool"/>
@@ -766,24 +995,38 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-user-docs">
-    <branch/>
-    <dependencies>
-      <dep package="yelp-tools"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gucharmap">
+  <autotools id="gnome-weather">
+    <if condition-set="coverage">
+      <autogenargs value="--enable-coverage"/>
+    </if>
+    <if condition-unset="dogtail">
+      <autogenargs value="--disable-dogtail"/>
+    </if>
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
+      <dep package="m4-common"/>
+      <dep package="appstream-glib"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="geoclue"/>
       <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <dep package="gtk+"/>
-      <dep package="yelp-tools"/>
+      <dep package="intltool"/>
+      <dep package="libgweather"/>
+      <dep package="gjs"/>
+      <if condition-set="coverage">
+        <dep package="lcov"/>
+      </if>
+      <if condition-set="dogtail">
+        <dep package="dogtail"/>
+      </if>
     </dependencies>
   </autotools>
 
   <autotools id="nautilus">
+    <if condition-unset="linux">
+      <autogenargs value="--disable-selinux"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="intltool"/>
@@ -799,6 +1042,22 @@
     </dependencies>
   </autotools>
 
+  <autotools id="orca">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="at-spi2-atk"/> <!-- to make Orca's gui accessible -->
+      <dep package="gobject-introspection"/>
+      <dep package="intltool"/>
+      <dep package="pyatspi2"/>
+      <dep package="pygobject"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+    <suggests>
+      <dep package="speech-dispatcher"/>
+    </suggests>
+  </autotools>
+
   <autotools id="sushi">
     <branch/>
     <dependencies>
@@ -809,7 +1068,7 @@
       <dep package="evince"/>
       <dep package="clutter"/>
       <dep package="clutter-gtk"/>
-      <dep package="clutter-gst"/>
+      <dep package="clutter-gst3"/>
       <dep package="gtksourceview"/>
       <dep package="WebKit"/>
       <dep package="gstreamer"/>
@@ -843,9 +1102,6 @@
       <dep package="totem-pl-parser"/>
       <dep package="yelp-tools"/>
     </dependencies>
-    <suggests>
-      <dep package="zeitgeist"/>
-    </suggests>
   </autotools>
 
   <autotools id="yelp">
@@ -865,55 +1121,6 @@
     </dependencies>
   </autotools>
 
-<!-- Core Extras -->
-
-  <autotools id="gnome-backgrounds">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-user-share">
-    <if condition-unset="linux">
-      <autogenargs value="--disable-bluetooth"/>
-    </if>
-    <branch/>
-    <dependencies>
-      <dep package="avahi"/>
-      <dep package="gtk+"/>
-      <dep package="dbus-glib"/>
-      <dep package="libcanberra"/>
-      <dep package="libnotify"/>
-      <dep package="nautilus"/>
-      <if condition-set="linux">
-        <dep package="gnome-bluetooth"/>
-      </if>
-    </dependencies>
-  </autotools>
-
-  <autotools id="vino">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libsoup"/>
-    </dependencies>
-    <suggests>
-      <dep package="avahi"/>
-      <dep package="gnutls"/>
-      <dep package="libgcrypt"/>
-      <dep package="libnotify"/>
-      <dep package="libsecret"/>
-      <dep package="telepathy-glib"/>
-      <if condition-set="linux">
-        <dep package="NetworkManager"/>
-      </if>
-    </suggests>
-  </autotools>
-
 
 <!-- Core OS Services -->
 
@@ -940,43 +1147,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="ConsoleKit">
-    <branch repo="git.freedesktop.org" module="ConsoleKit"/>
-    <dependencies>
-      <dep package="dbus-glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gdm" autogenargs="--with-systemdsystemunitdir=no --with-log-dir=${prefix}/var/log/gdm">
-    <if condition-unset="linux">
-      <autogenargs value="--without-plymouth"/>
-    </if>
-    <branch/>
-    <dependencies>
-      <dep package="accountsservice"/>
-      <dep package="dbus-glib"/>
-      <dep package="fontconfig"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="intltool"/>
-      <dep package="libcanberra"/>
-      <dep package="nss"/>
-      <dep package="pam"/>
-      <if condition-set="linux">
-        <dep package="plymouth"/>
-      </if>
-      <if condition-set="systemd">
-        <dep package="libsystemd-daemon"/>
-        <dep package="libsystemd-login"/>
-        <dep package="libsystemd-journal"/>
-      </if>
-    </dependencies>
-    <suggests>
-      <dep package="upower"/>
-      <dep package="yelp-tools"/>
-    </suggests>
-  </autotools>
-
   <autotools id="NetworkManager"
              autogenargs="--with-udev-dir=${libdir}/udev --with-systemdsystemunitdir=no --with-crypto=gnutls 
--disable-wimax --disable-more-warnings">
     <branch repo="git.freedesktop.org"
@@ -1066,13 +1236,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-shell-extensions" autogenargs="--enable-extensions=classic-mode">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-shell"/>
-      <dep package="gnome-menus"/>
-    </dependencies>
-  </autotools>
 
 <!-- Meta Modules -->
 
@@ -1082,19 +1245,24 @@
   <metamodule id="meta-gnome-core-utilities">
     <dependencies>
       <dep package="baobab"/>
-      <dep package="empathy"/>
-      <dep package="epiphany"/>
+      <dep package="cheese"/>
       <dep package="eog"/>
+      <dep package="epiphany"/>
       <dep package="evince"/>
+      <dep package="file-roller"/>
+      <dep package="gedit"/>
       <dep package="gnome-calculator"/>
+      <dep package="gnome-characters"/>
+      <dep package="gnome-clocks"/>
       <dep package="gnome-contacts"/>
-      <dep package="gnome-dictionary"/>
       <dep package="gnome-font-viewer"/>
+      <dep package="gnome-logs"/>
+      <dep package="gnome-maps"/>
       <dep package="gnome-screenshot"/>
-      <dep package="gnome-system-log"/>
+      <dep package="gnome-software"/>
       <dep package="gnome-system-monitor"/>
       <dep package="gnome-terminal"/>
-      <dep package="gucharmap"/>
+      <dep package="gnome-weather"/>
       <dep package="nautilus"/>
       <dep package="sushi"/>
       <dep package="totem"/>
@@ -1107,37 +1275,40 @@
   </metamodule>
 
   <!-- The Core GNOME UX Shell: Only integrated session services,
-       data, and core UI allowed
+       data, and core UI allowed.
   -->
   <metamodule id="meta-gnome-core-shell">
     <dependencies>
+      <dep package="adwaita-icon-theme"/>
       <dep package="dconf"/>
       <dep package="evolution-data-server"/>
+      <dep package="gdm"/>
+      <dep package="gnome-backgrounds"/>
+      <!-- Not in utilities because the desktop file is hidden -->
+      <dep package="gnome-color-manager"/>
       <dep package="gnome-control-center"/>
-      <dep package="adwaita-icon-theme"/>
+      <dep package="gnome-documents"/>
+      <dep package="gnome-getting-started-docs"/>
+      <dep package="gnome-initial-setup"/>
       <dep package="gnome-keyring"/>
       <dep package="gnome-online-accounts"/>
-      <dep package="gnome-packagekit"/>
       <dep package="gnome-session"/>
       <dep package="gnome-settings-daemon"/>
       <dep package="gnome-shell"/>
+      <dep package="gnome-shell-extensions"/>
       <dep package="gnome-themes-standard"/>
+      <dep package="gnome-user-docs"/>
+      <dep package="gnome-user-share"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gvfs"/>
       <dep package="glib-networking"/>
       <dep package="mousetweaks"/>
       <dep package="mutter"/>
+      <dep package="orca"/>
       <dep package="pulseaudio"/>
+      <dep package="rygel"/>
       <dep package="telepathy-mission-control"/>
-    </dependencies>
-  </metamodule>
-
-  <metamodule id="meta-gnome-core-extras">
-    <dependencies>
-      <dep package="gnome-backgrounds"/>
-      <dep package="gnome-user-share"/>
       <dep package="vino"/>
-      <dep package="gnome-user-docs"/>
     </dependencies>
   </metamodule>
 
@@ -1149,12 +1320,10 @@
       <dep package="accountsservice"/>
       <dep package="avahi"/>
       <dep package="bluez"/>
-      <dep package="ConsoleKit"/>
+      <dep package="cups"/>
       <dep package="dbus"/>
-      <dep package="gdm"/>
       <dep package="PackageKit"/>
       <dep package="upower"/>
-      <dep package="cups"/>
       <!-- <dep package="systemd"/> -->
       <!-- <dep package="xorg-x11-server"/> -->
       <!-- <dep package="plymouth"/> -->
@@ -1170,9 +1339,7 @@
   <metamodule id="meta-gnome-core">
     <dependencies>
       <dep package="meta-gnome-core-shell"/>
-      <dep package="meta-gnome-core-extras"/>
       <dep package="meta-gnome-core-utilities"/>
-      <dep package="gnome-shell-extensions"/>
     </dependencies>
   </metamodule>
 
diff --git a/gnome-sysdeps.modules b/gnome-sysdeps.modules
index fc4475b..17734a0 100644
--- a/gnome-sysdeps.modules
+++ b/gnome-sysdeps.modules
@@ -21,6 +21,13 @@
             version="9100h"/>
   </systemmodule>
 
+  <systemmodule id="argyll">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="spotread"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="avahi">
     <pkg-config>avahi-gobject.pc</pkg-config>
     <branch repo="system"
@@ -70,7 +77,23 @@
   <systemmodule id="clang">
     <branch repo="system"/>
     <systemdependencies>
-      <dep type="path" name="llvm-config"/>
+      <dep type="path" name="llvm-config">
+        <!-- Debian -->
+        <altdep type="path" name="llvm-config-3.9"/>
+        <altdep type="path" name="llvm-config-3.8"/>
+        <altdep type="path" name="llvm-config-3.7"/>
+        <altdep type="path" name="llvm-config-3.6"/>
+        <altdep type="path" name="llvm-config-3.5"/>
+        <altdep type="path" name="llvm-config-3.4"/>
+        <!-- FreeBSD -->
+        <altdep type="path" name="llvm-config39"/>
+        <altdep type="path" name="llvm-config38"/>
+        <altdep type="path" name="llvm-config37"/>
+        <altdep type="path" name="llvm-config36"/>
+        <altdep type="path" name="llvm-config35"/>
+        <altdep type="path" name="llvm-config34"/>
+        <altdep type="path" name="llvm-config-devel"/>
+      </dep>
     </systemdependencies>
   </systemmodule>
 
@@ -116,6 +139,22 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="docbook-utils">
+    <branch repo="system"
+            version="0.6.14"/>
+    <systemdependencies>
+      <dep type="path"
+           name="docbook2man"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="docbook-xml">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="xml" name="-//OASIS//DTD DocBook XML V4.3//EN"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="docbook-xsl">
     <branch repo="system"/>
     <systemdependencies>
@@ -228,7 +267,7 @@
   </systemmodule>
 
   <systemmodule id="gettext">
-    <branch repo="system" version="0.16"/>
+    <branch repo="system" version="0.19"/>
     <systemdependencies>
       <dep type="c_include" name="gettext-po.h"/>
     </systemdependencies>
@@ -402,6 +441,12 @@
             version="0.1.0"/>
   </systemmodule>
 
+  <systemmodule id="libical">
+    <pkg-config>libical.pc</pkg-config>
+    <branch repo="system"
+            version="1.0"/>
+  </systemmodule>
+
   <systemmodule id="libmusicbrainz">
     <pkg-config>libmusicbrainz5.pc</pkg-config>
     <branch repo="system"
@@ -552,6 +597,11 @@
     <branch repo="system" version="3.0.0"/>
   </systemmodule>
 
+  <systemmodule id="libpcre">
+    <pkg-config>libpcre.pc</pkg-config>
+    <branch repo="system" version="8.31"/>
+  </systemmodule>
+
   <systemmodule id="libgcrypt">
     <branch repo="system"
             version="1.5.0"/>
@@ -571,6 +621,13 @@
     <branch repo="system" version="4"/>
   </systemmodule>
 
+  <systemmodule id="libjasper">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="jasper/jasper.h"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="libjpeg">
     <branch repo="system"/>
     <systemdependencies>
@@ -700,7 +757,13 @@
 
   <systemmodule id="libusb1">
     <pkg-config>libusb-1.0.pc</pkg-config>
-    <branch repo="system"/>
+    <branch repo="system" version="1.0.19"/>
+  </systemmodule>
+
+  <!-- This system module is used to Keep compatibility with FreeBSD -->
+  <systemmodule id="libusb1-1.0.9">
+    <pkg-config>libusb-1.0.pc</pkg-config>
+    <branch repo="system" version="1.0.9"/>
   </systemmodule>
 
   <systemmodule id="libuuid">
@@ -769,7 +832,23 @@
   <systemmodule id="llvm">
     <branch repo="system"/>
     <systemdependencies>
-      <dep type="c_include" name="llvm-c/Core.h"/>
+      <dep type="c_include" name="llvm-c/Core.h">
+        <!-- Debian -->
+        <altdep type="c_include" name="llvm-c-3.9/llvm-c/Core.h"/>
+        <altdep type="c_include" name="llvm-c-3.8/llvm-c/Core.h"/>
+        <altdep type="c_include" name="llvm-c-3.7/llvm-c/Core.h"/>
+        <altdep type="c_include" name="llvm-c-3.6/llvm-c/Core.h"/>
+        <altdep type="c_include" name="llvm-c-3.5/llvm-c/Core.h"/>
+        <altdep type="c_include" name="llvm-c-3.4/llvm-c/Core.h"/>
+        <!-- FreeBSD -->
+        <altdep type="c_include" name="../llvm39/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm38/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm37/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm36/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm35/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm34/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm-devel/include/llvm-c/Core.h"/>
+      </dep>
     </systemdependencies>
   </systemmodule>
 
@@ -890,7 +969,7 @@
             version="2.7"/>
   </systemmodule>
 
-  <systemmodule id="python-devel">
+  <systemmodule id="python3-devel">
     <pkg-config>python3.pc</pkg-config>
     <branch repo="system"
             version="3.2"/>


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