Fri Mar 7 03:48:12 UTC 2014

69 files changed, 628 insertions, 1402 deletions

diff --git a/community/atril/PKGBUILD b/community/atril/PKGBUILD
new file mode 100644
index 000000000..0a6019562
--- /dev/null
+++ b/community/atril/PKGBUILD
@@ -0,0 +1,57 @@
+# $Id: PKGBUILD 106659 2014-03-06 11:40:25Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=atril
+pkgver=1.8.0
+pkgrel=1
+pkgdesc="Simply a document viewer"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dconf' 'dbus' 'desktop-file-utils' 'gtk2' 'libsm' 'libspectre'
+         'mate-desktop' 'mate-icon-theme' 'poppler-glib' 'zlib')
+makedepends=('caja' 'djvulibre' 'gobject-introspection' 'libgxps' 'mate-common'
+             'perl-xml-parser' 'texlive-bin' 'yelp-tools')
+optdepends=('caja: Document Properties extension'
+            'djvulibre: DjVu support'
+            'libgxps: XPS support'
+            'p7zip: cbz and cb7 compressed comic books'
+            'texlive-bin: DVI support'
+            'unrar: cbr compressed comic books'
+            'yelp: for reading MATE help documents')
+replaces=('mate-document-viewer')
+provides=('mate-document-viewer')
+conflicts=('mate-document-viewer')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('8327437ba12df61326b83342cea746d1764727d0')
+install=${pkgname}.install
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname} \
+        --with-gtk=2.0 \
+        --enable-gtk-doc \
+        --enable-djvu \
+        --enable-dvi \
+        --enable-t1lib \
+        --enable-pixbuf \
+        --enable-comics \
+        --enable-xps \
+        --enable-introspection \
+        --disable-static
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-image-viewer/mate-image-viewer.install b/community/atril/atril.install
index bf6781f93..bf6781f93 100644
--- a/community/mate-image-viewer/mate-image-viewer.install
+++ b/community/atril/atril.install
diff --git a/community/caja-extensions/PKGBUILD b/community/caja-extensions/PKGBUILD
new file mode 100644
index 000000000..338210041
--- /dev/null
+++ b/community/caja-extensions/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 106660 2014-03-06 11:40:34Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=caja-extensions
+pkgver=1.8.0
+pkgrel=1
+pkgdesc="Caja extensions."
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('caja' 'dbus-glib' 'gksu' 'gtk2' 'gupnp' 'imagemagick' 'samba')
+makedepends=('mate-common' 'perl-xml-parser')
+optdepends=('pidgin: Support for sending to instant messaging networks.'
+            'gajim: Support for sending to Jabber.')
+conflicts=('mate-file-manager-gksu' 'mate-file-manager-image-converter' 'mate-file-manager-open-terminal' 'mate-file-manager-sendto' 'mate-file-manager-share')
+replaces=('mate-file-manager-gksu' 'mate-file-manager-image-converter' 'mate-file-manager-open-terminal' 'mate-file-manager-sendto' 'mate-file-manager-share')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('b4872265988745bfc39531e2eb6ac6d41a01a645')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    PYTHON=/usr/bin/python2 ./configure \
+        --prefix=/usr \
+        --with-gtk=2.0
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-window-manager/mate-window-manager.install b/community/caja-extensions/caja-extensions.install
index 3a06d45b9..8fa189f58 100644
--- a/community/mate-window-manager/mate-window-manager.install
+++ b/community/caja-extensions/caja-extensions.install
@@ -2,10 +2,18 @@ post_install() {
     glib-compile-schemas /usr/share/glib-2.0/schemas/
 }
 
+pre_upgrade() {
+    pre_remove
+}
+
 post_upgrade() {
     post_install
 }
 
+pre_remove() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+}
+
 post_remove() {
-    post_install
+    :
 }
diff --git a/community/mate-file-manager/PKGBUILD b/community/caja/PKGBUILD
index 0203916d6..92f91368c 100644
--- a/community/mate-file-manager/PKGBUILD
+++ b/community/caja/PKGBUILD
@@ -1,30 +1,33 @@
-# $Id: PKGBUILD 104181 2014-01-16 15:54:41Z flexiondotorg $
+# $Id: PKGBUILD 106644 2014-03-06 11:38:04Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
 
-pkgname=mate-file-manager
-pkgver=1.6.3
+pkgname=caja
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="The MATE shell and file manager"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('dbus' 'desktop-file-utils' 'exempi' 'gtk2' 'gvfs' 'libexif'
-         'libunique' 'libxt' 'mate-desktop' 'mate-icon-theme' 'startup-notification')
+depends=('dbus' 'desktop-file-utils' 'exempi' 'gtk2' 'gvfs' 'libexif' 'libunique'
+         'libxt' 'mate-desktop' 'mate-icon-theme' 'startup-notification')
 makedepends=('gobject-introspection' 'mate-common' 'pangox-compat')
-optdepends=('gstreamer0.10-good-plugins: automatic media playback when mouseover')
+optdepends=('gstreamer0.10-good-plugins: automatic media playback when mouseover'
+            'gvfs-smb: To connect to Samba/Windows shares')
+replaces=('mate-file-manager')
+provides=('mate-file-manager')
+conflicts=('mate-file-manager')
 options=('!emptydirs')
 groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('ea52cfef3d728e4d5e135bff88452c02de05e960')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('3bfb52dceae4fa7b39eb26099b07326fa4197f3f')
 install=${pkgname}.install
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure \
         --prefix=/usr \
-        --libexecdir=/usr/lib/caja \
+        --libexecdir=/usr/lib/${pkgname} \
+        --with-gtk=2.0 \
         --enable-unique \
         --enable-introspection \
         --disable-static \
diff --git a/community/mate-file-manager/mate-file-manager.install b/community/caja/caja.install
index d5a70db20..d5a70db20 100644
--- a/community/mate-file-manager/mate-file-manager.install
+++ b/community/caja/caja.install
diff --git a/community/engrampa/PKGBUILD b/community/engrampa/PKGBUILD
new file mode 100644
index 000000000..6356e7459
--- /dev/null
+++ b/community/engrampa/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 106656 2014-03-06 11:39:56Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=engrampa
+pkgver=1.8.0
+pkgrel=1
+pkgdesc="Archive manipulator for MATE"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('bzip2' 'caja' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive' 'tar')
+makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('unrar: for RAR uncompression'
+            'zip: for ZIP archives' 'unzip: for ZIP archives'
+            'p7zip: 7zip compression utility' 'arj: for ARJ archives'
+            'unace: extraction tool for the proprietary ace archive format'
+            'yelp: for reading MATE help documents')
+replaces=('mate-file-archiver')
+provides=('mate-file-archiver')
+conflicts=('mate-file-archiver')
+options=( '!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz"
+        fr-rpm-bsdtar.patch)
+sha1sums=('511019cee95568a4951e9da12d8a7282c3f6af65'
+          '219b05a979bf6f249aaae27964f02345fd81168d')
+install=${pkgname}.install
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    # This patch 'depends' on libarchive
+    patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname} \
+        --with-gtk=2.0 \
+        --disable-static \
+        --disable-packagekit
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-file-manager-sendto/mate-file-manager-sendto.install b/community/engrampa/engrampa.install
index 3a06d45b9..bf6781f93 100644
--- a/community/mate-file-manager-sendto/mate-file-manager-sendto.install
+++ b/community/engrampa/engrampa.install
@@ -1,5 +1,7 @@
 post_install() {
     glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/community/engrampa/fr-rpm-bsdtar.patch b/community/engrampa/fr-rpm-bsdtar.patch
new file mode 100644
index 000000000..93a783176
--- /dev/null
+++ b/community/engrampa/fr-rpm-bsdtar.patch
@@ -0,0 +1,60 @@
+This makes Engrampa use bsdtar to extract .RPM packages instead of using cpio.
+It is useful on systems that do not have cpio or RPM/YUM
+This patch was created for Arch Linux, however should work on any system that has bsdtar capable of handling cpio archives.
+
+------------------+
+ rpm2cpio.c       |   2 +-
+ fr-command-rpm.c |   8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+Index: src/commands/rpm2cpio.c
+================================
+--- mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-03-31
++++ mate-file-archiver-1.6.0/src/commands/rpm2cpio.c	2013-07-26
+@@ -128,7 +128,7 @@
+ 		archive_command = "bzip2 -dc";
+ 	fclose (stream);
+ 
+-	command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | cpio %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
++	command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | bsdtar %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
+ 
+ 	return system (command);
+ }
+Index: src/fr-command-rpm.c
+================================
+--- mate-file-archiver-1.6.0/src/fr-command-rpm.c	2013-03-31
++++ mate-file-archiver-1.6.0/src/fr-command-rpm.c	2013-07-26
+@@ -175,7 +175,7 @@
+ 
+ 	fr_process_begin_command (comm->process, "sh");
+ 	fr_process_add_arg (comm->process, "-c");
+-	fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -itv", NULL);
++	fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -tvf -", NULL);
+ 	fr_process_end_command (comm->process);
+ 	fr_process_start (comm->process);
+ }
+@@ -200,7 +200,7 @@
+ 
+ 	cmd = g_string_new (PRIVEXECDIR "rpm2cpio ");
+ 	g_string_append (cmd, comm->e_filename);
+-	g_string_append (cmd, " -idu ");
++	g_string_append (cmd, " -xf - ");
+ 	for (scan = file_list; scan; scan = scan->next) {
+ 		char *filename = g_shell_quote (scan->data);
+ 		g_string_append (cmd, filename);
+@@ -233,7 +233,7 @@
+ 	FrCommandCap capabilities;
+ 
+ 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
+-	if (is_program_available ("cpio", check_command))
++	if (is_program_available ("bsdtar", check_command))
+ 		capabilities |= FR_COMMAND_CAN_READ;
+ 
+ 	return capabilities;
+@@ -244,7 +244,7 @@
+ fr_command_rpm_get_packages (FrCommand  *comm,
+ 			     const char *mime_type)
+ {
+-	return PACKAGES ("cpio,rpm");
++	return PACKAGES ("bsdtar,rpm");
+ }
diff --git a/community/eom/01-fix.diff b/community/eom/01-fix.diff
new file mode 100644
index 000000000..f857b7676
--- /dev/null
+++ b/community/eom/01-fix.diff
@@ -0,0 +1,13 @@
+diff --git a/src/eom-thumbnail.c b/src/eom-thumbnail.c
+index a4f24b6..a98dd30 100644
+--- a/src/eom-thumbnail.c
++++ b/src/eom-thumbnail.c
+@@ -31,7 +31,7 @@
+ #ifndef MATE_DESKTOP_USE_UNSTABLE_API
+ #define MATE_DESKTOP_USE_UNSTABLE_API
+ #endif
+-#include <libmateui/mate-desktop-thumbnail.h>
++#include <libmate-desktop/mate-desktop-thumbnail.h>
+ 
+ #include "eom-thumbnail.h"
+ #include "eom-list-store.h"
diff --git a/community/eom/PKGBUILD b/community/eom/PKGBUILD
new file mode 100644
index 000000000..00fd7d0e9
--- /dev/null
+++ b/community/eom/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 106663 2014-03-06 11:41:02Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=eom
+pkgver=1.8.0
+pkgrel=2
+pkgdesc="An image viewing and cataloging program for MATE"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus-glib' 'desktop-file-utils' 'gtk2' 'exempi' 'lcms2' 'libexif'
+         'libjpeg-turbo' 'mate-desktop' 'mate-icon-theme' 'pygtk' 'python2'
+         'python2-gobject2' 'startup-notification' 'zlib')
+makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
+replaces=('mate-image-viewer')
+provides=('mate-image-viewer')
+conflicts=('mate-image-viewer')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('580b3c06e16e14dd3f72d545f47f295af5d67dd1')
+install=${pkgname}.install
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    PYTHON=/usr/bin/python2 ./configure \
+        --prefix=/usr \
+        --localstatedir=/var \
+        --with-gtk=2.0
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-keyring/mate-keyring.install b/community/eom/eom.install
index 3a06d45b9..bf6781f93 100644
--- a/community/mate-keyring/mate-keyring.install
+++ b/community/eom/eom.install
@@ -1,5 +1,7 @@
 post_install() {
     glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/community/libhx/PKGBUILD b/community/libhx/PKGBUILD
index 12ded5a70..835422541 100644
--- a/community/libhx/PKGBUILD
+++ b/community/libhx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99849 2013-10-31 02:04:27Z allan $
+# $Id: PKGBUILD 106679 2014-03-06 13:15:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Max Roder <maxroder@web.de>
 # Contributor: Nathan Owe <ndowens.aur at gmail dot com>
 
 pkgname='libhx'
-pkgver=3.15
+pkgver=3.19
 pkgrel=1
 pkgdesc='A library providing queue, tree, I/O and utility functions'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url=('http://libhx.sourceforge.net/')
 license=('GPL')
 depends=()
 source=("http://downloads.sourceforge.net/${pkgname}/libHX-${pkgver}.tar.xz")
-md5sums=('0165d6aa994a094b2a170d93a48599e0')
+md5sums=('246c467607d042f69b57e9357de0b409')
 
 build() {
   cd ${srcdir}/libHX-${pkgver}
diff --git a/community/libmatekbd/PKGBUILD b/community/libmatekbd/PKGBUILD
index e351ce4b3..320e55476 100644
--- a/community/libmatekbd/PKGBUILD
+++ b/community/libmatekbd/PKGBUILD
@@ -1,10 +1,7 @@
-# $Id: PKGBUILD 104170 2014-01-16 15:09:15Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
 
 pkgname=libmatekbd
-pkgver=1.6.2
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="MATE keyboard library"
 url="http://mate-desktop.org"
@@ -13,14 +10,15 @@ license=('LGPL')
 depends=('dconf' 'gtk2' 'iso-codes' 'libxklavier')
 makedepends=('mate-common' 'perl-xml-parser')
 options=('!emptydirs')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('224eba31dbf6d44f69ae3b75712a0bb90717df68')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('8034737a40d5a2f1e4857a21110b4f1eacf0db30')
 install=${pkgname}.install
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure \
         --prefix=/usr \
+        --with-gtk=2.0 \
         --disable-static
     make
 }
diff --git a/community/libmatekeyring/PKGBUILD b/community/libmatekeyring/PKGBUILD
deleted file mode 100644
index 54fb88865..000000000
--- a/community/libmatekeyring/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 104159 2014-01-16 13:02:33Z flexiondotorg $
-# Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
-
-pkgname=libmatekeyring
-pkgver=1.6.1
-pkgrel=3
-pkgdesc="MATE keyring client library"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('dbus' 'glib2' 'libgcrypt')
-makedepends=('docbook-xml' 'mate-common' 'perl-xml-parser')
-options=('!emptydirs')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('ad6a5d029506348094e0147a9be9cc4555ed87a4')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib/mate-keyring \
-        --disable-static
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community/libmateweather/PKGBUILD b/community/libmateweather/PKGBUILD
index 82d54aebe..f4d972415 100644
--- a/community/libmateweather/PKGBUILD
+++ b/community/libmateweather/PKGBUILD
@@ -1,20 +1,17 @@
-# $Id: PKGBUILD 104174 2014-01-16 15:20:18Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
 
 pkgname=libmateweather
-pkgver=1.6.2
-pkgrel=5
-pkgdesc="Provides access to weather information from the net"
+pkgver=1.8.0
+pkgrel=1
+pkgdesc="Provides access to weather information from the Internet."
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('LGPL')
 depends=('dconf' 'gtk2' 'libsoup' 'pygtk' 'python2-gobject2')
 makedepends=('mate-common' 'perl-xml-parser')
 options=('!emptydirs')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('56f30e35345864954a37228ad8103350f4bc3651')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('80ca08ff1b8d55313a32f9fe4ffbc4907609b6cd')
 install=${pkgname}.install
 
 build() {
@@ -23,6 +20,7 @@ build() {
         --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
+        --with-gtk=2.0 \
         --disable-static \
         --enable-python \
         --enable-locations-compression
diff --git a/community/libmatewnck/PKGBUILD b/community/libmatewnck/PKGBUILD
deleted file mode 100644
index 2c967fb94..000000000
--- a/community/libmatewnck/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 104295 2014-01-17 10:05:11Z flexiondotorg $
-# Maintainer : Martin Wimpress <code@flexion.org>
-
-pkgname=libmatewnck
-pkgver=1.6.1
-pkgrel=6
-pkgdesc="Window Navigator Construction Kit for MATE."
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('gtk2' 'libxres' 'startup-notification')
-makedepends=('gobject-introspection' 'mate-common' 'perl-xml-parser')
-options=('!emptydirs')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('10e2def928dd74529c49a624803187098ea2b0f6')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure \
-        --prefix=/usr \
-        --disable-static \
-        --enable-gtk-doc \
-        --enable-startup-notification \
-        --enable-introspection
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community/mate-window-manager/PKGBUILD b/community/marco/PKGBUILD
index fa498c203..35028c2db 100644
--- a/community/mate-window-manager/PKGBUILD
+++ b/community/marco/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 104189 2014-01-16 16:18:35Z flexiondotorg $
+# $Id: PKGBUILD 106646 2014-03-06 11:38:22Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
 
-pkgname=mate-window-manager
-pkgver=1.6.2
-pkgrel=4
+pkgname=marco
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="A window manager for MATE"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('gtk2' 'libcanberra' 'libgtop' 'libice' 'libsm' 'libxt' 'mate-desktop'
          'mate-dialogs' 'startup-notification')
-makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
+replaces=('mate-window-manager')
+provides=('mate-window-manager')
+conflicts=('mate-window-manager')
 options=('!emptydirs')
 groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('dce0fd1953d75b4aad88d4818228eac677fb1d7b')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('7083d090aa2966ec590020aaf21ead77417bccba')
 install=${pkgname}.install
 
 build() {
@@ -24,9 +27,9 @@ build() {
         --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
+        --with-gtk=2.0 \
         --enable-startup-notification \
-        --disable-static \
-        --disable-scrollkeeper
+        --disable-static
     make
 }
 
diff --git a/community/mate-file-manager-open-terminal/mate-file-manager-open-terminal.install b/community/marco/marco.install
index 3a06d45b9..3a06d45b9 100644
--- a/community/mate-file-manager-open-terminal/mate-file-manager-open-terminal.install
+++ b/community/marco/marco.install
diff --git a/community/mate-applets/PKGBUILD b/community/mate-applets/PKGBUILD
index 67c628807..386fdcf3e 100644
--- a/community/mate-applets/PKGBUILD
+++ b/community/mate-applets/PKGBUILD
@@ -1,38 +1,26 @@
-# $Id: PKGBUILD 104220 2014-01-16 17:30:37Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
 
 pkgname=mate-applets
-pkgver=1.6.2
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="Applets for MATE panel"
 arch=('i686' 'x86_64')
 url="http://mate-desktop.org"
 license=('GPL')
-depends=('mate-character-map' 'mate-panel' 'python2-dbus' 'python2-gobject'
-         'upower')
-makedepends=('docbook2x' 'docbook-xsl' 'mate-common' 'mate-doc-utils'
-             'networkmanager' 'perl-xml-parser')
+depends=('gtksourceview2' 'gucharmap' 'mate-panel' 'python2-dbus'
+         'python2-gobject' 'upower')
+makedepends=('docbook2x' 'docbook-xsl' 'mate-common' 'networkmanager'
+             'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
 options=('!emptydirs')
 groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz"
-        "https://github.com/mate-desktop/mate-applets/commit/98dfd949e9209eefc0722fb232761f01b4fe2d7e.diff"
-        "https://github.com/mate-desktop/mate-applets/commit/6fca38a74cc9e6b4ce107496f2e0e7d203c43d2b.diff")
-sha1sums=('2978918a0b995b3f3dd98ad7ca159b0d7bcd245a'
-          'c4d7f2d7952b53d8ac616ced55a4cf3da25c0fc4'
-          '36c4507e54b21fbcff49732077912dbc5283807a')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('c9e7ac6f9cc6b6ebd77720b056a3a81536b92419')
 install=${pkgname}.install
 
 prepare() {
     cd "${srcdir}/${pkgname}-${pkgver}"
-    #upower: fix upower version
-    patch -Np1 -i "${srcdir}/98dfd949e9209eefc0722fb232761f01b4fe2d7e.diff"
-    #battstat: use g_signal notify for upower-1.0
-    patch -Np1 -i "${srcdir}/6fca38a74cc9e6b4ce107496f2e0e7d203c43d2b.diff"
-    # Use python2
     sed -i 's/env python/env python2/' invest-applet/invest/{chart.py,invest-applet.py,mate-invest-chart}
-    sed -i 's/env python/env python2/' timer-applet/src/timer-applet
 }
 
 build() {
@@ -44,8 +32,7 @@ build() {
         --enable-polkit \
         --enable-networkmanager \
         --enable-ipv6 \
-        --disable-static \
-        --disable-scrollkeeper
+        --disable-static
     make
 }
 
diff --git a/community/mate-calc/PKGBUILD b/community/mate-calc/PKGBUILD
index d48ea6d52..0651c0b4c 100644
--- a/community/mate-calc/PKGBUILD
+++ b/community/mate-calc/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 104914 2014-01-28 10:51:00Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
 
 pkgname=mate-calc
-pkgver=1.6.1
-pkgrel=1
+pkgver=1.8.0
+pkgrel=2
 pkgdesc="Calculator for the Mate desktop environment"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL')
 depends=('dconf' 'gtk2')
-makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
 options=('!emptydirs')
 groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('dca1568748e42d4a019d7cf8effe1be80b20b82b')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('d63156db75d8110f0cabf82a12c74c5b9836f327')
 install=${pkgname}.install
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure \
-        --prefix=/usr
+        --prefix=/usr \
+        --with-gtk=2.0
     make
 }
 
diff --git a/community/mate-character-map/PKGBUILD b/community/mate-character-map/PKGBUILD
deleted file mode 100644
index f7e511a3d..000000000
--- a/community/mate-character-map/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 104218 2014-01-16 17:20:32Z flexiondotorg $
-# Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-
-pkgname=mate-character-map
-pkgver=1.6.0
-pkgrel=5
-pkgdesc="MATE Unicode Charmap"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('dconf' 'gtk2' 'pygtk' 'python2')
-makedepends=('gobject-introspection' 'mate-common' 'mate-doc-utils' 'perl-xml-parser')
-options=('!emptydirs' )
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('e378e26ebe493d3f849771d10930504b8980448e')
-install=${pkgname}.install
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    PYTHON=/usr/bin/python2 ./autogen.sh \
-        --prefix=/usr \
-        --enable-charmap \
-        --enable-python-bindings \
-        --enable-introspection \
-        --disable-static \
-        --disable-scrollkeeper
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community/mate-character-map/mate-character-map.install b/community/mate-character-map/mate-character-map.install
deleted file mode 100644
index 9f6e9c08b..000000000
--- a/community/mate-character-map/mate-character-map.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas/    
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/community/mate-color-manager/PKGBUILD b/community/mate-color-manager/PKGBUILD
index 048949ce1..426325b87 100644
--- a/community/mate-color-manager/PKGBUILD
+++ b/community/mate-color-manager/PKGBUILD
@@ -1,27 +1,23 @@
-# $Id: PKGBUILD 105579 2014-02-10 13:50:05Z flexiondotorg $
+# $Id: PKGBUILD 106736 2014-03-06 17:38:21Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
 
 pkgname=mate-color-manager
-pkgver=1.6.1
-pkgrel=3
+pkgver=1.7.0
+pkgrel=1
 pkgdesc="Color management application for MATE."
 url="https://github.com/NiceandGently/${pkgname}"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('dbus' 'desktop-file-utils' 'exiv2' 'gtk2' 'lcms2' 'libcanberra' 'libcups' 'libexif' 'libnotify' 'libtiff'
          'libunique' 'mate-desktop' 'sane' 'vte')
-makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
 options=('!emptydirs')
-source=("https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz"
-        "https://github.com/NiceandGently/mate-color-manager/commit/cb80f549af83a703243eae4afad841d564743afb.diff")
-sha1sums=('6a8d18a3a7e3fb22e03cd319556575b9482c6f04'
-          '283c767591956206f5c7229ee1eff86faea253c0')
+source=("https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz")
+sha1sums=('800d1e76a0e55e0b75d42c78037c1561595c0d49')
 install=${pkgname}.install
 
 prepare() {
     cd "${srcdir}/${pkgname}-${pkgver}"
-    # Get udevrulesdir from pkg-config 
-    patch -Np1 -i  "${srcdir}/cb80f549af83a703243eae4afad841d564743afb.diff"
     NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -32,11 +28,7 @@ build() {
         --sysconfdir=/etc \
         --sbindir=/usr/bin \
         --libexecdir=/usr/lib/${pkgname} \
-        --disable-static \
-        --disable-scrollkeeper
-
-    #Work around a problem where the .sgml fail to parse.
-    sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in
+        --disable-static
     make
 }
 
diff --git a/community/mate-control-center/PKGBUILD b/community/mate-control-center/PKGBUILD
index 94620fbaa..1d779b917 100644
--- a/community/mate-control-center/PKGBUILD
+++ b/community/mate-control-center/PKGBUILD
@@ -1,25 +1,22 @@
-# $Id: PKGBUILD 104207 2014-01-16 16:54:02Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
-# Contributor: hekel <hekel@archlinux.info>
 
 pkgname=mate-control-center
-pkgver=1.6.2
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="The Control Center for MATE"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('dbus-glib' 'dconf' 'desktop-file-utils' 'gsettings-desktop-schemas'
-         'gtk2' 'mate-desktop' 'mate-file-manager' 'mate-icon-theme' 'mate-menus'
-         'mate-settings-daemon' 'mate-window-manager' 'libgtop' 'libmatekbd'
-         'libunique' 'librsvg' 'libxss' 'libxt' 'startup-notification')
-makedepends=('docbook2x' 'mate-common' 'mate-doc-utils' 'perl-xml-parser')
+depends=('caja' 'dbus-glib' 'dconf' 'desktop-file-utils' 'gsettings-desktop-schemas'
+         'gtk2' 'mate-desktop' 'mate-icon-theme' 'mate-menus' 'mate-settings-daemon'
+         'marco' 'libgtop' 'libmatekbd' 'libunique' 'librsvg' 'libxss'
+         'libxt' 'startup-notification')
+makedepends=('docbook2x' 'mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
 options=('!emptydirs')
 groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('d3aa9434dde63bd176e995cbb8408fd673f6eed5')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('d65088d1d7e9cf20aac466c98622f579979dc396')
 install=${pkgname}.install
 
 build() {
@@ -29,8 +26,8 @@ build() {
         --sysconfdir=/etc \
         --sbindir=/usr/bin \
         --localstatedir=/var \
+        --with-gtk=2.0 \
         --disable-static \
-        --disable-scrollkeeper \
         --disable-update-mimedb
     make
 }
diff --git a/community/mate-desktop/PKGBUILD b/community/mate-desktop/PKGBUILD
index caeed6036..f5b2c8d1e 100644
--- a/community/mate-desktop/PKGBUILD
+++ b/community/mate-desktop/PKGBUILD
@@ -1,32 +1,35 @@
-# $Id: PKGBUILD 104842 2014-01-27 11:23:45Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
 
 pkgname=mate-desktop
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="Library with common API for various MATE modules"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=(GPL LGPL)
 depends=('dconf' 'gtk2' 'hicolor-icon-theme' 'libunique' 'python2'
          'startup-notification' 'ttf-dejavu')
-makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
-optdepends=('lightdm-gtk2-greeter: A lightweight display manager')
+makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('lightdm-gtk2-greeter: A lightweight display manager'
+            'orca: Screen reader for blind or visually impaired individuals'
+            'yelp: for reading MATE help documents')
 options=('!emptydirs')
 groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('413ef92f1aedf0ffbbf232ce6907211f0f4722a2')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('1e722d18a198751b209fcf255ad5d3653cb8f6e6')
 install=${pkgname}.install
 
 build() {
+    # See the following for '--disable-desktop-docs' justification
+    #  - https://github.com/mate-desktop/mate-desktop/issues/68
     cd "${srcdir}/${pkgname}-${pkgver}"
     PYTHON=/usr/bin/python2 ./configure \
         --prefix=/usr \
+        --with-gtk=2.0 \
         --disable-static \
-        --disable-scrollkeeper \
         --disable-schemas-compile \
-        --enable-gtk-doc \
-        --with-omf-dir=/usr/share/omf/${pkgname}
+        --disable-desktop-docs \
+        --enable-gtk-doc
     make
 }
 
diff --git a/community/mate-dialogs/PKGBUILD b/community/mate-dialogs/PKGBUILD
index 8feff3f1d..e4617bf17 100644
--- a/community/mate-dialogs/PKGBUILD
+++ b/community/mate-dialogs/PKGBUILD
@@ -1,27 +1,25 @@
-# $Id: PKGBUILD 104188 2014-01-16 16:13:01Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
 
 pkgname=mate-dialogs
-pkgver=1.6.2
-pkgrel=3
+pkgver=1.8.0
+pkgrel=2
 pkgdesc="Display graphical dialog boxes from shell scripts"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('LGPL')
 depends=('gtk2' 'libnotify')
-makedepends=('docbook-xml' 'mate-common' 'mate-doc-utils' 'perl-xml-parser')
+makedepends=('docbook-xml' 'mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
 options=('!emptydirs')
 groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('64601ae71671911dbc83d1fab2a837da0b218cf9')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('b0248c54d1c5ff17573a8257f223e7a828c01f7c')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure \
         --prefix=/usr \
-        --disable-scrollkeeper
+        --with-gtk=2.0
     make
 }
 
diff --git a/community/mate-file-manager-gksu/PKGBUILD b/community/mate-file-manager-gksu/PKGBUILD
deleted file mode 100644
index c9e407950..000000000
--- a/community/mate-file-manager-gksu/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 104226 2014-01-16 17:40:52Z flexiondotorg $
-# Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
-
-pkgname=mate-file-manager-gksu
-pkgver=1.6.0
-pkgrel=7
-pkgdesc="A Caja extension for executing files with elevated privileges."
-url="http://mate-desktop.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gksu' 'gtk2' 'mate-file-manager')
-makedepends=('mate-common' 'perl-xml-parser')
-options=('!emptydirs')
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('fd6e6268e5e00706fbe5d20090aff94d2ce57302')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./autogen.sh \
-        --prefix=/usr
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community/mate-file-manager-image-converter/PKGBUILD b/community/mate-file-manager-image-converter/PKGBUILD
deleted file mode 100644
index 85b106344..000000000
--- a/community/mate-file-manager-image-converter/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 104228 2014-01-16 17:41:51Z flexiondotorg $
-# Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
-
-pkgname=mate-file-manager-image-converter
-pkgver=1.6.0
-pkgrel=6
-pkgdesc="A Caja extension for simple image conversions."
-url="http://mate-desktop.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk2' 'imagemagick' 'mate-file-manager')
-makedepends=('mate-common' 'perl-xml-parser')
-options=('!emptydirs')
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('ab3b248e93f4c7322296d5856a8439d0a2515f53')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./autogen.sh \
-        --prefix=/usr
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community/mate-file-manager-open-terminal/PKGBUILD b/community/mate-file-manager-open-terminal/PKGBUILD
deleted file mode 100644
index e40d19b16..000000000
--- a/community/mate-file-manager-open-terminal/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 104828 2014-01-27 09:49:50Z flexiondotorg $
-# Maintainer : Martin Wimpress <code@flexion.org>
-
-pkgname=mate-file-manager-open-terminal
-pkgver=1.6.1
-pkgrel=1
-pkgdesc="A Caja extension for opening terminals in arbitrary local paths."
-url="http://mate-desktop.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk2' 'mate-desktop' 'mate-file-manager')
-makedepends=('mate-common' 'perl-xml-parser')
-options=('!emptydirs')
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('958a213572e99cf734aeae75c604a9193abe07de')
-install=${pkgname}.install
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure \
-        --prefix=/usr
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community/mate-file-manager-sendto/PKGBUILD b/community/mate-file-manager-sendto/PKGBUILD
deleted file mode 100644
index e986477b5..000000000
--- a/community/mate-file-manager-sendto/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 104232 2014-01-16 17:43:59Z flexiondotorg $
-# Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
-
-pkgname=mate-file-manager-sendto
-pkgver=1.6.0
-pkgrel=4
-pkgdesc="A Caja extension for sending files."
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('dbus-glib' 'gupnp' 'gtk2' 'mate-file-manager')
-makedepends=('mate-common' 'perl-xml-parser')
-optdepends=('pidgin: Support for sending to instant messaging networks.'
-            'gajim: Support for sending to Jabber.'
-            'mate-bluetooth: Support for sending to bluetooth.')
-options=('!emptydirs')
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('cf81a12d6d5d90f431d96fd67eed893f472b36f0')
-install=${pkgname}.install
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./autogen.sh \
-        --prefix=/usr \
-        --with-plugins=gajim,pidgin,removable-devices,upnp,emailclient
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community/mate-file-manager-share/PKGBUILD b/community/mate-file-manager-share/PKGBUILD
deleted file mode 100644
index 96e1668a7..000000000
--- a/community/mate-file-manager-share/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 104234 2014-01-16 17:45:59Z flexiondotorg $
-# Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-
-pkgname=mate-file-manager-share
-pkgver=1.6.0
-pkgrel=7
-pkgdesc="A Caja extension to quickly share a folder."
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('mate-file-manager' 'samba')
-makedepends=('mate-common' 'perl-xml-parser')
-options=('!emptydirs')
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('28e8ec54330e41aa44866107c23f48b47ea198e4')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    PYTHON=/usr/bin/python2 ./autogen.sh \
-        --prefix=/usr
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community/mate-image-viewer/PKGBUILD b/community/mate-image-viewer/PKGBUILD
deleted file mode 100644
index 6d17b27cb..000000000
--- a/community/mate-image-viewer/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 104205 2014-01-16 16:49:55Z flexiondotorg $
-# Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
-
-pkgname=mate-image-viewer
-pkgver=1.6.2
-pkgrel=1
-pkgdesc="An image viewing and cataloging program for MATE"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('dbus-glib' 'desktop-file-utils' 'gtk2' 'exempi' 'lcms' 'libexif'
-         'libjpeg-turbo' 'mate-desktop' 'mate-icon-theme' 'pygtk' 'python2'
-         'python2-gobject2' 'startup-notification' 'zlib')
-makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
-options=('!emptydirs')
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz"
-        "https://github.com/mate-desktop/eom/commit/e62ed087493c8a529d4eeab46c7d68a2047ac81a.diff")
-sha1sums=('37e638790329350bb772a40549741f89ed43952c'
-          'a2f0810a48d81023e9bae29d80b682ae0fe9faac')
-install=${pkgname}.install
-
-prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    #Use GETTEXT_PACKAGE instead of PACKAGE
-    patch -Np1 -i "${srcdir}/e62ed087493c8a529d4eeab46c7d68a2047ac81a.diff"
-}
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    PYTHON=/usr/bin/python2 ./configure \
-        --prefix=/usr \
-        --localstatedir=/var \
-        --disable-scrollkeeper
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community/mate-keyring/PKGBUILD b/community/mate-keyring/PKGBUILD
deleted file mode 100644
index 7b67fa117..000000000
--- a/community/mate-keyring/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 104168 2014-01-16 15:04:52Z flexiondotorg $
-# Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
-
-pkgname=mate-keyring
-pkgver=1.6.1
-pkgrel=3
-pkgdesc="MATE Password Management daemon"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('dbus' 'dconf' 'gtk2' 'libtasn1' 'pam')
-makedepends=('docbook-xml' 'mate-common' 'perl-xml-parser')
-options=('!emptydirs')
-groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('7b2e0201d4f4eb0f728dbf1626d5aa05b2d05675')
-install=${pkgname}.install
-
-prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    # Prevent gck conflict with gnome gcr lib
-    sed -e 's/DOC_MODULE=gck/DOC_MODULE=mate-gck/' -i docs/reference/gck/Makefile.am
-    autoreconf -fi
-    intltoolize -c -f
-}
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib/${pkgname} \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --with-pam-dir=/usr/lib/security \
-        --with-root-certs=/etc/ssl/certs \
-        --disable-static
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community/mate-media/PKGBUILD b/community/mate-media/PKGBUILD
index 33c3510e2..1b954cf0d 100644
--- a/community/mate-media/PKGBUILD
+++ b/community/mate-media/PKGBUILD
@@ -1,60 +1,59 @@
-# $Id: PKGBUILD 104197 2014-01-16 16:38:43Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
 
 pkgbase=mate-media
 pkgname=("${pkgbase}-pulseaudio" "${pkgbase}-gstreamer")
-pkgver=1.6.1
-pkgrel=1
+pkgver=1.8.0
+pkgrel=3
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('gstreamer0.10-base-plugins' 'gtk2' 'libcanberra-pulse' 'libunique'
-         'mate-desktop' 'mate-window-manager' 'pulseaudio')
-makedepends=('mate-common' 'mate-doc-utils' 'mate-panel'
-             'mate-settings-daemon-gstreamer' 'perl-xml-parser')
+         'marco' 'mate-desktop' 'pulseaudio')
+makedepends=('mate-common' 'mate-panel' 'mate-settings-daemon-gstreamer'
+             'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
 options=('!emptydirs')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('39acbf670a384325b5f68487e62bb1bdddb7d68f')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('8ec726baa6c6b02664a1190aedbc2467ec562a89')
 
 build() {
     cd "${srcdir}"
     cp -a ${pkgbase}-${pkgver}{,-gstreamer}
-    
+
     # build for pulseaudio
     cd "${srcdir}/${pkgbase}-${pkgver}"
-    ./autogen.sh \
+    ./configure \
         --prefix=/usr \
         --sysconfdir=/etc \
         --libexecdir=/usr/lib/${pkgbase} \
         --localstatedir=/var \
+        --with-gtk=2.0 \
         --enable-pulseaudio \
         --disable-gstmix \
         --disable-gst-mixer-applet \
-        --disable-static \
-        --disable-scrollkeeper
+        --disable-static
     make
-    
+
     # build for gstreamer
     cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer"
-    ./autogen.sh \
+    ./configure \
         --prefix=/usr \
         --sysconfdir=/etc \
         --libexecdir=/usr/lib/${pkgbase} \
         --localstatedir=/var \
+        --with-gtk=2.0 \
         --enable-gstmix \
         --enable-gst-mixer-applet \
         --enable-deprecated \
         --disable-pulseaudio \
-        --disable-static \
-        --disable-scrollkeeper
+        --disable-static
     make
 }
 
 package_mate-media-pulseaudio() {
     groups=('mate-extra')
     pkgdesc="MATE Media Tools (pulseaudio)"
-    depends=('libcanberra-pulse' 'libunique' 'mate-desktop' 'mate-window-manager'
-             'pulseaudio')
+    depends=('libcanberra-pulse' 'libunique' 'marco' 'mate-desktop' 'pulseaudio')
     conflicts=("${pkgbase}-gstreamer" 'mate-settings-daemon-gstreamer')
     provides=("${pkgbase}")
     replaces=("${pkgbase}")
@@ -64,8 +63,8 @@ package_mate-media-pulseaudio() {
 
 package_mate-media-gstreamer() {
     pkgdesc="MATE Media Tools (GStreamer)"
-    depends=('gstreamer0.10-base-plugins' 'gtk2' 'libcanberra' 'mate-desktop'
-             'mate-window-manager')
+    depends=('gstreamer0.10-base-plugins' 'gtk2' 'libcanberra' 'marco' 
+             'mate-desktop')
     optdepends=('mate-panel: Volume control for the panel')
     conflicts=("${pkgbase}-pulseaudio" 'mate-settings-daemon-pulseaudio')
     provides=("${pkgbase}")    
diff --git a/community/mate-menus/PKGBUILD b/community/mate-menus/PKGBUILD
index d236e328e..e07cd6a41 100644
--- a/community/mate-menus/PKGBUILD
+++ b/community/mate-menus/PKGBUILD
@@ -1,25 +1,22 @@
-# $Id: PKGBUILD 104193 2014-01-16 16:26:41Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
 
 pkgname=mate-menus
-pkgver=1.6.0
-pkgrel=3
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="MATE menu specifications"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('glib2' 'python2')
-makedepends=('gobject-introspection'  'mate-common' 'perl-xml-parser')
+makedepends=('gobject-introspection' 'mate-common' 'perl-xml-parser')
 options=('!emptydirs')
 groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('798e1e96e8dea48d93f1db90b6fbe69d0a3f3ea5')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('e2c3eda5123da8ff30dcd5f86c4ad9426e34a7b5')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
-    PYTHON=/usr/bin/python2 ./autogen.sh \
+    PYTHON=/usr/bin/python2 ./configure \
         --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
diff --git a/community/mate-netbook/PKGBUILD b/community/mate-netbook/PKGBUILD
index eaba0ab36..102cc7061 100644
--- a/community/mate-netbook/PKGBUILD
+++ b/community/mate-netbook/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 104240 2014-01-16 17:53:25Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Xpander <xpander0@gmail.com>
 
 pkgname=mate-netbook
-pkgver=1.6.1
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="A simple window management tool."
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gtk2' 'libfakekey' 'libmatewnck' 'libunique' 'mate-panel')
-makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+depends=('gtk2' 'libfakekey' 'libwnck' 'libunique' 'mate-panel')
+makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
 options=('!emptydirs')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('8aa6f4802bbe5ef7aef9d601a4172d1304d6bb86')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('64723fcf6a3a42e7faacfb54fb0c85103af5b1ba')
 install=${pkgname}.install
 
 build() {
@@ -22,6 +21,7 @@ build() {
         --prefix=/usr \
         --libexec=/usr/lib/${pkgname} \
         --sysconfdir=/etc \
+        --with-gtk=2.0 \
         --disable-static
     make
 }
diff --git a/community/mate-netspeed/PKGBUILD b/community/mate-netspeed/PKGBUILD
index 883a6a108..a0081d010 100644
--- a/community/mate-netspeed/PKGBUILD
+++ b/community/mate-netspeed/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 105369 2014-02-06 05:24:15Z bisson $
 # Maintainer : Martin Wimpress <code@flexion.org>
 
 pkgname=mate-netspeed
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="A MATE applet that shows how much traffic occurs on a specified network device."
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('gtk2' 'libgtop' 'mate-panel' 'wireless_tools')
-makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
-options=('!emptydirs')
+makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
 groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('4b9c8b7f7ff59ef8ad989821fe360f5f459c66ed')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('d5e9f408ccaedbdeb3917b1d560288420f7f2c3f')
 install=${pkgname}.install
 
 build() {
@@ -21,8 +20,7 @@ build() {
     ./configure \
         --prefix=/usr \
         --libexecdir=/usr/lib/${pkgname} \
-        --disable-static \
-        --disable-scrollkeeper
+        --disable-static
     make
 }
 
diff --git a/community/mate-notification-daemon/PKGBUILD b/community/mate-notification-daemon/PKGBUILD
index 0201510a6..7cbbb6aa0 100644
--- a/community/mate-notification-daemon/PKGBUILD
+++ b/community/mate-notification-daemon/PKGBUILD
@@ -1,22 +1,19 @@
-# $Id: PKGBUILD 104203 2014-01-16 16:45:28Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
 
 pkgname=mate-notification-daemon
-pkgver=1.6.1
-pkgrel=3
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="Notification daemon for MATE"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
-depends=('dconf' 'dbus-glib' 'gtk2' 'libcanberra' 'libmatewnck' 'libnotify')
+depends=('dconf' 'dbus-glib' 'gtk2' 'libcanberra' 'libwnck' 'libnotify')
 makedepends=('mate-common' 'perl-xml-parser')
 options=('!emptydirs')
 groups=('mate')
 provides=('notification-daemon')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('b911efdc4e37dc0b521165168fee03889f776c12')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('5f663ee460b7a4cdeab9d4ee3b17746e0eabb78d')
 install=${pkgname}.install
 
 build() {
@@ -24,6 +21,7 @@ build() {
     ./configure \
         --prefix=/usr \
         --libexecdir=/usr/lib/${pkgname} \
+        --with-gtk=2.0 \
         --disable-static
     make
 }
diff --git a/community/mate-panel/PKGBUILD b/community/mate-panel/PKGBUILD
index 9fa14e4a8..acb846d76 100644
--- a/community/mate-panel/PKGBUILD
+++ b/community/mate-panel/PKGBUILD
@@ -1,22 +1,22 @@
 # Maintainer : Martin Wimpress <code@flexion.org>
 
 pkgname=mate-panel
-pkgver=1.6.2
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="The MATE Panel"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('dbus-glib' 'dconf' 'gtk2' 'libmatewnck' 'libcanberra' 'libice'
-         'libmateweather' 'librsvg' 'libsm'
-         'libsoup' 'libxau' 'mate-desktop' 'mate-file-manager'
-         'mate-menus' 'mate-session-manager' 'mate-window-manager')
-makedepends=('gobject-introspection' 'mate-common' 'mate-doc-utils'
-             'networkmanager' 'perl-xml-parser')
+depends=('caja' 'dbus-glib' 'dconf' 'gtk2' 'libwnck' 'libcanberra' 'libice'
+         'libmateweather' 'librsvg' 'libsm' 'libsoup' 'libxau' 'marco'
+         'mate-menus' 'mate-desktop' 'mate-session-manager')
+makedepends=('gobject-introspection' 'mate-common' 'networkmanager'
+             'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
 options=('!emptydirs')
 groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('a02d8a678b9235f231002feb4ecef7171939161e')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('289bca55fb26465f2c155d087932d6973edf07d9')
 install=${pkgname}.install
 
 build() {
@@ -26,9 +26,9 @@ build() {
         --libexecdir=/usr/lib/${pkgname} \
         --sysconfdir=/etc \
         --localstatedir=/var \
+        --with-gtk=2.0 \
         --enable-introspection \
-        --disable-static \
-        --disable-scrollkeeper
+        --disable-static
     make
 }
 
diff --git a/community/mate-polkit/PKGBUILD b/community/mate-polkit/PKGBUILD
index 67d8f1963..6ae1d5dd9 100644
--- a/community/mate-polkit/PKGBUILD
+++ b/community/mate-polkit/PKGBUILD
@@ -1,10 +1,7 @@
-# $Id: PKGBUILD 104183 2014-01-16 15:57:10Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
 
 pkgname=mate-polkit
-pkgver=1.6.1
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="PolicyKit integration for the MATE desktop"
 url="http://mate-desktop.org"
@@ -14,16 +11,17 @@ depends=('gtk2' 'polkit')
 makedepends=('gobject-introspection' 'mate-common' 'perl-xml-parser')
 options=('!emptydirs')
 groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('43afbbb0a9e4c1295bdd0f788ad7effd776dccf2')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('8b74b8d270a0392b9b54ae12693df2bdea1f429a')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure \
         --prefix=/usr \
-        --libexecdir=/usr/lib/polkit-mate \
+        --libexecdir=/usr/lib/${pkgname} \
         --sysconfdir=/etc \
         --localstatedir=/var \
+        --with-gtk=2.0 \
         --enable-introspection \
         --disable-static
     make
diff --git a/community/mate-power-manager/PKGBUILD b/community/mate-power-manager/PKGBUILD
index 74d83b619..dfc4f74ef 100644
--- a/community/mate-power-manager/PKGBUILD
+++ b/community/mate-power-manager/PKGBUILD
@@ -1,25 +1,21 @@
-# $Id: PKGBUILD 104214 2014-01-16 17:11:58Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
-# Contributor: hekel <hekel@archlinux.info>
 
 pkgname=mate-power-manager
-pkgver=1.6.3
-pkgrel=3
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system for Mate Desktop"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('dbus-glib' 'dconf' 'libcanberra' 'libmatekeyring' 'libnotify'
-         'libunique' 'upower')
-makedepends=('docbook2x' 'docbook-xml' 'mate-common' 'mate-doc-utils'
-             'mate-panel' 'perl-xml-parser' 'xmlto')
-optdepends=('mate-panel: Set brightness and inhibit power management from the panel')
+depends=('dbus-glib' 'dconf' 'libcanberra' 'libgnome-keyring' 'libnotify' 
+         'libunique' 'mate-panel' 'upower')
+makedepends=('docbook2x' 'docbook-xml' 'mate-common' 'perl-xml-parser'
+             'xmlto' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
 options=('!emptydirs')
 groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('a949e34494cb70bcb2fa349dcc35847f022be187')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('5cde22f2d6498294a76e3bf9005b4f73bbdd0db8')
 install=${pkgname}.install
 
 prepare() {
@@ -37,8 +33,7 @@ build() {
         --localstatedir=/var \
         --sbindir=/usr/bin \
         --enable-applets \
-        --enable-unique \
-        --disable-scrollkeeper
+        --enable-unique
     make
 }
 
diff --git a/community/mate-screensaver/PKGBUILD b/community/mate-screensaver/PKGBUILD
index 3ff0d4b0b..b93ea1458 100644
--- a/community/mate-screensaver/PKGBUILD
+++ b/community/mate-screensaver/PKGBUILD
@@ -1,22 +1,23 @@
 # Maintainer : Martin Wimpress <code@flexion.org>
 
 pkgname=mate-screensaver
-pkgver=1.6.2
-pkgrel=3
+pkgver=1.8.0
+pkgrel=1
 pkgdesc='Screensaver for MATE'
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('dbus-glib' 'libmatekbd' 'libnotify' 'libxss' 'mate-desktop'
          'mate-menus' 'mate-session-manager')
-makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser' 'xmlto')
+makedepends=('mate-common' 'perl-xml-parser' 'xmlto' 'yelp-tools')
 optdepends=('mate-power-manager: Add power management support.'
             'mate-screensaver-hacks: Additional screensavers.'
-            'rss-glx: Really slick screensavers.')
+            'rss-glx: Really slick screensavers.'
+            'yelp: for reading MATE help documents')
 options=('!emptydirs')
 groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('f8101af15e909ca40c1546bda637712e00458a67')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('b7ab88c3ee5b513630ff99a64c18626ed8ef49fa')
 install=${pkgname}.install
 
 build() {
diff --git a/community/mate-sensors-applet/PKGBUILD b/community/mate-sensors-applet/PKGBUILD
index c78432fa8..715061ae9 100644
--- a/community/mate-sensors-applet/PKGBUILD
+++ b/community/mate-sensors-applet/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 104246 2014-01-16 18:03:24Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
-# Contributor: Xpander <xpander0@gmail.com>
 
 pkgname=mate-sensors-applet
-pkgver=1.6.1
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="A MATE Panel applet to display readings from hardware sensors, including CPU temperature, fan speeds and voltage readings."
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('dbus' 'gtk2' 'libatasmart' 'libnotify' 'libxnvctrl' 'lm_sensors' 'mate-panel' )
-makedepends=('docbook-xml' 'mate-common' 'mate-doc-utils' 'perl-xml-parser' 'rarian')
+depends=('dbus' 'gtk2' 'libatasmart' 'libnotify' 'libxnvctrl' 'lm_sensors'
+         'mate-panel' 'yelp')
+makedepends=('docbook-xml' 'mate-common' 'perl-xml-parser' 'rarian' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
 options=('!emptydirs')
 groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('3b57d8e4b47ff2b25bbcee465c0ef7c37bcff1f7')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('0526400ad88b306fc74b2e219ce4aea34476577f')
 install=${pkgname}.install
 
 build() {
@@ -23,8 +22,7 @@ build() {
     ./configure \
         --prefix=/usr \
         --libexecdir=/usr/lib/${pkgname} \
-        --disable-static \
-        --disable-scrollkeeper
+        --disable-static
   make
 }
 
diff --git a/community/mate-session-manager/PKGBUILD b/community/mate-session-manager/PKGBUILD
index e493b23eb..fb006dcc8 100644
--- a/community/mate-session-manager/PKGBUILD
+++ b/community/mate-session-manager/PKGBUILD
@@ -1,41 +1,22 @@
-# $Id: PKGBUILD 105093 2014-01-31 12:59:35Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
 
 pkgname=mate-session-manager
-pkgver=1.6.1
-pkgrel=10
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="The MATE Session Handler"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
 depends=('dbus-glib' 'gtk2' 'libsm' 'libxtst' 'mate-desktop' 'mate-polkit'
-         'mate-settings-daemon' 'xdg-user-dirs')
+         'mate-settings-daemon' 'upower' 'xdg-user-dirs')
 makedepends=('mate-common' 'perl-xml-parser' 'xmlto')
 optdepends=('xdg-user-dirs-gtk: Add autostart that prompts to rename user directories when switching locales')
 options=('!emptydirs')
 groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz"
-        f0b5b1ab78879d64f80117415aacf029359afea5.diff
-        e934e91226e9a93956121c9c84ecf3664fcd68be.diff)
-sha1sums=('46188f6c02cc5978688af9d5db4be09f1b9199a5'
-          '20fb99c29731d05191cd0029d0573db784b06ccf'
-          '4312495bcd12ca5a20f7d5442b7517902605534c')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('2dbb537ba2cc31a8d4f1fa02afd6dabc2919aaa3')
 install=${pkgname}.install
 
-prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    # fix systemd-login1 support for hibernate/suspend
-    # https://github.com/mate-desktop/mate-session-manager/commit/f0b5b1ab78879d64f80117415aacf029359afea5
-    patch -Np1 -i "${srcdir}/f0b5b1ab78879d64f80117415aacf029359afea5.diff"
-
-    # Make upower optional
-    # https://github.com/mate-desktop/mate-session-manager/commit/e934e91226e9a93956121c9c84ecf3664fcd68be
-    patch -Np1 -i "${srcdir}/e934e91226e9a93956121c9c84ecf3664fcd68be.diff"
-
-    # Recreate the build system because configure.ac was patched.
-    autoreconf -fi
-}
-
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure \
@@ -43,7 +24,7 @@ build() {
         --libexecdir=/usr/lib/${pkgname} \
         --sysconfdir=/etc \
         --localstatedir=/var \
-        --disable-upower
+        --with-gtk=2.0
     make
 }
 
diff --git a/community/mate-session-manager/e934e91226e9a93956121c9c84ecf3664fcd68be.diff b/community/mate-session-manager/e934e91226e9a93956121c9c84ecf3664fcd68be.diff
deleted file mode 100644
index bd42a4722..000000000
--- a/community/mate-session-manager/e934e91226e9a93956121c9c84ecf3664fcd68be.diff
+++ /dev/null
@@ -1,293 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 37bb191..a9e20ef 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,7 +70,6 @@ PKG_CHECK_MODULES(MATE_SESSION,
-         gio-2.0 >= $GIO_REQUIRED
-         gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
-         dbus-glib-1 >= $DBUS_GLIB_REQUIRED
--        upower-glib >= $UPOWER_REQUIRED
- )
- 
- PKG_CHECK_MODULES(SESSION_PROPERTIES,
-@@ -128,6 +127,24 @@ AM_CONDITIONAL(HAVE_SYSTEMD, test "x$use_systemd" = "xyes")
- AC_SUBST(HAVE_SYSTEMD)
- 
- dnl ====================================================================
-+dnl UPOWER
-+dnl ====================================================================
-+
-+AC_ARG_ENABLE(upower,
-+              AS_HELP_STRING([--enable-upower],
-+              [Use upower to suspend/hibernate]),
-+              enable_upower=$enableval,
-+              enable_upower=yes)
-+if test "x$enable_upower" = "xyes"; then
-+    PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED, has_upower=yes, has_upower=no)
-+    AC_DEFINE(HAVE_UPOWER, 1, [upower support])
-+    AC_SUBST(UPOWER_CFLAGS)
-+    AC_SUBST(UPOWER_LIBS)
-+fi
-+AM_CONDITIONAL(HAVE_UPOWER, test "x$enable_upower" = "xyes")
-+AC_SUBST(HAVE_UPOWER)
-+
-+dnl ====================================================================
- dnl X development libraries check
- dnl ====================================================================
- 
-@@ -385,6 +402,7 @@ echo "
-         GTK+ version:             ${with_gtk}
-         Default WM:               ${with_default_wm}
-         Systemd support:          ${use_systemd}
-+        Upower support:           ${enable_upower}
-         IPv6 support:             ${have_full_ipv6}
-         Backtrace support:        ${have_backtrace}
-         XRender support:          ${have_xrender}
-diff --git a/mate-session/Makefile.am b/mate-session/Makefile.am
-index f37a0e2..53f0fc7 100644
---- a/mate-session/Makefile.am
-+++ b/mate-session/Makefile.am
-@@ -7,6 +7,7 @@ noinst_PROGRAMS = 		\
- AM_CPPFLAGS =					\
- 	$(MATE_SESSION_CFLAGS)		\
- 	$(SYSTEMD_CFLAGS)			\
-+	$(UPOWER_CFLAGS)			\
- 	$(DISABLE_DEPRECATED_CFLAGS)
- 
- AM_CFLAGS = $(WARN_CFLAGS)
-@@ -76,6 +77,7 @@ mate_session_LDADD =				\
- 	$(XEXT_LIBS)				\
- 	$(MATE_SESSION_LIBS)			\
- 	$(SYSTEMD_LIBS)				\
-+	$(UPOWER_LIBS)				\
- 	$(EXECINFO_LIBS)
- 
- libgsmutil_la_SOURCES =				\
-diff --git a/mate-session/gsm-logout-dialog.c b/mate-session/gsm-logout-dialog.c
-index 1a79875..323f123 100644
---- a/mate-session/gsm-logout-dialog.c
-+++ b/mate-session/gsm-logout-dialog.c
-@@ -27,7 +27,9 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- 
-+#ifdef HAVE_UPOWER
- #include <upower.h>
-+#endif
- 
- #include "gsm-logout-dialog.h"
- #ifdef HAVE_SYSTEMD
-@@ -52,8 +54,9 @@
- struct _GsmLogoutDialogPrivate
- {
-         GsmDialogLogoutType  type;
--
-+#ifdef HAVE_UPOWER
-         UpClient            *up_client;
-+#endif
- #ifdef HAVE_SYSTEMD
-         GsmSystemd          *systemd;
- #endif
-@@ -147,9 +150,9 @@ enum {
-         gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE);
-         gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
-         gtk_window_stick (GTK_WINDOW (logout_dialog));
--
-+#ifdef HAVE_UPOWER
-         logout_dialog->priv->up_client = up_client_new ();
--
-+#endif
- #ifdef HAVE_SYSTEMD
-         if (LOGIND_RUNNING())
-             logout_dialog->priv->systemd = gsm_get_systemd ();
-@@ -176,12 +179,12 @@ enum {
-                 g_source_remove (logout_dialog->priv->timeout_id);
-                 logout_dialog->priv->timeout_id = 0;
-         }
--
-+#ifdef HAVE_UPOWER
-         if (logout_dialog->priv->up_client) {
-                 g_object_unref (logout_dialog->priv->up_client);
-                 logout_dialog->priv->up_client = NULL;
-         }
--
-+#endif
- #ifdef HAVE_SYSTEMD
-         if (logout_dialog->priv->systemd) {
-                 g_object_unref (logout_dialog->priv->systemd);
-@@ -201,13 +204,17 @@ enum {
- gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog)
- {
-         gboolean ret;
-+        ret = FALSE;
- #ifdef HAVE_SYSTEMD
-         if (LOGIND_RUNNING())
-             ret = gsm_systemd_can_suspend (logout_dialog->priv->systemd);
-+#endif
-+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-         else
- #endif
-+#ifdef HAVE_UPOWER
-         ret = up_client_get_can_suspend (logout_dialog->priv->up_client);
--
-+#endif
-         return ret;
- }
- 
-@@ -215,13 +222,17 @@ enum {
- gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog)
- {
-         gboolean ret;
-+        ret = FALSE;
- #ifdef HAVE_SYSTEMD
-         if (LOGIND_RUNNING())
-             ret = gsm_systemd_can_hibernate (logout_dialog->priv->systemd);
-+#endif
-+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-         else
- #endif
-+#ifdef HAVE_UPOWER
-         ret = up_client_get_can_hibernate (logout_dialog->priv->up_client);
--
-+#endif
-         return ret;
- }
- 
-diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
-index 79d0829..17a20b8 100644
---- a/mate-session/gsm-manager.c
-+++ b/mate-session/gsm-manager.c
-@@ -38,7 +38,9 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
- 
-+#ifdef HAVE_UPOWER
- #include <upower.h>
-+#endif
- 
- #include <gtk/gtk.h> /* for logout dialog */
- #include <gio/gio.h> /* for gsettings */
-@@ -144,9 +146,10 @@ struct GsmManagerPrivate
- 
-         DBusGProxy             *bus_proxy;
-         DBusGConnection        *connection;
--
-+#ifdef HAVE_UPOWER
-         /* Interface with other parts of the system */
-         UpClient               *up_client;
-+#endif
- };
- 
- enum {
-@@ -1097,10 +1100,11 @@ enum {
- static void
- manager_attempt_hibernate (GsmManager *manager)
- {
-+#ifdef HAVE_UPOWER
-         gboolean  can_hibernate;
-         GError   *error;
-         gboolean  ret;
--
-+#endif
- #ifdef HAVE_SYSTEMD
-         if (LOGIND_RUNNING()) {
- 
-@@ -1113,8 +1117,11 @@ enum {
- 
-                 gsm_systemd_attempt_hibernate (systemd);
-         }
-+#endif
-+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-         else {
- #endif
-+#ifdef HAVE_UPOWER
-         can_hibernate = up_client_get_can_hibernate (manager->priv->up_client);
-         if (can_hibernate) {
- 
-@@ -1129,7 +1136,8 @@ enum {
-                         g_error_free (error);
-                 }
-         }
--#ifdef HAVE_SYSTEMD
-+#endif
-+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-         }
- #endif
- }
-@@ -1137,10 +1145,11 @@ enum {
- static void
- manager_attempt_suspend (GsmManager *manager)
- {
-+#ifdef HAVE_UPOWER
-         gboolean  can_suspend;
-         GError   *error;
-         gboolean  ret;
--
-+#endif
- #ifdef HAVE_SYSTEMD
-         if (LOGIND_RUNNING()) {
- 
-@@ -1153,8 +1162,11 @@ enum {
- 
-                 gsm_systemd_attempt_suspend (systemd);
-         }
-+#endif
-+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-         else {
- #endif
-+#ifdef HAVE_UPOWER
-         can_suspend = up_client_get_can_suspend (manager->priv->up_client);
-         if (can_suspend) {
- 
-@@ -1169,7 +1181,8 @@ enum {
-                         g_error_free (error);
-                 }
-         }
--#ifdef HAVE_SYSTEMD
-+#endif
-+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
-         }
- #endif
- }
-@@ -2341,12 +2354,12 @@ enum {
-                 g_object_unref (manager->priv->settings_screensaver);
-                 manager->priv->settings_screensaver = NULL;
-         }
--
-+#ifdef HAVE_UPOWER
-         if (manager->priv->up_client != NULL) {
-                 g_object_unref (manager->priv->up_client);
-                 manager->priv->up_client = NULL;
-         }
--
-+#endif
-         G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object);
- }
- 
-@@ -2553,9 +2566,9 @@ enum {
-                           "status-changed",
-                           G_CALLBACK (on_presence_status_changed),
-                           manager);
--
-+#ifdef HAVE_UPOWER
-         manager->priv->up_client = up_client_new ();
--
-+#endif
-         g_signal_connect (manager->priv->settings_session,
-                           "changed",
-                           G_CALLBACK (on_gsettings_key_changed),
-@@ -3224,12 +3237,12 @@ enum {
- #endif
-         gboolean can_suspend;
-         gboolean can_hibernate;
--
-+#ifdef HAVE_UPOWER
-         g_object_get (manager->priv->up_client,
-                       "can-suspend", &can_suspend,
-                       "can-hibernate", &can_hibernate,
-                       NULL);
--
-+#endif
-         g_debug ("GsmManager: CanShutdown called");
- 
-         g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
diff --git a/community/mate-session-manager/f0b5b1ab78879d64f80117415aacf029359afea5.diff b/community/mate-session-manager/f0b5b1ab78879d64f80117415aacf029359afea5.diff
deleted file mode 100644
index ffbe19a5d..000000000
--- a/community/mate-session-manager/f0b5b1ab78879d64f80117415aacf029359afea5.diff
+++ /dev/null
@@ -1,271 +0,0 @@
-diff --git a/mate-session/gsm-logout-dialog.c b/mate-session/gsm-logout-dialog.c
-index 2d2947c..1a79875 100644
---- a/mate-session/gsm-logout-dialog.c
-+++ b/mate-session/gsm-logout-dialog.c
-@@ -200,13 +200,29 @@ enum {
- static gboolean
- gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog)
- {
--        return up_client_get_can_suspend (logout_dialog->priv->up_client);
-+        gboolean ret;
-+#ifdef HAVE_SYSTEMD
-+        if (LOGIND_RUNNING())
-+            ret = gsm_systemd_can_suspend (logout_dialog->priv->systemd);
-+        else
-+#endif
-+        ret = up_client_get_can_suspend (logout_dialog->priv->up_client);
-+
-+        return ret;
- }
- 
- static gboolean
- gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog)
- {
--        return up_client_get_can_hibernate (logout_dialog->priv->up_client);
-+        gboolean ret;
-+#ifdef HAVE_SYSTEMD
-+        if (LOGIND_RUNNING())
-+            ret = gsm_systemd_can_hibernate (logout_dialog->priv->systemd);
-+        else
-+#endif
-+        ret = up_client_get_can_hibernate (logout_dialog->priv->up_client);
-+
-+        return ret;
- }
- 
- static gboolean
-diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
-index 8143d1f..b4986ac 100644
---- a/mate-session/gsm-manager.c
-+++ b/mate-session/gsm-manager.c
-@@ -1109,6 +1109,20 @@ enum {
-         GError   *error;
-         gboolean  ret;
- 
-+#ifdef HAVE_SYSTEMD
-+        if (LOGIND_RUNNING()) {
-+
-+                GsmSystemd *systemd;
-+
-+                systemd = gsm_get_systemd ();
-+
-+                /* lock the screen before we suspend */
-+                manager_perhaps_lock (manager);
-+
-+                gsm_systemd_attempt_hibernate (systemd);
-+        }
-+        else {
-+#endif
-         can_hibernate = up_client_get_can_hibernate (manager->priv->up_client);
-         if (can_hibernate) {
- 
-@@ -1123,6 +1137,9 @@ enum {
-                         g_error_free (error);
-                 }
-         }
-+#ifdef HAVE_SYSTEMD
-+        }
-+#endif
- }
- 
- static void
-@@ -1132,6 +1149,20 @@ enum {
-         GError   *error;
-         gboolean  ret;
- 
-+#ifdef HAVE_SYSTEMD
-+        if (LOGIND_RUNNING()) {
-+
-+                GsmSystemd *systemd;
-+
-+                systemd = gsm_get_systemd ();
-+
-+                /* lock the screen before we suspend */
-+                manager_perhaps_lock (manager);
-+
-+                gsm_systemd_attempt_suspend (systemd);
-+        }
-+        else {
-+#endif
-         can_suspend = up_client_get_can_suspend (manager->priv->up_client);
-         if (can_suspend) {
- 
-@@ -1146,6 +1177,9 @@ enum {
-                         g_error_free (error);
-                 }
-         }
-+#ifdef HAVE_SYSTEMD
-+        }
-+#endif
- }
- 
- static void
-diff --git a/mate-session/gsm-systemd.c b/mate-session/gsm-systemd.c
-index 377f026..dbe8ea0 100644
---- a/mate-session/gsm-systemd.c
-+++ b/mate-session/gsm-systemd.c
-@@ -725,6 +725,141 @@ static void     gsm_systemd_on_name_owner_changed (DBusGProxy       *bus_proxy,
-     return can_stop;
- }
- 
-+gboolean
-+gsm_systemd_can_hibernate (GsmSystemd *manager)
-+{
-+  gboolean res;
-+  gchar   *value;
-+  gboolean can_hibernate;
-+  GError  *error;
-+  
-+  error = NULL;
-+  
-+  if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
-+    g_warning ("Could not connect to Systemd: %s",
-+	       error->message);
-+    g_error_free (error);
-+    return FALSE;
-+  }
-+  
-+  res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy,
-+					"CanHibernate",
-+					INT_MAX,
-+					&error,
-+					G_TYPE_INVALID,
-+					G_TYPE_STRING, &value,
-+					G_TYPE_INVALID);
-+  if (res == FALSE) {
-+    g_warning ("Could not make DBUS call: %s",
-+	       error->message);
-+    g_error_free (error);
-+    return FALSE;
-+  }
-+  
-+  can_hibernate = g_strcmp0 (value, "yes") == 0 ||
-+  g_strcmp0 (value, "challenge") == 0;
-+  g_free (value);
-+  return can_hibernate;
-+}
-+
-+gboolean
-+gsm_systemd_can_suspend (GsmSystemd *manager)
-+{
-+  gboolean res;
-+  gchar   *value;
-+  gboolean can_suspend;
-+  GError  *error;
-+  
-+  error = NULL;
-+  
-+  if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
-+    g_warning ("Could not connect to Systemd: %s",
-+	       error->message);
-+    g_error_free (error);
-+    return FALSE;
-+  }
-+  
-+  res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy,
-+					"CanSuspend",
-+					INT_MAX,
-+					&error,
-+					G_TYPE_INVALID,
-+					G_TYPE_STRING, &value,
-+					G_TYPE_INVALID);
-+  if (res == FALSE) {
-+    g_warning ("Could not make DBUS call: %s",
-+	       error->message);
-+    g_error_free (error);
-+    return FALSE;
-+  }
-+  
-+  can_suspend = g_strcmp0 (value, "yes") == 0 ||
-+  g_strcmp0 (value, "challenge") == 0;
-+  g_free (value);
-+  return can_suspend;
-+}
-+
-+void
-+gsm_systemd_attempt_hibernate (GsmSystemd *manager)
-+{
-+  gboolean res;
-+  GError  *error;
-+  
-+  error = NULL;
-+  
-+  if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
-+    g_warning ("Could not connect to Systemd: %s",
-+	       error->message);
-+    g_error_free (error);
-+    return FALSE;
-+  }
-+  
-+  res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy,
-+					"Hibernate",
-+					INT_MAX,
-+					&error,
-+                                        G_TYPE_BOOLEAN, TRUE, /* interactive */
-+					G_TYPE_INVALID,
-+					G_TYPE_INVALID);
-+  if (res == FALSE) {
-+    g_warning ("Could not make DBUS call: %s",
-+	       error->message);
-+    g_error_free (error);
-+    return FALSE;
-+  }
-+  
-+}
-+
-+void
-+gsm_systemd_attempt_suspend (GsmSystemd *manager)
-+{
-+  gboolean res;
-+  GError  *error;
-+  
-+  error = NULL;
-+  
-+  if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
-+    g_warning ("Could not connect to Systemd: %s",
-+	       error->message);
-+    g_error_free (error);
-+    return FALSE;
-+  }
-+  
-+  res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy,
-+					"Suspend",
-+					INT_MAX,
-+					&error,
-+                                        G_TYPE_BOOLEAN, TRUE, /* interactive */
-+                                        G_TYPE_INVALID,
-+					G_TYPE_INVALID);
-+  if (res == FALSE) {
-+    g_warning ("Could not make DBUS call: %s",
-+	       error->message);
-+    g_error_free (error);
-+    return FALSE;
-+  }
-+}
-+
- gchar *
- gsm_systemd_get_current_session_type (GsmSystemd *manager)
- {
-diff --git a/mate-session/gsm-systemd.h b/mate-session/gsm-systemd.h
-index 8e886ba..e0e21c4 100644
---- a/mate-session/gsm-systemd.h
-+++ b/mate-session/gsm-systemd.h
-@@ -89,10 +89,18 @@ enum _GsmSystemdError {
- 
- gboolean         gsm_systemd_can_restart     (GsmSystemd *manager);
- 
-+gboolean         gsm_systemd_can_hibernate     (GsmSystemd *manager);
-+
-+gboolean         gsm_systemd_can_suspend     (GsmSystemd *manager);
-+
- void             gsm_systemd_attempt_stop    (GsmSystemd *manager);
- 
- void             gsm_systemd_attempt_restart (GsmSystemd *manager);
- 
-+void             gsm_systemd_attempt_hibernate (GsmSystemd *manager);
-+
-+void             gsm_systemd_attempt_suspend (GsmSystemd *manager);
-+
- void             gsm_systemd_set_session_idle (GsmSystemd *manager,
-                                                   gboolean       is_idle);
- 
diff --git a/community/mate-session-manager/mate-session-manager.install b/community/mate-session-manager/mate-session-manager.install
index b30edffe9..7af080f58 100644
--- a/community/mate-session-manager/mate-session-manager.install
+++ b/community/mate-session-manager/mate-session-manager.install
@@ -1,6 +1,6 @@
 post_install() {
     glib-compile-schemas /usr/share/glib-2.0/schemas/
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor    
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/community/mate-settings-daemon/PKGBUILD b/community/mate-settings-daemon/PKGBUILD
index 307271771..813d42fc1 100644
--- a/community/mate-settings-daemon/PKGBUILD
+++ b/community/mate-settings-daemon/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 105085 2014-01-31 11:55:11Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
 
 pkgbase=mate-settings-daemon
 pkgname=("${pkgbase}-pulseaudio" "${pkgbase}-gstreamer")
-pkgver=1.6.2
-pkgrel=6
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="The MATE Settings daemon"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
@@ -13,8 +12,8 @@ depends=('dbus-glib' 'dconf' 'fontconfig' 'gstreamer0.10-base' 'gtk2'
          'libcanberra-pulse' 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop'
          'nss' 'polkit' 'pulseaudio-alsa')
 makedepends=('mate-common' 'perl-xml-parser')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('76c50bddcffd6b0415b058c828784bcd11c034ee')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('f36819914e03c0f3ceda209fba17a2063990078b')
 install=${pkgbase}.install
 
 build() {
@@ -27,6 +26,7 @@ build() {
         --prefix=/usr \
         --libexecdir=/usr/lib/${pkgbase} \
         --sysconfdir=/etc \
+        --with-gtk=2.0 \
         --enable-polkit \
         --enable-pulse \
         --disable-gstreamer \
@@ -39,6 +39,7 @@ build() {
         --prefix=/usr \
         --libexecdir=/usr/lib/${pkgbase} \
         --sysconfdir=/etc \
+        --with-gtk=2.0 \
         --enable-polkit \
         --enable-gstreamer \
         --disable-pulse \
@@ -64,7 +65,7 @@ package_mate-settings-daemon-gstreamer() {
     depends=('dbus-glib' 'dconf' 'fontconfig' 'gstreamer0.10-base' 'gtk2'
              'libmatekbd' 'libnotify' 'libxt' 'mate-desktop' 'nss' 'polkit')
     conflicts=("${pkgbase}-pulseaudio" 'mate-media-pulseaudio')
-    provides=("${pkgbase}")             
+    provides=("${pkgbase}")
     cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer"
     make DESTDIR="${pkgdir}" install
 }
diff --git a/community/mate-system-monitor/PKGBUILD b/community/mate-system-monitor/PKGBUILD
index 9741948c9..de4d8e04b 100644
--- a/community/mate-system-monitor/PKGBUILD
+++ b/community/mate-system-monitor/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 104271 2014-01-16 18:56:12Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
 
 pkgname=mate-system-monitor
-pkgver=1.6.1
-pkgrel=6
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="A system monitor for MATE"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('dconf' 'dbus-glib' 'glibmm' 'gtk2' 'gtkmm' 'libgtop' 'libmatewnck' 'librsvg'
+depends=('dconf' 'dbus-glib' 'glibmm' 'gtk2' 'gtkmm' 'libgtop' 'libwnck' 'librsvg'
          'mate-icon-theme')
-makedepends=('docbook2x' 'mate-common' 'mate-doc-utils' 'perl-xml-parser')
+makedepends=('docbook2x' 'mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
 options=('!emptydirs')
 groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('84b6e8f3557bdadada026aeb349f6e9e90b59c6a')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('a8f652340613154fac994cdc060bae95460c1d6f')
 install=${pkgname}.install
 
 build() {
@@ -24,8 +23,8 @@ build() {
         --prefix=/usr \
         --libexecdir=/usr/lib/${pkgname} \
         --localstatedir=/var \
-        --disable-static \
-        --disable-scrollkeeper
+        --with-gtk=2.0 \
+        --disable-static
     make
 }
 
diff --git a/community/mate-system-tools/PKGBUILD b/community/mate-system-tools/PKGBUILD
index c3301560e..d581047b4 100644
--- a/community/mate-system-tools/PKGBUILD
+++ b/community/mate-system-tools/PKGBUILD
@@ -1,45 +1,31 @@
-# $Id: PKGBUILD 105370 2014-02-06 05:24:16Z bisson $
 # Maintainer : Martin Wimpress <code@flexion.org>
 
 pkgname=mate-system-tools
-pkgver=1.6.0
-pkgrel=9
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="Suite of tools for MATE to simplify configuring workstations."
 url="http://mate-desktop.org/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('dconf' 'gtk2' 'liboobs' 'mate-polkit' 'system-tools-backends'
-         'wireless_tools')
-makedepends=('mate-common' 'mate-doc-utils' 'mate-file-manager' 'perl-xml-parser')
+depends=('dconf' 'liboobs' 'mate-polkit' 'system-tools-backends' 'wireless_tools')
+makedepends=('caja' 'mate-common' 'perl-xml-parser' 'yelp-tools')
 optdepends=('ntp: Automatic time synchronisation.'
-            'mate-file-manager: provides Caja Shares extension')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('89d53c22171f6181ad4fb89387d4fa3300bb27b2')
+            'caja: provides Caja Shares extension'
+            'yelp: for reading MATE help documents')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('11a8d72cf265834867352ad67a2d32485dbc98e0')
 install=${pkgname}.install
 
-prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    # Modify the groups for Arch
-    #  - https://wiki.archlinux.org/index.php/Users_and_Groups
-    #  - https://wiki.archlinux.org/index.php/Systemd#Supplementary_information
-    #  - https://bbs.archlinux.org/viewtopic.php?pid=1183332
-    # Desktop user
-    sed -i 's/cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,video/adm,log,sys,users,uucp/' src/users/user-profiles.conf.in
-    # Administrator
-    sed -i 's/cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,admin,sambashare,lpadmin,video/adm,disk,locate,log,sys,users,uucp,wheel/' src/users/user-profiles.conf.in
-}
-
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
-    ./autogen.sh \
+    ./configure \
         --prefix=/usr \
-        --sysconfdir=/etc \
-        --disable-scrollkeeper \
-        LIBS="-lm" # Required for MATE 1.6 but can be removed in MATE 1.7/1.8
+        --sysconfdir=/etc
     make
 }
 
 package() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
+    rm -f "${pkgdir}/usr/lib/caja/extensions-2.0/libcaja-gst-shares.a"
 }
diff --git a/community/mate-terminal/PKGBUILD b/community/mate-terminal/PKGBUILD
index 8787ef79a..72b144396 100644
--- a/community/mate-terminal/PKGBUILD
+++ b/community/mate-terminal/PKGBUILD
@@ -1,28 +1,32 @@
-# $Id: PKGBUILD 104248 2014-01-16 18:05:57Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
 
 pkgname=mate-terminal
-pkgver=1.6.2
-pkgrel=1
+pkgver=1.8.0
+pkgrel=2
 pkgdesc="The MATE Terminal Emulator"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('dbus' 'dconf' 'gtk2' 'libsm' 'mate-desktop' 'vte')
-makedepends=('docbook2x' 'mate-common' 'mate-doc-utils' 'perl-xml-parser')
+makedepends=('docbook2x' 'mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
 options=('!emptydirs')
 groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('951c006c5ee31da0d0da1ebad4d1e6648fe0e41b')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('14b380c71aaf73499f5ae292ee14d2eb27920074')
 install=${pkgname}.install
 
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    sed -i 's/env python/env python2/' mate-terminal.wrapper
+}
+
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure \
         --prefix=/usr \
-        --disable-static \
-        --disable-scrollkeeper
+        --with-gtk=2.0 \
+        --disable-static
     make
 }
 
diff --git a/community/mate-text-editor/PKGBUILD b/community/mate-text-editor/PKGBUILD
deleted file mode 100644
index 2c384761e..000000000
--- a/community/mate-text-editor/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 104251 2014-01-16 18:10:47Z flexiondotorg $
-# Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com>
-
-pkgname=mate-text-editor
-pkgver=1.6.2
-pkgrel=1
-pkgdesc="A powerful text editor for MATE"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('desktop-file-utils' 'enchant' 'gtk2' 'gtksourceview2' 'iso-codes'
-         'libsm' 'mate-desktop' 'mate-file-manager' 'python2' 'python2-gobject2'
-         'pygtksourceview2')
-makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
-options=('!emptydirs')
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('64e34ae5724608fcc5adff195515b74e1e3e5bd6')
-install=${pkgname}.install
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    PYTHON=/usr/bin/python2 ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib \
-        --enable-python \
-        --disable-scrollkeeper
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community/mate-text-editor/pluma_gettext_fix.diff b/community/mate-text-editor/pluma_gettext_fix.diff
deleted file mode 100644
index b6829835a..000000000
--- a/community/mate-text-editor/pluma_gettext_fix.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index be832f7..485c574 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -155,10 +155,11 @@ dnl Gettext stuff.
- dnl ================================================================
- 
- IT_PROG_INTLTOOL([0.40.0])
--AC_SUBST([GETTEXT_PACKAGE], [pluma])
-+GETTEXT_PACKAGE=pluma
-+AC_SUBST([GETTEXT_PACKAGE])
- AM_GNU_GETTEXT_VERSION([0.17])
- AM_GLIB_GNU_GETTEXT
--AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME], [Define to the gettext package name.])
-+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name])
- 
- dnl ================================================================
- dnl Use gvfs metadata or the old xml file store.
diff --git a/community/mate-user-share/PKGBUILD b/community/mate-user-share/PKGBUILD
index ccf81858d..2d66a778c 100644
--- a/community/mate-user-share/PKGBUILD
+++ b/community/mate-user-share/PKGBUILD
@@ -1,28 +1,19 @@
-# $Id: PKGBUILD 105613 2014-02-11 18:11:20Z flexiondotorg $
-# Maintainer : Martin Wimpress <code@flexion.org>
+#Maintainer: Martin Wimpress <code@flexion.org>
 
 pkgname=mate-user-share
-pkgver=1.6.1
-pkgrel=7
-pkgdesc="User level public file sharing via WebDAV."
+pkgver=1.8.0
+pkgrel=1
+pkgdesc="User level public file sharing via WebDAV for MATE."
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('apache' 'dbus-glib' 'dconf' 'libunique' 'mod_dnssd')
-makedepends=('libcanberra' 'libnotify' 'mate-common' 'mate-doc-utils'
-             'mate-file-manager' 'perl-xml-parser')
+depends=('caja' 'dbus-glib' 'dconf' 'libunique' 'mod_dnssd')
+makedepends=('libcanberra' 'libnotify' 'mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
 options=('!emptydirs')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('dbeab8c06b098b2787b68541810e268c70764b14')
 install=${pkgname}.install
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz"
-        "https://github.com/mate-desktop/mate-user-share/commit/7a0305478295e9e7c284372677a4cbc382444482.diff")
-sha1sums=('83f161dee79ea0ae4345c54a5b1339f673f68e8f'
-          'ffa10ae69f5edf08d605418182f3c5bc975eb3cf')
-
-prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    # do not use download dir for incoming bluetooth downloads if mate-bluetooth isn't installed
-    patch -Np1 -i "${srcdir}/7a0305478295e9e7c284372677a4cbc382444482.diff"
-}
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/mate-user-share/mate-user-share.install b/community/mate-user-share/mate-user-share.install
index 7af080f58..bf6781f93 100644
--- a/community/mate-user-share/mate-user-share.install
+++ b/community/mate-user-share/mate-user-share.install
@@ -1,6 +1,7 @@
 post_install() {
     glib-compile-schemas /usr/share/glib-2.0/schemas/
     gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/community/mate-utils/422504e251442ca9921c4218151cffb6548280e6.diff b/community/mate-utils/422504e251442ca9921c4218151cffb6548280e6.diff
deleted file mode 100644
index fd71dbb57..000000000
--- a/community/mate-utils/422504e251442ca9921c4218151cffb6548280e6.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/mate-screenshot/mate-screenshot.c b/mate-screenshot/mate-screenshot.c
-index 63ec5d9..6510f7f 100644
---- a/mate-screenshot/mate-screenshot.c
-+++ b/mate-screenshot/mate-screenshot.c
-@@ -809,13 +809,14 @@ enum
- finish_prepare_screenshot (char *initial_uri, GdkWindow *window, GdkRectangle *rectangle)
- {  
-   ScreenshotDialog *dialog;
-+  gboolean include_mask = (!take_window_shot && !take_area_shot);
- 
-   /* always disable window border for full-desktop or selected-area screenshots */
-   if (!take_window_shot)
--    screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, FALSE);
-+    screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, FALSE, include_mask);
-   else
-     {
--      screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, include_border);
-+      screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, include_border, include_mask);
- 
-       switch (border_effect[0])
-         {
-diff --git a/mate-screenshot/screenshot-utils.c b/mate-screenshot/screenshot-utils.c
-index b41ae4b..faed676 100644
---- a/mate-screenshot/screenshot-utils.c
-+++ b/mate-screenshot/screenshot-utils.c
-@@ -670,7 +670,8 @@
- screenshot_get_pixbuf (GdkWindow    *window,
-                        GdkRectangle *rectangle,
-                        gboolean      include_pointer,
--                       gboolean      include_border)
-+                       gboolean      include_border,
-+                       gboolean      include_mask)
- {
-   GdkWindow *root;
-   GdkPixbuf *screenshot;
-@@ -738,7 +739,11 @@
-                                              x_orig, y_orig, 0, 0,
-                                              width, height);
- 
--  mask_monitors (screenshot, root);
-+  /*
-+   * Masking currently only works properly with full-screen shots
-+   */
-+  if (include_mask)
-+      mask_monitors (screenshot, root);
- 
- #ifdef HAVE_X11_EXTENSIONS_SHAPE_H
-   if (include_border)
-diff --git a/mate-screenshot/screenshot-utils.h b/mate-screenshot/screenshot-utils.h
-index 0af2ba3..5404bde 100644
---- a/mate-screenshot/screenshot-utils.h
-+++ b/mate-screenshot/screenshot-utils.h
-@@ -36,7 +36,8 @@ gboolean   screenshot_select_area         (int *px,
- GdkPixbuf *screenshot_get_pixbuf          (GdkWindow *win,
-                                            GdkRectangle *rectangle,
-                                            gboolean include_pointer,
--                                           gboolean include_border);
-+                                           gboolean include_border,
-+                                           gboolean include_mask);
- 
- void       screenshot_show_error_dialog   (GtkWindow   *parent,
-                                            const gchar *message,
diff --git a/community/mate-utils/PKGBUILD b/community/mate-utils/PKGBUILD
index 66b8ddd6c..bef0cb46f 100644
--- a/community/mate-utils/PKGBUILD
+++ b/community/mate-utils/PKGBUILD
@@ -1,22 +1,20 @@
-# $Id: PKGBUILD 104256 2014-01-16 18:15:52Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com>
 
 pkgname=mate-utils
-pkgver=1.6.1
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="Common MATE utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gtk2' 'libcanberra' 'libgtop' 'libsm' 'mate-desktop' 'zlib')
-makedepends=('mate-common' 'mate-doc-utils' 'mate-panel' 'perl-xml-parser'
-             'rarian')
-optdepends=('mate-panel: Look up words in dictionaries from the panel')
+depends=('desktop-file-utils' 'gtk2' 'libcanberra' 'libgtop' 'libsm' 'zlib')
+makedepends=('mate-common' 'mate-panel' 'perl-xml-parser' 'rarian' 'yelp-tools')
+optdepends=('mate-panel: Look up words in dictionaries from the panel'
+            'yelp: for reading MATE help documents')
 options=('!emptydirs')
 groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('c765c53cd4b279155d30ed057a78a584e5b2addc')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('5f4b6d8f7a39ab078c9ed8302ed97926e57b0596')
 install=${pkgname}.install
 
 build() {
@@ -24,9 +22,9 @@ build() {
     ./configure \
         --prefix=/usr \
         --libexecdir=/usr/lib/${pkgname} \
+        --with-gtk=2.0 \
         --sysconfdir=/etc \
-        --disable-static \
-        --disable-scrollkeeper
+        --disable-static
     make
 }
 
diff --git a/community/mate-utils/patch.diff b/community/mate-utils/patch.diff
deleted file mode 100644
index 6971c219e..000000000
--- a/community/mate-utils/patch.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From a59fda7d006b856ac5982750f2ffdefd24191be0 Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano@karapetsas.com>
-Date: Thu, 11 Jul 2013 11:14:38 +0000
-Subject: mate-screenshot: Fix save path selection
-
-Closes #32
-https://github.com/mate-desktop/mate-utils/issues/32
-
-Fix from https://bugzilla.gnome.org/show_bug.cgi?id=579232
----
-diff --git a/mate-screenshot/screenshot-dialog.c b/mate-screenshot/screenshot-dialog.c
-index bcac343..b5b2be5 100644
---- a/mate-screenshot/screenshot-dialog.c
-+++ b/mate-screenshot/screenshot-dialog.c
-@@ -338,7 +338,7 @@ screenshot_dialog_get_uri (ScreenshotDialog *dialog)
-   gchar *uri, *file, *tmp;
-   GError *error;
- 
--  folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog->save_widget));
-+  folder = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog->save_widget));
-   file_name = gtk_entry_get_text (GTK_ENTRY (dialog->filename_entry));
- 
-   error = NULL;
-@@ -366,7 +366,7 @@ screenshot_dialog_get_uri (ScreenshotDialog *dialog)
- char *
- screenshot_dialog_get_folder (ScreenshotDialog *dialog)
- {
--  return gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog->save_widget));
-+  return gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog->save_widget));
- }
- 
- GdkPixbuf *
---
-cgit 
diff --git a/community/mod_itk/PKGBUILD b/community/mod_itk/PKGBUILD
new file mode 100644
index 000000000..036613baa
--- /dev/null
+++ b/community/mod_itk/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 106741 2014-03-06 21:44:30Z anatolik $
+# Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com>
+
+_version=2.4.7-01
+pkgname=mod_itk
+pkgver=${_version//-/.r}
+pkgrel=1
+pkgdesc='Apache module that allows you to run each of your vhost under a separate uid and gid'
+arch=(i686 x86_64)
+url='http://mpm-itk.sesse.net/'
+license=(APACHE)
+depends=(apache)
+source=(http://mpm-itk.sesse.net/mpm-itk-$_version.tar.gz)
+sha256sums=('7cd2f6c08ff3872c472a88794161a6bbe9d7166eb3f6ffda4d1b5239f6d39004')
+
+build() {
+  cd mpm-itk-$_version
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd mpm-itk-$_version
+  install -D -m755 .libs/mpm_itk.so "$pkgdir/usr/lib/httpd/modules/mpm_itk.so"
+}
diff --git a/community/mod_wsgi/PKGBUILD b/community/mod_wsgi/PKGBUILD
index 36f968fb8..7e5a1af92 100644
--- a/community/mod_wsgi/PKGBUILD
+++ b/community/mod_wsgi/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 95320 2013-08-09 11:42:20Z arodseth $
+# $Id: PKGBUILD 106738 2014-03-06 21:43:47Z anatolik $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Ryan Coyner <rcoyner@gmail.com>
 
 pkgname=mod_wsgi
 pkgver=3.4
-pkgrel=3
+pkgrel=4
 pkgdesc='Python WSGI adapter module for Apache'
 arch=('x86_64' 'i686')
 url='http://www.modwsgi.org/'
diff --git a/community/mod_wsgi2/PKGBUILD b/community/mod_wsgi2/PKGBUILD
index 6cdf187df..09218cfbd 100644
--- a/community/mod_wsgi2/PKGBUILD
+++ b/community/mod_wsgi2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 95322 2013-08-09 11:50:53Z arodseth $
+# $Id: PKGBUILD 106739 2014-03-06 21:43:48Z anatolik $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Ryan Coyner <rcoyner@gmail.com>
 
 pkgname=mod_wsgi2
 pkgver=3.4
-pkgrel=4
+pkgrel=5
 pkgdesc='Python2 WSGI adapter module for Apache'
 arch=('x86_64' 'i686')
 url='http://www.modwsgi.org/'
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index c82736da4..6b8f807c9 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 105017 2014-01-30 08:53:30Z spupykin $
+# $Id: PKGBUILD 106740 2014-03-06 21:43:48Z anatolik $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=passenger
 pkgver=4.0.37
-pkgrel=1
+pkgrel=2
 pkgdesc="mod_rails passenger"
 arch=('i686' 'x86_64')
 url="http://www.modrails.com"
-#http://rubyforge.org/frs/?group_id=5873
+_watch="https://github.com/phusion/passenger/releases"
 license=('GPL')
 depends=('ruby' 'ruby-rack' 'curl')
 makedepends=('apache')
diff --git a/community/pluma/PKGBUILD b/community/pluma/PKGBUILD
new file mode 100644
index 000000000..82e1c9c18
--- /dev/null
+++ b/community/pluma/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 106671 2014-03-06 11:42:20Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+
+pkgname=pluma
+pkgver=1.8.0
+pkgrel=1
+pkgdesc="A powerful text editor for MATE"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('caja' 'desktop-file-utils' 'enchant' 'gtk2' 'gtksourceview2'
+         'iso-codes' 'libsm' 'mate-desktop' 'python2' 'python2-gobject2'
+         'pygtksourceview2')
+makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
+replaces=('mate-text-editor')
+provides=('mate-text-editor')
+conflicts=('mate-text-editor')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('858e3edaee698b3f99189d3285061ab56b21828c')
+install=${pkgname}.install
+
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    sed -i 's/python/python2/' plugins/externaltools/data/switch-c.tool.in
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    PYTHON=/usr/bin/python2 ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${pkgname} \
+        --with-gtk=2.0 \
+        --enable-gtk-doc \
+        --enable-python
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mate-text-editor/mate-text-editor.install b/community/pluma/pluma.install
index ed73415a4..ed73415a4 100644
--- a/community/mate-text-editor/mate-text-editor.install
+++ b/community/pluma/pluma.install
diff --git a/community/python2-caja/PKGBUILD b/community/python2-caja/PKGBUILD
index 85ad37a62..46530e36f 100644
--- a/community/python2-caja/PKGBUILD
+++ b/community/python2-caja/PKGBUILD
@@ -1,22 +1,20 @@
-# $Id: PKGBUILD 104310 2014-01-17 11:54:21Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
-# Contributor: Xpander <xpander0@gmail.com>
 
 pkgname=python2-caja
 _pkgname=python-caja
-pkgver=1.6.1
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="Python binding for Caja, to allow Caja property page and menu item extensions to be written in Python."
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('mate-file-manager' 'python2' 'python2-gobject')
+depends=('caja' 'python2' 'python2-gobject')
 makedepends=('mate-common')
 options=('!emptydirs')
 replaces=('python-caja')
 provides=('python-caja')
-source=("http://pub.mate-desktop.org/releases/1.6/${_pkgname}-${pkgver}.tar.xz")
-sha1sums=('44c39d62c977b06e9a8f37cfdbd81c2f6eb10ff5')
+source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz")
+sha1sums=('63cf08e3f711be8eb44c423322962a18f822031e')
 
 prepare() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/community/qt-at-api/PKGBUILD b/community/qt-at-api/PKGBUILD
new file mode 100644
index 000000000..f5c380be0
--- /dev/null
+++ b/community/qt-at-api/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 106680 2014-03-06 13:50:43Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Kyle <kyle@gmx.ca>
+
+pkgname=qt-at-spi
+pkgver=0.3.1
+pkgrel=3
+pkgdesc="A Qt plugin that bridges the QAccessible API’s to the AT-SPI 2 protocol, giving blind and visually impaired users access to qt applications."
+arch=(i686 x86_64)
+url="http://projects.kde.org/qtatspi"
+license=('LGPL')
+depends=('at-spi2-core' 'qt4>=4.8')
+source=(https://gitorious.org/$pkgname/$pkgname/archive-tarball/v$pkgver
+        qt-accessibility.sh)
+md5sums=('cc749ef766f8a199b603a7d5fb723006'
+         'f0c8551ed54f5d4e5daf7ddac9189aaa')
+
+build() {
+	cd "$srcdir/$pkgname-$pkgname"
+	qmake-qt4
+	make
+}
+
+check() {
+	cd "$srcdir/$pkgname-$pkgname"
+	make -k check
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgname"
+	make INSTALL_ROOT="$pkgdir" install
+	install -D -m755 "$srcdir/qt-accessibility.sh" "$pkgdir/etc/profile.d/qt-accessibility.sh"
+}
diff --git a/community/qt-at-api/qt-accessibility.sh b/community/qt-at-api/qt-accessibility.sh
new file mode 100755
index 000000000..d7c67d605
--- /dev/null
+++ b/community/qt-at-api/qt-accessibility.sh
@@ -0,0 +1 @@
+export QT_ACCESSIBILITY=1
diff --git a/community/system-tools-backends/PKGBUILD b/community/system-tools-backends/PKGBUILD
index 49dffb894..2aef071ae 100644
--- a/community/system-tools-backends/PKGBUILD
+++ b/community/system-tools-backends/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 104267 2014-01-16 18:40:20Z flexiondotorg $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 106615 2014-03-05 23:51:37Z flexiondotorg $
+# Maintainer : Martin Wimpress <code@flexion.org>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
-# Contributor: Martin Wimpress <code@flexion.org>
 
 pkgname=system-tools-backends
 pkgver=2.10.2
-pkgrel=4
+pkgrel=5
 pkgdesc='Backends for Gnome/MATE System Tools.'
 arch=('i686' 'x86_64')
 url='http://system-tools-backends.freedesktop.org/'
 license=('GPL')
-depends=('dbus-glib' 'perl' 'perl-net-dbus'  'polkit')
+depends=('dbus-glib' 'perl' 'perl-net-dbus' 'polkit')
 makedepends=('intltool' 'perl-xml-parser')
 source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.10/${pkgname}-${pkgver}.tar.bz2")
 sha256sums=('1dbe5177df46a9c7250735e05e77129fe7ec04840771accfa87690111ca2c670')