[gnome-modulesets/gnome-3-16: 1/3] Resync with current modulesets



commit 70deb16bb57afe9e28bb8d2008699a7238448e40
Author: Javier Jardón <jjardon gnome org>
Date:   Sun Mar 22 21:28:01 2015 +0000

    Resync with current modulesets

 gnome-apps.modules      |  197 +++++++++++++------
 gnome-core-deps.modules |  522 +++++++++++++++++++----------------------------
 gnome-core.modules      |  148 +++++++-------
 gnome-sysdeps.modules   |  313 +++++++++++++++++++++++++---
 gnome-world.modules     |  367 +++++++++++++++++++--------------
 5 files changed, 918 insertions(+), 629 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index 137f4f6..b1cdab9 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -25,8 +25,6 @@
     href="https://download.gnome.org/sources/"/>
   <repository type="tarball" name="spice"
       href="http://www.spice-space.org/download/"/>
-  <repository type="tarball" name="libvirt.org"
-      href="http://libvirt.org/sources/"/>
   <repository type="tarball" name="ftp.gnu.org"
       href="http://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="qqwing"
@@ -43,23 +41,12 @@
        that are not covered there, add them in here
     -->
 
-  <autotools id="appstream-glib">
-    <if condition-set="freebsd">
-      <autogenargs value="LIBARCHIVE_CFLAGS=' ' LIBARCHIVE_LIBS='-larchive'"/>
-    </if>
-    <branch repo="github.com" module="hughsie/appstream-glib.git" revision="0_2_X"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="babl">
     <branch/>
   </autotools>
 
   <autotools id="gegl">
-    <branch revision="gegl-0-2"/>
+    <branch/>
     <dependencies>
       <dep package="babl"/>
       <dep package="glib"/>
@@ -73,6 +60,7 @@
   <autotools id="bijiben">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="tracker"/>
       <dep package="clutter-gtk"/>
       <dep package="gtk+"/>
@@ -86,16 +74,24 @@
     </suggests>
   </autotools>
 
-  <autotools id="libvirt" autogenargs="--with-yajl">
-    <branch repo="libvirt.org"
-            module="libvirt-1.0.6.tar.gz"
-            version="1.0.6"
-            hash="sha256:a188eb2056d7936c4c9605f4d435b9097880ec359e10be6546f2c9fa665de67d">
-    </branch>
+  <autotools id="dconf-editor">
+    <branch/>
     <dependencies>
-      <dep package="device-mapper"/>
-      <dep package="libnl"/>
-      <dep package="yajl"/>
+      <dep package="glib"/>
+      <dep package="dconf"/>
+      <dep package="gtk+"/>
+      <dep package="vala"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-calendar">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="evolution-data-server"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
@@ -148,17 +144,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtkhtml">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="enchant"/>
-      <dep package="iso-codes"/>
-      <dep package="libsoup"/>
-    </dependencies>
-  </autotools>
-
  <autotools id="gtksourceviewmm">
     <branch/>
     <dependencies>
@@ -224,11 +209,26 @@
     </suggests>
  </autotools>
 
-  <autotools id="libgda" autogenargs="--with-java=no --disable-tools">
+  <autotools id="libgda-5.2" autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi 
--disable-vala --disable-gdaui-vala">
+    <if condition-set="freebsd">
+      <autogenargs value="LIBCRYPTO_CFLAGS=' ' LIBCRYPTO_LIBS='-lcrypto' --with-bdb=/usr/local 
--with-bdb-libdir-name=lib/db5 --with-bdb-includedir-name=include/db5"/>
+    </if>
+    <branch checkoutdir="libgda-5.2" module="libgda" revision="LIBGDA_5.2"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libxml2"/>
+      <dep package="openssl"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgda"
+             autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi --enable-vala 
--enable-gdaui-vala">
     <if condition-set="freebsd">
       <autogenargs value="LIBCRYPTO_CFLAGS=' ' LIBCRYPTO_LIBS='-lcrypto' --with-bdb=/usr/local 
--with-bdb-libdir-name=lib/db5 --with-bdb-includedir-name=include/db5"/>
     </if>
-    <branch revision="LIBGDA_5.2"/>
+    <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -276,7 +276,9 @@
             version="1.2.0"
             hash="sha256:b9de6cc596049cf852d17a37014f9a4b0cac1682bd8ccff5def4433b0b52d1e1"
             size="350915"/>
-    <dependencies />
+    <dependencies>
+      <dep package="c++"/>
+    </dependencies>
   </autotools>
 
   <autotools id="speech-dispatcher" autogenargs="--with-espeak">
@@ -290,15 +292,25 @@
     </dependencies>
   </autotools>
 
+  <autotools id="usbredir">
+    <branch repo="spice"
+            module="usbredir/usbredir-0.7.tar.bz2"
+            version="0.7"
+            hash="sha256:0a63a0712b5dc62be9cca44f97270fea5d1ec1fe7dde0c11dc74a01c8e2006aa"/>
+    <dependencies>
+      <dep package="libusb1"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-static">
     <if condition-set="freebsd">
       <autogenargs value="SSL_CFLAGS=' ' SSL_LIBS='-lssl'"/>
     </if>
     <branch repo="spice"
-            module="gtk/spice-gtk-0.25.tar.bz2"
-            version="0.25"
-            hash="sha256:0730c6a80ad9f5012f65927d443377019f300573f7ccc93db84eadec462ad087"
-            size="1242457"/>
+            module="gtk/spice-gtk-0.28.tar.bz2"
+            version="0.28"
+            hash="sha256:15aeeb63422cb3bfaa2edbf4602ed2025baa4455abfd1677f631245a0d0f81c4"
+            size="1274095"/>
     <dependencies>
       <dep package="cairo"/>
       <dep package="cyrus-sasl"/>
@@ -311,6 +323,7 @@
       <dep package="pixman"/>
       <dep package="pulseaudio"/>
       <dep package="spice-protocol"/>
+      <dep package="usbredir"/>
       <dep package="vala"/>
       <dep package="zlib"/>
     </dependencies>
@@ -370,10 +383,13 @@
          cmakeargs="-DTHREADSAFE:BOOL=1">
     <branch repo="tarball.github.com"
             module="libgit2/libgit2/archive/v${version}.tar.gz"
-            version="0.21.0"
-            hash="ae2afb5729ab6dcf6f690e5d66cb876372eaaedd37dc4fb072ad8da92338e099"
+            version="0.22.0"
+            hash="b70965b35e6d0adc891ba2edb28d982cb27729a3f2bb02186084f692e94922b2"
             checkoutdir="libgit2-${version}">
     </branch>
+    <dependencies>
+      <dep package="libssh2"/>
+    </dependencies>
   </cmake>
 
   <autotools id="libgit2-glib">
@@ -415,6 +431,7 @@
       <dep package="libgdata"/>
       <dep package="liboauth"/>
       <dep package="libzapojit"/>
+      <dep package="WebKit"/>
     </dependencies>
   </autotools>
 
@@ -430,10 +447,24 @@
       <dep package="libchamplain"/>
       <dep package="geocode-glib"/>
       <dep package="geoclue"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="libgfbgraph"/>
       <dep package="gnome-themes-standard"/>
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-multi-writer">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+      <dep package="libgusb"/>
+      <dep package="udisks"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="devhelp">
     <branch/>
     <dependencies>
@@ -490,6 +521,7 @@
       <dep package="libgee"/>
       <dep package="tracker"/>
       <dep package="valadoc"/>
+      <dep package="libmediaart"/>
     </dependencies>
   </autotools>
 
@@ -514,7 +546,7 @@
       <dep package="gtk+"/>
       <dep package="vte"/>
       <dep package="gdl"/>
-      <dep package="libgda"/>
+      <dep package="libgda-5.2"/>
       <dep package="gtksourceview"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -549,27 +581,37 @@
     </dependencies>
   </autotools>
 
-  <autotools id="evolution" autogenargs="--disable-pst-import">
-    <branch revision="evolution-3-12"/>
+  <autotools id="evolution" autogenargs="--disable-autoar --disable-libcryptui --disable-pst-import">
+    <branch/>
     <dependencies>
+      <dep package="atk"/>
       <dep package="bogofilter"/>
+      <dep package="cairo"/>
+      <dep package="enchant"/>
       <dep package="evolution-data-server"/>
+      <dep package="gcr"/>
+      <dep package="gdk-pixbuf"/>
       <dep package="gnome-desktop"/>
       <dep package="gnome-online-accounts"/>
+      <dep package="gsettings-desktop-schemas"/>
       <dep package="gstreamer"/>
+      <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gtkhtml"/>
       <dep package="highlight"/>
       <dep package="intltool"/>
       <dep package="libcanberra"/>
+      <dep package="libgcrypt"/>
       <dep package="libgdata"/>
       <dep package="libgweather"/>
       <dep package="libical"/>
+      <dep package="libnotify"/>
       <dep package="libsoup"/>
       <dep package="libxml2"/>
-      <dep package="libnotify"/>
+      <dep package="nspr"/>
+      <dep package="nss"/>
       <dep package="shared-mime-info"/>
       <dep package="spamassassin"/>
+      <dep package="WebKit1"/>
       <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
@@ -635,6 +677,7 @@
       <dep package="libxml2"/>
       <dep package="gtk-vnc"/>
       <dep package="libosinfo"/>
+      <dep package="libusb1"/>
       <dep package="libvirt-glib"/>
       <dep package="gtk+"/>
       <dep package="spice-gtk"/>
@@ -652,7 +695,7 @@
     <dependencies>
       <dep package="vala"/>
       <dep package="gtk+"/>
-      <dep package="libcanberra"/>
+      <dep package="gsound"/>
       <dep package="gnome-desktop"/>
       <dep package="libgweather"/>
       <dep package="libnotify"/>
@@ -676,6 +719,7 @@
       <dep package="iso-codes"/>
       <dep package="libgweather"/>
       <dep package="libpwquality"/>
+      <dep package="WebKit"/>
       <if condition-set="linux">
         <dep package="network-manager-applet"/>
         <dep package="NetworkManager"/>
@@ -701,21 +745,22 @@
     </dependencies>
   </autotools>
 
-  <autotools id="aisleriot"
-             autogenargs="--with-platform=gtk-only">
+  <autotools id="five-or-more">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
+      <dep package="librsvg"/>
       <dep package="gtk+"/>
       <dep package="libcanberra"/>
-      <dep package="librsvg"/>
-      <dep package="guile"/>
+      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
-  <autotools id="five-or-more">
+  <autotools id="four-in-a-row">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -724,20 +769,19 @@
     </dependencies>
   </autotools>
 
-  <autotools id="four-in-a-row">
+  <autotools id="gnome-characters">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
-      <dep package="librsvg"/>
+      <dep package="appstream-glib"/>
+      <dep package="gjs"/>
       <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-      <dep package="yelp-tools"/>
     </dependencies>
   </autotools>
 
   <autotools id="gnome-chess">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -750,6 +794,7 @@
   <autotools id="gnome-klotski">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -772,6 +817,7 @@
   <autotools id="gnome-mahjongg">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="gtk+"/>
       <dep package="librsvg"/>
@@ -783,6 +829,7 @@
   <autotools id="gnome-mines">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -811,6 +858,7 @@
   <autotools id="gnome-nibbles">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -881,6 +929,7 @@
   <autotools id="gnome-robots">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -892,6 +941,8 @@
   <autotools id="gnome-sudoku">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="c++"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="intltool"/>
@@ -902,9 +953,23 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-taquin">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="intltool"/>
+      <dep package="libcanberra"/>
+      <dep package="librsvg"/>
+      <dep package="gtk+"/>
+      <dep package="vala"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-tetravex">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -937,6 +1002,7 @@
   <autotools id="iagno">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -949,6 +1015,7 @@
   <autotools id="lightsoff">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="gtk+"/>
       <dep package="vala"/>
@@ -962,6 +1029,7 @@
   <autotools id="quadrapassel">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="gtk+"/>
       <dep package="librsvg"/>
@@ -976,6 +1044,7 @@
   <autotools id="swell-foop">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="gtk+"/>
       <dep package="clutter"/>
@@ -988,6 +1057,7 @@
   <autotools id="tali">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="gtk+"/>
@@ -1154,6 +1224,11 @@
     <dependencies>
       <dep package="gnome-common"/>
       <dep package="yelp-tools"/>
+      <dep package="gettext-bin"/>
+      <dep package="xmlcatalog"/>
+      <dep package="pkg-config"/>
+      <dep package="python2"/>
+      <dep package="cc"/>
     </dependencies>
   </autotools>
 
@@ -1170,6 +1245,7 @@
       <dep package="bijiben"/>
       <dep package="brasero"/>
       <dep package="cheese"/>
+      <dep package="dconf-editor"/>
       <dep package="devhelp"/>
       <dep package="evolution"/>
       <dep package="file-roller"/>
@@ -1180,7 +1256,9 @@
       <dep package="glade"/>
       <dep package="gnome-boxes"/>
       <dep package="gnome-clocks"/>
+      <dep package="gnome-characters"/>
       <dep package="gnome-chess"/>
+      <dep package="gnome-calendar"/>
       <dep package="gnome-color-manager"/>
       <dep package="gnome-documents"/>
       <dep package="gnome-devel-docs"/>
@@ -1198,6 +1276,7 @@
       <dep package="gnome-software"/>
       <dep package="gnome-sound-recorder"/>
       <dep package="gnome-sudoku"/>
+      <dep package="gnome-taquin"/>
       <dep package="gnome-tetravex"/>
       <dep package="gnome-tweak-tool"/>
       <dep package="gnome-weather"/>
diff --git a/gnome-core-deps.modules b/gnome-core-deps.modules
index 53da54e..1c22a82 100644
--- a/gnome-core-deps.modules
+++ b/gnome-core-deps.modules
@@ -18,8 +18,6 @@
     href="git://anongit.freedesktop.org/git/xorg"/>
 <repository type="git" name="github.com"
     href="git://github.com/"/>
-<repository type="git" name="gitorious.org"
-    href="git://gitorious.org/"/>
 <repository type="bzr" name="research.operationaldynamics.com"
     href="http://research.operationaldynamics.com/bzr"/>
 <repository type="git" name="linuxwacom.git.sourceforge.net"
@@ -28,8 +26,6 @@
     href="git://repo.or.cz/"/>
 
 <!-- tarball repos -->
-<repository type="tarball" name="0pointer.de"
-    href="http://0pointer.de/lennart/projects/"/>
 <repository type="tarball" name="iso-codes"
     href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
 <repository type="tarball" name="sourceforge.net"
@@ -42,30 +38,12 @@
     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"
-    href="http://poppler.freedesktop.org/"/>
-<repository type="tarball" name="p11-glue.freedesktop.org"
-    href="http://p11-glue.freedesktop.org/releases/"/>
 <repository type="tarball" name="itstool.org"
     href="http://files.itstool.org/itstool/"/>
 <repository type="tarball" name="libpwquality"
     href="https://fedorahosted.org/releases/l/i/libpwquality/"/>
-<repository type="tarball" name="graphviz.org"
-    href="http://www.graphviz.org/pub/"/>
-<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/"/>
 <repository type="tarball" name="kernel.org"
@@ -76,6 +54,12 @@
     href="http://libndp.org/files/"/>
 <repository type="tarball" name="mir"
     href="https://launchpad.net/mir/"/>
+<repository type="tarball" name="xorg-tar"
+    href="http://xorg.freedesktop.org/"/>
+<repository type="tarball" name="github-tar"
+    href="https://github.com/"/>
+<repository type="tarball" name="libxkbcommon"
+    href="http://xkbcommon.org/download/"/>
 
 <include href="gnome-sysdeps.modules"/>
 
@@ -83,37 +67,49 @@
 
 <!-- Build dependencies of gnome-suites-core -->
 
-  <autotools id="appdata-tools">
-    <branch repo="people.freedesktop.org"
-            module="~hughsient/releases/appdata-tools-${version}.tar.xz"
-            version="0.1.8"
-            hash="sha256:401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461"
-            size="251320"/>
-<!--
-    <branch repo="github.com" checkoutdir="appdata-tools" module="hughsie/appdata-tools.git"/>
--->
+  <autotools id="appstream-glib">
+    <if condition-set="freebsd">
+      <autogenargs value="LIBARCHIVE_CFLAGS=' ' LIBARCHIVE_LIBS='-larchive'"/>
+    </if>
+    <branch repo="github.com" module="hughsie/appstream-glib.git"/>
     <dependencies>
-      <dep package="appstream-glib"/>
+      <dep package="freetype2"/>
+      <dep package="gcab"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
-      <dep package="glib-networking"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libarchive"/>
       <dep package="libsoup"/>
+      <dep package="libyaml"/>
+      <dep package="sqlite3"/>
     </dependencies>
-    <suggests>
-      <dep package="libxslt"/>
-    </suggests>
   </autotools>
 
   <autotools id="cairo" autogenargs="--enable-gl">
+    <if condition-set="quartz">
+      <autogenargs value="--enable-quartz --disable-gl"/>
+    </if>
     <branch repo="git.freedesktop.org">
     </branch>
     <dependencies>
-      <dep package="fontconfig"/>
+      <if condition-unset="quartz">
+        <dep package="fontconfig"/>
+        <dep package="gl"/>
+      </if>
       <dep package="gtk-doc"/>
       <dep package="pixman"/>
     </dependencies>
   </autotools>
 
+  <autotools id="gcab">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="vala"/>
+      <dep package="zlib"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="geoclue">
     <if condition-unset="linux">
       <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-cdma-source"/>
@@ -121,13 +117,11 @@
     <branch repo="git.freedesktop.org"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="geoip"/>
       <dep package="json-glib"/>
       <dep package="libsoup"/>
       <dep package="libxml2"/>
       <if condition-set="linux">
         <dep package="ModemManager"/>
-        <dep package="NetworkManager"/>
       </if>
     </dependencies>
   </autotools>
@@ -142,10 +136,11 @@
   </autotools>
 
   <autotools id="geoip" skip-autogen="never" autogen-sh="autoreconf">
-    <branch repo="maxmind.com"
-            module="geoip/api/c/GeoIP-1.5.1.tar.gz" version="1.5.1"
-            hash="sha256:ec35ee73fcc54c493f4252565d1c81d022b398dd16de3af1522c8cab016f8731"
-            size="1195457">
+    <pkg-config>geoip.pc</pkg-config>
+    <branch repo="github-tar"
+            version="1.6.5"
+            module="maxmind/geoip-api-c/releases/download/v${version}/GeoIP-${version}.tar.gz"
+            hash="sha256:0ae1c95e69ad627d3a45cb897f79ce0c30f13fcd4b4a0dda073be0c9552521b3">
     </branch>
   </autotools>
 
@@ -174,6 +169,10 @@
     <dependencies>
       <dep package="libxslt"/>
       <dep package="yelp-tools"/>
+      <dep package="libtool"/>
+      <dep package="gettext-bin"/>
+      <dep package="docbook-xsl"/>
+      <dep package="cc"/>
     </dependencies>
   </autotools>
 
@@ -197,7 +196,7 @@
   </autotools>
 
   <autotools id="uhttpmock">
-    <branch repo="gitorious.org" checkoutdir="uhttpmock" module="uhttpmock/uhttpmock.git"/>
+    <branch repo="github.com" checkoutdir="uhttpmock" module="pwithnall/uhttpmock.git"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libsoup"/>
@@ -220,12 +219,16 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgsystem">
-    <branch/>
+  <cmake id="libical">
+    <pkg-config>libical.pc</pkg-config>
+    <branch repo="github-tar"
+            module="libical/libical/releases/download/v1.0.1/libical-1.0.1.tar.gz"
+            version="1.0.1"
+            hash="sha256:089ce3c42d97fbd7a5d4b3c70adbdd82115dd306349c1f5c46a8fb3f8c949592"
+            size="720618"/>
     <dependencies>
-      <dep package="glib"/>
     </dependencies>
-  </autotools>
+  </cmake>
 
   <autotools id="libmbim">
     <branch repo="git.freedesktop.org"
@@ -264,13 +267,14 @@
     </dependencies>
   </autotools>
 
-  <cmake id="mir" cmakeargs="-DMIR_ENABLE_TESTS=0">
+  <cmake id="mir" cmakeargs="-DMIR_ENABLE_TESTS=0 -DMIR_PLATFORM=mesa">
     <branch repo="mir"
-            module="0.4/${version}/+download/mir-${version}.tar.bz2"
-            version="0.4.0"
-            hash="sha256:5d859d353da88d81bf383e37d0744796d74d24a858fcc7d978a91575ebccd524"
-            size="949452">
+            module="0.8/${version}/+download/mir-${version}.tar.bz2"
+            version="0.8.0"
+            hash="sha256:a907bb7e6cf4d5975bc02db8a7b0d6e2f668527e6d38ae402ec8b87a8ca0c5f1"
+            size="1047629">
       <patch file="mir-gflags-noshutdown.patch" strip="1"/>
+      <patch file="mir-progressbar-example.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="boost"/>
@@ -296,7 +300,7 @@
       <dep package="glib"/>
       <dep package="dbus-glib"/>
       <dep package="gtk-doc"/>
-      <dep package="polkit"/>
+      <dep package="polkit-gobject"/>
       <dep package="gudev"/>
       <dep package="ppp"/>
       <dep package="libmbim"/>
@@ -319,7 +323,6 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
-      <dep package="gnome-common"/>
       <dep package="gtk-doc"/>
     </dependencies>
   </autotools>
@@ -329,7 +332,7 @@
       <autogenargs value="--enable-wayland-egl-platform --enable-wayland-egl-server 
--enable-kms-egl-platform"/>
     </if>
     <pkg-config>cogl-1.0.pc</pkg-config>
-    <branch revision="cogl-1.18"/>
+    <branch revision="cogl-1.20"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk-doc"/>
@@ -366,7 +369,7 @@
     <if condition-set="wayland">
       <autogenargs value="--enable-wayland-backend --enable-wayland-compositor --enable-evdev-input"/>
     </if>
-    <branch revision="clutter-1.20"/>
+    <branch/>
     <dependencies>
       <dep package="cogl"/>
       <dep package="atk"/>
@@ -389,6 +392,9 @@
   </autotools>
 
   <autotools id="gdk-pixbuf" autogenargs="--enable-installed-tests">
+    <if condition-set="macos">
+      <autogenargs value="--without-libtiff"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -405,6 +411,7 @@
     <dependencies>
       <dep package="gtk-doc"/>
       <dep package="libffi"/>
+      <dep package="zlib"/>
     </dependencies>
     <suggests>
       <!-- these provide gnome implementations of glib
@@ -418,13 +425,19 @@
     </after>
   </autotools>
 
-  <autotools id="gtk+" autogenargs="--enable-x11-backend --enable-broadway-backend --enable-installed-tests">
+  <autotools id="gtk+" autogenargs="--enable-broadway-backend --enable-installed-tests">
+    <if condition-set="x11">
+      <autogenargs value="--enable-x11-backend"/>
+    </if>
     <if condition-set="wayland">
       <autogenargs value="--enable-wayland-backend"/>
     </if>
     <if condition-set="mir">
       <autogenargs value="--enable-mir-backend"/>
     </if>
+    <if condition-set="quartz">
+      <autogenargs value="--enable-quartz-backend"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="atk"/>
@@ -434,7 +447,10 @@
       <dep package="gdk-pixbuf"/>
       <dep package="gtk-doc"/>
       <dep package="gobject-introspection"/>
-      <dep package="at-spi2-atk"/>
+      <dep package="libepoxy"/>
+      <if condition-unset="quartz">
+        <dep package="at-spi2-atk"/>
+      </if>
       <if condition-set="wayland">
         <dep package="libxkbcommon"/>
         <dep package="wayland"/>
@@ -456,9 +472,13 @@
       <dep package="cairo"/>
       <dep package="gtk-doc"/>
       <dep package="gobject-introspection"/>
-      <dep package="harfbuzz"/>
-      <dep package="libXft"/>
-      <dep package="fontconfig"/>
+      <if condition-set="x11">
+        <dep package="libXft"/>
+      </if>
+      <if condition-unset="quartz">
+        <dep package="harfbuzz"/>
+        <dep package="fontconfig"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -518,7 +538,7 @@
   </autotools>
 
   <autotools id="clutter-gst3">
-    <branch revision="master" module="clutter-gst" checkoutdir="clutter-gst3"/>
+    <branch revision="clutter-gst-3.0" module="clutter-gst" checkoutdir="clutter-gst3"/>
     <dependencies>
       <dep package="cogl"/>
       <dep package="clutter"/>
@@ -533,8 +553,8 @@
   <autotools id="farstream" autogenargs="--disable-python">
     <branch repo="freedesktop.org"
             module="farstream/releases/farstream/farstream-${version}.tar.gz"
-            version="0.2.4"
-            hash="sha256:120d5b5cd79fcbe19d9e046526fc4bc059e0a3733b3de2d7e5299dc5a3a7bb30"/>
+            version="0.2.7"
+            hash="sha256:dad0ed43cf94e71df558c23825abe57db59d1ee8d970ffaec5e2dbc2e7acbf7d"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -553,15 +573,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="exempi" autogenargs="--enable-unittest=no">
-    <pkg-config>exempi-2.0.pc</pkg-config>
-    <branch repo="libopenraw.freedesktop.org"
-            module="exempi-${version}.tar.bz2"
-            version="2.2.1"
-            hash="sha256:6c9e4380041abca80ef0e0029c07109f183506b812f870d8689e7140997fa601"/>
-  </autotools>
-
-  <autotools id="folks" autogenargs="--enable-eds-backend --disable-libsocialweb-backend 
--disable-fatal-warnings">
+  <autotools id="folks" autogenargs="--enable-eds-backend --disable-libsocialweb-backend 
--disable-fatal-warnings"
+             uninstall-before-install="true">
     <branch/>
     <dependencies>
       <dep package="dbus"/>
@@ -579,15 +592,13 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-js-common">
+  <autotools id="gom">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="sqlite3"/>
+      <dep package="gdk-pixbuf"/>
     </dependencies>
-    <suggests>
-      <dep package="seed"/>
-      <dep package="gjs"/>
-    </suggests>
   </autotools>
 
   <autotools id="grilo">
@@ -616,6 +627,7 @@
       <dep package="avahi"/>
       <dep package="gmime"/>
       <dep package="gnome-online-accounts"/>
+      <dep package="gom"/>
       <dep package="gssdp"/>
       <dep package="gupnp"/>
       <dep package="gupnp-av"/>
@@ -633,6 +645,16 @@
     </suggests>
   </autotools>
 
+  <autotools id="gsound" autogenargs="--disable-gtk-doc">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libcanberra"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gtksourceview" autogenargs="--enable-compile-warnings=maximum">
     <branch/>
     <dependencies>
@@ -650,7 +672,9 @@
     <branch repo="git.freedesktop.org"
       module="harfbuzz" checkoutdir="harfbuzz"/>
     <dependencies>
+      <dep package="c++"/>
       <dep package="glib"/>
+      <dep package="libicu"/>
       <dep package="ragel"/>
     </dependencies>
   </autotools>
@@ -704,17 +728,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="seed" autogenargs="--with-webkit=3.0">
-    <branch/>
-    <dependencies>
-      <dep package="gobject-introspection"/>
-      <dep package="WebKit1"/>
-      <dep package="gnome-js-common"/>
-      <dep package="mpfr"/>
-      <dep package="readline"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gstreamer"
              autogenargs="--disable-tests --disable-fatal-warnings"
              supports-non-srcdir-builds="no">
@@ -880,6 +893,9 @@
             size="96748">
       <patch file="itstool.use-correct-libxml.patch" strip="1"/>
     </branch>
+    <dependencies>
+      <dep package="libxml2-python"/>
+    </dependencies>
   </autotools>
 
   <autotools id="java-gnome" autogen-sh="configure" skip-autogen="never">
@@ -898,37 +914,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="js17" check-target="false"
-      autogenargs="--enable-threadsafe --with-system-nspr --enable-debug --disable-optimize">
-    <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="js24" check-target="false"
-      autogenargs="--enable-threadsafe --with-system-nspr --enable-debug --disable-tests --disable-strip 
--enable-ctypes --enable-system-ffi --disable-intl-api">
-    <pkg-config>mozjs-24.pc</pkg-config>
-    <branch repo="ftp.mozilla.org"
-            module="pub/mozilla.org/js/mozjs-24.2.0.tar.bz2"
-            version="24.2.0"
-            hash="sha256:e62f3f331ddd90df1e238c09d61a505c516fe9fd8c5c95336611d191d18437d8"
-            checkoutdir="js24-24.2.0">
-      <patch file="js24-buildapi.patch" strip="1"/>
-      <patch file="js24-prettyprinters.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="nspr"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="json-glib" autogenargs="--enable-installed-tests">
     <branch/>
     <dependencies>
@@ -939,6 +924,15 @@
     </suggests>
   </autotools>
 
+  <autotools id="lcms2" autogen-sh="configure">
+    <pkg-config>lcms2.pc</pkg-config>
+    <branch repo="sourceforge.net"
+            module="lcms/lcms2-2.6.tar.gz"
+            version="2.6"
+            hash="sha256:5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1"
+            size="4583389"/>
+  </autotools>
+
   <autotools id="libdmapsharing">
     <branch/>
     <dependencies>
@@ -951,25 +945,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libcanberra" autogen-sh="configure" autogenargs="--with-systemdsystemunitdir=no">
-    <pkg-config>libcanberra-gtk.pc</pkg-config>
-    <branch repo="0pointer.de"
-            module="libcanberra/libcanberra-${version}.tar.xz"
-            version="0.30"
-            hash="sha256:c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72">
-    </branch>
-    <dependencies>
-      <dep package="gtk-doc"/>
-      <dep package="libvorbis"/>
-    </dependencies>
-    <after>
-      <dep package="gtk+"/>
-      <dep package="gtk+-2"/>
-      <dep package="pulseaudio"/>
-      <dep package="gstreamer"/>
-    </after>
-  </autotools>
-
  <autotools id="libchamplain">
    <branch/>
    <dependencies>
@@ -986,6 +961,9 @@
  </autotools>
 
   <autotools id="libcroco" supports-non-srcdir-builds="no">
+    <if condition-unset="gnu-elf">
+      <autogenargs value="--disable-Bsymbolic"/>
+    </if>
     <pkg-config>libcroco-0.6.pc</pkg-config>
     <branch />
     <dependencies>
@@ -1005,15 +983,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgnomekbd">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gtk+" />
-      <dep package="libxklavier" />
-    </dependencies>
-  </autotools>
-
   <autotools id="libgweather">
     <branch/>
     <dependencies>
@@ -1060,9 +1029,9 @@
              autogenargs="--enable-gupnp">
     <pkg-config>nice.pc</pkg-config>
     <branch repo="nice.freedesktop.org"
-            module="libnice-0.1.7.tar.gz"
-            version="0.1.7"
-            hash="sha256:4ed165aa2203136dce548c7cef735d8becf5d9869793f96b99dcbbaa9acf78d8"/>
+            module="libnice-0.1.8.tar.gz"
+            version="0.1.8"
+            hash="sha256:9da7f09909902d535389d929c3e4d69129528fb18438a6c8565ec812d9904ddf"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gst-plugins-base"/>
@@ -1091,11 +1060,13 @@
       <dep package="gjs"/>
       <dep package="glade"/>
       <dep package="pygobject"/>
-      <dep package="seed"/>
     </suggests>
   </autotools>
 
-  <autotools id="librsvg" supports-non-srcdir-builds="no">
+  <autotools id="librsvg" supports-non-srcdir-builds="no" autogenargs="--enable-vala=yes">
+    <if condition-unset="gnu-elf">
+      <autogenargs value="--disable-Bsymbolic"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="libxml2"/>
@@ -1104,6 +1075,8 @@
       <dep package="gnome-common"/>
       <dep package="libcroco"/>
       <dep package="pango"/>
+      <dep package="gobject-introspection"/>
+      <dep package="vala"/>
     </dependencies>
   </autotools>
 
@@ -1124,37 +1097,6 @@
     <branch/>
   </autotools>
 
-  <autotools id="p11-kit" supports-non-srcdir-builds="no">
-    <if condition-set="freebsd">
-      <autogenargs value="--with-trust-paths=/usr/local/share/certs/ca-root-nss.crt"/>
-    </if>
-    <branch repo="p11-glue.freedesktop.org"
-            module="p11-kit-0.20.3.tar.gz"
-            version="0.20.3"
-            hash="sha256:b77032bc68c24e6c3cfd8cb340a4a3bb8b7d62a7c659dae08e9b6bb7287193c3"
-            size="1171155" />
-  </autotools>
-
-  <autotools id="poppler" autogenargs="--enable-xpdf-headers --enable-poppler-glib" 
makeargs="POPPLER_GLIB_DISABLE_DEPRECATED=">
-    <if condition-set="freebsd">
-      <autogenargs value="CXXFLAGS=-std=c++11"/>
-    </if>
-    <pkg-config>poppler-glib.pc</pkg-config>
-    <branch repo="poppler.freedesktop.org"
-            module="poppler-0.26.4.tar.xz"
-            version="0.26.4"
-            hash="sha256:7ede502a5ad6651d2ca56f3846ddee1ae66d0b1ab9bd302fb8b39a366d195c65"
-            size="1595096"/>
-    <dependencies>
-      <dep package="cairo"/>
-      <dep package="glib"/>
-    </dependencies>
-    <after>
-      <dep package="gtk+"/>
-      <dep package="gdk-pixbuf"/>
-    </after>
-  </autotools>
-
   <!-- Python 3 build of pygobject -->
   <autotools id="pygobject" autogenargs="--with-python=python3">
     <branch/>
@@ -1246,22 +1188,13 @@
   </autotools>
 
   <autotools id="vala" autogenargs="--enable-vapigen" supports-non-srcdir-builds="no">
-    <pkg-config>libvala-0.26.pc</pkg-config>
+    <pkg-config>libvala-0.28.pc</pkg-config>
     <branch/>
     <dependencies>
       <dep package="glib"/>
     </dependencies>
   </autotools>
 
-  <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"
-            hash="md5:8d26c1171f30ca3b1dc1b429f7937e58"
-            size="19620087">
-    </branch>
-  </autotools>
-
   <autotools id="valadoc">
     <branch />
     <dependencies>
@@ -1272,11 +1205,16 @@
   </autotools>
 
   <autotools id="libepoxy">
-    <branch repo="github.com"
-            checkoutdir="libepoxy"
-            module="anholt/libepoxy.git"/>
+    <pkg-config>epoxy.pc</pkg-config>
+    <branch repo="github-tar"
+            module="anholt/libepoxy/archive/v${version}.tar.gz"
+            version="1.2"
+            checkoutdir="libepoxy-${version}"
+            hash="sha256:42c328440f60a5795835c5ec4bdfc1329e75bba16b6e22b3a87ed17e9679e8f6"
+            size="267110"/>
     <dependencies>
       <dep package="xtrans"/>
+      <dep package="egl"/>
     </dependencies>
   </autotools>
 
@@ -1297,42 +1235,40 @@
     </dependencies>
   </autotools>
 
-  <autotools id="xcb-proto">
-    <branch repo="git.freedesktop.org"
-            checkoutdir="xcb-proto"
-            module="xcb/proto.git"
-            revision="1.10"/>
-  </autotools>
-
-  <autotools id="libxcb">
-    <branch repo="git.freedesktop.org"
-            checkoutdir="libxcb"
-            module="xcb/libxcb.git"
-            revision="1.10"/>
-    <dependencies>
-      <dep package="xcb-proto"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="libxkbcommon" autogenargs="--with-xkb-config-root=/usr/share/X11/xkb">
-    <branch repo="github.com" checkoutdir="libxkbcommon" module="xkbcommon/libxkbcommon.git"/>
+    <branch repo="libxkbcommon"
+            module="http://xkbcommon.org/download/libxkbcommon-${version}.tar.xz";
+            version="0.5.0"
+            hash="sha256:90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c"
+            size="615504"/>
     <dependencies>
       <dep package="xorg-macros"/>
       <dep package="xorg-xproto"/>
       <dep package="xorg-kbproto"/>
       <dep package="libX11"/>
-      <dep package="libxcb"/>
+      <dep package="xcb"/>
+      <dep package="xcb-xkb"/>
     </dependencies>
   </autotools>
 
-  <autotools id="wayland">
+  <autotools id="wayland"
+             autogenargs="--disable-documentation">
     <branch repo="wayland.freedesktop.org"/>
     <dependencies>
       <dep package="libffi"/>
       <dep package="doxygen"/>
+      <dep package="xmlto"/>
     </dependencies>
   </autotools>
 
+  <autotools id="xtrans">
+    <pkg-config>xtrans.pc</pkg-config>
+    <branch repo="xorg-tar"
+            module="releases/individual/lib/xtrans-1.3.5.tar.gz" version="1.3.5"
+            size="227536"
+            hash="sha256:b7a577c1b6c75030145e53b4793db9c88f9359ac49e7d771d4385d21b3e5945d"/>
+  </autotools>
+
   <autotools id="xwayland"
              autogenargs="--with-xkb-bin-directory=/usr/bin --with-xkb-path=/usr/share/X11/xkb 
--with-xkb-output=${prefix}/share/X11/xkb/compiled --enable-xwayland">
     <branch repo="xorg.freedesktop.org"
@@ -1343,16 +1279,30 @@
       <dep package="xtrans"/>
       <dep package="wayland"/>
       <dep package="libepoxy"/>
+      <dep package="pciaccess"/>
+      <dep package="xorg-xcmiscproto"/>
+      <dep package="xorg-bigreqsproto"/>
+      <dep package="xorg-scrnsaverproto"/>
+      <dep package="xorg-resourceproto"/>
+      <dep package="xorg-xf86driproto"/>
+      <dep package="xorg-presentproto"/>
+      <dep package="xorg-videoproto"/>
+      <dep package="xcb-keysyms"/>
+      <if condition-set="systemd">
+        <dep package="libsystemd-daemon"/>
+      </if>
     </dependencies>
   </autotools>
 
   <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release">
+    <pkg-config>webkit2gtk-4.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
-            module="webkitgtk-2.5.3.tar.xz" version="2.5.3"
-            hash="sha256:010803e371ac92a3e0e297e929978f83a9a3c597e4a10d50363fb1aaa6ea18d6"
-            size="10093908">
+            module="webkitgtk-2.7.92.tar.xz" version="2.7.92"
+            hash="sha256:5bc7b2737f5372ca82136d3b349d08d2b6bcbc5841d7a6888f10302e6e36bb10"
+            size="10431452">
     </branch>
     <dependencies>
+      <dep package="c++"/>
       <dep package="at-spi2-core"/>
       <dep package="cairo"/>
       <dep package="fontconfig"/>
@@ -1397,6 +1347,8 @@
       <dep package="intltool"/>
       <dep package="yelp-xsl"/>
       <dep package="itstool"/>
+      <dep package="xmllint"/>
+      <dep package="xsltproc"/>
     </dependencies>
   </autotools>
 
@@ -1423,7 +1375,7 @@
   <!-- OS Core Services dependencies -->
 
   <autotools id="libgusb">
-    <branch repo="gitorious.org" checkoutdir="libgusb" module="gusb/gusb.git"/>
+    <branch repo="github.com" checkoutdir="libgusb" module="hughsie/libgusb.git"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -1449,9 +1401,12 @@
         <dep package="libgusb"/>
         <dep package="gudev"/>
       </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
     <suggests>
-      <dep package="polkit"/>
+      <dep package="polkit-gobject"/>
     </suggests>
   </autotools>
 
@@ -1491,13 +1446,12 @@
     </dependencies>
   </autotools>
 
-  <autotools id="ibus" autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf 
--disable-ui GSETTINGS_SCHEMA_CONVERT=/usr/bin/false">
-    <branch repo="ibus"
-            module="ibus-${version}.tar.gz"
-            version="1.5.5"
-            size="2063794"
-            hash="sha256:02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec">
-      <patch file="ibus.skip-dconf-update-if-DESTDIR-is-set.patch" strip="1"/>
+  <autotools id="ibus"
+             autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf --disable-ui 
GSETTINGS_SCHEMA_CONVERT=/usr/bin/false --with-python=python3">
+    <branch repo="github-tar"
+            version="1.5.10"
+            module="ibus/ibus/releases/download/${version}/ibus-${version}.tar.gz"
+            hash="sha256:1d01b7806602875a1f3004f32e1000a39be01f59731d6baf36446498e26f5594">
     </branch>
     <dependencies>
       <dep package="dbus"/>
@@ -1509,43 +1463,25 @@
     </dependencies>
   </autotools>
 
-  <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"
-             makeargs="CFLAGS=-Wno-error">
-    <branch repo="ibus"
-            module="ibus-pinyin-${version}.tar.gz"
-            version="1.5.0"
-            hash="sha256:a85d458dcc51ea9fd65849e63002428b3fcb3b39adcbea9214b5cb4a4cbdbc96"/>
+  <autotools id="ibus-libpinyin"
+             autogenargs="--disable-lua-extension --with-python=python3">
+    <branch repo="github-tar"
+            version="1.7.0"
+            module="libpinyin/ibus-libpinyin/archive/${version}.tar.gz"
+            checkoutdir="ibus-libpinyin-${version}"
+            hash="sha256:4fcdf3300afe5b6551f0a05ce3e9f7e9fb43dd73f16604cabed348b4cc7f5d36"/>
     <dependencies>
       <dep package="ibus"/>
-      <dep package="pyzy"/>
+      <dep package="libpinyin"/>
       <dep package="sqlite3"/>
     </dependencies>
   </autotools>
 
-  <autotools id="anthy">
-    <branch repo="anthy"
-            module="anthy-9100h.tar.gz" version="9100h"
-            hash="sha1:bfea9e74e208c4b976b6bd7ac6784cd290c636fd" size="4446148"/>
-  </autotools>
-
   <autotools id="ibus-anthy" autogenargs="--enable-private-png=yes">
-    <branch repo="ibus"
-            module="ibus-anthy-${version}.tar.gz"
-            version="1.5.0"
-            hash="sha256:3addfa3e3682fcc07b8edc9470dd4bcd4cf42d4303f1538fe56164f029c181b7"/>
+    <branch repo="github-tar"
+            version="1.5.6"
+            module="ibus/ibus-anthy/releases/download/${version}/ibus-anthy-${version}.tar.gz"
+            hash="sha256:035c636bc884ff3131bb75aee6ec58db938d3797344687a2eb5f18542801896e"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -1554,16 +1490,12 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libhangul">
-    <branch repo="libhangul"
-            module="libhangul-0.1.0.tar.gz" version="0.1.0"
-            hash="sha1:9c6f3a82f2d4068771215f1b9f13a0d4bdbbfc77" size="2899845"/>
-  </autotools>
-
-  <autotools id="ibus-hangul">
-    <branch repo="ibus"
-            module="ibus-hangul-1.4.1.tar.gz" version="1.4.1"
-            hash="sha1:659899cf942a983fbd2ffbb4bd4f5ecd883f5c0a" size="484065"/>
+  <autotools id="ibus-hangul"
+             autogen-sh="configure">
+    <branch repo="github-tar"
+            version="1.5.0"
+            module="choehwanjin/ibus-hangul/releases/download/${version}/ibus-hangul-${version}.tar.gz"
+            hash="sha256:a22d4030bb20f73914a9d8a28c71b823123a5d1902a30f8328111af50f4f1788"/>
     <dependencies>
       <dep package="ibus"/>
       <dep package="libhangul"/>
@@ -1573,6 +1505,9 @@
   <!-- Deprecated dependencies -->
 
   <autotools id="gtk+-2">
+    <if condition-set="quartz">
+      <autogenargs value="--with-backend=quartz"/>
+    </if>
     <branch checkoutdir="gtk+-2" module="gtk+" revision="gtk-2-24"/>
     <dependencies>
       <dep package="glib"/>
@@ -1603,55 +1538,14 @@
     </dependencies>
   </autotools>
 
-  <autotools id="sbc">
-    <pkg-config>sbc.pc</pkg-config>
-    <branch repo="kernel.org"
-            module="pub/linux/bluetooth/sbc-${version}.tar.xz"
-            version="1.1"
-            hash="sha256:9a30ad2dc20979a0847a7b1a06ea073498810f358a02fcad68ab414f239cfbc6"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
-
-  <autotools id="WebKit1" makefile="GNUmakefile"
-             autogenargs="--enable-introspection --disable-webkit2">
-    <pkg-config>webkitgtk-3.0.pc</pkg-config>
-    <branch repo="webkitgtk.org"
-            module="webkitgtk-2.4.4.tar.xz" version="2.4.4"
-            hash="sha256:58cbfc7e352ae1e1f5e383f9f766795794d88483e9a52377a295f56eedf53ab9"
-            size="9844048">
-    </branch>
-    <dependencies>
-      <dep package="at-spi2-core"/>
-      <dep package="cairo"/>
-      <dep package="fontconfig"/>
-      <dep package="geoclue"/>
-      <dep package="libxml2"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gtk+"/>
-      <dep package="pango"/>
-      <dep package="libsoup"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gperf"/>
-      <dep package="libicu"/>
-      <dep package="libXt"/>
-      <dep package="ruby"/>
-      <dep package="libsecret"/>
-      <dep package="libwebp"/>
-    </dependencies>
-    <suggests>
-      <dep package="libxslt"/>
-      <dep package="sqlite3"/>
-      <dep package="enchant"/>
-    </suggests>
-  </autotools>
-
   <autotools id="zeitgeist">
     <branch repo="git.freedesktop.org"
             module="zeitgeist/zeitgeist"
             checkoutdir="zeitgeist"/>
     <dependencies>
       <dep package="glib"/>
+      <dep package="rapper"/>
+      <dep package="rdflib"/>
       <dep package="sqlite3"/>
       <dep package="vala"/>
     </dependencies>
diff --git a/gnome-core.modules b/gnome-core.modules
index c654367..bcd0e54 100644
--- a/gnome-core.modules
+++ b/gnome-core.modules
@@ -55,10 +55,8 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
       <dep package="dbus"/>
       <dep package="vala"/>
-      <dep package="libxml2"/>
     </dependencies>
   </autotools>
 
@@ -72,7 +70,7 @@
     <if condition-set="freebsd">
       <autogenargs value="DB_CFLAGS=-I/usr/local/include/db5 DB_LIBS=-ldb-5.3"/>
     </if>
-    <branch revision="evolution-data-server-3-12"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libsoup"/>
@@ -100,8 +98,6 @@
       <dep package="gtk+"/>
       <dep package="gtk-doc"/>
       <dep package="glib"/>
-      <dep package="dbus-glib"/>
-      <dep package="libnotify"/>
       <dep package="nautilus-sendto"/>
     </dependencies>
     <suggests>
@@ -113,11 +109,13 @@
     <branch/>
     <dependencies>
       <dep package="gtk+"/>
-      <dep package="WebKit1"/>
-      <dep package="libnotify"/>
+      <dep package="WebKit"/>
       <dep package="librest"/>
+      <dep package="libsoup"/>
+      <dep package="libsecret"/>
       <dep package="json-glib"/>
       <dep package="libsecret"/>
+      <dep package="libxml2"/>
       <dep package="telepathy-glib"/>
     </dependencies>
   </autotools>
@@ -140,12 +138,13 @@
       <dep package="ibus"/>
       <dep package="intltool"/>
       <dep package="iso-codes"/>
-      <dep package="libcanberra"/>
+      <dep package="krb5"/>
+      <dep package="libcanberra-gtk3"/>
       <dep package="libgtop"/>
       <dep package="libnotify"/>
       <dep package="libpwquality"/>
       <dep package="libxml2"/>
-      <dep package="polkit"/>
+      <dep package="polkit-gobject"/>
       <dep package="pulseaudio"/>
       <dep package="smbclient"/>
       <dep package="sound-theme-freedesktop"/>
@@ -161,7 +160,7 @@
       <dep package="cups"/>
       <dep package="cheese"/>
       <dep package="gstreamer"/>
-      <dep package="ibus-pinyin"/>
+      <dep package="ibus-libpinyin"/>
       <dep package="ibus-anthy"/>
       <dep package="ibus-hangul"/>
       <if condition-set="linux">
@@ -236,6 +235,9 @@
       <if condition-set="linux">
         <dep package="gudev"/>
       </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd-login"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -247,16 +249,16 @@
       <dep package="gtk+"/>
       <dep package="gnome-desktop"/>
       <dep package="json-glib"/>
-      <dep package="dbus-glib"/>
-      <dep package="startup-notification"/>
       <dep package="upower"/>
       <dep package="libXcomposite"/>
       <dep package="sm"/>
       <dep package="xtrans"/>
+      <if condition-set="systemd">
+        <dep package="libsystemd-daemon"/>
+        <dep package="libsystemd-journal"/>
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
-    <suggests>
-      <dep package="polkit"/>
-    </suggests>
   </autotools>
 
   <autotools id="gnome-settings-daemon">
@@ -273,17 +275,16 @@
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gtk+"/>
       <dep package="intltool"/>
-      <dep package="libcanberra"/>
+      <dep package="libcanberra-gtk3"/>
       <dep package="libgweather"/>
       <dep package="libnotify"/>
       <dep package="PackageKit"/>
-      <dep package="polkit"/>
+      <dep package="polkit-gobject"/>
       <dep package="pulseaudio"/>
       <dep package="upower"/>
       <dep package="ibus"/>
       <dep package="cups"/>
       <if condition-set="linux">
-        <dep package="libgsystem"/>
         <dep package="librsvg"/>
         <dep package="libwacom"/>
         <dep package="xorg-wacom"/>
@@ -311,7 +312,6 @@
       <dep package="glib"/>
       <dep package="gnome-desktop"/>
       <dep package="adwaita-icon-theme"/>
-      <dep package="gnome-menus"/>
       <dep package="gnome-settings-daemon"/>
       <dep package="gobject-introspection"/>
       <dep package="gtk+"/>
@@ -320,7 +320,7 @@
       <dep package="libcroco"/>
       <dep package="libsoup"/>
       <dep package="mutter"/>
-      <dep package="polkit"/>
+      <dep package="polkit-agent"/>
       <dep package="pulseaudio"/>
       <dep package="startup-notification"/>
       <dep package="telepathy-glib"/>
@@ -330,7 +330,9 @@
       <if condition-set="linux">
         <dep package="gnome-bluetooth"/>
         <dep package="NetworkManager"/>
-        <dep package="network-manager-applet"/>
+      </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd-journal"/>
       </if>
     </dependencies>
     <suggests>
@@ -368,10 +370,15 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="dbus"/>
+      <dep package="libgcrypt"/>
       <dep package="libsoup"/>
       <if condition-set="linux">
         <dep package="udisks"/>
       </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd"/>
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="libgphoto2"/>
@@ -429,12 +436,14 @@
       <dep package="libXinerama"/>
       <dep package="libXcomposite"/>
       <dep package="libXrandr"/>
+      <dep package="libxkbcommon"/>
       <dep package="pango"/>
       <dep package="sm"/>
       <dep package="startup-notification"/>
       <dep package="upower"/>
       <dep package="zenity"/>
       <if condition-set="wayland">
+        <dep package="gbm"/>
         <dep package="libdrm"/>
         <dep package="libsystemd"/>
         <dep package="wayland"/>
@@ -443,26 +452,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="network-manager-applet"
-             autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
-    <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="gudev"/>
-      <dep package="iso-codes"/>
-      <dep package="libsecret"/>
-      <dep package="NetworkManager"/>
-      <dep package="libnotify"/>
-    </dependencies>
-    <suggests>
-      <dep package="mobile-broadband-provider-info"/>
-    </suggests>
-  </autotools>
-
   <autotools id="pulseaudio"
              autogenargs="--disable-hal --disable-oss-output --disable-esound --disable-gconf --disable-gtk3 
--enable-bluez5">
     <if condition-unset="linux">
@@ -484,10 +473,13 @@
         <dep package="libudev"/>
         <dep package="sbc"/>
       </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd"/>
+        <dep package="libsystemd-daemon"/>
+        <dep package="libsystemd-journal"/>
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
-    <after>
-      <dep package="polkit"/>
-    </after>
   </autotools>
 
   <!-- mc 5.16 doesn't build against upower 1.0 -->
@@ -638,6 +630,7 @@
       <dep package="gtk+"/>
       <dep package="gtksourceview"/>
       <dep package="libxml2"/>
+      <dep package="mpfr"/>
       <dep package="vala"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -741,7 +734,7 @@
       <dep package="vte"/>
       <dep package="yelp-tools"/>
       <dep package="nautilus"/>
-      <dep package="appdata-tools"/>
+      <dep package="appstream-glib"/>
     </dependencies>
     <suggests>
       <dep package="gnome-shell"/>
@@ -794,7 +787,7 @@
       <dep package="clutter-gtk"/>
       <dep package="clutter-gst"/>
       <dep package="gtksourceview"/>
-      <dep package="WebKit1"/>
+      <dep package="WebKit"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="gtk+"/>
@@ -804,13 +797,14 @@
   <autotools id="totem">
     <branch/>
     <dependencies>
-      <dep package="appdata-tools"/>
+      <dep package="appstream-glib"/>
       <dep package="cairo"/>
       <dep package="clutter"/>
-      <dep package="clutter-gst"/>
+      <dep package="clutter-gst3"/>
       <dep package="clutter-gtk"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
+      <dep package="gnome-desktop"/>
       <dep package="grilo"/>
       <dep package="grilo-plugins"/>
       <dep package="gsettings-desktop-schemas"/>
@@ -901,8 +895,12 @@
   <autotools id="accountsservice" autogenargs="--with-systemdsystemunitdir=no">
     <branch repo="git.freedesktop.org" module="accountsservice"/>
     <dependencies>
-      <dep package="dbus-glib"/>
+      <dep package="glib"/>
       <dep package="gobject-introspection"/>
+      <dep package="polkit-gobject"/>
+      <if condition-set="systemd">
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -925,6 +923,9 @@
   </autotools>
 
   <autotools id="gdm">
+    <if condition-unset="linux">
+      <autogenargs value="--without-plymouth"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="accountsservice"/>
@@ -935,6 +936,15 @@
       <dep package="intltool"/>
       <dep package="libcanberra"/>
       <dep package="nss"/>
+      <dep package="pam"/>
+      <if condition-set="linux">
+        <dep package="plymouth"/>
+      </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd-daemon"/>
+        <dep package="libsystemd-login"/>
+        <dep package="libsystemd-journal"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="upower"/>
@@ -958,12 +968,16 @@
       <dep package="libgcrypt"/>
       <dep package="libuuid"/>
       <dep package="gtk-doc"/>
-      <dep package="polkit"/>
+      <dep package="polkit-agent"/>
       <dep package="gudev"/>
       <dep package="gnutls"/>
       <dep package="ppp"/>
       <dep package="vala"/>
       <dep package="wireless-tools"/>
+      <if condition-set="systemd">
+        <dep package="libsystemd"/>
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -981,9 +995,13 @@
       <dep package="gtk+"/>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
+      <if condition-set="systemd">
+        <dep package="libsystemd-journal"/>
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
     <suggests>
-      <dep package="polkit"/>
+      <dep package="polkit-gobject"/>
       <if condition-set="linux">
         <dep package="gudev"/>
         <dep package="NetworkManager"/>
@@ -991,29 +1009,20 @@
     </suggests>
   </autotools>
 
-  <autotools id="polkit">
-    <if condition-unset="linux">
-      <autogenargs value="--disable-test"/>
-    </if>
-    <branch repo="git.freedesktop.org"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="expat"/>
-      <dep package="intltool"/>
-      <dep package="js17"/>
-      <dep package="pam"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="udisks">
     <pkg-config>udisks2.pc</pkg-config>
     <branch repo="git.freedesktop.org" module="udisks"/>
     <dependencies>
       <dep package="gudev"/>
       <dep package="libacl"/>
-      <dep package="polkit"/>
+      <dep package="polkit-gobject"/>
+      <dep package="polkit-agent"/>
       <dep package="libatasmart"/>
+      <if condition-set="systemd">
+        <dep package="libsystemd"/>
+        <dep package="libsystemd-daemon"/>
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -1034,6 +1043,7 @@
     <branch/>
     <dependencies>
       <dep package="gnome-shell"/>
+      <dep package="gnome-menus"/>
     </dependencies>
   </autotools>
 
@@ -1079,7 +1089,6 @@
       <dep package="gnome-control-center"/>
       <dep package="adwaita-icon-theme"/>
       <dep package="gnome-keyring"/>
-      <dep package="gnome-menus"/>
       <dep package="gnome-online-accounts"/>
       <dep package="gnome-packagekit"/>
       <dep package="gnome-session"/>
@@ -1117,7 +1126,6 @@
       <dep package="dbus"/>
       <dep package="gdm"/>
       <dep package="PackageKit"/>
-      <dep package="polkit"/>
       <dep package="upower"/>
       <dep package="cups"/>
       <!-- <dep package="systemd"/> -->
@@ -1164,7 +1172,6 @@
       <dep package="libnotify"/>
       <dep package="libpeas"/>
       <dep package="PackageKit"/>
-      <dep package="polkit"/>
       <dep package="telepathy-glib"/>
       <dep package="upower"/>
       <dep package="WebKit"/>
@@ -1172,7 +1179,6 @@
       <dep package="pygobject"/>
       <dep package="gtkmm"/>
       <dep package="java-gnome"/>
-      <dep package="seed"/>
       <if condition-set="linux">
         <dep package="NetworkManager"/>
       </if>
diff --git a/gnome-sysdeps.modules b/gnome-sysdeps.modules
index bd353b3..c5d08e8 100644
--- a/gnome-sysdeps.modules
+++ b/gnome-sysdeps.modules
@@ -15,6 +15,12 @@
             version="1.0.19"/>
   </systemmodule>
 
+  <systemmodule id="anthy">
+    <pkg-config>anthy.pc</pkg-config>
+    <branch repo="system"
+            version="9100h"/>
+  </systemmodule>
+
   <systemmodule id="avahi">
     <pkg-config>avahi-gobject.pc</pkg-config>
     <branch repo="system"
@@ -22,7 +28,7 @@
   </systemmodule>
 
   <systemmodule id="bison">
-    <branch repo="system" version="2.0"/>
+    <branch repo="system" version="2.4"/>
     <systemdependencies>
       <dep type="path" name="bison"/>
     </systemdependencies>
@@ -42,12 +48,26 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="c++">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="c++"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="cairomm">
     <pkg-config>cairomm-1.0.pc</pkg-config>
     <branch repo="system"
             version="1.8.4"/>
   </systemmodule>
 
+  <systemmodule id="cc">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="cc"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="cracklib">
     <branch repo="system"/>
     <systemdependencies>
@@ -97,6 +117,13 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="docbook-xsl">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="xml" name="http://docbook.sourceforge.net/release/xsl/current/"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="dotconf">
     <pkg-config>dotconf.pc</pkg-config>
     <branch repo="system" version="1.3"/>
@@ -127,6 +154,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="exempi">
+    <pkg-config>exempi-2.0.pc</pkg-config>
+    <branch repo="system"
+            version="2.2.0"/>
+  </systemmodule>
+
   <systemmodule id="exiv2">
     <pkg-config>exiv2.pc</pkg-config>
     <branch repo="system" version="0"/>
@@ -196,6 +229,13 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="gettext-bin">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="msgfmt"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="gexiv2">
     <pkg-config>gexiv2.pc</pkg-config>
     <branch repo="system"/>
@@ -248,17 +288,17 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="graphviz">
+    <pkg-config>libgvc.pc</pkg-config>
+    <branch repo="system"
+            version="2.26.0"/>
+  </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>
@@ -288,10 +328,17 @@
             version="0.11"/>
   </systemmodule>
 
-  <systemmodule id="lcms2">
-    <pkg-config>lcms2.pc</pkg-config>
+  <systemmodule id="js24">
+    <pkg-config>mozjs-24.pc</pkg-config>
     <branch repo="system"
-            version="2.6"/>
+            version="24.2"/>
+  </systemmodule>
+
+  <systemmodule id="krb5">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="krb5-config"/>
+    </systemdependencies>
   </systemmodule>
 
   <systemmodule id="lcov">
@@ -308,12 +355,36 @@
             version="0.17"/>
   </systemmodule>
 
+  <systemmodule id="libcanberra">
+    <pkg-config>libcanberra-gtk.pc</pkg-config>
+    <branch repo="system"
+            version="0.30"/>
+  </systemmodule>
+
+  <systemmodule id="libcanberra-gtk3">
+    <pkg-config>libcanberra-gtk3.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="libhangul">
+    <pkg-config>libhangul.pc</pkg-config>
+    <branch repo="system"
+            version="0.1.0"/>
+  </systemmodule>
+
   <systemmodule id="libmusicbrainz">
     <pkg-config>libmusicbrainz5.pc</pkg-config>
     <branch repo="system"
             version="5.0"/>
   </systemmodule>
 
+  <systemmodule id="libtool">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="libtoolize"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="libX11">
     <pkg-config>x11.pc</pkg-config>
     <branch repo="system"/>
@@ -386,11 +457,46 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="xorg-bigreqsproto">
+    <pkg-config>bigreqsproto.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="xorg-kbproto">
     <pkg-config>kbproto.pc</pkg-config>
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="xorg-presentproto">
+    <pkg-config>presentproto.pc</pkg-config>
+    <branch repo="system"/>
+    </systemmodule>
+
+  <systemmodule id="xorg-resourceproto">
+    <pkg-config>resourceproto.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="xorg-scrnsaverproto">
+    <pkg-config>scrnsaverproto.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="xorg-videoproto">
+    <pkg-config>videoproto.pc</pkg-config>
+    <branch repo="system"/>
+    </systemmodule>
+
+  <systemmodule id="xorg-xcmiscproto">
+    <pkg-config>xcmiscproto.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
+  <systemmodule id="xorg-xf86driproto">
+    <pkg-config>xf86driproto.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="libacl">
     <branch repo="system"/>
     <systemdependencies>
@@ -448,12 +554,6 @@
             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"/>
@@ -490,6 +590,11 @@
             version="0.9.4"/>
   </systemmodule>
 
+  <systemmodule id="libpinyin">
+    <pkg-config>libpinyin.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="libpng">
     <pkg-config>libpng.pc</pkg-config>
     <branch repo="system"/>
@@ -511,16 +616,30 @@
             version="1.0.21"/>
   </systemmodule>
 
+  <systemmodule id="libssh2">
+    <pkg-config>libssh2.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="libsystemd">
     <pkg-config>libsystemd.pc</pkg-config>
     <branch repo="system"
             version="210"/>
   </systemmodule>
 
+  <systemmodule id="libsystemd-daemon">
+    <pkg-config>libsystemd-daemon.pc</pkg-config>
+    <branch repo="system" version="210"/>
+  </systemmodule>
+
   <systemmodule id="libsystemd-journal">
     <pkg-config>libsystemd-journal.pc</pkg-config>
-    <branch repo="system"
-            version="201"/>
+    <branch repo="system" version="201"/>
+  </systemmodule>
+
+  <systemmodule id="libsystemd-login">
+    <pkg-config>libsystemd-login.pc</pkg-config>
+    <branch repo="system" version="210"/>
   </systemmodule>
 
   <systemmodule id="libtasn1">
@@ -571,6 +690,12 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libvirt">
+    <pkg-config>libvirt.pc</pkg-config>
+    <branch repo="system"
+            version="1.0.6"/>
+  </systemmodule>
+
   <systemmodule id="libvorbis">
     <pkg-config>vorbisfile.pc</pkg-config>
     <branch repo="system"/>
@@ -598,12 +723,26 @@
             version="2.7.8"/>
   </systemmodule>
 
+  <systemmodule id="libxml2-python">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="python2" name="libxml2"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="libxslt">
     <pkg-config>libxslt.pc</pkg-config>
     <branch repo="system"
             version="1.1.26"/>
   </systemmodule>
 
+  <systemmodule id="libyaml">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include" name="yaml.h"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="libwebp">
    <branch repo="system"/>
     <systemdependencies>
@@ -654,6 +793,12 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="p11-kit">
+    <pkg-config>p11-kit-1.pc</pkg-config>
+    <branch repo="system"
+            version="0.19.0"/>
+  </systemmodule>
+
   <systemmodule id="pam">
     <branch repo="system"/>
     <systemdependencies>
@@ -661,12 +806,46 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="pciaccess">
+    <pkg-config>pciaccess.pc</pkg-config>
+    <branch repo="system" version="0.12.901"/>
+  </systemmodule>
+
   <systemmodule id="pixman">
     <pkg-config>pixman-1.pc</pkg-config>
     <branch repo="system"
             version="0.30"/>
   </systemmodule>
 
+  <systemmodule id="pkg-config">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="pkg-config"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="plymouth">
+    <pkg-config>ply-boot-client.pc</pkg-config>
+    <branch repo="system"
+            version="0.8.9"/>
+  </systemmodule>
+
+  <systemmodule id="polkit-agent">
+    <pkg-config>polkit-agent-1.pc</pkg-config>
+    <branch repo="system" version="0.102"/>
+  </systemmodule>
+
+  <systemmodule id="polkit-gobject">
+    <pkg-config>polkit-gobject-1.pc</pkg-config>
+    <branch repo="system" version="0.103"/>
+  </systemmodule>
+
+  <systemmodule id="poppler">
+    <pkg-config>poppler-glib.pc</pkg-config>
+    <branch repo="system"
+            version="0.24.0"/>
+  </systemmodule>
+
   <systemmodule id="ppp">
     <branch repo="system"/>
     <systemdependencies>
@@ -686,6 +865,13 @@
             version="1.10.0"/>
   </systemmodule>
 
+  <systemmodule id="python2">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="python2"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="python2-devel">
     <pkg-config>python2.pc</pkg-config>
     <branch repo="system"
@@ -706,6 +892,20 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="rapper">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="rapper"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="rdflib">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="python2" name="rdflib"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="readline">
     <branch repo="system"/>
     <systemdependencies>
@@ -720,6 +920,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="sbc">
+    <pkg-config>sbc.pc</pkg-config>
+    <branch repo="system"
+            version="1.1"/>
+  </systemmodule>
+
   <systemmodule id="shared-mime-info">
     <pkg-config>shared-mime-info.pc</pkg-config>
     <branch repo="system"
@@ -798,16 +1004,31 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="xcb">
+    <pkg-config>xcb.pc</pkg-config>
+    <branch repo="system" version="1.10"/>
+  </systemmodule>
+
   <systemmodule id="xcb-dri2">
     <pkg-config>xcb-dri2.pc</pkg-config>
     <branch repo="system" version="1.8.1"/>
   </systemmodule>
 
+  <systemmodule id="xcb-keysyms">
+    <pkg-config>xcb-keysyms.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="xcb-util">
     <pkg-config>xcb-aux.pc</pkg-config>
     <branch repo="system" version="0.1"/>
   </systemmodule>
 
+  <systemmodule id="xcb-xkb">
+    <pkg-config>xcb-xkb.pc</pkg-config>
+    <branch repo="system" version="1.10"/>
+  </systemmodule>
+
   <systemmodule id="xkeyboard-config">
     <pkg-config>xkeyboard-config.pc</pkg-config>
     <branch repo="system"/>
@@ -818,13 +1039,6 @@
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="yajl">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="c_include" name="yajl/yajl_common.h"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="yasm">
     <branch repo="system"/>
     <systemdependencies>
@@ -848,11 +1062,6 @@
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="xtrans">
-    <pkg-config>xtrans.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="gtkspell-3">
     <pkg-config>gtkspell3-3.0.pc</pkg-config>
     <branch repo="system"/>
@@ -878,13 +1087,13 @@
   </systemmodule>
 
   <systemmodule id="protobuf">
-    <branch repo="system" version="2.5.0"/>
     <pkg-config>protobuf.pc</pkg-config>
+    <branch repo="system" version="2.5.0"/>
   </systemmodule>
 
   <systemmodule id="egl">
-    <branch repo="system" version="10.1.3"/>
     <pkg-config>egl.pc</pkg-config>
+    <branch repo="system" version="10.1.3"/>
   </systemmodule>
 
   <systemmodule id="glm">
@@ -895,7 +1104,45 @@
   </systemmodule>
 
   <systemmodule id="lttng-ust">
-    <branch repo="system" version="2.3.0"/>
     <pkg-config>lttng-ust.pc</pkg-config>
+    <branch repo="system" version="2.3.0"/>
+  </systemmodule>
+
+  <systemmodule id="WebKit1">
+    <pkg-config>webkitgtk-3.0.pc</pkg-config>
+    <branch repo="system" version="2.0.0"/>
+  </systemmodule>
+
+  <systemmodule id="xmlcatalog">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="xmlcatalog"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="xmllint">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="xmllint"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="xmlto">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="xmlto"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="xsltproc">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="xsltproc"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="zlib">
+    <pkg-config>zlib.pc</pkg-config>
+    <branch repo="system"/>
   </systemmodule>
 </moduleset>
diff --git a/gnome-world.modules b/gnome-world.modules
index 815190a..cf5dac2 100644
--- a/gnome-world.modules
+++ b/gnome-world.modules
@@ -7,9 +7,6 @@
       href="git://git.gnome.org/"/>
   <repository type="svn" name="svn.abisource.com"
       href="http://svn.abisource.com/"/>
-  <repository type="cvs" name="cairo.freedesktop.org"
-      cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/cairo"
-      password=""/>
   <repository type="git" name="gstreamer.freedesktop.org"
       href="git://anongit.freedesktop.org/gstreamer/"/>
   <repository type="git" name="fprint.freedesktop.org"
@@ -62,9 +59,6 @@
     href="http://hg.circular-chaos.org"; />
   <repository type="svn" name="transmissionbt.com"
     href="svn://svn.m0k.org/Transmission/" />
-  <repository type="cvs" name="ldtp.freedesktop.org"
-      cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/ldtp"
-      password=""/>
   <repository type="svn" name="svn.async.com.br"
       href="svn://svn.async.com.br/"/>
   <repository type="svn" name="flumotion.code.fluendo.com"
@@ -75,9 +69,6 @@
       href="git://git.fishsoup.net/"/>
   <repository type="git" name="diracvideo.org"
     href="git://diracvideo.org/git/"/>
-  <repository type="cvs" name="cvs.claws-mail"
-      cvsroot=":ext:cvs scm dotsrc org:/srv/cvs/claws-mail"
-      password=""/>
   <repository type="git" name="git.xfce.org"
       href="git://git.xfce.org"/>
   <repository type="git" name="git.dronelabs.com"
@@ -87,7 +78,7 @@
   <repository type="git" name="git.ardour.org"
       href="git://git.ardour.org/"/>
   <repository type="git" name="gitorious.org"
-      href="git://gitorious.org/"/>
+      href="https://gitorious.org/"/>
   <repository type="tarball" name="samba.org"
       href="https://ftp.samba.org/pub/"/>
   <repository type="tarball" name="sourceforge.net"
@@ -121,7 +112,20 @@
   <repository type="tarball" name="downloads.sourceforge.net"
       href="http://downloads.sourceforge.net/"/>
 
-  <include href="gnome-apps.modules"/>
+  <include href="gnome-apps-3.16.modules"/>
+
+  <autotools id="aisleriot"
+             autogenargs="--with-platform=gtk-only">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gconf"/>
+      <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+      <dep package="librsvg"/>
+      <dep package="guile"/>
+    </dependencies>
+  </autotools>
 
   <autotools id="alacarte">
     <branch/>
@@ -149,7 +153,7 @@
   <autotools id="easytag">
     <branch/>
     <dependencies>
-      <dep package="appdata-tools"/>
+      <dep package="appstream-glib"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="intltool"/>
@@ -215,25 +219,28 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-builder">
-    <branch/>
+  <autotools id="uncrustify">
+    <branch repo="downloads.sourceforge.net"
+            module="project/uncrustify/uncrustify/uncrustify-0.61/uncrustify-0.61.tar.gz"
+            version="0.61"
+            hash="sha256:1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"
+            size="1143946"/>
     <dependencies>
-      <dep package="devhelp"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gtksourceview"/>
-      <dep package="WebKit"/>
+      <dep package="c++"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-calendar">
+  <autotools id="gnome-builder">
     <branch/>
     <dependencies>
-      <dep package="clutter"/>
-      <dep package="clutter-gtk"/>
-      <dep package="evolution-data-server"/>
+      <dep package="devhelp"/>
       <dep package="glib"/>
+      <dep package="gnome-code-assistance"/>
       <dep package="gtk+"/>
+      <dep package="gtksourceview"/>
+      <dep package="libgit2-glib"/>
+      <dep package="librsvg"/>
+      <dep package="uncrustify"/>
     </dependencies>
   </autotools>
 
@@ -279,6 +286,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gtkhtml">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="enchant"/>
+      <dep package="iso-codes"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gxml">
     <branch/>
     <dependencies>
@@ -290,11 +308,13 @@
     </dependencies>
   </autotools>
 
-  <autotools id="cairo-gtk-engine">
-    <branch repo="cairo.freedesktop.org"/>
+  <autotools id="java-atk-wrapper">
+    <branch/>
     <dependencies>
-      <dep package="gtk+-2"/>
-      <dep package="cairo"/>
+      <dep package="at-spi2-atk"/>
+      <dep package="gobject-introspection"/>
+      <dep package="glib"/>
+      <dep package="gconf"/>
     </dependencies>
   </autotools>
 
@@ -524,10 +544,11 @@
   </autotools>
 
   <autotools id="gstreamer-vaapi">
-    <branch repo="gitorious.org" module="vaapi/gstreamer-vaapi"/>
+    <branch repo="gitorious.org" module="vaapi/gstreamer-vaapi.git"/>
     <dependencies>
-      <dep package="gstreamer-0.10"/>
-      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-bad"/>
       <dep package="libva"/>
     </dependencies>
   </autotools>
@@ -741,14 +762,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libpanelappletmm">
-    <branch/>
-    <dependencies>
-      <dep package="gtkmm"/>
-      <dep package="gnome-panel"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="libgdamm">
     <branch/>
     <dependencies>
@@ -876,6 +889,16 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libchamplainmm">
+    <branch/>
+    <dependencies>
+      <dep package="glibmm"/>
+      <dep package="gtkmm"/>
+      <dep package="cluttermm-1.0"/>
+      <dep package="libchamplain"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnet" autogenargs="--enable-glib2">
     <branch/>
     <dependencies>
@@ -1095,7 +1118,9 @@
   <autotools id="atomix">
     <branch/>
     <dependencies>
-      <dep package="gtk+-2"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
       <dep package="libxml2"/>
     </dependencies>
   </autotools>
@@ -1204,7 +1229,6 @@
   <autotools id="gnome-main-menu">
     <branch/>
     <dependencies>
-      <dep package="gnome-panel"/>
       <dep package="NetworkManager"/>
     </dependencies>
   </autotools>
@@ -1219,14 +1243,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gimmie">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-panel"/>
-      <dep package="pygtk"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-games-extra-data">
     <branch/>
   </autotools>
@@ -1288,7 +1304,7 @@
   </autotools>
 
   <autotools id="rhythmbox-gupnp" autogenargs="--with-rhythmbox=../rhythmbox">
-    <branch repo="gitorious.org" module="gupnp/rhythmbox-gupnp"/>
+    <branch repo="gitorious.org" module="gupnp/rhythmbox-gupnp.git"/>
     <dependencies>
       <dep package="rhythmbox"/>
       <dep package="gupnp-av"/>
@@ -1459,14 +1475,6 @@
     </dependencies>
   </autotools>
 
- <autotools id="netspeed">
-   <branch/>
-   <dependencies>
-     <dep package="gtk+-2"/>
-     <dep package="gnome-panel"/>
-   </dependencies>
- </autotools>
-
  <tarball id="liboil" version="0.3.17">
    <pkg-config>liboil-0.3.pc</pkg-config>
    <source href="http://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz";
@@ -1646,12 +1654,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="ldtp">
-    <branch repo="ldtp.freedesktop.org" module="ldtp"/>
-    <dependencies>
-    </dependencies>
-  </autotools>
-
   <distutils id="postr">
    <branch/>
    <dependencies>
@@ -1788,29 +1790,6 @@
     </dependencies>
   </autotools>
 
- <autotools id="window-picker-applet">
-    <branch repo="launchpad.net"
-            module="window-picker-applet"/>
-    <dependencies>
-      <dep package="gnome-panel"/>
-      <dep package="gconf"/>
-      <dep package="libwnck-2"/>
-      <dep package="gtk+-2"/>
-    </dependencies>
-  </autotools>
-
- <autotools id="go-home-applet">
-    <branch repo="launchpad.net"
-            module="go-home-applet"/>
-    <dependencies>
-      <dep package="gnome-panel"/>
-      <dep package="gnome-desktop-2"/>
-      <dep package="gconf"/>
-      <dep package="libwnck-2"/>
-      <dep package="gtk+-2"/>
-    </dependencies>
-  </autotools>
-
  <autotools id="netbook-remix-launcher">
     <branch repo="launchpad.net"
             module="netbook-remix-launcher"/>
@@ -1885,15 +1864,15 @@
    <branch />
    <dependencies>
      <dep package="glib"/>
-     <dep package="gstreamer-0.10"/>
-     <dep package="gst-rtsp-server-0.10"/>
+     <dep package="gstreamer"/>
+     <dep package="gst-rtsp-server"/>
      <dep package="vala"/>
-     <dep package="gst-plugins-good-0.10"/>
-     <dep package="gst-plugins-bad-0.10"/>
-     <dep package="libgee-0.6"/>
+     <dep package="gst-plugins-good"/>
+     <dep package="gst-plugins-bad"/>
+     <dep package="libgee"/>
      <dep package="sqlite3"/>
-     <dep package="pygobject2"/>
-     <dep package="gst-python-0.10"/>
+     <dep package="pygobject"/>
+     <dep package="grilo"/>
    </dependencies>
   </autotools>
 
@@ -1904,15 +1883,6 @@
     </dependencies>
   </autotools>
 
- <autotools id="quick-lounge-applet">
-    <branch />
-    <dependencies>
-      <dep package="gtk+-2"/>
-      <dep package="gnome-panel"/>
-      <dep package="gnome-menus"/>
-    </dependencies>
-  </autotools>
-
  <autotools id="gpointing-device-settings">
     <branch />
     <dependencies>
@@ -2024,21 +1994,6 @@
 
   <!-- ########## End of Pimplico Modules ########## -->
 
-  <autotools id="claws-mail"
-             autogenargs="--disable-libetpan">
-    <branch repo="cvs.claws-mail" revision="gtk2" module="claws" checkoutdir="claws-mail"/>
-    <dependencies>
-      <dep package="gtk+-2"/>
-      <dep package="glib"/>
-      <dep package="enchant"/>
-    </dependencies>
-    <suggests>
-      <dep package="startup-notification"/>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-    </suggests>
-  </autotools>
-
   <autotools id="midori">
     <branch repo="git.xfce.org" branch="kalikiana/midori"/>
     <dependencies>
@@ -2072,18 +2027,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-pilot">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="libxml2"/>
-      <dep package="gnome-panel"/>
-      <dep package="gconf"/>
-      <dep package="dbus-glib"/>
-      <dep package="gudev"/>
-    </dependencies>
-  </autotools>
-
   <tarball id="qt" version="4.5.2" autogenargs="-opensource -confirm-license">
     <source href="http://get.qt.nokia.com/qt/source/qt-x11-opensource-src-4.5.2.tar.gz";
             hash="sha256:4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2"
@@ -2188,13 +2131,6 @@
 
   <!-- Desktop: deprecated libraries -->
 
-  <autotools id="libgail-gnome">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-panel"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="libgnomecups">
     <branch/>
     <dependencies>
@@ -2500,11 +2436,22 @@
     <branch/>
   </autotools>
 
+  <autotools id="libgsystem">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <if condition-set="systemd">
+        <dep package="libsystemd-journal"/>
+      </if>
+    </dependencies>
+  </autotools>
+
   <autotools id="ostree" autogenargs="--with-libarchive --enable-installed-tests">
     <branch/>
     <dependencies>
       <dep package="libsoup"/>
       <dep package="libarchive"/>
+      <dep package="libgsystem"/>
     </dependencies>
   </autotools>
 
@@ -2527,12 +2474,10 @@
   <autotools id="latexila">
     <branch/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
       <dep package="gtksourceview"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="vala"/>
-      <dep package="libgee-0.6"/>
+      <dep package="libgee"/>
       <dep package="enchant"/>
       <dep package="yelp-tools"/>
     </dependencies>
@@ -2560,7 +2505,6 @@
   <autotools id="gnome-panel">
     <branch/>
     <dependencies>
-      <dep package="gconf"/>
       <dep package="intltool"/>
       <dep package="gnome-desktop"/>
       <dep package="libwnck"/>
@@ -2573,7 +2517,7 @@
       <dep package="yelp-tools"/>
     </dependencies>
     <suggests>
-      <dep package="polkit"/>
+      <dep package="polkit-gobject"/>
     </suggests>
   </autotools>
 
@@ -2600,6 +2544,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgnomekbd">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk+" />
+      <dep package="libxklavier" />
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-screensaver">
     <branch/>
     <dependencies>
@@ -2635,6 +2588,8 @@
 
   <metamodule id="meta-gnome-flashback">
     <dependencies>
+      <dep package="gnome-applets"/>
+      <dep package="gnome-flashback"/>
       <dep package="gnome-panel"/>
       <dep package="metacity"/>
       <dep package="notification-daemon"/>
@@ -2673,31 +2628,27 @@
   <!--   enscript                                   -->
   <!--   libavcodec                                 -->
   <!-- Those are not managed by jhbuild             -->
-  <autotools id="gnome-applets" autogenargs="--enable-mixer-applet --enable-mini-commander">
+  <autotools id="gnome-applets" autogenargs="--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="pygobject"/>
+      <dep package="adwaita-icon-theme"/>
       <dep package="libxml2"/>
-      <dep package="polkit"/>
-      <dep package="NetworkManager"/>
+      <dep package="polkit-gobject"/>
     </dependencies>
     <after>
       <dep package="gnome-control-center"/>
@@ -3005,9 +2956,6 @@
       <dep package="libxml++"/>
       <dep package="gtkmm"/>
     </dependencies>
-    <suggests>
-      <dep package="libpanelappletmm"/>
-    </suggests>
   </autotools>
 
   <autotools id="gnumeric">
@@ -3139,6 +3087,47 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libretro-free"
+             skip-autogen="true">
+    <branch repo="github.com"
+            module="Kekun/libretro-free.git"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+
+  <autotools id="retro-gobject"
+             skip-autogen="true">
+    <branch repo="github.com"
+            module="Kekun/retro-gobject.git"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="retro-gtk"
+             skip-autogen="true">
+    <branch repo="github.com"
+            module="Kekun/retro-gtk.git"/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="retro-gtk"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="retro-gtk-demo"
+             skip-autogen="true">
+    <branch repo="github.com"
+            module="Kekun/retro-gtk-demo.git"/>
+    <dependencies>
+      <dep package="libretro-free"/>
+      <dep package="retro-gobject"/>
+      <dep package="retro-gtk"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="rhythmbox">
     <branch/>
     <dependencies>
@@ -3208,6 +3197,8 @@
   <autotools id="sound-juicer">
     <branch/>
     <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="iso-codes"/>
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
@@ -3254,4 +3245,76 @@
     </suggests>
   </autotools>
 
+  <autotools id="gnome-2048">
+    <branch/>
+    <dependencies>
+      <dep package="clutter"/>
+      <dep package="clutter-gtk"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libgee"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-js-common">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+    </dependencies>
+    <suggests>
+      <dep package="seed"/>
+      <dep package="gjs"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="seed" autogenargs="--with-webkit=3.0">
+    <branch/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="WebKit1"/>
+      <dep package="gnome-js-common"/>
+      <dep package="mpfr"/>
+      <dep package="readline"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="xdg-app" autogenargs="--enable-sudo">
+    <branch repo="github.com"
+            module="alexlarsson/xdg-app"/>
+    <dependencies>
+      <dep package="ostree"/>
+      <dep package="libgsystem"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgames-support">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libgee"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="network-manager-applet"
+             autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
+    <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="gudev"/>
+      <dep package="iso-codes"/>
+      <dep package="libsecret"/>
+      <dep package="NetworkManager"/>
+      <dep package="libnotify"/>
+    </dependencies>
+    <suggests>
+      <dep package="mobile-broadband-provider-info"/>
+    </suggests>
+  </autotools>
+
 </moduleset>



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