Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/shotwell/PKGBUILD
	community-testing/texmaker/PKGBUILD
	community/i3lock/PKGBUILD
	core/dnsutils/PKGBUILD
	core/expat/PKGBUILD
	core/iptables/PKGBUILD
	extra/ntp/PKGBUILD
	extra/talloc/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/lib32-udev/PKGBUILD

28 files changed, 231 insertions, 172 deletions

diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 4b3e0291b..51ede6de9 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 57853 2011-11-03 15:52:53Z giovanni $
+# $Id: PKGBUILD 58055 2011-11-06 09:27:03Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.24
-pkgrel=2
+pkgver=0.8.25
+pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://calibre-ebook.com/"
@@ -21,7 +21,7 @@ install=calibre.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('9ab82f7d4d072cc6858ef92f29d6029a'
+md5sums=('b7b141db18912925be08ff79fd2ead3f'
          '253ce4fe5d01f8ff76b63cd3825755ea'
          '675cd87d41342119827ef706055491e7')
 
diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD
index b34f32956..6431e90b3 100755
--- a/community/e-modules-extra-svn/PKGBUILD
+++ b/community/e-modules-extra-svn/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=e-modules-extra-svn
-pkgver=62844
+pkgver=64772
 pkgrel=1
 pkgdesc="Extra gadgets for e17"
 arch=('i686' 'x86_64' 'mips64el')
@@ -40,13 +40,13 @@ build() {
   sed -i 's|efreet/Efreet.h|efreet-0/Efreet.h|' winlist-ng/src/e_mod_main.h || return 1
 
 for i in alarm calendar comp-scale cpu diskio deskshow \
-	empris engage eooorg everything-aspell everything-mpris \
-	everything-places everything-shotgun \
-	everything-wallpaper everything-websearch  \
+	empris engage eooorg e-tiling everything-aspell everything-mpris \
+	everything-pidgin everything-places everything-shotgun \
+	everything-tracker everything-wallpaper everything-websearch  \
 	execwatch flame forecasts iiirk itask language mail mem \
-        moon mpdule net news notification penguins photo places quickaccess \
+        moon mpdule net news penguins photo places quickaccess \
 	rain screenshot slideshow snow taskbar tclock tiling uptime \
-	weather winlist-ng winselector wlan; do
+	weather winlist-ng winselector wlan xkbswitch; do
 
   cd $i
   ./autogen.sh --prefix=/usr
@@ -59,13 +59,13 @@ package() {
   cd $srcdir/$_svnmod-build
 
 for i in alarm calendar comp-scale cpu diskio deskshow \
-        empris engage eooorg everything-aspell everything-mpris \
-        everything-places everything-shotgun \
-        everything-wallpaper everything-websearch  \
+        empris engage eooorg e-tiling everything-aspell everything-mpris \
+        everything-pidgin everything-places everything-shotgun \
+        everything-tracker everything-wallpaper everything-websearch  \
         execwatch flame forecasts iiirk itask language mail mem \
-        moon mpdule net news notification penguins photo places quickaccess \
+        moon mpdule net news penguins photo places quickaccess \
         rain screenshot slideshow snow taskbar tclock tiling uptime \
-        weather winlist-ng winselector wlan; do
+        weather winlist-ng winselector wlan xkbswitch; do
 
   cd $i
   make DESTDIR=$pkgdir install
diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD
index 07e74dc04..db8906b12 100755
--- a/community/e-svn/PKGBUILD
+++ b/community/e-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 54908 2011-08-27 14:51:01Z rvanharen $
+# $Id: PKGBUILD 58075 2011-11-06 10:13:58Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=e-svn
-pkgver=62822
+pkgver=64801
 pkgrel=1
 pkgdesc="Enlightenment window manager DR17 (aka e17)"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD
index 60f06d611..06c75533c 100755
--- a/community/e_dbus-svn/PKGBUILD
+++ b/community/e_dbus-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 54905 2011-08-27 14:49:26Z rvanharen $
+# $Id: PKGBUILD 58073 2011-11-06 10:12:55Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=e_dbus-svn
-pkgver=61974
+pkgver=64761
 pkgrel=1
 pkgdesc="dbus abstraction layer for e17"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD
index 9d16458e5..ec20ba97a 100755
--- a/community/ecore-svn/PKGBUILD
+++ b/community/ecore-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 54894 2011-08-27 14:45:17Z rvanharen $
+# $Id: PKGBUILD 58089 2011-11-06 13:31:05Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=ecore-svn
-pkgver=62785
+pkgver=64802
 pkgrel=1
 pkgdesc="Ecore is an abstraction layer for e17"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD
index 9f711d493..912678418 100755
--- a/community/edje-svn/PKGBUILD
+++ b/community/edje-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 54900 2011-08-27 14:47:46Z rvanharen $
+# $Id: PKGBUILD 58090 2011-11-06 13:31:38Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=edje-svn
-pkgver=62791
+pkgver=64793
 pkgrel=1
 pkgdesc="A graphical design and layout library based on Evas"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD
index be2ed3d41..983c417af 100755
--- a/community/eet-svn/PKGBUILD
+++ b/community/eet-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 54890 2011-08-27 14:43:26Z rvanharen $
+# $Id: PKGBUILD 58091 2011-11-06 13:32:00Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=eet-svn
-pkgver=62590
+pkgver=64494
 pkgrel=1
 pkgdesc="A data storage and compression library"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD
index b4612d458..11886aae4 100644
--- a/community/eeze-svn/PKGBUILD
+++ b/community/eeze-svn/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: bluebugs
 
 pkgname=eeze-svn
-pkgver=62160
+pkgver=63230
 pkgrel=1
 pkgdesc="A data storage and compression library"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD
index 2c1f5c7ca..e7609cf72 100755
--- a/community/efreet-svn/PKGBUILD
+++ b/community/efreet-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 54902 2011-08-27 14:48:35Z rvanharen $
+# $Id: PKGBUILD 58071 2011-11-06 10:11:44Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=efreet-svn
-pkgver=62616
+pkgver=64137
 pkgrel=1
 pkgdesc="freedesktop.org specifications for e17"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD
index 2a437b4a5..75957b532 100755
--- a/community/eina-svn/PKGBUILD
+++ b/community/eina-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 54889 2011-08-27 14:42:42Z rvanharen $
+# $Id: PKGBUILD 58057 2011-11-06 10:03:11Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=eina-svn
-pkgver=62813
+pkgver=64778
 pkgrel=1
 pkgdesc="E17 file chunk reading/writing library"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD
index c59daec30..e65d7a2f7 100644
--- a/community/elementary-svn/PKGBUILD
+++ b/community/elementary-svn/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=elementary-svn
-pkgver=62830
+pkgver=64794
 pkgrel=1
 pkgdesc="Enlightenment's basic widget set"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD
index 6c854b492..4a27c760d 100755
--- a/community/embryo-svn/PKGBUILD
+++ b/community/embryo-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 54898 2011-08-27 14:46:48Z rvanharen $
+# $Id: PKGBUILD 58067 2011-11-06 10:07:33Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=embryo-svn
-pkgver=62382
+pkgver=64802
 pkgrel=1
 pkgdesc="implementation of a C like scripting language for e17"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD
index 514616637..a6fcc5a41 100755
--- a/community/evas-svn/PKGBUILD
+++ b/community/evas-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 54892 2011-08-27 14:44:08Z rvanharen $
+# $Id: PKGBUILD 58061 2011-11-06 10:05:15Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=evas-svn
-pkgver=62798
+pkgver=64779
 pkgrel=1
 pkgdesc="A hardware-accelerated canvas API for X-Windows"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index fb5de8318..ee0bb4f9f 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57868 2011-11-03 22:36:48Z lcarlier $
+# $Id: PKGBUILD 58131 2011-11-06 19:03:02Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Biru Ionut <ionut@archlinux.ro>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
          'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
          'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
 pkgver=2.23.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gambas.sourceforge.net"
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index 5c6e5ac1e..3a234f814 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56505 2011-10-07 13:41:51Z spupykin $
+# $Id: PKGBUILD 58115 2011-11-06 17:48:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: farid <farid at archlinuc-br.org>
@@ -6,7 +6,7 @@
 
 pkgbase=gmic
 pkgname=('gmic' 'gimp-plugin-gmic')
-pkgver=1.5.0.4
+pkgver=1.5.0.6
 pkgrel=1
 pkgdesc="image procession framework"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagema
 options=('docs' '!emptydirs')
 source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz"
 	opencv-buildfix.patch)
-md5sums=('8a1fe1207fb09fa2d515ccd484be521c'
+md5sums=('01ddab64ed2d127c2ee35602a3e141f5'
          'f135182ced743c296e08ddd560fa6be9')
 
 build() {
diff --git a/community/i3lock/PKGBUILD b/community/i3lock/PKGBUILD
index ee018e632..9ea01f608 100644
--- a/community/i3lock/PKGBUILD
+++ b/community/i3lock/PKGBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3lock
-pkgver=2.1
+pkgver=2.2
 pkgrel=1
 pkgdesc="An improved screenlocker based upon XCB and PAM"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://i3.zekjur.net/i3lock/"
+url="http://i3wm.org/i3lock/"
 license=('MIT')
 groups=("i3")
 depends=('xcb-util' 'pam')
 options=('docs')
-source=(http://i3.zekjur.net/i3lock/$pkgname-$pkgver.tar.gz)
-md5sums=('6a86f0032eb0c09e557afae998cbe000')
+source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2")
+md5sums=('6179a1611e333c8baf54093b57d50687')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/kmymoney/PKGBUILD b/community/kmymoney/PKGBUILD
index fb7b59bc3..caf5ab674 100644
--- a/community/kmymoney/PKGBUILD
+++ b/community/kmymoney/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57452 2011-10-27 21:53:29Z lcarlier $
+# $Id: PKGBUILD 58094 2011-11-06 14:12:09Z lcarlier $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Vamp898 <vamp898@web.de>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Todd Maynard <arch@toddmaynard.com>
 
 pkgname=kmymoney
-pkgver=4.6.0
+pkgver=4.6.1
 pkgrel=1
 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ install=$pkgname.install
 changelog=$pkgname.changelog
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('8f034a92682cc61dfa76c2593893524d00658c49360b17ddc67671e32ec7edf8')
+sha256sums=('5fcab9c4f1b5868aabb816a87c61cb025e69a191f6cb218cce3f29f0c1c1b77a')
 
 build() {
   cd ${srcdir}
diff --git a/community/libalkimia/PKGBUILD b/community/libalkimia/PKGBUILD
index 18a86ae47..2f14f4bf6 100644
--- a/community/libalkimia/PKGBUILD
+++ b/community/libalkimia/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 57450 2011-10-27 21:27:30Z lcarlier $
+# $Id: PKGBUILD 58105 2011-11-06 17:14:04Z lcarlier $
 # Contributor: gumper <gumper1034@gmail.com>
 
 pkgname=libalkimia
 pkgver=4.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A library with common classes and functionality used by finance applications for the KDE SC."
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4' 'doxygen')
diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD
index b3f1f9b02..ab0e8f94d 100755
--- a/community/libfbclient/PKGBUILD
+++ b/community/libfbclient/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 48689 2011-06-04 20:28:04Z lcarlier $
+# $Id: PKGBUILD 58129 2011-11-06 19:02:46Z lcarlier $
 # Maintainer: Carlier Laurent <lordheavym@gmail.com>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgname=libfbclient
-pkgver=2.5.0.26074
-pkgrel=3
+pkgver=2.5.1.26351
+pkgrel=1
 pkgdesc="Client library for Firebird."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.firebirdsql.org/"
@@ -12,7 +12,7 @@ license=('custom')
 depends=('gcc-libs' 'icu')
 source=(http://downloads.sourceforge.net/firebird/Firebird-$pkgver-0.tar.bz2
         LICENSE)
-md5sums=('780f162ee71f087fc277adf09f966529'
+md5sums=('1772fba4f09c8fc84d989282405f90fd'
          '0d61798861e159c85dbdf0f30fe2f2ce')
 
 build() {
diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD
index 907caec87..0875674b3 100644
--- a/community/libmicrohttpd/PKGBUILD
+++ b/community/libmicrohttpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56030 2011-09-29 09:40:54Z spupykin $
+# $Id: PKGBUILD 58117 2011-11-06 17:51:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Norberto Lopes <shelika@mail.telepac.pt>
 # Contributor: Kao Dome <kaodome@gmail.com>
@@ -6,7 +6,7 @@
 # Contributor: Mathias Rohnstock <linksoft@gmx.de>
 
 pkgname=libmicrohttpd
-pkgver=0.9.15
+pkgver=0.9.16
 pkgrel=1
 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ options=('!libtool')
 depends=('gnutls' 'libgcrypt')
 install=libmicrohttpd.install
 source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz)
-md5sums=('fb726a48095cc6b25c245dbc27ea76b0')
+md5sums=('e1240c6ae383b5be89431932f181898a')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index ece3a58fa..786686d64 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 57938 2011-11-04 18:07:05Z bpiotrowski $
+# $Id: PKGBUILD 58107 2011-11-06 17:20:02Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: kiefer <jorgelmadrid@gmail.com>
 
 pkgname=lxdm
 pkgver=0.4.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Lightweight Display Manager (part of LXDE)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/lxdm/"
@@ -41,7 +41,8 @@ package() {
 
 	install -m644 ${srcdir}/lxdm-pam.patch ${pkgdir}/etc/pam.d/lxdm
 	install -Dm755 ${srcdir}/lxdm-daemon ${pkgdir}/etc/rc.d/lxdm
-	
+    install -d ${pkgdir}/var/{lib,run}/lxdm
+
 	# fix the greeter location
 	sed -i -e "s/local\/libexec/lib\/lxdm/" ${pkgdir}/etc/lxdm/lxdm.conf
 }
diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD
index 6db305207..71195520d 100644
--- a/community/root/PKGBUILD
+++ b/community/root/PKGBUILD
@@ -3,24 +3,22 @@
 
 pkgname=root
 pkgver=5.30.03
-pkgrel=1
+pkgrel=3
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://root.cern.ch'
 license=('LGPL2.1')
 depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient'
-         'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran')
+         'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran' 'hicolor-icon-theme')
 makedepends=('fftw')
 install='root.install'
 source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
         'root.sh'
         'rootd'
-        'root.desktop'
         'root.xml')
-md5sums=('d2c39bf7640bdd26d4645c52c504cc24'
+md5sums=('da46aac87047acc41a67b24c05fc465f'
          '0e883ad44f99da9bc7c23bc102800b62'
          'efd06bfa230cc2194b38e0c8939e72af'
-         'ac61b17395d75a2705fefa2ef841a6bf'
          'e2cf69b204192b5889ceb5b4dedc66f7')
 
 build() {
@@ -78,10 +76,20 @@ package() {
     ${pkgdir}/etc/profile.d/root.sh
   install -D ${srcdir}/rootd \
     ${pkgdir}/etc/rc.d/rootd
-  install -D -m644 ${srcdir}/root.desktop \
-    ${pkgdir}/usr/share/applications/root.desktop
   install -D -m644 ${srcdir}/root.xml \
     ${pkgdir}/usr/share/mime/packages/root.xml
 
+  install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.desktop.in \
+    ${pkgdir}/usr/share/applications/root-system-bin.desktop
+  # replace @prefix@ with /usr for the desktop
+  sed -e 's_@prefix@_/usr_' -i ${pkgdir}/usr/share/applications/root-system-bin.desktop
+
+  install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.png \
+    ${pkgdir}/usr/share/icons/hicolor/48x48/apps/root-system-bin.png
+
+  # use a file that pacman can track instead of adding directly to ld.so.conf
+  install -d ${pkgdir}/etc/ld.so.conf.d
+  echo '/usr/lib/root' > ${pkgdir}/etc/ld.so.conf.d/root.conf
+
   rm -rf ${pkgdir}/etc/root/daemons
 }
diff --git a/community/root/root.install b/community/root/root.install
index 457af7314..afabb7aea 100644
--- a/community/root/root.install
+++ b/community/root/root.install
@@ -1,17 +1,25 @@
 post_install() {
-  if ! [ `grep '/usr/lib/root' etc/ld.so.conf` ]; then
-    echo "/usr/lib/root" >> etc/ld.so.conf
-    sbin/ldconfig -r .
-  fi
-
   update-desktop-database >/dev/null
 
   update-mime-database /usr/share/mime >/dev/null
+
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_remove() {
-  cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot
-  mv /tmp/.pacroot etc/ld.so.conf
-  chmod 644 etc/ld.so.conf
-  sbin/ldconfig -r .
+  # leave for pre 5.30.03-3
+  if [[ $(vercmp $1 5.30.03-3) == -1 ]]; then
+    cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot
+    mv /tmp/.pacroot etc/ld.so.conf
+    chmod 644 etc/ld.so.conf
+    sbin/ldconfig -r .
+  fi
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
diff --git a/community/swi-prolog/PKGBUILD b/community/swi-prolog/PKGBUILD
index 1d2ca3fb0..6ea5e45ba 100644
--- a/community/swi-prolog/PKGBUILD
+++ b/community/swi-prolog/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=swi-prolog
 pkgver=5.10.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Prolog environment'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.swi-prolog.org/'
diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD
index 98e4f2380..9f4eec24e 100644
--- a/community/sxiv/PKGBUILD
+++ b/community/sxiv/PKGBUILD
@@ -1,22 +1,23 @@
+# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de>
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
+# Contributor: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=sxiv
-pkgver=0.9
+pkgver=1.0
 pkgrel=1
 pkgdesc='simple x image viewer'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-install=('sxiv.install')
+install=sxiv.install
 url='https://github.com/muennich/sxiv'
-depends=('libx11' 'xproto' 'imlib2')
+depends=('libx11' 'xproto' 'imlib2' 'desktop-file-utils')
 source=("https://github.com/downloads/muennich/sxiv/sxiv-${pkgver}.tar.gz"
         'sxiv.desktop'
-	'config.h')
-md5sums=('865f1e542669ad6d7932fcd4664fb481'
+	    'config.h')
+md5sums=('c887e0af1e4d5a101b285a46d288c419'
          '1dda85ff6bed4de337f8fb303075ed11'
-	 '05c3801bf32c2861c3c7b37073664db3')
+         '78c71ef924095d7d6fb75222047de0bd')
 
 build() {
   	cd "sxiv-${pkgver}"
diff --git a/community/sxiv/config.h b/community/sxiv/config.h
index dd9efe89f..777cb805a 100644
--- a/community/sxiv/config.h
+++ b/community/sxiv/config.h
@@ -1,119 +1,158 @@
+#ifdef _FEATURE_CONFIG
+
+/* auto-orientate jpeg files according to their exif tags?
+ * (requires libexif [-lexif] to be installed)
+ */
+#define EXIF_SUPPORT 0
+/* load all frames from gif files and support gif animations?
+ * (requires giflib [-lgif] to be installed)
+ */
+#define GIF_SUPPORT  0
+
+#endif
 #ifdef _WINDOW_CONFIG
 
-/* default window dimensions (overwritten via -g option):      */
-enum { WIN_WIDTH  = 800, WIN_HEIGHT = 600 };
+/* default window dimensions (overwritten via -g option): */
+enum {
+	WIN_WIDTH  = 800,
+	WIN_HEIGHT = 600
+};
 
-/* default color for window background:                        *
- * (see X(7) "COLOR NAMES" section for valid values)           */
+/* default color for window background: */
 static const char * const BG_COLOR  = "#777777";
-/* default color for thumbnail selection:                      */
+/* default color for thumbnail selection: */
 static const char * const SEL_COLOR = "#DDDDDD";
+/* (see X(7) section "COLOR NAMES" for valid values) */
 
 #endif
 #ifdef _IMAGE_CONFIG
 
-/* how should images be scaled when they are loaded?:          *
- * (also controllable via -d/-s/-Z/-z options)                 *
- *   SCALE_DOWN: 100%, but fit large images into window,       *
- *   SCALE_FIT:  fit all images into window,                   *
- *   SCALE_ZOOM: use current zoom level, 100% at startup       */
+/* how should images be scaled when they are loaded?
+ * (also controllable via -d/-s/-Z/-z options)
+ *   SCALE_DOWN: 100%, but fit large images into window,
+ *   SCALE_FIT:  fit all images into window,
+ *   SCALE_ZOOM: use current zoom level, 100% at startup
+ */
 static const scalemode_t SCALE_MODE = SCALE_DOWN;
 
-/* levels (percent) to use when zooming via '-' and '+':       */
+/* levels (in percent) to use when zooming via '-' and '+':
+ * (first/last value is used as min/max zoom level)
+ */
 static const float zoom_levels[] = {
 	 12.5,  25.0,  50.0,  75.0,
 	100.0, 150.0, 200.0, 400.0, 800.0
 };
 
+/* default slideshow delay (in sec, overwritten via -S option): */
+enum { SLIDESHOW_DELAY = 5 };
+
+/* default settings for multi-frame gif images: */
+enum {
+	GIF_DELAY    = 100, /* delay time (in ms) */
+	GIF_AUTOPLAY = 1,   /* autoplay when loaded [0/1] */
+	GIF_LOOP     = 0    /* endless loop [0/1] */
+};
+
 #endif
 #ifdef _THUMBS_CONFIG
 
-/* default dimension of thumbnails (width == height):          */
+/* default dimension of thumbnails (width == height): */
 enum { THUMB_SIZE = 60 };
 
 #endif
 #ifdef _MAPPINGS_CONFIG
 
-/* keyboard mappings for image and thumbnail mode:             */
+/* keyboard mappings for image and thumbnail mode: */
 static const keymap_t keys[] = {
-	/* ctrl    key              function           argument      */
-	{ False,   XK_q,            quit,              (arg_t) None },
-	{ False,   XK_r,            reload,            (arg_t) None },
-	{ False,   XK_f,            toggle_fullscreen, (arg_t) None },
-	{ False,   XK_a,            toggle_antialias,  (arg_t) None },
-	{ False,   XK_A,            toggle_alpha,      (arg_t) None },
-	{ False,   XK_Return,       switch_mode,       (arg_t) None },
-
-	{ False,   XK_g,            first,             (arg_t) None },
-	{ False,   XK_G,            last,              (arg_t) None },
-	{ False,   XK_n,            navigate,          (arg_t) +1 },
-	{ False,   XK_space,        navigate,          (arg_t) +1 },
-	{ False,   XK_p,            navigate,          (arg_t) -1 },
-	{ False,   XK_BackSpace,    navigate,          (arg_t) -1 },
-	{ False,   XK_bracketright, navigate,          (arg_t) +10 },
-	{ False,   XK_bracketleft,  navigate,          (arg_t) -10 },
-
-	{ False,   XK_D,            remove_image,      (arg_t) None },
-
-	{ False,   XK_h,            move,              (arg_t) DIR_LEFT },
-	{ False,   XK_Left,         move,              (arg_t) DIR_LEFT },
-	{ False,   XK_j,            move,              (arg_t) DIR_DOWN },
-	{ False,   XK_Down,         move,              (arg_t) DIR_DOWN },
-	{ False,   XK_k,            move,              (arg_t) DIR_UP },
-	{ False,   XK_Up,           move,              (arg_t) DIR_UP },
-	{ False,   XK_l,            move,              (arg_t) DIR_RIGHT },
-	{ False,   XK_Right,        move,              (arg_t) DIR_RIGHT },
-
-	{ True,    XK_h,            pan_screen,        (arg_t) DIR_LEFT },
-	{ True,    XK_Left,         pan_screen,        (arg_t) DIR_LEFT },
-	{ True,    XK_j,            pan_screen,        (arg_t) DIR_DOWN },
-	{ True,    XK_Down,         pan_screen,        (arg_t) DIR_DOWN },
-	{ True,    XK_k,            pan_screen,        (arg_t) DIR_UP },
-	{ True,    XK_Up,           pan_screen,        (arg_t) DIR_UP },
-	{ True,    XK_l,            pan_screen,        (arg_t) DIR_RIGHT },
-	{ True,    XK_Right,        pan_screen,        (arg_t) DIR_RIGHT },
-
-	{ False,   XK_H,            pan_edge,          (arg_t) DIR_LEFT },
-	{ False,   XK_J,            pan_edge,          (arg_t) DIR_DOWN },
-	{ False,   XK_K,            pan_edge,          (arg_t) DIR_UP },
-	{ False,   XK_L,            pan_edge,          (arg_t) DIR_RIGHT },
-
-	{ False,   XK_plus,         zoom,              (arg_t) +1 },
-	{ False,   XK_equal,        zoom,              (arg_t) +1 },
-	{ False,   XK_KP_Add,       zoom,              (arg_t) +1 },
-	{ False,   XK_minus,        zoom,              (arg_t) -1 },
-	{ False,   XK_KP_Subtract,  zoom,              (arg_t) -1 },
-	{ False,   XK_0,            zoom,              (arg_t) None },
-	{ False,   XK_KP_0,         zoom,              (arg_t) None },
-	{ False,   XK_w,            fit_to_win,        (arg_t) None },
-	{ False,   XK_W,            fit_to_img,        (arg_t) None },
-
-	{ False,   XK_less,         rotate,            (arg_t) DIR_LEFT },
-	{ False,   XK_greater,      rotate,            (arg_t) DIR_RIGHT },
-
-	                            /* open the current image with given program:  */
-	{ True,    XK_g,            open_with,         (arg_t) "gimp" },
-
-	                            /* run shell command line on the current file,
-	                             * '#' is replaced by filename:                */
-	{ True,    XK_less,         run_command,       (arg_t) "mogrify -rotate -90 #" },
-	{ True,    XK_greater,      run_command,       (arg_t) "mogrify -rotate +90 #" },
-	{ True,    XK_comma,        run_command,       (arg_t) "jpegtran -rotate 270 -copy all -outfile # #" },
-	{ True,    XK_period,       run_command,       (arg_t) "jpegtran -rotate 90 -copy all -outfile # #" },
+	/* ctrl   key               function              argument */
+	{ false,  XK_q,             it_quit,              (arg_t) None },
+	{ false,  XK_Return,        it_switch_mode,       (arg_t) None },
+	{ false,  XK_f,             it_toggle_fullscreen, (arg_t) None },
+
+	{ false,  XK_r,             it_reload_image,      (arg_t) None },
+	{ false,  XK_D,             it_remove_image,      (arg_t) None },
+
+	{ false,  XK_n,             i_navigate,           (arg_t) +1 },
+	{ false,  XK_space,         i_navigate,           (arg_t) +1 },
+	{ false,  XK_p,             i_navigate,           (arg_t) -1 },
+	{ false,  XK_BackSpace,     i_navigate,           (arg_t) -1 },
+	{ false,  XK_bracketright,  i_navigate,           (arg_t) +10 },
+	{ false,  XK_bracketleft,   i_navigate,           (arg_t) -10 },
+	{ false,  XK_g,             it_first,             (arg_t) None },
+	{ false,  XK_G,             it_n_or_last,         (arg_t) None },
+
+	{ true,   XK_n,             i_navigate_frame,     (arg_t) +1 },
+	{ true,   XK_p,             i_navigate_frame,     (arg_t) -1 },
+	{ true,   XK_space,         i_toggle_animation,   (arg_t) None },
+
+	{ false,  XK_h,             it_scroll_move,       (arg_t) DIR_LEFT },
+	{ false,  XK_Left,          it_scroll_move,       (arg_t) DIR_LEFT },
+	{ false,  XK_j,             it_scroll_move,       (arg_t) DIR_DOWN },
+	{ false,  XK_Down,          it_scroll_move,       (arg_t) DIR_DOWN },
+	{ false,  XK_k,             it_scroll_move,       (arg_t) DIR_UP },
+	{ false,  XK_Up,            it_scroll_move,       (arg_t) DIR_UP },
+	{ false,  XK_l,             it_scroll_move,       (arg_t) DIR_RIGHT },
+	{ false,  XK_Right,         it_scroll_move,       (arg_t) DIR_RIGHT },
+
+	{ true,   XK_h,             it_scroll_screen,     (arg_t) DIR_LEFT },
+	{ true,   XK_Left,          it_scroll_screen,     (arg_t) DIR_LEFT },
+	{ true,   XK_j,             it_scroll_screen,     (arg_t) DIR_DOWN },
+	{ true,   XK_Down,          it_scroll_screen,     (arg_t) DIR_DOWN },
+	{ true,   XK_k,             it_scroll_screen,     (arg_t) DIR_UP },
+	{ true,   XK_Up,            it_scroll_screen,     (arg_t) DIR_UP },
+	{ true,   XK_l,             it_scroll_screen,     (arg_t) DIR_RIGHT },
+	{ true,   XK_Right,         it_scroll_screen,     (arg_t) DIR_RIGHT },
+
+	{ false,  XK_H,             i_scroll_to_edge,     (arg_t) DIR_LEFT },
+	{ false,  XK_J,             i_scroll_to_edge,     (arg_t) DIR_DOWN },
+	{ false,  XK_K,             i_scroll_to_edge,     (arg_t) DIR_UP },
+	{ false,  XK_L,             i_scroll_to_edge,     (arg_t) DIR_RIGHT },
+
+	{ false,  XK_plus,          i_zoom,               (arg_t) +1 },
+	{ false,  XK_KP_Add,        i_zoom,               (arg_t) +1 },
+	{ false,  XK_minus,         i_zoom,               (arg_t) -1 },
+	{ false,  XK_KP_Subtract,   i_zoom,               (arg_t) -1 },
+	{ false,  XK_equal,         i_set_zoom,           (arg_t) 100 },
+	{ false,  XK_w,             i_fit_to_win,         (arg_t) None },
+	{ false,  XK_W,             i_fit_to_img,         (arg_t) None },
+
+	{ false,  XK_less,          i_rotate,             (arg_t) DIR_LEFT },
+	{ false,  XK_greater,       i_rotate,             (arg_t) DIR_RIGHT },
+
+	{ false,  XK_s,             i_toggle_slideshow,   (arg_t) None },
+	{ true,   XK_plus,          i_adjust_slideshow,   (arg_t) +1 },
+	{ true,   XK_minus,         i_adjust_slideshow,   (arg_t) -1 },
+	{ true,   XK_equal,         i_reset_slideshow,    (arg_t) None },
+
+	{ false,  XK_a,             i_toggle_antialias,   (arg_t) None },
+	{ false,  XK_A,             it_toggle_alpha,      (arg_t) None },
+
+	/* open current image with given program: */
+	{ true,   XK_g,             it_open_with,         (arg_t) "gimp" },
+
+	/* run shell command line on current file ("$SXIV_IMG"): */
+	{ true,   XK_less,          it_shell_cmd,         (arg_t) \
+			"mogrify -rotate -90 \"$SXIV_IMG\"" },
+	{ true,   XK_greater,       it_shell_cmd,         (arg_t) \
+			"mogrify -rotate +90 \"$SXIV_IMG\"" },
+	{ true,   XK_comma,         it_shell_cmd,         (arg_t) \
+			"jpegtran -rotate 270 -copy all -outfile \"$SXIV_IMG\" \"$SXIV_IMG\"" },
+	{ true,   XK_period,        it_shell_cmd,         (arg_t) \
+			"jpegtran -rotate  90 -copy all -outfile \"$SXIV_IMG\" \"$SXIV_IMG\"" },
 };
 
-/* mouse button mappings for image mode:                       */
+/* mouse button mappings for image mode: */
 static const button_t buttons[] = {
-	/* ctrl    shift    button       function      argument      */
-	{ False,   False,   Button1,     navigate,     (arg_t) +1 },
-	{ False,   False,   Button3,     navigate,     (arg_t) -1 },
-	{ False,   False,   Button2,     drag,         (arg_t) None },
-	{ False,   False,   Button4,     move,         (arg_t) DIR_UP },
-	{ False,   False,   Button5,     move,         (arg_t) DIR_DOWN },
-	{ False,   True,    Button4,     move,         (arg_t) DIR_LEFT },
-	{ False,   True,    Button5,     move,         (arg_t) DIR_RIGHT },
-	{ True,    False,   Button4,     zoom,         (arg_t) +1 },
-	{ True,    False,   Button5,     zoom,         (arg_t) -1 },
+	/* ctrl   shift   button    function              argument */
+	{ false,  false,  Button1,  i_navigate,           (arg_t) +1 },
+	{ false,  false,  Button3,  i_navigate,           (arg_t) -1 },
+	{ false,  false,  Button2,  i_drag,               (arg_t) None },
+	{ false,  false,  Button4,  it_scroll_move,       (arg_t) DIR_UP },
+	{ false,  false,  Button5,  it_scroll_move,       (arg_t) DIR_DOWN },
+	{ false,  true,   Button4,  it_scroll_move,       (arg_t) DIR_LEFT },
+	{ false,  true,   Button5,  it_scroll_move,       (arg_t) DIR_RIGHT },
+	{ true,   false,  Button4,  i_zoom,               (arg_t) +1 },
+	{ true,   false,  Button5,  i_zoom,               (arg_t) -1 },
 };
 
 #endif
diff --git a/community/sxiv/sxiv.install b/community/sxiv/sxiv.install
index 410e17b44..c50e26c78 100644
--- a/community/sxiv/sxiv.install
+++ b/community/sxiv/sxiv.install
@@ -1,4 +1,6 @@
 post_install () {
+    update-desktop-database -q
+
   	echo "* Look into config.h to customize sxiv to your needs."
   	echo "  Use 'makepkg --skipinteg' to rebuild the package after changing config.h."
 	echo "* Create the directory ~/.sxiv/ to enable thumbnail caching."
diff --git a/community/xylib/PKGBUILD b/community/xylib/PKGBUILD
index 6c599bd66..dc0c87ea1 100644
--- a/community/xylib/PKGBUILD
+++ b/community/xylib/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=xylib
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 pkgdesc='xylib is a portable C++ library for reading files that contain x-y data from powder diffraction, spectroscopy or other experimental methods.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.unipress.waw.pl/fityk/xylib/'