Merge branch 'gnome-3.6'

This contains all updates required by gnome 3.6.
2012-09-27 16:39:06 +02:00 · 2012-09-27 16:39:06 +02:00 · 6e136ac41f
parent 36ff9216a7 d28d6f72fb
commit 6e136ac41f
284 changed files with 2864 additions and 1836 deletions
--- a/common/shlibs
+++ b/common/shlibs
@ -512,6 +512,14 @@ libedata-book-1.2.so.13 evolution-data-server-3.3.92_1
 libedata-cal-1.2.so.15 evolution-data-server-3.3.92_1
 libedataserver-1.2.so.16 evolution-data-server-3.3.92_1
 libedataserverui-3.0.so.1 evolution-data-server-3.3.92_1
+libcamel-1.2.so.40 evolution-data-server-3.6.0_1
+libedataserver-1.2.so.17 evolution-data-server-3.6.0_1
+libebackend-1.2.so.5 evolution-data-server-3.6.0_1
+libebook-1.2.so.14 evolution-data-server-3.6.0_1
+libedata-book-1.2.so.15 evolution-data-server-3.6.0_1
+libecal-1.2.so.15 evolution-data-server-3.6.0_1
+libedata-cal-1.2.so.18 evolution-data-server-3.6.0_1
+libedataserverui-3.0.so.4 evolution-data-server-3.6.0_1
 libgdata.so.13 libgdata-0.10.0_1
 libpcap.so.1 libpcap-1.1.1_1
 libiptc.so.0 iptables-1.4.7_1
@ -592,6 +600,8 @@ libtalloc.so.1 talloc-2.0.1_1
 libtalloc.so.2 talloc-2.0.1_1
 libmount.so.1 libmount-2.18_1
 libdconf.so.0 dconf-0.5.1_1
+libdconf.so.1 dconf-0.13.90_1
+libdconf-dbus-1.so.0 dconf-0.13.90_1
 libassuan.so.0 libassuan-2.0.1_1
 libgpgme.so.11 gpgme-1.3.0_1
 libgpgme-pthread.so.11 gpgme-1.3.0_1
@ -704,8 +714,9 @@ libfolks.so.25 folks-0.6.3.2_1
 libfolks-telepathy.so.25 folks-0.6.3.2_1
 libfolks-libsocialweb.so.25 folks-0.6.3.2_1
 libfolks-eds.so.25 folks-0.6.3.2_1
+libfolks-tracker.so.25 folks-0.7.4.1_1
 libnice.so.10 libnice-0.1.0_1
-libgupnp-igd-1.0.so.3 gupnp-igd-0.1.7_1
+libgupnp-igd-1.0.so.4 gupnp-igd-0.2.0_1
 libtelepathy-logger.so.2 telepathy-logger-0.2.12_1
 libmission-control-plugins.so.0 telepathy-mission-control-5.9.2_1
 libclutter-gtk-1.0.so.0 clutter-gtk-1.1.2_1
@ -751,12 +762,9 @@ libv4l1.so.0 v4l-utils-0.8.5_1
 libclutter-gst-1.0.so.0 clutter-gst-1.5.4_1
 libmx-1.0.so.2 mx-1.4.3_1_1
 libmx-gtk-1.0.so.0 mx-1.4.3_1_1
-libcheese.so.3 libcheese-3.3.92_1
-libcheese-gtk.so.21 libcheese-3.3.92_1
 libjson.so.0 json-c-0.9_1
-libcogl.so.9 cogl-1.10.0_1
 libcogl.so.11 cogl-1.12.0_1
-libcogl-pango.so.0 cogl-1.10.0_1
+libcogl-pango.so.0 cogl-1.12.0_1
 libp11-kit.so.0 p11-kit-0.7_1
 librest-0.7.so.0 rest-0.7_1
 librest-extras-0.7.so.0 rest-0.7_1
@ -773,11 +781,9 @@ liblcms2.so.2 lcms2-2.2_1
 libcolord.so.1 colord-0.1.12_1
 libnm-gtk.so.0 libnm-gtk-0.9.1.95_1
 libcaribou.so.0 caribou-0.4.0_1
-libgdmgreeter.so.1 gdm-3.2.0_1
-libgdmsimplegreeter.so.1 gdm-3.2.0_1
 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1
-libgrilo-0.1.so.0 grilo-0.1.17_1
-libgrlnet-0.1.so.0 grilo-0.1.17_1
+libgrilo-0.2.so.1 grilo-0.2.0_1
+libgrlnet-0.2.so.0 grilo-0.2.0_1
 libquvi.so.7 libquvi-0.4.0_1
 libepc-1.0.so.3 libepc-0.4.1_1
 libepc-ui-1.0.so.3 libepc-0.4.1_1
@ -921,7 +927,9 @@ libgck-1.so.0 gcr-3.3.92_1
 libgcr-base-3.so.1 gcr-3.3.92_1
 libwacom.so.2 libwacom-0.3_1
 libfarstream-0.1.so.0 farstream-0.1.1_1
+libfarstream-0.2.so.2 farstream-0.2.0_1
 libtelepathy-farstream.so.2 telepathy-farstream-0.2.3_1
+libtelepathy-farstream.so.3 telepathy-farstream-0.6.0_1
 libass.so.4 libass-0.10.0_1
 libcryptui.so.0 libcryptui-3.4.0_1
 libwx_gtk2u-2.8.so.0 wxGTK-2.8.12.1_1
@ -1029,3 +1037,25 @@ libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.0.0_1
 libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.0.0_1
 libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.0.0_1
 libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.0.0_1
+libgnome-desktop-3.so.4 gnome-desktop-3.6.0_1
+libsecret-1.so.0 libsecret-0.10_1
+libgweather-3.so.1 libgweather-3.6.0_1
+libgnomekbd.so.8 libgnomekbd-3.6.0_1
+libgnomekbdui.so.8 libgnomekbd-3.6.0_1
+libibus-1.0.so.5 ibus-1.4.99.20120917_1
+libgnome-bluetooth.so.11 gnome-bluetooth-3.6.0_1
+libxapian.so.22 libxapian-1.2.12_1
+libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1
+libcolord-gtk.so.1 colord-gtk-0.1.23_1
+libgdm.so.1 libgdm-3.6.0_1
+libgdmsimplegreeter.so.1 gdm-3.6.0_1
+libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1
+libcheese.so.7 libcheese-3.6.0_1
+libcheese-gtk.so.23 libcheese-3.6.0_1
+libSoundTouch.so.0 soundtouch-1.7.0_1
+libzapojit-0.0.so.0 libzapojit-0.0.2_1
+libmusicbrainz5.so.0 libmusicbrainz5-5.0.1_1
+librygel-core-1.0.so.0 librygel-0.16.0_1
+librygel-renderer-1.0.so.0 librygel-0.16.0_1
+librygel-server-1.0.so.0 librygel-0.16.0_1
+libharfbuzz.so.0 libharfbuzz-0.9.4_1
--- a/srcpkgs/brasero/brasero-devel.template
+++ b/srcpkgs/brasero/brasero-devel.template
@ -1,12 +1,12 @@
 # Template file for 'brasero-devel'.
 #
-depends="gst-plugins-base-devel totem-pl-parser-devel libnotify-devel libcanberra-devel nautilus-devel brasero>=3.4.1"
+depends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel libcanberra-devel
+nautilus-devel>=3.6.0 brasero>=${version}"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}

 This package contains files for development, headers, static libs, etc."

-
 noarch=yes

 do_install() {
--- a/srcpkgs/brasero/brasero.rshlibs
+++ b/srcpkgs/brasero/brasero.rshlibs
@ -1,7 +1,11 @@
-libgstinterfaces-0.10.so.0
-libgstpbutils-0.10.so.0
-libgstreamer-0.10.so.0
-libxml2.so.2
+libgstvideo-1.0.so.0
+libgstbase-1.0.so.0
+libgsttag-1.0.so.0
+libgstpbutils-1.0.so.0
+libgstreamer-1.0.so.0
+libgmodule-2.0.so.0
+libgthread-2.0.so.0
+librt.so.1
 libtotem-plparser.so.17
 libgtk-3.so.0
 libatk-1.0.so.0
@ -11,20 +15,19 @@ libpangocairo-1.0.so.0
 libgdk_pixbuf-2.0.so.0
 libcairo-gobject.so.2
 libpango-1.0.so.0
-libgmodule-2.0.so.0
 libcairo.so.2
 libgobject-2.0.so.0
-libgthread-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
 libnotify.so.4
 libcanberra-gtk3.so.0
 libcanberra.so.0
-libnautilus-extension.so.1
-libSM.so.6
-libICE.so.6
+libm.so.6
+libxml2.so.2
 libburn.so.4
 libisofs.so.6
+libnautilus-extension.so.1
 libtracker-sparql-0.14.so.0
+libSM.so.6
+libICE.so.6
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@ -1,17 +1,19 @@
 # Template file for 'brasero'
 pkgname=brasero
-version=3.4.1
-homepage="http://www.gnome.org/projects/brasero"
-license="GPL-2"
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
+version=3.6.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-caches"
 depends="cdrtools dconf>=0 shared-mime-info hicolor-icon-theme desktop-file-utils"
-makedepends="pkg-config intltool which gnome-doc-utils gobject-introspection gst-plugins-base-devel totem-pl-parser-devel libnotify-devel libcanberra-devel nautilus-devel tracker-devel libisofs-devel libburn-devel"
-revision=1
+makedepends="pkg-config intltool which gnome-doc-utils gobject-introspection
+gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel libcanberra-devel
+nautilus-devel>=3.6.0 tracker-devel libisofs-devel libburn-devel itstool"
 short_desc="Application to burn CD/DVD for the Gnome Desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=e4fcd5dca1c7b0a930a43ae59953fa96db3f6beef41ceedb2f0ef8636e26a7a6
+homepage="http://www.gnome.org/projects/brasero"
+license="GPL-2"
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=1eb16f85c5663f3f38ee60516759c0980024b893af9ec7875d31208a53c12b3b
 long_desc="
 Features
    * Data CD/DVD: supports edition of discs contents (remove/move/rename
@ -26,7 +28,5 @@ long_desc="

 And much more..."

-subpackages="$pkgname-devel"
+subpackages="${pkgname}-devel"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-
-
--- a/srcpkgs/cheese/cheese-devel.template
+++ b/srcpkgs/cheese/cheese-devel.template
@ -1,12 +1,12 @@
 # Template file for 'cheese-devel'.
 #
-depends="gst-plugins-base-devel libcanberra-devel clutter-gst-devel clutter-gtk-devel libcheese>=3.4.2"
+depends="gst-plugins-base1-devel libcanberra-devel clutter-gst-devel>=1.9.92
+clutter-gtk-devel>=1.3.2 libcheese>=${version}"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}

 This package contains files for development, headers, static libs, etc."

-
 noarch=yes

 do_install() {
--- a/srcpkgs/cheese/cheese.rshlibs
+++ b/srcpkgs/cheese/cheese.rshlibs
@ -1,6 +1,10 @@
-libgstreamer-0.10.so.0
-libgnome-desktop-3.so.2
+libcheese.so.7
+libcheese-gtk.so.23
+libgstreamer-1.0.so.0
+libgthread-2.0.so.0
+libgnome-desktop-3.so.4
 libclutter-gtk-1.0.so.0
+libclutter-1.0.so.0
 libgee.so.2
 libcanberra-gtk3.so.0
 libgtk-3.so.0
@ -8,10 +12,6 @@ libgdk-3.so.0
 libgio-2.0.so.0
 libgdk_pixbuf-2.0.so.0
 libgobject-2.0.so.0
-libgthread-2.0.so.0
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
-libcheese.so.3
-libcheese-gtk.so.21
-libclutter-1.0.so.0
--- a/srcpkgs/cheese/libcheese.rshlibs
+++ b/srcpkgs/cheese/libcheese.rshlibs
@ -1,21 +1,24 @@
-libclutter-gst-1.0.so.0
-libgstbase-0.10.so.0
-libgstreamer-0.10.so.0
-libxml2.so.2
-libmx-1.0.so.2
-libgstinterfaces-0.10.so.0
-libgnome-desktop-3.so.2
+libgstpbutils-1.0.so.0
+libgstphotography-1.0.so.0
+libclutter-gst-2.0.so.0
+libgstbase-1.0.so.0
+libgstreamer-1.0.so.0
+libgthread-2.0.so.0
+libgnome-desktop-3.so.4
 librsvg-2.so.2
 libm.so.6
 libclutter-gtk-1.0.so.0
+libclutter-1.0.so.0
 libcogl-pango.so.0
 libjson-glib-1.0.so.0
 libXi.so.6
-libdrm.so.2
+libcogl.so.11
 libX11.so.6
 libXext.so.6
 libXdamage.so.1
 libXcomposite.so.1
+libgmodule-2.0.so.0
+librt.so.1
 libXfixes.so.3
 libgee.so.2
 libcanberra-gtk3.so.0
@ -27,15 +30,10 @@ libgio-2.0.so.0
 libpangocairo-1.0.so.0
 libgdk_pixbuf-2.0.so.0
 libcairo-gobject.so.2
-libcairo.so.2
 libpango-1.0.so.0
-libgmodule-2.0.so.0
+libcairo.so.2
 libgudev-1.0.so.0
 libgobject-2.0.so.0
-libgthread-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
-libclutter-1.0.so.0
-libcogl.so.9
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@ -1,18 +1,23 @@
 # Template file for 'cheese'
 pkgname=cheese
-version=3.4.2
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
+version=3.6.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile"
 depends="desktop-file-utils hicolor-icon-theme nautilus-sendto"
-makedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection gst-plugins-base-devel clutter-gtk-devel clutter-gst-devel mx-devel libgee-devel libcanberra-devel librsvg-devel gnome-desktop-devel"
-fulldepends="gst-plugins-good gst-plugins-bad gnome-video-effects gsettings-desktop-schemas"
-revision=2
+makedepends="which pkg-config intltool gnome-doc-utils itstool
+gobject-introspection gst-plugins-base1-devel clutter-gtk-devel>=1.3.2
+clutter-gst-devel>=1.9.92 mx-devel libgee-devel libcanberra-devel
+librsvg-devel gnome-desktop-devel>=3.6.0 libgudev-devel
+gsettings-desktop-schemas-devel>=3.6.0 gst-plugins-bad1-devel"
+fulldepends="gst-plugins-good1 gnome-video-effects
+gsettings-desktop-schemas>=3.6.0"
 short_desc="GNOME tool to take pictures and videos from your webcam"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/cheese/"
 license="GPL-2"
-checksum=730083e1fb7da1fc8c38978cbb957ff2128d6f132132b3863bd60c0963a120e0
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=f0872c6c276fabf054e37e427cb4a4174351a439ebfae7431ecc09a1837e9a80
 long_desc="
 A webcam application that supports image and video capture. Makes it easy to
 take photos and videos of you, your friends, pets or whatever you want. Allows
@ -21,6 +26,3 @@ long_desc="

 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="lib${pkgname} ${pkgname}-devel"
-
-
-
--- a/srcpkgs/chroot-make/patches/make-3.82-bug30612.patch
+++ b/srcpkgs/chroot-make/patches/make-3.82-bug30612.patch
@ -1,66 +0,0 @@
-http://savannah.gnu.org/bugs/?30612
-
--- main.c	2010-07-19 17:10:53.000000000 +1000
-+++ main.c	2010-09-23 23:33:37.908855839 +1000
-@@ -1,3 +1,4 @@
-+
- /* Argument parsing and main program of GNU Make.
- Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
- 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-@@ -1138,7 +1139,7 @@
-      a macro and some compilers (MSVC) don't like conditionals in macros.  */
-   {
-     const char *features = "target-specific order-only second-expansion"
-                           " else-if shortest-stem undefine"
-+                           " else-if shortest-stem undefine oneshell"
- #ifndef NO_ARCHIVES
-                            " archives"
- #endif
--- read.c	2010-07-13 11:20:42.000000000 +1000
-+++ read.c	2010-09-23 23:30:58.018855839 +1000
-@@ -3028,7 +3028,7 @@
-             {
-               /* This looks like the first element in an open archive group.
-                  A valid group MUST have ')' as the last character.  */
-              const char *e = p + nlen;
-+              const char *e = p;
-               do
-                 {
-                   e = next_token (e);
-@@ -3084,19 +3084,19 @@
-          Go to the next item in the string.  */
-       if (flags & PARSEFS_NOGLOB)
-         {
-          NEWELT (concat (2, prefix, tp));
-+          NEWELT (concat (2, prefix, tmpbuf));
-           continue;
-         }
-
-       /* If we get here we know we're doing glob expansion.
-          TP is a string in tmpbuf.  NLEN is no longer used.
-          We may need to do more work: after this NAME will be set.  */
-      name = tp;
-+      name = tmpbuf;
-
-       /* Expand tilde if applicable.  */
-      if (tp[0] == '~')
-+      if (tmpbuf[0] == '~')
-	{
-	  tildep = tilde_expand (tp);
-+	  tildep = tilde_expand (tmpbuf);
-	  if (tildep != 0)
-             name = tildep;
-	}
-@@ -3152,7 +3152,11 @@
-             else
-               {
-                 /* We got a chain of items.  Attach them.  */
-                (*newp)->next = found;
-+                if (*newp)
-+                  (*newp)->next = found;
-+                else
-+                  *newp = found;
-+
-
-                 /* Find and set the new end.  Massage names if necessary.  */
-                 while (1)
--- a/srcpkgs/chroot-make/patches/make-3.82-bug30723.patch
+++ b/srcpkgs/chroot-make/patches/make-3.82-bug30723.patch
@ -1,13 +0,0 @@
-http://savannah.gnu.org/bugs/?30723
-
--- main.c	2010-07-19 17:10:53.000000000 +1000
-+++ main.c	2010-09-23 23:34:10.932188592 +1000
-@@ -2093,7 +2093,7 @@
-             const char *pv = define_makeflags (1, 1);
-             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
-             sprintf (p, "MAKEFLAGS=%s", pv);
-            putenv (p);
-+            putenv (allocated_variable_expand (p));
-           }
-
-	  if (ISDB (DB_BASIC))
--- a/srcpkgs/chroot-make/patches/make-3.82-bugfixes.patch
+++ b/srcpkgs/chroot-make/patches/make-3.82-bugfixes.patch
@ -0,0 +1,243 @@
+diff -urpN make/ChangeLog make-new/ChangeLog
+--- ChangeLog	2010-09-13 13:42:35.000000000 +0200
+++ ChangeLog	2010-09-13 13:42:09.000000000 +0200
+@@ -1,3 +1,22 @@
+2010-08-13  Paul Smith  <psmith@gnu.org>
+
+	* NEWS: Accidentally forgot to back out the sorted wildcard
+	enhancement in 3.82, so update NEWS.
+	Also add NEWS about the error check for explicit and pattern
+	targets in the same rule, added to 3.82.
+
+	* main.c (main): Add "oneshell" to $(.FEATURES) (forgot to add
+	this in 3.82!)
+
+	* read.c (parse_file_seq): Fix various errors parsing archives
+	with multiple objects in the parenthesis, as well as wildcards.
+	Fixes Savannah bug #30612.
+
+2010-08-10  Paul Smith  <psmith@gnu.org>
+
+	* main.c (main): Expand MAKEFLAGS before adding it to the
+	environment when re-exec'ing.  Fixes Savannah bug #30723.
+
+ 2010-07-28  Paul Smith  <psmith@gnu.org>
+ 
+ 	Version 3.82 released.
+--- main.c	2010-09-13 13:42:35.000000000 +0200
+++ main.c	2010-09-13 13:42:12.000000000 +0200
+@@ -1138,7 +1138,7 @@ main (int argc, char **argv, char **envp
+      a macro and some compilers (MSVC) don't like conditionals in macros.  */
+   {
+     const char *features = "target-specific order-only second-expansion"
+-                           " else-if shortest-stem undefine"
+                           " else-if shortest-stem undefine oneshell"
+ #ifndef NO_ARCHIVES
+                            " archives"
+ #endif
+@@ -2093,7 +2093,7 @@ main (int argc, char **argv, char **envp
+             const char *pv = define_makeflags (1, 1);
+             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
+             sprintf (p, "MAKEFLAGS=%s", pv);
+-            putenv (p);
+            putenv (allocated_variable_expand (p));
+           }
+ 
+ 	  if (ISDB (DB_BASIC))
+--- NEWS	2010-09-13 13:42:35.000000000 +0200
+++ NEWS	2010-09-13 13:42:11.000000000 +0200
+@@ -18,14 +18,6 @@ http://sv.gnu.org/bugs/index.php?group=m
+ * Compiling GNU make now requires a conforming ISO C 1989 compiler and
+   standard runtime library.
+ 
+-* WARNING: Future backward-incompatibility!
+-  Wildcards are not documented as returning sorted values, but up to and
+-  including this release the results have been sorted and some makefiles are
+-  apparently depending on that.  In the next release of GNU make, for
+-  performance reasons, we may remove that sorting.  If your makefiles
+-  require sorted results from wildcard expansions, use the $(sort ...)
+-  function to request it explicitly.
+-
+ * WARNING: Backward-incompatibility!
+   The POSIX standard for make was changed in the 2008 version in a
+   fundamentally incompatible way: make is required to invoke the shell as if
+@@ -42,6 +34,21 @@ http://sv.gnu.org/bugs/index.php?group=m
+   existing targets were provided in $?).
+ 
+ * WARNING: Backward-incompatibility!
+  Wildcards were not documented as returning sorted values, but the results
+  have been sorted up until this release..  If your makefiles require sorted
+  results from wildcard expansions, use the $(sort ...)  function to request
+  it explicitly.
+
+* WARNING: Backward-incompatibility!
+  In previous versions of make it was acceptable to list one or more explicit
+  targets followed by one or more pattern targets in the same rule and it
+  worked "as expected".  However, this was not documented as acceptable and if
+  you listed any explicit targets AFTER the pattern targets, the entire rule
+  would be mis-parsed.  This release removes this ability completely: make
+  will generate an error message if you mix explicit and pattern targets in
+  the same rule.
+
+* WARNING: Backward-incompatibility!
+   As a result of parser enhancements, three backward-compatibility issues
+   exist: first, a prerequisite containing an "=" cannot be escaped with a
+   backslash any longer.  You must create a variable containing an "=" and
+--- read.c	2010-09-13 13:42:35.000000000 +0200
+++ read.c	2010-09-13 13:42:11.000000000 +0200
+@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned
+             {
+               /* This looks like the first element in an open archive group.
+                  A valid group MUST have ')' as the last character.  */
+-              const char *e = p + nlen;
+              const char *e = p;
+               do
+                 {
+                   e = next_token (e);
+@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned
+          Go to the next item in the string.  */
+       if (flags & PARSEFS_NOGLOB)
+         {
+-          NEWELT (concat (2, prefix, tp));
+          NEWELT (concat (2, prefix, tmpbuf));
+           continue;
+         }
+ 
+       /* If we get here we know we're doing glob expansion.
+          TP is a string in tmpbuf.  NLEN is no longer used.
+          We may need to do more work: after this NAME will be set.  */
+-      name = tp;
+      name = tmpbuf;
+ 
+       /* Expand tilde if applicable.  */
+-      if (tp[0] == '~')
+      if (tmpbuf[0] == '~')
+ 	{
+-	  tildep = tilde_expand (tp);
+	  tildep = tilde_expand (tmpbuf);
+ 	  if (tildep != 0)
+             name = tildep;
+ 	}
+@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned
+             else
+               {
+                 /* We got a chain of items.  Attach them.  */
+-                (*newp)->next = found;
+                if (*newp)
+                  (*newp)->next = found;
+                else
+                  *newp = found;
+ 
+                 /* Find and set the new end.  Massage names if necessary.  */
+                 while (1)
+--- tests/ChangeLog	2010-09-13 13:42:35.000000000 +0200
+++ tests/ChangeLog	2010-09-13 13:42:10.000000000 +0200
+@@ -1,3 +1,16 @@
+2010-08-13  Paul Smith  <psmith@gnu.org>
+
+	* scripts/features/archives: New regression tests for archive
+	support.  Test for fix to Savannah bug #30612.
+
+	* run_make_tests.pl (set_more_defaults): Set a %FEATURES hash to
+	the features available in $(.FEATURES).
+
+2010-08-10  Paul Smith  <psmith@gnu.org>
+
+	* scripts/features/reinvoke: Ensure command line variable settings
+	are preserved across make re-exec.  Tests Savannah bug #30723.
+
+ 2010-07-28  Paul Smith  <psmith@gnu.org>
+ 
+ 	* scripts/targets/POSIX: Compatibility issues with Solaris (and
+--- tests/run_make_tests.pl	2010-09-13 13:42:35.000000000 +0200
+++ tests/run_make_tests.pl	2010-09-13 13:42:10.000000000 +0200
+@@ -29,6 +29,7 @@
+ # You should have received a copy of the GNU General Public License along with
+ # this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+%FEATURES = ();
+ 
+ $valgrind = 0;              # invoke make with valgrind
+ $valgrind_args = '';
+@@ -367,6 +368,8 @@ sub set_more_defaults
+      $parallel_jobs = 1;
+    }
+ 
+   %FEATURES = map { $_ => 1 } split /\s+/, `sh -c "echo '\\\$(info \\\$(.FEATURES))' | $make_path -f- 2>/dev/null"`;
+
+    # Set up for valgrind, if requested.
+ 
+    if ($valgrind) {
+--- tests/scripts/features/archives	1970-01-01 01:00:00.000000000 +0100
+++ tests/scripts/features/archives	2010-09-13 13:42:10.000000000 +0200
+@@ -0,0 +1,42 @@
+#                                                              -*-mode: perl-*-
+
+$description = "Test GNU make's archive management features.";
+
+$details = "\
+This only works on systems that support it.";
+
+# If this instance of make doesn't support archives, skip it
+exists $FEATURES{archives} or return -1;
+
+# Create some .o files to work with
+utouch(-60, qw(a1.o a2.o a3.o));
+
+# Very simple
+run_make_test('all: libxx.a(a1.o)',
+              '', "ar rv libxx.a a1.o\nar: creating libxx.a\na - a1.o\n");
+
+# Multiple .o's.  Add a new one to the existing library
+run_make_test('all: libxx.a(a1.o a2.o)',
+              '', "ar rv libxx.a a2.o\na - a2.o\n");
+
+# Touch one of the .o's so it's rebuilt
+utouch(-40, 'a1.o');
+run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n");
+
+# Use wildcards
+run_make_test('all: libxx.a(*.o)',
+              '', "#MAKE#: Nothing to be done for `all'.\n");
+
+# Touch one of the .o's so it's rebuilt
+utouch(-30, 'a1.o');
+run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n");
+
+# Use both wildcards and simple names
+utouch(-50, 'a2.o');
+run_make_test('all: libxx.a(a3.o *.o)', '',
+              "ar rv libxx.a a3.o\na - a3.o\nar rv libxx.a a2.o\nr - a2.o\n");
+
+rmfiles(qw(a1.o a2.o a3.o libxx.a));
+
+# This tells the test driver that the perl test script executed properly.
+1;
+--- tests/scripts/features/reinvoke	2010-09-13 13:42:35.000000000 +0200
+++ tests/scripts/features/reinvoke	2010-09-13 13:42:10.000000000 +0200
+@@ -57,9 +57,24 @@ include $(F)',
+ # Now try with the file we're not updating being the actual file we're
+ # including: this and the previous one test different parts of the code.
+ 
+-run_make_test(undef, "F=b", "[ -f b ] || echo >> b\nhello\n")
+run_make_test(undef, 'F=b', "[ -f b ] || echo >> b\nhello\n")
+ 
+ &rmfiles('a','b','c');
+ 
+# Ensure command line variables are preserved properly across re-exec
+# Tests for Savannah bug #30723
+
+run_make_test('
+ifdef RECURSE
+-include foo30723
+endif
+recurse: ; @$(MAKE) -f $(MAKEFILE_LIST) RECURSE=1 test
+test: ; @echo F.O=$(F.O)
+foo30723: ; @touch $@
+',
+              '--no-print-directory F.O=bar', "F.O=bar\n");
+
+unlink('foo30723');
+
+ # This tells the test driver that the perl test script executed properly.
+ 1;
--- a/srcpkgs/chroot-make/patches/make-3.82-copy-on-expand.patch
+++ b/srcpkgs/chroot-make/patches/make-3.82-copy-on-expand.patch
@ -0,0 +1,77 @@
+From 2f661dc20617ba6fdeb2d7e243dc898653faafea Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Tue, 26 Apr 2011 21:50:26 +0200
+Subject: [PATCH] Always copy the string before expanding it
+
+It might get freed during expansion, e.g. with eval function.
+A simple reproducer:
+
+TRUE = $(eval TRUE := true)
+all:
+	$(TRUE)
+---
+ ChangeLog |    5 +++++
+ expand.c  |   18 +++++++++---------
+ 2 files changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 91878fb..7519164 100644
+--- ChangeLog
+++ ChangeLog
+@@ -1,3 +1,8 @@
+2011-04-26  Lubomir Rintel  <lkundrak@v3.sk>
+
+	* expand.c (variable_expand_string): Always copy the string
+	to expand.
+
+ 2010-08-13  Paul Smith  <psmith@gnu.org>
+ 
+ 	* NEWS: Accidentally forgot to back out the sorted wildcard
+diff --git a/expand.c b/expand.c
+index 2315b06..3e6e346 100644
+--- expand.c
+++ expand.c
+@@ -197,7 +197,7 @@ variable_expand_string (char *line, const char *string, long length)
+ {
+   struct variable *v;
+   const char *p, *p1;
+-  char *abuf = NULL;
+  char *abuf;
+   char *o;
+   unsigned int line_offset;
+ 
+@@ -214,14 +214,15 @@ variable_expand_string (char *line, const char *string, long length)
+ 
+   /* If we want a subset of the string, allocate a temporary buffer for it.
+      Most of the functions we use here don't work with length limits.  */
+-  if (length > 0 && string[length] != '\0')
+  if (length == -1)
+     {
+-      abuf = xmalloc(length+1);
+-      memcpy(abuf, string, length);
+-      abuf[length] = '\0';
+-      string = abuf;
+      length = strlen (string);
+     }
+-  p = string;
+
+  abuf = xmalloc(length+1);
+  memcpy(abuf, string, length);
+  abuf[length] = '\0';
+  p = abuf;
+ 
+   while (1)
+     {
+@@ -411,8 +412,7 @@ variable_expand_string (char *line, const char *string, long length)
+       ++p;
+     }
+ 
+-  if (abuf)
+-    free (abuf);
+  free (abuf);
+ 
+   variable_buffer_output (o, "", 1);
+   return (variable_buffer + line_offset);
+-- 
+1.7.4.1
+
--- a/srcpkgs/chroot-make/patches/make-3.82-err-reporting.patch
+++ b/srcpkgs/chroot-make/patches/make-3.82-err-reporting.patch
@ -0,0 +1,154 @@
+--- misc.c	2010-07-19 09:10:54.000000000 +0200
+++ misc.c	2010-08-11 15:26:45.000000000 +0200
+@@ -342,17 +342,31 @@ strerror (int errnum)
+ /* Print an error message from errno.  */
+ 
+ void
+perror_with_name_err (const char *str, const char *name, int errnum)
+{
+  error (NILF, _("%s%s: %s"), str, name, strerror (errnum));
+}
+
+void
+ perror_with_name (const char *str, const char *name)
+ {
+-  error (NILF, _("%s%s: %s"), str, name, strerror (errno));
+  perror_with_name_err (str, name, errno);
+ }
+ 
+ /* Print an error message from errno and exit.  */
+ 
+ void
+pfatal_with_name_err (const char *name, int errnum)
+{
+  fatal (NILF, _("%s: %s"), name, strerror (errnum));
+
+  /* NOTREACHED */
+}
+
+void
+ pfatal_with_name (const char *name)
+ {
+-  fatal (NILF, _("%s: %s"), name, strerror (errno));
+  pfatal_with_name_err (name, errno);
+ 
+   /* NOTREACHED */
+ }
+--- main.c	2010-08-11 15:34:12.000000000 +0200
+++ main.c	2010-08-11 15:30:11.000000000 +0200
+@@ -1536,13 +1536,13 @@ main (int argc, char **argv, char **envp
+ 	    strcat (template, DEFAULT_TMPFILE);
+ 	    outfile = open_tmpfile (&stdin_nm, template);
+ 	    if (outfile == 0)
+-	      pfatal_with_name (_("fopen (temporary file)"));
+	      pfatal_with_name_err (_("fopen (temporary file)"), errno);
+ 	    while (!feof (stdin) && ! ferror (stdin))
+ 	      {
+ 		char buf[2048];
+ 		unsigned int n = fread (buf, 1, sizeof (buf), stdin);
+ 		if (n > 0 && fwrite (buf, 1, n, outfile) != n)
+-		  pfatal_with_name (_("fwrite (temporary file)"));
+		  pfatal_with_name_err (_("fwrite (temporary file)"), errno);
+ 	      }
+ 	    fclose (outfile);
+ 
+@@ -1747,7 +1747,7 @@ main (int argc, char **argv, char **envp
+       else if ((job_rfd = dup (job_fds[0])) < 0)
+         {
+           if (errno != EBADF)
+-            pfatal_with_name (_("dup jobserver"));
+            pfatal_with_name_err (_("dup jobserver"), errno);
+ 
+           error (NILF,
+                  _("warning: jobserver unavailable: using -j1.  Add `+' to parent make rule."));
+@@ -1788,7 +1788,7 @@ main (int argc, char **argv, char **envp
+       char c = '+';
+ 
+       if (pipe (job_fds) < 0 || (job_rfd = dup (job_fds[0])) < 0)
+-	pfatal_with_name (_("creating jobs pipe"));
+	pfatal_with_name_err (_("creating jobs pipe"), errno);
+ 
+       /* Every make assumes that it always has one job it can run.  For the
+          submakes it's the token they were given by their parent.  For the
+@@ -1803,7 +1803,7 @@ main (int argc, char **argv, char **envp
+ 
+           EINTRLOOP (r, write (job_fds[1], &c, 1));
+           if (r != 1)
+-            pfatal_with_name (_("init jobserver pipe"));
+            pfatal_with_name_err (_("init jobserver pipe"), errno);
+         }
+ 
+       /* Fill in the jobserver_fds struct for our children.  */
+@@ -2226,7 +2226,7 @@ main (int argc, char **argv, char **envp
+   /* If there is a temp file from reading a makefile from stdin, get rid of
+      it now.  */
+   if (stdin_nm && unlink (stdin_nm) < 0 && errno != ENOENT)
+-    perror_with_name (_("unlink (temporary file): "), stdin_nm);
+    perror_with_name_err (_("unlink (temporary file): "), stdin_nm, errno);
+ 
+   /* If there were no command-line goals, use the default.  */
+   if (goals == 0)
+Только в make-3.82-pm: job.c~
+Только в make-3.82-pm: main.c~
+--- make.h	2010-08-11 15:34:12.000000000 +0200
+++ make.h	2010-08-11 15:31:26.000000000 +0200
+@@ -385,6 +385,8 @@ void die (int) __attribute__ ((noreturn)
+ void log_working_directory (int);
+ void pfatal_with_name (const char *) __attribute__ ((noreturn));
+ void perror_with_name (const char *, const char *);
+void pfatal_with_name_err (const char *, int errnum) __attribute__ ((noreturn));
+void perror_with_name_err (const char *, const char *, int errnum);
+ void *xmalloc (unsigned int);
+ void *xcalloc (unsigned int);
+ void *xrealloc (void *, unsigned int);
+diff -urp make-3.82/job.c make-3.82-pm/job.c
+--- job.c	2010-07-24 10:27:50.000000000 +0200
+++ job.c	2010-08-11 15:33:54.000000000 +0200
+@@ -917,7 +917,7 @@ free_child (struct child *child)
+ 
+       EINTRLOOP (r, write (job_fds[1], &token, 1));
+       if (r != 1)
+-	pfatal_with_name (_("write jobserver"));
+	pfatal_with_name_err (_("write jobserver"), errno);
+ 
+       DB (DB_JOBS, (_("Released token for child %p (%s).\n"),
+                     child, child->file->name));
+@@ -1768,6 +1768,7 @@ new_job (struct file *file)
+ 
+         /* Set interruptible system calls, and read() for a job token.  */
+ 	set_child_handler_action_flags (1, waiting_jobs != NULL);
+	errno = 0;
+ 	got_token = read (job_rfd, &token, 1);
+ 	saved_errno = errno;
+ 	set_child_handler_action_flags (0, waiting_jobs != NULL);
+@@ -1782,10 +1783,14 @@ new_job (struct file *file)
+ 
+         /* If the error _wasn't_ expected (EINTR or EBADF), punt.  Otherwise,
+            go back and reap_children(), and try again.  */
+-	errno = saved_errno;
+-        if (errno != EINTR && errno != EBADF)
+-          pfatal_with_name (_("read jobs pipe"));
+-        if (errno == EBADF)
+        if (saved_errno != EINTR && saved_errno != EBADF)
+	  {
+	    if (got_token == 0)
+	      fatal (NILF, _("read jobs pipe EOF"));
+	    else
+	      pfatal_with_name_err (_("read jobs pipe"), saved_errno);
+	  }
+        if (saved_errno == EBADF)
+           DB (DB_JOBS, ("Read returned EBADF.\n"));
+       }
+ #endif
+@@ -1909,7 +1914,8 @@ load_too_high (void)
+ 	    error (NILF,
+                    _("cannot enforce load limits on this operating system"));
+ 	  else
+-	    perror_with_name (_("cannot enforce load limit: "), "getloadavg");
+	    perror_with_name_err (_("cannot enforce load limit: "),
+				  "getloadavg", errno);
+ 	}
+       lossage = errno;
+       load = 0;
+Только в make-3.82-pm: make.h~
+Только в make-3.82-pm: misc.c.orig
--- a/srcpkgs/chroot-make/patches/make-3.82-getcwd.patch
+++ b/srcpkgs/chroot-make/patches/make-3.82-getcwd.patch
@ -0,0 +1,13 @@
+--- make.h~	2010-07-20 15:12:06.000000000 +0200
+++ make.h	2010-08-11 15:19:09.000000000 +0200
+@@ -472,7 +472,7 @@ long int lseek ();
+ #endif  /* Not GNU C library or POSIX.  */
+ 
+ #ifdef  HAVE_GETCWD
+-# if !defined(VMS) && !defined(__DECC)
+# if !defined(VMS) && !defined(__DECC) && !defined(getcwd)
+ char *getcwd ();
+ # endif
+ #else
+
+Diff finished.  Wed Aug 11 15:19:12 2010
--- a/srcpkgs/chroot-make/patches/make-3.82-j8k.patch
+++ b/srcpkgs/chroot-make/patches/make-3.82-j8k.patch
@ -0,0 +1,25 @@
+--- main.c~	2010-07-19 09:10:53.000000000 +0200
+++ main.c	2010-08-11 15:12:09.000000000 +0200
+@@ -1765,6 +1765,20 @@ main (int argc, char **argv, char **envp
+         }
+     }
+ 
+#ifdef PIPE_BUF
+  if (job_slots > PIPE_BUF)
+#elif defined _POSIX_PIPE_BUF
+  if (job_slots > _POSIX_PIPE_BUF)
+#else
+  if (job_slots > 512)
+#endif
+    {
+      error (NILF,
+	     _("More parallel jobs (-jN) than this platform can handle requested."));
+      error (NILF, _("Resetting to single job (-j1) mode."));
+      job_slots = 1;
+    }
+
+   /* If we have >1 slot but no jobserver-fds, then we're a top-level make.
+      Set up the pipe and install the fds option for our children.  */
+ 
+
+Diff finished.  Wed Aug 11 15:12:32 2010
--- a/srcpkgs/chroot-make/patches/make-3.82-jobserver.patch
+++ b/srcpkgs/chroot-make/patches/make-3.82-jobserver.patch
@ -0,0 +1,18 @@
+--- main.c~	2010-08-12 14:59:20.000000000 +0200
+++ main.c	2010-08-12 15:00:07.000000000 +0200
+@@ -1756,8 +1756,11 @@ main (int argc, char **argv, char **envp
+ 
+       if (job_slots > 0)
+         {
+-          close (job_fds[0]);
+-          close (job_fds[1]);
+	  if (restarts == 0)
+	    {
+	      close (job_fds[0]);
+	      close (job_fds[1]);
+	    }
+           job_fds[0] = job_fds[1] = -1;
+           free (jobserver_fds->list);
+           free (jobserver_fds);
+
+Diff finished.  Thu Aug 12 15:00:22 2010
--- a/srcpkgs/chroot-make/patches/make-3.82-makeflags.patch
+++ b/srcpkgs/chroot-make/patches/make-3.82-makeflags.patch
@ -1,38 +0,0 @@
-https://savannah.gnu.org/bugs/?33873
-
-Index: main.c
-===================================================================
-RCS file: /sources/make/make/main.c,v
-retrieving revision 1.246
-diff -u -r1.246 main.c
--- main.c	29 Aug 2010 23:05:27 -0000	1.246
-+++ main.c	27 Jul 2011 22:03:12 -0000
-@@ -2091,10 +2095,16 @@
-
-           /* Reset makeflags in case they were changed.  */
-           {
-+            if (master_job_slots)
-+              {
-+                assert (job_slots == default_job_slots);
-+                job_slots = master_job_slots;
-+              }
-             const char *pv = define_makeflags (1, 1);
-             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
-             sprintf (p, "MAKEFLAGS=%s", pv);
-             putenv (allocated_variable_expand (p));
-+            job_slots = default_job_slots;
-           }
-
-	  if (ISDB (DB_BASIC))
-@@ -2825,9 +2852,11 @@
-		       && (*(unsigned int *) cs->value_ptr ==
-			   *(unsigned int *) cs->noarg_value))
-		ADD_FLAG ("", 0); /* Optional value omitted; see below.  */
-+#if 0
-	      else if (cs->c == 'j')
-		/* Special case for `-j'.  */
-		ADD_FLAG ("1", 1);
-+#endif
-	      else
-		{
-		  char *buf = alloca (30);
--- a/srcpkgs/chroot-make/patches/make-3.82-newlines.patch
+++ b/srcpkgs/chroot-make/patches/make-3.82-newlines.patch
@ -0,0 +1,29 @@
+--- job.c~	2010-08-12 14:57:15.000000000 +0200
+++ job.c	2010-08-12 14:58:23.000000000 +0200
+@@ -2876,7 +2876,7 @@ construct_command_argv_internal (char *l
+       }
+ 
+     new_line = alloca (shell_len + 1 + sflags_len + 1
+-                             + (line_len*2) + 1);
+                             + (line_len*4) + 1);
+     ap = new_line;
+     memcpy (ap, shell, shell_len);
+     ap += shell_len;
+@@ -2904,13 +2904,14 @@ construct_command_argv_internal (char *l
+ #endif
+ 	    if (PRESERVE_BSNL)
+ 	      {
+-		*(ap++) = '\\';
+		*(ap++) = '\'';
+ 		/* Only non-batch execution needs another backslash,
+ 		   because it will be passed through a recursive
+ 		   invocation of this function.  */
+ 		if (!batch_mode_shell)
+ 		  *(ap++) = '\\';
+ 		*(ap++) = '\n';
+		*(ap++) = '\'';
+ 	      }
+ 	    ++p;
+ 	    continue;
+
+Diff finished.  Thu Aug 12 14:58:34 2010
--- a/srcpkgs/chroot-make/patches/make-3.82-parallel-remake.patch
+++ b/srcpkgs/chroot-make/patches/make-3.82-parallel-remake.patch
@ -0,0 +1,30 @@
+Index: main.c
+===================================================================
+RCS file: /sources/make/make/main.c,v
+retrieving revision 1.247
+retrieving revision 1.246
+diff -u -r1.247 -r1.246
+--- main.c	18 Sep 2011 23:39:26 -0000	1.247
+++ main.c	29 Aug 2010 23:05:27 -0000	1.246
+@@ -2089,6 +2089,11 @@
+ 
+           ++restarts;
+ 
+          /* If we're re-exec'ing the first make, put back the number of
+             job slots so define_makefiles() will get it right.  */
+          if (master_job_slots)
+            job_slots = master_job_slots;
+
+           /* Reset makeflags in case they were changed.  */
+           {
+             const char *pv = define_makeflags (1, 1);
+@@ -2830,9 +2825,6 @@
+ 		       && (*(unsigned int *) cs->value_ptr ==
+ 			   *(unsigned int *) cs->noarg_value))
+ 		ADD_FLAG ("", 0); /* Optional value omitted; see below.  */
+-	      else if (cs->c == 'j')
+-		/* Special case for `-j'.  */
+-		ADD_FLAG ("1", 1);
+ 	      else
+ 		{
+ 		  char *buf = alloca (30);
--- a/srcpkgs/chroot-make/patches/make-3.82-trace.patch
+++ b/srcpkgs/chroot-make/patches/make-3.82-trace.patch
@ -0,0 +1,108 @@
+
+This patch add the support for --debug=c and --debug=e to make
+this option when activated will trace in stdout the activity of $(call and $(eval in the Makefile
+
+The trace use the format:
+ ### xxx -->
+ ### xxx <--
+the number of space before ### is at least 1 and increase with the nesting of eval/call
+
+usage: make --debug=c,e
+
+--- debug.h	2010-07-12 20:20:38.000000000 -0500
+++ debug.h	2011-06-22 12:06:37.000000000 -0500
+@@ -21,6 +21,8 @@
+ #define DB_JOBS         (0x004)
+ #define DB_IMPLICIT     (0x008)
+ #define DB_MAKEFILES    (0x100)
+#define DB_CALL       (0x01000)
+#define DB_EVAL       (0x02000)
+ 
+ #define DB_ALL          (0xfff)
+ 
+--- function.c	2011-06-23 01:01:35.000000000 -0500
+++ function.c	2011-06-23 01:40:05.000000000 -0500
+@@ -28,6 +28,8 @@
+ #include "amiga.h"
+ #endif
+ 
+static int depth = 0;
+
+ 
+ struct function_table_entry
+   {
+@@ -1371,7 +1373,12 @@
+ 
+   install_variable_buffer (&buf, &len);
+ 
+  depth += 1;
+  DBS( DB_EVAL, ("### eval -->\n"));
+  DB( DB_EVAL, ("%s\n", argv[0]));
+   eval_buffer (argv[0]);
+  DBS( DB_EVAL, ("### eval <--\n"));
+  depth -= 1;
+ 
+   restore_variable_buffer (buf, len);
+ 
+@@ -2338,6 +2345,7 @@
+   if (v == 0 || *v->value == '\0')
+     return o;
+ 
+  depth += 1;
+   body = alloca (flen + 4);
+   body[0] = '$';
+   body[1] = '(';
+@@ -2345,6 +2353,7 @@
+   body[flen+2] = ')';
+   body[flen+3] = '\0';
+ 
+  DBS(DB_CALL, ("### call %s -->\n", body));
+   /* Set up arguments $(1) .. $(N).  $(0) is the function name.  */
+ 
+   push_new_variable_scope ();
+@@ -2354,6 +2363,7 @@
+       char num[11];
+ 
+       sprintf (num, "%d", i);
+      DBS(DB_CALL, ("### arg %i for call %s is '%s'\n", i, body, *argv));
+       define_variable (num, strlen (num), *argv, o_automatic, 0);
+     }
+ 
+@@ -2367,6 +2377,7 @@
+       char num[11];
+ 
+       sprintf (num, "%d", i);
+      DBS(DB_CALL, ("### arg %i for call %s is implicit\n", i, body));
+       define_variable (num, strlen (num), "", o_automatic, 0);
+     }
+ 
+@@ -2377,7 +2388,14 @@
+ 
+   saved_args = max_args;
+   max_args = i;
+
+   o = variable_expand_string (o, body, flen+3);
+  DBS(DB_CALL, ("### call to %s expended into\n", body));
+  DB(DB_CALL, ("%s\n", o));
+  DBS(DB_CALL, ("### call %s <--\n", body));
+
+  depth -= 1;
+
+   max_args = saved_args;
+ 
+   v->exp_count = 0;
+--- main.c	2010-07-19 02:10:53.000000000 -0500
+++ main.c	2011-06-22 11:46:39.000000000 -0500
+@@ -634,6 +634,12 @@
+             case 'b':
+               db_level |= DB_BASIC;
+               break;
+            case 'c':
+              db_level |= DB_CALL;
+              break;
+            case 'e':
+              db_level |= DB_EVAL;
+              break;
+             case 'i':
+               db_level |= DB_BASIC | DB_IMPLICIT;
+               break;
--- a/srcpkgs/chroot-make/patches/make-3.82-warn_undefined_function.patch
+++ b/srcpkgs/chroot-make/patches/make-3.82-warn_undefined_function.patch
@ -0,0 +1,84 @@
+diff --git a/make-3.82-gbuild/function.c b/make-3.82-gbuild/function.c
+index e2f6c8c..ff0527f 100644
+--- function.c
+++ function.c
+@@ -2333,8 +2333,10 @@ func_call (char *o, char **argv, const char *funcname UNUSED)
+   v = lookup_variable (fname, flen);
+ 
+   if (v == 0)
+-    warn_undefined (fname, flen);
+-
+    {
+      warn_undefined (fname, flen);
+      warn_undefined_function (fname, flen);
+    }
+   if (v == 0 || *v->value == '\0')
+     return o;
+ 
+diff --git a/make-3.82-gbuild/main.c b/make-3.82-gbuild/main.c
+index c6989e3..2f545a7 100644
+--- main.c
+++ main.c
+@@ -275,6 +275,11 @@ static int print_usage_flag = 0;
+ 
+ int warn_undefined_variables_flag;
+ 
+/* If nonzero, we should print a warning message
+   for each attemtp to call an undefined user function.  */
+
+int warn_undefined_functions_flag;
+
+ /* If nonzero, always build all targets, regardless of whether
+    they appear out of date or not.  */
+ 
+@@ -368,6 +373,8 @@ static const char *const usage[] =
+                               Consider FILE to be infinitely new.\n"),
+     N_("\
+   --warn-undefined-variables  Warn when an undefined variable is referenced.\n"),
+    N_("\
+  --warn-undefined-functions  Warn when an undefined user function is called.\n"),
+     NULL
+   };
+ 
+@@ -424,6 +431,8 @@ static const struct command_switch switches[] =
+     { CHAR_MAX+5, flag, &warn_undefined_variables_flag, 1, 1, 0, 0, 0,
+       "warn-undefined-variables" },
+     { CHAR_MAX+6, string, &eval_strings, 1, 0, 0, 0, 0, "eval" },
+    { CHAR_MAX+7, flag, &warn_undefined_functions_flag, 1, 1, 0, 0, 0,
+      "warn-undefined-functions" },
+     { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+   };
+ 
+diff --git a/make-3.82-gbuild/make.h b/make-3.82-gbuild/make.h
+index 60ade4c..f2ebb56 100644
+--- make.h
+++ make.h
+@@ -513,7 +513,7 @@ extern int env_overrides, no_builtin_rules_flag, no_builtin_variables_flag;
+ extern int print_version_flag, print_directory_flag, check_symlink_flag;
+ extern int warn_undefined_variables_flag, posix_pedantic, not_parallel;
+ extern int second_expansion, clock_skew_detected, rebuilding_makefiles;
+-extern int one_shell;
+extern int one_shell, warn_undefined_functions_flag;
+ 
+ /* can we run commands via 'sh -c xxx' or must we use batch files? */
+ extern int batch_mode_shell;
+diff --git a/make-3.82-gbuild/variable.h b/make-3.82-gbuild/variable.h
+index c215867..02713c1 100644
+--- variable.h
+++ variable.h
+@@ -220,6 +220,13 @@ void undefine_variable_in_set (const char *name, unsigned int length,
+                                 (int)(l), (n)); \
+                               }while(0)
+ 
+#define warn_undefined_function(n,l) do{\
+                              if (warn_undefined_functions_flag) \
+                                error (reading_file, \
+                                       _("warning: undefined function `%.*s'"), \
+                                (int)(l), (n)); \
+                              }while(0)
+
+ char **target_environment (struct file *file);
+ 
+ struct pattern_var *create_pattern_var (const char *target,
+--
+cgit v0.9.0.2-2-gbebe
--- a/srcpkgs/chroot-make/patches/make-3.82-weird-shell.patch
+++ b/srcpkgs/chroot-make/patches/make-3.82-weird-shell.patch
@ -0,0 +1,15 @@
+--- job.c~	2010-08-11 16:13:33.000000000 +0200
+++ job.c	2010-08-12 14:20:08.000000000 +0200
+@@ -2442,7 +2442,11 @@ construct_command_argv_internal (char *l
+ 
+   /* See if it is safe to parse commands internally.  */
+   if (shell == 0)
+-    shell = default_shell;
+    {
+      shell = default_shell;
+      if (shellflags == 0)
+	shellflags = "-c";
+    }
+ #ifdef WINDOWS32
+   else if (strcmp (shell, default_shell))
+   {
--- a/srcpkgs/chroot-make/template
+++ b/srcpkgs/chroot-make/template
@ -1,7 +1,7 @@
 # Template build file for 'chroot-make'
 pkgname=chroot-make
 version=3.82
-revision=2
+revision=3
 wrksrc="make-${version}"
 build_style=gnu-configure
 configure_args="--disable-nls"
--- a/srcpkgs/cinnamon/cinnamon.rshlibs
+++ b/srcpkgs/cinnamon/cinnamon.rshlibs
@ -22,8 +22,6 @@ libgconf-2.so.4
 libsoup-2.4.so.1
 libGL.so.1
 libstartup-notification-1.so.0
-libgthread-2.0.so.0
-libffi.so.5
 libcanberra.so.0
 libpolkit-agent-1.so.0
 libpolkit-gobject-1.so.0
@ -37,8 +35,7 @@ libclutter-1.0.so.0
 libcogl-pango.so.0
 libjson-glib-1.0.so.0
 libXi.so.6
-libcogl.so.9
-libdrm.so.2
+libcogl.so.11
 libXext.so.6
 libXdamage.so.1
 libXcomposite.so.1
@ -47,10 +44,11 @@ librt.so.1
 libXfixes.so.3
 libcroco-0.6.so.3
 libxml2.so.2
-libgnome-desktop-3.so.2
+libgnome-desktop-3.so.4
 libatk-1.0.so.0
 libpangocairo-1.0.so.0
 libcairo-gobject.so.2
 libpango-1.0.so.0
+libgthread-2.0.so.0
 libpulse-mainloop-glib.so.0
 libpulse.so.0
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@ -1,18 +1,18 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
 version=1.6.0
-revision=5
+revision=6
 wrksrc="linuxmint-Cinnamon-bd02368"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --enable-compile-warnings=yes
 --disable-static --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
 makedepends="which gnome-common gettext-devel automake gnome-doc-utils
-pkg-config intltool glib-devel dbus-glib-devel libxml2-devel gtk+3-devel
-libmuffin-devel gjs-devel gnome-menus-devel GConf-devel libsoup-devel
-MesaLib-devel clutter-devel startup-notification-devel libcanberra-devel
-polkit-devel NetworkManager-devel libgnome-keyring-devel libcroco-devel
-gnome-desktop-devel gnome-bluetooth-devel pulseaudio-devel gobject-introspection"
-depends="desktop-file-utils caribou pulseaudio mesa-demos muffin>=1.0.6
+pkg-config intltool glib-devel dbus-glib-devel libxml2-devel gtk+3-devel>=3.6.0_2
+libmuffin-devel>=1.1.0_2 gjs-devel gnome-menus-devel>=3.6.0 GConf-devel libsoup-devel
+MesaLib-devel cogl-devel>=1.12 clutter-devel>=1.12 startup-notification-devel libcanberra-devel
+polkit-devel NetworkManager-devel libgnome-keyring-devel>=3.6.0 libcroco-devel
+gnome-desktop-devel>=3.6.0 gnome-bluetooth-devel>=3.6.0 pulseaudio-devel gobject-introspection"
+depends="desktop-file-utils caribou pulseaudio mesa-demos muffin>=1.1.0
 python-gconf python-lxml python-imaging"
 fulldepends="gsettings-desktop-schemas"
 short_desc="The Cinnamon desktop (gnome-shell fork)"
@ -31,6 +31,7 @@ long_desc="
 easy to use and comfortable desktop experience."

 pycompile_dirs="usr/lib/cinnamon-settings usr/lib/cinnamon-menu-editor"
+LDFLAGS="-lgthread-2.0"

 pre_configure() {
 	_cur="/usr/lib/gnome-session/gnome-session-check-accelerated"
--- a/srcpkgs/clutter-gst/clutter-gst-devel.template
+++ b/srcpkgs/clutter-gst/clutter-gst-devel.template
@ -1,7 +1,7 @@
 # Template file for 'clutter-gst--devel'.
 #
 noarch=yes
-depends="clutter-devel gst-plugins-base-devel clutter-gst>=$version"
+depends="clutter-devel>=1.12 gst-plugins-base1-devel clutter-gst>=${version}"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}

--- a/srcpkgs/clutter-gst/clutter-gst.rshlibs
+++ b/srcpkgs/clutter-gst/clutter-gst.rshlibs
@ -1,32 +1,29 @@
+libclutter-1.0.so.0
 libcairo-gobject.so.2
 libatk-1.0.so.0
 libpangocairo-1.0.so.0
 libcogl-pango.so.0
 libjson-glib-1.0.so.0
 libXi.so.6
+libpango-1.0.so.0
 libcairo.so.2
+libcogl.so.11
 libgdk_pixbuf-2.0.so.0
-libdrm.so.2
 libX11.so.6
 libXext.so.6
 libXdamage.so.1
 libXcomposite.so.1
-libpango-1.0.so.0
 libXfixes.so.3
 libgio-2.0.so.0
-libgstvideo-0.10.so.0
-libgstaudio-0.10.so.0
-libgstbase-0.10.so.0
-libgstinterfaces-0.10.so.0
-libgsttag-0.10.so.0
-libgstreamer-0.10.so.0
+libgstvideo-1.0.so.0
+libgstaudio-1.0.so.0
+libgstbase-1.0.so.0
+libgsttag-1.0.so.0
+libgstreamer-1.0.so.0
 libgobject-2.0.so.0
 libgmodule-2.0.so.0
-libxml2.so.2
 libgthread-2.0.so.0
 librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
-libclutter-1.0.so.0
-libcogl.so.9
--- a/srcpkgs/clutter-gst/template
+++ b/srcpkgs/clutter-gst/template
@ -1,16 +1,17 @@
 # Template file for 'clutter-gst'
 pkgname=clutter-gst
-version=1.6.0
+version=1.9.92
 revision=1
 build_style=gnu-configure
 configure_args="--disable-debug"
-makedepends="pkg-config intltool gobject-introspection clutter-devel libXdamage-devel gst-plugins-base-devel"
-subpackages="$pkgname-devel"
+makedepends="pkg-config intltool gobject-introspection clutter-devel>=1.12
+libXdamage-devel gst-plugins-base1-devel gst-plugins-bad1-devel"
+subpackages="${pkgname}-devel"
 short_desc="GStreamer bindings for the Clutter Toolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
 license="GPL-2"
-distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=5c09dce218f711a44bd4d741e2dd10ffc47e7fcd7b0cf514ca0e92b825c76c45
 long_desc="
 This packages contains the GStreamer bindings for the Clutter Toolkit."
--- a/srcpkgs/clutter-gtk/clutter-gtk-devel.template
+++ b/srcpkgs/clutter-gtk/clutter-gtk-devel.template
@ -1,12 +1,11 @@
 # Template file for 'clutter-gtk--devel'.
 #
-depends="gtk+3-devel clutter-devel clutter-gtk>=1.2.0"
+depends="gtk+3-devel>=3.6.0_2 clutter-devel>=1.12 clutter-gtk>=${version}"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}

 This package contains files for development, headers, static libs, etc."

-
 noarch=yes

 do_install() {
--- a/srcpkgs/clutter-gtk/clutter-gtk.rshlibs
+++ b/srcpkgs/clutter-gtk/clutter-gtk.rshlibs
@ -1,7 +1,6 @@
 libcogl-pango.so.0
 libjson-glib-1.0.so.0
 libXi.so.6
-libdrm.so.2
 libX11.so.6
 libXext.so.6
 libXdamage.so.1
@ -24,4 +23,4 @@ libm.so.6
 libpthread.so.0
 libc.so.6
 libclutter-1.0.so.0
-libcogl.so.9
+libcogl.so.11
--- a/srcpkgs/clutter-gtk/template
+++ b/srcpkgs/clutter-gtk/template
@ -1,14 +1,15 @@
 # Template file for 'clutter-gtk'
 pkgname=clutter-gtk
-version=1.2.0
-distfiles="${GNOME_SITE}/$pkgname/1.2/$pkgname-$version.tar.xz"
-build_style=gnu-configure
-makedepends="pkg-config intltool gobject-introspection gtk+3-devel clutter-devel"
+version=1.3.2
 revision=1
+subpackages="$pkgname-devel"
+build_style=gnu-configure
+makedepends="pkg-config intltool gobject-introspection gtk+3-devel>=3.6.0_2
+clutter-devel>=1.12"
 short_desc="GTK+3 bindings for the Clutter Tolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=8be5deb0fa2f318e5f5e888b8ace3371c516464472a48f25c8b42ccc298af59a
+distfiles="${GNOME_SITE}/$pkgname/1.3/$pkgname-$version.tar.xz"
+checksum=ee50538daca9447be6ad1ed0d049fbb2dc5a1bcaecd13fda847b9b66f922ee37
 long_desc="
 This packages contains the GTK+3 bindings for the Clutter Toolkit."

-subpackages="$pkgname-devel"
--- a/srcpkgs/colord-gtk-devel
+++ b/srcpkgs/colord-gtk-devel
@ -0,0 +1 @@
+colord-gtk
--- a/srcpkgs/colord-gtk/colord-gtk-devel.template
+++ b/srcpkgs/colord-gtk/colord-gtk-devel.template
@ -0,0 +1,15 @@
+# Template file for 'colord-gtk-devel'.
+#
+noarch=yes
+depends="colord-devel gtk+3-devel>=3.6.0_2 ${sourcepkg}>=${version}"
+short_desc="${sourcepkg} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/gir-1.0 usr/share
+	vmove usr/share/vala usr/share
+}
--- a/srcpkgs/colord-gtk/colord-gtk.rshlibs
+++ b/srcpkgs/colord-gtk/colord-gtk.rshlibs
@ -0,0 +1,17 @@
+libcolord.so.1
+libgtk-3.so.0
+libgdk-3.so.0
+libatk-1.0.so.0
+libpangocairo-1.0.so.0
+libgdk_pixbuf-2.0.so.0
+libcairo-gobject.so.2
+libpango-1.0.so.0
+libcairo.so.2
+libgthread-2.0.so.0
+libgio-2.0.so.0
+libgobject-2.0.so.0
+libgmodule-2.0.so.0
+librt.so.1
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@ -0,0 +1,18 @@
+# Template file for 'colord-gtk'
+pkgname=colord-gtk
+version=0.1.23
+revision=1
+build_style=gnu-configure
+configure_args="--disable-static --disable-schemas-compile"
+makedepends="pkg-config intltool gobject-introspection vala-devel
+gtk+3-devel>=3.6.0_2 colord-devel"
+subpackages="$pkgname-devel"
+short_desc="GTK support library for colord"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.freedesktop.org/software/colord"
+distfiles="http://www.freedesktop.org/software/colord/releases/${pkgname}-${version}.tar.xz"
+checksum=30e658ee407531afe7b5787f31ffd20bc0a6a1c84bda153378b9a3acb2d58539
+long_desc="
+ colord-gtk is a support library for colord and provides additional
+ functionality that requires GTK+."
+
--- a/srcpkgs/colord/template
+++ b/srcpkgs/colord/template
@ -1,7 +1,7 @@
 # Template file for 'colord'
 pkgname=colord
-version=0.1.21
-revision=3
+version=0.1.23
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile
 --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-volume-search"
@ -16,7 +16,7 @@ short_desc="Color daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/software/colord"
 distfiles="$homepage/releases/$pkgname-$version.tar.xz"
-checksum=360b896b0d2a35970a0cd42e448ea327d789f309ff95022190c4d33bb8b02c30
+checksum=e0e9da36e28b3f977ce32accdc5cbac415ac2575031377c63b1e7bd2af32d789
 long_desc="
 colord is a system service that makes it easy to manage, install and generate
 color profiles to accurately color manage input and output devices.
--- a/srcpkgs/dconf/dconf-devel.template
+++ b/srcpkgs/dconf/dconf-devel.template
@ -1,12 +1,11 @@
 # Template file for 'dconf-devel'.
 #
-depends="glib-devel vala-devel dconf>=0.12.1"
+depends="glib-devel vala-devel dconf>=${version}"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}

 This package contains files for development, headers, static libs, etc."

-
 noarch=yes

 do_install() {
--- a/srcpkgs/dconf/dconf-editor.rshlibs
+++ b/srcpkgs/dconf/dconf-editor.rshlibs
@ -1,4 +1,4 @@
-libdconf.so.0
+libdconf.so.1
 libgtk-3.so.0
 libgio-2.0.so.0
 libpango-1.0.so.0
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@ -1,20 +1,19 @@
 # Template file for 'dconf'
 pkgname=dconf
-version=0.12.1
-distfiles="${GNOME_SITE}/$pkgname/0.12/$pkgname-$version.tar.xz"
-build_style=gnu-configure
-depends="dbus"
-makedepends="pkg-config vala-devel dbus-devel gtk+3-devel libxml2-devel"
+version=0.14.0
 revision=1
+build_style=gnu-configure
+subpackages="dconf-devel dconf-editor"
+depends="dbus"
+makedepends="pkg-config intltool libxslt docbook-xsl vala-devel>=0.18
+dbus-devel gtk+3-devel>=3.6.0_2 libxml2-devel"
 short_desc="A low-level configuration system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/dconf"
 licenses="LGPL-2.1"
-checksum=3cd32b78d88ed7be90dace5d45e2cf8a6abdb253d43dbfa5ef52103b329dc214
+distfiles="${GNOME_SITE}/$pkgname/0.14/$pkgname-$version.tar.xz"
+checksum=9ae848bf25c3de0fb8c0157679630ddf39be1c10ed2f3beb2b8f0165d768da33
 long_desc="
 dconf is a low-level configuration system. Its main purpose is to provide a
 backend to GSettings on platforms that don't already have configuration
 storage systems."
-
-subpackages="dconf-devel dconf-editor"
-
--- a/srcpkgs/empathy/empathy.rshlibs
+++ b/srcpkgs/empathy/empathy.rshlibs
@ -1,68 +1,63 @@
-libenchant.so.1
-libchamplain-gtk-0.12.so.0
-libclutter-gtk-1.0.so.0
-libchamplain-0.12.so.0
-libcogl-pango.so.0
-libjson-glib-1.0.so.0
-libXi.so.6
-libdrm.so.2
-libXext.so.6
-libXdamage.so.1
-libXcomposite.so.1
-libXfixes.so.3
 libfolks-telepathy.so.25
 libfolks.so.25
-libgee.so.2
-libgnome-keyring.so.0
+libsecret-1.so.0
 libgnutls.so.26
-libgstinterfaces-0.10.so.0
-libgstreamer-0.10.so.0
+libgmodule-2.0.so.0
+librt.so.1
 libtelepathy-logger.so.2
-libtelepathy-glib.so.0
 libX11.so.6
 libcanberra-gtk3.so.0
 libcanberra.so.0
 libnotify.so.4
 libgcr-3.so.1
+libgcr-base-3.so.1
 libgck-1.so.0
 libp11-kit.so.0
 libpulse-mainloop-glib.so.0
 libpulse.so.0
 libwebkitgtk-3.0.so.0
 libgtk-3.so.0
-libsoup-2.4.so.1
+libjavascriptcoregtk-3.0.so.0
 libgdk-3.so.0
 libatk-1.0.so.0
 libpangocairo-1.0.so.0
 libgdk_pixbuf-2.0.so.0
 libcairo-gobject.so.2
-libcairo.so.2
 libpango-1.0.so.0
-libgio-2.0.so.0
-libgmodule-2.0.so.0
+libcairo.so.2
+libsoup-2.4.so.1
+libgee.so.2
 libgeoclue.so.0
-libxml2.so.2
-libnm-glib.so.4
 libdbus-glib-1.so.2
+libxml2.so.2
 libdbus-1.so.3
-libpthread.so.0
 libgudev-1.0.so.0
+libmission-control-plugins.so.0
+libtelepathy-glib.so.0
+libgoa-1.0.so.0
+libgio-2.0.so.0
 libgobject-2.0.so.0
-libgthread-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
 libm.so.6
+libpthread.so.0
 libc.so.6
-libmission-control-plugins.so.0
-libgoa-1.0.so.0
-libjavascriptcoregtk-3.0.so.0
+libenchant.so.1
+libchamplain-gtk-0.12.so.0
+libclutter-gtk-1.0.so.0
+libchamplain-0.12.so.0
 libclutter-1.0.so.0
-libcogl.so.9
-libcheese-gtk.so.21
-libebook-1.2.so.13
-libedataserver-1.2.so.16
-libgconf-2.so.4
-libgcr-base-3.so.1
-libfarstream-0.1.so.0
-libtelepathy-farstream.so.2
-libclutter-gst-1.0.so.0
+libcogl-pango.so.0
+libjson-glib-1.0.so.0
+libXi.so.6
+libcogl.so.11
+libXext.so.6
+libXdamage.so.1
+libXcomposite.so.1
+libXfixes.so.3
+libcheese-gtk.so.23
+libfarstream-0.2.so.2
+libtelepathy-farstream.so.3
+libclutter-gst-2.0.so.0
+libgstaudio-1.0.so.0
+libgstvideo-1.0.so.0
+libgstreamer-1.0.so.0
--- a/srcpkgs/empathy/template
+++ b/srcpkgs/empathy/template
@ -1,24 +1,26 @@
 # Template file for 'empathy'
 pkgname=empathy
-version=3.4.2.3
+version=3.6.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-schemas-compile --disable-static"
-depends="webkit-gtk3>=1.6.3"
-makedepends="pkg-config intltool gnome-doc-utils itstool telepathy-glib-devel>=0.15.5
-telepathy-logger-devel telepathy-farstream-devel telepathy-mission-control-devel
-evolution-data-server-devel geoclue-devel folks-devel libcanberra-devel
-libnotify-devel clutter-gtk-devel clutter-gst-devel webkit-gtk3-devel gcr-devel
-pulseaudio-devel enchant-devel NetworkManager-devel gnome-online-accounts-devel
-libchamplain-devel nautilus-sendto-devel cheese-devel gnutls-devel"
-fulldepends="iso-codes"
+configure_args="--enable-gst-1.0=yes --disable-schemas-compile --disable-static"
+depends="webkit-gtk3>=1.8"
+makedepends="pkg-config intltool gnome-doc-utils itstool telepathy-glib-devel>=0.19.9
+telepathy-logger-devel telepathy-farstream-devel>=0.6.0 telepathy-mission-control-devel
+evolution-data-server-devel>=3.6.0 geoclue-devel folks-devel>=0.7.4.1 libcanberra-devel
+libnotify-devel clutter-gtk-devel>=1.3.2 clutter-gst-devel>=1.9.92 webkit-gtk3-devel
+gcr-devel>=3.6.0 gnome-online-accounts-devel>=3.6.0 pulseaudio-devel libgudev-devel
+nautilus-sendto-devel>=3.6.0 cheese-devel>=3.6.0 enchant-devel NetworkManager-devel
+libchamplain-devel>=0.12.3_2 gnutls-devel libsecret-devel
+gsettings-desktop-schemas-devel>=3.6.0"
+fulldepends="iso-codes gsettings-desktop-schemas>=3.6.0"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 short_desc="GNOME instant messaging client using the Telepathy framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/Empathy"
 license="GPL-2"
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
-checksum=ca511c2a6bb2f39fb29127782b4b0ba813839f7ffc06ae8680445ecb5d58c203
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=6bd73710846f369bc41fa0f88b3dd60d03f9242702b6a8c35681c9e5c99e8441
 long_desc="
 Instant messaging program supporting text, voice, video, file transfers and
 inter-application communication over many different protocols, including:
--- a/srcpkgs/eog-plugins/eog-plugins.rshlibs
+++ b/srcpkgs/eog-plugins/eog-plugins.rshlibs
@ -1,6 +1,7 @@
 libpeas-1.0.so.0
+libgmodule-2.0.so.0
+librt.so.1
 libgirepository-1.0.so.1
-libffi.so.5
 libgtk-3.so.0
 libgdk-3.so.0
 libatk-1.0.so.0
@ -8,12 +9,9 @@ libgio-2.0.so.0
 libpangocairo-1.0.so.0
 libgdk_pixbuf-2.0.so.0
 libcairo-gobject.so.2
-libcairo.so.2
 libpango-1.0.so.0
+libcairo.so.2
 libgobject-2.0.so.0
-libgmodule-2.0.so.0
-libgthread-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
 libexif.so.12
 libpthread.so.0
@ -21,17 +19,23 @@ libc.so.6
 libchamplain-gtk-0.12.so.0
 libchamplain-0.12.so.0
 libclutter-gtk-1.0.so.0
+libclutter-1.0.so.0
 libcogl-pango.so.0
 libjson-glib-1.0.so.0
 libXi.so.6
-libdrm.so.2
+libcogl.so.11
 libX11.so.6
 libXext.so.6
 libXdamage.so.1
 libXcomposite.so.1
 libXfixes.so.3
 libgdata.so.13
-libsoup-2.4.so.1
 libxml2.so.2
-libclutter-1.0.so.0
-libcogl.so.9
+libgthread-2.0.so.0
+liboauth.so.0
+libsoup-gnome-2.4.so.1
+libgcr-base-3.so.1
+libgoa-1.0.so.0
+libsoup-2.4.so.1
+libgck-1.so.0
+libp11-kit.so.0
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@ -1,17 +1,19 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.4.1
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
-build_style=gnu-configure
-depends="eog>=$version"
-makedepends="pkg-config intltool eog-devel libgdata-devel libchamplain-devel libpeas-devel libexif-devel"
-pycompile_dirs="usr/lib/eog/plugins"
+version=3.6.0
 revision=1
+build_style=gnu-configure
+depends="eog>=${version} gsettings-desktop-schemas>=3.6.0"
+makedepends="pkg-config intltool eog-devel>=3.6.0 libgdata-devel>=0.13
+libchamplain-devel>=0.12.3_2 libpeas-devel libexif-devel
+gsettings-desktop-schemas-devel>=3.6.0"
+pycompile_dirs="usr/lib/eog/plugins"
 short_desc="Eye of GNOME plugins"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
-checksum=e1f7c4a0a9cc825d1ac8a64cc3d8db4da3054d294e4cd60b28eba13643d71055
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=3919f1a2d058867891a4424bc5a5aeae951c2e56a141ec77cfa4eb70cc089ab0
 long_desc="
 eog or the Eye of GNOME is a simple graphics viewer for the GNOME desktop
 which uses the gdk-pixbuf library. It can deal with large images, and zoom
--- a/srcpkgs/eog/eog.rshlibs
+++ b/srcpkgs/eog/eog.rshlibs
@ -1,4 +1,4 @@
-libgnome-desktop-3.so.2
+libgnome-desktop-3.so.4
 libpeas-gtk-1.0.so.0
 libgtk-3.so.0
 libpeas-1.0.so.0
@ -17,7 +17,6 @@ libxml2.so.2
 libX11.so.6
 libgirepository-1.0.so.1
 libgobject-2.0.so.0
-libgthread-2.0.so.0
 libglib-2.0.so.0
 libz.so.1
 libpthread.so.0
@ -25,6 +24,5 @@ libc.so.6
 libpangocairo-1.0.so.0
 libcairo-gobject.so.2
 libpango-1.0.so.0
-libffi.so.5
 libgmodule-2.0.so.0
 librt.so.1
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@ -1,21 +1,21 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.4.3
+version=3.6.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
 depends="hicolor-icon-theme desktop-file-utils"
-makedepends="which pkg-config intltool gnome-doc-utils gnome-desktop-devel
+makedepends="which pkg-config intltool gnome-doc-utils itstool
+gnome-desktop-devel>=3.6.0 gsettings-desktop-schemas-devel>=3.6.0
 libpeas-devel lcms2-devel exempi-devel libexif-devel librsvg-devel"
-fulldepends="gnome-icon-theme gsettings-desktop-schemas shared-mime-info"
+fulldepends="gnome-icon-theme gsettings-desktop-schemas>=3.6.0 shared-mime-info"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="eog-devel"
 short_desc="Eye of GNOME graphics viewer program"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
-distfiles="${GNOME_SITE}/eog/3.4/eog-$version.tar.xz"
-checksum=66e468f09de4b8097671cb6e56cd057c0e7869d836a2345e640b6cf4c404d5d9
+distfiles="${GNOME_SITE}/eog/3.6/eog-$version.tar.xz"
+checksum=8f8e43a337a3fb7071c650078f2ef89567b4889527f300d053491e9185dbae6b
 long_desc="
 eog or the Eye of GNOME is a simple graphics viewer for the GNOME desktop
 which uses the gdk-pixbuf library. It can deal with large images, and zoom
--- a/srcpkgs/epiphany/epiphany-devel.template
+++ b/srcpkgs/epiphany/epiphany-devel.template
@ -1,9 +1,6 @@
 # Template file for 'epiphany-devel'.
 #
-depends="nss-devel libgnome-keyring-devel libsoup-gnome-devel
-webkit-gtk3-devel startup-notification-devel NetworkManager-devel
-libseed-devel libnotify-devel avahi-libs-devel avahi-glib-libs-devel
-epiphany>=${version}"
+depends="gtk+3-devel>=3.6.0_2 libxml2-devel webkit-gtk3-devel>=1.10.0"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}

@ -16,4 +13,5 @@ do_install() {
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/aclocal usr/share
 	vmove usr/share/gir-1.0 usr/share
+	vmove usr/share/gtk-doc usr/share
 }
--- a/srcpkgs/epiphany/epiphany.rshlibs
+++ b/srcpkgs/epiphany/epiphany.rshlibs
@ -1,9 +1,12 @@
 libxml2.so.2
-libgtk-3.so.0
-libgdk-3.so.0
+libwebkitgtk-3.0.so.0
 libsoup-gnome-2.4.so.1
 libsoup-2.4.so.1
 libgnome-keyring.so.0
+libsqlite3.so.0
+libgtk-3.so.0
+libgdk-3.so.0
+libgdk_pixbuf-2.0.so.0
 libgio-2.0.so.0
 libgobject-2.0.so.0
 libglib-2.0.so.0
@ -11,21 +14,18 @@ libnss3.so
 libplc4.so
 libpthread.so.0
 libc.so.6
+libgmodule-2.0.so.0
+libX11.so.6
+libxslt.so.1
+libm.so.6
+libgnome-desktop-3.so.4
+libnotify.so.4
+libgcr-3.so.1
+libgcr-base-3.so.1
+libpangocairo-1.0.so.0
+libpango-1.0.so.0
+libcairo.so.2
 libavahi-gobject.so.0
 libavahi-common.so.3
 libavahi-client.so.3
-libX11.so.6
-libSM.so.6
-libICE.so.6
-libxslt.so.1
-libm.so.6
-libwebkitgtk-3.0.so.0
-libpangocairo-1.0.so.0
-libcairo.so.2
-libpango-1.0.so.0
-libnotify.so.4
-libgdk_pixbuf-2.0.so.0
-libseed-gtk3.so.0
 libgirepository-1.0.so.1
-libgmodule-2.0.so.0
-libsqlite3.so.0
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@ -1,22 +1,23 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=3.4.3
+version=3.6.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-schemas-compile --disable-scrollkeeper
--disable-tests --enable-seed"
-depends="ca-certificates hicolor-icon-theme desktop-file-utils webkit-gtk3>=1.8.2"
+configure_args="--disable-schemas-compile --disable-tests"
+depends="ca-certificates hicolor-icon-theme desktop-file-utils webkit-gtk3>=1.10.0"
 makedepends="which pkg-config intltool gnome-doc-utils gobject-introspection
-nss-devel libgnome-keyring-devel libsoup-gnome-devel gtk+3-devel
-webkit-gtk3-devel>=1.8.2 sqlite-devel libxslt-devel avahi-glib-libs-devel
-startup-notification-devel NetworkManager-devel libseed-devel libnotify-devel"
-fulldepends="iso-codes gsettings-desktop-schemas"
+nss-devel libsoup-gnome-devel>=2.40 gtk+3-devel>=3.6.0_2 libnotify-devel
+webkit-gtk3-devel>=1.10.0 sqlite-devel libxslt-devel avahi-glib-libs-devel
+startup-notification-devel NetworkManager-devel gcr-devel>=3.6.0
+libgnome-keyring-devel>=3.6.0 gnome-desktop-devel>=3.6.0
+gsettings-desktop-schemas-devel>=3.6.0"
+fulldepends="iso-codes gsettings-desktop-schemas>=3.6.0"
 short_desc="Intuitive GNOME web browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/epiphany/"
 license="GPL-2"
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
-checksum=3233fb9e9e8a056c3ef494e85cf5e27068abf51df5fc7f5203ab7afda480f395
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=54458b220e5f320b93f2f59840971627f43f2aa6b1ff5fa3e6a8fad5deef2207
 long_desc="
 Epiphany is a simple yet powerful GNOME web browser targeted at non-technical
 users. Its principles are simplicity and standards compliance. Simplicity is
--- a/srcpkgs/evince/evince-devel.template
+++ b/srcpkgs/evince/evince-devel.template
@ -1,12 +1,11 @@
 # Template file for 'evince-devel'.
 #
-depends="gtk+3-devel libevince>=3.4.0"
+depends="gtk+3-devel libevince>=${version}"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}

 This package contains files for development, headers, static libs, etc."

-
 noarch=yes

 do_install() {
--- a/srcpkgs/evince/evince.rshlibs
+++ b/srcpkgs/evince/evince.rshlibs
@ -22,7 +22,7 @@ libdjvulibre.so.21
 libpthread.so.0
 libnautilus-extension.so.1
 libevview3.so.3
-libX11.so.6
+libgmodule-2.0.so.0
 libgnome-keyring.so.0
 libgxps.so.2
 libarchive.so.12
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@ -1,20 +1,25 @@
 # Template file for 'evince'
 pkgname=evince
-version=3.4.0
-revision=4
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
+version=3.6.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-introspection --disable-schemas-compile
 --enable-comics --disable-scrollkeeper --enable-xps --disable-t1lib
 --disable-tests --disable-static"
+# XXX missing packages for DVI  backend.
 depends="desktop-file-utils hicolor-icon-theme"
-makedepends="which pkg-config intltool gnome-doc-utils gobject-introspection tiff-devel libarchive-devel nautilus-devel poppler-glib-devel libgnome-keyring-devel libxml2-devel djvulibre-devel libgxps-devel libSM-devel libICE-devel gtk+3-devel libspectre-devel"
-fulldepends="gnome-icon-theme gsettings-desktop-schemas"
+makedepends="which pkg-config intltool gnome-doc-utils gobject-introspection
+tiff-devel libarchive-devel nautilus-devel>=3.6.0 poppler-glib-devel
+libgnome-keyring-devel libxml2-devel djvulibre-devel libgxps-devel
+libSM-devel libICE-devel gtk+3-devel>=3.6.0_2 libspectre-devel
+gsettings-desktop-schemas-devel>=3.6.0 itstool"
+fulldepends="gnome-icon-theme gsettings-desktop-schemas>=3.6.0"
 short_desc="GNOME Document viewer for multiple document formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://projects.gnome.org/evince/"
 license="GPL-2"
-checksum=02f1c74c123ea0cb4c1a98cb9ba2b67d724e9f90d7ff15acbcd6b8dbeef0a129
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=8dfa7b9c2f0b910d06b1612ff445d3f3050c44d25f2e78718966374d30ab83f2
 long_desc="
 Evince is specifically designed to support the file following formats:
  * PDF
@ -26,8 +31,5 @@ long_desc="
  * SyncTex support with gedit
  * comics books (cbr,cbz,cb7 and cbt)"

-# XXX missing packages for DVI  backend.
 subpackages="lib${pkgname} ${pkgname}-devel"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-
-
--- a/srcpkgs/evolution-data-server/evolution-data-server-devel.template
+++ b/srcpkgs/evolution-data-server/evolution-data-server-devel.template
@ -1,9 +1,10 @@
 # Template file for 'evolution-data-server-devel'.
 #
 noarch=yes
-depends="sqlite-devel GConf-devel mit-krb5-devel nss-devel libical-devel
-libgweather-devel libldap-devel libgdata-devel gnome-online-accounts-devel
-evolution-data-server>=$version"
+depends="sqlite-devel mit-krb5-devel nss-devel libical-devel
+libgweather-devel>=3.6.0 libldap-devel libgdata-devel
+libgnome-keyring-devel gnome-online-accounts-devel>=3.6.0
+${sourcepkg}>=${version}"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}

--- a/srcpkgs/evolution-data-server/evolution-data-server.rshlibs
+++ b/srcpkgs/evolution-data-server/evolution-data-server.rshlibs
@ -1,45 +1,46 @@
-libxml2.so.2
-libgconf-2.so.4
-libdl.so.2
-libplc4.so
-libplds4.so
-libnspr4.so
-libsoup-2.4.so.1
 libgio-2.0.so.0
-libgobject-2.0.so.0
-libgmodule-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
+libgobject-2.0.so.0
+libical.so.0
+libgnome-keyring.so.0
+libsoup-2.4.so.1
+libgmodule-2.0.so.0
+librt.so.1
 libsqlite3.so.0
-libdb-4.8.so
 libz.so.1
 libkrb5.so.3
 libk5crypto.so.3
 libcom_err.so.2
 libgssapi_krb5.so.2
+libdl.so.2
+libplc4.so
+libplds4.so
+libnspr4.so
 libssl3.so
 libsmime3.so
 libnss3.so
 libgoa-1.0.so.0
+libgcr-base-3.so.1
+libgck-1.so.0
+libp11-kit.so.0
+libdb-4.8.so
+libxml2.so.2
 libldap-2.4.so.2
 liblber-2.4.so.2
 libresolv.so.2
 libnsl.so.1
 libgdata.so.13
 liboauth.so.0
-libical.so.0
 libicalss.so.0
 libicalvcal.so.0
-libgweather-3.so.0
+libgweather-3.so.1
 libgtk-3.so.0
 libgdk-3.so.0
 libatk-1.0.so.0
 libpangocairo-1.0.so.0
 libgdk_pixbuf-2.0.so.0
 libcairo-gobject.so.2
-libcairo.so.2
 libpango-1.0.so.0
-libgnome-keyring.so.0
-libdbus-glib-1.so.2
+libcairo.so.2
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@ -1,22 +1,22 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.4.4
-revision=1
+version=3.6.0
+revision=2
 build_style=gnu-configure
 configure_args="--with-openldap
 --with-krb5=/usr --with-nspr-includes=/usr/include/nspr
 --with-nss-includes=/usr/include/nss --enable-vala-bindings"
-makedepends="pkg-config intltool flex gperf gobject-introspection sqlite-devel
-dbus-glib-devel GConf-devel mit-krb5-devel nss-devel libical-devel
-libgweather-devel libldap-devel libgdata-devel gnome-online-accounts-devel
-vala-devel liboauth-devel libgnome-keyring-devel"
+makedepends="pkg-config intltool flex gperf gobject-introspection
+sqlite-devel mit-krb5-devel nss-devel libical-devel libgnome-keyring-devel
+gcr-devel>=3.6.0 libgweather-devel>=3.6.0 libldap-devel libgdata-devel
+gnome-online-accounts-devel>=3.6.0 vala-devel liboauth-devel"
 subpackages="$pkgname-devel"
 short_desc="Evolution data server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
-checksum=ce9e1d5625503cd7f1f0631ec2f552e26800c33305b45722b34eba8da5ced491
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=50a7dd1a8109aefa748e6ba7b6469bb5bf8739b30a197c495db516703f3aaba8
 long_desc="
 Evolution Data Server is responsible for managing calendar and addressbook
 information within the GNOME desktop."
--- a/srcpkgs/evolution/evolution.rshlibs
+++ b/srcpkgs/evolution/evolution.rshlibs
@ -1,9 +1,34 @@
-libpthread.so.0
+libgmodule-2.0.so.0
+librt.so.1
+libgailutil-3.so.0
+libxml2.so.2
+libgnome-desktop-3.so.4
+libwebkitgtk-3.0.so.0
+libgtk-3.so.0
+libsoup-2.4.so.1
+libjavascriptcoregtk-3.0.so.0
+libgdk-3.so.0
+libatk-1.0.so.0
+libpangocairo-1.0.so.0
+libgdk_pixbuf-2.0.so.0
+libcairo-gobject.so.2
+libpango-1.0.so.0
+libcairo.so.2
+libgio-2.0.so.0
+libgobject-2.0.so.0
+libglib-2.0.so.0
 libm.so.6
+libpthread.so.0
+libc.so.6
+libecal-1.2.so.15
 libical.so.0
 libicalss.so.0
 libicalvcal.so.0
-libedataserverui-3.0.so.1
+libedataserverui-3.0.so.4
+libebook-1.2.so.14
+libebackend-1.2.so.5
+libedataserver-1.2.so.17
+libcamel-1.2.so.40
 libdl.so.2
 libplc4.so
 libplds4.so
@ -11,62 +36,28 @@ libnspr4.so
 libssl3.so
 libsmime3.so
 libnss3.so
+libgnome-keyring.so.0
 libsqlite3.so.0
-libsoup-2.4.so.1
-libnotify.so.4
 libgtkhtml-editor-4.0.so.0
 libgtkhtml-4.0.so.0
 libenchant.so.1
-libgailutil-3.so.0
-libgconf-2.so.4
-libxml2.so.2
-libgnome-desktop-3.so.2
-libgtk-3.so.0
-libgdk-3.so.0
-libatk-1.0.so.0
-libgio-2.0.so.0
-libpangocairo-1.0.so.0
-libgdk_pixbuf-2.0.so.0
-libcairo-gobject.so.2
-libcairo.so.2
-libpango-1.0.so.0
-libgobject-2.0.so.0
-libgmodule-2.0.so.0
-libgthread-2.0.so.0
-librt.so.1
-libglib-2.0.so.0
-libc.so.6
+libICE.so.6
+libSM.so.6
+libnssutil3.so
 libsoup-gnome-2.4.so.1
 libcanberra-gtk3.so.0
 libcanberra.so.0
-libSM.so.6
-libICE.so.6
-libnssutil3.so
-libmx-1.0.so.2
-libclutter-gtk-1.0.so.0
-libcogl-pango.so.0
-libjson-glib-1.0.so.0
-libXi.so.6
-libdrm.so.2
-libX11.so.6
-libXext.so.6
-libXdamage.so.1
-libXcomposite.so.1
-libXfixes.so.3
-libgdata.so.13
-libgweather-3.so.0
-libgstreamer-0.10.so.0
+libresolv.so.2
+libnotify.so.4
 libldap-2.4.so.2
 liblber-2.4.so.2
-libresolv.so.2
 libnsl.so.1
+libgdata.so.13
+libgthread-2.0.so.0
+liboauth.so.0
+libgcr-base-3.so.1
 libgoa-1.0.so.0
-libdbus-glib-1.so.2
-libdbus-1.so.3
-libclutter-1.0.so.0
-libcogl.so.9
-libcamel-1.2.so.33
-libecal-1.2.so.11
-libebook-1.2.so.13
-libedataserver-1.2.so.16
-libebackend-1.2.so.2
+libgck-1.so.0
+libp11-kit.so.0
+libgweather-3.so.1
+libgstreamer-1.0.so.0
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@ -1,51 +1,33 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.4.4
+version=3.6.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-pst-import --with-clutter --with-openldap
--with-krb5=/usr --disable-schemas-install --disable-scrollkeeper
--disable-static --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
-makedepends="which pkg-config intltool gnome-doc-utils evolution-data-server-devel
-gtk+3-devel libical-devel GConf-devel mx-devel clutter-gtk-devel libcanberra-devel
-gtkhtml-devel nss-devel clutter-devel json-glib-devel libXfixes-devel enchant-devel
-sqlite-devel libsoup-devel libxml2-devel gnome-desktop-devel libldap-devel
-libsoup-gnome-devel libnotify-devel gnome-online-accounts-devel libgdata-devel
-gstreamer-devel libgweather-devel mit-krb5-devel NetworkManager-devel"
+configure_args="--disable-pst-import --with-openldap
+--with-krb5=/usr --disable-schemas-compile --disable-static"
+makedepends="which pkg-config intltool gnome-doc-utils libgdata-devel>=0.13
+gtk+3-devel>=3.6.0_2 webkit-gtk3-devel evolution-data-server-devel>=3.6.0
+libical-devel GConf-devel mx-devel clutter-gtk-devel>=1.3.2 libcanberra-devel
+gtkhtml-devel>=4.6.0 nss-devel clutter-devel>=1.12 json-glib-devel libXfixes-devel
+sqlite-devel libsoup-devel libxml2-devel gnome-desktop-devel>=3.6.0 libldap-devel
+libsoup-gnome-devel libnotify-devel gnome-online-accounts-devel>=3.6.0
+gstreamer1-devel libgweather-devel>=3.6.0 mit-krb5-devel NetworkManager-devel
+gsettings-desktop-schemas-devel>=3.6.0 enchant-devel itstool psmisc"
 depends="hicolor-icon-theme desktop-file-utils"
-fulldepends="gsettings-desktop-schemas iso-codes"
+fulldepends="gsettings-desktop-schemas>=3.6.0 iso-codes"
 short_desc="Integrated mail, addressbook and calendaring"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
 homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
-checksum=7e541d0894c1d48b89820b6466edafe40215f8cdb45b1c0e9635cc15f49ecb9a
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=6163ef56a22ca7c605a89d774851c9988d7840a4dc5c73c546308e5380cfe7b4
 long_desc="
 Evolution provides integrated mail, addressbook and calendaring functionality
 to users of the GNOME desktop."

-gconf_schemas="
-apps-evolution-attachment-reminder.schemas
-apps-evolution-mail-notification.schemas
-apps-evolution-mail-prompts-checkdefault.schemas
-apps-evolution-template-placeholders.schemas
-apps_evolution_addressbook.schemas
-apps_evolution_calendar.schemas
-apps_evolution_email_custom_header.schemas
-apps_evolution_eplugin_face.schemas
-apps_evolution_shell.schemas
-evolution-bogofilter.schemas
-evolution-mail.schemas
-evolution-spamassassin.schemas"
-
 gtk_iconcache_dirs="/usr/share/icons/hicolor"

 post_install() {
-	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
-	for f in ${gconf_schemas}; do
-		gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${f} \
-			--domain ${pkgname}-3.2 ${wrksrc}/${f}
-	done
 	# Remove devel stuff, not interested.
 	rm -rf ${DESTDIR}/usr/include
 	rm -rf ${DESTDIR}/usr/lib/pkgconfig
--- a/srcpkgs/farstream/farstream-devel.template
+++ b/srcpkgs/farstream/farstream-devel.template
@ -1,14 +1,12 @@
 # Template file for 'farstream-devel'.
 #
-depends="gst-plugins-base-devel farstream>=0.1.2"
+depends="gst-plugins-base1-devel farstream>=${version}"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}

 This package contains files for development, headers, static libs, etc."

 replaces="farsight2-devel>=0"
-
-
 noarch=yes

 do_install() {
--- a/srcpkgs/farstream/farstream.rshlibs
+++ b/srcpkgs/farstream/farstream.rshlibs
@ -1,19 +1,19 @@
-libgstbase-0.10.so.0
-libgstreamer-0.10.so.0
+libgstbase-1.0.so.0
+libgstreamer-1.0.so.0
 libgobject-2.0.so.0
 libgmodule-2.0.so.0
 libgthread-2.0.so.0
 librt.so.1
-libxml2.so.2
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
-libgstrtp-0.10.so.0
+libgstrtp-1.0.so.0
 libm.so.6
 libnice.so.10
-libgupnp-igd-1.0.so.3
+libgio-2.0.so.0
+libgupnp-igd-1.0.so.4
 libgupnp-1.0.so.4
 libgssdp-1.0.so.3
+libxml2.so.2
 libsoup-2.4.so.1
-libgio-2.0.so.0
-libgstnetbuffer-0.10.so.0
+libgstnet-1.0.so.0
--- a/srcpkgs/farstream/template
+++ b/srcpkgs/farstream/template
@ -1,17 +1,19 @@
 # Template file for 'farstream'
 pkgname=farstream
-version=0.1.2
-homepage="http://www.freedesktop.org/wiki/Software/Farstream"
-distfiles="http://freedesktop.org/software/farstream/releases/$pkgname/$pkgname-$version.tar.gz"
+version=0.2.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valgrind --disable-debug --disable-static"
-depends="gst-python pygobject2 pygtk gst-plugins-good gst-plugins-bad"
-makedepends="pkg-config intltool libnice-devel gst-plugins-base-devel python-devel gst-python-devel pygobject2-devel gupnp-devel gobject-introspection"
-revision=1
+depends="gst-python pygobject2 pygtk gst-plugins-good1 gst-plugins-bad1"
+makedepends="pkg-config intltool gupnp-igd-devel>=0.2.0 libnice-devel>=0.1.3
+gst-plugins-base1-devel python-devel gst-python-devel pygobject2-devel
+gobject-introspection"
 short_desc="GStreamer modules and libraries for videoconferencing"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
-checksum=fa5a40597b47b59d124f7fd57f66704b030d576cdc0d90e107c7a592f05e73d9
+homepage="http://www.freedesktop.org/wiki/Software/Farstream"
+distfiles="http://freedesktop.org/software/farstream/releases/$pkgname/$pkgname-$version.tar.gz"
+checksum=5b9d97056ecf43d6dafade7cbe959c2a4e412eb75a3104911586f40f5f0378c9
 long_desc="
 The Farsight project is an effort to create a framework to deal with all
 known audio/video conferencing protocols. On one side it offers a generic API
@ -20,5 +22,3 @@ long_desc="

 replaces="farsight2>=0"
 subpackages="$pkgname-devel"
-
-
--- a/srcpkgs/file-roller/file-roller.rshlibs
+++ b/srcpkgs/file-roller/file-roller.rshlibs
@ -3,11 +3,14 @@ libpthread.so.0
 libc.so.6
 libgtk-3.so.0
 libgdk-3.so.0
-libgio-2.0.so.0
-libgdk_pixbuf-2.0.so.0
-libcairo.so.2
 libpango-1.0.so.0
+libcairo.so.2
+libjson-glib-1.0.so.0
+libnotify.so.4
+libgdk_pixbuf-2.0.so.0
+libgio-2.0.so.0
 libgobject-2.0.so.0
+libarchive.so.12
 libmagic.so.1
 libm.so.6
 libnautilus-extension.so.1
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@ -1,18 +1,19 @@
 # Template file for 'file-roller'
 pkgname=file-roller
-version=3.4.2
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
-build_style=gnu-configure
-configure_args="--disable-scrollkeeper --enable-magic
--disable-schemas-compile --disable-static"
-depends="desktop-file-utils hicolor-icon-theme"
-makedepends="which pkg-config intltool gnome-doc-utils file-devel nautilus-devel"
+version=3.6.0
 revision=1
+build_style=gnu-configure
+configure_args="--disable-schemas-compile --enable-magic --disable-static"
+depends="desktop-file-utils hicolor-icon-theme"
+makedepends="which pkg-config intltool gnome-doc-utils file-devel
+nautilus-devel>=3.6.0 json-glib-devel itstool libnotify-devel
+libarchive-devel"
 short_desc="GNOME Front-end to archiving programs like tar and zip"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
-checksum=7085a351c55171718bbf5b9b614a7b9606efb8cbd2eb44cc6c538545444d0cdd
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=01771788c673b2db323fae1eee766ceb3342d815a4f2cba839b662c2ea56918d
 long_desc="
 File Roller is an archive manager for the GNOME environment. This means
 that you can:
@ -36,6 +37,3 @@ long_desc="
  - unace: extraction tool for the proprietary ace archive format"

 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-
-
-
--- a/srcpkgs/folks/folks-devel.template
+++ b/srcpkgs/folks/folks-devel.template
@ -1,12 +1,12 @@
 # Template file for 'folks-devel'.
 #
-depends="telepathy-glib-devel libgee-devel>=0.6.2.1_1 libsocialweb-devel evolution-data-server-devel folks>=0.6.9"
+depends="telepathy-glib-devel>=0.19.9 libgee-devel>=0.6.2.1_1 libsocialweb-devel
+evolution-data-server-devel>=3.6.0 folks>=${version}"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}

 This package contains files for development, headers, static libs, etc."

-
 noarch=yes

 do_install() {
--- a/srcpkgs/folks/folks.rshlibs
+++ b/srcpkgs/folks/folks.rshlibs
@ -1,19 +1,29 @@
 libgio-2.0.so.0
 libgmodule-2.0.so.0
-libgconf-2.so.4
+librt.so.1
 libgee.so.2
 libgobject-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
 libtelepathy-glib.so.0
+libzeitgeist-1.0.so.1
 libsocialweb-client.so.2
 libdbus-glib-1.so.2
 libdbus-1.so.3
+libtracker-sparql-0.14.so.0
+libebook-1.2.so.14
+libedataserver-1.2.so.17
+libcamel-1.2.so.40
+libdl.so.2
+libplc4.so
+libplds4.so
+libnspr4.so
+libssl3.so
+libsmime3.so
+libnss3.so
+libgnome-keyring.so.0
 libsoup-2.4.so.1
+libsqlite3.so.0
 libxml2.so.2
 libreadline.so.6
-libtracker-sparql-0.14.so.0
-libebook-1.2.so.13
-libedataserver-1.2.so.16
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@ -1,16 +1,21 @@
 # Template file for 'folks'
 pkgname=folks
-version=0.6.9
-homepage="http://telepathy.freedesktop.org/wiki/Folks"
-distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.xz"
-build_style=gnu-configure
-configure_args="--enable-vala --enable-tracker-backend"
-makedepends="pkg-config intltool which gobject-introspection vala-devel dbus-glib-devel telepathy-glib-devel libgee-devel>=0.6.2.1_1 libsocialweb-devel evolution-data-server-devel tracker-devel"
+version=0.7.4.1
 revision=1
+build_style=gnu-configure
+subpackages="$pkgname-devel"
+configure_args="--enable-vala --enable-tracker-backend"
+depends="zeitgeist"
+makedepends="pkg-config intltool which gobject-introspection vala-devel
+dbus-glib-devel telepathy-glib-devel>=0.19.9 libgee-devel>=0.6.2.1_1
+libsocialweb-devel evolution-data-server-devel>=3.6.0 tracker-devel
+libzeitgeist-devel"
 short_desc="GObject Library to aggregate people into metacontacts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
-checksum=cb14657f581e3d4b50884ac099ab13c7f9949c99f95806d1b8ad865345d26540
+homepage="http://telepathy.freedesktop.org/wiki/Folks"
+distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.xz"
+checksum=424ca5ef0bebc12666465fe4ee557d374f4694348109443efe7832be949679d3
 long_desc="
 libfolks is a library that aggregates people from multiple sources (eg,
 Telepathy connection managers and eventually evolution data server, Facebook,
@ -18,9 +23,3 @@ long_desc="
 The initial goal is for GObject/C support, though the Vala bindings should
 basically automatic."

-subpackages="$pkgname-devel"
-
-
-pre_configure() {
-	sed -i "s|\(TRACKER_SPARQL_MAJOR=\)0.12|\10.14|" configure
-}
--- a/srcpkgs/gcalctool/template
+++ b/srcpkgs/gcalctool/template
@ -1,18 +1,17 @@
 # Template file for 'gcalctool'
 pkgname=gcalctool
-version=6.4.2.1
-distfiles="${GNOME_SITE}/$pkgname/6.4/$pkgname-$version.tar.xz"
+version=6.6.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
 depends="dconf desktop-file-utils"
-makedepends="pkg-config intltool gnome-doc-utils itstool flex gtk+3-devel libxml2-devel"
-revision=1
+makedepends="pkg-config intltool gnome-doc-utils itstool flex
+gtk+3-devel>=3.6.0_2 libxml2-devel"
 short_desc="GNOME Scientific calculator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/Gcalctool"
 license="GPL-2"
-checksum=d79f7272534fc33357acc4438fe7746fa125fb05c45dfdb468a193b7490ca1f8
+distfiles="${GNOME_SITE}/$pkgname/6.6/$pkgname-$version.tar.xz"
+checksum=0d2e0729be42e3ee06ea7d02fa6a00446df6e4de601745bcbbef53a027f9542e
 long_desc="
 The package contains the GNOME scientific calculator."
-
-
--- a/srcpkgs/gcr/gcr-devel.template
+++ b/srcpkgs/gcr/gcr-devel.template
@ -1,14 +1,12 @@
 # Template file for 'gcr-devel'.
 #
-depends="glib-devel p11-kit-devel gtk+3-devel gcr>=3.4.1"
+depends="glib-devel p11-kit-devel gtk+3-devel gcr>=${version}"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}

 This package contains files for development, headers, static libs, etc."

 replaces="gnome-keyring-devel<3.3.92"
-
-
 noarch=yes

 do_install() {
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@ -1,19 +1,20 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.4.1
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
+version=3.6.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-debug --disable-update-mime
 --disable-update-icon-cache --disable-schemas-compile"
 depends="hicolor-icon-theme desktop-file-utils"
-makedepends="which pkg-config intltool gnome-doc-utils gobject-introspection gtk+3-devel p11-kit-devel libgcrypt-devel libtasn1-tools"
+makedepends="which pkg-config intltool gnome-doc-utils gobject-introspection
+gtk+3-devel>=3.6.0_2 p11-kit-devel libgcrypt-devel libtasn1-tools"
 fulldepends="gnupg"
-revision=2
 short_desc="GNOME crypto package"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
-checksum=a0812b6e9623465b0053f4b1b09f3b9316317b2c6ed69a73bc2c5b3b6b849609
+homepage="http://www.gnome.org"
+distfiles="${GNOME_SITE}/gcr/3.6/gcr-${version}.tar.xz"
+checksum=b84e0779cf8977953e9fdfea294bfa377522ca745f75abccf8d2a2909207c090
 long_desc="
 GCR is a library for displaying certificates, and crypto UI, accessing
 key stores. It also provides the viewer for crypto files on the GNOME
@ -24,6 +25,4 @@ long_desc="

 replaces="gnome-keyring<3.3.92"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="$pkgname-devel"
-
-
+subpackages="gcr-devel"
--- a/srcpkgs/gdm/INSTALL
+++ b/srcpkgs/gdm/INSTALL
@ -3,7 +3,48 @@
 #
 case "${ACTION}" in
 post)
-	chown gdm:gdm var/lib/gdm > /dev/null
+	if [ ! -d var/gdm ]; then
+		mkdir -p var/gdm
+	fi
+	chmod 1770 var/gdm
+	chown root:gdm var/gdm
+
+	if [ ! -d var/lib/gdm/greeter ]; then
+		mkdir -p var/lib/gdm/greeter
+	fi
+	chmod 0755 var/lib/gdm/greeter
+	chown gdm:gdm var/lib/gdm/greeter
+
+	if [ ! -d var/lib/gdm/.config ]; then
+		mkdir -p var/lib/gdm/.config
+	fi
+	chmod 1755 var/lib/gdm/.config
+	chown gdm:gdm var/lib/gdm/.config
+
+	if [ ! -d var/lib/gdm/.config/dconf ]; then
+		mkdir -p var/lib/gdm/.config/dconf
+	fi
+	chmod 0755 var/lib/gdm/.config/dconf
+	chown gdm:gdm var/lib/gdm/.config/dconf
+
+	if [ ! -d var/lib/gdm/.local/share/applications ]; then
+		mkdir -p var/lib/gdm/.local/share/applications
+	fi
+	chmod 0755 var/lib/gdm/.local/share/applications
+	chown gdm:gdm var/lib/gdm/.local/share/applications
+
+	if [ ! -d var/cache/gdm ]; then
+		mkdir -p var/cache/gdm
+	fi
+	chmod 1755 var/cache/gdm
+	chown root:gdm var/cache/gdm
+
+	if [ ! -d var/log/gdm ]; then
+		mkdir -p var/log/gdm
+	fi
+	chmod 1770 var/log/gdm
+	chown gdm:gdm var/log/gdm
+
 	dconf update
 	;;
 esac
--- a/srcpkgs/gdm/REMOVE
+++ b/srcpkgs/gdm/REMOVE
@ -6,5 +6,6 @@ purge)
 	[ -d var/cache/gdm ] && rm -rf var/cache/gdm
 	[ -d var/lib/gdm ] && rm -rf var/lib/gdm
 	[ -d var/log/gdm ] && rm -rf var/log/gdm
+	[ -d var/gdm ] && rm -rf var/gdm
 	;;
 esac
--- a/srcpkgs/gdm/files/gdm-launch-environment.pam
+++ b/srcpkgs/gdm/files/gdm-launch-environment.pam
--- a/srcpkgs/gdm/files/gdm.service
+++ b/srcpkgs/gdm/files/gdm.service
@ -1,10 +0,0 @@
-[Unit]
-Description=Gnome Display Manager
-Conflicts=getty@tty1.service
-After=systemd-user-sessions.service getty@tty1.service
-
-[Service]
-ExecStart=/usr/sbin/gdm -nodaemon
-
-[Install]
-Alias=display-manager.service
--- a/srcpkgs/gdm/gdm-devel.template
+++ b/srcpkgs/gdm/gdm-devel.template
@ -1,5 +1,6 @@
 # Template file for 'gdm-devel'.
 #
+depends="libgdm>=${version}"
 short_desc="${sourcepkg} (development files)"
 long_desc="${long_desc}

--- a/srcpkgs/gdm/gdm.rshlibs
+++ b/srcpkgs/gdm/gdm.rshlibs
@ -5,9 +5,6 @@ libpthread.so.0
 libc.so.6
 libX11.so.6
 libXrandr.so.2
-libdbus-glib-1.so.2
-libdbus-1.so.3
-libxklavier.so.16
 libgobject-2.0.so.0
 libXau.so.6
 libpam.so.0
@ -27,6 +24,6 @@ libXdmcp.so.6
 libatk-1.0.so.0
 libpangocairo-1.0.so.0
 libcairo-gobject.so.2
-libfontconfig.so.1
 libcanberra-gtk3.so.0
 libcanberra.so.0
+libgdm.so.1
--- a/srcpkgs/gdm/libgdm.rshlibs
+++ b/srcpkgs/gdm/libgdm.rshlibs
@ -0,0 +1,15 @@
+libgio-2.0.so.0
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libsystemd-login.so.0
+libsystemd-daemon.so.0
+libpthread.so.0
+libc.so.6
+libgtk-3.so.0
+libgdk-3.so.0
+libatk-1.0.so.0
+libpangocairo-1.0.so.0
+libgdk_pixbuf-2.0.so.0
+libcairo-gobject.so.2
+libpango-1.0.so.0
+libcairo.so.2
--- a/srcpkgs/gdm/libgdm.template
+++ b/srcpkgs/gdm/libgdm.template
@ -0,0 +1,10 @@
+# Template file for 'libgdm'.
+#
+short_desc="${sourcepkg} runtime libraries"
+long_desc="${long_desc}
+
+ This package contains the runtime libraries."
+
+do_install() {
+	vmove "usr/lib/*.so*" usr/lib
+}
--- a/srcpkgs/gdm/patches/gdm-vt-allocation-hack.patch
+++ b/srcpkgs/gdm/patches/gdm-vt-allocation-hack.patch
@ -1,118 +0,0 @@
-diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
-index 39def47..03488fd 100644
--- daemon/gdm-server.c
-+++ daemon/gdm-server.c
-@@ -33,6 +33,8 @@
- #include <grp.h>
- #include <signal.h>
- #include <sys/resource.h>
-+#include <sys/ioctl.h>
-+#include <sys/vt.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
-         return out;
- }
- 
-+#ifndef O_NOCTTY
-+# define O_NOCTTY 0
-+#endif
-+
-+static int
-+open_vt (int vtno)
-+{
-+	char *vtname;
-+	int fd;
-+
-+	vtname = g_strdup_printf ("/dev/tty%d", vtno);
-+
-+	do {
-+		errno = 0;
-+		fd = open (vtname, O_RDWR | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	g_free (vtname);
-+	return fd;
-+}
-+
-+static gint
-+find_first_probably_free_vt (void)
-+{
-+	int fd, fdv;
-+	int vtno;
-+	unsigned short vtmask;
-+	struct vt_stat vtstat;
-+	guint v_state;
-+
-+	fdv = -1;
-+
-+	do {
-+		errno = 0;
-+		fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	if (fd >= 0) {
-+		if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) {
-+			v_state = vtstat.v_state;
-+		} else {
-+			close (fd);
-+			v_state = 0;
-+			fd = -1;
-+		}
-+	} else {
-+		v_state = 0;
-+	}
-+
-+	if (fd < 0) {
-+		do {
-+			errno = 0;
-+			fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0);
-+		} while (errno == EINTR);
-+
-+		if (fd >= 0) {
-+			if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0)
-+				v_state = vtstat.v_state;
-+		}
-+	}
-+
-+	for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) {
-+		/* Is this console in use? */
-+		if (v_state & vtmask)
-+			continue;
-+
-+		/* No, try to open it */
-+		fdv = open_vt (vtno);
-+		if (fdv >= 0)
-+			break;
-+
-+		/* If we're here, kernel indicated that the console was free,
-+		 * but we failed to open it. Just go on to higher VTs. */
-+	}
-+
-+        if (fdv >= 0)
-+                close (fdv);
-+        else
-+		vtno = -1;
-+
-+	if (fd >= 0)
-+		close (fd);
-+
-+	return vtno;
-+}
-+
- char *
- gdm_server_get_display_device (GdmServer *server)
- {
-@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer  *server,
- 
-         if (vtarg != NULL && ! gotvtarg) {
-                 argv[len++] = g_strdup (vtarg);
-+        } else if (!query_in_arglist && !gotvtarg) {
-+                gint vtnum = find_first_probably_free_vt ();
-+
-+                if (vtnum > 0)
-+                        argv [len++] = g_strdup_printf ("vt%d", vtnum);
-         }
- 
-         argv[len++] = NULL;
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@ -1,26 +1,24 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=3.4.1
-revision=8
+version=3.6.0
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile --disable-scrollkeeper
+configure_args="--disable-schemas-compile --disable-static
 --with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers
--disable-static --with-systemd  --with-screenshot-dir=/var/lib/gdm/greeter
--with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid"
+--with-systemd  --with-screenshot-dir=/var/lib/gdm/greeter
+--with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid
+--with-systemdsystemunitdir=/usr/lib/systemd/system"
 makedepends="pkg-config intltool which gnome-doc-utils gobject-introspection
-pam-devel nss-devel accountsservice-devel gtk+3-devel upower-devel systemd-devel
-libcanberra-devel libXrandr-devel libxklavier-devel at-spi2-core-devel
-dbus-glib-devel"
-fulldepends="xrdb dconf hicolor-icon-theme polkit-gnome xorg-server metacity
-gnome-session gnome-settings-daemon dbus-x11"
-subpackages="gdm-devel"
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
+pam-devel nss-devel accountsservice-devel gtk+3-devel>=3.6.0_2 upower-devel
+libcanberra-devel libXrandr-devel systemd-devel at-spi2-core-devel itstool"
+fulldepends="xrdb dconf>=0.13.90 hicolor-icon-theme polkit-gnome xorg-server
+metacity gnome-session>=3.6.0 gnome-settings-daemon>=3.6.0 dbus-x11"
 short_desc="GNOME Display Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
-checksum=6292968dff5fc89877b5e1aaa3c7d1484dd3ed2d4f388e935841d053439be665
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=ea63736fc8f7234aca442f4e99b3ba9cc29dce5e464ed93f7bf7eb8c49abd60b
 long_desc="
 GDM is the GNOME Display Manager, it is the little proggie that runs
 in the background, runs your X sessions, presents you with a login box
@ -35,6 +33,9 @@ long_desc="
 xdmcp a little bit in places where I thought xdm was lacking (but is
 still compatible with xdm's xdmcp)."

+subpackages="libgdm gdm-devel"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+
 conf_files="
 /etc/gdm/custom.conf
 /etc/pam.d/gdm
@ -44,14 +45,6 @@ conf_files="
 /etc/pam.d/gdm-smartcard
 /etc/pam.d/gdm-welcome"

-# Required runtime directories.
-make_dirs="
-/var/cache/gdm  			1755 root gdm
-/var/log/gdm 				1755 root gdm
-/var/lib/gdm/.config/dconf		0755 gdm gdm
-/var/lib/gdm/.local/share/applications	0755 gdm gdm
-"
-
 # Create the 'gdm' system user/group.
 system_accounts="gdm"
 gdm_homedir="/var/lib/gdm"
@ -60,12 +53,10 @@ systemd_services="gdm.service off"
 post_install() {
 	# Use our own pam files.
 	rm -f ${DESTDIR}/etc/pam.d/*
-	for f in gdm gdm-autologin gdm-fingerprint gdm-password gdm-smartcard \
-		gdm-welcome; do
-		vinstall ${FILESDIR}/${f}.pam 644 etc/pam.d ${f}
+	for f in ${FILESDIR}/*.pam; do
+		vinstall ${f} 644 etc/pam.d ${f%.pam}
 	done
 	# Install systemd service.
-	vinstall ${FILESDIR}/gdm.service 644 usr/lib/systemd/system
 	vinstall ${FILESDIR}/gdm.tmpfiles.d 644 usr/lib/tmpfiles.d gdm.conf

 	chmod 1770 ${DESTDIR}/var/log/gdm
--- a/srcpkgs/gedit/gedit.rshlibs
+++ b/srcpkgs/gedit/gedit.rshlibs
@ -1,3 +1,4 @@
+libzeitgeist-1.0.so.1
 libm.so.6
 libc.so.6
 libxml2.so.2
@ -13,12 +14,10 @@ libcairo-gobject.so.2
 libcairo.so.2
 libpango-1.0.so.0
 libgirepository-1.0.so.1
-libffi.so.5
 libX11.so.6
 libgio-2.0.so.0
 libgobject-2.0.so.0
 libgmodule-2.0.so.0
-libgthread-2.0.so.0
 librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@ -1,21 +1,25 @@
 # Template file for 'gedit'
 pkgname=gedit
-version=3.4.2
+version=3.6.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-updater --enable-python"
 depends="pygobject hicolor-icon-theme desktop-file-utils"
-makedepends="pkg-config intltool itstool gnome-doc-utils gtksourceview-devel libpeas-devel enchant-devel pygobject-devel"
-fulldepends="gsettings-desktop-schemas iso-codes"
-pycompile_module="gi/overrides"
-pycompile_dirs="usr/lib/gedit/plugins"
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
+makedepends="pkg-config intltool itstool gnome-doc-utils
+gtksourceview-devel>=3.6.0 libpeas-devel>=1.6.0 enchant-devel
+pygobject-devel gsettings-desktop-schemas-devel>=3.6.0
+libzeitgeist-devel"
+fulldepends="gsettings-desktop-schemas>=3.6.0 iso-codes"
 subpackages="gedit-devel"
-revision=2
 short_desc="A text editor for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
-distfiles="${GNOME_SITE}/gedit/3.4/gedit-$version.tar.xz"
-checksum=4bd81156de3da433d93eaf3df9cae4aa28356c2bda23fd88ca68ba6e184a9e6d
+distfiles="${GNOME_SITE}/gedit/3.6/gedit-$version.tar.xz"
+checksum=2043aaa61708222f476dd1c83e43bd17c67a341b30a4baa6466a60bbfb6d9471
 long_desc="
 The GNOME Editor."
+
+pycompile_module="gi/overrides"
+pycompile_dirs="usr/lib/gedit/plugins"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
--- a/srcpkgs/gjs/gjs-devel.template
+++ b/srcpkgs/gjs/gjs-devel.template
@ -1,12 +1,12 @@
 # Template file for 'gjs-devel'.
 #
-depends="libffi-devel libgirepository-devel dbus-glib-devel cairo-devel readline-devel js-devel gjs>=1.32.0"
+depends="libffi-devel libgirepository-devel dbus-glib-devel cairo-devel
+readline-devel js-devel gjs>=${version}"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}

 This package contains files for development, headers, static libs, etc."

-
 noarch=yes

 do_install() {
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@ -1,19 +1,19 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.32.0
-homepage="http://live.gnome.org/Gjs"
-distfiles="${GNOME_SITE}/$pkgname/1.32/$pkgname-$version.tar.xz"
-build_style=gnu-configure
-makedepends="pkg-config intltool libffi-devel libgirepository-devel dbus-glib-devel cairo-devel readline-devel js-devel gobject-introspection"
+version=1.34.0
 revision=1
+build_style=gnu-configure
+makedepends="pkg-config intltool libffi-devel libgirepository-devel
+dbus-glib-devel cairo-devel readline-devel js-devel gobject-introspection"
 short_desc="Mozilla-based javascript bindings for the GNOME platform"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MPL-1.1, LGPL-2.1, GPL-2"
-checksum=b9f1dc156c15806824c936bb08ddc5048f52f6921654146c47025a62457108c0
+homepage="http://live.gnome.org/Gjs"
+distfiles="${GNOME_SITE}/$pkgname/1.34/$pkgname-$version.tar.xz"
+checksum=3d62c717a0522a36c6faa1eb021872255e3cd285a72786afe23b7cca2e3084cb
 long_desc="
 Makes it possible for applications to use all of GNOME's platform libraries
 using the Javascript language. It's mainly based on the Mozilla javascript
 engine and the GObject introsepection framework."

 subpackages="gjs-devel"
-
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@ -1,18 +1,19 @@
 # Template file for 'glib-networking'
 pkgname=glib-networking
-version=2.32.3
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.xz"
+version=2.34.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-libproxy --with-gnome-proxy
 --with-gnutls --with-pkcs11
 --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
-makedepends="pkg-config intltool glib-devel libproxy-devel libgpg-error-devel libgcrypt-devel gnutls-devel p11-kit-devel"
-fulldepends="ca-certificates gsettings-desktop-schemas"
-revision=1
+makedepends="pkg-config intltool glib-devel libproxy-devel
+libgpg-error-devel libgcrypt-devel gnutls-devel p11-kit-devel
+gsettings-desktop-schemas-devel>=3.6.0"
+depends="gsettings-desktop-schemas>=3.6.0"
+fulldepends="ca-certificates"
 short_desc="Network-related giomodules for glib"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=39fe23e86a57bb7a8a67c65668394ad0fbe2d43960c1f9d68311d5d13ef1e5cf
+distfiles="${GNOME_SITE}/$pkgname/2.34/$pkgname-$version.tar.xz"
+checksum=c56eb4161671bff9568f3a92a88531ca01217eb7ee8514bb6255730400f877f1
 long_desc="
 This package contains GLib's GIO modules for networking."
-
-
--- a/srcpkgs/gnome-applets/gnome-applets.rshlibs
+++ b/srcpkgs/gnome-applets/gnome-applets.rshlibs
@ -19,8 +19,7 @@ libgtop-2.0.so.7
 libnotify.so.4
 libdbus-glib-1.so.2
 libdbus-1.so.3
-libgweather-3.so.0
+libgweather-3.so.1
 libpangocairo-1.0.so.0
 libcpufreq.so.0
-libpthread.so.0
 libpolkit-gobject-1.so.0
--- a/srcpkgs/gnome-applets/template
+++ b/srcpkgs/gnome-applets/template
@ -1,28 +1,30 @@
 # Template file for 'gnome-applets'
 pkgname=gnome-applets
-version=3.4.1
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
+version=3.5.92
+revision=1
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper --disable-schemas-install
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas --without-hal"
 depends="hicolor-icon-theme desktop-file-utils pygtk"
-makedepends="which pkg-config intltool itstool gnome-doc-utils gtk+3-devel GConf-devel gnome-panel-devel libgtop-devel libwnck-devel gnome-settings-daemon-devel polkit-devel gucharmap-devel pygtk-devel libxml2-devel dbus-glib-devel libgweather-devel NetworkManager-devel libcpufreq-devel libnotify-devel"
-fulldepends="gsettings-desktop-schemas gnome-icon-theme"
-revision=1
+makedepends="which pkg-config intltool itstool gnome-doc-utils
+gtk+3-devel>=3.6.0_2 GConf-devel gnome-panel-devel>=3.6.0 libgtop-devel
+libwnck-devel gnome-settings-daemon-devel>=3.6.0 polkit-devel
+gucharmap-devel pygtk-devel libxml2-devel dbus-glib-devel
+libgweather-devel>=3.6.0 NetworkManager-devel libcpufreq-devel
+libnotify-devel gsettings-desktop-schemas-devel>=3.6.0"
+fulldepends="gsettings-desktop-schemas>=3.6.0 gnome-icon-theme"
 short_desc="GNOME panel applets"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
-checksum=ec5487eb81fb29851b6336de94a329f5623e73830d61022e0e20fe3d038a415e
+distfiles="${GNOME_SITE}/$pkgname/3.5/$pkgname-$version.tar.xz"
+checksum=f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83
 long_desc="
- This package contains a few $short_desc."
+ This package contains $short_desc."

 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 gconf_schemas="${pkgname}.schemas"

-
-
-
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@ -1,17 +1,16 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=3.4.2
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
+version=3.6.0
+revision=1
+noarch=yes
 build_style=gnu-configure
 makedepends="pkg-config intltool"
-revision=1
 short_desc="Set of background images for the GNOME Desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
-checksum=d5e6e6e205f83222c739274851e52691caa1cf383784195e196f343436cf1ae8
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=006c8e0dc7c5b223dac4243291886d6106faae95cb620700dc211e668d6a70ed
 long_desc="
 This package provides a set of background images ready to be used within the
 GNOME Desktop."
-
-noarch=yes
--- a/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template
+++ b/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template
@ -1,7 +1,7 @@
 # Template file for 'gnome-bluetooth-devel'.
 #
 noarch=yes
-depends="gtk+3-devel glib-devel gnome-bluetooth>=${version}"
+depends="glib-devel gtk+3-devel gnome-bluetooth>=${version}"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}

--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@ -1,20 +1,20 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.4.2
-revision=2
+version=3.6.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-desktop-update --disable-schemas-compile --disable-icon-update"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
-depends="dconf bluez gvfs obexd-client hicolor-icon-theme desktop-file-utils"
-makedepends="which pkg-config intltool gnome-doc-utils gobject-introspection
-libXi-devel gtk+3-devel libnotify-devel nautilus-sendto-devel"
+depends="dconf bluez gvfs obexd-client>=0.47 hicolor-icon-theme desktop-file-utils"
+makedepends="which pkg-config intltool itstool gnome-doc-utils gobject-introspection
+libXi-devel gtk+3-devel>=3.6.0_2 libnotify-devel nautilus-sendto-devel>=3.6.0"
 short_desc="The GNOME Bluetooth Subsystem"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/GnomeBluetooth"
 license="GPL, LGPL"
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
-checksum=c58480f1687aca048444d5e4dbd306594d0785c8e6e74f99fa0b13e57fdad4de
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=021d9711d76e6d195812b1804ff39b5936ce978c25f900bc92e4bffd7045d306
 long_desc="
 This package contains tools for managing and manipulating Bluetooth devices
 using the GNOME desktop.
--- a/srcpkgs/gnome-color-manager/gnome-color-manager.rshlibs
+++ b/srcpkgs/gnome-color-manager/gnome-color-manager.rshlibs
@ -1,26 +1,27 @@
+liblcms2.so.2
+libcolord.so.1
 libgtk-3.so.0
 libgdk-3.so.0
 libgio-2.0.so.0
-liblcms2.so.2
-libcolord.so.1
 libgobject-2.0.so.0
 libglib-2.0.so.0
 libm.so.6
 libpthread.so.0
 libc.so.6
 libclutter-gtk-1.0.so.0
-libcairo.so.2
-libgdk_pixbuf-2.0.so.0
+libmash-0.2.so.0
+libclutter-1.0.so.0
 libpango-1.0.so.0
+libcairo.so.2
+libcogl.so.11
+libgdk_pixbuf-2.0.so.0
 libcanberra-gtk3.so.0
 libcanberra.so.0
+libcolord-gtk.so.1
 libexif.so.12
 libtiff.so.5
 libvte2_90.so.9
+libgnome-desktop-3.so.4
 libexiv2.so.11
 libstdc++.so.6
 libgcc_s.so.1
-libclutter-1.0.so.0
-libcogl.so.9
-libgnome-desktop-3.so.2
-libmash-0.2.so.0
--- a/srcpkgs/gnome-color-manager/template
+++ b/srcpkgs/gnome-color-manager/template
@ -1,19 +1,21 @@
 # Template file for 'gnome-color-manager'
 pkgname=gnome-color-manager
-version=3.4.2
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
+version=3.6.0
+revision=1
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper --disable-schemas-compile
+configure_args="--disable-schemas-compile
 --enable-clutter --enable-packagekit --enable-exiv"
 depends="desktop-file-utils hicolor-icon-theme"
-makedepends="pkg-config intltool gnome-doc-utils libcanberra-devel vte3-devel exiv2-devel clutter-gtk-devel mash-devel gnome-desktop-devel libXrandr-devel lcms2-devel colord-devel libexif-devel"
+makedepends="pkg-config intltool itstool gnome-doc-utils libcanberra-devel
+exiv2-devel clutter-gtk-devel>=1.3.2 mash-devel gnome-desktop-devel>=3.6.0
+libXrandr-devel lcms2-devel libexif-devel vte3-devel colord-gtk-devel"
 fulldepends="shared-color-profiles shared-color-targets"
-revision=1
 short_desc="Color profile manager for the GNOME desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://projects.gnome.org/gnome-color-manager/"
 license="GPL-2"
-checksum=ad69ac0ac242be0ad5b7966e0c2978a9a1440e52ee816993e4a8eb2cf6f0c922
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=c4e9d63c53061c65c4d1bcdd14952dd01aed7332c2e36d34f4a243a9e5097ec9
 long_desc="
 GNOME Color Manager is a session framework that makes it easy to manage, install
 and generate color profiles in the GNOME desktop.
@ -36,5 +38,3 @@ long_desc="
   is only started when it is needed, and quits after a small period of idleness."

 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-
-
--- a/srcpkgs/gnome-contacts/gnome-contacts.rshlibs
+++ b/srcpkgs/gnome-contacts/gnome-contacts.rshlibs
@ -1,22 +1,22 @@
-libgnome-desktop-3.so.2
+libgnome-desktop-3.so.4
 libgtk-3.so.0
 libgdk-3.so.0
-libpangocairo-1.0.so.0
-libcairo.so.2
-libpango-1.0.so.0
 libfolks-telepathy.so.25
+libfolks-eds.so.25
 libfolks.so.25
-libtelepathy-glib.so.0
 libnotify.so.4
-libgdk_pixbuf-2.0.so.0
-libgoa-1.0.so.0
-libgio-2.0.so.0
+libtelepathy-glib.so.0
+libedataserver-1.2.so.17
 libgee.so.2
+libm.so.6
+libcheese-gtk.so.23
+libcheese.so.7
+libpangocairo-1.0.so.0
+libpango-1.0.so.0
+libcairo.so.2
+libgdk_pixbuf-2.0.so.0
+libgio-2.0.so.0
 libgobject-2.0.so.0
 libglib-2.0.so.0
-libm.so.6
 libpthread.so.0
 libc.so.6
-libfolks-eds.so.25
-libebook-1.2.so.13
-libedataserver-1.2.so.16
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@ -1,17 +1,17 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
-version=3.4.1
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
+version=3.6.0
+revision=1
 build_style=gnu-configure
 depends="desktop-file-utils"
-makedepends="pkg-config intltool vala-devel telepathy-glib-devel gnome-desktop-devel folks-devel libnotify-devel"
-revision=1
+makedepends="pkg-config intltool vala-devel telepathy-glib-devel>=0.19.9
+gnome-desktop-devel>=3.6.0 folks-devel>=0.7.4.1 libnotify-devel
+cheese-devel>=3.6.0"
 short_desc="GNOME contacts manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
-checksum=673614fe6cd5f986132819eeb21d67c40af336ffd2c4ca4c3e99365114f13523
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=203ed52fbdad3412fa88ae011c0d1cf94e8fe15c13dc192e8be554a1268614a5
 long_desc="
 This packages the contacts manager for the GNOME desktop."
-
-
--- a/srcpkgs/gnome-control-center/gnome-control-center.rshlibs
+++ b/srcpkgs/gnome-control-center/gnome-control-center.rshlibs
@ -1,53 +1,64 @@
+libnotify.so.4
+libgnome-menu-3.so.0
 libgtk-3.so.0
+libX11.so.6
 libgdk-3.so.0
+libgio-2.0.so.0
+libgdk_pixbuf-2.0.so.0
+libpango-1.0.so.0
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
+libcanberra-gtk3.so.0
+libpulse-mainloop-glib.so.0
+libpulse.so.0
+libm.so.6
+libgthread-2.0.so.0
+librt.so.1
+libxml2.so.2
+libgnome-desktop-3.so.4
 libatk-1.0.so.0
 libpangocairo-1.0.so.0
 libcairo-gobject.so.2
 libcairo.so.2
-libpango-1.0.so.0
-libfontconfig.so.1
-libnotify.so.4
-libgdk_pixbuf-2.0.so.0
-libgio-2.0.so.0
-libgobject-2.0.so.0
-libgmodule-2.0.so.0
-libgthread-2.0.so.0
-librt.so.1
-libglib-2.0.so.0
-libm.so.6
-libpthread.so.0
-libc.so.6
-libxml2.so.2
-libgnome-desktop-3.so.2
-libupower-glib.so.1
+libsocialweb-client.so.2
 libdbus-glib-1.so.2
 libdbus-1.so.3
+libupower-glib.so.1
 libcolord.so.1
 libXi.so.6
-libX11.so.6
 libgoa-backend-1.0.so.0
 libgoa-1.0.so.0
 libpolkit-gobject-1.so.0
-libgnomekbdui.so.7
-libgnomekbd.so.7
-libxklavier.so.16
+libibus-1.0.so.5
+libfontconfig.so.1
 libgtop-2.0.so.7
-libcanberra-gtk3.so.0
 libcanberra.so.0
-libpulse-mainloop-glib.so.0
-libpulse.so.0
-libcrypt.so.1
-libnm-gtk.so.0
-libnm-util.so.2
-libnm-glib.so.4
-libgnome-menu-3.so.0
-libsocialweb-client.so.2
-libgnome-bluetooth.so.10
-libwacom.so.2
 libsystemd-login.so.0
-libcups.so.2
-libgssapi_krb5.so.2
 libkrb5.so.3
 libk5crypto.so.3
 libcom_err.so.2
+libpwquality.so.1
+libcrypt.so.1
+libgstreamer-1.0.so.0
+libcheese-gtk.so.23
+libcheese.so.7
+libclutter-gtk-1.0.so.0
+libclutter-1.0.so.0
+libcogl-pango.so.0
+libjson-glib-1.0.so.0
+libcogl.so.11
+libXext.so.6
+libXdamage.so.1
+libXcomposite.so.1
+libgmodule-2.0.so.0
+libXfixes.so.3
+libwacom.so.2
+libcups.so.2
+libgssapi_krb5.so.2
 libz.so.1
+libnm-gtk.so.0
+libnm-util.so.2
+libnm-glib.so.4
+libgnome-bluetooth.so.11
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@ -1,20 +1,27 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.4.2
+version=3.6.0
 revision=2
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
-configure_args="--enable-cups --with-libsocialweb --without-cheese
+configure_args="--enable-cups --with-libsocialweb
 --disable-update-mimedb --disable-static --enable-systemd"
-depends="gsettings-desktop-schemas pulseaudio desktop-file-utils hicolor-icon-theme sound-theme-freedesktop apg"
-# Reenable cheese-devel once g-c-c doesn't segfault.
-makedepends="which pkg-config intltool gnome-doc-utils libXi-devel libnotify-devel gnome-desktop-devel libgnomekbd-devel gnome-menus-devel network-manager-applet-devel gnome-settings-daemon-devel gnome-online-accounts-devel libsocialweb-devel libcanberra-devel polkit-devel libgtop-devel upower-devel colord-devel pulseaudio-devel libwacom-devel gnome-bluetooth-devel tzdata systemd-devel cups-devel"
+depends="gsettings-desktop-schemas>=3.6.0 pulseaudio desktop-file-utils
+hicolor-icon-theme sound-theme-freedesktop apg"
+makedepends="which pkg-config intltool gnome-doc-utils libXi-devel
+libnotify-devel gnome-desktop-devel>=3.6.0 libgnomekbd-devel>=3.6.0
+gnome-menus-devel>=3.6.0 network-manager-applet-devel
+gnome-settings-daemon-devel>=3.6.0 gnome-online-accounts-devel>=3.6.0
+libsocialweb-devel libcanberra-devel polkit-devel libgtop-devel
+upower-devel colord-devel pulseaudio-devel libwacom-devel ibus-devel
+gnome-bluetooth-devel>=3.6.0 tzdata systemd-devel cups-devel
+libpwquality-devel mit-krb5-devel cheese-devel>=3.6.0"
 fulldepends="iso-codes"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 short_desc="GNOME control center"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://www.gnome.org"
-checksum=efc72bf8af07b439f5f0e9135d1b2c5237e649e6a0f1ff3cf32bdd710421042a
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=7d58d0ccc3defe622f66f4ce8e1229e443f4f57c58f85eecde12b642b8a8e893
 long_desc="
 This packages the control center for the GNOME desktop."
--- a/srcpkgs/gnome-desktop/gnome-desktop-devel.template
+++ b/srcpkgs/gnome-desktop/gnome-desktop-devel.template
@ -1,12 +1,12 @@
 # Template file for 'gnome-desktop-devel'.
 #
-depends="gsettings-desktop-schemas gtk+3-devel gnome-desktop>=3.4.2"
+depends="libxkbfile-devel gsettings-desktop-schemas-devel>=3.6.0
+gtk+3-devel>=3.6.0_2 gnome-desktop>=${version}"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}

 This package contains files for development, headers, static libs, etc."

-
 noarch=yes

 do_install() {
--- a/srcpkgs/gnome-desktop/gnome-desktop.rshlibs
+++ b/srcpkgs/gnome-desktop/gnome-desktop.rshlibs
@ -1,3 +1,5 @@
+libxkbfile.so.1
+libpthread.so.0
 libX11.so.6
 libm.so.6
 libgtk-3.so.0
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@ -1,17 +1,20 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=3.4.2
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
+version=3.6.0.1
+revision=1
+subpackages="$pkgname-devel"
 build_style=gnu-configure
 configure_args="--with-gnome-distributor=XBPS --disable-scrollkeeper"
-makedepends="which pkg-config intltool gnome-doc-utils gobject-introspection gtk+3-devel"
-fulldepends="gsettings-desktop-schemas"
-revision=2
+makedepends="which pkg-config intltool itstool gnome-doc-utils gobject-introspection
+libxkbfile-devel gtk+3-devel>=3.6.0_2 gsettings-desktop-schemas-devel>=3.6.0"
+depends="gsettings-desktop-schemas>=3.6.0"
+fulldepends="xkeyboard-config"
 short_desc="GNOME desktop management utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
-checksum=7565e0a822132ea7b699cb8c64d42b57081ddefd0b5d911f4f4209be0c755952
+homepage="http://www.gnome.org"
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=f3a3a7229426360d48677846bf7a674b12ef89b0a353044d7cc488c438d2ee5f
 long_desc="
 gnome-desktop provides the following components:

@ -20,7 +23,3 @@ long_desc="
    desktop management related utilities.
  * The GNOME desktop manager proxy, which handles basic desktop
    management for applications that do not support XSM."
-
-subpackages="$pkgname-devel"
-
-
--- a/srcpkgs/gnome-dictionary/template
+++ b/srcpkgs/gnome-dictionary/template
@ -1,27 +1,25 @@
 # Template file for 'gnome-dictionary'
 pkgname=gnome-dictionary
-version=3.4.0
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
+version=3.6.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-scrollkeeper"
 depends="hicolor-icon-theme desktop-file-utils"
-makedepends="which pkg-config intltool itstool gnome-doc-utils gtk+3-devel"
-fulldepends="gsettings-desktop-schemas"
-revision=1
+makedepends="which pkg-config intltool itstool gnome-doc-utils
+gtk+3-devel>=3.6.0_2 gsettings-desktop-schemas-devel>=3.6.0"
+fulldepends="gsettings-desktop-schemas>=3.6.0"
 short_desc="Look up words in dictionary sources"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
-checksum=70a15987617f5ae39f1fc27f7ed0a039193b4704cef7b89ed3aea30ac38f56af
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=1ad03f629bbfe4360fc6d8dd2d7cb4a03e24579068bdd79a25ff5fc5fbff6fa9
 long_desc="
 This package contains $pkgname, to look up words in dictionary sources."

 replaces="gnome-utils>=3.0"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"

-
-
-
 post_install() {
 	# Remove -devel stuff.
 	rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib/pkgconfig \
--- a/srcpkgs/gnome-disk-utility/gnome-disk-utility.rshlibs
+++ b/srcpkgs/gnome-disk-utility/gnome-disk-utility.rshlibs
@ -1,3 +1,5 @@
+libpwquality.so.1
+libsecret-1.so.0
 libgtk-3.so.0
 libgdk-3.so.0
 libgio-2.0.so.0
@ -9,5 +11,4 @@ libpangocairo-1.0.so.0
 libgdk_pixbuf-2.0.so.0
 libcairo.so.2
 libpango-1.0.so.0
-libm.so.6
 libudisks2.so.0
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@ -1,18 +1,19 @@
 # Template file for 'gnome-disk-utility'
 pkgname=gnome-disk-utility
-version=3.4.1
-revision=2
+version=3.6.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 depends="hicolor-icon-theme desktop-file-utils parted"
-makedepends="pkg-config intltool gnome-doc-utils gtk+3-devel udisks2-devel"
+makedepends="pkg-config intltool gnome-doc-utils gtk+3-devel>=3.6.0_2
+udisks2-devel libsecret-devel libpwquality-devel"
 short_desc="GNOME libraries and applications for dealing with storage devices"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
-checksum=54c60a3215a144a353f78742cf14221a011641244421170d7169da39f82b0129
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=0e3ccd8ae0f79a8ccc41bfaaf0f34c14fec7b193249e650862c589d82053e57d
 long_desc="
 palimpsest (from the gnome-disk-utility project) is a tool to manage disk
 drives and media:
--- a/srcpkgs/gnome-documents/gnome-documents.rshlibs
+++ b/srcpkgs/gnome-documents/gnome-documents.rshlibs
@ -1,41 +1,45 @@
+libgtk-3.so.0
+libgdk-3.so.0
+libatk-1.0.so.0
+libgio-2.0.so.0
+libpangocairo-1.0.so.0
+libgdk_pixbuf-2.0.so.0
+libcairo-gobject.so.2
+libpango-1.0.so.0
+libcairo.so.2
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libm.so.6
+libc.so.6
 libclutter-gtk-1.0.so.0
+libclutter-1.0.so.0
 libcogl-pango.so.0
-libjson-glib-1.0.so.0
 libXi.so.6
-libdrm.so.2
+libcogl.so.11
 libX11.so.6
 libXext.so.6
 libXdamage.so.1
 libXcomposite.so.1
 libXfixes.so.3
 libevview3.so.3
-libgirepository-1.0.so.1
-libffi.so.5
-libgnome-desktop-3.so.2
-libgtk-3.so.0
-libgdk-3.so.0
-libatk-1.0.so.0
-libpangocairo-1.0.so.0
-libgdk_pixbuf-2.0.so.0
-libcairo-gobject.so.2
-libcairo.so.2
-libpango-1.0.so.0
-libtracker-sparql-0.14.so.0
-libgoa-1.0.so.0
-libgdata.so.13
-libsoup-2.4.so.1
-libxml2.so.2
-libgio-2.0.so.0
-libgobject-2.0.so.0
-libgmodule-2.0.so.0
-libgthread-2.0.so.0
-librt.so.1
-libglib-2.0.so.0
-liboauth.so.0
-libpthread.so.0
-libc.so.6
 libevdocument3.so.4
 libgjs.so.0
-libm.so.6
-libclutter-1.0.so.0
-libcogl.so.9
+libgirepository-1.0.so.1
+libgnome-desktop-3.so.4
+libtracker-sparql-0.14.so.0
+libgmodule-2.0.so.0
+libgdata.so.13
+libgthread-2.0.so.0
+librt.so.1
+liboauth.so.0
+libsoup-gnome-2.4.so.1
+libgcr-base-3.so.1
+libgck-1.so.0
+libp11-kit.so.0
+libzapojit-0.0.so.0
+libgoa-1.0.so.0
+libjson-glib-1.0.so.0
+librest-0.7.so.0
+libsoup-2.4.so.1
+libxml2.so.2
+libpthread.so.0
--- a/Show More
+++ b/Show More