Tue Jun 24 03:25:03 UTC 2014

42 files changed, 752 insertions, 578 deletions

diff --git a/community/arm-wince-cegcc-gcc-base/PKGBUILD b/community/arm-wince-cegcc-gcc-base/PKGBUILD
deleted file mode 100644
index 443bd0801..000000000
--- a/community/arm-wince-cegcc-gcc-base/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 99680 2013-10-30 22:59:10Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=arm-wince-cegcc-gcc-base
-pkgver=0.59.1
-pkgrel=3
-_prefix=/opt/cegcc
-pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
-arch=(i686 x86_64)
-license=(GPL)
-url="http://cegcc.sf.net"
-depends=('glibc' 'mpfr' 'cloog')
-makedepends=(arm-wince-cegcc-binutils)
-source=(http://arch.p5n.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2)
-md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
-
-build() {
-  cd $srcdir/cegcc/src
-
-  mkdir build-gcc-base || true
-  cd build-gcc-base
-
-  export PATH=$_prefix/bin:$PATH
-  export TARGET=arm-wince-cegcc
-  unset CFLAGS
-  unset LDFLAGS
-  unset MAKEFLAGS
-
-  ../gcc-4.4.0/configure               \
-	--with-gcc                     \
-	--with-gnu-ld                  \
-	--with-gnu-as                  \
-	--target=arm-wince-cegcc       \
-	--build=$CARCH		       \
-	--host=$CARCH		       \
-	--prefix=${_prefix}            \
-	--disable-threads              \
-	--disable-nls                  \
-	--disable-shared               \
-	--enable-languages=c           \
-	--disable-win32-registry       \
-	--disable-multilib             \
-	--disable-interwork            \
-	--without-headers              \
-	--with-as=$_prefix/bin/arm-wince-cegcc-as \
-	--with-ld=$_prefix/bin/arm-wince-cegcc-ld \
-	--with-local-prefix=$_prefix \
-	--enable-checking
-
-  make all-gcc || (cd gcc && make) && make all-gcc
-  make DESTDIR=$pkgdir install-gcc
-  find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \;
-  cd $pkgdir/${_prefix} && ln -s arm-wince-cegcc arm-cegcc
-}
diff --git a/community/arm-wince-cegcc-gcc/PKGBUILD b/community/arm-wince-cegcc-gcc/PKGBUILD
deleted file mode 100644
index 1962507a8..000000000
--- a/community/arm-wince-cegcc-gcc/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 99679 2013-10-30 22:58:46Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=arm-wince-cegcc-gcc
-pkgver=0.59.1
-pkgrel=4
-_prefix=/opt/cegcc
-pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
-arch=(i686 x86_64)
-license=('GPL')
-options=(!strip)
-url="http://cegcc.sf.net"
-depends=('cloog' 'ppl' 'arm-wince-cegcc-binutils')
-makedepends=('arm-wince-cegcc-newlib' 'arm-wince-cegcc-w32api'
-	     'arm-wince-cegcc-importlibs' 'arm-wince-cegcc-gcc-base'
-	     'arm-wince-cegcc-cegccdll-dummy')
-conflicts=('arm-wince-cegcc-gcc-base')
-groups=('cegcc')
-source=(http://arch.p5n.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2)
-md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
-
-build() {
-  cd $srcdir/cegcc/src
-
-  export PATH=$_prefix/bin:$PATH
-  export TARGET=arm-wince-cegcc
-  unset CFLAGS
-  unset CXXFLAGS
-  unset CPPFLAGS
-  unset LDFLAGS
-  unset MAKEFLAGS
-
-  mkdir -p build-gcc
-  cd build-gcc
-
-  [ -f Makefile ] || ../gcc-4.4.0/configure \
-	--prefix=${_prefix} \
-	--exec-prefix=${_prefix} \
-	--bindir=${_prefix}/bin \
-	--target=$TARGET \
-	--build=$CARCH \
-	--host=$CARCH \
-	--disable-nls \
-	--includedir=${_prefix}/include \
-	--with-gcc \
-	--with-ld=/opt/cegcc/bin/arm-wince-cegcc-ld \
-	--with-as=/opt/cegcc/bin/arm-wince-cegcc-as \
-	--enable-threads=win32 \
-	--enable-languages=c,c++ \
-	--disable-win32-registry \
-	--disable-multilib \
-	--disable-interwork \
-	--without-newlib \
-	--enable-checking \
-	--with-headers \
-	--disable-libssp
-
-  make
-  make DESTDIR=$pkgdir install
-  rm -f $pkgdir/$_prefix/lib/libiberty.a
-  find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \;
-  strip $pkgdir/${_prefix}/bin/arm-wince-cegcc-* || true
-  find $pkgdir/${_prefix}/libexec/ -type f -exec strip {} \; || true
-  rm -f $pkgdir/${_prefix}/info/dir
-  cd $pkgdir/${_prefix} && ln -s arm-wince-cegcc arm-cegcc
-}
diff --git a/community/eom/PKGBUILD b/community/eom/PKGBUILD
index 00fd7d0e9..fc06e8868 100644
--- a/community/eom/PKGBUILD
+++ b/community/eom/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 106663 2014-03-06 11:41:02Z flexiondotorg $
+# $Id: PKGBUILD 113456 2014-06-23 12:04:26Z flexiondotorg $
 # Maintainer : Martin Wimpress <code@flexion.org>
 
 pkgname=eom
 pkgver=1.8.0
-pkgrel=2
+pkgrel=3
 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')
+         'libjpeg-turbo' 'librsvg' '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')
@@ -27,7 +26,8 @@ build() {
     PYTHON=/usr/bin/python2 ./configure \
         --prefix=/usr \
         --localstatedir=/var \
-        --with-gtk=2.0
+        --with-gtk=2.0 \
+        --with-librsvg
     make
 }
 
diff --git a/community/gst-python/PKGBUILD b/community/gst-python/PKGBUILD
index b7be8a93c..c10911f2b 100644
--- a/community/gst-python/PKGBUILD
+++ b/community/gst-python/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108151 2014-03-24 07:45:38Z spupykin $
+# $Id: PKGBUILD 113447 2014-06-23 11:20:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-python
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="Python bindings for GStreamer"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url="http://gstreamer.freedesktop.org/"
 depends=('python2-gobject' 'gst-plugins-base')
 makedepends=('pkg-config')
 source=(http://gstreamer.freedesktop.org/src/gst-python/gst-python-${pkgver}.tar.bz2)
-md5sums=('da9a33cccdb7d094f243e4b469cfbc76')
+md5sums=('bfc70a6529a981cb84fc8a7b4da69305')
 
 build() {
   cd "${srcdir}/gst-python-${pkgver}"
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index e55407ab6..4d8473cdd 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 112459 2014-06-02 10:45:56Z spupykin $
+# $Id: PKGBUILD 113445 2014-06-23 11:08:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
 pkgver=1.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -81,6 +81,9 @@ prepare() {
     src/locking/virtlockd.service.in
   sed -i 's|@sbindir@|/usr/bin|g' src/locking/virtlockd.service.in
   sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf
+  sed -i 's|/usr/libexec/qemu-bridge-helper|/usr/lib/qemu/qemu-bridge-helper|g' \
+    src/qemu/qemu{.conf,_conf.c} \
+    src/qemu/test_libvirtd_qemu.aug.in
 }
 
 build() {
diff --git a/community/syncthing/PKGBUILD b/community/syncthing/PKGBUILD
index 432d22e1c..9830506cc 100644
--- a/community/syncthing/PKGBUILD
+++ b/community/syncthing/PKGBUILD
@@ -6,8 +6,8 @@
 
 _pkgstamp=$(date +%s)
 pkgname=syncthing
-pkgver=0.8.15
-pkgrel=2
+pkgver=0.8.16
+pkgrel=1
 pkgdesc="Open Source Continuous Replication / Cluster Synchronization Thing"
 url="http://syncthing.net/"
 license=('MIT')
@@ -17,7 +17,7 @@ makedepends=('go' 'godep' 'inetutils' 'sed')
 source=("https://github.com/calmh/${pkgname}/archive/v${pkgver}.tar.gz"
         "syncthing@.service"
         "syncthing.1")
-sha1sums=('2fa7f943e545a753619ec7a1fa6de3e8555619d3'
+sha1sums=('62ed3ac4f01546bba743e223dd98a2af8f67ca2b'
           '204cad3823306c793a14a17a23220e26199160d4'
           '17be8b3f99c577e325765abc251f597e204d7711')
 install=${pkgname}.install
diff --git a/community/syncthing/syncthing.install b/community/syncthing/syncthing.install
index 3718a4722..ba45691c9 100644
--- a/community/syncthing/syncthing.install
+++ b/community/syncthing/syncthing.install
@@ -1,17 +1,10 @@
 post_install() {
 cat << EOF
-  WebGUI can be accessed at http://localhost:8080
-
-  Execute the following to reload systemd modules.
-
-    systemctl daemon-reload
-
-  To start and/or enable syncthing execute the the following,
+  To start and/or enable syncthing execute the following,
   replacing 'user' with your username.
 
     systemctl start syncthing@user
     systemctl enable syncthing@user
-
 EOF
 }
 
diff --git a/community/uudeview/PKGBUILD b/community/uudeview/PKGBUILD
index 939835c23..71a55a3ee 100644
--- a/community/uudeview/PKGBUILD
+++ b/community/uudeview/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 100326 2013-11-02 09:31:41Z spupykin $
+# $Id: PKGBUILD 113460 2014-06-23 13:12:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: kmaster <kmaster12@sasktel.net>
 
 pkgname=uudeview
 pkgver=0.5.20
-pkgrel=11
+pkgrel=12
 pkgdesc="UUDeview helps transmitting & receiving binary files using mail or newsgroups. Includes library files."
 arch=('i686' 'x86_64')
 url="http://www.fpx.de/fp/Software/UUDeview/"
 license=('GPL')
 optdepends=('tk: for GUI')
+options=('staticlibs')
 source=(http://www.fpx.de/fp/Software/UUDeview/download/$pkgname-$pkgver.tar.gz)
 md5sums=('0161abaec3658095044601eae82bbc5b')
 
diff --git a/community/wiznote/PKGBUILD b/community/wiznote/PKGBUILD
index 3d342d526..ada2a1950 100644
--- a/community/wiznote/PKGBUILD
+++ b/community/wiznote/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113057 2014-06-12 09:59:12Z fyan $
+# $Id: PKGBUILD 113452 2014-06-23 11:56:39Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Albert.Zhou <albert.zhou@wiz.cn>
 
 pkgname=wiznote
-pkgver=2.1.8
+pkgver=2.1.9
 pkgrel=1
 pkgdesc="Opensource cross-platform cloud based note-taking client"
 arch=('i686' 'x86_64')
diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD
index c501bafcb..a13dc4c1e 100644
--- a/community/xlockmore/PKGBUILD
+++ b/community/xlockmore/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96760 2013-09-04 10:17:31Z spupykin $
+# $Id: PKGBUILD 113449 2014-06-23 11:20:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: dorphell <dorphell@archlinux.org>
 
 pkgname=xlockmore
 pkgver=5.43
-pkgrel=1
+pkgrel=2
 pkgdesc="screen saver / locker for the X Window System"
 arch=(i686 x86_64)
 license=('BSD')
diff --git a/community/xpad/PKGBUILD b/community/xpad/PKGBUILD
index d1200009e..92a75b75e 100644
--- a/community/xpad/PKGBUILD
+++ b/community/xpad/PKGBUILD
@@ -1,22 +1,20 @@
-# $Id: PKGBUILD 100460 2013-11-04 12:14:25Z spupykin $
+# $Id: PKGBUILD 113443 2014-06-23 10:52:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Ben <contrasutra@myrealbox.com>
 
 pkgname=xpad
-pkgver=4.2
+pkgver=4.3
 pkgrel=1
 pkgdesc="Stickies-like notes program"
 arch=(i686 x86_64)
-depends=('gtk2' 'libsm' 'librsvg')
+depends=('gtk3' 'libsm' 'librsvg')
 makedepends=('intltool')
 url="http://mterry.name/xpad/"
 license=('GPL')
 install=xpad.install
-source=(http://launchpad.net/xpad/trunk/$pkgver/+download/xpad-$pkgver.tar.bz2
-	xpad-gtk-2.20.patch)
-md5sums=('85583f8f68ad61ec282ea1332fe76480'
-         '6a3d2952b469d65ec333714991ba8284')
+source=(http://launchpad.net/xpad/trunk/$pkgver/+download/xpad-$pkgver.tar.bz2)
+md5sums=('d524d693e2ecb6be99a3005b090b2256')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -26,5 +24,5 @@ build() {
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir install helpdir=$pkgdir/usr/lib/xpad/help
 }
diff --git a/community/xpad/xpad-gtk-2.20.patch b/community/xpad/xpad-gtk-2.20.patch
deleted file mode 100644
index 54612b6db..000000000
--- a/community/xpad/xpad-gtk-2.20.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Only in xpad-4.0.my/autopackage: default.apspec
-Only in xpad-4.0.my/autopackage: Makefile
-Only in xpad-4.0.my: config.h
-Only in xpad-4.0.my: config.log
-Only in xpad-4.0.my: config.status
-Only in xpad-4.0.my/doc: Makefile
-Only in xpad-4.0.my/images: Makefile
-Only in xpad-4.0.my: Makefile
-Only in xpad-4.0.my/po: af.gmo
-Only in xpad-4.0.my/po: bg.gmo
-Only in xpad-4.0.my/po: cs.gmo
-Only in xpad-4.0.my/po: da.gmo
-Only in xpad-4.0.my/po: de.gmo
-Only in xpad-4.0.my/po: en_GB.gmo
-Only in xpad-4.0.my/po: es.gmo
-Only in xpad-4.0.my/po: et.gmo
-Only in xpad-4.0.my/po: fi.gmo
-Only in xpad-4.0.my/po: fr.gmo
-Only in xpad-4.0.my/po: ga.gmo
-Only in xpad-4.0.my/po: hr.gmo
-Only in xpad-4.0.my/po: hu.gmo
-Only in xpad-4.0.my/po: .intltool-merge-cache
-Only in xpad-4.0.my/po: it.gmo
-Only in xpad-4.0.my/po: ja.gmo
-Only in xpad-4.0.my/po: ko.gmo
-Only in xpad-4.0.my/po: lv.gmo
-Only in xpad-4.0.my/po: Makefile
-Only in xpad-4.0.my/po: Makefile.in
-Only in xpad-4.0.my/po: nl.gmo
-Only in xpad-4.0.my/po: POTFILES
-Only in xpad-4.0.my/po: pt.gmo
-Only in xpad-4.0.my/po: ro.gmo
-Only in xpad-4.0.my/po: ru.gmo
-Only in xpad-4.0.my/po: rw.gmo
-Only in xpad-4.0.my/po: stamp-it
-Only in xpad-4.0.my/po: sv.gmo
-Only in xpad-4.0.my/po: th.gmo
-Only in xpad-4.0.my/po: tr.gmo
-Only in xpad-4.0.my/po: vi.gmo
-Only in xpad-4.0.my/po: zh_CN.gmo
-Only in xpad-4.0.my/po: zh_TW.gmo
-Only in xpad-4.0.my/src: .deps
-Only in xpad-4.0.my/src: fio.o
-Only in xpad-4.0.my/src: help.o
-Only in xpad-4.0.my/src: Makefile
-Only in xpad-4.0.my/src: prefix.o
-Only in xpad-4.0.my/src: xpad
-Only in xpad-4.0.my/src: xpad-app.o
-Only in xpad-4.0.my/src: xpad-grip-tool-item.o
-diff -wbBur xpad-4.0/src/xpad-pad.c xpad-4.0.my/src/xpad-pad.c
---- xpad-4.0/src/xpad-pad.c	2009-05-11 01:44:09.000000000 +0000
-+++ xpad-4.0.my/src/xpad-pad.c	2010-04-12 15:25:24.000000000 +0000
-@@ -268,18 +268,22 @@
- 		NULL));
- 	gtk_container_child_set (GTK_CONTAINER (vbox), pad->priv->toolbar, "expand", FALSE, NULL);
- 	
--	g_object_set (G_OBJECT (pad),
--		"decorated", xpad_settings_get_has_decorations (xpad_settings ()),
--		"default-height", xpad_settings_get_height (xpad_settings ()),
--		"default-width", xpad_settings_get_width (xpad_settings ()),
--		"gravity", GDK_GRAVITY_STATIC, /* static gravity makes saving pad x,y work */
--		"skip-pager-hint", !xpad_settings_get_has_decorations (xpad_settings ()),
--		"skip-taskbar-hint", !xpad_settings_get_has_decorations (xpad_settings ()),
--		"type", GTK_WINDOW_TOPLEVEL,
--		"type-hint", GDK_WINDOW_TYPE_HINT_NORMAL,
--		"window-position", GTK_WIN_POS_MOUSE,
--		"child", vbox,
--		NULL);
-+//	g_object_set (G_OBJECT (pad),
-+//		"default-height", xpad_settings_get_height (xpad_settings ()),
-+//		"default-width", xpad_settings_get_width (xpad_settings ()),
-+//		"gravity", GDK_GRAVITY_STATIC, /* static gravity makes saving pad x,y work */
-+//		"skip-pager-hint", !xpad_settings_get_has_decorations (xpad_settings ()),
-+//		"skip-taskbar-hint", !xpad_settings_get_has_decorations (xpad_settings ()),
-+//		"type", GTK_WINDOW_TOPLEVEL,
-+//		"window-position", GTK_WIN_POS_MOUSE,
-+//		"child", vbox,
-+//		NULL);
-+
-+	gtk_window_set_type_hint (GTK_WINDOW (pad), GDK_WINDOW_TYPE_HINT_NORMAL);
-+	gtk_window_set_decorated (GTK_WINDOW (pad), xpad_settings_get_has_decorations (xpad_settings ()));
-+	gtk_window_set_resizable (GTK_WINDOW (pad), TRUE);
-+	gtk_container_add (GTK_CONTAINER (pad), vbox);
-+
- 	
- 	xpad_pad_notify_has_scrollbar (pad);
- 	
-Only in xpad-4.0.my/src: xpad-pad-group.o
-Only in xpad-4.0.my/src: xpad-pad.o
-Only in xpad-4.0.my/src: xpad-pad-properties.o
-Only in xpad-4.0.my/src: xpad-preferences.o
-Only in xpad-4.0.my/src: xpad-session-manager.o
-Only in xpad-4.0.my/src: xpad-settings.o
-Only in xpad-4.0.my/src: xpad-text-buffer.o
-Only in xpad-4.0.my/src: xpad-text-view.o
-Only in xpad-4.0.my/src: xpad-toolbar.o
-Only in xpad-4.0.my/src: xpad-tray.o
-Only in xpad-4.0.my: stamp-h1
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index 2967f3bb4..1fb3cfd03 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 208219 2014-03-19 12:29:50Z anatolik $
+# $Id: PKGBUILD 215348 2014-06-23 07:30:53Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tom Killian <tom.archlinux.org>
 # Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=6.3.2
+pkgver=6.4.0
 pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/projects/dhcpcd/"
@@ -18,7 +18,7 @@ options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
 source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"
         'dhcpcd_.service'
         'dhcpcd.service')
-sha1sums=('ff8ef22b7305795eff52b8b41b81e2999a5923ff'
+sha1sums=('77eb7b909cc9b1f9f178f1ba7b79dbb8fe5389ef'
           '6f1633edde14d29b5cdc09c4f029a450ef2ebc96'
           '52c1bad9ab43e9a253c1eb175e7eefb13497b8f9')
 
diff --git a/core/systemd/0001-fsck-disable-l-option-for-now.patch b/core/systemd/0001-fsck-disable-l-option-for-now.patch
deleted file mode 100644
index 050d06dec..000000000
--- a/core/systemd/0001-fsck-disable-l-option-for-now.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From c343be283b7152554bac0c02493a4e1759c163f7 Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay@vrfy.org>
-Date: Wed, 4 Jun 2014 11:14:48 +0200
-Subject: [PATCH] fsck: disable "-l" option for now
-
-  https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
----
- TODO            |  4 +++-
- src/fsck/fsck.c | 13 ++++++++++++-
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/TODO b/TODO
-index 8169a57..fb118f1 100644
---- a/TODO
-+++ b/TODO
-@@ -1,4 +1,7 @@
- Bugfixes:
-+* Re-enable "fsck -l" when it is ready:
-+   https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
-+
- * Should systemctl status \* work on all unit types, not just .service?
- 
- * enabling an instance unit creates a pointless link, and
-@@ -20,7 +23,6 @@ Bugfixes:
-   See the comment in sd_bus_unref() for more..
- 
- External:
--
- * Fedora: when installing fedora with yum --installroot /var/run is a directory, not a symlink
-    https://bugzilla.redhat.com/show_bug.cgi?id=975864
- 
-diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
-index 56cb52d..cb2f573 100644
---- a/src/fsck/fsck.c
-+++ b/src/fsck/fsck.c
-@@ -319,7 +319,18 @@ int main(int argc, char *argv[]) {
-         cmdline[i++] = "/sbin/fsck";
-         cmdline[i++] =  arg_repair;
-         cmdline[i++] = "-T";
--        cmdline[i++] = "-l";
-+
-+        /*
-+         * Disable locking which conflict with udev's event
-+         * ownershipi, until util-linux moves the flock
-+         * synchronization file which prevents multiple fsck running
-+         * on the same rotationg media, from the disk device
-+         * node to a privately owned regular file.
-+         *
-+         * https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
-+         *
-+         * cmdline[i++] = "-l";
-+         */
- 
-         if (!root_directory)
-                 cmdline[i++] = "-M";
--- 
-2.0.0
-
diff --git a/core/systemd/0001-networkd-link-intialize-mac-address.patch b/core/systemd/0001-networkd-link-intialize-mac-address.patch
deleted file mode 100644
index b0d8254e9..000000000
--- a/core/systemd/0001-networkd-link-intialize-mac-address.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2ae6cda520f5c925ba313b8e83ea8b58bc00112c Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Wed, 4 Jun 2014 21:29:08 +0200
-Subject: [PATCH] networkd: link - intialize mac address
-
-Otherwise .netwrok matching on MAC address will not work.
-
-Based on patch by Dave Reisner, and bug originally reported by Max Pray.
-
-Conflicts:
-	src/network/networkd-link.c
----
- src/network/networkd-link.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index 6677b94..9afb871 100644
---- a/src/network/networkd-link.c
-+++ b/src/network/networkd-link.c
-@@ -75,6 +75,10 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) {
-         if (!link->ifname)
-                 return -ENOMEM;
- 
-+        r = sd_rtnl_message_read_ether_addr(message, IFLA_ADDRESS, &link->mac);
-+        if (r < 0)
-+                return r;
-+
-         r = asprintf(&link->state_file, "/run/systemd/network/links/%"PRIu64,
-                      link->ifindex);
-         if (r < 0)
--- 
-2.0.0
-
diff --git a/core/systemd/0001-udev-always-close-lock-file-descriptor.patch b/core/systemd/0001-udev-always-close-lock-file-descriptor.patch
deleted file mode 100644
index ed5deb556..000000000
--- a/core/systemd/0001-udev-always-close-lock-file-descriptor.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3d06f4183470d42361303086ed9dedd29c0ffc1b Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay@vrfy.org>
-Date: Tue, 3 Jun 2014 10:46:51 +0200
-Subject: [PATCH] udev: always close lock file descriptor
-
-https://bugs.freedesktop.org/show_bug.cgi?id=79576
----
- src/udev/udevd.c | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 1c9488e..819ea3b 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -301,6 +301,7 @@ static void worker_new(struct event *event)
-                                         if (fd_lock >= 0 && flock(fd_lock, LOCK_SH|LOCK_NB) < 0) {
-                                                 log_debug("Unable to flock(%s), skipping event handling: %m", udev_device_get_devnode(d));
-                                                 err = -EWOULDBLOCK;
-+                                                fd_lock = safe_close(fd_lock);
-                                                 goto skip;
-                                         }
-                                 }
-@@ -317,8 +318,7 @@ static void worker_new(struct event *event)
-                                 udev_device_update_db(dev);
-                         }
- 
--                        if (fd_lock >= 0)
--                                close(fd_lock);
-+                        safe_close(fd_lock);
- 
-                         /* send processed event back to libudev listeners */
-                         udev_monitor_send_device(worker_monitor, NULL, dev);
-@@ -377,10 +377,8 @@ skip:
-                 }
- out:
-                 udev_device_unref(dev);
--                if (fd_signal >= 0)
--                        close(fd_signal);
--                if (fd_ep >= 0)
--                        close(fd_ep);
-+                safe_close(fd_signal);
-+                safe_close(fd_ep);
-                 close(fd_inotify);
-                 close(worker_watch[WRITE_END]);
-                 udev_rules_unref(rules);
--- 
-2.0.0
-
diff --git a/core/systemd/0001-udev-exclude-device-mapper-from-block-device-ownersh.patch b/core/systemd/0001-udev-exclude-device-mapper-from-block-device-ownersh.patch
deleted file mode 100644
index 533c88e53..000000000
--- a/core/systemd/0001-udev-exclude-device-mapper-from-block-device-ownersh.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e918a1b5a94f270186dca59156354acd2a596494 Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay@vrfy.org>
-Date: Tue, 3 Jun 2014 16:49:38 +0200
-Subject: [PATCH] udev: exclude device-mapper from block device ownership event
- locking
-
----
- src/udev/udevd.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 819ea3b..6c05104 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -290,7 +290,19 @@ static void worker_new(struct event *event)
-                          * acquired the lock, the external process will block until
-                          * udev has finished its event handling.
-                          */
--                        if (streq_ptr("block", udev_device_get_subsystem(dev))) {
-+
-+                        /*
-+                         * <kabi_> since we make check - device seems unused - we try
-+                         *         ioctl to deactivate - and device is found to be opened
-+                         * <kay> sure, you try to take a write lock
-+                         * <kay> if you get it udev is out
-+                         * <kay> if you can't get it, udev is busy
-+                         * <kabi_> we cannot deactivate openned device  (as it is in-use)
-+                         * <kay> maybe we should just exclude dm from that thing entirely
-+                         * <kabi_> IMHO this sounds like a good plan for this moment
-+                         */
-+                        if (streq_ptr("block", udev_device_get_subsystem(dev)) &&
-+                            !startswith("dm-", udev_device_get_sysname(dev))) {
-                                 struct udev_device *d = dev;
- 
-                                 if (streq_ptr("partition", udev_device_get_devtype(d)))
--- 
-2.0.0
-
diff --git a/core/systemd/0001-udev-really-exclude-device-mapper-from-block-device-.patch b/core/systemd/0001-udev-really-exclude-device-mapper-from-block-device-.patch
deleted file mode 100644
index 10cf379e4..000000000
--- a/core/systemd/0001-udev-really-exclude-device-mapper-from-block-device-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 638ca89c53e2b897cfb3f627f4acbc7d09af2f4c Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Tue, 10 Jun 2014 15:51:15 +0200
-Subject: [PATCH] udev: really exclude device-mapper from block device
- ownership event locking
-
-Arguments were wrong order, no?
-This fixes commits:
-
-e918a1b5a94f270186dca59156354acd2a596494
-3d06f4183470d42361303086ed9dedd29c0ffc1b
----
-* dreisner: avoid second hunk of patch which doesn't apply to v213
-
- src/udev/udevd.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 0f3f3f0..160360e 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -304,7 +304,7 @@ static void worker_new(struct event *event)
-                          * <kabi_> IMHO this sounds like a good plan for this moment
-                          */
-                         if (streq_ptr("block", udev_device_get_subsystem(dev)) &&
--                            !startswith("dm-", udev_device_get_sysname(dev))) {
-+                            !startswith(udev_device_get_sysname(dev), "dm-")) {
-                                 struct udev_device *d = dev;
- 
-                                 if (streq_ptr("partition", udev_device_get_devtype(d)))
--- 
-2.0.0
-
diff --git a/core/systemd/0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch b/core/systemd/0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch
deleted file mode 100644
index f5c55e249..000000000
--- a/core/systemd/0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d8e40d62ab871a87fde421c4b246bb45bc3cbe2d Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Thu, 29 May 2014 01:17:25 +1000
-Subject: [PATCH] units: use KillMode=mixed for systemd-nspawn@.service
-
-This causes the container to shut down cleanly when the service is
-stopped.
----
- units/systemd-nspawn@.service.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
-index ff36e90..e373628 100644
---- a/units/systemd-nspawn@.service.in
-+++ b/units/systemd-nspawn@.service.in
-@@ -11,6 +11,7 @@ Documentation=man:systemd-nspawn(1)
- 
- [Service]
- ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=guest --directory=/var/lib/container/%i
-+KillMode=mixed
- Type=notify
- 
- [Install]
--- 
-1.9.3
-
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 1e67f5839..24021348b 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
-pkgver=213
-pkgrel=9
+pkgver=214
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -15,41 +15,15 @@ options=('strip' 'debug')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
-        'initcpio-install-udev'
-        '0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch'
-        '0001-fsck-disable-l-option-for-now.patch'
-        '0001-udev-exclude-device-mapper-from-block-device-ownersh.patch'
-        '0001-udev-always-close-lock-file-descriptor.patch'
-        '0001-networkd-link-intialize-mac-address.patch'
-        '0001-udev-really-exclude-device-mapper-from-block-device-.patch')
-md5sums=('06496edcf86ddf6d8c12d72ba78e735d'
+        'initcpio-install-udev')
+md5sums=('eac4f9fc5bd18a0efc3fc20858baacf3'
          '29245f7a240bfba66e2b1783b63b6b40'
          '66cca7318e13eaf37c5b7db2efa69846'
-         'bde43090d4ac0ef048e3eaee8202a407'
-         '5f8ad7126970855614c7fa34b317728d'
-         '888cf85a92dd28bcf80e18539fef3915'
-         'f26803dda8811196c0564f928bfe69d1'
-         '2a14fe9876fa48f01cca3c1d575e5771'
-         '3d53d3bcd85ca0b2ff9f4e79d012808d'
-         'ae060fc00eeced6554e70d9a9c0eb42f')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 <"$srcdir/0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch"
-  patch -Np1 <"$srcdir/0001-networkd-link-intialize-mac-address.patch"
-  patch -Np1 <"$srcdir/0001-fsck-disable-l-option-for-now.patch"
-  patch -Np1 <"$srcdir/0001-udev-always-close-lock-file-descriptor.patch"
-  patch -Np1 <"$srcdir/0001-udev-exclude-device-mapper-from-block-device-ownersh.patch"
-  patch -Np1 <"$srcdir/0001-udev-really-exclude-device-mapper-from-block-device-.patch"
-}
-
+         'bde43090d4ac0ef048e3eaee8202a407')
 
 build() {
   cd "$pkgname-$pkgver"
 
-  export NM=gcc-nm RANLIB=gcc-ranlib
-
   ./configure \
       --libexecdir=/usr/lib \
       --localstatedir=/var \
@@ -108,6 +82,9 @@ package_systemd() {
   rmdir "$pkgdir/etc/systemd/system/getty.target.wants" \
       "$pkgdir/etc/systemd/system/network-online.target.wants"
 
+  # remove the coredump rule until minidumps are a thing.
+  rm "$pkgdir/usr/lib/sysctl.d/50-coredump.conf"
+
   # get rid of RPM macros
   rm -r "$pkgdir/usr/lib/rpm"
 
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install
index cb47fe987..062e9a97d 100644
--- a/core/systemd/systemd.install
+++ b/core/systemd/systemd.install
@@ -38,10 +38,6 @@ _dir_empty() {
 post_common() {
   systemd-machine-id-setup
 
-  # TODO: drop this for 214
-  # http://cgit.freedesktop.org/systemd/systemd/commit/?id=fdd2531170
-  add_privs usr/bin/systemd-detect-virt 'cap_dac_override,cap_sys_ptrace+ep'
-
   udevadm hwdb --update
   journalctl --update-catalog
 }
@@ -120,6 +116,27 @@ _213_4_changes() {
   fi
 }
 
+_214_2_changes() {
+  # /run/systemd/network/resolv.conf -> /run/systemd/resolve/resolv.conf
+  if [[ etc/resolv.conf -ef run/systemd/network/resolv.conf ]]; then
+    ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
+
+    if sd_booted; then
+      if [[ ! -d run/systemd/resolve ]]; then
+        mkdir run/systemd/resolve
+      fi
+
+      if [[ -f run/systemd/network/resolv.conf ]]; then
+        mv run/systemd/{network,resolve}/resolv.conf
+      fi
+    fi
+  fi
+
+  echo ':: coredumps are no longer sent to the journal by default. To re-enable:'
+  echo '   echo >/etc/sysctl.d/50-coredump.conf \'
+  echo '       "kernel.core_pattern=|/usr/lib/systemd/systemd-coredump %p %u %g %s %t %e"'
+}
+
 post_install() {
   post_common "$@"
 
@@ -144,7 +161,8 @@ post_upgrade() {
                     208-8
                     209-1
                     210-1
-                    213-4)
+                    213-4
+                    214-2)
 
   for v in "${upgrades[@]}"; do
     if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
diff --git a/extra/cinepaint/LICENSE b/extra/cinepaint/LICENSE
new file mode 100644
index 000000000..746207229
--- /dev/null
+++ b/extra/cinepaint/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2005, Kai-Uwe Behrmann
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met: 
+    * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer. 
+    * Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.ntributors may be used to endorse or promote
+    products derived from this software without specific prior written
+    permission. 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
new file mode 100644
index 000000000..aa9a6ab01
--- /dev/null
+++ b/extra/cinepaint/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 213128 2014-05-19 14:15:58Z svenstaro $
+# Maintainer:
+# Contributor: tobias [tobias.archlinux.org]
+
+pkgname=cinepaint
+_realver=1.0-4
+pkgver=${_realver/-/.}
+pkgrel=2
+epoch=1
+pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
+arch=('i686' 'x86_64')
+license=('LGPL' 'GPL' 'MIT')
+url="http://www.cinepaint.org"
+depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm')
+makedepends=('python2' 'gutenprint>=5.2.9' 'optipng')
+optdepends=('python2: for python plug-ins'
+            'gutenprint: for print plug-ins'
+            'ghostscript: for pdf plug-ins')
+install=cinepaint.install
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$_realver.tar.gz
+        LICENSE cinepaint-libpng15.patch)
+sha1sums=('2049958784d211cc0be8f41f3473433479ba71fe'
+          'ca8411db87f3fc51bbdfade22f4e1f555b2ee19e'
+          '3dfc9f06f02791aee59b60d33ddf9d305b0f1de5')
+
+prepare() {
+  cd $pkgname-$_realver
+  patch -p1 -i ../cinepaint-libpng15.patch
+  find . -name \*.png -exec optipng -quiet -force -fix {} +
+}
+
+build() {
+  export LDFLAGS="$LDFLAGS -lstdc++ -lm -lX11"
+
+  cd $pkgname-$_realver
+  ./configure --prefix=/usr \
+    --libdir=/usr/lib --mandir=/usr/share/man \
+    --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
+
+  find . -name Makefile -exec sed -i 's/-Wl,,/-Wl,/g' {} +
+
+  make
+}
+
+package() {
+  cd $pkgname-$_realver
+  make DESTDIR="$pkgdir" install
+
+  sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" \
+    -e "/libcinepaint.la/d" -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" \
+    "$pkgdir/usr/bin/cinepainttool"
+  sed -i "s/cinepaint.png/cinepaint/" "$pkgdir/usr/share/applications/cinepaint.desktop"
+  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/extra/cinepaint/cinepaint-libpng15.patch b/extra/cinepaint/cinepaint-libpng15.patch
new file mode 100644
index 000000000..e22edafae
--- /dev/null
+++ b/extra/cinepaint/cinepaint-libpng15.patch
@@ -0,0 +1,452 @@
+diff -Naur cinepaint.old/plug-ins/png/png.c cinepaint/plug-ins/png/png.c
+--- cinepaint.old/plug-ins/png/png.c	2012-01-23 12:39:42.000000000 -0500
++++ cinepaint/plug-ins/png/png.c	2012-01-23 12:39:50.000000000 -0500
+@@ -390,6 +390,16 @@
+   gchar		*progress;	/* Title for progress display... */
+   guchar	alpha[256],	/* Index -> Alpha */
+   		*alpha_ptr;	/* Temporary pointer */
++  png_byte     color_type;
++  png_byte     bit_depth;
++  png_colorp palette;
++  int num_palette;
++  png_charpp iccp_name;
++  int compression_type;
++  png_bytepp iccp_profile;
++  png_uint_32 iccp_proflen;
++  png_uint_32 width, height;
++  png_byte channels;
+ 
+  /*
+   * PNG 0.89 and newer have a sane, forwards compatible constructor.
+@@ -405,7 +415,7 @@
+   info = (png_infop)calloc(sizeof(png_info), 1);
+ #endif /* PNG_LIBPNG_VER > 88 */
+ 
+-  if (setjmp (pp->jmpbuf))
++  if (setjmp (png_jmpbuf(pp)))
+   {
+     g_message ("%s\nPNG error. File corrupted?", filename);
+     return image;
+@@ -442,21 +452,26 @@
+   */
+ 
+   png_read_info(pp, info);
++  color_type = png_get_color_type(pp, info);
++  width=png_get_image_width(pp, info);
++  height=png_get_image_height(pp, info);
+ 
+  /*
+   * Latest attempt, this should be my best yet :)
+   */
+ 
++  bit_depth = png_get_bit_depth(pp, info);
++
+ #ifndef WORDS_BIGENDIAN
+-  if(info->bit_depth == 16)
++  if(bit_depth == 16)
+ 	  png_set_swap(pp);
+ #endif
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) {
++  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+     png_set_expand(pp);
+   }
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) {
++  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) {
+     png_set_packing(pp);
+   }
+ 
+@@ -464,8 +479,8 @@
+   * Expand G+tRNS to GA, RGB+tRNS to RGBA
+   */
+ 
+-  if (info->color_type != PNG_COLOR_TYPE_PALETTE &&
+-                       (info->valid & PNG_INFO_tRNS)) {
++  if (color_type != PNG_COLOR_TYPE_PALETTE &&
++      (png_get_valid(pp, info, PNG_INFO_tRNS))) {
+     png_set_expand(pp);
+   }
+ 
+@@ -482,7 +497,7 @@
+ 
+ #if PNG_LIBPNG_VER > 99
+   if (png_get_valid(pp, info, PNG_INFO_tRNS) &&
+-      info->color_type == PNG_COLOR_TYPE_PALETTE)
++      color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_get_tRNS(pp, info, &alpha_ptr, &num, NULL);
+     /* Copy the existing alpha values from the tRNS chunk */
+@@ -505,9 +520,9 @@
+ 
+   png_read_update_info(pp, info);
+   
+-  if(info->bit_depth==16)
++  if(bit_depth==16)
+   {
+-	  switch (info->color_type)
++	  switch (color_type)
+ 	  {
+ 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
+ 			  bpp        = 6;
+@@ -545,7 +560,7 @@
+   }
+   else
+   {
+-	  switch (info->color_type)
++	  switch (color_type)
+ 	  {
+ 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
+ 			  bpp        = 3;
+@@ -582,7 +597,7 @@
+ 	  };
+   }
+ 
+-  image = gimp_image_new(info->width, info->height, image_type);
++  image = gimp_image_new(width, height, image_type);
+   if (image == -1)
+   {
+     g_message("Can't allocate new image\n%s", filename);
+@@ -595,7 +610,7 @@
+   * Create the "background" layer to hold the image...
+   */
+ 
+-  layer = gimp_layer_new(image, _("Background"), info->width, info->height,
++  layer = gimp_layer_new(image, _("Background"), width, height,
+                          layer_type, 100, NORMAL_MODE);
+   gimp_image_add_layer(image, layer, 0);
+ 
+@@ -627,20 +642,21 @@
+ 
+   empty= 0; /* by default assume no full transparent palette entries */
+ 
+-  if (info->color_type & PNG_COLOR_MASK_PALETTE) {
++  if (color_type & PNG_COLOR_MASK_PALETTE) {
+ 
+ #if PNG_LIBPNG_VER > 99
++    png_get_PLTE(pp, info, &palette, &num_palette);
+     if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
+       for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty);
+         /* Calculates number of fully transparent "empty" entries */
+ 
+-      gimp_image_set_cmap(image, (guchar *) (info->palette + empty),
+-                          info->num_palette - empty);
++      gimp_image_set_cmap(image, (guchar *) (palette + empty),
++                          num_palette - empty);
+     } else {
+-      gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
++      gimp_image_set_cmap(image, (guchar *)palette, num_palette);
+     }
+ #else
+-    gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
++    gimp_image_set_cmap(image, (guchar *)palette, num_palette);
+ #endif /* PNG_LIBPNG_VER > 99 */
+ 
+   }
+@@ -659,18 +675,19 @@
+   */
+ 
+   tile_height = gimp_tile_height ();
+-  pixel       = g_new(guchar, tile_height * info->width * bpp);
++  pixel       = g_new(guchar, tile_height * width * bpp);
+   pixels      = g_new(guchar *, tile_height);
++  channels=png_get_channels(pp, info);
+ 
+-  if(info->bit_depth==16)
++  if(bit_depth==16)
+   {
+ 	  for (i = 0; i < tile_height; i ++)
+-		  pixels[i] = pixel + info->width * info->channels * i * 2;
++		  pixels[i] = pixel + width * channels * i * 2;
+   }
+   else
+   {
+ 	  for (i = 0; i < tile_height; i ++)
+-		  pixels[i] = pixel + info->width * info->channels * i;
++		  pixels[i] = pixel + width * channels * i;
+   }
+ 
+   for (pass = 0; pass < num_passes; pass ++)
+@@ -680,11 +697,11 @@
+ 	   */
+ 
+ 	  for (begin = 0, end = tile_height;
+-			  begin < info->height;
++			  begin < height;
+ 			  begin += tile_height, end += tile_height)
+ 	  {
+-		  if (end > info->height)
+-			  end = info->height;
++		  if (end > height)
++			  end = height;
+ 
+ 		  num = end - begin;
+ 
+@@ -697,20 +714,21 @@
+ 		  gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin,
+ 				  drawable->width, num);
+ 
+-		  gimp_progress_update(((double)pass + (double)end / (double)info->height) /
++		  gimp_progress_update(((double)pass + (double)end / (double)height) /
+ 				  (double)num_passes);
+ 	  };
+   };
+ 
+ #if defined(PNG_iCCP_SUPPORTED)
+   /* set icc profile */
+-  if (info->iccp_proflen > 0) {
+-    gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen,
+-                                              info->iccp_profile,
+-                                              ICC_IMAGE_PROFILE);
++  png_get_iCCP(pp, info,  (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen);
++  if (iccp_proflen > 0) {
++    gimp_image_set_icc_profile_by_mem (image, iccp_proflen,
++				       (gchar *)iccp_profile,
++				       ICC_IMAGE_PROFILE);
+     printf ("%s:%d %s() set embedded profile \"%s\"\n",
+              __FILE__,__LINE__,__func__,
+-                                              info->iccp_name);
++	    (char *)iccp_name);
+   }
+ #endif
+ 
+@@ -808,6 +826,14 @@
+                 blue;           /* Used for palette background */
+   time_t	cutime;         /* Time since epoch */
+   struct tm	*gmt;		/* GMT broken down */
++  png_byte     color_type;
++  png_byte     bit_depth;
++  int filter_method=0;
++  png_colorp palette;
++  int num_palette;
++  png_charpp iccp_name;
++  png_uint_32 height;
++  int compression_type;
+ 
+  /*
+   * PNG 0.89 and newer have a sane, forwards compatible constructor.
+@@ -824,7 +849,7 @@
+   info = (png_infop)calloc(sizeof(png_info), 1);
+ #endif /* PNG_LIBPNG_VER > 88 */
+ 
+-  if (setjmp (pp->jmpbuf))
++  if (setjmp (png_jmpbuf(pp)))
+   {
+     g_message ("%s\nPNG error. Couldn't save image", filename);
+     return 0;
+@@ -857,15 +882,6 @@
+   drawable = gimp_drawable_get (drawable_ID);
+   type     = gimp_drawable_type (drawable_ID);
+ 
+- /*
+-  * Set the image dimensions, bit depth, interlacing and compression
+-  */
+-
+-  png_set_compression_level (pp, pngvals.compression_level);
+-
+-  info->width          = drawable->width;
+-  info->height         = drawable->height;
+-  info->interlace_type = pngvals.interlaced;
+ 
+  /*
+   * Set color type and remember bytes per pixel count 
+@@ -874,71 +890,69 @@
+   switch (type)
+   {
+     case RGB_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_RGB;
++	bit_depth      = 8;
+         bpp              = 3;
+         break;
+     case RGBA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++	bit_depth      = 8;
+         bpp              = 4;
+         break;
+     case GRAY_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_GRAY;
++	bit_depth      = 8;
+         bpp              = 1;
+         break;
+     case GRAYA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
++	bit_depth      = 8;
+         bpp              = 2;
+         break;
+     case INDEXED_IMAGE :
+ 	bpp		 = 1;
+-	info->bit_depth      = 8;
+-        info->color_type = PNG_COLOR_TYPE_PALETTE;
+-	info->valid      |= PNG_INFO_PLTE;
+-        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
+-        info->num_palette= num_colors;
++	bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_PALETTE;
++	png_get_valid(pp, info, PNG_INFO_PLTE);
++	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
+         break;
+     case INDEXEDA_IMAGE :
+ 	bpp		 = 2;
+-	info->bit_depth      = 8;
+-	info->color_type = PNG_COLOR_TYPE_PALETTE;
++	bit_depth      = 8;
++	color_type = PNG_COLOR_TYPE_PALETTE;
+ 	respin_cmap (pp, info, image_ID); /* fix up transparency */
+ 	break;
+     case U16_RGB_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_RGB;
++	bit_depth      = 16;
+         bpp              = 6;
+         break;
+     case U16_RGBA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++	bit_depth      = 16;
+         bpp              = 8;
+         break;
+     case U16_GRAY_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_GRAY;
++	bit_depth      = 16;
+         bpp              = 2;
+         break;
+     case U16_GRAYA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
++	bit_depth      = 16;
+         bpp              = 4;
+         break;
+     case U16_INDEXED_IMAGE :
+ 	bpp		 = 2;
+-	info->bit_depth      = 16;
+-        info->color_type = PNG_COLOR_TYPE_PALETTE;
+-	info->valid      |= PNG_INFO_PLTE;
+-        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
+-        info->num_palette= num_colors;
++	bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_PALETTE;
++	png_get_valid(pp, info, PNG_INFO_PLTE);
++	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
+         break;
+     case U16_INDEXEDA_IMAGE :
+ 	bpp		 = 4;
+-	info->bit_depth      = 16;
+-	info->color_type = PNG_COLOR_TYPE_PALETTE;
++	bit_depth      = 16;
++	color_type = PNG_COLOR_TYPE_PALETTE;
+ 	respin_cmap (pp, info, image_ID); /* fix up transparency */
+ 	break;
+     default:
+@@ -950,30 +964,36 @@
+   * Fix bit depths for (possibly) smaller colormap images
+   */
+   
+-  if (info->valid & PNG_INFO_PLTE) {
+-    if (info->num_palette <= 2)
+-      info->bit_depth= 1;
+-    else if (info->num_palette <= 4)
+-      info->bit_depth= 2;
+-    else if (info->num_palette <= 16)
+-      info->bit_depth= 4;
++  if (png_get_valid(pp, info, PNG_INFO_PLTE)) {
++    png_get_PLTE(pp, info, &palette, &num_palette);
++    if (num_palette <= 2)
++      bit_depth= 1;
++    else if (num_palette <= 4)
++      bit_depth= 2;
++    else if (num_palette <= 16)
++      bit_depth= 4;
+     /* otherwise the default is fine */
+   }
+ 
++ png_set_compression_level (pp, pngvals.compression_level);
++ png_set_IHDR(pp, info, drawable->width, drawable->height,
++	      bit_depth, color_type, pngvals.interlaced, compression_type, filter_method);
++
++
+   // write icc profile
+ #if defined(PNG_iCCP_SUPPORTED)
+   if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) {
+-    int size;
++    int  size;
+     char *buffer;
+     
+     buffer = gimp_image_get_icc_profile_by_mem (image_ID, &size,
+                                                 ICC_IMAGE_PROFILE);
+     png_set_iCCP (pp, info,
+            gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE),
+-                  0, buffer, size);
++                  0, (png_const_bytep)buffer, size);
+     printf ("%s:%d %s() embedd icc profile \"%s\"\n",
+              __FILE__,__LINE__,__func__,
+-                                              info->iccp_name);
++	    (char *)iccp_name);
+   }
+ #endif
+ 
+@@ -1039,13 +1059,13 @@
+   * Convert unpacked pixels to packed if necessary
+   */
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
++  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8)
+     png_set_packing(pp);
+ 
+   /* Set swapping for 16 bit per sample images */
+   
+ #ifndef WORDS_BIGENDIAN
+-  if (info->bit_depth == 16)
++  if (bit_depth == 16)
+ 	  png_set_swap(pp);
+ #endif
+   
+@@ -1063,6 +1083,7 @@
+ 
+   gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width,
+                       drawable->height, FALSE, FALSE);
++  height=png_get_image_height(pp, info);
+ 
+   for (pass = 0; pass < num_passes; pass ++)
+   {
+@@ -1077,7 +1098,7 @@
+ 	num = end - begin;
+ 	
+ 	gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num);
+-        if (info->valid & PNG_INFO_tRNS) {
++        if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
+           for (i = 0; i < num; ++i) {
+ 	    fixed= pixels[i];
+             for (k = 0; k < drawable->width; ++k) {
+@@ -1085,7 +1106,7 @@
+             }
+           }
+        /* Forgot this case before, what if there are too many colors? */
+-        } else if (info->valid & PNG_INFO_PLTE && bpp == 2) {
++        } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) {
+           for (i = 0; i < num; ++i) {
+ 	    fixed= pixels[i];
+             for (k = 0; k < drawable->width; ++k) {
+@@ -1095,9 +1116,8 @@
+         }
+ 	
+ 	png_write_rows (pp, pixels, num);
+-	
+ 	gimp_progress_update (((double)pass + (double)end /
+-                    (double)info->height) / (double)num_passes);
++                    (double)height) / (double)num_passes);
+       };
+   };
+ 
diff --git a/extra/cinepaint/cinepaint-missing-include.patch b/extra/cinepaint/cinepaint-missing-include.patch
new file mode 100644
index 000000000..ed159213a
--- /dev/null
+++ b/extra/cinepaint/cinepaint-missing-include.patch
@@ -0,0 +1,11 @@
+diff -Naur cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
+--- cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp	2012-04-20 18:51:10.625503826 -0400
++++ cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp	2012-04-20 18:52:04.478835055 -0400
+@@ -32,6 +32,7 @@
+ 
+ #include <list>
+ #include <string>
++#include <unistd.h>
+ 
+ #include "icc_modell_beobachter.h"
+ 
diff --git a/extra/cinepaint/cinepaint.install b/extra/cinepaint/cinepaint.install
new file mode 100644
index 000000000..5e5cfef4d
--- /dev/null
+++ b/extra/cinepaint/cinepaint.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+}
diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD
index 9b0ed0fb9..70ec0260d 100644
--- a/extra/easytag/PKGBUILD
+++ b/extra/easytag/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 212164 2014-05-09 16:55:37Z guillaume $
+# $Id: PKGBUILD 215370 2014-06-23 18:51:25Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=easytag
-pkgver=2.2.2
+pkgver=2.2.3
 pkgrel=1
 pkgdesc='Simple application for viewing and editing tags in audio files'
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ depends=('id3lib' 'libid3tag' 'gtk3' 'libvorbis' 'flac' 'speex' 'wavpack' 'tagli
          'desktop-file-utils' 'hicolor-icon-theme' 'opusfile')
 install=${pkgname}.install
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('fb21ac51975c90c58c5dc38c28aa1030d6fa3420bc6b8406f085e34df9e14164')
+sha256sums=('f49cadc868a67faeb99bdbedc21a3009783609b380d098412c4799ec48aeaeb3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index fd7f00414..25124e36e 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 213435 2014-05-23 23:08:17Z heftig $
+# $Id: PKGBUILD 215391 2014-06-23 19:55:35Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.12.2
+pkgver=3.12.4
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@ options=('!makeflags')
 groups=(gnome)
 install=empathy.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('414d0c6b1a30b1afbf35ad04b0b9ff3ada3e06fab797a50a7147cdfe0905e7cd')
+sha256sums=('056a1fc27e9aa1f9df4d4d91353e04ca2e1b0fcc6bf082a9108f9dbb9870c978')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD
index b093decb1..dfbd37a36 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -1,30 +1,29 @@
-# $Id: PKGBUILD 211631 2014-04-21 18:28:13Z jgc $
+# $Id: PKGBUILD 215389 2014-06-23 19:53:29Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=folks
 pkgver=0.9.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Library to aggregates people into metacontacts"
 arch=(i686 x86_64)
 url="http://telepathy.freedesktop.org/wiki/Folks"
 license=(LGPL2.1)
 depends=(telepathy-glib libgee libxml2 evolution-data-server zeitgeist)
-makedepends=(gobject-introspection intltool vala git)
+makedepends=(gobject-introspection intltool vala)
 install=folks.install
 options=('!emptydirs')
-source=(git://git.gnome.org/folks#commit=0085cb463849e5b30d4b4c58da63a5df3fd0d0be)
-md5sums=('SKIP')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-${pkgver}.tar.xz)
+md5sums=('aeaeb5a8e7277b167b9f055f372b9d5d')
 
 build() {
-  cd $pkgname
-  NOCONFIGURE=1 ./autogen.sh
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-schemas-compile \
     --disable-libsocialweb-backend --disable-fatal-warnings
   make
 }
 
 package() {
-  cd $pkgname
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/foomatic/PKGBUILD b/extra/foomatic/PKGBUILD
new file mode 100644
index 000000000..c79c71bd3
--- /dev/null
+++ b/extra/foomatic/PKGBUILD
@@ -0,0 +1,86 @@
+# $Id: PKGBUILD 208610 2014-03-24 16:45:27Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgbase="foomatic"
+pkgname=('foomatic-db' 'foomatic-db-engine' 'foomatic-db-nonfree')
+arch=('i686' 'x86_64') # needs to be changed  in the subpackages when makepkg will support it
+pkgver=20140324
+pkgrel=1
+epoch=3
+
+makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash' 'bzr')
+url="http://www.linuxprinting.org/foomatic.html"
+options=('!emptydirs')
+
+# check http://bzr.linuxfoundation.org/loggerhead/openprinting/foomatic/
+# for latest commits and development, identical to foomatic-4.0 branch
+
+source=(foomatic-db-engine::bzr+http://bzr.linuxfoundation.org/openprinting/foomatic/foomatic-db-engine/#revision=368       #2014-03-20
+        foomatic-db::bzr+http://bzr.linuxfoundation.org/openprinting/foomatic/foomatic-db/#revision=1255                    #2014-03-19
+        foomatic-db-nonfree::bzr+http://bzr.linuxfoundation.org/openprinting/foomatic/foomatic-db-nonfree/#revision=40      #2013-09-25
+)
+md5sums=('SKIP'
+         'SKIP'
+         'SKIP')
+
+pkgver() {
+  date +%Y%m%d
+}
+
+package_foomatic-db() {
+
+ pkgdesc="Foomatic - The collected knowledge about printers, drivers, and driver options in XML files, used by foomatic-db-engine to generate PPD files."
+# arch=('any')
+ license=('GPL' 'custom')
+ depends=('perl' 'libxml2')
+ replaces=('foomatic-db-ppd' 'foomatic-db-hpijs')
+ conflicts=('foomatic-db-ppd' 'foomatic-db-hpijs')
+ provides=('foomatic-db-hpijs')
+
+   cd ${srcdir}/${pkgname}
+   bzr revno
+   echo $pkgver
+   ./make_configure
+   ./configure --prefix=/usr
+   make DESTDIR=${pkgdir} install
+   install -v -Dm644 ${srcdir}/${pkgname}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}
+
+package_foomatic-db-engine() {
+
+ pkgdesc="Foomatic - Foomatic's database engine generates PPD files from the data in Foomatic's XML database. It also contains scripts to directly generate print queues and handle jobs."
+# arch=('i686' 'x86_64')
+ license=('GPL')
+ depends=('perl' 'libxml2' "cups-filters>=1.0.42" 'bash')
+
+   export LIB_CUPS="/usr/lib/cups"
+   cd ${srcdir}/foomatic-db-engine
+   bzr revno
+   ./make_configure
+   ./configure --prefix=/usr \
+      --sbindir=/usr/bin
+   make
+   eval `perl -V:archname`
+   make DESTDIR=${pkgdir} \
+        INSTALLARCHLIB=/usr/lib/perl5/vendor_perl/ \
+        INSTALLSITELIB=/usr/lib/perl5/vendor_perl/ \
+        INSTALLSITEARCH=/usr/lib/perl5/vendor_perl/ install
+   /usr/bin/find ${pkgdir} -name '.packlist' -delete
+   # fix permissions
+   chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/vendor_perl}
+}
+
+package_foomatic-db-nonfree() {
+
+ pkgdesc="Foomatic - database extension consisting of manufacturer-supplied PPD files released under non-free licenses"
+# arch=('any')
+ license=('custom')
+ depends=('perl' 'libxml2' "foomatic-db-engine" 'foomatic-db')
+
+   cd ${srcdir}/foomatic-db-nonfree
+   bzr revno
+   ./make_configure
+   ./configure --prefix=/usr
+   make DESTDIR=${pkgdir} install
+   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}
diff --git a/extra/four-in-a-row/PKGBUILD b/extra/four-in-a-row/PKGBUILD
index 10fc65e57..cc57994cc 100644
--- a/extra/four-in-a-row/PKGBUILD
+++ b/extra/four-in-a-row/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213465 2014-05-23 23:34:13Z heftig $
+# $Id: PKGBUILD 215384 2014-06-23 19:35:51Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=four-in-a-row
-pkgver=3.12.2
+pkgver=3.12.3
 pkgrel=1
 pkgdesc="Make lines of the same color to win"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ install=four-in-a-row.install
 url="https://live.gnome.org/Four-in-a-row"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6180612c70a04e70f17bc165fdfccc8c7984e6ed7d3c2870221cf596864545ef')
+sha256sums=('a445b745d2ae025fcd733734538b94dacc22afe0d7e0227d8da2aeb0a343d560')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-calculator/PKGBUILD b/extra/gnome-calculator/PKGBUILD
index c4345f85b..bbf4f8ab1 100644
--- a/extra/gnome-calculator/PKGBUILD
+++ b/extra/gnome-calculator/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 214066 2014-06-03 08:33:44Z jgc $
+# $Id: PKGBUILD 215383 2014-06-23 19:34:37Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-calculator
-pkgver=3.12.2
+pkgver=3.12.3
 pkgrel=1
 pkgdesc="GNOME Scientific calculator"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ options=(!emptydirs)
 url="http://www.gnome.org"
 install=gnome-calculator.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('da9dd34286979e88430b236982bf0c8b4415cd0c0caa0c19228fb521c08abe60')
+sha256sums=('201022e26759462d1c0c3e32e0560d6b8c25540a6cfeeb9aca518837e053c32e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD
index 829117754..7a44a84d6 100644
--- a/extra/gnome-online-accounts/PKGBUILD
+++ b/extra/gnome-online-accounts/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 213525 2014-05-24 00:30:53Z heftig $
+# $Id: PKGBUILD 215376 2014-06-23 19:16:33Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-online-accounts
-pkgver=3.12.2
+pkgver=3.12.3
 pkgrel=1
 pkgdesc="GNOME service to access online accounts"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsec
 makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('cac7758e09d32eb54af50ab6b23d65da0c8d48c555c8db011a0cf5b977d542ec')
+sha256sums=('afd7e2f0e6eccbde92f10183ea366c95b579767c540442ef82e4009d7759eda6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-robots/PKGBUILD b/extra/gnome-robots/PKGBUILD
index c24fb1a84..11ce8f9d5 100644
--- a/extra/gnome-robots/PKGBUILD
+++ b/extra/gnome-robots/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213510 2014-05-24 00:15:30Z heftig $
+# $Id: PKGBUILD 215386 2014-06-23 19:42:58Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-robots
-pkgver=3.12.2
+pkgver=3.12.3
 pkgrel=1
 pkgdesc="Avoid the robots and make them crash into each other"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ install=gnome-robots.install
 url="https://live.gnome.org/Robots"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7a826835777611ce28a0e54b8e4cb3b221c200557ad155f7bd3aeacea29c97de')
+sha256sums=('3e89935f80c0d17b7bc9a56314ef309341cb90c3938c85d5f52524e24b032902')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index 943275064..02ec60f87 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 213505 2014-05-24 00:01:09Z heftig $
+# $Id: PKGBUILD 215397 2014-06-23 20:16:43Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=3.12.2
+pkgver=3.12.3
 pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
 arch=(i686 x86_64)
@@ -16,7 +16,7 @@ url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-terminal.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ea19ce610af2873d26e1e75491415e17af6a5080366db966f9220fdeea5ebecd')
+sha256sums=('8450da259fb485289d61fdbe5b59037be068e0dbdd5c7dd8216b60cd49d55528')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index b32f1363c..7707805cb 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 210498 2014-04-14 20:07:01Z jgc $
+# $Id: PKGBUILD 215395 2014-06-23 20:11:12Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.23
+pkgver=2.24.24
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -12,7 +12,7 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
         gtkrc xid-collision-debug.patch)
-sha256sums=('a0a406e27e9b5e7d6b2c4334212706ed5cdcd41e713e66c9ae950655dd61517c'
+sha256sums=('12ceb2e198c82bfb93eb36348b6e9293c8fdcd60786763d04cfec7ebe7ed3d6d'
             'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
             'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
 
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD
index 3a9455df2..5b59934e3 100644
--- a/extra/gtkhtml4/PKGBUILD
+++ b/extra/gtkhtml4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213457 2014-05-23 23:29:13Z heftig $
+# $Id: PKGBUILD 215378 2014-06-23 19:29:00Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtkhtml4
 _pkgbasename=gtkhtml
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('gtk3' 'enchant' 'iso-codes' 'libsoup')
 makedepends=('intltool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver:0:3}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('558bf8ec61d9e24cd67301613fc26ab54a495b4b75af5770d1259128aaeefa63')
+sha256sums=('58d2d6bafd221fdc07982ad0455fd168afc7fb642465d53b66b07328eab32868')
 
 build() {
     cd "$_pkgbasename-$pkgver"
diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD
index 9b1a687e2..797999510 100644
--- a/extra/gupnp-av/PKGBUILD
+++ b/extra/gupnp-av/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 205057 2014-02-03 21:26:34Z heftig $
+# $Id: PKGBUILD 215380 2014-06-23 19:31:07Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
 # Contributor: Denis Zawada <deno@rootnode.net>
 
 pkgname=gupnp-av
-pkgver=0.12.5
+pkgver=0.12.6
 pkgrel=1
 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ license=(LGPL)
 depends=(gupnp)
 makedepends=(gobject-introspection gtk-doc vala)
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8375034ccc4a45e90923c26135517aab57a88f5757ce65a1b23378df4c60bff6')
+sha256sums=('e0553d60dd7c7277c65c02a68a270c4dcb9036a4c7075c902fc8111c6a5e6a44')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 791789251..58f933952 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 215257 2014-06-17 19:24:43Z eric $
+# $Id: PKGBUILD 215353 2014-06-23 10:40:14Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Contributor: tobias <tobias@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.4
-pkgrel=16
+pkgrel=17
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 4a62bfb7b..bea5bcb38 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -10,11 +10,11 @@
 
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=4.1.8
+pkgver=4.1.9
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=4.1.8
+_realver=4.1.9
 pkgrel=1
 arch=(i686 x86_64)
 url="http://www.samba.org"
@@ -240,7 +240,7 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('212b7568d44e7668a7dc8a45c5558764'
+md5sums=('f9efc506e08c680d2b79b13be28c959c'
          '5697da77590ec092cc8a883bae06093c'
          '96f82c38f3f540b53f3e5144900acf17'
          'ee4763a656cf00d92bfda31b6bb2c5cb'
diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD
index 11e6d6eed..44545c792 100644
--- a/extra/vte3/PKGBUILD
+++ b/extra/vte3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213504 2014-05-24 00:00:04Z heftig $
+# $Id: PKGBUILD 215396 2014-06-23 20:15:51Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=vte3
 pkgname=(vte3 vte-common)
-pkgver=0.36.2
+pkgver=0.36.3
 pkgrel=1
 pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ options=('!emptydirs')
 makedepends=('intltool' 'gobject-introspection' 'gtk3')
 url="http://www.gnome.org"
 source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz)
-sha256sums=('f45eed3aed823068c7563345ea947be0e6ddb3dacd74646e6d7d26a921e04345')
+sha256sums=('54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c')
 
 build() {
   cd "vte-$pkgver"
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index bcb4cdbe4..713829bdb 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 212000 2014-05-04 08:39:18Z andyrtr $
+# $Id: PKGBUILD 215362 2014-06-23 17:04:03Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=304
+pkgver=308
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz{,.asc}
         LICENSE)
-md5sums=('8a9460d848cf4ed244fcfc9b07d1c3d0'
+md5sums=('1ec76c1a79a70de4f82c24c527ef4626'
          'SKIP'
          '10ecc3f8ee91e3189863a172f68282d2')