[gnome-modulesets/gnome-3-8] resync with current 3.8 modulesets



commit f44e315ba86f912351fabe6cb365b6b48b608e8a
Author: Javier Jardón <javier jardon codethink co uk>
Date:   Wed Apr 2 12:03:32 2014 +0100

    resync with current 3.8 modulesets

 gnome-apps.modules      |  997 +++++++++++++--------------------------------
 gnome-core-deps.modules |  587 ++++++++++++++-------------
 gnome-core.modules      |  350 ++++++----------
 gnome-sysdeps.modules   |  409 ++++++++++++++++++-
 gnome-world.modules     | 1043 ++++++++++++++++++++++++++++++++++++++++++-----
 5 files changed, 2044 insertions(+), 1342 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index 71ad371..7438c35 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -7,62 +7,36 @@
 <!-- git repos -->
   <repository type="git" name="git.gnome.org" default="yes"
       href="git://git.gnome.org/"/>
-  <repository type="svn" name="svn.abisource.com"
-      href="http://svn.abisource.com/"/>
   <repository type="git" name="git.freedesktop.org"
       href="git://anongit.freedesktop.org/git/"/>
-  <repository type="git" name="gstreamer.freedesktop.org"
-      href="git://anongit.freedesktop.org/gstreamer/"/>
-  <repository type="bzr" name="launchpad.net"
-      href="lp:"/>
   <repository type="git" name="github.com"
       href="git://github.com/"/>
-  <repository type="git" name="yorba.org"
-      href="git://yorba.org/"/>
   <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="colord.gitorious.org"
-      href="git://gitorious.org/colord/"/>
-  <repository type="svn" name="opalvoip.sf.net"
-      href="https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/"/>
 
 <!-- tarball repos -->
-  <repository type="tarball" name="cairo.org"
-    href="http://cairographics.org/"/>
   <repository type="tarball" name="gnome.org"
     href="http://download.gnome.org/sources/"/>
-  <repository type="tarball" name="mono.net"
-    href="http://download.mono-project.com/sources/"/>
-  <repository type="tarball" name="launchpad.net/tarball"
-      href="https://launchpad.net/"/>
-  <repository type="tarball" name="monogithub"
-    href="https://github.com/downloads/mono/dbus-sharp/"/>
-  <repository type="tarball" name="github.com/metabrainz"
-      href="https://github.com/downloads/metabrainz/"/>
   <repository type="tarball" name="spice"
       href="http://www.spice-space.org/download/"/>
   <repository type="tarball" name="libvirt.org"
       href="http://libvirt.org/sources/"/>
-  <repository type="tarball" name="downloads.sourceforge.net"
-      href="http://downloads.sourceforge.net/"/>
   <repository type="tarball" name="xiph.org"
         href="http://downloads.xiph.org/releases/"/>
   <repository type="tarball" name="ftp.gnu.org"
       href="http://ftp.gnu.org/gnu/"/>
+  <repository type="tarball" name="speech-dispatcher"
+      href="http://devel.freebsoft.org/pub/projects/speechd/"/>
 
-  <include href="gnome-core.modules"/>
+  <include href="gnome-suites-core-3.8.modules"/>
 
-  <!-- NOTE: gnome-core and gnome-core-deps
+  <!-- NOTE: gnome-suites-core-3.8 and gnome-suites-core-deps-3.8
        are supposed to remain self-contained. If apps have dependencies
        that are not covered there, add them in here
     -->
 
-  <autotools id="babl">
-    <branch/>
-  </autotools>
-
   <autotools id="celt">
     <branch repo="xiph.org"
             module="celt/celt-0.5.1.3.tar.gz"
@@ -73,21 +47,11 @@
     </dependencies>
   </autotools>
 
-  <autotools id="colord-gtk">
-    <branch repo="colord.gitorious.org" checkoutdir="colord-gtk" module="colord-gtk.git"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="colord"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="libvirt" autogenargs="--with-yajl">
     <branch repo="libvirt.org"
-            module="libvirt-0.10.2.tar.gz"
-            version="0.10.2"
-            hash="sha256:1fe69ae1268a097cc0cf83563883b51780d528c6493efe3e7d94c4160cc46977">
+            module="libvirt-1.0.3.tar.gz"
+            version="1.0.3"
+            hash="sha256:f64f4acd7cdcfc6ab5e803195ed58b949f262b54e3659d8c37b33f0fec112757">
     </branch>
     <dependencies>
       <dep package="device-mapper"/>
@@ -96,50 +60,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="librsync">
-    <branch repo="downloads.sourceforge.net"
-            module="librsync/librsync-0.9.7.tar.gz"
-            version="0.9.7"
-            hash="sha256:6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6"
-            size="453802"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
-
-  <distutils id="duplicity">
-    <branch repo="launchpad.net/tarball"
-            module="duplicity/0.6-series/0.6.15/+download/duplicity-0.6.15.tar.gz"
-            version="0.6.15"
-            hash="sha256:69f30388334b84db43ed4eb7838896a73cf53d62718c692a88ab3d3963e1dfad"
-            size="304916"/>
-    <dependencies>
-      <dep package="pygobject2"/>
-      <dep package="librsync"/>
-    </dependencies>
-  </distutils>
-
-  <!-- Other useful deps that you can install are:  -->
-  <!--   libjpeg                                    -->
-  <!--   libpng                                     -->
-  <!--   OpenEXR (see http://www.openexr.com/)      -->
-  <!--   libsdl                                     -->
-  <!--   enscript                                   -->
-  <!--   libavcodec                                 -->
-  <!-- Those are not managed by jhbuild             -->
-  <autotools id="gegl">
-    <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="ghex">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
@@ -148,78 +70,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-applets" autogenargs="--without-hal --enable-mixer-applet --enable-mini-commander">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gnome-panel"/>
-      <dep package="libgtop"/>
-      <dep package="libgnomekbd"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
-      <dep package="gucharmap"/>
-      <dep package="libgweather"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gtk+"/>
-      <dep package="glib"/>
-      <dep package="gconf"/>
-      <dep package="libxklavier" />
-      <dep package="libwnck"/>
-      <dep package="libnotify"/>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-      <dep package="pygobject2"/>
-      <dep package="gnome-icon-theme"/>
-      <dep package="libxml2"/>
-      <dep package="polkit"/>
-      <dep package="NetworkManager"/>
-    </dependencies>
-    <after>
-      <dep package="gnome-control-center"/>
-    </after>
-  </autotools>
-
-  <autotools id="gnome-search-tool">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="goffice">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libgsf"/>
-      <dep package="libxml2"/>
-      <dep package="pango"/>
-      <dep package="librsvg"/>
-      <dep package="cairo"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gst-plugins-good-0.10" autogenargs="--with-gtk=3.0 --disable-tests --disable-examples" 
makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS=" 
supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-good" revision="0.10"/>
-    <dependencies>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
-      <dep package="flac"/>
-      <dep package="libv4l"/>
-      <dep package="libvpx"/>
-      <dep package="taglib"/>
-      <dep package="wavpack"/>
-    </dependencies>
-    <suggests>
-      <dep package="pulseaudio"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gudev"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gtkhtml">
     <branch/>
     <dependencies>
@@ -232,15 +82,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-sharp" autogen-sh="bootstrap-2.12">
-    <branch repo="github.com" module="mono/gtk-sharp.git" checkoutdir="gtk-sharp"
-            revision="gtk-sharp-2-12-branch"/>
-    <dependencies>
-      <dep package="mono"/>
-      <dep package="gtk+-2"/>
-    </dependencies>
-  </autotools>
-
  <autotools id="gtksourceviewmm">
     <branch/>
     <dependencies>
@@ -264,10 +105,10 @@
   <autotools id="guile">
     <pkg-config>guile-2.0.pc</pkg-config>
     <branch repo="ftp.gnu.org"
-            module="guile/guile-2.0.3.tar.xz"
-            version="2.0.3"
-            hash="sha256:d2ebcd78dc587080b96d9120053a57d8e2d22c3d54a444dff06513d5fba53093"
-            size="4196064"/>
+            module="guile/guile-2.0.7.tar.xz"
+            version="2.0.7"
+            hash="sha256:6f278fa699685382ae51ba8bfad5840959e0af6414f3ad803d61131567bfa338"
+            size="4396724"/>
     <dependencies>
       <dep package="libunistring"/>
       <dep package="gc"/>
@@ -275,7 +116,7 @@
   </autotools>
 
   <autotools id="gupnp-av">
-    <branch revision="gupnp-av-0-10" />
+    <branch />
     <dependencies>
       <dep package="glib"/>
       <dep package="gupnp"/>
@@ -290,25 +131,11 @@
     <dependencies>
       <dep package="libxml2"/>
       <dep package="glib"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
-    </dependencies>
-    <suggests>
-      <dep package="gst-plugins-good-0.10"/>
-    </suggests>
- </autotools>
-
-  <autotools id="gupnp-vala">
-    <branch />
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gssdp"/>
-      <dep package="gupnp"/>
-      <dep package="gupnp-av"/>
-      <dep package="gupnp-dlna"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
     </dependencies>
     <suggests>
-      <dep package="gobject-introspection"/>
+      <dep package="gst-plugins-good"/>
     </suggests>
  </autotools>
 
@@ -322,19 +149,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgdiplus">
-    <branch module="libgdiplus/libgdiplus-1.2.6.tar.bz2" version="1.2.6"
-            repo="mono.net"
-            hash="sha256:5eb1a7a8d3b75c751eac6075239469059238082aee1963bc6a172b3073046cfe"
-            size="2897855">
-    </branch>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="libosinfo"
              autogenargs="--enable-tests=no --enable-werror=no">
     <branch repo="fedorahosted.org" module="libosinfo.git"/>
@@ -356,14 +170,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libxml++">
-    <branch/>
-    <dependencies>
-      <dep package="libxml2"/>
-      <dep package="glibmm"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="mash">
     <branch repo="github.com" module="clutter-project/mash.git"/>
     <dependencies>
@@ -371,75 +177,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="mono">
-    <branch module="mono/mono-2.6.7.tar.bz2" version="2.6.7"
-            repo="mono.net"
-            hash="sha256:ae21a997d72e2fb8ea88644c87ab52471e9c97117b937e205ea1835b5a028ce4"
-            size="27921963"/>
-    <dependencies>
-      <dep package="libgdiplus"/>
-      <dep package="sqlite3"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="mono-addins">
-    <branch module="mono-addins/mono-addins-0.4.tar.bz2" version="0.4"
-            repo="mono.net"
-            hash="sha256:d0fa0eec4e95c8cdfefc8961d7666d6137064df1b599a6489acf17e22fbc3e2e"
-            size="304402"/>
-    <dependencies>
-      <dep package="mono"/>
-      <dep package="gtk-sharp"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="dbus-sharp">
-    <branch repo="monogithub" module="dbus-sharp-0.7.0.tar.gz" version="0.7.0"
-            hash="sha256:92529aef9063f477d1975947c6388c63d03234018f45d007c07716dd3e21dd41"
-            size="127651">
-      <patch file="dbus-sharp-0.7.0-pkgconfig.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="mono"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="dbus-sharp-glib">
-    <branch repo="monogithub"
-            module="dbus-sharp-glib-0.5.0.tar.gz"
-            version="0.5.0"
-            hash="256:f4fd663957f06ac5f0322beab264c5498bf6408f7435d0387950b4cb7996180e"
-            size="95405"/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-sharp">
-    <branch repo="gnome.org"
-            module="gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2"
-            version="2.24.2"
-            hash="sha256:122b1e03966d63ec3389decf5440fb94285907d1b6be48352dcf6aca292cf7b0"
-            size="421281"/>
-    <dependencies>
-      <dep package="mono"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="opal" autogenargs="--disable-vpb">
-    <branch repo="opalvoip.sf.net" module="opal/branches/v3_10"/>
-    <dependencies>
-      <dep package="ptlib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="ptlib">
-    <branch repo="opalvoip.sf.net" module="ptlib/branches/v2_10"/>
-  </autotools>
-
-  <autotools id="pyatspi2">
-    <branch/>
+  <autotools id="pyatspi2" autogenargs="--with-python=python3" >
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="pygobject"/>
     </dependencies>
@@ -448,15 +187,13 @@
     </suggests>
   </autotools>
 
-  <autotools id="pygobject2" autogenargs="--disable-introspection">
-    <pkg-config>pygobject-2.0.pc</pkg-config>
-    <branch repo="gnome.org"
-            module="pygobject/2.28/pygobject-2.28.6.tar.bz2"
-            version="2.28.6"
-            hash="sha256:e4bfe017fa845940184c82a4d8949db3414cb29dfc84815fb763697dc85bdcee"
-            size="888240"/>
+  <autotools id="speech-dispatcher" autogenargs="--with-espeak">
+    <branch repo="speech-dispatcher" module="speech-dispatcher-0.8-beta1.tar.gz" version="0.8-beta1"
+            hash="sha256:eb60069f291008717c429aff210afe6075c24b68b8de75fe16d9298e85cbac5c"
+            size="1229374"/>
     <dependencies>
-      <dep package="glib"/>
+      <dep package="dotconf"/>
+      <dep package="espeak"/>
     </dependencies>
   </autotools>
 
@@ -472,10 +209,10 @@
 
   <autotools id="spice-server" autogenargs="--disable-smartcard --without-sasl --disable-client">
     <branch repo="spice"
-            module="releases/spice-0.10.1.tar.bz2"
-            version="0.10.1"
-            hash="sha256:13dfe2e80984a836f85a1da4e1a4da3707123f15a507e8c0df1f4268a02bb780"
-            size="1237043"/>
+            module="releases/spice-0.12.2.tar.bz2"
+            version="0.12.2"
+            hash="sha256:5654fac02f5568088ea01979088d539f4e95551568dd709ec197e965cf8612d5"
+            size="1685684"/>
     <dependencies>
       <dep package="spice-protocol"/>
       <dep package="celt"/>
@@ -484,10 +221,10 @@
 
   <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala">
     <branch repo="spice"
-            module="gtk/spice-gtk-0.14.tar.bz2"
-            version="0.14"
-            hash="sha256:a16fa27364541493b886cc943f72c8f96ec251083af0a29d405a2c4f490274f5"
-            size="1204821">
+            module="gtk/spice-gtk-0.18.tar.bz2"
+            version="0.18"
+            hash="sha256:decc954ad3af5894d49b772d7b291620cfea19651fcd2f6c9bf76340428719f3"
+            size="1220594">
     </branch>
     <dependencies>
       <dep package="celt"/>
@@ -498,34 +235,8 @@
     </dependencies>
   </autotools>
 
-  <repository type="tarball" name="taglib-sharp"
-      href="download.banshee.fm/"/>
-
-  <autotools id="taglib-sharp" autogenargs="--disable-docs">
-    <branch module="taglib-sharp/2.0.3.7/taglib-sharp-2.0.3.7.tar.gz" version="2.0.3.7"
-        repo="taglib-sharp"
-        hash="sha256:cf9515928bd25b37816cd78ef8a2e0f6d14ebabdafe344214b02034791e895fa"
-        size="2287272"/>
-    <dependencies>
-      <dep package="mono"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="wv">
-    <branch repo="downloads.sourceforge.net"
-            module="wvware/wv-1.2.4.tar.gz"
-            version="1.2.4"
-            hash="sha256:673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6"
-            size="629554"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libgsf"/>
-      <dep package="libxml2"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gdl">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
@@ -555,25 +266,8 @@
 
   <!-- Apps start here -->
 
-  <autotools id="abiword">
-    <branch repo="svn.abisource.com"/>
-    <dependencies>
-      <dep package="cairo"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libxml2"/>
-      <dep package="libgsf"/>
-      <dep package="wv"/>
-    </dependencies>
-    <suggests>
-      <dep package="enchant"/>
-      <dep package="goffice"/>
-      <dep package="gucharmap"/>
-    </suggests>
-  </autotools>
-
   <autotools id="accerciser">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="at-spi2-atk"/> <!-- to make accerciser's gui accessible -->
       <dep package="intltool"/>
@@ -581,98 +275,13 @@
       <dep package="pyatspi2"/>
       <dep package="yelp-tools"/>
       <dep package="gtk+"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="banshee" autogenargs="--disable-daap --disable-boo --disable-ipod --disable-mtp">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gconf"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
-      <dep package="gst-plugins-good-0.10"/>
-      <dep package="mono"/>
-      <dep package="gtk-sharp"/>
-      <dep package="taglib-sharp"/>
-      <dep package="mono-addins"/>
-      <dep package="dbus-sharp"/>
-      <dep package="dbus-sharp-glib"/>
-      <dep package="sqlite3"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="deja-dup">
-    <branch repo="launchpad.net"
-            module="deja-dup/26"
-            checkoutdir="deja-dup/"/>
-    <dependencies>
-      <dep package="duplicity"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libgnome-keyring"/>
-      <dep package="libnotify"/>
-      <dep package="vala"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-    <suggests>
-      <dep package="nautilus"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="f-spot">
-    <branch/>
-    <dependencies>
-      <dep package="gtk-sharp"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gthumb">
-    <branch/>
-    <dependencies>
-      <dep package="clutter"/>
-      <dep package="glib"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gtk+"/>
-      <dep package="libgnome-keyring"/>
-      <dep package="librsvg"/>
-      <dep package="libsoup"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gimp" autogenargs="--disable-print --without-gnomevfs">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+-2"/>
-      <dep package="intltool"/>
-      <dep package="gegl"/>
-    </dependencies>
-    <suggests>
-      <dep package="iso-codes"/>
-      <dep package="WebKit"/>
-      <dep package="librsvg"/>
-      <dep package="poppler"/>
-      <dep package="libgnome-keyring"/>
-      <dep package="dbus-glib"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="gnome-doc-utils" supports-parallel-builds="no">
-    <branch/>
-    <dependencies>
-      <dep package="gettext"/>
-      <dep package="gnome-common"/>
-      <dep package="libxslt"/>
-      <dep package="libxml2"/>
-      <dep package="intltool"/>
-      <dep package="rarian"/>
+      <dep package="py3cairo"/>
     </dependencies>
   </autotools>
 
   <autotools id="gnome-documents">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
-      <dep package="clutter-gtk"/>
       <dep package="evince"/>
       <dep package="gjs"/>
       <dep package="glib"/>
@@ -687,85 +296,17 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-media">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gconf"/>
-      <dep package="libcanberra"/>
-      <dep package="libxml2"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
-      <dep package="libgnome-media-profiles"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-tweak-tool">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="pygobject"/>
-      <dep package="gsettings-desktop-schemas"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnote">
-    <branch/>
-    <dependencies>
-      <dep package="glibmm"/>
-      <dep package="libxml2"/>
-      <dep package="libxml++"/>
-      <dep package="gtkmm"/>
-    </dependencies>
-    <suggests>
-      <dep package="libpanelappletmm"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="gnumeric">
-    <branch/>
-    <dependencies>
-      <dep package="goffice"/>
-      <dep package="gtk+"/>
-      <dep package="libgsf"/>
-      <dep package="libxml2"/>
-      <dep package="pygobject"/>
-      <dep package="pango"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="inkscape">
-    <branch repo="launchpad.net"
-            module="inkscape"
-            checkoutdir="inkscape/"/>
-    <dependencies>
-      <dep package="gtkmm"/>
-      <dep package="libxslt"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libgnome-media-profiles">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="gconf"/>
-      <dep package="gst-plugins-base-0.10"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="devhelp">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
-      <dep package="gconf"/>
       <dep package="WebKit"/>
     </dependencies>
   </autotools>
 
   <autotools id="glade">
-    <branch/>
+    <branch revision="glade-3-14"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gnome-common"/>
@@ -777,7 +318,7 @@
   </autotools>
 
   <autotools id="gnome-color-manager">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="exiv2"/>
       <dep package="glib"/>
@@ -800,62 +341,27 @@
   <autotools id="gnome-devel-docs">
     <branch/>
     <dependencies>
-      <dep package="gnome-doc-utils"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="rarian" supports-non-srcdir-builds="no">
-    <!-- Always build rarian due to some distributions providing rarian-compat
-                  package. (see https://bugzilla.gnome.org/show_bug.cgi?id=670917)
-         rarian can be sysdeps again when GNOME bug 671042 is fixed. -->
-    <!-- <pkg-config>rarian.pc</pkg-config> -->
-    <branch repo="gnome.org"
-            module="rarian/0.8/rarian-0.8.1.tar.bz2"
-            version="0.8.1"
-            hash="sha256:aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"
-            size="324441"/>
-    <dependencies>
-      <dep package="libxslt"/>
-      <dep package="intltool"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
   <autotools id="rygel">
-    <branch revision="rygel-0-16"/>
+    <branch revision="rygel-0-18"/>
     <dependencies>
       <dep package="vala"/>
-      <dep package="gupnp-vala"/>
       <dep package="gupnp"/>
       <dep package="gupnp-av"/>
       <dep package="gupnp-dlna"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="libgee-0.6"/>
+      <dep package="libgee"/>
       <dep package="tracker"/>
       <dep package="valadoc"/>
     </dependencies>
   </autotools>
 
-  <autotools id="simple-scan">
-    <branch repo="launchpad.net"
-            module="~simple-scan-team/simple-scan/trunk"
-            checkoutdir="simple-scan/"/>
-    <dependencies>
-      <dep package="cairo"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gudev"/>
-      <dep package="vala"/>
-    </dependencies>
-    <suggests>
-      <dep package="colord"/>
-    </suggests>
-  </autotools>
-
 <!-- Featured Apps -->
 
   <autotools id="anjuta">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -875,7 +381,7 @@
   </autotools>
 
   <autotools id="cheese">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -889,38 +395,16 @@
       <dep package="clutter-gtk"/>
       <dep package="libcanberra"/>
       <dep package="vala"/>
-      <dep package="libgee-0.6"/>
       <dep package="gnome-video-effects"/>
       <dep package="librsvg"/>
       <dep package="gnome-desktop"/>
     </dependencies>
   </autotools>
 
-  <autotools id="ekiga">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="gtk+-2"/>
-      <dep package="libxml2"/>
-      <dep package="libsigc++2"/>
-      <dep package="libXv"/>
-      <dep package="opal" />
-      <dep package="evolution-data-server"/>
-    </dependencies>
-    <suggests>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-      <dep package="avahi"/>
-      <dep package="libsoup"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
-    </suggests>
-  </autotools>
-
   <autotools id="evolution" autogenargs="--disable-pst-import">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
+      <dep package="bogofilter"/>
       <dep package="evolution-data-server"/>
       <dep package="gnome-desktop"/>
       <dep package="gnome-icon-theme"/>
@@ -928,6 +412,7 @@
       <dep package="gstreamer"/>
       <dep package="gtk+"/>
       <dep package="gtkhtml"/>
+      <dep package="highlight"/>
       <dep package="intltool"/>
       <dep package="libcanberra"/>
       <dep package="libgdata"/>
@@ -937,19 +422,17 @@
       <dep package="libxml2"/>
       <dep package="libnotify"/>
       <dep package="shared-mime-info"/>
+      <dep package="spamassassin"/>
       <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
       <dep package="geoclue"/>
       <dep package="geocode-glib"/>
     </suggests>
-    <after>
-      <dep package="mono"/>
-    </after>
   </autotools>
 
   <autotools id="file-roller">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="file"/>
       <dep package="glib"/>
@@ -961,13 +444,14 @@
   </autotools>
 
   <autotools id="gedit">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <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"/>
@@ -976,7 +460,7 @@
   </autotools>
 
   <autotools id="gnome-boxes" autogenargs="--enable-vala">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -989,130 +473,256 @@
       <dep package="vala"/>
       <dep package="gudev"/>
       <dep package="tracker"/>
+      <dep package="gnome-themes-standard"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-clocks">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+      <dep package="gnome-desktop"/>
+      <dep package="libgweather"/>
+      <dep package="libnotify"/>
     </dependencies>
   </autotools>
 
   <autotools id="gnome-initial-setup">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="accountsservice"/>
       <dep package="cheese"/>
       <dep package="clutter-gtk"/>
+      <dep package="clutter-gst"/>
       <dep package="geoclue"/>
       <dep package="gdm"/>
-      <dep package="gtk+"/>
       <dep package="glib"/>
+      <dep package="gtk+"/>
       <dep package="gnome-keyring"/>
       <dep package="gnome-online-accounts"/>
+      <dep package="gstreamer"/>
+      <dep package="iso-codes"/>
       <dep package="libgweather"/>
+      <dep package="libpwquality"/>
+      <dep package="network-manager-applet"/>
       <dep package="NetworkManager"/>
     </dependencies>
-    <suggest>
-      <dep package="libxklavier"/>
+    <suggests>
       <dep package="upower"/>
-    </suggest>
+      <dep package="gnome-getting-started-docs"/>
+    </suggests>
   </autotools>
 
-  <autotools id="gnome-games">
+  <autotools id="gnome-getting-started-docs">
     <branch/>
     <dependencies>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-video-effects">
+    <branch/>
+    <dependencies>
+      <dep package="gstreamer"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="aisleriot">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+      <dep package="librsvg"/>
+      <dep package="gconf"/>
+      <dep package="guile"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="five-or-more">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="librsvg"/>
+      <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="four-in-a-row">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="librsvg"/>
+      <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-chess">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
+      <dep package="gtk+"/>
+      <dep package="vala"/>
+      <dep package="yelp-tools"/>
       <dep package="glu"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-klotski">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="librsvg"/>
       <dep package="gtk+"/>
-      <dep package="pygobject"/>
-      <dep package="clutter"/>
-      <dep package="clutter-gtk"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-mahjongg">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="librsvg"/>
       <dep package="vala"/>
-      <dep package="libcanberra"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="aisleriot">
-    <branch/>
+  <autotools id="gnome-mines">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="librsvg"/>
+      <dep package="gtk+"/>
+      <dep package="vala"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-nibbles">
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
+      <dep package="librsvg"/>
       <dep package="gtk+"/>
       <dep package="libcanberra"/>
+      <dep package="yelp-tools"/>
+      <dep package="clutter"/>
+      <dep package="clutter-gtk"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-robots">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
+      <dep package="intltool"/>
       <dep package="librsvg"/>
-      <dep package="gconf"/>
-      <dep package="guile"/>
+      <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-nettool">
-    <branch/>
+  <autotools id="gnome-sudoku">
+    <branch revision="gnome-3-8"/>
     <dependencies>
+      <dep package="intltool"/>
       <dep package="gtk+"/>
-      <dep package="gconf"/>
+      <dep package="pygobject-python2"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-power-manager">
-    <branch/>
+  <autotools id="gnome-tetravex">
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="dbus-glib"/>
+      <dep package="librsvg"/>
+      <dep package="gtk+"/>
+      <dep package="vala"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="iagno">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="librsvg"/>
       <dep package="gtk+"/>
-      <dep package="libgnome-keyring"/>
-      <dep package="gnome-doc-utils"/>
-      <dep package="upower"/>
-      <dep package="libnotify"/>
       <dep package="libcanberra"/>
-      <dep package="gnome-control-center"/>
+      <dep package="vala"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="grilo">
-    <branch revision="0.2.x"/>
+  <autotools id="lightsoff">
+    <branch revision="gnome-3-8"/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="vala"/>
+      <dep package="clutter"/>
+      <dep package="clutter-gtk"/>
+      <dep package="yelp-tools"/>
     </dependencies>
-    <suggests>
+  </autotools>
+
+  <autotools id="quadrapassel">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
+      <dep package="intltool"/>
       <dep package="gtk+"/>
+      <dep package="librsvg"/>
+      <dep package="libcanberra"/>
+      <dep package="clutter"/>
+      <dep package="clutter-gtk"/>
       <dep package="vala"/>
-      <dep package="libsoup"/>
-    </suggests>
+      <dep package="yelp-tools"/>
+    </dependencies>
   </autotools>
 
-  <autotools id="grilo-plugins">
-    <branch revision="0.2.x"/>
+  <autotools id="swell-foop">
+    <branch revision="gnome-3-8"/>
     <dependencies>
-      <dep package="grilo"/>
-      <dep package="libxml2"/>
-      <dep package="totem-pl-parser"/>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="clutter"/>
+      <dep package="clutter-gtk"/>
+      <dep package="vala"/>
+      <dep package="yelp-tools"/>
     </dependencies>
-    <suggests>
-      <dep package="libgdata"/>
-      <dep package="gmime"/>
-      <dep package="gupnp"/>
-      <dep package="gupnp-av"/>
-      <dep package="sqlite3"/>
-      <dep package="libgcrypt"/>
-      <dep package="tracker"/>
-    </suggests>
   </autotools>
 
-  <cmake id="libmusicbrainz4"
-         cmakeargs="-DLIB_SUFFIX=${libsuffix}">
-    <pkg-config>libmusicbrainz4.pc</pkg-config>
-    <branch repo="github.com/metabrainz"
-            module="libmusicbrainz/libmusicbrainz-4.0.3.tar.gz"
-            version="4.0.3"
-            hash="sha256:8f2a8f6e8aa858a66860a4726ee383480b43a57350b28a4478af3e19cacb52d7"
-            size="110111">
-    </branch>
+  <autotools id="tali">
+    <branch revision="gnome-3-8"/>
     <dependencies>
+      <dep package="intltool"/>
+      <dep package="librsvg"/>
+      <dep package="gtk+"/>
+      <dep package="yelp-tools"/>
     </dependencies>
-  </cmake>
+  </autotools>
 
-  <autotools id="nautilus-sendto">
+  <autotools id="gnome-nettool">
     <branch/>
     <dependencies>
+      <dep package="gtk+"/>
+      <dep package="gconf"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="nautilus-sendto">
+    <branch revision="gnome-3-6"/>
+    <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="dbus-glib"/>
@@ -1141,49 +751,24 @@
   </autotools>
 
   <autotools id="orca">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <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="py2cairo"/>
+      <dep package="py3cairo"/>
       <dep package="pygobject"/>
       <dep package="yelp-tools"/>
     </dependencies>
-  </autotools>
-
-  <autotools id="rhythmbox">
-    <branch/>
-    <dependencies>
-      <dep package="gdk-pixbuf"/>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gnome-doc-utils"/>
-      <dep package="grilo"/>
-      <dep package="gst-plugins-base-0.10"/>
-      <dep package="gtk+"/>
-      <dep package="gudev"/>
-      <dep package="json-glib"/>
-      <dep package="libnotify"/>
-      <dep package="libpeas"/>
-      <dep package="libsoup"/>
-      <dep package="libxml2"/>
-      <dep package="pygobject"/>
-      <dep package="totem-pl-parser"/>
-    </dependencies>
     <suggests>
-      <dep package="avahi"/>
-      <dep package="brasero"/>
-      <dep package="libdmapsharing"/>
-      <dep package="libgnome-keyring"/>
-      <dep package="vala"/>
-      <dep package="WebKit"/>
+      <dep package="speech-dispatcher"/>
     </suggests>
   </autotools>
 
   <autotools id="seahorse">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -1192,6 +777,8 @@
       <dep package="libsecret"/>
       <dep package="gcr"/>
       <dep package="yelp-tools"/>
+      <dep package="gpgme"/>
+      <dep package="gnupg"/>
     </dependencies>
     <suggests>
       <dep package="avahi"/>
@@ -1199,83 +786,40 @@
     </suggests>
   </autotools>
 
-  <autotools id="libunique">
-    <pkg-config>unique-3.0.pc</pkg-config>
-    <branch module="libunique/3.0/libunique-3.0.2.tar.bz2" repo="gnome.org"
-            version="3.0.2" checkoutdir="libunique-3.0.2"
-            hash="sha256:50269a87c7aabf1e25f01b3bbb280133138ffd7b6776289894c614a4b6ca968d"
-            size="342778"/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="dbus-glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="shotwell">
-    <branch repo="yorba.org" module="shotwell"/>
+  <autotools id="vinagre">
+    <branch revision="gnome-3-8"/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
-      <dep package="gudev"/>
-      <dep package="libgee-0.6"/>
-      <dep package="libsoup"/>
-      <dep package="libunique"/>
+      <dep package="intltool"/>
       <dep package="libxml2"/>
-      <dep package="sqlite3"/>
+      <dep package="gtk+"/>
+      <dep package="gtk-vnc"/>
+      <dep package="libsecret"/>
       <dep package="vala"/>
-      <dep package="WebKit"/>
     </dependencies>
+    <suggests>
+      <dep package="avahi"/>
+      <dep package="spice-gtk"/>
+      <dep package="telepathy-glib"/>
+      <dep package="vte"/>
+    </suggests>
   </autotools>
 
-  <autotools id="sound-juicer">
+  <autotools id="brasero">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gnome-doc-utils"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
-      <dep package="brasero"/>
-      <dep package="libmusicbrainz"/>
       <dep package="libcanberra"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="tomboy">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gtk-sharp"/>
-      <dep package="dbus-sharp"/>
-      <dep package="dbus-sharp-glib"/>
-      <dep package="gnome-doc-utils"/>
-      <dep package="gnome-sharp"/>
-      <dep package="mono-addins"/>
-    </dependencies>
-    <suggests>
-      <dep package="gtkspell"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="vinagre">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
+      <dep package="libnotify"/>
       <dep package="libxml2"/>
-      <dep package="gtk+"/>
-      <dep package="gtk-vnc"/>
-      <dep package="libgnome-keyring"/>
-      <dep package="vala"/>
+      <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
-      <dep package="avahi"/>
-      <dep package="spice-gtk"/>
-      <dep package="telepathy-glib"/>
-      <dep package="vte"/>
+      <dep package="nautilus"/>
+      <dep package="totem-pl-parser"/>
+      <dep package="tracker"/>
     </suggests>
   </autotools>
 
@@ -1289,24 +833,41 @@
       <dep package="accerciser"/>
       <dep package="aisleriot"/>
       <dep package="anjuta"/>
+      <dep package="brasero"/>
       <dep package="cheese"/>
       <dep package="devhelp"/>
       <dep package="evolution"/>
       <dep package="file-roller"/>
+      <dep package="five-or-more"/>
+      <dep package="four-in-a-row"/>
       <dep package="gedit"/>
       <dep package="glade"/>
       <dep package="gnome-boxes"/>
+      <dep package="gnome-clocks"/>
+      <dep package="gnome-chess"/>
       <dep package="gnome-color-manager"/>
       <dep package="gnome-documents"/>
       <dep package="gnome-devel-docs"/>
-      <dep package="gnome-games"/>
       <dep package="gnome-initial-setup"/>
+      <dep package="gnome-getting-started-docs"/>
+      <dep package="gnome-klotski"/>
+      <dep package="gnome-mahjongg"/>
+      <dep package="gnome-mines"/>
       <dep package="gnome-nettool"/>
+      <dep package="gnome-nibbles"/>
+      <dep package="gnome-robots"/>
+      <dep package="gnome-sudoku"/>
+      <dep package="gnome-tetravex"/>
+      <dep package="iagno"/>
+      <dep package="lightsoff"/>
       <dep package="nautilus-sendto"/>
       <dep package="nemiver"/>
       <dep package="orca"/>
+      <dep package="quadrapassel"/>
       <dep package="rygel"/>
       <dep package="seahorse"/>
+      <dep package="swell-foop"/>
+      <dep package="tali"/>
       <dep package="vinagre"/>
     </dependencies>
   </metamodule>
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index f6dfd4c..3c6c860 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -12,11 +12,8 @@
     href="git://anongit.freedesktop.org/gstreamer/"/>
 <repository type="git" name="telepathy.freedesktop.org"
     href="git://anongit.freedesktop.org/telepathy/"/>
-<repository type="cvs" name="libxklavier.freedesktop.org"
-    cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/xklavier"
-    password=""/>
-<repository type="git" name="colord.gitorious.org"
-    href="git://gitorious.org/colord"/>
+<repository type="git" name="github.com"
+    href="git://github.com/"/>
 <repository type="git" name="gusb.gitorious.org"
     href="git://gitorious.org/gusb"/>
 <repository type="bzr" name="research.operationaldynamics.com"
@@ -25,16 +22,24 @@
     href="git://linuxwacom.git.sourceforge.net/"/>
 
 <!-- tarball repos -->
-<repository type="tarball" name="gnome.org"
-    href="http://download.gnome.org/sources/"/>
-<repository type="tarball" name="ftp.mozilla.org"
-    href="https://ftp.mozilla.org/pub/mozilla.org/"/>
+<repository type="tarball" name="0pointer.de"
+    href="http://0pointer.de/lennart/projects/"/>
+<repository type="tarball" name="iso-codes"
+    href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
+<repository type="tarball" name="github.com/metabrainz"
+    href="https://github.com/downloads/metabrainz/"/>
 <repository type="tarball" name="sourceforge.net"
     href="http://prdownloads.sourceforge.net/sourceforge/"/>
 <repository type="tarball" name="webkitgtk.org"
     href="http://webkitgtk.org/releases/"/>
 <repository type="tarball" name="freedesktop.org"
     href="http://freedesktop.org/software/"/>
+<repository type="tarball" name="people.freedesktop.org"
+    href="http://people.freedesktop.org/"/>
+<repository type="tarball" name="icon-theme.freedesktop.org"
+    href="http://icon-theme.freedesktop.org/releases/"/>
+<repository type="tarball" name="libopenraw.freedesktop.org"
+    href="http://libopenraw.freedesktop.org/download/"/>
 <repository type="tarball" name="nice.freedesktop.org"
     href="http://nice.freedesktop.org/releases/"/>
 <repository type="tarball" name="poppler.freedesktop.org"
@@ -47,39 +52,31 @@
     href="https://fedorahosted.org/releases/l/i/libpwquality/"/>
 <repository type="tarball" name="graphviz.org"
     href="http://www.graphviz.org/pub/"/>
-<repository type="tarball" name="launchpad.net/tarball"
-    href="https://launchpad.net/"/>
-<repository type="tarball" name="opencc"
-    href="http://opencc.googlecode.com/files/"/>
 <repository type="tarball" name="anthy"
     href="http://ftp.jaist.ac.jp/pub/sourceforge.jp/anthy/37536/"/>
 <repository type="tarball" name="libhangul"
     href="http://libhangul.googlecode.com/files/"/>
 <repository type="tarball" name="ibus"
     href="http://ibus.googlecode.com/files/"/>
+<repository type="tarball" name="pyzy"
+    href="http://pyzy.googlecode.com/files/"/>
+<repository type="tarball" name="maxmind.com"
+      href="http://www.maxmind.com/download/"/>
+<repository type="tarball" name="ftp.mozilla.org"
+      href="http://ftp.mozilla.org/"/>
 
-<include href="gnome-core-deps-base.modules"/>
+<include href="gnome-sysdeps-3.8.modules"/>
 
 <!-- Please try to keep organized alphabetically by section -->
 
-<!-- Build dependencies of gnome-suites-core-3.4 -->
-
-  <autotools id="gypsy">
-    <branch repo="git.freedesktop.org"/>
-    <dependencies>
-      <dep package="bluez"/>
-      <dep package="dbus-glib"/>
-      <dep package="gudev"/>
-      <dep package="libxslt"/>
-    </dependencies>
-  </autotools>
+<!-- Build dependencies of gnome-suites-core -->
 
   <autotools id="geoclue">
     <branch repo="git.freedesktop.org"/>
     <dependencies>
       <dep package="dbus-glib"/>
       <dep package="glib"/>
-      <dep package="gtk+-2"/>
+      <dep package="gtk+"/>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
       <dep package="NetworkManager"/>
@@ -93,14 +90,24 @@
   <autotools id="geocode-glib">
     <branch/>
     <dependencies>
+      <dep package="geoip"/>
       <dep package="glib"/>
       <dep package="json-glib"/>
       <dep package="libsoup"/>
     </dependencies>
   </autotools>
 
+  <autotools id="geoip" skip-autogen="never" autogen-sh="autoreconf">
+    <branch repo="maxmind.com"
+            module="geoip/api/c/GeoIP-1.4.8.tar.gz" version="1.4.8"
+            hash="sha256:cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4"
+            size="1074829">
+      <patch file="geoip-1.4.8-add-pkg-config.patch" strip="1"/>
+    </branch>
+  </autotools>
+
   <autotools id="gcr">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="glib"/>
@@ -126,6 +133,44 @@
     </dependencies>
   </autotools>
 
+  <autotools id="iso-codes">
+    <pkg-config>iso-codes.pc</pkg-config>
+    <branch repo="iso-codes"
+            module="iso-codes-3.33.tar.bz2"
+            version="3.33"
+            hash="sha256:682a8df2ea1d970093e8a9f37d6a32293c3b48e458a295862905a83a1b098853"
+            size="6349976"/>
+  </autotools>
+
+  <autotools id="hicolor-icon-theme" supports-non-srcdir-builds="no"
+             check-target="false">
+    <branch module="hicolor-icon-theme-0.12.tar.gz" version="0.12"
+           repo="icon-theme.freedesktop.org"
+            hash="sha256:9edca690617eaa19054951ca53501c802180262be8880ed84754ac46c93bec73"
+            size="38008">
+      <patch file="hicolor-icon-theme.clean-target.patch" strip="1"/>
+    </branch>
+  </autotools>
+
+  <autotools id="libcanberra" autogen-sh="configure" autogenargs="--with-systemdsystemunitdir=no">
+    <pkg-config>libcanberra-gtk.pc</pkg-config>
+    <branch repo="0pointer.de"
+            module="libcanberra/libcanberra-${version}.tar.xz"
+            version="0.30"
+            hash="sha256:c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72">
+    </branch>
+    <dependencies>
+      <dep package="gtk-doc"/>
+      <dep package="libvorbis"/>
+    </dependencies>
+    <after>
+      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
+      <dep package="pulseaudio"/>
+      <dep package="gstreamer"/>
+    </after>
+  </autotools>
+
   <autotools id="libgdata">
     <pkg-config>libgdata.pc</pkg-config>
     <branch/>
@@ -140,35 +185,72 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libzeitgeist">
-    <branch repo="launchpad.net/tarball"
-            module="libzeitgeist/0.3/0.3.18/+download/libzeitgeist-0.3.18.tar.gz"
-            version="0.3.18"
-            hash="sha256:82c128d97a68600518b8e3e65ef4d5b123c57f3d5dfa977c7ff733c0fdf80f73"
-            size="527117"/>
+  <cmake id="libmusicbrainz"
+         cmakeargs="-DLIB_SUFFIX=${libsuffix}">
+    <pkg-config>libmusicbrainz5.pc</pkg-config>
+    <branch repo="github.com/metabrainz"
+            module="libmusicbrainz/libmusicbrainz-5.0.1.tar.gz"
+            version="5.0.1"
+            hash="sha256:1ca75e1c5059a3620b0d82633b1f468acc2a65fcc4305f844ec44f6fb5db82d5"
+            size="109119">
+    </branch>
+    <dependencies>
+      <dep package="neon"/>
+    </dependencies>
+  </cmake>
+
+  <autotools id="libqmi">
+    <branch repo="git.freedesktop.org" module="libqmi.git"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk-doc"/>
     </dependencies>
   </autotools>
 
+  <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"/>
+      <dep package="gudev"/>
+      <dep package="ppp"/>
+      <dep package="libqmi"/>
+    </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">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
+      <dep package="gnome-common"/>
       <dep package="gtk-doc"/>
     </dependencies>
   </autotools>
 
   <autotools id="cogl">
     <pkg-config>cogl-1.0.pc</pkg-config>
-    <branch revision="cogl-1.10"/>
+    <branch revision="cogl-1.14"/>
     <dependencies>
+      <dep package="gtk-doc"/>
       <dep package="glib"/>
       <dep package="libXcomposite"/>
+      <dep package="xcb-dri2" />
+      <dep package="pango"/>
     </dependencies>
     <suggests>
       <dep package="gobject-introspection"/>
@@ -176,14 +258,12 @@
   </autotools>
 
   <autotools id="clutter">
-    <branch/>
+    <branch revision="clutter-1.14"/>
     <dependencies>
       <dep package="cogl"/>
       <dep package="atk"/>
       <dep package="glib"/>
       <dep package="cairo"/>
-      <dep package="pango"/>
-      <dep package="gtk-doc"/>
       <dep package="json-glib"/>
       <dep package="gobject-introspection"/>
     </dependencies>
@@ -194,7 +274,7 @@
   </autotools>
 
   <autotools id="gdk-pixbuf">
-    <branch/>
+    <branch revision="gdk-pixbuf-2-28"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -206,36 +286,24 @@
   </autotools>
 
   <autotools id="glib">
-    <branch/>
+    <branch revision="glib-2-36"/>
     <dependencies>
       <dep package="gtk-doc"/>
       <dep package="libffi"/>
     </dependencies>
-    <after>
-      <dep package="shared-mime-info"/>
-    </after>
     <suggests>
       <!-- these provide gnome implementations of glib
            extension points -->
       <dep package="gvfs"/>
       <dep package="glib-networking"/>
     </suggests>
-  </autotools>
-
-  <autotools id="glib-networking">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="intltool"/>
-      <dep package="libproxy"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="gnutls"/>
-      <dep package="p11-kit"/>
-    </dependencies>
+    <after>
+      <dep package="shared-mime-info"/>
+    </after>
   </autotools>
 
   <autotools id="gtk+">
-    <branch/>
+    <branch revision="gtk-3-8"/>
     <dependencies>
       <dep package="atk"/>
       <dep package="glib"/>
@@ -252,7 +320,7 @@
   </autotools>
 
   <autotools id="pango">
-    <branch/>
+    <branch revision="1.34.1"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
@@ -260,6 +328,7 @@
       <dep package="gobject-introspection"/>
       <dep package="harfbuzz"/>
       <dep package="libXft"/>
+      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
@@ -272,20 +341,27 @@
     </dependencies>
   </autotools>
 
+  <autotools id="fontconfig" autogenargs="--disable-docs">
+    <branch repo="git.freedesktop.org"/>
+    <dependencies>
+      <dep package="gperf"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="caribou" autogenargs="--disable-gtk2-module">
     <branch/>
     <dependencies>
-      <dep package="pygobject"/>
+      <dep package="pygobject-python2"/>
       <dep package="gtk+"/>
       <dep package="clutter"/>
-      <dep package="libgee-0.6"/>
+      <dep package="libgee"/>
       <dep package="libxklavier"/>
       <dep package="vala"/>
     </dependencies>
   </autotools>
 
   <autotools id="clutter-gtk">
-    <branch/>
+    <branch revision="clutter-gtk-1.4"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="clutter"/>
@@ -293,7 +369,7 @@
   </autotools>
 
   <autotools id="clutter-gst">
-    <branch/>
+    <branch revision="clutter-gst-2.0"/>
     <dependencies>
       <dep package="clutter"/>
       <dep package="gstreamer"/>
@@ -307,8 +383,8 @@
   <autotools id="farstream" autogenargs="--disable-python">
     <branch repo="freedesktop.org"
             module="farstream/releases/farstream/farstream-${version}.tar.gz"
-            version="0.1.91"
-            hash="sha256:8aa148759f7ee771ba03168d0a9e0ef67b9f7b9d0faec07a551baaa10d441e35"/>
+            version="0.2.1"
+            hash="sha256:4c080d9ee663db1898584fded8d69daac0414f452c985792aa464220d28f02f7"/>
     <dependencies>
       <dep package="libnice"/>
     </dependencies>
@@ -324,7 +400,10 @@
 
   <autotools id="exempi" autogenargs="--enable-unittest=no">
     <pkg-config>exempi-2.0.pc</pkg-config>
-    <branch repo="git.freedesktop.org"/>
+    <branch repo="libopenraw.freedesktop.org"
+            module="exempi-${version}.tar.bz2"
+            version="2.2.0"
+            hash="sha256:8ac374cca17df023ae978bb5f7a9d5d116da89141192f8de8c8060de0722b00f"/>
   </autotools>
 
   <autotools id="folks" autogenargs="--enable-eds-backend --disable-libsocialweb-backend 
--disable-fatal-warnings">
@@ -332,7 +411,7 @@
     <dependencies>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
-      <dep package="libgee-0.6"/>
+      <dep package="libgee"/>
       <dep package="vala"/>
       <dep package="gobject-introspection"/>
       <dep package="telepathy-glib"/>
@@ -356,9 +435,40 @@
     </suggests>
   </autotools>
 
-  <autotools id="gtksourceview" autogenargs="--enable-compile-warnings=maximum">
+  <autotools id="grilo">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+    <suggests>
+      <dep package="gtk+"/>
+      <dep package="vala"/>
+      <dep package="libsoup"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="grilo-plugins">
     <branch/>
     <dependencies>
+      <dep package="grilo"/>
+      <dep package="libxml2"/>
+      <dep package="totem-pl-parser"/>
+    </dependencies>
+    <suggests>
+      <dep package="libgdata"/>
+      <dep package="gmime"/>
+      <dep package="gupnp"/>
+      <dep package="gupnp-av"/>
+      <dep package="sqlite3"/>
+      <dep package="libgcrypt"/>
+      <dep package="tracker"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gtksourceview" autogenargs="--enable-compile-warnings=maximum">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
       <dep package="intltool"/>
       <dep package="libxml2"/>
       <dep package="shared-mime-info"/>
@@ -367,12 +477,8 @@
   </autotools>
 
   <autotools id="harfbuzz" autogenargs="">
-    <branch repo="freedesktop.org"
-            module="harfbuzz/release/harfbuzz-0.9.3.tar.bz2"
-            version="0.9.3"
-            hash="sha256:02fbe8375dbbc7240cbb9183695359843a6c9fa52f6d0a6534edefc383f5b04d"
-            size="717318">
-    </branch>
+    <branch repo="git.freedesktop.org"
+      module="harfbuzz" checkoutdir="harfbuzz"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="ragel"/>
@@ -398,27 +504,19 @@
     </suggests>
   </autotools>
 
-
-  <autotools id="gnome-video-effects">
-    <branch/>
-    <dependencies>
-      <dep package="gstreamer"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gobject-introspection">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="bison"/>
       <dep package="flex"/>
       <dep package="glib"/>
       <dep package="cairo"/>
-      <dep package="python-devel"/>
+      <dep package="python2-devel"/>
     </dependencies>
   </autotools>
 
   <autotools id="gjs">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="dbus-glib"/>
       <dep package="gobject-introspection"/>
@@ -437,20 +535,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gmime" version="2.6.6">
-    <branch repo="gnome.org"
-            module="gmime/2.6/gmime-2.6.6.tar.xz"
-            version="2.6.6"
-            hash="sha256:efdff4cebaaa9b8dfe99832eb16f54ce60a7e02c5d1f3964f15d4ae0ddf6b3ee"
-            size="721152"/>
-    <dependencies>
-      <dep package="gtk-doc"/>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gstreamer"
-             autogenargs="--disable-tests"
+             autogenargs="--disable-tests --disable-fatal-warnings"
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gstreamer"
@@ -463,7 +549,7 @@
   </autotools>
 
   <autotools id="gst-plugins-base"
-             autogenargs="--with-gtk=3.0 --disable-gnome_vfs"
+             autogenargs="--disable-fatal-warnings"
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-base"
@@ -471,7 +557,7 @@
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gtk+"/>
-      <dep package="liboil"/>
+      <dep package="iso-codes"/>
     </dependencies>
     <suggests>
       <dep package="gudev"/>
@@ -479,7 +565,7 @@
   </autotools>
 
   <autotools id="gst-plugins-good"
-             autogenargs="--with-gtk=3.0"
+             autogenargs="--disable-fatal-warnings"
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-good"
@@ -501,6 +587,7 @@
   </autotools>
 
   <autotools id="gst-plugins-bad"
+             autogenargs="--disable-fatal-warnings"
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             checkoutdir="gst-plugins-bad"
@@ -508,31 +595,9 @@
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
-      <dep package="soundtouch"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gstreamer-0.10" autogenargs="-- --disable-tests" 
makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS=" supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" module="gstreamer" revision="0.10" 
checkoutdir="gstreamer-0.10"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libxml2"/>
-      <dep package="gobject-introspection"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gst-plugins-base-0.10" autogenargs="--with-gtk=3.0 --disable-tests --disable-gnome_vfs" 
makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS=" 
supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-base" revision="0.10" 
checkoutdir="gst-plugins-base-0.10"/>
-    <dependencies>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gtk+"/>
-      <dep package="liboil"/>
-    </dependencies>
-    <suggests>
-      <dep package="gudev"/>
-    </suggests>
-  </autotools>
-
   <autotools id="mm-common">
     <branch/>
   </autotools>
@@ -571,7 +636,7 @@
   </autotools>
 
   <autotools id="gtkmm">
-    <branch/>
+    <branch revision="gtkmm-3-8"/>
     <dependencies>
       <dep package="pangomm"/>
       <dep package="atkmm"/>
@@ -580,7 +645,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gssdp">
+  <autotools id="gssdp" makeargs="CFLAGS=-Wno-error">
     <branch />
     <dependencies>
       <dep package="glib"/>
@@ -593,7 +658,7 @@
 
   <autotools id="gupnp"
              autogenargs="--with-context-manager=network-manager">
-    <branch revision="gupnp-0.18"/>
+    <branch />
     <dependencies>
       <dep package="gssdp"/>
       <dep package="glib"/>
@@ -618,10 +683,10 @@
 
   <autotools id="itstool">
     <branch repo="itstool.org"
-            module="itstool-1.1.3.tar.bz2"
-            version="1.1.3"
-            hash="sha256:e635b445eb6836fa3b30e95ca3fefc4c246f7857e09c172cb2f85ab4bf0d6a9e"
-            size="79803"/>
+            module="itstool-1.2.0.tar.bz2"
+            version="1.2.0"
+            hash="sha256:46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa"
+            size="82479"/>
   </autotools>
 
   <autotools id="java-gnome" autogen-sh="configure" skip-autogen="never">
@@ -640,6 +705,21 @@
     </dependencies>
   </autotools>
 
+  <autotools id="js17" check-target="false"
+      autogenargs="--enable-threadsafe --with-system-nspr">
+    <pkg-config>mozjs-17.0.pc</pkg-config>
+    <branch repo="ftp.mozilla.org"
+            module="pub/mozilla.org/js/mozjs17.0.0.tar.gz"
+            version="17.0.0"
+            hash="sha256:321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba"
+            checkoutdir="js17-17.0.0">
+      <patch file="js17-build-fixes.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="nspr"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="json-glib">
     <branch/>
     <dependencies>
@@ -667,11 +747,7 @@
 
   <autotools id="libcroco" supports-non-srcdir-builds="no">
     <pkg-config>libcroco-0.6.pc</pkg-config>
-    <branch repo="gnome.org"
-            module="libcroco/0.6/libcroco-0.6.6.tar.xz"
-            version="0.6.6"
-            hash="sha256:72ecace2f3d016a25f2b923c6d0cc76cced823e94171692c533f6c2088086bd9"
-            size="463920"/>
+    <branch />
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk-doc"/>
@@ -679,18 +755,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgee-0.6">
-    <pkg-config>gee-1.0.pc</pkg-config>
-    <branch module="libgee"
-            revision="0.6"
-            checkoutdir="libgee-0.6"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="libgee">
     <pkg-config>gee-0.8.pc</pkg-config>
     <branch/>
@@ -711,7 +775,7 @@
   </autotools>
 
   <autotools id="libgweather">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxml2"/>
@@ -737,6 +801,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
+      <dep package="texinfo"/>
     </dependencies>
   </autotools>
 
@@ -746,6 +811,7 @@
       <dep package="glib"/>
       <dep package="cairo"/>
       <dep package="lcms2"/>
+      <dep package="libarchive"/>
     </dependencies>
   </autotools>
 
@@ -772,7 +838,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libpeas">
+  <autotools id="libpeas"
+             autogenargs="--enable-python3">
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -799,12 +866,11 @@
   </autotools>
 
   <autotools id="libsoup" autogenargs="--disable-tls-check">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libxml2"/>
       <dep package="sqlite3"/>
-      <dep package="libgnome-keyring"/>
       <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
@@ -812,90 +878,16 @@
     </suggests>
   </autotools>
 
-  <autotools id="p11-kit" supports-non-srcdir-builds="no">
-    <branch repo="p11-glue.freedesktop.org"
-            module="p11-kit-0.13.tar.gz"
-            version="0.13"
-            hash="sha256:3cb942465efd5bde1c1875826118fe4bca45b0c9edc7c87835909a5866bed325"
-            size="544632" />
-  </autotools>
-
-  <autotools id="libxklavier" supports-non-srcdir-builds="no">
-    <pkg-config>libxklavier.pc</pkg-config>
-    <branch repo="gnome.org"
-            module="libxklavier/5.2/libxklavier-5.2.1.tar.xz"
-            version="5.2.1"
-            hash="sha256:a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e"
-            size="312944">
-    </branch>
-    <dependencies>
-      <dep package="libxml2"/>
-      <dep package="gtk-doc"/>
-      <dep package="glib"/>
-      <dep package="iso-codes"/>
-    </dependencies>
-  </autotools>
-
-<!-- Begin Mozilla stuff subsection -->
-
-    <autotools id="nspr" autogen-sh="mozilla/nsprpub/configure"
-             autogenargs="--enable-ipv6 --with-mozilla" check-target="false">
-    <pkg-config>nspr.pc</pkg-config>
-    <branch repo="ftp.mozilla.org"
-            module="nspr/releases/v4.8.9/src/nspr-4.8.9.tar.gz"
-            version="4.8.6"
-            hash="sha256:ff43c7c819e72f03bb908e7652c5d5f59a5d31ee86c333e692650207103d1cce"
-            size="1235265">
-      <patch file="nspr.config_64bits.patch" strip="1" />
-      <patch file="nspr.pkgconfig.patch" strip="1"/>
-      <patch file="nspr.hostcompiler.patch" strip="1"/>
-      <patch file="nspr.configure_4.8.9.patch" strip="1"/>
-    </branch>
-  </autotools>
-
-  <autotools id="js185" check-target="false"
-            autogenargs="--enable-threadsafe --with-system-nspr">
-    <pkg-config>mozjs185.pc</pkg-config>
-    <branch repo="ftp.mozilla.org"
-           module="js/js185-1.0.0.tar.gz"
-            version="1.0.0"
-            checkoutdir="js185-1.0.0"
-           source-subdir="js/src"
-            hash="sha256:5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687"
-           size="6164605">
-      <patch file="js185.destdir.patch" strip="0"/>
-    </branch>
-    <dependencies>
-      <dep package="nspr"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="nss"
-            autogen-sh="autogen.sh" supports-non-srcdir-builds="no"
-         supports-parallel-builds="no" check-target="false">
-    <pkg-config>nss.pc</pkg-config>
-    <branch repo="ftp.mozilla.org"
-            module="security/nss/releases/NSS_3_12_11_RTM/src/nss-3.12.11.tar.gz"
-           version="3.12.11"
-           hash="sha256:d043f8d44212bc9418b6a954ca88e05b8ab2a71f8c59e6829a9a36d8a28e9f16"
-           size="5944840">
-      <patch file="nss.pkgconfig-and-configure.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="nspr"/>
-      <dep package="sqlite3"/>
-    </dependencies>
+  <autotools id="mobile-broadband-provider-info">
+    <branch/>
   </autotools>
 
-<!-- End Mozilla stuff subsection -->
-
-  <autotools id="polkit-gnome" autogenargs="--with-gtk=3.0">
-    <branch checkoutdir="polkit-gnome" module="PolicyKit-gnome"/>
-    <dependencies>
-      <dep package="polkit"/>
-      <dep package="gtk+"/>
-      <dep package="intltool"/>
-    </dependencies>
+  <autotools id="p11-kit" supports-non-srcdir-builds="no">
+    <branch repo="p11-glue.freedesktop.org"
+            module="p11-kit-0.17.4.tar.gz"
+            version="0.17.4"
+            hash="sha256:405257bd12852d5552e53559836db6020f10fca88701fb46555ede5bd669a65a"
+            size="950704" />
   </autotools>
 
   <autotools id="poppler" autogenargs="--enable-xpdf-headers" makeargs="POPPLER_GLIB_DISABLE_DEPRECATED=">
@@ -917,28 +909,31 @@
     </after>
   </autotools>
 
-  <autotools id="pygobject">
-    <branch/>
+  <!-- Python 3 build of pygobject -->
+  <autotools id="pygobject" autogenargs="--with-python=python3">
+    <branch revision="pygobject-3-8" />
     <dependencies>
+      <dep package="gnome-common"/>
       <dep package="glib"/>
-      <dep package="py2cairo"/>
+      <dep package="py3cairo"/>
+      <dep package="python-devel"/>
       <dep package="gobject-introspection"/>
     </dependencies>
   </autotools>
 
-  <autotools id="startup-notification">
-    <pkg-config>libstartup-notification-1.0.pc</pkg-config>
-    <branch repo="freedesktop.org"
-            module="startup-notification/releases/startup-notification-0.12.tar.gz"
-            version="0.12"
-            hash="sha256:3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"
-            size="355285"/>
+  <!-- Python 2 build of pygobject, until everything gets ported to Python 3 -->
+  <autotools id="pygobject-python2" autogenargs="--with-python=python2">
+    <branch module="pygobject" checkoutdir="pygobject-python2" revision="pygobject-3-8" />
     <dependencies>
-      <dep package="xcb-util"/>
+      <dep package="gnome-common"/>
+      <dep package="glib"/>
+      <dep package="py2cairo"/>
+      <dep package="python2-devel"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
   </autotools>
 
-  <autotools id="telepathy-glib" autogenargs="--enable-vala-bindings">
+  <autotools id="telepathy-glib" autogenargs="--enable-vala-bindings --disable-Werror">
     <pkg-config>telepathy-glib.pc</pkg-config>
     <branch repo="telepathy.freedesktop.org"/>
     <dependencies>
@@ -964,8 +959,9 @@
   </autotools>
 
   <autotools id="totem-pl-parser">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
+      <dep package="gnome-common"/>
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gmime"/>
@@ -974,26 +970,27 @@
     </dependencies>
     <suggests>
       <dep package="libgcrypt"/>
+      <dep package="libquvi"/>
     </suggests>
   </autotools>
 
   <!-- evolution miner broken:
        https://bugzilla.gnome.org/show_bug.cgi?id=678235 -->
   <autotools id="tracker"
-             autogenargs="--enable-miner-firefox=no --enable-miner-thunderbird=no 
--enable-miner-evolution=no --disable-nautilus-extension --disable-tracker-needle 
--disable-tracker-preferences --disable-tracker-search-bar --disable-tracker-explorer 
--with-unicode-support=libicu"
+             autogenargs="--enable-miner-firefox=no --enable-miner-thunderbird=no 
--enable-miner-evolution=no --disable-nautilus-extension --disable-tracker-needle 
--disable-tracker-preferences --with-unicode-support=libicu"
              check-target="false">
-    <branch/>
+    <branch revision="tracker-0.16"/>
     <dependencies>
+      <dep package="libicu"/>
       <dep package="intltool"/>
       <dep package="sqlite3"/>
       <dep package="vala"/>
     </dependencies>
     <suggests>
-      <dep package="libgnome-keyring"/>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
+      <dep package="libsecret"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
       <dep package="NetworkManager"/>
-      <dep package="evolution"/>
       <dep package="upower"/>
       <dep package="libgsf"/>
       <dep package="gdk-pixbuf"/>
@@ -1001,15 +998,15 @@
     </suggests>
   </autotools>
 
-  <autotools id="vala" autogenargs="--enable-vapigen">
+  <autotools id="vala" autogenargs="--enable-vapigen" supports-non-srcdir-builds="no">
+    <pkg-config>libvala-0.20.pc</pkg-config>
     <branch/>
-    <pkg-config>libvala-0.16.pc</pkg-config>
     <dependencies>
       <dep package="glib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="graphviz">
+  <autotools id="graphviz" autogen-sh="configure">
     <pkg-config>libgvc.pc</pkg-config>
     <branch repo="graphviz.org"
             module="graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz" version="2.28.0"
@@ -1021,24 +1018,19 @@
   <autotools id="valadoc">
     <branch />
     <dependencies>
-      <dep package="libgee-0.6"/>
+      <dep package="libgee"/>
       <dep package="gdk-pixbuf"/>
       <dep package="graphviz"/>
     </dependencies>
   </autotools>
 
-  <!-- bugs that prevent webkit for supporting parallel build:
-       https://bugs.webkit.org/show_bug.cgi?id=79498
-       http://savannah.gnu.org/bugs/?30653
-  -->
   <autotools id="WebKit" makefile="GNUmakefile"
-             autogenargs="--enable-introspection --disable-silent-rules --with-gstreamer=1.0"
-             supports-parallel-builds="no">
+             autogenargs="--enable-introspection --disable-silent-rules --with-gstreamer=1.0">
     <pkg-config>webkitgtk-3.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
-            module="webkitgtk-1.10.0.tar.xz" version="1.10.0"
-            hash="sha256:6db37376d387dcc980e5349a5a385d87d40909371796e3dd895817e466799034"
-            size="8597932">
+            module="webkitgtk-2.0.4.tar.xz" version="2.0.4"
+            hash="sha256:bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f"
+            size="9849620">
     </branch>
     <dependencies>
       <dep package="at-spi2-core"/>
@@ -1057,6 +1049,8 @@
       <dep package="libicu"/>
       <dep package="libXt"/>
       <dep package="ruby"/>
+      <dep package="libsecret"/>
+      <dep package="libwebp"/>
     </dependencies>
     <suggests>
       <dep package="libxslt"/>
@@ -1114,8 +1108,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="colord" autogenargs="--disable-examples">
-    <branch repo="colord.gitorious.org" checkoutdir="colord" module="master.git"/>
+  <autotools id="colord" autogenargs="--disable-examples --disable-strict">
+    <branch repo="github.com" checkoutdir="colord" module="hughsie/colord.git" revision="colord-1-0"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus"/>
@@ -1133,10 +1127,20 @@
     </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/libwacom-0.6.tar.bz2" version="0.6"
-            hash="sha256:7115690698edc87deec482f0b2526567b858475d2135b5f8ccc946e5e76ec01d"
-            md5sum="33dc2f4d8230754305c3f59525f04550" size="372573"/>
+    <branch repo="sourceforge.net" module="linuxwacom/libwacom-0.7.tar.bz2" version="0.7"
+            hash="sha256:210c48b595461ebee63b1a846a6eb1d8f029b49d02ccbde34eadf551a5a68a78"
+            size="403532"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gudev"/>
@@ -1157,8 +1161,9 @@
              autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf --disable-ui"
              makeargs="CFLAGS=-Wno-error">
     <branch repo="ibus"
-            module="ibus-1.4.99.20120822.tar.gz" version="1.4.99.20120822"
-            hash="sha1:46d836b68733953b443859f47ad6991f4584658d" size="1736787">
+            module="ibus-${version}.tar.gz"
+            version="1.5.1"
+            hash="sha256:6023809ced2794b75fad07eb1b1d6288154b373920ecdcd51582a4cde4e0d017">
     </branch>
     <dependencies>
       <dep package="dbus"/>
@@ -1171,21 +1176,29 @@
     </dependencies>
   </autotools>
 
-  <cmake id="opencc">
-    <branch repo="opencc"
-            module="opencc-0.3.0.tar.gz" version="0.3.0"
-            hash="sha1:76f1750751b7fe15d25d66f0378814434fad1e70" size="491179"/>
-  </cmake>
+  <autotools id="pyzy"
+             autogenargs="--enable-db-open-phrase --disable-db-android">
+    <branch repo="pyzy"
+            module="pyzy-${version}.tar.gz"
+            version="0.1.0"
+            hash="sha256:fe468a4372473d85a56f05d55b14f0e0201fde6f9336a1a2322cf79421c84d9a"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="sqlite3"/>
+    </dependencies>
+  </autotools>
+
 
   <autotools id="ibus-pinyin"
-             autogenargs="--enable-db-open-phrase --enable-opencc --disable-boost"
              makeargs="CFLAGS=-Wno-error">
     <branch repo="ibus"
-            module="ibus-pinyin-1.4.99.20120620.tar.gz" version="1.4.99.20120620"
-            hash="sha1:acfadeb1903789f56c6f89ccb5e6a0064be54604" size="1817269"/>
+            module="ibus-pinyin-${version}.tar.gz"
+            version="1.5.0"
+            hash="sha256:a85d458dcc51ea9fd65849e63002428b3fcb3b39adcbea9214b5cb4a4cbdbc96"/>
     <dependencies>
       <dep package="ibus"/>
-      <dep package="opencc"/>
+      <dep package="pyzy"/>
+      <dep package="sqlite3"/>
     </dependencies>
   </autotools>
 
@@ -1197,9 +1210,12 @@
 
   <autotools id="ibus-anthy" autogenargs="--enable-private-png=yes">
     <branch repo="ibus"
-            module="ibus-anthy-1.4.99.20120713.tar.gz" version="1.4.99.20120713"
-            hash="sha1:28b285228608d09dd79df492e74660b199095f77" size="553048"/>
+            module="ibus-anthy-${version}.tar.gz"
+            version="1.5.0"
+            hash="sha256:3addfa3e3682fcc07b8edc9470dd4bcd4cf42d4303f1538fe56164f029c181b7"/>
     <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <dep package="ibus"/>
       <dep package="anthy"/>
     </dependencies>
@@ -1245,15 +1261,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgnome-keyring">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="dbus"/>
-      <dep package="libgcrypt"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="libwnck">
     <branch/>
     <dependencies>
diff --git a/gnome-core.modules b/gnome-core.modules
index 043738b..5ab852a 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -17,16 +17,12 @@
 <!-- tarball repos -->
   <repository type="tarball" name="avahi.org"
       href="http://www.avahi.org/download/"/>
-  <repository type="tarball" name="dbus"
-      href="http://dbus.freedesktop.org/releases/"/>
   <repository type="tarball" name="freedesktop.org"
       href="http://freedesktop.org/"/>
-  <repository type="tarball" name="kernel.org"
-      href="http://www.kernel.org"/>
   <repository type="tarball" name="gnome.org"
       href="http://download.gnome.org/sources/"/>
 
-<include href="gnome-core-deps.modules"/>
+<include href="gnome-suites-core-deps-3.8.modules"/>
 
 <!-- Please try to keep organized alphabetically by section -->
 
@@ -34,7 +30,7 @@
 <!-- Core User Shell -->
 
   <autotools id="at-spi2-core">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
@@ -42,7 +38,7 @@
   </autotools>
 
   <autotools id="at-spi2-atk">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="glib"/>
@@ -65,8 +61,8 @@
 
   <autotools id="evolution-data-server"
              supports-non-srcdir-builds="no"
-             autogenargs="--enable-vala-bindings">
-    <branch/>
+             autogenargs="--enable-vala-bindings --disable-strict --disable-uoa">
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libsoup"/>
@@ -81,18 +77,15 @@
       <dep package="liboauth"/>
       <dep package="vala"/>
       <dep package="libdb"/>
+      <dep package="libsecret"/>
     </dependencies>
     <suggests>
-      <dep package="nspr"/>
       <dep package="nss"/>
     </suggests>
-    <after>
-      <dep package="libgnome-keyring"/>
-    </after>
   </autotools>
 
   <autotools id="gnome-bluetooth">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="gtk-doc"/>
@@ -107,7 +100,7 @@
   </autotools>
 
   <autotools id="gnome-online-accounts">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="WebKit"/>
@@ -119,10 +112,12 @@
   </autotools>
 
   <autotools id="gnome-control-center" supports-non-srcdir-builds="no">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
+      <dep package="accountsservice"/>
       <dep package="clutter-gtk"/>
       <dep package="colord"/>
+      <dep package="colord-gtk"/>
       <dep package="fontconfig"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
@@ -133,6 +128,7 @@
       <dep package="gnome-online-accounts"/>
       <dep package="gnome-settings-daemon"/>
       <dep package="gsettings-desktop-schemas"/>
+      <dep package="ibus"/>
       <dep package="intltool"/>
       <dep package="iso-codes"/>
       <dep package="libcanberra"/>
@@ -141,20 +137,20 @@
       <dep package="libpwquality"/>
       <dep package="libwacom"/>
       <dep package="libxml2"/>
+      <dep package="network-manager-applet"/>
       <dep package="polkit"/>
       <dep package="pulseaudio"/>
+      <dep package="smbclient"/>
       <dep package="sound-theme-freedesktop"/>
       <dep package="upower"/>
-      <dep package="ibus"/>
     </dependencies>
     <suggests>
-      <!-- <dep package="cups"/> -->
-      <dep package="accountsservice"/>
+      <dep package="cups"/>
       <dep package="cheese"/>
       <dep package="gstreamer"/>
       <dep package="NetworkManager"/>
       <dep package="network-manager-applet"/>
-      <dep package="realmd"/>
+      <dep package="ModemManager"/>
       <dep package="ibus-pinyin"/>
       <dep package="ibus-anthy"/>
       <dep package="ibus-hangul"/>
@@ -162,15 +158,17 @@
   </autotools>
 
   <autotools id="gnome-desktop" autogenargs="--with-gnome-distributor=JHBuild">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxkbfile"/>
       <dep package="libXrandr"/>
+      <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gvfs"/> <!-- gvfs-copy used in autogen.sh -->
+      <dep package="iso-codes"/>
       <dep package="yelp-tools"/> <!-- for the docs -->
       <dep package="xkeyboard-config"/>
     </dependencies>
@@ -195,7 +193,7 @@
   </autotools>
 
   <autotools id="gnome-icon-theme-symbolic">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="gtk+"/>
@@ -204,7 +202,7 @@
   </autotools>
 
   <autotools id="gnome-keyring">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="dbus"/>
@@ -228,7 +226,7 @@
   </autotools>
 
   <autotools id="gnome-packagekit" autogenargs="--enable-strict=no">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="PackageKit"/>
       <dep package="gtk+"/>
@@ -243,33 +241,20 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-screensaver">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="dbus-glib"/>
-      <dep package="gnome-menus"/>
-      <dep package="gnome-desktop"/>
-      <dep package="libgnomekbd"/>
-    </dependencies>
-    <suggests>
-      <dep package="libnotify"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gnome-session">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gl"/>
       <dep package="gtk+"/>
+      <dep package="gnome-desktop"/>
       <dep package="json-glib"/>
       <dep package="dbus-glib"/>
       <dep package="startup-notification"/>
       <dep package="upower"/>
       <dep package="librsvg"/>
       <dep package="libXcomposite"/>
+      <dep package="sm"/>
     </dependencies>
     <suggests>
       <dep package="polkit"/>
@@ -277,7 +262,7 @@
   </autotools>
 
   <autotools id="gnome-settings-daemon">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="colord"/>
       <dep package="glib"/>
@@ -288,21 +273,23 @@
       <dep package="intltool"/>
       <dep package="libcanberra"/>
       <dep package="libnotify"/>
+      <dep package="librsvg"/>
       <dep package="libwacom"/>
+      <dep package="PackageKit"/>
       <dep package="polkit"/>
       <dep package="pulseaudio"/>
       <dep package="upower"/>
       <dep package="ibus"/>
       <dep package="xorg-wacom"/>
+      <dep package="cups"/>
     </dependencies>
     <suggests>
-      <!-- <dep package="cups"/> -->
       <!-- <dep package="xkbfile"/> -->
     </suggests>
   </autotools>
 
   <autotools id="gnome-shell" autogenargs="--enable-compile-warnings=maximum">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="accountsservice"/>
       <dep package="caribou"/>
@@ -324,6 +311,8 @@
       <dep package="libcroco"/>
       <dep package="libsoup"/>
       <dep package="mutter"/>
+      <dep package="NetworkManager"/>
+      <dep package="network-manager-applet"/>
       <dep package="polkit"/>
       <dep package="pulseaudio"/>
       <dep package="startup-notification"/>
@@ -342,41 +331,55 @@
   </autotools>
 
   <autotools id="gnome-themes-standard">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="cantarell-fonts"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
   <autotools id="gsettings-desktop-schemas" autogenargs="--enable-introspection=yes">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gnome-common"/>
       <dep package="gobject-introspection"/>
     </dependencies>
   </autotools>
 
  <autotools id="gvfs">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="dbus"/>
       <dep package="libsoup"/>
+      <dep package="udisks"/>
     </dependencies>
     <suggests>
-      <dep package="gnome-disk-utility"/>
       <dep package="gudev"/>
       <dep package="libgphoto2"/>
     </suggests>
   </autotools>
 
-  <autotools id="mousetweaks">
+  <autotools id="glib-networking">
     <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 revision="gnome-3-8"/>
+    <dependencies>
       <dep package="gtk+"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="intltool"/>
@@ -387,7 +390,7 @@
   </autotools>
 
   <autotools id="mutter" autogenargs="--enable-compile-warnings=maximum">
-    <branch />
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gdk-pixbuf"/>
@@ -403,40 +406,46 @@
   </autotools>
 
   <autotools id="network-manager-applet" autogenargs="--enable-more-warnings=no">
-    <branch revision="nma-0-9-6"/>
+    <branch revision="nma-0-9-8" />
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
+      <dep package="gnome-bluetooth"/>
+      <dep package="gobject-introspection"/>
       <dep package="gtk+"/>
-      <dep package="libgnome-keyring"/>
+      <dep package="gudev"/>
+      <dep package="iso-codes"/>
+      <dep package="libsecret"/>
       <dep package="NetworkManager"/>
       <dep package="libnotify"/>
-      <dep package="polkit"/>
     </dependencies>
     <suggests>
       <dep package="mobile-broadband-provider-info"/>
     </suggests>
   </autotools>
 
-  <autotools id="pulseaudio" autogenargs="--disable-udev --disable-hal --disable-oss">
+  <autotools id="pulseaudio"
+             autogenargs="--disable-hal --disable-oss">
     <pkg-config>libpulse.pc</pkg-config>
-    <branch repo="freedesktop.org" module="software/pulseaudio/releases/pulseaudio-2.0.tar.xz"
-            version="2.0"
-            hash="sha256:28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061"
-            size="1353708"/>
+    <branch repo="freedesktop.org"
+            module="software/pulseaudio/releases/pulseaudio-${version}.tar.xz"
+            version="2.1"
+            hash="sha256:ef6b347bf47abfb98080795f1583018ac959b4aeb4df916b879f9e1eaba0ca7f"/>
     <dependencies>
+      <dep package="alsa"/>
       <dep package="json"/>
       <dep package="libsndfile"/>
-      <dep package="liboil"/>
       <dep package="libtool-ltdl"/>
+      <dep package="libudev"/>
       <dep package="glib"/>
       <dep package="speex"/>
     </dependencies>
-    <after>
-      <dep package="gconf"/>
+    <suggests>
       <dep package="avahi"/>
       <dep package="bluez"/>
       <dep package="dbus"/>
+    </suggests>
+    <after>
       <dep package="polkit"/>
     </after>
   </autotools>
@@ -447,7 +456,6 @@
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
       <dep package="telepathy-glib"/>
-      <dep package="libgnome-keyring"/>
     </dependencies>
   </autotools>
 
@@ -467,53 +475,10 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-panel">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gnome-desktop"/>
-      <dep package="libwnck"/>
-      <dep package="evolution-data-server"/>
-      <dep package="gnome-menus"/>
-      <dep package="dbus-glib"/>
-      <dep package="librsvg"/>
-      <dep package="libgweather"/>
-      <dep package="libcanberra"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-    <suggests>
-      <dep package="polkit"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="metacity">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gtk+-2"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="intltool"/>
-      <dep package="libcanberra"/>
-      <dep package="zenity"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="notification-daemon">
-    <branch/>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-    </dependencies>
-  </autotools>
-
-
 <!-- Core Utilities -->
 
   <autotools id="baobab">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -523,27 +488,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="brasero">
-    <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="empathy" autogenargs="--disable-Werror">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="clutter"/>
       <dep package="clutter-gst"/>
@@ -554,7 +500,7 @@
       <dep package="folks"/>
       <dep package="gcr"/>
       <dep package="glib"/>
-      <dep package="libgee-0.6"/>
+      <dep package="libgee"/>
       <dep package="libsecret"/>
       <dep package="gnome-online-accounts"/>
       <dep package="gnutls"/>
@@ -584,7 +530,7 @@
   </autotools>
 
   <autotools id="eog">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -594,19 +540,22 @@
       <dep package="gnome-icon-theme"/>
       <dep package="gobject-introspection"/>
       <dep package="gsettings-desktop-schemas"/>
+      <dep package="libjpeg"/>
       <dep package="libpeas"/>
       <dep package="libxml2"/>
       <dep package="shared-mime-info"/>
+      <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
+      <dep package="exempi"/>
+      <dep package="exiv2"/>
       <dep package="lcms2"/>
       <dep package="librsvg"/>
-      <dep package="pygobject"/>
     </suggests>
   </autotools>
 
   <autotools id="epiphany">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="iso-codes"/>
@@ -616,6 +565,9 @@
       <dep package="gcr"/>
       <dep package="avahi"/>
       <dep package="gnome-desktop"/>
+      <dep package="libwnck"/>
+      <dep package="libsecret"/>
+      <dep package="libsoup"/>
     </dependencies>
     <suggests>
       <dep package="enchant"/>
@@ -627,7 +579,7 @@
 
   <autotools id="evince" autogenargs="--enable-introspection"
                          supports-parallel-builds="no">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -638,14 +590,12 @@
       <dep package="nautilus"/>
       <dep package="libgxps"/>
       <dep package="yelp-tools"/>
+      <dep package="libsecret"/>
     </dependencies>
-    <suggests>
-      <dep package="libgnome-keyring"/>
-    </suggests>
   </autotools>
 
-  <autotools id="gcalctool" supports-non-srcdir-builds="no">
-    <branch/>
+  <autotools id="gnome-calculator" supports-non-srcdir-builds="no">
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -654,14 +604,14 @@
   </autotools>
 
   <autotools id="gnome-contacts">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="folks"/>
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
       <dep package="gnome-online-accounts"/>
       <dep package="gtk+"/>
-      <dep package="libgee-0.6"/>
+      <dep package="libgee"/>
       <dep package="libnotify"/>
       <dep package="telepathy-glib"/>
       <dep package="vala"/>
@@ -683,27 +633,31 @@
   </autotools>
 
   <autotools id="gnome-disk-utility">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="gnome-settings-daemon"/>
       <dep package="gtk+"/>
+      <dep package="libnotify"/>
       <dep package="libpwquality"/>
       <dep package="libsecret"/>
       <dep package="udisks"/>
+      <dep package="dvdread"/>
     </dependencies>
   </autotools>
 
   <autotools id="gnome-font-viewer">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
+      <dep package="gnome-desktop"/>
       <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
   <autotools id="gnome-screenshot">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -712,7 +666,7 @@
   </autotools>
 
   <autotools id="gnome-system-log">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -722,7 +676,7 @@
   </autotools>
 
   <autotools id="gnome-system-monitor">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -736,21 +690,23 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-terminal" autogenargs="--with-gtk=3.0">
-    <branch/>
+  <autotools id="gnome-terminal">
+    <branch revision="gnome-3-8"/>
     <dependencies>
+      <dep package="dconf"/>
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="gconf"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="libuuid"/>
       <dep package="vte"/>
-      <dep package="startup-notification"/>
       <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
   <autotools id="gnome-user-docs">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -767,12 +723,13 @@
   </autotools>
 
   <autotools id="nautilus">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="pango"/>
+      <dep package="libnotify"/>
       <dep package="libxml2"/>
       <dep package="gnome-desktop"/>
       <dep package="gsettings-desktop-schemas"/>
@@ -802,7 +759,7 @@
   </autotools>
 
   <autotools id="totem">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -818,9 +775,6 @@
       <dep package="grilo-plugins"/>
       <dep package="yelp-tools"/>
     </dependencies>
-    <suggests>
-      <dep package="brasero"/>
-    </suggests>
   </autotools>
 
   <autotools id="yelp">
@@ -860,7 +814,7 @@
   </autotools>
 
   <autotools id="vino">
-    <branch/>
+    <branch revision="gnome-3-8"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -871,8 +825,8 @@
       <dep package="avahi"/>
       <dep package="gnutls"/>
       <dep package="libgcrypt"/>
-      <dep package="libgnome-keyring"/>
       <dep package="libnotify"/>
+      <dep package="libsecret"/>
       <dep package="NetworkManager"/>
       <dep package="telepathy-glib"/>
     </suggests>
@@ -882,7 +836,7 @@
 <!-- Core OS Services -->
 
   <autotools id="accountsservice" autogenargs="--with-systemdsystemunitdir=no">
-    <branch repo="git.freedesktop.org" module="accountsservice"/>
+    <branch repo="git.freedesktop.org" module="accountsservice" revision="0.6.34"/>
     <dependencies>
       <dep package="dbus-glib"/>
       <dep package="gobject-introspection"/>
@@ -891,7 +845,7 @@
 
   <!-- explicit disabling of qt3 and qt4 can be removed once avahi
        correctly detects what is available. -->
-  <autotools id="avahi" version="0.6.31" autogen-sh="configure"
+  <autotools id="avahi" autogen-sh="configure"
              autogenargs="--disable-gtk --disable-gtk3 --enable-introspection=no --disable-qt3 --disable-qt4 
--disable-mono --disable-monodoc --disable-manpages --disable-python --enable-compat-howl 
--enable-compat-libdns_sd --with-systemdsystemunitdir=no">
     <pkg-config>avahi-ui-gtk3.pc</pkg-config>
     <branch repo="avahi.org" module="avahi-0.6.31.tar.gz" version="0.6.31"
@@ -904,18 +858,6 @@
     </dependencies>
   </autotools>
 
-  <!-- hack around the lack of autogen.sh; bootstrap-configure doesn't
-       quite work since it doesn't pass arguments to configure
-    --> 
-  <autotools id="bluez" autogenargs="--enable-udevrules=no">
-    <pkg-config>bluez.pc</pkg-config>
-    <branch repo="kernel.org" module="pub/linux/bluetooth/bluez-4.87.tar.xz" version="4.87"
-            hash="sha256:165e4025e86ecbf2ade2c2f96d3f0de8d98e90fe3ce54d26c4f7e135f46bd61a"
-            size="760456"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
-
   <autotools id="ConsoleKit">
     <branch repo="git.freedesktop.org" module="ConsoleKit"/>
     <dependencies>
@@ -923,20 +865,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="dbus" supports-non-srcdir-builds="no" autogenargs="--with-systemdsystemunitdir=no">
-    <pkg-config>dbus-1.pc</pkg-config>
-    <branch module="dbus/dbus-1.4.0.tar.gz" version="1.4.0"
-           repo="dbus"
-           hash="sha256:c96d2f86d40e158e2bf405925a0a42cce0533a8466098e2f2238aa1614926652"
-           size="1800347">
-    </branch>
-    <dependencies>
-      <dep package="expat"/>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gdm">
+  <autotools id="gdm"
+             autogenargs="--disable-fallback-greeter">
     <branch/>
     <dependencies>
       <dep package="accountsservice"/>
@@ -948,17 +878,17 @@
       <dep package="libcanberra"/>
       <dep package="nss"/>
     </dependencies>
-    <suggest>
-      <dep package="libxklavier"/>
+    <suggests>
       <dep package="upower"/>
       <dep package="yelp-tools"/>
-    </suggest>
+    </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"
-           module="NetworkManager/NetworkManager.git" checkoutdir="NetworkManager"/>
+           module="NetworkManager/NetworkManager.git" checkoutdir="NetworkManager"
+            revision="nm-0-9-8" />
     <dependencies>
       <dep package="libnl"/>
       <dep package="glib"/>
@@ -1002,16 +932,19 @@
     </dependencies>
   </autotools>
 
-  <autotools id="realmd" autogenargs="">
-    <branch repo="git.freedesktop.org" module="realmd/realmd"/>
+  <autotools id="udisks">
+    <pkg-config>udisks2.pc</pkg-config>
+    <branch repo="git.freedesktop.org" module="udisks"/>
     <dependencies>
-      <dep package="dbus"/>
-      <dep package="PackageKit"/>
+      <dep package="gudev"/>
+      <dep package="libacl"/>
+      <dep package="polkit"/>
+      <dep package="libatasmart"/>
     </dependencies>
   </autotools>
 
   <autotools id="upower" autogenargs="--enable-strict=no">
-    <branch repo="git.freedesktop.org" />
+    <branch repo="git.freedesktop.org" revision="0.9"/>
     <dependencies>
       <dep package="polkit"/>
       <dep package="dbus-glib"/>
@@ -1022,6 +955,12 @@
     </suggests>
   </autotools>
 
+  <autotools id="gnome-shell-extensions" autogenargs="--enable-extensions=classic-mode">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
+      <dep package="gnome-shell"/>
+    </dependencies>
+  </autotools>
 
 <!-- Meta Modules -->
 
@@ -1031,12 +970,11 @@
   <metamodule id="meta-gnome-core-utilities">
     <dependencies>
       <dep package="baobab"/>
-      <dep package="brasero"/>
       <dep package="empathy"/>
       <dep package="epiphany"/>
       <dep package="eog"/>
       <dep package="evince"/>
-      <dep package="gcalctool"/>
+      <dep package="gnome-calculator"/>
       <dep package="gnome-contacts"/>
       <dep package="gnome-dictionary"/>
       <dep package="gnome-disk-utility"/>
@@ -1078,7 +1016,6 @@
       <dep package="glib-networking"/>
       <dep package="mousetweaks"/>
       <dep package="mutter"/>
-      <dep package="network-manager-applet"/>
       <dep package="pulseaudio"/>
       <dep package="telepathy-mission-control"/>
     </dependencies>
@@ -1093,25 +1030,6 @@
     </dependencies>
   </metamodule>
 
-  <!-- The Core GNOME Fallback UX: Provides a non composited
-       fallback experience for incapable hardware
-  -->
-  <metamodule id="meta-gnome-core-shell-fallback">
-    <dependencies>
-      <dep package="gnome-panel"/>
-      <dep package="gnome-screensaver"/>
-      <dep package="metacity"/>
-      <dep package="notification-daemon"/>
-      <!-- workaround to ensure that dbus-python is around for
-           glib tests
-      -->
-      <dep package="dbus-python"/>
-    </dependencies>
-    <suggests>
-      <dep package="polkit-gnome"/>
-    </suggests>
-  </metamodule>
-
   <!-- The Core GNOME OS Services: Only OS System services required to
        provide the Core GNOME UX
   -->
@@ -1127,22 +1045,22 @@
       <dep package="PackageKit"/>
       <dep package="polkit"/>
       <dep package="upower"/>
-      <!-- <dep package="cups"/> -->
-      <!-- <dep package="udisks"/> -->
+      <dep package="udisks"/>
+      <dep package="cups"/>
       <!-- <dep package="systemd"/> -->
       <!-- <dep package="xorg-x11-server"/> -->
       <!-- <dep package="plymouth"/> -->
     </dependencies>
   </metamodule>
 
-  <!-- The entirety of the Core GNOME UX, including fallback and utilities
+  <!-- The entirety of the Core GNOME UX, including extras and utilities
   -->
   <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="meta-gnome-core-shell-fallback"/>
+      <dep package="gnome-shell-extensions"/>
     </dependencies>
   </metamodule>
 
diff --git a/gnome-sysdeps.modules b/gnome-sysdeps.modules
index 5dfa3ce..58ce9d0 100644
--- a/gnome-sysdeps.modules
+++ b/gnome-sysdeps.modules
@@ -9,6 +9,12 @@
 
   <repository type="system" name="system"/>
 
+  <systemmodule id="alsa">
+    <pkg-config>alsa.pc</pkg-config>
+    <branch repo="system"
+            version="1.0.19"/>
+  </systemmodule>
+
   <systemmodule id="bison">
     <branch repo="system" version="2.0"/>
     <systemdependencies>
@@ -16,6 +22,19 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="bluez">
+    <pkg-config>bluez.pc</pkg-config>
+    <branch repo="system"
+            version="4.66"/>
+  </systemmodule>
+
+  <systemmodule id="bogofilter">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="bogofilter"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="boost">
     <branch repo="system" version="1.33.1"/>
     <systemdependencies>
@@ -23,6 +42,18 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="cairo">
+    <pkg-config>cairo.pc</pkg-config>
+    <branch repo="system"
+            version="1.10.2"/>
+  </systemmodule>
+
+  <systemmodule id="cairomm">
+    <pkg-config>cairomm-1.0.pc</pkg-config>
+    <branch repo="system"
+            version="1.8.4"/>
+  </systemmodule>
+
   <systemmodule id="cracklib">
     <branch repo="system"/>
     <systemdependencies>
@@ -30,6 +61,13 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="cups">
+    <branch repo="system" version="1.4"/>
+    <systemdependencies>
+      <dep type="path" name="cups-config"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="cyrus-sasl">
     <branch repo="system"/>
     <systemdependencies>
@@ -37,6 +75,27 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="dbus">
+    <pkg-config>dbus-1.pc</pkg-config>
+    <branch repo="system"
+            version="1.4.10"/>
+  </systemmodule>
+
+  <systemmodule id="dbus-glib">
+    <pkg-config>dbus-glib-1.pc</pkg-config>
+    <branch repo="system"
+            version="0.98"/>
+  </systemmodule>
+
+  <systemmodule id="desktop-file-utils">
+    <branch repo="system"
+            version="0.20"/>
+    <systemdependencies>
+      <dep type="path"
+           name="desktop-file-validate"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="device-mapper">
     <branch repo="system"/>
     <systemdependencies>
@@ -44,11 +103,42 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="dotconf">
+    <pkg-config>dotconf.pc</pkg-config>
+    <branch repo="system" version="1.3"/>
+  </systemmodule>
+
+  <systemmodule id="dvdread">
+    <pkg-config>dvdread.pc</pkg-config>
+    <branch repo="system" version="4.2.0"/>
+  </systemmodule>
+
+  <systemmodule id="enchant">
+    <pkg-config>enchant.pc</pkg-config>
+    <branch repo="system"
+            version="1.6.0"/>
+  </systemmodule>
+
+  <systemmodule id="espeak">
+    <branch repo="system" version="1.46.02"/>
+    <systemdependencies>
+      <dep type="c_include" name="espeak/speak_lib.h"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="exiv2">
     <pkg-config>exiv2.pc</pkg-config>
     <branch repo="system" version="0"/>
   </systemmodule>
 
+  <systemmodule id="expat">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include"
+           name="expat.h"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="file">
     <branch repo="system"/>
     <systemdependencies>
@@ -87,6 +177,11 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="gexiv2">
+    <pkg-config>gexiv2.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="gl">
     <pkg-config>gl.pc</pkg-config>
     <branch repo="system"/>
@@ -97,6 +192,36 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="gmime">
+    <pkg-config>gmime-2.6.pc</pkg-config>
+    <branch repo="system"
+            version="2.6.6"/>
+  </systemmodule>
+
+  <systemmodule id="gnutls">
+    <pkg-config>gnutls.pc</pkg-config>
+    <branch repo="system"
+            version="2.12.8"/>
+  </systemmodule>
+
+  <systemmodule id="gpgme">
+    <branch repo="system"
+            version="1.0.0"/>
+    <systemdependencies>
+      <dep type="path"
+           name="gpgme-config"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="gnupg">
+    <branch repo="system"
+            version="1.4"/>
+    <systemdependencies>
+      <dep type="path"
+           name="gpg"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="gperf">
     <branch repo="system"/>
     <systemdependencies>
@@ -104,6 +229,62 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="gudev">
+    <pkg-config>gudev-1.0.pc</pkg-config>
+    <branch repo="system" version="173"/>
+  </systemmodule>
+
+  <systemmodule id="gypsy">
+    <pkg-config>gypsy.pc</pkg-config>
+    <branch repo="system"
+            version="0.8"/>
+  </systemmodule>
+
+  <systemmodule id="highlight">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="highlight"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="icon-naming-utils">
+    <pkg-config>icon-naming-utils.pc</pkg-config>
+    <branch repo="system"
+            version="0.8.90"/>
+  </systemmodule>
+
+  <systemmodule id="intltool">
+    <branch repo="system"
+            version="0.50"/>
+    <systemdependencies>
+      <dep type="path"
+           name="intltoolize"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="js185">
+    <pkg-config>mozjs185.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="json">
+    <pkg-config>json.pc</pkg-config>
+    <branch repo="system"
+            version="0.9"/>
+  </systemmodule>
+
+  <systemmodule id="lcms2">
+    <pkg-config>lcms2.pc</pkg-config>
+    <branch repo="system"
+            version="2.2"/>
+  </systemmodule>
+
+  <systemmodule id="libatasmart">
+    <pkg-config>libatasmart.pc</pkg-config>
+    <branch repo="system"
+            version="0.17"/>
+  </systemmodule>
+
   <systemmodule id="libXcomposite">
     <pkg-config>xcomposite.pc</pkg-config>
     <branch repo="system"/>
@@ -158,6 +339,17 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="libarchive">
+    <pkg-config>libarchive.pc</pkg-config>
+    <branch repo="system" version="2.8.0"/>
+  </systemmodule>
+
+  <systemmodule id="libdaemon">
+    <pkg-config>libdaemon.pc</pkg-config>
+    <branch repo="system"
+            version="0.14"/>
+  </systemmodule>
+
   <systemmodule id="libdb">
     <branch repo="system"/>
     <systemdependencies>
@@ -165,11 +357,37 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="libexif">
+    <pkg-config>libexif.pc</pkg-config>
+    <branch repo="system"
+            version="0.6.19"/>
+  </systemmodule>
+
   <systemmodule id="libffi">
     <pkg-config>libffi.pc</pkg-config>
     <branch repo="system" version="3.0.0"/>
   </systemmodule>
 
+  <systemmodule id="libgcrypt">
+    <branch repo="system"
+            version="1.5.0"/>
+    <systemdependencies>
+      <dep type="c_include" name="gcrypt.h"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="libgphoto2">
+    <pkg-config>libgphoto2.pc</pkg-config>
+    <branch repo="system"
+            version="2.4.13"/>
+  </systemmodule>
+
+  <systemmodule id="libical">
+    <pkg-config>libical.pc</pkg-config>
+    <branch repo="system"
+            version="0.44"/>
+  </systemmodule>
+
   <systemmodule id="libicu">
     <pkg-config>icu-i18n.pc</pkg-config>
     <branch repo="system" version="4"/>
@@ -182,11 +400,50 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="libnl">
+    <pkg-config>libnl-3.0.pc</pkg-config>
+    <branch repo="system"
+            version="3.2.7"/>
+  </systemmodule>
+
+  <systemmodule id="liboauth">
+    <pkg-config>oauth.pc</pkg-config>
+    <branch repo="system"
+            version="0.9.4"/>
+  </systemmodule>
+
   <systemmodule id="libpng">
     <pkg-config>libpng.pc</pkg-config>
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libproxy">
+    <pkg-config>libproxy-1.0.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="libquvi">
+    <pkg-config>libquvi.pc</pkg-config>
+    <branch repo="system" version="0.4.0"/>
+  </systemmodule>
+
+  <systemmodule id="libraw">
+    <pkg-config>libraw.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="libsndfile">
+    <pkg-config>sndfile.pc</pkg-config>
+    <branch repo="system"
+            version="1.0.21"/>
+  </systemmodule>
+
+  <systemmodule id="libtasn1">
+    <pkg-config>libtasn1.pc</pkg-config>
+    <branch repo="system"
+            version="2.7"/>
+  </systemmodule>
+
   <systemmodule id="libtiff">
     <branch repo="system"/>
     <systemdependencies>
@@ -201,6 +458,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="libudev">
+    <pkg-config>libudev.pc</pkg-config>
+    <branch repo="system"
+            version="173"/>
+  </systemmodule>
+
   <systemmodule id="libunistring">
     <branch repo="system"/>
     <systemdependencies>
@@ -238,6 +501,37 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libxklavier">
+    <pkg-config>libxklavier.pc</pkg-config>
+    <branch repo="system"
+            version="5.2.1"/>
+  </systemmodule>
+
+  <systemmodule id="libxml2">
+    <pkg-config>libxml-2.0.pc</pkg-config>
+    <branch repo="system"
+            version="2.7.8"/>
+  </systemmodule>
+
+  <systemmodule id="libxslt">
+    <pkg-config>libxslt.pc</pkg-config>
+    <branch repo="system"
+            version="1.1.26"/>
+  </systemmodule>
+
+  <systemmodule id="libwebp">
+   <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="webp/decode.h"/>
+      </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="libzeitgeist">
+    <pkg-config>zeitgeist-1.0.pc</pkg-config>
+    <branch repo="system"
+            version="0.3.18"/>
+  </systemmodule>
+
   <systemmodule id="mpfr">
     <branch repo="system"/>
     <systemdependencies>
@@ -250,6 +544,25 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="nss">
+    <pkg-config>nss.pc</pkg-config>
+    <branch repo="system"
+            version="3.12.11"/>
+  </systemmodule>
+
+  <systemmodule id="nspr">
+    <pkg-config>nspr.pc</pkg-config>
+    <branch repo="system"
+            version="4.9.2"/>
+  </systemmodule>
+
+  <systemmodule id="openldap">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="ldap.h"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="openssl">
     <pkg-config>libcrypto.pc</pkg-config>
     <branch repo="system"/>
@@ -262,6 +575,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="pixman">
+    <pkg-config>pixman-1.pc</pkg-config>
+    <branch repo="system"
+            version="0.20"/>
+  </systemmodule>
+
   <systemmodule id="ppp">
     <branch repo="system"/>
     <systemdependencies>
@@ -269,11 +588,37 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="python-devel">
+  <systemmodule id="py2cairo">
+    <pkg-config>pycairo.pc</pkg-config>
+    <branch repo="system"
+            version="1.8.2"/>
+  </systemmodule>
+
+  <systemmodule id="py3cairo">
+    <pkg-config>py3cairo.pc</pkg-config>
+    <branch repo="system"
+            version="1.10.0"/>
+  </systemmodule>
+
+  <systemmodule id="python2-devel">
     <pkg-config>python.pc</pkg-config>
     <branch repo="system" version="2.5"/>
   </systemmodule>
 
+  <systemmodule id="python-devel">
+    <pkg-config>python3.pc</pkg-config>
+    <branch repo="system"
+            version="3.2"/>
+  </systemmodule>
+
+  <systemmodule id="ragel">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path"
+           name="ragel"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="readline">
     <branch repo="system"/>
     <systemdependencies>
@@ -288,9 +633,45 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="soundtouch">
-    <pkg-config>soundtouch-1.4.pc</pkg-config>
-    <branch repo="system" version="0"/>
+  <systemmodule id="shared-mime-info">
+    <pkg-config>shared-mime-info.pc</pkg-config>
+    <branch repo="system"
+            version="1.0"/>
+  </systemmodule>
+
+  <systemmodule id="sm">
+    <pkg-config>sm.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="smbclient">
+    <pkg-config>smbclient.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="spamassassin">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="spamassassin"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="speex">
+    <pkg-config>speex.pc</pkg-config>
+    <branch repo="system"
+            version="1.2rc1"/>
+  </systemmodule>
+
+  <systemmodule id="sqlite3">
+    <pkg-config>sqlite3.pc</pkg-config>
+    <branch repo="system"
+            version="3.7.3"/>
+  </systemmodule>
+
+  <systemmodule id="startup-notification">
+    <pkg-config>libstartup-notification-1.0.pc</pkg-config>
+    <branch repo="system"
+            version="0.12"/>
   </systemmodule>
 
   <systemmodule id="taglib">
@@ -298,9 +679,11 @@
     <branch repo="system" version="1.5"/>
   </systemmodule>
 
-  <systemmodule id="udisks">
-    <pkg-config>udisks2.pc</pkg-config>
-    <branch repo="system" version="1.99"/>
+  <systemmodule id="texinfo">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="makeinfo"/>
+    </systemdependencies>
   </systemmodule>
 
   <systemmodule id="wavpack">
@@ -322,6 +705,11 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="xcb-dri2">
+    <pkg-config>xcb-dri2.pc</pkg-config>
+    <branch repo="system" version="1.8.1"/>
+  </systemmodule>
+
   <systemmodule id="xcb-util">
     <pkg-config>xcb-aux.pc</pkg-config>
     <branch repo="system" version="0.1"/>
@@ -351,9 +739,10 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="zlib">
-    <pkg-config>zlib.pc</pkg-config>
-    <branch repo="system" version="1.0"/>
+  <systemmodule id="libarchive">
+    <pkg-config>libarchive.pc</pkg-config>
+    <branch repo="system"
+            version="3.0.0"/>
   </systemmodule>
 
 </moduleset>
diff --git a/gnome-world.modules b/gnome-world.modules
index f1946ab..de73221 100644
--- a/gnome-world.modules
+++ b/gnome-world.modules
@@ -5,15 +5,15 @@
 <moduleset>
   <repository type="git" name="git.gnome.org" default="yes"
       href="git://git.gnome.org/"/>
-  <repository type="git" name="git.clutter-project.org"
-      href="http://git.clutter-project.org/"/>
-  <repository type="tarball" name="clutter-project.org"
-    href="http://source.clutter-project.org/sources/"/>
+  <repository type="svn" name="svn.abisource.com"
+      href="http://svn.abisource.com/"/>
   <repository type="cvs" name="cairo.freedesktop.org"
       cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/cairo"
       password=""/>
   <repository type="git" name="gstreamer.freedesktop.org"
       href="git://anongit.freedesktop.org/gstreamer/"/>
+  <repository type="git" name="fprint.freedesktop.org"
+      href="git://anongit.freedesktop.org/libfprint/"/>
   <repository type="cvs" name="elysium-project.sf.net"
       cvsroot=":pserver:anonymous elysium-project cvs sourceforge net:/cvsroot/elysium-project"
       password=""/>
@@ -92,8 +92,8 @@
       href="git://gitorious.org/"/>
   <repository type="tarball" name="samba.org"
       href="http://samba.org/samba/ftp/"/>
-  <repository type="hg" name="hg.sourceforge.net"
-    href="http://hg.sourceforge.net/"/>
+  <repository type="hg" name="hg.code.sf.net"
+    href="http://hg.code.sf.net/p/"/>
   <repository type="tarball" name="sourceforge.net"
       href="http://prdownloads.sourceforge.net/sourceforge/"/>
   <repository type="svn" name="xchat.sf.net"
@@ -107,8 +107,25 @@
       href="http://download.gnome.org/sources/"/>
   <repository type="git" name="yorba.org"
       href="git://yorba.org/"/>
-
-  <include href="gnome-apps.modules"/>
+  <repository type="git" name="fedorahosted.org"
+      href="git://git.fedorahosted.org/git/"/>
+  <repository type="svn" name="opalvoip.sf.net"
+      href="https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/"/>
+
+  <repository type="tarball" name="dbus"
+    href="http://dbus.freedesktop.org/releases/"/>
+  <repository type="tarball" name="mono.net"
+    href="http://download.mono-project.com/sources/"/>
+  <repository type="tarball" name="launchpad.net/tarball"
+      href="https://launchpad.net/"/>
+  <repository type="tarball" name="monogithub"
+    href="https://github.com/downloads/mono/dbus-sharp/"/>
+  <repository type="tarball" name="github.com/metabrainz"
+      href="https://github.com/downloads/metabrainz/"/>
+  <repository type="tarball" name="downloads.sourceforge.net"
+      href="http://downloads.sourceforge.net/"/>
+
+  <include href="gnome-apps-3.8.modules"/>
 
   <autotools id="alacarte">
     <branch/>
@@ -119,8 +136,41 @@
     </dependencies>
   </autotools>
 
+  <autotools id="dbus-python">
+    <branch module="dbus-python/dbus-python-0.83.1.tar.gz" version="0.83.1"
+            repo="dbus"
+            hash="sha256:ce283806f1af4f2322e183a276528a880b503c74972932bd09f06bdb7fcc1b99"
+            size="533391"/>
+    <dependencies>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+    <suggests>
+      <dep package="pygobject-python2"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="easytag">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <!-- GTK+ 3 support is still experimental. -->
+      <dep package="gtk+-2"/>
+      <dep package="intltool"/>
+    </dependencies>
+    <suggests>
+      <dep package="flac"/>
+      <!-- <dep package="id3tag" -->
+      <!-- <dep package="id3lib" -->
+      <dep package="libvorbis"/>
+      <dep package="speex"/>
+      <dep package="taglib"/>
+      <dep package="wavpack"/>
+    </suggests>
+  </autotools>
+
   <cmake id="geary">
-    <branch repo="yorba.org" module="geary"/>
+    <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gmime"/>
@@ -161,6 +211,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-doc-utils" supports-parallel-builds="no">
+    <branch/>
+    <dependencies>
+      <dep package="gettext"/>
+      <dep package="gnome-common"/>
+      <dep package="libxslt"/>
+      <dep package="libxml2"/>
+      <dep package="intltool"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-photos">
     <branch/>
     <dependencies>
@@ -176,6 +237,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-software">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="PackageKit"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gxml">
     <branch/>
     <dependencies>
@@ -195,34 +265,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="mx">
-    <branch repo="clutter-project.org"
-            module="mx/1.4/mx-1.4.3.tar.xz"
-            version="1.4.3"
-            hash="sha256:d0c259a7bcaf130a17cef00ed4c7118287f05790a6b50bcffa02668130336eb5"
-            size="951232"/>
-    <dependencies>
-      <dep package="clutter"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-      <dep package="startup-notification"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="cluttersmith">
-    <branch repo="git.clutter-project.org"/>
-    <dependencies>
-      <dep package="gjs"/>
-      <dep package="glib"/>
-      <dep package="clutter"/>
-      <dep package="clutter-gtk"/>
-      <dep package="mx"/>
-    </dependencies>
-  </autotools>
-
-  <waf id="hamster-applet" check-target="false">
+  <waf id="hamster-applet">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
@@ -240,6 +283,28 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgee-0.6">
+    <pkg-config>gee-1.0.pc</pkg-config>
+    <branch module="libgee"
+            revision="0.6"
+            checkoutdir="libgee-0.6"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgnome-keyring">
+    <branch/>
+    <dependencies>
+      <dep package="gnome-common"/>
+      <dep package="intltool"/>
+      <dep package="dbus"/>
+      <dep package="libgcrypt"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libunique-1">
     <branch module="libunique/1.1/libunique-1.1.6.tar.bz2" repo="gnome.org"
             version="1.1.6" checkoutdir="libunique-1.1.6"
@@ -361,7 +426,8 @@
     </suggests>
   </autotools>
 
-  <cmake id="libgit2">
+  <cmake id="libgit2"
+         cmakeargs="-DTHREADSAFE:BOOL=1">
     <branch repo="github.com" module="libgit2/libgit2.git" checkoutdir="libgit2" revision="development"/>
   </cmake>
 
@@ -387,10 +453,11 @@
       <dep package="libpeas"/>
       <dep package="vala"/>
       <dep package="WebKit"/>
+      <dep package="gtkspell-3"/>
     </dependencies>
     <suggests>
       <dep package="glade"/>
-      <dep package="pygobject2"/>
+      <dep package="pygobject"/>
     </suggests>
   </autotools>
 
@@ -420,10 +487,12 @@
   <autotools id="libdmapsharing">
     <branch/>
     <dependencies>
-      <dep package="glib"/>
       <dep package="avahi"/>
+      <dep package="glib"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="libgee"/>
       <dep package="libsoup"/>
-      <dep package="gst-plugins-base-0.10"/>
     </dependencies>
   </autotools>
 
@@ -436,6 +505,11 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libva">
+    <branch repo="git.freedesktop.org"
+            module="vaapi/libva"/>
+  </autotools>
+
   <autotools id="gstreamer-vaapi">
     <branch repo="gitorious.org" module="vaapi/gstreamer-vaapi"/>
     <dependencies>
@@ -445,12 +519,32 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libva">
-    <branch repo="git.freedesktop.org" module="vaapi/libva" revision="v1.0-branch"/>
+  <autotools id="libva-intel-driver">
+    <branch repo="git.freedesktop.org"
+            checkoutdir="libva-intel-driver"
+            module="vaapi/intel-driver"
+            revision="v1.0-branch"/>
+    <dependencies>
+      <dep package="libva"/>
+    </dependencies>
   </autotools>
 
-  <autotools id="libva-intel-driver">
-    <branch repo="git.freedesktop.org" checkoutdir="libva-intel-driver" module="vaapi/intel-driver" 
revision="v1.0-branch"/>
+  <autotools id="libva-vdpau-driver">
+    <branch repo="git.freedesktop.org"
+            checkoutdir="libva-vdpau-driver"
+            module="vaapi/vdpau-driver"/>
+    <dependencies>
+      <dep package="libva"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libva-xvba-driver">
+    <branch repo="git.freedesktop.org"
+            checkoutdir="libva-xvba-driver"
+            module="vaapi/xvba-driver"/>
+    <dependencies>
+      <dep package="libva"/>
+    </dependencies>
   </autotools>
 
   <autotools id="gst-plugins-bad-0.10"
@@ -493,17 +587,24 @@
   </autotools>
 
   <autotools id="gst-libav"
-             autogenargs="--disable-tests"
-             supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org"
-            module="gst-ffmpeg"/>
+             autogenargs="--disable-fatal-warnings">
+    <branch repo="gstreamer.freedesktop.org"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gst-python"
+  <autotools id="gst-python">
+    <branch repo="gstreamer.freedesktop.org"/>
+    <dependencies>
+      <dep package="pygobject-python2"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-python-0.10"
              makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS="
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
@@ -516,6 +617,23 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libfprint">
+    <branch repo="fprint.freedesktop.org" module="libfprint"/>
+    <dependencies>
+      <dep package="libusb1"/>
+      <dep package="nss"/>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="fprintd">
+    <branch repo="fprint.freedesktop.org" module="fprintd"/>
+    <dependencies>
+      <dep package="libfprint"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="planner">
     <branch/>
     <dependencies>
@@ -568,13 +686,24 @@
     </dependencies>
   </distutils>
 
+  <autotools id="pyatspi2-python2" autogenargs="--with-python=python2">
+    <branch module="pyatspi2" checkoutdir="pyatspi2-python2"/>
+    <dependencies>
+      <dep package="pygobject-python2"/>
+    </dependencies>
+    <suggests>
+      <dep package="at-spi2-core"/>
+    </suggests>
+  </autotools>
+
   <distutils id="dogtail">
-    <branch/>
+    <branch repo="fedorahosted.org" module="dogtail.git"/>
     <dependencies>
-      <dep package="pyspi"/>
+      <dep package="py2cairo"/>
+      <dep package="pyatspi2-python2"/>
+      <dep package="pygobject-python2"/>
+      <dep package="pygtk"/>
     </dependencies>
-    <after>
-    </after>
   </distutils>
 
   <autotools id="tinymail" autogenargs="--with-platform=gnome-desktop">
@@ -766,7 +895,7 @@
   </autotools>
 
   <tarball id="gob2" version="2.0.15">
-    <source href="http://ftp.5z.com/pub/gob/gob2-2.0.15.tar.gz";
+    <source href="http://ftp.5z.com/pub/gob/old/gob2-2.0.15.tar.gz";
             hash="sha256:8d51dba71308e0fdff24c95f9e5551faec0eac334f6256d802035c6d64e5cd40"
             md5sum="0c5ab18305fc37902d202a253fdb28b1" size="257582"/>
     <dependencies>
@@ -790,13 +919,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="epiphany-extensions">
-    <branch/>
-    <dependencies>
-      <dep package="epiphany"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="galeon">
     <branch/>
     <dependencies>
@@ -922,7 +1044,7 @@
       <dep package="goocanvasmm"/>
       <dep package="libepc"/>
       <dep package="evince"/>
-      <dep package="pygobject"/>
+      <dep package="pygobject-python2"/>
     </dependencies>
   </autotools>
 
@@ -957,7 +1079,7 @@
       <dep package="gnome-python-extras"/>
       <dep package="pygtk"/>
       <dep package="gstreamer-0.10"/>
-      <dep package="gst-python"/>
+      <dep package="gst-python-0.10"/>
     </dependencies>
   </autotools>
 
@@ -979,8 +1101,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gst-editing-services"
-             makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS=">
+  <autotools id="gst-editing-services">
     <branch repo="gstreamer.freedesktop.org"
             module="gst-editing-services"/>
     <dependencies>
@@ -1000,7 +1121,8 @@
       <dep package="gst-editing-services"/>
       <dep package="gst-plugins-base"/>
       <dep package="gst-plugins-good"/>
-      <dep package="pygobject"/>
+      <dep package="gst-python"/>
+      <dep package="pygobject-python2"/>
       <dep package="py2cairo"/>
     </dependencies>
   </autotools>
@@ -1073,14 +1195,10 @@
     <branch/>
   </autotools>
 
-  <autotools id="mobile-broadband-provider-info">
-    <branch/>
-  </autotools>
-
   <autotools id="xdg-user-dirs-gtk">
     <branch/>
     <dependencies>
-      <dep package="gtk+-2"/>
+      <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
@@ -1149,7 +1267,6 @@
       <dep package="gupnp-av"/>
       <dep package="gupnp-tools"/>
       <dep package="rhythmbox-gupnp"/>
-      <dep package="gupnp-vala"/>
     </dependencies>
   </metamodule>
 
@@ -1314,6 +1431,13 @@
    </dependencies>
  </autotools>
 
+ <tarball id="liboil" version="0.3.17">
+   <pkg-config>liboil-0.3.pc</pkg-config>
+   <source href="http://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz";
+           hash="sha256:105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69"
+           size="912563"/>
+ </tarball>
+
  <autotools id="gst-fluendo-mp3"
             autogenargs="--with-liboil=yes">
    <branch repo="svn.fluendo.com" />
@@ -1341,7 +1465,7 @@
      <dep package="gsettings-desktop-schemas"/>
      <dep package="libchamplain"/>
      <dep package="libgdata"/>
-     <dep package="pygobject"/>
+     <dep package="pygobject-python2"/>
    </suggests>
  </autotools>
 
@@ -1391,8 +1515,9 @@
  <distutils id="d-feet">
    <branch/>
    <dependencies>
-     <dep package="pygtk"/>
-     <dep package="dbus-python"/>
+     <dep package="pygobject"/>
+     <dep package="glib"/>
+     <dep package="gtk+"/>
    </dependencies>
  </distutils>
 
@@ -1428,8 +1553,8 @@
   </tarball>
 
   <autotools id="gtkspell-3">
-    <branch repo="hg.sourceforge.net"
-            module="gtkspell/gtkspell"
+    <branch repo="hg.code.sf.net"
+            module="gtkspell/code"
             checkoutdir="gtkspell"/>
     <dependencies>
       <dep package="gtk+"/>
@@ -1502,7 +1627,7 @@
     </dependencies>
   </autotools>
 
-  <distutils id="postr" autogen-sh="autoreconf">
+  <distutils id="postr">
    <branch/>
    <dependencies>
      <dep package="pygtk"/>
@@ -1510,7 +1635,7 @@
    </dependencies>
   </distutils>
 
-  <distutils id="zebu" autogen-sh="autoreconf">
+  <distutils id="zebu">
     <branch repo="bzr.burtonini.com" module="zebu" checkoutdir="zebu"/>
    <dependencies>
      <dep package="pygtk"/>
@@ -1538,7 +1663,7 @@
     <branch repo="flumotion.code.fluendo.com" module="flumotion/trunk" checkoutdir="flumotion"/>
     <dependencies>
       <dep package="kiwi"/>
-      <dep package="gst-python"/>
+      <dep package="gst-python-0.10"/>
       <!-- <dep package="twisted-core"/> -->
     </dependencies>
   </autotools>
@@ -1577,7 +1702,7 @@
   <autotools id="libfakekey">
     <branch repo="matchbox-project.org"
             module="libfakekey/0.1/libfakekey-0.1.tar.bz2" version="0.1"
-            size="203504" md5="83dbde4d77e8baf0176fe4291d8a2303"/>
+            size="203504" md5sum="83dbde4d77e8baf0176fe4291d8a2303"/>
   </autotools>
 
   <autotools id="gir-repository">
@@ -1620,7 +1745,7 @@
       <dep package="libgee-0.6"/>
       <dep package="libnotify"/>
       <dep package="libsoup"/>
-      <dep package="pygobject"/>
+      <dep package="pygobject-python2"/>
       <dep package="vala"/>
     </dependencies>
   </autotools>
@@ -1712,8 +1837,9 @@
     </suggests>
   </autotools>
 
-  <autotools id="gst-rtsp-server">
-    <branch repo="gstreamer.freedesktop.org" module="gst-rtsp-server"/>
+  <autotools id="gst-rtsp-server-0.10">
+    <branch repo="gstreamer.freedesktop.org" module="gst-rtsp-server"
+            revision="0.10" checkoutdir="gst-rtsp-server-0.10"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gstreamer-0.10"/>
@@ -1721,19 +1847,28 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gst-rtsp-server">
+    <branch repo="gstreamer.freedesktop.org" module="gst-rtsp-server"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-dvb-daemon">
    <branch />
    <dependencies>
      <dep package="glib"/>
      <dep package="gstreamer-0.10"/>
-     <dep package="gst-rtsp-server"/>
+     <dep package="gst-rtsp-server-0.10"/>
      <dep package="vala"/>
      <dep package="gst-plugins-good-0.10"/>
      <dep package="gst-plugins-bad-0.10"/>
      <dep package="libgee-0.6"/>
      <dep package="sqlite3"/>
      <dep package="pygobject2"/>
-     <dep package="gst-python"/>
+     <dep package="gst-python-0.10"/>
    </dependencies>
   </autotools>
 
@@ -2340,20 +2475,14 @@
   </autotools>
 
   <autotools id="gtkparasite">
-    <branch repo="github.com" module="hadess/gtkparasite.git" checkoutdir="gtkparasite"/>
-    <dependencies>
-      <dep package="gtk+"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-shell-extensions">
     <branch/>
     <dependencies>
-      <dep package="gnome-shell"/>
+      <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
   <autotools id="gst-plugins-ugly"
+             autogenargs="--disable-fatal-warnings"
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             checkoutdir="gst-plugins-ugly"
@@ -2368,10 +2497,11 @@
     <branch/>
   </autotools>
 
-  <autotools id="ostree">
+  <autotools id="ostree"  autogenargs="--with-libarchive">
     <branch/>
     <dependencies>
       <dep package="libsoup"/>
+      <dep package="libarchive"/>
     </dependencies>
   </autotools>
 
@@ -2379,21 +2509,10 @@
     <branch/>
     <dependencies>
       <dep package="ostree"/>
+      <dep package="gjs"/>
     </dependencies>
   </autotools>
 
-  <distutils id="gnome-clocks">
-    <branch/>
-    <dependencies>
-      <dep package="pygobject"/>
-      <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-      <dep package="clutter-gtk"/>
-      <dep package="libgweather"/>
-      <dep package="libnotify"/>
-    </dependencies>
-  </distutils>
-
   <autotools id="latexila">
     <branch/>
     <dependencies>
@@ -2422,4 +2541,712 @@
     </suggests>
   </autotools>
 
+  <autotools id="bijiben">
+    <branch/>
+    <dependencies>
+      <dep package="tracker"/>
+      <dep package="clutter-gtk"/>
+      <dep package="gtk+"/>
+      <dep package="libxml2"/>
+      <dep package="glib"/>
+      <dep package="WebKit"/>
+    </dependencies>
+  </autotools>
+
+  <!-- ########## Gnome Flashback Modules ########## -->
+
+  <autotools id="gnome-panel">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gnome-desktop"/>
+      <dep package="libwnck"/>
+      <dep package="evolution-data-server"/>
+      <dep package="gnome-menus"/>
+      <dep package="dbus-glib"/>
+      <dep package="librsvg"/>
+      <dep package="libgweather"/>
+      <dep package="libcanberra"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+    <suggests>
+      <dep package="polkit"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="metacity">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gtk+-2"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="intltool"/>
+      <dep package="libcanberra"/>
+      <dep package="zenity"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="notification-daemon">
+    <branch/>
+    <dependencies>
+      <dep package="dbus"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-screensaver">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="dbus-glib"/>
+      <dep package="gnome-menus"/>
+      <dep package="gnome-desktop"/>
+      <dep package="libgnomekbd"/>
+    </dependencies>
+    <suggests>
+      <dep package="libnotify"/>
+    </suggests>
+  </autotools>
+
+ <autotools id="polkit-gnome" autogenargs="--with-gtk=3.0">
+    <branch checkoutdir="polkit-gnome" module="PolicyKit-gnome"/>
+    <dependencies>
+      <dep package="polkit"/>
+      <dep package="gtk+"/>
+      <dep package="intltool"/>
+    </dependencies>
+  </autotools>
+
+  <metamodule id="meta-gnome-flashback">
+    <dependencies>
+      <dep package="gnome-panel"/>
+      <dep package="metacity"/>
+      <dep package="notification-daemon"/>
+    </dependencies>
+  </metamodule>
+
+  <!-- ########## End of Gnome Flashback Modules ########## -->
+
+  <autotools id="babl">
+    <branch/>
+  </autotools>
+
+  <autotools id="librsync">
+    <branch repo="downloads.sourceforge.net"
+            module="librsync/librsync-0.9.7.tar.gz"
+            version="0.9.7"
+            hash="sha256:6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6"
+            size="453802"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <distutils id="duplicity">
+    <branch repo="launchpad.net/tarball"
+            module="duplicity/0.6-series/0.6.15/+download/duplicity-0.6.15.tar.gz"
+            version="0.6.15"
+            hash="sha256:69f30388334b84db43ed4eb7838896a73cf53d62718c692a88ab3d3963e1dfad"
+            size="304916"/>
+    <dependencies>
+      <dep package="pygobject2"/>
+      <dep package="librsync"/>
+    </dependencies>
+  </distutils>
+
+  <!-- Other useful deps that you can install are:  -->
+  <!--   libjpeg                                    -->
+  <!--   libpng                                     -->
+  <!--   OpenEXR (see http://www.openexr.com/)      -->
+  <!--   libsdl                                     -->
+  <!--   enscript                                   -->
+  <!--   libavcodec                                 -->
+  <!-- Those are not managed by jhbuild             -->
+  <autotools id="gegl">
+    <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="gnome-applets" autogenargs="--without-hal --enable-mixer-applet --enable-mini-commander">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gnome-panel"/>
+      <dep package="libgtop"/>
+      <dep package="libgnomekbd"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gucharmap"/>
+      <dep package="libgweather"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gtk+"/>
+      <dep package="glib"/>
+      <dep package="gconf"/>
+      <dep package="libxklavier" />
+      <dep package="libwnck"/>
+      <dep package="libnotify"/>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+      <dep package="pygobject2"/>
+      <dep package="gnome-icon-theme"/>
+      <dep package="libxml2"/>
+      <dep package="polkit"/>
+      <dep package="NetworkManager"/>
+    </dependencies>
+    <after>
+      <dep package="gnome-control-center"/>
+    </after>
+  </autotools>
+
+  <autotools id="gnome-search-tool">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="goffice">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libgsf"/>
+      <dep package="libxml2"/>
+      <dep package="pango"/>
+      <dep package="librsvg"/>
+      <dep package="cairo"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gstreamer-0.10"
+             autogenargs="--disable-tests --disable-fatal-warnings"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gstreamer"
+            revision="0.10"
+            checkoutdir="gstreamer-0.10"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libxml2"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-base-0.10"
+             autogenargs="--with-gtk=3.0 --disable-tests --disable-gnome_vfs"
+             makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS="
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-plugins-base"
+            revision="0.10"
+            checkoutdir="gst-plugins-base-0.10"/>
+    <dependencies>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gtk+"/>
+    </dependencies>
+    <suggests>
+      <dep package="gudev"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gst-plugins-good-0.10" autogenargs="--with-gtk=3.0 --disable-tests --disable-examples" 
makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS=" 
supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-good" revision="0.10"/>
+    <dependencies>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="flac"/>
+      <dep package="libv4l"/>
+      <dep package="libvpx"/>
+      <dep package="taglib"/>
+      <dep package="wavpack"/>
+    </dependencies>
+    <suggests>
+      <dep package="pulseaudio"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gudev"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gtk-sharp" autogen-sh="bootstrap-2.12">
+    <branch repo="github.com" module="mono/gtk-sharp.git" checkoutdir="gtk-sharp"
+            revision="gtk-sharp-2-12-branch"/>
+    <dependencies>
+      <dep package="mono"/>
+      <dep package="gtk+-2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libxml++">
+    <branch/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="glibmm"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="mono">
+    <branch module="mono/mono-2.6.7.tar.bz2" version="2.6.7"
+            repo="mono.net"
+            hash="sha256:ae21a997d72e2fb8ea88644c87ab52471e9c97117b937e205ea1835b5a028ce4"
+            size="27921963"/>
+    <dependencies>
+      <dep package="libgdiplus"/>
+      <dep package="sqlite3"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="mono-addins">
+    <branch module="mono-addins/mono-addins-0.4.tar.bz2" version="0.4"
+            repo="mono.net"
+            hash="sha256:d0fa0eec4e95c8cdfefc8961d7666d6137064df1b599a6489acf17e22fbc3e2e"
+            size="304402"/>
+    <dependencies>
+      <dep package="mono"/>
+      <dep package="gtk-sharp"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="dbus-sharp">
+    <branch repo="monogithub" module="dbus-sharp-0.7.0.tar.gz" version="0.7.0"
+            hash="sha256:92529aef9063f477d1975947c6388c63d03234018f45d007c07716dd3e21dd41"
+            size="127651">
+      <patch file="dbus-sharp-0.7.0-pkgconfig.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="dbus"/>
+      <dep package="mono"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="dbus-sharp-glib">
+    <branch repo="monogithub"
+            module="dbus-sharp-glib-0.5.0.tar.gz"
+            version="0.5.0"
+            hash="256:f4fd663957f06ac5f0322beab264c5498bf6408f7435d0387950b4cb7996180e"
+            size="95405"/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-sharp">
+    <branch repo="gnome.org"
+            module="gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2"
+            version="2.24.2"
+            hash="sha256:122b1e03966d63ec3389decf5440fb94285907d1b6be48352dcf6aca292cf7b0"
+            size="421281"/>
+    <dependencies>
+      <dep package="mono"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="opal" autogenargs="--disable-vpb">
+    <branch repo="opalvoip.sf.net" module="opal/branches/v3_10"/>
+    <dependencies>
+      <dep package="ptlib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="ptlib">
+    <branch repo="opalvoip.sf.net" module="ptlib/branches/v2_10"/>
+  </autotools>
+
+  <repository type="tarball" name="taglib-sharp"
+      href="download.banshee.fm/"/>
+
+  <autotools id="taglib-sharp" autogenargs="--disable-docs">
+    <branch module="taglib-sharp/2.0.3.7/taglib-sharp-2.0.3.7.tar.gz" version="2.0.3.7"
+        repo="taglib-sharp"
+        hash="sha256:cf9515928bd25b37816cd78ef8a2e0f6d14ebabdafe344214b02034791e895fa"
+        size="2287272"/>
+    <dependencies>
+      <dep package="mono"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="wv">
+    <branch repo="downloads.sourceforge.net"
+            module="wvware/wv-1.2.4.tar.gz"
+            version="1.2.4"
+            hash="sha256:673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6"
+            size="629554"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libgsf"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="abiword">
+    <branch repo="svn.abisource.com"/>
+    <dependencies>
+      <dep package="cairo"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libxml2"/>
+      <dep package="libgsf"/>
+      <dep package="wv"/>
+    </dependencies>
+    <suggests>
+      <dep package="enchant"/>
+      <dep package="goffice"/>
+      <dep package="gucharmap"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="banshee" autogenargs="--disable-daap --disable-boo --disable-ipod --disable-mtp">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gconf"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gst-plugins-good-0.10"/>
+      <dep package="mono"/>
+      <dep package="gtk-sharp"/>
+      <dep package="taglib-sharp"/>
+      <dep package="mono-addins"/>
+      <dep package="dbus-sharp"/>
+      <dep package="dbus-sharp-glib"/>
+      <dep package="sqlite3"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="deja-dup">
+    <branch repo="launchpad.net"
+            module="deja-dup/26"
+            checkoutdir="deja-dup/"/>
+    <dependencies>
+      <dep package="duplicity"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libnotify"/>
+      <dep package="libsecret"/>
+      <dep package="vala"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+    <suggests>
+      <dep package="nautilus"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="f-spot">
+    <branch/>
+    <dependencies>
+      <dep package="gtk-sharp"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gthumb">
+    <branch/>
+    <dependencies>
+      <dep package="clutter"/>
+      <dep package="glib"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gtk+"/>
+      <dep package="libgnome-keyring"/>
+      <dep package="librsvg"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gimp" autogenargs="--disable-print --without-gnomevfs">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-2"/>
+      <dep package="intltool"/>
+      <dep package="gegl"/>
+    </dependencies>
+    <suggests>
+      <dep package="iso-codes"/>
+      <dep package="WebKit"/>
+      <dep package="librsvg"/>
+      <dep package="poppler"/>
+      <dep package="libgnome-keyring"/>
+      <dep package="dbus-glib"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gnome-media">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="gconf"/>
+      <dep package="libcanberra"/>
+      <dep package="libxml2"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="libgnome-media-profiles"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-tweak-tool">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="pygobject-python2"/>
+      <dep package="gsettings-desktop-schemas"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnote">
+    <branch/>
+    <dependencies>
+      <dep package="glibmm"/>
+      <dep package="libxml2"/>
+      <dep package="libxml++"/>
+      <dep package="gtkmm"/>
+    </dependencies>
+    <suggests>
+      <dep package="libpanelappletmm"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gnumeric">
+    <branch/>
+    <dependencies>
+      <dep package="goffice"/>
+      <dep package="gtk+"/>
+      <dep package="libgsf"/>
+      <dep package="libxml2"/>
+      <dep package="pygobject-python2"/>
+      <dep package="pango"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="inkscape">
+    <branch repo="launchpad.net"
+            module="inkscape"
+            checkoutdir="inkscape/"/>
+    <dependencies>
+      <dep package="gtkmm"/>
+      <dep package="libxslt"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgdiplus">
+    <branch module="libgdiplus/libgdiplus-1.2.6.tar.bz2" version="1.2.6"
+            repo="mono.net"
+            hash="sha256:5eb1a7a8d3b75c751eac6075239469059238082aee1963bc6a172b3073046cfe"
+            size="2897855">
+    </branch>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgnome-media-profiles">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="gconf"/>
+      <dep package="gst-plugins-base-0.10"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="rarian" supports-non-srcdir-builds="no">
+    <!-- Always build rarian due to some distributions providing rarian-compat
+                  package. (see https://bugzilla.gnome.org/show_bug.cgi?id=670917)
+         rarian can be sysdeps again when GNOME bug 671042 is fixed. -->
+    <!-- <pkg-config>rarian.pc</pkg-config> -->
+    <branch repo="gnome.org"
+            module="rarian/0.8/rarian-0.8.1.tar.bz2"
+            version="0.8.1"
+            hash="sha256:aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"
+            size="324441"/>
+    <dependencies>
+      <dep package="libxslt"/>
+      <dep package="intltool"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="simple-scan">
+    <branch repo="launchpad.net"
+            module="~simple-scan-team/simple-scan/trunk"
+            checkoutdir="simple-scan/"/>
+    <dependencies>
+      <dep package="cairo"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="gudev"/>
+      <dep package="vala"/>
+    </dependencies>
+    <suggests>
+      <dep package="colord"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="ekiga">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="gtk+-2"/>
+      <dep package="libxml2"/>
+      <dep package="libboost"/>
+      <dep package="libXv"/>
+      <dep package="opal" />
+      <dep package="evolution-data-server"/>
+    </dependencies>
+    <suggests>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+      <dep package="avahi"/>
+      <dep package="libsoup"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gnome-power-manager">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="dbus-glib"/>
+      <dep package="gtk+"/>
+      <dep package="libgnome-keyring"/>
+      <dep package="gnome-doc-utils"/>
+      <dep package="upower"/>
+      <dep package="libnotify"/>
+      <dep package="libcanberra"/>
+      <dep package="gnome-control-center"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="pygobject2" autogenargs="--disable-introspection">
+    <pkg-config>pygobject-2.0.pc</pkg-config>
+    <branch repo="gnome.org"
+            module="pygobject/2.28/pygobject-2.28.6.tar.bz2"
+            version="2.28.6"
+            hash="sha256:e4bfe017fa845940184c82a4d8949db3414cb29dfc84815fb763697dc85bdcee"
+            size="888240"/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="rhythmbox">
+    <branch/>
+    <dependencies>
+      <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gnome-doc-utils"/>
+      <dep package="grilo"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gtk+"/>
+      <dep package="gudev"/>
+      <dep package="json-glib"/>
+      <dep package="libnotify"/>
+      <dep package="libpeas"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="pygobject-python2"/>
+      <dep package="totem-pl-parser"/>
+    </dependencies>
+    <suggests>
+      <dep package="avahi"/>
+      <dep package="brasero"/>
+      <dep package="libdmapsharing"/>
+      <dep package="libgnome-keyring"/>
+      <dep package="vala"/>
+      <dep package="WebKit"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="libunique">
+    <pkg-config>unique-3.0.pc</pkg-config>
+    <branch module="libunique/3.0/libunique-3.0.2.tar.bz2" repo="gnome.org"
+            version="3.0.2" checkoutdir="libunique-3.0.2"
+            hash="sha256:50269a87c7aabf1e25f01b3bbb280133138ffd7b6776289894c614a4b6ca968d"
+            size="342778"/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="shotwell">
+    <branch repo="yorba.org" module="shotwell"/>
+    <dependencies>
+      <dep package="gexiv2"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gudev"/>
+      <dep package="libgee-0.6"/>
+      <dep package="libraw"/>
+      <dep package="libsoup"/>
+      <dep package="libunique"/>
+      <dep package="libxml2"/>
+      <dep package="sqlite3"/>
+      <dep package="vala"/>
+      <dep package="WebKit"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="sound-juicer">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="gnome-doc-utils"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-good"/>
+      <dep package="brasero"/>
+      <dep package="libmusicbrainz"/>
+      <dep package="libcanberra"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="tomboy">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk-sharp"/>
+      <dep package="dbus-sharp"/>
+      <dep package="dbus-sharp-glib"/>
+      <dep package="gnome-doc-utils"/>
+      <dep package="gnome-sharp"/>
+      <dep package="mono-addins"/>
+    </dependencies>
+    <suggests>
+      <dep package="gtkspell"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gnome-weather">
+    <branch revision="gnome-3-8"/>
+    <dependencies>
+      <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="intltool"/>
+      <dep package="libgweather"/>
+      <dep package="gjs"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>


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