[jhbuild] Remove unneeded deps and sort alphabetically

[William Jon McCann <mccann src gnome org>]

commit 5d7e98fe4e65a6fb85b9f07c6b4980e8c32c26fe
Author: William Jon McCann <jmccann redhat com>
Date:   Mon Oct 11 18:27:46 2010 -0400

    Remove unneeded deps and sort alphabetically

 modulesets/gnome-suites-core-3.0.modules      |  324 +-----
 modulesets/gnome-suites-core-deps-3.0.modules | 1518 ++++++++++++-------------
 2 files changed, 779 insertions(+), 1063 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.0.modules b/modulesets/gnome-suites-core-3.0.modules
index 44c6c6f..e76c049 100644
--- a/modulesets/gnome-suites-core-3.0.modules
+++ b/modulesets/gnome-suites-core-3.0.modules
@@ -5,8 +5,6 @@
 <moduleset>
   <repository type="git" name="git.gnome.org" default="yes"
       href="git://git.gnome.org/"/>
-  <repository type="git" name="gstreamer.freedesktop.org"
-      href="git://anongit.freedesktop.org/gstreamer/"/>
   <repository type="git" name="git.freedesktop.org"
       href="git://anongit.freedesktop.org/git/"/>
   <repository type="git" name="clutter-project.org" href="git://git.clutter-project.org/"/>
@@ -14,123 +12,12 @@
       href="git://git.kernel.org/pub/scm/"/>
   <repository type="tarball" name="dbus"
       href="http://dbus.freedesktop.org/releases/"/>
+  <repository type="tarball" name="0pointer.de"
+      href="http://0pointer.de/lennart/projects/"/>
 
-<!-- This is a special module: it's needed to build from svn, but not
-     needed to build from tarballs, so it doesn't need to be in our suites
-     and it doesn't need to be an external dependency -->
-  <autotools id="gnome-common">
-    <branch/>
-  </autotools>
-
-  <include href="gnome-suites-core-deps-3.0.modules"/>
-
-
-<!-- Build dependencies -->
-
-  <autotools id="gnome-doc-utils">
-    <branch/>
-    <dependencies>
-      <dep package="libxslt"/>
-      <dep package="intltool"/>
-      <dep package="rarian"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gtk-doc">
-    <branch/>
-    <dependencies>
-      <dep package="libxslt"/>
-      <dep package="rarian"/>
-      <dep package="gnome-doc-utils"/>
-    </dependencies>
-  </autotools>
-
-
-<!-- OS Shell Platform stuff -->
-
-  <autotools id="atk">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gnome-doc-utils"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="glib">
-    <branch/>
-    <dependencies>
-      <dep package="gtk-doc"/>
-    </dependencies>
-    <after>
-      <dep package="shared-mime-info"/>
-    </after>
-  </autotools>
-
-  <autotools id="gdk-pixbuf">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gtk+-3">
-    <branch checkoutdir="gtk+-3" module="gtk+"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="pango"/>
-      <dep package="atk"/>
-      <dep package="gdk-pixbuf"/>
-    </dependencies>
-    <after>
-      <dep package="shared-mime-info"/>
-    </after>
-  </autotools>
-
-  <autotools id="gtk+">
-    <branch revision="gtk-2-24"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="pango"/>
-      <dep package="atk"/>
-      <dep package="gdk-pixbuf"/>
-    </dependencies>
-    <after>
-      <dep package="shared-mime-info"/>
-    </after>
-  </autotools>
-
-  <autotools id="clutter">
-    <branch repo="clutter-project.org"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="pango"/>
-      <dep package="gtk-doc"/>
-      <dep package="json-glib"/>
-    </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-      <dep package="gdk-pixbuf"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="pango">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-common"/>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-    </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
-    <after>
-      <dep package="libXft"/>
-    </after>
-  </autotools>
+<include href="gnome-suites-core-deps-3.0.modules"/>
 
+<!-- Please try to keep organized alphabetically by section -->
 
 <!-- Core User Shell -->
 
@@ -204,31 +91,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="empathy" autogenargs="--enable-gtk3">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="gtk+-3"/>
-      <dep package="gconf"/>
-      <dep package="libunique-3"/>
-      <dep package="telepathy-glib"/>
-      <dep package="folks"/>
-      <dep package="telepathy-logger"/>
-      <dep package="telepathy-mission-control"/>
-      <dep package="evolution-data-server"/>
-      <dep package="libcanberra"/>
-      <dep package="telepathy-farsight"/>
-      <dep package="gnome-keyring-3"/>
-    </dependencies>
-    <suggests>
-      <dep package="enchant"/>
-      <dep package="iso-codes"/>
-      <dep package="libchamplain"/>
-      <dep package="WebKit"/>
-    </suggests>
-  </autotools>
-
   <autotools id="evolution-data-server" supports-non-srcdir-builds="no"
              autogenargs="--enable-gtk3">
     <branch/>
@@ -306,15 +168,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgnome-keyring">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="dbus"/>
-      <dep package="libgcrypt"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-keyring-3" autogenargs="--with-gtk=3.0">
     <branch checkoutdir="gnome-keyring-3" module="gnome-keyring"/>
     <dependencies>
@@ -474,13 +327,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gobject-introspection">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gsettings-desktop-schemas">
     <branch/>
     <dependencies>
@@ -488,35 +334,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gstreamer" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" module="gstreamer"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libxml2"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gst-plugins-base" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-base"/>
-    <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gtk+"/>
-      <dep package="liboil"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gst-plugins-good" autogenargs="-- --disable-tests --disable-examples" supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-good"/>
-    <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-    <suggests>
-      <dep package="pulseaudio"/>
-      <dep package="gdk-pixbuf"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gtk-engines-3" autogenargs="--enable-deprecated">
     <branch checkoutdir="gtk-engines-3" module="gtk-engines"/>
     <dependencies>
@@ -539,52 +356,21 @@
     </suggests>
   </autotools>
 
-  <autotools id="libgnomekbd">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gconf" />
-      <dep package="gtk+-3" />
-      <dep package="libxklavier" />
-    </dependencies>
-  </autotools>
-
-  <autotools id="libgweather-3">
-    <branch checkoutdir="libgweather-3" module="libgweather"/>
+  <autotools id="mutter" autogenargs="--with-gtk=3.0">
+    <branch />
     <dependencies>
       <dep package="intltool"/>
-      <dep package="libxml2"/>
-      <dep package="gconf"/>
-      <dep package="gtk+-3"/>
-      <dep package="libsoup"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="librsvg" supports-non-srcdir-builds="no" autogenargs="--disable-gtk-theme">
-    <branch/>
-    <dependencies>
-      <dep package="libxml2"/>
-      <dep package="glib"/>
       <dep package="gdk-pixbuf"/>
-      <dep package="gnome-common"/>
-      <dep package="libcroco"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libsoup">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gnutls"/>
-      <dep package="libxml2"/>
+      <dep package="gtk+-3"/>
       <dep package="gconf"/>
-      <dep package="libproxy"/>
-      <dep package="sqlite3"/>
-      <dep package="libgnome-keyring"/>
+      <dep package="intltool"/>
+      <dep package="zenity"/>
+      <dep package="clutter"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
   </autotools>
 
- <autotools id="network-manager-applet">
+  <autotools id="network-manager-applet">
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -602,32 +388,25 @@
     </suggests>
   </autotools>
 
-  <autotools id="mutter" autogenargs="--with-gtk=3.0">
-    <branch />
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gtk+-3"/>
-      <dep package="gconf"/>
-      <dep package="intltool"/>
-      <dep package="zenity"/>
-      <dep package="clutter"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="totem-pl-parser">
-    <branch/>
+  <autotools id="pulseaudio" autogenargs="--disable-udev">
+    <branch repo="0pointer.de" module="pulseaudio/pulseaudio-0.9.21.tar.gz" version="0.9.21"
+            autogenargs="--disable-udev"
+            hash="sha256:94e22356ac70ee95388ae58da90d88c6b3186d1938618d21671627ff56cee254"
+            md5sum="76e623c4c72e2258bc8bdeb1599bad74" size="2056896"/>
     <dependencies>
-      <dep package="intltool"/>
+      <dep package="libsndfile"/>
+      <dep package="liboil"/>
       <dep package="glib"/>
-      <dep package="gmime"/>
+      <dep package="speex"/>
     </dependencies>
-    <suggests>
-      <dep package="libepc"/>
-      <dep package="tracker"/>
-      <dep package="dbus-glib"/>
-    </suggests>
+    <after>
+      <dep package="libsamplerate"/>
+      <dep package="gconf"/>
+      <dep package="avahi"/>
+      <dep package="bluez"/>
+      <dep package="dbus"/>
+      <dep package="PolicyKit"/>
+    </after>
   </autotools>
 
   <autotools id="vino">
@@ -657,14 +436,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gjs">
-    <branch/>
-    <dependencies>
-      <dep package="gobject-introspection"/>
-      <dep package="mozilla"/>
-    </dependencies>
-  </autotools>
-
 
 <!-- Fallback Shell -->
 
@@ -991,7 +762,7 @@
 
   <!-- explicit disabling of qt3 and qt4 can be removed once avahi
        correctly detects what is available. -->
-  <tarball autogenargs="--enable-gtk --enable-introspection=no --disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-manpages --disable-python --enable-compat-howl --enable-compat-libdns_sd --enable-gtk3 --with-systemdsystemunitdir=no" id="avahi"  version="0.6.28">
+  <tarball id="avahi" version="0.6.28" autogenargs="--enable-gtk --enable-introspection=no --disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-manpages --disable-python --enable-compat-howl --enable-compat-libdns_sd --enable-gtk3 --with-systemdsystemunitdir=no">
     <source href="http://avahi.org/download/avahi-0.6.28.tar.gz";
             hash="sha256:a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91"
             md5sum="d0143a5aa3265019072e53ab497818d0" size="1238660"/>
@@ -1118,6 +889,23 @@
     </dependencies>
   </autotools>
 
+  <tarball id="PackageKit" version="0.6.8" autogenargs="--disable-tests --disable-qt">
+    <source href="http://www.packagekit.org/releases/PackageKit-0.6.8.tar.bz2";
+            hash="sha256:24de9db9b292b174746d3596a9ea624b868b59f033e786bccb29ed5303c50f83"
+            md5sum="47987b91826bd522de1202d5a1e2510d" size="8568179"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+    <suggests>
+      <dep package="NetworkManager"/>
+      <dep package="polkit"/>
+    </suggests>
+  </tarball>
+
   <tarball id="polkit" version="0.99">
     <source href="http://hal.freedesktop.org/releases/polkit-0.99.tar.gz";
             hash="sha256:f612c7c26ec822f67751420057a4ae113fc50ab51070758faacf2ad30bb3583f"
@@ -1145,6 +933,9 @@
 
 <!-- Meta Modules -->
 
+  <!-- The Core GNOME Utilities: Only unbranded, GNOME integrated
+       basic functionality utilities allowed
+  -->
   <metamodule id="meta-gnome-core-utilities">
     <dependencies>
       <dep package="brasero"/>
@@ -1163,6 +954,9 @@
     </dependencies>
   </metamodule>
 
+  <!-- The Core GNOME UX Shell: Only integrated session services,
+       data, and core UI allowed
+  -->
   <metamodule id="meta-gnome-core-shell">
     <dependencies>
       <dep package="gnome-control-center"/>
@@ -1188,12 +982,9 @@
       <dep package="gnome-themes"/>
       <dep package="gnome-user-docs"/>
       <dep package="gnome-user-share"/>
-      <dep package="network-manager-applet"/>
-      <dep package="gobject-introspection"/>
       <dep package="gsettings-desktop-schemas"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
+      <dep package="network-manager-applet"/>
+      <dep package="pulseaudio"/>
       <dep package="gtk-engines-3"/>
       <dep package="gvfs"/>
       <dep package="mutter"/>
@@ -1201,6 +992,9 @@
     </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="metacity"/>
@@ -1210,6 +1004,9 @@
     </dependencies>
   </metamodule>
 
+  <!-- The Core GNOME OS Services: Only OS System services required to
+       provide the Core GNOME UX
+  -->
   <metamodule id="meta-gnome-core-os-services">
     <dependencies>
       <dep package="avahi"/>
@@ -1218,6 +1015,7 @@
       <dep package="dbus"/>
       <dep package="gdm"/>
       <dep package="NetworkManager"/>
+      <dep package="PackageKit"/>
       <dep package="polkit"/>
       <dep package="upower"/>
       <!-- <dep package="cups"/> -->
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index efa0b5e..05c75c2 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -3,14 +3,19 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
 
+<!-- git repos -->
 <repository type="git" name="git.gnome.org" default="yes"
     href="git://git.gnome.org/"/>
 <repository type="tarball" name="cairo.org"
     href="http://cairographics.org/"/>
-<repository type="tarball" name="mono.net"
-    href="http://go-mono.com/sources/"/>
+<repository type="git" name="git.clutter-project.org"
+    href="git://git.clutter-project.org/"/>
 <repository type="tarball" name="dbus"
     href="http://dbus.freedesktop.org/releases/"/>
+<repository type="git" name="gstreamer.freedesktop.org"
+    href="git://anongit.freedesktop.org/gstreamer/"/>
+
+<!-- tarball repos -->
 <repository type="tarball" name="sqlite.org"
     href="http://www.sqlite.org/"/>
 <repository type="tarball" name="gnome.org"
@@ -23,8 +28,6 @@
     href="http://prdownloads.sourceforge.net/sourceforge/"/>
 <repository type="tarball" name="clutter-project.org"
     href="http://source.clutter-project.org/sources/"/>
-<repository type="git" name="git.clutter-project.org"
-    href="git://git.clutter-project.org/"/>
 <repository type="tarball" name="libproxy.googlecode.com"
     href="http://libproxy.googlecode.com/files/"/>
 <repository type="tarball" name="0pointer.de"
@@ -37,23 +40,49 @@
     href="http://ftp.musicbrainz.org/pub/musicbrainz/"/>
 <repository type="tarball" name="people.suug.ch/~tgr/libnl/"
     href="http://www.gnome.org/~fpeters/libnl/"/>
+<repository type="tarball" name="kernel.org"
+    href="http://www.kernel.org/pub/linux/"/>
+
+<!-- Please try to keep organized alphabetically by section -->
 
 
-  <!-- explicit disabling of qt3 and qt4 can be removed once avahi
-       correctly detects what is available. -->
-  <tarball autogenargs="--enable-gtk --enable-introspection=no --disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-manpages --disable-python --enable-compat-howl --enable-compat-libdns_sd --enable-gtk3" id="avahi"  version="0.6.27">
-    <source href="http://avahi.org/download/avahi-0.6.27.tar.gz";
-            hash="sha256:c22df5e0b0d695bfe3cc52545bf0affc1c52060818a5a65d70055e320bc45e84"
-            md5sum="74b40f87aeab07fc77af25f725b32f04" size="1217974"/>
-    <patch file="avahi-build-fix.patch" strip="1"/>
+<!-- Build dependencies -->
+
+<!-- This is a special module: it's needed to build from git, but not
+     needed to build from tarballs, so it doesn't need to be in our suites
+     and it doesn't need to be an external dependency -->
+  <autotools id="gnome-common">
+    <branch/>
+  </autotools>
+
+  <autotools id="gnome-doc-utils">
+    <branch/>
     <dependencies>
-      <dep package="gtk+"/>
-      <dep package="gtk+-3"/>
-      <dep package="libdaemon"/>
-      <dep package="dbus-python"/>
-      <dep package="pygtk"/>
+      <dep package="libxslt"/>
+      <dep package="intltool"/>
+      <dep package="rarian"/>
     </dependencies>
-  </tarball>
+  </autotools>
+
+  <autotools id="gtk-doc">
+    <branch/>
+    <dependencies>
+      <dep package="libxslt"/>
+      <dep package="rarian"/>
+      <dep package="gnome-doc-utils"/>
+    </dependencies>
+  </autotools>
+
+
+<!-- OS Core API/ABI stable dependencies -->
+
+  <autotools id="atk">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gnome-doc-utils"/>
+    </dependencies>
+  </autotools>
 
   <autotools id="cairo" autogenargs="--enable-xlib">
     <branch module="releases/cairo-1.10.0.tar.gz" version="1.10.0"
@@ -71,25 +100,68 @@
     </after>
   </autotools>
 
-  <autotools id="cairomm" autogen-sh="configure">
-    <branch module="releases/cairomm-1.9.2.tar.gz" version="1.9.2"
-            repo="cairo.org"
-            hash="sha256:06be135a638be9e279905cc6287c066da93ab62f273a4a66858af379621288f6"
-            md5sum="24b0d35de4154195b8b78cf1f48b85e7" size="856678">
-    </branch>
+  <autotools id="clutter">
+    <branch repo="git.clutter-project.org"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="pango"/>
+      <dep package="gtk-doc"/>
+      <dep package="json-glib"/>
+    </dependencies>
+    <suggests>
+      <dep package="gobject-introspection"/>
+      <dep package="gdk-pixbuf"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gdk-pixbuf">
+    <branch/>
     <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="glib">
+    <branch/>
+    <dependencies>
+      <dep package="gtk-doc"/>
+    </dependencies>
+    <after>
+      <dep package="shared-mime-info"/>
+    </after>
+  </autotools>
+
+  <autotools id="gtk+-3">
+    <branch checkoutdir="gtk+-3" module="gtk+"/>
+    <dependencies>
+      <dep package="glib"/>
       <dep package="cairo"/>
+      <dep package="pango"/>
+      <dep package="atk"/>
+      <dep package="gdk-pixbuf"/>
     </dependencies>
+    <after>
+      <dep package="shared-mime-info"/>
+    </after>
   </autotools>
 
-  <tarball id="json-glib" version="0.12">
-    <source href="http://download.gnome.org/sources/json-glib/0.12/json-glib-0.12.0.tar.bz2";
-            hash="sha256:e22978aadbe92a12e4cef2f494eb3571ac5c983ad05cff4256328157f1112842"
-            size="417623"/>
+  <autotools id="pango">
+    <branch/>
     <dependencies>
+      <dep package="gnome-common"/>
       <dep package="glib"/>
+      <dep package="cairo"/>
     </dependencies>
-  </tarball>
+    <suggests>
+      <dep package="gobject-introspection"/>
+    </suggests>
+    <after>
+      <dep package="libXft"/>
+    </after>
+  </autotools>
+
+  <!-- OS Core unstable dependencies -->
 
   <autotools id="clutter-gtk">
     <branch repo="git.clutter-project.org"/>
@@ -111,25 +183,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-video-effects">
-    <branch/>
-    <dependencies>
-      <dep package="gstreamer"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="pyclutter">
-    <branch module="pyclutter/1.0/pyclutter-1.0.2.tar.gz" version="1.0.2"
-            repo="clutter-project.org"
-            hash="sha256:9a396f55fa28eb4beeeb6d11fa64d785f7ae428717e3cb02f08c2dbc008bd0c9"
-            md5sum="9bd6a73bba4a40e5dc79003ccb6bc6a7" size="633912"/>
-    <dependencies>
-      <dep package="pygtk"/>
-      <dep package="pycairo"/>
-      <dep package="clutter"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="dbus-glib">
     <branch module="dbus-glib/dbus-glib-0.82.tar.gz" version="0.82"
 	    repo="dbus"
@@ -176,6 +229,35 @@
     </dependencies>
   </tarball>
 
+  <tarball id="expat" version="1.95.8">
+    <source href="http://downloads.sourceforge.net/project/expat/expat/1.95.8/expat-1.95.8.tar.gz";
+            hash="sha256:c6aaa0b427e775a0fd5a956a75ae41e5110f22760723d9bda316100010e891ca"
+            md5sum="aff487543845a82fe262e6e2922b4c8e" size="318349"/>
+  </tarball>
+
+  <tarball id="farsight2" version="0.0.19" autogenargs="--disable-python">
+    <source href="http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.19.tar.gz";
+            hash="sha256:71e6f487bf7434c424234c136c2a8233ddecf3178acbe4fd9295b742b59ea04c"
+            md5sum="0ce00833b1baaab2b9d8b6dbba56fbfd" size="1067517"/>
+    <dependencies>
+      <dep package="libnice"/>
+    </dependencies>
+  </tarball>
+
+  <tarball id="folks" version="0.2.0">
+    <source href="http://download.gnome.org/sources/folks/0.2/folks-0.2.0.tar.bz2";
+            hash="sha256:25f4760ba777b2f8a90576ac43c1540c9fd88dd4d39de3d07bc7f2f9ef5fc84f"
+            md5sum="8c66c03d942313db735f6eb375c2f71a" size="458990"/>
+    <dependencies>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+      <dep package="libgee"/>
+      <dep package="vala"/>
+      <dep package="gobject-introspection"/>
+      <dep package="telepathy-glib"/>
+    </dependencies>
+  </tarball>
+
   <tarball id="fontconfig" version="2.8.0">
     <source href="http://www.fontconfig.org/release/fontconfig-2.8.0.tar.gz";
             hash="sha256:fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"
@@ -194,6 +276,38 @@
     </dependencies>
   </tarball>
 
+  <tarball id="gnome-js-common" version="0.1.1">
+    <source href="http://download.gnome.org/sources/gnome-js-common/0.1/gnome-js-common-0.1.1.tar.bz2";
+            hash="sha256:6cad015cda5abfd2bccd6b95714ca39c83ca69ca7e6f7326dc75763a758dc8db"
+            md5sum="4f1c409a0be66d0df9dcdf15e9cf70ff" size="274010"/>
+    <suggests>
+      <dep package="seed"/>
+      <dep package="gjs"/>
+    </suggests>
+  </tarball>
+
+  <autotools id="gnome-video-effects">
+    <branch/>
+    <dependencies>
+      <dep package="gstreamer"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gobject-introspection">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gjs">
+    <branch/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="mozilla"/>
+    </dependencies>
+  </autotools>
+
   <tarball id="gnutls" version="2.8.6" autogenargs="--enable-guile=no">
     <source href="ftp://ftp.gnu.org/pub/gnu/gnutls/gnutls-2.8.6.tar.bz2";
             hash="sha256:d6f846a7064af3ee2c9aebd65dcee76953b767170cbcd719e990ed6b9688a356"
@@ -204,21 +318,137 @@
     </dependencies>
   </tarball>
 
-  <tarball id="hal" version="0.5.11">
-    <source href="http://hal.freedesktop.org/releases/hal-0.5.11.tar.gz";
-	    hash="sha256:730a9f2340f789677eb0c3b0984bbaca3ede6c12d1e4b16bc7ea91f51d10ba90"
-	    md5sum="750cf074e88b6fb7012f26d99cd39b9b" size="1672992"/>
+  <tarball id="gmime" version="2.4.15">
+    <source href="http://download.gnome.org/sources/gmime/2.4/gmime-2.4.15.tar.bz2";
+            hash="sha256:a0a6c9413b057ab5d8a2a2902cbaa5b3a17871af3f94dc8431978c9e0e5f53e1"
+            md5sum="604ec62e1ce4d149d724f5d3ee69c110" size="859146"/>
     <dependencies>
-      <dep package="dbus-glib"/>
-      <dep package="libvolume_id"/>
-      <dep package="PolicyKit"/>
+      <dep package="gtk-doc"/>
+      <dep package="glib"/>
     </dependencies>
+    <after>
+      <dep package="gtk-sharp"/>
+    </after>
   </tarball>
 
-  <tarball id="lcms2" version="2.0a" checkoutdir="lcms-2.0">
-    <source href="http://downloads.sourceforge.net/lcms/lcms2-2.0a.tar.gz";
-            hash="sha256:6deaf78611f5978ff58aa85efc37cf070b6ffb7106486b894914c4fc548d054f"
-            md5sum="c4f115462a7a5b306c247d018d7a8982" size="3449841"/>
+  <tarball id="gssdp" version="0.8.0">
+    <source href="http://www.gupnp.org/sites/all/files/sources/gssdp-0.8.0.tar.gz";
+            hash="sha256:c6ca4f084109487255aa847b2b1d27cf29b19aafb85f9d67a9a38f36a9b58506"
+            md5sum="a4cf85650decaec7a12382a8a002bc83" size="368212"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </tarball>
+
+  <autotools id="gstreamer" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gstreamer"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-base" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-base"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gtk+"/>
+      <dep package="liboil"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-good" autogenargs="-- --disable-tests --disable-examples" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-good"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+    <suggests>
+      <dep package="pulseaudio"/>
+      <dep package="gdk-pixbuf"/>
+    </suggests>
+  </autotools>
+
+  <tarball id="gst-plugins-farsight" version="0.12.11">
+    <source href="http://farsight.freedesktop.org/releases/gst-plugins-farsight/gst-plugins-farsight-0.12.11.tar.gz";
+            hash="sha256:df5b6fb9774d63be7dc18af5e5760e2e9d4726711d423e8de3af6a960aa13761"
+            md5sum="685a3dfd6752390e336e9556b62fad9e" size="500109"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </tarball>
+
+  <tarball id="gtk-vnc" version="0.4.1" autogenargs="--with-gtk=3.0">
+    <source href="http://download.gnome.org/sources/gtk-vnc/0.4/gtk-vnc-0.4.1.tar.bz2";
+            hash="sha256:095ae7c98ddba0db39845b516b49651a134c7ed8b45ccd02ed1ba3fd66645b57"
+            md5sum="61033a0b0130e1e04a8bc2546567ed8c" size="536411"/>
+    <dependencies>
+      <dep package="gtk+-3"/>
+    </dependencies>
+  </tarball>
+
+  <tarball id="gupnp" version="0.14.0" autogenargs="--with-context-manager=network-manager">
+    <source href="http://www.gupnp.org/sites/all/files/sources/gupnp-0.14.0.tar.gz";
+            hash="sha256:6ac13efe46c6f1e5d05e48e1041bf37dfa702839ce5fbb01e0f314f3904b6a16"
+            md5sum="8598922256faa5adb28657d0c10a3e3e" size="529403"/>
+    <dependencies>
+      <dep package="gssdp"/>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="shared-mime-info"/>
+    </dependencies>
+    <suggests>
+      <dep package="NetworkManager"/>
+    </suggests>
+  </tarball>
+
+  <tarball id="gupnp-av" version="0.6.1">
+    <source href="http://www.gupnp.org/sites/all/files/sources/gupnp-av-0.6.1.tar.gz";
+            hash="sha256:b636e3aa8af3e43103a812b45e41045180f793ef15371ef7b13c0dfc3b2135f2"
+            md5sum="ec775ee520dc62d73f56c96931c3b97" size="408227"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gupnp"/>
+    </dependencies>
+  </tarball>
+
+  <tarball id="gupnp-dlna" version="0.4.0">
+    <source href="http://www.gupnp.org/sites/all/files/sources/gupnp-dlna-0.4.0.tar.gz";
+            hash="sha256:f0968686d88c101f6b9457896cbcde388649d1dda37b16330a08662a2c88650b"
+            md5sum="8e0913fa62da959d98a5417b06b909fa" size="429117"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="glib"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+    <suggests>
+      <dep package="gst-plugins-good"/>
+      <dep package="gst-plugins-bad"/>
+      <dep package="gst-plugins-ugly"/>
+      <dep package="gst-ffmpeg"/>
+    </suggests>
+  </tarball>
+
+  <tarball id="gupnp-vala" version="0.6.12">
+    <source href="http://www.gupnp.org/sites/all/files/sources/gupnp-vala-0.6.12.tar.gz";
+            hash="sha256:a28d00b7c2952871dcdeaf15f879a33fecba942bdf6cd15e00323e2cfa1d06c0"
+            md5sum="065397f2eeee8356b94bdf469f1a12cd" size="115668"/>
+    <dependencies>
+      <dep package="vala"/>
+      <dep package="gssdp"/>
+      <dep package="gupnp"/>
+      <dep package="gupnp-av"/>
+      <dep package="gupnp-dlna"/>
+    </dependencies>
+    <suggests>
+      <dep package="gupnp-ui"/>
+    </suggests>
   </tarball>
 
   <repository type="tarball" name="icon-theme.freedesktop.org"
@@ -246,6 +476,54 @@
             md5sum="90472da66aa4460b04f39c324208f8f2" size="6105567"/>
   </tarball>
 
+  <tarball id="json-glib" version="0.12">
+    <source href="http://download.gnome.org/sources/json-glib/0.12/json-glib-0.12.0.tar.bz2";
+            hash="sha256:e22978aadbe92a12e4cef2f494eb3571ac5c983ad05cff4256328157f1112842"
+            size="417623"/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </tarball>
+
+  <tarball id="lcms2" version="2.0a" checkoutdir="lcms-2.0">
+    <source href="http://downloads.sourceforge.net/lcms/lcms2-2.0a.tar.gz";
+            hash="sha256:6deaf78611f5978ff58aa85efc37cf070b6ffb7106486b894914c4fc548d054f"
+            md5sum="c4f115462a7a5b306c247d018d7a8982" size="3449841"/>
+  </tarball>
+
+  <autotools id="libcanberra" autogen-sh="configure">
+    <branch repo="0pointer.de" module="libcanberra/libcanberra-0.26.tar.gz" version="0.26"
+            hash="sha256:4b5d8d2c2835133620adbc53745dd107b6e58b9a2963059e8f457143fee00982"
+            md5sum="ee2c66ada7c851a4e7b6eb1682285a24" size="463209">
+    </branch>
+    <dependencies>
+      <dep package="gtk-doc"/>
+    </dependencies>
+    <after>
+      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
+      <dep package="pulseaudio"/>
+      <dep package="gstreamer"/>
+    </after>
+  </autotools>
+
+  <tarball id="libchamplain" version="0.7.2">
+    <source href="http://download.gnome.org/sources/libchamplain/0.7/libchamplain-0.7.2.tar.bz2";
+            hash="sha256:4841263418ccf36d20822d3c0dfd50d2754510c714e3254aea69599396abbd95"
+            md5sum="18f4e53b17467ae3602d5dcbec6bba43" size="672748"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="clutter"/>
+      <dep package="gtk+"/>
+      <dep package="sqlite3"/>
+    </dependencies>
+    <suggests>
+      <dep package="libsoup"/>
+      <dep package="clutter-gtk"/>
+    </suggests>
+  </tarball>
+
   <tarball id="libcolorblind" version="0.0.1">
     <source href="http://alioth.debian.org/frs/download.php/1952/colorblind-0.0.1.tar.gz";
             hash="sha256:02d606fa7ba809454ff58990cb12e3de4fa1118305d4139395b54d79eb6d88cd"
@@ -269,6 +547,12 @@
             md5sum="509dc27107c21bcd9fbf2f95f5669563" size="340474"/>
   </autotools>
 
+  <tarball id="libdiscid" version="0.2.2">
+    <source href="http://users.musicbrainz.org/~matt/libdiscid-0.2.2.tar.gz";
+            hash="sha256:974b5d5ab23fb45910a4fe171045a22a749cd8cb9833168f7178839993a58402"
+            md5sum="ee21ddbe696a3c60e14827a75f3bcf5b" size="347907"/>
+  </tarball>
+
   <autotools id="libgpg-error" autogen-sh="configure" check-target="false">
     <branch module="libgpg-error/libgpg-error-1.8.tar.bz2"
             repo="gnupg.org" version="1.8"
@@ -288,6 +572,36 @@
     </dependencies>
   </autotools>
 
+  <tarball id="libgee" version="0.6.0">
+    <source href="http://download.gnome.org/sources/libgee/0.6/libgee-0.6.0.tar.bz2";
+            hash="sha256:e586678d0a88637abeaaf850b62231000772e79ea6d9c4b45dc3cea99f778a7a"
+            md5sum="4eb513b23ab6ea78884989518a4acf6f" size="477609"/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </tarball>
+
+  <autotools id="libgnomekbd">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gconf" />
+      <dep package="gtk+-3" />
+      <dep package="libxklavier" />
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgweather-3">
+    <branch checkoutdir="libgweather-3" module="libgweather"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="libxml2"/>
+      <dep package="gconf"/>
+      <dep package="gtk+-3"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </autotools>
+
   <tarball id="libgsf" version="1.14.18">
     <source href="http://download.gnome.org/sources/libgsf/1.14/libgsf-1.14.18.tar.bz2";
             hash="sha256:16d29e82f7eba68f919f2588ea5328973490fe6d4a7a5f160e8af89b387c9a95"
@@ -303,11 +617,13 @@
     </suggests>
   </tarball>
 
-  <tarball id="libdiscid" version="0.2.2">
-    <source href="http://users.musicbrainz.org/~matt/libdiscid-0.2.2.tar.gz";
-            hash="sha256:974b5d5ab23fb45910a4fe171045a22a749cd8cb9833168f7178839993a58402"
-            md5sum="ee21ddbe696a3c60e14827a75f3bcf5b" size="347907"/>
-  </tarball>
+  <autotools id="libgtop">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
 
   <cmake id="libmusicbrainz">
     <branch module="libmusicbrainz-3.0.2.tar.gz" version="3.0.2"
@@ -321,213 +637,156 @@
     </dependencies>
   </cmake>
 
-  <tarball id="liboil" version="0.3.17">
-    <source href="http://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz";
-            hash="sha256:105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69"
-            md5sum="47dc734f82faeb2964d97771cfd2e701" size="912563"/>
-  </tarball>
-
-  <tarball id="libtasn1" version="2.2" supports-non-srcdir-builds="no">
-    <source href="ftp://ftp.gnu.org/gnu/libtasn1/libtasn1-2.2.tar.gz";
-            hash="sha256:5dd7956d62a351bb657f18d228c5d5b9e9455355543f59ff36484a9d389e36b9"
-            md5sum="14cc361500d2e768a8a6ec538ce3fecb" size="1641693" />
-  </tarball>
-
-  <tarball id="libxklavier" supports-non-srcdir-builds="no" version="5.0">
-    <source href="http://download.gnome.org/sources/libxklavier/5.0/libxklavier-5.0.tar.bz2";
-            hash="sha256:dfd94b17a752b2839281764f0a16af2b338024c8867c10fba7015f276dec4db0"
-            md5sum="134c7ea177ff901123b909de77394780" size="357862"/>
+  <tarball id="libnice" version="0.0.11">
+    <source href="http://nice.freedesktop.org/releases/libnice-0.0.11.tar.gz";
+            hash="sha256:a331a2cf4ec868a0d79175dc233f55e5a07c097a56643e8c1449505d83c32ece"
+            md5sum="9e6f6b0b781b747e49df2160cbb29f83" size="636299"/>
     <dependencies>
-      <dep package="libxml2"/>
-      <dep package="gtk-doc"/>
       <dep package="glib"/>
-      <dep package="iso-codes"/>
+      <dep package="gst-plugins-base"/>
     </dependencies>
   </tarball>
 
-  <autotools id="libxml2">
-    <branch module="libxml2/libxml2-2.7.7.tar.gz"
-            repo="xmlsoft.org" version="2.7.7"
-            hash="sha256:af5b781418ba4fff556fa43c50086658ea8a2f31909c2b625c2ce913a1d9eb68"
-            md5sum="9abc9959823ca9ff904f1fbcf21df066" size="4868502"/>
-  </autotools>
-
-  <autotools id="libxslt" check-target="false">
-    <branch module="libxml2/libxslt-1.1.26.tar.gz"
-            repo="xmlsoft.org" version="1.1.26"
-            hash="sha256:55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1"
-            md5sum="e61d0364a30146aaa3001296f853b2b9" size="3401513"/>
-    <dependencies>
-      <dep package="libxml2"/>
-      <dep package="libgcrypt"/>
-    </dependencies>
-  </autotools>
-
-  <tarball id="gtk-vnc" version="0.4.1" autogenargs="--with-gtk=3.0">
-    <source href="http://download.gnome.org/sources/gtk-vnc/0.4/gtk-vnc-0.4.1.tar.bz2";
-            hash="sha256:095ae7c98ddba0db39845b516b49651a134c7ed8b45ccd02ed1ba3fd66645b57"
-            md5sum="61033a0b0130e1e04a8bc2546567ed8c" size="536411"/>
+  <autotools id="libnotify">
+    <branch/>
     <dependencies>
+      <dep package="gtk+"/>
       <dep package="gtk+-3"/>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
     </dependencies>
-  </tarball>
-
-  <tarball id="ndesk-dbus" version="0.6.0">
-    <source href="http://www.ndesk.org/archive/dbus-sharp/ndesk-dbus-0.6.0.tar.gz";
-            hash="sha256:252322f18e906ba7e64cecd0baec08d1a0109206777a5507a713e12def126424"
-            md5sum="5157ba105c9ac491f6e900bc78d1791f" size="122303"/>
-    <dependencies>
-      <dep package="mono"/>
-    </dependencies>
-  </tarball>
+  </autotools>
 
-  <tarball id="ndesk-dbus-glib" version="0.4.1">
-    <source href="http://www.ndesk.org/archive/dbus-sharp/ndesk-dbus-glib-0.4.1.tar.gz";
-            hash="sha256:0a6d5fe7be55b6301615d71b89507b712f287b4ba498b798301333ffabe06769"
-            md5sum="7faf8770b214956fa9de009def550826" size="85471"/>
-    <dependencies>
-      <dep package="ndesk-dbus"/>
-    </dependencies>
+  <tarball id="liboil" version="0.3.17">
+    <source href="http://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz";
+            hash="sha256:105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69"
+            md5sum="47dc734f82faeb2964d97771cfd2e701" size="912563"/>
   </tarball>
 
-  <autotools id="opal" autogenargs="--disable-vpb"
-             check-target="false" supports-non-srcdir-builds="no">
-    <branch module="opal/3.8/opal-3.8.1.tar.bz2" repo="gnome.org"
-            version="3.8.1"
-            hash="sha256:2ba01932ffd0d0f7bb464daf552b2cb286859fa9ecdd86abf106703d26d66c81"
-            md5sum="19e9fd97695dbe9974dbf5a3354495a0" size="7444010"/>
+  <autotools id="libpeas">
+    <branch module="libpeas/0.7/libpeas-0.7.0.tar.bz2" repo="gnome.org"
+            version="0.7.0"
+            hash="sha256:f6fa3d4a2150adf9dd65c09e5fc81229918b3cef1b1ed85a0a75957b14b4f6bd"
+            md5sum="1b45b559414b1c1ea237e8823b1d8866" size="495554"/>
     <dependencies>
-      <dep package="ptlib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+-3"/>
     </dependencies>
+    <suggests>
+      <dep package="pygobject"/>
+      <dep package="seed"/>
+    </suggests>
   </autotools>
 
-  <autotools id="pixman" autogenargs="--disable-gtk">
-    <branch module="releases/pixman-0.18.4.tar.gz" version="1.18.4"
-            repo="cairo.org" 
-            hash="sha256:1484092277c5187f5458229a2b7fd7fbc0cb07e1f220c7f8f9ac65de6dba7989"
-            md5sum="532db4194e18c108d0b7dd85f20d39b8" size="510878">
-    </branch>
-  </autotools>
-
-  <tarball id="poppler" version="0.14.1" autogenargs="--enable-xpdf-headers">
-    <source href="http://poppler.freedesktop.org/poppler-0.14.1.tar.gz";
-            hash="sha256:efe59b33585791ef6714fa33a6d62b8746d6352c4f57a093f03364b0979bfa3e"
-            md5sum="1d27cb8a09aaa373660fd608b258022a" size="1782771"/>
+  <cmake id="libproxy"
+         cmakeargs="-DCMAKE_BUILD_TYPE=None -DWITH_PERL=OFF -DWITH_VALA=ON -DWITH_DOTNET=OFF -DGAC_DIR=${prefix}/lib/mono">
+    <branch repo="libproxy.googlecode.com"
+            module="libproxy-0.4.6.tar.gz" version="0.4.6"
+            hash="sha256:9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30"
+            md5sum="199c6b120baf1f7258a55f38d5ec74f5" size="82483"/>
     <dependencies>
-      <dep package="cairo"/>
+      <dep package="gconf"/>
     </dependencies>
     <suggests>
-      <dep package="glib"/>
-      <dep package="poppler-data"/>
+      <dep package="NetworkManager"/>
     </suggests>
     <after>
-      <dep package="gtk+"/>
-      <dep package="gdk-pixbuf"/>
+      <dep package="mozilla"/>
+      <dep package="WebKit"/>
     </after>
-  </tarball>
-
-  <autotools id="pycairo">
-    <branch module="releases/pycairo-1.8.2.tar.gz" version="1.8.2"
-            repo="cairo.org" 
-            hash="sha256:77a8cbe388fd66825056744f2fc5c58b3afc247748bc2c777751cc0c2eb30a2f"
-            md5sum="bbfc0c2fef08dfb0c5b8baa5f0b67a87" size="519064">
-    </branch>
-    <dependencies>
-      <dep package="cairo"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="ptlib" check-target="false" supports-non-srcdir-builds="no">
-    <branch module="ptlib/2.8/ptlib-2.8.1.tar.bz2" repo="gnome.org"
-            autogen-sh="configure"
-            version="2.8.1"
-            hash="sha256:cb35473fe004b443d42c704f11151285951532593f41cc7f8e96c90ac09ef700"/>
-  </autotools>
+  </cmake>
 
-  <tarball id="shared-mime-info" supports-non-srcdir-builds="no" version="0.71">
-    <source href="http://people.freedesktop.org/~hadess/shared-mime-info-0.71.tar.bz2";
-            hash="sha256:1d8f97f17de77ae0d8a3a4ef357280ef444da87f4ce19170392712d0c2f6d04f"
-            md5sum="0a90508234d415f761a79fbffdff74f4" size="493216"/>
+  <autotools id="librsvg" supports-non-srcdir-builds="no" autogenargs="--disable-gtk-theme">
+    <branch/>
     <dependencies>
-      <dep package="intltool"/>
       <dep package="libxml2"/>
       <dep package="glib"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gnome-common"/>
+      <dep package="libcroco"/>
     </dependencies>
-  </tarball>
+  </autotools>
 
-  <tarball id="startup-notification" version="0.9">
-    <source href="http://download.gnome.org/sources/startup-notification/0.9/startup-notification-0.9.tar.bz2";
-            hash="sha256:61de1aed379ea9d44a835baf76567e0aaa813b6d6e995db7e83e8986f69b580d"
-            md5sum="624b42f1fac5a12c543a079e2cd3b366" size="226231"/>
+  <tarball id="libsndfile" version="1.0.20" supports-non-srcdir-builds="no"
+           autogenargs="--disable-flac">
+    <source href="http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.20.tar.gz";
+            hash="sha256:7517eb966579f8814b5efe307cb919c5b4e7b5c6729209ba1da95f31e8368dc7"
+            md5sum="e0553e12c7a467af44693e95e2eac668" size="927422"/>
   </tarball>
 
-  <tarball id="swfdec" version="0.8.0">
-    <source href="http://swfdec.freedesktop.org/download/swfdec/0.8/swfdec-0.8.0.tar.gz";
-            hash="sha256:a19f0abc57ef6f367cc21002082efe18fa893d8af872cc2825a4536d509e8182"
-            md5sum="ce3002fc5d8ace9ce34ce960c0cc3c06" size="9986340"/>
+  <autotools id="libsoup">
+    <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="pango"/>
-      <dep package="gtk+"/>
-      <dep package="cairo"/>
-      <dep package="liboil"/>
-      <dep package="libsoup"/>
+      <dep package="gnutls"/>
+      <dep package="libxml2"/>
+      <dep package="gconf"/>
+      <dep package="libproxy"/>
+      <dep package="sqlite3"/>
+      <dep package="libgnome-keyring"/>
     </dependencies>
-  </tarball>
+  </autotools>
 
-  <tarball id="system-tools-backends" version="2.10.1"
-           supports-non-srcdir-builds="no">
-    <source href="http://ftp.gnome.org/pub/GNOME/sources/system-tools-backends/2.10/system-tools-backends-2.10.1.tar.gz";
-            hash="sha256:2f740c99c8cb99226e20cf11ecfcb7f07b74f84d3c07408b72b2f97fc587fee7"
-            md5sum="cf633d333c4a3dc67414056517e58941" size="580528"/>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="glib"/>
-      <dep package="polkit"/>
-      <dep package="intltool"/>
-    </dependencies>
-    <suggests>
-      <dep package="perl-net-dbus"/>
-    </suggests>
+  <tarball id="libtasn1" version="2.2" supports-non-srcdir-builds="no">
+    <source href="ftp://ftp.gnu.org/gnu/libtasn1/libtasn1-2.2.tar.gz";
+            hash="sha256:5dd7956d62a351bb657f18d228c5d5b9e9455355543f59ff36484a9d389e36b9"
+            md5sum="14cc361500d2e768a8a6ec538ce3fecb" size="1641693" />
   </tarball>
-  <tarball id="telepathy-glib" version="0.13.1" autogenargs="--enable-vala-bindings">
-    <source href="http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.13.1.tar.gz";
-            hash="sha256:29ff30175109364f397636b3f7c6dc33ca9a225f6938de6b7c13599bd89c7f0c"
-            md5sum="d9073ad4ba99ae3cd31bc02aabd3455c" size="2673395"/>
+
+  <autotools id="libunique-3">
+    <branch module="libunique/2.90/libunique-2.90.1.tar.bz2" repo="gnome.org"
+            version="2.90.1" checkoutdir="libunique-2.90.1"
+            hash="sha256:94c46006557b9f981b801f90c1ce324dcd5385aa6ded5058cb06f39e32119993"
+            md5sum="7778865473d8c81084ad5959a0d9853c" size="344813"/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="dbus"/>
+      <dep package="gtk+-3"/>
       <dep package="dbus-glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="libxslt"/>
-      <dep package="vala"/>
     </dependencies>
-  </tarball>
+  </autotools>
 
-  <tarball id="telepathy-logger" version="0.1.5">
-    <source href="http://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-0.1.5.tar.bz2";
-            hash="sha256:0b2e4f402531a607c5322c2fbcd0fd61a96f6b933c726430dafefa03f580bec8"
-            md5sum="6e41a5c6b323a337085b9519ac557fb7" size="448552"/>
+  <autotools id="libvolume_id" skip-autogen="true"
+                 makeargs="EXTRAS=extras/volume_id prefix=${prefix} libdir=${libdir}"
+		 makeinstallargs="-C extras/volume_id prefix=${prefix} libdir=${libdir} install-bin install-man"
+		 check-target="false" supports-non-srcdir-builds="no">
+    <branch repo="kernel.org"
+	    module="utils/kernel/hotplug/udev-111.tar.bz2" version="111"
+	    hash="sha256:ec47cc46b15838321c31589d7bdbdcf553c0ea4f406edc6f239cb20a3732c233"
+	    md5sum="bd2a94e3ed243e6a3d501a5c8afc4b54" size="190020">
+      <patch file="libvolume_id_Makefile.patch" strip="1"/>
+    </branch>
+  </autotools>
+
+  <tarball id="libxklavier" supports-non-srcdir-builds="no" version="5.0">
+    <source href="http://download.gnome.org/sources/libxklavier/5.0/libxklavier-5.0.tar.bz2";
+            hash="sha256:dfd94b17a752b2839281764f0a16af2b338024c8867c10fba7015f276dec4db0"
+            md5sum="134c7ea177ff901123b909de77394780" size="357862"/>
     <dependencies>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-      <dep package="telepathy-glib"/>
+      <dep package="libxml2"/>
+      <dep package="gtk-doc"/>
+      <dep package="glib"/>
+      <dep package="iso-codes"/>
     </dependencies>
   </tarball>
 
-  <tarball id="telepathy-mission-control" version="5.5.1">
-    <source href="http://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-5.5.1.tar.gz";
-            hash="sha256:efa033f018066987edaa80d7e6a58e50788e4466a6cfd7fb7493e955f3b38a79"
-            md5sum="97b0d0af8670a6a9a4510995eebce1c6" size="1217791"/>
+  <autotools id="libxml2">
+    <branch module="libxml2/libxml2-2.7.7.tar.gz"
+            repo="xmlsoft.org" version="2.7.7"
+            hash="sha256:af5b781418ba4fff556fa43c50086658ea8a2f31909c2b625c2ce913a1d9eb68"
+            md5sum="9abc9959823ca9ff904f1fbcf21df066" size="4868502"/>
+  </autotools>
+
+  <autotools id="libxslt" check-target="false">
+    <branch module="libxml2/libxslt-1.1.26.tar.gz"
+            repo="xmlsoft.org" version="1.1.26"
+            hash="sha256:55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1"
+            md5sum="e61d0364a30146aaa3001296f853b2b9" size="3401513"/>
     <dependencies>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-      <dep package="telepathy-glib"/>
-      <dep package="gnome-keyring"/>
-      <dep package="gconf"/>
+      <dep package="libxml2"/>
+      <dep package="libgcrypt"/>
     </dependencies>
-  </tarball>
+  </autotools>
 
+<!-- Begin Mozilla stuff subsection -->
   <repository type="tarball" name="ftp.mozilla.org"
       href="https://ftp.mozilla.org/pub/mozilla.org/"/>
   <autotools id="nspr" autogen-sh="mozilla/nsprpub/configure"
@@ -593,79 +852,116 @@
       <dep package="cairo"/>
     </dependencies>
   </autotools>
+<!-- End Mozilla stuff subsection -->
 
-  <repository type="tarball" name="kernel.org"
-      href="http://www.kernel.org/pub/linux/"/>
-  <autotools id="libvolume_id" skip-autogen="true"
-                 makeargs="EXTRAS=extras/volume_id prefix=${prefix} libdir=${libdir}"
-		 makeinstallargs="-C extras/volume_id prefix=${prefix} libdir=${libdir} install-bin install-man"
-		 check-target="false" supports-non-srcdir-builds="no">
-    <branch repo="kernel.org"
-	    module="utils/kernel/hotplug/udev-111.tar.bz2" version="111"
-	    hash="sha256:ec47cc46b15838321c31589d7bdbdcf553c0ea4f406edc6f239cb20a3732c233"
-	    md5sum="bd2a94e3ed243e6a3d501a5c8afc4b54" size="190020">
-      <patch file="libvolume_id_Makefile.patch" strip="1"/>
+
+  <autotools id="nautilus-sendto">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+-3"/>
+      <dep package="gconf"/>
+      <dep package="nautilus"/>
+    </dependencies>
+    <suggests>
+      <dep package="evolution-data-server"/>
+      <dep package="dbus-glib"/>
+      <dep package="gupnp-av"/>
+      <dep package="empathy"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="pixman" autogenargs="--disable-gtk">
+    <branch module="releases/pixman-0.18.4.tar.gz" version="1.18.4"
+            repo="cairo.org"
+            hash="sha256:1484092277c5187f5458229a2b7fd7fbc0cb07e1f220c7f8f9ac65de6dba7989"
+            md5sum="532db4194e18c108d0b7dd85f20d39b8" size="510878">
     </branch>
   </autotools>
 
-  <tarball id="rarian" version="0.8.1" supports-non-srcdir-builds="no">
-    <source href="http://download.gnome.org/sources/rarian/0.8/rarian-0.8.1.tar.bz2";
-            hash="sha256:aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"
-            md5sum="75091185e13da67a0ff4279de1757b94" size="324441"/>
+  <tarball id="polkit-gnome" version="0.99">
+    <source href="http://hal.freedesktop.org/releases/polkit-gnome-0.99.tar.bz2";
+            hash="sha256:73c4d04aa89d9a9687f3650327c0ec1cba704e9d5b7fc193958fa81d621208ba"
+            md5sum="f1a2565083266bc8c05c60aa7d8a0f6a" size="388069"/>
     <dependencies>
-      <dep package="libxslt"/>
+      <dep package="polkit"/>
+      <dep package="gtk+"/>
       <dep package="intltool"/>
     </dependencies>
   </tarball>
 
-  <tarball id="expat" version="1.95.8">
-    <source href="http://downloads.sourceforge.net/project/expat/expat/1.95.8/expat-1.95.8.tar.gz";
-            hash="sha256:c6aaa0b427e775a0fd5a956a75ae41e5110f22760723d9bda316100010e891ca"
-            md5sum="aff487543845a82fe262e6e2922b4c8e" size="318349"/>
-  </tarball>
-
-  <tarball id="autogen" version="5.8.4">
-    <source href="http://internap.dl.sourceforge.net/sourceforge/autogen/autogen-5.8.4.tar.bz2";
-            hash="sha256:854731a72e37efb62b3226d64fb2b856c2122fa8f813e5073c6e629e62d05ed7"
-            md5sum="b65d4b9e3ddbcfd5418b708858c05b66" size="931015"/>
+  <tarball id="poppler" version="0.14.1" autogenargs="--enable-xpdf-headers">
+    <source href="http://poppler.freedesktop.org/poppler-0.14.1.tar.gz";
+            hash="sha256:efe59b33585791ef6714fa33a6d62b8746d6352c4f57a093f03364b0979bfa3e"
+            md5sum="1d27cb8a09aaa373660fd608b258022a" size="1782771"/>
+    <dependencies>
+      <dep package="cairo"/>
+    </dependencies>
+    <suggests>
+      <dep package="glib"/>
+      <dep package="poppler-data"/>
+    </suggests>
+    <after>
+      <dep package="gtk+"/>
+      <dep package="gdk-pixbuf"/>
+    </after>
   </tarball>
 
-  <!-- Mono Binding -->
+  <autotools id="ptlib" check-target="false" supports-non-srcdir-builds="no">
+    <branch module="ptlib/2.8/ptlib-2.8.1.tar.bz2" repo="gnome.org"
+            autogen-sh="configure"
+            version="2.8.1"
+            hash="sha256:cb35473fe004b443d42c704f11151285951532593f41cc7f8e96c90ac09ef700"/>
+  </autotools>
 
-  <autotools id="libgdiplus">
-    <branch module="libgdiplus/libgdiplus-1.2.6.tar.bz2" version="1.2.6"
-            repo="mono.net" 
-            hash="sha256:5eb1a7a8d3b75c751eac6075239469059238082aee1963bc6a172b3073046cfe"
-            md5sum="dfe8e43a49b4aa40ab5b7cf53bf83675" size="2897855">
+  <autotools id="pycairo">
+    <branch module="releases/pycairo-1.8.2.tar.gz" version="1.8.2"
+            repo="cairo.org"
+            hash="sha256:77a8cbe388fd66825056744f2fc5c58b3afc247748bc2c777751cc0c2eb30a2f"
+            md5sum="bbfc0c2fef08dfb0c5b8baa5f0b67a87" size="519064">
     </branch>
     <dependencies>
-      <dep package="glib"/>
       <dep package="cairo"/>
-      <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="mono">
-    <branch module="mono/mono-2.4.2.2.tar.bz2" version="2.4.2.2"
-            repo="mono.net" 
-            hash="sha256:e3b965c56a669c3012856dcc17b7400d28505dd4bb8a3c6eb3e653bb41b5e6ba"
-            md5sum="54aac9b914c5a4dc81c2bfd058df1c93" size="24813167"/>
+  <tarball id="rarian" version="0.8.1" supports-non-srcdir-builds="no">
+    <source href="http://download.gnome.org/sources/rarian/0.8/rarian-0.8.1.tar.bz2";
+            hash="sha256:aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"
+            md5sum="75091185e13da67a0ff4279de1757b94" size="324441"/>
     <dependencies>
-      <dep package="libgdiplus"/>
-      <dep package="sqlite3"/>
+      <dep package="libxslt"/>
+      <dep package="intltool"/>
     </dependencies>
+  </tarball>
+
+  <autotools id="samba4" skip-autogen="never" autogen-sh="configure"
+             autogenargs="--enable-fhs" supports-non-srcdir-builds="no">
+    <branch repo="samba.org"
+            module="samba4/samba-4.0.0alpha11.tar.gz" version="4.0.0alpha11"
+            hash="sha256:ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9"
+            md5sum="dac98184a01e7e0c171302e3b78bf507" size="13917363"
+	    source-subdir="source4">
+      <patch file="samba.configure-for-libs.patch" strip="1"/>
+    </branch>
   </autotools>
 
-  <autotools id="mono-addins">
-    <branch module="mono-addins/mono-addins-0.4.tar.bz2" version="0.4"
-            repo="mono.net"
-            hash="sha256:d0fa0eec4e95c8cdfefc8961d7666d6137064df1b599a6489acf17e22fbc3e2e"
-            md5sum="3b7f3f6e55c95413df184d0e4c9233e4" size="304402"/>
+  <tarball id="shared-mime-info" supports-non-srcdir-builds="no" version="0.71">
+    <source href="http://people.freedesktop.org/~hadess/shared-mime-info-0.71.tar.bz2";
+            hash="sha256:1d8f97f17de77ae0d8a3a4ef357280ef444da87f4ce19170392712d0c2f6d04f"
+            md5sum="0a90508234d415f761a79fbffdff74f4" size="493216"/>
     <dependencies>
-      <dep package="mono"/>
-      <dep package="gtk-sharp"/>
+      <dep package="intltool"/>
+      <dep package="libxml2"/>
+      <dep package="glib"/>
     </dependencies>
-  </autotools>
+  </tarball>
+
+  <tarball id="speex" version="1.2rc1">
+    <source href="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz";
+            hash="sha256:342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6"
+            md5sum="c4438b22c08e5811ff10e2b06ee9b9ae" size="1061882"/>
+  </tarball>
 
   <autotools id="sqlite3"
 	     autogenargs="--enable-threadsafe --disable-tcl --enable-load-extension" check-target="false">
@@ -677,164 +973,64 @@
     </branch>
   </autotools>
 
-  <tarball id="PolicyKit" version="0.9" autogenargs="--enable-tests=no">
-    <source href="http://hal.freedesktop.org/releases/PolicyKit-0.9.tar.gz";
-            hash="sha256:f40c7c6bec19d7dba2335bddcffd0457494409a0dfce11d888c748dc892e80b7"
-            md5sum="802fd13ae41f73d79359e5ecb0a98716" size="1254318"/>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-      <dep package="glib"/>
-      <dep package="expat"/>
-      <dep package="intltool"/>
-    </dependencies>
-  </tarball>
-  
-  <tarball id="PolicyKit-gnome" version="0.9.2">
-    <source href="http://hal.freedesktop.org/releases/PolicyKit-gnome-0.9.2.tar.bz2";
-            hash="sha256:ecf4ce303a90a4580c54ee7b932ffaf01b7f115f40b17d75634c5bbfba085c8a"
-            md5sum="fc478b168d0c926a9766b0b415ff4bbf" size="1223691"/>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-      <dep package="gtk+"/>
-      <dep package="gconf"/>
-      <dep package="PolicyKit"/>
-      <dep package="gnome-doc-utils"/>
-      <dep package="intltool"/>
-    </dependencies>
+  <tarball id="startup-notification" version="0.9">
+    <source href="http://download.gnome.org/sources/startup-notification/0.9/startup-notification-0.9.tar.bz2";
+            hash="sha256:61de1aed379ea9d44a835baf76567e0aaa813b6d6e995db7e83e8986f69b580d"
+            md5sum="624b42f1fac5a12c543a079e2cd3b366" size="226231"/>
   </tarball>
 
-  <tarball id="polkit" version="0.99">
-    <source href="http://hal.freedesktop.org/releases/polkit-0.99.tar.gz";
-            hash="sha256:f612c7c26ec822f67751420057a4ae113fc50ab51070758faacf2ad30bb3583f"
-            md5sum="fcc4d7b19c08ad54d3ce0eae0ab12398" size="1042461"/>
+  <tarball id="swfdec" version="0.8.0">
+    <source href="http://swfdec.freedesktop.org/download/swfdec/0.8/swfdec-0.8.0.tar.gz";
+            hash="sha256:a19f0abc57ef6f367cc21002082efe18fa893d8af872cc2825a4536d509e8182"
+            md5sum="ce3002fc5d8ace9ce34ce960c0cc3c06" size="9986340"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="expat"/>
-      <dep package="intltool"/>
-    </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
-  </tarball>
-
-  <tarball id="polkit-gnome" version="0.99">
-    <source href="http://hal.freedesktop.org/releases/polkit-gnome-0.99.tar.bz2";
-            hash="sha256:73c4d04aa89d9a9687f3650327c0ec1cba704e9d5b7fc193958fa81d621208ba"
-            md5sum="f1a2565083266bc8c05c60aa7d8a0f6a" size="388069"/>
-    <dependencies>
-      <dep package="polkit"/>
+      <dep package="pango"/>
       <dep package="gtk+"/>
-      <dep package="intltool"/>
-    </dependencies>
-  </tarball>
-
-  <autotools id="libcanberra" autogen-sh="configure">
-    <branch repo="0pointer.de" module="libcanberra/libcanberra-0.26.tar.gz" version="0.26"
-            hash="sha256:4b5d8d2c2835133620adbc53745dd107b6e58b9a2963059e8f457143fee00982"
-            md5sum="ee2c66ada7c851a4e7b6eb1682285a24" size="463209">
-    </branch>
-    <dependencies>
-      <dep package="gtk-doc"/>
+      <dep package="cairo"/>
+      <dep package="liboil"/>
+      <dep package="libsoup"/>
     </dependencies>
-    <after>
-      <dep package="gtk+"/>
-      <dep package="gtk+-3"/>
-      <dep package="pulseaudio"/>
-      <dep package="gstreamer"/>
-    </after>
-  </autotools>
-
-  <tarball id="speex" version="1.2rc1">
-    <source href="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz";
-            hash="sha256:342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6"
-            md5sum="c4438b22c08e5811ff10e2b06ee9b9ae" size="1061882"/>
-  </tarball>
-
-  <tarball id="libsndfile" version="1.0.20" supports-non-srcdir-builds="no"
-           autogenargs="--disable-flac">
-    <source href="http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.20.tar.gz";
-            hash="sha256:7517eb966579f8814b5efe307cb919c5b4e7b5c6729209ba1da95f31e8368dc7"
-            md5sum="e0553e12c7a467af44693e95e2eac668" size="927422"/>
   </tarball>
 
-  <autotools id="pulseaudio" autogenargs="--disable-udev">
-    <branch repo="0pointer.de" module="pulseaudio/pulseaudio-0.9.21.tar.gz" version="0.9.21"
-            autogenargs="--disable-udev"
-            hash="sha256:94e22356ac70ee95388ae58da90d88c6b3186d1938618d21671627ff56cee254"
-            md5sum="76e623c4c72e2258bc8bdeb1599bad74" size="2056896"/>
+  <tarball id="telepathy-glib" version="0.13.1" autogenargs="--enable-vala-bindings">
+    <source href="http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.13.1.tar.gz";
+            hash="sha256:29ff30175109364f397636b3f7c6dc33ca9a225f6938de6b7c13599bd89c7f0c"
+            md5sum="d9073ad4ba99ae3cd31bc02aabd3455c" size="2673395"/>
     <dependencies>
-      <dep package="libsndfile"/>
-      <dep package="liboil"/>
       <dep package="glib"/>
-      <dep package="speex"/>
-    </dependencies>
-    <after>
-      <dep package="libsamplerate"/>
-      <dep package="gconf"/>
-      <dep package="avahi"/>
-      <dep package="bluez"/>
       <dep package="dbus"/>
-      <dep package="PolicyKit"/>
-    </after>
-  </autotools>
-
-  <cmake id="libproxy"
-         cmakeargs="-DCMAKE_BUILD_TYPE=None -DWITH_PERL=OFF -DWITH_VALA=ON -DWITH_DOTNET=OFF -DGAC_DIR=${prefix}/lib/mono">
-    <branch repo="libproxy.googlecode.com"
-            module="libproxy-0.4.6.tar.gz" version="0.4.6"
-            hash="sha256:9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30"
-            md5sum="199c6b120baf1f7258a55f38d5ec74f5" size="82483"/>
-    <dependencies>
-      <dep package="gconf"/>
-    </dependencies>
-    <suggests>
-      <dep package="NetworkManager"/>
-    </suggests>
-    <after>
-      <dep package="mozilla"/>
-      <dep package="WebKit"/>
-    </after>
-  </cmake>
-
-  <tarball id="libunique" version="1.1.6">
-    <source href="http://download.gnome.org/sources/libunique/1.1/libunique-1.1.6.tar.bz2";
-            hash="sha256:e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb"
-            md5sum="7955769ef31f1bc4f83446dbb3625e6d" size="335534"/>
-    <dependencies>
-      <dep package="gtk+"/>
       <dep package="dbus-glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libxslt"/>
+      <dep package="vala"/>
     </dependencies>
   </tarball>
 
-  <tarball id="intltool" version="0.41.1">
-    <source href="http://launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz";
-            hash="sha256:06d02133a85b9d6f29cd763050dc9267a6d73ef3008993f5b917cafc7ece96c0"
-            md5sum="d6c91bf06681919ccfdf3624035b75dc" size="139287"/>
+  <tarball id="telepathy-logger" version="0.1.5">
+    <source href="http://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-0.1.5.tar.bz2";
+            hash="sha256:0b2e4f402531a607c5322c2fbcd0fd61a96f6b933c726430dafefa03f580bec8"
+            md5sum="6e41a5c6b323a337085b9519ac557fb7" size="448552"/>
     <dependencies>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+      <dep package="telepathy-glib"/>
     </dependencies>
   </tarball>
 
-  <tarball id="libical" version="0.43">
-    <source href="http://downloads.sourceforge.net/freeassociation/libical-0.43.tar.gz";
-            hash="sha256:099f3e29a864de324477983eefaf17a4ef3b4ec8f075f95384db1ac67b6663a6"
-            md5sum="5f0a1feb60894d0be537aefea5647474" size="1145724"/>
+  <tarball id="telepathy-mission-control" version="5.5.1">
+    <source href="http://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-5.5.1.tar.gz";
+            hash="sha256:efa033f018066987edaa80d7e6a58e50788e4466a6cfd7fb7493e955f3b38a79"
+            md5sum="97b0d0af8670a6a9a4510995eebce1c6" size="1217791"/>
     <dependencies>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+      <dep package="telepathy-glib"/>
+      <dep package="gnome-keyring"/>
+      <dep package="gconf"/>
     </dependencies>
   </tarball>
 
-  <autotools id="samba4" skip-autogen="never" autogen-sh="configure"
-             autogenargs="--enable-fhs" supports-non-srcdir-builds="no">
-    <branch repo="samba.org"
-            module="samba4/samba-4.0.0alpha11.tar.gz" version="4.0.0alpha11"
-            hash="sha256:ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9"
-            md5sum="dac98184a01e7e0c171302e3b78bf507" size="13917363"
-	    source-subdir="source4">
-      <patch file="samba.configure-for-libs.patch" strip="1"/>
-    </branch>
-  </autotools>
-
   <autotools id="talloc"
 	    makeargs="tallocdir='$(srcdir)'"
 	    makeinstallargs="install tallocdir='$(srcdir)'">
@@ -857,61 +1053,6 @@
     </branch>
   </autotools>
 
-  <autotools id="tevent">
-    <branch repo="samba.org"
-            module="samba4/samba-4.0.0alpha11.tar.gz" version="4.0.0alpha11"
-            hash="sha256:ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9"
-            md5sum="dac98184a01e7e0c171302e3b78bf507" size="13917363"
-	    source-subdir="lib/tevent">
-      <patch file="samba.configure-for-libs.patch" strip="1"/>
-    </branch>
-  </autotools>
-
-  <autotools id="libmapi" skip-autogen="never" autogen-sh="configure"
-             supports-non-srcdir-builds="no">
-    <branch repo="sourceforge.net"
-            module="openchange/openchange-0.9-COCHRANE.tar.gz" version="0.9"
-            hash="sha256:b8467d1fa9fd025323a2ddc2d4b4a29a78fee1b6cb1f4373725e45f7769b5402"
-            md5sum="9dc6c91ea5d4afce4a5aa81215835b8b" size="1601358"/>
-    <dependencies>
-      <dep package="tdb"/>
-      <dep package="talloc"/>
-      <dep package="tevent"/>
-      <dep package="samba4"/>
-    </dependencies>
-  </autotools>
-
-  <tarball id="gst-plugins-farsight" version="0.12.11">
-    <source href="http://farsight.freedesktop.org/releases/gst-plugins-farsight/gst-plugins-farsight-0.12.11.tar.gz";
-            hash="sha256:df5b6fb9774d63be7dc18af5e5760e2e9d4726711d423e8de3af6a960aa13761"
-            md5sum="685a3dfd6752390e336e9556b62fad9e" size="500109"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="libxml2"/>
-    </dependencies>
-  </tarball>
-
-  <tarball id="farsight2" version="0.0.19" autogenargs="--disable-python">
-    <source href="http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.19.tar.gz";
-            hash="sha256:71e6f487bf7434c424234c136c2a8233ddecf3178acbe4fd9295b742b59ea04c"
-            md5sum="0ce00833b1baaab2b9d8b6dbba56fbfd" size="1067517"/>
-    <dependencies>
-      <dep package="libnice"/>
-    </dependencies>
-  </tarball>
-
-  <tarball id="libnice" version="0.0.11">
-    <source href="http://nice.freedesktop.org/releases/libnice-0.0.11.tar.gz";
-            hash="sha256:a331a2cf4ec868a0d79175dc233f55e5a07c097a56643e8c1449505d83c32ece"
-            md5sum="9e6f6b0b781b747e49df2160cbb29f83" size="636299"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-  </tarball>
-
   <tarball id="telepathy-farsight" version="0.0.14" autogenargs="--disable-python">
     <source href="http://telepathy.freedesktop.org/releases/telepathy-farsight/telepathy-farsight-0.0.14.tar.gz";
             hash="sha256:3074d40b33ecd08d7fc0168dfb4a4dd4f98ef3fd5c4708074b9669b3f39457b5"
@@ -922,124 +1063,29 @@
     </dependencies>
   </tarball>
 
-  <autotools id="libnotify">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="gtk+-3"/>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-    </dependencies>
-  </autotools>
-
-  <tarball id="libgda" version="4.1.6" autogenargs="--with-java=no">
-    <source href="http://download.gnome.org/sources/libgda/4.1/libgda-4.1.6.tar.bz2";
-            hash="sha256:1e1c7ec56662c5463ffad28030ae1017d4af6add6cccb92ec4e3b45dcb5f3c59"
-            md5sum="353dbf284ca7b43935a8fb8863b8391b" size="12583049"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libxml2"/>
-    </dependencies>
-  </tarball>
-
-  <autotools id="WebKit" makefile="GNUmakefile"
-             autogenargs="--with-gtk=3.0 --enable-introspection">
-    <branch repo="webkitgtk.org"
-            module="webkit-1.3.4.tar.gz" version="1.3.4"
-            hash="sha256:c4f53837210440dcd654a3f58f37ad97879e0d5dcadfe5c5624e972a4d4ad7ed"
-            md5sum="a46046e438c148ffbce6a438f86733bc" size="8043653"/>
-    <dependencies>
-      <dep package="cairo"/>
-      <dep package="fontconfig"/>
-      <dep package="libxml2"/>
-      <dep package="gtk+-3"/>
-      <dep package="pango"/>
-      <dep package="libsoup"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-    <suggests>
-      <dep package="libxslt"/>
-      <dep package="sqlite3"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="enchant"/>
-    </suggests>
+  <autotools id="tevent">
+    <branch repo="samba.org"
+            module="samba4/samba-4.0.0alpha11.tar.gz" version="4.0.0alpha11"
+            hash="sha256:ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9"
+            md5sum="dac98184a01e7e0c171302e3b78bf507" size="13917363"
+	    source-subdir="lib/tevent">
+      <patch file="samba.configure-for-libs.patch" strip="1"/>
+    </branch>
   </autotools>
 
-  <tarball id="libchamplain" version="0.7.2">
-    <source href="http://download.gnome.org/sources/libchamplain/0.7/libchamplain-0.7.2.tar.bz2";
-            hash="sha256:4841263418ccf36d20822d3c0dfd50d2754510c714e3254aea69599396abbd95"
-            md5sum="18f4e53b17467ae3602d5dcbec6bba43" size="672748"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="clutter"/>
-      <dep package="gtk+"/>
-      <dep package="sqlite3"/>
-    </dependencies>
-    <suggests>
-      <dep package="libsoup"/>
-      <dep package="clutter-gtk"/>
-    </suggests>
-  </tarball>
-
-  <repository type="tarball" name="pyxdg"
-      href="http://www.gnome.org/~fpeters/pyxdg/"/>
-  <distutils id="pyxdg">
-    <branch repo="pyxdg" module="pyxdg-0.17.tar.gz" version="0.17"
-            hash="sha256:fbc87711922b2dd6ceb23ee041f1f96da9b7dbb6971df03a3081b439def069ce"
-            md5sum="a086de99cc536095684d87f15594e4db" size="37372"/>
-  </distutils>
-
-  <tarball id="libgdata" version="0.6.5">
-    <source href="http://download.gnome.org/sources/libgdata/0.6/libgdata-0.6.5.tar.bz2";
-            hash="sha256:dcb82f7162d69549512444376da2cdea65650ee4dae4d00eed7fbbd3387ddf2c"
-            md5sum="e12f52a3d25c25016856c64ca0331221" size="1015870"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libxml2"/>
-      <dep package="libsoup"/>
-    </dependencies>
-  </tarball>
-
-  <tarball id="gmime" version="2.4.15">
-    <source href="http://download.gnome.org/sources/gmime/2.4/gmime-2.4.15.tar.bz2";
-            hash="sha256:a0a6c9413b057ab5d8a2a2902cbaa5b3a17871af3f94dc8431978c9e0e5f53e1"
-            md5sum="604ec62e1ce4d149d724f5d3ee69c110" size="859146"/>
+  <autotools id="totem-pl-parser">
+    <branch/>
     <dependencies>
-      <dep package="gtk-doc"/>
+      <dep package="intltool"/>
       <dep package="glib"/>
+      <dep package="gmime"/>
     </dependencies>
-    <after>
-      <dep package="gtk-sharp"/>
-    </after>
-  </tarball>
-
-  <tarball id="gnome-js-common" version="0.1.1">
-    <source href="http://download.gnome.org/sources/gnome-js-common/0.1/gnome-js-common-0.1.1.tar.bz2";
-            hash="sha256:6cad015cda5abfd2bccd6b95714ca39c83ca69ca7e6f7326dc75763a758dc8db"
-            md5sum="4f1c409a0be66d0df9dcdf15e9cf70ff" size="274010"/>
     <suggests>
-      <dep package="seed"/>
-      <dep package="gjs"/>
-    </suggests>
-  </tarball>
-
-  <tarball id="PackageKit" version="0.6.8" autogenargs="--disable-tests --disable-qt">
-    <source href="http://www.packagekit.org/releases/PackageKit-0.6.8.tar.bz2";
-            hash="sha256:24de9db9b292b174746d3596a9ea624b868b59f033e786bccb29ed5303c50f83"
-            md5sum="47987b91826bd522de1202d5a1e2510d" size="8568179"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gtk+-3"/>
-      <dep package="dbus"/>
+      <dep package="libepc"/>
+      <dep package="tracker"/>
       <dep package="dbus-glib"/>
-    </dependencies>
-    <suggests>
-      <dep package="NetworkManager"/>
-      <dep package="polkit"/>
     </suggests>
-  </tarball>
+  </autotools>
 
   <tarball id="tracker" version="0.9.24" autogenargs="--enable-miner-evolution=no">
     <source href="http://download.gnome.org/sources/tracker/0.9/tracker-0.9.24.tar.bz2";
@@ -1067,6 +1113,7 @@
     </after>
   </tarball>
 
+
   <tarball id="vala" version="0.10.0" autogenargs="--enable-vapigen">
     <source href="http://download.gnome.org/sources/vala/0.10/vala-0.10.0.tar.bz2";
             hash="sha256:f5655a3cdc21c4c8d94d4af55a4c0a0418bad7a5ebf60ccdf471c4e16c5c9235"
@@ -1076,177 +1123,63 @@
     </dependencies>
   </tarball>
 
-  <!-- new external dependencies -->
-  <tarball id="raptor" version="1.4.21">
-    <source href="http://download.librdf.org/source/raptor-1.4.21.tar.gz";
-            hash="sha256:db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca"
-            md5sum="992061488af7a9e2d933df6b694bb876" size="1651843"/>
+  <autotools id="WebKit" makefile="GNUmakefile"
+             autogenargs="--with-gtk=3.0 --enable-introspection">
+    <branch repo="webkitgtk.org"
+            module="webkit-1.3.4.tar.gz" version="1.3.4"
+            hash="sha256:c4f53837210440dcd654a3f58f37ad97879e0d5dcadfe5c5624e972a4d4ad7ed"
+            md5sum="a46046e438c148ffbce6a438f86733bc" size="8043653"/>
     <dependencies>
+      <dep package="cairo"/>
+      <dep package="fontconfig"/>
       <dep package="libxml2"/>
-      <dep package="libxslt"/>
-    </dependencies>
-  </tarball>
-
-  <tarball id="gssdp" version="0.8.0">
-    <source href="http://www.gupnp.org/sites/all/files/sources/gssdp-0.8.0.tar.gz";
-            hash="sha256:c6ca4f084109487255aa847b2b1d27cf29b19aafb85f9d67a9a38f36a9b58506"
-            md5sum="a4cf85650decaec7a12382a8a002bc83" size="368212"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libsoup"/>
-    </dependencies>
-  </tarball>
-
-  <tarball id="gupnp" version="0.14.0" autogenargs="--with-context-manager=network-manager">
-    <source href="http://www.gupnp.org/sites/all/files/sources/gupnp-0.14.0.tar.gz";
-            hash="sha256:6ac13efe46c6f1e5d05e48e1041bf37dfa702839ce5fbb01e0f314f3904b6a16"
-            md5sum="8598922256faa5adb28657d0c10a3e3e" size="529403"/>
-    <dependencies>
-      <dep package="gssdp"/>
-      <dep package="glib"/>
+      <dep package="gtk+-3"/>
+      <dep package="pango"/>
       <dep package="libsoup"/>
-      <dep package="libxml2"/>
-      <dep package="shared-mime-info"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <suggests>
-      <dep package="NetworkManager"/>
-    </suggests>
-  </tarball>
-
-  <tarball id="gupnp-av" version="0.6.1">
-    <source href="http://www.gupnp.org/sites/all/files/sources/gupnp-av-0.6.1.tar.gz";
-            hash="sha256:b636e3aa8af3e43103a812b45e41045180f793ef15371ef7b13c0dfc3b2135f2"
-            md5sum="ec775ee520dc62d73f56c96931c3b97" size="408227"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gupnp"/>
-    </dependencies>
-  </tarball>
-
-  <tarball id="gupnp-dlna" version="0.4.0">
-    <source href="http://www.gupnp.org/sites/all/files/sources/gupnp-dlna-0.4.0.tar.gz";
-            hash="sha256:f0968686d88c101f6b9457896cbcde388649d1dda37b16330a08662a2c88650b"
-            md5sum="8e0913fa62da959d98a5417b06b909fa" size="429117"/>
-    <dependencies>
-      <dep package="libxml2"/>
-      <dep package="glib"/>
-      <dep package="gstreamer"/>
+      <dep package="libxslt"/>
+      <dep package="sqlite3"/>
       <dep package="gst-plugins-base"/>
-    </dependencies>
-    <suggests>
-      <dep package="gst-plugins-good"/>
-      <dep package="gst-plugins-bad"/>
-      <dep package="gst-plugins-ugly"/>
-      <dep package="gst-ffmpeg"/>
+      <dep package="enchant"/>
     </suggests>
-  </tarball>
+  </autotools>
 
-  <tarball id="gupnp-vala" version="0.6.12">
-    <source href="http://www.gupnp.org/sites/all/files/sources/gupnp-vala-0.6.12.tar.gz";
-            hash="sha256:a28d00b7c2952871dcdeaf15f879a33fecba942bdf6cd15e00323e2cfa1d06c0"
-            md5sum="065397f2eeee8356b94bdf469f1a12cd" size="115668"/>
-    <dependencies>
-      <dep package="vala"/>
-      <dep package="gssdp"/>
-      <dep package="gupnp"/>
-      <dep package="gupnp-av"/>
-      <dep package="gupnp-dlna"/>
-    </dependencies>
-    <suggests>
-      <dep package="gupnp-ui"/>
-    </suggests>
-  </tarball>
+  <!-- new external dependencies -->
 
-  <tarball id="libgee" version="0.6.0">
-    <source href="http://download.gnome.org/sources/libgee/0.6/libgee-0.6.0.tar.bz2";
-            hash="sha256:e586678d0a88637abeaaf850b62231000772e79ea6d9c4b45dc3cea99f778a7a"
-            md5sum="4eb513b23ab6ea78884989518a4acf6f" size="477609"/>
+ <autotools id="vte-3" autogenargs="--with-gtk=3.0 --enable-introspection=yes">
+    <branch checkoutdir="vte-3" module="vte"/>
     <dependencies>
+      <dep package="intltool"/>
       <dep package="glib"/>
-    </dependencies>
-  </tarball>
-
-  <autotools id="libunique-3">
-    <branch module="libunique/2.90/libunique-2.90.1.tar.bz2" repo="gnome.org"
-            version="2.90.1" checkoutdir="libunique-2.90.1"
-            hash="sha256:94c46006557b9f981b801f90c1ce324dcd5385aa6ded5058cb06f39e32119993"
-            md5sum="7778865473d8c81084ad5959a0d9853c" size="344813"/>
-    <dependencies>
-      <dep package="gtk+-3"/>
-      <dep package="dbus-glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libpeas">
-    <branch module="libpeas/0.7/libpeas-0.7.0.tar.bz2" repo="gnome.org"
-            version="0.7.0"
-            hash="sha256:f6fa3d4a2150adf9dd65c09e5fc81229918b3cef1b1ed85a0a75957b14b4f6bd"
-            md5sum="1b45b559414b1c1ea237e8823b1d8866" size="495554"/>
-    <dependencies>
-      <dep package="gobject-introspection"/>
       <dep package="gtk+-3"/>
-    </dependencies>
-    <suggests>
-      <dep package="pygobject"/>
-      <dep package="seed"/>
-    </suggests>
-  </autotools>
-
-  <tarball id="folks" version="0.2.0">
-    <source href="http://download.gnome.org/sources/folks/0.2/folks-0.2.0.tar.bz2";
-            hash="sha256:25f4760ba777b2f8a90576ac43c1540c9fd88dd4d39de3d07bc7f2f9ef5fc84f"
-            md5sum="8c66c03d942313db735f6eb375c2f71a" size="458990"/>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-      <dep package="libgee"/>
-      <dep package="vala"/>
       <dep package="gobject-introspection"/>
-      <dep package="telepathy-glib"/>
-    </dependencies>
-  </tarball>
-
-  <autotools id="ORBit2">
-    <branch/>
-    <dependencies>
-      <dep package="libIDL"/>
-      <dep package="gnome-common"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libIDL">
+  <autotools id="zenity">
     <branch/>
     <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="nautilus-sendto">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
+      <dep package="intltool"/>
       <dep package="gtk+-3"/>
       <dep package="gconf"/>
-      <dep package="nautilus"/>
+      <dep package="gnome-doc-utils"/>
     </dependencies>
-    <suggests>
-      <dep package="evolution-data-server"/>
-      <dep package="dbus-glib"/>
-      <dep package="gupnp-av"/>
-      <dep package="empathy"/>
-    </suggests>
   </autotools>
 
- <autotools id="vte-3" autogenargs="--with-gtk=3.0 --enable-introspection=yes">
-    <branch checkoutdir="vte-3" module="vte"/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="gtk+-3"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
+  <!-- OS Core Services dependencies -->
+
+  <autotools id="libnl" skip-autogen="never" autogen-sh="configure">
+    <branch repo="people.suug.ch/~tgr/libnl/"
+            module="libnl-1.1.tar.gz" version="1.1"
+            md5sum="ae970ccd9144e132b68664f98e7ceeb1" size="288932">
+      <patch file="libnl-include-fix.patch" strip="1"/>
+    </branch>
   </autotools>
 
+  <!-- Deprecated dependencies -->
+
   <autotools id="libglade">
     <branch/>
     <dependencies>
@@ -1255,24 +1188,27 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-keyring" autogenargs="--with-gtk=2.0">
+  <autotools id="libgnome-keyring">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="dbus"/>
-      <dep package="gconf"/>
-      <dep package="gtk+"/>
       <dep package="libgcrypt"/>
-      <dep package="libtasn1"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libgtop">
-    <branch/>
+  <autotools id="libgweather">
+    <branch revision="gnome-2-30"/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="glib"/>
+      <dep package="libxml2"/>
+      <dep package="gconf"/>
+      <dep package="gtk+"/>
+      <dep package="libsoup"/>
     </dependencies>
+    <suggests>
+      <dep package="pygobject"/>
+    </suggests>
   </autotools>
 
   <autotools id="gnome-desktop" autogenargs="--with-gnome-distributor=JHBuild">
@@ -1290,112 +1226,94 @@
     </dependencies>
   </autotools>
 
-  <autotools id="mm-common">
-    <branch/>
-  </autotools>
-
-  <autotools id="libsigc++2">
+  <autotools id="gnome-keyring" autogenargs="--with-gtk=2.0">
     <branch/>
     <dependencies>
-      <dep package="mm-common"/>
+      <dep package="intltool"/>
+      <dep package="dbus"/>
+      <dep package="gconf"/>
+      <dep package="gtk+"/>
+      <dep package="libgcrypt"/>
+      <dep package="libtasn1"/>
     </dependencies>
   </autotools>
 
-  <autotools id="glibmm">
-    <branch/>
+  <autotools id="gtk+">
+    <branch revision="gtk-2-24"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="libsigc++2"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="cairomm" autogen-sh="configure">
-    <branch module="releases/cairomm-1.9.2.tar.gz" version="1.9.2"
-            repo="cairo.org"
-            hash="sha256:06be135a638be9e279905cc6287c066da93ab62f273a4a66858af379621288f6"
-            md5sum="24b0d35de4154195b8b78cf1f48b85e7" size="856678">
-    </branch>
-    <dependencies>
       <dep package="cairo"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="pangomm">
-    <branch/>
-    <dependencies>
-      <dep package="glibmm"/>
-      <dep package="cairomm"/>
       <dep package="pango"/>
+      <dep package="atk"/>
+      <dep package="gdk-pixbuf"/>
     </dependencies>
+    <after>
+      <dep package="shared-mime-info"/>
+    </after>
   </autotools>
 
-  <autotools id="atkmm">
-    <branch/>
+  <tarball id="hal" version="0.5.11">
+    <source href="http://hal.freedesktop.org/releases/hal-0.5.11.tar.gz";
+	    hash="sha256:730a9f2340f789677eb0c3b0984bbaca3ede6c12d1e4b16bc7ea91f51d10ba90"
+	    md5sum="750cf074e88b6fb7012f26d99cd39b9b" size="1672992"/>
     <dependencies>
-      <dep package="glibmm"/>
-      <dep package="atk"/>
+      <dep package="dbus-glib"/>
+      <dep package="libvolume_id"/>
+      <dep package="PolicyKit"/>
     </dependencies>
-  </autotools>
+  </tarball>
 
-  <autotools id="gtkmm">
+  <autotools id="libIDL">
     <branch/>
     <dependencies>
-      <dep package="pangomm"/>
-      <dep package="atkmm"/>
-      <dep package="gtk+-3"/>
+      <dep package="glib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="pycairo">
-    <branch module="releases/pycairo-1.8.2.tar.gz" version="1.8.2"
-            repo="cairo.org" 
-            hash="sha256:77a8cbe388fd66825056744f2fc5c58b3afc247748bc2c777751cc0c2eb30a2f"
-            md5sum="bbfc0c2fef08dfb0c5b8baa5f0b67a87" size="519064">
-    </branch>
+  <tarball id="libunique" version="1.1.6">
+    <source href="http://download.gnome.org/sources/libunique/1.1/libunique-1.1.6.tar.bz2";
+            hash="sha256:e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb"
+            md5sum="7955769ef31f1bc4f83446dbb3625e6d" size="335534"/>
     <dependencies>
-      <dep package="cairo"/>
+      <dep package="gtk+"/>
+      <dep package="dbus-glib"/>
     </dependencies>
-  </autotools>
+  </tarball>
 
- <autotools id="pygobject">
+  <autotools id="ORBit2">
     <branch/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="pycairo"/>
+      <dep package="libIDL"/>
+      <dep package="gnome-common"/>
     </dependencies>
   </autotools>
 
-  <autotools id="pygtk">
-    <branch/>
+  <tarball id="PolicyKit" version="0.9" autogenargs="--enable-tests=no">
+    <source href="http://hal.freedesktop.org/releases/PolicyKit-0.9.tar.gz";
+            hash="sha256:f40c7c6bec19d7dba2335bddcffd0457494409a0dfce11d888c748dc892e80b7"
+            md5sum="802fd13ae41f73d79359e5ecb0a98716" size="1254318"/>
     <dependencies>
-      <dep package="pygobject"/>
-      <dep package="gtk+"/>
-      <dep package="pycairo"/>
-      <dep package="libglade"/>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+      <dep package="glib"/>
+      <dep package="expat"/>
+      <dep package="intltool"/>
     </dependencies>
-  </autotools>
-
- <autotools id="libnl" skip-autogen="never" autogen-sh="configure">
-    <branch repo="people.suug.ch/~tgr/libnl/"
-            module="libnl-1.1.tar.gz" version="1.1"
-            md5sum="ae970ccd9144e132b68664f98e7ceeb1" size="288932">
-      <patch file="libnl-include-fix.patch" strip="1"/>
-    </branch>
-  </autotools>
+  </tarball>
 
-  <autotools id="libgweather">
-    n<branch revision="gnome-2-30"/>
+  <tarball id="PolicyKit-gnome" version="0.9.2">
+    <source href="http://hal.freedesktop.org/releases/PolicyKit-gnome-0.9.2.tar.bz2";
+            hash="sha256:ecf4ce303a90a4580c54ee7b932ffaf01b7f115f40b17d75634c5bbfba085c8a"
+            md5sum="fc478b168d0c926a9766b0b415ff4bbf" size="1223691"/>
     <dependencies>
-      <dep package="intltool"/>
-      <dep package="libxml2"/>
-      <dep package="gconf"/>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
       <dep package="gtk+"/>
-      <dep package="libsoup"/>
+      <dep package="gconf"/>
+      <dep package="PolicyKit"/>
+      <dep package="gnome-doc-utils"/>
+      <dep package="intltool"/>
     </dependencies>
-    <suggests>
-      <dep package="pygobject"/>
-    </suggests>
-  </autotools>
+  </tarball>
 
 </moduleset>