Merge branch 'master' of gparabola:abslibre-mips64el

1651 files changed, 36204 insertions, 50776 deletions

diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD
index 8b99ab009..d4aefca01 100644
--- a/community/0ad/PKGBUILD
+++ b/community/0ad/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83239 2013-01-28 16:49:23Z stephane $
+# $Id: PKGBUILD 87879 2013-04-08 12:35:31Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
 # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
 pkgname=0ad
-pkgver=a12
-_pkgver=0.0.12-alpha
+pkgver=a13
+_pkgver=0.0.13-alpha
 pkgrel=2
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL2' 'CCPL')
 depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu')
 makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2')
 source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz")
-md5sums=('0ff92fb2b22b5384067cdd88b89e5450')
+md5sums=('3075c982c4af41a3586b6b6ef637d2c4')
 
 build() {
   cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
@@ -21,10 +21,12 @@ build() {
   sed -i 's/unix_names = { "boost_filesystem-mt", "boost_system-mt" },/unix_names = { "boost_filesystem", "boost_system" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua"
   sed -i 's/unix_names = { "boost_signals-mt" },/unix_names = { "boost_signals" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua"
 
+  unset CPPFLAGS
+
   ./update-workspaces.sh \
       --with-system-enet \
       --bindir=/usr/bin \
-      --libdir=/usr/lib \
+      --libdir=/usr/lib/0ad \
       --datadir=/usr/share/${pkgname}/data
 
   cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
@@ -33,9 +35,9 @@ build() {
 }
 
 package() {
-  install -d "${pkgdir}"/usr/{bin,lib}
+  install -d "${pkgdir}"/usr/{bin,lib/0ad}
   install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/pyrogenesis "${pkgdir}/usr/bin"
-  install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib"
+  install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib/0ad"
 
   install -Dm755 "${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
   install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
diff --git a/community/6tunnel/PKGBUILD b/community/6tunnel/PKGBUILD
index aa7df64cd..f9dcd9a03 100644
--- a/community/6tunnel/PKGBUILD
+++ b/community/6tunnel/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=6tunnel
 pkgver=0.11rc2
-pkgrel=5
+pkgrel=5.1
 pkgdesc="Tunnels IPv6 connections for IPv4-only applications"
 url="http://toxygen.net/6tunnel/"
 license=('GPL')
diff --git a/community/abuse/PKGBUILD b/community/abuse/PKGBUILD
deleted file mode 100644
index 68924e839..000000000
--- a/community/abuse/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 64627 2012-02-17 12:45:02Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: jlvsimoes <jlvsimoes@oninet.pt>
-# Contributor: kevin <kevin@archlinux.org>
-
-pkgname=abuse
-pkgver=0.8
-pkgrel=2
-pkgdesc='A side-scroller action game that pits you against ruthless alien killers.'
-arch=('i686' 'x86_64')
-url='http://abuse.zoy.org/'
-license=('GPL' 'custom')
-depends=('gcc-libs' 'libgl' 'sdl' 'sdl_mixer')
-install='abuse.install'
-source=("http://abuse.zoy.org/raw-attachment/wiki/download/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ec678b8dc8d00e0382d8c805c6438489')
-
-build() {
-  cd "${srcdir}/abuse-${pkgver}"
-
-  ./configure --prefix=/usr --with-assetdir=/usr/share/abuse/orig --with-x
-  make
-}
-
-package() {
-  cd "${srcdir}/abuse-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}/usr/share/licenses/abuse"
-  sed -n '1,/^$/p' src/view.cpp > "${pkgdir}/usr/share/licenses/abuse/orig.code.license"
-}
diff --git a/community/abuse/abuse.install b/community/abuse/abuse.install
deleted file mode 100644
index 4d28ebacd..000000000
--- a/community/abuse/abuse.install
+++ /dev/null
@@ -1,13 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-#  echo "If you get a BOSS_ANT error trying to run abuse, copy /usr/share/games/abuse/gamma.lsp to ~/.abuse"
-   echo "Abuse uses the original game levels by default.  To use the frabs levels"
-   echo "use '-datadir' or set 'datadir' in the abuserc to /usr/share/abuse/frabs"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	post_install
-}
-
diff --git a/community/acetoneiso2/PKGBUILD b/community/acetoneiso2/PKGBUILD
deleted file mode 100644
index e400f8b72..000000000
--- a/community/acetoneiso2/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 61069 2011-12-21 20:50:25Z andrea $
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Wes Brewer <brewerw@gmail.com>
-
-pkgname=acetoneiso2
-pkgver=2.3
-pkgrel=4
-pkgdesc="An all in one ISO tool (bin mdf nrg img daa dmg cdi b5i bwi pdi iso)"
-arch=('i686' 'x86_64')
-url="http://www.acetoneteam.org"
-license=('GPL3')
-depends=('qtwebkit' 'fuseiso' 'cdrdao' 'cdrkit' 'dvd+rw-tools' 'gnupg2' 'pinentry' 'mplayer' 'phonon')
-optdepends=("p7zip: for ISO compress/decompress support")
-conflicts=('acetoneiso')
-install=${pkgname}.install
-source=(http://downloads.sourceforge.net/acetoneiso/AcetoneISO/AcetoneISO%202.3/acetoneiso_${pkgver}.tar.gz)
-md5sums=('225f7af687016690ff28b9771a1ce179')
-
-build() {
-	cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso
-
-	qmake
-	# needed for phonon
-	sed -i 's|-I/usr/include/QtCore|-I/usr/include/QtCore -I/usr/include/KDE|' Makefile
-	make
-}
-
-package() {
-	cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso
-
-	make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/community/acetoneiso2/acetoneiso2.install b/community/acetoneiso2/acetoneiso2.install
deleted file mode 100644
index 1a3984e24..000000000
--- a/community/acetoneiso2/acetoneiso2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-cat << EOF
-  -->
-  -->  Please remember to add 'fuse' to your MODULES array in /etc/rc.conf
-  -->
-EOF
-}
-
-post_upgrade() {
-    post_install $*
-}
diff --git a/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch b/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch
deleted file mode 100644
index d111214d3..000000000
--- a/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ddf5be1f8fc35c38dc241ca935bf4d408f2ff61d Mon Sep 17 00:00:00 2001
-From: Ted Felix <ted@tedfelix.com>
-Date: Thu, 17 Jan 2013 20:03:54 -0500
-Subject: [PATCH] Fix format of video/tabletmode event string
-
-The previous format caused Xorg's xserver to crash in
-lnxACPIGetEventFromOs() because it doesn't check for NULL
-returns from strtok().
----
- input_layer.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/input_layer.c b/input_layer.c
-index 591ad64..db410c0 100644
---- a/input_layer.c
-+++ b/input_layer.c
-@@ -56,6 +56,14 @@ struct evtab_entry {
-    evtest.c, acpi_genl, or kacpimon to find new events to add to this
-    table. */
- 
-+/*
-+ * The two numbers (e.g. "00000080 00000000") in each string is a format
-+ * that Xorg and maybe others expect.
-+ *
-+ * See hw/xfree86/os-support/linux/lnx_acpi.c in xserver and specifically
-+ * lnxACPIGetEventFromOs().
-+ */
-+
- static struct evtab_entry evtab[] = {
- 
- 	/*** COMMON EVENTS ***/
-@@ -66,8 +74,8 @@ static struct evtab_entry evtab[] = {
- 	{{{0,0}, EV_KEY, KEY_SLEEP, 1}, "button/sleep SBTN 00000080 00000000"},
- 	{{{0,0}, EV_SW, SW_LID, 1}, "button/lid LID close"},
- 	{{{0,0}, EV_SW, SW_LID, 0}, "button/lid LID open"},
--	{{{0,0}, EV_SW, SW_TABLET_MODE, 0}, "video/tabletmode TBLT off"},
--	{{{0,0}, EV_SW, SW_TABLET_MODE, 1}, "video/tabletmode TBLT on"},
-+	{{{0,0}, EV_SW, SW_TABLET_MODE, 0}, "video/tabletmode TBLT 0000008A 00000000"},
-+	{{{0,0}, EV_SW, SW_TABLET_MODE, 1}, "video/tabletmode TBLT 0000008A 00000001"},
- 
- 
- 	/*** VIDEO ***/
--- 
-1.8.1.1
-
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
index 355f848fb..6b4ab3159 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 82787 2013-01-24 12:57:51Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 86363 2013-03-15 22:40:51Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
 # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=2.0.17
-pkgrel=4
+pkgver=2.0.18
+pkgrel=2
 pkgdesc='A daemon for delivering ACPI power management events with netlink support'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://tedfelix.com/linux/acpid-netlink.html'
@@ -15,22 +15,19 @@ depends=('bash')
 optdepends=('perl: use perl based examples')
 replaces=('acpid2')
 backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything')
-source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz"
+source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.tar.xz"
         'acpid.socket'
         'acpid.service'
         'anything'
-        'handler.sh'
-        '0001-Fix-format-of-video-tabletmode-event-string.patch')
-md5sums=('d858729b7d984c5e3a0c7558e9de1584'
-         'ee6cb99e50e580c50331a73045412ae9'
+        'handler.sh')
+md5sums=('7c4ff315ae960c54eea303c71c49f152'
+         'd11700eb136e0489835ddaf977a7905b'
          '10290f69491206cd104654e5b900b661'
          '2d37b98d6e74bab815604b8b48c6cfd4'
-         '47f44ff5f02685dce8bcdab8568f0c38'
-         'a813e00553104f2129f64cae95a7983f')
+         '47f44ff5f02685dce8bcdab8568f0c38')
 
 build() {
   cd $pkgname-$pkgver
-  patch -p1 -i "$srcdir/0001-Fix-format-of-video-tabletmode-event-string.patch"
   ./configure --prefix=/usr
   make
 }
diff --git a/community/acpid/acpid.conf b/community/acpid/acpid.conf
deleted file mode 100644
index b60103a2d..000000000
--- a/community/acpid/acpid.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Arguments to be passed to the acpid daemon
-#
-
-ACPID_ARGS=""
diff --git a/community/acpid/acpid.rc b/community/acpid/acpid.rc
deleted file mode 100644
index 674f4621b..000000000
--- a/community/acpid/acpid.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[[ -f /etc/conf.d/acpid ]] && . /etc/conf.d/acpid
-
-PID=$(pidof -o %PPID /usr/sbin/acpid)
-case "$1" in
-  start)
-    stat_busy "Starting acpid"
-    [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon acpid
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping acpid"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon acpid
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/acpid/acpid.socket b/community/acpid/acpid.socket
index 1e5365bf1..1b23f8735 100644
--- a/community/acpid/acpid.socket
+++ b/community/acpid/acpid.socket
@@ -2,7 +2,7 @@
 Description=ACPID Listen Socket
 
 [Socket]
-ListenStream=/run/acpid.socket
+ListenStream=/var/run/acpid.socket
 
 [Install]
 WantedBy=sockets.target
diff --git a/community/activity-log-manager/PKGBUILD b/community/activity-log-manager/PKGBUILD
index 861adf798..232db2511 100644
--- a/community/activity-log-manager/PKGBUILD
+++ b/community/activity-log-manager/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 79218 2012-11-01 09:45:30Z bgyorgy $
+# $Id: PKGBUILD 88673 2013-04-21 22:16:39Z heftig $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Ner0
 
 pkgname=activity-log-manager
 pkgver=0.9.4
-pkgrel=3
+pkgrel=4
 pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/activity-log-manager"
 license=('GPL2')
-depends=('gtk3' 'libgee' 'libzeitgeist' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils')
+depends=('gtk3' 'libgee06' 'libzeitgeist' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils')
 makedepends=('vala' 'intltool')
 install=$pkgname.install
 source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz
@@ -27,10 +27,10 @@ build() {
   # Fix docdir location
   sed -i 's/almdocdir =.*/almdocdir = ${docdir}/' Makefile.{am,in}
 
-  # Update language files
-  echo 'af ar ast be bg bn bs ca ca@valencia cs da de el eo es et eu fi fr gd gl he hi hr hu id it ja km ko ku lt lv mi ms my nb nl oc pl pt ro ru se si sk sl sr sv ta te ug uk uz vi zh_CN zh_HK zh_TW' >po/LINGUAS
+  # Install updated language files
   rename $pkgname- '' ../po/$pkgname-*.po
   mv -f -t po ../po/*
+  printf "%s\n" po/*.po | sed -e 's/po\///g' -e 's/\.po//g' >po/LINGUAS
 
   # Fix crash with GTK+ 3.6
   # https://bugs.launchpad.net/activity-log-manager/+bug/1058037
diff --git a/community/addinclude/PKGBUILD b/community/addinclude/PKGBUILD
new file mode 100644
index 000000000..edb5f73d8
--- /dev/null
+++ b/community/addinclude/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 87598 2013-04-03 23:28:26Z arodseth $
+# Maintainer: Alexander R�dseth <rodseth@gmail.com>
+
+pkgname=addinclude
+pkgver=0.9
+pkgrel=8
+pkgdesc='Utility to add includes to C header- and sourcefiles'
+arch=('x86_64' 'i686')
+url='http://addinclude.roboticoverlords.org/'
+license=('GPL')
+makedepends=('go')
+source=("http://$pkgname.roboticoverlords.org/$pkgname-$pkgver.tbz2")
+sha256sums=('8d88014b4b166d808892f433ce12e3ee683101af5e31886faa52a44cc6f7b451')
+options=('zipman')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  source /etc/profile.d/go.sh
+  go build -o "$pkgname"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  install -Dm755 "$pkgname" \
+    "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 "$pkgname.1.gz" \
+    "$pkgdir/usr/share/man/man1/$pkgname.1.gz"
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD
new file mode 100755
index 000000000..6acc2ade7
--- /dev/null
+++ b/community/aegisub/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 85317 2013-03-01 00:32:14Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: kozec <kozec@kozec.com>
+# Contributor: Limao Luo <luolimao+AUR@gmail.com>
+
+pkgname=aegisub
+pkgver=3.0.2
+pkgrel=6
+pkgdesc="A general-purpose subtitle editor with ASS/SSA support"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.aegisub.org"
+license=('GPL' 'BSD')
+depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9' 'hicolor-icon-theme')
+makedepends=('mesa')
+install=aegisub.install
+source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz" 'crash-on-deatach.patch' 'lua51.patch')
+sha256sums=('68ec20cf49f513608cec400bd462ebb762d6057109968fb01d842e10e6e7fb39'
+            '85e2c2a6bf091f5b4ca29a0149df8d8ca6219d98a4095f79809f2e698983bca4'
+            'ce67b143cc2949fbbd7d72862c54005030339d1c364753335acec271ca9e179d')
+
+build() {
+  cd "${srcdir}"/${pkgname}/${pkgname}
+
+# Patch
+  patch -Np1 -i "${srcdir}"/crash-on-deatach.patch
+  patch -Np1 -i "${srcdir}"/lua51.patch
+
+# Build
+  autoreconf -ivf
+  ./configure --prefix=/usr --without-{portaudio,openal,oss} --with-wxdir=/usr/include/wx-2.9 --with-wx-config=/usr/bin/wx-config-2.9
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}/${pkgname}
+
+# Install
+  make DESTDIR="$pkgdir" install
+
+# License
+  install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub
+  install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/ogmrip/ogmrip.install b/community/aegisub/aegisub.install
index 660593cf5..af7ea4171 100644..100755
--- a/community/ogmrip/ogmrip.install
+++ b/community/aegisub/aegisub.install
@@ -1,4 +1,5 @@
 post_install() {
+    gtk-update-icon-cache -ftq usr/share/icons/hicolor
     update-desktop-database -q
 }
 
@@ -9,3 +10,5 @@ post_upgrade() {
 post_remove() {
     post_install
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/community/aegisub/crash-on-deatach.patch b/community/aegisub/crash-on-deatach.patch
new file mode 100755
index 000000000..1a1a3d007
--- /dev/null
+++ b/community/aegisub/crash-on-deatach.patch
@@ -0,0 +1,10 @@
+--- a/src/video_display.cpp
++++ b/src/video_display.cpp
+@@ -309,6 +309,7 @@
+ }
+ 
+ void VideoDisplay::UpdateSize() {
++	if (zoomValue<=0) zoomValue = 1;
+ 	if (!con->videoController->IsLoaded() || !IsShownOnScreen()) return;
+ 
+ 	videoSize.Set(con->videoController->GetWidth(), con->videoController->GetHeight());
diff --git a/community/aegisub/lua51.patch b/community/aegisub/lua51.patch
new file mode 100755
index 000000000..f93fb02de
--- /dev/null
+++ b/community/aegisub/lua51.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -371,9 +371,9 @@
+ 
+ AS_IF([test x$with_lua = xno], [$with_auto4_lua="no"; lua_disabled="(disabled)"], [
+   # First try pkg-config with several names
+-  PKG_CHECK_MODULES(LUA, lua     >= 5.1, [with_auto4_lua="yes"], [
+-  PKG_CHECK_MODULES(LUA, lua5.1  >= 5.1, [with_auto4_lua="yes"], [
+-  PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1, [with_auto4_lua="yes"], [
++  PKG_CHECK_MODULES(LUA, lua5.1  >= 5.1 lua5.1  < 5.2, [with_auto4_lua="yes"], [
++  PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1 lua-5.1 < 5.2, [with_auto4_lua="yes"], [
++  PKG_CHECK_MODULES(LUA, lua     >= 5.1 lua     < 5.2, [with_auto4_lua="yes"], [
+     # Still not found so try to autodetect
+     AS_IF([test -z "$LUA_CFLAGS"],
+       [AGI_FIND_HEADER([LUA], [lua.hpp],
+@@ -393,7 +393,7 @@
+   return !res;
+ }])
+     AS_IF([test x$agi_cv_with_lua = xno && test x$with_lua = xyes],
+-          [AC_MSG_FAILURE([--with-lua was specified, but lua could not be found. Try setting LUA_CLFAGS and LUA_LIBS manually])])
++          [AC_MSG_FAILURE([--with-lua was specified, but lua 5.1 could not be found. Try setting LUA_CLFAGS and LUA_LIBS manually])])
+     with_auto4_lua=$agi_cv_with_lua
+   ])])])
+ ])
diff --git a/community/agg/PKGBUILD b/community/agg/PKGBUILD
index 4ac0172da..a8f4b8e7d 100644
--- a/community/agg/PKGBUILD
+++ b/community/agg/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=agg
 pkgver=2.5
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A High Quality Rendering Engine for C++"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.antigrain.com/"
@@ -23,6 +23,7 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/agg-2.4-depends.patch"
   patch -Np1 -i "${srcdir}/agg-2.5-pkgconfig.patch"
+  sed -i '/^AM_C_PROTOTYPES/d' configure.in
   sh ./autogen.sh
   ./configure --prefix=/usr --disable-static
   make
diff --git a/community/aiccu/01-no-init-script.patch b/community/aiccu/01-no-init-script.patch
new file mode 100644
index 000000000..930d5d21a
--- /dev/null
+++ b/community/aiccu/01-no-init-script.patch
@@ -0,0 +1,17 @@
+Index: aiccu-20070115/Makefile
+===================================================================
+--- aiccu-20070115.orig/Makefile	2009-10-25 22:25:45.000000000 +0100
++++ aiccu-20070115/Makefile	2009-10-25 22:25:58.000000000 +0100
+@@ -84,9 +84,9 @@
+ 	@cp doc/README ${DESTDIR}${dirdoc}
+ 	@cp doc/LICENSE ${DESTDIR}${dirdoc}
+ 	@cp doc/HOWTO  ${DESTDIR}${dirdoc}
+-	@echo "Installing Debian-style init.d"
+-	@mkdir -p ${DESTDIR}${diretc}init.d
+-	@cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT}
++#	@echo "Installing Debian-style init.d"
++#	@mkdir -p ${DESTDIR}${diretc}init.d
++#	@cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT}
+ else
+ 	@echo "Installing Redhat-style init.d"
+ 	@mkdir -p ${DESTDIR}${diretc}init.d
diff --git a/community/aiccu/02-allow-tunnels.patch b/community/aiccu/02-allow-tunnels.patch
new file mode 100644
index 000000000..ec1c1dade
--- /dev/null
+++ b/community/aiccu/02-allow-tunnels.patch
@@ -0,0 +1,61 @@
+commit d7c4f7c0d34b80c188fa45228ca282fd8771a41d
+Author: Norman Rasmussen <norman@rasmussen.co.za>
+Date:   Sun Jan 10 21:45:55 2010 +0000
+
+    Allow 'tunnels' mode when there's an already running instance.
+
+diff --git a/unix-console/main.c b/unix-console/main.c
+index 8a4d9a9..388d988 100755
+--- a/unix-console/main.c
++++ b/unix-console/main.c
+@@ -50,7 +50,7 @@ int sigrunning(int sig)
+ 	/* Close the file again */
+ 	fclose(f);
+ 
+-	/* If we can HUP it, it still runs */
++	/* If we can signal it, it still runs */
+ 	return (pid > 0 && kill(pid, sig) == 0 ? 1 : 0);
+ }
+ 
+@@ -302,20 +302,6 @@ int main(int argc, char *argv[])
+ 		return -1;
+ 	}
+ 
+-#ifndef _WIN32
+-	/* start or stop? */
+-	if (	mode != A_TEST &&
+-		mode != A_AUTOTEST)
+-	{
+-		/* Already running? */
+-		if (sigrunning(mode == A_STOP ? SIGTERM : 0) == 1)
+-		{
+-			dolog(LOG_ERR, "Already running instance HUP'ed, exiting\n");
+-			return 0;
+-		}
+-	}
+-#endif
+-
+ 	/* Verify required parameters */
+ 	if (!g_aiccu->username || !g_aiccu->password)
+ 	{
+@@ -331,6 +317,20 @@ int main(int argc, char *argv[])
+ 		return ret == 0 ? -1 : 0;
+ 	}
+ 
++#ifndef _WIN32
++	/* start or stop? */
++	if (	mode != A_TEST &&
++		mode != A_AUTOTEST)
++	{
++		/* Already running? */
++		if (sigrunning(mode == A_STOP ? SIGTERM : 0) == 1)
++		{
++			dolog(LOG_ERR, "Already running instance signaled, exiting\n");
++			return 0;
++		}
++	}
++#endif
++
+ 	/* Get our tunnel */
+ 	hTunnel = get_tunnel();
+ 	
diff --git a/community/aiccu/03-no-quiet-gcc.patch b/community/aiccu/03-no-quiet-gcc.patch
new file mode 100644
index 000000000..27d14addf
--- /dev/null
+++ b/community/aiccu/03-no-quiet-gcc.patch
@@ -0,0 +1,16 @@
+It's better for us to see gcc output in the build log to ease debugging.
+Quiet builds make that much harder.
+
+Index: aiccu-20070115/unix-console/Makefile
+===================================================================
+--- aiccu-20070115.orig/unix-console/Makefile	2009-10-25 22:33:06.000000000 +0100
++++ aiccu-20070115/unix-console/Makefile	2009-10-25 22:33:12.000000000 +0100
+@@ -26,7 +26,7 @@
+ 
+ #CFLAGS	+= $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0
+ CFLAGS	+= $(CWARNS) -D_GNU_SOURCE
+-CC      = @gcc
++CC      = gcc
+ RM      = rm
+ 
+ # Add -O3 when nothing is specified yet
diff --git a/community/aiccu/04-skip-strip.patch b/community/aiccu/04-skip-strip.patch
new file mode 100644
index 000000000..6249a0fe5
--- /dev/null
+++ b/community/aiccu/04-skip-strip.patch
@@ -0,0 +1,16 @@
+Index: aiccu-20070115/unix-console/Makefile
+===================================================================
+--- aiccu-20070115.orig/unix-console/Makefile	2009-10-25 22:31:57.000000000 +0100
++++ aiccu-20070115/unix-console/Makefile	2009-10-25 22:32:04.000000000 +0100
+@@ -145,11 +145,6 @@
+ 
+ aiccu:	$(OBJS) ${SRCS} ${INCS}
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
+-ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0)
+-ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
+-	strip $@
+-endif
+-endif
+ 
+ clean:
+ 	$(RM) -f $(OBJS) aiccu
diff --git a/community/aiccu/05-spelling-error.patch b/community/aiccu/05-spelling-error.patch
new file mode 100644
index 000000000..832dbf9ce
--- /dev/null
+++ b/community/aiccu/05-spelling-error.patch
@@ -0,0 +1,46 @@
+Fix some spelling errors to satisfy lintian
+
+--- aiccu.orig/common/aiccu_test.c
++++ aiccu/common/aiccu_test.c
+@@ -133,7 +133,7 @@
+ 	printf("### This confirms the reachability of the other side of the tunnel\n");
+ 	printf("### If it doesn't reply then check your interface and routing tables\n");
+ 	printf("### Don't forget to check your firewall of course\n");
+-	printf("### If the previous test was succesful then this could be both\n");
++	printf("### If the previous test was successful then this could be both\n");
+ 	printf("### a firewalling and a routing/interface problem\n");
+ 	printf("\n");
+ 	system_arg(PING6, PINGCOUNT, hTunnel->sIPv6_POP);
+--- aiccu.orig/common/common.c
++++ aiccu/common/common.c
+@@ -484,7 +484,7 @@
+ 		return false;
+ 	}
+ 
+-	dolog(LOG_DEBUG, "TLS Handshake completed succesfully\n");
++	dolog(LOG_DEBUG, "TLS Handshake completed successfully\n");
+ 
+ 	sock->tls_active = true;
+ 	return true;
+--- aiccu.orig/common/tic.c
++++ aiccu/common/tic.c
+@@ -517,8 +517,8 @@
+ 		struct in6_addr ipv6_ll, ipv6_local;
+ 		char ll[100];
+ 
+-		/* Log that the fetch was succesful */
+-		dolog(LOG_INFO, "Succesfully retrieved tunnel information for %s\n", sId);
++		/* Log that the fetch was successful */
++		dolog(LOG_INFO, "Successfully retrieved tunnel information for %s\n", sId);
+ 
+ 		/*
+ 		 * Some TUN/TAP devices don't have any
+@@ -652,7 +652,7 @@
+ 	/* All went okay? */
+ 	if (buf[0] == '2' && buf[1] == '0' && buf[2] == '2')
+ 	{
+-		dolog(LOG_INFO, "Succesfully retrieved POP information for %s\n", sId);
++		dolog(LOG_INFO, "Successfully retrieved POP information for %s\n", sId);
+ 		return pop;
+ 	}
+ 
diff --git a/community/aiccu/06-setup-script.patch b/community/aiccu/06-setup-script.patch
new file mode 100644
index 000000000..26010f809
--- /dev/null
+++ b/community/aiccu/06-setup-script.patch
@@ -0,0 +1,40 @@
+Author: Norman Rasmussen <norman@rasmussen.co.za>
+
+    Make setupscript work and add teardownscript setting.
+
+--- aiccu.orig/common/aiccu.c
++++ aiccu/common/aiccu.c
+@@ -212,9 +212,6 @@
+ 	fprintf(f, "# Try to automatically login and setup the tunnel?\n");
+ 	fprintf(f, "automatic %s\n", g_aiccu->automatic ? "true" : "false");
+ 	fprintf(f, "\n");
+-	fprintf(f, "# Script to run after setting up the interfaces (default: none)\n");
+-	fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : "<path>");
+-	fprintf(f, "\n");
+ 	fprintf(f, "# TLS Required?\n");
+ 	fprintf(f, "requiretls %s\n", g_aiccu->requiretls ? "true" : "false");
+ 	fprintf(f, "\n");
+@@ -231,6 +228,9 @@
+ 	fprintf(f, "# PID File\n");
+ 	fprintf(f, "pidfile %s\n", g_aiccu->pidfile);
+ 	fprintf(f, "\n");
++	fprintf(f, "# Script to run after setting up the interfaces (default: none)\n");
++	fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : "<path>");
++	fprintf(f, "\n");
+ 	fprintf(f, "# Make heartbeats (default true)\n");
+ 	fprintf(f, "# In general you don't want to turn this off\n");
+ 	fprintf(f, "# Of course only applies to AYIYA and heartbeat tunnels not to static ones\n");
+--- aiccu.orig/unix-console/main.c
++++ aiccu/unix-console/main.c
+@@ -471,6 +471,11 @@
+ 	 */
+ 	if (aiccu_setup(hTunnel, true))
+ 	{
++		if (g_aiccu->setupscript)
++		{
++			aiccu_exec("%s", g_aiccu->setupscript);
++		}
++
+ 		/* We need to stay running when doing Heartbeat or AYIYA */
+ 		if (	strcasecmp(hTunnel->sType, "6in4-heartbeat") == 0 ||
+ 			strcasecmp(hTunnel->sType, "ayiya") == 0)
diff --git a/community/aiccu/PKGBUILD b/community/aiccu/PKGBUILD
new file mode 100644
index 000000000..504dd2369
--- /dev/null
+++ b/community/aiccu/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 84114 2013-02-10 18:32:51Z seblu $
+# Maintainer: Sébastien Luttringer
+
+pkgname=aiccu
+pkgver=20070115
+pkgrel=2
+pkgdesc='SixXS Automatic IPv6 Connectivity Client Utility'
+arch=('i686' 'x86_64' 'mips64el')
+url='http://www.sixxs.net/tools/aiccu/'
+license=('custom')
+depends=('gnutls' 'iproute2')
+backup=('etc/aiccu.conf')
+source=("http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz"
+        'aiccu.service'
+        '01-no-init-script.patch'
+        '02-allow-tunnels.patch'
+        '03-no-quiet-gcc.patch'
+        '04-skip-strip.patch'
+        '05-spelling-error.patch'
+        '06-setup-script.patch')
+md5sums=('c9bcc83644ed788e22a7c3f3d4021350'
+         'e038c9d7882e6e603d87962bac7a0f2a'
+         '6de05338752bfb01772dee37b1dc0454'
+         'b9b2c0e7186f3f96366caaa39252dccc'
+         'b38db1d95760cd9687330b7db5f4ea1d'
+         '6dfa2df27bb4859c7511bfea91337925'
+         '21a37c376ebfcf787c0e7ee8552053ac'
+         '98e73756609f4e09c45c4e5139fd5aed')
+
+build() {
+  cd $pkgname
+  for _p in "$srcdir"/*.patch; do
+    patch -p1 -i "$_p"
+  done
+  [[ $LDFLAGS ]] && LDFLAGS="$LDFLAGS,--no-as-needed"
+  make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+  # default config
+  install -Dm640 doc/aiccu.conf "$pkgdir/etc/aiccu.conf"
+  # license
+  install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  # doc
+  install -dm755 "$pkgdir/usr/share/doc/$pkgname"
+  install -m644 doc/{README,HOWTO,changelog} "$pkgdir/usr/share/doc/$pkgname/"
+  install -Dm644 doc/$pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1"
+  # systemd
+  install -Dm644 "$srcdir/aiccu.service" "$pkgdir/usr/lib/systemd/system/aiccu.service"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/aiccu/aiccu.service b/community/aiccu/aiccu.service
new file mode 100644
index 000000000..7371b2849
--- /dev/null
+++ b/community/aiccu/aiccu.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=SixXS Automatic IPv6 Connectivity Configuration Utility
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/aiccu.pid
+ExecStart=/usr/sbin/aiccu start
+ExecStop=/usr/sbin/aiccu stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/aircrack-ng/PKGBUILD b/community/aircrack-ng/PKGBUILD
index fab0fc395..17692b130 100644
--- a/community/aircrack-ng/PKGBUILD
+++ b/community/aircrack-ng/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase=aircrack-ng
 pkgname=(aircrack-ng aircrack-ng-scripts)
 pkgver=1.1
-pkgrel=8
+pkgrel=8.1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.aircrack-ng.org"
 license=('GPL2')
diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD
index e48b9db79..25345ec7e 100644
--- a/community/alex/PKGBUILD
+++ b/community/alex/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 83990 2013-02-08 04:15:22Z td123 $
+# $Id: PKGBUILD 89285 2013-04-28 16:52:06Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Philip Nilsson <pnilsson@nullref.se>
 
 pkgname=alex
-pkgver=3.0.2
-pkgrel=4
+pkgver=3.0.5
+pkgrel=2
 pkgdesc='Lexical analyser generator for Haskell'
 arch=('x86_64' 'i686')
 url='http://hackage.haskell.org/package/alex'
 license=('custom:BSD3')
 depends=('gmp')
-makedepends=('ghc=7.6.2-1' 'haskell-quickcheck>=2')
+makedepends=('ghc=7.6.3-1' 'haskell-quickcheck>=2')
 source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('997e33342c3c6e0edfff862f051fc286bd661f442d09d1bc02cd6e9d22083164')
+sha256sums=('c3326417a0538e355e5ad1871ab931b9c8145391e8b2ff79668eb643d9b99659')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/alienarena/PKGBUILD b/community/alienarena/PKGBUILD
deleted file mode 100644
index 124c7aa7a..000000000
--- a/community/alienarena/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 76630 2012-09-25 13:43:44Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: yugrotavele <yugrotavele at archlinux dot us>
-# Contributor: Det <nimetonmaili at gmail a-dot com>
-# Contributor: godane <slaxemulator@gmail.com>
-# Contributor: damian01w <damian01w@gmail.com>
-
-pkgname=alienarena
-pkgver=7.60.1
-pkgrel=1
-_verdate=20120823
-pkgdesc="Multiplayer retro sci-fi deathmatch game"
-arch=('i686' 'x86_64')
-url='http://icculus.org/alienarena/rpa/'
-license=('GPL')
-depends=('curl' 'freetype2' 'libgl' 'libjpeg' 'libvorbis' 'libxxf86dga' 'libxxf86vm' 'libgl' 'sdl' 'openal' 'alienarena-data')
-makedepends=('gendesk' 'mesa')
-source=(http://icculus.org/alienarena/Files/alienarena-${pkgver}-linux${_verdate}.tar.gz)
-md5sums=('1e32455d8f6418c92b1b6f4d54becadd')
-_name=('Alien Arena')
-
-build() {
-  cd "$srcdir"
-  gendesk -n
-
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-  install -Dm644 "../$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  rm -rf "$pkgdir/usr/share/$pkgname"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/allegro/PKGBUILD b/community/allegro/PKGBUILD
index 125d0d192..d6a253120 100644
--- a/community/allegro/PKGBUILD
+++ b/community/allegro/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80364 2012-11-20 22:04:44Z arodseth $
+# $Id: PKGBUILD 84380 2013-02-17 11:58:40Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: arjan <arjan@archlinux.org>
 
 pkgname=allegro
-pkgver=5.0.8
+pkgver=5.0.9
 pkgrel=1
 pkgdesc='Portable library mainly aimed at video game and multimedia programming'
 arch=('x86_64' 'i686' 'mips64el')
@@ -14,7 +14,7 @@ license=('custom')
 depends=('jack' 'libxpm' 'libxxf86dga' 'libgl' 'physfs' 'gtk2' 'libpulse')
 makedepends=('cmake' 'mesa' 'glu')
 source=("http://downloads.sourceforge.net/alleg/$pkgname-$pkgver.tar.gz")
-sha256sums=('272e77d0ca0cef7586d7207887f87bf271e1d0db5f8f208dc7dd9a5e3bb6140b')
+sha256sums=('ba28ac307023f1c756f1c421086f81d1e19ec5f09412d5848303c64177a20bd5')
 
 build() {
   cd "$srcdir"
diff --git a/community/alltray/PKGBUILD b/community/alltray/PKGBUILD
index b96cebe05..a01d2b3b1 100644
--- a/community/alltray/PKGBUILD
+++ b/community/alltray/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=alltray
 pkgver=0.7.5.1dev
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Drops any app in the tray."
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD
index da160f09d..c817624ef 100644
--- a/community/almanah/PKGBUILD
+++ b/community/almanah/PKGBUILD
@@ -1,22 +1,33 @@
-# $Id: PKGBUILD 79128 2012-10-30 23:07:30Z heftig $
+# $Id: PKGBUILD 88674 2013-04-21 22:16:40Z heftig $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=almanah
-pkgver=0.10.0
-pkgrel=1
+pkgver=0.10.1
+pkgrel=2
 pkgdesc="Small GTK+ application to allow you to keep a diary of your life"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Almanah_Diary"
 license=('GPL')
-depends=('evolution-data-server>=3.6.0' 'gtkspell3' 'libcryptui' 'xdg-utils')
+depends=('evolution-data-server' 'gtkspell3' 'libcryptui' 'xdg-utils')
 makedepends=('intltool')
 install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('fd213b53ca2a9832df868ee44ed7c446cd6b320651e2f2d10e0a0c98aa3bfced')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        eds-3.8.patch
+        update-gtkspell3-support.patch)
+sha256sums=('122789c1baea1713102b200c0401d25395ec177a66ae22635d3ae2fecc1f08bd'
+            '2407cb2cc11e61b7863bf20fc13d4614a3384e8cb7c5b534f1e3ce7a3afb2d2d'
+            '60fedd6be05ef2619c3b50539b9fdc717480e4f03a2920d8b68b09e63dc7e7db')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Port to evolution-data-server 3.8
+  patch -Np1 -i "$srcdir/eds-3.8.patch"
+
+  # Port to the new gtkspell3
+  patch -Np1 -i "$srcdir/update-gtkspell3-support.patch"
+
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static --disable-schemas-compile
   make
diff --git a/community/almanah/eds-3.8.patch b/community/almanah/eds-3.8.patch
new file mode 100644
index 000000000..dea51eb74
--- /dev/null
+++ b/community/almanah/eds-3.8.patch
@@ -0,0 +1,2609 @@
+From e481f5abdb46d41ac00ee3393332e92f605b55e7 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@redhat.com>
+Date: Thu, 13 Dec 2012 14:16:58 +0000
+Subject: Bug 687229 - Embed ESourceSelector widget from libedataserverui
+
+Evolution developers are merging libedataserverui back into Evolution.
+Drop the libedataserverui dependency and embed the ECellRendererColor
+and ESourceSelector widgets from libedataserverui in event-factories.
+
+See also:
+https://mail.gnome.org/archives/distributor-list/2012-December/msg00000.html
+---
+diff --git a/configure.ac b/configure.ac
+index a529568..b89ba74 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,7 +83,7 @@ AC_SUBST(STANDARD_CFLAGS)
+ AC_SUBST(STANDARD_LIBS)
+ 
+ dnl Evolution
+-PKG_CHECK_MODULES(EVO, libecal-1.2 libedataserver-1.2 libedataserverui-3.0, have_evo=yes, have_evo=no)
++PKG_CHECK_MODULES(EVO, libecal-1.2 >= 3.5.91 libedataserver-1.2, have_evo=yes, have_evo=no)
+ if test "x$have_evo" = "xyes"; then
+ 	AC_DEFINE(HAVE_EVO, 1, [Defined if libecal-1.2 is installed])
+ fi
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0de37e3..740c9f2 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -52,6 +52,10 @@ almanah_SOURCES += \
+ 	event-factories/calendar-debug.h	\
+ 	event-factories/calendar-sources.c	\
+ 	event-factories/calendar-sources.h	\
++	event-factories/e-cell-renderer-color.c	\
++	event-factories/e-cell-renderer-color.h	\
++	event-factories/e-source-selector.c	\
++	event-factories/e-source-selector.h	\
+ 	events/calendar-appointment.c		\
+ 	events/calendar-appointment.h		\
+ 	events/calendar-task.c			\
+diff --git a/src/event-factories/calendar-sources.c b/src/event-factories/calendar-sources.c
+index 217327d..9451a0d 100644
+--- a/src/event-factories/calendar-sources.c
++++ b/src/event-factories/calendar-sources.c
+@@ -32,7 +32,8 @@
+ #define HANDLE_LIBICAL_MEMORY
+ #include <libecal/libecal.h>
+ #include <libedataserver/libedataserver.h>
+-#include <libedataserverui/libedataserverui.h>
++
++#include "e-source-selector.h"
+ 
+ #undef CALENDAR_ENABLE_DEBUG
+ #include "calendar-debug.h"
+diff --git a/src/event-factories/e-cell-renderer-color.c b/src/event-factories/e-cell-renderer-color.c
+new file mode 100644
+index 0000000..748bea5
+--- /dev/null
++++ b/src/event-factories/e-cell-renderer-color.c
+@@ -0,0 +1,237 @@
++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
++/* e-cell-renderer-color.c
++ *
++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of version 2 of the GNU Lesser General Public
++ * License as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this program; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include "e-cell-renderer-color.h"
++
++#include <string.h>
++#include <glib/gi18n-lib.h>
++
++#define E_CELL_RENDERER_COLOR_GET_PRIVATE(obj) \
++	(G_TYPE_INSTANCE_GET_PRIVATE \
++	((obj), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColorPrivate))
++
++enum {
++	PROP_0,
++	PROP_COLOR
++};
++
++struct _ECellRendererColorPrivate {
++	GdkColor *color;
++};
++
++G_DEFINE_TYPE (
++	ECellRendererColor,
++	e_cell_renderer_color,
++	GTK_TYPE_CELL_RENDERER)
++
++static void
++cell_renderer_color_get_size (GtkCellRenderer *cell,
++                              GtkWidget *widget,
++                              const GdkRectangle *cell_area,
++                              gint *x_offset,
++                              gint *y_offset,
++                              gint *width,
++                              gint *height)
++{
++	gint color_width  = 16;
++	gint color_height = 16;
++	gint calc_width;
++	gint calc_height;
++	gfloat xalign;
++	gfloat yalign;
++	guint xpad;
++	guint ypad;
++
++	g_object_get (
++		cell, "xalign", &xalign, "yalign", &yalign,
++		"xpad", &xpad, "ypad", &ypad, NULL);
++
++	calc_width  = (gint) xpad * 2 + color_width;
++	calc_height = (gint) ypad * 2 + color_height;
++
++	if (cell_area && color_width > 0 && color_height > 0) {
++		if (x_offset) {
++			*x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
++					(1.0 - xalign) : xalign) *
++					(cell_area->width - calc_width));
++			*x_offset = MAX (*x_offset, 0);
++		}
++
++		if (y_offset) {
++			*y_offset =(yalign *
++				(cell_area->height - calc_height));
++			*y_offset = MAX (*y_offset, 0);
++		}
++	} else {
++		if (x_offset) *x_offset = 0;
++		if (y_offset) *y_offset = 0;
++	}
++
++	if (width)
++		*width = calc_width;
++
++	if (height)
++		*height = calc_height;
++}
++
++static void
++cell_renderer_color_render (GtkCellRenderer *cell,
++                            cairo_t *cr,
++                            GtkWidget *widget,
++                            const GdkRectangle *background_area,
++                            const GdkRectangle *cell_area,
++                            GtkCellRendererState flags)
++{
++	ECellRendererColorPrivate *priv;
++	GdkRectangle pix_rect;
++	GdkRectangle draw_rect;
++	guint xpad;
++	guint ypad;
++
++	priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (cell);
++
++	if (priv->color == NULL)
++		return;
++
++	cell_renderer_color_get_size (
++		cell, widget, cell_area,
++		&pix_rect.x, &pix_rect.y,
++		&pix_rect.width, &pix_rect.height);
++
++	g_object_get (cell, "xpad", &xpad, "ypad", &ypad, NULL);
++
++	pix_rect.x += cell_area->x + xpad;
++	pix_rect.y += cell_area->y + ypad;
++	pix_rect.width  -= xpad * 2;
++	pix_rect.height -= ypad * 2;
++
++	if (!gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect))
++		return;
++
++	gdk_cairo_set_source_color (cr, priv->color);
++	cairo_rectangle (cr, pix_rect.x, pix_rect.y, draw_rect.width, draw_rect.height);
++
++	cairo_fill (cr);
++}
++
++static void
++cell_renderer_color_set_property (GObject *object,
++                                  guint property_id,
++                                  const GValue *value,
++                                  GParamSpec *pspec)
++{
++	ECellRendererColorPrivate *priv;
++
++	priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object);
++
++	switch (property_id) {
++		case PROP_COLOR:
++			if (priv->color != NULL)
++				gdk_color_free (priv->color);
++			priv->color = g_value_dup_boxed (value);
++			return;
++	}
++
++	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++}
++
++static void
++cell_renderer_color_get_property (GObject *object,
++                                  guint property_id,
++                                  GValue *value,
++                                  GParamSpec *pspec)
++{
++	ECellRendererColorPrivate *priv;
++
++	priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object);
++
++	switch (property_id) {
++		case PROP_COLOR:
++			g_value_set_boxed (value, priv->color);
++			return;
++	}
++
++	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++}
++
++static void
++cell_renderer_color_finalize (GObject *object)
++{
++	ECellRendererColorPrivate *priv;
++
++	priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object);
++
++	if (priv->color != NULL)
++		gdk_color_free (priv->color);
++
++	/* Chain up to parent's finalize() method. */
++	G_OBJECT_CLASS (e_cell_renderer_color_parent_class)->finalize (object);
++}
++
++static void
++e_cell_renderer_color_class_init (ECellRendererColorClass *class)
++{
++	GObjectClass *object_class;
++	GtkCellRendererClass *cell_class;
++
++	g_type_class_add_private (class, sizeof (ECellRendererColorPrivate));
++
++	object_class = G_OBJECT_CLASS (class);
++	object_class->set_property = cell_renderer_color_set_property;
++	object_class->get_property = cell_renderer_color_get_property;
++	object_class->finalize = cell_renderer_color_finalize;
++
++	cell_class = GTK_CELL_RENDERER_CLASS (class);
++	cell_class->get_size = cell_renderer_color_get_size;
++	cell_class->render = cell_renderer_color_render;
++
++	g_object_class_install_property (
++		object_class,
++		PROP_COLOR,
++		g_param_spec_boxed (
++			"color",
++			"Color Info",
++			"The color to render",
++			GDK_TYPE_COLOR,
++			G_PARAM_READWRITE));
++}
++
++static void
++e_cell_renderer_color_init (ECellRendererColor *cellcolor)
++{
++	cellcolor->priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (cellcolor);
++
++	g_object_set (cellcolor, "xpad", 4, NULL);
++}
++
++/**
++ * e_cell_renderer_color_new:
++ *
++ * Since: 2.22
++ **/
++GtkCellRenderer *
++e_cell_renderer_color_new (void)
++{
++	return g_object_new (E_TYPE_CELL_RENDERER_COLOR, NULL);
++}
+diff --git a/src/event-factories/e-cell-renderer-color.h b/src/event-factories/e-cell-renderer-color.h
+new file mode 100644
+index 0000000..0e0da70
+--- /dev/null
++++ b/src/event-factories/e-cell-renderer-color.h
+@@ -0,0 +1,75 @@
++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
++/* e-cell-renderer-color.h
++ *
++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of version 2 of the GNU Lesser General Public
++ * License as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this program; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#ifndef _E_CELL_RENDERER_COLOR_H_
++#define _E_CELL_RENDERER_COLOR_H_
++
++#include <gtk/gtk.h>
++
++/* Standard GObject macros */
++#define E_TYPE_CELL_RENDERER_COLOR \
++	(e_cell_renderer_color_get_type ())
++#define E_CELL_RENDERER_COLOR(obj) \
++	(G_TYPE_CHECK_INSTANCE_CAST \
++	((obj), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColor))
++#define E_CELL_RENDERER_COLOR_CLASS(cls) \
++	(G_TYPE_CHECK_CLASS_CAST \
++	((cls), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColorClass))
++#define E_IS_CELL_RENDERER_COLOR(obj) \
++	(G_TYPE_CHECK_INSTANCE_TYPE \
++	((obj), E_TYPE_CELL_RENDERER_COLOR))
++#define E_IS_CELL_RENDERER_COLOR_CLASS(cls) \
++	(G_TYPE_CHECK_CLASS_TYPE ((cls), E_TYPE_CELL_RENDERER_COLOR))
++#define E_CELL_RENDERER_COLOR_GET_CLASS(obj) \
++	(G_TYPE_INSTANCE_GET_CLASS \
++	((obj), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColorClass))
++
++G_BEGIN_DECLS
++
++typedef struct _ECellRendererColor ECellRendererColor;
++typedef struct _ECellRendererColorClass ECellRendererColorClass;
++typedef struct _ECellRendererColorPrivate ECellRendererColorPrivate;
++
++/**
++ * ECellRendererColor:
++ *
++ * Since: 2.22
++ **/
++struct _ECellRendererColor {
++	GtkCellRenderer parent;
++	ECellRendererColorPrivate *priv;
++};
++
++struct _ECellRendererColorClass {
++	GtkCellRendererClass parent_class;
++
++	/* Padding for future expansion */
++	void (*_gtk_reserved1) (void);
++	void (*_gtk_reserved2) (void);
++	void (*_gtk_reserved3) (void);
++	void (*_gtk_reserved4) (void);
++};
++
++GType            e_cell_renderer_color_get_type	(void);
++GtkCellRenderer *e_cell_renderer_color_new	(void);
++
++G_END_DECLS
++
++#endif /* _E_CELL_RENDERER_COLOR_H_ */
+diff --git a/src/event-factories/e-source-selector.c b/src/event-factories/e-source-selector.c
+new file mode 100644
+index 0000000..925d9cd
+--- /dev/null
++++ b/src/event-factories/e-source-selector.c
+@@ -0,0 +1,2080 @@
++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
++/* e-source-selector.c
++ *
++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this program; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ *
++ * Author: Ettore Perazzoli <ettore@ximian.com>
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include <string.h>
++
++#include "e-cell-renderer-color.h"
++#include "e-source-selector.h"
++
++#define E_SOURCE_SELECTOR_GET_PRIVATE(obj) \
++	(G_TYPE_INSTANCE_GET_PRIVATE \
++	((obj), E_TYPE_SOURCE_SELECTOR, ESourceSelectorPrivate))
++
++typedef struct _AsyncContext AsyncContext;
++
++struct _ESourceSelectorPrivate {
++	ESourceRegistry *registry;
++	GHashTable *source_index;
++	gchar *extension_name;
++
++	GtkTreeRowReference *saved_primary_selection;
++
++	/* ESource -> GSource */
++	GHashTable *pending_writes;
++	GMainContext *main_context;
++
++	gboolean toggled_last;
++	gboolean select_new;
++	gboolean show_colors;
++	gboolean show_toggles;
++};
++
++struct _AsyncContext {
++	ESourceSelector *selector;
++	ESource *source;
++};
++
++enum {
++	PROP_0,
++	PROP_EXTENSION_NAME,
++	PROP_PRIMARY_SELECTION,
++	PROP_REGISTRY,
++	PROP_SHOW_COLORS,
++	PROP_SHOW_TOGGLES
++};
++
++enum {
++	SELECTION_CHANGED,
++	PRIMARY_SELECTION_CHANGED,
++	POPUP_EVENT,
++	DATA_DROPPED,
++	NUM_SIGNALS
++};
++
++enum {
++	COLUMN_NAME,
++	COLUMN_COLOR,
++	COLUMN_ACTIVE,
++	COLUMN_SHOW_COLOR,
++	COLUMN_SHOW_TOGGLE,
++	COLUMN_WEIGHT,
++	COLUMN_SOURCE,
++	NUM_COLUMNS
++};
++
++static guint signals[NUM_SIGNALS];
++
++G_DEFINE_TYPE (ESourceSelector, e_source_selector, GTK_TYPE_TREE_VIEW)
++
++/* ESafeToggleRenderer does not emit 'toggled' signal
++ * on 'activate' when mouse is not over the toggle. */
++
++typedef GtkCellRendererToggle ECellRendererSafeToggle;
++typedef GtkCellRendererToggleClass ECellRendererSafeToggleClass;
++
++/* Forward Declarations */
++GType e_cell_renderer_safe_toggle_get_type (void);
++
++G_DEFINE_TYPE (
++	ECellRendererSafeToggle,
++	e_cell_renderer_safe_toggle,
++	GTK_TYPE_CELL_RENDERER_TOGGLE)
++
++static gboolean
++safe_toggle_activate (GtkCellRenderer *cell,
++                      GdkEvent *event,
++                      GtkWidget *widget,
++                      const gchar *path,
++                      const GdkRectangle *background_area,
++                      const GdkRectangle *cell_area,
++                      GtkCellRendererState flags)
++{
++	gboolean point_in_cell_area = TRUE;
++
++	if (event->type == GDK_BUTTON_PRESS && cell_area != NULL) {
++		cairo_region_t *region;
++
++		region = cairo_region_create_rectangle (cell_area);
++		point_in_cell_area = cairo_region_contains_point (
++			region, event->button.x, event->button.y);
++		cairo_region_destroy (region);
++	}
++
++	if (!point_in_cell_area)
++		return FALSE;
++
++	return GTK_CELL_RENDERER_CLASS (
++		e_cell_renderer_safe_toggle_parent_class)->activate (
++		cell, event, widget, path, background_area, cell_area, flags);
++}
++
++static void
++e_cell_renderer_safe_toggle_class_init (ECellRendererSafeToggleClass *class)
++{
++	GtkCellRendererClass *cell_renderer_class;
++
++	cell_renderer_class = GTK_CELL_RENDERER_CLASS (class);
++	cell_renderer_class->activate = safe_toggle_activate;
++}
++
++static void
++e_cell_renderer_safe_toggle_init (ECellRendererSafeToggle *obj)
++{
++}
++
++static GtkCellRenderer *
++e_cell_renderer_safe_toggle_new (void)
++{
++	return g_object_new (e_cell_renderer_safe_toggle_get_type (), NULL);
++}
++
++static void
++clear_saved_primary_selection (ESourceSelector *selector)
++{
++	gtk_tree_row_reference_free (selector->priv->saved_primary_selection);
++	selector->priv->saved_primary_selection = NULL;
++}
++
++static void
++async_context_free (AsyncContext *async_context)
++{
++	if (async_context->selector != NULL)
++		g_object_unref (async_context->selector);
++
++	if (async_context->source != NULL)
++		g_object_unref (async_context->source);
++
++	g_slice_free (AsyncContext, async_context);
++}
++
++static void
++pending_writes_destroy_source (GSource *source)
++{
++	g_source_destroy (source);
++	g_source_unref (source);
++}
++
++static void
++source_selector_write_done_cb (GObject *source_object,
++                               GAsyncResult *result,
++                               gpointer user_data)
++{
++	ESource *source;
++	ESourceSelector *selector;
++	GError *error = NULL;
++
++	source = E_SOURCE (source_object);
++	selector = E_SOURCE_SELECTOR (user_data);
++
++	e_source_write_finish (source, result, &error);
++
++	/* FIXME Display the error in the selector somehow? */
++	if (error != NULL) {
++		g_warning ("%s: %s", G_STRFUNC, error->message);
++		g_error_free (error);
++	}
++
++	g_object_unref (selector);
++}
++
++static gboolean
++source_selector_write_idle_cb (gpointer user_data)
++{
++	AsyncContext *async_context = user_data;
++	GHashTable *pending_writes;
++
++	/* XXX This operation is not cancellable. */
++	e_source_write (
++		async_context->source, NULL,
++		source_selector_write_done_cb,
++		g_object_ref (async_context->selector));
++
++	pending_writes = async_context->selector->priv->pending_writes;
++	g_hash_table_remove (pending_writes, async_context->source);
++
++	return FALSE;
++}
++
++static void
++source_selector_cancel_write (ESourceSelector *selector,
++                              ESource *source)
++{
++	GHashTable *pending_writes;
++
++	/* Cancel any pending writes for this ESource so as not
++	 * to overwrite whatever change we're being notified of. */
++	pending_writes = selector->priv->pending_writes;
++	g_hash_table_remove (pending_writes, source);
++}
++
++static void
++source_selector_update_row (ESourceSelector *selector,
++                            ESource *source)
++{
++	GHashTable *source_index;
++	ESourceExtension *extension = NULL;
++	GtkTreeRowReference *reference;
++	GtkTreeModel *model;
++	GtkTreePath *path;
++	GtkTreeIter iter;
++	const gchar *extension_name;
++	const gchar *display_name;
++	gboolean selected;
++
++	source_index = selector->priv->source_index;
++	reference = g_hash_table_lookup (source_index, source);
++
++	/* This function runs when ANY ESource in the registry changes.
++	 * If the ESource is not in our tree model then return silently. */
++	if (reference == NULL)
++		return;
++
++	/* If we do have a row reference, it should be valid. */
++	g_return_if_fail (gtk_tree_row_reference_valid (reference));
++
++	model = gtk_tree_row_reference_get_model (reference);
++	path = gtk_tree_row_reference_get_path (reference);
++	gtk_tree_model_get_iter (model, &iter, path);
++	gtk_tree_path_free (path);
++
++	display_name = e_source_get_display_name (source);
++
++	extension_name = e_source_selector_get_extension_name (selector);
++	selected = e_source_selector_source_is_selected (selector, source);
++
++	if (e_source_has_extension (source, extension_name))
++		extension = e_source_get_extension (source, extension_name);
++
++	if (extension != NULL) {
++		GdkColor color;
++		const gchar *color_spec = NULL;
++		gboolean show_color = FALSE;
++		gboolean show_toggle;
++
++		show_color =
++			E_IS_SOURCE_SELECTABLE (extension) &&
++			e_source_selector_get_show_colors (selector);
++
++		if (show_color)
++			color_spec = e_source_selectable_get_color (
++				E_SOURCE_SELECTABLE (extension));
++
++		if (color_spec != NULL && *color_spec != '\0')
++			show_color = gdk_color_parse (color_spec, &color);
++
++		show_toggle = e_source_selector_get_show_toggles (selector);
++
++		gtk_tree_store_set (
++			GTK_TREE_STORE (model), &iter,
++			COLUMN_NAME, display_name,
++			COLUMN_COLOR, show_color ? &color : NULL,
++			COLUMN_ACTIVE, selected,
++			COLUMN_SHOW_COLOR, show_color,
++			COLUMN_SHOW_TOGGLE, show_toggle,
++			COLUMN_WEIGHT, PANGO_WEIGHT_NORMAL,
++			COLUMN_SOURCE, source,
++			-1);
++	} else {
++		gtk_tree_store_set (
++			GTK_TREE_STORE (model), &iter,
++			COLUMN_NAME, display_name,
++			COLUMN_COLOR, NULL,
++			COLUMN_ACTIVE, FALSE,
++			COLUMN_SHOW_COLOR, FALSE,
++			COLUMN_SHOW_TOGGLE, FALSE,
++			COLUMN_WEIGHT, PANGO_WEIGHT_BOLD,
++			COLUMN_SOURCE, source,
++			-1);
++	}
++}
++
++static gboolean
++source_selector_traverse (GNode *node,
++                          ESourceSelector *selector)
++{
++	ESource *source;
++	GHashTable *source_index;
++	GtkTreeRowReference *reference = NULL;
++	GtkTreeModel *model;
++	GtkTreePath *path;
++	GtkTreeIter iter;
++
++	/* Skip the root node. */
++	if (G_NODE_IS_ROOT (node))
++		return FALSE;
++
++	source_index = selector->priv->source_index;
++
++	model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector));
++
++	if (node->parent != NULL && node->parent->data != NULL)
++		reference = g_hash_table_lookup (
++			source_index, node->parent->data);
++
++	if (gtk_tree_row_reference_valid (reference)) {
++		GtkTreeIter parent;
++
++		path = gtk_tree_row_reference_get_path (reference);
++		gtk_tree_model_get_iter (model, &parent, path);
++		gtk_tree_path_free (path);
++
++		gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &parent);
++	} else
++		gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
++
++	source = E_SOURCE (node->data);
++
++	path = gtk_tree_model_get_path (model, &iter);
++	reference = gtk_tree_row_reference_new (model, path);
++	g_hash_table_insert (source_index, g_object_ref (source), reference);
++	gtk_tree_path_free (path);
++
++	source_selector_update_row (selector, source);
++
++	return FALSE;
++}
++
++static void
++source_selector_save_expanded (GtkTreeView *tree_view,
++                               GtkTreePath *path,
++                               GQueue *queue)
++{
++	GtkTreeModel *model;
++	GtkTreeIter iter;
++	ESource *source;
++
++	model = gtk_tree_view_get_model (tree_view);
++	gtk_tree_model_get_iter (model, &iter, path);
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++	g_queue_push_tail (queue, source);
++}
++
++static void
++source_selector_build_model (ESourceSelector *selector)
++{
++	ESourceRegistry *registry;
++	GQueue queue = G_QUEUE_INIT;
++	GHashTable *source_index;
++	GtkTreeView *tree_view;
++	GtkTreeModel *model;
++	ESource *selected;
++	const gchar *extension_name;
++	GNode *root;
++
++	tree_view = GTK_TREE_VIEW (selector);
++
++	registry = e_source_selector_get_registry (selector);
++	extension_name = e_source_selector_get_extension_name (selector);
++
++	/* Make sure we have what we need to build the model, since
++	 * this can get called early in the initialization phase. */
++	if (registry == NULL || extension_name == NULL)
++		return;
++
++	source_index = selector->priv->source_index;
++	selected = e_source_selector_ref_primary_selection (selector);
++
++	/* Save expanded sources to restore later. */
++	gtk_tree_view_map_expanded_rows (
++		tree_view, (GtkTreeViewMappingFunc)
++		source_selector_save_expanded, &queue);
++
++	model = gtk_tree_view_get_model (tree_view);
++	gtk_tree_store_clear (GTK_TREE_STORE (model));
++
++	g_hash_table_remove_all (source_index);
++
++	root = e_source_registry_build_display_tree (registry, extension_name);
++
++	g_node_traverse (
++		root, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
++		(GNodeTraverseFunc) source_selector_traverse,
++		selector);
++
++	e_source_registry_free_display_tree (root);
++
++	/* Restore previously expanded sources. */
++	while (!g_queue_is_empty (&queue)) {
++		GtkTreeRowReference *reference;
++		ESource *source;
++
++		source = g_queue_pop_head (&queue);
++		reference = g_hash_table_lookup (source_index, source);
++
++		if (gtk_tree_row_reference_valid (reference)) {
++			GtkTreePath *path;
++
++			path = gtk_tree_row_reference_get_path (reference);
++			gtk_tree_view_expand_to_path (tree_view, path);
++			gtk_tree_path_free (path);
++		}
++
++		g_object_unref (source);
++	}
++
++	/* Restore the primary selection. */
++	if (selected != NULL) {
++		e_source_selector_set_primary_selection (selector, selected);
++		g_object_unref (selected);
++	}
++
++	/* Make sure we have a primary selection.  If not, pick one. */
++	selected = e_source_selector_ref_primary_selection (selector);
++	if (selected == NULL) {
++		selected = e_source_registry_ref_default_for_extension_name (
++			registry, extension_name);
++		e_source_selector_set_primary_selection (selector, selected);
++	}
++	g_object_unref (selected);
++}
++
++static void
++source_selector_expand_to_source (ESourceSelector *selector,
++                                  ESource *source)
++{
++	GHashTable *source_index;
++	GtkTreeRowReference *reference;
++	GtkTreePath *path;
++
++	source_index = selector->priv->source_index;
++	reference = g_hash_table_lookup (source_index, source);
++
++	/* If the ESource is not in our tree model then return silently. */
++	if (reference == NULL)
++		return;
++
++	/* If we do have a row reference, it should be valid. */
++	g_return_if_fail (gtk_tree_row_reference_valid (reference));
++
++	/* Expand the tree view to the path containing the ESource */
++	path = gtk_tree_row_reference_get_path (reference);
++	gtk_tree_view_expand_to_path (GTK_TREE_VIEW (selector), path);
++	gtk_tree_path_free (path);
++}
++
++static void
++source_selector_source_added_cb (ESourceRegistry *registry,
++                                 ESource *source,
++                                 ESourceSelector *selector)
++{
++	source_selector_build_model (selector);
++
++	source_selector_expand_to_source (selector, source);
++}
++
++static void
++source_selector_source_changed_cb (ESourceRegistry *registry,
++                                   ESource *source,
++                                   ESourceSelector *selector)
++{
++	source_selector_cancel_write (selector, source);
++
++	source_selector_update_row (selector, source);
++}
++
++static void
++source_selector_source_removed_cb (ESourceRegistry *registry,
++                                   ESource *source,
++                                   ESourceSelector *selector)
++{
++	source_selector_build_model (selector);
++}
++
++static void
++source_selector_source_enabled_cb (ESourceRegistry *registry,
++                                   ESource *source,
++                                   ESourceSelector *selector)
++{
++	source_selector_build_model (selector);
++
++	source_selector_expand_to_source (selector, source);
++}
++
++static void
++source_selector_source_disabled_cb (ESourceRegistry *registry,
++                                    ESource *source,
++                                    ESourceSelector *selector)
++{
++	source_selector_build_model (selector);
++}
++
++static gboolean
++same_source_name_exists (ESourceSelector *selector,
++                         const gchar *display_name)
++{
++	GHashTable *source_index;
++	GHashTableIter iter;
++	gpointer key;
++
++	source_index = selector->priv->source_index;
++	g_hash_table_iter_init (&iter, source_index);
++
++	while (g_hash_table_iter_next (&iter, &key, NULL)) {
++		ESource *source = E_SOURCE (key);
++		const gchar *source_name;
++
++		source_name = e_source_get_display_name (source);
++		if (g_strcmp0 (display_name, source_name) == 0)
++			return TRUE;
++	}
++
++	return FALSE;
++}
++
++static gboolean
++selection_func (GtkTreeSelection *selection,
++                GtkTreeModel *model,
++                GtkTreePath *path,
++                gboolean path_currently_selected,
++                ESourceSelector *selector)
++{
++	ESource *source;
++	GtkTreeIter iter;
++	const gchar *extension_name;
++
++	if (selector->priv->toggled_last) {
++		selector->priv->toggled_last = FALSE;
++		return FALSE;
++	}
++
++	if (path_currently_selected)
++		return TRUE;
++
++	if (!gtk_tree_model_get_iter (model, &iter, path))
++		return FALSE;
++
++	extension_name = e_source_selector_get_extension_name (selector);
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++
++	if (!e_source_has_extension (source, extension_name)) {
++		g_object_unref (source);
++		return FALSE;
++	}
++
++	clear_saved_primary_selection (selector);
++
++	g_object_unref (source);
++
++	return TRUE;
++}
++
++static void
++text_cell_edited_cb (ESourceSelector *selector,
++                     const gchar *path_string,
++                     const gchar *new_name)
++{
++	GtkTreeView *tree_view;
++	GtkTreeModel *model;
++	GtkTreePath *path;
++	GtkTreeIter iter;
++	ESource *source;
++
++	tree_view = GTK_TREE_VIEW (selector);
++	model = gtk_tree_view_get_model (tree_view);
++	path = gtk_tree_path_new_from_string (path_string);
++
++	gtk_tree_model_get_iter (model, &iter, path);
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++	gtk_tree_path_free (path);
++
++	if (new_name == NULL || *new_name == '\0')
++		return;
++
++	if (same_source_name_exists (selector, new_name))
++		return;
++
++	e_source_set_display_name (source, new_name);
++
++	e_source_selector_queue_write (selector, source);
++}
++
++static void
++cell_toggled_callback (GtkCellRendererToggle *renderer,
++                       const gchar *path_string,
++                       ESourceSelector *selector)
++{
++	ESource *source;
++	GtkTreeModel *model;
++	GtkTreePath *path;
++	GtkTreeIter iter;
++
++	model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector));
++	path = gtk_tree_path_new_from_string (path_string);
++
++	if (!gtk_tree_model_get_iter (model, &iter, path)) {
++		gtk_tree_path_free (path);
++		return;
++	}
++
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++
++	if (e_source_selector_source_is_selected (selector, source))
++		e_source_selector_unselect_source (selector, source);
++	else
++		e_source_selector_select_source (selector, source);
++
++	selector->priv->toggled_last = TRUE;
++
++	gtk_tree_path_free (path);
++
++	g_object_unref (source);
++}
++
++static void
++selection_changed_callback (GtkTreeSelection *selection,
++                            ESourceSelector *selector)
++{
++	g_signal_emit (selector, signals[PRIMARY_SELECTION_CHANGED], 0);
++	g_object_notify (G_OBJECT (selector), "primary-selection");
++}
++
++static void
++source_selector_set_extension_name (ESourceSelector *selector,
++                                    const gchar *extension_name)
++{
++	g_return_if_fail (extension_name != NULL);
++	g_return_if_fail (selector->priv->extension_name == NULL);
++
++	selector->priv->extension_name = g_strdup (extension_name);
++}
++
++static void
++source_selector_set_registry (ESourceSelector *selector,
++                              ESourceRegistry *registry)
++{
++	g_return_if_fail (E_IS_SOURCE_REGISTRY (registry));
++	g_return_if_fail (selector->priv->registry == NULL);
++
++	selector->priv->registry = g_object_ref (registry);
++}
++
++static void
++source_selector_set_property (GObject *object,
++                              guint property_id,
++                              const GValue *value,
++                              GParamSpec *pspec)
++{
++	switch (property_id) {
++		case PROP_EXTENSION_NAME:
++			source_selector_set_extension_name (
++				E_SOURCE_SELECTOR (object),
++				g_value_get_string (value));
++			return;
++
++		case PROP_PRIMARY_SELECTION:
++			e_source_selector_set_primary_selection (
++				E_SOURCE_SELECTOR (object),
++				g_value_get_object (value));
++			return;
++
++		case PROP_REGISTRY:
++			source_selector_set_registry (
++				E_SOURCE_SELECTOR (object),
++				g_value_get_object (value));
++			return;
++
++		case PROP_SHOW_COLORS:
++			e_source_selector_set_show_colors (
++				E_SOURCE_SELECTOR (object),
++				g_value_get_boolean (value));
++			return;
++
++		case PROP_SHOW_TOGGLES:
++			e_source_selector_set_show_toggles (
++				E_SOURCE_SELECTOR (object),
++				g_value_get_boolean (value));
++			return;
++	}
++
++	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++}
++
++static void
++source_selector_get_property (GObject *object,
++                              guint property_id,
++                              GValue *value,
++                              GParamSpec *pspec)
++{
++	switch (property_id) {
++		case PROP_EXTENSION_NAME:
++			g_value_set_string (
++				value,
++				e_source_selector_get_extension_name (
++				E_SOURCE_SELECTOR (object)));
++			return;
++
++		case PROP_PRIMARY_SELECTION:
++			g_value_take_object (
++				value,
++				e_source_selector_ref_primary_selection (
++				E_SOURCE_SELECTOR (object)));
++			return;
++
++		case PROP_REGISTRY:
++			g_value_set_object (
++				value,
++				e_source_selector_get_registry (
++				E_SOURCE_SELECTOR (object)));
++			return;
++
++		case PROP_SHOW_COLORS:
++			g_value_set_boolean (
++				value,
++				e_source_selector_get_show_colors (
++				E_SOURCE_SELECTOR (object)));
++			return;
++
++		case PROP_SHOW_TOGGLES:
++			g_value_set_boolean (
++				value,
++				e_source_selector_get_show_toggles (
++				E_SOURCE_SELECTOR (object)));
++			return;
++	}
++
++	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++}
++
++static void
++source_selector_dispose (GObject *object)
++{
++	ESourceSelectorPrivate *priv;
++
++	priv = E_SOURCE_SELECTOR_GET_PRIVATE (object);
++
++	if (priv->registry != NULL) {
++		g_signal_handlers_disconnect_matched (
++			priv->registry,
++			G_SIGNAL_MATCH_DATA,
++			0, 0, NULL, NULL, object);
++		g_object_unref (priv->registry);
++		priv->registry = NULL;
++	}
++
++	g_hash_table_remove_all (priv->source_index);
++	g_hash_table_remove_all (priv->pending_writes);
++
++	clear_saved_primary_selection (E_SOURCE_SELECTOR (object));
++
++	/* Chain up to parent's dispose() method. */
++	G_OBJECT_CLASS (e_source_selector_parent_class)->dispose (object);
++}
++
++static void
++source_selector_finalize (GObject *object)
++{
++	ESourceSelectorPrivate *priv;
++
++	priv = E_SOURCE_SELECTOR_GET_PRIVATE (object);
++
++	g_hash_table_destroy (priv->source_index);
++	g_hash_table_destroy (priv->pending_writes);
++
++	g_free (priv->extension_name);
++
++	if (priv->main_context != NULL)
++		g_main_context_unref (priv->main_context);
++
++	/* Chain up to parent's finalize() method. */
++	G_OBJECT_CLASS (e_source_selector_parent_class)->finalize (object);
++}
++
++static void
++source_selector_constructed (GObject *object)
++{
++	ESourceRegistry *registry;
++	ESourceSelector *selector;
++
++	selector = E_SOURCE_SELECTOR (object);
++	registry = e_source_selector_get_registry (selector);
++
++	g_signal_connect (
++		registry, "source-added",
++		G_CALLBACK (source_selector_source_added_cb), selector);
++
++	g_signal_connect (
++		registry, "source-changed",
++		G_CALLBACK (source_selector_source_changed_cb), selector);
++
++	g_signal_connect (
++		registry, "source-removed",
++		G_CALLBACK (source_selector_source_removed_cb), selector);
++
++	g_signal_connect (
++		registry, "source-enabled",
++		G_CALLBACK (source_selector_source_enabled_cb), selector);
++
++	g_signal_connect (
++		registry, "source-disabled",
++		G_CALLBACK (source_selector_source_disabled_cb), selector);
++
++	source_selector_build_model (selector);
++
++	gtk_tree_view_expand_all (GTK_TREE_VIEW (selector));
++}
++
++static gboolean
++source_selector_button_press_event (GtkWidget *widget,
++                                    GdkEventButton *event)
++{
++	ESourceSelector *selector;
++	GtkWidgetClass *widget_class;
++	GtkTreePath *path;
++	ESource *source = NULL;
++	ESource *primary;
++	gboolean right_click = FALSE;
++	gboolean triple_click = FALSE;
++	gboolean row_exists;
++	gboolean res = FALSE;
++
++	selector = E_SOURCE_SELECTOR (widget);
++
++	selector->priv->toggled_last = FALSE;
++
++	/* Triple-clicking a source selects it exclusively. */
++
++	if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
++		right_click = TRUE;
++	else if (event->button == 1 && event->type == GDK_3BUTTON_PRESS)
++		triple_click = TRUE;
++	else
++		goto chainup;
++
++	row_exists = gtk_tree_view_get_path_at_pos (
++		GTK_TREE_VIEW (widget), event->x, event->y,
++		&path, NULL, NULL, NULL);
++
++	/* Get the source/group */
++	if (row_exists) {
++		GtkTreeModel *model;
++		GtkTreeIter iter;
++
++		model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
++
++		gtk_tree_model_get_iter (model, &iter, path);
++		gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++	}
++
++	if (source == NULL)
++		goto chainup;
++
++	primary = e_source_selector_ref_primary_selection (selector);
++	if (source != primary)
++		e_source_selector_set_primary_selection (selector, source);
++	if (primary != NULL)
++		g_object_unref (primary);
++
++	if (right_click)
++		g_signal_emit (
++			widget, signals[POPUP_EVENT], 0, source, event, &res);
++
++	if (triple_click) {
++		e_source_selector_select_exclusive (selector, source);
++		res = TRUE;
++	}
++
++	g_object_unref (source);
++
++	return res;
++
++chainup:
++
++	/* Chain up to parent's button_press_event() method. */
++	widget_class = GTK_WIDGET_CLASS (e_source_selector_parent_class);
++	return widget_class->button_press_event (widget, event);
++}
++
++static void
++source_selector_drag_leave (GtkWidget *widget,
++                            GdkDragContext *context,
++                            guint time_)
++{
++	GtkTreeView *tree_view;
++	GtkTreeViewDropPosition pos;
++
++	tree_view = GTK_TREE_VIEW (widget);
++	pos = GTK_TREE_VIEW_DROP_BEFORE;
++
++	gtk_tree_view_set_drag_dest_row (tree_view, NULL, pos);
++}
++
++static gboolean
++source_selector_drag_motion (GtkWidget *widget,
++                             GdkDragContext *context,
++                             gint x,
++                             gint y,
++                             guint time_)
++{
++	ESource *source = NULL;
++	GtkTreeView *tree_view;
++	GtkTreeModel *model;
++	GtkTreePath *path = NULL;
++	GtkTreeIter iter;
++	GtkTreeViewDropPosition pos;
++	GdkDragAction action = 0;
++
++	tree_view = GTK_TREE_VIEW (widget);
++	model = gtk_tree_view_get_model (tree_view);
++
++	if (!gtk_tree_view_get_dest_row_at_pos (tree_view, x, y, &path, NULL))
++		goto exit;
++
++	if (!gtk_tree_model_get_iter (model, &iter, path))
++		goto exit;
++
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++
++	if (!e_source_get_writable (source))
++		goto exit;
++
++	pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
++	gtk_tree_view_set_drag_dest_row (tree_view, path, pos);
++
++	if (gdk_drag_context_get_actions (context) & GDK_ACTION_MOVE)
++		action = GDK_ACTION_MOVE;
++	else
++		action = gdk_drag_context_get_suggested_action (context);
++
++exit:
++	if (path != NULL)
++		gtk_tree_path_free (path);
++
++	if (source != NULL)
++		g_object_unref (source);
++
++	gdk_drag_status (context, action, time_);
++
++	return TRUE;
++}
++
++static gboolean
++source_selector_drag_drop (GtkWidget *widget,
++                           GdkDragContext *context,
++                           gint x,
++                           gint y,
++                           guint time_)
++{
++	ESource *source;
++	ESourceSelector *selector;
++	GtkTreeView *tree_view;
++	GtkTreeModel *model;
++	GtkTreePath *path;
++	GtkTreeIter iter;
++	const gchar *extension_name;
++	gboolean drop_zone;
++	gboolean valid;
++
++	tree_view = GTK_TREE_VIEW (widget);
++	model = gtk_tree_view_get_model (tree_view);
++
++	if (!gtk_tree_view_get_path_at_pos (
++		tree_view, x, y, &path, NULL, NULL, NULL))
++		return FALSE;
++
++	valid = gtk_tree_model_get_iter (model, &iter, path);
++	gtk_tree_path_free (path);
++	g_return_val_if_fail (valid, FALSE);
++
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++
++	selector = E_SOURCE_SELECTOR (widget);
++	extension_name = e_source_selector_get_extension_name (selector);
++	drop_zone = e_source_has_extension (source, extension_name);
++
++	g_object_unref (source);
++
++	return drop_zone;
++}
++
++static void
++source_selector_drag_data_received (GtkWidget *widget,
++                                    GdkDragContext *context,
++                                    gint x,
++                                    gint y,
++                                    GtkSelectionData *selection_data,
++                                    guint info,
++                                    guint time_)
++{
++	ESource *source = NULL;
++	GtkTreeView *tree_view;
++	GtkTreeModel *model;
++	GtkTreePath *path = NULL;
++	GtkTreeIter iter;
++	GdkDragAction action;
++	gboolean delete;
++	gboolean success = FALSE;
++
++	tree_view = GTK_TREE_VIEW (widget);
++	model = gtk_tree_view_get_model (tree_view);
++
++	action = gdk_drag_context_get_selected_action (context);
++	delete = (action == GDK_ACTION_MOVE);
++
++	if (!gtk_tree_view_get_dest_row_at_pos (tree_view, x, y, &path, NULL))
++		goto exit;
++
++	if (!gtk_tree_model_get_iter (model, &iter, path))
++		goto exit;
++
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++
++	if (!e_source_get_writable (source))
++		goto exit;
++
++	g_signal_emit (
++		widget, signals[DATA_DROPPED], 0, selection_data,
++		source, gdk_drag_context_get_selected_action (context),
++		info, &success);
++
++exit:
++	if (path != NULL)
++		gtk_tree_path_free (path);
++
++	if (source != NULL)
++		g_object_unref (source);
++
++	gtk_drag_finish (context, success, delete, time_);
++}
++
++static gboolean
++source_selector_popup_menu (GtkWidget *widget)
++{
++	ESourceSelector *selector;
++	ESource *source;
++	gboolean res = FALSE;
++
++	selector = E_SOURCE_SELECTOR (widget);
++	source = e_source_selector_ref_primary_selection (selector);
++	g_signal_emit (selector, signals[POPUP_EVENT], 0, source, NULL, &res);
++
++	if (source != NULL)
++		g_object_unref (source);
++
++	return res;
++}
++
++static gboolean
++source_selector_test_collapse_row (GtkTreeView *tree_view,
++                                   GtkTreeIter *iter,
++                                   GtkTreePath *path)
++{
++	ESourceSelectorPrivate *priv;
++	GtkTreeSelection *selection;
++	GtkTreeModel *model;
++	GtkTreeIter child_iter;
++
++	priv = E_SOURCE_SELECTOR_GET_PRIVATE (tree_view);
++
++	/* Clear this because something else has been clicked on now */
++	priv->toggled_last = FALSE;
++
++	if (priv->saved_primary_selection)
++		return FALSE;
++
++	selection = gtk_tree_view_get_selection (tree_view);
++
++	if (!gtk_tree_selection_get_selected (selection, &model, &child_iter))
++		return FALSE;
++
++	if (gtk_tree_store_is_ancestor (GTK_TREE_STORE (model), iter, &child_iter)) {
++		GtkTreeRowReference *reference;
++		GtkTreePath *child_path;
++
++		child_path = gtk_tree_model_get_path (model, &child_iter);
++		reference = gtk_tree_row_reference_new (model, child_path);
++		priv->saved_primary_selection = reference;
++		gtk_tree_path_free (child_path);
++	}
++
++	return FALSE;
++}
++
++static void
++source_selector_row_expanded (GtkTreeView *tree_view,
++                              GtkTreeIter *iter,
++                              GtkTreePath *path)
++{
++	ESourceSelectorPrivate *priv;
++	GtkTreeModel *model;
++	GtkTreePath *child_path;
++	GtkTreeIter child_iter;
++
++	priv = E_SOURCE_SELECTOR_GET_PRIVATE (tree_view);
++
++	if (!priv->saved_primary_selection)
++		return;
++
++	model = gtk_tree_view_get_model (tree_view);
++
++	child_path = gtk_tree_row_reference_get_path (
++		priv->saved_primary_selection);
++	gtk_tree_model_get_iter (model, &child_iter, child_path);
++
++	if (gtk_tree_store_is_ancestor (GTK_TREE_STORE (model), iter, &child_iter)) {
++		GtkTreeSelection *selection;
++
++		selection = gtk_tree_view_get_selection (tree_view);
++		gtk_tree_selection_select_iter (selection, &child_iter);
++
++		clear_saved_primary_selection (E_SOURCE_SELECTOR (tree_view));
++	}
++
++	gtk_tree_path_free (child_path);
++}
++
++static gboolean
++source_selector_get_source_selected (ESourceSelector *selector,
++                                     ESource *source)
++{
++	ESourceSelectable *extension;
++	const gchar *extension_name;
++	gboolean selected = TRUE;
++
++	extension_name = e_source_selector_get_extension_name (selector);
++
++	if (!e_source_has_extension (source, extension_name))
++		return FALSE;
++
++	extension = e_source_get_extension (source, extension_name);
++
++	if (E_IS_SOURCE_SELECTABLE (extension))
++		selected = e_source_selectable_get_selected (extension);
++
++	return selected;
++}
++
++static void
++source_selector_set_source_selected (ESourceSelector *selector,
++                                     ESource *source,
++                                     gboolean selected)
++{
++	ESourceSelectable *extension;
++	const gchar *extension_name;
++
++	extension_name = e_source_selector_get_extension_name (selector);
++
++	if (!e_source_has_extension (source, extension_name))
++		return;
++
++	extension = e_source_get_extension (source, extension_name);
++
++	if (!E_IS_SOURCE_SELECTABLE (extension))
++		return;
++
++	if (selected != e_source_selectable_get_selected (extension)) {
++		e_source_selectable_set_selected (extension, selected);
++		e_source_selector_queue_write (selector, source);
++	}
++}
++
++static gboolean
++ess_bool_accumulator (GSignalInvocationHint *ihint,
++                      GValue *out,
++                      const GValue *in,
++                      gpointer data)
++{
++	gboolean v_boolean;
++
++	v_boolean = g_value_get_boolean (in);
++	g_value_set_boolean (out, v_boolean);
++
++	return !v_boolean;
++}
++
++static void
++e_source_selector_class_init (ESourceSelectorClass *class)
++{
++	GObjectClass *object_class;
++	GtkWidgetClass *widget_class;
++	GtkTreeViewClass *tree_view_class;
++
++	g_type_class_add_private (class, sizeof (ESourceSelectorPrivate));
++
++	object_class = G_OBJECT_CLASS (class);
++	object_class->set_property = source_selector_set_property;
++	object_class->get_property = source_selector_get_property;
++	object_class->dispose  = source_selector_dispose;
++	object_class->finalize = source_selector_finalize;
++	object_class->constructed = source_selector_constructed;
++
++	widget_class = GTK_WIDGET_CLASS (class);
++	widget_class->button_press_event = source_selector_button_press_event;
++	widget_class->drag_leave = source_selector_drag_leave;
++	widget_class->drag_motion = source_selector_drag_motion;
++	widget_class->drag_drop = source_selector_drag_drop;
++	widget_class->drag_data_received = source_selector_drag_data_received;
++	widget_class->popup_menu = source_selector_popup_menu;
++
++	tree_view_class = GTK_TREE_VIEW_CLASS (class);
++	tree_view_class->test_collapse_row = source_selector_test_collapse_row;
++	tree_view_class->row_expanded = source_selector_row_expanded;
++
++	class->get_source_selected = source_selector_get_source_selected;
++	class->set_source_selected = source_selector_set_source_selected;
++
++	g_object_class_install_property (
++		object_class,
++		PROP_EXTENSION_NAME,
++		g_param_spec_string (
++			"extension-name",
++			NULL,
++			NULL,
++			NULL,
++			G_PARAM_READWRITE |
++			G_PARAM_CONSTRUCT_ONLY |
++			G_PARAM_STATIC_STRINGS));
++
++	g_object_class_install_property (
++		object_class,
++		PROP_PRIMARY_SELECTION,
++		g_param_spec_object (
++			"primary-selection",
++			NULL,
++			NULL,
++			E_TYPE_SOURCE,
++			G_PARAM_READWRITE |
++			G_PARAM_STATIC_STRINGS));
++
++	g_object_class_install_property (
++		object_class,
++		PROP_REGISTRY,
++		g_param_spec_object (
++			"registry",
++			NULL,
++			NULL,
++			E_TYPE_SOURCE_REGISTRY,
++			G_PARAM_READWRITE |
++			G_PARAM_CONSTRUCT_ONLY |
++			G_PARAM_STATIC_STRINGS));
++
++	g_object_class_install_property (
++		object_class,
++		PROP_SHOW_COLORS,
++		g_param_spec_boolean (
++			"show-colors",
++			NULL,
++			NULL,
++			TRUE,
++			G_PARAM_READWRITE |
++			G_PARAM_STATIC_STRINGS));
++
++	g_object_class_install_property (
++		object_class,
++		PROP_SHOW_TOGGLES,
++		g_param_spec_boolean (
++			"show-toggles",
++			NULL,
++			NULL,
++			TRUE,
++			G_PARAM_READWRITE |
++			G_PARAM_STATIC_STRINGS));
++
++	signals[SELECTION_CHANGED] = g_signal_new (
++		"selection-changed",
++		G_OBJECT_CLASS_TYPE (object_class),
++		G_SIGNAL_RUN_LAST,
++		G_STRUCT_OFFSET (ESourceSelectorClass, selection_changed),
++		NULL, NULL, NULL,
++		G_TYPE_NONE, 0);
++
++	/* XXX Consider this signal deprecated.  Connect
++	 *     to "notify::primary-selection" instead. */
++	signals[PRIMARY_SELECTION_CHANGED] = g_signal_new (
++		"primary-selection-changed",
++		G_OBJECT_CLASS_TYPE (object_class),
++		G_SIGNAL_RUN_LAST,
++		G_STRUCT_OFFSET (ESourceSelectorClass, primary_selection_changed),
++		NULL, NULL, NULL,
++		G_TYPE_NONE, 0);
++
++	signals[POPUP_EVENT] = g_signal_new (
++		"popup-event",
++		G_OBJECT_CLASS_TYPE (object_class),
++		G_SIGNAL_RUN_LAST,
++		G_STRUCT_OFFSET (ESourceSelectorClass, popup_event),
++		ess_bool_accumulator, NULL, NULL,
++		G_TYPE_BOOLEAN, 2, G_TYPE_OBJECT,
++		GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
++
++	signals[DATA_DROPPED] = g_signal_new (
++		"data-dropped",
++		G_OBJECT_CLASS_TYPE (object_class),
++		G_SIGNAL_RUN_LAST,
++		G_STRUCT_OFFSET (ESourceSelectorClass, data_dropped),
++		NULL, NULL, NULL,
++		G_TYPE_BOOLEAN, 4,
++		GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
++		E_TYPE_SOURCE,
++		GDK_TYPE_DRAG_ACTION,
++		G_TYPE_UINT);
++}
++
++static void
++e_source_selector_init (ESourceSelector *selector)
++{
++	GHashTable *pending_writes;
++	GtkTreeViewColumn *column;
++	GtkTreeSelection *selection;
++	GtkCellRenderer *renderer;
++	GtkTreeStore *tree_store;
++	GtkTreeView *tree_view;
++
++	pending_writes = g_hash_table_new_full (
++		(GHashFunc) g_direct_hash,
++		(GEqualFunc) g_direct_equal,
++		(GDestroyNotify) g_object_unref,
++		(GDestroyNotify) pending_writes_destroy_source);
++
++	selector->priv = E_SOURCE_SELECTOR_GET_PRIVATE (selector);
++
++	selector->priv->pending_writes = pending_writes;
++
++	selector->priv->main_context = g_main_context_get_thread_default ();
++	if (selector->priv->main_context != NULL)
++		g_main_context_ref (selector->priv->main_context);
++
++	tree_view = GTK_TREE_VIEW (selector);
++
++	gtk_tree_view_set_search_column (tree_view, COLUMN_SOURCE);
++	gtk_tree_view_set_enable_search (tree_view, TRUE);
++
++	selector->priv->toggled_last = FALSE;
++	selector->priv->select_new = FALSE;
++	selector->priv->show_colors = TRUE;
++	selector->priv->show_toggles = TRUE;
++
++	selector->priv->source_index = g_hash_table_new_full (
++		(GHashFunc) e_source_hash,
++		(GEqualFunc) e_source_equal,
++		(GDestroyNotify) g_object_unref,
++		(GDestroyNotify) gtk_tree_row_reference_free);
++
++	tree_store = gtk_tree_store_new (
++		NUM_COLUMNS,
++		G_TYPE_STRING,		/* COLUMN_NAME */
++		GDK_TYPE_COLOR,		/* COLUMN_COLOR */
++		G_TYPE_BOOLEAN,		/* COLUMN_ACTIVE */
++		G_TYPE_BOOLEAN,		/* COLUMN_SHOW_COLOR */
++		G_TYPE_BOOLEAN,		/* COLUMN_SHOW_TOGGLE */
++		G_TYPE_INT,		/* COLUMN_WEIGHT */
++		E_TYPE_SOURCE);		/* COLUMN_SOURCE */
++
++	gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (tree_store));
++
++	column = gtk_tree_view_column_new ();
++	gtk_tree_view_append_column (tree_view, column);
++
++	renderer = e_cell_renderer_color_new ();
++	g_object_set (
++		G_OBJECT (renderer), "mode",
++		GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL);
++	gtk_tree_view_column_pack_start (column, renderer, FALSE);
++	gtk_tree_view_column_add_attribute (
++		column, renderer, "color", COLUMN_COLOR);
++	gtk_tree_view_column_add_attribute (
++		column, renderer, "visible", COLUMN_SHOW_COLOR);
++
++	renderer = e_cell_renderer_safe_toggle_new ();
++	gtk_tree_view_column_pack_start (column, renderer, FALSE);
++	gtk_tree_view_column_add_attribute (
++		column, renderer, "active", COLUMN_ACTIVE);
++	gtk_tree_view_column_add_attribute (
++		column, renderer, "visible", COLUMN_SHOW_TOGGLE);
++	g_signal_connect (
++		renderer, "toggled",
++		G_CALLBACK (cell_toggled_callback), selector);
++
++	renderer = gtk_cell_renderer_text_new ();
++	g_object_set (
++		G_OBJECT (renderer),
++		"ellipsize", PANGO_ELLIPSIZE_END, NULL);
++	g_signal_connect_swapped (
++		renderer, "edited",
++		G_CALLBACK (text_cell_edited_cb), selector);
++	gtk_tree_view_column_pack_start (column, renderer, TRUE);
++	gtk_tree_view_column_set_attributes (
++		column, renderer,
++		"text", COLUMN_NAME,
++		"weight", COLUMN_WEIGHT,
++		NULL);
++
++	selection = gtk_tree_view_get_selection (tree_view);
++	gtk_tree_selection_set_select_function (
++		selection, (GtkTreeSelectionFunc)
++		selection_func, selector, NULL);
++	g_signal_connect_object (
++		selection, "changed",
++		G_CALLBACK (selection_changed_callback),
++		G_OBJECT (selector), 0);
++
++	gtk_tree_view_set_headers_visible (tree_view, FALSE);
++}
++
++/**
++ * e_source_selector_new:
++ * @registry: an #ESourceRegistry
++ * @extension_name: the name of an #ESource extension
++ *
++ * Displays a list of sources from @registry having an extension named
++ * @extension_name.  The sources are grouped by backend or groupware
++ * account, which are described by the parent source.
++ *
++ * Returns: a new #ESourceSelector
++ **/
++GtkWidget *
++e_source_selector_new (ESourceRegistry *registry,
++                       const gchar *extension_name)
++{
++	g_return_val_if_fail (E_IS_SOURCE_REGISTRY (registry), NULL);
++	g_return_val_if_fail (extension_name != NULL, NULL);
++
++	return g_object_new (
++		E_TYPE_SOURCE_SELECTOR, "registry", registry,
++		"extension-name", extension_name, NULL);
++}
++
++/**
++ * e_source_selector_get_registry:
++ * @selector: an #ESourceSelector
++ *
++ * Returns the #ESourceRegistry that @selector is getting sources from.
++ *
++ * Returns: an #ESourceRegistry
++ *
++ * Since: 3.6
++ **/
++ESourceRegistry *
++e_source_selector_get_registry (ESourceSelector *selector)
++{
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL);
++
++	return selector->priv->registry;
++}
++
++/**
++ * e_source_selector_get_extension_name:
++ * @selector: an #ESourceSelector
++ *
++ * Returns the extension name used to filter which sources are displayed.
++ *
++ * Returns: the #ESource extension name
++ *
++ * Since: 3.6
++ **/
++const gchar *
++e_source_selector_get_extension_name (ESourceSelector *selector)
++{
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL);
++
++	return selector->priv->extension_name;
++}
++
++/**
++ * e_source_selector_get_show_colors:
++ * @selector: an #ESourceSelector
++ *
++ * Returns whether colors are shown next to data sources.
++ *
++ * Returns: %TRUE if colors are being shown
++ *
++ * Since: 3.6
++ **/
++gboolean
++e_source_selector_get_show_colors (ESourceSelector *selector)
++{
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), FALSE);
++
++	return selector->priv->show_colors;
++}
++
++/**
++ * e_source_selector_set_show_colors:
++ * @selector: an #ESourceSelector
++ * @show_colors: whether to show colors
++ *
++ * Sets whether to show colors next to data sources.
++ *
++ * Since: 3.6
++ **/
++void
++e_source_selector_set_show_colors (ESourceSelector *selector,
++                                   gboolean show_colors)
++{
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++
++	if ((show_colors ? 1 : 0) == (selector->priv->show_colors ? 1 : 0))
++		return;
++
++	selector->priv->show_colors = show_colors;
++
++	g_object_notify (G_OBJECT (selector), "show-colors");
++
++	source_selector_build_model (selector);
++}
++
++/**
++ * e_source_selector_get_show_toggles:
++ * @selector: an #ESourceSelector
++ *
++ * Returns whether toggles are shown next to data sources.
++ *
++ * Returns: %TRUE if toggles are being shown
++ *
++ * Since: 3.6
++ **/
++gboolean
++e_source_selector_get_show_toggles (ESourceSelector *selector)
++{
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), FALSE);
++
++	return selector->priv->show_toggles;
++}
++
++/**
++ * e_source_selector_set_show_toggles:
++ * @selector: an #ESourceSelector
++ * @show_toggles: whether to show toggles
++ *
++ * Sets whether to show toggles next to data sources.
++ *
++ * Since: 3.6
++ **/
++void
++e_source_selector_set_show_toggles (ESourceSelector *selector,
++                                   gboolean show_toggles)
++{
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++
++	if ((show_toggles ? 1 : 0) == (selector->priv->show_toggles ? 1 : 0))
++		return;
++
++	selector->priv->show_toggles = show_toggles;
++
++	g_object_notify (G_OBJECT (selector), "show-toggles");
++
++	source_selector_build_model (selector);
++}
++
++/* Helper for e_source_selector_get_selection() */
++static gboolean
++source_selector_check_selected (GtkTreeModel *model,
++                                GtkTreePath *path,
++                                GtkTreeIter *iter,
++                                gpointer user_data)
++{
++	ESource *source;
++
++	struct {
++		ESourceSelector *selector;
++		GSList *list;
++	} *closure = user_data;
++
++	gtk_tree_model_get (model, iter, COLUMN_SOURCE, &source, -1);
++
++	if (e_source_selector_source_is_selected (closure->selector, source))
++		closure->list = g_slist_prepend (closure->list, source);
++	else
++		g_object_unref (source);
++
++	return FALSE;
++}
++
++/**
++ * e_source_selector_get_selection:
++ * @selector: an #ESourceSelector
++ *
++ * Get the list of selected sources, i.e. those that were enabled through the
++ * corresponding checkboxes in the tree.
++ *
++ * Returns: A list of the ESources currently selected.  The sources will
++ * be in the same order as they appear on the screen, and the list should be
++ * freed using e_source_selector_free_selection().
++ **/
++GSList *
++e_source_selector_get_selection (ESourceSelector *selector)
++{
++	struct {
++		ESourceSelector *selector;
++		GSList *list;
++	} closure;
++
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL);
++
++	closure.selector = selector;
++	closure.list = NULL;
++
++	gtk_tree_model_foreach (
++		gtk_tree_view_get_model (GTK_TREE_VIEW (selector)),
++		(GtkTreeModelForeachFunc) source_selector_check_selected,
++		&closure);
++
++	return g_slist_reverse (closure.list);
++}
++
++/**
++ * e_source_list_free_selection:
++ * @list: A selection list returned by e_source_selector_get_selection().
++ *
++ * Free the selection list.
++ **/
++void
++e_source_selector_free_selection (GSList *list)
++{
++	g_slist_foreach (list, (GFunc) g_object_unref, NULL);
++	g_slist_free (list);
++}
++
++/**
++ * e_source_selector_set_select_new:
++ * @selector: An #ESourceSelector widget
++ * @state: A gboolean
++ *
++ * Set whether or not to select new sources added to @selector.
++ **/
++void
++e_source_selector_set_select_new (ESourceSelector *selector,
++                                  gboolean state)
++{
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++
++	selector->priv->select_new = state;
++}
++
++/**
++ * e_source_selector_select_source:
++ * @selector: An #ESourceSelector widget
++ * @source: An #ESource.
++ *
++ * Select @source in @selector.
++ **/
++void
++e_source_selector_select_source (ESourceSelector *selector,
++                                 ESource *source)
++{
++	ESourceSelectorClass *class;
++	GtkTreeRowReference *reference;
++	GHashTable *source_index;
++
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++	g_return_if_fail (E_IS_SOURCE (source));
++
++	/* Make sure the ESource is in our tree model. */
++	source_index = selector->priv->source_index;
++	reference = g_hash_table_lookup (source_index, source);
++	g_return_if_fail (gtk_tree_row_reference_valid (reference));
++
++	class = E_SOURCE_SELECTOR_GET_CLASS (selector);
++	g_return_if_fail (class->set_source_selected != NULL);
++
++	class->set_source_selected (selector, source, TRUE);
++
++	g_signal_emit (selector, signals[SELECTION_CHANGED], 0);
++}
++
++/**
++ * e_source_selector_unselect_source:
++ * @selector: An #ESourceSelector widget
++ * @source: An #ESource.
++ *
++ * Unselect @source in @selector.
++ **/
++void
++e_source_selector_unselect_source (ESourceSelector *selector,
++                                   ESource *source)
++{
++	ESourceSelectorClass *class;
++	GtkTreeRowReference *reference;
++	GHashTable *source_index;
++
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++	g_return_if_fail (E_IS_SOURCE (source));
++
++	/* Make sure the ESource is in our tree model. */
++	source_index = selector->priv->source_index;
++	reference = g_hash_table_lookup (source_index, source);
++	g_return_if_fail (gtk_tree_row_reference_valid (reference));
++
++	class = E_SOURCE_SELECTOR_GET_CLASS (selector);
++	g_return_if_fail (class->set_source_selected != NULL);
++
++	class->set_source_selected (selector, source, FALSE);
++
++	g_signal_emit (selector, signals[SELECTION_CHANGED], 0);
++}
++
++/**
++ * e_source_selector_select_exclusive:
++ * @selector: An #ESourceSelector widget
++ * @source: An #ESource.
++ *
++ * Select @source in @selector and unselect all others.
++ *
++ * Since: 2.30
++ **/
++void
++e_source_selector_select_exclusive (ESourceSelector *selector,
++                                    ESource *source)
++{
++	ESourceSelectorClass *class;
++	GHashTable *source_index;
++	GHashTableIter iter;
++	gpointer key;
++
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++	g_return_if_fail (E_IS_SOURCE (source));
++
++	class = E_SOURCE_SELECTOR_GET_CLASS (selector);
++	g_return_if_fail (class->set_source_selected != NULL);
++
++	source_index = selector->priv->source_index;
++	g_hash_table_iter_init (&iter, source_index);
++
++	while (g_hash_table_iter_next (&iter, &key, NULL)) {
++		gboolean selected = e_source_equal (key, source);
++		class->set_source_selected (selector, key, selected);
++	}
++
++	g_signal_emit (selector, signals[SELECTION_CHANGED], 0);
++}
++
++/**
++ * e_source_selector_source_is_selected:
++ * @selector: An #ESourceSelector widget
++ * @source: An #ESource.
++ *
++ * Check whether @source is selected in @selector.
++ *
++ * Returns: %TRUE if @source is currently selected, %FALSE otherwise.
++ **/
++gboolean
++e_source_selector_source_is_selected (ESourceSelector *selector,
++                                      ESource *source)
++{
++	ESourceSelectorClass *class;
++	GtkTreeRowReference *reference;
++	GHashTable *source_index;
++
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), FALSE);
++	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
++
++	/* Make sure the ESource is in our tree model. */
++	source_index = selector->priv->source_index;
++	reference = g_hash_table_lookup (source_index, source);
++	g_return_val_if_fail (gtk_tree_row_reference_valid (reference), FALSE);
++
++	class = E_SOURCE_SELECTOR_GET_CLASS (selector);
++	g_return_val_if_fail (class->get_source_selected != NULL, FALSE);
++
++	return class->get_source_selected (selector, source);
++}
++
++/**
++ * e_source_selector_edit_primary_selection:
++ * @selector: An #ESourceSelector widget
++ *
++ * Allows the user to rename the primary selected source by opening an
++ * entry box directly in @selector.
++ *
++ * Since: 2.26
++ **/
++void
++e_source_selector_edit_primary_selection (ESourceSelector *selector)
++{
++	GtkTreeRowReference *reference;
++	GtkTreeSelection *selection;
++	GtkTreeViewColumn *column;
++	GtkCellRenderer *renderer;
++	GtkTreeView *tree_view;
++	GtkTreeModel *model;
++	GtkTreePath *path = NULL;
++	GtkTreeIter iter;
++	GList *list;
++
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++
++	tree_view = GTK_TREE_VIEW (selector);
++	column = gtk_tree_view_get_column (tree_view, 0);
++	reference = selector->priv->saved_primary_selection;
++	selection = gtk_tree_view_get_selection (tree_view);
++
++	if (reference != NULL)
++		path = gtk_tree_row_reference_get_path (reference);
++	else if (gtk_tree_selection_get_selected (selection, &model, &iter))
++		path = gtk_tree_model_get_path (model, &iter);
++
++	if (path == NULL)
++		return;
++
++	/* XXX Because we stuff three renderers in a single column,
++	 *     we have to manually hunt for the text renderer. */
++	renderer = NULL;
++	list = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column));
++	while (list != NULL) {
++		renderer = list->data;
++		if (GTK_IS_CELL_RENDERER_TEXT (renderer))
++			break;
++		list = g_list_delete_link (list, list);
++	}
++	g_list_free (list);
++
++	/* Make the text cell renderer editable, but only temporarily.
++	 * We don't want editing to be activated by simply clicking on
++	 * the source name.  Too easy for accidental edits to occur. */
++	g_object_set (renderer, "editable", TRUE, NULL);
++	gtk_tree_view_expand_to_path (tree_view, path);
++	gtk_tree_view_set_cursor_on_cell (
++		tree_view, path, column, renderer, TRUE);
++	g_object_set (renderer, "editable", FALSE, NULL);
++
++	gtk_tree_path_free (path);
++}
++
++/**
++ * e_source_selector_ref_primary_selection:
++ * @selector: An #ESourceSelector widget
++ *
++ * Get the primary selected source.  The primary selection is the one that is
++ * highlighted through the normal #GtkTreeView selection mechanism (as opposed
++ * to the "normal" selection, which is the set of source whose checkboxes are
++ * checked).
++ *
++ * The returned #ESource is referenced for thread-safety and must be
++ * unreferenced with g_object_unref() when finished with it.
++ *
++ * Returns: The selected source.
++ *
++ * Since: 3.6
++ **/
++ESource *
++e_source_selector_ref_primary_selection (ESourceSelector *selector)
++{
++	ESource *source;
++	GtkTreeRowReference *reference;
++	GtkTreeSelection *selection;
++	GtkTreeView *tree_view;
++	GtkTreeModel *model;
++	GtkTreeIter iter;
++	const gchar *extension_name;
++	gboolean have_iter = FALSE;
++
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL);
++
++	tree_view = GTK_TREE_VIEW (selector);
++	model = gtk_tree_view_get_model (tree_view);
++	selection = gtk_tree_view_get_selection (tree_view);
++
++	reference = selector->priv->saved_primary_selection;
++
++	if (gtk_tree_row_reference_valid (reference)) {
++		GtkTreePath *path;
++
++		path = gtk_tree_row_reference_get_path (reference);
++		have_iter = gtk_tree_model_get_iter (model, &iter, path);
++		gtk_tree_path_free (path);
++	}
++
++	if (!have_iter)
++		have_iter = gtk_tree_selection_get_selected (
++			selection, NULL, &iter);
++
++	if (!have_iter)
++		return NULL;
++
++	gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++
++	extension_name = e_source_selector_get_extension_name (selector);
++
++	if (!e_source_has_extension (source, extension_name)) {
++		g_object_unref (source);
++		return NULL;
++	}
++
++	return source;
++}
++
++/**
++ * e_source_selector_set_primary_selection:
++ * @selector: an #ESourceSelector widget
++ * @source: an #ESource to select
++ *
++ * Highlights @source in @selector.  The highlighted #ESource is called
++ * the primary selection.
++ *
++ * Do not confuse this function with e_source_selector_select_source(),
++ * which activates the check box next to an #ESource's display name in
++ * @selector.  This function does not alter the check box.
++ **/
++void
++e_source_selector_set_primary_selection (ESourceSelector *selector,
++                                         ESource *source)
++{
++	GHashTable *source_index;
++	GtkTreeRowReference *reference;
++	GtkTreeSelection *selection;
++	GtkTreeView *tree_view;
++	GtkTreePath *child_path;
++	GtkTreePath *parent_path;
++	const gchar *extension_name;
++
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++	g_return_if_fail (E_IS_SOURCE (source));
++
++	tree_view = GTK_TREE_VIEW (selector);
++	selection = gtk_tree_view_get_selection (tree_view);
++
++	source_index = selector->priv->source_index;
++	reference = g_hash_table_lookup (source_index, source);
++
++	/* XXX Maybe we should return a success/fail boolean? */
++	if (!gtk_tree_row_reference_valid (reference))
++		return;
++
++	extension_name = e_source_selector_get_extension_name (selector);
++
++	/* Return silently if attempting to select a parent node
++	 * lacking the expected extension (e.g. On This Computer). */
++	if (!e_source_has_extension (source, extension_name))
++		return;
++
++	/* We block the signal because this all needs to be atomic */
++	g_signal_handlers_block_matched (
++		selection, G_SIGNAL_MATCH_FUNC,
++		0, 0, NULL, selection_changed_callback, NULL);
++	gtk_tree_selection_unselect_all (selection);
++	g_signal_handlers_unblock_matched (
++		selection, G_SIGNAL_MATCH_FUNC,
++		0, 0, NULL, selection_changed_callback, NULL);
++
++	clear_saved_primary_selection (selector);
++
++	child_path = gtk_tree_row_reference_get_path (reference);
++
++	parent_path = gtk_tree_path_copy (child_path);
++	gtk_tree_path_up (parent_path);
++
++	if (gtk_tree_view_row_expanded (tree_view, parent_path)) {
++		gtk_tree_selection_select_path (selection, child_path);
++	} else {
++		selector->priv->saved_primary_selection =
++			gtk_tree_row_reference_copy (reference);
++		g_signal_emit (selector, signals[PRIMARY_SELECTION_CHANGED], 0);
++		g_object_notify (G_OBJECT (selector), "primary-selection");
++	}
++
++	gtk_tree_path_free (child_path);
++	gtk_tree_path_free (parent_path);
++}
++
++/**
++ * e_source_selector_ref_source_by_path:
++ * @selector: an #ESourceSelector
++ * @path: a #GtkTreePath
++ *
++ * Returns the #ESource object at @path, or %NULL if @path is invalid.
++ *
++ * The returned #ESource is referenced for thread-safety and must be
++ * unreferenced with g_object_unref() when finished with it.
++ *
++ * Returns: the #ESource object at @path, or %NULL
++ *
++ * Since: 3.6
++ **/
++ESource *
++e_source_selector_ref_source_by_path (ESourceSelector *selector,
++                                      GtkTreePath *path)
++{
++	ESource *source = NULL;
++	GtkTreeModel *model;
++	GtkTreeIter iter;
++
++	g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL);
++	g_return_val_if_fail (path != NULL, NULL);
++
++	model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector));
++
++	if (gtk_tree_model_get_iter (model, &iter, path))
++		gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1);
++
++	return source;
++}
++
++/**
++ * e_source_selector_queue_write:
++ * @selector: an #ESourceSelecetor
++ * @source: an #ESource with changes to be written
++ *
++ * Queues a main loop idle callback to write changes to @source back to
++ * the D-Bus registry service.
++ *
++ * Since: 3.6
++ **/
++void
++e_source_selector_queue_write (ESourceSelector *selector,
++                               ESource *source)
++{
++	GSource *idle_source;
++	GHashTable *pending_writes;
++	GMainContext *main_context;
++	AsyncContext *async_context;
++
++	g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
++	g_return_if_fail (E_IS_SOURCE (source));
++
++	main_context = selector->priv->main_context;
++	pending_writes = selector->priv->pending_writes;
++
++	idle_source = g_hash_table_lookup (pending_writes, source);
++	if (idle_source != NULL && !g_source_is_destroyed (idle_source))
++		return;
++
++	async_context = g_slice_new0 (AsyncContext);
++	async_context->selector = g_object_ref (selector);
++	async_context->source = g_object_ref (source);
++
++	/* Set a higher priority so this idle source runs before our
++	 * source_selector_cancel_write() signal handler, which will
++	 * cancel this idle source.  Cancellation is the right thing
++	 * to do when receiving changes from OTHER registry clients,
++	 * but we don't want to cancel our own changes.
++	 *
++	 * XXX This might be an argument for using etags.
++	 */
++	idle_source = g_idle_source_new ();
++	g_hash_table_insert (
++		pending_writes,
++		g_object_ref (source),
++		g_source_ref (idle_source));
++	g_source_set_callback (
++		idle_source,
++		source_selector_write_idle_cb,
++		async_context,
++		(GDestroyNotify) async_context_free);
++	g_source_set_priority (idle_source, G_PRIORITY_HIGH_IDLE);
++	g_source_attach (idle_source, main_context);
++	g_source_unref (idle_source);
++}
++
+diff --git a/src/event-factories/e-source-selector.h b/src/event-factories/e-source-selector.h
+new file mode 100644
+index 0000000..b6d3770
+--- /dev/null
++++ b/src/event-factories/e-source-selector.h
+@@ -0,0 +1,137 @@
++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
++/* e-source-selector.h
++ *
++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this program; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ *
++ * Author: Ettore Perazzoli <ettore@ximian.com>
++ */
++
++#ifndef E_SOURCE_SELECTOR_H
++#define E_SOURCE_SELECTOR_H
++
++#include <gtk/gtk.h>
++#include <libedataserver/libedataserver.h>
++
++/* Standard GObject macros */
++#define E_TYPE_SOURCE_SELECTOR \
++	(e_source_selector_get_type ())
++#define E_SOURCE_SELECTOR(obj) \
++	(G_TYPE_CHECK_INSTANCE_CAST \
++	((obj), E_TYPE_SOURCE_SELECTOR, ESourceSelector))
++#define E_SOURCE_SELECTOR_CLASS(cls) \
++	(G_TYPE_CHECK_CLASS_CAST \
++	((cls), E_TYPE_SOURCE_SELECTOR, ESourceSelectorClass))
++#define E_IS_SOURCE_SELECTOR(obj) \
++	(G_TYPE_CHECK_INSTANCE_TYPE \
++	((obj), E_TYPE_SOURCE_SELECTOR))
++#define E_IS_SOURCE_SELECTOR_CLASS(cls) \
++	(G_TYPE_CHECK_CLASS_TYPE \
++	((cls), E_TYPE_SOURCE_SELECTOR))
++#define E_SOURCE_SELECTOR_GET_CLASS(obj) \
++	(G_TYPE_INSTANCE_GET_CLASS \
++	((obj), E_TYPE_SOURCE_SELECTOR, ESourceSelectorClass))
++
++G_BEGIN_DECLS
++
++typedef struct _ESourceSelector ESourceSelector;
++typedef struct _ESourceSelectorClass ESourceSelectorClass;
++typedef struct _ESourceSelectorPrivate ESourceSelectorPrivate;
++
++struct _ESourceSelector {
++	GtkTreeView parent;
++	ESourceSelectorPrivate *priv;
++};
++
++struct _ESourceSelectorClass {
++	GtkTreeViewClass parent_class;
++
++	/* Methods */
++	gboolean	(*get_source_selected)	(ESourceSelector *selector,
++						 ESource *source);
++	void		(*set_source_selected)	(ESourceSelector *selector,
++						 ESource *source,
++						 gboolean selected);
++
++	/* Signals */
++	void		(*selection_changed)	(ESourceSelector *selector);
++	void		(*primary_selection_changed)
++						(ESourceSelector *selector);
++	gboolean	(*popup_event)		(ESourceSelector *selector,
++						 ESource *primary,
++						 GdkEventButton *event);
++	gboolean	(*data_dropped)		(ESourceSelector *selector,
++						 GtkSelectionData *data,
++						 ESource *destination,
++						 GdkDragAction action,
++						 guint target_info);
++
++	gpointer padding1;
++	gpointer padding2;
++	gpointer padding3;
++};
++
++GType		e_source_selector_get_type	(void);
++GtkWidget *	e_source_selector_new		(ESourceRegistry *registry,
++						 const gchar *extension_name);
++ESourceRegistry *
++		e_source_selector_get_registry	(ESourceSelector *selector);
++const gchar *	e_source_selector_get_extension_name
++						(ESourceSelector *selector);
++gboolean	e_source_selector_get_show_colors
++						(ESourceSelector *selector);
++void		e_source_selector_set_show_colors
++						(ESourceSelector *selector,
++						 gboolean show_colors);
++gboolean	e_source_selector_get_show_toggles
++						(ESourceSelector *selector);
++void		e_source_selector_set_show_toggles
++						(ESourceSelector *selector,
++						 gboolean show_toggles);
++void		e_source_selector_select_source	(ESourceSelector *selector,
++						 ESource *source);
++void		e_source_selector_unselect_source
++						(ESourceSelector *selector,
++						 ESource *source);
++void		e_source_selector_select_exclusive
++						(ESourceSelector *selector,
++						 ESource *source);
++gboolean	e_source_selector_source_is_selected
++						(ESourceSelector *selector,
++						 ESource *source);
++GSList *	e_source_selector_get_selection	(ESourceSelector *selector);
++void		e_source_selector_free_selection
++						(GSList *list);
++void		e_source_selector_set_select_new
++						(ESourceSelector *selector,
++						 gboolean state);
++void		e_source_selector_edit_primary_selection
++						(ESourceSelector *selector);
++ESource *	e_source_selector_ref_primary_selection
++						(ESourceSelector *selector);
++void		e_source_selector_set_primary_selection
++						(ESourceSelector *selector,
++						 ESource *source);
++ESource *	e_source_selector_ref_source_by_path
++						(ESourceSelector *selector,
++						 GtkTreePath *path);
++void		e_source_selector_queue_write	(ESourceSelector *selector,
++						 ESource *source);
++
++G_END_DECLS
++
++#endif /* E_SOURCE_SELECTOR_H */
+--
+cgit v0.9.1
diff --git a/community/almanah/update-gtkspell3-support.patch b/community/almanah/update-gtkspell3-support.patch
new file mode 100644
index 000000000..aa2a81159
--- /dev/null
+++ b/community/almanah/update-gtkspell3-support.patch
@@ -0,0 +1,90 @@
+From 114c4f78ac9882be51c4154751760bd4fea48403 Mon Sep 17 00:00:00 2001
+From: Álvaro Peña <alvaropg@gmail.com>
+Date: Wed, 06 Feb 2013 10:12:54 +0000
+Subject: Update GtkSpell 3 support
+
+---
+diff --git a/configure.ac b/configure.ac
+index b89ba74..fbe6889 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -95,7 +95,7 @@ AC_SUBST(EVO_LIBS)
+ 
+ dnl Spell checking
+ if test $spell_checking = "true"; then
+-	PKG_CHECK_MODULES(SPELL_CHECKING, gtkspell-3.0)
++	PKG_CHECK_MODULES(SPELL_CHECKING, gtkspell3-3.0)
+ 	AC_SUBST(SPELL_CHECKING_CFLAGS)
+ 	AC_SUBST(SPELL_CHECKING_LIBS)
+ fi
+diff --git a/src/main-window.c b/src/main-window.c
+index fb931e1..2fe01ef 100644
+--- a/src/main-window.c
++++ b/src/main-window.c
+@@ -1109,7 +1109,7 @@ mw_calendar_day_selected_cb (AlmanahCalendarButton *calendar_button, AlmanahMain
+ 	AlmanahEventManager *event_manager;
+ 	GDate calendar_date;
+ #ifdef ENABLE_SPELL_CHECKING
+-	GtkSpell *gtkspell;
++	GtkSpellChecker *gtkspell;
+ #endif /* ENABLE_SPELL_CHECKING */
+ 	AlmanahMainWindowPrivate *priv = main_window->priv;
+ 	AlmanahEntry *entry;
+@@ -1166,9 +1166,9 @@ mw_calendar_day_selected_cb (AlmanahCalendarButton *calendar_button, AlmanahMain
+ 
+ #ifdef ENABLE_SPELL_CHECKING
+ 	/* Ensure the spell-checking is updated */
+-	gtkspell = gtkspell_get_from_text_view (priv->entry_view);
++	gtkspell = gtk_spell_checker_get_from_text_view (priv->entry_view);
+ 	if (gtkspell != NULL) {
+-		gtkspell_recheck_all (gtkspell);
++		gtk_spell_checker_recheck_all (gtkspell);
+ 		gtk_widget_queue_draw (GTK_WIDGET (priv->entry_view));
+ 	}
+ #endif /* ENABLE_SPELL_CHECKING */
+@@ -1326,13 +1326,13 @@ enable_spell_checking (AlmanahMainWindow *self, GError **error)
+ {
+ 	AlmanahApplication *application;
+ 	GSettings *settings;
+-	GtkSpell *gtkspell;
++	GtkSpellChecker *gtkspell;
+ 	gchar *spelling_language;
+ 	GtkTextTagTable *table;
+ 	GtkTextTag *tag;
+ 
+ 	/* Bail out if spell checking's already enabled */
+-	if (gtkspell_get_from_text_view (self->priv->entry_view) != NULL)
++	if (gtk_spell_checker_get_from_text_view (self->priv->entry_view) != NULL)
+ 		return TRUE;
+ 
+ 	/* If spell checking wasn't already enabled, we have a dummy gtkspell-misspelled text tag to destroy */
+@@ -1353,7 +1353,9 @@ enable_spell_checking (AlmanahMainWindow *self, GError **error)
+ 		spelling_language = NULL;
+ 	}
+ 
+-	gtkspell = gtkspell_new_attach (self->priv->entry_view, spelling_language, error);
++	gtkspell = gtk_spell_checker_new ();
++	gtk_spell_checker_set_language (gtkspell, spelling_language, error);
++	gtk_spell_checker_attach (gtkspell, self->priv->entry_view);
+ 	g_free (spelling_language);
+ 
+ 	if (gtkspell == NULL)
+@@ -1364,13 +1366,13 @@ enable_spell_checking (AlmanahMainWindow *self, GError **error)
+ static void
+ disable_spell_checking (AlmanahMainWindow *self)
+ {
+-	GtkSpell *gtkspell;
++	GtkSpellChecker *gtkspell;
+ 	GtkTextTagTable *table;
+ 	GtkTextTag *tag;
+ 
+-	gtkspell = gtkspell_get_from_text_view (self->priv->entry_view);
++	gtkspell = gtk_spell_checker_get_from_text_view (self->priv->entry_view);
+ 	if (gtkspell != NULL)
+-		gtkspell_detach (gtkspell);
++		gtk_spell_checker_detach (gtkspell);
+ 
+ 	/* Remove the old gtkspell-misspelling text tag */
+ 	table = gtk_text_buffer_get_tag_table (self->priv->entry_buffer);
+--
+cgit v0.9.1
diff --git a/community/alure/PKGBUILD b/community/alure/PKGBUILD
index bc710db00..da9ad5247 100644
--- a/community/alure/PKGBUILD
+++ b/community/alure/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=alure
 pkgver=1.2
-pkgrel=2
+pkgrel=2.1
 pkgdesc='Utility library to help manage common tasks with OpenAL applications.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://kcat.strangesoft.net/alure.html'
diff --git a/community/angband/PKGBUILD b/community/angband/PKGBUILD
deleted file mode 100644
index af58de442..000000000
--- a/community/angband/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Maintainer: schuay <jakob.gruber@gmail.com>
-# Maintainer: Mike Sampson <mike at sambodata dot com>
-# Contributor: Adrian Stratulat <adrian.stratulat at inboxcom>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: KillaB <xGenoBlast@gmail.com>
-# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
-# Contributor: Christian Schmidt <xmucknertx@googlemail.com>
-# Contributor: Sebastian Sareyko <public@nooms.de>
-
-pkgname=angband
-pkgver=3.4.1
-pkgrel=1
-pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien"
-arch=('i686' 'x86_64')
-url="http://rephial.org/"
-license=('GPL2' 'custom')
-depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses' 'libglade')
-source=("http://rephial.org/downloads/${pkgver:0:3}/${pkgname}-v${pkgver}.tar.gz")
-
-build() {
-
-  cd "${srcdir}/${pkgname}-v${pkgver}"
-
-  ./configure \
-    --prefix=/usr \
-    --bindir=/usr/bin \
-    --sysconfdir=/usr/share/angband \
-    --with-configpath=/usr/share/angband \
-    --with-libpath=/usr/share/angband \
-    --enable-gtk \
-    --enable-sdl \
-    --enable-sdl-mixer
-
-  make
-
-}
-
-package() {
-
-  cd "${srcdir}/${pkgname}-v${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}/usr/share/angband/*/delete.me"
-  install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-
-}
-
-md5sums=('3ea22e5caabc3de7b49bac13ba922a8c')
diff --git a/community/antiword/PKGBUILD b/community/antiword/PKGBUILD
index 260633c73..7ff6bda40 100644
--- a/community/antiword/PKGBUILD
+++ b/community/antiword/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=antiword
 pkgver=0.37
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A free MS Word reader for Linux and RISC OS"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.winfield.demon.nl/"
diff --git a/community/apg/PKGBUILD b/community/apg/PKGBUILD
index 6e55d72af..67221698e 100644
--- a/community/apg/PKGBUILD
+++ b/community/apg/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=apg
 pkgver=2.2.3
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Automated Password Generator."
 arch=(i686 x86_64 'mips64el')
 url="http://www.adel.nursat.kz/apg/index.shtml"
diff --git a/community/apitrace/PKGBUILD b/community/apitrace/PKGBUILD
new file mode 100644
index 000000000..4eab13710
--- /dev/null
+++ b/community/apitrace/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 89930 2013-05-05 19:53:46Z lcarlier $
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Luca Bennati <lucak3 AT gmail DOT com>
+# Contributor: Glaucous <glakke1 at gmail dot com>
+
+pkgname=apitrace
+pkgver=4.0
+pkgrel=1
+pkgdesc="Graphics API Tracing"
+arch=('i686' 'x86_64' 'mips64el')
+url="https://github.com/apitrace/apitrace"
+license=('custom')
+makedepends=('cmake' 'mesa' 'libgl' 'python2' 'qtwebkit' 'qjson')
+optdepends=('qtwebkit: GUI support' 'qjson: GUI support')
+source=("https://github.com/apitrace/apitrace/archive/${pkgver}.zip")
+md5sums=('5b2e212d91d2f184d8608c712eab69a0')
+
+build() {
+  cd ${srcdir}/apitrace-*
+
+  cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=/usr -DPYTHON_EXECUTABLE='/usr/bin/python2'
+  make -C build
+}
+
+package() {
+  depends=('python2' 'libgl')
+  cd ${srcdir}/apitrace-*
+
+  make -C build DESTDIR="${pkgdir}/" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/apitrace"
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/apitrace/"
+}
diff --git a/community/apitrace/gcc-4.7-fix.patch b/community/apitrace/gcc-4.7-fix.patch
new file mode 100644
index 000000000..20cc71a3a
--- /dev/null
+++ b/community/apitrace/gcc-4.7-fix.patch
@@ -0,0 +1,39 @@
+From 8159d6c1295da8c1b342bc77686e7ecfed1e5c01 Mon Sep 17 00:00:00 2001
+From: Martin Olsson <martin@minimum.se>
+Date: Mon, 26 Mar 2012 10:40:45 +0200
+Subject: [PATCH] Fix compile error "isatty was not declared"; missing
+ unistd.h include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When I built apitrace on Fedora 16, using the usual:
+
+	cmake -H. -Bbuild
+	make -C build
+
+...then I got this compile error:
+
+	apitrace/cli/cli_dump.cpp: In function ‘int command(int, char**)’:
+	apitrace/cli/cli_dump.cpp:176:25: error: ‘isatty’ was not declared in this scope
+---
+ cli/cli_dump.cpp |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/cli/cli_dump.cpp b/cli/cli_dump.cpp
+index 28c91af..f52b83c 100644
+--- a/cli/cli_dump.cpp
++++ b/cli/cli_dump.cpp
+@@ -28,6 +28,9 @@
+ #include <string.h>
+ #include <limits.h> // for CHAR_MAX
+ #include <getopt.h>
++#ifndef _WIN32
++#include <unistd.h> // for isatty()
++#endif
+ 
+ #include "cli.hpp"
+ #include "cli_pager.hpp"
+-- 
+1.7.10
+
diff --git a/community/apvlv/PKGBUILD b/community/apvlv/PKGBUILD
index af84629fa..14323233c 100644
--- a/community/apvlv/PKGBUILD
+++ b/community/apvlv/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 79519 2012-11-06 16:27:50Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 88809 2013-04-22 20:09:44Z jsteel $
+# Maintainer:  Jonathan Steel <jsteel@aur.archlinux.org>
+# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: tocer.deng <tocer.deng@gmail.com>
 
 pkgname=apvlv
 pkgver=0.1.4.20121023
-pkgrel=1
-pkgdesc='A PDF Viewer which behaves like Vim'
+pkgrel=3
+pkgdesc='A PDF Viewer, which behaves like Vim'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://naihe2010.github.com/apvlv/"
 license=('GPL')
-depends=('gtk2' 'cairo' 'poppler-glib' 'djvulibre')
+depends=('gtk2' 'cairo' 'poppler-glib' 'djvulibre' 'desktop-file-utils')
 makedepends=('cmake' 'libwebkit')
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('f222fc4b09b15358eb4e7f996ba810d6')
+install=$pkgname.install
+source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz
+        $pkgname.desktop)
+backup=(etc/apvlvrc)
+md5sums=('f222fc4b09b15358eb4e7f996ba810d6'
+         '54478fecb54f36d1c44d8fdc233ddbac')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
 
   mkdir -p build
   cd build
@@ -25,11 +30,15 @@ build() {
   cmake -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DAPVLV_WITH_UMD=no  ..
+
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver/build
+  cd "$srcdir"/$pkgname-$pkgver/build
+
+  make DESTDIR="$pkgdir"/ install
 
-  make DESTDIR=$pkgdir/ install
+  install -Dm644 "$srcdir"/$pkgname.desktop \
+    "$pkgdir"/usr/share/applications/$pkgname.desktop
 }
diff --git a/community/apvlv/apvlv.desktop b/community/apvlv/apvlv.desktop
new file mode 100644
index 000000000..2f6ebd398
--- /dev/null
+++ b/community/apvlv/apvlv.desktop
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=apvlv
+Comment=A minimalistic document viewer
+Comment[de]=Ein minimalistischer Dokumenten-Betrachter
+Comment[fr]=Un visionneur de document minimaliste
+Comment[ru]=Минималистичный просмотрщик документов
+Comment[tr]=Minimalist bir belge görüntüleyicisi
+Comment[es_CL]=Un visor de documentos minimalista
+Comment[uk_UA]=Легкий переглядач документів
+Comment[it]=Un visualizzatore di documenti minimalista
+Comment[pl]=Minimalistyczna przeglądarka dokumentów
+Exec=apvlv %f
+Terminal=false
+Categories=Office;Viewer;
+MimeType=application/pdf;application/postscript;application/eps;application/x-eps;image/eps;image/x-eps;image/vnd.djvu;
diff --git a/community/apvlv/apvlv.install b/community/apvlv/apvlv.install
new file mode 100644
index 000000000..5384f9c85
--- /dev/null
+++ b/community/apvlv/apvlv.install
@@ -0,0 +1,7 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/arch/PKGBUILD b/community/arch/PKGBUILD
index 9467e75cb..6b2b8c96d 100644
--- a/community/arch/PKGBUILD
+++ b/community/arch/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=arch
 pkgver=1.3.5
-pkgrel=9
+pkgrel=9.1
 pkgdesc='A modern and remarkable revision control system.'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index 6d11c2b5a..2b521e3f1 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83746 2013-02-04 21:45:01Z bpiotrowski $
+# $Id: PKGBUILD 88658 2013-04-21 10:47:57Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=aria2
-pkgver=1.16.3
+pkgver=1.17.0
 pkgrel=1
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ url='http://aria2.sourceforge.net/'
 license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates')
 checkdepends=('cppunit')
-source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2)
-sha256sums=('989f8eb5599394681d75e18acf3d4261870cc2dce70b813ce84305dc3c9e50a2')
+source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.xz)
+sha256sums=('e3b533a33d33ad2392acc37d4510e5cd660af8ac23943c6402a0172f4a347c9c')
 
 build() {
   cd $pkgname-$pkgver
@@ -35,11 +35,11 @@ check() {
 package() {
   cd $pkgname-$pkgver
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="$pkgdir" install
 
   # add bash completion (aria2 automatically installs to a temporary target directory)
-  install -d ${pkgdir}/usr/share/bash-completion/completions
-  install -m644 ${pkgdir}/usr/share/doc/aria2/bash_completion/aria2c \
-    ${pkgdir}/usr/share/bash-completion/completions
-  rm -rf ${pkgdir}/usr/share/doc/aria2/bash_completion
+  install -d "$pkgdir"/usr/share/bash-completion/completions
+  install -m644 "$pkgdir"/usr/share/doc/aria2/bash_completion/aria2c \
+    "$pkgdir"/usr/share/bash-completion/completions
+  rm -rf "$pkgdir"/usr/share/doc/aria2/bash_completion
 }
diff --git a/community/ario/PKGBUILD b/community/ario/PKGBUILD
index 1673e6952..db5e3a091 100644
--- a/community/ario/PKGBUILD
+++ b/community/ario/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=ario
 pkgver=1.5.1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A GTK client for MPD (Music player daemon) inspired by Rhythmbox but much lighter and faster"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ario-player.sourceforge.net/"
@@ -13,12 +13,14 @@ makedepends=('intltool' 'perl-xml-parser')
 options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$pkgver.tar.gz)
-sha256sums=('0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$pkgver.tar.gz
+	ario-1.5.1-glib.patch)
+sha256sums=('0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e'
+	    '2e42992e7ed0be590278198b75bc9a7259cdfdde4de41a38ddbf2f093ccda930')
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
-
+  patch -Np1 -i ${srcdir}/ario-1.5.1-glib.patch
   ./configure --prefix=/usr --sysconfdir=/etc
   make
  }
diff --git a/community/ario/ario-1.5.1-glib.patch b/community/ario/ario-1.5.1-glib.patch
new file mode 100644
index 000000000..d183c9511
--- /dev/null
+++ b/community/ario/ario-1.5.1-glib.patch
@@ -0,0 +1,33 @@
+--- ario-1.5.1.orig/src/ario-util.h	2011-02-27 10:07:31.000000000 -0500
++++ ario-1.5.1/src/ario-util.h	2013-02-10 20:07:13.587768553 -0500
+@@ -18,7 +18,7 @@
+  */
+ 
+ #include "servers/ario-server.h"
+-#include "glib/gslist.h"
++#include "glib.h"
+ #include "gdk/gdkpixbuf.h"
+ 
+ /* Number of covers used to generate the drag & drop image */
+--- ario-1.5.1.orig/src/ario-profiles.h	2011-05-17 12:54:49.000000000 -0500
++++ ario-1.5.1/src/ario-profiles.h	2013-02-10 20:20:12.934814452 -0500
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_PROFILES_H
+ #define __ARIO_PROFILES_H
+ 
+-#include <glib/gslist.h>
++#include <glib.h>
+ #include "servers/ario-server.h"
+ 
+ G_BEGIN_DECLS
+--- ario-1.5.1.orig/src/plugins/ario-plugin-info.c	2011-02-27 10:07:28.000000000 -0500
++++ ario-1.5.1/src/plugins/ario-plugin-info.c	2013-02-10 20:32:41.847900389 -0500
+@@ -27,7 +27,7 @@
+ 
+ #include <string.h>
+ #include <glib/gi18n.h>
+-#include <glib/gkeyfile.h>
++#include <glib.h>
+ 
+ #include "plugins/ario-plugin-info-priv.h"
+ #include "ario-debug.h"
diff --git a/community/arp-scan/PKGBUILD b/community/arp-scan/PKGBUILD
index baaab48c7..a6e2be7fa 100644
--- a/community/arp-scan/PKGBUILD
+++ b/community/arp-scan/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=arp-scan
 pkgver=1.8.1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A tool that uses ARP to discover and fingerprint IP hosts on the local network"
-arch=(mips64el)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nta-monitor.com/tools/arp-scan/"
 license=('GPL')
 depends=('libpcap' 'perl-libwww')
diff --git a/community/arpack/PKGBUILD b/community/arpack/PKGBUILD
index 70bff7b10..48bef3af5 100644
--- a/community/arpack/PKGBUILD
+++ b/community/arpack/PKGBUILD
@@ -1,26 +1,29 @@
-# $Id: PKGBUILD 66078 2012-02-22 22:46:10Z arodseth $
+# $Id: PKGBUILD 85849 2013-03-07 18:31:38Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=arpack
-pkgver=3.1.0
-pkgrel=2.1
+pkgver=3.1.2
+pkgrel=1
 arch=('x86_64' 'i686' 'mips64el')
-pkgdesc="Fortran77 subroutines designed to solve large scale eigenvalue problems"
-url="http://forge.scilab.org/index.php/p/arpack-ng/"
+pkgdesc='Fortran77 subroutines designed to solve large scale eigenvalue problems'
+url='http://forge.scilab.org/index.php/p/arpack-ng/'
 license=('BSD')
-depends=('glibc' 'gcc-fortran' 'lapack' 'openmpi>=1.5.4-4')
+depends=('lapack' 'openmpi')
 provides=('arpack-ng')
 options=('!libtool')
 source=("http://forge.scilab.org/upload/$pkgname-ng/files/$pkgname-ng_$pkgver.tar.gz")
-sha256sums=('65b7856126f06ecbf9ec450d50df92ca9260d4b0d21baf02497554ac230d6feb')
+sha256sums=('9338bda5bef5a4bafd99c18f327acb54f8be4ffc5c53d0a186e4aa27db3260f2')
 
 build() {
   cd "$srcdir/$pkgname-ng_$pkgver"
 
   ./configure --prefix=/usr --enable-mpi
-  make F77="gfortran" LIBS+=" `pkg-config --libs ompi` "
+  make \
+    F77="mpif77" \
+    CFLAGS+=" `pkg-config --cflags ompi` " \
+    LIBS+=" `pkg-config --libs ompi` "
 }
 
 package() {
diff --git a/community/arptables/arptables.conf b/community/arptables/arptables.conf
deleted file mode 100644
index 8b5456788..000000000
--- a/community/arptables/arptables.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration file used to load/save configuration.
-CONFIG_FILE='/etc/arptables.conf'
-
-# Save configuration on stop/restart.
-#SAVE_ON_STOP=yes
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/arptables/arptables.install b/community/arptables/arptables.install
deleted file mode 100644
index 5f03b6e24..000000000
--- a/community/arptables/arptables.install
+++ /dev/null
@@ -1,10 +0,0 @@
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  [ $(vercmp "$2" '0.0.3_4-2') -gt 0 ] || cat <<EOF
-Config file have been moved from /etc/arptables/arptables to /etc/arptables.conf.
-You can revert to the previous location by editing /etc/conf.d/arptables.
-EOF
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/arptables/arptables.rc b/community/arptables/arptables.rc
deleted file mode 100644
index a188c65c1..000000000
--- a/community/arptables/arptables.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-case "$1" in
-  start)
-    stat_busy 'Loading arptables rules'
-    arptables-restore < "$CONFIG_FILE" &&
-      add_daemon ${0##*/} && stat_done || stat_die
-    ;;
-  stop)
-    [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save
-    stat_busy 'Clearing arptables rules'
-    arptables-restore < /dev/null &&
-      rm_daemon ${0##*/} && stat_done || stat_die
-    ;;
-  restart)
-    $0 start
-    $0 stop
-    ;;
-  save)
-    stat_busy 'Saving arptables rules'
-    arptables-save > "$CONFIG_FILE" &&
-      stat_done || stat_die
-    ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|restart|save}" >&2
-    exit 1
-    ;;
-esac
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/arpwatch/ChangeLog b/community/arpwatch/ChangeLog
deleted file mode 100644
index d22a5592c..000000000
--- a/community/arpwatch/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-07-02 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community/arpwatch/LICENSE b/community/arpwatch/LICENSE
new file mode 100644
index 000000000..be49954d9
--- /dev/null
+++ b/community/arpwatch/LICENSE
@@ -0,0 +1,18 @@
+Copyright (c) 1992, 1993, 1994, 1995, 1996, 1998, 2000
+     The Regents of the University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that: (1) source code distributions
+retain the above copyright notice and this paragraph in its entirety, (2)
+distributions including binary code include the above copyright notice and
+this paragraph in its entirety in the documentation or other materials
+provided with the distribution, and (3) all advertising materials mentioning
+features or use of this software display the following acknowledgement:
+``This product includes software developed by the University of California,
+Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
+the University nor the names of its contributors may be used to endorse
+or promote products derived from this software without specific prior
+written permission.
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/community/arpwatch/PKGBUILD b/community/arpwatch/PKGBUILD
index 96f4e5e19..a5d2f0975 100644
--- a/community/arpwatch/PKGBUILD
+++ b/community/arpwatch/PKGBUILD
@@ -1,29 +1,48 @@
-# $Id: PKGBUILD 65045 2012-02-20 02:17:24Z spupykin $
+# $Id: PKGBUILD 87787 2013-04-06 15:38:17Z seblu $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Sébastien Luttringer
 
 pkgname=arpwatch
 pkgver=2.1a15
-pkgrel=8
-pkgdesc="arpwatch and arpsnmp network monitoring tools"
-arch=(i686 x86_64 'mips64el')
-url="ftp://ftp.ee.lbl.gov/"
-license=("GPL")
-depends=(libpcap)
-source=(ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz)
-md5sums=('cebfeb99c4a7c2a6cee2564770415fe7')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
+pkgrel=10
+pkgdesc='Ethernet/FDDI station activity monitor'
+arch=('i686' 'x86_64' 'mips64el')
+url='ftp://ftp.ee.lbl.gov/'
+license=('BSD')
+depends=('libpcap' 'smtp-forwarder')
+source=("ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz"
+        'LICENSE'
+        "$pkgname.service")
+md5sums=('cebfeb99c4a7c2a6cee2564770415fe7'
+         '9359518c500562281e76cdb0b2fa9062'
+         '2324a202222303daa1a41d8abd7a7e4a')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # move arp database in /var/lib/arpwatch
   sed -i 's|ARPDIR = $(prefix)/arpwatch|ARPDIR = /var/lib/arpwatch|' Makefile.in
+  # binary ownership to root
+  sed -i 's/-\(o\|g\) bin/-\1 root/g' Makefile.in
+}
 
-  ./configure --prefix=/usr
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man
   make SENDMAIL=/usr/sbin/sendmail
-  install -d -m 0755 $pkgdir/usr/sbin
-  make DESTDIR=$pkgdir install
-  install -D -m 0644 arpwatch.8 $pkgdir/usr/share/man/man8/arpwatch.8
-  install -D -m 0644 arpsnmp.8 $pkgdir/usr/share/man/man8/arpsnmp.8
-  install -d -m 0755 $pkgdir/var/lib/arpwatch
-  touch $pkgdir/var/lib/arpwatch/arp.dat
 }
+
+package() {
+  cd $pkgname-$pkgver
+  install -d -m 0755 "$pkgdir"/usr/{sbin,share/man}
+  make DESTDIR="$pkgdir" install install-man
+  # install ether prefix database
+  install -Dm644 ethercodes.dat "$pkgdir/var/lib/$pkgname/ethercodes.dat"
+  cd "$srcdir"
+  # license
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  # systemd
+  install -Dm644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname@.service"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/arpwatch/arpwatch.service b/community/arpwatch/arpwatch.service
new file mode 100644
index 000000000..570f93852
--- /dev/null
+++ b/community/arpwatch/arpwatch.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Watch ARP on interface %I
+After=network.target
+
+[Service]
+Type=forking
+ExecStartPre=/usr/bin/touch /var/lib/arpwatch/%I.dat
+ExecStart=/usr/sbin/arpwatch -f /var/lib/arpwatch/%I.dat -i %I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/ascii/PKGBUILD b/community/ascii/PKGBUILD
index d0cbc0503..959969ea2 100644
--- a/community/ascii/PKGBUILD
+++ b/community/ascii/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=ascii
 pkgver=3.11
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Utility for conversion between various byte representations and the ASCII character table"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.catb.org/~esr/ascii"
diff --git a/community/aspell-cs/PKGBUILD b/community/aspell-cs/PKGBUILD
index 287ded396..bc0d7600d 100644
--- a/community/aspell-cs/PKGBUILD
+++ b/community/aspell-cs/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=aspell-cs
 pkgver=20040614
-pkgrel=6
+pkgrel=6.1
 pkgdesc="Czech dictionary for aspell"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://aspell.net/"
diff --git a/community/aspell-uk/PKGBUILD b/community/aspell-uk/PKGBUILD
index 08a4999bd..9c05505e4 100644
--- a/community/aspell-uk/PKGBUILD
+++ b/community/aspell-uk/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=aspell-uk
 pkgver=1.6.5
 _ftpver=1.4.0
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Ukrainian dictionary for aspell"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ispell-uk.sourceforge.net/"
diff --git a/community/assaultcube/PKGBUILD b/community/assaultcube/PKGBUILD
deleted file mode 100644
index bc05fbe4e..000000000
--- a/community/assaultcube/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 64731 2012-02-18 03:18:55Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: Rabyte <rabyte [at] gmail (dot) com>
-
-pkgname=assaultcube
-pkgver=1.1.0.4
-pkgrel=4
-pkgdesc='A realistic team oriented multiplayer FPS based on the Cube engine'
-arch=('i686' 'x86_64')
-url='http://assault.cubers.net/'
-license=('ZLIB' 'custom')
-depends=('sdl' 'sdl_mixer' 'sdl_image' 'openal' 'zlib' 'gcc-libs' 'libgl' 'desktop-file-utils')
-makedepends=('mesa')
-source=("http://downloads.sourceforge.net/actiongame/AssaultCube_v${pkgver}.tar.bz2"
-        "http://downloads.sourceforge.net/actiongame/AssaultCube_v${pkgver}_source.tar.bz2"
-        'assaultcube'
-        'assaultcube-server'
-        'assaultcube.desktop'
-        'assaultcube.png')
-md5sums=('a5eb79eaf564c5b4de1ffad0883e45e8'
-         '603b97a4262fb59ea86d483730b712e9'
-         'd658ad3ee476bfe92afa5b5a04a7b4f5'
-         '553e2c3b38c4d13e5d77c23efd51a6a6'
-         'a37dfbe8263f4ef8fe41120196194eae'
-         'f688c59ecee2ebc5c589720aa1480765')
-install=assaultcube.install
-
-build() {
-  cd ${pkgver}/source
-
-  # We'll use official binaries for cheat protection or some stuff.
-  # Upstream is strange.
-  #make
-}
-
-package() {
-  #cd ${pkgver}/source/src
-
-  #install -Dm755 ac_client ${pkgdir}/usr/bin/ac_client
-  #install -Dm755 ac_server ${pkgdir}/usr/bin/ac_server
-  cd ${srcdir}/${pkgver}
-
-  mkdir -p ${pkgdir}/usr/share/assaultcube/packages
-  mkdir -p ${pkgdir}/usr/bin
-
-  if [[ $CARCH == "x86_64" ]]; then
-    cp bin_unix/linux_64_client ${pkgdir}/usr/bin/ac_client
-    cp bin_unix/linux_64_server ${pkgdir}/usr/bin/ac_server
-  else
-    cp bin_unix/linux_client ${pkgdir}/usr/bin/ac_client
-    cp bin_unix/linux_server ${pkgdir}/usr/bin/ac_server
-  fi
-  cp -rf config packages docs mods ${pkgdir}/usr/share/assaultcube
-  install -Dm644 ${srcdir}/assaultcube.png ${pkgdir}/usr/share/pixmaps/assaultcube.png
-  install -Dm644 ${srcdir}/assaultcube.desktop ${pkgdir}/usr/share/applications/assaultcube.desktop
-  install -Dm644 docs/package_copyrights.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  install -Dm755 ${srcdir}/assaultcube ${pkgdir}/usr/bin/assaultcube
-  install -Dm755 ${srcdir}/assaultcube-server ${pkgdir}/usr/bin/assaultcube-server
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community/assaultcube/assaultcube b/community/assaultcube/assaultcube
deleted file mode 100755
index d982cb641..000000000
--- a/community/assaultcube/assaultcube
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd /usr/share/assaultcube
-ac_client "--home=${HOME}/.assaultcube" "--init=${HOME}/.assaultcube/config/init.cfg" "$@"
diff --git a/community/assaultcube/assaultcube-server b/community/assaultcube/assaultcube-server
deleted file mode 100755
index 46d93c594..000000000
--- a/community/assaultcube/assaultcube-server
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd /usr/share/assaultcube
-ac_server "$@"
diff --git a/community/assaultcube/assaultcube.desktop b/community/assaultcube/assaultcube.desktop
deleted file mode 100644
index 9449fc1f3..000000000
--- a/community/assaultcube/assaultcube.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=assaultcube
-Icon=assaultcube
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=AssaultCube
-GenericName=Realistic Multiplayer FPS
-MimeType=text/html
-StartupNotify=false
-Categories=Game;ActionGame;
diff --git a/community/assaultcube/assaultcube.png b/community/assaultcube/assaultcube.png
deleted file mode 100644
index a0915cb76..000000000
--- a/community/assaultcube/assaultcube.png
+++ /dev/null
diff --git a/community/asunder/PKGBUILD b/community/asunder/PKGBUILD
deleted file mode 100644
index 5a30eb34f..000000000
--- a/community/asunder/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 66554 2012-02-26 05:35:59Z xyne $
-# Maintainer: Xyne <ac xunilhcra enyx, backwards>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Contributor: cs-cam - me.at.camdaniel.com
-# Contributor: Sebastien Piccand <sebcactus gmail com>
-
-pkgname=asunder
-pkgver=2.2
-pkgrel=1
-pkgdesc="a graphical CD ripper and encoder"
-arch=('i686' 'x86_64')
-url="http://littlesvr.ca/asunder/"
-license=('GPL2')
-depends=('gtk2' 'libcddb' 'cdparanoia')
-makedepends=('pkgconfig')
-optdepends=('lame: for mp3 support' 'vorbis-tools: for ogg support' \
-	'flac: for flac support')
-source=(http://littlesvr.ca/asunder/releases/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4996860f552879fd8abdc87d1c6c7530')
-sha256sums=('bb608c1cdefcce2f533fb5d5cc23838846b2810ec89d0ebb083507cf27e7822f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
diff --git a/community/at/PKGBUILD b/community/at/PKGBUILD
new file mode 100644
index 000000000..a1bb86500
--- /dev/null
+++ b/community/at/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 88443 2013-04-17 18:45:36Z eric $
+# Maintainer: Judd Vinet <jvinet@zeroflux.org>
+# Contributor: Todd Musall <tmusall@comcast.net>
+
+pkgname=at
+pkgver=3.1.13
+pkgrel=2
+pkgdesc="AT and batch delayed command scheduling utility and daemon"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://packages.qa.debian.org/a/at.html"
+license=('GPL')
+depends=('pam')
+makedepends=('ssmtp')
+backup=('etc/at.deny')
+options=('!makeflags')
+source=(http://ftp.debian.org/debian/pool/main/a/at/at_${pkgver}.orig.tar.gz
+        atd atd.service)
+md5sums=('1da61af6c29e323abaaf13ee1a8dad79'
+         '35574e34829e7df07a3269d4ab646a29'
+         '33976a813f4fe7f5659354601044c6f8')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+              --mandir=/usr/share/man  \
+              --with-jobdir=/var/spool/atd \
+              --with-atspool=/var/spool/atd
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make IROOT="${pkgdir}" docdir=/usr/share/doc install
+  install -D -m755 "${srcdir}/atd" "${pkgdir}/etc/rc.d/atd"
+  install -D -m644 "${srcdir}/atd.service" "${pkgdir}/usr/lib/systemd/system/atd.service"
+}
diff --git a/community/mailman/rc.mailman b/community/at/atd
index 07660e530..d10a46a3b 100644
--- a/community/mailman/rc.mailman
+++ b/community/at/atd
@@ -1,35 +1,35 @@
 #!/bin/bash
 
-# general config
 . /etc/rc.conf
 . /etc/rc.d/functions
 
+PID=`pidof -o %PPID /usr/sbin/atd`
 case "$1" in
   start)
-    stat_busy "Starting mailman Daemon"
-      /usr/lib/mailman/bin/mailmanctl start &>/dev/null
+    stat_busy "Starting ATD Daemon"
+    [ -z "$PID" ] && /usr/sbin/atd
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      add_daemon mailman
+      add_daemon atd
       stat_done
     fi
     ;;
   stop)
-    stat_busy "Stopping mailman Daemon"
-    /usr/lib/mailman/bin/mailmanctl stop &>/dev/null
+    stat_busy "Stopping ATD Daemon"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      rm_daemon mailman
+      rm_daemon atd
       stat_done
     fi
     ;;
   restart)
     $0 stop
-    sleep 3
     $0 start
     ;;
   *)
     echo "usage: $0 {start|stop|restart}"  
 esac
+exit 0
diff --git a/community/at/atd.service b/community/at/atd.service
new file mode 100644
index 000000000..ba359878c
--- /dev/null
+++ b/community/at/atd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=ATD daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/atd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/audex/PKGBUILD b/community/audex/PKGBUILD
deleted file mode 100644
index 8bf86960c..000000000
--- a/community/audex/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 83864 2013-02-05 20:31:35Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: mightyjaym <jmambrosino@gmail.com>
-# Contributor: moostik <mooostik_at_gmail.com>
-
-pkgname=audex
-pkgver=0.77b1
-pkgrel=1
-pkgdesc="A CDDA extraction tool with a ftp upload function for KDE"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://kde-apps.org/content/show.php?content=77125"
-license=('GPL')
-depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia')
-makedepends=('cmake' 'automoc4')
-optdepends=('vorbis-tools: OGG encoder'
-	'faac: MP4/M4A/AAC encoder'
-	'flac: FLAC encoder'
-	'lame: MP3 encoder')
-install=${pkgname}.install
-#source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-source=("http://kde.maniatek.com/${pkgname}/files/${pkgname}-${pkgver}.tar.xz"
-        'gcc47.patch')
-md5sums=('1f3df64b60b15315e958e3e3b151fe92'
-         '64107bcf90e22910e57804be774822dd')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  patch -p1 -i "${srcdir}"/gcc47.patch
-  cd ..
-
-  mkdir build
-  cd build
-
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community/audex/gcc47.patch b/community/audex/gcc47.patch
deleted file mode 100644
index 3d0ccf024..000000000
--- a/community/audex/gcc47.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- audex-0.74b1.orig/utils/hashlist.cpp
-+++ audex-0.74b1/utils/hashlist.cpp
-@@ -15,7 +15,8 @@
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-- 
-+
-+#include <unistd.h>
- #include "hashlist.h"
- 
- Hashlist::Hashlist() {
-
diff --git a/community/audex/google_regex.patch b/community/audex/google_regex.patch
deleted file mode 100644
index 86917e66f..000000000
--- a/community/audex/google_regex.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- audex-0.74b1/utils/coverfetcher.cpp	2011-01-15 12:06:25.000000000 +0100
-+++ audex-0.74b1/utils/coverfetcher_new.cpp	2011-07-20 18:43:37.554588883 +0200
-@@ -162,7 +162,10 @@
-   cover_tbnids.clear();
-   cover_thumbnails.clear();
- 
--  QRegExp rx("<a\\shref=(\\/imgres\\?imgurl=[a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+)>[\\s\\n]*<img\\ssrc=([a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+).*>[\\s\\n]*</a>");
-+  QRegExp rx("<a\\shref=\"(\\/imgres\\?imgurl=[^\"]+)\">[\\s\\n]*<img[^>]+src=\"([^>]+)\"></a>");
-+  QString html = xml;
-+  html.replace( QLatin1String("&amp;"), QLatin1String("&") );
-+
-   rx.setMinimal(TRUE);
-   
-   int pos = 0; int i = 0;
diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD
index 4a0459fd1..5b3be46f0 100644
--- a/community/audit/PKGBUILD
+++ b/community/audit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82354 2013-01-16 08:38:43Z mtorromeo $
+# $Id: PKGBUILD 88732 2013-04-22 07:51:09Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Connor Behan <connor.behan@gmail.com>
 # Contributor: henning mueller <henning@orgizm.net>
 
 pkgname=audit
-pkgver=2.2.2
+pkgver=2.2.3
 pkgrel=1
 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.'
 url=http://people.redhat.com/sgrubb/$pkgname
@@ -59,7 +59,7 @@ package() {
 	sed -ri 's| /sbin| /usr/sbin|' etc/audit/*.conf etc/audisp/plugins.d/*.conf
 }
 
-sha256sums=('8bc2b45a5f08f5df6cebcd5543f24b7e68e28b64da4b23f08de2c6616384302b'
+sha256sums=('2fc8f97020121593f516dc011ef61f39043c4cea9b2cb9ab3849bf9e41dedf02'
             '1e374ff164667b6a11f84c825a39996b449dc712d573996907cd47f063bf0dd5'
             '3c7179f40216b594675f26bb73884406c8ac91577b609dd1ab9837f889954007'
             '6adadb405bebe99bb6a50e80e7c1a356996626e135d566283448fe4019fff3a4')
diff --git a/community/augeas/PKGBUILD b/community/augeas/PKGBUILD
index b19b3e230..09ef5c9c2 100644
--- a/community/augeas/PKGBUILD
+++ b/community/augeas/PKGBUILD
@@ -17,7 +17,6 @@ md5sums=('82131019432ecf8102e1491610ad2dd1'
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i ${srcdir}/augeas-0.10.0-gets.patch
   sed -i 's|Requires:.*|Requires: libxml-2.0|' augeas.pc.in
   ./configure --prefix=/usr
   make
diff --git a/community/avfs/PKGBUILD b/community/avfs/PKGBUILD
index 962021782..ed004f224 100644
--- a/community/avfs/PKGBUILD
+++ b/community/avfs/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=avfs
 pkgver=1.0.1
-pkgrel=1
+pkgrel=1.2
 pkgdesc="A virtual filesystem that allows browsing of compressed files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 url="http://avf.sourceforge.net/"
 depends=('fuse' 'xz' 'perl')
diff --git a/community/avifile/PKGBUILD b/community/avifile/PKGBUILD
index f04a93557..f2169a2af 100644
--- a/community/avifile/PKGBUILD
+++ b/community/avifile/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75654 2012-08-28 09:59:19Z spupykin $
+# $Id: PKGBUILD 87987 2013-04-09 21:29:15Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -30,9 +30,9 @@ build() {
  ./configure \
     --prefix=/usr \
     --mandir=$pkgdir/usr/share/man \
-    --with-qt-prefix=/opt/qt \
-    --with-qt-includes=/opt/qt/include \
-    --with-qt-libraries=/opt/qt/lib \
+    --with-qt-prefix=/usr \
+    --with-qt-includes=/usr/include/qt3 \
+    --with-qt-libraries=/usr/lib \
     --enable-oss
 
   make
diff --git a/community/avr-binutils/PKGBUILD b/community/avr-binutils/PKGBUILD
index cb5a600a8..636eba978 100644
--- a/community/avr-binutils/PKGBUILD
+++ b/community/avr-binutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79838 2012-11-13 22:12:42Z schuay $
+# $Id: PKGBUILD 88220 2013-04-14 18:16:45Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -7,60 +7,70 @@
 # Build order: avr-binutils -> avr-gcc -> avr-libc
 
 pkgname=avr-binutils
-pkgver=2.23
-pkgrel=2
-_pkgname=binutils
-pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture"
+pkgver=2.23.2
+pkgrel=1
+pkgdesc="A set of programs to assemble and manipulate binary and object files for the AVR architecture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/binutils/"
 license=('GPL')
-depends=('glibc>=2.16' 'zlib')
+depends=('glibc>=2.17' 'zlib' 'binutils')
 provides=("binutils-avr=$pkgver")
 replaces=('binutils-avr')
 options=('!libtool' '!distcc' '!ccache')
-source=("ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz"
-        "avr-size.patch")
+install=avr-binutils.install
+source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
+        binutils-2.23.2-texinfo-5.0.patch
+        avr-size.patch)
 
 _builddir=binutils-build
 
 build() {
-    cd ${srcdir}/${_pkgname}-${pkgver}
+    cd ${srcdir}/binutils-${pkgver}
 
     # See https://bugs.archlinux.org/task/32504
     patch -Np0 < ${srcdir}/avr-size.patch
 
+    # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935
+    # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542
+    patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch
+
+    # https://bugs.archlinux.org/task/34629
+    sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
+
     config_guess=$(./config.guess)
 
     cd ${srcdir}
     rm -rf ${_builddir}
     mkdir ${_builddir} && cd ${_builddir}
 
-    [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib"
-
-    ${srcdir}/${_pkgname}-${pkgver}/configure \
+    ${srcdir}/binutils-${pkgver}/configure \
         --prefix=/usr \
+        --with-lib-path=/usr/lib:/usr/local/lib \
+        --with-bugurl=https://bugs.archlinux.org/ \
+        --enable-ld=default \
+        --enable-gold \
+        --enable-plugins \
+        --enable-threads \
+        --with-pic \
+        --enable-shared \
+        --disable-werror \
+        --disable-multilib \
         --build=${config_guess} \
-        --disable-nls \
-        --enable-install-libbfd \
-        --includedir=/usr/${config_guess}/include \
-        --infodir=/usr/share/info \
-        --libdir=/usr/lib \
-        --mandir=/usr/share/man \
         --target=avr \
         $CONFIGFLAG
 
     # This checks the host environment and makes sure all the necessary tools are available to compile Binutils.
     make configure-host
 
-    make tooldir=${pkgdir}/usr
+    make tooldir=/usr
 }
 
 package() {
     cd ${srcdir}/${_builddir}
 
-    make DESTDIR=${pkgdir} tooldir=/usr install
+    make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
 
-    rm -f ${pkgdir}/usr/lib/libiberty.a
+    rm ${pkgdir}/usr/lib/libiberty.a
 
     for bin in ar as nm objcopy objdump ranlib strip ; do
         rm -f ${pkgdir}/usr/bin/${bin}
@@ -69,7 +79,11 @@ package() {
     for info in as bfd binutils configure gprof ld standards; do
         mv ${pkgdir}/usr/share/info/${info}.info ${pkgdir}/usr/share/info/avr-${info}.info
     done
+
+    rm -rf ${pkgdir}/usr/share/locale
 }
 
-md5sums=('ed58f50d8920c3f1d9cb110d5c972c27'
+md5sums=('4f8fa651e35ef262edc01d60fb45702e'
+         'SKIP'
+         '34e439ce23213a91e2af872dfbb5094c'
          '573769ec1107d1bfed78680edd7ae63f')
diff --git a/community/netperf/netperf.install b/community/avr-binutils/avr-binutils.install
index fcb9ba6ae..eb066ae3a 100644
--- a/community/netperf/netperf.install
+++ b/community/avr-binutils/avr-binutils.install
@@ -1,20 +1,17 @@
-infodir=/usr/share/info
-filelist=(netperf.info)
+infodir=usr/share/info
+filelist=(avr-as.info avr-bfd.info avr-binutils.info avr-configure.info avr-gprof.info avr-ld.info avr-standards.info)
 
-post_install() {
+post_upgrade() {
   [ -x usr/bin/install-info ] || return 0
-  for file in "${filelist[@]}"; do
+  for file in ${filelist[@]}; do
     install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
-post_upgrade() {
-  post_install $1
-}
-
 pre_remove() {
   [ -x usr/bin/install-info ] || return 0
-  for file in "${filelist[@]}"; do
+  for file in ${filelist[@]}; do
     install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
+
diff --git a/community/avr-binutils/binutils-2.23.2-texinfo-5.0.patch b/community/avr-binutils/binutils-2.23.2-texinfo-5.0.patch
new file mode 100644
index 000000000..38dc19fb0
--- /dev/null
+++ b/community/avr-binutils/binutils-2.23.2-texinfo-5.0.patch
@@ -0,0 +1,162 @@
+diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
+index 45ffa73..3aa3300 100644
+--- a/bfd/doc/bfd.texinfo
++++ b/bfd/doc/bfd.texinfo
+@@ -322,7 +324,7 @@ All of BFD lives in one directory.
+ @printindex cp
+ 
+ @tex
+-% I think something like @colophon should be in texinfo.  In the
++% I think something like @@colophon should be in texinfo.  In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -333,7 +335,7 @@ All of BFD lives in one directory.
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+ 
+ @bye
+diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
+index 56a0510..fb1802b 100644
+--- a/binutils/doc/binutils.texi
++++ b/binutils/doc/binutils.texi
+@@ -148,18 +148,18 @@ in the section entitled ``GNU Free Documentation License''.
+ * objcopy::			Copy and translate object files
+ * objdump::                     Display information from object files
+ * ranlib::                      Generate index to archive contents
+-* readelf::                     Display the contents of ELF format files
+ * size::                        List section sizes and total size
+ * strings::                     List printable strings from files
+ * strip::                       Discard symbols
+-* elfedit::                     Update the ELF header of ELF files
+ * c++filt::			Filter to demangle encoded C++ symbols
+ * cxxfilt: c++filt.             MS-DOS name for c++filt
+ * addr2line::			Convert addresses to file and line
+ * nlmconv::                     Converts object code into an NLM
+-* windres::			Manipulate Windows resources
+ * windmc::			Generator for Windows message resources
++* windres::			Manipulate Windows resources
+ * dlltool::			Create files needed to build and use DLLs
++* readelf::                     Display the contents of ELF format files
++* elfedit::                     Update the ELF header of ELF files
+ * Common Options::              Command-line options for all utilities
+ * Selecting the Target System:: How these utilities determine the target
+ * Reporting Bugs::              Reporting Bugs
+@@ -2907,7 +2907,7 @@ the Info entries for @file{binutils}.
+ @c man end
+ @end ignore
+ 
+-@node c++filt, addr2line, elfedit, Top
++@node c++filt, addr2line, strip, Top
+ @chapter c++filt
+ 
+ @kindex c++filt
+@@ -4384,7 +4384,7 @@ equivalent. At least one of the @option{--output-mach},
+ 
+ @table @env
+ 
+-@itemx --input-mach=@var{machine}
++@item --input-mach=@var{machine}
+ Set the matching input ELF machine type to @var{machine}.  If
+ @option{--input-mach} isn't specified, it will match any ELF
+ machine types.
+@@ -4392,21 +4392,21 @@ machine types.
+ The supported ELF machine types are, @var{L1OM}, @var{K1OM} and
+ @var{x86-64}.
+ 
+-@itemx --output-mach=@var{machine}
++@item --output-mach=@var{machine}
+ Change the ELF machine type in the ELF header to @var{machine}.  The
+ supported ELF machine types are the same as @option{--input-mach}.
+ 
+-@itemx --input-type=@var{type}
++@item --input-type=@var{type}
+ Set the matching input ELF file type to @var{type}.  If
+ @option{--input-type} isn't specified, it will match any ELF file types.
+ 
+ The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}.
+ 
+-@itemx --output-type=@var{type}
++@item --output-type=@var{type}
+ Change the ELF file type in the ELF header to @var{type}.  The
+ supported ELF types are the same as @option{--input-type}.
+ 
+-@itemx --input-osabi=@var{osabi}
++@item --input-osabi=@var{osabi}
+ Set the matching input ELF file OSABI to @var{osabi}.  If
+ @option{--input-osabi} isn't specified, it will match any ELF OSABIs.
+ 
+@@ -4416,7 +4416,7 @@ The supported ELF OSABIs are, @var{none}, @var{HPUX}, @var{NetBSD},
+ @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS},
+ @var{NSK}, @var{AROS} and @var{FenixOS}.
+ 
+-@itemx --output-osabi=@var{osabi}
++@item --output-osabi=@var{osabi}
+ Change the ELF OSABI in the ELF header to @var{osabi}.  The
+ supported ELF OSABI are the same as @option{--input-osabi}.
+ 
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index c7ae2a5..4777ad5 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -142,12 +144,12 @@ in the section entitled ``GNU Free Documentation License''.
+ @ifset ARM
+ * ARM::				ld and the ARM family
+ @end ifset
+-@ifset HPPA
+-* HPPA ELF32::                  ld and HPPA 32-bit ELF
+-@end ifset
+ @ifset M68HC11
+ * M68HC11/68HC12::              ld and the Motorola 68HC11 and 68HC12 families
+ @end ifset
++@ifset HPPA
++* HPPA ELF32::                  ld and HPPA 32-bit ELF
++@end ifset
+ @ifset M68K
+ * M68K::                        ld and Motorola 68K family
+ @end ifset
+@@ -6012,6 +6014,9 @@ functionality are not listed.
+ @ifset I960
+ * i960::                        @command{ld} and the Intel 960 family
+ @end ifset
++@ifset M68HC11
++* M68HC11/68HC12::		@code{ld} and the Motorola 68HC11 and 68HC12 families
++@end ifset
+ @ifset ARM
+ * ARM::				@command{ld} and the ARM family
+ @end ifset
+@@ -6027,9 +6032,6 @@ functionality are not listed.
+ @ifset MSP430
+ * MSP430::			@command{ld} and MSP430
+ @end ifset
+-@ifset M68HC11
+-* M68HC11/68HC12::		@code{ld} and the Motorola 68HC11 and 68HC12 families
+-@end ifset
+ @ifset POWERPC
+ * PowerPC ELF32::		@command{ld} and PowerPC 32-bit ELF Support
+ @end ifset
+@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same
+ @printindex cp
+ 
+ @tex
+-% I think something like @colophon should be in texinfo.  In the
++% I think something like @@colophon should be in texinfo.  In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+ 
+ @bye
+-- 
+1.7.1
+
diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD
index 36ed19ef1..3bcecdca4 100644
--- a/community/avr-gcc/PKGBUILD
+++ b/community/avr-gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77419 2012-10-09 18:03:26Z schuay $
+# $Id: PKGBUILD 88836 2013-04-23 14:57:29Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -8,19 +8,20 @@
 
 pkgname=avr-gcc
 _pkgname=gcc
-pkgver=4.7.2
-pkgrel=1
+pkgver=4.8.0
+pkgrel=2
 pkgdesc="The GNU AVR Compiler Collection"
 arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'custom')
+license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org/"
-depends=('avr-binutils>=2.22-3' 'cloog' 'ppl' 'gcc-libs>=4.7.0' 'libmpc')
+depends=('avr-binutils>=2.23' 'cloog' 'ppl' 'gcc-libs>=4.8.0' 'libmpc')
+optdepends=('avr-libc: Standard C library for Atmel AVR development')
 provides=("gcc-avr=$pkgver")
 replaces=('gcc-avr')
-options=('!libtool' '!emptydirs' '!libtool' '!strip')
+options=('!libtool' '!emptydirs' '!strip')
 source=(http://ftp.gnu.org/gnu/gcc/${_pkgname}-${pkgver}/gcc-${pkgver}.tar.bz2)
 
-_basedir=${srcdir}/${_pkgname}-${pkgver}
+_basedir=${_pkgname}-${pkgver}
 
 build() {
     # default CFLAGS lead to issues later on when configure 
@@ -28,30 +29,54 @@ build() {
     export CFLAGS="-O2 -pipe"
     export CXXFLAGS="-O2 -pipe"
 
-    cd ${_basedir} 
+    cd ${srcdir}/${_basedir} 
 
     # Do not install libiberty
     sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
 
+    # https://bugs.archlinux.org/task/34629
+    sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
+    sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" gcc/configure
+
     echo ${pkgver} > gcc/BASE-VER
 
     cd ${srcdir}
     mkdir gcc-build && cd gcc-build
 
-    ${_basedir}/configure \
-                --prefix=/usr \
+    # --disable-linker-build-id: https://bugs.archlinux.org/task/34902
+
+    ${srcdir}/${_basedir}/configure \
+                --disable-cloog-version-check \
+                --disable-install-libiberty \
+                --disable-libssp \
+                --disable-libstdcxx-pch \
+                --disable-libunwind-exceptions \
+                --disable-linker-build-id \
+                --disable-nls \
+                --disable-werror \
+                --enable-__cxa_atexit \
+                --enable-checking=release \
+                --enable-clocale=gnu \
+                --enable-cloog-backend=isl \
+                --enable-gnu-unique-object \
+                --enable-gold \
+                --enable-languages=c,c++ \
+                --enable-ld=default \
+                --enable-lto \
+                --enable-plugin \
+                --enable-shared \
+                --infodir=/usr/share/info \
                 --libdir=/usr/lib \
                 --libexecdir=/usr/lib \
                 --mandir=/usr/share/man \
-                --infodir=/usr/share/info \
-                --enable-languages=c,c++ \
-                --disable-libssp \
-                --disable-nls \
+                --prefix=/usr \
                 --target=avr \
                 --with-as=/usr/bin/avr-as \
-                --with-ld=/usr/bin/avr-ld \
                 --with-gnu-as \
-                --with-gnu-ld
+                --with-gnu-ld \
+                --with-ld=/usr/bin/avr-ld \
+                --with-plugin-ld=ld.gold \
+                --with-system-zlib
 
     make
 }
@@ -61,12 +86,16 @@ package() {
 
     make -j1 DESTDIR=${pkgdir} install
 
-      # Install Runtime Library Exception
-    install -Dm644 ${_basedir}/COPYING.RUNTIME \
+    # Strip debug symbols from libraries; without this, the package size balloons to ~500MB.
+    find ${pkgdir}/usr/lib -type f -name "*.a" \
+        -exec /usr/bin/avr-strip --strip-debug '{}' \;
+
+    # Install Runtime Library Exception
+    install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
         ${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION
 
     rm -rf ${pkgdir}/usr/share/man/man7
     rm -rf ${pkgdir}/usr/share/info
 }
 
-md5sums=('cc308a0891e778cfda7a151ab8a6e762')
+md5sums=('e6040024eb9e761c3bea348d1fa5abb0')
diff --git a/community/avr-gdb/PKGBUILD b/community/avr-gdb/PKGBUILD
index 2dbb56ee0..29aaf49f7 100644
--- a/community/avr-gdb/PKGBUILD
+++ b/community/avr-gdb/PKGBUILD
@@ -7,34 +7,37 @@
 
 pkgname=avr-gdb
 _pkgname=gdb
-pkgver=7.4
-pkgrel=2
+pkgver=7.5.1
+pkgrel=1
 pkgdesc="The GNU Debugger for AVR"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gdb/"
 license=('GPL3')
-depends=('python')
+depends=('python2')
 options=('!libtool')
 source=(http://ftp.gnu.org/gnu/gdb/${_pkgname}-${pkgver}.tar.bz2)
-md5sums=('95a9a8305fed4d30a30a6dc28ff9d060')
 
 build() {
   cd ${srcdir}/${_pkgname}-${pkgver}
 
   unset LDFLAGS
   export CFLAGS="-O2 -pipe"
+  export CPPFLAGS="-O2 -pipe"
   export CXXFLAGS="$CFLAGS"
     
-  ./configure --prefix=/usr \
-    --target=avr \
+  ./configure \
     --disable-nls \
     --enable-languages=c,c++ \
     --infodir=/usr/share/info \
     --libdir=/usr/lib \
-    --program-prefix=avr- \
     --libexecdir=/usr/lib \
     --mandir=/usr/share/man \
+    --prefix=/usr \
+    --program-prefix=avr- \
+    --target=avr \
+    --with-python=/usr/bin/python2 \
     --with-system-readline
+
   make
 }
 
@@ -48,3 +51,5 @@ package() {
   rm -rf ${pkgdir}/usr/share/gdb
   rm -rf ${pkgdir}/usr/include/gdb
 }
+
+md5sums=('3f48f468b24447cf24820054ff6e85b1')
diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD
index 1786d8b8c..39e47c3db 100644
--- a/community/avrdude/PKGBUILD
+++ b/community/avrdude/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 81870 2013-01-02 15:51:02Z jelle $
+# $Id: PKGBUILD 87805 2013-04-06 19:56:39Z jelle $
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=avrdude
 pkgver=5.11.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/avrdude/"
 license=('GPL')
-depends=('libusb-compat' 'readline')
+depends=('libusb-compat' 'readline' 'libftdi')
 source=(http://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz{,.sig})
 md5sums=('3a43e288cb32916703b6945e3f260df9'
                  '0c23b005d4090aef4e081476aabc1958')
diff --git a/community/awesome/01-fix_glib2_build.patch b/community/awesome/01-fix_glib2_build.patch
deleted file mode 100644
index aeab63fbb..000000000
--- a/community/awesome/01-fix_glib2_build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d3d8160e273b56d0262d2570cfa6bcb76b9ea771 Mon Sep 17 00:00:00 2001
-From: Thomas Moschny <thomas.moschny@gmx.de>
-Date: Wed, 14 Dec 2011 20:00:53 +0100
-Subject: [PATCH] Fix build with glib2 2.31.0
-
-Starting with glib2 2.31.0, It is no longer possible to
-include individual headers (like "ghash.h") -- you must
-#include <glib.h>.
-
-Signed-off-by: Thomas Moschny <thomas.moschny@gmx.de>
-Signed-off-by: Uli Schlachter <psychon@znc.in>
----
- spawn.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/spawn.c b/spawn.c
-index 3c8cf07..a6d6c5e 100644
---- a/spawn.c
-+++ b/spawn.c
-@@ -24,7 +24,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- 
--#include <glib/gspawn.h>
-+#include <glib.h>
- 
- #include "spawn.h"
- #include "screen.h"
--- 
-1.7.2.5
-
diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD
index 45dc2b35c..a55e1c214 100644
--- a/community/awesome/PKGBUILD
+++ b/community/awesome/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 81846 2013-01-02 00:52:38Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 87494 2013-04-01 17:59:30Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: xduugu
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Vesa Kaihlavirta
 
 pkgname=awesome
-pkgver=3.5
-pkgrel=2
+pkgver=3.5.1
+pkgrel=1
 pkgdesc='Highly configurable framework window manager'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://awesome.naquadah.org/'
@@ -44,7 +44,7 @@ optdepends=(
 provides=('notification-daemon')
 source=("$url/download/$pkgname-$pkgver.tar.xz"
         "$pkgname.desktop")
-md5sums=('ce998f19c80bd98f8d119a91f53526df'
+md5sums=('f528f66ddcdb07f24e6f494837371702'
          '0fdbeec43d211c6750041d7e37611a6a')
 
 build() {
@@ -64,4 +64,4 @@ package() {
   install -Dm644 ../awesome.desktop "$pkgdir/usr/share/xsessions/awesome.desktop"
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/awn-extras-applets/PKGBUILD b/community/awn-extras-applets/PKGBUILD
index 7ce9fca85..849ad6e03 100644
--- a/community/awn-extras-applets/PKGBUILD
+++ b/community/awn-extras-applets/PKGBUILD
@@ -8,7 +8,7 @@ _pkgname=awn-extras
 pkgver=0.4.0
 pkgrel=15
 pkgdesc="Collection of applets for avant-window-navigator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/awn-extras"
 license=('GPL')
 depends=('avant-window-navigator' 'python2-notify' 'vte' 'gnome-menus' 'gnome-menus2' 'webkitgtk2')
diff --git a/community/axel/PKGBUILD b/community/axel/PKGBUILD
index 9811003e1..00fad4b80 100644
--- a/community/axel/PKGBUILD
+++ b/community/axel/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=axel
 pkgver=2.4
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Download accelerator"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://axel.alioth.debian.org/"
diff --git a/community/balsa/PKGBUILD b/community/balsa/PKGBUILD
index 6b8f4cb2f..fe96c58ce 100644
--- a/community/balsa/PKGBUILD
+++ b/community/balsa/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 76471 2012-09-18 19:07:49Z jlichtblau $
+# $Id: PKGBUILD 88630 2013-04-20 17:58:41Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=balsa
-pkgver=2.4.12
+pkgver=2.5.0
 pkgrel=1
 pkgdesc="An e-mail client for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pawsa.fedorapeople.org/balsa/'
 license=('GPL')
-depends=('gmime' 'libwebkit' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview2' 'gtkspell' 'gnome-icon-theme' 'desktop-file-utils')
+depends=('gmime' 'webkitgtk3' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview3' 'gtkspell3' 'gnome-icon-theme' 'desktop-file-utils')
 makedepends=('perlxml' 'gnome-doc-utils' 'intltool')
 install=$pkgname.install
 source=(http://pawsa.fedorapeople.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3f72fc69bb7fecb59e64c4cb88dc5083ed58dc76c9345b22d6c15af2c6b1e3c4')
+sha256sums=('67eaddbc33a079a74b65bf5f71ef163573f7d4a6f29ed6dca2ad6811d95519b4')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/balsa/gmime26.patch b/community/balsa/gmime26.patch
deleted file mode 100644
index fe4e6a9fa..000000000
--- a/community/balsa/gmime26.patch
+++ /dev/null
@@ -1,1372 +0,0 @@
-From 393d0077495cb750ee47bab6ec44a60906a95179 Mon Sep 17 00:00:00 2001
-From: Peter Bloomfield <PeterBloomfield@bellsouth.net>
-Date: Mon, 28 Nov 2011 03:00:55 +0000
-Subject: Build with GMime 2.6.0
-
-	* configure.in: check for GMime >= 2.5.7
-	* libbalsa/gmime-application-pkcs7.c
-	(g_mime_application_pkcs7_sign), (g_mime_application_pkcs7_verify),
-	(g_mime_application_pkcs7_encrypt),
-	(g_mime_application_pkcs7_decrypt): build with GMime >= 2.5.7.
-	* libbalsa/gmime-application-pkcs7.h: ditto.
-	* libbalsa/gmime-gpgme-context.c (g_mime_gpgme_context_get_type),
-	(g_mime_gpgme_context_class_init), (g_mime_gpgme_context_finalize),
-	(g_mime_gpgme_digest_id): ditto.
-	* libbalsa/gmime-gpgme-context.h: ditto.
-	* libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_sign_encrypt),
-	(g_mime_part_rfc2440_verify), (g_mime_part_rfc2440_decrypt):
-	ditto.
-	* libbalsa/gmime-part-rfc2440.h: ditto.
-	* libbalsa/rfc3156.c (password_request_func),
-	(libbalsa_sign_mime_object), (libbalsa_encrypt_mime_object),
-	(libbalsa_body_check_signature), (libbalsa_body_decrypt): ditto.
----
-diff --git a/ChangeLog b/ChangeLog
-index bd95e68..d5c62f5 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,25 @@
-+2011-11-27  Peter Bloomfield
-+
-+	Build with GMime 2.6.0
-+
-+	* configure.in: check for GMime >= 2.5.7
-+	* libbalsa/gmime-application-pkcs7.c
-+	(g_mime_application_pkcs7_sign), (g_mime_application_pkcs7_verify),
-+	(g_mime_application_pkcs7_encrypt),
-+	(g_mime_application_pkcs7_decrypt): build with GMime >= 2.5.7.
-+	* libbalsa/gmime-application-pkcs7.h: ditto.
-+	* libbalsa/gmime-gpgme-context.c (g_mime_gpgme_context_get_type),
-+	(g_mime_gpgme_context_class_init), (g_mime_gpgme_context_finalize),
-+	(g_mime_gpgme_digest_id): ditto.
-+	* libbalsa/gmime-gpgme-context.h: ditto.
-+	* libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_sign_encrypt),
-+	(g_mime_part_rfc2440_verify), (g_mime_part_rfc2440_decrypt):
-+	ditto.
-+	* libbalsa/gmime-part-rfc2440.h: ditto.
-+	* libbalsa/rfc3156.c (password_request_func),
-+	(libbalsa_sign_mime_object), (libbalsa_encrypt_mime_object),
-+	(libbalsa_body_check_signature), (libbalsa_body_decrypt): ditto.
-+
- 2011-11-22  Pawel Salek
- 
- 	* NEWS, configure.in: release balsa-2.4.11
-diff --git a/configure.in b/configure.in
-index 4a8320e..64d99f3 100644
---- a/configure.in
-+++ b/configure.in
-@@ -307,7 +307,12 @@ fi
- case "$with_gmime" in
-     2.4) ;;
-     2.6) AC_DEFINE([HAVE_GMIME_2_6], [1],
--                   [Defined to build with GMime version 2.5 or 2.6]) ;;
-+                   [Defined to build with GMime version 2.5 or 2.6])
-+         if $PKG_CONFIG --atleast-version=2.5.7 gmime-2.6; then
-+             AC_DEFINE([HAVE_GMIME_2_5_7], [1],
-+                       [Defined when GMime version is at least 2.5.7])
-+         fi
-+         ;;
-     *) AC_MSG_ERROR([unknown GMime version $with_gmime]) ;;
- esac
- 
-diff --git a/libbalsa/gmime-application-pkcs7.c b/libbalsa/gmime-application-pkcs7.c
-index 12f4f8f..63b8087 100644
---- a/libbalsa/gmime-application-pkcs7.c
-+++ b/libbalsa/gmime-application-pkcs7.c
-@@ -96,8 +96,14 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content,
-     GMimeFilter *crlf_filter, *from_filter;
- 	
-     g_return_val_if_fail (GMIME_IS_PART (pkcs7), -1);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail (GMIME_IS_CIPHER_CONTEXT (ctx), -1);
-     g_return_val_if_fail (ctx->sign_protocol != NULL, -1);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail (GMIME_IS_CRYPTO_CONTEXT (ctx), -1);
-+    g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol(ctx)
-+                         != NULL, -1);
-+#endif /* HAVE_GMIME_2_5_7 */
-     g_return_val_if_fail (GMIME_IS_OBJECT (content), -1);
- 	
-     /* Prepare all the parts for signing... */
-@@ -127,7 +133,14 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content,
-     sig_data_stream = g_mime_stream_mem_new ();
- 	
-     /* get the signed content */
--    if (g_mime_cipher_context_sign (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, sig_data_stream, err) == -1) {
-+#ifndef HAVE_GMIME_2_5_7
-+    if (g_mime_cipher_context_sign (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, sig_data_stream, err) == -1)
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (g_mime_crypto_context_sign
-+        (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream,
-+         sig_data_stream, err) == -1)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	g_object_unref (filtered_stream);
- 	g_object_unref (sig_data_stream);
- 	g_object_unref (stream);
-@@ -168,9 +181,15 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content,
-  * decrypting it again. In this case, validity is undefined.
-  */
- GMimeObject *
-+#ifndef HAVE_GMIME_2_5_7
- g_mime_application_pkcs7_verify(GMimePart * pkcs7,
- 				GMimeSignatureValidity ** validity,
- 				GMimeCipherContext * ctx, GError ** err)
-+#else /* HAVE_GMIME_2_5_7 */
-+g_mime_application_pkcs7_verify(GMimePart * pkcs7,
-+                                GMimeSignatureList ** list,
-+                                GMimeCryptoContext * ctx, GError ** err)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeObject *decrypted;
-     GMimeDataWrapper *wrapper;
-@@ -181,8 +200,14 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7,
-     const char *smime_type;
- 
-     g_return_val_if_fail(GMIME_IS_PART(pkcs7), NULL);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail(GMIME_IS_CIPHER_CONTEXT(ctx), NULL);
-     g_return_val_if_fail(ctx->encrypt_protocol != NULL, NULL);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail(GMIME_IS_CRYPTO_CONTEXT(ctx), NULL);
-+    g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx)
-+                         != NULL, NULL);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* some sanity checks */
-     smime_type =
-@@ -208,9 +233,16 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7,
-     g_object_unref(crlf_filter);
- 
-     /* get the cleartext */
-+#ifndef HAVE_GMIME_2_5_7
-     *validity = g_mime_cipher_context_verify(ctx, GMIME_CIPHER_HASH_DEFAULT,
- 				     ciphertext, filtered_stream, err);
--    if (!*validity) {
-+    if (!*validity)
-+#else /* HAVE_GMIME_2_5_7 */
-+    *list = g_mime_crypto_context_verify(ctx, GMIME_CIPHER_ALGO_DEFAULT,
-+                                         ciphertext, filtered_stream, err);
-+    if (!*list)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	g_object_unref(filtered_stream);
- 	g_object_unref(ciphertext);
- 	g_object_unref(stream);
-@@ -248,7 +280,12 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7,
-  */
- int
- g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content,
-+#ifndef HAVE_GMIME_2_5_7
- 				  GMimeCipherContext *ctx, GPtrArray *recipients,
-+#else /* HAVE_GMIME_2_5_7 */
-+				  GMimeCryptoContext *ctx,
-+                                  GPtrArray *recipients,
-+#endif /* HAVE_GMIME_2_5_7 */
- 				  GError **err)
- {
-     GMimeDataWrapper *wrapper;
-@@ -257,8 +294,14 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content,
-     GMimeFilter *crlf_filter;
- 	
-     g_return_val_if_fail (GMIME_IS_PART (pkcs7), -1);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail (GMIME_IS_CIPHER_CONTEXT (ctx), -1);
-     g_return_val_if_fail (ctx->encrypt_protocol != NULL, -1);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail (GMIME_IS_CRYPTO_CONTEXT (ctx), -1);
-+    g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx)
-+                         != NULL, -1);
-+#endif /* HAVE_GMIME_2_5_7 */
-     g_return_val_if_fail (GMIME_IS_OBJECT (content), -1);
- 	
-     /* get the cleartext */
-@@ -279,7 +322,15 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content,
- 	
-     /* encrypt the content stream */
-     ciphertext = g_mime_stream_mem_new ();
--    if (g_mime_cipher_context_encrypt (ctx, FALSE, NULL, recipients, stream, ciphertext, err) == -1) {
-+#ifndef HAVE_GMIME_2_5_7
-+    if (g_mime_cipher_context_encrypt (ctx, FALSE, NULL, recipients, stream, ciphertext, err) == -1)
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (g_mime_crypto_context_encrypt
-+        (ctx, FALSE, NULL,
-+         GMIME_CIPHER_ALGO_DEFAULT,
-+         recipients, stream, ciphertext, err) == -1)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	g_object_unref (ciphertext);
- 	g_object_unref (stream);
- 	return -1;
-@@ -313,8 +364,14 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content,
-  * err with more information about the reason.
-  */
- GMimeObject *
-+#ifndef HAVE_GMIME_2_5_7
- g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx,
- 				  GError **err)
-+#else /* HAVE_GMIME_2_5_7 */
-+g_mime_application_pkcs7_decrypt (GMimePart *pkcs7,
-+                                  GMimeCryptoContext *ctx,
-+				  GError **err)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeObject *decrypted;
-     GMimeDataWrapper *wrapper;
-@@ -325,8 +382,14 @@ g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx,
-     const char *smime_type;
- 
-     g_return_val_if_fail(GMIME_IS_PART(pkcs7), NULL);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail(GMIME_IS_CIPHER_CONTEXT(ctx), NULL);
-     g_return_val_if_fail(ctx->encrypt_protocol != NULL, NULL);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail(GMIME_IS_CRYPTO_CONTEXT(ctx), NULL);
-+    g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx)
-+                         != NULL, NULL);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* some sanity checks */
-     smime_type =
-@@ -353,7 +416,13 @@ g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx,
-     g_object_unref(crlf_filter);
- 
-     /* get the cleartext */
--    if (g_mime_cipher_context_decrypt(ctx, ciphertext, filtered_stream, err) == NULL) {
-+#ifndef HAVE_GMIME_2_5_7
-+    if (g_mime_cipher_context_decrypt(ctx, ciphertext, filtered_stream, err) == NULL)
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (g_mime_crypto_context_decrypt
-+        (ctx, ciphertext, filtered_stream, err) == NULL)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	g_object_unref(filtered_stream);
- 	g_object_unref(ciphertext);
- 	g_object_unref(stream);
-diff --git a/libbalsa/gmime-application-pkcs7.h b/libbalsa/gmime-application-pkcs7.h
-index 03fa401..6678ff5 100644
---- a/libbalsa/gmime-application-pkcs7.h
-+++ b/libbalsa/gmime-application-pkcs7.h
-@@ -28,7 +28,11 @@ extern "C" {
- #endif				/* __cplusplus */
- 
- #include <gmime/gmime-part.h>
-+#ifndef HAVE_GMIME_2_5_7
- #include <gmime/gmime-cipher-context.h>
-+#else /* HAVE_GMIME_2_5_7 */
-+#include <gmime/gmime-crypto-context.h>
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- #undef HAS_APPLICATION_PKCS7_MIME_SIGNED_SUPPORT
- 
-@@ -39,21 +43,40 @@ extern "C" {
-  * Balsa always encodes S/MIME signed stuff as multipart/signed. */
- int g_mime_application_pkcs7_sign(GMimePart * pkcs7,
- 				  GMimeObject * content,
-+#ifndef HAVE_GMIME_2_5_7
- 				  GMimeCipherContext * ctx,
-+#else /* HAVE_GMIME_2_5_7 */
-+				  GMimeCryptoContext * ctx,
-+#endif /* HAVE_GMIME_2_5_7 */
- 				  const char *userid, GError ** err);
- #endif
- 
-+#ifndef HAVE_GMIME_2_5_7
- GMimeObject *g_mime_application_pkcs7_verify(GMimePart * pkcs7,
- 					     GMimeSignatureValidity ** validity,
- 					     GMimeCipherContext * ctx, GError ** err);
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeObject *g_mime_application_pkcs7_verify(GMimePart * pkcs7,
-+					     GMimeSignatureList ** validity,
-+					     GMimeCryptoContext * ctx, GError ** err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- int g_mime_application_pkcs7_encrypt(GMimePart * pkcs7,
- 				     GMimeObject * content,
-+#ifndef HAVE_GMIME_2_5_7
- 				     GMimeCipherContext * ctx,
-+#else /* HAVE_GMIME_2_5_7 */
-+				     GMimeCryptoContext * ctx,
-+#endif /* HAVE_GMIME_2_5_7 */
- 				     GPtrArray * recipients, GError ** err);
- 
-+#ifndef HAVE_GMIME_2_5_7
- GMimeObject *g_mime_application_pkcs7_decrypt(GMimePart * pkcs7,
- 					      GMimeCipherContext * ctx, GError ** err);
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeObject *g_mime_application_pkcs7_decrypt(GMimePart * pkcs7,
-+					      GMimeCryptoContext * ctx, GError ** err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- #ifdef __cplusplus
- }
-diff --git a/libbalsa/gmime-gpgme-context.c b/libbalsa/gmime-gpgme-context.c
-index 24b140b..0c56f94 100644
---- a/libbalsa/gmime-gpgme-context.c
-+++ b/libbalsa/gmime-gpgme-context.c
-@@ -27,6 +27,9 @@
- #include <unistd.h>
- #include <glib.h>
- #include <gmime/gmime.h>
-+#ifdef HAVE_GMIME_2_5_7
-+#include <gmime/gmime-certificate.h>
-+#endif /* HAVE_GMIME_2_5_7 */
- #include <gpgme.h>
- #include <time.h>
- #include <glib/gi18n.h>
-@@ -44,6 +47,7 @@ static gboolean g_mime_gpgme_context_check_protocol(GMimeGpgmeContextClass
- 						    protocol,
- 						    GError ** error);
- 
-+#ifndef HAVE_GMIME_2_5_7
- static GMimeCipherHash g_mime_gpgme_hash_id(GMimeCipherContext * ctx,
- 					    const char *hash);
- 
-@@ -70,6 +74,46 @@ static GMimeSignatureValidity *g_mime_gpgme_decrypt(GMimeCipherContext *
-                                                     GMimeStream * istream,
-                                                     GMimeStream * ostream,
-                                                     GError ** err);
-+#else /* HAVE_GMIME_2_5_7 */
-+static GMimeDigestAlgo g_mime_gpgme_digest_id(GMimeCryptoContext * ctx,
-+                                              const char *hash);
-+
-+static const char *g_mime_gpgme_digest_name(GMimeCryptoContext * ctx,
-+                                            GMimeDigestAlgo hash);
-+
-+static const char
-+    *g_mime_gpgme_get_signature_protocol(GMimeCryptoContext * context);
-+static const char
-+    *g_mime_gpgme_get_encryption_protocol(GMimeCryptoContext * context);
-+static const char
-+    *g_mime_gpgme_get_key_exchange_protocol(GMimeCryptoContext * context);
-+
-+static int g_mime_gpgme_sign(GMimeCryptoContext * ctx,
-+                             const char * userid,
-+			     GMimeDigestAlgo hash,
-+                             GMimeStream * istream,
-+			     GMimeStream * ostream,
-+                             GError ** err);
-+
-+static GMimeSignatureList *g_mime_gpgme_verify(GMimeCryptoContext * ctx,
-+                                               GMimeDigestAlgo hash,
-+                                               GMimeStream * istream,
-+                                               GMimeStream * sigstream,
-+                                               GError ** err);
-+
-+static int g_mime_gpgme_encrypt(GMimeCryptoContext * ctx,
-+                                gboolean sign,
-+				const char *userid,
-+                                GMimeDigestAlgo digest,
-+                                GPtrArray * recipients,
-+				GMimeStream * istream,
-+				GMimeStream * ostream, GError ** err);
-+
-+static GMimeDecryptResult *g_mime_gpgme_decrypt(GMimeCryptoContext * ctx,
-+                                                GMimeStream * istream,
-+                                                GMimeStream * ostream,
-+                                                GError ** err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- 
- /* internal passphrase callback */
-@@ -102,7 +146,11 @@ static void g_set_error_from_gpgme(GError ** error, gpgme_error_t gpgme_err,
- 				   const gchar * message);
- 
- 
-+#ifndef HAVE_GMIME_2_5_7
- static GMimeCipherContextClass *parent_class = NULL;
-+#else /* HAVE_GMIME_2_5_7 */
-+static GMimeCryptoContextClass *parent_class = NULL;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- 
- GType
-@@ -124,8 +172,13 @@ g_mime_gpgme_context_get_type(void)
- 	};
- 
- 	type =
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_type_register_static(GMIME_TYPE_CIPHER_CONTEXT,
- 				   "GMimeGpgmeContext", &info, 0);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_type_register_static(GMIME_TYPE_CRYPTO_CONTEXT,
-+				   "GMimeGpgmeContext", &info, 0);
-+#endif /* HAVE_GMIME_2_5_7 */
-     }
- 
-     return type;
-@@ -136,19 +189,39 @@ static void
- g_mime_gpgme_context_class_init(GMimeGpgmeContextClass * klass)
- {
-     GObjectClass *object_class = G_OBJECT_CLASS(klass);
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeCipherContextClass *cipher_class =
- 	GMIME_CIPHER_CONTEXT_CLASS(klass);
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContextClass *crypto_class =
-+	GMIME_CRYPTO_CONTEXT_CLASS(klass);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     parent_class = g_type_class_ref(G_TYPE_OBJECT);
- 
-     object_class->finalize = g_mime_gpgme_context_finalize;
- 
-+#ifndef HAVE_GMIME_2_5_7
-     cipher_class->hash_id = g_mime_gpgme_hash_id;
-     cipher_class->hash_name = g_mime_gpgme_hash_name;
-     cipher_class->sign = g_mime_gpgme_sign;
-     cipher_class->verify = g_mime_gpgme_verify;
-     cipher_class->encrypt = g_mime_gpgme_encrypt;
-     cipher_class->decrypt = g_mime_gpgme_decrypt;
-+#else /* HAVE_GMIME_2_5_7 */
-+    crypto_class->digest_id = g_mime_gpgme_digest_id;
-+    crypto_class->digest_name = g_mime_gpgme_digest_name;
-+    crypto_class->get_signature_protocol =
-+        g_mime_gpgme_get_signature_protocol;
-+    crypto_class->get_encryption_protocol =
-+        g_mime_gpgme_get_encryption_protocol;
-+    crypto_class->get_key_exchange_protocol =
-+        g_mime_gpgme_get_key_exchange_protocol;
-+    crypto_class->sign = g_mime_gpgme_sign;
-+    crypto_class->verify = g_mime_gpgme_verify;
-+    crypto_class->encrypt = g_mime_gpgme_encrypt;
-+    crypto_class->decrypt = g_mime_gpgme_decrypt;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     if (gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP) ==
- 	GPG_ERR_NO_ERROR)
-@@ -190,7 +263,11 @@ g_mime_gpgme_context_finalize(GObject * object)
-     }
- 
- #if !defined(HAVE_GMIME_2_6)
-+#ifndef HAVE_GMIME_2_5_7
-     g_object_unref(GMIME_CIPHER_CONTEXT(ctx)->session);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_object_unref(GMIME_CRYPTO_CONTEXT(ctx)->session);
-+#endif /* HAVE_GMIME_2_5_7 */
- #endif                          /* HAVE_GMIME_2_6 */
- 
-     G_OBJECT_CLASS(parent_class)->finalize(object);
-@@ -200,15 +277,26 @@ g_mime_gpgme_context_finalize(GObject * object)
- /*
-  * Convert a hash algorithm name to a number
-  */
-+#ifndef HAVE_GMIME_2_5_7
- static GMimeCipherHash
- g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash)
-+#else /* HAVE_GMIME_2_5_7 */
-+static GMimeDigestAlgo
-+g_mime_gpgme_digest_id(GMimeCryptoContext * ctx, const char *hash)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-+#ifndef HAVE_GMIME_2_5_7
-     if (hash == NULL)
- 	return GMIME_CIPHER_HASH_DEFAULT;
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (hash == NULL)
-+	return GMIME_DIGEST_ALGO_DEFAULT;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     if (!g_ascii_strcasecmp(hash, "pgp-"))
- 	hash += 4;
- 
-+#ifndef HAVE_GMIME_2_5_7
-     if (!g_ascii_strcasecmp(hash, "md2"))
- 	return GMIME_CIPHER_HASH_MD2;
-     else if (!g_ascii_strcasecmp(hash, "md5"))
-@@ -223,6 +311,22 @@ g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash)
- 	return GMIME_CIPHER_HASH_HAVAL5160;
- 
-     return GMIME_CIPHER_HASH_DEFAULT;
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (!g_ascii_strcasecmp(hash, "md2"))
-+	return GMIME_DIGEST_ALGO_MD2;
-+    else if (!g_ascii_strcasecmp(hash, "md5"))
-+	return GMIME_DIGEST_ALGO_MD5;
-+    else if (!g_ascii_strcasecmp(hash, "sha1"))
-+	return GMIME_DIGEST_ALGO_SHA1;
-+    else if (!g_ascii_strcasecmp(hash, "ripemd160"))
-+	return GMIME_DIGEST_ALGO_RIPEMD160;
-+    else if (!g_ascii_strcasecmp(hash, "tiger192"))
-+	return GMIME_DIGEST_ALGO_TIGER192;
-+    else if (!g_ascii_strcasecmp(hash, "haval-5-160"))
-+	return GMIME_DIGEST_ALGO_HAVAL5160;
-+
-+    return GMIME_DIGEST_ALGO_DEFAULT;
-+#endif /* HAVE_GMIME_2_5_7 */
- }
- 
- 
-@@ -230,7 +334,11 @@ g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash)
-  * Convert a hash algorithm number to a string
-  */
- static const char *
-+#ifndef HAVE_GMIME_2_5_7
- g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash)
-+#else /* HAVE_GMIME_2_5_7 */
-+g_mime_gpgme_digest_name(GMimeCryptoContext * context, GMimeDigestAlgo hash)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context);
-     char *p;
-@@ -239,6 +347,7 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash)
-     g_return_val_if_fail(ctx->gpgme_ctx, NULL);
- 
-     /* note: this is only a subset of the hash algorithms gpg(me) supports */
-+#ifndef HAVE_GMIME_2_5_7
-     switch (hash) {
-     case GMIME_CIPHER_HASH_MD2:
- 	p = "pgp-md2";
-@@ -258,6 +367,27 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash)
-     case GMIME_CIPHER_HASH_HAVAL5160:
- 	p = "pgp-haval-5-160";
- 	break;
-+#else /* HAVE_GMIME_2_5_7 */
-+    switch (hash) {
-+    case GMIME_DIGEST_ALGO_MD2:
-+	p = "pgp-md2";
-+	break;
-+    case GMIME_DIGEST_ALGO_MD5:
-+	p = "pgp-md5";
-+	break;
-+    case GMIME_DIGEST_ALGO_SHA1:
-+	p = "pgp-sha1";
-+	break;
-+    case GMIME_DIGEST_ALGO_RIPEMD160:
-+	p = "pgp-ripemd160";
-+	break;
-+    case GMIME_DIGEST_ALGO_TIGER192:
-+	p = "pgp-tiger192";
-+	break;
-+    case GMIME_DIGEST_ALGO_HAVAL5160:
-+	p = "pgp-haval-5-160";
-+	break;
-+#endif /* HAVE_GMIME_2_5_7 */
-     default:
- 	if (!(p = ctx->micalg))
- 	    return p;
-@@ -270,6 +400,29 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash)
-     return p;
- }
- 
-+#ifdef HAVE_GMIME_2_5_7
-+static const char *
-+g_mime_gpgme_get_signature_protocol(GMimeCryptoContext * context)
-+{
-+    GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context);
-+    return ctx->sign_protocol;
-+}
-+
-+static const char *
-+g_mime_gpgme_get_encryption_protocol(GMimeCryptoContext * context)
-+{
-+    GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context);
-+    return ctx->encrypt_protocol;
-+}
-+
-+static const char *
-+g_mime_gpgme_get_key_exchange_protocol(GMimeCryptoContext * context)
-+{
-+    GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context);
-+    return ctx->key_protocol;
-+}
-+
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- /*
-  * Wrapper to convert the passphrase returned from the gmime session to gpgme.
-@@ -279,7 +432,11 @@ g_mime_session_passphrase(void *HOOK, const char *UID_HINT,
- 			  const char *PASSPHRASE_INFO, int PREV_WAS_BAD,
- 			  int FD)
- {
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeCipherContext *ctx = GMIME_CIPHER_CONTEXT(HOOK);
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContext *ctx = GMIME_CRYPTO_CONTEXT(HOOK);
-+#endif /* HAVE_GMIME_2_5_7 */
- #if defined(HAVE_GMIME_2_6)
-     GMimeStream *stream;
-     gboolean rc;
-@@ -366,9 +523,15 @@ cb_data_release(void *handle)
-  * arg, but set the value in the context.
-  */
- static int
-+#ifndef HAVE_GMIME_2_5_7
- g_mime_gpgme_sign(GMimeCipherContext * context, const char *userid,
- 		  GMimeCipherHash hash, GMimeStream * istream,
- 		  GMimeStream * ostream, GError ** error)
-+#else /* HAVE_GMIME_2_5_7 */
-+g_mime_gpgme_sign(GMimeCryptoContext * context, const char *userid,
-+		  GMimeDigestAlgo hash, GMimeStream * istream,
-+		  GMimeStream * ostream, GError ** error)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context;
-     gpgme_sig_mode_t sig_mode;
-@@ -460,6 +623,7 @@ g_mime_gpgme_sign(GMimeCipherContext * context, const char *userid,
- }
- 
- 
-+#ifndef HAVE_GMIME_2_5_7
- /*
-  * In standard mode, verify that sigstream contains a detached signature for
-  * istream. In single-part mode (RFC 2440, RFC 2633 application/pkcs7-mime),
-@@ -471,13 +635,33 @@ static GMimeSignatureValidity *
- g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash,
- 		    GMimeStream * istream, GMimeStream * sigstream,
- 		    GError ** error)
-+#else /* HAVE_GMIME_2_5_7 */
-+/*
-+ * In standard mode, verify that sigstream contains a detached signature for
-+ * istream. In single-part mode (RFC 2440, RFC 2633 application/pkcs7-mime),
-+ * istream contains clearsigned data, and sigstream will be filled with the
-+ * verified plaintext. The routine returns a GMimeSignatureList object.
-+ * More information is saved in the context's signature object.
-+ * On error error is set accordingly.
-+ */
-+static GMimeSignatureList *
-+g_mime_gpgme_verify(GMimeCryptoContext * context, GMimeDigestAlgo hash,
-+		    GMimeStream * istream, GMimeStream * sigstream,
-+		    GError ** error)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context;
-     gpgme_ctx_t gpgme_ctx;
-     gpgme_protocol_t protocol;
-     gpgme_error_t err;
-     gpgme_data_t msg, sig;
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeSignatureValidity *validity;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeSignatureList *list;
-+    GMimeSignature *signature;
-+
-+#endif /* HAVE_GMIME_2_5_7 */
-     struct gpgme_data_cbs cbs = {
- 	(gpgme_data_read_cb_t) g_mime_gpgme_stream_rd,	/* read method */
- 	(gpgme_data_write_cb_t) g_mime_gpgme_stream_wr,	/* write method */
-@@ -521,6 +705,7 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash,
- 	ctx->sig_state =
- 	    g_mime_gpgme_sigstat_new_from_gpgme_ctx(gpgme_ctx);
- 
-+#ifndef HAVE_GMIME_2_5_7
-     validity = g_mime_signature_validity_new();
-     if (ctx->sig_state) {
- 	switch (ctx->sig_state->status)
-@@ -536,12 +721,44 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash,
- 	    }
-     } else
- 	g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN);
-+#else /* HAVE_GMIME_2_5_7 */
-+    list = g_mime_signature_list_new();
-+    signature = g_mime_signature_new();
-+    g_mime_signature_list_add(list, signature);
-+
-+    if (ctx->sig_state) {
-+	switch (ctx->sig_state->status)
-+	    {
-+	    case GPG_ERR_NO_ERROR:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_GOOD);
-+		break;
-+	    case GPG_ERR_NOT_SIGNED:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_ERROR);
-+		g_mime_signature_set_errors(signature,
-+                                            GMIME_SIGNATURE_ERROR_NONE);
-+		break;
-+	    default:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_BAD);
-+	    }
-+    } else {
-+	g_mime_signature_set_status(signature,
-+                                    GMIME_SIGNATURE_STATUS_ERROR);
-+        g_mime_signature_set_errors(signature, GMIME_SIGNATURE_ERROR_NONE);
-+    }
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* release gmgme data buffers */
-     gpgme_data_release(msg);
-     gpgme_data_release(sig);
- 
-+#ifndef HAVE_GMIME_2_5_7
-     return validity;
-+#else /* HAVE_GMIME_2_5_7 */
-+    return list;
-+#endif /* HAVE_GMIME_2_5_7 */
- }
- 
- 
-@@ -549,10 +766,19 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash,
-  * Encrypt istream to ostream for recipients. If sign is set, sign by userid.
-  */
- static int
-+#ifndef HAVE_GMIME_2_5_7
- g_mime_gpgme_encrypt(GMimeCipherContext * context, gboolean sign,
- 		     const char *userid, GPtrArray * recipients,
- 		     GMimeStream * istream, GMimeStream * ostream,
- 		     GError ** error)
-+#else /* HAVE_GMIME_2_5_7 */
-+g_mime_gpgme_encrypt(GMimeCryptoContext * context, gboolean sign,
-+		     const char *userid,
-+                     GMimeDigestAlgo digest,
-+                     GPtrArray * recipients,
-+		     GMimeStream * istream, GMimeStream * ostream,
-+		     GError ** error)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context;
-     gpgme_ctx_t gpgme_ctx;
-@@ -653,9 +879,15 @@ g_mime_gpgme_encrypt(GMimeCipherContext * context, gboolean sign,
-  * Decrypt istream to ostream. In RFC 2440 mode, also try to check an included
-  * signature (if any).
-  */
-+#ifndef HAVE_GMIME_2_5_7
- static GMimeSignatureValidity *
- g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream,
- 		     GMimeStream * ostream, GError ** error)
-+#else /* HAVE_GMIME_2_5_7 */
-+static GMimeDecryptResult *
-+g_mime_gpgme_decrypt(GMimeCryptoContext * context, GMimeStream * istream,
-+		     GMimeStream * ostream, GError ** error)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context;
-     gpgme_ctx_t gpgme_ctx;
-@@ -668,7 +900,13 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream,
- 	NULL,			/* seek method */
- 	cb_data_release		/* release method */
-     };
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeSignatureValidity *validity;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeDecryptResult *result;
-+    GMimeSignatureList *list;
-+    GMimeSignature *signature;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* some paranoia checks */
-     g_return_val_if_fail(ctx, NULL);
-@@ -716,6 +954,7 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream,
-     /* try to get information about the signature (if any) */
-     ctx->sig_state = g_mime_gpgme_sigstat_new_from_gpgme_ctx(gpgme_ctx);
- 
-+#ifndef HAVE_GMIME_2_5_7
-     validity = g_mime_signature_validity_new();
-     if (ctx->sig_state) {
- 	switch (ctx->sig_state->status)
-@@ -733,14 +972,57 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream,
- 	g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN);
- 
-     return validity;
-+#else /* HAVE_GMIME_2_5_7 */
-+    list = g_mime_signature_list_new();
-+    signature = g_mime_signature_new();
-+    g_mime_signature_list_add(list, signature);
-+    result = g_mime_decrypt_result_new();
-+    g_mime_decrypt_result_set_signatures(result, list);
-+
-+    if (ctx->sig_state) {
-+	switch (ctx->sig_state->status)
-+	    {
-+	    case GPG_ERR_NO_ERROR:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_GOOD);
-+		break;
-+	    case GPG_ERR_NOT_SIGNED:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_ERROR);
-+		g_mime_signature_set_errors(signature,
-+                                            GMIME_SIGNATURE_ERROR_NONE);
-+		break;
-+	    default:
-+		g_mime_signature_set_status(signature,
-+                                            GMIME_SIGNATURE_STATUS_BAD);
-+	    }
-+    } else {
-+	g_mime_signature_set_status(signature,
-+                                    GMIME_SIGNATURE_STATUS_ERROR);
-+        g_mime_signature_set_errors(signature, GMIME_SIGNATURE_ERROR_NONE);
-+    }
-+
-+    return result;
-+#endif /* HAVE_GMIME_2_5_7 */
- }
- 
- 
-+#ifndef HAVE_GMIME_2_5_7
- /*
-  * Create a new gpgme cipher context with protocol. If anything fails, return
-  * NULL and set error.
-  */
-+#else /* HAVE_GMIME_2_5_7 */
-+/*
-+ * Create a new gpgme crypto context with protocol. If anything fails, return
-+ * NULL and set error.
-+ */
-+#endif /* HAVE_GMIME_2_5_7 */
-+#ifndef HAVE_GMIME_2_5_7
- GMimeCipherContext *
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeCryptoContext *
-+#endif /* HAVE_GMIME_2_5_7 */
- #if defined(HAVE_GMIME_2_6)
- g_mime_gpgme_context_new(GMimePasswordRequestFunc request_passwd,
-                          gpgme_protocol_t protocol, GError ** error)
-@@ -749,7 +1031,11 @@ g_mime_gpgme_context_new(GMimeSession * session,
- 			 gpgme_protocol_t protocol, GError ** error)
- #endif                          /* HAVE_GMIME_2_6 */
- {
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeCipherContext *cipher;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContext *crypto;
-+#endif /* HAVE_GMIME_2_5_7 */
-     GMimeGpgmeContext *ctx;
-     gpgme_error_t err;
-     gpgme_ctx_t gpgme_ctx;
-@@ -766,14 +1052,22 @@ g_mime_gpgme_context_new(GMimeSession * session,
- 	return NULL;
-     }
- 
-+#ifndef HAVE_GMIME_2_5_7
-     /* create the cipher context */
-+#else /* HAVE_GMIME_2_5_7 */
-+    /* create the crypto context */
-+#endif /* HAVE_GMIME_2_5_7 */
-     ctx = g_object_new(GMIME_TYPE_GPGME_CONTEXT, NULL, NULL);
-     if (!ctx) {
- 	gpgme_release(gpgme_ctx);
- 	return NULL;
-     } else
- 	ctx->gpgme_ctx = gpgme_ctx;
-+#ifndef HAVE_GMIME_2_5_7
-     cipher = (GMimeCipherContext *) ctx;
-+#else /* HAVE_GMIME_2_5_7 */
-+    crypto = (GMimeCryptoContext *) ctx;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* check if the requested protocol is available */
-     if (!g_mime_gpgme_context_check_protocol
-@@ -785,23 +1079,47 @@ g_mime_gpgme_context_new(GMimeSession * session,
- 
-     /* setup according to requested protocol */
- #if defined(HAVE_GMIME_2_6)
-+#ifndef HAVE_GMIME_2_5_7
-     cipher->request_passwd = request_passwd;
-+#else /* HAVE_GMIME_2_5_7 */
-+    crypto->request_passwd = request_passwd;
-+#endif /* HAVE_GMIME_2_5_7 */
- #else                           /* HAVE_GMIME_2_6 */
-+#ifndef HAVE_GMIME_2_5_7
-     cipher->session = session;
-+#else /* HAVE_GMIME_2_5_7 */
-+    crypto->session = session;
-+#endif /* HAVE_GMIME_2_5_7 */
-     g_object_ref(session);
- #endif                          /* HAVE_GMIME_2_6 */
-     gpgme_set_protocol(gpgme_ctx, protocol);
-     if (protocol == GPGME_PROTOCOL_OpenPGP) {
-+#ifndef HAVE_GMIME_2_5_7
- 	cipher->sign_protocol = "application/pgp-signature";
- 	cipher->encrypt_protocol = "application/pgp-encrypted";
- 	cipher->key_protocol = NULL;	/* FIXME */
-+#else /* HAVE_GMIME_2_5_7 */
-+	ctx->sign_protocol = "application/pgp-signature";
-+	ctx->encrypt_protocol = "application/pgp-encrypted";
-+	ctx->key_protocol = NULL;	/* FIXME */
-+#endif /* HAVE_GMIME_2_5_7 */
-     } else {
-+#ifndef HAVE_GMIME_2_5_7
- 	cipher->sign_protocol = "application/pkcs7-signature";
- 	cipher->encrypt_protocol = "application/pkcs7-mime";
- 	cipher->key_protocol = NULL;	/* FIXME */
-+#else /* HAVE_GMIME_2_5_7 */
-+	ctx->sign_protocol = "application/pkcs7-signature";
-+	ctx->encrypt_protocol = "application/pkcs7-mime";
-+	ctx->key_protocol = NULL;	/* FIXME */
-+#endif /* HAVE_GMIME_2_5_7 */
-     }
- 
-+#ifndef HAVE_GMIME_2_5_7
-     return cipher;
-+#else /* HAVE_GMIME_2_5_7 */
-+    return crypto;
-+#endif /* HAVE_GMIME_2_5_7 */
- }
- 
- 
-diff --git a/libbalsa/gmime-gpgme-context.h b/libbalsa/gmime-gpgme-context.h
-index 585d927..19c5fae 100644
---- a/libbalsa/gmime-gpgme-context.h
-+++ b/libbalsa/gmime-gpgme-context.h
-@@ -63,7 +63,11 @@ typedef gboolean(*GMimeGpgmeKeyTrustCB) (const gchar * name,
- 					 GMimeGpgmeContext * ctx);
- 
- struct _GMimeGpgmeContext {
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeCipherContext parent_object;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContext parent_object;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     gpgme_ctx_t gpgme_ctx;	/* gpgme context */
-     gboolean singlepart_mode;	/* set context to single-part mode (RFC 2440, 2633) */
-@@ -73,11 +77,21 @@ struct _GMimeGpgmeContext {
-     GMimeGpgmeKeySelectCB key_select_cb;	/* key selection callback */
-     GMimeGpgmeKeyTrustCB key_trust_cb;          /* low trust key cb */
-     gpgme_passphrase_cb_t passphrase_cb;	/* passphrase callback */
-+#ifdef HAVE_GMIME_2_5_7
-+
-+    const gchar *sign_protocol;
-+    const gchar *encrypt_protocol;
-+    const gchar *key_protocol;
-+#endif /* HAVE_GMIME_2_5_7 */
- };
- 
- 
- struct _GMimeGpgmeContextClass {
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeCipherContextClass parent_class;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContextClass parent_class;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     gboolean has_proto_openpgp;
-     gboolean has_proto_cms;
-@@ -86,10 +100,17 @@ struct _GMimeGpgmeContextClass {
- 
- GType g_mime_gpgme_context_get_type(void);
- #if defined(HAVE_GMIME_2_6)
-+#ifndef HAVE_GMIME_2_5_7
- GMimeCipherContext *g_mime_gpgme_context_new(GMimePasswordRequestFunc
-                                              request_passwd,
- 					     gpgme_protocol_t protocol,
- 					     GError ** error);
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeCryptoContext *g_mime_gpgme_context_new(GMimePasswordRequestFunc
-+                                             request_passwd,
-+					     gpgme_protocol_t protocol,
-+					     GError ** error);
-+#endif /* HAVE_GMIME_2_5_7 */
- #else                           /* HAVE_GMIME_2_6 */
- GMimeCipherContext *g_mime_gpgme_context_new(GMimeSession * session,
- 					     gpgme_protocol_t protocol,
-diff --git a/libbalsa/gmime-part-rfc2440.c b/libbalsa/gmime-part-rfc2440.c
-index 795d2e1..e79c4cb 100644
---- a/libbalsa/gmime-part-rfc2440.c
-+++ b/libbalsa/gmime-part-rfc2440.c
-@@ -112,8 +112,13 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part,
- 
-     g_return_val_if_fail(GMIME_IS_PART(part), -1);
-     g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), -1);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->sign_protocol != NULL,
- 			 -1);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol
-+                         (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, -1);
-+#endif /* HAVE_GMIME_2_5_7 */
-     g_return_val_if_fail(recipients != NULL || sign_userid != NULL, -1);
- 
-     /* get the raw content */
-@@ -131,14 +136,27 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part,
-     ctx->singlepart_mode = TRUE;
-     if (recipients == NULL)
- 	result =
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_mime_cipher_context_sign(GMIME_CIPHER_CONTEXT(ctx), sign_userid,
- 			       GMIME_CIPHER_HASH_DEFAULT, stream,
- 			       cipherstream, err);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_mime_crypto_context_sign(GMIME_CRYPTO_CONTEXT(ctx), sign_userid,
-+			       GMIME_CIPHER_ALGO_DEFAULT, stream,
-+			       cipherstream, err);
-+#endif /* HAVE_GMIME_2_5_7 */
-     else
- 	result =
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_mime_cipher_context_encrypt(GMIME_CIPHER_CONTEXT(ctx),
- 				  sign_userid != NULL, sign_userid,
- 				  recipients, stream, cipherstream, err);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_mime_crypto_context_encrypt(GMIME_CRYPTO_CONTEXT(ctx),
-+				  sign_userid != NULL, sign_userid,
-+                                  GMIME_CIPHER_ALGO_DEFAULT,
-+				  recipients, stream, cipherstream, err);
-+#endif /* HAVE_GMIME_2_5_7 */
-     if (result == -1) {
- 	g_object_unref(cipherstream);
- 	return -1;
-@@ -202,18 +220,31 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part,
-  * set on err to provide more information. Upon success, the content
-  * of part is replaced by the verified output of the crypto engine.
-  */
-+#ifndef HAVE_GMIME_2_5_7
- GMimeSignatureValidity *
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeSignatureList *
-+#endif /* HAVE_GMIME_2_5_7 */
- g_mime_part_rfc2440_verify(GMimePart * part,
- 			   GMimeGpgmeContext * ctx, GError ** err)
- {
-     GMimeStream *stream, *plainstream;
-     GMimeDataWrapper * wrapper;
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeSignatureValidity *valid;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeSignatureList *list;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     g_return_val_if_fail(GMIME_IS_PART(part), NULL);
-     g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), NULL);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->sign_protocol != NULL,
- 			 NULL);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol
-+                         (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, NULL);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* get the raw content */
-     wrapper = g_mime_part_get_content_object(GMIME_PART(part));
-@@ -227,13 +258,25 @@ g_mime_part_rfc2440_verify(GMimePart * part,
- 
-     /* verify the signature */
-     ctx->singlepart_mode = TRUE;
-+#ifndef HAVE_GMIME_2_5_7
-     valid =
- 	g_mime_cipher_context_verify(GMIME_CIPHER_CONTEXT(ctx),
- 			     GMIME_CIPHER_HASH_DEFAULT, stream,
- 			     plainstream, err);
-+#else /* HAVE_GMIME_2_5_7 */
-+    list =
-+	g_mime_crypto_context_verify(GMIME_CRYPTO_CONTEXT(ctx),
-+			     GMIME_CIPHER_ALGO_DEFAULT, stream,
-+			     plainstream, err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* upon success, replace the signed content by the checked one */
--    if (valid) {
-+#ifndef HAVE_GMIME_2_5_7
-+    if (valid)
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (list)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	GMimeDataWrapper *wrapper = g_mime_data_wrapper_new();
- 
- 	g_mime_data_wrapper_set_stream(wrapper, plainstream);
-@@ -242,7 +285,11 @@ g_mime_part_rfc2440_verify(GMimePart * part,
-     }
-     g_object_unref(plainstream);
- 
-+#ifndef HAVE_GMIME_2_5_7
-     return valid;
-+#else /* HAVE_GMIME_2_5_7 */
-+    return list;
-+#endif /* HAVE_GMIME_2_5_7 */
- }
- 
- 
-@@ -255,19 +302,32 @@ g_mime_part_rfc2440_verify(GMimePart * part,
-  * verified and the result is placed in ctx by the underlying gpgme
-  * context.
-  */
-+#ifndef HAVE_GMIME_2_5_7
- GMimeSignatureValidity *
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeDecryptResult *
-+#endif /* HAVE_GMIME_2_5_7 */
- g_mime_part_rfc2440_decrypt(GMimePart * part,
- 			    GMimeGpgmeContext * ctx, GError ** err)
- {
-     GMimeStream *stream, *plainstream;
-     GMimeDataWrapper * wrapper;
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeSignatureValidity *result;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeDecryptResult *result;
-+#endif /* HAVE_GMIME_2_5_7 */
-     gchar *headbuf = g_malloc0(1024);
- 
-     g_return_val_if_fail(GMIME_IS_PART(part), NULL);
-     g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), NULL);
-+#ifndef HAVE_GMIME_2_5_7
-     g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->encrypt_protocol !=
- 			 NULL, NULL);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol
-+                         (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, NULL);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     /* get the raw content */
-     wrapper = g_mime_part_get_content_object(part);
-@@ -284,8 +344,13 @@ g_mime_part_rfc2440_decrypt(GMimePart * part,
- 
-     /* decrypt and (if possible) verify the input */
-     result =
-+#ifndef HAVE_GMIME_2_5_7
- 	g_mime_cipher_context_decrypt(GMIME_CIPHER_CONTEXT(ctx), stream,
- 			      plainstream, err);
-+#else /* HAVE_GMIME_2_5_7 */
-+	g_mime_crypto_context_decrypt(GMIME_CRYPTO_CONTEXT(ctx), stream,
-+                                      plainstream, err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
-     if (result != NULL) {
- 	GMimeStream *filter_stream;
-diff --git a/libbalsa/gmime-part-rfc2440.h b/libbalsa/gmime-part-rfc2440.h
-index 48be5a4..cc1901a 100644
---- a/libbalsa/gmime-part-rfc2440.h
-+++ b/libbalsa/gmime-part-rfc2440.h
-@@ -53,12 +53,21 @@ int g_mime_part_rfc2440_sign_encrypt(GMimePart * part,
- 				     GPtrArray * recipients,
- 				     const char *sign_userid,
- 				     GError ** err);
-+#ifndef HAVE_GMIME_2_5_7
- GMimeSignatureValidity *g_mime_part_rfc2440_verify(GMimePart * part,
- 						   GMimeGpgmeContext * ctx,
- 						   GError ** err);
- GMimeSignatureValidity *g_mime_part_rfc2440_decrypt(GMimePart * part,
-                                                     GMimeGpgmeContext *
-                                                     ctx, GError ** err);
-+#else /* HAVE_GMIME_2_5_7 */
-+GMimeSignatureList *g_mime_part_rfc2440_verify(GMimePart * part,
-+                                               GMimeGpgmeContext * ctx,
-+                                               GError ** err);
-+GMimeDecryptResult *g_mime_part_rfc2440_decrypt(GMimePart * part,
-+                                                GMimeGpgmeContext * ctx,
-+                                                GError ** err);
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- #ifdef __cplusplus
- }
-diff --git a/libbalsa/rfc3156.c b/libbalsa/rfc3156.c
-index a56e12c..df4a2e1 100644
---- a/libbalsa/rfc3156.c
-+++ b/libbalsa/rfc3156.c
-@@ -268,9 +268,15 @@ libbalsa_message_body_protection(LibBalsaMessageBody * body)
- 
- #if defined(HAVE_GMIME_2_6)
- static gboolean
-+#ifndef HAVE_GMIME_2_5_7
- password_request_func(GMimeCipherContext * ctx, const char *user_id,
-                       const char *prompt_ctx, gboolean reprompt,
-                       GMimeStream * response, GError ** err)
-+#else /* HAVE_GMIME_2_5_7 */
-+password_request_func(GMimeCryptoContext * ctx, const char *user_id,
-+                      const char *prompt_ctx, gboolean reprompt,
-+                      GMimeStream * response, GError ** err)
-+#endif /* HAVE_GMIME_2_5_7 */
- {
-     gint fd;
-     gchar *name_used;
-@@ -366,9 +372,16 @@ libbalsa_sign_mime_object(GMimeObject ** content, const gchar * rfc822_for,
- 	return FALSE;
-     }
- 
-+#ifndef HAVE_GMIME_2_5_7
-     if (g_mime_multipart_signed_sign
- 	(mps, *content, GMIME_CIPHER_CONTEXT(ctx), rfc822_for,
--	 GMIME_CIPHER_HASH_DEFAULT, error) != 0) {
-+	 GMIME_CIPHER_HASH_DEFAULT, error) != 0)
-+#else /* HAVE_GMIME_2_5_7 */
-+    if (g_mime_multipart_signed_sign
-+	(mps, *content, GMIME_CRYPTO_CONTEXT(ctx), rfc822_for,
-+	 GMIME_DIGEST_ALGO_DEFAULT, error) != 0)
-+#endif /* HAVE_GMIME_2_5_7 */
-+    {
- 	g_object_unref(mps);
- 	g_object_unref(ctx);
- #if !defined(HAVE_GMIME_2_6)
-@@ -458,10 +471,18 @@ libbalsa_encrypt_mime_object(GMimeObject ** content, GList * rfc822_for,
- 
- 	encrypted_obj = GMIME_OBJECT(mpe);
- 	result = 
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_mime_multipart_encrypted_encrypt(mpe, *content,
- 					       GMIME_CIPHER_CONTEXT(ctx),
-                                                FALSE, NULL,
- 					       recipients, error);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_mime_multipart_encrypted_encrypt(mpe, *content,
-+					       GMIME_CRYPTO_CONTEXT(ctx),
-+                                               FALSE, NULL,
-+                                               GMIME_DIGEST_ALGO_DEFAULT,
-+					       recipients, error);
-+#endif /* HAVE_GMIME_2_5_7 */
-     }
- #ifdef HAVE_SMIME
-     else {
-@@ -471,9 +492,15 @@ libbalsa_encrypt_mime_object(GMimeObject ** content, GList * rfc822_for,
- 	encrypted_obj = GMIME_OBJECT(pkcs7);
- 	ctx->singlepart_mode = TRUE;
- 	result = 
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_mime_application_pkcs7_encrypt(pkcs7, *content,
- 					     GMIME_CIPHER_CONTEXT(ctx),
- 					     recipients, error);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_mime_application_pkcs7_encrypt(pkcs7, *content,
-+					     GMIME_CRYPTO_CONTEXT(ctx),
-+					     recipients, error);
-+#endif /* HAVE_GMIME_2_5_7 */
-     }
- #endif
- 
-@@ -565,8 +592,14 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
- #if !defined(HAVE_GMIME_2_6)
-     GMimeSession *session;
- #endif                          /* HAVE_GMIME_2_6 */
--    GMimeCipherContext *ctx;
-+#ifndef HAVE_GMIME_2_5_7
-+    GMimeCipherContext *g_mime_ctx;
-     GMimeSignatureValidity *valid;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeCryptoContext *g_mime_ctx;
-+    GMimeSignatureList *valid;
-+#endif /* HAVE_GMIME_2_5_7 */
-+    GMimeGpgmeContext *ctx;
-     GError *error = NULL;
- 
-     /* paranoia checks */
-@@ -592,12 +625,12 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
-     /* try to create GMimeGpgMEContext */
- #if !defined(HAVE_GMIME_2_6)
-     session = g_object_new(g_mime_session_get_type(), NULL, NULL);
--    ctx = g_mime_gpgme_context_new(session, protocol, &error);
-+    g_mime_ctx = g_mime_gpgme_context_new(session, protocol, &error);
- #else                           /* HAVE_GMIME_2_6 */
--    ctx =
-+    g_mime_ctx =
-         g_mime_gpgme_context_new(password_request_func, protocol, &error);
- #endif                          /* HAVE_GMIME_2_6 */
--    if (ctx == NULL) {
-+    if (g_mime_ctx == NULL) {
- 	if (error) {
- 	    libbalsa_information(LIBBALSA_INFORMATION_ERROR, "%s: %s",
- 				 _("creating a gpgme context failed"),
-@@ -613,6 +646,7 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
- 	body->parts->next->sig_info->status = GPGME_SIG_STAT_ERROR;
- 	return FALSE;
-     }
-+    ctx = GMIME_GPGME_CONTEXT(g_mime_ctx);
- 
-     /* S/MIME uses the protocol application/pkcs7-signature, but some ancient
-        mailers, not yet knowing RFC 2633, use application/x-pkcs7-signature,
-@@ -622,14 +656,19 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
- 	    g_mime_object_get_content_type_parameter(GMIME_OBJECT (body->mime_part),
- 						     "protocol");
- 	if (!g_ascii_strcasecmp(cms_protocol, "application/x-pkcs7-signature"))
-+#ifndef HAVE_GMIME_2_5_7
-+	    g_mime_ctx->sign_protocol = cms_protocol;
-+#else /* HAVE_GMIME_2_5_7 */
- 	    ctx->sign_protocol = cms_protocol;
-+#endif /* HAVE_GMIME_2_5_7 */
-     }
- 
-     /* verify the signature */
- 
-     libbalsa_mailbox_lock_store(body->message->mailbox);
-     valid = g_mime_multipart_signed_verify(GMIME_MULTIPART_SIGNED
--					   (body->mime_part), ctx, &error);
-+					   (body->mime_part), g_mime_ctx,
-+                                           &error);
-     libbalsa_mailbox_unlock_store(body->message->mailbox);
- 
-     if (valid == NULL) {
-@@ -642,12 +681,16 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body,
- 	    libbalsa_information(LIBBALSA_INFORMATION_ERROR,
- 				 _("signature verification failed"));
-     }
--    if (GMIME_GPGME_CONTEXT(ctx)->sig_state) {
--	body->parts->next->sig_info = GMIME_GPGME_CONTEXT(ctx)->sig_state;
-+    if (ctx->sig_state) {
-+	body->parts->next->sig_info = ctx->sig_state;
- 	g_object_ref(G_OBJECT(body->parts->next->sig_info));
-     }
-+#ifndef HAVE_GMIME_2_5_7
-     g_mime_signature_validity_free(valid);
--    g_object_unref(ctx);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_object_unref(valid);
-+#endif /* HAVE_GMIME_2_5_7 */
-+    g_object_unref(g_mime_ctx);
- #if !defined(HAVE_GMIME_2_6)
-     g_object_unref(session);
- #endif                          /* HAVE_GMIME_2_6 */
-@@ -747,14 +790,26 @@ libbalsa_body_decrypt(LibBalsaMessageBody * body,
-     libbalsa_mailbox_lock_store(body->message->mailbox);
-     if (protocol == GPGME_PROTOCOL_OpenPGP)
- 	mime_obj =
-+#ifndef HAVE_GMIME_2_5_7
- 	    g_mime_multipart_encrypted_decrypt(GMIME_MULTIPART_ENCRYPTED(body->mime_part),
- 					       GMIME_CIPHER_CONTEXT(ctx),
- 					       &error);
-+#else /* HAVE_GMIME_2_5_7 */
-+	    g_mime_multipart_encrypted_decrypt(GMIME_MULTIPART_ENCRYPTED(body->mime_part),
-+					       GMIME_CRYPTO_CONTEXT(ctx),
-+                                               NULL,
-+					       &error);
-+#endif /* HAVE_GMIME_2_5_7 */
- #ifdef HAVE_SMIME
-     else if (smime_signed) {
-+#ifndef HAVE_GMIME_2_5_7
- 	GMimeSignatureValidity *valid;
-+#else /* HAVE_GMIME_2_5_7 */
-+	GMimeSignatureList *valid;
-+#endif /* HAVE_GMIME_2_5_7 */
- 
- 	ctx->singlepart_mode = TRUE;
-+#ifndef HAVE_GMIME_2_5_7
- 	mime_obj =
- 	    g_mime_application_pkcs7_verify(GMIME_PART(body->mime_part),
- 					    &valid,
-@@ -766,6 +821,19 @@ libbalsa_body_decrypt(LibBalsaMessageBody * body,
- 	    g_mime_application_pkcs7_decrypt(GMIME_PART(body->mime_part),
- 					       GMIME_CIPHER_CONTEXT(ctx),
- 					       &error);
-+#else /* HAVE_GMIME_2_5_7 */
-+	mime_obj =
-+	    g_mime_application_pkcs7_verify(GMIME_PART(body->mime_part),
-+					    &valid,
-+					    GMIME_CRYPTO_CONTEXT(ctx),
-+					    &error);
-+	g_object_unref(valid);
-+    } else
-+	mime_obj =
-+	    g_mime_application_pkcs7_decrypt(GMIME_PART(body->mime_part),
-+					       GMIME_CRYPTO_CONTEXT(ctx),
-+					       &error);
-+#endif /* HAVE_GMIME_2_5_7 */
- #endif
-     libbalsa_mailbox_unlock_store(body->message->mailbox);
- 
-@@ -906,7 +974,11 @@ libbalsa_rfc2440_verify(GMimePart * part, GMimeGpgmeSigstat ** sig_info)
-     GMimeSession *session;
- #endif                          /* HAVE_GMIME_2_6 */
-     GMimeGpgmeContext *ctx;
-+#ifndef HAVE_GMIME_2_5_7
-     GMimeSignatureValidity *valid;
-+#else /* HAVE_GMIME_2_5_7 */
-+    GMimeSignatureList *valid;
-+#endif /* HAVE_GMIME_2_5_7 */
-     GError *error = NULL;
-     gpgme_error_t retval;
- 
-@@ -978,7 +1050,11 @@ libbalsa_rfc2440_verify(GMimePart * part, GMimeGpgmeSigstat ** sig_info)
-     }
- 
-     /* clean up */
-+#ifndef HAVE_GMIME_2_5_7
-     g_mime_signature_validity_free(valid);
-+#else /* HAVE_GMIME_2_5_7 */
-+    g_object_unref(valid);
-+#endif /* HAVE_GMIME_2_5_7 */
-     retval = ctx->sig_state->status;
-     g_object_unref(ctx);
- #if !defined(HAVE_GMIME_2_6)
---
-cgit v0.9.0.2
diff --git a/community/bbrun/PKGBUILD b/community/bbrun/PKGBUILD
index 3d655a809..b13e35c2e 100644
--- a/community/bbrun/PKGBUILD
+++ b/community/bbrun/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=bbrun
 pkgver=1.6
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A run - component for blackbox window manager"
 arch=(i686 x86_64 'mips64el')
 url="http://www.darkops.net/bbrun/"
diff --git a/community/bin2iso/PKGBUILD b/community/bin2iso/PKGBUILD
index c6d211426..1574dfa58 100644
--- a/community/bin2iso/PKGBUILD
+++ b/community/bin2iso/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=bin2iso
 pkgver=1.9b
 _dlver=${pkgver/./}
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Converts RAW format (.bin/.cue) files to ISO/WAV format"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://users.eastlink.ca/~doiron/bin2iso/"
diff --git a/community/bind/127.0.0.zone b/community/bind/127.0.0.zone
new file mode 100644
index 000000000..509c311f6
--- /dev/null
+++ b/community/bind/127.0.0.zone
@@ -0,0 +1,11 @@
+$ORIGIN 0.0.127.in-addr.arpa.
+
+@			1D IN SOA	localhost. root.localhost. (
+					42		; serial (yyyymmdd##)
+					3H		; refresh
+					15M		; retry
+					1W		; expiry
+					1D )		; minimum ttl
+
+			1D IN NS	localhost.
+1			1D IN PTR	localhost.
diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD
new file mode 100644
index 000000000..d8caa3a2e
--- /dev/null
+++ b/community/bind/PKGBUILD
@@ -0,0 +1,85 @@
+# $Id: PKGBUILD 89171 2013-04-27 13:07:51Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
+
+pkgname=bind
+_pkgver=9.9.2-P2
+pkgver=${_pkgver//-/.}
+pkgrel=1
+pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
+url='http://www.isc.org/software/bind/'
+license=('custom:ISC')
+arch=('i686' 'x86_64' 'mips64el')
+options=('!makeflags' '!libtool')
+depends=('openssl' 'krb5' 'libxml2')
+source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
+        'root.hint::http://www.internic.net/zones/named.root'
+        'remove-tools.patch'
+        'tmpfiles.d'
+        'named'
+        'named.conf'
+        'named.conf.d'
+        'named.service'
+        'named.logrotate'
+        'localhost.zone'
+        '127.0.0.zone')
+sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d'
+          '029f89c49550c40ec7a95116b6a33f0e5a041094'
+          '14264affa71bcfe7703d0fb7c3556c4c47efaa8b'
+          'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
+          '47f9ac4f6f70bc9167c1cf7859a298531197ad20'
+          'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726'
+          '7848edbfb9a848843f57c11c02b0289eefd42d00'
+          '7de92fff4b90c4821b3b133a05affd186fb93951'
+          '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b'
+          '76a0d4cd1b913db177a5a375bebc47e5956866ec'
+          '53be0f1437ebe595240d8dbdd819939582b97fb9')
+provides=('dns-server')
+
+install=install
+backup=('etc/logrotate.d/named'
+        'etc/conf.d/named'
+        'etc/named.conf')
+
+build() {
+	cd "${srcdir}/bind-${_pkgver}"
+
+	patch -p1 -i ../remove-tools.patch
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-linux-caps \
+		--with-openssl \
+		--with-libxml2 \
+		--with-libtool \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/bind-${_pkgver}"
+
+	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+	make DESTDIR="${pkgdir}" install
+
+	rmdir "${pkgdir}/var/run"
+	install -d "${pkgdir}"/usr/share/doc/bind
+	install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind
+
+	install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
+	install -D -m644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/named.conf
+	install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
+	install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service
+	install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named
+	install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf
+
+	install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named
+	install    -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named
+	install    -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named
+	install    -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named
+}
diff --git a/community/bind/install b/community/bind/install
new file mode 100644
index 000000000..287d0e05b
--- /dev/null
+++ b/community/bind/install
@@ -0,0 +1,21 @@
+post_install() {
+	getent group named &>/dev/null || groupadd -g 40 named
+	getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named
+	passwd -l named &>/dev/null
+
+	touch var/log/named.log
+	chown named:named var/log/named.log
+
+	# create an rndc.key if it doesn't already exist
+	if [[ ! -s etc/rndc.key ]]; then
+		usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
+		chown root:named etc/rndc.key
+		chmod 640 etc/rndc.key
+	fi
+}
+
+pre_remove() {
+	getent passwd named &>/dev/null && userdel named >/dev/null
+	getent group named &>/dev/null && groupdel named >/dev/null
+	return 0
+}
diff --git a/community/bind/localhost.zone b/community/bind/localhost.zone
new file mode 100644
index 000000000..e3ff9641c
--- /dev/null
+++ b/community/bind/localhost.zone
@@ -0,0 +1,10 @@
+$ORIGIN localhost.
+@			1D IN SOA	@ root (
+					42		; serial (yyyymmdd##)
+					3H		; refresh
+					15M		; retry
+					1W		; expiry
+					1D )		; minimum ttl
+
+			1D IN NS	@
+			1D IN A		127.0.0.1
diff --git a/community/bind/named b/community/bind/named
new file mode 100755
index 000000000..65dd0fe82
--- /dev/null
+++ b/community/bind/named
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/named
+
+PIDFILE=/run/named/named.pid
+PID=$(cat $PIDFILE 2>/dev/null)
+readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; }
+
+case "$1" in
+  start)
+    stat_busy "Starting BIND"
+    [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS}
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon named
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping BIND"
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon named
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  reload)
+    stat_busy "Reloading BIND"
+    [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      stat_done
+    fi
+    ;;
+  *)
+    echo "usage: $0 {start|stop|reload|restart}"
+esac
+exit 0
diff --git a/community/bind/named.conf b/community/bind/named.conf
new file mode 100644
index 000000000..4aaf19a49
--- /dev/null
+++ b/community/bind/named.conf
@@ -0,0 +1,64 @@
+// 
+// /etc/named.conf
+//
+
+options {
+	directory "/var/named";
+	pid-file "/run/named/named.pid";
+	auth-nxdomain yes;
+	datasize default;
+// Uncomment these to enable IPv6 connections support
+// IPv4 will still work:
+//	listen-on-v6 { any; };
+// Add this for no IPv4:
+//	listen-on { none; };
+
+	// Default security settings.
+	allow-recursion { 127.0.0.1; };
+	allow-transfer { none; };
+	allow-update { none; };
+    version none;
+    hostname none;
+    server-id none;
+};
+
+zone "localhost" IN {
+	type master;
+	file "localhost.zone";
+	allow-transfer { any; };
+};
+
+zone "0.0.127.in-addr.arpa" IN {
+	type master;
+	file "127.0.0.zone";
+	allow-transfer { any; };
+};
+
+zone "." IN {
+	type hint;
+	file "root.hint";
+};
+
+//zone "example.org" IN {
+//	type slave;
+//	file "example.zone";
+//	masters {
+//		192.168.1.100; 
+//	};
+//	allow-query { any; };
+//	allow-transfer { any; };
+//};
+
+logging {
+        channel xfer-log {
+                file "/var/log/named.log";
+                print-category yes;
+                print-severity yes;
+                print-time yes;
+                severity info;
+        };
+        category xfer-in { xfer-log; };
+        category xfer-out { xfer-log; };
+        category notify { xfer-log; };
+};
+
diff --git a/community/bind/named.conf.d b/community/bind/named.conf.d
new file mode 100644
index 000000000..aecbd2307
--- /dev/null
+++ b/community/bind/named.conf.d
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to BIND
+#
+NAMED_ARGS="-u named"
diff --git a/community/bind/named.logrotate b/community/bind/named.logrotate
new file mode 100644
index 000000000..5f9a47693
--- /dev/null
+++ b/community/bind/named.logrotate
@@ -0,0 +1,6 @@
+/var/log/named.log {
+   missingok
+   postrotate
+      /bin/kill -HUP `cat /run/named/named.pid 2>/dev/null` 2>/dev/null || true
+   endscript
+}
diff --git a/community/bind/named.service b/community/bind/named.service
new file mode 100644
index 000000000..c21f13f4b
--- /dev/null
+++ b/community/bind/named.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Internet domain name server
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/named -f -u named
+ExecReload=/usr/sbin/rndc reload
+ExecStop=/usr/sbin/rndc stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/bind/remove-tools.patch b/community/bind/remove-tools.patch
new file mode 100644
index 000000000..29b4c9c5f
--- /dev/null
+++ b/community/bind/remove-tools.patch
@@ -0,0 +1,12 @@
+diff -aur old/bin/Makefile.in new/bin/Makefile.in
+--- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
++++ new/bin/Makefile.in	2011-08-28 19:14:17.025674400 -0700
+@@ -19,7 +19,7 @@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
++SUBDIRS =	named rndc dnssec tests tools nsupdate \
+ 		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
+ TARGETS =
+ 
diff --git a/community/bind/tmpfiles.d b/community/bind/tmpfiles.d
new file mode 100644
index 000000000..1cfc82d08
--- /dev/null
+++ b/community/bind/tmpfiles.d
@@ -0,0 +1 @@
+d /run/named 0750 named named -
diff --git a/community/bird/bird.conf b/community/bird/bird.conf
deleted file mode 100644
index 88276d8cf..000000000
--- a/community/bird/bird.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh noet:
-
-DAEMON_OPTS='-u nobody -g nobody'
diff --git a/community/bird/bird.rc b/community/bird/bird.rc
deleted file mode 100644
index a3aa5e4ad..000000000
--- a/community/bird/bird.rc
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-DAEMON=/usr/sbin/${0##*/}
-PID=$(pidof -o %PPID $DAEMON)
-
-case "$1" in
-  start)
-    stat_busy "Starting ${0##*/} daemon"
-    [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0
-    stat_fail
-  ;;
-  stop)
-    stat_busy "Stopping ${0##*/} daemon"
-    [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
-    stat_fail
-  ;;
-  restart)
-    $0 stop
-    $0 start
-    exit 0
-  ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|restart}" >&2
-  ;;
-esac
-
-exit 1
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
index 6b74d24b3..bfbf734f7 100644
--- a/community/bitcoin/PKGBUILD
+++ b/community/bitcoin/PKGBUILD
@@ -1,35 +1,33 @@
-# $Id: PKGBUILD 83240 2013-01-28 16:49:24Z stephane $
+# $Id: PKGBUILD 87403 2013-03-31 19:18:05Z stephane $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: shahid <helllamer@gmail.com>
 
 pkgbase=bitcoin
 pkgname=('bitcoin-daemon' 'bitcoin-qt')
-pkgver=0.7.2
+pkgver=0.8.1
 pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bitcoin.org/"
-makedepends=('boost' 'automoc4' 'miniupnpc')
-conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
-replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
+makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc')
 license=('MIT')
 source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz)
-sha256sums=('23d44161670c521f2aba64f9351b42260baa6bb2981640617c8e2e7683e5855c')
+sha256sums=('6d7f023a9df1a436c51de83f7cd751f162be9b4fb1c06da05545f9fba7cb2a98')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver-linux/src"
 
   # and make qt gui
-  qmake
+  qmake-qt4 USE_QRCODE=1
   make
 
   # make bitcoind
-  make -f makefile.unix -C src  CXXFLAGS="$CXXFLAGS" USE_UPNP=1
+  make -f makefile.unix -C src  CXXFLAGS="$CXXFLAGS"
 }
 
 
 package_bitcoin-qt() {
   pkgdesc="Bitcoin is a peer-to-peer network based digital currency - QT"
-  depends=(boost-libs qt miniupnpc)
+  depends=(boost-libs qt4 miniupnpc qrencode)
   install=bitcoin-qt.install
 
   cd "$srcdir/$pkgbase-$pkgver-linux/src"
diff --git a/community/blackbox/PKGBUILD b/community/blackbox/PKGBUILD
deleted file mode 100644
index c8c641216..000000000
--- a/community/blackbox/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 58674 2011-11-17 13:44:24Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: durbatuluk <dvdscripter@gmail.org>
-# Contributor: Steve Ponsford <sp4d@lavabit.com>
-
-pkgname=blackbox
-pkgver=0.70.1
-pkgrel=10
-pkgdesc="A window manager for X11"
-url="http://blackboxwm.sourceforge.net/"
-arch=('i686' 'x86_64')
-depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt')
-license=('MIT')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/blackboxwm/$pkgname-$pkgver.tar.gz
-	gcc4.3.patch
-	bbdock.patch
-	bsetbg-feh.patch
-	textpropertytostring-unconditional.patch)
-md5sums=('2d173b95ca5e64ef478c6a5d2deee9df'
-         'bc7a1335d77cdeb6f85cba4d01e68e63'
-         '69c5a5e981b087b2d8267cab996b48dd'
-         'e7fb0d5bfd95820c0194ec73df66dadc'
-         '3b92ad246f07126dd55ae9634d6e875e')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  patch -Np1 -i ../gcc4.3.patch
-  patch -Np0 -i ../bbdock.patch
-  patch -Np0 -i ../bsetbg-feh.patch
-  patch -Np1 -i ../textpropertytostring-unconditional.patch
-
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-  make DESTDIR=$pkgdir install
-
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/community/blackbox/bbdock.patch b/community/blackbox/bbdock.patch
deleted file mode 100644
index 709b6cfe1..000000000
--- a/community/blackbox/bbdock.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/Slit.cc	2005-01-04 05:58:33.000000000 -0700
-+++ /root/tmp/Slit.cc	2007-12-29 11:13:09.000000000 -0700
-@@ -248,6 +248,13 @@
-     bt::PixmapCache::find(screen->screenNumber(), texture,
-                           frame.rect.width(), frame.rect.height(),
-                           frame.pixmap);
-+/*** START: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative **************/
-+  if ((texture.texture() & bt::Texture::Gradient) && frame.pixmap)
-+    XSetWindowBackgroundPixmap(display, frame.window, frame.pixmap);
-+  else if ((texture.texture() & bt::Texture::Solid))
-+    XSetWindowBackground(display, frame.window, 
-+      texture.color1().pixel(screen->screenNumber()));
-+/*** STOP: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative ***************/
-   XClearArea(display, frame.window, 0, 0,
-              frame.rect.width(), frame.rect.height(), True);
- 
diff --git a/community/blackbox/bsetbg-feh.patch b/community/blackbox/bsetbg-feh.patch
deleted file mode 100644
index 17a612ff0..000000000
--- a/community/blackbox/bsetbg-feh.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- util/bsetbg.orig	2008-03-26 21:17:04.000000000 -0700
-+++ util/bsetbg	2008-03-26 21:21:57.000000000 -0700
-@@ -22,7 +22,7 @@
- 
- PATH=$PATH:/usr/bin:/usr/local/bin:/usr/X11R6/bin
- 
--img_apps="display xli xsetbg Esetroot qiv wmsetbg xv"
-+img_apps="display xli xsetbg Esetroot qiv wmsetbg xv feh"
- 
- display_full_cmd="display -geometry 800x600 -window root"
- display_tile_cmd="display -window root"
-@@ -59,6 +59,11 @@
- xsetbg_center_cmd="xsetbg -center"
- xsetbg_default_cmd="$xsetbg_center_cmd"
- 
-+feh_full_cmd="feh --bg-scale"
-+feh_tile_cmd="feh --bg-tile"
-+feh_center_cmd="feh --bg-center"
-+feh_default_cmd="$feh_center_cmd"
-+
- ##################################
- 
- me=`basename $0`
diff --git a/community/blackbox/gcc4.3.patch b/community/blackbox/gcc4.3.patch
deleted file mode 100644
index 40a9dcdef..000000000
--- a/community/blackbox/gcc4.3.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -Nur blackbox-0.70.1/lib/Image.cc blackbox-0.70.1-new/lib/Image.cc
---- blackbox-0.70.1/lib/Image.cc	2005-04-08 08:41:09.000000000 -0700
-+++ blackbox-0.70.1-new/lib/Image.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -45,6 +45,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
-+#include <cstring>
-+
- // #define COLORTABLE_DEBUG
- // #define MITSHM_DEBUG
- 
-diff -Nur blackbox-0.70.1/lib/Resource.cc blackbox-0.70.1-new/lib/Resource.cc
---- blackbox-0.70.1/lib/Resource.cc	2005-04-06 14:16:50.000000000 -0700
-+++ blackbox-0.70.1-new/lib/Resource.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -30,6 +30,8 @@
- 
- #include <stdio.h>
- 
-+#include <cstring>
-+
- 
- bt::Resource::Resource(void)
-   : db(NULL)
-diff -Nur blackbox-0.70.1/lib/XDG.cc blackbox-0.70.1-new/lib/XDG.cc
---- blackbox-0.70.1/lib/XDG.cc	2005-04-06 07:04:38.000000000 -0700
-+++ blackbox-0.70.1-new/lib/XDG.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -26,7 +26,7 @@
- #include "XDG.hh"
- 
- #include <stdlib.h>
--
-+#include <algorithm>
- 
- // make sure directory names end with a slash
- static std::string terminateDir(const std::string &string)
-diff -Nur blackbox-0.70.1/src/BlackboxResource.cc blackbox-0.70.1-new/src/BlackboxResource.cc
---- blackbox-0.70.1/src/BlackboxResource.cc	2005-10-18 00:34:46.000000000 -0700
-+++ blackbox-0.70.1-new/src/BlackboxResource.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -33,6 +33,8 @@
- #include <X11/Xutil.h>
- #include <X11/cursorfont.h>
- 
-+#include <cstring>
-+
- 
- BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
-   screen_resources = 0;
-diff -Nur blackbox-0.70.1/src/Screen.cc blackbox-0.70.1-new/src/Screen.cc
---- blackbox-0.70.1/src/Screen.cc	2005-10-18 01:07:22.000000000 -0700
-+++ blackbox-0.70.1-new/src/Screen.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -48,6 +48,8 @@
- #include <ctype.h>
- #include <dirent.h>
- 
-+#include <cstring>
-+
- 
- static bool running = true;
- static int anotherWMRunning(Display *, XErrorEvent *) {
-diff -Nur blackbox-0.70.1/src/ScreenResource.cc blackbox-0.70.1-new/src/ScreenResource.cc
---- blackbox-0.70.1/src/ScreenResource.cc	2005-04-12 22:54:08.000000000 -0700
-+++ blackbox-0.70.1-new/src/ScreenResource.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -33,6 +33,8 @@
- 
- #include <assert.h>
- 
-+#include <cstring>
-+
- 
- static const int iconify_width  = 9;
- static const int iconify_height = 9;
-diff -Nur blackbox-0.70.1/src/main.cc blackbox-0.70.1-new/src/main.cc
---- blackbox-0.70.1/src/main.cc	2005-01-03 02:42:57.000000000 -0700
-+++ blackbox-0.70.1-new/src/main.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -36,6 +36,8 @@
- 
- #include <stdio.h>
- 
-+#include <cstring>
-+
- 
- static void showHelp(int exitval) {
-   // print version - this should not be localized!
-diff -Nur blackbox-0.70.1/util/bsetbg blackbox-0.70.1-new/util/bsetbg
---- blackbox-0.70.1/util/bsetbg	2004-12-22 02:40:18.000000000 -0700
-+++ blackbox-0.70.1-new/util/bsetbg	2008-05-21 20:52:44.000000000 -0700
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- # Copyright (c) 2000-2002 Timothy M. King (tmk@lordzork.com)
- #
-diff -Nur blackbox-0.70.1/util/bsetroot.cc blackbox-0.70.1-new/util/bsetroot.cc
---- blackbox-0.70.1/util/bsetroot.cc	2005-03-15 00:01:37.000000000 -0700
-+++ blackbox-0.70.1-new/util/bsetroot.cc	2008-05-21 20:52:44.000000000 -0700
-@@ -27,11 +27,14 @@
- #include <Pen.hh>
- #include <Texture.hh>
- 
-+#include <cstdlib>
- #include <cctype>
- 
- #include <X11/Xatom.h>
- #include <stdio.h>
- 
-+#include <cstring>
-+
- 
- // ignore all X errors
- static int x11_error(::Display *, XErrorEvent *)
diff --git a/community/blackbox/textpropertytostring-unconditional.patch b/community/blackbox/textpropertytostring-unconditional.patch
deleted file mode 100644
index ed320388a..000000000
--- a/community/blackbox/textpropertytostring-unconditional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Declare bt::textPropertyToString unconditionally.
-Author: Jakub Wilk <jwilk@debian.org>
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/614468
-Last-Update: 2011-03-12
-
---- a/lib/Util.hh
-+++ b/lib/Util.hh
-@@ -25,6 +25,8 @@
- #ifndef __Util_hh
- #define __Util_hh
- 
-+#include <X11/Xutil.h>
-+
- #include <limits.h>
- #include <string>
- 
-@@ -94,10 +96,8 @@
- 
-   std::string tolower(const std::string &string);
- 
--#ifdef _XUTIL_H_
-   std::string textPropertyToString(::Display *display,
-                                    ::XTextProperty& text_prop);
--#endif
- 
- } // namespace bt
- 
diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD
index 0f0dc6315..8d339de81 100644
--- a/community/blueman/PKGBUILD
+++ b/community/blueman/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD 78176 2012-10-17 10:22:59Z allan $
+# $Id: PKGBUILD 87809 2013-04-06 22:04:55Z bgyorgy $
 # Maintainer : Ionut Biru <ibiru@archlinux.org
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 
 pkgname=blueman
 pkgver=1.23
-pkgrel=5
+pkgrel=6
 pkgdesc="GTK+ bluetooth manager"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-url="http://blueman-project.org"
-depends=('python2-notify' 'bluez' 'python2-dbus' 'gtk2' 'python2-gobject2' 'startup-notification'
-	 'obex-data-server' 'polkit-gnome' 'xdg-utils' 'hicolor-icon-theme' 'libpulse'
-	 'notification-daemon')
+url="https://launchpad.net/blueman"
+depends=('bluez' 'gnome-icon-theme' 'libpulse' 'obex-data-server' 'python2-dbus'
+         'python2-notify' 'startup-notification' 'xdg-utils')
 makedepends=('pyrex' 'intltool')
 optdepends=('dnsmasq: For creating PAN network'
-	    'gconf: For gconf configuration support'
+	    'modemmanager: For modem management service'
+	    'notification-daemon: For desktop notifications'
+	    'polkit-gnome: For privileged actions'
 	    'pulseaudio: To use the pulseaudio plugin'
-	    'notification-daemon: for desktop notifications'
-	    'libnotify: for desktop notifications'
-	    'modemmanager: for modem management service'
-	    'gnome-icon-theme: icon theme')
+	    'python2-gconf: For gconf configuration support')
 options=('!libtool')
 install=$pkgname.install
-source=(http://download.tuxfamily.org/blueman/${pkgname}-${pkgver}.tar.gz)
+source=(https://launchpad.net/${pkgname}/1.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
 md5sums=('f0bee59589f4c23e35bf08c2ef8acaef')
 
 build() {
@@ -44,5 +42,5 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  echo "OnlyShowIn=GNOME;XFCE;" >> ${pkgdir}/etc/xdg/autostart/blueman.desktop
+  echo "NotShowIn=KDE;" >> ${pkgdir}/etc/xdg/autostart/blueman.desktop
 }
diff --git a/community/bmp-musepack/PKGBUILD b/community/bmp-musepack/PKGBUILD
index 5d339287e..b5637201c 100644
--- a/community/bmp-musepack/PKGBUILD
+++ b/community/bmp-musepack/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=bmp-musepack
 pkgver=1.2
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A BMP plugin for playing sounds in Musepack (MPC) format"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://musepack.net/"
 license=('BSD')
 depends=('bmp' 'libmpcdec' 'taglib')
diff --git a/community/bmp-wma/PKGBUILD b/community/bmp-wma/PKGBUILD
index 7817ceb44..62dfc89ef 100644
--- a/community/bmp-wma/PKGBUILD
+++ b/community/bmp-wma/PKGBUILD
@@ -4,11 +4,11 @@
 
 pkgname=bmp-wma
 pkgver=0.1.1
-pkgrel=4
+pkgrel=4.1
 pkgdesc="WMA plugin for Beep Media Player"
 url="http://bmp-plugins.berlios.de/novelian/project.php?p=bmp-wma"
 license=('GPL')
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 depends=('bmp')
 groups=('bmp-plugins' 'bmp-io-plugins')
 options=('!libtool' '!emptydirs')
@@ -20,7 +20,7 @@ md5sums=('8dcf3fcdb10e8e2e386f70745812412b'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch"
-  if [ "${CARCH}" = "x86_64" ]; then
+  if [ "${CARCH}" != "i686" ]; then
     export CFLAGS="${CFLAGS} -fPIC"
   fi
   ./configure --prefix=/usr --disable-static
diff --git a/community/bochs/PKGBUILD b/community/bochs/PKGBUILD
index b8df6203d..e5722c6eb 100644
--- a/community/bochs/PKGBUILD
+++ b/community/bochs/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=bochs
 pkgver=2.6
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A portable x86 PC emulation software package"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://bochs.sourceforge.net/"
 license=('LGPL')
 depends=('gcc-libs' 'libxrandr')
diff --git a/community/boinc/PKGBUILD b/community/boinc/PKGBUILD
deleted file mode 100644
index 7e24b51c0..000000000
--- a/community/boinc/PKGBUILD
+++ /dev/null
@@ -1,74 +0,0 @@
-# $Id: PKGBUILD 79673 2012-11-11 01:08:11Z fyan $
-# Maintainer: Felix Yan <felixonmars@gmail.com>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Michal Krenek <mikos@sg1.cz>
-
-pkgname=boinc
-pkgver=7.0.28
-pkgrel=1
-pkgdesc="Berkeley Open Infrastructure for Network Computing for desktop with X"
-arch=('i686' 'x86_64')
-url="http://boinc.berkeley.edu/"
-license=('LGPL')
-depends=('curl' 'wxgtk' 'libnotify' 'libxss' 'sqlite')
-makedepends=('curl' 'libxslt' 'perl-xml-sax' 'subversion' 'wxgtk' 'libnotify')
-options=('!libtool')
-install=$pkgname.install
-source=(boinc.rc boinc.bash boinc.desktop boinc.service boinc-AM_CONDITIONAL.patch)
-
-_svnroot="http://boinc.berkeley.edu/svn/tags"
-_svnmod="boinc_core_release_${pkgver//./_}"
-
-build() {
-  cd ${srcdir}
-
-  msg "Connecting to boinc.berkeley.edu SVN server..."
-  svn co ${_svnroot}/${_svnmod} || (error "SVN checkout failed" && return 1)
-  msg "SVN checkout done or server timeout"
-
-  msg "Starting make..."
-  rm -fr ${_svnmod}-build
-  cp -r $_svnmod $_svnmod-build
-  cd $_svnmod-build
-  
-  patch -p1 -i ${srcdir}/boinc-AM_CONDITIONAL.patch
-
-  ./_autosetup
-
-  ./configure --prefix=/usr --disable-server --enable-unicode --with-ssl \
-              --with-wxdir=/usr/lib --with-wx-config=$(which wx-config) \
-              --disable-static --enable-client --enable-manager --with-x LDFLAGS='-lX11'
-  make
-}
-
-package() {
-  cd ${srcdir}/$_svnmod-build
-
-  make DESTDIR=${pkgdir} install
-
-#install rc-script
-  install -D -m755 ${srcdir}/$pkgname.rc ${pkgdir}/etc/rc.d/$pkgname
-
-#install systemd unit
-  install -D -m644 ${srcdir}/$pkgname.service ${pkgdir}/usr/lib/systemd/system/$pkgname.service
-
-#install bash-completion
-  install -D -m644 ${srcdir}/$pkgname.bash ${pkgdir}/usr/share/bash-completion/completions/$pkgname
-
-#install .desktop File
-  install -D -m644 ${srcdir}/${pkgname}.desktop \
-    ${pkgdir}/usr/share/applications/${pkgname}.desktop
-
-#install icons
-  install -D -m644 ${srcdir}/${_svnmod}-build/clientgui/res/boincmgr.48x48.png \
-    ${pkgdir}/usr/share/pixmaps/$pkgname.png
-
-#killing /etc/init.d directory
-  rm -rf ${pkgdir}/etc/init.d
-}
-
-md5sums=('c6dadc333f982ea7b548602a70bd1e93'
-         '4d00e1aa4090a3f51feb20f5a541b9ee'
-         '17969d849f3cf27c2100b20a7b7a7e64'
-         '3d5cbab785cc8b004661b17c65883fd5'
-         'e27047518dec54d4db38816487a28661')
diff --git a/community/boinc/boinc-AM_CONDITIONAL.patch b/community/boinc/boinc-AM_CONDITIONAL.patch
deleted file mode 100644
index 3ebf7c887..000000000
--- a/community/boinc/boinc-AM_CONDITIONAL.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- A/configure.ac
-+++ B/configure.ac
-@@ -39,6 +39,7 @@ AC_PROG_CC
- AC_PROG_CXX
- AC_PROG_F77
- AC_PROG_CPP
-+AC_PROG_OBJCXX
- AC_PROG_MAKE_SET
- SAH_LINKS
- AC_LANG_PUSH(C)
-@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test "
- AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
- AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
- 
-+PKG_CHECK_MODULES([GTK2], [gtk+-2.0])
-+
- dnl ======================================================================
- dnl some more vodoo required for building portable client-binary (client, clientgui)
- dnl ======================================================================
diff --git a/community/boinc/boinc.bash b/community/boinc/boinc.bash
deleted file mode 100644
index b614dd54c..000000000
--- a/community/boinc/boinc.bash
+++ /dev/null
@@ -1,99 +0,0 @@
-# Source this file in BASH to get command completion (using tab) for
-# boinc and boinccmd. Written by Frank S. Thomas <fst@debian.org>.
-# See also: http://boinc.berkeley.edu/trac/wiki/BashCommandCompletion
-
-_boinc()
-{
-    local cur prev opts
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-
-    opts="$(boinc_client --help | \
-        sed -n -r 's/^[[:space:]]*(--[a-z_]*).*/\1/p')"
-
-    # Handle options that require one or more arguments.
-    case "$prev" in
-        --attach_project|--detach_project|--reset_project|--update_prefs|\
-        --gui_rpc_port)
-            return 0
-        ;;
-    esac
-
-    # Handle options that require two arguments.
-    if [[ COMP_CWORD -gt 1 ]]; then
-        pprev="${COMP_WORDS[COMP_CWORD-2]}"
-
-        case "$pprev" in
-            --attach_project)
-                return 0
-            ;;
-        esac
-    fi
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
-        return 0
-    fi
-}
-complete -F _boinc -o default boinc_client
-
-_boinccmd()
-{
-    local cur prev opts cmds
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-
-    opts="--host --passwd -h --help -V --version"
-    cmds="$(boinc_cmd --help 2>&1 | \
-        sed -n -r 's/^[[:space:]]*(--[a-z_]*).*/\1/p')"
-
-    # The following construct assures that:
-    # - no command follows if one of $opts or $cmds was given
-    # - after --host follows only one command or --passwd and one command
-    # - after --passwd follows only one command
-    if [[ $COMP_CWORD -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W "$opts $cmds" -- "$cur") )
-        return 0
-    else
-        if [[ "${COMP_WORDS[@]}" =~ ".* --host .* --passwd .*" ]]; then
-            if [[ $COMP_CWORD -eq 5 ]]; then
-                COMPREPLY=( $(compgen -W "$cmds" -- "$cur") )
-            fi
-        elif [[ "${COMP_WORDS[@]}" =~ ".* --passwd .*" ]]; then
-            if [[ $COMP_CWORD -eq 3 ]]; then
-                COMPREPLY=( $(compgen -W "$cmds" -- "$cur") )
-            fi
-        elif [[ "${COMP_WORDS[@]}" =~ ".* --host .*" ]]; then
-            if [[ $COMP_CWORD -eq 3 ]]; then
-                COMPREPLY=( $(compgen -W "--passwd $cmds" -- "$cur") )
-            fi
-       fi
-    fi
-
-    # Handle options/commands that require one or more arguments.
-    case "$prev" in
-        --get_messages|--passwd)
-            return 0
-        ;;
-
-        --host)
-            _known_hosts
-            return 0
-        ;;
-
-        --set_run_mode|--set_network_mode)
-            COMPREPLY=( $(compgen -W "always auto never" -- "$cur") )
-            return 0
-        ;;
-
-        --set_screensaver_mode)
-            COMPREPLY=( $(compgen -W "on off" -- "$cur") )
-            return 0
-        ;;
-    esac
-}
-complete -F _boinccmd boinc_cmd
-
-# vim: syntax=sh
\ No newline at end of file
diff --git a/community/boinc/boinc.desktop b/community/boinc/boinc.desktop
deleted file mode 100644
index 267d56d6d..000000000
--- a/community/boinc/boinc.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Exec=/usr/bin/boincmgr
-Path=/var/lib/boinc
-Icon=boincmgr
-Categories=System;Monitor;GTK;
-Name=BOINC Manager
-GenericName=BOINC monitor and control utility
-GenericName[cs]=Monitorovací a ovládací nástroj pro BOINC
-GenericName[de]=BOINC Überwachungs- und Kontrollprogramm
-GenericName[pt]=Monitorização BOINC e utilitário de controlo
-Comment=Configure or monitor a BOINC core client
-Comment[cs]=Monitoruje a nastavuje klienta BOINC
-Comment[de]=BOINC Basis Client konfigurieren oder überwachen
-Comment[pt]=Configurar ou monitorizar o cliente básico do BOINC
diff --git a/community/boinc/boinc.install b/community/boinc/boinc.install
deleted file mode 100644
index b54002ada..000000000
--- a/community/boinc/boinc.install
+++ /dev/null
@@ -1,23 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  /usr/sbin/groupadd boinc 2>/dev/null || true
-  /usr/sbin/useradd -s /bin/bash -g boinc -d /var/lib/boinc boinc 2>/dev/null || true
-
-  if [ ! -d /var/lib/boinc ]; then
-    install -d /var/lib/boinc
-  fi
-  chown -R boinc:boinc /var/lib/boinc
-
-  echo '>>> Client RPC password can be found in /var/lib/boinc/gui_rpc_auth.cfg'
-  echo '>>> (this file is generated after first run of /etc/rc.d/boinc start).'
-  echo '>>> Remove it from gui_rpc_auth.cfg if you do not want to use password.'
-  echo '>>> See more details on the Arch Linux BOINC wiki page.'
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /usr/sbin/userdel boinc
-  /usr/sbin/groupdel boinc
-
-  echo '>>> If you really do not want to run Boinc in the future, you may completely remove the directory "/var/lib/boinc".'
-}
diff --git a/community/boinc/boinc.rc b/community/boinc/boinc.rc
deleted file mode 100644
index 160043a04..000000000
--- a/community/boinc/boinc.rc
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-BOINCUSER="boinc"
-BOINCDIR="/var/lib/boinc"
-PID=`pidof -o %PPID /usr/bin/boinc_client`
-case "$1" in
-  attach)
-    echo "Enter the Project URL: "
-    read url
-    echo "Enter your Account Key: "
-    read key
-    echo "Attaching to project"
-    cd $BOINCDIR
-    su $BOINCUSER -c "boinccmd --project_attach $url $key"
-;;
-  start)
-    stat_busy "Starting boinc"
-    if [ -z "$PID" ]; then
-      su $BOINCUSER -c "nice -n 19 /usr/bin/boinc_client --daemon --dir ${BOINCDIR} --redirectio"
-    else
-      false
-    fi
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon boinc
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping boinc"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon boinc
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {attach|start|stop|restart}"
-esac
-exit 0
diff --git a/community/boinc/boinc.service b/community/boinc/boinc.service
deleted file mode 100644
index 12634ff5a..000000000
--- a/community/boinc/boinc.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=BOINC Daemon
-
-[Service]
-User=boinc
-Nice=19
-ExecStart=/usr/bin/boinc_client --dir /var/lib/boinc --redirectio
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/botan/PKGBUILD b/community/botan/PKGBUILD
index 762a96f46..caf945b04 100644
--- a/community/botan/PKGBUILD
+++ b/community/botan/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 83128 2013-01-27 16:10:24Z pierre $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# $Id: PKGBUILD 87983 2013-04-09 20:48:46Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: d'Ronin <daronin@2600.com>
 
 pkgname=botan
-pkgver=1.10.3
+pkgver=1.10.5
 pkgrel=1
-pkgdesc="Crypto library written in C++"
+pkgdesc='Crypto library written in C++'
 license=('BSD')
-arch=('i686' 'x86_64')
-url="http://botan.randombit.net/"
+arch=('x86_64' 'i686' 'mips64el')
+url='http://botan.randombit.net/'
 depends=('gcc-libs' 'sh')
 makedepends=('python2')
-source=(http://files.randombit.net/botan/Botan-${pkgver}.tbz{,.asc})
-sha1sums=('9f929101bf75c19432f49f57c80d2d26eec91dcb'
-          'd03b220849e3d3b3a49363a0debc266b615d9fca')
+source=("http://files.randombit.net/botan/Botan-${pkgver}.tbz")
+sha256sums=('2934c00533847dc93c485081d3ce6aae4a110151a69b587b895241159da77cf3')
 
 build() {
-  cd "${srcdir}/Botan-${pkgver}"
-  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' configure.py
+  cd "$srcdir/Botan-$pkgver"
+
+  sed -i 's:env python:env python2:' configure.py
+  sed -i 's/mabi=64/mabi=n32/g' src/build-data/cc/gcc.txt
   ./configure.py --prefix=/usr
   make 
 }
 
 package() {
-  cd "${srcdir}/Botan-${pkgver}"
-  make DESTDIR="${pkgdir}/usr" install
-  install -D -m644 doc/license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  find "${pkgdir}/usr/share/doc" -type f -exec chmod 0644 {} \;
+  cd "$srcdir/Botan-$pkgver"
+
+  make DESTDIR="$pkgdir/usr" install
+  install -Dm644 doc/license.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  find "$pkgdir/usr/share/doc" -type f -exec chmod 0644 {} \;
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/community/bsd-games/PKGBUILD b/community/bsd-games/PKGBUILD
index 910754aec..f91561543 100644
--- a/community/bsd-games/PKGBUILD
+++ b/community/bsd-games/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73816 2012-07-15 23:02:25Z cbrannon $
+# $Id: PKGBUILD 86789 2013-03-22 02:13:44Z eric $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: SmackleFunky <smacklefunky@optusnet.com.au>
@@ -17,15 +17,21 @@ source=(ftp://ftp.ibiblio.org/pub/Linux/games/$pkgname-$pkgver.tar.gz
         config.params stdio.h.diff gamescreen.h.diff getline.diff
         number.c.diff bsd-games-2.17-64bit.patch
         bad-ntohl-cast.diff null-check.diff)
+md5sums=('238a38a3a017ca9b216fc42bde405639'
+         '9916baef5cb8aa09361f67de12ca7bef'
+         '784f68c796b9e099ac008aecef1af998'
+         '9c0fa6e2345bd0a7945c9a41d5ba68aa'
+         '5356bd6999ae53dd27cb2a0f837a3e70'
+         '47249a90f38ccb4dd07625b245bbc728'
+         '257813b76a41c8b2c02701571c804227'
+         '3d21a9dad2e603ddf3842972e4ff85a1'
+         'a43ca0b4b9ebc4eec26372c52014ac0a')
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
   [ "$CARCH" = "x86_64" ] && patch -p1 < "$srcdir/bsd-games-2.17-64bit.patch"
   cp "${srcdir}/config.params" .
 
-# Patches
-  sed -i "s%PKGDIR%$pkgdir%" config.params
-
   # Several games use their own internal functions named getline.  All
   # are different, and none is the getline from glibc.  So we need a patch
   # in order to compile.  Each internal getline function is prefixed
@@ -65,6 +71,7 @@ build() {
 
 package() {
   cd "${srcdir}/$pkgname-$pkgver"
+  sed -i "s%PKGDIR%$pkgdir%g" hide-game install-man install-score Makeconfig subst.sed
   make install
   # This make install command does install to $pkgdir, because of the
   # change to config.params in the build function.
@@ -91,12 +98,3 @@ package() {
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/COPYING"
 }
 
-md5sums=('238a38a3a017ca9b216fc42bde405639'
-         '9916baef5cb8aa09361f67de12ca7bef'
-         '784f68c796b9e099ac008aecef1af998'
-         '9c0fa6e2345bd0a7945c9a41d5ba68aa'
-         '5356bd6999ae53dd27cb2a0f837a3e70'
-         '47249a90f38ccb4dd07625b245bbc728'
-         '257813b76a41c8b2c02701571c804227'
-         '3d21a9dad2e603ddf3842972e4ff85a1'
-         'a43ca0b4b9ebc4eec26372c52014ac0a')
diff --git a/community/bsdiff/Makefile.patch b/community/bsdiff/Makefile.patch
index b2a3ffa82..e5f1aa4ee 100644
--- a/community/bsdiff/Makefile.patch
+++ b/community/bsdiff/Makefile.patch
@@ -6,7 +6,7 @@
  PREFIX		?=	/usr/local
 -INSTALL_PROGRAM	?=	${INSTALL} -c -s -m 555
 -INSTALL_MAN	?=	${INSTALL} -c -m 444
-+INSTALL		=	/bin/install
++INSTALL		=	/usr/bin/install
 +INSTALL_PROGRAM	?=	${INSTALL} -D -m755
 +INSTALL_MAN	?=	${INSTALL} -D -m644
  
diff --git a/community/bsdiff/PKGBUILD b/community/bsdiff/PKGBUILD
index 008397bca..581b03e40 100644
--- a/community/bsdiff/PKGBUILD
+++ b/community/bsdiff/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=bsdiff
 pkgver=4.3
-pkgrel=7
+pkgrel=7.1
 pkgdesc="bsdiff and bspatch are tools for building and applying patches to binary files."
 url="http://www.daemonology.net/bsdiff/"
 license=('BSD')
@@ -12,7 +12,7 @@ depends=('bzip2')
 source=(http://www.daemonology.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
 	Makefile.patch)
 md5sums=('e6d812394f0e0ecc8d5df255aa1db22a'
-         '87ec6120b2e2d38da5a67821af6ac356')
+         '3610499f8d8f406738bd3a0fbe0c4da9')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD
index 6e11ac52a..1c696163b 100644
--- a/community/busybox/PKGBUILD
+++ b/community/busybox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73502 2012-07-08 17:57:22Z spupykin $
+# $Id: PKGBUILD 85655 2013-03-04 13:07:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jens Pranaitis <jens@jenux.homelinux.org>
 
 pkgname=busybox
 pkgver=1.20.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Utilities for rescue and embedded systems"
 arch=("i686" "x86_64" 'mips64el')
 url="http://www.busybox.net"
diff --git a/community/busybox/busybox.install b/community/busybox/busybox.install
index 72a1e98b3..ecbeec39a 100644
--- a/community/busybox/busybox.install
+++ b/community/busybox/busybox.install
@@ -4,10 +4,10 @@ post_install() {
 }
 
 pre_upgrade() {
-  stat -c %a bin/busybox >tmp/busybox.upgrade.script
+  busybox stat -c %a bin/busybox >tmp/busybox.upgrade.script
 }
 
 post_upgrade() {
-  [ -f tmp/busybox.upgrade.script ] && chmod `cat tmp/busybox.upgrade.script` bin/busybox
-  rm -f tmp/busybox.upgrade.script
+  [ -f tmp/busybox.upgrade.script ] && busybox chmod `busybox cat tmp/busybox.upgrade.script` bin/busybox
+  busybox rm -f tmp/busybox.upgrade.script
 }
diff --git a/community/bwm-ng/PKGBUILD b/community/bwm-ng/PKGBUILD
index 5fe7bb1c7..4fd2d3509 100644
--- a/community/bwm-ng/PKGBUILD
+++ b/community/bwm-ng/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=bwm-ng
 pkgver=0.6
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A small and simple console-based live bandwidth monitor"
 arch=(i686 x86_64 'mips64el')
 url="http://www.gropp.org/"
diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD
index 73e21fb18..a63cfee27 100644
--- a/community/c++-gtk-utils/PKGBUILD
+++ b/community/c++-gtk-utils/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 81974 2013-01-05 08:10:13Z giovanni $
+# $Id: PKGBUILD 88546 2013-04-19 14:27:07Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=c++-gtk-utils
-pkgver=2.0.14
+pkgver=2.0.16
 pkgrel=1
 pkgdesc="Classes and functions for programming in GTK+"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cxx-gtk-utils.sourceforge.net/"
 license=('LGPL2.1')
 depends=('gtk3')
-options=('!libtool')
+options=('!libtool' '!docs' '!emptydirs')
 source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('84c7da0542bc60c093573c134e053c15')
+md5sums=('5502683a5ca2c725fb9dd205fe81ca5b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/cabextract/PKGBUILD b/community/cabextract/PKGBUILD
index ba6680251..bcf66a01e 100644
--- a/community/cabextract/PKGBUILD
+++ b/community/cabextract/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=cabextract
 pkgver=1.4
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A program to extract Microsoft cabinet (.CAB) files"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/community/cairo-dock-plugins/PKGBUILD b/community/cairo-dock-plugins/PKGBUILD
new file mode 100755
index 000000000..cad086944
--- /dev/null
+++ b/community/cairo-dock-plugins/PKGBUILD
@@ -0,0 +1,57 @@
+# $Id: PKGBUILD 88927 2013-04-24 21:31:30Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: Tofe <chris.chapuis@gmail.com>
+# Contributor: zhuqin <zhuqin83@gmail.com>
+# Contributor: tri1976 <trile7@gmail.com>
+# Contributor: snoopy33 <snoopy33@no-log.org>
+
+pkgname=cairo-dock-plugins
+pkgver=3.2.1
+pkgrel=2
+pkgdesc="Plugins for Cairo-Dock"
+url="https://launchpad.net/cairo-dock"
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('cairo-dock')
+makedepends=('cmake' 'alsa-lib' 'fftw' 'gnome-menus' 'gtk-sharp-2' 'gvfs' 'libetpan' 'libexif' 'libical' 'libpulse' 'libxklavier' 'libzeitgeist' 'lm_sensors' 'ndesk-dbus-glib' 'python' 'ruby' 'upower' 'vala' 'vte3' 'webkitgtk3')
+optdepends=('alsa-lib: AlsaMixer, Sound Effects applets'
+            'fftw: Impulse applet'
+            'gnome-menus: GMenu applet'
+            'gtk-sharp-2: Mono API'
+            'gvfs: GVFS integration'
+            'libetpan: Mail applet'
+            'libexif: Slider applet'
+            'libical: Clock applet'
+            'libpulse: Impulse applet'
+            'libxklavier: Keyboard Indicator applet'
+            'libzeitgeist: Recent Events applet'
+            'lm_sensors: System Monitor applet'
+            'ndesk-dbus-glib: Mono API'
+            'python: Python API'
+            'ruby: Ruby API'
+            'upower: Logout, PowerManager applets'
+            'vte3: Terminal applet'
+            'webkitgtk3: Weblets applet')
+options=('!libtool')
+source=("http://launchpad.net/cairo-dock-plug-ins/3.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('11b4433e40bbb1507757b23e167c521d620827576c2f30bb1a9642e0bff57e01')
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}/build
+
+  make DESTDIR=${pkgdir} install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/cairo-dock/PKGBUILD b/community/cairo-dock/PKGBUILD
new file mode 100755
index 000000000..d47e4d107
--- /dev/null
+++ b/community/cairo-dock/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 88925 2013-04-24 21:20:34Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: Tofe <chris.chapuis@gmail.com>
+# Contributor: erm67 <erm67@yahoo.it>
+
+pkgname=cairo-dock
+pkgver=3.2.1
+pkgrel=3
+pkgdesc="Light eye-candy fully themable animated dock"
+arch=('i686' 'x86_64' 'mips64el')
+url="https://launchpad.net/cairo-dock-core"
+license=('GPL')
+depends=('curl' 'dbus-glib' 'gtk3' 'librsvg')
+makedepends=('cmake')
+optdepends=('cairo-dock-plugins: Plugins for Cairo-Dock')
+options=('!libtool')
+source=("http://launchpad.net/${pkgname}-core/3.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz" 'gldit-rpath.patch')
+sha256sums=('441e407f92138dc604c796b0455777b765e298ecb8f3120104f521d0e0b34543'
+            '5a5fbc67aaa210387ef4410701747fe741942c99c4bd84ae771b96a3bdd1c4cc')
+
+prepare() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  patch -Np1 -i ../gldit-rpath.patch
+}
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}/build
+
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/cairo-dock/gldit-rpath.patch b/community/cairo-dock/gldit-rpath.patch
new file mode 100755
index 000000000..11f73bf55
--- /dev/null
+++ b/community/cairo-dock/gldit-rpath.patch
@@ -0,0 +1,13 @@
+--- a/src/gldit/CMakeLists.txt	2013-03-23 16:55:12.000000000 +0100
++++ b/src/gldit/CMakeLists.txt	2013-03-26 11:57:14.159200918 +0100
+@@ -82,9 +82,7 @@ link_directories(
+ 	${GTK_LIBRARY_DIRS}
+ 	${XEXTEND_LIBRARY_DIRS}
+ 	${XINERAMA_LIBRARY_DIRS}
+-	${CMAKE_SOURCE_DIR}/src/gldit
+-	${CMAKE_SOURCE_DIR}/src/icon-factory
+-	${CMAKE_SOURCE_DIR}/src/implementations)
++	)
+ 
+ # Define the library
+ add_library ("gldi" SHARED ${core_lib_SRCS})
diff --git a/community/calc/PKGBUILD b/community/calc/PKGBUILD
index 622528c4a..d4ca01a96 100644
--- a/community/calc/PKGBUILD
+++ b/community/calc/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=calc
 pkgver=2.12.4.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc="console calculator"
 arch=(i686 x86_64 'mips64el')
 url="http://www.isthe.com/chongo/tech/comp/calc/"
diff --git a/community/calcurse/PKGBUILD b/community/calcurse/PKGBUILD
index be65222f7..c6388e351 100644
--- a/community/calcurse/PKGBUILD
+++ b/community/calcurse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81291 2012-12-16 10:48:59Z lfleischer $
+# $Id: PKGBUILD 84062 2013-02-09 16:21:30Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: wain <wain.at.gmx.net>
 
 pkgname=calcurse
-pkgver=3.1.2
+pkgver=3.1.4
 pkgrel=1
 pkgdesc='A text-based personal organizer.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ license=('BSD')
 depends=('ncurses')
 install='calcurse.install'
 source=("http://calcurse.org/files/${pkgname}-${pkgver}.tar.gz"{,.asc})
-md5sums=('9ad32bd0efa9c8ed1e1d7df49aef5663'
-         '484c86e82252d39917d00fe4f80d807f')
+md5sums=('e354bdb7636daffa99ffb98534d04cb2'
+         '44baaf17198e2fd75d2d160dedee814f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/calf/include_fix.patch b/community/calf/include_fix.patch
deleted file mode 100644
index 243bd86ab..000000000
--- a/community/calf/include_fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -aur calf-0.0.18.6.orig/src/benchmark.cpp calf-0.0.18.6/src/benchmark.cpp
---- calf-0.0.18.6.orig/src/benchmark.cpp	2012-07-08 21:57:55.246042862 +0800
-+++ calf-0.0.18.6/src/benchmark.cpp	2012-07-08 21:58:20.015908672 +0800
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <config.h>
-+#include <unistd.h>
- #include <calf/audio_fx.h>
- 
- #ifdef BENCHMARK_PLUGINS
-diff -aur calf-0.0.18.6.orig/src/osctlnet.cpp calf-0.0.18.6/src/osctlnet.cpp
---- calf-0.0.18.6.orig/src/osctlnet.cpp	2012-07-08 21:57:55.246042862 +0800
-+++ calf-0.0.18.6/src/osctlnet.cpp	2012-07-08 21:58:19.002580827 +0800
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <sstream>
- #include <stdio.h>
-+#include <unistd.h>
- using namespace osctl;
- using namespace std;
- 
-diff -aur calf-0.0.18.6.orig/src/preset.cpp calf-0.0.18.6/src/preset.cpp
---- calf-0.0.18.6.orig/src/preset.cpp	2012-07-08 21:57:55.246042862 +0800
-+++ calf-0.0.18.6/src/preset.cpp	2012-07-08 21:58:18.989247567 +0800
-@@ -20,6 +20,7 @@
-  */
- 
- #include <config.h>
-+#include <unistd.h>
- #include <fcntl.h>
- #include <stdlib.h>
- #include <errno.h>
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
deleted file mode 100644
index 32dcab244..000000000
--- a/community/calibre/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 81470 2012-12-21 14:35:15Z 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.9.11
-pkgrel=1
-pkgdesc="Ebook management application"
-arch=('i686' 'x86_64') 
-url="http://calibre-ebook.com/"
-license=('GPL3')
-depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 
-         'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' 
-         'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 
-         'python2-imaging' 'shared-mime-info' 'python2-dnspython' 
-         'libunrar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' 
-         'python2-netifaces' 'python2-cssselect')
-makedepends=('python2-pycountry')
-optdepends=('ipython2: to use calibre-debug')
-install=calibre.install
-source=("http://calibre-ebook.googlecode.com/files/${pkgname}-${pkgver}.tar.xz"
-        'desktop_integration.patch'
-        'calibre-mount-helper')
-md5sums=('07e620aed65d7bae2a27ccea123da4c9'
-         '42c07b43d575b5e7e7524bd7b9528f0e'
-         '675cd87d41342119827ef706055491e7')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-
-  #rm -rf src/{cherrypy,pyPdf}
-  rm -rf src/cherrypy
-  sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
-
-  # Fix for calibre-0.8.58
-  sed -i -e "s:#!usr:#!/usr:g" src/calibre/ebooks/markdown/extensions/meta.py
-
-  sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
-    $(find . -regex ".*.py\|.*.recipe")
-
-  LANG='en_US.UTF-8' python2 setup.py build
-  # LANG='en_US.UTF-8' python2 setup.py resources
-  LANG='en_US.UTF-8' python2 setup.py translations
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  
-  patch -Np1 -i "${srcdir}/desktop_integration.patch"
-
-  # More on desktop integration (e.g. enforce arch defaults)
-  sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
-      -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \
-      -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \
-      -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \
-      -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py
-
-  # Fix the environment module location
-  sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py
-
-  install -d "${pkgdir}/usr/lib/python2.7/site-packages"
-  LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \
-    --staging-bindir="${pkgdir}/usr/bin" \
-    --staging-libdir="${pkgdir}/usr/lib" \
-    --staging-sharedir="${pkgdir}/usr/share"
-
-  find "${pkgdir}" -type d -empty -delete
-
-  # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/
-  rm -rf "${pkgdir}/usr/bin/calibre-mount-helper"
-  install -m 755 "${srcdir}/calibre-mount-helper" "${pkgdir}/usr/bin"
-}
diff --git a/community/calibre/calibre-mount-helper b/community/calibre/calibre-mount-helper
deleted file mode 100755
index 00cac4270..000000000
--- a/community/calibre/calibre-mount-helper
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh -e
-# Replacement for upstream mount helper using udisks/eject
-# (C) 2010 Martin Pitt <mpitt@debian.org>
-
-ACTION="$1"
-DEV="$2"
-
-case "$ACTION" in
-    mount)
-	udisks --mount "$DEV"
-    
-	# check if mount worked. If not, fail
-	# udisks does return 0 even if mount failed
-	mount | grep -q "$DEV" || exit 0
-	;;
-
-    eject)
-	eject "$DEV"
-	;;
-
-    cleanup)
-	;;
-
-    *)
-	echo "unknown action" >&2
-	exit 1
-esac
-
diff --git a/community/calibre/desktop_integration.patch b/community/calibre/desktop_integration.patch
deleted file mode 100644
index 4c756f5d4..000000000
--- a/community/calibre/desktop_integration.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- a/src/calibre/linux.py	2012-09-21 06:56:20.000000000 +0200
-+++ b/src/calibre/linux.py	2012-09-22 18:51:12.000000000 +0200
-@@ -179,19 +179,6 @@
-             self.setup_completion()
-         if islinux or isbsd:
-             self.setup_desktop_integration()
--        self.create_uninstaller()
--
--        from calibre.utils.config import config_dir
--        if os.path.exists(config_dir):
--            os.chdir(config_dir)
--            if islinux or isbsd:
--                for f in os.listdir('.'):
--                    if os.stat(f).st_uid == 0:
--                        import shutil
--                        shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
--                if os.stat(config_dir).st_uid == 0:
--                    os.rmdir(config_dir)
--
-         if warn is None and self.warnings:
-             self.info('There were %d warnings'%len(self.warnings))
-             for args, kwargs in self.warnings:
-@@ -237,7 +224,7 @@
-                 if isnetbsd:
-                     f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
-                 else:
--                    f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
-+                    f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre')
-             if not os.path.exists(os.path.dirname(f)):
-                 os.makedirs(os.path.dirname(f))
-             self.manifest.append(f)
-@@ -357,63 +344,39 @@
- 
-             with TemporaryDirectory() as tdir, CurrentDir(tdir), \
-                                 PreserveMIMEDefaults():
--                render_img('mimetypes/lrf.png', 'calibre-lrf.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-lrs',
--                '128'))
--                render_img('mimetypes/mobi.png', 'calibre-mobi.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128'))
--                render_img('mimetypes/tpz.png', 'calibre-tpz.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128'))
--                render_img('mimetypes/azw2.png', 'calibre-azw2.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128'))
--                render_img('mimetypes/azw3.png', 'calibre-azw3.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128'))
--                render_img('lt.png', 'calibre-gui.png', width=256, height=256)
--                cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
--                self.icon_resources.append(('apps', 'calibre-gui', '128'))
--                render_img('viewer.png', 'calibre-viewer.png')
--                cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
--                self.icon_resources.append(('apps', 'calibre-viewer', '128'))
-+                dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
-+                os.mkdir(dir)
-+                render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
-+                render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
-+                render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
- 
-                 mimetypes = set([])
-                 for x in all_input_formats():
-                     mt = guess_type('dummy.'+x)[0]
--                    if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
-+                    if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
-                         mimetypes.add(mt)
- 
-                 def write_mimetypes(f):
-                     f.write('MimeType=%s;\n'%';'.join(mimetypes))
- 
--                f = open('calibre-lrfviewer.desktop', 'wb')
-+                dir = os.path.join(self.opts.staging_sharedir,'../applications')
-+                os.mkdir(dir)
-+                f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
-                 f.write(VIEWER)
-                 f.close()
--                f = open('calibre-ebook-viewer.desktop', 'wb')
-+                f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
-                 f.write(EVIEWER)
-                 write_mimetypes(f)
-                 f.close()
--                f = open('calibre-gui.desktop', 'wb')
-+                f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
-                 f.write(GUI)
-                 write_mimetypes(f)
-                 f.close()
--                des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
--                        'calibre-ebook-viewer.desktop')
--                for x in des:
--                    cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
--                    cc(' '.join(cmd), shell=True)
--                    self.menu_resources.append(x)
--                cc(['xdg-desktop-menu', 'forceupdate'])
--                f = open('calibre-mimetypes.xml', 'wb')
-+                dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
-+                os.makedirs(dir)
-+                f = open(os.path.join(dir, 'calibre.xml'), 'wb')
-                 f.write(MIME)
-                 f.close()
--                self.mime_resources.append('calibre-mimetypes.xml')
--                cc('xdg-mime install ./calibre-mimetypes.xml', shell=True)
-         except Exception:
-             if self.opts.fatal_errors:
-                 raise
diff --git a/community/canorus/PKGBUILD b/community/canorus/PKGBUILD
index c2a37de26..4767b9030 100644
--- a/community/canorus/PKGBUILD
+++ b/community/canorus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59873 2011-12-01 13:49:19Z spupykin $
+# $Id: PKGBUILD 85336 2013-03-01 10:28:57Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Arch Linux Pro Audio <dev@archaudio.org>
 # Contributor: Coenraad van der Westhuizen <chwesthuizen@gmail.com>
@@ -6,12 +6,12 @@
 
 pkgname=canorus
 pkgver=0.7.R1002
-pkgrel=4
+pkgrel=5
 pkgdesc="A free music score editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.canorus.org/"
 license=('GPL')
-depends=('qt' 'alsa-lib' 'python2' 'swig')
+depends=('qt4' 'alsa-lib' 'python2' 'swig' 'zlib')
 makedepends=('cmake')
 options=('strip')
 source=(http://download.berlios.de/$pkgname/$pkgname\_$pkgver\_source.tar.bz2
@@ -21,13 +21,16 @@ md5sums=('5575b7c54633056a463177579a390318'
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ${srcdir}/0006-Add-lz-and-lpthread-to-linker-flags.patch
-  export QTDIR=/usr
+  source /etc/profile.d/qt4.sh
+  export LDFLAGS="-lz -lpthread"
   cmake . -DCMAKE_INSTALL_PREFIX=$pkgdir/usr \
 	-DDEFAULT_DATA_DIR="/usr/share/canorus" \
 	-DNO_SWIG=ON
-  make install
+}
 
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make install
   install -d $pkgdir/usr/share/{applications,pixmaps}
   cp canorus.desktop $pkgdir/usr/share/applications
   cp $pkgdir/usr/share/{canorus/images/clogosm.png,pixmaps/canorus.png}
diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD
index d063f4697..8eb49da90 100644
--- a/community/cantata/PKGBUILD
+++ b/community/cantata/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 82406 2013-01-16 22:11:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 86462 2013-03-17 20:07:56Z cinelli $
+# Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Mcder3 <mcder3[at]gmail[dot]com>
 # Contributor: MisterFred <mister.fred[at]free[dot]fr>
 
 pkgname=cantata
 pkgver=0.9.2
 pkgdesc="A KDE client for the music player daemon (MPD)"
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde-apps.org/content/show.php/Cantata?content=147733"
 license=('GPL')
-depends=('kdebase-runtime' 'taglib-extras' 'ffmpeg' 'mpg123' 'libmtp' 'speex')
+depends=('kdebase-runtime' 'taglib-extras' 'mpg123' 'libmtp')
 makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://cantata.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
+install="$pkgname.install"
+source=("http://cantata.googlecode.com/files/$pkgname-$pkgver.tar.bz2")
 md5sums=('882cec90eb01d190b899689675e990b0')
 
 build() {
+  cd "$srcdir/$pkgname-$pkgver"
   mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
+
+  cmake . \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
     -DENABLE_PHONON=ON
+
   make
 }
 
 package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  
+  make DESTDIR="$pkgdir" PREFIX="/usr" install
 }
diff --git a/community/caph/PKGBUILD b/community/caph/PKGBUILD
index 31f310435..13cb1b7e5 100644
--- a/community/caph/PKGBUILD
+++ b/community/caph/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 63510 2012-02-05 11:52:20Z ibiru $
+# $Id: PKGBUILD 84880 2013-02-25 19:41:45Z arodseth $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: jose <jose1711 [at] gmail (dot) com>
 
 pkgname=caph
 arch=('i686' 'x86_64' 'mips64el')
 pkgver=1.1
-pkgrel=2
-pkgdesc="A sandbox game based on physics which uses doodles as a primary gameplay element"
+pkgrel=3
+pkgdesc='Sandbox game based on physics which uses doodles as a primary gameplay element'
 license=('GPL')
-url="http://sourceforge.net/projects/caphgame/"
+url='http://sourceforge.net/projects/caphgame/'
 depends=('sdl' 'libgl' 'libpng')
 makedepends=('mesa')
 source=("http://sourceforge.net/projects/caphgame/files/caph/caphgame-${pkgver}/caph-${pkgver}.tar.bz2" 
@@ -18,13 +18,13 @@ md5sums=('dbc2cfbb5cd98a77c5b731515d3a77b9'
 
 build() {
   cd $srcdir/caph-${pkgver}/src
-  mkdir -p $pkgdir/usr/{bin,share/{caph/maps,doc/caph}}
   ./confg
   ./build
 }
 
 package() {
   cd $srcdir/caph-${pkgver}/src
+  mkdir -p $pkgdir/usr/{bin,share/{caph/maps,doc/caph}}
   install -D -m755 ./caph $pkgdir/usr/bin/caph
   install -D -m644 ../doc/caph/* $pkgdir/usr/share/doc/caph/ || true
   install -D -m644 ../share/caph/* $pkgdir/usr/share/caph/ || true
diff --git a/community/catalyst-utils/PKGBUILD b/community/catalyst-utils/PKGBUILD
deleted file mode 100644
index 3fa6a4509..000000000
--- a/community/catalyst-utils/PKGBUILD
+++ /dev/null
@@ -1,136 +0,0 @@
-# $Id: PKGBUILD 77684 2012-10-13 13:37:15Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero
-# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert
-
-pkgbase=catalyst-utils
-pkgname=('catalyst-utils' 'opencl-catalyst')
-pkgver=12.9
-pkgrel=0.1
-pkgdesc="AMD Catalyst drivers utilities and libraries with OpenCL implementation."
-arch=('i686' 'x86_64')
-url="http://www.amd.com"
-license=('custom')
-source=(#"http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip"
-        https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu1/+files/fglrx-installer_9.000.orig.tar.gz
-        fglrx-authfile-locations.patch
-        atieventsd
-        atieventsd.service)
-md5sums=('2bb6e8193fdddff9bbd2e3d9f9e8f39b'
-         '31ec3f0432dc2e9bf3203223aa75ce20'
-         'f729bf913613f49b0b9759c246058a87'
-         '4bdb353dea68e33ac9e20ec30cc42082')
-
-if [ "${CARCH}" = "i686" ]; then
-  _ARCHDIR="x86"
-  _ARCHLIB=""
-  _ARCHXPIC=""
-else
-  _ARCHDIR="x86_64"
-  _ARCHLIB="64"
-  _ARCHXPIC="_64a"
-fi
-
-build() {
-  cd ${srcdir}
-  
-#   sh ./amd-driver-installer*.run --extract fglrx-install
-#   
-#   cd fglrx-install
-  patch -Np2 -i fglrx-authfile-locations.patch
-}
-
-package_catalyst-utils() {
-  pkgdesc="AMD Catalyst drivers utilities and libraries."
-  provides=('libgl')
-  conflicts=('libgl' 'nvidia-utils')
-  depends=('xorg-server>=1.7.0'  'gcc-libs' 'libxinerama' 'libxcursor' 'libxxf86vm' 'libxrandr' 'libsm' 'fontconfig' 'libxi' 'netkit-bsd-finger')
-  optdepends=('qt: amdcccle'
-              'acpid: acpi event support')
-  
-  install -dm755 "${pkgdir}"/usr/{bin,sbin}
-  install -dm755 "${pkgdir}"/usr/lib/{dri,xorg/modules/{dri,drivers,extensions/fglrx,linux},systemd/system}
-  install -dm755 "${pkgdir}"/usr/include/GL
-  install -dm755 "${pkgdir}"/etc/{ati,acpi/events,security/console.apps,rc.d}
-  install -dm755 "${pkgdir}"/usr/share/{applications,ati/amdcccle,man/man8,pixmaps}
-  
-  # binaries
-  cd ${srcdir}
-  install -m755 usr/sbin/* "${pkgdir}/usr/sbin/"
-  install -m755 usr/X11R6/bin/* "${pkgdir}/usr/bin/"
-  install -m755 arch/${_ARCHDIR}/usr/sbin/* "${pkgdir}/usr/sbin/"
-  install -m755 arch/${_ARCHDIR}/usr/X11R6/bin/* "${pkgdir}/usr/bin/"
-  
-  # headers
-  install -m644 usr/include/GL/* "${pkgdir}/usr/include/GL/"
-  
-  # xorg/dri/gl/... drivers
-  cd xpic${_ARCHXPIC}/usr/X11R6/lib${_ARCHLIB}/modules
-  install -m755 *.so "${pkgdir}/usr/lib/xorg/modules/"
-  install -m755 drivers/*.so "${pkgdir}/usr/lib/xorg/modules/drivers/"
-  install -m755 linux/*.so "${pkgdir}/usr/lib/xorg/modules/linux/"
-  install -m755 extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/"
-  ln -s fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
-  cd ${srcdir}/arch/${_ARCHDIR}/usr/X11R6/lib${_ARCHLIB}
-  install -m755 modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/"
-  ln -s /usr/lib/xorg/modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/dri/"
-  install -m755 fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/"
-  install -m755 *.so* "${pkgdir}/usr/lib/"
-  install -m644 libAMDXvBA.cap "${pkgdir}/usr/lib/"
-  cd ${srcdir}/arch/${_ARCHDIR}/usr/lib${_ARCHLIB}
-  install -m755 *.so* "${pkgdir}/usr/lib/"
-  # needed symlinks
-  ln -s libatiuki.so.1.0 "${pkgdir}/usr/lib/libatiuki.so.1"
-  ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1"
-  ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so"
-  ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/libAMDXvBA.so.1"
-  ln -s libXvBAW.so.1.0 "${pkgdir}/usr/lib/libXvBAW.so"
-  ln -s libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/libfglrx_dm.so.1"
-  
-  # various files 
-  cd ${srcdir}
-  install -m644 usr/share/man/man8/* "${pkgdir}/usr/share/man/man8/"
-  install -m644 usr/share/applications/* "${pkgdir}/usr/share/applications/"
-  install -m644 usr/share/icons/* "${pkgdir}/usr/share/pixmaps/"
-  install -m644 usr/share/ati/amdcccle/* "${pkgdir}/usr/share/ati/amdcccle/"
-  install -m644 etc/ati/* "${pkgdir}/etc/ati/"
-  chmod 755 "${pkgdir}/etc/ati/authatieventsd.sh"
-  install -m644 etc/security/console.apps/amdcccle-su "${pkgdir}/etc/security/console.apps/"
-  install -m644 usr/share/applications/*.desktop "${pkgdir}/usr/share/applications/"
-  # use ACPI example files
-  install -m755 usr/share/doc/fglrx/examples/etc/acpi/*.sh "${pkgdir}/etc/acpi/"
-  install -m644 usr/share/doc/fglrx/examples/etc/acpi/events/* "${pkgdir}/etc/acpi/events/"
-  # systemd and rc.d scripts
-  install -m755 "${srcdir}/atieventsd" "${pkgdir}/etc/rc.d/"
-  install -m644 "${srcdir}/atieventsd.service" "${pkgdir}/usr/lib/systemd/system/"
-
-  # provided in opencl-catalyst package
-  rm "${pkgdir}"/usr/lib/lib{amdocl*,OpenCL}.so* 
-
-  # licenses
-  install -Dm644 "${srcdir}/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
-  install -Dm644 "${srcdir}/usr/share/doc/amdcccle/ccc_copyrights.txt" \
-    "${pkgdir}/usr/share/licenses/${pkgname}/amdcccle_copyrights.txt"
-}
-
-package_opencl-catalyst() {
-  pkgdesc="OpenCL implemention from AMD"
-  provides=('libcl')
-  conflicts=('libcl')
-  depends=('gcc-libs')
-  optdepends=('opencl-headers: headers necessary for OpenCL development')
-
-  install -dm755 "${pkgdir}"/usr/{bin,lib}
-  install -dm755 "${pkgdir}/etc/OpenCL/vendors"
-
-  cd ${srcdir}/arch/${_ARCHDIR}
-  
-  install -m755 usr/bin/clinfo "${pkgdir}/usr/bin/"
-  install -m644 etc/OpenCL/vendors/amdocl*.icd "${pkgdir}/etc/OpenCL/vendors/"
-  install -m755 usr/lib${_ARCHLIB}/libamdocl*.so "${pkgdir}/usr/lib/"
-  install -m755 usr/lib${_ARCHLIB}/libOpenCL.so.1 "${pkgdir}/usr/lib/"
-  ln -s libOpenCL.so.1 "${pkgdir}/usr/lib/libOpenCL.so"
-  
-  # license
-  install -Dm644 "${srcdir}//usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
-}
diff --git a/community/catalyst-utils/atieventsd b/community/catalyst-utils/atieventsd
deleted file mode 100644
index 16bd9a4fa..000000000
--- a/community/catalyst-utils/atieventsd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-ATID_PID=`pidof -o %PPID /usr/sbin/atieventsd`
-
-case "$1" in
-  start)
-    rc=0
-    stat_busy "Starting ATI Events Daemon"
-    [ -z "$ATID_PID" ] && /usr/sbin/atieventsd
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon atieventsd
-      stat_done
-    fi
-    ;;
-  stop)
-    rc=0
-    stat_busy "Stopping ATI Events Daemon"
-    kill $ATID_PID &>/dev/null
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon atieventsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/catalyst-utils/atieventsd.service b/community/catalyst-utils/atieventsd.service
deleted file mode 100644
index 90af165bd..000000000
--- a/community/catalyst-utils/atieventsd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Catalyst event Daemon
-Requires=acpid.socket
-
-[Service]
-ExecStart=/usr/sbin/atieventsd --nodaemon
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/community/catalyst-utils/fglrx-authfile-locations.patch b/community/catalyst-utils/fglrx-authfile-locations.patch
deleted file mode 100644
index 3617e310b..000000000
--- a/community/catalyst-utils/fglrx-authfile-locations.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: ati803/common/etc/ati/authatieventsd.sh
-===================================================================
---- ati803/common/etc/ati/authatieventsd.sh
-+++ ati803/common/etc/ati/authatieventsd.sh	2008-04-18 23:25:27.000000000 +0300
-@@ -34,8 +34,9 @@
- 
-     # Check xdm/kdm
- 
--    XDM_AUTH_MASK=/var/lib/xdm/authdir/authfiles/A$1*
--    XDM_AUTH_FILE=`ls -t $XDM_AUTH_MASK 2>/dev/null | head -n 1`   # Choose the newest file
-+    XDM_AUTH_MASK=/var/lib/xdm/authfiles/A$1*
-+    KDM_AUTH_MASK=/var/run/xauth/A$1*
-+    XDM_AUTH_FILE=`ls -t $XDM_AUTH_MASK $KDM_AUTH_MASK 2>/dev/null | head -n 1`   # Choose the newest file
-     if [ -n "$XDM_AUTH_FILE" ]; then
-         SERVER_AUTH_FILE=$XDM_AUTH_FILE
-         DISP_SEARCH_STRING="#ffff#"
diff --git a/community/catdoc/PKGBUILD b/community/catdoc/PKGBUILD
index 8d0f91502..a513735b8 100644
--- a/community/catdoc/PKGBUILD
+++ b/community/catdoc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 75719 2012-08-29 11:08:22Z bisson $
+# $Id: PKGBUILD 89169 2013-04-27 12:49:08Z kkeen $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Paulius Palevicius <paulius@birzai.com>
 
 pkgname=catdoc
-pkgver=0.94.3
+pkgver=0.94.4
 pkgrel=1
 pkgdesc="A convertor for Microsoft Word, Excel, PowerPoint and RTF Files to text"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,12 +13,12 @@ depends=('glibc')
 optdepends=('tk: for using wordview')
 options=('!makeflags')
 source=(http://ftp.de.debian.org/debian/pool/main/c/catdoc/${pkgname}_$pkgver.orig.tar.gz)
-md5sums=('61212b9fd06b0a31aa7bc9a671130f57')
+md5sums=('4820680e3611392caf2b4dd2413bfae5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   sed -i 's/$(prefix)/$(installroot)$(prefix)/' desktop/Makefile.in
-  sed -i 's/0.94.2/0.94.3/' configure* doc/*.1 src/makefile.tc
+  sed -i 's/0.94.2/0.94.4/' configure* doc/*.1 src/makefile.tc
   ./configure --prefix=/usr  --with-wish=/usr/bin/wish
   make
 }
diff --git a/community/ccd2iso/PKGBUILD b/community/ccd2iso/PKGBUILD
index 7b1868fac..353d4e2ae 100644
--- a/community/ccd2iso/PKGBUILD
+++ b/community/ccd2iso/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=ccd2iso
 pkgver=0.3
-pkgrel=7
+pkgrel=7.1
 pkgdesc="Converts CCD/IMG CloneCD images to ISO format"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/ccd2iso"
diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD
index ffdf67f1d..79f03f0a4 100644
--- a/community/ccid/PKGBUILD
+++ b/community/ccid/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82451 2013-01-18 08:29:46Z giovanni $
+# $Id: PKGBUILD 89650 2013-05-01 05:38:53Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=ccid
-pkgver=1.4.9
+pkgver=1.4.10
 pkgrel=1
 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('LGPL' 'GPL')
 depends=('pcsclite' 'libusbx')
 makedepends=('pkg-config')
 backup=(etc/reader.conf.d/libccidtwin)
-source=("https://alioth.debian.org/frs/download.php/3864/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('1afd9cc6fb1676d1fdd605d10c70d08e')
+source=("https://alioth.debian.org/frs/download.php/3897/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('5372e8593624dee837269bf86e4b8b06')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD
index 08b64291c..ac0471939 100644
--- a/community/cclive/PKGBUILD
+++ b/community/cclive/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83242 2013-01-28 16:49:28Z stephane $
+# $Id: PKGBUILD 87405 2013-03-31 19:18:08Z stephane $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 # Contributor: nathan owe ndowens04 at gmail dot com
 
 pkgname=cclive
-pkgver=0.7.11
+pkgver=0.7.12
 pkgrel=2
 pkgdesc='Commandline downloader for popular video websites.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL3')
 depends=('boost-libs' 'pcre' 'curl' 'libquvi')
 makedepends=('boost')
 source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz")
-md5sums=('b96cf74e846e3047e0b1db917070c6d0')
+md5sums=('f35a6fb3a9a08d59da7170c1330a24ce')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/ccmalloc/PKGBUILD b/community/ccmalloc/PKGBUILD
index 95df39a45..62becbedc 100644
--- a/community/ccmalloc/PKGBUILD
+++ b/community/ccmalloc/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=ccmalloc
 pkgver=0.4.0
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Track down memory related problems with C and C++ programs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/sid/ccmalloc"
diff --git a/community/ccze/PKGBUILD b/community/ccze/PKGBUILD
index 57dd4d636..f114d083f 100644
--- a/community/ccze/PKGBUILD
+++ b/community/ccze/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=ccze
 pkgver=0.2.1
-pkgrel=6.1
+pkgrel=6.2
 pkgdesc="Robust and modular log colorizer with many plugins"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freshmeat.net/projects/ccze/"
diff --git a/community/cdcd/PKGBUILD b/community/cdcd/PKGBUILD
index 57338fc35..da091ad55 100644
--- a/community/cdcd/PKGBUILD
+++ b/community/cdcd/PKGBUILD
@@ -1,33 +1,44 @@
-# $Id: PKGBUILD 55773 2011-09-20 06:44:34Z andrea $
-# Maintainer: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 86149 2013-03-12 09:55:52Z cinelli $
+# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
+# Contributor dorphell <dorphell@archlinux.org>
 # Contributor Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=cdcd
 pkgver=0.6.6
-pkgrel=6
+pkgrel=6.1
 pkgdesc="A commandline cd-player"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libcdaudio' 'readline')
 url="http://libcdaudio.sourceforge.net/"
 license=('GPL2')
 install=cdcd.install
-source=("http://downloads.sourceforge.net/libcdaudio/$pkgname-$pkgver.tar.gz"
-        cdcd-0.6.6-x86_64.patch)
-md5sums=('dc17f2e275c7214cb693f6abb50f29fb'
-         '7c39f01408fc084e2c62da4da324370e')
+source=("http://downloads.sourceforge.net/libcdaudio/$pkgname-$pkgver.tar.gz")
+md5sums=('dc17f2e275c7214cb693f6abb50f29fb')
+
+if [[ "$CARCH" == "x86_64" ]]; then
+  source+=("cdcd-0.6.6-$CARCH.patch")
+  md5sums+=('7c39f01408fc084e2c62da4da324370e')
+fi
 
 build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  patch -Np1 -i "${srcdir}"/cdcd-0.6.6-x86_64.patch
+  cd "$srcdir/$pkgname-$pkgver" 
+
+  if [[ "$CARCH" == "x86_64" ]]; then
+    patch -Np1 -i "$srcdir/cdcd-0.6.6-$CARCH.patch"
+  fi
+
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make prefix="${pkgdir}"/usr install
+  cd "$srcdir/$pkgname-$pkgver"
+ 
+  make PREFIX=/usr DESTDIR="$pkgdir" install
+  
+  mv "$pkgdir/usr/info" "$pkgdir/usr/share/"
+  mv "$pkgdir/usr/man/" "$pkgdir/usr/share/"
+  rm "$pkgdir/usr/share/dir"
 
-  install -dm755 "${pkgdir}"/usr/share
-  mv "${pkgdir}"/usr/{man,info} "${pkgdir}"/usr/share
-  rm "${pkgdir}"/usr/share/info/dir
+  install -dm755 "$pkgdir/usr/bin" "$pkgdir/usr/share"
 }
diff --git a/community/cdcover/PKGBUILD b/community/cdcover/PKGBUILD
index ca1d2a159..ef473b525 100644
--- a/community/cdcover/PKGBUILD
+++ b/community/cdcover/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=cdcover
 pkgver=0.7.4
-pkgrel=5
+pkgrel=5.1
 pkgdesc="cdcover allows the creation of inlay-sheets for cd-cases and dvd's"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdcover.sourceforge.net"
diff --git a/community/cdemu-client/PKGBUILD b/community/cdemu-client/PKGBUILD
deleted file mode 100644
index f31a9608a..000000000
--- a/community/cdemu-client/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Charles Lindsay <charles@chaoslizard.org>
-
-pkgname=cdemu-client
-pkgver=1.5.0
-pkgrel=2
-pkgdesc="Simple command-line client for controlling cdemu-daemon"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://cdemu.sourceforge.net/"
-license=('GPL')
-depends=('python2' 'dbus-python' 'cdemu-daemon')
-makedepends=('intltool')
-conflicts=('cdemu')
-source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2")
-md5sums=('11141138f2b91a7100445d9c32b31181')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # python2 fix
-  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' src/cdemu
-
-  # bash completion dir change
-  sed -e 's,bashcompdir = $(sysconfdir)/bash_completion.d,bashcompdir = $(datadir)/bash-completion/completions,' -i data/Makefile.am data/Makefile.in
-
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/cdemu-daemon/cdemud-dbus.conf b/community/cdemu-daemon/cdemud-dbus.conf
deleted file mode 100644
index 3043fe251..000000000
--- a/community/cdemu-daemon/cdemud-dbus.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE busconfig PUBLIC 
-    "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-    "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<busconfig>
-    <!-- Only root can own the CDEMUD_Daemon service on bus -->
-    <policy user="root">
-        <allow own="net.sf.cdemu.CDEMUD_Daemon"/>
-    </policy>
-    <policy group="root">
-        <allow own="net.sf.cdemu.CDEMUD_Daemon"/>
-    </policy>
-    
-    <!-- Allow users at the console to invoke methods on the interface -->
-    <policy at_console="true">
-        <allow send_destination="net.sf.cdemu.CDEMUD_Daemon"/>
-    </policy>
-
-    <!-- Allow users in the 'cdemu' group to invoke methods on the interface -->
-    <policy group="cdemu">
-        <allow send_destination="net.sf.cdemu.CDEMUD_Daemon"/>
-    </policy>
-</busconfig>
-
diff --git a/community/cdemu-daemon/cdemud.conf b/community/cdemu-daemon/cdemud.conf
deleted file mode 100644
index 1d8c55fe6..000000000
--- a/community/cdemu-daemon/cdemud.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# how many optical drives to emulate
-NUM_DEVICES=2
-
-# audio backend (null, alsa or pulse)
-AUDIO_DRIVER=null
-
-# log file
-LOG_FILE=/var/log/cdemud.log
diff --git a/community/cdemu-daemon/cdemud.rc b/community/cdemu-daemon/cdemud.rc
deleted file mode 100644
index 09b9ec345..000000000
--- a/community/cdemu-daemon/cdemud.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting cdemud"
-    /usr/lib/cdemu-daemon/cdemu-daemon-system.sh &
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      add_daemon cdemud
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping cdemud"
-    kill `pidof cdemud` &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      rm_daemon cdemud
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community/cdrtools/PKGBUILD b/community/cdrtools/PKGBUILD
deleted file mode 100644
index ca59ebaa3..000000000
--- a/community/cdrtools/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 82236 2013-01-12 18:33:09Z stativ $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-pkgname=cdrtools
-pkgver=3.01a11
-pkgrel=1
-pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://cdrecord.berlios.de/private/cdrecord.html"
-license=('CDDL')
-depends=('acl')
-conflicts=('cdrkit')
-provides=('cdrkit')
-options=(!makeflags)
-backup=('etc/default/cdrecord' 'etc/default/rscsi')
-install=cdrtools.install
-source=(http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.bz2)
-md5sums=('e4f8f105affc5d93b6ebabd63c43c8a6')
-
-build() {
-  cd "$srcdir"/cdrtools-${pkgver%%a*}
-  sed -i 's|/opt/schily|/usr|g' DEFAULTS/Defaults.linux
-  sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux
-  
-  export GMAKE_NOWARN=true
-  make INS_BASE=/usr INS_RBASE=/
-}
-
-package() {
-  cd "$srcdir"/cdrtools-${pkgver%%a*}
-
-  export GMAKE_NOWARN=true
-  make INS_BASE=/usr INS_RBASE=/ DESTDIR="$pkgdir" install
-  rm -rf "$pkgdir"/usr/include
-  rm -rf "$pkgdir"/usr/lib/{*.a,profiled}
-
-  # autoload 'sg' module needed by cdrecord
-  install -d -m755 "$pkgdir"/usr/lib/modules-load.d/
-  echo sg > "$pkgdir"/usr/lib/modules-load.d/cdrecord.conf
-
-  # create symlinks for cdrkit compatibility
-  cd "$pkgdir"/usr/bin
-  ln -s cdrecord wodim
-  ln -s readcd readom
-  ln -s mkisofs genisoimage
-  ln -s cdda2wav icedax
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/cdrtools/cdrtools.install b/community/cdrtools/cdrtools.install
deleted file mode 100644
index 3f49eb1bb..000000000
--- a/community/cdrtools/cdrtools.install
+++ /dev/null
@@ -1,14 +0,0 @@
-
-post_install() {
-  echo "To allow other users than root execute rscsi add an entry"
-  echo "to /etc/default/rscsi or use an \"rscsi\" user"
-  echo ""
-  post_upgrade
-}
-
-post_upgrade() {
-  echo "The manual loading (or loading using rc.conf)"
-  echo "of the 'sg' module is no longer necessary."
-  echo "It is automatically loaded during boot by systemd-tools (udev 185)."
-}
-
diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD
index a52387492..636e4284c 100644
--- a/community/cegui/PKGBUILD
+++ b/community/cegui/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83243 2013-01-28 16:49:29Z stephane $
+# $Id: PKGBUILD 87406 2013-03-31 19:18:09Z stephane $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org> 
 # Contributor: William Rea <sillywilly@gmail.com>, 
@@ -6,8 +6,8 @@
 
 pkgbase=cegui
 pkgname=('cegui' 'cegui-docs')
-pkgver=0.7.7
-pkgrel=5
+pkgver=0.7.9
+pkgrel=2
 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://crayzedsgui.sourceforge.net"
@@ -21,7 +21,7 @@ optdepends=("python2: python bindings"
             #"irrlicht: irrlicht module") maybe again at some point
 options=(!libtool)
 source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz)
-md5sums=('8b83577f86eaa1581765dd155c7c8f24')
+md5sums=('a8b682daf82e383edc169c2e6eb2b321')
 
 build() {
   cd "$srcdir/CEGUI-${pkgver}"
diff --git a/community/cellwriter/PKGBUILD b/community/cellwriter/PKGBUILD
index 19ce811d5..5b2016a03 100644
--- a/community/cellwriter/PKGBUILD
+++ b/community/cellwriter/PKGBUILD
@@ -4,23 +4,23 @@
 # Contributor: Winston Weinert
 
 pkgname=cellwriter
-pkgver=1.3.4
-pkgrel=6
+pkgver=1.3.5
+pkgrel=1
 pkgdesc='A grid-entry natural handwriting input panel.'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://v1.risujin.org/cellwriter/'
 depends=('gtk2' 'libxtst' 'libgnome' 'hicolor-icon-theme')
 source=("http://v1.risujin.org/pub/cellwriter/${pkgname}-${pkgver}.tar.gz"
-        "http://launchpadlibrarian.net/18959127/${pkgname}-${pkgver}-cellwidget-dont-disable-xinput.diff")
-md5sums=('72b4e552a32d6acd888da0b88aeebbdd'
+        "http://launchpadlibrarian.net/18959127/${pkgname}-1.3.4-cellwidget-dont-disable-xinput.diff")
+md5sums=('16db87415c3c669e0489f9c4d795ec7d'
          '5e8c61309c5ec8f67f0af7bb5ceb1aea')
 install="${pkgname}.install"
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/src"
 
-  patch -p0 < "${srcdir}/${pkgname}-${pkgver}-cellwidget-dont-disable-xinput.diff"
+  patch -p0 < "${srcdir}/${pkgname}-1.3.4-cellwidget-dont-disable-xinput.diff"
 
   cd "${srcdir}/${pkgname}-${pkgver}"
 
diff --git a/community/celt-0.7/PKGBUILD b/community/celt-0.7/PKGBUILD
deleted file mode 100644
index f22201bd7..000000000
--- a/community/celt-0.7/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 61638 2012-01-05 08:56:24Z svenstaro $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Lauri Niskanen <ape@ape3000.com>
-
-pkgname=celt-0.7
-_realname=celt
-pkgver=0.7.1
-pkgrel=3
-pkgdesc="Low-latency audio communication codec"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.celt-codec.org"
-license=('BSD')
-depends=('libogg')
-#provides=('celt=$pkgver')
-conflicts=('celt')
-options=('!libtool')
-source=(http://downloads.xiph.org/releases/celt/$_realname-$pkgver.tar.gz)
-md5sums=('c7f6b8346e132b1a48dae0eff77ea9f0')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="$pkgdir/" install
-}
-
-package() {
-	cd "$srcdir/$_realname-$pkgver"
-
-  install -Dm644 COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/BSD"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD
index b1660d650..bdda0434f 100644
--- a/community/cgit/PKGBUILD
+++ b/community/cgit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80035 2012-11-15 15:53:42Z spupykin $
+# $Id: PKGBUILD 88266 2013-04-15 11:13:22Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Current Maintainer:  Patrick Palka <patrick@parcs.ath.cx>
 # Previous Maintainer:  Loui Chang <louipc.ist at gmail com>
@@ -8,18 +8,18 @@
 pkgname=cgit
 pkgver=0.9.1
 _gitver=1.7.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A web interface for git written in plain C"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hjemli.net/git/cgit"
 license=('GPL')
 depends=('openssl')
-makedepends=('git' 'zlib' 'curl' 'asciidoc')
+makedepends=('zlib' 'curl' 'asciidoc')
 install=cgit.install
 source=("http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz"
 	"git-${_gitver}.tar.gz::https://github.com/git/git/archive/v${_gitver}.tar.gz"
 	"apache.example.conf")
-md5sums=('ed1a1ccccdcbf55ddd6a9de29bca6edf'
+md5sums=('272ee8fec2d81ac1e65117578e64df1e'
          'c63cc7ca8a4bbf97c8802f354511223e'
          'bd5696bea0654bfcf98f249b1a36737d')
 
diff --git a/community/cgminer/PKGBUILD b/community/cgminer/PKGBUILD
deleted file mode 100644
index 76d7915bd..000000000
--- a/community/cgminer/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 83058 2013-01-27 09:29:50Z andrea $
-# Maintainer: Felix Yan <felixonmars@gmail.com>
-# Contributor: monson <holymonson@gmail.com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: David Manouchehri <david@davidmanouchehri.com>
-
-pkgname=cgminer
-pkgver=2.10.4
-_build=
-pkgrel=1
-pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer."
-url='http://forum.bitcoin.org/index.php?topic=28402.0'
-license=('GPL3')
-arch=('i686' 'x86_64')
-depends=('curl' 'libcl')
-makedepends=('opencl-headers')
-optdepends=('opencl-nvidia: OpenCL implementation for NVIDIA'
-            'opencl-catalyst: OpenCL implementation for AMD')
-source=("http://ck.kolivas.org/apps/cgminer/$pkgname-$pkgver.tar.bz2"
-        "$pkgname.conf.d"
-        "$pkgname"
-        "$pkgname.service")
-backup=("etc/conf.d/$pkgname" "etc/$pkgname.conf")
-
-[ "$CARCH" == "x86_64" ] && makedepends+=('yasm')
-
-build() {
-  cd "$srcdir"
-  cd $pkgname-$pkgver${_build}
-
-  # Use in-tree jansson since it is not compatible with jansson 2.0
-  #sed -e 's/^AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)$/request_jansson=true/' -i configure.ac
-
-  # Here you may want to use custom CFLAGS
-  #export CFLAGS="-O2 -march=native -mtune=native -msse2"
-
-  ./configure --prefix=/usr --enable-cpumining --disable-adl
-  
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver${_build}
-
-  make DESTDIR="$pkgdir" install
-
-  install -Dm755 "$srcdir"/$pkgname "$pkgdir"/etc/rc.d/$pkgname
-  install -Dm644 "$srcdir"/$pkgname.service "$pkgdir"/usr/lib/systemd/system/$pkgname.service
-  install -Dm644 "$srcdir"/$pkgname.conf.d "$pkgdir"/etc/conf.d/$pkgname
-  sed 's#/usr/local/bin#/usr/bin#g' example.conf > $pkgname.conf
-  install -Dm644 $pkgname.conf "$pkgdir"/etc/$pkgname.conf
-}
-
-md5sums=('f165e9060796d07b031aacc9468536f4'
-         'fe4a243fabe24608f5c05e40f0f118f6'
-         'ee39698273671fee0e98d4af16014c36'
-         'bd76fc92fedce18c59ccea2aa79cc664')
diff --git a/community/cgminer/cgminer b/community/cgminer/cgminer
deleted file mode 100644
index 9081e8e77..000000000
--- a/community/cgminer/cgminer
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON=cgminer
-
-# stupid patch var
-export HOME=/root
-
-[ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON
-
-if [ -r $CGMINER_CONF ]; then
-  ARGS="--config $CGMINER_CONF $CGMINER_ARGS"
-else
-  ARGS="--url $CGMINER_PROTOCOL://$CGMINER_IP:$CGMINER_PORT --user $CGMINER_USER --pass $CGMINER_PASS $CGMINER_ARGS"
-fi
-
-PID=$(get_pid $DAEMON)
-
-case "$1" in
-  start)
-    stat_busy "Starting $DAEMON"
-    [ -z "$PID" ] && $DAEMON $ARGS &>/dev/null &
-    if [ $? = 0 ]; then
-      add_daemon $DAEMON
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping $DAEMON"
-    [ -n "$PID" ] && kill $PID &>/dev/null
-    if [ $? = 0 ]; then
-      rm_daemon $DAEMON
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/cgminer/cgminer.conf.d b/community/cgminer/cgminer.conf.d
deleted file mode 100644
index 88ec535d6..000000000
--- a/community/cgminer/cgminer.conf.d
+++ /dev/null
@@ -1,11 +0,0 @@
-# Use JSON-format configuration. (recommended)
-CGMINER_CONF="/etc/cgminer.conf"
-
-# Uncommend this if you prefer simple command-line arguments.
-#CGMINER_CONF=""
-#CGMINER_PROTOCOL="http"
-#CGMINER_IP="127.0.0.1"
-#CGMINER_PORT="8332"
-#CGMINER_USER="username"
-#CGMINER_PASS="password"
-CGMINER_ARGS="--syslog"
diff --git a/community/cgminer/cgminer.service b/community/cgminer/cgminer.service
deleted file mode 100644
index 84461879f..000000000
--- a/community/cgminer/cgminer.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Multi-threaded multi-pool CPU and GPU miner for bitcoin
-
-[Service]
-ExecStart=/usr/bin/cgminer -T --config /etc/cgminer.conf --syslog
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/checkinstall/PKGBUILD b/community/checkinstall/PKGBUILD
index f5ad9ee3c..c0ed0cbbc 100644
--- a/community/checkinstall/PKGBUILD
+++ b/community/checkinstall/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=checkinstall
 pkgver=1.6.2
-pkgrel=2
+pkgrel=2.1
 pkgdesc="spy for 'make install' and build rpm or deb"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://asic-linux.com.mx/~izto/checkinstall/"
diff --git a/community/chicken/PKGBUILD b/community/chicken/PKGBUILD
index 9a6c0204e..b851d61de 100644
--- a/community/chicken/PKGBUILD
+++ b/community/chicken/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 83421 2013-01-31 20:35:27Z arodseth $
+# $Id: PKGBUILD 86291 2013-03-14 20:09:27Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: <david@pako.st>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=chicken
-pkgver=4.8.0.1
+pkgver=4.8.0.3
 pkgrel=1
 pkgdesc='Compiler for R5RS scheme, featuring handy extensions'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://call-cc.org/'
 license=('BSD')
 depends=('gcc')
-source=("http://code.call-cc.org/releases/${pkgver/.1}/$pkgname-$pkgver.tar.gz")
-sha256sums=('a60efa9d2a621ecb9e03b41ebdd03ae27ecb32c1292671fd969506c9baf88d0c')
+source=("http://code.call-cc.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.gz")
+sha256sums=('6a1414e6f35586e47d7f4470eaf1779a4f73dec664b14bebf8763dd804b399c3')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -25,7 +25,7 @@ package() {
   cd "$pkgname-$pkgver"
   
   make -j1 PLATFORM=linux PREFIX=/usr DESTDIR="$pkgdir" install
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD
index 40c0b3969..c49379b51 100644
--- a/community/chmsee/PKGBUILD
+++ b/community/chmsee/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 83313 2013-01-29 13:27:03Z lcarlier $
+# $Id: PKGBUILD 88085 2013-04-11 09:03:50Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: dionydonny <dionydonny@gmail.com>
 # Contributor: Ermanno <erm67@yahoo.it>
 
 pkgname=chmsee
 pkgver=2.0
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=5
+arch=('i686' 'x86_64')
 pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner."
 url="http://chmsee.googlecode.com/"
 license=('GPL')
-depends=('xulrunner>=18.0' 'xulrunner<=19.0' 'chmlib' 'desktop-file-utils')
+depends=('xulrunner>18.0' 'xulrunner<21.0' 'chmlib' 'desktop-file-utils')
 makedepends=('python2')
 #source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver
 #source=(https://github.com/jungleji/chmsee/archive/b2a3c2ad32bfe9db067665ea1928d7e130d1b5e7.zip
@@ -18,14 +18,14 @@ source=(https://chmsee.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
         chmsee)
 install=chmsee.install
 md5sums=('a9a1e79094e5a2674caa3b1f1e34f5e7'
-         '242a9390bc943cc38237fa71137fb26c')
+         '1787edd1de8aa75bd9fa75a5ab319e85')
 
 build() {
   cd ${srcdir}/chmsee-*/src
 
   cp Makefile.arch Makefile
   sed -i -e 's/17.*/18.0/g' ../application.ini
-  sed -i -e 's/19.*/19.0/g' ../application.ini
+  sed -i -e 's/19.*/20.0/g' ../application.ini
 
   make -j1
 }
diff --git a/community/chmsee/chmsee b/community/chmsee/chmsee
index 65a1e195b..cd022f561 100644
--- a/community/chmsee/chmsee
+++ b/community/chmsee/chmsee
@@ -1,4 +1,2 @@
 #!/bin/sh
-cd /usr/share/chmsee/
 xulrunner /usr/share/chmsee/application.ini "$@"
-cd -
diff --git a/community/chromium-bsu/PKGBUILD b/community/chromium-bsu/PKGBUILD
index 2974d0fd9..e7c294cca 100644
--- a/community/chromium-bsu/PKGBUILD
+++ b/community/chromium-bsu/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 77622 2012-10-13 11:41:22Z allan $
+# $Id: PKGBUILD 85755 2013-03-06 11:30:49Z jelle $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=chromium-bsu
 pkgver=0.9.15
-pkgrel=3
+pkgrel=4
 pkgdesc="A fast paced top scrolling shooter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://chromium-bsu.sourceforge.net/"
 license=('custom:artistic')
-depends=('freeglut' 'glu' 'sdl' 'openal' 'freealut' 'glpng' 'ftgl' 'fontconfig' 'sdl_image')
+depends=('freeglut' 'glu' 'sdl' 'openal' 'freealut' 'ftgl' 'fontconfig' 'sdl_image')
 install=chromium-bsu.install
 source=(http://downloads.sourceforge.net/project/$pkgname/Chromium%20B.S.U.%20source%20code/$pkgver/$pkgname-$pkgver.tar.gz)
 md5sums=('d57137a1ac2292363b35192724c7e3be')
diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD
index e009e9546..50af1b4d7 100644
--- a/community/chrony/PKGBUILD
+++ b/community/chrony/PKGBUILD
@@ -1,6 +1,7 @@
-# $Id: PKGBUILD 83627 2013-02-04 07:41:05Z bpiotrowski $
+# $Id: PKGBUILD 85509 2013-03-02 08:05:25Z thestinger $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Maintainer:  Daniel Micay <danielmicay@gmail.com>
 # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>
 # Contributor: cdhotfire <cdhotfire@gmail.com>
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
@@ -8,7 +9,7 @@
 
 pkgname=chrony
 pkgver=1.27
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight NTP client and server'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://chrony.tuxfamily.org/"
@@ -28,10 +29,15 @@ build() {
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver 
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 
   install -Dm0644 $srcdir/$pkgname-$pkgver/examples/chrony.conf.example $pkgdir/etc/chrony.conf
+
+  # Arch's kernel has enhanced RTC support, make chrony use it by default
+  sed -ie '/^! \(rtconutc\|rtcfile \/etc\/chrony.rtc\)$/ s/^! //' \
+    "$pkgdir/etc/chrony.conf"
+
   install -Dm644  $srcdir/service $pkgdir/usr/lib/systemd/system/chrony.service
 
   install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d"
diff --git a/community/chrony/chrony b/community/chrony/chrony
deleted file mode 100755
index ec042d798..000000000
--- a/community/chrony/chrony
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/chronyd`
-case "$1" in
-  start)
-    stat_busy "Starting chrony Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/chronyd $NTPD_ARGS &
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon chrony
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping chrony Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon chrony
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community/chrony/rc.d b/community/chrony/rc.d
deleted file mode 100644
index ec042d798..000000000
--- a/community/chrony/rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/chronyd`
-case "$1" in
-  start)
-    stat_busy "Starting chrony Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/chronyd $NTPD_ARGS &
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon chrony
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping chrony Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon chrony
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community/chrootuid/PKGBUILD b/community/chrootuid/PKGBUILD
index 89448b5c9..8f907410c 100644
--- a/community/chrootuid/PKGBUILD
+++ b/community/chrootuid/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=chrootuid
 pkgver=1.3
-pkgrel=5
+pkgrel=5.1
 arch=(i686 x86_64 'mips64el')
 pkgdesc="Runs a command in a restricted environment."
 url="ftp://ftp.porcupine.org/pub/security/index.html"
diff --git a/community/cinelerra-cv/PKGBUILD b/community/cinelerra-cv/PKGBUILD
deleted file mode 100644
index 339265f54..000000000
--- a/community/cinelerra-cv/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 80152 2012-11-16 23:35:55Z ioni $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-
-pkgname=cinelerra-cv
-pkgver=2.2
-_gitrel=2.2.0
-pkgrel=12
-epoch=1
-pkgdesc="Professional video editing and compositing environment"
-arch=('x86_64' 'i686')
-url="http://cinelerra.org/"
-license=('GPL')
-depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'freetype2'
-         'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
-         'ffmpeg' 'libxv' 'faad2' 'faac' 'openexr' 'ilmbase>=1.0.3')
-makedepends=('git' 'nasm' 'mesa')
-options=('!libtool')
-source=('v4l1_removal.patch'
-        'ffmpeg_api.patch')
-md5sums=('bfa85e20809429d88eba4ab83e569612'
-         'b05ec2fb54e7d02f6167525417802111')
-
-_gituri="git://git.cinelerra.org/CinelerraCV.git"
-_gitdir="cinelerra"
-
-_confit() {
-  ./configure --prefix=/usr \
-              --with-buildinfo=git/recompile \
-              --with-external-ffmpeg \
-              --enable-opengl \
-              --disable-esd $@
-}
-
-build() {
-  msg "Connecting to GIT server...."
-
-  if [ -d $_gitdir ] ; then
-    cd $_gitdir && git pull origin
-    msg "The local files are updated."
-  else
-    git clone $_gituri -b rel$_gitrel $_gitdir
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$_gitdir-build"
-  cp -r "$srcdir/$_gitdir" "$srcdir/$_gitdir-build"
-  cd "$srcdir/$_gitdir-build"
-
-  # gcc 4.6 workaround
-  export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS"
-  export CPPFLAGS="$CFLAGS"
-
-  # remove executable stack
-  export LDFLAGS+=" -Wl,-z,noexecstack"
-
-  # v4l1 removal patch
-  patch -Np1 -i "$srcdir/v4l1_removal.patch"
-
-  # new ffmpeg api patch
-  patch -Np1 -i "$srcdir/ffmpeg_api.patch"
-
-  sed -i -e '/Debian/d' admin/nasm
-
-  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
-  sed -i '/\/X11R6/s///' configure.in
-
-  ./autogen.sh
-
-  if [ "$CARCH" = 'x86_64' ]; then
-    _confit --disable-mmx
-  else
-    _confit --enable-mmx
-  fi
-
-  make
-}
-
-package() {
-  cd "$srcdir/$_gitdir-build"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/cinelerra-cv/ffmpeg_api.patch b/community/cinelerra-cv/ffmpeg_api.patch
deleted file mode 100644
index d9747476c..000000000
--- a/community/cinelerra-cv/ffmpeg_api.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C
-index 6ab6047..7cde503 100644
---- a/cinelerra/ffmpeg.C
-+++ b/cinelerra/ffmpeg.C
-@@ -23,7 +23,6 @@ FFMPEG::FFMPEG(Asset *asset) {
- 
- int FFMPEG::init(char *codec_string) {
- 
--	avcodec_init();
- 	avcodec_register_all();
- 
- 	CodecID id = codec_id(codec_string);
-@@ -364,12 +363,15 @@ int FFMPEG::decode(uint8_t *data, long data_size, VFrame *frame_out) {
- 
- 	// NOTE: frame must already have data space allocated
- 	
-+	AVPacket pkt;
- 	got_picture = 0;
--	int length = avcodec_decode_video(context,
-+	av_init_packet( &pkt );
-+	pkt.data = data;
-+	pkt.size = data_size;
-+	int length = avcodec_decode_video2(context,
- 					  picture,
- 					  &got_picture,
--					  data,
--					  data_size);
-+					  &pkt);
- 	
- 	if (length < 0) {
- 		printf("FFMPEG::decode error decoding frame\n");
-diff --git a/cinelerra/fileac3.C b/cinelerra/fileac3.C
-index a1ef61e..e56705f 100644
---- a/cinelerra/fileac3.C
-+++ b/cinelerra/fileac3.C
-@@ -84,7 +84,6 @@ int FileAC3::open_file(int rd, int wr)
- 
- 	if(wr)
- 	{
--  		avcodec_init();
- 		avcodec_register_all();
- 		codec = avcodec_find_encoder(CODEC_ID_AC3);
- 		if(!codec)
-diff --git a/quicktime/mpeg4.c b/quicktime/mpeg4.c
-index 81cb72b..67bcab8 100644
---- a/quicktime/mpeg4.c
-+++ b/quicktime/mpeg4.c
-@@ -629,7 +629,6 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track)
- 			if(!ffmpeg_initialized)
- 			{
- 				ffmpeg_initialized = 1;
--  				avcodec_init();
- 				avcodec_register_all();
- 			}
- 
-@@ -674,7 +673,7 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track)
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- 			context->error_resilience = FF_ER_CAREFUL;
- #else
--			context->error_recognition = FF_ER_CAREFUL;
-+			context->err_recognition = AV_EF_CRCCHECK;
- #endif
- 			context->error_concealment = 3;
- 			context->frame_skip_cmp = FF_CMP_DCTMAX;
-@@ -699,7 +698,6 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track)
-         	context->profile= FF_PROFILE_UNKNOWN;
- 			context->rc_buffer_aggressivity = 1.0;
-         	context->level= FF_LEVEL_UNKNOWN;
--			context->flags |= CODEC_FLAG_H263P_UMV;
- 			context->flags |= CODEC_FLAG_AC_PRED;
- 
- // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg...
-@@ -717,10 +715,8 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track)
- 				(codec->ffmpeg_id == CODEC_ID_MPEG4 ||
- 			         codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
- 			         codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
--			         codec->ffmpeg_id == CODEC_ID_H263P || 
--			         codec->ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
-+			         codec->ffmpeg_id == CODEC_ID_H263P))
- 			{
--				avcodec_thread_init(context, file->cpus);
- 				context->thread_count = file->cpus;
- 			}
- 
-diff --git a/quicktime/qtffmpeg.c b/quicktime/qtffmpeg.c
-index 8c532c2..a2b51e9 100644
---- a/quicktime/qtffmpeg.c
-+++ b/quicktime/qtffmpeg.c
-@@ -54,7 +54,6 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus,
- 	if(!ffmpeg_initialized)
- 	{
- 		ffmpeg_initialized = 1;
--  		avcodec_init();
- 		avcodec_register_all();
- 	}
- 
-@@ -90,10 +89,8 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus,
- 				(ffmpeg_id == CODEC_ID_MPEG4 ||
- 			         ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
- 			         ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
--			         ffmpeg_id == CODEC_ID_H263P || 
--			         ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
-+			         ffmpeg_id == CODEC_ID_H263P))
- 		{
--			avcodec_thread_init(context, cpus);
- 			context->thread_count = cpus;
- 		}
- 		if(avcodec_open(context, 
-@@ -181,6 +178,7 @@ static int decode_wrapper(quicktime_t *file,
-  
- 	if(!result) 
- 	{ 
-+		AVPacket pkt;
- 
- 
- // No way to determine if there was an error based on nonzero status.
-@@ -189,11 +187,13 @@ static int decode_wrapper(quicktime_t *file,
- 			ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_NONREF /* AVDISCARD_BIDIR */;
- 		else
- 			ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_DEFAULT;
--		result = avcodec_decode_video(ffmpeg->decoder_context[current_field], 
-+		av_init_packet( &pkt );
-+		pkt.data = ffmpeg->work_buffer;
-+		pkt.size = bytes + header_bytes;
-+		result = avcodec_decode_video2(ffmpeg->decoder_context[current_field], 
- 			&ffmpeg->picture[current_field], 
- 			&got_picture, 
--			ffmpeg->work_buffer, 
--			bytes + header_bytes);
-+			&pkt);
- 
- 
- 
-diff --git a/quicktime/wma.c b/quicktime/wma.c
-index c045741..abc2dc8 100644
---- a/quicktime/wma.c
-+++ b/quicktime/wma.c
-@@ -67,7 +67,6 @@ static int init_decode(quicktime_audio_map_t *track_map,
- 		if(!ffmpeg_initialized)
- 		{
- 			ffmpeg_initialized = 1;
--			avcodec_init();
- 			avcodec_register_all();
- 		}
- 
-@@ -195,11 +194,14 @@ printf("decode 2 %x %llx %llx\n", chunk_size, chunk_offset, chunk_offset + chunk
- 			chunk_size);
- #else
- 		bytes_decoded = AVCODEC_MAX_AUDIO_FRAME_SIZE;
--		result = avcodec_decode_audio2(codec->decoder_context,
-+		AVPacket pkt;
-+		av_init_packet( &pkt );
-+		pkt.data = codec->packet_buffer;
-+		pkt.size = chunk_size;
-+		result = avcodec_decode_audio3(codec->decoder_context,
- 			(int16_t*)(codec->work_buffer + codec->output_size * sample_size),
- 			&bytes_decoded,
--			codec->packet_buffer,
--			chunk_size);
-+			&pkt);
- #endif
- 
- 		pthread_mutex_unlock(&ffmpeg_lock);
diff --git a/community/cinelerra-cv/v4l1_removal.patch b/community/cinelerra-cv/v4l1_removal.patch
deleted file mode 100644
index 9df4004fe..000000000
--- a/community/cinelerra-cv/v4l1_removal.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-http://bugs.cinelerra.org/ticket/949
-https://bugs.gentoo.org/show_bug.cgi?id=361709
-
-diff -Nru cinelerra.orig//cinelerra/channelpicker.C cinelerra/cinelerra/channelpicker.C
---- cinelerra.orig//cinelerra/channelpicker.C	2010-11-24 18:18:03.000000000 -0500
-+++ cinelerra/cinelerra/channelpicker.C	2011-02-17 13:31:30.147880002 -0500
-@@ -39,7 +39,7 @@
- #include "recordgui.h"
- #include "recordmonitor.h"
- #include "theme.h"
--#include "vdevicebuz.h"
-+//#include "vdevicebuz.h"
- #include "vdeviceprefs.h"
- #include "videodevice.h"
- 
-@@ -280,7 +280,7 @@
- //	printf("PrefsChannelPicker::PrefsChannelPicker 1\n");
- 	this->mwindow = mwindow;
- 	this->prefs = prefs;
--	VDeviceBUZ::get_inputs(&input_sources);
-+//	VDeviceBUZ::get_inputs(&input_sources);
- }
- 
- PrefsChannelPicker::~PrefsChannelPicker()
-diff -Nru cinelerra.orig//cinelerra/Makefile.am cinelerra/cinelerra/Makefile.am
---- cinelerra.orig//cinelerra/Makefile.am	2010-11-24 18:18:03.000000000 -0500
-+++ cinelerra/cinelerra/Makefile.am	2011-02-17 13:31:30.147880002 -0500
-@@ -305,10 +305,8 @@
- 		    vattachmentpoint.C \
- 		    vautomation.C \
- 		    vdevicebase.C \
--		    vdevicebuz.C \
- 		    vdevicedvb.C \
- 		    vdeviceprefs.C \
--		    vdevicev4l.C \
- 		    vdevicev4l2.C \
- 		    vdevicev4l2jpeg.C \
- 		    vdevicex11.C \
-diff -Nru cinelerra.orig//cinelerra/reversemake cinelerra/cinelerra/reversemake
---- cinelerra.orig//cinelerra/reversemake	2010-11-24 18:18:03.000000000 -0500
-+++ cinelerra/cinelerra/reversemake	2011-02-17 13:31:30.151880002 -0500
-@@ -32,10 +32,8 @@
- make $OBJDIR/vedits.o
- make $OBJDIR/vedit.o
- make $OBJDIR/vdevicex11.o
--make $OBJDIR/vdevicev4l.o
- make $OBJDIR/vdeviceprefs.o
- make $OBJDIR/vdevicelml.o
--make $OBJDIR/vdevicebuz.o
- make $OBJDIR/vdevicebase.o
- make $OBJDIR/vdevice1394.o
- make $OBJDIR/vautomation.o
-diff -Nru cinelerra.orig//cinelerra/videodevice.C cinelerra/cinelerra/videodevice.C
---- cinelerra.orig//cinelerra/videodevice.C	2010-11-24 18:18:03.000000000 -0500
-+++ cinelerra/cinelerra/videodevice.C	2011-02-17 13:41:53.239880001 -0500
-@@ -39,9 +39,9 @@
- #ifdef HAVE_FIREWIRE
- #include "vdevice1394.h"
- #endif
--#include "vdevicebuz.h"
-+//#include "vdevicebuz.h"
- #include "vdevicedvb.h"
--#include "vdevicev4l.h"
-+//#include "vdevicev4l.h"
- #include "vdevicev4l2.h"
- #include "vdevicev4l2jpeg.h"
- #include "vdevicex11.h"
-@@ -203,7 +203,6 @@
- 			result = input_base->open_input();
- 			break;
- 
--
- #ifdef HAVE_VIDEO4LINUX2
- 		case VIDEO4LINUX2:
- 			new_device_base();
-@@ -250,8 +249,8 @@
- {
- 	switch(in_config->driver)
- 	{
--		case VIDEO4LINUX:
--			return input_base = new VDeviceV4L(this);
-+		//case VIDEO4LINUX:
-+		//	return input_base = new VDeviceV4L(this);
- 
- #ifdef HAVE_VIDEO4LINUX2
- 		case VIDEO4LINUX2:
-@@ -264,8 +263,8 @@
- 		case SCREENCAPTURE:
- 			return input_base = new VDeviceX11(this, 0);
- 
--		case CAPTURE_BUZ:
--			return input_base = new VDeviceBUZ(this);
-+		//case CAPTURE_BUZ:
-+		//	return input_base = new VDeviceBUZ(this);
- 
- #ifdef HAVE_FIREWIRE
- 		case CAPTURE_FIREWIRE:
-@@ -662,9 +661,9 @@
- //printf("VideoDevice::open_output 1 %d\n", out_config->driver);
- 	switch(out_config->driver)
- 	{
--		case PLAYBACK_BUZ:
--			output_base = new VDeviceBUZ(this);
--			break;
-+		//case PLAYBACK_BUZ:
-+		//	output_base = new VDeviceBUZ(this);
-+		//	break;
- 		case PLAYBACK_X11:
- 		case PLAYBACK_X11_XV:
- 		case PLAYBACK_X11_GL:
-diff -Nru cinelerra.orig//cinelerra/videodevice.h cinelerra/cinelerra/videodevice.h
---- cinelerra.orig//cinelerra/videodevice.h	2010-11-24 18:18:03.000000000 -0500
-+++ cinelerra/cinelerra/videodevice.h	2011-02-17 13:31:30.167880002 -0500
-@@ -40,9 +40,9 @@
- #include "thread.h"
- #include "picture.inc"
- #include "vdevicebase.inc"
--#include "vdevicebuz.inc"
-+//#include "vdevicebuz.inc"
- #include "vdevicelml.inc"
--#include "vdevicev4l.inc"
-+//#include "vdevicev4l.inc"
- #include "vdevicex11.inc"
- #include "videoconfig.inc"
- #include "videowindow.inc"
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD
new file mode 100644
index 000000000..36131c4f9
--- /dev/null
+++ b/community/cinnamon-control-center/PKGBUILD
@@ -0,0 +1,65 @@
+# $Id: PKGBUILD 89868 2013-05-03 19:53:33Z faidoc $
+# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com
+# Based on gnome-control-center:
+# Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Jan de Groot <jgc@archlinux.org>
+
+pkgname=cinnamon-control-center
+pkgver=1.7.5
+pkgrel=1
+pkgdesc="The Control Center for Cinnamon"
+arch=('i686' 'x86_64' 'mips64el')
+depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet')
+optdepends=('gnome-color-manager: for color management tasks')
+makedepends=('intltool' 'gnome-common')
+url="https://github.com/linuxmint/cinnamon-control-center"
+install=cinnamon-control-center.install
+license=('GPL')
+options=('!libtool' '!emptydirs')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
+        "gnomerrlabeler.patch"
+        "idle-delay.patch")
+sha256sums=('50192b279bd2d6c9a0cb686144d5cf8195e33fbe1e107baeca6da03a638e1f8d'
+            '826de61fa60349a99c6895f2ffb0ea1c7f71031b17dd80bb245e3834b30b6ff6'
+            '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67')
+
+build() {
+  cd $pkgname-$pkgver
+
+  # Build fix for GNOME 3.8
+  patch -Np1 -i "$srcdir/gnomerrlabeler.patch"
+
+  # Runtime fix for GNOME 3.8
+  patch -Np1 -i "$srcdir/idle-delay.patch"
+
+  autoreconf -fi
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --enable-systemd \
+      --disable-update-mimedb
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+
+  # Remove unused stuff
+  make -C panels/sound DESTDIR="$pkgdir" uninstall
+  make -C panels/sound/data DESTDIR="$pkgdir" install
+  make -C shell DESTDIR="$pkgdir" uninstall
+  make -C shell DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+  # Remove broken desktop files
+  rm -R "$pkgdir/usr/share/applications"
+  rm -R "$pkgdir/etc"
+
+  # Fix a warning
+  chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
+  chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
+}
diff --git a/community/cinnamon-control-center/cinnamon-control-center.install b/community/cinnamon-control-center/cinnamon-control-center.install
new file mode 100644
index 000000000..d1fce39bc
--- /dev/null
+++ b/community/cinnamon-control-center/cinnamon-control-center.install
@@ -0,0 +1,11 @@
+post_install() {
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}
\ No newline at end of file
diff --git a/community/cinnamon-control-center/gnomerrlabeler.patch b/community/cinnamon-control-center/gnomerrlabeler.patch
new file mode 100644
index 000000000..b763078ba
--- /dev/null
+++ b/community/cinnamon-control-center/gnomerrlabeler.patch
@@ -0,0 +1,766 @@
+diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c
+--- cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c	2013-04-15 16:04:38.000000000 +0200
++++ cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c	2013-04-22 03:46:53.499944701 +0200
+@@ -31,12 +31,13 @@
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+ #include <libgnome-desktop/gnome-rr.h>
+ #include <libgnome-desktop/gnome-rr-config.h>
+-#include <libgnome-desktop/gnome-rr-labeler.h>
+ #include <gdk/gdkx.h>
+ #include <X11/Xlib.h>
+ #include <glib/gi18n.h>
+ #include <gdesktop-enums.h>
+ 
++#include "cc-rr-labeler.h"
++
+ CC_PANEL_REGISTER (CcDisplayPanel, cc_display_panel)
+ 
+ #define DISPLAY_PANEL_PRIVATE(o) \
+@@ -75,7 +76,7 @@
+ {
+   GnomeRRScreen       *screen;
+   GnomeRRConfig  *current_configuration;
+-  GnomeRRLabeler *labeler;
++  CcRRLabeler *labeler;
+   GnomeRROutputInfo         *current_output;
+ 
+   GSettings      *clock_settings;
+@@ -200,7 +201,7 @@
+         g_signal_handler_disconnect (GTK_WIDGET (self), self->priv->focus_id_hide);
+     }
+ 
+-  gnome_rr_labeler_hide (self->priv->labeler);
++  cc_rr_labeler_hide (self->priv->labeler);
+   g_object_unref (self->priv->labeler);
+ 
+   G_OBJECT_CLASS (cc_display_panel_parent_class)->finalize (object);
+@@ -293,16 +294,16 @@
+   self->priv->current_output = NULL;
+ 
+   if (self->priv->labeler) {
+-    gnome_rr_labeler_hide (self->priv->labeler);
++    cc_rr_labeler_hide (self->priv->labeler);
+     g_object_unref (self->priv->labeler);
+   }
+ 
+-  self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration);
++  self->priv->labeler = cc_rr_labeler_new (self->priv->current_configuration);
+ 
+   if (cc_panel_get_shell (CC_PANEL (self)) == NULL)
+-    gnome_rr_labeler_hide (self->priv->labeler);
++    cc_rr_labeler_hide (self->priv->labeler);
+   else
+-    gnome_rr_labeler_show (self->priv->labeler);
++    cc_rr_labeler_show (self->priv->labeler);
+ 
+   select_current_output_from_dialog_position (self);
+ 
+@@ -2594,9 +2595,9 @@
+   if (self->priv->labeler == NULL)
+     return;
+   if (gtk_window_has_toplevel_focus (window))
+-    gnome_rr_labeler_show (self->priv->labeler);
++    cc_rr_labeler_show (self->priv->labeler);
+   else
+-    gnome_rr_labeler_hide (self->priv->labeler);
++    cc_rr_labeler_hide (self->priv->labeler);
+ }
+ 
+ static void
+@@ -2606,9 +2607,9 @@
+     if (CC_DISPLAY_PANEL(widget)->priv->labeler == NULL)
+         return;
+     if (gtk_widget_get_visible (widget)) {
+-        gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
++        cc_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
+     } else {
+-        gnome_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler);
++        cc_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler);
+     }
+ }
+ 
+diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.c cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.c
+--- cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.c	1970-01-01 01:00:00.000000000 +0100
++++ cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.c	2013-04-22 03:42:12.379900127 +0200
+@@ -0,0 +1,601 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
++ * cc-rr-labeler.c - Utility to label monitors to identify them
++ * while they are being configured.
++ *
++ * Copyright 2008, Novell, Inc.
++ *
++ * This file is part of the Gnome Library.
++ *
++ * The Gnome Library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * The Gnome Library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
++ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ *
++ * Author: Federico Mena-Quintero <federico@novell.com>
++ */
++
++#include <config.h>
++#include <glib/gi18n-lib.h>
++#include <gtk/gtk.h>
++
++#include <X11/Xproto.h>
++#include <X11/Xlib.h>
++#include <X11/Xutil.h>
++#include <X11/Xatom.h>
++#include <gdk/gdkx.h>
++
++#include "cc-rr-labeler.h"
++
++struct _CcRRLabelerPrivate {
++	GnomeRRConfig *config;
++
++	int num_outputs;
++
++	GdkRGBA *palette;
++	GtkWidget **windows;
++
++	GdkScreen  *screen;
++	Atom        workarea_atom;
++};
++
++enum {
++	PROP_0,
++	PROP_CONFIG,
++	PROP_LAST
++};
++
++G_DEFINE_TYPE (CcRRLabeler, cc_rr_labeler, G_TYPE_OBJECT);
++
++static void cc_rr_labeler_finalize (GObject *object);
++static void setup_from_config (CcRRLabeler *labeler);
++
++static GdkFilterReturn
++screen_xevent_filter (GdkXEvent      *xevent,
++		      GdkEvent       *event,
++		      CcRRLabeler *labeler)
++{
++	XEvent *xev;
++
++	xev = (XEvent *) xevent;
++
++	if (xev->type == PropertyNotify &&
++	    xev->xproperty.atom == labeler->priv->workarea_atom) {
++		/* update label positions */
++		if (labeler->priv->windows != NULL) {
++			cc_rr_labeler_hide (labeler);
++			cc_rr_labeler_show (labeler);
++		}
++	}
++
++	return GDK_FILTER_CONTINUE;
++}
++
++static void
++cc_rr_labeler_init (CcRRLabeler *labeler)
++{
++	GdkWindow *gdkwindow;
++
++	labeler->priv = G_TYPE_INSTANCE_GET_PRIVATE (labeler, GNOME_TYPE_RR_LABELER, CcRRLabelerPrivate);
++
++	labeler->priv->workarea_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
++						    "_NET_WORKAREA",
++						    True);
++
++	labeler->priv->screen = gdk_screen_get_default ();
++	/* code is not really designed to handle multiple screens so *shrug* */
++	gdkwindow = gdk_screen_get_root_window (labeler->priv->screen);
++	gdk_window_add_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, labeler);
++	gdk_window_set_events (gdkwindow, gdk_window_get_events (gdkwindow) | GDK_PROPERTY_CHANGE_MASK);
++}
++
++static void
++cc_rr_labeler_set_property (GObject *gobject, guint property_id, const GValue *value, GParamSpec *param_spec)
++{
++	CcRRLabeler *self = CC_RR_LABELER (gobject);
++
++	switch (property_id) {
++	case PROP_CONFIG:
++		self->priv->config = GNOME_RR_CONFIG (g_value_dup_object (value));
++		return;
++	default:
++		G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, property_id, param_spec);
++	}
++}
++
++static GObject *
++cc_rr_labeler_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)
++{
++	CcRRLabeler *self = (CcRRLabeler*) G_OBJECT_CLASS (cc_rr_labeler_parent_class)->constructor (type, n_construct_properties, construct_properties);
++
++	setup_from_config (self);
++
++	return (GObject*) self;
++}
++
++static void
++cc_rr_labeler_class_init (CcRRLabelerClass *klass)
++{
++	GObjectClass *object_class;
++
++	g_type_class_add_private (klass, sizeof (CcRRLabelerPrivate));
++
++	object_class = (GObjectClass *) klass;
++
++	object_class->set_property = cc_rr_labeler_set_property;
++	object_class->finalize = cc_rr_labeler_finalize;
++	object_class->constructor = cc_rr_labeler_constructor;
++
++	g_object_class_install_property (object_class, PROP_CONFIG, g_param_spec_object ("config",
++											 "Configuration",
++											 "RandR configuration to label",
++											 GNOME_TYPE_RR_CONFIG,
++											 G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
++											 G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
++}
++
++static void
++cc_rr_labeler_finalize (GObject *object)
++{
++	CcRRLabeler *labeler;
++	GdkWindow      *gdkwindow;
++
++	labeler = CC_RR_LABELER (object);
++
++	gdkwindow = gdk_screen_get_root_window (labeler->priv->screen);
++	gdk_window_remove_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, labeler);
++
++	if (labeler->priv->config != NULL) {
++		g_object_unref (labeler->priv->config);
++	}
++
++	if (labeler->priv->windows != NULL) {
++		cc_rr_labeler_hide (labeler);
++		g_free (labeler->priv->windows);
++	}
++
++	g_free (labeler->priv->palette);
++
++	G_OBJECT_CLASS (cc_rr_labeler_parent_class)->finalize (object);
++}
++
++static int
++count_outputs (GnomeRRConfig *config)
++{
++	int i;
++	GnomeRROutputInfo **outputs = gnome_rr_config_get_outputs (config);
++
++	for (i = 0; outputs[i] != NULL; i++)
++		;
++
++	return i;
++}
++
++static void
++make_palette (CcRRLabeler *labeler)
++{
++	/* The idea is that we go around an hue color wheel.  We want to start
++	 * at red, go around to green/etc. and stop at blue --- because magenta
++	 * is evil.  Eeeeek, no magenta, please!
++	 *
++	 * Purple would be nice, though.  Remember that we are watered down
++	 * (i.e. low saturation), so that would be like Like berries with cream.
++	 * Mmmmm, berries.
++	 */
++	double start_hue;
++	double end_hue;
++	int i;
++
++	g_assert (labeler->priv->num_outputs > 0);
++
++	labeler->priv->palette = g_new (GdkRGBA, labeler->priv->num_outputs);
++
++	start_hue = 0.0; /* red */
++	end_hue   = 2.0/3; /* blue */
++
++	for (i = 0; i < labeler->priv->num_outputs; i++) {
++		double h, s, v;
++		double r, g, b;
++
++		h = start_hue + (end_hue - start_hue) / labeler->priv->num_outputs * i;
++		s = 1.0 / 3;
++		v = 1.0;
++
++		gtk_hsv_to_rgb (h, s, v, &r, &g, &b);
++
++		labeler->priv->palette[i].red   = r;
++		labeler->priv->palette[i].green = g;
++		labeler->priv->palette[i].blue  = b;
++		labeler->priv->palette[i].alpha  = 1.0;
++	}
++}
++
++static void
++rounded_rectangle (cairo_t *cr,
++                   gint     x,
++                   gint     y,
++                   gint     width,
++                   gint     height,
++                   gint     x_radius,
++                   gint     y_radius)
++{
++	gint x1, x2;
++	gint y1, y2;
++	gint xr1, xr2;
++	gint yr1, yr2;
++
++	x1 = x;
++	x2 = x1 + width;
++	y1 = y;
++	y2 = y1 + height;
++
++	x_radius = MIN (x_radius, width / 2.0);
++	y_radius = MIN (y_radius, width / 2.0);
++
++	xr1 = x_radius;
++	xr2 = x_radius / 2.0;
++	yr1 = y_radius;
++	yr2 = y_radius / 2.0;
++
++	cairo_move_to    (cr, x1 + xr1, y1);
++	cairo_line_to    (cr, x2 - xr1, y1);
++	cairo_curve_to   (cr, x2 - xr2, y1, x2, y1 + yr2, x2, y1 + yr1);
++	cairo_line_to    (cr, x2, y2 - yr1);
++	cairo_curve_to   (cr, x2, y2 - yr2, x2 - xr2, y2, x2 - xr1, y2);
++	cairo_line_to    (cr, x1 + xr1, y2);
++	cairo_curve_to   (cr, x1 + xr2, y2, x1, y2 - yr2, x1, y2 - yr1);
++	cairo_line_to    (cr, x1, y1 + yr1);
++	cairo_curve_to   (cr, x1, y1 + yr2, x1 + xr2, y1, x1 + xr1, y1);
++	cairo_close_path (cr);
++}
++
++#define LABEL_WINDOW_EDGE_THICKNESS 2
++#define LABEL_WINDOW_PADDING 12
++/* Look for panel-corner in:
++ * http://git.gnome.org/browse/gnome-shell/tree/data/theme/gnome-shell.css
++ * to match the corner radius */
++#define LABEL_CORNER_RADIUS 6 + LABEL_WINDOW_EDGE_THICKNESS
++
++static void
++label_draw_background_and_frame (GtkWidget *widget, cairo_t *cr, gboolean for_shape)
++{
++	GdkRGBA shape_color = { 0, 0, 0, 1 };
++	GdkRGBA *rgba;
++	GtkAllocation allocation;
++
++	rgba = g_object_get_data (G_OBJECT (widget), "rgba");
++	gtk_widget_get_allocation (widget, &allocation);
++
++	cairo_save (cr);
++	cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
++
++	/* edge outline */
++	if (for_shape)
++		gdk_cairo_set_source_rgba (cr, &shape_color);
++	else
++		cairo_set_source_rgba (cr, 0, 0, 0, 0.5);
++
++	rounded_rectangle (cr,
++	                   LABEL_WINDOW_EDGE_THICKNESS / 2.0,
++	                   LABEL_WINDOW_EDGE_THICKNESS / 2.0,
++	                   allocation.width - LABEL_WINDOW_EDGE_THICKNESS,
++	                   allocation.height - LABEL_WINDOW_EDGE_THICKNESS,
++	                   LABEL_CORNER_RADIUS, LABEL_CORNER_RADIUS);
++	cairo_set_line_width (cr, LABEL_WINDOW_EDGE_THICKNESS);
++	cairo_stroke (cr);
++
++	/* fill */
++	if (for_shape) {
++		gdk_cairo_set_source_rgba (cr, &shape_color);
++	} else {
++		rgba->alpha = 0.75;
++		gdk_cairo_set_source_rgba (cr, rgba);
++	}
++
++	rounded_rectangle (cr,
++	                   LABEL_WINDOW_EDGE_THICKNESS,
++	                   LABEL_WINDOW_EDGE_THICKNESS,
++	                   allocation.width - LABEL_WINDOW_EDGE_THICKNESS * 2,
++	                   allocation.height - LABEL_WINDOW_EDGE_THICKNESS * 2,
++	                   LABEL_CORNER_RADIUS - LABEL_WINDOW_EDGE_THICKNESS / 2.0,
++			   LABEL_CORNER_RADIUS - LABEL_WINDOW_EDGE_THICKNESS / 2.0);
++	cairo_fill (cr);
++
++	cairo_restore (cr);
++}
++
++static void
++maybe_update_shape (GtkWidget *widget)
++{
++	cairo_t *cr;
++	cairo_surface_t *surface;
++	cairo_region_t *region;
++
++	/* fallback to XShape only for non-composited clients */
++	if (gtk_widget_is_composited (widget)) {
++		gtk_widget_shape_combine_region (widget, NULL);
++		return;
++	}
++
++	surface = gdk_window_create_similar_surface (gtk_widget_get_window (widget),
++						     CAIRO_CONTENT_COLOR_ALPHA,
++						     gtk_widget_get_allocated_width (widget),
++						     gtk_widget_get_allocated_height (widget));
++
++	cr = cairo_create (surface);
++	label_draw_background_and_frame (widget, cr, TRUE);
++	cairo_destroy (cr);
++
++	region = gdk_cairo_region_create_from_surface (surface);
++	gtk_widget_shape_combine_region (widget, region);
++
++	cairo_surface_destroy (surface);
++	cairo_region_destroy (region);
++}
++
++static gboolean
++label_window_draw_event_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
++{
++	if (gtk_widget_is_composited (widget)) {
++		/* clear any content */
++		cairo_save (cr);
++		cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
++		cairo_set_source_rgba (cr, 0, 0, 0, 0);
++		cairo_paint (cr);
++		cairo_restore (cr);
++	}
++
++	maybe_update_shape (widget);
++	label_draw_background_and_frame (widget, cr, FALSE);
++
++	return FALSE;
++}
++
++static void
++position_window (CcRRLabeler  *labeler,
++		 GtkWidget       *window,
++		 int              x,
++		 int              y)
++{
++	GdkRectangle    workarea;
++	GdkRectangle    monitor;
++	int             monitor_num;
++
++	monitor_num = gdk_screen_get_monitor_at_point (labeler->priv->screen, x, y);
++	gdk_screen_get_monitor_workarea (labeler->priv->screen, monitor_num, &workarea);
++	gdk_screen_get_monitor_geometry (labeler->priv->screen,
++                                         monitor_num,
++                                         &monitor);
++	gdk_rectangle_intersect (&monitor, &workarea, &workarea);
++
++	gtk_window_move (GTK_WINDOW (window), workarea.x, workarea.y);
++}
++
++static void
++label_window_realize_cb (GtkWidget *widget)
++{
++	cairo_region_t *region;
++
++	/* make the whole window ignore events */
++	region = cairo_region_create ();
++	gtk_widget_input_shape_combine_region (widget, region);
++	cairo_region_destroy (region);
++
++	maybe_update_shape (widget);
++}
++
++static void
++label_window_composited_changed_cb (GtkWidget *widget, CcRRLabeler *labeler)
++{
++	if (gtk_widget_get_realized (widget))
++		maybe_update_shape (widget);
++}
++
++static GtkWidget *
++create_label_window (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba)
++{
++	GtkWidget *window;
++	GtkWidget *widget;
++	char *str;
++	const char *display_name;
++	GdkRGBA black = { 0, 0, 0, 1.0 };
++	int x, y;
++	GdkScreen *screen;
++	GdkVisual *visual;
++
++	window = gtk_window_new (GTK_WINDOW_POPUP);
++	gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_TOOLTIP);
++	gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
++	gtk_widget_set_app_paintable (window, TRUE);
++	screen = gtk_widget_get_screen (window);
++	visual = gdk_screen_get_rgba_visual (screen);
++
++	if (visual != NULL)
++		gtk_widget_set_visual (window, visual);
++
++	gtk_container_set_border_width (GTK_CONTAINER (window), LABEL_WINDOW_PADDING + LABEL_WINDOW_EDGE_THICKNESS);
++
++	/* This is semi-dangerous.  The color is part of the labeler->palette
++	 * array.  Note that in cc_rr_labeler_finalize(), we are careful to
++	 * free the palette only after we free the windows.
++	 */
++	g_object_set_data (G_OBJECT (window), "rgba", rgba);
++
++	g_signal_connect (window, "draw",
++			  G_CALLBACK (label_window_draw_event_cb), labeler);
++	g_signal_connect (window, "realize",
++			  G_CALLBACK (label_window_realize_cb), labeler);
++	g_signal_connect (window, "composited-changed",
++			  G_CALLBACK (label_window_composited_changed_cb), labeler);
++
++	if (gnome_rr_config_get_clone (labeler->priv->config)) {
++		/* Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name() */
++
++		/* Translators:  this is the feature where what you see on your
++		 * laptop's screen is the same as your external projector.
++		 * Here, "Mirrored" is being used as an adjective.  For example,
++		 * the Spanish translation could be "Pantallas en Espejo".
++		 */
++		display_name = _("Mirrored Displays");
++	} else
++		display_name = gnome_rr_output_info_get_display_name (output);
++
++	str = g_strdup_printf ("<b>%s</b>", display_name);
++	widget = gtk_label_new (NULL);
++	gtk_label_set_markup (GTK_LABEL (widget), str);
++	g_free (str);
++
++	/* Make the label explicitly black.  We don't want it to follow the
++	 * theme's colors, since the label is always shown against a light
++	 * pastel background.  See bgo#556050
++	 */
++	gtk_widget_override_color (widget,
++				   gtk_widget_get_state_flags (widget),
++				   &black);
++
++	gtk_container_add (GTK_CONTAINER (window), widget);
++
++	/* Should we center this at the top edge of the monitor, instead of using the upper-left corner? */
++	gnome_rr_output_info_get_geometry (output, &x, &y, NULL, NULL);
++	position_window (labeler, window, x, y);
++
++	gtk_widget_show_all (window);
++
++	return window;
++}
++
++static void
++setup_from_config (CcRRLabeler *labeler)
++{
++	labeler->priv->num_outputs = count_outputs (labeler->priv->config);
++
++	make_palette (labeler);
++
++	cc_rr_labeler_show (labeler);
++}
++
++/**
++ * cc_rr_labeler_new:
++ * @config: Configuration of the screens to label
++ *
++ * Create a GUI element that will display colored labels on each connected monitor.
++ * This is useful when users are required to identify which monitor is which, e.g. for
++ * for configuring multiple monitors.
++ * The labels will be shown by default, use cc_rr_labeler_hide to hide them.
++ *
++ * Returns: A new #CcRRLabeler
++ */
++CcRRLabeler *
++cc_rr_labeler_new (GnomeRRConfig *config)
++{
++	g_return_val_if_fail (GNOME_IS_RR_CONFIG (config), NULL);
++
++	return g_object_new (GNOME_TYPE_RR_LABELER, "config", config, NULL);
++}
++
++/**
++ * cc_rr_labeler_show:
++ * @labeler: A #CcRRLabeler
++ *
++ * Show the labels.
++ */
++void
++cc_rr_labeler_show (CcRRLabeler *labeler)
++{
++	int i;
++	gboolean created_window_for_clone;
++	GnomeRROutputInfo **outputs;
++
++	g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
++
++	if (labeler->priv->windows != NULL)
++		return;
++
++	labeler->priv->windows = g_new (GtkWidget *, labeler->priv->num_outputs);
++
++	created_window_for_clone = FALSE;
++
++	outputs = gnome_rr_config_get_outputs (labeler->priv->config);
++
++	for (i = 0; i < labeler->priv->num_outputs; i++) {
++		if (!created_window_for_clone && gnome_rr_output_info_is_active (outputs[i])) {
++			labeler->priv->windows[i] = create_label_window (labeler, outputs[i], labeler->priv->palette + i);
++
++			if (gnome_rr_config_get_clone (labeler->priv->config))
++				created_window_for_clone = TRUE;
++		} else
++			labeler->priv->windows[i] = NULL;
++	}
++}
++
++/**
++ * cc_rr_labeler_hide:
++ * @labeler: A #CcRRLabeler
++ *
++ * Hide ouput labels.
++ */
++void
++cc_rr_labeler_hide (CcRRLabeler *labeler)
++{
++	int i;
++	CcRRLabelerPrivate *priv;
++
++	g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
++
++	priv = labeler->priv;
++
++	if (priv->windows == NULL)
++		return;
++
++	for (i = 0; i < priv->num_outputs; i++)
++		if (priv->windows[i] != NULL) {
++			gtk_widget_destroy (priv->windows[i]);
++			priv->windows[i] = NULL;
++	}
++	g_free (priv->windows);
++	priv->windows = NULL;
++}
++
++/**
++ * cc_rr_labeler_get_rgba_for_output:
++ * @labeler: A #CcRRLabeler
++ * @output: Output device (i.e. monitor) to query
++ * @rgba_out: (out): Color of selected monitor.
++ *
++ * Get the color used for the label on a given output (monitor).
++ */
++void
++cc_rr_labeler_get_rgba_for_output (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba_out)
++{
++	int i;
++	GnomeRROutputInfo **outputs;
++
++	g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
++	g_return_if_fail (GNOME_IS_RR_OUTPUT_INFO (output));
++	g_return_if_fail (rgba_out != NULL);
++
++	outputs = gnome_rr_config_get_outputs (labeler->priv->config);
++
++	for (i = 0; i < labeler->priv->num_outputs; i++)
++		if (outputs[i] == output) {
++			*rgba_out = labeler->priv->palette[i];
++			return;
++		}
++
++	g_warning ("trying to get the color for unknown GnomeOutputInfo %p; returning magenta!", output);
++
++	rgba_out->red   = 1.0;
++	rgba_out->green = 0;
++	rgba_out->blue  = 1.0;
++	rgba_out->alpha  = 1.0;
++}
+diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.h cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.h
+--- cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.h	1970-01-01 01:00:00.000000000 +0100
++++ cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.h	2013-04-22 03:42:12.383233540 +0200
+@@ -0,0 +1,64 @@
++/* gnome-rr-labeler.h - Utility to label monitors to identify them
++ * while they are being configured.
++ *
++ * Copyright 2008, Novell, Inc.
++ *
++ * This file is part of the Gnome Library.
++ *
++ * The Gnome Library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * The Gnome Library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
++ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ *
++ * Author: Federico Mena-Quintero <federico@novell.com>
++ */
++
++#ifndef CC_RR_LABELER_H
++#define CC_RR_LABELER_H
++
++#define GNOME_DESKTOP_USE_UNSTABLE_API
++#include <libgnome-desktop/gnome-rr-config.h>
++
++#define GNOME_TYPE_RR_LABELER            (cc_rr_labeler_get_type ())
++#define CC_RR_LABELER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_RR_LABELER, CcRRLabeler))
++#define CC_RR_LABELER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GNOME_TYPE_RR_LABELER, CcRRLabelerClass))
++#define GNOME_IS_RR_LABELER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_RR_LABELER))
++#define GNOME_IS_RR_LABELER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GNOME_TYPE_RR_LABELER))
++#define CC_RR_LABELER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GNOME_TYPE_RR_LABELER, CcRRLabelerClass))
++
++typedef struct _CcRRLabeler CcRRLabeler;
++typedef struct _CcRRLabelerClass CcRRLabelerClass;
++typedef struct _CcRRLabelerPrivate CcRRLabelerPrivate;
++
++struct _CcRRLabeler {
++	GObject parent;
++
++	/*< private >*/
++	CcRRLabelerPrivate *priv;
++};
++
++struct _CcRRLabelerClass {
++	GObjectClass parent_class;
++};
++
++GType cc_rr_labeler_get_type (void);
++
++CcRRLabeler *cc_rr_labeler_new (GnomeRRConfig *config);
++
++void cc_rr_labeler_show (CcRRLabeler *labeler);
++
++void cc_rr_labeler_hide (CcRRLabeler *labeler);
++
++void cc_rr_labeler_get_rgba_for_output (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba_out);
++
++#endif
+diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/Makefile.am cinnamon-control-center-1.7.3/panels/display/Makefile.am
+--- cinnamon-control-center-1.7.3.orig/panels/display/Makefile.am	2013-04-15 16:04:38.000000000 +0200
++++ cinnamon-control-center-1.7.3/panels/display/Makefile.am	2013-04-22 03:42:12.376566715 +0200
+@@ -19,6 +19,8 @@
+ 	display-module.c	\
+ 	cc-display-panel.c	\
+ 	cc-display-panel.h	\
++	cc-rr-labeler.c		\
++	cc-rr-labeler.h		\
+ 	scrollarea.c		\
+ 	scrollarea.h		\
+ 	$(MARSHALFILES)
diff --git a/community/cinnamon-control-center/idle-delay.patch b/community/cinnamon-control-center/idle-delay.patch
new file mode 100644
index 000000000..7434018f5
--- /dev/null
+++ b/community/cinnamon-control-center/idle-delay.patch
@@ -0,0 +1,71 @@
+diff -Naur cinnamon-control-center-1.7.3.orig/panels/power/cc-power-panel.c cinnamon-control-center-1.7.3/panels/power/cc-power-panel.c
+--- cinnamon-control-center-1.7.3.orig/panels/power/cc-power-panel.c	2013-04-15 16:04:38.000000000 +0200
++++ cinnamon-control-center-1.7.3/panels/power/cc-power-panel.c	2013-04-22 05:04:26.466092668 +0200
+@@ -1068,26 +1068,6 @@
+                     G_CALLBACK (combo_enum_changed_cb),
+                     self);
+ 
+-  value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-ac-action");
+-  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
+-                                               "combobox_lid_ac"));
+-  disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget));
+-  set_value_for_combo (GTK_COMBO_BOX (widget), value);
+-  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-ac-action");
+-  g_signal_connect (widget, "changed",
+-                    G_CALLBACK (combo_enum_changed_cb),
+-                    self);
+-
+-  value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-battery-action");
+-  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
+-                                               "combobox_lid_battery"));
+-  disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget));
+-  set_value_for_combo (GTK_COMBO_BOX (widget), value);
+-  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-battery-action");
+-  g_signal_connect (widget, "changed",
+-                    G_CALLBACK (combo_enum_changed_cb),
+-                    self);
+-
+   widget = WID (self->priv->builder, "vbox_power");
+   gtk_widget_reparent (widget, (GtkWidget *) self);
+ 
+diff -Naur cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c cinnamon-control-center-1.7.3/panels/screen/cc-screen-panel.c
+--- cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c	2013-04-15 16:04:38.000000000 +0200
++++ cinnamon-control-center-1.7.3/panels/screen/cc-screen-panel.c	2013-04-22 14:15:28.440488342 +0200
+@@ -351,10 +351,6 @@
+                       1, &value,
+                       -1);
+ 
+-  /* set both battery and ac keys */
+-  g_settings_set_int (self->priv->gsd_settings, "sleep-display-ac", value);
+-  g_settings_set_int (self->priv->gsd_settings, "sleep-display-battery", value);
+-
+   set_idle_delay_from_dpms (self, value);
+ }
+ 
+@@ -384,7 +380,7 @@
+ {
+   GtkTreeIter iter;
+   GtkTreeModel *model;
+-  gint value;
++  guint value;
+   gint value_tmp, value_prev;
+   gboolean ret;
+   guint i;
+@@ -399,7 +395,7 @@
+   i = 0;
+ 
+   /* try to make the UI match the AC setting */
+-  value = g_settings_get_int (self->priv->gsd_settings, "sleep-display-ac");
++  g_settings_get (self->priv->session_settings, "idle-delay", "u", &value);
+   do
+     {
+       gtk_tree_model_get (model, &iter,
+@@ -510,7 +506,7 @@
+   /* bind the auto dim checkbox */
+   widget = WID ("screen_auto_reduce_checkbutton");
+   g_settings_bind (self->priv->gsd_settings,
+-                   "idle-dim-battery",
++                   "idle-dim",
+                    widget, "active",
+                    G_SETTINGS_BIND_DEFAULT);
+ 
diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD
new file mode 100644
index 000000000..b3e764c01
--- /dev/null
+++ b/community/cinnamon-screensaver/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
+# Based on gnome-screensaver package:
+# Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Jan de Groot <jgc@archlinux.org>
+
+pkgname=cinnamon-screensaver
+pkgver=1.7.2
+pkgrel=1
+pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url="https://github.com/linuxmint/cinnamon-screensaver"
+backup=(etc/pam.d/cinnamon-screensaver)
+depends=('cinnamon' 'gnome-screensaver')
+makedepends=('intltool' 'gnome-common')
+options=(!emptydirs)
+source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
+       cinnamon-screensaver.desktop
+       cinnamon2d-screensaver.desktop
+       cinnamon-screensaver.pam
+       configure.patch
+       fix-dbus-compatibility.patch)
+sha256sums=('c04d2c9c85729b5ae5635202b89084ea23e5211c50cf2dcce11869ffb2acce9f'
+            '2f29a72991deb5cc2b44da06f49d1115148fee6a0a22b1abfecee1c1661abcaa'
+            '335df8f2fb270484829d94995622521f0a42a12d6887f7de827db34fc81f583a'
+            'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
+            'fed5f1f94404fab13c5369f4106b0b498cff2bb71351cae4f3d9c27f417f5e6a'
+            'eebd1d056c21d2d3f60fb954677b9214fd1d575ed1c2bbb56326cedf41a39eb6')
+
+build() {
+  cd $pkgname-$pkgver
+
+  # Fix build with automake 1.13
+  patch -uNp2 -r- -i ${srcdir}/configure.patch
+
+  # Fix compatibility with gnome-screensaver's D-Bus interface and various fixes
+  patch -Np1 -i ${srcdir}/fix-dbus-compatibility.patch
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+               --libexecdir=/usr/lib/cinnamon-screensaver \
+               --localstatedir=/var \
+               --with-mit-ext --with-systemd
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../cinnamon-screensaver.pam "$pkgdir/etc/pam.d/cinnamon-screensaver"
+
+  # Remove conflicts with gnome-screensaver
+  rm "$pkgdir"/usr/bin/gnome-screensaver{,-command}
+
+  # Autostart only in Cinnamon
+  install -m644 "$srcdir/cinnamon-screensaver.desktop" "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop"
+  install -m644 "$srcdir/cinnamon2d-screensaver.desktop" "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop"
+}
diff --git a/community/cinnamon/cinnamon-screensaver.desktop b/community/cinnamon-screensaver/cinnamon-screensaver.desktop
index ddc968691..75c81ca26 100644
--- a/community/cinnamon/cinnamon-screensaver.desktop
+++ b/community/cinnamon-screensaver/cinnamon-screensaver.desktop
@@ -3,13 +3,9 @@ Type=Application
 Name=Cinnamon Screensaver
 Comment=Launch screensaver and locker program
 Icon=preferences-desktop-screensaver
-Exec=gnome-screensaver
+Exec=cinnamon-screensaver
 OnlyShowIn=GNOME;
 AutostartCondition=GNOME3 if-session cinnamon
 NoDisplay=true
 X-GNOME-Autostart-Phase=Application
 X-GNOME-Autostart-Notify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-screensaver
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.6.0
diff --git a/community/cinnamon-screensaver/cinnamon-screensaver.pam b/community/cinnamon-screensaver/cinnamon-screensaver.pam
new file mode 100644
index 000000000..8d3baf085
--- /dev/null
+++ b/community/cinnamon-screensaver/cinnamon-screensaver.pam
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth        substack     system-login
+-auth        optional     pam_gnome_keyring.so
diff --git a/community/cinnamon/cinnamon2d-screensaver.desktop b/community/cinnamon-screensaver/cinnamon2d-screensaver.desktop
index aed9557bf..d9d50012c 100644
--- a/community/cinnamon/cinnamon2d-screensaver.desktop
+++ b/community/cinnamon-screensaver/cinnamon2d-screensaver.desktop
@@ -1,15 +1,11 @@
 [Desktop Entry]
 Type=Application
-Name=Cinnamon2d Screensaver
+Name=Cinnamon Screensaver
 Comment=Launch screensaver and locker program
 Icon=preferences-desktop-screensaver
-Exec=gnome-screensaver
+Exec=cinnamon-screensaver
 OnlyShowIn=GNOME;
 AutostartCondition=GNOME3 if-session cinnamon2d
 NoDisplay=true
 X-GNOME-Autostart-Phase=Application
 X-GNOME-Autostart-Notify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-screensaver
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.6.0
diff --git a/community/cinnamon-screensaver/configure.patch b/community/cinnamon-screensaver/configure.patch
new file mode 100644
index 000000000..289825536
--- /dev/null
+++ b/community/cinnamon-screensaver/configure.patch
@@ -0,0 +1,12 @@
+diff -Naur cinnamon-screensaver-1.7.1.orig/configure.ac cinnamon-screensaver-1.7.1/configure.ac
+--- ./cinnamon-screensaver-1.7.1.orig/configure.ac	2013-02-19 17:35:35.000000000 +0100
++++ ./cinnamon-screensaver-1.7.1/configure.ac	2013-02-20 12:40:34.936078052 +0100
+@@ -10,7 +10,7 @@
+ AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz tar-ustar])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AM_MAINTAINER_MODE([enable])
+ 
diff --git a/community/cinnamon-screensaver/fix-dbus-compatibility.patch b/community/cinnamon-screensaver/fix-dbus-compatibility.patch
new file mode 100644
index 000000000..3d70a79d0
--- /dev/null
+++ b/community/cinnamon-screensaver/fix-dbus-compatibility.patch
@@ -0,0 +1,149 @@
+From e43385126cf6f5187f98f940b8c04c3e99202b0b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Thu, 28 Feb 2013 05:45:12 +0100
+Subject: [PATCH 1/4] Fix crashing and compatibility with gnome-screensaver's
+ D-Bus interface
+
+---
+ src/cinnamon-screensaver-command.c |  4 ++--
+ src/gs-listener-dbus.c             | 10 ++++++++--
+ src/gs-manager.c                   | 14 +++++++++++---
+ 3 files changed, 21 insertions(+), 7 deletions(-)
+
+diff --git a/src/cinnamon-screensaver-command.c b/src/cinnamon-screensaver-command.c
+index 4267bd0..5c90916 100644
+--- a/src/cinnamon-screensaver-command.c
++++ b/src/cinnamon-screensaver-command.c
+@@ -311,11 +311,11 @@
+ 
+         if (do_lock) {
+ 				if (g_strcmp0 (away_message, "DEFAULT") == 0) {
+-					reply = screensaver_send_message_string (connection, "Lock", away_message);
++					reply = screensaver_send_message_string (connection, "LockMessage", away_message);
+ 				}
+ 				else {
+ 					gchar * custom_message = g_strdup_printf("CUSTOM###%s", away_message);
+-					reply = screensaver_send_message_string (connection, "Lock", custom_message);
++					reply = screensaver_send_message_string (connection, "LockMessage", custom_message);
+ 					g_free (custom_message);
+ 				}
+                 if (reply == NULL) {
+diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
+index 2a98aee..6dbf12d 100644
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -653,6 +653,8 @@ enum {
+         xml = g_string_append (xml,
+                                "  <interface name=\""GS_INTERFACE"\">\n"
+                                "    <method name=\"Lock\">\n"
++                               "    </method>\n"
++                               "    <method name=\"LockMessage\">\n"
+                                "      <arg name=\"body\" direction=\"in\" type=\"s\"/>\n"
+                                "    </method>\n"
+                                "    <method name=\"SimulateUserActivity\">\n"
+@@ -744,6 +746,10 @@ enum {
+         g_return_val_if_fail (message != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
+ 
+         if (dbus_message_is_method_call (message, GS_SERVICE, "Lock")) {
++                g_signal_emit (listener, signals [LOCK], 0);
++                return send_success_reply (connection, message);
++        }
++        if (dbus_message_is_method_call (message, GS_SERVICE, "LockMessage")) {
+                 return listener_lock (listener, connection, message);
+         }
+         if (dbus_message_is_method_call (message, GS_SERVICE, "Quit")) {
+@@ -906,7 +912,7 @@ enum {
+                 } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_SESSION_INTERFACE, "Lock")) {
+                         if (_listener_message_path_is_our_session (listener, message)) {
+                                 gs_debug ("systemd requested session lock");
+-                                return listener_lock (listener, connection, message);
++                                g_signal_emit (listener, signals [LOCK], 0);
+                         }
+ 
+                         return DBUS_HANDLER_RESULT_HANDLED;
+@@ -948,7 +954,7 @@ enum {
+         } else if (dbus_message_is_signal (message, CK_SESSION_INTERFACE, "Lock")) {
+                 if (_listener_message_path_is_our_session (listener, message)) {
+                         gs_debug ("ConsoleKit requested session lock");
+-                        return listener_lock (listener, connection, message);
++                        g_signal_emit (listener, signals [LOCK], 0);
+                 }
+ 
+                 return DBUS_HANDLER_RESULT_HANDLED;
+diff --git a/src/gs-manager.c b/src/gs-manager.c
+index 1544921..bc09cb9 100644
+--- a/src/gs-manager.c
++++ b/src/gs-manager.c
+@@ -1275,10 +1275,18 @@ enum {
+ gs_manager_set_away_message (GSManager   *manager,
+                              const char  *message)
+ {
+-        g_free (manager->priv->logout_command);
+-
+-        manager->priv->away_message = g_strdup(message);
+         GSList *l;
++
++        g_return_if_fail (GS_IS_MANAGER (manager));
++
++        g_free (manager->priv->away_message);
++
++        if (message) {
++                manager->priv->away_message = g_strdup (message);
++        } else {
++                manager->priv->away_message = NULL;
++        }
++
+         for (l = manager->priv->windows; l; l = l->next) {
+                 gs_window_set_away_message (l->data, manager->priv->away_message);
+         }
+-- 
+1.8.1.6
+
+
+From 4db01451afbb246213f483805f81a77c4c7371a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Fri, 1 Mar 2013 05:17:46 +0100
+Subject: [PATCH 2/4] Update dbus document with the new LockMessage method
+
+---
+ doc/dbus-interface.html | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/doc/dbus-interface.html b/doc/dbus-interface.html
+index faff26c..c9f95ba 100644
+--- a/doc/dbus-interface.html
++++ b/doc/dbus-interface.html
+@@ -2,6 +2,8 @@
+ ������������<code class="email">&lt;<a class="email" href="mailto:mccann@jhu.edu">mccann@jhu.edu</a>&gt;</code><br>
+ ����������</p></div></div></div></div></div><div><p class="releaseinfo">Version 1.7.1</p></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="#dbus-interface">1. DBUS Interface</a></span></dt><dd><dl><dt><span class="sect1"><a href="#gs-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#gs-methods">Methods</a></span></dt><dd><dl><dt><span class="sect2"><a href="#gs-method-Lock">
+         <code class="literal">Lock</code>
++      </a></span></dt><dt><span class="sect2"><a href="#gs-method-LockMessage">
++        <code class="literal">LockMessage</code>
+       </a></span></dt><dt><span class="sect2"><a href="#gs-method-Cycle">
+         <code class="literal">Cycle</code>
+       </a></span></dt><dt><span class="sect2"><a href="#gs-method-SimulateUserActivity">
+@@ -30,6 +32,8 @@
+         <code class="literal">AuthenticationRequestEnd</code>
+       </a></span></dt></dl></dd><dt><span class="sect1"><a href="#gs-examples">Examples</a></span></dt></dl></dd></dl></div><div class="chapter" title="Chapter�1.�DBUS Interface"><div class="titlepage"><div><div><h2 class="title"><a name="dbus-interface"></a>Chapter�1.�DBUS Interface</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#gs-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#gs-methods">Methods</a></span></dt><dd><dl><dt><span class="sect2"><a href="#gs-method-Lock">
+         <code class="literal">Lock</code>
++      </a></span></dt><dt><span class="sect2"><a href="#gs-method-LockMessage">
++        <code class="literal">LockMessage</code>
+       </a></span></dt><dt><span class="sect2"><a href="#gs-method-Cycle">
+         <code class="literal">Cycle</code>
+       </a></span></dt><dt><span class="sect2"><a href="#gs-method-SimulateUserActivity">
+@@ -70,7 +74,11 @@
+         <code class="literal">Lock</code>
+       </h3></div></div></div><p>
+         Request that the screen be locked.
+-      </p></div><div class="sect2" title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>
++      </p></div><div class="sect2" title="LockMessage"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-LockMessage"></a>
++        <code class="literal">LockMessage</code>
++      </h3></div></div></div><p>
++        Request that the screen be locked, and set an away message.
++      </p><div class="informaltable"><table border="1"><colgroup><col><col></colgroup><thead><tr><th>Direction</th><th>Type</th><th>Description</th></tr></thead><tbody><tr><td>in</td><td>string</td><td>the away message</td></tr></tbody></table></div></div><div class="sect2" title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>
+         <code class="literal">Cycle</code>
+       </h3></div></div></div><p>
+         Request that the screen saver theme be restarted and, if applicable,
+-- 
+1.8.1.6
+
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index ab7686196..3c68672d1 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,41 +1,71 @@
-# $Id: PKGBUILD 83983 2013-02-07 22:10:55Z bgyorgy $
+# $Id: PKGBUILD 89873 2013-05-03 22:01:21Z faidoc $
+# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=1.6.7
-pkgrel=6
+pkgver=1.7.10
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cinnamon.linuxmint.com/"
 license=('GPL2')
-depends=('accountsservice' 'caribou' 'gjs' 'gnome-bluetooth' 'gnome-icon-theme'
-         'gnome-menus' 'gnome-settings-daemon' 'gnome-session' 'gnome-themes-standard'
-         'gstreamer0.10' 'libgnomekbd' 'networkmanager' 'muffin' 'python2-dbus'
-         'python2-gconf' 'python2-imaging' 'python2-lxml')
+depends=('accountsservice' 'caribou' 'clutter-gtk' 'gjs' 'gnome-bluetooth'
+         'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session'
+         'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg'
+         'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-imaging'
+         'python2-pyinotify' 'python2-lxml' 'webkitgtk3' 'gnome-settings-daemon-compat')
 makedepends=('gnome-common' 'intltool')
-optdepends=('gnome-control-center: open settings from various applets'
-            'gnome-screensaver: lock screen'
-            'nautilus: the official Gnome file manager')
+optdepends=('cinnamon-control-center: extended configurations for Cinnamon'
+            'cinnamon-screensaver: lock screen'
+            'gucharmap: show character table from Keyboard applet'
+            'libgnomekbd: show keyboard layout from Keyboard applet'
+            'nemo: the official Cinnamon file manager (forked from Nautilus)')
 options=('!libtool' '!emptydirs')
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver"
-        "cinnamon-screensaver.desktop"
-        "cinnamon2d-screensaver.desktop"
-        "gnome-autogen.sh")
-md5sums=('ea73c6367d43d82c61f977477bf0c08c'
-         'd55c079cdc8bec606f510f87b2a6f776'
-         '5c6af851ab1cf7e9219f11d86353196a'
-         'a925691c9b57a6a884dcf07da057fd1f')
+        "keyboard_applet.patch"
+        "fix-control-center-check.patch"
+        "gnome-3.8.patch"
+        "switch-applications.patch"
+        "fallback-helpers.patch"
+        "idle-dim.patch")
+sha256sums=('32ac069773b7d1634136d4f8f01c2083708fa26a1a5bc21957c2144cd9244bf7'
+            'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30'
+            'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
+            '0971ac14bc31167d3b94ea93e608c5d49518a12b89f40c97f84d80e715657aa3'
+            '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262'
+            'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e'
+            'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100')
 
 build() {
   cd ${srcdir}/linuxmint-Cinnamon*
 
-  cp ${srcdir}/gnome-autogen.sh .
-  sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am
-  sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh
-  chmod +x gnome-autogen.sh
+  # Python2 fix
+  sed -i 's|#! /usr/bin/python|#! /usr/bin/python2|' \
+    files/usr/bin/$pkgname-menu-editor \
+    files/usr/share/$pkgname/applets/panel-launchers@$pkgname.org/$pkgname-add-panel-launcher.py
+  find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+
+  # Fix Keyboard applet
+  # https://github.com/linuxmint/Cinnamon/issues/1337
+  patch -Np1 -i ../keyboard_applet.patch
+
+  # Check for the cc-panel path, not for the unneeded binary
+  patch -Np1 -i ../fix-control-center-check.patch
+
+  # https://github.com/linuxmint/Cinnamon/pull/1888
+  patch -Np1 -i ../gnome-3.8.patch
+
+  # Fix windows switcher keybinding with default settings in GNOME 3.8
+  patch -Np1 -i ../switch-applications.patch
+
+  # Start media keys and mount helpers with the session
+  patch -Np1 -i ../fallback-helpers.patch
+
+  # Fix brightness applet for GNOME 3.8
+  patch -Np1 -i ../idle-dim.patch
 
   ./autogen.sh --prefix=/usr \
                --sysconfdir=/etc \
@@ -45,27 +75,10 @@ build() {
                --disable-schemas-compile \
                --enable-compile-warnings=yes \
                --with-session-tracking=systemd
- 
   make
 }
 
 package() {
   cd ${srcdir}/linuxmint-Cinnamon*
   make DESTDIR="${pkgdir}" install
-  
-  # Python2 fix
-  sed -i 's/bin\/python/bin\/python2/g' \
-    "${pkgdir}/usr/bin/$pkgname-launcher" \
-    "${pkgdir}/usr/bin/$pkgname-menu-editor" \
-    "${pkgdir}/usr/bin/$pkgname-settings" \
-    "${pkgdir}/usr/share/$pkgname/applets/panel-launchers@$pkgname.org/$pkgname-add-panel-launcher.py"
-    
-  sed -i 's/env python/env python2/g' \
-    "${pkgdir}/usr/lib/$pkgname-settings/$pkgname-settings.py"
-
-  # Screensaver gnome 3.6 fix
-  mkdir -p $pkgdir/etc/xdg/autostart
-  cp $srcdir/cinnamon*-screensaver.desktop $pkgdir/etc/xdg/autostart
 }
-
-
diff --git a/community/cinnamon/cinnamon.install b/community/cinnamon/cinnamon.install
index 901fd95c9..326aa98a2 100644
--- a/community/cinnamon/cinnamon.install
+++ b/community/cinnamon/cinnamon.install
@@ -2,28 +2,10 @@ post_install() {
   glib-compile-schemas usr/share/glib-2.0/schemas
 }
 
-pre_upgrade() {
-  if [ -f /usr/share/gconf/schemas/cinnamon.schemas ]; then
-    gconfpkg --uninstall cinnamon
-  fi
-
-  if [ "$(vercmp 1.6.7-6 "$2")" -eq 1 ]; then
-    if [[ -h '/usr/lib/libgnome-desktop-3.so.2' ]]; then
-      if [[ $(uname -m) == 'i686' ]]; then
-        unlink /usr/lib/libgnome-desktop-3.so.2
-      fi
-    fi
-  fi
-}
-
 post_upgrade() {
   post_install
 }
 
-pre_remove() {
-  pre_upgrade
-}
-
 post_remove() {
   post_install
 }
diff --git a/community/cinnamon/fallback-helpers.patch b/community/cinnamon/fallback-helpers.patch
new file mode 100644
index 000000000..b6810cdba
--- /dev/null
+++ b/community/cinnamon/fallback-helpers.patch
@@ -0,0 +1,20 @@
+diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon2d.session linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon2d.session
+--- linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon2d.session	2013-04-15 15:55:01.000000000 +0200
++++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon2d.session	2013-04-25 01:30:35.435650613 +0200
+@@ -1,5 +1,5 @@
+ [GNOME Session]
+ Name=Cinnamon (Software Rendering)
+-RequiredComponents=cinnamon2d;gnome-settings-daemon;
++RequiredComponents=cinnamon2d;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
+ DesktopName=GNOME
+ 
+diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session
+--- linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session	2013-04-15 15:55:01.000000000 +0200
++++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session	2013-04-25 01:30:33.645607769 +0200
+@@ -1,5 +1,5 @@
+ [GNOME Session]
+ Name=Cinnamon
+-RequiredComponents=cinnamon;gnome-settings-daemon;
++RequiredComponents=cinnamon;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
+ DesktopName=GNOME
+ 
diff --git a/community/cinnamon/fix-control-center-check.patch b/community/cinnamon/fix-control-center-check.patch
new file mode 100644
index 000000000..981b1c1a5
--- /dev/null
+++ b/community/cinnamon/fix-control-center-check.patch
@@ -0,0 +1,12 @@
+diff -Naur cinnamon-1.7.1.orig/files/usr/bin/cinnamon-settings cinnamon-1.7.1/files/usr/bin/cinnamon-settings
+--- cinnamon-1.7.1.orig/files/usr/bin/cinnamon-settings	2013-02-21 17:23:45.000000000 +0100
++++ cinnamon-1.7.1/files/usr/bin/cinnamon-settings	2013-03-03 03:03:24.151209998 +0100
+@@ -7,7 +7,7 @@
+ 	if os.path.exists("/usr/lib/cinnamon-settings/modules/cs_%s.py" % module):
+ 		print "Python module"
+ 		os.execvp("/usr/lib/cinnamon-settings/cinnamon-settings.py", ("",) + tuple(sys.argv[1:]))
+-	elif os.path.exists("/usr/bin/cinnamon-control-center"):
++	elif os.path.exists("/usr/lib/cinnamon-control-center-1/panels"):
+ 		print "Unknown module %s, using cinnamon-control-center" % module
+ 		os.execvp("/usr/lib/cinnamon-settings/cinnamon-settings.py", ("",) + tuple(sys.argv[1:]))
+ 	elif os.path.exists("/usr/bin/gnome-control-center"):	
\ No newline at end of file
diff --git a/community/cinnamon/fix-cursor-change.patch b/community/cinnamon/fix-cursor-change.patch
deleted file mode 100644
index 626b3e19e..000000000
--- a/community/cinnamon/fix-cursor-change.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- cinnamon-original/files/usr/lib/cinnamon-settings/cinnamon-settings.py	2012-11-14 15:45:14.000000000 +0100
-+++ cinnamon-new/files/usr/lib/cinnamon-settings/cinnamon-settings.py	2013-01-21 12:49:11.332556000 +0100
- try:
-     import os
-@@ -915,7 +915,8 @@
-         valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
-         res = []
-         for i in valid:
--            res.append((i, i))
-+            if i != 'default':
-+                res.append((i, i))
-         return res
-         
-     def _load_keybinding_themes(self):
-@@ -933,7 +934,8 @@
-         valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
-         res = []
-         for i in valid:
--            res.append((i, i))
-+            if i != 'default':
-+                res.append((i, i))
-         return res
-         
-     def _load_window_themes(self):
-@@ -1638,7 +1640,7 @@
-     def onCategoryChanged(self, tree):
-         self.kb_store.clear()
-         if tree.get_selection() is not None:
--            categories, iter = tree.get_selection().get_selected()
-+            categories, iter = tree.get_selection().get_selected() 
-             if iter:
-                 category = categories[iter][1]
-                 if category.int_name is not "custom":
-@@ -2005,7 +2007,7 @@
- 
-     def on_my_setting_changed(self, settings, key):
-         self.content_widget.set_text(self.settings.get_string(self.key))
--
-+    
-     def on_my_value_changed(self, event, widget):        
-         self.settings.set_string(self.key, self.content_widget.get_text())
- 
-@@ -2260,8 +2262,14 @@
-     def on_my_value_changed(self, widget):
-         tree_iter = widget.get_active_iter()
-         if tree_iter != None:            
--            value = self.model[tree_iter][0]            
-+            value = self.model[tree_iter][0]          
-             self.settings.set_string(self.key, value)
-+            if self.key == 'cursor-theme':
-+                if os.path.exists("/usr/share/icons/%s" % value):
-+                    commands.getoutput('gksudo "ln -snf /usr/share/icons/%s /usr/share/icons/default"' % value.strip())
-+                elif os.path.exists("%s/.icons/%s" % (os.path.join(os.path.expanduser("~")), value)):
-+                    commands.getoutput('gksudo "ln -snf %s/.icons/%s /usr/share/icons/default"' % (os.path.join(os.path.expanduser("~")), value))
-+                   
- 
-     def on_dependency_setting_changed(self, settings, dep_key):
-         if not self.dependency_invert:
diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch
new file mode 100644
index 000000000..4053a151b
--- /dev/null
+++ b/community/cinnamon/gnome-3.8.patch
@@ -0,0 +1,3952 @@
+From 2ba97ed278777fcb96b86cd58e9176536585ad2d Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Fri, 19 Apr 2013 13:19:50 -0400
+Subject: [PATCH 01/16] Disable XInput on cinnamon startup (for 3.8 compat)
+ This has no effect on < 1.14 clutter
+
+---
+ src/main.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/main.c b/src/main.c
+index 418fb60..ac90d91 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -260,6 +260,7 @@
+   meta_plugin_type_register (gnome_cinnamon_plugin_get_type ());
+ 
+   /* Prevent meta_init() from causing gtk to load gail and at-bridge */
++  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
+   g_setenv ("NO_GAIL", "1", TRUE);
+   g_setenv ("NO_AT_BRIDGE", "1", TRUE);
+   meta_init ();
+-- 
+1.8.1.6
+
+
+From 72133f97fbd99c78169cec49e18b97da3edba524 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Fri, 19 Apr 2013 13:21:40 -0400
+Subject: [PATCH 02/16] Explain change
+
+---
+ src/main.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/main.c b/src/main.c
+index ac90d91..9d37975 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -257,10 +257,12 @@
+ 
+   g_option_context_free (ctx);
+ 
++  /* Disable XInput extension - required for 3.8 compatibility */
++  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
++
+   meta_plugin_type_register (gnome_cinnamon_plugin_get_type ());
+ 
+   /* Prevent meta_init() from causing gtk to load gail and at-bridge */
+-  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
+   g_setenv ("NO_GAIL", "1", TRUE);
+   g_setenv ("NO_AT_BRIDGE", "1", TRUE);
+   meta_init ();
+-- 
+1.8.1.6
+
+
+From 28210e29e3e0d81c68320b9511574a168f5779e4 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Tue, 16 Apr 2013 17:01:30 -0400
+Subject: [PATCH 03/16] Add backgroundManager - this is needed for gnome 3.8
+ compatibility, as gnome-settings-daemon no longer handles the desktop
+ background.
+
+---
+ configure.ac                                       |   7 +-
+ data/org.cinnamon.gschema.xml.in                   |  71 +++-
+ .../cinnamon-settings/modules/cs_backgrounds.py    |  31 +-
+ js/ui/main.js                                      |   3 +-
+ src/Makefile.am                                    |   2 +
+ src/cinnamon-background-manager.c                  | 411 +++++++++++++++++++++
+ src/cinnamon-background-manager.h                  |  57 +++
+ 7 files changed, 562 insertions(+), 20 deletions(-)
+ create mode 100644 src/cinnamon-background-manager.c
+ create mode 100644 src/cinnamon-background-manager.h
+
+diff --git a/configure.ac b/configure.ac
+index 0aa47c5..a2a9479 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,6 +68,7 @@ GTK_MIN_VERSION=3.0.0
+ GIO_MIN_VERSION=2.29.10
+ POLKIT_MIN_VERSION=0.100
+ STARTUP_NOTIFICATION_MIN_VERSION=0.11
++GNOME_DESKTOP_MIN_VERSION=3.0.0
+ 
+ # Collect more than 20 libraries for a prize!
+ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
+@@ -82,7 +83,8 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
+                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
+ 			       libcanberra
+                                polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
+-                               libnm-glib libnm-util gnome-keyring-1)
++                               libnm-glib libnm-util gnome-keyring-1
++                               gnome-desktop-3.0 >= GNOME_DESKTOP_MIN_VERSION)
+ 
+ PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
+ 
+@@ -106,7 +108,8 @@ AC_CHECK_FUNCS(JS_NewGlobalObject XFixesCreatePointerBarrier)
+ CFLAGS=$saved_CFLAGS
+ LIBS=$saved_LIBS
+ 
+-PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 gnome-desktop-3.0 >= 2.90.0 x11)
++PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 
++                      gnome-desktop-3.0 >= GNOME_DESKTOP_MIN_VERSION x11)
+ PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0)
+ PKG_CHECK_MODULES(TRAY, gtk+-3.0)
+ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
+diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
+index f12f8c5..939ea70 100644
+--- a/data/org.cinnamon.gschema.xml.in
++++ b/data/org.cinnamon.gschema.xml.in
+@@ -746,6 +746,23 @@
+     </key>
+   </schema>
+ 
++
++  <enum id="bg_style">
++    <value nick="none" value="0"/>
++    <value nick="wallpaper" value="1"/>
++    <value nick="centered" value="2"/>
++    <value nick="scaled" value="3"/>
++    <value nick="stretched" value="4"/>
++    <value nick="zoom" value="5"/>
++    <value nick="spanned" value="6"/>
++  </enum>
++
++  <enum id="bg_shading">
++    <value nick="solid" value="0"/>
++    <value nick="vertical" value="1"/>
++    <value nick="horizontal" value="2"/>
++  </enum>
++
+   <schema id="org.cinnamon.background" path="/org/cinnamon/background/">
+     <key name="mode" type="s">
+       <default>"wallpaper"</default>
+@@ -776,8 +793,60 @@
+         This key defines the delay for the slideshow.
+       </description>
+     </key>
++    <key name="draw-background" type="b">
++      <default>true</default>
++      <_summary>Draw Desktop Background</_summary>
++      <_description>Have GNOME draw the desktop background.</_description>
++    </key>
++    <key name="picture-options" enum="bg_style">
++      <default>'zoom'</default>
++      <_summary>Picture Options</_summary>
++      <_description>
++        Determines how the image set by wallpaper_filename is rendered.
++        Possible values are "none", "wallpaper", "centered", "scaled",
++        "stretched", "zoom", "spanned".
++      </_description>
++    </key>
++    <key name="picture-uri" type="s">
++      <default>'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml'</default>
++      <_summary>Picture URI</_summary>
++      <_description>
++        URI to use for the background image. Not that the backend only supports
++        local (file://) URIs.
++      </_description>
++    </key>
++    <key name="picture-opacity" type="i">
++      <range min="0" max="100"/>
++      <default>100</default>
++      <_summary>Picture Opacity</_summary>
++      <_description>
++        Opacity with which to draw the background picture.
++      </_description>
++    </key>
++    <key name="primary-color" type="s">
++      <default>'#023c88'</default>
++      <_summary>Primary Color</_summary>
++      <_description>
++        Left or Top color when drawing gradients, or the solid color.
++      </_description>
++    </key>
++    <key name="secondary-color" type="s">
++      <default>'#5789ca'</default>
++      <_summary>Secondary Color</_summary>
++      <_description>
++        Right or Bottom color when drawing gradients, not used for solid color.
++      </_description>
++    </key>
++    <key name="color-shading-type" enum="bg_shading">
++      <default>'solid'</default>
++      <_summary>Color Shading Type</_summary>
++      <_description>
++        How to shade the background color. Possible values are "horizontal",
++        "vertical", and "solid".
++      </_description>
++    </key>
+   </schema>
+-  
++
+   <schema id="org.cinnamon.screensaver" path="/org/cinnamon/screensaver/">
+     <key name="default-message" type="s">
+       <default>""</default>
+--- linuxmint-Cinnamon-a464dc9.orig/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py 2013-04-30 18:01:56.000000000 +0200
++++ linuxmint-Cinnamon-a464dc9/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py  2013-04-30 23:36:46.718385152 +0200
+@@ -232,11 +232,11 @@
+     
+ 
+ class BackgroundWallpaperPane (Gtk.VBox):
+-    def __init__(self, sidepage, gnome_background_schema):
++    def __init__(self, sidepage, cinnamon_background_schema):
+         Gtk.VBox.__init__(self)
+         self.set_spacing(5)
+         
+-        self._gnome_background_schema = gnome_background_schema
++        self._cinnamon_background_schema = cinnamon_background_schema
+         self._sidepage = sidepage
+         
+         scw = Gtk.ScrolledWindow()
+@@ -263,15 +263,15 @@
+         if wallpaper:
+             for key in wallpaper:
+                 if key == "filename":
+-                    self._gnome_background_schema.set_string("picture-uri", "file://" + wallpaper[key])
++                    self._cinnamon_background_schema.set_string("picture-uri", "file://" + wallpaper[key])
+                 elif key == "pcolor":
+-                    self._gnome_background_schema.set_string("primary-color", wallpaper[key])
++                    self._cinnamon_background_schema.set_string("primary-color", wallpaper[key])
+                 elif key == "scolor":
+-                    self._gnome_background_schema.set_string("secondary-color", wallpaper[key])
++                    self._cinnamon_background_schema.set_string("secondary-color", wallpaper[key])
+                 elif key == "shade_type":
+-                    self._gnome_background_schema.set_string("color-shading-type", wallpaper[key])
++                    self._cinnamon_background_schema.set_string("color-shading-type", wallpaper[key])
+                 elif key == "options":
+-                    self._gnome_background_schema.set_string("picture-options", wallpaper[key])
++                    self._cinnamon_background_schema.set_string("picture-options", wallpaper[key])
+             if (not "metadataFile" in wallpaper) or (wallpaper["metadataFile"] == ""):
+                 self._sidepage.remove_wallpaper_button.set_sensitive(True)
+     
+@@ -445,12 +445,11 @@
+             f = open(filename, "w")
+             f.write(xml_data)
+             f.close()
+-            Gio.Settings("org.gnome.desktop.background").set_string("picture-uri", "file://" + filename)
++            Gio.Settings("org.cinnamon.background").set_string("picture-uri", "file://" + filename)
+ 
+ class BackgroundSidePage (SidePage):
+     def __init__(self, name, icon, keywords, advanced, content_box):
+         SidePage.__init__(self, name, icon, keywords, advanced, content_box, -1)
+-        self._gnome_background_schema = Gio.Settings("org.gnome.desktop.background")
+         self._cinnamon_background_schema = Gio.Settings("org.cinnamon.background")
+         self._add_wallpapers_dialog = AddWallpapersDialog()
+         
+@@ -515,8 +514,8 @@
+         self.mainbox.set_visible_window(False)
+         self.content_box.pack_start(self.mainbox, True, True, 3)
+         
+-        self.wallpaper_pane = BackgroundWallpaperPane(self, self._gnome_background_schema)
+-        self.slideshow_pane = BackgroundSlideshowPane(self, self._gnome_background_schema, self._cinnamon_background_schema)
++        self.wallpaper_pane = BackgroundWallpaperPane(self, self._cinnamon_background_schema)
++        self.slideshow_pane = BackgroundSlideshowPane(self, self._cinnamon_background_schema, self._cinnamon_background_schema)
+         if self._cinnamon_background_schema["mode"] == "slideshow":
+             self.mainbox.add(self.slideshow_pane)
+         else:
+@@ -536,21 +535,21 @@
+         l = Gtk.Label(_("Picture aspect"))
+         l.set_alignment(0, 0.5)
+         advanced_options_box.pack_start(l, False, False, 0)
+-        self.picture_options = GSettingsComboBox("", "org.gnome.desktop.background", "picture-options", None, BACKGROUND_PICTURE_OPTIONS)
++        self.picture_options = GSettingsComboBox("", "org.cinnamon.background", "picture-options", None, BACKGROUND_PICTURE_OPTIONS)
+         advanced_options_box.pack_start(self.picture_options, False, False, 0)
+         
+         l = Gtk.Label(_("Gradient"))
+         l.set_alignment(0, 0.5)
+         advanced_options_box.pack_start(l, False, False, 0)
+-        self.color_shading_type = GSettingsComboBox("", "org.gnome.desktop.background", "color-shading-type", None, BACKGROUND_COLOR_SHADING_TYPES)
++        self.color_shading_type = GSettingsComboBox("", "org.cinnamon.background", "color-shading-type", None, BACKGROUND_COLOR_SHADING_TYPES)
+         advanced_options_box.pack_start(self.color_shading_type, False, False, 0)
+         
+         hbox = Gtk.HBox()
+         l = Gtk.Label(_("Colors"))
+         hbox.pack_start(l, False, False, 2)
+-        self.primary_color = GSettingsColorChooser("org.gnome.desktop.background", "primary-color", None)
++        self.primary_color = GSettingsColorChooser("org.cinnamon.background", "primary-color", None)
+         hbox.pack_start(self.primary_color, False, False, 2)
+-        self.secondary_color = GSettingsColorChooser("org.gnome.desktop.background", "secondary-color", None)
++        self.secondary_color = GSettingsColorChooser("org.cinnamon.background", "secondary-color", None)
+         hbox.pack_start(self.secondary_color, False, False, 2)
+         advanced_options_box.pack_start(hbox, False, False, 0)
+         self.content_box.show_all()
+
+diff --git a/js/ui/main.js b/js/ui/main.js
+index 74154ab..99aee95 100644
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -86,6 +86,7 @@ let _cssStylesheet = null;
+ let dynamicWorkspaces = null;
+ let nWorks = null;
+ let tracker = null;
++let backgroundManager = null;
+ let desktopShown;
+ 
+ let workspace_names = [];
+@@ -214,7 +215,7 @@ function start() {
+     // be predictable anyways.
+     tracker = Cinnamon.WindowTracker.get_default();
+     Cinnamon.AppUsage.get_default();
+-
++    backgroundManager = Cinnamon.BackgroundManager.get_default();
+     // The stage is always covered so Clutter doesn't need to clear it; however
+     // the color is used as the default contents for the Muffin root background
+     // actor so set it anyways.
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3bab29c..6bac83c 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -105,6 +105,7 @@ cinnamon_public_headers_h =		\
+ 	cinnamon-app-system.h		\
+ 	cinnamon-app-usage.h		\
+ 	cinnamon-arrow.h			\
++	cinnamon-background-manager.h	\
+ 	cinnamon-doc-system.h		\
+ 	cinnamon-embedded-window.h		\
+ 	cinnamon-generic-container.h	\
+@@ -142,6 +143,7 @@ libcinnamon_la_SOURCES =		\
+ 	cinnamon-app-system.c		\
+ 	cinnamon-app-usage.c		\
+ 	cinnamon-arrow.c			\
++	cinnamon-background-manager.c	\
+ 	cinnamon-doc-system.c		\
+ 	cinnamon-embedded-window.c		\
+ 	cinnamon-generic-container.c	\
+diff --git a/src/cinnamon-background-manager.c b/src/cinnamon-background-manager.c
+new file mode 100644
+index 0000000..9d95250
+--- /dev/null
++++ b/src/cinnamon-background-manager.c
+@@ -0,0 +1,411 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright © 2001 Ximian, Inc.
++ * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
++ * Copyright 2007 Red Hat, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ */
++
++#include "config.h"
++
++#include <sys/types.h>
++#include <sys/wait.h>
++#include <stdlib.h>
++#include <stdio.h>
++#include <unistd.h>
++#include <string.h>
++#include <errno.h>
++
++#include <locale.h>
++
++#include <glib.h>
++#include <glib/gi18n.h>
++#include <gio/gio.h>
++#include <gdk/gdk.h>
++#include <gdk/gdkx.h>
++
++#define GNOME_DESKTOP_USE_UNSTABLE_API
++#include <libgnome-desktop/gnome-bg.h>
++#include <X11/Xatom.h>
++
++#include "cinnamon-background-manager.h"
++
++#define CINNAMON_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerPrivate))
++
++struct CinnamonBackgroundManagerPrivate
++{
++        GSettings   *settings;
++        GnomeBG     *bg;
++
++        GnomeBGCrossfade *fade;
++
++        GDBusProxy  *proxy;
++        guint        proxy_signal_id;
++};
++
++static void     cinnamon_background_manager_class_init  (CinnamonBackgroundManagerClass *klass);
++static void     cinnamon_background_manager_init        (CinnamonBackgroundManager      *background_manager);
++static void     cinnamon_background_manager_finalize    (GObject             *object);
++
++static void setup_bg (CinnamonBackgroundManager *manager);
++static void connect_screen_signals (CinnamonBackgroundManager *manager);
++
++G_DEFINE_TYPE (CinnamonBackgroundManager, cinnamon_background_manager, G_TYPE_OBJECT)
++
++static gpointer manager_object = NULL;
++
++static gboolean
++dont_draw_background (CinnamonBackgroundManager *manager)
++{
++        return !g_settings_get_boolean (manager->priv->settings,
++                                        "draw-background");
++}
++
++static void
++on_crossfade_finished (CinnamonBackgroundManager *manager)
++{
++        g_object_unref (manager->priv->fade);
++        manager->priv->fade = NULL;
++}
++
++static void
++draw_background (CinnamonBackgroundManager *manager,
++                 gboolean              use_crossfade)
++{
++        GdkDisplay *display;
++        int         n_screens;
++        int         i;
++
++        display = gdk_display_get_default ();
++        n_screens = gdk_display_get_n_screens (display);
++
++        for (i = 0; i < n_screens; ++i) {
++                GdkScreen *screen;
++                GdkWindow *root_window;
++                cairo_surface_t *surface;
++
++                screen = gdk_display_get_screen (display, i);
++
++                root_window = gdk_screen_get_root_window (screen);
++
++                surface = gnome_bg_create_surface (manager->priv->bg,
++                                                   root_window,
++                                                   gdk_screen_get_width (screen),
++                                                   gdk_screen_get_height (screen),
++                                                   TRUE);
++
++                if (use_crossfade) {
++
++                        if (manager->priv->fade != NULL) {
++                                g_object_unref (manager->priv->fade);
++                        }
++
++                        manager->priv->fade = gnome_bg_set_surface_as_root_with_crossfade (screen, surface);
++                        g_signal_connect_swapped (manager->priv->fade, "finished",
++                                                  G_CALLBACK (on_crossfade_finished),
++                                                  manager);
++                } else {
++                        gnome_bg_set_surface_as_root (screen, surface);
++                }
++
++                cairo_surface_destroy (surface);
++        }
++}
++
++static void
++on_bg_transitioned (GnomeBG              *bg,
++                    CinnamonBackgroundManager *manager)
++{
++        draw_background (manager, FALSE);
++}
++
++static gboolean
++settings_change_event_cb (GSettings            *settings,
++                          gpointer              keys,
++                          gint                  n_keys,
++                          CinnamonBackgroundManager *manager)
++{
++        gnome_bg_load_from_preferences (manager->priv->bg,
++                                        manager->priv->settings);
++        return FALSE;
++}
++
++static void
++on_screen_size_changed (GdkScreen            *screen,
++                        CinnamonBackgroundManager *manager)
++{
++        draw_background (manager, FALSE);
++}
++
++static void
++watch_bg_preferences (CinnamonBackgroundManager *manager)
++{
++        g_signal_connect (manager->priv->settings,
++                          "change-event",
++                          G_CALLBACK (settings_change_event_cb),
++                          manager);
++}
++
++static void
++on_bg_changed (GnomeBG              *bg,
++               CinnamonBackgroundManager *manager)
++{
++        draw_background (manager, TRUE);
++}
++
++static void
++setup_bg (CinnamonBackgroundManager *manager)
++{
++        g_return_if_fail (manager->priv->bg == NULL);
++
++        manager->priv->bg = gnome_bg_new ();
++
++        g_signal_connect (manager->priv->bg,
++                          "changed",
++                          G_CALLBACK (on_bg_changed),
++                          manager);
++
++        g_signal_connect (manager->priv->bg,
++                          "transitioned",
++                          G_CALLBACK (on_bg_transitioned),
++                          manager);
++
++        connect_screen_signals (manager);
++        watch_bg_preferences (manager);
++        gnome_bg_load_from_preferences (manager->priv->bg,
++                                        manager->priv->settings);
++}
++
++static void
++setup_bg_and_draw_background (CinnamonBackgroundManager *manager)
++{
++        setup_bg (manager);
++        draw_background (manager, FALSE);
++}
++
++static void
++disconnect_session_manager_listener (CinnamonBackgroundManager *manager)
++{
++        if (manager->priv->proxy && manager->priv->proxy_signal_id) {
++                g_signal_handler_disconnect (manager->priv->proxy,
++                                             manager->priv->proxy_signal_id);
++                manager->priv->proxy_signal_id = 0;
++        }
++}
++
++static void
++on_session_manager_signal (GDBusProxy   *proxy,
++                           const gchar  *sender_name,
++                           const gchar  *signal_name,
++                           GVariant     *parameters,
++                           gpointer      user_data)
++{
++        CinnamonBackgroundManager *manager = CINNAMON_BACKGROUND_MANAGER (user_data);
++
++        if (g_strcmp0 (signal_name, "SessionRunning") == 0) {
++                setup_bg_and_draw_background (manager);
++                disconnect_session_manager_listener (manager);
++        }
++}
++
++static void
++draw_background_after_session_loads (CinnamonBackgroundManager *manager)
++{
++        GError *error = NULL;
++        GDBusProxyFlags flags;
++
++        flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
++                G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
++        manager->priv->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
++                                                              flags,
++                                                              NULL, /* GDBusInterfaceInfo */
++                                                              "org.gnome.SessionManager",
++                                                              "/org/gnome/SessionManager",
++                                                              "org.gnome.SessionManager",
++                                                              NULL, /* GCancellable */
++                                                              &error);
++        if (manager->priv->proxy == NULL) {
++                g_warning ("Could not listen to session manager: %s",
++                           error->message);
++                g_error_free (error);
++                return;
++        }
++
++        manager->priv->proxy_signal_id = g_signal_connect (manager->priv->proxy,
++                                                           "g-signal",
++                                                           G_CALLBACK (on_session_manager_signal),
++                                                           manager);
++}
++
++
++static void
++disconnect_screen_signals (CinnamonBackgroundManager *manager)
++{
++        GdkDisplay *display;
++        int         i;
++        int         n_screens;
++
++        display = gdk_display_get_default ();
++        n_screens = gdk_display_get_n_screens (display);
++
++        for (i = 0; i < n_screens; ++i) {
++                GdkScreen *screen;
++                screen = gdk_display_get_screen (display, i);
++                g_signal_handlers_disconnect_by_func (screen,
++                                                      G_CALLBACK (on_screen_size_changed),
++                                                      manager);
++        }
++}
++
++static void
++connect_screen_signals (CinnamonBackgroundManager *manager)
++{
++        GdkDisplay *display;
++        int         i;
++        int         n_screens;
++
++        display = gdk_display_get_default ();
++        n_screens = gdk_display_get_n_screens (display);
++
++        for (i = 0; i < n_screens; ++i) {
++                GdkScreen *screen;
++                screen = gdk_display_get_screen (display, i);
++                g_signal_connect (screen,
++                                  "monitors-changed",
++                                  G_CALLBACK (on_screen_size_changed),
++                                  manager);
++                g_signal_connect (screen,
++                                  "size-changed",
++                                  G_CALLBACK (on_screen_size_changed),
++                                  manager);
++        }
++}
++
++static void
++draw_background_changed (GSettings            *settings,
++                         const char           *key,
++                         CinnamonBackgroundManager *manager)
++{
++        if (dont_draw_background (manager) == FALSE)
++                setup_bg_and_draw_background (manager);
++}
++
++gboolean
++cinnamon_background_manager_start (CinnamonBackgroundManager *manager)
++{
++        manager->priv->settings = g_settings_new ("org.cinnamon.background");
++        g_signal_connect (manager->priv->settings, "changed::draw-background",
++                          G_CALLBACK (draw_background_changed), manager);
++
++        setup_bg_and_draw_background (manager);
++            //draw_background_after_session_loads (manager);
++
++
++        return TRUE;
++}
++
++void
++cinnamon_background_manager_stop (CinnamonBackgroundManager *manager)
++{
++        CinnamonBackgroundManagerPrivate *p = manager->priv;
++
++        g_debug ("Stopping background manager");
++
++        disconnect_screen_signals (manager);
++
++        if (manager->priv->proxy) {
++                disconnect_session_manager_listener (manager);
++                g_object_unref (manager->priv->proxy);
++        }
++
++        g_signal_handlers_disconnect_by_func (manager->priv->settings,
++                                              settings_change_event_cb,
++                                              manager);
++
++        if (p->settings != NULL) {
++                g_object_unref (p->settings);
++                p->settings = NULL;
++        }
++
++        if (p->bg != NULL) {
++                g_object_unref (p->bg);
++                p->bg = NULL;
++        }
++}
++
++/**
++ * cinnamon_background_manager_get_default:
++ *
++ * Return Value: (transfer none): The global #CinnamonBackgroundManager singleton
++ */
++CinnamonBackgroundManager *
++cinnamon_background_manager_get_default ()
++{
++  static CinnamonBackgroundManager *instance = NULL;
++
++  if (instance == NULL)
++    instance = g_object_new (CINNAMON_TYPE_BACKGROUND_MANAGER, NULL);
++
++  return instance;
++}
++
++static GObject *
++cinnamon_background_manager_constructor (GType                  type,
++                                    guint                  n_construct_properties,
++                                    GObjectConstructParam *construct_properties)
++{
++        CinnamonBackgroundManager      *background_manager;
++
++        background_manager = CINNAMON_BACKGROUND_MANAGER (G_OBJECT_CLASS (cinnamon_background_manager_parent_class)->constructor (type,
++                                                                                                                        n_construct_properties,
++                                                                                                                        construct_properties));
++
++        return G_OBJECT (background_manager);
++}
++
++static void
++cinnamon_background_manager_class_init (CinnamonBackgroundManagerClass *klass)
++{
++        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
++
++        object_class->constructor = cinnamon_background_manager_constructor;
++        object_class->finalize = cinnamon_background_manager_finalize;
++
++        g_type_class_add_private (klass, sizeof (CinnamonBackgroundManagerPrivate));
++}
++
++static void
++cinnamon_background_manager_init (CinnamonBackgroundManager *manager)
++{
++        manager->priv = CINNAMON_BACKGROUND_MANAGER_GET_PRIVATE (manager);
++        cinnamon_background_manager_start (manager);
++}
++
++static void
++cinnamon_background_manager_finalize (GObject *object)
++{
++        CinnamonBackgroundManager *background_manager;
++
++        g_return_if_fail (object != NULL);
++        g_return_if_fail (CINNAMON_IS_BACKGROUND_MANAGER (object));
++
++        background_manager = CINNAMON_BACKGROUND_MANAGER (object);
++
++        g_return_if_fail (background_manager->priv != NULL);
++
++        G_OBJECT_CLASS (cinnamon_background_manager_parent_class)->finalize (object);
++}
+diff --git a/src/cinnamon-background-manager.h b/src/cinnamon-background-manager.h
+new file mode 100644
+index 0000000..9a56e32
+--- /dev/null
++++ b/src/cinnamon-background-manager.h
+@@ -0,0 +1,57 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ */
++
++#ifndef __CINNAMON_BACKGROUND_MANAGER_H
++#define __CINNAMON_BACKGROUND_MANAGER_H
++
++#include <glib-object.h>
++
++G_BEGIN_DECLS
++
++#define CINNAMON_TYPE_BACKGROUND_MANAGER         (cinnamon_background_manager_get_type ())
++#define CINNAMON_BACKGROUND_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManager))
++#define CINNAMON_BACKGROUND_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerClass))
++#define CINNAMON_IS_BACKGROUND_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), CINNAMON_TYPE_BACKGROUND_MANAGER))
++#define CINNAMON_IS_BACKGROUND_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), CINNAMON_TYPE_BACKGROUND_MANAGER))
++#define CINNAMON_BACKGROUND_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerClass))
++
++typedef struct CinnamonBackgroundManagerPrivate CinnamonBackgroundManagerPrivate;
++
++typedef struct
++{
++        GObject                     parent;
++        CinnamonBackgroundManagerPrivate *priv;
++} CinnamonBackgroundManager;
++
++typedef struct
++{
++        GObjectClass   parent_class;
++} CinnamonBackgroundManagerClass;
++
++GType                   cinnamon_background_manager_get_type            (void);
++
++CinnamonBackgroundManager *cinnamon_background_manager_get_default (void);
++
++gboolean                cinnamon_background_manager_start               (CinnamonBackgroundManager *manager);
++void                    cinnamon_background_manager_stop                (CinnamonBackgroundManager *manager);
++
++G_END_DECLS
++
++#endif /* __CINNAMON_BACKGROUND_MANAGER_H */
+-- 
+1.8.1.6
+
+
+From c971d472a88f8ea725b2bef33715016e111732d9 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Tue, 16 Apr 2013 18:28:16 -0400
+Subject: [PATCH 04/16] Change default background
+
+---
+ data/org.cinnamon.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
+index 939ea70..6d8c82d 100644
+--- a/data/org.cinnamon.gschema.xml.in
++++ b/data/org.cinnamon.gschema.xml.in
+@@ -808,7 +808,7 @@
+       </_description>
+     </key>
+     <key name="picture-uri" type="s">
+-      <default>'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml'</default>
++      <default>'file:///usr/share/backgrounds/linuxmint/default_background.jpg'</default>
+       <_summary>Picture URI</_summary>
+       <_description>
+         URI to use for the background image. Not that the backend only supports
+-- 
+1.8.1.6
+
+
+From 0147459229b449757bac9a92c173c4bd3c2f9eca Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Tue, 16 Apr 2013 18:41:16 -0400
+Subject: [PATCH 05/16] Use distro-agnostic background..
+
+---
+ data/org.cinnamon.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in
+index 6d8c82d..567dca8 100644
+--- a/data/org.cinnamon.gschema.xml.in
++++ b/data/org.cinnamon.gschema.xml.in
+@@ -808,7 +808,7 @@
+       </_description>
+     </key>
+     <key name="picture-uri" type="s">
+-      <default>'file:///usr/share/backgrounds/linuxmint/default_background.jpg'</default>
++      <default>'file:///usr/share/themes/Adwaita/backgrounds/adwaita-timed.xml'</default>
+       <_summary>Picture URI</_summary>
+       <_description>
+         URI to use for the background image. Not that the backend only supports
+-- 
+1.8.1.6
+
+
+From 706d244a9dbe2ace9860044e2245a285d8473f47 Mon Sep 17 00:00:00 2001
+From: dalcde <dalcde@yahoo.com.hk>
+Date: Mon, 15 Apr 2013 18:34:48 +0800
+Subject: [PATCH 06/16] [GDbus] Port DBus to GDBus (AltLinux patch)
+
+---
+ .../applets/brightness@cinnamon.org/applet.js      |  39 +-
+ .../cinnamon/applets/power@cinnamon.org/applet.js  | 102 ++--
+ .../cinnamon/applets/sound@cinnamon.org/applet.js  | 511 ++++++---------------
+ .../cinnamon/applets/xrandr@cinnamon.org/applet.js |  19 +-
+ js/misc/gnomeSession.js                            | 147 ++----
+ js/misc/modemManager.js                            |  79 ++--
+ js/misc/screenSaver.js                             |  89 ++--
+ js/ui/appletManager.js                             |   1 -
+ js/ui/automountManager.js                          | 106 ++---
+ js/ui/autorunManager.js                            |  27 +-
+ js/ui/calendar.js                                  |  71 +--
+ js/ui/cinnamonDBus.js                              |  96 ++--
+ js/ui/endSessionDialog.js                          |  79 ++--
+ js/ui/keyboard.js                                  |  48 +-
+ js/ui/layout.js                                    |  14 +-
+ js/ui/magnifierDBus.js                             | 134 ++++--
+ js/ui/main.js                                      |   6 -
+ js/ui/messageTray.js                               |  13 +-
+ js/ui/notificationDaemon.js                        | 193 ++++----
+ js/ui/scripting.js                                 |  34 +-
+ 20 files changed, 774 insertions(+), 1034 deletions(-)
+
+diff --git a/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
+index 9cbda80..9087b25 100644
+--- a/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
+@@ -5,7 +5,6 @@ const St = imports.gi.St;
+ const PopupMenu = imports.ui.popupMenu;
+ const GLib = imports.gi.GLib;
+ const Gio = imports.gi.Gio;
+-const DBus = imports.dbus;
+ 
+ /* constants */
+ const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power";
+@@ -14,24 +13,25 @@ const DimSettingsBattery = "idle-dim-battery";
+ const PowerBusName = 'org.gnome.SettingsDaemon';
+ const PowerObjectPath = '/org/gnome/SettingsDaemon/Power';
+ 
+-/* DBus interface */
+-const PowerManagerInterface = {
+-    name: 'org.gnome.SettingsDaemon.Power.Screen',
+-    methods:
+-        [
+-            { name: 'GetPercentage', inSignature: '', outSignature: 'u' },
+-            { name: 'SetPercentage', inSignature: 'u', outSignature: 'u' },
+-            { name: 'StepUp', inSignature: '', outSignature: 'u' },
+-            { name: 'StepDown', inSignature: '', outSignature: 'u' },
+-        ],
+-    signals:
+-        [
+-            { name: 'Changed', inSignature: '', outSignature: '' },
+-        ]
+-};
++const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power.Screen">
++<method name="GetPercentage">
++    <arg type="u" direction="out"/>
++</method>
++<method name="SetPercentage">
++    <arg type="u" direction="in"/>
++    <arg type="u" direction="out"/>
++</method>
++<method name="StepUp">
++    <arg type="u" direction="out"/>
++</method>
++<method name="StepDown">
++    <arg type="u" direction="out"/>
++</method>
++<signal name="Changed" />
++</interface>;
+ 
+ /* DBus magic */
+-let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface);
++const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface);
+ 
+ /* TextImageMenuItem taken from sound@cinnamon.org applet */
+ let icon_path = "/usr/share/cinnamon/theme/";
+@@ -100,7 +100,7 @@ MyApplet.prototype = {
+         Applet.IconApplet.prototype._init.call(this, orientation, panel_height);
+         
+         try {
+-            this._proxy = new PowerManagerProxy(DBus.session, PowerBusName, PowerObjectPath);
++            this._proxy = new PowerManagerProxy(Gio.DBus.session, PowerBusName, PowerObjectPath);
+             
+             this.menuManager = new PopupMenu.PopupMenuManager(this);
+             this.menu = new Applet.AppletPopupMenu(this, orientation);
+@@ -137,7 +137,8 @@ MyApplet.prototype = {
+                     this.menu.addMenuItem(this._settingsMenu);
+                 
+                     //get notified
+-                    this._proxy.connect('Changed', Lang.bind(this, this._getBrightness));
++                    this._proxy.connectSignal('Changed', Lang.bind(this, this._getBrightness));
++                    
+                     this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+                 } else {
+                     this.set_applet_tooltip(_("Brightness"));
+diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+index c342fe7..b6b2bcd 100644
+--- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+@@ -1,6 +1,5 @@
+ const Applet = imports.ui.applet;
+ const Gio = imports.gi.Gio;
+-const DBus = imports.dbus;
+ const Lang = imports.lang;
+ const St = imports.gi.St;
+ const PopupMenu = imports.ui.popupMenu;
+@@ -42,34 +41,46 @@ const LabelDisplay = {
+     TIME: 'time'
+ };
+ 
+-const PowerManagerInterface = {
+-    name: 'org.gnome.SettingsDaemon.Power',
+-    methods: [
+-        { name: 'GetDevices', inSignature: '', outSignature: 'a(susdut)' },
+-        { name: 'GetPrimaryDevice', inSignature: '', outSignature: '(susdut)' },
+-        ],
+-    signals: [
+-        { name: 'PropertiesChanged', inSignature: 's,a{sv},a[s]' },
+-        ],
+-    properties: [
+-        { name: 'Icon', signature: 's', access: 'read' },
+-        ]
+-};
+-let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface);
+-
+-const SettingsManagerInterface = {
+-	name: 'org.freedesktop.DBus.Properties',
+-	methods: [
+-		{ name: 'Get', inSignature: 's,s', outSignature: 'v' },
+-		{ name: 'GetAll', inSignature: 's', outSignature: 'a{sv}' },
+-		{ name: 'Set', inSignature: 's,s,v', outSignature: '' }
+-	],
+-	signals: [
+-	{name: 'PropertiesChanged', inSignature:'s,a{sv},a[s]', outSignature:''}
+-	]
+-};
+-
+-let SettingsManagerProxy = DBus.makeProxyClass(SettingsManagerInterface);
++const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power">
++<method name="GetDevices">
++    <arg type="a(susdut)" direction="out"/>
++</method>
++<method name="GetPrimaryDevice">
++    <arg type="(susdut)" direction="out"/>
++</method>
++<signal name="PropertiesChanged">
++    <arg type="s"/>
++    <arg type="a{sv}"/>
++    <arg type="a[s]"/>
++</signal>
++<property name="Icon" type="s" access="read" />
++</interface>;
++
++const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface);
++
++const SettingsManagerInterface = <interface name="org.freedesktop.DBus.Properties">
++<method name="Get">
++    <arg type="s" direction="in"/>
++    <arg type="s" direction="in"/>
++    <arg type="v" direction="out"/>
++</method>
++<method name="GetAll">
++    <arg type="s" direction="in"/>
++    <arg type="a{sv}" direction="out"/>
++</method>
++<method name="Set">
++    <arg type="s" direction="in"/>
++    <arg type="s" direction="in"/>
++    <arg type="v" direction="in"/>
++</method>
++<signal name="PropertiesChanged">
++    <arg type="s"/>
++    <arg type="a{sv}"/>
++    <arg type="a[s]"/>
++</signal>
++</interface>;
++
++const SettingsManagerProxy = Gio.DBusProxy.makeProxyWrapper(SettingsManagerInterface);
+ 
+ function DeviceItem() {
+     this._init.apply(this, arguments);
+@@ -143,11 +154,11 @@ MyApplet.prototype = {
+             this.menuManager = new PopupMenu.PopupMenuManager(this);
+             this.menu = new Applet.AppletPopupMenu(this, orientation);
+             this.menuManager.addMenu(this.menu);            
+-            
++
+             //this.set_applet_icon_symbolic_name('battery-missing');            
+-            this._proxy = new PowerManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH);
+-            this._smProxy = new SettingsManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH);
+-            
++            this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
++            this._smProxy = new SettingsManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
++
+             let icon = this.actor.get_children()[0];
+             this.actor.remove_actor(icon);
+             let box = new St.BoxLayout({ name: 'batteryBox' });
+@@ -306,18 +317,19 @@ MyApplet.prototype = {
+         this._devicesChanged();
+     },
+ 
+-    _devicesChanged: function() {        
+-        this._proxy.GetRemote('Icon', Lang.bind(this, function(icon, error) {
+-            if (icon) {    
+-                this.set_applet_icon_symbolic_name('battery-missing');
+-                let gicon = Gio.icon_new_for_string(icon);
+-                this._applet_icon.gicon = gicon;
+-                this.actor.show();
+-            } else {
+-                this.menu.close();
+-                this.actor.hide();
+-            }
+-        }));
++
++    _devicesChanged: function() {
++        this.set_applet_icon_symbolic_name('battery-missing');
++        let icon = this._proxy.Icon;
++        if (icon) {
++            let gicon = Gio.icon_new_for_string(icon);
++            this.setGIcon(gicon);
++            this.actor.show();
++        } else {
++            this.menu.close();
++            this.actor.hide();
++        }
++
+         this._readPrimaryDevice();
+         this._readOtherDevices();
+         this._updateLabel();
+diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
+index 50c4e1e..c8427ac 100644
+--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
+@@ -1,7 +1,6 @@
+ const Applet = imports.ui.applet;
+ const Mainloop = imports.mainloop;
+ const Gio = imports.gi.Gio;
+-const DBus = imports.dbus;
+ const Lang = imports.lang;
+ const Cinnamon = imports.gi.Cinnamon;
+ const Clutter = imports.gi.Clutter;
+@@ -12,95 +11,50 @@ const Gvc = imports.gi.Gvc;
+ const Pango = imports.gi.Pango;
+ const Tooltips = imports.ui.tooltips;
+ 
+-const PropIFace = {
+-    name: 'org.freedesktop.DBus.Properties',
+-    signals: [{ name: 'PropertiesChanged',
+-                inSignature: 'a{sv}'}]
+-};
+-
+-const MediaServer2IFace = {
+-    name: 'org.mpris.MediaPlayer2',
+-    methods: [{ name: 'Raise',
+-                inSignature: '',
+-                outSignature: '' },
+-              { name: 'Quit',
+-                inSignature: '',
+-                outSignature: '' }],
+-    properties: [{ name: 'CanRaise',
+-                   signature: 'b',
+-                   access: 'read'},
+-                 { name: 'CanQuit',
+-                   signature: 'b',
+-                   access: 'read'}],
+-};
+-
+-const MediaServer2PlayerIFace = {
+-    name: 'org.mpris.MediaPlayer2.Player',
+-    methods: [{ name: 'PlayPause',
+-                inSignature: '',
+-                outSignature: '' },
+-              { name: 'Pause',
+-                inSignature: '',
+-                outSignature: '' },
+-              { name: 'Play',
+-                inSignature: '',
+-                outSignature: '' },
+-              { name: 'Stop',
+-                inSignature: '',
+-                outSignature: '' },
+-              { name: 'Next',
+-                inSignature: '',
+-                outSignature: '' },
+-              { name: 'Previous',
+-                inSignature: '',
+-                outSignature: '' },
+-              { name: 'SetPosition',
+-                inSignature: 'ox',
+-                outSignature: '' }],
+-    properties: [{ name: 'Metadata',
+-                   signature: 'a{sv}',
+-                   access: 'read'},
+-                 { name: 'Shuffle',
+-                   signature: 'b',
+-                   access: 'readwrite'},
+-                 { name: 'Rate',
+-                   signature: 'd',
+-                   access: 'readwrite'},
+-                 { name: 'LoopStatus',
+-                   signature: 'b',
+-                   access: 'readwrite'},
+-                 { name: 'Volume',
+-                   signature: 'd',
+-                   access: 'readwrite'},
+-                 { name: 'PlaybackStatus',
+-                   signature: 's',
+-                   access: 'read'},
+-                 { name: 'Position',
+-                   signature: 'x',
+-                   access: 'read'},
+-                 { name: 'CanGoNext',
+-                   signature: 'b',
+-                   access: 'read'},
+-                 { name: 'CanGoPrevious',
+-                   signature: 'b',
+-                   access: 'read'},
+-                 { name: 'CanPlay',
+-                   signature: 'b',
+-                   access: 'read'},
+-                 { name: 'CanPause',
+-                   signature: 'b',
+-                   access: 'read'},
+-                 { name: 'CanSeek',
+-                   signature: 'b',
+-                   access: 'read'}],
+-    signals: [{ name: 'Seeked',
+-                inSignature: 'x' }]
+-};
++const PropIFace = <interface name="org.freedesktop.DBus.Properties">
++<signal name="PropertiesChanged">
++    <arg type="a{sv}"/>
++</signal>
++</interface>;
++
++const MediaServer2IFace = <interface name="org.mpris.MediaPlayer2">
++<method name="Raise" />
++<method name="Quit" />
++<property name="CanRaise" type="b" access="read" />
++<property name="CanQuit" type="b" access="read" />
++</interface>;
++
++const MediaServer2PlayerIFace = <interface name="org.mpris.MediaPlayer2.Player">
++<method name="PlayPause" />
++<method name="Pause" />
++<method name="Play" />
++<method name="Stop" />
++<method name="Next" />
++<method name="Previous" />
++<method name="SetPosition">
++    <arg type="a{ov}" direction="in"/>
++</method>
++<property name='Metadata' access='read' type='a{sv}' />
++<property name='Shuffle' access='readwrite' type='b' />
++<property name='Rate' access='readwrite' type='d' />
++<property name='LoopStatus' access='readwrite' type='s' />
++<property name='Volume' access='readwrite' type='d' />
++<property name='PlaybackStatus' access='read' type='s' />
++<property name='Position' access='read' type='x' />
++<property name="CanGoNext" type="b" access="read" />
++<property name="CanGoPrevious" type="b" access="read" />
++<property name="CanPlay" type="b" access="read" />
++<property name="CanPause" type="b" access="read" />
++<property name="CanSeek" type="b" access="read" />
++<signal name="Seeked">
++    <arg type="x"/>
++</signal>
++</interface>;
+ 
+ /* global values */
+ let icon_path = "/usr/share/cinnamon/theme/";
+-let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer", "qmmp" ];
+-let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer", "qmmp" ];
++let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer" ];
++let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer" ];
+ /* dummy vars for translation */
+ let x = _("Playing");
+ x = _("Paused");
+@@ -112,131 +66,20 @@ const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */
+ const ICON_SIZE = 28;
+ 
+ 
+-function Prop() {
+-    this._init.apply(this, arguments);
+-}
+-
+-Prop.prototype = {
+-    _init: function(owner) {
+-        DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this);
+-    }
+-}
+-DBus.proxifyPrototype(Prop.prototype, PropIFace)
+-
+-function MediaServer2() {
+-    this._init.apply(this, arguments);
+-}
+-
+-MediaServer2.prototype = {
+-    _init: function(owner) {
+-        DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this);
+-    },
+-    getRaise: function(callback) {
+-        this.GetRemote('CanRaise', Lang.bind(this,
+-            function(raise, ex) {
+-                if (!ex)
+-                    callback(this, raise);
+-            }));
+-    },
+-    getQuit: function(callback) {
+-        this.GetRemote('CanQuit', Lang.bind(this,
+-            function(quit, ex) {
+-                if (!ex)
+-                    callback(this, quit);
+-            }));
+-    }
++var PropProxy = Gio.DBusProxy.makeProxyWrapper(PropIFace);
++function Prop(owner, initCallback, cancellable) {
++    return new PropProxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable);
+ }
+-DBus.proxifyPrototype(MediaServer2.prototype, MediaServer2IFace)
+ 
+-function MediaServer2Player() {
+-    this._init.apply(this, arguments);
++var MediaServer2Proxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2IFace);
++function MediaServer2(owner, initCallback, cancellable) {
++    return new MediaServer2Proxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable);
+ }
+ 
+-MediaServer2Player.prototype = {
+-    _init: function(owner) {
+-        this._owner = owner;
+-        DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this);
+-    },
+-    getMetadata: function(callback) {
+-        this.GetRemote('Metadata', Lang.bind(this,
+-            function(metadata, ex) {
+-                if (!ex)
+-                    callback(this, metadata);
+-            }));
+-    },
+-    getPlaybackStatus: function(callback) {
+-        this.GetRemote('PlaybackStatus', Lang.bind(this,
+-            function(status, ex) {
+-                if (!ex)
+-                    callback(this, status);
+-            }));
+-    },
+-    getRate: function(callback) {
+-        this.GetRemote('Rate', Lang.bind(this,
+-            function(rate, ex) {
+-                if (!ex)
+-                    callback(this, rate);
+-            }));
+-    },
+-    getPosition: function(callback) {
+-        this.GetRemote('Position', Lang.bind(this,
+-            function(position, ex) {
+-                if (!ex)
+-                    callback(this, position);
+-            }));
+-    },
+-    setPosition: function(value) {
+-        this.SetRemote('Position', value);
+-    },
+-    getShuffle: function(callback) {
+-        this.GetRemote('Shuffle', Lang.bind(this,
+-            function(shuffle, ex) {
+-                if (!ex)
+-                    callback(this, shuffle);
+-            }));
+-    },
+-    setShuffle: function(value) {
+-        this.SetRemote('Shuffle', value);
+-    },
+-    getVolume: function(callback) {
+-        this.GetRemote('Volume', Lang.bind(this,
+-            function(volume, ex) {
+-                if (!ex)
+-                    callback(this, volume);
+-            }));
+-    },
+-    setVolume: function(value) {
+-        this.SetRemote('Volume', parseFloat(value));
+-    },
+-    getRepeat: function(callback) {
+-        this.GetRemote('LoopStatus', Lang.bind(this,
+-            function(repeat, ex) {
+-                if (!ex) {
+-                    if (repeat == "None")
+-                        repeat = false
+-                    else
+-                        repeat = true
+-                    callback(this, repeat);
+-                }
+-            }));
+-    },
+-    setRepeat: function(value) {
+-        if (value)
+-            value = "Playlist"
+-        else
+-            value = "None"
+-        this.SetRemote('LoopStatus', value);
+-    },
+-    getCanSeek: function(callback) {
+-        this.GetRemote('CanSeek', Lang.bind(this,
+-            function(canSeek, err) {
+-                if (!err) {
+-                    callback(this, canSeek);
+-                }
+-            }));
+-    }
++var MediaServer2PlayerProxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2PlayerIFace);
++function MediaServer2Player(owner, initCallback, cancellable) {
++    return new MediaServer2PlayerProxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable);
+ }
+-DBus.proxifyPrototype(MediaServer2Player.prototype, MediaServer2PlayerIFace)
+ 
+ function TrackInfo() {
+     this._init.apply(this, arguments);
+@@ -355,7 +198,6 @@ Player.prototype = {
+     _init: function(system_status_button, owner) {
+         PopupMenu.PopupMenuSection.prototype._init.call(this);
+ 
+-        this.showPosition = true; // @todo: Get from settings
+         this._owner = owner;
+         this._system_status_button = system_status_button;
+         this._name = this._owner.split('.')[3];
+@@ -389,7 +231,7 @@ Player.prototype = {
+         this.infos_top.add_actor(this._artist.getActor());
+         this.infos_bottom.add_actor(this._album.getActor());
+         this.infos_top.add_actor(this._title.getActor());
+-
++        this.infos_bottom.add_actor(this._time.getActor());
+         this._trackInfosTop.set_child(this.infos_top);
+         this._trackInfosBottom.set_child(this.infos_bottom);
+ 
+@@ -414,90 +256,39 @@ Player.prototype = {
+         this._trackControls.set_child(this.controls);
+         this.addActor(this._trackControls);
+ 
+-        this._seekControls = new St.Bin({style_class: 'sound-seek', x_align: St.Align.START});
+-        this.seekControls = new St.BoxLayout({style_class: 'sound-seek-box'});
+-        this.seekControls.add_actor(this._time.getActor());
+-
+-        this._positionSlider = new PopupMenu.PopupSliderMenuItem(0);
+-        this._positionSlider.connect('value-changed', Lang.bind(this, function(item) {
+-            let time = item._value * this._songLength;
+-            this._time.setLabel(this._formatTime(time) + " / " + this._formatTime(this._songLength));
+-        }));
+-        this._positionSlider.connect('drag-end', Lang.bind(this, function(item) {
+-            let time = item._value * this._songLength;
+-            this._time.setLabel(this._formatTime(time) + " / " + this._formatTime(this._songLength));
+-            this._wantedSeekValue = Math.round(time * 1000000);
+-            this._mediaServerPlayer.SetPositionRemote(this._trackObj, time * 1000000);
+-        }));
+-
+-        this.sliderBin = new St.Bin({style_class: 'sound-seek-slider'});
+-        this.sliderBin.set_child(this._positionSlider.actor);
+-        this.seekControls.add_actor(this.sliderBin);
+-        this._seekControls.set_child(this.seekControls);
+-        this.addActor(this._seekControls);
+-
+-        this._mediaServer.getRaise(Lang.bind(this, function(sender, raise) {
+-            if (raise) {
+-                this._raiseButton = new ControlButton('go-up',
+-                    Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); }));
+-                this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player"));
+-                this.controls.add_actor(this._raiseButton.getActor());
+-            }
+-        }));
+-
+-        this._mediaServer.getQuit(Lang.bind(this, function(sender, quit) {
+-            if (quit) {
+-                this._quitButton = new ControlButton('window-close',
+-                    Lang.bind(this, function () { this._mediaServer.QuitRemote(); }));
+-                this.controls.add_actor(this._quitButton.getActor());
+-                this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player"));
+-            }
+-        }));
++    let CanRaise = this._mediaServer.CanRaise;
++    let CanQuit = this._mediaServer.CanQuit;
++    if (CanRaise) {
++            this._raiseButton = new ControlButton('go-up',
++                          Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); }));
++            this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player"));
++            this.controls.add_actor(this._raiseButton.getActor());
++    }
++    if (CanQuit) {
++            this._quitButton = new ControlButton('window-close',
++                         Lang.bind(this, function () { this._mediaServer.QuitRemote(); }));
++            this.controls.add_actor(this._quitButton.getActor());
++            this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player"));
++    }
+ 
+         /* this players don't support seek */
+-        if (support_seek.indexOf(this._name) == -1) {
++        if (support_seek.indexOf(this._name) == -1)
+             this._time.hide();
+-            this.showPosition = false;
+-            this._positionSlider.hide();
+-        }
+         this._getStatus();
+         this._trackId = {};
+         this._getMetadata();
+         this._currentTime = 0;
+         this._getPosition();
+-        this._wantedSeekValue = 0;
+-        this._updatePositionSlider();
+ 
+-        this._prop.connect('PropertiesChanged', Lang.bind(this, function(sender, iface, value) {
++        this._prop.connectSignal('PropertiesChanged', Lang.bind(this, function(sender, iface, value) {
+             if (value["PlaybackStatus"])
+-                this._setStatus(iface, value["PlaybackStatus"]);
++                this._setStatus(value["PlaybackStatus"]);
+             if (value["Metadata"])
+-                this._setMetadata(iface, value["Metadata"]);
+-            //qmmp
+-            if(sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
+-                if (value["playbackStatus"])
+-                    this._setStatus(iface, value["playbackStatus"]);
+-                if (value["metadata"])
+-                    this._setMetadata(sender, value["metadata"]);
+-            } 
++                this._setMetadata(value["Metadata"]);
+         }));
+ 
+-        this._mediaServerPlayer.connect('Seeked', Lang.bind(this, function(sender, value) {
+-            if (value > 0) {
+-                this._setPosition(value);
+-            }
+-            // Seek initiated by the position slider
+-            else if (this._wantedSeekValue > 0) {
+-                // Some broken gstreamer players (Banshee) reports always 0
+-                // when the track is seeked so we set the position at the
+-                // value we set on the slider
+-                this._setPosition(this._wantedSeekValue);
+-            }
+-            // Seek value send by the player
+-            else
+-                this._setPosition(value);
+-
+-            this._wantedSeekValue = 0;
++        this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) {
++            this._setPosition(sender, value);
+         }));
+ 
+         Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition));
+@@ -512,45 +303,26 @@ Player.prototype = {
+         this._playerInfo.setText(this._getName() + " - " + _(status));
+     },
+ 
+-    _updatePositionSlider: function(position) {
+-        this._mediaServerPlayer.getCanSeek(Lang.bind(this, function(sender, canSeek) {
+-            this._canSeek = canSeek;
+-            
+-            if (this._songLength == 0 || position == false)
+-                this._canSeek = false
+-
+-            // Clem: The following code was commented out. When the next song started, it resulted in hiding the sound menu, making it hard for the user to repeatedly click on the next song button.
+-            // There's probably a better fix and this was not tested with players which don't support seeking, but it fixes the regression created by the slider (apparently when the slider is hidden it closes the menu)
+-            // if (this._playerStatus == "Playing" && this._canSeek && this.showPosition)
+-            //     this._positionSlider.actor.show();
+-            // else
+-            //     this._positionSlider.actor.hide();
+-        }));
+-    },
+-
+-    _setPosition: function(value) {
+-        if (value == null && this._playerStatus != 'Stopped') {
+-            this._updatePositionSlider(false);
+-        }
+-        else {
+-            this._currentTime = value / 1000000;
+-            this._updateTimer();
+-        }
++    _setPosition: function(sender, value) {
++        this._stopTimer();
++        this._currentTime = value / 1000000;
++        this._updateTimer();
++        if (this._playerStatus == "Playing")
++            this._runTimer();
+     },
+ 
+     _getPosition: function() {
+-        this._mediaServerPlayer.getPosition(Lang.bind(this, function(sender, value) {
+-            this._setPosition(value);
+-        }));
++    this._setPosition(this._mediaServerPlayer.Position);
++        Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition));
+     },
+ 
+-    _setMetadata: function(sender, metadata) {
++    _setMetadata: function(metadata) {
+         if (metadata["mpris:length"]) {
+             // song length in secs
+-            this._songLength = metadata["mpris:length"] / 1000000;
++            this._songLength = metadata["mpris:length"].unpack() / 1000000;
+             // FIXME upstream
+             if (this._name == "quodlibet")
+-                this._songLength = metadata["mpris:length"] / 1000;
++                this._songLength = metadata["mpris:length"].unpack() / 1000;
+             // reset timer
+             this._stopTimer();
+             if (this._playerStatus == "Playing")
+@@ -559,26 +333,29 @@ Player.prototype = {
+             this._stopTimer();
+         }
+         if (metadata["xesam:artist"])
+-            this._artist.setLabel(metadata["xesam:artist"].toString());
++            this._artist.setLabel(metadata["xesam:artist"].unpack());
+         else
+             this._artist.setLabel(_("Unknown Artist"));
+         if (metadata["xesam:album"])
+-            this._album.setLabel(metadata["xesam:album"].toString());
++            this._album.setLabel(metadata["xesam:album"].unpack());
+         else
+             this._album.setLabel(_("Unknown Album"));
+         if (metadata["xesam:title"])
+-            this._title.setLabel(metadata["xesam:title"].toString());
++            this._title.setLabel(metadata["xesam:title"].unpack());
+         else
+             this._title.setLabel(_("Unknown Title"));
+-        
+-        if (metadata["mpris:trackid"]) {
+-            this._trackObj = metadata["mpris:trackid"];
+-        }
++        /*if (metadata["mpris:trackid"]) {
++            this._trackId = {
++                _init: function() {
++                    DBus.session.proxifyObject(this, this._owner, metadata["mpris:trackid"]);
++                }
++            }
++        }*/
+ 
+         let change = false;
+         if (metadata["mpris:artUrl"]) {
+-            if (this._trackCoverFile != metadata["mpris:artUrl"].toString()) {
+-                this._trackCoverFile = metadata["mpris:artUrl"].toString();
++            if (this._trackCoverFile != metadata["mpris:artUrl"].unpack()) {
++                this._trackCoverFile = metadata["mpris:artUrl"].unpack();
+                 change = true;
+             }
+         }
+@@ -600,8 +377,7 @@ Player.prototype = {
+                     cover.read_async(null, null, Lang.bind(this, this._onReadCover));
+                 }
+                 else {
+-                    cover_path = decodeURIComponent(this._trackCoverFile);
+-                    cover_path = cover_path.replace("file://", "");
++                    cover_path = decodeURIComponent(this._trackCoverFile.substr(7));
+                     this._showCover(cover_path);
+                 }
+             }
+@@ -611,13 +387,10 @@ Player.prototype = {
+     },
+ 
+     _getMetadata: function() {
+-        this._mediaServerPlayer.getMetadata(Lang.bind(this,
+-            this._setMetadata
+-        ));
++    this._setMetadata(this._mediaServerPlayer.Metadata);
+     },
+ 
+-    _setStatus: function(sender, status) {
+-        this._updatePositionSlider();
++    _setStatus: function(status) {
+         this._playerStatus = status;
+         if (status == "Playing") {
+             this._playButton.setIcon("media-playback-pause");
+@@ -631,53 +404,39 @@ Player.prototype = {
+             this._playButton.setIcon("media-playback-start");
+             this._stopTimer();
+         }
+-
+         this._playerInfo.setImage("player-" + status.toLowerCase());
+         this._setName(status);
+     },
+ 
+     _getStatus: function() {
+-        this._mediaServerPlayer.getPlaybackStatus(Lang.bind(this,
+-            this._setStatus
+-        ));
++    this._setStatus(this._mediaServerPlayer.PlaybackStatus);
+     },
+ 
+     _updateRate: function() {
+-        this._mediaServerPlayer.getRate(Lang.bind(this, function(sender, rate) {
+-            this._rate = rate;
+-        }));
++    this._rate = this._mediaServerPlayer.Rate;
+     },
+ 
+     _updateTimer: function() {
+-        if (this.showPosition && this._canSeek) {
+-            if (!isNaN(this._currentTime) && !isNaN(this._songLength) && this._currentTime > 0)
+-                this._positionSlider.setValue(this._currentTime / this._songLength);
+-            else
+-                this._positionSlider.setValue(0);
+-        }
+         this._time.setLabel(this._formatTime(this._currentTime) + " / " + this._formatTime(this._songLength));
+     },
+ 
+     _runTimer: function() {
+-        if (this._playerStatus == 'Playing') {
+-            this._timeoutId = Mainloop.timeout_add_seconds(1, Lang.bind(this, this._runTimer));
+-            this._currentTime += 1;
+-            this._updateTimer();
+-        }
++        /*if (!Tweener.resumeTweens(this)) {
++            Tweener.addTween(this,
++                { time: this._songLength - this._currentTime,
++                  transition: 'linear',
++                  onUpdate: Lang.bind(this, this._updateTimer) });
++        }*/
+     },
+ 
+     _pauseTimer: function() {
+-        if (this._timeoutId != 0) {
+-            Mainloop.source_remove(this._timeoutId);
+-            this._timeoutId = 0;
+-        }
+-        this._updateTimer();
++        //Tweener.pauseTweens(this);
+     },
+ 
+     _stopTimer: function() {
++        /*Tweener.removeTweens(this);
+         this._currentTime = 0;
+-        this._pauseTimer();
+-        this._updateTimer();
++        this._updateTimer();*/
+     },
+ 
+     _formatTime: function(s) {
+@@ -771,7 +530,7 @@ MediaPlayerLauncher.prototype = {
+     },
+ 
+     activate: function (event) {
+-    	this._menu.actor.hide();
++        this._menu.actor.hide();
+         this._app.activate_full(-1, event.get_time());
+         return true;
+     }
+@@ -799,7 +558,7 @@ MyApplet.prototype = {
+             this._players = {};
+             // watch players
+             for (var p=0; p<compatible_players.length; p++) {
+-                DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false,
++                Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE,
+                     Lang.bind(this, this._addPlayer),
+                     Lang.bind(this, this._removePlayer)
+                 );
+@@ -930,7 +689,7 @@ MyApplet.prototype = {
+         return Object.keys(this._players).length;
+     },
+ 
+-    _addPlayer: function(owner) {
++    _addPlayer: function(connection, owner) {
+         // ensure menu is empty
+         this._cleanup();
+         this._volumeControlShown = false;
+@@ -945,12 +704,12 @@ MyApplet.prototype = {
+         this._readOutput();
+     },
+ 
+-    _removePlayer: function(owner) {
++    _removePlayer: function(connection, owner) {
+         delete this._players[owner];
+         this._cleanup();
+         this._volumeControlShown = false;
+         for (owner in this._players) {
+-            this._addPlayer(owner);
++            this._addPlayer(connection, owner);
+         }
+         this.menu.emit('players-loaded', true);
+ 
+@@ -974,21 +733,21 @@ MyApplet.prototype = {
+         this._volumeControlShown = true;
+ 
+         if (this._nbPlayers()==0){
+-        	this._availablePlayers = new Array();
++            this._availablePlayers = new Array();
+             let appsys = Cinnamon.AppSystem.get_default();
+             let allApps = appsys.get_all();
+             let listedDesktopFiles = new Array();
+             for (let y=0; y<allApps.length; y++) {
+-            	let app = allApps[y];
+-            	let entry = app.get_tree_entry();
+-            	let path = entry.get_desktop_file_path();
+-            	for (var p=0; p<compatible_players.length; p++) {
++                let app = allApps[y];
++                let entry = app.get_tree_entry();
++                let path = entry.get_desktop_file_path();
++                for (var p=0; p<compatible_players.length; p++) {
+                     let desktopFile = compatible_players[p]+".desktop";
+-            		if (path.indexOf(desktopFile) != -1 && listedDesktopFiles.indexOf(desktopFile) == -1) {
+-                		this._availablePlayers.push(app);
++                    if (path.indexOf(desktopFile) != -1 && listedDesktopFiles.indexOf(desktopFile) == -1) {
++                        this._availablePlayers.push(app);
+                         listedDesktopFiles.push(desktopFile);
+-            		}
+-           		}
++                    }
++                }
+             }
+ 
+             if (this._availablePlayers.length > 0){
+@@ -1137,19 +896,19 @@ MyApplet.prototype = {
+             this._mutedChanged (null, null, '_output');
+             this._volumeChanged (null, null, '_output');
+             let sinks = this._control.get_sinks();
+-	        this._selectDeviceItem.menu.removeAll();
+-	        for (let i = 0; i < sinks.length; i++) {
+-	        	let sink = sinks[i];
+-	        	let menuItem = new PopupMenu.PopupMenuItem(sink.get_description());
+-	        	if (sinks[i].get_id() == this._output.get_id()) {
+-	        		menuItem.setShowDot(true);
+-	        	}
+-	        	menuItem.connect('activate', Lang.bind(this, function() {
+-	        		log('Changing default sink to ' + sink.get_description());
+-	                this._control.set_default_sink(sink);
+-	            }));
+-	            this._selectDeviceItem.menu.addMenuItem(menuItem);
+-	        }
++            this._selectDeviceItem.menu.removeAll();
++            for (let i = 0; i < sinks.length; i++) {
++                let sink = sinks[i];
++                let menuItem = new PopupMenu.PopupMenuItem(sink.get_description());
++                if (sinks[i].get_id() == this._output.get_id()) {
++                    menuItem.setShowDot(true);
++                }
++                menuItem.connect('activate', Lang.bind(this, function() {
++                    log('Changing default sink to ' + sink.get_description());
++                    this._control.set_default_sink(sink);
++                }));
++                this._selectDeviceItem.menu.addMenuItem(menuItem);
++            }
+         } else {
+             this._outputSlider.setValue(0);
+             this.setIconName('audio-volume-muted-symbolic');
+diff --git a/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
+index 0dcf74d..c2d152a 100644
+--- a/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js
+@@ -1,6 +1,6 @@
+ /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+ 
+-const DBus = imports.dbus;
++const Gio = imports.gi.Gio;
+ const Gdk = imports.gi.Gdk;
+ const GLib = imports.gi.GLib;
+ const GnomeDesktop = imports.gi.GnomeDesktop;
+@@ -22,13 +22,14 @@ let rotations = [ [ GnomeDesktop.RRRotation.ROTATION_0, N_("Normal") ],
+ 		  [ GnomeDesktop.RRRotation.ROTATION_180, N_("Upside-down") ]
+ 		];
+ 
+-const XRandr2Iface = {
+-    name: 'org.gnome.SettingsDaemon.XRANDR_2',
+-    methods: [
+-	{ name: 'ApplyConfiguration', inSignature: 'xx', outSignature: '' },
+-    ]
+-};
+-let XRandr2 = DBus.makeProxyClass(XRandr2Iface);
++const XRandr2Iface = <interface name="org.gnome.SettingsDaemon.XRANDR_2">
++<method name="ApplyConfiguration">
++    <arg type="x" direction="in"/>
++    <arg type="x" direction="in"/>
++</method>
++</interface>;
++
++const XRandr2 = Gio.DBusProxy.makeProxyWrapper(XRandr2Iface);
+ 
+ function MyApplet(orientation, panel_height) {
+     this._init(orientation, panel_height);
+@@ -48,7 +49,7 @@ MyApplet.prototype = {
+             this.menu = new Applet.AppletPopupMenu(this, orientation);
+             this.menuManager.addMenu(this.menu);            
+                                 
+-            this._proxy = new XRandr2(DBus.session, 'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/XRANDR');
++            this._proxy = new XRandr2(Gio.DBus.session, 'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/XRANDR');
+ 
+             try {
+                 this._screen = new GnomeDesktop.RRScreen({ gdk_screen: Gdk.Screen.get_default() });
+diff --git a/js/misc/gnomeSession.js b/js/misc/gnomeSession.js
+index a2b61fd..e21d3a8 100644
+--- a/js/misc/gnomeSession.js
++++ b/js/misc/gnomeSession.js
+@@ -1,20 +1,18 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+-const DBus = imports.dbus;
++const Gio = imports.gi.Gio;
+ const Lang = imports.lang;
+ const Signals = imports.signals;
+ 
+-const PresenceIface = {
+-    name: 'org.gnome.SessionManager.Presence',
+-    methods: [{ name: 'SetStatus',
+-                inSignature: 'u',
+-                outSignature: '' }],
+-    properties: [{ name: 'status',
+-                   signature: 'u',
+-                   access: 'readwrite' }],
+-    signals: [{ name: 'StatusChanged',
+-                inSignature: 'u' }]
+-};
++const PresenceIface = <interface name="org.gnome.SessionManager.Presence">
++<method name="SetStatus">
++    <arg type="u" direction="in"/>
++</method>
++<property name="status" type="u" access="readwrite"/>
++<signal name="StatusChanged">
++    <arg type="u" direction="out"/>
++</signal>
++</interface>;
+ 
+ const PresenceStatus = {
+     AVAILABLE: 0,
+@@ -23,104 +21,37 @@ const PresenceStatus = {
+     IDLE: 3
+ };
+ 
+-function Presence() {
+-    this._init();
++var PresenceProxy = Gio.DBusProxy.makeProxyWrapper(PresenceIface);
++function Presence(initCallback, cancellable) {
++    return new PresenceProxy(Gio.DBus.session, 'org.gnome.SessionManager',
++                             '/org/gnome/SessionManager/Presence', initCallback, cancellable);
+ }
+ 
+-Presence.prototype = {
+-    _init: function() {
+-        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager/Presence', this);
+-    },
+-
+-    getStatus: function(callback) {
+-        this.GetRemote('status', Lang.bind(this,
+-            function(status, ex) {
+-                if (!ex)
+-                    callback(this, status);
+-            }));
+-    },
+-
+-    setStatus: function(status) {
+-        this.SetStatusRemote(status);
+-    }
+-};
+-DBus.proxifyPrototype(Presence.prototype, PresenceIface);
+-
+-// Note inhibitors are immutable objects, so they don't
+-// change at runtime (changes always come in the form
+-// of new inhibitors)
+-const InhibitorIface = {
+-    name: 'org.gnome.SessionManager.Inhibitor',
+-    properties: [{ name: 'app_id',
+-                   signature: 's',
+-                   access: 'readonly' },
+-                 { name: 'client_id',
+-                   signature: 's',
+-                   access: 'readonly' },
+-                 { name: 'reason',
+-                   signature: 's',
+-                   access: 'readonly' },
+-                 { name: 'flags',
+-                   signature: 'u',
+-                   access: 'readonly' },
+-                 { name: 'toplevel_xid',
+-                   signature: 'u',
+-                   access: 'readonly' },
+-                 { name: 'cookie',
+-                   signature: 'u',
+-                   access: 'readonly' }],
+-};
+-
+-function Inhibitor(objectPath) {
+-    this._init(objectPath);
++const InhibitorIface = <interface name="org.gnome.SessionManager.Inhibitor">
++<property name="app_id" type="s" access="read" />
++<property name="client_id" type="s" access="read" />
++<property name="reason" type="s" access="read" />
++<property name="flags" type="u" access="read" />
++<property name="toplevel_xid" type="u" access="read" />
++<property name="cookie" type="u" access="read" />
++</interface>;
++
++var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface);
++function Inhibitor(objectPath, initCallback, cancellable) {
++    return new InhibitorProxy(Gio.DBus.session, 'org.gnome.SessionManager', objectPath, initCallback, cancellable);
+ }
+ 
+-Inhibitor.prototype = {
+-    _init: function(objectPath) {
+-        DBus.session.proxifyObject(this,
+-                                   'org.gnome.SessionManager',
+-                                   objectPath);
+-        this.isLoaded = false;
+-        this._loadingPropertiesCount = InhibitorIface.properties.length;
+-        for (let i = 0; i < InhibitorIface.properties.length; i++) {
+-            let propertyName = InhibitorIface.properties[i].name;
+-            this.GetRemote(propertyName, Lang.bind(this,
+-                function(value, exception) {
+-                    if (exception)
+-                        return;
+-
+-                    this[propertyName] = value;
+-                    this._loadingPropertiesCount--;
+-
+-                    if (this._loadingPropertiesCount == 0) {
+-                        this.isLoaded = true;
+-                        this.emit('is-loaded');
+-                    }
+-                }));
+-        }
+-    },
+-};
+-DBus.proxifyPrototype(Inhibitor.prototype, InhibitorIface);
+-Signals.addSignalMethods(Inhibitor.prototype);
+-
+-
+-// Not the full interface, only the methods we use
+-const SessionManagerIface = {
+-    name: 'org.gnome.SessionManager',
+-    methods: [
+-        { name: 'Logout', inSignature: 'u', outSignature: '' },
+-        { name: 'Shutdown', inSignature: '', outSignature: '' },
+-        { name: 'CanShutdown', inSignature: '', outSignature: 'b' }
+-    ]
+-};
+-
+-function SessionManager() {
+-    this._init();
++const SessionManagerIface = <interface name="org.gnome.SessionManager">
++<method name="Logout">
++    <arg type="u" direction="in" />
++</method>
++<method name="Shutdown" />
++<method name="CanShutdown">
++    <arg type="b" direction="out" />
++</method>
++</interface>;
++
++var SessionManagerProxy = Gio.DBusProxy.makeProxyWrapper(SessionManagerIface);
++function SessionManager(initCallback, cancellable) {
++    return new SessionManagerProxy(Gio.DBus.session, 'org.gnome.SessionManager', '/org/gnome/SessionManager', initCallback, cancellable);
+ }
+-
+-SessionManager.prototype = {
+-    _init: function() {
+-        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager');
+-    }
+-};
+-DBus.proxifyPrototype(SessionManager.prototype, SessionManagerIface);
+\ No newline at end of file
+diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js
+index befd142..f35f925 100644
+--- a/js/misc/modemManager.js
++++ b/js/misc/modemManager.js
+@@ -1,6 +1,6 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+-const DBus = imports.dbus;
++const Gio = imports.gi.Gio;
+ const Lang = imports.lang;
+ const Cinnamon = imports.gi.Cinnamon;
+ const Signals = imports.signals;
+@@ -8,33 +8,43 @@ const Signals = imports.signals;
+ // The following are not the complete interfaces, just the methods we need
+ // (or may need in the future)
+ 
+-const ModemGsmNetworkInterface = {
+-    name: 'org.freedesktop.ModemManager.Modem.Gsm.Network',
+-    methods: [
+-        { name: 'GetRegistrationInfo', inSignature: '', outSignature: 'uss' },
+-        { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' }
+-    ],
+-    properties: [
+-        { name: 'AccessTechnology', signature: 'u', access: 'read' }
+-    ],
+-    signals: [
+-        { name: 'SignalQuality', inSignature: 'u' },
+-        { name: 'RegistrationInfo', inSignature: 'uss' }
+-    ]
+-};
+-const ModemGsmNetworkProxy = DBus.makeProxyClass(ModemGsmNetworkInterface);
+-
+-const ModemCdmaInterface = {
+-    name: 'org.freedesktop.ModemManager.Modem.Cdma',
+-    methods: [
+-        { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' },
+-        { name: 'GetServingSystem', inSignature: '', outSignature: 'usu' }
+-    ],
+-    signals: [
+-        { name: 'SignalQuality', inSignature: 'u' }
+-    ]
+-};
+-const ModemCdmaProxy = DBus.makeProxyClass(ModemCdmaInterface);
++const ModemGsmNetworkInterface = <interface name="org.freedesktop.ModemManager.Modem.Gsm.Network">
++<method name="GetRegistrationInfo">
++    <arg type="u" direction="out" />
++    <arg type="s" direction="out" />
++    <arg type="s" direction="out" />
++</method>
++<method name="GetSignalQuality">
++    <arg type="u" direction="out" />
++</method>
++<property name="AccessTechnology" type="u" access="read" />
++<signal name="SignalQuality">
++    <arg type="u" direction="out" />
++</signal>
++<signal name="RegistrationInfo">
++    <arg type="u" direction="out" />
++    <arg type="s" direction="out" />
++    <arg type="s" direction="out" />
++</signal>
++</interface>;
++
++const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInterface);
++
++const ModemCdmaInterface = <interface name="org.freedesktop.ModemManager.Modem.Cdma">
++<method name="GetSignalQuality">
++    <arg type="u" direction="out" />
++</method>
++<method name="GetServingSystem">
++    <arg type="u" direction="out" />
++    <arg type="s" direction="out" />
++    <arg type="u" direction="out" />
++</method>
++<signal name="SignalQuality">
++    <arg type="u" direction="out" />
++</signal>
++</interface>;
++
++const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface);
+ 
+ let _providersTable;
+ function _getProvidersTable() {
+@@ -50,17 +60,17 @@ function ModemGsm() {
+ 
+ ModemGsm.prototype = {
+     _init: function(path) {
+-        this._proxy = new ModemGsmNetworkProxy(DBus.system, 'org.freedesktop.ModemManager', path);
++        this._proxy = new ModemGsmNetworkProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
+ 
+         this.signal_quality = 0;
+         this.operator_name = null;
+ 
+         // Code is duplicated because the function have different signatures
+-        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) {
++        this._proxy.connectSignal('SignalQuality', Lang.bind(this, function(proxy, sender, [quality]) {
+             this.signal_quality = quality;
+             this.emit('notify::signal-quality');
+         }));
+-        this._proxy.connect('RegistrationInfo', Lang.bind(this, function(proxy, status, code, name) {
++        this._proxy.connectSignal('RegistrationInfo', Lang.bind(this, function(proxy, sender, [status, code, name]) {
+             this.operator_name = this._findOperatorName(name, code);
+             this.emit('notify::operator-name');
+         }));
+@@ -154,12 +164,13 @@ function ModemCdma() {
+ }
+ 
+ ModemCdma.prototype = {
+-    _init: function(path) {
+-        this._proxy = new ModemCdmaProxy(DBus.system, 'org.freedesktop.ModemManager', path);
++    _init: function(path) {        
++        this._proxy = new ModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);
+ 
+         this.signal_quality = 0;
+         this.operator_name = null;
+-        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) {
++        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, sender, params) {
++            this.signal_quality = params[0];
+             this.signal_quality = quality;
+             this.emit('notify::signal-quality');
+ 
+diff --git a/js/misc/screenSaver.js b/js/misc/screenSaver.js
+index c471856..aec883f 100644
+--- a/js/misc/screenSaver.js
++++ b/js/misc/screenSaver.js
+@@ -1,53 +1,48 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+-const DBus = imports.dbus;
+ const Lang = imports.lang;
+-
+-const ScreenSaverIface = {
+-    name: 'org.gnome.ScreenSaver',
+-    methods: [{ name: 'GetActive',
+-                inSignature: '',
+-                outSignature: 'b' },
+-              { name: 'Lock',
+-                inSignature: '' },
+-              { name: 'SetActive',
+-                inSignature: 'b' }],
+-    signals: [{ name: 'ActiveChanged',
+-                inSignature: 'b' }]
+-};
++const Gio = imports.gi.Gio;
++
++const ScreenSaverIface = <interface name="org.gnome.ScreenSaver">
++<method name="GetActive">
++    <arg type="b" direction="out" />
++</method>
++<method name="Lock" />
++<method name="SetActive">
++    <arg type="b" direction="in" />
++</method>
++<signal name="ActiveChanged">
++    <arg type="b" direction="out" />
++</signal>
++</interface>;
++
++const ScreenSaverInfo = Gio.DBusInterfaceInfo.new_for_xml(ScreenSaverIface);
+ 
+ function ScreenSaverProxy() {
+-    this._init();
++    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
++                                  g_interface_name: ScreenSaverInfo.name,
++                                  g_interface_info: ScreenSaverInfo,
++                                  g_name: 'org.gnome.ScreenSaver',
++                                  g_object_path: '/org/gnome/ScreenSaver',
++                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
++                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
++    self.init(null);
++    self.screenSaverActive = false;
++
++    self.connectSignal('ActiveChanged', function(proxy, senderName, [isActive]) {
++        self.screenSaverActive = isActive;
++    });
++    self.connect('notify::g-name-owner', function() {
++        if (self.g_name_owner) {
++            self.GetActiveRemote(function(result, excp) {
++                if (result) {
++                    let [isActive] = result;
++                    self.screenSaverActive = isActive;
++                }
++            });
++        } else
++            self.screenSaverActive = false;
++    });
++
++    return self;
+ }
+-
+-ScreenSaverProxy.prototype = {
+-    _init: function() {
+-        DBus.session.proxifyObject(this,
+-                                   'org.gnome.ScreenSaver',
+-                                   '/org/gnome/ScreenSaver');
+-
+-        DBus.session.watch_name('org.gnome.ScreenSaver',
+-                                false, // do not launch a name-owner if none exists
+-                                Lang.bind(this, this._onSSAppeared),
+-                                Lang.bind(this, this._onSSVanished));
+-
+-        this.screenSaverActive = false;
+-        this.connect('ActiveChanged',
+-                     Lang.bind(this, this._onActiveChanged));
+-    },
+-
+-    _onSSAppeared: function(owner) {
+-        this.GetActiveRemote(Lang.bind(this, function(isActive) {
+-            this.screenSaverActive = isActive;
+-        }))
+-    },
+-
+-    _onSSVanished: function(oldOwner) {
+-        this.screenSaverActive = false;
+-    },
+-
+-    _onActiveChanged: function(object, isActive) {
+-        this.screenSaverActive = isActive;
+-    }
+-};
+-DBus.proxifyPrototype(ScreenSaverProxy.prototype, ScreenSaverIface);
+diff --git a/js/ui/appletManager.js b/js/ui/appletManager.js
+index abf8136..830d80d 100644
+--- a/js/ui/appletManager.js
++++ b/js/ui/appletManager.js
+@@ -7,7 +7,6 @@ const Cinnamon = imports.gi.Cinnamon;
+ const Main = imports.ui.main;
+ const Applet = imports.ui.applet;
+ const Extension = imports.ui.extension;
+-const DBus = imports.dbus;
+ 
+ // Maps uuid -> metadata object
+ var appletMeta;
+diff --git a/js/ui/automountManager.js b/js/ui/automountManager.js
+index fa73bfe..f29f9f3 100644
+--- a/js/ui/automountManager.js
++++ b/js/ui/automountManager.js
+@@ -1,7 +1,6 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+ const Lang = imports.lang;
+-const DBus = imports.dbus;
+ const Mainloop = imports.mainloop;
+ const Gio = imports.gi.Gio;
+ const Params = imports.misc.params;
+@@ -15,63 +14,57 @@ const SETTING_ENABLE_AUTOMOUNT = 'automount';
+ 
+ const AUTORUN_EXPIRE_TIMEOUT_SECS = 10;
+ 
+-const ConsoleKitSessionIface = {
+-    name: 'org.freedesktop.ConsoleKit.Session',
+-    methods: [{ name: 'IsActive',
+-                inSignature: '',
+-                outSignature: 'b' }],
+-    signals: [{ name: 'ActiveChanged',
+-                inSignature: 'b' }]
+-};
++const ConsoleKitSessionIface = <interface name="org.freedesktop.ConsoleKit.Session">
++<method name="isActive">
++    <arg type="b" direction="out" />
++</method>
++<method name="ActiveChanged">
++    <arg type="b" direction="in" />
++</method>
++</interface>;
+ 
+-const ConsoleKitSessionProxy = DBus.makeProxyClass(ConsoleKitSessionIface);
++const ConsoleKitSessionProxy = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface);
+ 
+-const ConsoleKitManagerIface = {
+-    name: 'org.freedesktop.ConsoleKit.Manager',
+-    methods: [{ name: 'GetCurrentSession',
+-                inSignature: '',
+-                outSignature: 'o' }]
+-};
++const ConsoleKitManagerIface = <interface name="org.freedesktop.ConsoleKit.Manager">
++<method name="GetCurrentSession">
++    <arg type="o" direction="out" />
++</method>
++</interface>;
+ 
+-function ConsoleKitManager() {
+-    this._init();
+-};
+-
+-ConsoleKitManager.prototype = {
+-    _init: function() {
+-        this.sessionActive = true;
+-
+-        DBus.system.proxifyObject(this,
+-                                  'org.freedesktop.ConsoleKit',
+-                                  '/org/freedesktop/ConsoleKit/Manager');
++const ConsoleKitManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ConsoleKitManagerIface);
+ 
+-        DBus.system.watch_name('org.freedesktop.ConsoleKit',
+-                               false, // do not launch a name-owner if none exists
+-                               Lang.bind(this, this._onManagerAppeared),
+-                               Lang.bind(this, this._onManagerVanished));
+-    },
+-
+-    _onManagerAppeared: function(owner) {
+-        this.GetCurrentSessionRemote(Lang.bind(this, this._onCurrentSession));
+-    },
+-
+-    _onManagerVanished: function(oldOwner) {
+-        this.sessionActive = true;
+-    },
+-
+-    _onCurrentSession: function(session) {
+-        this._ckSession = new ConsoleKitSessionProxy(DBus.system, 'org.freedesktop.ConsoleKit', session);
+-
+-        this._ckSession.connect
+-            ('ActiveChanged', Lang.bind(this, function(object, isActive) {
+-                this.sessionActive = isActive;            
+-            }));
+-        this._ckSession.IsActiveRemote(Lang.bind(this, function(isActive) {
+-            this.sessionActive = isActive;            
+-        }));
++function ConsoleKitManager() {
++    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.system,
++                                  g_interface_name: ConsoleKitManagerInfo.name,
++                                  g_interface_info: ConsoleKitManagerInfo,
++                                  g_name: 'org.freedesktop.ConsoleKit',
++                                  g_object_path: '/org/freedesktop/ConsoleKit/Manager',
++                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
++                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
++    
++    self._updateSessionActive = function() {
++        if (self.g_name_owner) {
++            self.GetCurrentSessionRemote(function([session]) {
++                self._ckSession = new ConsoleKitSessionProxy(Gio.DBus.system, 'org.freedesktop.ConsoleKit', session);
++
++                self._ckSession.connectSignal('ActiveChanged', function(object, senderName, [isActive]) {
++                    self.sessionActive = isActive;
++                });
++                self._ckSession.IsActiveRemote(function([isActive]) {
++                    self.sessionActive = isActive;
++                });
++            });
++        } else {
++            self.sessionActive = true;
++        }
+     }
+-};
+-DBus.proxifyPrototype(ConsoleKitManager.prototype, ConsoleKitManagerIface);
++    self.connect('notify::g-name-owner',
++                 Lang.bind(self, self._updateSessionActive));
++ 
++    self._updateSessionActive();
++    self.init(null);
++    return self;
++}
+ 
+ function AutomountManager() {
+     this._init();
+@@ -85,9 +78,8 @@ AutomountManager.prototype = {
+         this.ckListener = new ConsoleKitManager();
+ 
+         this._ssProxy = new ScreenSaver.ScreenSaverProxy();
+-        this._ssProxy.connect('ActiveChanged',
+-                              Lang.bind(this,
+-                                        this._screenSaverActiveChanged));
++        this._ssProxy.connectSignal('ActiveChanged',
++                                    Lang.bind(this, this._screenSaverActiveChanged));
+ 
+         this._volumeMonitor = Gio.VolumeMonitor.get();
+ 
+@@ -110,7 +102,7 @@ AutomountManager.prototype = {
+         Mainloop.idle_add(Lang.bind(this, this._startupMountAll));
+     },
+ 
+-    _screenSaverActiveChanged: function(object, isActive) {
++    _screenSaverActiveChanged: function(object, senderName, [isActive]) {
+         if (!isActive) {
+             this._volumeQueue.forEach(Lang.bind(this, function(volume) {
+                 this._checkAndMountVolume(volume);
+diff --git a/js/ui/autorunManager.js b/js/ui/autorunManager.js
+index 02cd4da..99b6fbe 100644
+--- a/js/ui/autorunManager.js
++++ b/js/ui/autorunManager.js
+@@ -1,7 +1,6 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+ const Lang = imports.lang;
+-const DBus = imports.dbus;
+ const Gio = imports.gi.Gio;
+ const St = imports.gi.St;
+ 
+@@ -61,25 +60,19 @@ function startAppForMount(app, mount) {
+ 
+ /******************************************/
+ 
+-const HotplugSnifferIface = {
+-    name: 'org.Cinnamon.HotplugSniffer',
+-    methods: [{ name: 'SniffURI',
+-                inSignature: 's',
+-                outSignature: 'as' }]
+-};
+-
+-const HotplugSniffer = function() {
+-    this._init();
+-};
++const HotplugSnifferIface = <interface name="org.Cinnamon.HotplugSniffer">
++<method name="SniffURI">
++    <arg type="s" direction="in" />
++    <arg type="as" direction="out" />
++</method>
++</interface>;
+ 
+-HotplugSniffer.prototype = {
+-    _init: function() {
+-        DBus.session.proxifyObject(this,
++const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface);
++function HotplugSniffer() {
++    return new HotplugSnifferProxy(Gio.DBus.session,
+                                    'org.Cinnamon.HotplugSniffer',
+                                    '/org/Cinnamon/HotplugSniffer');
+-    },
+-};
+-DBus.proxifyPrototype(HotplugSniffer.prototype, HotplugSnifferIface);
++}
+ 
+ function ContentTypeDiscoverer(callback) {
+     this._init(callback);
+diff --git a/js/ui/calendar.js b/js/ui/calendar.js
+index ff4777a..a97e2a9 100644
+--- a/js/ui/calendar.js
++++ b/js/ui/calendar.js
+@@ -1,6 +1,5 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+-const DBus = imports.dbus;
+ const Clutter = imports.gi.Clutter;
+ const Gio = imports.gi.Gio;
+ const Lang = imports.lang;
+@@ -194,30 +193,34 @@ EmptyEventSource.prototype = {
+ };
+ Signals.addSignalMethods(EmptyEventSource.prototype);
+ 
+-const CalendarServerIface = {
+-    name: 'org.Cinnamon.CalendarServer',
+-    methods: [{ name: 'GetEvents',
+-                inSignature: 'xxb',
+-                outSignature: 'a(sssbxxa{sv})' }],
+-    signals: [{ name: 'Changed',
+-                inSignature: '' }]
+-};
+-
+-const CalendarServer = function () {
+-    this._init();
+-};
+-
+-CalendarServer.prototype = {
+-     _init: function() {
+-         DBus.session.proxifyObject(this, 'org.Cinnamon.CalendarServer', '/org/Cinnamon/CalendarServer');
+-     }
+-};
+-
+-DBus.proxifyPrototype(CalendarServer.prototype, CalendarServerIface);
++const CalendarServerIface = <interface name="org.Cinnamon.CalendarServer">
++<method name="GetEvents">
++    <arg type="x" direction="in" />
++    <arg type="x" direction="in" />
++    <arg type="b" direction="in" />
++    <arg type="a(sssbxxa{sv})" direction="out" />
++</method>
++<signal name="Changed" />
++</interface>;
++
++const CalendarServerInfo  = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface);
++
++function CalendarServer() {
++    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
++				   g_interface_name: CalendarServerInfo.name,
++				   g_interface_info: CalendarServerInfo,
++				   g_name: 'org.Cinnamon.CalendarServer',
++				   g_object_path: '/org/Cinnamon/CalendarServer',
++                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
++                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
++
++    self.init(null);
++    return self;
++}
+ 
+ // an implementation that reads data from a session bus service
+-function DBusEventSource(owner) {
+-    this._init(owner);
++function DBusEventSource() {
++    this._init();
+ }
+ 
+ function _datesEqual(a, b) {
+@@ -240,16 +243,18 @@ function _dateIntervalsOverlap(a0, a1, b0, b1)
+ 
+ 
+ DBusEventSource.prototype = {
+-    _init: function(owner) {
++    _init: function() {
+         this._resetCache();
+ 
+-        this._dbusProxy = new CalendarServer(owner);
+-        this._dbusProxy.connect('Changed', Lang.bind(this, this._onChanged));
++        this._dbusProxy = new CalendarServer();
++        this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
+ 
+-        DBus.session.watch_name('org.Cinnamon.CalendarServer',
+-                                false, // do not launch a name-owner if none exists
+-                                Lang.bind(this, this._onNameAppeared),
+-                                Lang.bind(this, this._onNameVanished));
++        this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
++            if (this._dbusProxy.g_name_owner)
++                this._onNameAppeared();
++            else
++                this._onNameVanished();
++        }));
+     },
+ 
+     _resetCache: function() {
+@@ -272,7 +277,7 @@ DBusEventSource.prototype = {
+         this._loadEvents(false);
+     },
+ 
+-    _onEventsReceived: function(appointments) {
++    _onEventsReceived: function([appointments]) {
+         let newEvents = [];
+         if (appointments != null) {
+             for (let n = 0; n < appointments.length; n++) {
+@@ -295,9 +300,9 @@ DBusEventSource.prototype = {
+ 
+     _loadEvents: function(forceReload) {
+         if (this._curRequestBegin && this._curRequestEnd){
+-            let callFlags = 0;
++            let callFlags = Gio.DBusCallFlags.NO_AUTO_START;
+             if (forceReload)
+-                callFlags |= DBus.CALL_FLAG_START;
++                callFlags = Gio.DBusCallFlags.NONE;
+             this._dbusProxy.GetEventsRemote(this._curRequestBegin.getTime() / 1000,
+                                             this._curRequestEnd.getTime() / 1000,
+                                             forceReload,
+diff --git a/js/ui/cinnamonDBus.js b/js/ui/cinnamonDBus.js
+index 600e92f..5d4eb1c 100644
+--- a/js/ui/cinnamonDBus.js
++++ b/js/ui/cinnamonDBus.js
+@@ -1,7 +1,7 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+-const DBus = imports.dbus;
+ const Lang = imports.lang;
++const Gio = imports.gi.Gio;
+ 
+ const Config = imports.misc.config;
+ const Flashspot = imports.ui.flashspot;
+@@ -9,48 +9,53 @@ const Main = imports.ui.main;
+ const AppletManager = imports.ui.appletManager;
+ const DeskletManager = imports.ui.deskletManager;
+ 
+-const CinnamonIface = {
+-    name: 'org.Cinnamon',
+-    methods: [{ name: 'Eval',
+-                inSignature: 's',
+-                outSignature: 'bs'
+-              },
+-              { name: 'ScreenshotArea',
+-                inSignature: 'biiiibs',
+-                outSignature: ''
+-              },
+-              { name: 'ScreenshotWindow',
+-                inSignature: 'bbbs',
+-                outSignature: ''
+-              },
+-              { name: 'Screenshot',
+-                inSignature: 'bbs',
+-                outSignature: ''
+-              },
+-              {
+-                name: 'FlashArea',
+-                inSignature: 'iiii',
+-                outSignature: ''
+-              },
+-              {
+-                name: 'highlightApplet',
+-                inSignature: 'sb',
+-                outSignature: ''
+-              },
+-              {
+-                name: 'activateCallback',
+-                inSignature: 'ssb',
+-                outSignature: ''
+-              }
+-             ],
+-    signals: [],
+-    properties: [{ name: 'OverviewActive',
+-                   signature: 'b',
+-                   access: 'readwrite' },
+-                 { name: 'CinnamonVersion',
+-                   signature: 's',
+-                   access: 'read' }]
+-};
++
++const CinnamonIface = <interface name="org.Cinnamon">
++<method name="Eval">
++    <arg type="s" direction="in" name="script" />
++    <arg type="b" direction="out" name="success" />
++    <arg type="s" direction="out" name="result" />
++</method>
++<method name="ScreenshotArea">
++include_cursor
++    <arg type="b" direction="in" name="include_cursor"/>
++    <arg type="i" direction="in" name="x"/>
++    <arg type="i" direction="in" name="y"/>
++    <arg type="i" direction="in" name="width"/>
++    <arg type="i" direction="in" name="height"/>
++    <arg type="b" direction="in" name="flash"/>
++    <arg type="s" direction="in" name="filename"/>
++</method>
++<method name="ScreenshotWindow">
++    <arg type="b" direction="in" name="include_frame"/>
++    <arg type="b" direction="in" name="include_cursor"/>
++    <arg type="b" direction="in" name="flash"/>
++    <arg type="s" direction="in" name="filename"/>
++</method>
++<method name="Screenshot">
++    <arg type="b" direction="in" name="include_frame"/>
++    <arg type="b" direction="in" name="flash"/>
++    <arg type="s" direction="in" name="filename"/>
++</method>
++<method name="FlashArea">
++include_cursor
++    <arg type="i" direction="in" name="x"/>
++    <arg type="i" direction="in" name="y"/>
++    <arg type="i" direction="in" name="width"/>
++    <arg type="i" direction="in" name="height"/>
++</method>
++<method name="highlightApplet">
++    <arg type="s" direction="in" />
++    <arg type="b" direction="in" />
++</method>
++<method name="activateCallback">
++    <arg type="s" direction="in" />
++    <arg type="s" direction="in" />
++    <arg type="b" direction="in" />
++</method>
++<property name="OverviewActive" type="b" access="readwrite" />
++<property name="CinnamonVersion" type="s" access="read" />
++</interface>;
+ 
+ function Cinnamon() {
+     this._init();
+@@ -58,7 +63,8 @@ function Cinnamon() {
+ 
+ Cinnamon.prototype = {
+     _init: function() {
+-        DBus.session.exportObject('/org/Cinnamon', this);
++        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(CinnamonIface, this);
++        this._dbusImpl.export(Gio.DBus.session, '/org/Cinnamon');
+     },
+ 
+     /**
+@@ -215,5 +221,3 @@ Cinnamon.prototype = {
+     CinnamonVersion: Config.PACKAGE_VERSION
+ };
+ 
+-DBus.conformExport(Cinnamon.prototype, CinnamonIface);
+-
+diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
+index e909f5f..4f1f7d0 100644
+--- a/js/ui/endSessionDialog.js
++++ b/js/ui/endSessionDialog.js
+@@ -18,19 +18,19 @@
+  * 02110-1335, USA.
+  */
+ 
+-const DBus = imports.dbus;
+ const Lang = imports.lang;
+ const Signals = imports.signals;
+ 
+ const AccountsService = imports.gi.AccountsService;
+ const Clutter = imports.gi.Clutter;
++const Gio = imports.gi.Gio;
+ const GLib = imports.gi.GLib;
+ const Gtk = imports.gi.Gtk;
+ const Pango = imports.gi.Pango;
+ const St = imports.gi.St;
+ const Cinnamon = imports.gi.Cinnamon;
+ 
+-const GnomeSession = imports.misc.gnomeSession
++const GnomeSession = imports.misc.gnomeSession;
+ const ModalDialog = imports.ui.modalDialog;
+ const Tweener = imports.ui.tweener;
+ 
+@@ -40,20 +40,20 @@ const _ITEM_ICON_SIZE = 48;
+ const _DIALOG_ICON_SIZE = 32;
+ 
+ const GSM_SESSION_MANAGER_LOGOUT_FORCE = 2;
+-
+-const EndSessionDialogIface = {
+-    name: 'org.gnome.SessionManager.EndSessionDialog',
+-    methods: [{ name: 'Open',
+-                inSignature: 'uuuao',
+-                outSignature: ''
+-              }
+-             ],
+-    signals: [{ name: 'Canceled',
+-                inSignature: '',
+-              }],
+-    properties: []
+-};
+-
++const EndSessionDialogIface = <interface name="org.gnome.SessionManager.EndSessionDialog">
++<method name="Open">
++    <arg type="u" direction="in" />
++    <arg type="u" direction="in" />
++    <arg type="u" direction="in" />
++    <arg type="ao" direction="in" />
++</method>
++<signal name="ConfirmedLogout" />
++<signal name="ConfirmedReboot" />
++<signal name="ConfirmedShutdown" />
++<signal name="Canceled" />
++<signal name="Closed" />
++</interface>;
++ 
+ const logoutDialogContent = {
+     subjectWithUser: _("Log Out %s"),
+     subject: _("Log Out"),
+@@ -230,8 +230,6 @@ function _setLabelText(label, text) {
+ function EndSessionDialog() {
+     if (_endSessionDialog == null) {
+         this._init();
+-        DBus.session.exportObject('/org/gnome/SessionManager/EndSessionDialog',
+-                                  this);
+         _endSessionDialog = this;
+     }
+ 
+@@ -328,6 +326,9 @@ EndSessionDialog.prototype = {
+                                           if (this._applicationList.get_children().length == 0)
+                                               scrollView.hide();
+                                       }));
++
++        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this);
++        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog');
+     },
+ 
+     _onDestroy: function() {
+@@ -442,25 +443,19 @@ EndSessionDialog.prototype = {
+ 
+     close: function() {
+         ModalDialog.ModalDialog.prototype.close.call(this);
+-        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
+-                                 'org.gnome.SessionManager.EndSessionDialog',
+-                                 'Closed', '', []);
++        this._dbusImpl.emit_signal('Closed', null);
+     },
+ 
+     cancel: function() {
+         this._stopTimer();
+-        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
+-                                 'org.gnome.SessionManager.EndSessionDialog',
+-                                 'Canceled', '', []);
++        this._dbusImpl.emit_signal('Canceled', null);
+         this.close(global.get_current_time());
+     },
+ 
+     _confirm: function(signal) {
+         this._fadeOutDialog();
+         this._stopTimer();
+-        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
+-                                 'org.gnome.SessionManager.EndSessionDialog',
+-                                 signal, '', []);
++        this._dbusImpl.emit_signal(signal, null);
+     },
+ 
+     _onOpened: function() {
+@@ -512,39 +507,41 @@ EndSessionDialog.prototype = {
+         this._updateContent();
+     },
+ 
+-    OpenAsync: function(type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths, callback) {
++    OpenAsync: function(parameters, invocation) {
++        let [type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths] = parameters;
+         this._totalSecondsToStayOpen = totalSecondsToStayOpen;
+         this._inhibitors = [];
+         this._applicationList.destroy_children();
+         this._type = type;
+ 
+-        if (!(this._type in DialogContent))
+-            throw new DBus.DBusError('org.Cinnamon.ModalDialog.TypeError',
+-                                     "Unknown dialog type requested");
++        if (!(this._type in DialogContent)) {
++            invocation.report_dbus_error('org.Cinnamon.ModalDialog.TypeError',
++                                         "Unknown dialog type requested");
++            return;
++        }
+ 
+         for (let i = 0; i < inhibitorObjectPaths.length; i++) {
+-            let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i]);
++            let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i], Lang.bind(this, function(proxy, error) {
++                this._onInhibitorLoaded(proxy);
++            }));
+ 
+-            inhibitor.connect('is-loaded',
+-                              Lang.bind(this, function() {
+-                                  this._onInhibitorLoaded(inhibitor);
+-                              }));
+             this._inhibitors.push(inhibitor);
+         }
+ 
+         this._updateButtons();
+ 
+-        if (!this.open(timestamp))
+-            throw new DBus.DBusError('org.Cinnamon.ModalDialog.GrabError',
+-                                     "Cannot grab pointer and keyboard");
++        if (!this.open(timestamp)) {
++            invocation.report_dbus_error('org.Cinnamon.ModalDialog.GrabError',
++                                         "Cannot grab pointer and keyboard");
++            return;
++        }
+ 
+         this._updateContent();
+ 
+         let signalId = this.connect('opened',
+                                     Lang.bind(this, function() {
+-                                        callback();
++                                        invocation.return_value(null);
+                                         this.disconnect(signalId);
+                                     }));
+     }
+ };
+-DBus.conformExport(EndSessionDialog.prototype, EndSessionDialogIface);
+diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
+index f55cf93..69edb51 100644
+--- a/js/ui/keyboard.js
++++ b/js/ui/keyboard.js
+@@ -2,7 +2,6 @@
+ 
+ const Caribou = imports.gi.Caribou;
+ const Clutter = imports.gi.Clutter;
+-const DBus = imports.dbus;
+ const Gdk = imports.gi.Gdk;
+ const Gio = imports.gi.Gio;
+ const GLib = imports.gi.GLib;
+@@ -38,28 +37,27 @@ const PRETTY_KEYS = {
+     'Alt_L': 'Alt'
+ };
+ 
+-const CaribouKeyboardIface = {
+-    name: 'org.gnome.Caribou.Keyboard',
+-    methods:    [ { name: 'Show',
+-                    inSignature: 'u',
+-                    outSignature: ''
+-                  },
+-                  { name: 'Hide',
+-                    inSignature: 'u',
+-                    outSignature: ''
+-                  },
+-                  { name: 'SetCursorLocation',
+-                    inSignature: 'iiii',
+-                    outSignature: ''
+-                  },
+-                  { name: 'SetEntryLocation',
+-                    inSignature: 'iiii',
+-                    outSignature: ''
+-                  } ],
+-    properties: [ { name: 'Name',
+-                    signature: 's',
+-                    access: 'read' } ]
+-};
++const CaribouKeyboardIface = <interface name='org.gnome.Caribou.Keyboard'>
++<method name='Show'>
++    <arg type='u' direction='in' />
++</method>
++<method name='Hide'>
++    <arg type='u' direction='in' />
++</method>
++<method name='SetCursorLocation'>
++    <arg type='i' direction='in' />
++    <arg type='i' direction='in' />
++    <arg type='i' direction='in' />
++    <arg type='i' direction='in' />
++</method>
++<method name='SetEntryLocation'>
++    <arg type='i' direction='in' />
++    <arg type='i' direction='in' />
++    <arg type='i' direction='in' />
++    <arg type='i' direction='in' />
++</method>
++<property name='Name' access='read' type='s' />
++</interface>;
+ 
+ function Key() {
+     this._init.apply(this, arguments);
+@@ -199,7 +197,8 @@ function Keyboard() {
+ 
+ Keyboard.prototype = {
+     _init: function () {
+-        DBus.session.exportObject('/org/gnome/Caribou/Keyboard', this);
++        this._impl = Gio.DBusExportedObject.wrapJSObject(CaribouKeyboardIface, this);
++        this._impl.export(Gio.DBus.session, '/org/gnome/Caribou/Keyboard');
+ 
+         this.actor = null;
+ 
+@@ -541,7 +540,6 @@ Keyboard.prototype = {
+         return 'cinnamon';
+     }
+ };
+-DBus.conformExport(Keyboard.prototype, CaribouKeyboardIface);
+ 
+ function KeyboardSource() {
+     this._init.apply(this, arguments);
+diff --git a/js/ui/layout.js b/js/ui/layout.js
+index 3446e7a..7523b6f 100644
+--- a/js/ui/layout.js
++++ b/js/ui/layout.js
+@@ -488,12 +488,14 @@ Chrome.prototype = {
+ 
+         this._screenSaverActive = false;
+         this._screenSaverProxy = new ScreenSaver.ScreenSaverProxy();
+-        this._screenSaverProxy.connect('ActiveChanged', Lang.bind(this, this._onScreenSaverActiveChanged));
+-        this._screenSaverProxy.GetActiveRemote(Lang.bind(this,
+-            function(result, err) {
+-                if (!err)
+-                    this._onScreenSaverActiveChanged(this._screenSaverProxy, result);
+-            }));
++        this._screenSaverProxy.connectSignal('ActiveChanged', Lang.bind(this, function(proxy, senderName, [isActive]) {
++            this._onScreenSaverActiveChanged(isActive);
++        }));
++        this._screenSaverProxy.GetActiveRemote(Lang.bind(this, function(result, err) {
++            if (!err)
++                this._onScreenSaverActiveChanged(result[0]);
++        }));
++
+ 
+         this._relayout();
+     },
+diff --git a/js/ui/magnifierDBus.js b/js/ui/magnifierDBus.js
+index 72bba26..4d21797 100644
+--- a/js/ui/magnifierDBus.js
++++ b/js/ui/magnifierDBus.js
+@@ -1,6 +1,6 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+-const DBus = imports.dbus;
++const Gio = imports.gi.Gio;
+ const Main = imports.ui.main;
+ 
+ const MAG_SERVICE_NAME = 'org.gnome.Magnifier';
+@@ -10,47 +10,85 @@ const ZOOM_SERVICE_PATH = '/org/gnome/Magnifier/ZoomRegion';
+ 
+ // Subset of gnome-mag's Magnifier dbus interface -- to be expanded.  See:
+ // http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml
+-const MagnifierIface = {
+-    name: MAG_SERVICE_NAME,
+-    methods: [
+-                { name: 'setActive', inSignature: 'b', outSignature: '' },
+-                { name: 'isActive', inSignature: '', outSignature: 'b' },
+-                { name: 'showCursor', inSignature: '', outSignature: '' },
+-                { name: 'hideCursor', inSignature: '', outSignature: ''  },
+-                { name: 'createZoomRegion', inSignature: 'ddaiai', outSignature: 'o' },
+-                { name: 'addZoomRegion', inSignature: 'o', outSignature: 'b' },
+-                { name: 'getZoomRegions', inSignature: '', outSignature: 'ao' },
+-                { name: 'clearAllZoomRegions', inSignature: '', outSignature: '' },
+-                { name: 'fullScreenCapable', inSignature: '', outSignature: 'b' },
+-
+-                { name: 'setCrosswireSize', inSignature: 'i', outSignature: '' },
+-                { name: 'getCrosswireSize', inSignature: '', outSignature: 'i' },
+-                { name: 'setCrosswireLength', inSignature: 'i', outSignature: '' },
+-                { name: 'getCrosswireLength', inSignature: '', outSignature: 'i' },
+-                { name: 'setCrosswireClip', inSignature: 'b', outSignature: '' },
+-                { name: 'getCrosswireClip', inSignature: '', outSignature: 'b' },
+-                { name: 'setCrosswireColor', inSignature: 'u', outSignature: '' },
+-                { name: 'getCrosswireColor', inSignature: '', outSignature: 'u' }
+-             ],
+-    signals: [],
+-    properties: []
+-};
++const MagnifierIface = <interface name={MAG_SERVICE_NAME}>
++<method name="setActive">
++    <arg type="b" direction="in" />
++</method>
++<method name="isActive">
++    <arg type="b" direction="out" />
++</method>
++<method name="showCursor" />
++<method name="hideCursor" />
++<method name="createZoomRegion">
++    <arg type="d" direction="in" />
++    <arg type="d" direction="in" />
++    <arg type="ai" direction="in" />
++    <arg type="ai" direction="in" />
++    <arg type="o" direction="out" />
++</method>
++<method name="addZoomRegion">
++    <arg type="o" direction="in" />
++    <arg type="b" direction="out" />
++</method>
++<method name="getZoomRegions">
++    <arg type="ao" direction="out" />
++</method>
++<method name="clearAllZoomRegions" />
++<method name="fullScreenCapable">
++    <arg type="b" direction="out" />
++</method>
++<method name="setCrosswireSize">
++    <arg type="i" direction="in" />
++</method>
++<method name="getCrosswireSize">
++    <arg type="i" direction="out" />
++</method>
++<method name="setCrosswireLength">
++    <arg type="i" direction="in" />
++</method>
++<method name="getCrosswireLength">
++    <arg type="i" direction="out" />
++</method>
++<method name="setCrosswireClip">
++    <arg type="b" direction="in" />
++</method>
++<method name="getCrosswireClip">
++    <arg type="b" direction="out" />
++</method>
++<method name="setCrosswireColor">
++    <arg type="u" direction="in" />
++</method>
++<method name="getCrosswireColor">
++    <arg type="u" direction="out" />
++</method>
++</interface>;
+ 
+ // Subset of gnome-mag's ZoomRegion dbus interface -- to be expanded.  See:
+ // http://git.gnome.org/browse/gnome-mag/tree/xml/...ZoomRegion.xml
+-const ZoomRegionIface = {
+-    name: ZOOM_SERVICE_NAME,
+-    methods: [
+-                { name: 'setMagFactor', inSignature: 'dd', outSignature: ''},
+-                { name: 'getMagFactor', inSignature: '', outSignature: 'dd' },
+-                { name: 'setRoi', inSignature: 'ai', outSignature: '' },
+-                { name: 'getRoi', inSignature: '', outSignature: 'ai' },
+-                { name: 'shiftContentsTo', inSignature: 'ii', outSignature: 'b' },
+-                { name: 'moveResize', inSignature: 'ai', outSignature: '' }
+-             ],
+-    signals: [],
+-    properties: []
+-};
++const ZoomRegionIface = <interface name={ZOOM_SERVICE_NAME}>
++<method name="setMagFactor">
++    <arg type="d" direction="in" />
++    <arg type="d" direction="in" />
++</method>
++<method name="getMagFactor">
++    <arg type="d" direction="out" />
++    <arg type="d" direction="out" />
++</method>
++<method name="setRoi">
++    <arg type="ai" direction="in" />
++</method>
++<method name="getRoi">
++    <arg type="ai" direction="out" />
++</method>
++<method name="shiftContentsTo">
++    <arg type="i" direction="in" />
++    <arg type="i" direction="in" />
++    <arg type="b" direction="out" />
++</method>
++<method name="moveResize">
++    <arg type="ai" direction="in" />
++</method>
++</interface>;
+ 
+ // For making unique ZoomRegion DBus proxy object paths of the form:
+ // '/org/gnome/Magnifier/ZoomRegion/zoomer0',
+@@ -64,7 +102,9 @@ function CinnamonMagnifier() {
+ CinnamonMagnifier.prototype = {
+     _init: function() {
+         this._zoomers = {};
+-        DBus.session.exportObject(MAG_SERVICE_PATH, this);
++
++        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(MagnifierIface, this);
++        this._dbusImpl.export(Gio.DBus.session, MAG_SERVICE_PATH);
+     },
+ 
+     /**
+@@ -195,10 +235,10 @@ CinnamonMagnifier.prototype = {
+         Main.magnifier.clearAllZoomRegions();
+         for (let objectPath in this._zoomers) {
+             let proxyAndZoomer = this._zoomers[objectPath];
++            proxyAndZoomer.proxy.destroy();
+             proxyAndZoomer.proxy = null;
+             proxyAndZoomer.zoomRegion = null;
+             delete this._zoomers[objectPath];
+-            DBus.session.unexportObject(proxyAndZoomer);
+         }
+         this._zoomers = {};
+     },
+@@ -300,8 +340,9 @@ function CinnamonMagnifierZoomRegion(zoomerObjectPath, zoomRegion) {
+ CinnamonMagnifierZoomRegion.prototype = {
+     _init: function(zoomerObjectPath, zoomRegion) {
+         this._zoomRegion = zoomRegion;
+-        DBus.session.proxifyObject(this, ZOOM_SERVICE_NAME, zoomerObjectPath);
+-        DBus.session.exportObject(zoomerObjectPath, this);
++
++        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ZoomRegionIface, this);
++        this._dbusImpl.export(Gio.DBus.session, zoomerObjectPath);
+     },
+ 
+     /**
+@@ -376,8 +417,9 @@ CinnamonMagnifierZoomRegion.prototype = {
+     moveResize: function(viewPort) {
+         let viewRect = { x: viewPort[0], y: viewPort[1], width: viewPort[2] - viewPort[0], height: viewPort[3] - viewPort[1] };
+         this._zoomRegion.setViewPort(viewRect);
++    },
++
++    destroy: function() {
++        this._dbusImpl.unexport();
+     }
+ };
+-
+-DBus.conformExport(CinnamonMagnifier.prototype, MagnifierIface);
+-DBus.conformExport(CinnamonMagnifierZoomRegion.prototype, ZoomRegionIface);
+diff --git a/js/ui/main.js b/js/ui/main.js
+index 99aee95..b602915 100644
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -1,7 +1,6 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+ const Clutter = imports.gi.Clutter;
+-const DBus= imports.dbus;
+ const Gio = imports.gi.Gio;
+ const GLib = imports.gi.GLib;
+ const Gtk = imports.gi.Gtk;
+@@ -199,11 +198,6 @@ function start() {
+ 
+     cinnamonDBusService = new CinnamonDBus.Cinnamon();
+     lookingGlassDBusService = new LookingGlassDBus.CinnamonLookingGlass();
+-    // Force a connection now; dbus.js will do this internally
+-    // if we use its name acquisition stuff but we aren't right
+-    // now; to do so we'd need to convert from its async calls
+-    // back into sync ones.
+-    DBus.session.flush();
+ 
+     // Ensure CinnamonWindowTracker and CinnamonAppUsage are initialized; this will
+     // also initialize CinnamonAppSystem first.  CinnamonAppSystem
+diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
+index 18d6615..8bed028 100644
+--- a/js/ui/messageTray.js
++++ b/js/ui/messageTray.js
+@@ -1388,12 +1388,17 @@ function MessageTray() {
+ 
+ MessageTray.prototype = {
+     _init: function() {
+-        this._presence = new GnomeSession.Presence();
++        this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) {
++            this._onStatusChanged(proxy.status);
++        }));
++
+         this._userStatus = GnomeSession.PresenceStatus.AVAILABLE;
+         this._busy = false;
+         this._backFromAway = false;
+-        this._presence.connect('StatusChanged', Lang.bind(this, this._onStatusChanged));
+-        this._presence.getStatus(Lang.bind(this, this._onStatusChanged));
++        this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
++            this._onStatusChanged(status);
++        }));
++
+ 
+         this._notificationBin = new St.Bin();
+         this._notificationBin.hide();
+@@ -1548,7 +1553,7 @@ MessageTray.prototype = {
+         this._updateState();
+     },
+ 
+-    _onStatusChanged: function(presence, status) {
++    _onStatusChanged: function(status) {
+         this._backFromAway = (this._userStatus == GnomeSession.PresenceStatus.IDLE && this._userStatus != status);
+         this._userStatus = status;
+ 
+diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
+index bee8ffd..b037e07 100644
+--- a/js/ui/notificationDaemon.js
++++ b/js/ui/notificationDaemon.js
+@@ -1,7 +1,7 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+ const Clutter = imports.gi.Clutter;
+-const DBus = imports.dbus;
++const Gio = imports.gi.Gio;
+ const GLib = imports.gi.GLib;
+ const Lang = imports.lang;
+ const Cinnamon = imports.gi.Cinnamon;
+@@ -14,49 +14,52 @@ const Params = imports.misc.params;
+ 
+ let nextNotificationId = 1;
+ 
+-// Should really be defined in dbus.js
+-const BusIface = {
+-    name: 'org.freedesktop.DBus',
+-    methods: [{ name: 'GetConnectionUnixProcessID',
+-                inSignature: 's',
+-                outSignature: 'i' }]
+-};
+-
+-const Bus = function () {
+-    this._init();
+-};
+-
+-Bus.prototype = {
+-     _init: function() {
+-         DBus.session.proxifyObject(this, 'org.freedesktop.DBus', '/org/freedesktop/DBus');
+-     }
+-};
++// Should really be defined in Gio.js
++const BusIface = <interface name="org.freedesktop.DBus">
++<method name="GetConnectionUnixProcessID">
++    <arg type="s" direction="in" />
++    <arg type="u" direction="out" />
++</method>
++</interface>;
++
++var BusProxy = Gio.DBusProxy.makeProxyWrapper(BusIface);
++function Bus() {
++    return new BusProxy(Gio.DBus.session, 'org.freedesktop.DBus', '/org/freedesktop/DBus');
++}
+ 
+-DBus.proxifyPrototype(Bus.prototype, BusIface);
+-
+-const NotificationDaemonIface = {
+-    name: 'org.freedesktop.Notifications',
+-    methods: [{ name: 'Notify',
+-                inSignature: 'susssasa{sv}i',
+-                outSignature: 'u'
+-              },
+-              { name: 'CloseNotification',
+-                inSignature: 'u',
+-                outSignature: ''
+-              },
+-              { name: 'GetCapabilities',
+-                inSignature: '',
+-                outSignature: 'as'
+-              },
+-              { name: 'GetServerInformation',
+-                inSignature: '',
+-                outSignature: 'ssss'
+-              }],
+-    signals: [{ name: 'NotificationClosed',
+-                inSignature: 'uu' },
+-              { name: 'ActionInvoked',
+-                inSignature: 'us' }]
+-};
++const NotificationDaemonIface = <interface name="org.freedesktop.Notifications">
++<method name="Notify">
++    <arg type="s" direction="in"/>
++    <arg type="u" direction="in"/>
++    <arg type="s" direction="in"/>
++    <arg type="s" direction="in"/>
++    <arg type="s" direction="in"/>
++    <arg type="as" direction="in"/>
++    <arg type="a{sv}" direction="in"/>
++    <arg type="i" direction="in"/>
++    <arg type="u" direction="out"/>
++</method>
++<method name="CloseNotification">
++    <arg type="u" direction="in"/>
++</method>
++<method name="GetCapabilities">
++    <arg type="as" direction="out"/>
++</method>
++<method name="GetServerInformation">
++    <arg type="s" direction="out"/>
++    <arg type="s" direction="out"/>
++    <arg type="s" direction="out"/>
++    <arg type="s" direction="out"/>
++</method>
++<signal name="NotificationClosed">
++    <arg type="u"/>
++    <arg type="u"/>
++</signal>
++<signal name="ActionInvoked">
++    <arg type="u"/>
++    <arg type="s"/>
++</signal>
++</interface>;
+ 
+ const NotificationClosedReason = {
+     EXPIRED: 1,
+@@ -88,7 +91,8 @@ function NotificationDaemon() {
+ 
+ NotificationDaemon.prototype = {
+     _init: function() {
+-        DBus.session.exportObject('/org/freedesktop/Notifications', this);
++        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(NotificationDaemonIface, this);
++        this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/Notifications');
+ 
+         this._sources = [];
+         this._senderToPid = {};
+@@ -213,8 +217,8 @@ NotificationDaemon.prototype = {
+         return source;
+     },
+ 
+-    Notify: function(appName, replacesId, icon, summary, body,
+-                     actions, hints, timeout) {
++    NotifyAsync: function(params, invocation) {
++        let [appName, replacesId, icon, summary, body, actions, hints, timeout] = params;
+         let id;
+         
+         let rewrites = rewriteRules[appName];
+@@ -257,51 +261,55 @@ NotificationDaemon.prototype = {
+         }
+         this._notifications[id] = ndata;
+ 
+-        let sender = DBus.getCurrentMessageContext().sender;
++        let sender = invocation.get_sender();
+         let pid = this._senderToPid[sender];
+ 
+         let source = this._getSource(appName, pid, ndata, sender, null);
+ 
+         if (source) {
+             this._notifyForSource(source, ndata);
+-            return id;
++            return invocation.return_value(GLib.Variant.new('(u)', [id]));
+         }
+ 
+         if (replacesId) {
+             // There's already a pending call to GetConnectionUnixProcessID,
+             // which will see the new notification data when it finishes,
+             // so we don't have to do anything.
+-            return id;
++            return invocation.return_value(GLib.Variant.new('(u)', [id]));
+         }
+ 
+-        this._busProxy.GetConnectionUnixProcessIDRemote(sender, Lang.bind(this,
+-            function (pid, ex) {
+-                // The app may have updated or removed the notification
+-                ndata = this._notifications[id];
+-                if (!ndata)
+-                    return;
+-
+-                source = this._getSource(appName, pid, ndata, sender, null);
+-
+-                // We only store sender-pid entries for persistent sources.
+-                // Removing the entries once the source is destroyed
+-                // would result in the entries associated with transient
+-                // sources removed once the notification is shown anyway.
+-                // However, keeping these pairs would mean that we would
+-                // possibly remove an entry associated with a persistent
+-                // source when a transient source for the same sender is
+-                // distroyed.
+-                if (!source.isTransient) {
+-                    this._senderToPid[sender] = pid;
+-                    source.connect('destroy', Lang.bind(this,
+-                        function() {
+-                            delete this._senderToPid[sender];
+-                        }));
+-                }
+-                this._notifyForSource(source, ndata);
+-            }));
++        this._busProxy.GetConnectionUnixProcessIDRemote(sender, Lang.bind(this, function (result, excp) {
++            // The app may have updated or removed the notification
++            ndata = this._notifications[id];
++            if (!ndata)
++                return;
+ 
+-        return id;
++            if (excp) {
++                logError(excp, 'Call to GetConnectionUnixProcessID failed');
++                return;
++            }
++
++            let [pid] = result;
++            source = this._getSource(appName, pid, ndata, sender);
++
++            // We only store sender-pid entries for persistent sources.
++            // Removing the entries once the source is destroyed
++            // would result in the entries associated with transient
++            // sources removed once the notification is shown anyway.
++            // However, keeping these pairs would mean that we would
++            // possibly remove an entry associated with a persistent
++            // source when a transient source for the same sender is
++            // distroyed.
++            if (!source.isTransient) {
++                this._senderToPid[sender] = pid;
++                source.connect('destroy', Lang.bind(this, function() {
++                    delete this._senderToPid[sender];
++                }));
++            }
++            this._notifyForSource(source, ndata);
++        }));
++
++        return invocation.return_value(GLib.Variant.new('(u)', [id]));
+     },
+ 
+     _notifyForSource: function(source, ndata) {
+@@ -441,17 +449,13 @@ NotificationDaemon.prototype = {
+     },
+ 
+     _emitNotificationClosed: function(id, reason) {
+-        DBus.session.emit_signal('/org/freedesktop/Notifications',
+-                                 'org.freedesktop.Notifications',
+-                                 'NotificationClosed', 'uu',
+-                                 [id, reason]);
++        this._dbusImpl.emit_signal('NotificationClosed',
++                                   GLib.Variant.new('(uu)', [id, reason]));
+     },
+ 
+     _emitActionInvoked: function(id, action) {
+-        DBus.session.emit_signal('/org/freedesktop/Notifications',
+-                                 'org.freedesktop.Notifications',
+-                                 'ActionInvoked', 'us',
+-                                 [id, action]);
++        this._dbusImpl.emit_signal('ActionInvoked',
++                                   GLib.Variant.new('(us)', [id, action]));
+     },
+ 
+     _onTrayIconAdded: function(o, icon) {
+@@ -465,8 +469,6 @@ NotificationDaemon.prototype = {
+     }
+ };
+ 
+-DBus.conformExport(NotificationDaemon.prototype, NotificationDaemonIface);
+-
+ function Source(title, pid, sender, trayIcon) {
+     this._init(title, pid, sender, trayIcon);
+ }
+@@ -481,15 +483,12 @@ Source.prototype = {
+ 
+         this.pid = pid;
+         if (sender)
+-            // TODO: dbus-glib implementation of watch_name() doesn’t return an id to be used for
+-            // unwatch_name() or implement unwatch_name(), however when we move to using GDBus implementation,
+-            // we should save the id here and call unwatch_name() with it in destroy().
+-            // Moving to GDBus is the work in progress: https://bugzilla.gnome.org/show_bug.cgi?id=648651
+-            // and https://bugzilla.gnome.org/show_bug.cgi?id=622921 .
+-            DBus.session.watch_name(sender,
+-                                    false,
+-                                    null,
+-                                    Lang.bind(this, this._onNameVanished));
++            this._nameWatcherId = Gio.DBus.session.watch_name(sender,
++                                                              Gio.BusNameWatcherFlags.NONE,
++                                                              null,
++                                                              Lang.bind(this, this._onNameVanished));
++        else
++            this._nameWatcherId = 0;
+ 
+         this._setApp();
+         if (this.app)
+@@ -596,6 +595,10 @@ Source.prototype = {
+     },
+ 
+     destroy: function() {
++        if (this._nameWatcherId) {
++            Gio.DBus.session.unwatch_name(this._nameWatcherId);
++            this._nameWatcherId = 0;
++        }
+         MessageTray.Source.prototype.destroy.call(this);
+     }
+ };
+diff --git a/js/ui/scripting.js b/js/ui/scripting.js
+index 42c4f6d..9163d29 100644
+--- a/js/ui/scripting.js
++++ b/js/ui/scripting.js
+@@ -1,6 +1,5 @@
+ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ 
+-const DBus = imports.dbus;
+ const Gio = imports.gi.Gio;
+ const Mainloop = imports.mainloop;
+ const Meta = imports.gi.Meta;
+@@ -70,24 +69,21 @@ function waitLeisure() {
+     };
+ }
+ 
+-const PerfHelperIface = {
+-    name: 'org.Cinnamon.PerfHelper',
+-    methods: [{ name: 'CreateWindow', inSignature: 'iibb', outSignature: '' },
+-              { name: 'WaitWindows', inSignature: '', outSignature: '' },
+-              { name: 'DestroyWindows', inSignature: '', outSignature: ''}]
+-};
+-
+-const PerfHelper = function () {
+-    this._init();
+-};
+-
+-PerfHelper.prototype = {
+-     _init: function() {
+-         DBus.session.proxifyObject(this, 'org.Cinnamon.PerfHelper', '/org/Cinnamon/PerfHelper');
+-     }
+-};
+-
+-DBus.proxifyPrototype(PerfHelper.prototype, PerfHelperIface);
++const PerfHelperIface = <interface name="org.gnome.Shell.PerfHelper">
++<method name="CreateWindow">
++    <arg type="i" direction="in" />
++    <arg type="i" direction="in" />
++    <arg type="b" direction="in" />
++    <arg type="b" direction="in" />
++</method>
++<method name="WaitWindows" />
++<method name="DestroyWindows" />
++</interface>;
++
++var PerfHelperProxy = Gio.DBusProxy.makeProxyWrapper(PerfHelperIface);
++function PerfHelper() {
++    return new PerfHelperProxy(Gio.DBus.session, 'org.gnome.Shell.PerfHelper', '/org/gnome/Shell/PerfHelper');
++}
+ 
+ let _perfHelper = null;
+ function _getPerfHelper() {
+-- 
+1.8.1.6
+
+
+From 135d2228bbf6d3b1be5f90e0e599cd3880e06d93 Mon Sep 17 00:00:00 2001
+From: dalcde <dalcde@yahoo.com.hk>
+Date: Tue, 16 Apr 2013 16:58:30 +0800
+Subject: [PATCH 07/16] [GDBus][Sound/Power Applet] Fix dbus port issues
+
+---
+ files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+index b6b2bcd..fad39ab 100644
+--- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+@@ -212,7 +212,7 @@ MyApplet.prototype = {
+             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+             this.menu.addSettingsAction(_("Power Settings"), 'power');
+ 
+-            this._smProxy.connect('PropertiesChanged', Lang.bind(this, this._devicesChanged));
++            this._smProxy.connectSignal('PropertiesChanged', Lang.bind(this, this._devicesChanged));
+             this._devicesChanged();            
+         }
+         catch (e) {
+-- 
+1.8.1.6
+
+
+From 5880ce34538ec2791b5e58cc3ffc07e41c189c82 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Fri, 19 Apr 2013 19:09:18 -0400
+Subject: [PATCH 08/16] Fix gicon error - power applet
+
+---
+ files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+index fad39ab..3a13eab 100644
+--- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+@@ -323,7 +323,7 @@ MyApplet.prototype = {
+         let icon = this._proxy.Icon;
+         if (icon) {
+             let gicon = Gio.icon_new_for_string(icon);
+-            this.setGIcon(gicon);
++            this._applet_icon.gicon = gicon
+             this.actor.show();
+         } else {
+             this.menu.close();
+-- 
+1.8.1.6
+
+
+From 647bd58c93541acdba11cd11d586d2cb08a0a4eb Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Fri, 19 Apr 2013 19:44:33 -0400
+Subject: [PATCH 09/16] Remove unused
+
+---
+ src/cinnamon-background-manager.c | 34 ----------------------------------
+ 1 file changed, 34 deletions(-)
+
+diff --git a/src/cinnamon-background-manager.c b/src/cinnamon-background-manager.c
+index 9d95250..67427ed 100644
+--- a/src/cinnamon-background-manager.c
++++ b/src/cinnamon-background-manager.c
+@@ -66,8 +66,6 @@ struct CinnamonBackgroundManagerPrivate
+ 
+ G_DEFINE_TYPE (CinnamonBackgroundManager, cinnamon_background_manager, G_TYPE_OBJECT)
+ 
+-static gpointer manager_object = NULL;
+-
+ static gboolean
+ dont_draw_background (CinnamonBackgroundManager *manager)
+ {
+@@ -223,36 +221,6 @@ struct CinnamonBackgroundManagerPrivate
+ }
+ 
+ static void
+-draw_background_after_session_loads (CinnamonBackgroundManager *manager)
+-{
+-        GError *error = NULL;
+-        GDBusProxyFlags flags;
+-
+-        flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
+-                G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
+-        manager->priv->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+-                                                              flags,
+-                                                              NULL, /* GDBusInterfaceInfo */
+-                                                              "org.gnome.SessionManager",
+-                                                              "/org/gnome/SessionManager",
+-                                                              "org.gnome.SessionManager",
+-                                                              NULL, /* GCancellable */
+-                                                              &error);
+-        if (manager->priv->proxy == NULL) {
+-                g_warning ("Could not listen to session manager: %s",
+-                           error->message);
+-                g_error_free (error);
+-                return;
+-        }
+-
+-        manager->priv->proxy_signal_id = g_signal_connect (manager->priv->proxy,
+-                                                           "g-signal",
+-                                                           G_CALLBACK (on_session_manager_signal),
+-                                                           manager);
+-}
+-
+-
+-static void
+ disconnect_screen_signals (CinnamonBackgroundManager *manager)
+ {
+         GdkDisplay *display;
+@@ -312,8 +280,6 @@ struct CinnamonBackgroundManagerPrivate
+                           G_CALLBACK (draw_background_changed), manager);
+ 
+         setup_bg_and_draw_background (manager);
+-            //draw_background_after_session_loads (manager);
+-
+ 
+         return TRUE;
+ }
+-- 
+1.8.1.6
+
+
+From 7a8233638187d00798cf3a4b66a27d707eaec804 Mon Sep 17 00:00:00 2001
+From: dalcde <dalcde@yahoo.com.hk>
+Date: Sat, 20 Apr 2013 15:42:13 +0800
+Subject: [PATCH 10/16] [GDBus][Power applet] Some fixes and cleanup
+
+---
+ .../cinnamon/applets/power@cinnamon.org/applet.js  | 52 ++++++----------------
+ 1 file changed, 14 insertions(+), 38 deletions(-)
+
+diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+index 3a13eab..5f81d91 100644
+--- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
+@@ -48,40 +48,11 @@ const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power">
+ <method name="GetPrimaryDevice">
+     <arg type="(susdut)" direction="out"/>
+ </method>
+-<signal name="PropertiesChanged">
+-    <arg type="s"/>
+-    <arg type="a{sv}"/>
+-    <arg type="a[s]"/>
+-</signal>
+ <property name="Icon" type="s" access="read" />
+ </interface>;
+ 
+ const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface);
+ 
+-const SettingsManagerInterface = <interface name="org.freedesktop.DBus.Properties">
+-<method name="Get">
+-    <arg type="s" direction="in"/>
+-    <arg type="s" direction="in"/>
+-    <arg type="v" direction="out"/>
+-</method>
+-<method name="GetAll">
+-    <arg type="s" direction="in"/>
+-    <arg type="a{sv}" direction="out"/>
+-</method>
+-<method name="Set">
+-    <arg type="s" direction="in"/>
+-    <arg type="s" direction="in"/>
+-    <arg type="v" direction="in"/>
+-</method>
+-<signal name="PropertiesChanged">
+-    <arg type="s"/>
+-    <arg type="a{sv}"/>
+-    <arg type="a[s]"/>
+-</signal>
+-</interface>;
+-
+-const SettingsManagerProxy = Gio.DBusProxy.makeProxyWrapper(SettingsManagerInterface);
+-
+ function DeviceItem() {
+     this._init.apply(this, arguments);
+ }
+@@ -156,8 +127,16 @@ MyApplet.prototype = {
+             this.menuManager.addMenu(this.menu);            
+ 
+             //this.set_applet_icon_symbolic_name('battery-missing');            
+-            this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
+-            this._smProxy = new SettingsManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
++            this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH,
++                                               Lang.bind(this, function(proxy, error) {
++                                                             if (error) {
++                                                                 global.log(error.message);
++
++                                                                 return;
++                                                             }
++                                                             this._proxy.connect('g-properties-changed', Lang.bind(this, this._devicesChanged));
++                                                             this._devicesChanged();
++                                               }));
+ 
+             let icon = this.actor.get_children()[0];
+             this.actor.remove_actor(icon);
+@@ -211,9 +190,6 @@ MyApplet.prototype = {
+ 
+             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+             this.menu.addSettingsAction(_("Power Settings"), 'power');
+-
+-            this._smProxy.connectSignal('PropertiesChanged', Lang.bind(this, this._devicesChanged));
+-            this._devicesChanged();            
+         }
+         catch (e) {
+             global.logError(e);
+@@ -245,14 +221,14 @@ MyApplet.prototype = {
+     },
+     
+     _readPrimaryDevice: function() {
+-        this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(device, error) {
++        this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(result, error) {
+             if (error) {
+                 this._hasPrimary = false;
+                 this._primaryDeviceId = null;
+                 this._batteryItem.actor.hide();                
+                 return;
+             }
+-            let [device_id, device_type, icon, percentage, state, seconds] = device;
++            let [[device_id, device_type, icon, percentage, state, seconds]] = result;
+             if (device_type == UPDeviceType.BATTERY) {
+                 this._hasPrimary = true;
+                 let time = Math.round(seconds / 60);
+@@ -290,7 +266,7 @@ MyApplet.prototype = {
+     },
+ 
+     _readOtherDevices: function() {
+-        this._proxy.GetDevicesRemote(Lang.bind(this, function(devices, error) {
++        this._proxy.GetDevicesRemote(Lang.bind(this, function([devices], error) {
+             this._deviceItems.forEach(function(i) { i.destroy(); });
+             this._deviceItems = [];
+ 
+@@ -336,7 +312,7 @@ MyApplet.prototype = {
+     },
+     
+     _updateLabel: function() {
+-        this._proxy.GetDevicesRemote(Lang.bind(this, function(devices, error) {
++        this._proxy.GetDevicesRemote(Lang.bind(this, function([devices], error) {
+             if (error) {
+                 this._mainLabel.set_text("");
+                 return;
+-- 
+1.8.1.6
+
+
+From 1a74c4a4d010a6ddcd2350b1ea298710bc1c08b1 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Sat, 20 Apr 2013 10:59:54 -0400
+Subject: [PATCH 11/16] Move CLUTTER_DISABLE_XINPUT to session startup file
+
+---
+ files/usr/bin/gnome-session-cinnamon | 2 +-
+ src/main.c                           | 3 ---
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/files/usr/bin/gnome-session-cinnamon b/files/usr/bin/gnome-session-cinnamon
+index 315f135..56c37f5 100755
+--- a/files/usr/bin/gnome-session-cinnamon
++++ b/files/usr/bin/gnome-session-cinnamon
+@@ -1,3 +1,3 @@
+ #! /bin/sh
+-exec gnome-session --session cinnamon "$@"
++exec CLUTTER_DISABLE_XINPUT=1 gnome-session --session cinnamon "$@"
+ 
+diff --git a/src/main.c b/src/main.c
+index 9d37975..418fb60 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -257,9 +257,6 @@
+ 
+   g_option_context_free (ctx);
+ 
+-  /* Disable XInput extension - required for 3.8 compatibility */
+-  g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE);
+-
+   meta_plugin_type_register (gnome_cinnamon_plugin_get_type ());
+ 
+   /* Prevent meta_init() from causing gtk to load gail and at-bridge */
+-- 
+1.8.1.6
+
+
+From dfa107fd874866da2f634c65a90e2c13a447464c Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Sat, 20 Apr 2013 12:23:29 -0400
+Subject: [PATCH 12/16] Add Xinput disable to cinnamon2d
+
+---
+ files/usr/bin/cinnamon2d | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/files/usr/bin/cinnamon2d b/files/usr/bin/cinnamon2d
+index 1eced99..7f42517 100755
+--- a/files/usr/bin/cinnamon2d
++++ b/files/usr/bin/cinnamon2d
+@@ -1,2 +1,2 @@
+ #!/bin/bash
+-CLUTTER_PAINT=disable-clipped-redraws:disable-culling LIBGL_ALWAYS_SOFTWARE=1 CINNAMON_SOFTWARE_RENDERING=1 CINNAMON_SLOWDOWN_FACTOR=0.0001 MUFFIN_NO_SHADOWS=1 CLUTTER_DEFAULT_FPS=15 cinnamon $@
++CLUTTER_DISABLE_XINPUT=1 CLUTTER_PAINT=disable-clipped-redraws:disable-culling LIBGL_ALWAYS_SOFTWARE=1 CINNAMON_SOFTWARE_RENDERING=1 CINNAMON_SLOWDOWN_FACTOR=0.0001 MUFFIN_NO_SHADOWS=1 CLUTTER_DEFAULT_FPS=15 cinnamon $@
+-- 
+1.8.1.6
+
+
+From 28b39b2372a571ddcc1298f34f2d7e653f6b2e96 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Sat, 20 Apr 2013 12:29:43 -0400
+Subject: [PATCH 13/16] Fix session file
+
+---
+ files/usr/bin/gnome-session-cinnamon | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/files/usr/bin/gnome-session-cinnamon b/files/usr/bin/gnome-session-cinnamon
+index 56c37f5..31c9eff 100755
+--- a/files/usr/bin/gnome-session-cinnamon
++++ b/files/usr/bin/gnome-session-cinnamon
+@@ -1,3 +1,3 @@
+ #! /bin/sh
+-exec CLUTTER_DISABLE_XINPUT=1 gnome-session --session cinnamon "$@"
++CLUTTER_DISABLE_XINPUT=1 exec gnome-session --session cinnamon "$@"
+ 
+-- 
+1.8.1.6
+
+
+From aba3a7666d3679e5803862af07edc47e7b093b11 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Sat, 20 Apr 2013 12:36:45 -0400
+Subject: [PATCH 14/16] Add cinnamon3d command
+
+---
+ files/usr/bin/cinnamon3d | 2 ++
+ 1 file changed, 2 insertions(+)
+ create mode 100644 files/usr/bin/cinnamon3d
+
+diff --git a/files/usr/bin/cinnamon3d b/files/usr/bin/cinnamon3d
+new file mode 100644
+index 0000000..4891783
+--- /dev/null
++++ b/files/usr/bin/cinnamon3d
+@@ -0,0 +1,2 @@
++#!/bin/bash
++CLUTTER_DISABLE_XINPUT=1 cinnamon $@
+-- 
+1.8.1.6
+
+
+From 3e1cdf6d88ade9abe5a0b8773b565d345c01f2cb Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Sat, 20 Apr 2013 12:37:26 -0400
+Subject: [PATCH 15/16] Fix perms
+
+---
+ files/usr/bin/cinnamon3d | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 files/usr/bin/cinnamon3d
+
+diff --git a/files/usr/bin/cinnamon3d b/files/usr/bin/cinnamon3d
+old mode 100644
+new mode 100755
+-- 
+1.8.1.6
+
+
+From 7904eaf179918f4f97b328f2b5f340776544ca49 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 22 Apr 2013 18:27:39 -0400
+Subject: [PATCH 16/16] Sledgehammer merge of:
+
+f251f0b77d01cb9a80212b1dce2538c60a5bf59e
+
+Don't ask...
+---
+ .../share/cinnamon/applets/sound@cinnamon.org/applet.js    | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
+index c8427ac..a7b2e09 100644
+--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
+@@ -53,8 +53,8 @@ const MediaServer2PlayerIFace = <interface name="org.mpris.MediaPlayer2.Player">
+ 
+ /* global values */
+ let icon_path = "/usr/share/cinnamon/theme/";
+-let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer" ];
+-let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer" ];
++let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer", "qmmp"];
++let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer", "qmmp" ];
+ /* dummy vars for translation */
+ let x = _("Playing");
+ x = _("Paused");
+@@ -285,6 +285,13 @@ Player.prototype = {
+                 this._setStatus(value["PlaybackStatus"]);
+             if (value["Metadata"])
+                 this._setMetadata(value["Metadata"]);
++            // qmmp
++            if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') {
++                if (value["playbackStatus"])
++                    this._setStatus(value["playbackStatus"]);
++                if (value["metadata"])
++                    this._setMetadata(value["metadata"]);
++            }
+         }));
+ 
+         this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) {
+@@ -377,7 +384,8 @@ Player.prototype = {
+                     cover.read_async(null, null, Lang.bind(this, this._onReadCover));
+                 }
+                 else {
+-                    cover_path = decodeURIComponent(this._trackCoverFile.substr(7));
++                    cover_path = decodeURIComponent(this._trackCoverFile);
++                    cover_path = cover_path.replace("file://", "");
+                     this._showCover(cover_path);
+                 }
+             }
+-- 
+1.8.1.6
+
diff --git a/community/cinnamon/gnome-autogen.sh b/community/cinnamon/gnome-autogen.sh
deleted file mode 100644
index 2467a1de2..000000000
--- a/community/cinnamon/gnome-autogen.sh
+++ /dev/null
@@ -1,538 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-#name of package
-test "$PKG_NAME" || PKG_NAME=Package
-test "$srcdir" || srcdir=.
-
-# default version requirements ...
-test "$REQUIRED_AUTOCONF_VERSION" || REQUIRED_AUTOCONF_VERSION=2.53
-test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.9
-test "$REQUIRED_LIBTOOL_VERSION" || REQUIRED_LIBTOOL_VERSION=1.4.3
-test "$REQUIRED_GETTEXT_VERSION" || REQUIRED_GETTEXT_VERSION=0.10.40
-test "$REQUIRED_GLIB_GETTEXT_VERSION" || REQUIRED_GLIB_GETTEXT_VERSION=2.2.0
-test "$REQUIRED_INTLTOOL_VERSION" || REQUIRED_INTLTOOL_VERSION=0.25
-test "$REQUIRED_PKG_CONFIG_VERSION" || REQUIRED_PKG_CONFIG_VERSION=0.14.0
-test "$REQUIRED_GTK_DOC_VERSION" || REQUIRED_GTK_DOC_VERSION=1.0
-test "$REQUIRED_DOC_COMMON_VERSION" || REQUIRED_DOC_COMMON_VERSION=2.3.0
-test "$REQUIRED_GNOME_DOC_UTILS_VERSION" || REQUIRED_GNOME_DOC_UTILS_VERSION=0.4.2
-
-# a list of required m4 macros.  Package can set an initial value
-test "$REQUIRED_M4MACROS" || REQUIRED_M4MACROS=
-test "$FORBIDDEN_M4MACROS" || FORBIDDEN_M4MACROS=
-
-# Not all echo versions allow -n, so we check what is possible. This test is
-# based on the one in autoconf.
-ECHO_C=
-ECHO_N=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ;;
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-# some terminal codes ...
-if tty < /dev/null 1>/dev/null 2>&1; then
-    boldface="`tput bold 2>/dev/null`"
-    normal="`tput sgr0 2>/dev/null`"
-else
-    boldface=
-    normal=
-fi
-printbold() {
-    echo $ECHO_N "$boldface" $ECHO_C
-    echo "$@"
-    echo $ECHO_N "$normal" $ECHO_C
-}    
-printerr() {
-    echo "$@" >&2
-}
-
-# Usage:
-#     compare_versions MIN_VERSION ACTUAL_VERSION
-# returns true if ACTUAL_VERSION >= MIN_VERSION
-compare_versions() {
-    ch_min_version=$1
-    ch_actual_version=$2
-    ch_status=0
-    IFS="${IFS=         }"; ch_save_IFS="$IFS"; IFS="."
-    set $ch_actual_version
-    for ch_min in $ch_min_version; do
-        ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
-        if [ -z "$ch_min" ]; then break; fi
-        if [ -z "$ch_cur" ]; then ch_status=1; break; fi
-        if [ $ch_cur -gt $ch_min ]; then break; fi
-        if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
-    done
-    IFS="$ch_save_IFS"
-    return $ch_status
-}
-
-# Usage:
-#     version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE
-# checks to see if the package is available
-version_check() {
-    vc_package=$1
-    vc_variable=$2
-    vc_checkprogs=$3
-    vc_min_version=$4
-    vc_source=$5
-    vc_status=1
-
-    vc_checkprog=`eval echo "\\$$vc_variable"`
-    if [ -n "$vc_checkprog" ]; then
-	printbold "using $vc_checkprog for $vc_package"
-	return 0
-    fi
-
-    if test "x$vc_package" = "xautomake" -a "x$vc_min_version" = "x1.4"; then
-	vc_comparator="="
-    else
-	vc_comparator=">="
-    fi
-    printbold "checking for $vc_package $vc_comparator $vc_min_version..."
-    for vc_checkprog in $vc_checkprogs; do
-	echo $ECHO_N "  testing $vc_checkprog... " $ECHO_C
-	if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then
-	    vc_actual_version=`$vc_checkprog --version | head -n 1 | \
-                               sed 's/^.*[ 	]\([0-9.]*[a-z]*\).*$/\1/'`
-	    if compare_versions $vc_min_version $vc_actual_version; then
-		echo "found $vc_actual_version"
-		# set variables
-		eval "$vc_variable=$vc_checkprog; \
-			${vc_variable}_VERSION=$vc_actual_version"
-		vc_status=0
-		break
-	    else
-		echo "too old (found version $vc_actual_version)"
-	    fi
-	else
-	    echo "not found."
-	fi
-    done
-    if [ "$vc_status" != 0 ]; then
-	printerr "***Error***: You must have $vc_package $vc_comparator $vc_min_version installed"
-	printerr "  to build $PKG_NAME.  Download the appropriate package for"
-	printerr "  from your distribution or get the source tarball at"
-        printerr "    $vc_source"
-	printerr
-	exit $vc_status
-    fi
-    return $vc_status
-}
-
-# Usage:
-#     require_m4macro filename.m4
-# adds filename.m4 to the list of required macros
-require_m4macro() {
-    case "$REQUIRED_M4MACROS" in
-	$1\ * | *\ $1\ * | *\ $1) ;;
-	*) REQUIRED_M4MACROS="$REQUIRED_M4MACROS $1" ;;
-    esac
-}
-
-forbid_m4macro() {
-    case "$FORBIDDEN_M4MACROS" in
-	$1\ * | *\ $1\ * | *\ $1) ;;
-	*) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;;
-    esac
-}
-
-# Usage:
-#     add_to_cm_macrodirs dirname
-# Adds the dir to $cm_macrodirs, if it's not there yet.
-add_to_cm_macrodirs() {
-    case $cm_macrodirs in
-    "$1 "* | *" $1 "* | *" $1") ;;
-    *) cm_macrodirs="$cm_macrodirs $1";;
-    esac
-}
-
-# Usage:
-#     print_m4macros_error
-# Prints an error message saying that autoconf macros were misused
-print_m4macros_error() {
-    printerr "***Error***: some autoconf macros required to build $PKG_NAME"
-    printerr "  were not found in your aclocal path, or some forbidden"
-    printerr "  macros were found.  Perhaps you need to adjust your"
-    printerr "  ACLOCAL_FLAGS?"
-    printerr
-}
-
-# Usage:
-#     check_m4macros
-# Checks that all the requested macro files are in the aclocal macro path
-# Uses REQUIRED_M4MACROS and ACLOCAL variables.
-check_m4macros() {
-    # construct list of macro directories
-    cm_macrodirs=`$ACLOCAL --print-ac-dir`
-    # aclocal also searches a version specific dir, eg. /usr/share/aclocal-1.9
-    # but it contains only Automake's own macros, so we can ignore it.
-
-    # Read the dirlist file, supported by Automake >= 1.7.
-    # If AUTOMAKE was defined, no version was detected.
-    if [ -z "$AUTOMAKE_VERSION" ] || compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then
-	cm_dirlist=`sed 's/[ 	]*#.*//;/^$/d' $cm_macrodirs/dirlist`
-	if [ -n "$cm_dirlist" ] ; then
-	    for cm_dir in $cm_dirlist; do
-		if [ -d $cm_dir ]; then
-		    add_to_cm_macrodirs $cm_dir
-		fi
-	    done
-	fi
-    fi
-
-    # Parse $ACLOCAL_FLAGS
-    set - $ACLOCAL_FLAGS
-    while [ $# -gt 0 ]; do
-	if [ "$1" = "-I" ]; then
-	    add_to_cm_macrodirs "$2"
-	    shift
-	fi
-	shift
-    done
-
-    cm_status=0
-    if [ -n "$REQUIRED_M4MACROS" ]; then
-	printbold "Checking for required M4 macros..."
-	# check that each macro file is in one of the macro dirs
-	for cm_macro in $REQUIRED_M4MACROS; do
-	    cm_macrofound=false
-	    for cm_dir in $cm_macrodirs; do
-		if [ -f "$cm_dir/$cm_macro" ]; then
-		    cm_macrofound=true
-		    break
-		fi
-		# The macro dir in Cygwin environments may contain a file
-		# called dirlist containing other directories to look in.
-		if [ -f "$cm_dir/dirlist" ]; then
-		    for cm_otherdir in `cat $cm_dir/dirlist`; do
-			if [ -f "$cm_otherdir/$cm_macro" ]; then
-			    cm_macrofound=true
-		            break
-			fi
-		    done
-		fi
-	    done
-	    if $cm_macrofound; then
-		:
-	    else
-		printerr "  $cm_macro not found"
-		cm_status=1
-	    fi
-	done
-    fi
-    if [ "$cm_status" != 0 ]; then
-        print_m4macros_error
-        exit $cm_status
-    fi
-    if [ -n "$FORBIDDEN_M4MACROS" ]; then
-	printbold "Checking for forbidden M4 macros..."
-	# check that each macro file is in one of the macro dirs
-	for cm_macro in $FORBIDDEN_M4MACROS; do
-	    cm_macrofound=false
-	    for cm_dir in $cm_macrodirs; do
-		if [ -f "$cm_dir/$cm_macro" ]; then
-		    cm_macrofound=true
-		    break
-		fi
-	    done
-	    if $cm_macrofound; then
-		printerr "  $cm_macro found (should be cleared from macros dir)"
-		cm_status=1
-	    fi
-	done
-    fi
-    if [ "$cm_status" != 0 ]; then
-        print_m4macros_error
-	exit $cm_status
-    fi
-}
-
-# try to catch the case where the macros2/ directory hasn't been cleared out.
-forbid_m4macro gnome-cxx-check.m4
-
-want_libtool=false
-want_gettext=false
-want_glib_gettext=false
-want_intltool=false
-want_pkg_config=false
-want_gtk_doc=false
-want_gnome_doc_utils=false
-want_maintainer_mode=false
-
-find_configure_files() {
-    configure_ac=
-    if test -f "$1/configure.ac"; then
-	configure_ac="$1/configure.ac"
-    elif test -f "$1/configure.in"; then
-	configure_ac="$1/configure.in"
-    fi
-    if test "x$configure_ac" != x; then
-	echo "$configure_ac"
-	# TODO We have not detected the right autoconf yet!
-	autoconf -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do
-	    find_configure_files "$1/$dir"
-	done
-    fi
-}
-
-configure_files="`find_configure_files $srcdir`"
-
-for configure_ac in $configure_files; do
-    dirname=`dirname $configure_ac`
-    if [ -f $dirname/NO-AUTO-GEN ]; then
-	echo skipping $dirname -- flagged as no auto-gen
-	continue
-    fi
-    if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null ||
-       grep "^LT_INIT" $configure_ac >/dev/null; then
-	want_libtool=true
-    fi
-    if grep "^AM_GNU_GETTEXT" $configure_ac >/dev/null; then
-	want_gettext=true
-    fi
-    if grep "^AM_GLIB_GNU_GETTEXT" $configure_ac >/dev/null; then
-	want_glib_gettext=true
-    fi
-    if grep "^AC_PROG_INTLTOOL" $configure_ac >/dev/null ||
-       grep "^IT_PROG_INTLTOOL" $configure_ac >/dev/null; then
-	want_intltool=true
-    fi
-    if grep "^PKG_CHECK_MODULES" $configure_ac >/dev/null; then
-	want_pkg_config=true
-    fi
-    if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then
-	want_gtk_doc=true
-    fi
-    if grep "^GNOME_DOC_INIT" $configure_ac >/dev/null; then
-        want_gnome_doc_utils=true
-    fi
-
-    # check that AM_MAINTAINER_MODE is used
-    if grep "^AM_MAINTAINER_MODE" $configure_ac >/dev/null; then
-	want_maintainer_mode=true
-    fi
-
-    if grep "^YELP_HELP_INIT" $configure_ac >/dev/null; then
-        require_m4macro yelp.m4
-    fi
-
-    # check to make sure gnome-common macros can be found ...
-    if grep "^GNOME_COMMON_INIT" $configure_ac >/dev/null ||
-       grep "^GNOME_DEBUG_CHECK" $configure_ac >/dev/null ||
-       grep "^GNOME_MAINTAINER_MODE_DEFINES" $configure_ac >/dev/null; then
-        require_m4macro gnome-common.m4
-    fi
-    if grep "^GNOME_COMPILE_WARNINGS" $configure_ac >/dev/null ||
-       grep "^GNOME_CXX_WARNINGS" $configure_ac >/dev/null; then
-        require_m4macro gnome-compiler-flags.m4
-    fi
-    if grep "^GNOME_CODE_COVERAGE" $configure_ac >/dev/null; then
-        require_m4macro gnome-code-coverage.m4
-    fi
-done
-
-#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13
-WANT_AUTOCONF_2_5=1
-export WANT_AUTOCONF_2_5
-version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \
-    "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz"
-AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
-
-case $REQUIRED_AUTOMAKE_VERSION in
-    1.4*) automake_progs="automake-1.4" ;;
-    1.5*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
-    1.6*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
-    1.7*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
-    1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
-    1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
-    1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;;
-    1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;;
-    1.12*) automake_progs="automake-1.13 automake-1.12" ;;
-    1.13*) automake_progs="automake-1.13" ;;
-esac
-version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
-    "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
-ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
-
-if $want_libtool; then
-    version_check libtool LIBTOOLIZE "libtoolize glibtoolize" $REQUIRED_LIBTOOL_VERSION \
-        "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz"
-    require_m4macro libtool.m4
-fi
-
-if $want_gettext; then
-    version_check gettext GETTEXTIZE gettextize $REQUIRED_GETTEXT_VERSION \
-        "http://ftp.gnu.org/pub/gnu/gettext/gettext-$REQUIRED_GETTEXT_VERSION.tar.gz"
-    require_m4macro gettext.m4
-fi
-
-if $want_glib_gettext; then
-    version_check glib-gettext GLIB_GETTEXTIZE glib-gettextize $REQUIRED_GLIB_GETTEXT_VERSION \
-        "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-$REQUIRED_GLIB_GETTEXT_VERSION.tar.gz"
-    require_m4macro glib-gettext.m4
-fi
-
-if $want_intltool; then
-    version_check intltool INTLTOOLIZE intltoolize $REQUIRED_INTLTOOL_VERSION \
-        "http://ftp.gnome.org/pub/GNOME/sources/intltool/"
-    require_m4macro intltool.m4
-fi
-
-if $want_pkg_config; then
-    version_check pkg-config PKG_CONFIG pkg-config $REQUIRED_PKG_CONFIG_VERSION \
-        "'http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-$REQUIRED_PKG_CONFIG_VERSION.tar.gz"
-    require_m4macro pkg.m4
-fi
-
-if $want_gtk_doc; then
-    version_check gtk-doc GTKDOCIZE gtkdocize $REQUIRED_GTK_DOC_VERSION \
-        "http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-    require_m4macro gtk-doc.m4
-fi
-
-if $want_gnome_doc_utils; then
-    version_check gnome-doc-utils GNOME_DOC_PREPARE gnome-doc-prepare $REQUIRED_GNOME_DOC_UTILS_VERSION \
-        "http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/"
-fi
-
-if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then
-    version_check gnome-common DOC_COMMON gnome-doc-common \
-        $REQUIRED_DOC_COMMON_VERSION " "
-fi
-
-check_m4macros
-
-if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
-  printerr "**Warning**: I am going to run \`configure' with no arguments."
-  printerr "If you wish to pass any to it, please specify them on the"
-  printerr \`$0\'" command line."
-  printerr
-fi
-
-topdir=`pwd`
-for configure_ac in $configure_files; do 
-    dirname=`dirname $configure_ac`
-    basename=`basename $configure_ac`
-    if [ -f $dirname/NO-AUTO-GEN ]; then
-	echo skipping $dirname -- flagged as no auto-gen
-    elif [ ! -w $dirname ]; then
-        echo skipping $dirname -- directory is read only
-    else
-	printbold "Processing $configure_ac"
-	cd $dirname
-
-        # Note that the order these tools are called should match what
-        # autoconf's "autoupdate" package does.  See bug 138584 for
-        # details.
-
-        # programs that might install new macros get run before aclocal
-	if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null ||
-	   grep "^LT_INIT" $basename >/dev/null; then
-	    printbold "Running $LIBTOOLIZE..."
-	    $LIBTOOLIZE --force --copy || exit 1
-	fi
-
-	if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then
-	    printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages."
-	    echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1
-	elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then
-	   if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then
-	   	printbold "Running autopoint..."
-		autopoint --force || exit 1
-	   else
-	    	printbold "Running $GETTEXTIZE... Ignore non-fatal messages."
-	    	echo "no" | $GETTEXTIZE --force --copy || exit 1
-	   fi
-	fi
-
-	if grep "^AC_PROG_INTLTOOL" $basename >/dev/null ||
-           grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then
-	    printbold "Running $INTLTOOLIZE..."
-	    $INTLTOOLIZE --force --copy --automake || exit 1
-	fi
-	if grep "^GTK_DOC_CHECK" $basename >/dev/null; then
-	    printbold "Running $GTKDOCIZE..."
-	    $GTKDOCIZE --copy || exit 1
-	fi
-
-	if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then
-	    printbold "Running gnome-doc-common..."
-	    gnome-doc-common --copy || exit 1
-	fi
-	if grep "^GNOME_DOC_INIT" $basename >/dev/null; then
-	    printbold "Running $GNOME_DOC_PREPARE..."
-	    $GNOME_DOC_PREPARE --force --copy || exit 1
-	fi
-
-        # Now run aclocal to pull in any additional macros needed
-
-	# if the AC_CONFIG_MACRO_DIR() macro is used, pass that
-	# directory to aclocal.
-	m4dir=`cat "$basename" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
-	if [ -n "$m4dir" ]; then
-	    m4dir="-I $m4dir"
-	fi
-	printbold "Running $ACLOCAL..."
-	$ACLOCAL $m4dir $ACLOCAL_FLAGS || exit 1
-
-	if grep "GNOME_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then
-	    printerr "*** obsolete gnome macros were used in $configure_ac"
-	fi
-
-	# Now that all the macros are sorted, run autoconf and autoheader ...
-	printbold "Running $AUTOCONF..."
-	$AUTOCONF || exit 1
-	if grep "^A[CM]_CONFIG_HEADER" $basename >/dev/null; then
-	    printbold "Running $AUTOHEADER..."
-	    $AUTOHEADER || exit 1
-	    # this prevents automake from thinking config.h.in is out of
-	    # date, since autoheader doesn't touch the file if it doesn't
-	    # change.
-	    test -f config.h.in && touch config.h.in
-	fi
-
-	# Finally, run automake to create the makefiles ...
-	printbold "Running $AUTOMAKE..."
-        if [ -f COPYING ]; then
-          cp -pf COPYING COPYING.autogen_bak
-        fi
-        if [ -f INSTALL ]; then
-          cp -pf INSTALL INSTALL.autogen_bak
-        fi
-	if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then
-	    $AUTOMAKE --gnu --add-missing --copy -Wno-portability || exit 1
-	else
-	    $AUTOMAKE --gnu --add-missing --copy || exit 1
-	fi
-        if [ -f COPYING.autogen_bak ]; then
-          cmp COPYING COPYING.autogen_bak > /dev/null || cp -pf COPYING.autogen_bak COPYING
-          rm -f COPYING.autogen_bak
-        fi
-        if [ -f INSTALL.autogen_bak ]; then
-          cmp INSTALL INSTALL.autogen_bak > /dev/null || cp -pf INSTALL.autogen_bak INSTALL
-          rm -f INSTALL.autogen_bak
-        fi
-
-	cd "$topdir"
-    fi
-done
-
-conf_flags=""
-
-if $want_maintainer_mode; then
-    conf_flags="--enable-maintainer-mode"
-fi
-
-if test x$NOCONFIGURE = x; then
-    printbold Running $srcdir/configure $conf_flags "$@" ...
-    $srcdir/configure $conf_flags "$@" \
-	&& echo Now type \`make\' to compile $PKG_NAME || exit 1
-else
-    echo Skipping configure process.
-fi
diff --git a/community/cinnamon/idle-dim.patch b/community/cinnamon/idle-dim.patch
new file mode 100644
index 000000000..17f5af616
--- /dev/null
+++ b/community/cinnamon/idle-dim.patch
@@ -0,0 +1,35 @@
+diff -Naur linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
+--- linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js	2013-04-30 18:01:56.000000000 +0200
++++ linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js	2013-05-02 19:32:12.934254811 +0200
+@@ -9,8 +9,7 @@
+ 
+ /* constants */
+ const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power";
+-const DimSettingsAc = "idle-dim-ac";
+-const DimSettingsBattery = "idle-dim-battery";
++const DimSettings = "idle-dim";
+ const PowerBusName = 'org.gnome.SettingsDaemon';
+ const PowerObjectPath = '/org/gnome/SettingsDaemon/Power';
+ 
+@@ -116,10 +115,8 @@
+             
+             this._settingsMenu = new PopupMenu.PopupSubMenuMenuItem(_("Dimming settings"));
+             
+-            let dimSwitchAc = this._buildItem(_("Dim screen on AC power"), DimSettingsSchema, DimSettingsAc);
+-            this._settingsMenu.menu.addMenuItem(dimSwitchAc);
+-            let dimSwitchBattery = this._buildItem(_("Dim screen on battery"), DimSettingsSchema, DimSettingsBattery);
+-            this._settingsMenu.menu.addMenuItem(dimSwitchBattery);
++            let dimSwitch = this._buildItem(_("Dim screen"), DimSettingsSchema, DimSettings);
++            this._settingsMenu.menu.addMenuItem(dimSwitch);
+                       
+             //initial update.
+             //We have to wait until dbus calls back to decide whether to display brightness controls.
+@@ -145,7 +142,7 @@
+                     this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+                 }
+                 
+-                this.menu.addSettingsAction(_("Settings"), "screen");
++                this.menu.addSettingsAction(_("Settings"), "screensaver");
+ 		    }));
+         }
+         catch (e) {
diff --git a/community/cinnamon/keyboard_applet.patch b/community/cinnamon/keyboard_applet.patch
new file mode 100644
index 000000000..6b3694086
--- /dev/null
+++ b/community/cinnamon/keyboard_applet.patch
@@ -0,0 +1,142 @@
+diff --git a/applet.js b/applet.js
+--- a/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js
+@@ -1,9 +1,10 @@
+ const Applet = imports.ui.applet;
+-const Gkbd = imports.gi.Gkbd;
+ const Lang = imports.lang;
+-const Cinnamon = imports.gi.Cinnamon;
++const Gio = imports.gi.Gio;
++const GLib = imports.gi.GLib;
+ const St = imports.gi.St;
+ const Gtk = imports.gi.Gtk;
++const GnomeDesktop = imports.gi.GnomeDesktop;
+ const Main = imports.ui.main;
+ const PopupMenu = imports.ui.popupMenu;
+ const Util = imports.misc.util;
+@@ -15,11 +16,12 @@
+ LayoutMenuItem.prototype = {
+     __proto__: PopupMenu.PopupBaseMenuItem.prototype,
+ 
+-    _init: function(config, id, indicator, long_name) {
++    _init: function(ipsettings, id, index, indicator, long_name) {
+         PopupMenu.PopupBaseMenuItem.prototype._init.call(this);
+ 
+-        this._config = config;
++        this._ipsettings = ipsettings;
+         this._id = id;
++        this._index = index;
+         this.label = new St.Label({ text: long_name });
+         this.indicator = indicator;
+         this.addActor(this.label);
+@@ -28,7 +30,7 @@
+ 
+     activate: function(event) {
+         PopupMenu.PopupBaseMenuItem.prototype.activate.call(this);
+-        this._config.lock_group(this._id);
++        this._ipsettings.set_value('current', GLib.Variant.new_uint32(this._index));
+     }
+ };
+ 
+@@ -54,18 +56,18 @@
+             this._layoutItems = [ ];
+ 
+             this._showFlags = global.settings.get_boolean("keyboard-applet-use-flags");
+-            this._config = Gkbd.Configuration.get();
+-            this._config.connect('changed', Lang.bind(this, this._syncConfig));
+-            this._config.connect('group-changed', Lang.bind(this, this._syncGroup));
++            this._xkbInfo = new GnomeDesktop.XkbInfo();
++            this._ipsettings = new Gio.Settings({ schema: 'org.gnome.desktop.input-sources' });
++            this._ipsettings.connect('changed::sources', Lang.bind(this, this._syncConfig));
++            this._ipsettings.connect('changed::current', Lang.bind(this, this._syncGroup));
+             global.settings.connect('changed::keyboard-applet-use-flags', Lang.bind(this, this._reload_settings));
+-            this._config.start_listen();
+ 
+             this._syncConfig();
+ 
+             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+             this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, function() {
+                 Main.overview.hide();
+-                Util.spawn(['gkbd-keyboard-display', '-g', String(this._config.get_current_group() + 1)]);
++                Util.spawn(['gkbd-keyboard-display', '-l', this._selectedLayout._id]);
+             }));                                
+             this.menu.addAction(_("Show Character Table"), Lang.bind(this, function() {
+                 Main.overview.hide();
+@@ -98,7 +100,6 @@
+     },
+     
+     _reload_settings: function() {
+-        this._showFlags = global.settings.get_boolean("keyboard-applet-use-flags");
+         this._syncConfig();
+     },
+     
+@@ -127,8 +128,8 @@
+     _syncConfig: function() {
+         this._showFlags = global.settings.get_boolean("keyboard-applet-use-flags");
+ 
+-        let groups = this._config.get_group_names();
+-        if (groups.length > 1) {
++        let sources = this._ipsettings.get_value('sources');
++        if (sources.n_children() > 1) {
+             this.actor.show();
+         } else {
+             this.menu.close();
+@@ -141,25 +142,29 @@
+         for (let i = 0; i < this._labelActors.length; i++)
+             this._labelActors[i].destroy();
+ 
+-        let short_names = this._adjustGroupNames(this._config.get_short_group_names());
+-
+         this._selectedLayout = null;
+         this._layoutItems = [ ];
+         this._labelActors = [ ];
+-        for (let i = 0; i < groups.length; i++) {
+-            let icon_name = this._config.get_group_name(i);
++        for (let i = 0; i < sources.n_children(); i++) {
++            let [type, id] = sources.get_child_value(i).deep_unpack();
++            let displayName = id;
++            let shortName = id;
++            let xkbLayout = id;
++            if (type == 'xkb') {
++                [_exists, displayName, shortName, xkbLayout, _xkbVariant] = this._xkbInfo.get_layout_info(id);
++            } // TODO: errorhandling, handle 'ibus'
++            let icon_name = xkbLayout; // FIXME: Really?
+             let actor;
+             if (this._showFlags)
+                 actor = new St.Icon({ icon_name: icon_name, icon_type: St.IconType.FULLCOLOR, style_class: 'popup-menu-icon' });
+             else
+-                actor = new St.Label({ text: short_names[i] });
+-            let item = new LayoutMenuItem(this._config, i, actor, groups[i]);
+-            item._short_group_name = short_names[i];
++                actor = new St.Label({ text: shortName });
++            let item = new LayoutMenuItem(this._ipsettings, id, i, actor, displayName);
+             item._icon_name = icon_name;
+             this._layoutItems.push(item);
+             this.menu.addMenuItem(item, i);
+ 
+-            let shortLabel = new St.Label({ text: short_names[i] });
++            let shortLabel = new St.Label({ text: shortName });
+             this._labelActors.push(shortLabel);
+         }
+ 
+@@ -167,17 +172,17 @@
+     },
+ 
+     _syncGroup: function() {
+-        let selected = this._config.get_current_group();
++        let current = this._ipsettings.get_uint('current');
+ 
+         if (this._selectedLayout) {
+             this._selectedLayout.setShowDot(false);
+             this._selectedLayout = null;
+         }
+ 
+-        let item = this._layoutItems[selected];
++        let item = this._layoutItems[current];
+         item.setShowDot(true);
+ 
+-        let selectedLabel = this._labelActors[selected];
++        let selectedLabel = this._labelActors[current];
+ 
+         if (this._showFlags) {
+             this.set_applet_icon_name(item._icon_name);
diff --git a/community/cinnamon/switch-applications.patch b/community/cinnamon/switch-applications.patch
new file mode 100644
index 000000000..1254a7ce4
--- /dev/null
+++ b/community/cinnamon/switch-applications.patch
@@ -0,0 +1,31 @@
+diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py linuxmint-Cinnamon-b41bad0/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
+--- linuxmint-Cinnamon-b41bad0.orig/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py	2013-04-15 15:55:01.000000000 +0200
++++ linuxmint-Cinnamon-b41bad0/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py	2013-04-24 21:19:49.262020614 +0200
+@@ -43,8 +43,8 @@
+     # Cinnamon stuff
+     [_("Toggle Scale"), "org.gnome.desktop.wm.keybindings", "switch-to-workspace-down", True, "cinnamon"],
+     [_("Toggle Expo"), "org.gnome.desktop.wm.keybindings", "switch-to-workspace-up", True, "cinnamon"],
+-    [_("Cycle through open windows"), "org.gnome.desktop.wm.keybindings", "switch-windows", True, "cinnamon"],
+-    [_("Cycle backwards though open windows"), "org.gnome.desktop.wm.keybindings", "switch-windows-backward", True, "cinnamon"],
++    [_("Cycle through open windows"), "org.gnome.desktop.wm.keybindings", "switch-applications", True, "cinnamon"],
++    [_("Cycle backwards though open windows"), "org.gnome.desktop.wm.keybindings", "switch-applications-backward", True, "cinnamon"],
+     [_("Run dialog (must restart Cinnamon)"), "org.gnome.desktop.wm.keybindings", "panel-run-dialog", True, "cinnamon"],
+     [_("Menu button (must restart Cinnamon)"), "org.cinnamon.muffin", "overlay-key", False, "cinnamon"],
+ 
+diff -Naur linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js
+--- linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js	2013-04-15 15:55:01.000000000 +0200
++++ linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js	2013-04-24 21:21:22.447677094 +0200
+@@ -131,11 +131,11 @@
+                                             Lang.bind(this, this._showWorkspaceSwitcher));
+         Meta.keybindings_set_custom_handler('switch-to-workspace-down',
+                                             Lang.bind(this, this._showWorkspaceSwitcher));
+-        Meta.keybindings_set_custom_handler('switch-windows',
++        Meta.keybindings_set_custom_handler('switch-applications',
+                                             Lang.bind(this, this._startAppSwitcher));
+         Meta.keybindings_set_custom_handler('switch-group',
+                                             Lang.bind(this, this._startAppSwitcher));
+-        Meta.keybindings_set_custom_handler('switch-windows-backward',
++        Meta.keybindings_set_custom_handler('switch-applications-backward',
+                                             Lang.bind(this, this._startAppSwitcher));
+         Meta.keybindings_set_custom_handler('switch-group-backward',
+                                             Lang.bind(this, this._startAppSwitcher));
diff --git a/community/cksfv/PKGBUILD b/community/cksfv/PKGBUILD
index b8b4192d0..90f7bf4e7 100644
--- a/community/cksfv/PKGBUILD
+++ b/community/cksfv/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 57202 2011-10-23 23:26:43Z andrea $
+# $Id: PKGBUILD 86750 2013-03-21 21:05:54Z eric $
 # Maintainer: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Wijnand Modderman <wijanand+aur@archlinux.nl>
 
 pkgname=cksfv
 pkgver=1.3.14
-pkgrel=2
+pkgrel=2.1
 pkgdesc="SFV (Simple File Verification) Checker"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/"
+url="http://zakalwe.fi/~shd/foss/cksfv"
 license=('GPL')
 depends=('glibc')
 source=(http://zakalwe.fi/~shd/foss/cksfv/files/$pkgname-$pkgver.tar.gz)
 md5sums=('2e15289753ea0b90b6ea86993f93b383')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --package-prefix=$pkgdir
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make install
-  chmod 644 $pkgdir/usr/share/man/man1/$pkgname.1
+  cd "$srcdir/$pkgname-$pkgver"
+  make BINDIR="$pkgdir/usr/bin" MANDIR="$pkgdir/usr/share/man" install
+  chmod 644 "$pkgdir/usr/share/man/man1/$pkgname.1"
 }
diff --git a/community/clamz/PKGBUILD b/community/clamz/PKGBUILD
index ae887294d..6cab64df8 100644
--- a/community/clamz/PKGBUILD
+++ b/community/clamz/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=clamz
 pkgver=0.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Command-line program to download MP3 files from Amazon.com's music store."
 arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/clamz/'
diff --git a/community/clearsilver/PKGBUILD b/community/clearsilver/PKGBUILD
index 441d1f08b..a184a4c65 100644
--- a/community/clearsilver/PKGBUILD
+++ b/community/clearsilver/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 64605 2012-02-17 02:32:25Z spupykin $
+# $Id: PKGBUILD 86874 2013-03-23 23:10:33Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Aaron Griffin <aaron@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=clearsilver
 pkgver=0.10.5
-pkgrel=8
+pkgrel=9
 pkgdesc="clearsilver is a fast, powerful, and language-neutral HTML template system"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.clearsilver.net'
@@ -38,6 +38,10 @@ build()
 EOF
 
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make PREFIX=$pkgdir DESTDIR=$pkgdir install
 
   install -Dm644 CS_LICENSE $pkgdir/usr/share/licenses/clearsilver/license.txt
diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD
deleted file mode 100644
index 242d2122c..000000000
--- a/community/clementine/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 81239 2012-12-14 02:06:27Z stephane $
-#Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-#Contributor: BlackEagle <ike.devolder@gmail.com>
-#Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
-
-pkgname=clementine
-pkgver=1.1.1
-pkgrel=2
-pkgdesc="A music player and library organizer"
-url="http://www.clementine-player.org/"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod'
-         'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice'
-         'sparsehash' 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl' 'gvfs')
-makedepends=('cmake' 'boost' 'mesa')
-optdepends=('gstreamer0.10-base-plugins: for more open formats'
-            'gstreamer0.10-good-plugins: for use with "Good" plugin libraries'
-            'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries'
-            'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries')
-source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('f8d3e9c8f54ac488323ab5a629c9accbe256378e')
-install=clementine.install
-
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-
-   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
-   make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make DESTDIR="${pkgdir}" install
-}
diff --git a/community/clementine/clementine.install b/community/clementine/clementine.install
deleted file mode 100644
index 2f0338d8a..000000000
--- a/community/clementine/clementine.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-
-post_remove() {
-  post_install $1
-}
diff --git a/community/clinica/PKGBUILD b/community/clinica/PKGBUILD
index 4a069a29d..9ef39fd88 100644
--- a/community/clinica/PKGBUILD
+++ b/community/clinica/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 78165 2012-10-16 15:57:54Z bgyorgy $
+# $Id: PKGBUILD 88675 2013-04-21 22:16:41Z heftig $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gianmarco Brocchi <gianmarcobrocchi@gmail.com>
 
 pkgname=clinica
 pkgver=0.2.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Simple medical records manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/clinica-project"
 license=('GPL3')
-depends=('libgee' 'libpeas' 'dconf')
+depends=('libgee06' 'libpeas' 'dconf')
 makedepends=('vala' 'intltool' 'python')
 optdepends=('python2-gobject: for Agenzia del Farmaco plugin')
 install=clinica.install
diff --git a/community/codeblocks/PKGBUILD b/community/codeblocks/PKGBUILD
index 6debec44f..41704dd93 100644
--- a/community/codeblocks/PKGBUILD
+++ b/community/codeblocks/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=codeblocks
 pkgver=12.11
-pkgrel=2
+pkgrel=2.1
 pkgdesc='Open source and cross-platform C/C++ IDE'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.codeblocks.org"
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index d4bffed52..ec2720150 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82585 2013-01-21 05:37:10Z bisson $
+# $Id: PKGBUILD 88406 2013-04-17 07:01:42Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 
 pkgname=collectd
-pkgver=5.2.0
-pkgrel=2
+pkgver=5.3.0
+pkgrel=1
 pkgdesc='Daemon which collects system performance statistics periodically'
 url='http://collectd.org/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
             'libesmtp: notify_email plugin'
             'libgcrypt: encryption and authentication for network plugin'
             'libmemcached: memcachec plugin'
-            'libmysqlclient: mysql plugin'
+            'libmariadbclient: mysql plugin'
             'iproute2: netlink plugin'
             'net-snmp: snmp plugin'
             'libnotify: notify_desktop plugin'
@@ -32,7 +32,7 @@ optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
             'yajl: curl_json plugin')
 
 makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached'
-             'libmysqlclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
+             'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
              'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors'
              'libvirt' 'libxml2' 'xmms' 'yajl')
 
@@ -42,39 +42,38 @@ source=("${url}files/${pkgname}-${pkgver}.tar.gz"
         'libperl.patch'
         'service'
         'rc.d')
-sha1sums=('b56832913cbdc06ee370f89a57ed3c25ed16a88b'
+sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539'
           '245c098d121a4a05594553583310953b3a2f6461'
           'b56907f532b9174e1b6995aadb518228d7464d3b'
           '0f441718d5519cb043b1130e5a1d0379078adbcc')
 
 backup=('etc/collectd.conf')
 options=('!libtool')
-install=install
 
-build() {
+prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	patch -p1 -i ../libperl.patch
 	autoconf
+	sed 's/-Werror//g' -i src/Makefile.in
+}
 
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-static=no \
 		--with-python=/usr/bin/python2
-
 	make all
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	make DESTDIR="${pkgdir}" install
-
 	rmdir "${pkgdir}/var/run" # FS#30201
 	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
 	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service
 	install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
-	mv "${pkgdir}"/usr/man/man3 "${pkgdir}"/usr/share/man # perl man magick ignores datarootdir
 }
diff --git a/community/collectd/install b/community/collectd/install
deleted file mode 100644
index 54cc0e1b3..000000000
--- a/community/collectd/install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install() {
-	cat <<EOF
-==> Customize your /etc/collectd.conf (you really want to).
-==> Then start and stop the daemon using: /etc/rc.d/collectd
-==> To see some result of collected data, use the Perl script:
-==>   /usr/share/collectd/collectd2html.pl
-EOF
-}
diff --git a/community/collectd/rtnl_dump_filter.patch b/community/collectd/rtnl_dump_filter.patch
deleted file mode 100644
index d5929a621..000000000
--- a/community/collectd/rtnl_dump_filter.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur old/src/netlink.c new/src/netlink.c
---- old/src/netlink.c	2012-01-22 22:10:04.000000000 +1100
-+++ new/src/netlink.c	2012-02-01 17:22:54.362752065 +1100
-@@ -570,8 +570,7 @@
-     return (-1);
-   }
- 
--  if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL,
--	NULL, NULL) != 0)
-+  if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL) != 0)
-   {
-     ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");
-     return (-1);
-@@ -608,8 +607,7 @@
- 	continue;
-       }
- 
--      if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex,
--	    NULL, NULL) != 0)
-+      if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex) != 0)
-       {
- 	ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");
- 	continue;
diff --git a/community/commoncpp2/PKGBUILD b/community/commoncpp2/PKGBUILD
index 9714ebb61..d5d5e8a33 100644
--- a/community/commoncpp2/PKGBUILD
+++ b/community/commoncpp2/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=commoncpp2
 pkgver=1.8.1
-pkgrel=3
+pkgrel=3.1
 pkgdesc="GNU Common C++ 2"
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.gnu.org/software/commoncpp/'
diff --git a/community/compiz/compiz-build.patch b/community/compiz/compiz-build.patch
deleted file mode 100644
index f22a3fa21..000000000
--- a/community/compiz/compiz-build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp
---- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp	2012-01-29 22:05:54.000000000 -0500
-+++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp	2012-01-29 22:10:38.000000000 -0500
-@@ -986,10 +986,10 @@
- {
-     Atom    atom = Atoms::compizWindowBlurDecor;
-     QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
--    Region  topRegion = NULL;
--    Region  bottomRegion = NULL;
--    Region  leftRegion = NULL;
--    Region  rightRegion = NULL;
-+    ::Region  topRegion = NULL;
-+    ::Region  bottomRegion = NULL;
-+    ::Region  leftRegion = NULL;
-+    ::Region  rightRegion = NULL;
-     int     size = 0;
-     int     w, h;
- 
diff --git a/community/confuse/PKGBUILD b/community/confuse/PKGBUILD
index 14cc92378..33f19975c 100644
--- a/community/confuse/PKGBUILD
+++ b/community/confuse/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=confuse
 pkgver=2.7
-pkgrel=2
+pkgrel=2.1
 pkgdesc="C-library for parsing configuration files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/confuse"
diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD
index 64f0775f6..c825c5ea9 100644
--- a/community/connman/PKGBUILD
+++ b/community/connman/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 83726 2013-02-04 18:08:38Z dwallace $
+#$Id: PKGBUILD 88577 2013-04-20 14:52:33Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com>
 
 pkgname=connman
-pkgver=1.11
+pkgver=1.13
 pkgrel=1
 pkgdesc="Wireless LAN network manager"
 url="http://connman.net/"
@@ -15,11 +15,9 @@ optdepends=('bluez: Support for Bluetooth devices'
             'wpa_supplicant: For WiFi devices')
 makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn')
 options=('!libtool')
-source=('connmand-daemon'
-        "http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'allow_group_network.diff')
-md5sums=('88ece7cbf1d0d289545ce4f8553fdab8'
-         '73f1f93ce503ee80dcc8c9bdda2c3426'
+md5sums=('12c0d5a52ad3749afac260ebc7151d16'
          'a8d22ee089fb0ed725130d16ad393047')
 
 build() {
@@ -40,9 +38,6 @@ build() {
 }
 
 package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  install -Dm755 "$srcdir"/connmand-daemon "$pkgdir"/etc/rc.d/connmand
+  make -C "${srcdir}/${pkgname}-${pkgver}" DESTDIR="${pkgdir}" install
   install -Dm755 "$srcdir/$pkgname-$pkgver/client/${pkgname}ctl" "$pkgdir/usr/sbin/${pkgname}ctl"
 }
diff --git a/community/connman/connmand-daemon b/community/connman/connmand-daemon
deleted file mode 100755
index aff1ddeb2..000000000
--- a/community/connman/connmand-daemon
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DESC="Connection Manager"
-NAME="connmand"
-ARGS=""
-DAEMON="/usr/sbin/$NAME"
-
-PID=`pidof -o %PPID ${DAEMON}`
-case "$1" in
-  start)
-    stat_busy "Starting ${DESC}"
-    if [ -z "$PID" ]; then
-       ${DAEMON} ${ARGS}
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ${NAME}
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ${DESC}"
-    [ ! -z "$PID" ]  && killall ${DAEMON} &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ${NAME}
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/community/conntrack-tools/02-fix-compilation-of-timeout-extension.patch b/community/conntrack-tools/02-fix-compilation-of-timeout-extension.patch
deleted file mode 100644
index 746934994..000000000
--- a/community/conntrack-tools/02-fix-compilation-of-timeout-extension.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 18efbc802479ce042378dc0cccc7577e1c6afa41 Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Sat, 26 May 2012 20:58:16 +0200
-Subject: [PATCH] nfct: fix compilation of timeout extension
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-nfct-extensions/timeout.c: In function ‘nfct_timeout_cb’:
-nfct-extensions/timeout.c:99:2: warning: passing argument 4 of ‘nfct_timeout_snprintf’ makes integer from pointer without a cast [enabled by default]
-/usr/include/libnetfilter_cttimeout/libnetfilter_cttimeout.h:114:5: note: expected ‘unsigned int’ but argument is of type ‘struct nfct_timeout *’
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- src/nfct-extensions/timeout.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/nfct-extensions/timeout.c b/src/nfct-extensions/timeout.c
-index a1a5c52..5b32023 100644
---- a/src/nfct-extensions/timeout.c
-+++ b/src/nfct-extensions/timeout.c
-@@ -96,7 +96,7 @@ static int nfct_timeout_cb(const struct nlmsghdr *nlh, void *data)
- 		goto err_free;
- 	}
- 
--	nfct_timeout_snprintf(buf, sizeof(buf), t, 0);
-+	nfct_timeout_snprintf(buf, sizeof(buf), t, NFCT_TIMEOUT_O_DEFAULT, 0);
- 	printf("%s\n", buf);
- 
- err_free:
--- 
-1.7.2.5
-
diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD
index 29fbfa561..53a011a4a 100644
--- a/community/conntrack-tools/PKGBUILD
+++ b/community/conntrack-tools/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 83854 2013-02-05 18:12:01Z eric $
+# $Id: PKGBUILD 85682 2013-03-04 23:03:57Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Valere Monseur <valere_monseur@hotmail.com>
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=conntrack-tools
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.4.1
+pkgrel=1
 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/conntrack-tools'
@@ -21,9 +21,9 @@ source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.b
         'conntrackd.service'
         '01-config-file-path.patch')
 install=$pkgname.install
-md5sums=('ee737c774e01349f75e935228a2d851b'
-         'bd135eaefb47923bb8e8d26f084d3e9d'
-         'e71ff7b8c4997b797cab3eaaccb693f4')
+sha1sums=('6fda497ef1ebd5e4afe01830ece072d2df2fe50f'
+          '2c205952a447ee0a6a7fc99bddeea1bfaf1b8034'
+          'e7607a9ac14dd839f3716ac68d46e19ab26ef112')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/conntrack-tools/conntrackd.conf b/community/conntrack-tools/conntrackd.conf
deleted file mode 100644
index 285f566d2..000000000
--- a/community/conntrack-tools/conntrackd.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh noet:
-
-#DAEMON_OPTIONS=''
diff --git a/community/conntrack-tools/conntrackd.rc b/community/conntrack-tools/conntrackd.rc
deleted file mode 100644
index 4300a7041..000000000
--- a/community/conntrack-tools/conntrackd.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-DAEMON=/usr/sbin/conntrackd
-PID=$(pidof -o %PPID $DAEMON)
-DAEMON_OPTIONS="-d $DAEMON_OPTIONS"
-
-case "$1" in
-  start)
-    stat_busy "Starting ${0##*/} daemon"
-    [[ ! $PID ]] && $DAEMON $DAEMON_OPTIONS && add_daemon ${0##*/} && stat_done && exit 0
-    stat_fail
-  ;;
-  stop)
-    stat_busy "Stopping ${0##*/} daemon"
-    [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
-    stat_fail
-  ;;
-  restart)
-    $0 stop
-    $0 start
-    exit 0
-  ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|restart}" >&2
-  ;;
-esac
-
-exit 1
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index 0c3f63fc5..f365c0205 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 82692 2013-01-23 00:16:02Z eric $
+# $Id: PKGBUILD 89888 2013-05-04 21:16:10Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: archtux <antonio.arias99999 at gmail.com>
 
 pkgname=converseen
-pkgver=0.5.2
-pkgrel=2
+pkgver=0.6.1
+pkgrel=1
 pkgdesc="The batch image converter and resizer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://converseen.sourceforge.net/"
 license=('GPL3')
-depends=('imagemagick' 'qt' 'libwmf' 'openexr')
+depends=('imagemagick' 'qt4' 'libwmf' 'openexr')
 makedepends=('cmake')
 install=converseen.install
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7d0c4b73676d2939ba6230eaad3f6f55')
+md5sums=('15bf5783d3df2c0063b5c5b37d5c495c')
 
 build() {
   cd "${srcdir}"
@@ -22,9 +22,12 @@ build() {
   cmake ../${pkgname}-${pkgver} \
           -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_INSTALL_PREFIX=/usr \
-          -DImageMagick_Magick++_LIBRARY:FILEPATH=/usr/lib/libMagick++-Q16.so \
-          -DImageMagick_MagickWand_LIBRARY:FILEPATH=/usr/lib/libMagickWand-Q16.so \
-          -DImageMagick_MagickCore_LIBRARY:FILEPATH=/usr/lib/libMagickCore-Q16.so
+          -DImageMagick_Magick++_INCLUDE_DIR:PATH=/usr/include/ImageMagick-6 \
+          -DImageMagick_Magick++_LIBRARY:FILEPATH=/usr/lib/libMagick++-6.Q16.so \
+          -DImageMagick_MagickWand_INCLUDE_DIR:PATH=/usr/include/ImageMagick-6 \
+          -DImageMagick_MagickWand_LIBRARY:FILEPATH=/usr/lib/libMagickWand-6.Q16.so \
+          -DImageMagick_MagickCore_INCLUDE_DIR:PATH=/usr/include/ImageMagick-6 \
+          -DImageMagick_MagickCore_LIBRARY:FILEPATH=/usr/lib/libMagickCore-6.Q16.so
   make
 }
 
diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD
index 5e0b5eebf..8f93e8784 100644
--- a/community/couchdb/PKGBUILD
+++ b/community/couchdb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82681 2013-01-23 00:15:50Z eric $
+# $Id: PKGBUILD 88676 2013-04-21 22:16:43Z heftig $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
 
 pkgname=couchdb
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=2
 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,19 +16,21 @@ options=('!libtool')
 backup=('etc/couchdb/local.ini'
 	'etc/conf.d/couchdb'
 	'etc/logrotate.d/couchdb')
-source=("http://apache-mirror.rbc.ru/pub/apache/couchdb/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc}
+source=("http://apache-mirror.rbc.ru/pub/apache/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc}
 	"couchdb.service"
 	"couchdb.tmpfiles"
-	"couchdb.rc")
-md5sums=('df75b03e56c2431ede7625200f0d44a7'
-         'e6e943c1da93cfcb41a4286daa80195d'
+	"couchdb.rc"
+	"build-fix.patch")
+md5sums=('6cc49c22fadcf7d8cf8aa34dae71b203'
+         '1346a657d7552188f6cc9e0cdc231b05'
          '8914a7ffc6745f94106d96206709acb4'
          '1e254ebe32eeb061be64193bafa35dbf'
-         'a75ee9b310a950eea13b07274b7a0669')
+         'a75ee9b310a950eea13b07274b7a0669'
+         '71afe48505dfc07ba2091786b4650fa2')
 
 build() {
   cd "$srcdir/apache-$pkgname-$pkgver"
-
+  patch -p1 <$srcdir/build-fix.patch
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var
diff --git a/community/couchdb/build-fix.patch b/community/couchdb/build-fix.patch
new file mode 100644
index 000000000..d847b3cf2
--- /dev/null
+++ b/community/couchdb/build-fix.patch
@@ -0,0 +1,5568 @@
+diff -wbBur apache-couchdb-1.2.1/src/Makefile.am apache-couchdb-1.2.1.q/src/Makefile.am
+--- apache-couchdb-1.2.1/src/Makefile.am	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/Makefile.am	2013-03-22 15:28:06.836935634 +0400
+@@ -10,4 +10,4 @@
+ ## License for the specific language governing permissions and limitations under
+ ## the License.
+ 
+-SUBDIRS = couchdb ejson erlang-oauth etap ibrowse mochiweb snappy
++SUBDIRS = couchdb ejson erlang-oauth ibrowse mochiweb snappy
+diff -wbBur apache-couchdb-1.2.1/src/Makefile.in apache-couchdb-1.2.1.q/src/Makefile.in
+--- apache-couchdb-1.2.1/src/Makefile.in	2012-12-21 01:28:49.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/Makefile.in	2013-03-22 15:28:11.563602246 +0400
+@@ -267,7 +267,7 @@
+ version_release = @version_release@
+ version_revision = @version_revision@
+ version_stage = @version_stage@
+-SUBDIRS = couchdb ejson erlang-oauth etap ibrowse mochiweb snappy
++SUBDIRS = couchdb ejson erlang-oauth ibrowse mochiweb snappy
+ all: all-recursive
+ 
+ .SUFFIXES:
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochifmt.erl apache-couchdb-1.2.1.q/src/mochiweb/mochifmt.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochifmt.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochifmt.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -369,8 +369,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ tokenize_test() ->
+     {?MODULE, [{raw, "ABC"}]} = tokenize("ABC"),
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochifmt_records.erl apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_records.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochifmt_records.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_records.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -9,11 +9,15 @@
+ %%    M:format("{0.bar}", [#rec{bar=foo}]).
+ %%    foo
+ 
+--module(mochifmt_records, [Recs]).
++-module(mochifmt_records).
+ -author('bob@mochimedia.com').
+--export([get_value/2]).
++-export([new/1, get_value/3]).
+ 
+-get_value(Key, Rec) when is_tuple(Rec) and is_atom(element(1, Rec)) ->
++new([{_Rec, RecFields}]=Recs) when is_list(RecFields) ->
++    {?MODULE, Recs}.
++
++get_value(Key, Rec, {?MODULE, Recs})
++  when is_tuple(Rec) and is_atom(element(1, Rec)) ->
+     try begin
+             Atom = list_to_existing_atom(Key),
+             {_, Fields} = proplists:lookup(element(1, Rec), Recs),
+@@ -21,7 +25,7 @@
+         end
+     catch error:_ -> mochifmt:get_value(Key, Rec)
+     end;
+-get_value(Key, Args) ->
++get_value(Key, Args, {?MODULE, _Recs}) ->
+     mochifmt:get_value(Key, Args).
+ 
+ get_rec_index(Atom, [Atom | _], Index) ->
+@@ -33,6 +37,6 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ -endif.
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochifmt_std.erl apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_std.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochifmt_std.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_std.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -3,28 +3,31 @@
+ 
+ %% @doc Template module for a mochifmt formatter.
+ 
+--module(mochifmt_std, []).
++-module(mochifmt_std).
+ -author('bob@mochimedia.com').
+--export([format/2, get_value/2, format_field/2, get_field/2, convert_field/2]).
++-export([new/0, format/3, get_value/3, format_field/3, get_field/3, convert_field/3]).
+ 
+-format(Format, Args) ->
++new() ->
++    {?MODULE}.
++
++format(Format, Args, {?MODULE}=THIS) ->
+     mochifmt:format(Format, Args, THIS).
+ 
+-get_field(Key, Args) ->
++get_field(Key, Args, {?MODULE}=THIS) ->
+     mochifmt:get_field(Key, Args, THIS).
+ 
+-convert_field(Key, Args) ->
++convert_field(Key, Args, {?MODULE}) ->
+     mochifmt:convert_field(Key, Args).
+ 
+-get_value(Key, Args) ->
++get_value(Key, Args, {?MODULE}) ->
+     mochifmt:get_value(Key, Args).
+ 
+-format_field(Arg, Format) ->
++format_field(Arg, Format, {?MODULE}=THIS) ->
+     mochifmt:format_field(Arg, Format, THIS).
+ 
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ -endif.
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiglobal.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiglobal.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiglobal.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiglobal.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -30,7 +30,7 @@
+ put(_K, V, Mod) ->
+     Bin = compile(Mod, V),
+     code:purge(Mod),
+-    code:load_binary(Mod, atom_to_list(Mod) ++ ".erl", Bin),
++    {module, Mod} = code:load_binary(Mod, atom_to_list(Mod) ++ ".erl", Bin),
+     ok.
+ 
+ -spec delete(atom()) -> boolean().
+@@ -77,8 +77,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ get_put_delete_test() ->
+     K = '$$test$$mochiglobal',
+     delete(K),
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochihex.erl apache-couchdb-1.2.1.q/src/mochiweb/mochihex.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochihex.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochihex.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -8,9 +8,6 @@
+ 
+ -export([to_hex/1, to_bin/1, to_int/1, dehex/1, hexdigit/1]).
+ 
+-%% @type iolist() = [char() | binary() | iolist()]
+-%% @type iodata() = iolist() | binary()
+-
+ %% @spec to_hex(integer | iolist()) -> string()
+ %% @doc Convert an iolist to a hexadecimal string.
+ to_hex(0) ->
+@@ -68,8 +65,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ to_hex_test() ->
+     "ff000ff1" = to_hex([255, 0, 15, 241]),
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochijson2.erl apache-couchdb-1.2.1.q/src/mochiweb/mochijson2.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochijson2.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochijson2.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -40,9 +40,9 @@
+ -module(mochijson2).
+ -author('bob@mochimedia.com').
+ -export([encoder/1, encode/1]).
+--export([decoder/1, decode/1]).
++-export([decoder/1, decode/1, decode/2]).
+ 
+-% This is a macro to placate syntax highlighters..
++%% This is a macro to placate syntax highlighters..
+ -define(Q, $\").
+ -define(ADV_COL(S, N), S#decoder{offset=N+S#decoder.offset,
+                                  column=N+S#decoder.column}).
+@@ -64,15 +64,14 @@
+ -define(IS_WHITESPACE(C),
+         (C =:= $\s orelse C =:= $\t orelse C =:= $\r orelse C =:= $\n)).
+ 
+-%% @type iolist() = [char() | binary() | iolist()]
+-%% @type iodata() = iolist() | binary()
+ %% @type json_string() = atom | binary()
+ %% @type json_number() = integer() | float()
+ %% @type json_array() = [json_term()]
+ %% @type json_object() = {struct, [{json_string(), json_term()}]}
++%% @type json_eep18_object() = {[{json_string(), json_term()}]}
+ %% @type json_iolist() = {json, iolist()}
+ %% @type json_term() = json_string() | json_number() | json_array() |
+-%%                     json_object() | json_iolist()
++%%                     json_object() | json_eep18_object() | json_iolist()
+ 
+ -record(encoder, {handler=null,
+                   utf8=false}).
+@@ -102,6 +101,14 @@
+     State = parse_decoder_options(Options, #decoder{}),
+     fun (O) -> json_decode(O, State) end.
+ 
++%% @spec decode(iolist(), [{format, proplist | eep18 | struct}]) -> json_term()
++%% @doc Decode the given iolist to Erlang terms using the given object format
++%%      for decoding, where proplist returns JSON objects as [{binary(), json_term()}]
++%%      proplists, eep18 returns JSON objects as {[binary(), json_term()]}, and struct
++%%      returns them as-is.
++decode(S, Options) ->
++    json_decode(S, parse_decoder_options(Options, #decoder{})).
++
+ %% @spec decode(iolist()) -> json_term()
+ %% @doc Decode the given iolist to Erlang terms.
+ decode(S) ->
+@@ -119,7 +126,10 @@
+ parse_decoder_options([], State) ->
+     State;
+ parse_decoder_options([{object_hook, Hook} | Rest], State) ->
+-    parse_decoder_options(Rest, State#decoder{object_hook=Hook}).
++    parse_decoder_options(Rest, State#decoder{object_hook=Hook});
++parse_decoder_options([{format, Format} | Rest], State)
++  when Format =:= struct orelse Format =:= eep18 orelse Format =:= proplist ->
++    parse_decoder_options(Rest, State#decoder{object_hook=Format}).
+ 
+ json_encode(true, _State) ->
+     <<"true">>;
+@@ -139,6 +149,10 @@
+     json_encode_proplist(Props, State);
+ json_encode({struct, Props}, State) when is_list(Props) ->
+     json_encode_proplist(Props, State);
++json_encode({Props}, State) when is_list(Props) ->
++    json_encode_proplist(Props, State);
++json_encode({}, State) ->
++    json_encode_proplist([], State);
+ json_encode(Array, State) when is_list(Array) ->
+     json_encode_array(Array, State);
+ json_encode({array, Array}, State) when is_list(Array) ->
+@@ -318,8 +332,12 @@
+             decode_object(B, S1)
+     end.
+ 
+-make_object(V, #decoder{object_hook=null}) ->
++make_object(V, #decoder{object_hook=N}) when N =:= null orelse N =:= struct ->
+     V;
++make_object({struct, P}, #decoder{object_hook=eep18}) ->
++    {P};
++make_object({struct, P}, #decoder{object_hook=proplist}) ->
++    P;
+ make_object(V, #decoder{object_hook=Hook}) ->
+     Hook(V).
+ 
+@@ -559,8 +577,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ 
+ %% testing constructs borrowed from the Yaws JSON implementation.
+@@ -838,12 +856,34 @@
+ 
+ handler_test() ->
+     ?assertEqual(
+-       {'EXIT',{json_encode,{bad_term,{}}}},
+-       catch encode({})),
+-    F = fun ({}) -> [] end,
++       {'EXIT',{json_encode,{bad_term,{x,y}}}},
++       catch encode({x,y})),
++    F = fun ({x,y}) -> [] end,
+     ?assertEqual(
+        <<"[]">>,
+-       iolist_to_binary((encoder([{handler, F}]))({}))),
++       iolist_to_binary((encoder([{handler, F}]))({x, y}))),
+     ok.
+ 
++encode_empty_test_() ->
++    [{A, ?_assertEqual(<<"{}">>, iolist_to_binary(encode(B)))}
++     || {A, B} <- [{"eep18 {}", {}},
++                   {"eep18 {[]}", {[]}},
++                   {"{struct, []}", {struct, []}}]].
++
++encode_test_() ->
++    P = [{<<"k">>, <<"v">>}],
++    JSON = iolist_to_binary(encode({struct, P})),
++    [{atom_to_list(F),
++      ?_assertEqual(JSON, iolist_to_binary(encode(decode(JSON, [{format, F}]))))}
++     || F <- [struct, eep18, proplist]].
++
++format_test_() ->
++    P = [{<<"k">>, <<"v">>}],
++    JSON = iolist_to_binary(encode({struct, P})),
++    [{atom_to_list(F),
++      ?_assertEqual(A, decode(JSON, [{format, F}]))}
++     || {F, A} <- [{struct, {struct, P}},
++                   {eep18, {P}},
++                   {proplist, P}]].
++
+ -endif.
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochijson.erl apache-couchdb-1.2.1.q/src/mochiweb/mochijson.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochijson.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochijson.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -15,8 +15,6 @@
+ -define(INC_COL(S), S#decoder{column=1+S#decoder.column}).
+ -define(INC_LINE(S), S#decoder{column=1, line=1+S#decoder.line}).
+ 
+-%% @type iolist() = [char() | binary() | iolist()]
+-%% @type iodata() = iolist() | binary()
+ %% @type json_string() = atom | string() | binary()
+ %% @type json_number() = integer() | float()
+ %% @type json_array() = {array, [json_term()]}
+@@ -406,8 +404,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ %% testing constructs borrowed from the Yaws JSON implementation.
+ 
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochilists.erl apache-couchdb-1.2.1.q/src/mochiweb/mochilists.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochilists.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochilists.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -55,8 +55,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ set_defaults_test() ->
+     ?assertEqual(
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochilogfile2.erl apache-couchdb-1.2.1.q/src/mochiweb/mochilogfile2.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochilogfile2.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochilogfile2.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -57,8 +57,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ name_test() ->
+     D = mochitemp:mkdtemp(),
+     FileName = filename:join(D, "open_close_test.log"),
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochinum.erl apache-couchdb-1.2.1.q/src/mochiweb/mochinum.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochinum.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochinum.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -243,8 +243,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ int_ceil_test() ->
+     ?assertEqual(1, int_ceil(0.0001)),
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochitemp.erl apache-couchdb-1.2.1.q/src/mochiweb/mochitemp.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochitemp.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochitemp.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -135,8 +135,9 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
++
+ pushenv(L) ->
+     [{K, os:getenv(K)} || K <- L].
+ popenv(L) ->
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiutf8.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiutf8.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiutf8.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiutf8.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -5,8 +5,9 @@
+ %%      invalid bytes.
+ 
+ -module(mochiutf8).
+--export([valid_utf8_bytes/1, codepoint_to_bytes/1, bytes_to_codepoints/1]).
+--export([bytes_foldl/3, codepoint_foldl/3, read_codepoint/1, len/1]).
++-export([valid_utf8_bytes/1, codepoint_to_bytes/1, codepoints_to_bytes/1]).
++-export([bytes_to_codepoints/1, bytes_foldl/3, codepoint_foldl/3]).
++-export([read_codepoint/1, len/1]).
+ 
+ %% External API
+ 
+@@ -192,8 +193,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ binary_skip_bytes_test() ->
+     ?assertEqual(<<"foo">>,
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_acceptor.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_acceptor.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_acceptor.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_acceptor.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -14,10 +14,10 @@
+     proc_lib:spawn_link(?MODULE, init, [Server, Listen, Loop]).
+ 
+ init(Server, Listen, Loop) ->
+-    T1 = now(),
++    T1 = os:timestamp(),
+     case catch mochiweb_socket:accept(Listen) of
+         {ok, Socket} ->
+-            gen_server:cast(Server, {accepted, self(), timer:now_diff(now(), T1)}),
++            gen_server:cast(Server, {accepted, self(), timer:now_diff(os:timestamp(), T1)}),
+             call_loop(Loop, Socket);
+         {error, closed} ->
+             exit(normal);
+@@ -35,6 +35,8 @@
+ 
+ call_loop({M, F}, Socket) ->
+     M:F(Socket);
++call_loop({M, F, [A1]}, Socket) ->
++    M:F(Socket, A1);
+ call_loop({M, F, A}, Socket) ->
+     erlang:apply(M, F, [Socket | A]);
+ call_loop(Loop, Socket) ->
+@@ -43,6 +45,6 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ -endif.
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb.app.src apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.app.src
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb.app.src	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.app.src	2013-03-22 15:26:58.000000000 +0400
+@@ -1,9 +1,9 @@
+ %% This is generated from src/mochiweb.app.src
+ {application, mochiweb,
+  [{description, "MochiMedia Web Server"},
+-  {vsn, "1.4.1"},
++  {vsn, "2.5.0"},
+   {modules, []},
+   {registered, []},
+-  {mod, {mochiweb_app, []}},
+   {env, []},
+-  {applications, [kernel, stdlib, crypto, inets]}]}.
++  {applications, [kernel, stdlib, crypto, inets, ssl, xmerl,
++                  compiler, syntax_tools]}]}.
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_charref.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_charref.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_charref.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_charref.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -1,17 +1,17 @@
+ %% @author Bob Ippolito <bob@mochimedia.com>
+ %% @copyright 2007 Mochi Media, Inc.
+ 
+-%% @doc Converts HTML 4 charrefs and entities to codepoints.
++%% @doc Converts HTML 5 charrefs and entities to codepoints (or lists of code points).
+ -module(mochiweb_charref).
+ -export([charref/1]).
+ 
+ %% External API.
+ 
+-%% @spec charref(S) -> integer() | undefined
+ %% @doc Convert a decimal charref, hex charref, or html entity to a unicode
+ %%      codepoint, or return undefined on failure.
+ %%      The input should not include an ampersand or semicolon.
+ %%      charref("#38") = 38, charref("#x26") = 38, charref("amp") = 38.
++-spec charref(binary() | string()) -> integer() | [integer()] | undefined.
+ charref(B) when is_binary(B) ->
+     charref(binary_to_list(B));
+ charref([$#, C | L]) when C =:= $x orelse C =:= $X ->
+@@ -29,266 +29,2141 @@
+ 
+ %% Internal API.
+ 
+-entity("nbsp") -> 160;
+-entity("iexcl") -> 161;
+-entity("cent") -> 162;
+-entity("pound") -> 163;
+-entity("curren") -> 164;
+-entity("yen") -> 165;
+-entity("brvbar") -> 166;
+-entity("sect") -> 167;
+-entity("uml") -> 168;
+-entity("copy") -> 169;
+-entity("ordf") -> 170;
+-entity("laquo") -> 171;
+-entity("not") -> 172;
+-entity("shy") -> 173;
+-entity("reg") -> 174;
+-entity("macr") -> 175;
+-entity("deg") -> 176;
+-entity("plusmn") -> 177;
+-entity("sup2") -> 178;
+-entity("sup3") -> 179;
+-entity("acute") -> 180;
+-entity("micro") -> 181;
+-entity("para") -> 182;
+-entity("middot") -> 183;
+-entity("cedil") -> 184;
+-entity("sup1") -> 185;
+-entity("ordm") -> 186;
+-entity("raquo") -> 187;
+-entity("frac14") -> 188;
+-entity("frac12") -> 189;
+-entity("frac34") -> 190;
+-entity("iquest") -> 191;
+-entity("Agrave") -> 192;
+-entity("Aacute") -> 193;
+-entity("Acirc") -> 194;
+-entity("Atilde") -> 195;
+-entity("Auml") -> 196;
+-entity("Aring") -> 197;
+-entity("AElig") -> 198;
+-entity("Ccedil") -> 199;
+-entity("Egrave") -> 200;
+-entity("Eacute") -> 201;
+-entity("Ecirc") -> 202;
+-entity("Euml") -> 203;
+-entity("Igrave") -> 204;
+-entity("Iacute") -> 205;
+-entity("Icirc") -> 206;
+-entity("Iuml") -> 207;
+-entity("ETH") -> 208;
+-entity("Ntilde") -> 209;
+-entity("Ograve") -> 210;
+-entity("Oacute") -> 211;
+-entity("Ocirc") -> 212;
+-entity("Otilde") -> 213;
+-entity("Ouml") -> 214;
+-entity("times") -> 215;
+-entity("Oslash") -> 216;
+-entity("Ugrave") -> 217;
+-entity("Uacute") -> 218;
+-entity("Ucirc") -> 219;
+-entity("Uuml") -> 220;
+-entity("Yacute") -> 221;
+-entity("THORN") -> 222;
+-entity("szlig") -> 223;
+-entity("agrave") -> 224;
+-entity("aacute") -> 225;
+-entity("acirc") -> 226;
+-entity("atilde") -> 227;
+-entity("auml") -> 228;
+-entity("aring") -> 229;
+-entity("aelig") -> 230;
+-entity("ccedil") -> 231;
+-entity("egrave") -> 232;
+-entity("eacute") -> 233;
+-entity("ecirc") -> 234;
+-entity("euml") -> 235;
+-entity("igrave") -> 236;
+-entity("iacute") -> 237;
+-entity("icirc") -> 238;
+-entity("iuml") -> 239;
+-entity("eth") -> 240;
+-entity("ntilde") -> 241;
+-entity("ograve") -> 242;
+-entity("oacute") -> 243;
+-entity("ocirc") -> 244;
+-entity("otilde") -> 245;
+-entity("ouml") -> 246;
+-entity("divide") -> 247;
+-entity("oslash") -> 248;
+-entity("ugrave") -> 249;
+-entity("uacute") -> 250;
+-entity("ucirc") -> 251;
+-entity("uuml") -> 252;
+-entity("yacute") -> 253;
+-entity("thorn") -> 254;
+-entity("yuml") -> 255;
+-entity("fnof") -> 402;
+-entity("Alpha") -> 913;
+-entity("Beta") -> 914;
+-entity("Gamma") -> 915;
+-entity("Delta") -> 916;
+-entity("Epsilon") -> 917;
+-entity("Zeta") -> 918;
+-entity("Eta") -> 919;
+-entity("Theta") -> 920;
+-entity("Iota") -> 921;
+-entity("Kappa") -> 922;
+-entity("Lambda") -> 923;
+-entity("Mu") -> 924;
+-entity("Nu") -> 925;
+-entity("Xi") -> 926;
+-entity("Omicron") -> 927;
+-entity("Pi") -> 928;
+-entity("Rho") -> 929;
+-entity("Sigma") -> 931;
+-entity("Tau") -> 932;
+-entity("Upsilon") -> 933;
+-entity("Phi") -> 934;
+-entity("Chi") -> 935;
+-entity("Psi") -> 936;
+-entity("Omega") -> 937;
+-entity("alpha") -> 945;
+-entity("beta") -> 946;
+-entity("gamma") -> 947;
+-entity("delta") -> 948;
+-entity("epsilon") -> 949;
+-entity("zeta") -> 950;
+-entity("eta") -> 951;
+-entity("theta") -> 952;
+-entity("iota") -> 953;
+-entity("kappa") -> 954;
+-entity("lambda") -> 955;
+-entity("mu") -> 956;
+-entity("nu") -> 957;
+-entity("xi") -> 958;
+-entity("omicron") -> 959;
+-entity("pi") -> 960;
+-entity("rho") -> 961;
+-entity("sigmaf") -> 962;
+-entity("sigma") -> 963;
+-entity("tau") -> 964;
+-entity("upsilon") -> 965;
+-entity("phi") -> 966;
+-entity("chi") -> 967;
+-entity("psi") -> 968;
+-entity("omega") -> 969;
+-entity("thetasym") -> 977;
+-entity("upsih") -> 978;
+-entity("piv") -> 982;
+-entity("bull") -> 8226;
+-entity("hellip") -> 8230;
+-entity("prime") -> 8242;
+-entity("Prime") -> 8243;
+-entity("oline") -> 8254;
+-entity("frasl") -> 8260;
+-entity("weierp") -> 8472;
+-entity("image") -> 8465;
+-entity("real") -> 8476;
+-entity("trade") -> 8482;
+-entity("alefsym") -> 8501;
+-entity("larr") -> 8592;
+-entity("uarr") -> 8593;
+-entity("rarr") -> 8594;
+-entity("darr") -> 8595;
+-entity("harr") -> 8596;
+-entity("crarr") -> 8629;
+-entity("lArr") -> 8656;
+-entity("uArr") -> 8657;
+-entity("rArr") -> 8658;
+-entity("dArr") -> 8659;
+-entity("hArr") -> 8660;
+-entity("forall") -> 8704;
+-entity("part") -> 8706;
+-entity("exist") -> 8707;
+-entity("empty") -> 8709;
+-entity("nabla") -> 8711;
+-entity("isin") -> 8712;
+-entity("notin") -> 8713;
+-entity("ni") -> 8715;
+-entity("prod") -> 8719;
+-entity("sum") -> 8721;
+-entity("minus") -> 8722;
+-entity("lowast") -> 8727;
+-entity("radic") -> 8730;
+-entity("prop") -> 8733;
+-entity("infin") -> 8734;
+-entity("ang") -> 8736;
+-entity("and") -> 8743;
+-entity("or") -> 8744;
+-entity("cap") -> 8745;
+-entity("cup") -> 8746;
+-entity("int") -> 8747;
+-entity("there4") -> 8756;
+-entity("sim") -> 8764;
+-entity("cong") -> 8773;
+-entity("asymp") -> 8776;
+-entity("ne") -> 8800;
+-entity("equiv") -> 8801;
+-entity("le") -> 8804;
+-entity("ge") -> 8805;
+-entity("sub") -> 8834;
+-entity("sup") -> 8835;
+-entity("nsub") -> 8836;
+-entity("sube") -> 8838;
+-entity("supe") -> 8839;
+-entity("oplus") -> 8853;
+-entity("otimes") -> 8855;
+-entity("perp") -> 8869;
+-entity("sdot") -> 8901;
+-entity("lceil") -> 8968;
+-entity("rceil") -> 8969;
+-entity("lfloor") -> 8970;
+-entity("rfloor") -> 8971;
+-entity("lang") -> 9001;
+-entity("rang") -> 9002;
+-entity("loz") -> 9674;
+-entity("spades") -> 9824;
+-entity("clubs") -> 9827;
+-entity("hearts") -> 9829;
+-entity("diams") -> 9830;
+-entity("quot") -> 34;
+-entity("amp") -> 38;
+-entity("lt") -> 60;
+-entity("gt") -> 62;
+-entity("OElig") -> 338;
+-entity("oelig") -> 339;
+-entity("Scaron") -> 352;
+-entity("scaron") -> 353;
+-entity("Yuml") -> 376;
+-entity("circ") -> 710;
+-entity("tilde") -> 732;
+-entity("ensp") -> 8194;
+-entity("emsp") -> 8195;
+-entity("thinsp") -> 8201;
+-entity("zwnj") -> 8204;
+-entity("zwj") -> 8205;
+-entity("lrm") -> 8206;
+-entity("rlm") -> 8207;
+-entity("ndash") -> 8211;
+-entity("mdash") -> 8212;
+-entity("lsquo") -> 8216;
+-entity("rsquo") -> 8217;
+-entity("sbquo") -> 8218;
+-entity("ldquo") -> 8220;
+-entity("rdquo") -> 8221;
+-entity("bdquo") -> 8222;
+-entity("dagger") -> 8224;
+-entity("Dagger") -> 8225;
+-entity("permil") -> 8240;
+-entity("lsaquo") -> 8249;
+-entity("rsaquo") -> 8250;
+-entity("euro") -> 8364;
+-entity(_) -> undefined.
++%% [2011-10-14] Generated from:
++%% http://www.w3.org/TR/html5/named-character-references.html
+ 
++entity("AElig") -> 16#000C6;
++entity("AMP") -> 16#00026;
++entity("Aacute") -> 16#000C1;
++entity("Abreve") -> 16#00102;
++entity("Acirc") -> 16#000C2;
++entity("Acy") -> 16#00410;
++entity("Afr") -> 16#1D504;
++entity("Agrave") -> 16#000C0;
++entity("Alpha") -> 16#00391;
++entity("Amacr") -> 16#00100;
++entity("And") -> 16#02A53;
++entity("Aogon") -> 16#00104;
++entity("Aopf") -> 16#1D538;
++entity("ApplyFunction") -> 16#02061;
++entity("Aring") -> 16#000C5;
++entity("Ascr") -> 16#1D49C;
++entity("Assign") -> 16#02254;
++entity("Atilde") -> 16#000C3;
++entity("Auml") -> 16#000C4;
++entity("Backslash") -> 16#02216;
++entity("Barv") -> 16#02AE7;
++entity("Barwed") -> 16#02306;
++entity("Bcy") -> 16#00411;
++entity("Because") -> 16#02235;
++entity("Bernoullis") -> 16#0212C;
++entity("Beta") -> 16#00392;
++entity("Bfr") -> 16#1D505;
++entity("Bopf") -> 16#1D539;
++entity("Breve") -> 16#002D8;
++entity("Bscr") -> 16#0212C;
++entity("Bumpeq") -> 16#0224E;
++entity("CHcy") -> 16#00427;
++entity("COPY") -> 16#000A9;
++entity("Cacute") -> 16#00106;
++entity("Cap") -> 16#022D2;
++entity("CapitalDifferentialD") -> 16#02145;
++entity("Cayleys") -> 16#0212D;
++entity("Ccaron") -> 16#0010C;
++entity("Ccedil") -> 16#000C7;
++entity("Ccirc") -> 16#00108;
++entity("Cconint") -> 16#02230;
++entity("Cdot") -> 16#0010A;
++entity("Cedilla") -> 16#000B8;
++entity("CenterDot") -> 16#000B7;
++entity("Cfr") -> 16#0212D;
++entity("Chi") -> 16#003A7;
++entity("CircleDot") -> 16#02299;
++entity("CircleMinus") -> 16#02296;
++entity("CirclePlus") -> 16#02295;
++entity("CircleTimes") -> 16#02297;
++entity("ClockwiseContourIntegral") -> 16#02232;
++entity("CloseCurlyDoubleQuote") -> 16#0201D;
++entity("CloseCurlyQuote") -> 16#02019;
++entity("Colon") -> 16#02237;
++entity("Colone") -> 16#02A74;
++entity("Congruent") -> 16#02261;
++entity("Conint") -> 16#0222F;
++entity("ContourIntegral") -> 16#0222E;
++entity("Copf") -> 16#02102;
++entity("Coproduct") -> 16#02210;
++entity("CounterClockwiseContourIntegral") -> 16#02233;
++entity("Cross") -> 16#02A2F;
++entity("Cscr") -> 16#1D49E;
++entity("Cup") -> 16#022D3;
++entity("CupCap") -> 16#0224D;
++entity("DD") -> 16#02145;
++entity("DDotrahd") -> 16#02911;
++entity("DJcy") -> 16#00402;
++entity("DScy") -> 16#00405;
++entity("DZcy") -> 16#0040F;
++entity("Dagger") -> 16#02021;
++entity("Darr") -> 16#021A1;
++entity("Dashv") -> 16#02AE4;
++entity("Dcaron") -> 16#0010E;
++entity("Dcy") -> 16#00414;
++entity("Del") -> 16#02207;
++entity("Delta") -> 16#00394;
++entity("Dfr") -> 16#1D507;
++entity("DiacriticalAcute") -> 16#000B4;
++entity("DiacriticalDot") -> 16#002D9;
++entity("DiacriticalDoubleAcute") -> 16#002DD;
++entity("DiacriticalGrave") -> 16#00060;
++entity("DiacriticalTilde") -> 16#002DC;
++entity("Diamond") -> 16#022C4;
++entity("DifferentialD") -> 16#02146;
++entity("Dopf") -> 16#1D53B;
++entity("Dot") -> 16#000A8;
++entity("DotDot") -> 16#020DC;
++entity("DotEqual") -> 16#02250;
++entity("DoubleContourIntegral") -> 16#0222F;
++entity("DoubleDot") -> 16#000A8;
++entity("DoubleDownArrow") -> 16#021D3;
++entity("DoubleLeftArrow") -> 16#021D0;
++entity("DoubleLeftRightArrow") -> 16#021D4;
++entity("DoubleLeftTee") -> 16#02AE4;
++entity("DoubleLongLeftArrow") -> 16#027F8;
++entity("DoubleLongLeftRightArrow") -> 16#027FA;
++entity("DoubleLongRightArrow") -> 16#027F9;
++entity("DoubleRightArrow") -> 16#021D2;
++entity("DoubleRightTee") -> 16#022A8;
++entity("DoubleUpArrow") -> 16#021D1;
++entity("DoubleUpDownArrow") -> 16#021D5;
++entity("DoubleVerticalBar") -> 16#02225;
++entity("DownArrow") -> 16#02193;
++entity("DownArrowBar") -> 16#02913;
++entity("DownArrowUpArrow") -> 16#021F5;
++entity("DownBreve") -> 16#00311;
++entity("DownLeftRightVector") -> 16#02950;
++entity("DownLeftTeeVector") -> 16#0295E;
++entity("DownLeftVector") -> 16#021BD;
++entity("DownLeftVectorBar") -> 16#02956;
++entity("DownRightTeeVector") -> 16#0295F;
++entity("DownRightVector") -> 16#021C1;
++entity("DownRightVectorBar") -> 16#02957;
++entity("DownTee") -> 16#022A4;
++entity("DownTeeArrow") -> 16#021A7;
++entity("Downarrow") -> 16#021D3;
++entity("Dscr") -> 16#1D49F;
++entity("Dstrok") -> 16#00110;
++entity("ENG") -> 16#0014A;
++entity("ETH") -> 16#000D0;
++entity("Eacute") -> 16#000C9;
++entity("Ecaron") -> 16#0011A;
++entity("Ecirc") -> 16#000CA;
++entity("Ecy") -> 16#0042D;
++entity("Edot") -> 16#00116;
++entity("Efr") -> 16#1D508;
++entity("Egrave") -> 16#000C8;
++entity("Element") -> 16#02208;
++entity("Emacr") -> 16#00112;
++entity("EmptySmallSquare") -> 16#025FB;
++entity("EmptyVerySmallSquare") -> 16#025AB;
++entity("Eogon") -> 16#00118;
++entity("Eopf") -> 16#1D53C;
++entity("Epsilon") -> 16#00395;
++entity("Equal") -> 16#02A75;
++entity("EqualTilde") -> 16#02242;
++entity("Equilibrium") -> 16#021CC;
++entity("Escr") -> 16#02130;
++entity("Esim") -> 16#02A73;
++entity("Eta") -> 16#00397;
++entity("Euml") -> 16#000CB;
++entity("Exists") -> 16#02203;
++entity("ExponentialE") -> 16#02147;
++entity("Fcy") -> 16#00424;
++entity("Ffr") -> 16#1D509;
++entity("FilledSmallSquare") -> 16#025FC;
++entity("FilledVerySmallSquare") -> 16#025AA;
++entity("Fopf") -> 16#1D53D;
++entity("ForAll") -> 16#02200;
++entity("Fouriertrf") -> 16#02131;
++entity("Fscr") -> 16#02131;
++entity("GJcy") -> 16#00403;
++entity("GT") -> 16#0003E;
++entity("Gamma") -> 16#00393;
++entity("Gammad") -> 16#003DC;
++entity("Gbreve") -> 16#0011E;
++entity("Gcedil") -> 16#00122;
++entity("Gcirc") -> 16#0011C;
++entity("Gcy") -> 16#00413;
++entity("Gdot") -> 16#00120;
++entity("Gfr") -> 16#1D50A;
++entity("Gg") -> 16#022D9;
++entity("Gopf") -> 16#1D53E;
++entity("GreaterEqual") -> 16#02265;
++entity("GreaterEqualLess") -> 16#022DB;
++entity("GreaterFullEqual") -> 16#02267;
++entity("GreaterGreater") -> 16#02AA2;
++entity("GreaterLess") -> 16#02277;
++entity("GreaterSlantEqual") -> 16#02A7E;
++entity("GreaterTilde") -> 16#02273;
++entity("Gscr") -> 16#1D4A2;
++entity("Gt") -> 16#0226B;
++entity("HARDcy") -> 16#0042A;
++entity("Hacek") -> 16#002C7;
++entity("Hat") -> 16#0005E;
++entity("Hcirc") -> 16#00124;
++entity("Hfr") -> 16#0210C;
++entity("HilbertSpace") -> 16#0210B;
++entity("Hopf") -> 16#0210D;
++entity("HorizontalLine") -> 16#02500;
++entity("Hscr") -> 16#0210B;
++entity("Hstrok") -> 16#00126;
++entity("HumpDownHump") -> 16#0224E;
++entity("HumpEqual") -> 16#0224F;
++entity("IEcy") -> 16#00415;
++entity("IJlig") -> 16#00132;
++entity("IOcy") -> 16#00401;
++entity("Iacute") -> 16#000CD;
++entity("Icirc") -> 16#000CE;
++entity("Icy") -> 16#00418;
++entity("Idot") -> 16#00130;
++entity("Ifr") -> 16#02111;
++entity("Igrave") -> 16#000CC;
++entity("Im") -> 16#02111;
++entity("Imacr") -> 16#0012A;
++entity("ImaginaryI") -> 16#02148;
++entity("Implies") -> 16#021D2;
++entity("Int") -> 16#0222C;
++entity("Integral") -> 16#0222B;
++entity("Intersection") -> 16#022C2;
++entity("InvisibleComma") -> 16#02063;
++entity("InvisibleTimes") -> 16#02062;
++entity("Iogon") -> 16#0012E;
++entity("Iopf") -> 16#1D540;
++entity("Iota") -> 16#00399;
++entity("Iscr") -> 16#02110;
++entity("Itilde") -> 16#00128;
++entity("Iukcy") -> 16#00406;
++entity("Iuml") -> 16#000CF;
++entity("Jcirc") -> 16#00134;
++entity("Jcy") -> 16#00419;
++entity("Jfr") -> 16#1D50D;
++entity("Jopf") -> 16#1D541;
++entity("Jscr") -> 16#1D4A5;
++entity("Jsercy") -> 16#00408;
++entity("Jukcy") -> 16#00404;
++entity("KHcy") -> 16#00425;
++entity("KJcy") -> 16#0040C;
++entity("Kappa") -> 16#0039A;
++entity("Kcedil") -> 16#00136;
++entity("Kcy") -> 16#0041A;
++entity("Kfr") -> 16#1D50E;
++entity("Kopf") -> 16#1D542;
++entity("Kscr") -> 16#1D4A6;
++entity("LJcy") -> 16#00409;
++entity("LT") -> 16#0003C;
++entity("Lacute") -> 16#00139;
++entity("Lambda") -> 16#0039B;
++entity("Lang") -> 16#027EA;
++entity("Laplacetrf") -> 16#02112;
++entity("Larr") -> 16#0219E;
++entity("Lcaron") -> 16#0013D;
++entity("Lcedil") -> 16#0013B;
++entity("Lcy") -> 16#0041B;
++entity("LeftAngleBracket") -> 16#027E8;
++entity("LeftArrow") -> 16#02190;
++entity("LeftArrowBar") -> 16#021E4;
++entity("LeftArrowRightArrow") -> 16#021C6;
++entity("LeftCeiling") -> 16#02308;
++entity("LeftDoubleBracket") -> 16#027E6;
++entity("LeftDownTeeVector") -> 16#02961;
++entity("LeftDownVector") -> 16#021C3;
++entity("LeftDownVectorBar") -> 16#02959;
++entity("LeftFloor") -> 16#0230A;
++entity("LeftRightArrow") -> 16#02194;
++entity("LeftRightVector") -> 16#0294E;
++entity("LeftTee") -> 16#022A3;
++entity("LeftTeeArrow") -> 16#021A4;
++entity("LeftTeeVector") -> 16#0295A;
++entity("LeftTriangle") -> 16#022B2;
++entity("LeftTriangleBar") -> 16#029CF;
++entity("LeftTriangleEqual") -> 16#022B4;
++entity("LeftUpDownVector") -> 16#02951;
++entity("LeftUpTeeVector") -> 16#02960;
++entity("LeftUpVector") -> 16#021BF;
++entity("LeftUpVectorBar") -> 16#02958;
++entity("LeftVector") -> 16#021BC;
++entity("LeftVectorBar") -> 16#02952;
++entity("Leftarrow") -> 16#021D0;
++entity("Leftrightarrow") -> 16#021D4;
++entity("LessEqualGreater") -> 16#022DA;
++entity("LessFullEqual") -> 16#02266;
++entity("LessGreater") -> 16#02276;
++entity("LessLess") -> 16#02AA1;
++entity("LessSlantEqual") -> 16#02A7D;
++entity("LessTilde") -> 16#02272;
++entity("Lfr") -> 16#1D50F;
++entity("Ll") -> 16#022D8;
++entity("Lleftarrow") -> 16#021DA;
++entity("Lmidot") -> 16#0013F;
++entity("LongLeftArrow") -> 16#027F5;
++entity("LongLeftRightArrow") -> 16#027F7;
++entity("LongRightArrow") -> 16#027F6;
++entity("Longleftarrow") -> 16#027F8;
++entity("Longleftrightarrow") -> 16#027FA;
++entity("Longrightarrow") -> 16#027F9;
++entity("Lopf") -> 16#1D543;
++entity("LowerLeftArrow") -> 16#02199;
++entity("LowerRightArrow") -> 16#02198;
++entity("Lscr") -> 16#02112;
++entity("Lsh") -> 16#021B0;
++entity("Lstrok") -> 16#00141;
++entity("Lt") -> 16#0226A;
++entity("Map") -> 16#02905;
++entity("Mcy") -> 16#0041C;
++entity("MediumSpace") -> 16#0205F;
++entity("Mellintrf") -> 16#02133;
++entity("Mfr") -> 16#1D510;
++entity("MinusPlus") -> 16#02213;
++entity("Mopf") -> 16#1D544;
++entity("Mscr") -> 16#02133;
++entity("Mu") -> 16#0039C;
++entity("NJcy") -> 16#0040A;
++entity("Nacute") -> 16#00143;
++entity("Ncaron") -> 16#00147;
++entity("Ncedil") -> 16#00145;
++entity("Ncy") -> 16#0041D;
++entity("NegativeMediumSpace") -> 16#0200B;
++entity("NegativeThickSpace") -> 16#0200B;
++entity("NegativeThinSpace") -> 16#0200B;
++entity("NegativeVeryThinSpace") -> 16#0200B;
++entity("NestedGreaterGreater") -> 16#0226B;
++entity("NestedLessLess") -> 16#0226A;
++entity("NewLine") -> 16#0000A;
++entity("Nfr") -> 16#1D511;
++entity("NoBreak") -> 16#02060;
++entity("NonBreakingSpace") -> 16#000A0;
++entity("Nopf") -> 16#02115;
++entity("Not") -> 16#02AEC;
++entity("NotCongruent") -> 16#02262;
++entity("NotCupCap") -> 16#0226D;
++entity("NotDoubleVerticalBar") -> 16#02226;
++entity("NotElement") -> 16#02209;
++entity("NotEqual") -> 16#02260;
++entity("NotEqualTilde") -> [16#02242, 16#00338];
++entity("NotExists") -> 16#02204;
++entity("NotGreater") -> 16#0226F;
++entity("NotGreaterEqual") -> 16#02271;
++entity("NotGreaterFullEqual") -> [16#02267, 16#00338];
++entity("NotGreaterGreater") -> [16#0226B, 16#00338];
++entity("NotGreaterLess") -> 16#02279;
++entity("NotGreaterSlantEqual") -> [16#02A7E, 16#00338];
++entity("NotGreaterTilde") -> 16#02275;
++entity("NotHumpDownHump") -> [16#0224E, 16#00338];
++entity("NotHumpEqual") -> [16#0224F, 16#00338];
++entity("NotLeftTriangle") -> 16#022EA;
++entity("NotLeftTriangleBar") -> [16#029CF, 16#00338];
++entity("NotLeftTriangleEqual") -> 16#022EC;
++entity("NotLess") -> 16#0226E;
++entity("NotLessEqual") -> 16#02270;
++entity("NotLessGreater") -> 16#02278;
++entity("NotLessLess") -> [16#0226A, 16#00338];
++entity("NotLessSlantEqual") -> [16#02A7D, 16#00338];
++entity("NotLessTilde") -> 16#02274;
++entity("NotNestedGreaterGreater") -> [16#02AA2, 16#00338];
++entity("NotNestedLessLess") -> [16#02AA1, 16#00338];
++entity("NotPrecedes") -> 16#02280;
++entity("NotPrecedesEqual") -> [16#02AAF, 16#00338];
++entity("NotPrecedesSlantEqual") -> 16#022E0;
++entity("NotReverseElement") -> 16#0220C;
++entity("NotRightTriangle") -> 16#022EB;
++entity("NotRightTriangleBar") -> [16#029D0, 16#00338];
++entity("NotRightTriangleEqual") -> 16#022ED;
++entity("NotSquareSubset") -> [16#0228F, 16#00338];
++entity("NotSquareSubsetEqual") -> 16#022E2;
++entity("NotSquareSuperset") -> [16#02290, 16#00338];
++entity("NotSquareSupersetEqual") -> 16#022E3;
++entity("NotSubset") -> [16#02282, 16#020D2];
++entity("NotSubsetEqual") -> 16#02288;
++entity("NotSucceeds") -> 16#02281;
++entity("NotSucceedsEqual") -> [16#02AB0, 16#00338];
++entity("NotSucceedsSlantEqual") -> 16#022E1;
++entity("NotSucceedsTilde") -> [16#0227F, 16#00338];
++entity("NotSuperset") -> [16#02283, 16#020D2];
++entity("NotSupersetEqual") -> 16#02289;
++entity("NotTilde") -> 16#02241;
++entity("NotTildeEqual") -> 16#02244;
++entity("NotTildeFullEqual") -> 16#02247;
++entity("NotTildeTilde") -> 16#02249;
++entity("NotVerticalBar") -> 16#02224;
++entity("Nscr") -> 16#1D4A9;
++entity("Ntilde") -> 16#000D1;
++entity("Nu") -> 16#0039D;
++entity("OElig") -> 16#00152;
++entity("Oacute") -> 16#000D3;
++entity("Ocirc") -> 16#000D4;
++entity("Ocy") -> 16#0041E;
++entity("Odblac") -> 16#00150;
++entity("Ofr") -> 16#1D512;
++entity("Ograve") -> 16#000D2;
++entity("Omacr") -> 16#0014C;
++entity("Omega") -> 16#003A9;
++entity("Omicron") -> 16#0039F;
++entity("Oopf") -> 16#1D546;
++entity("OpenCurlyDoubleQuote") -> 16#0201C;
++entity("OpenCurlyQuote") -> 16#02018;
++entity("Or") -> 16#02A54;
++entity("Oscr") -> 16#1D4AA;
++entity("Oslash") -> 16#000D8;
++entity("Otilde") -> 16#000D5;
++entity("Otimes") -> 16#02A37;
++entity("Ouml") -> 16#000D6;
++entity("OverBar") -> 16#0203E;
++entity("OverBrace") -> 16#023DE;
++entity("OverBracket") -> 16#023B4;
++entity("OverParenthesis") -> 16#023DC;
++entity("PartialD") -> 16#02202;
++entity("Pcy") -> 16#0041F;
++entity("Pfr") -> 16#1D513;
++entity("Phi") -> 16#003A6;
++entity("Pi") -> 16#003A0;
++entity("PlusMinus") -> 16#000B1;
++entity("Poincareplane") -> 16#0210C;
++entity("Popf") -> 16#02119;
++entity("Pr") -> 16#02ABB;
++entity("Precedes") -> 16#0227A;
++entity("PrecedesEqual") -> 16#02AAF;
++entity("PrecedesSlantEqual") -> 16#0227C;
++entity("PrecedesTilde") -> 16#0227E;
++entity("Prime") -> 16#02033;
++entity("Product") -> 16#0220F;
++entity("Proportion") -> 16#02237;
++entity("Proportional") -> 16#0221D;
++entity("Pscr") -> 16#1D4AB;
++entity("Psi") -> 16#003A8;
++entity("QUOT") -> 16#00022;
++entity("Qfr") -> 16#1D514;
++entity("Qopf") -> 16#0211A;
++entity("Qscr") -> 16#1D4AC;
++entity("RBarr") -> 16#02910;
++entity("REG") -> 16#000AE;
++entity("Racute") -> 16#00154;
++entity("Rang") -> 16#027EB;
++entity("Rarr") -> 16#021A0;
++entity("Rarrtl") -> 16#02916;
++entity("Rcaron") -> 16#00158;
++entity("Rcedil") -> 16#00156;
++entity("Rcy") -> 16#00420;
++entity("Re") -> 16#0211C;
++entity("ReverseElement") -> 16#0220B;
++entity("ReverseEquilibrium") -> 16#021CB;
++entity("ReverseUpEquilibrium") -> 16#0296F;
++entity("Rfr") -> 16#0211C;
++entity("Rho") -> 16#003A1;
++entity("RightAngleBracket") -> 16#027E9;
++entity("RightArrow") -> 16#02192;
++entity("RightArrowBar") -> 16#021E5;
++entity("RightArrowLeftArrow") -> 16#021C4;
++entity("RightCeiling") -> 16#02309;
++entity("RightDoubleBracket") -> 16#027E7;
++entity("RightDownTeeVector") -> 16#0295D;
++entity("RightDownVector") -> 16#021C2;
++entity("RightDownVectorBar") -> 16#02955;
++entity("RightFloor") -> 16#0230B;
++entity("RightTee") -> 16#022A2;
++entity("RightTeeArrow") -> 16#021A6;
++entity("RightTeeVector") -> 16#0295B;
++entity("RightTriangle") -> 16#022B3;
++entity("RightTriangleBar") -> 16#029D0;
++entity("RightTriangleEqual") -> 16#022B5;
++entity("RightUpDownVector") -> 16#0294F;
++entity("RightUpTeeVector") -> 16#0295C;
++entity("RightUpVector") -> 16#021BE;
++entity("RightUpVectorBar") -> 16#02954;
++entity("RightVector") -> 16#021C0;
++entity("RightVectorBar") -> 16#02953;
++entity("Rightarrow") -> 16#021D2;
++entity("Ropf") -> 16#0211D;
++entity("RoundImplies") -> 16#02970;
++entity("Rrightarrow") -> 16#021DB;
++entity("Rscr") -> 16#0211B;
++entity("Rsh") -> 16#021B1;
++entity("RuleDelayed") -> 16#029F4;
++entity("SHCHcy") -> 16#00429;
++entity("SHcy") -> 16#00428;
++entity("SOFTcy") -> 16#0042C;
++entity("Sacute") -> 16#0015A;
++entity("Sc") -> 16#02ABC;
++entity("Scaron") -> 16#00160;
++entity("Scedil") -> 16#0015E;
++entity("Scirc") -> 16#0015C;
++entity("Scy") -> 16#00421;
++entity("Sfr") -> 16#1D516;
++entity("ShortDownArrow") -> 16#02193;
++entity("ShortLeftArrow") -> 16#02190;
++entity("ShortRightArrow") -> 16#02192;
++entity("ShortUpArrow") -> 16#02191;
++entity("Sigma") -> 16#003A3;
++entity("SmallCircle") -> 16#02218;
++entity("Sopf") -> 16#1D54A;
++entity("Sqrt") -> 16#0221A;
++entity("Square") -> 16#025A1;
++entity("SquareIntersection") -> 16#02293;
++entity("SquareSubset") -> 16#0228F;
++entity("SquareSubsetEqual") -> 16#02291;
++entity("SquareSuperset") -> 16#02290;
++entity("SquareSupersetEqual") -> 16#02292;
++entity("SquareUnion") -> 16#02294;
++entity("Sscr") -> 16#1D4AE;
++entity("Star") -> 16#022C6;
++entity("Sub") -> 16#022D0;
++entity("Subset") -> 16#022D0;
++entity("SubsetEqual") -> 16#02286;
++entity("Succeeds") -> 16#0227B;
++entity("SucceedsEqual") -> 16#02AB0;
++entity("SucceedsSlantEqual") -> 16#0227D;
++entity("SucceedsTilde") -> 16#0227F;
++entity("SuchThat") -> 16#0220B;
++entity("Sum") -> 16#02211;
++entity("Sup") -> 16#022D1;
++entity("Superset") -> 16#02283;
++entity("SupersetEqual") -> 16#02287;
++entity("Supset") -> 16#022D1;
++entity("THORN") -> 16#000DE;
++entity("TRADE") -> 16#02122;
++entity("TSHcy") -> 16#0040B;
++entity("TScy") -> 16#00426;
++entity("Tab") -> 16#00009;
++entity("Tau") -> 16#003A4;
++entity("Tcaron") -> 16#00164;
++entity("Tcedil") -> 16#00162;
++entity("Tcy") -> 16#00422;
++entity("Tfr") -> 16#1D517;
++entity("Therefore") -> 16#02234;
++entity("Theta") -> 16#00398;
++entity("ThickSpace") -> [16#0205F, 16#0200A];
++entity("ThinSpace") -> 16#02009;
++entity("Tilde") -> 16#0223C;
++entity("TildeEqual") -> 16#02243;
++entity("TildeFullEqual") -> 16#02245;
++entity("TildeTilde") -> 16#02248;
++entity("Topf") -> 16#1D54B;
++entity("TripleDot") -> 16#020DB;
++entity("Tscr") -> 16#1D4AF;
++entity("Tstrok") -> 16#00166;
++entity("Uacute") -> 16#000DA;
++entity("Uarr") -> 16#0219F;
++entity("Uarrocir") -> 16#02949;
++entity("Ubrcy") -> 16#0040E;
++entity("Ubreve") -> 16#0016C;
++entity("Ucirc") -> 16#000DB;
++entity("Ucy") -> 16#00423;
++entity("Udblac") -> 16#00170;
++entity("Ufr") -> 16#1D518;
++entity("Ugrave") -> 16#000D9;
++entity("Umacr") -> 16#0016A;
++entity("UnderBar") -> 16#0005F;
++entity("UnderBrace") -> 16#023DF;
++entity("UnderBracket") -> 16#023B5;
++entity("UnderParenthesis") -> 16#023DD;
++entity("Union") -> 16#022C3;
++entity("UnionPlus") -> 16#0228E;
++entity("Uogon") -> 16#00172;
++entity("Uopf") -> 16#1D54C;
++entity("UpArrow") -> 16#02191;
++entity("UpArrowBar") -> 16#02912;
++entity("UpArrowDownArrow") -> 16#021C5;
++entity("UpDownArrow") -> 16#02195;
++entity("UpEquilibrium") -> 16#0296E;
++entity("UpTee") -> 16#022A5;
++entity("UpTeeArrow") -> 16#021A5;
++entity("Uparrow") -> 16#021D1;
++entity("Updownarrow") -> 16#021D5;
++entity("UpperLeftArrow") -> 16#02196;
++entity("UpperRightArrow") -> 16#02197;
++entity("Upsi") -> 16#003D2;
++entity("Upsilon") -> 16#003A5;
++entity("Uring") -> 16#0016E;
++entity("Uscr") -> 16#1D4B0;
++entity("Utilde") -> 16#00168;
++entity("Uuml") -> 16#000DC;
++entity("VDash") -> 16#022AB;
++entity("Vbar") -> 16#02AEB;
++entity("Vcy") -> 16#00412;
++entity("Vdash") -> 16#022A9;
++entity("Vdashl") -> 16#02AE6;
++entity("Vee") -> 16#022C1;
++entity("Verbar") -> 16#02016;
++entity("Vert") -> 16#02016;
++entity("VerticalBar") -> 16#02223;
++entity("VerticalLine") -> 16#0007C;
++entity("VerticalSeparator") -> 16#02758;
++entity("VerticalTilde") -> 16#02240;
++entity("VeryThinSpace") -> 16#0200A;
++entity("Vfr") -> 16#1D519;
++entity("Vopf") -> 16#1D54D;
++entity("Vscr") -> 16#1D4B1;
++entity("Vvdash") -> 16#022AA;
++entity("Wcirc") -> 16#00174;
++entity("Wedge") -> 16#022C0;
++entity("Wfr") -> 16#1D51A;
++entity("Wopf") -> 16#1D54E;
++entity("Wscr") -> 16#1D4B2;
++entity("Xfr") -> 16#1D51B;
++entity("Xi") -> 16#0039E;
++entity("Xopf") -> 16#1D54F;
++entity("Xscr") -> 16#1D4B3;
++entity("YAcy") -> 16#0042F;
++entity("YIcy") -> 16#00407;
++entity("YUcy") -> 16#0042E;
++entity("Yacute") -> 16#000DD;
++entity("Ycirc") -> 16#00176;
++entity("Ycy") -> 16#0042B;
++entity("Yfr") -> 16#1D51C;
++entity("Yopf") -> 16#1D550;
++entity("Yscr") -> 16#1D4B4;
++entity("Yuml") -> 16#00178;
++entity("ZHcy") -> 16#00416;
++entity("Zacute") -> 16#00179;
++entity("Zcaron") -> 16#0017D;
++entity("Zcy") -> 16#00417;
++entity("Zdot") -> 16#0017B;
++entity("ZeroWidthSpace") -> 16#0200B;
++entity("Zeta") -> 16#00396;
++entity("Zfr") -> 16#02128;
++entity("Zopf") -> 16#02124;
++entity("Zscr") -> 16#1D4B5;
++entity("aacute") -> 16#000E1;
++entity("abreve") -> 16#00103;
++entity("ac") -> 16#0223E;
++entity("acE") -> [16#0223E, 16#00333];
++entity("acd") -> 16#0223F;
++entity("acirc") -> 16#000E2;
++entity("acute") -> 16#000B4;
++entity("acy") -> 16#00430;
++entity("aelig") -> 16#000E6;
++entity("af") -> 16#02061;
++entity("afr") -> 16#1D51E;
++entity("agrave") -> 16#000E0;
++entity("alefsym") -> 16#02135;
++entity("aleph") -> 16#02135;
++entity("alpha") -> 16#003B1;
++entity("amacr") -> 16#00101;
++entity("amalg") -> 16#02A3F;
++entity("amp") -> 16#00026;
++entity("and") -> 16#02227;
++entity("andand") -> 16#02A55;
++entity("andd") -> 16#02A5C;
++entity("andslope") -> 16#02A58;
++entity("andv") -> 16#02A5A;
++entity("ang") -> 16#02220;
++entity("ange") -> 16#029A4;
++entity("angle") -> 16#02220;
++entity("angmsd") -> 16#02221;
++entity("angmsdaa") -> 16#029A8;
++entity("angmsdab") -> 16#029A9;
++entity("angmsdac") -> 16#029AA;
++entity("angmsdad") -> 16#029AB;
++entity("angmsdae") -> 16#029AC;
++entity("angmsdaf") -> 16#029AD;
++entity("angmsdag") -> 16#029AE;
++entity("angmsdah") -> 16#029AF;
++entity("angrt") -> 16#0221F;
++entity("angrtvb") -> 16#022BE;
++entity("angrtvbd") -> 16#0299D;
++entity("angsph") -> 16#02222;
++entity("angst") -> 16#000C5;
++entity("angzarr") -> 16#0237C;
++entity("aogon") -> 16#00105;
++entity("aopf") -> 16#1D552;
++entity("ap") -> 16#02248;
++entity("apE") -> 16#02A70;
++entity("apacir") -> 16#02A6F;
++entity("ape") -> 16#0224A;
++entity("apid") -> 16#0224B;
++entity("apos") -> 16#00027;
++entity("approx") -> 16#02248;
++entity("approxeq") -> 16#0224A;
++entity("aring") -> 16#000E5;
++entity("ascr") -> 16#1D4B6;
++entity("ast") -> 16#0002A;
++entity("asymp") -> 16#02248;
++entity("asympeq") -> 16#0224D;
++entity("atilde") -> 16#000E3;
++entity("auml") -> 16#000E4;
++entity("awconint") -> 16#02233;
++entity("awint") -> 16#02A11;
++entity("bNot") -> 16#02AED;
++entity("backcong") -> 16#0224C;
++entity("backepsilon") -> 16#003F6;
++entity("backprime") -> 16#02035;
++entity("backsim") -> 16#0223D;
++entity("backsimeq") -> 16#022CD;
++entity("barvee") -> 16#022BD;
++entity("barwed") -> 16#02305;
++entity("barwedge") -> 16#02305;
++entity("bbrk") -> 16#023B5;
++entity("bbrktbrk") -> 16#023B6;
++entity("bcong") -> 16#0224C;
++entity("bcy") -> 16#00431;
++entity("bdquo") -> 16#0201E;
++entity("becaus") -> 16#02235;
++entity("because") -> 16#02235;
++entity("bemptyv") -> 16#029B0;
++entity("bepsi") -> 16#003F6;
++entity("bernou") -> 16#0212C;
++entity("beta") -> 16#003B2;
++entity("beth") -> 16#02136;
++entity("between") -> 16#0226C;
++entity("bfr") -> 16#1D51F;
++entity("bigcap") -> 16#022C2;
++entity("bigcirc") -> 16#025EF;
++entity("bigcup") -> 16#022C3;
++entity("bigodot") -> 16#02A00;
++entity("bigoplus") -> 16#02A01;
++entity("bigotimes") -> 16#02A02;
++entity("bigsqcup") -> 16#02A06;
++entity("bigstar") -> 16#02605;
++entity("bigtriangledown") -> 16#025BD;
++entity("bigtriangleup") -> 16#025B3;
++entity("biguplus") -> 16#02A04;
++entity("bigvee") -> 16#022C1;
++entity("bigwedge") -> 16#022C0;
++entity("bkarow") -> 16#0290D;
++entity("blacklozenge") -> 16#029EB;
++entity("blacksquare") -> 16#025AA;
++entity("blacktriangle") -> 16#025B4;
++entity("blacktriangledown") -> 16#025BE;
++entity("blacktriangleleft") -> 16#025C2;
++entity("blacktriangleright") -> 16#025B8;
++entity("blank") -> 16#02423;
++entity("blk12") -> 16#02592;
++entity("blk14") -> 16#02591;
++entity("blk34") -> 16#02593;
++entity("block") -> 16#02588;
++entity("bne") -> [16#0003D, 16#020E5];
++entity("bnequiv") -> [16#02261, 16#020E5];
++entity("bnot") -> 16#02310;
++entity("bopf") -> 16#1D553;
++entity("bot") -> 16#022A5;
++entity("bottom") -> 16#022A5;
++entity("bowtie") -> 16#022C8;
++entity("boxDL") -> 16#02557;
++entity("boxDR") -> 16#02554;
++entity("boxDl") -> 16#02556;
++entity("boxDr") -> 16#02553;
++entity("boxH") -> 16#02550;
++entity("boxHD") -> 16#02566;
++entity("boxHU") -> 16#02569;
++entity("boxHd") -> 16#02564;
++entity("boxHu") -> 16#02567;
++entity("boxUL") -> 16#0255D;
++entity("boxUR") -> 16#0255A;
++entity("boxUl") -> 16#0255C;
++entity("boxUr") -> 16#02559;
++entity("boxV") -> 16#02551;
++entity("boxVH") -> 16#0256C;
++entity("boxVL") -> 16#02563;
++entity("boxVR") -> 16#02560;
++entity("boxVh") -> 16#0256B;
++entity("boxVl") -> 16#02562;
++entity("boxVr") -> 16#0255F;
++entity("boxbox") -> 16#029C9;
++entity("boxdL") -> 16#02555;
++entity("boxdR") -> 16#02552;
++entity("boxdl") -> 16#02510;
++entity("boxdr") -> 16#0250C;
++entity("boxh") -> 16#02500;
++entity("boxhD") -> 16#02565;
++entity("boxhU") -> 16#02568;
++entity("boxhd") -> 16#0252C;
++entity("boxhu") -> 16#02534;
++entity("boxminus") -> 16#0229F;
++entity("boxplus") -> 16#0229E;
++entity("boxtimes") -> 16#022A0;
++entity("boxuL") -> 16#0255B;
++entity("boxuR") -> 16#02558;
++entity("boxul") -> 16#02518;
++entity("boxur") -> 16#02514;
++entity("boxv") -> 16#02502;
++entity("boxvH") -> 16#0256A;
++entity("boxvL") -> 16#02561;
++entity("boxvR") -> 16#0255E;
++entity("boxvh") -> 16#0253C;
++entity("boxvl") -> 16#02524;
++entity("boxvr") -> 16#0251C;
++entity("bprime") -> 16#02035;
++entity("breve") -> 16#002D8;
++entity("brvbar") -> 16#000A6;
++entity("bscr") -> 16#1D4B7;
++entity("bsemi") -> 16#0204F;
++entity("bsim") -> 16#0223D;
++entity("bsime") -> 16#022CD;
++entity("bsol") -> 16#0005C;
++entity("bsolb") -> 16#029C5;
++entity("bsolhsub") -> 16#027C8;
++entity("bull") -> 16#02022;
++entity("bullet") -> 16#02022;
++entity("bump") -> 16#0224E;
++entity("bumpE") -> 16#02AAE;
++entity("bumpe") -> 16#0224F;
++entity("bumpeq") -> 16#0224F;
++entity("cacute") -> 16#00107;
++entity("cap") -> 16#02229;
++entity("capand") -> 16#02A44;
++entity("capbrcup") -> 16#02A49;
++entity("capcap") -> 16#02A4B;
++entity("capcup") -> 16#02A47;
++entity("capdot") -> 16#02A40;
++entity("caps") -> [16#02229, 16#0FE00];
++entity("caret") -> 16#02041;
++entity("caron") -> 16#002C7;
++entity("ccaps") -> 16#02A4D;
++entity("ccaron") -> 16#0010D;
++entity("ccedil") -> 16#000E7;
++entity("ccirc") -> 16#00109;
++entity("ccups") -> 16#02A4C;
++entity("ccupssm") -> 16#02A50;
++entity("cdot") -> 16#0010B;
++entity("cedil") -> 16#000B8;
++entity("cemptyv") -> 16#029B2;
++entity("cent") -> 16#000A2;
++entity("centerdot") -> 16#000B7;
++entity("cfr") -> 16#1D520;
++entity("chcy") -> 16#00447;
++entity("check") -> 16#02713;
++entity("checkmark") -> 16#02713;
++entity("chi") -> 16#003C7;
++entity("cir") -> 16#025CB;
++entity("cirE") -> 16#029C3;
++entity("circ") -> 16#002C6;
++entity("circeq") -> 16#02257;
++entity("circlearrowleft") -> 16#021BA;
++entity("circlearrowright") -> 16#021BB;
++entity("circledR") -> 16#000AE;
++entity("circledS") -> 16#024C8;
++entity("circledast") -> 16#0229B;
++entity("circledcirc") -> 16#0229A;
++entity("circleddash") -> 16#0229D;
++entity("cire") -> 16#02257;
++entity("cirfnint") -> 16#02A10;
++entity("cirmid") -> 16#02AEF;
++entity("cirscir") -> 16#029C2;
++entity("clubs") -> 16#02663;
++entity("clubsuit") -> 16#02663;
++entity("colon") -> 16#0003A;
++entity("colone") -> 16#02254;
++entity("coloneq") -> 16#02254;
++entity("comma") -> 16#0002C;
++entity("commat") -> 16#00040;
++entity("comp") -> 16#02201;
++entity("compfn") -> 16#02218;
++entity("complement") -> 16#02201;
++entity("complexes") -> 16#02102;
++entity("cong") -> 16#02245;
++entity("congdot") -> 16#02A6D;
++entity("conint") -> 16#0222E;
++entity("copf") -> 16#1D554;
++entity("coprod") -> 16#02210;
++entity("copy") -> 16#000A9;
++entity("copysr") -> 16#02117;
++entity("crarr") -> 16#021B5;
++entity("cross") -> 16#02717;
++entity("cscr") -> 16#1D4B8;
++entity("csub") -> 16#02ACF;
++entity("csube") -> 16#02AD1;
++entity("csup") -> 16#02AD0;
++entity("csupe") -> 16#02AD2;
++entity("ctdot") -> 16#022EF;
++entity("cudarrl") -> 16#02938;
++entity("cudarrr") -> 16#02935;
++entity("cuepr") -> 16#022DE;
++entity("cuesc") -> 16#022DF;
++entity("cularr") -> 16#021B6;
++entity("cularrp") -> 16#0293D;
++entity("cup") -> 16#0222A;
++entity("cupbrcap") -> 16#02A48;
++entity("cupcap") -> 16#02A46;
++entity("cupcup") -> 16#02A4A;
++entity("cupdot") -> 16#0228D;
++entity("cupor") -> 16#02A45;
++entity("cups") -> [16#0222A, 16#0FE00];
++entity("curarr") -> 16#021B7;
++entity("curarrm") -> 16#0293C;
++entity("curlyeqprec") -> 16#022DE;
++entity("curlyeqsucc") -> 16#022DF;
++entity("curlyvee") -> 16#022CE;
++entity("curlywedge") -> 16#022CF;
++entity("curren") -> 16#000A4;
++entity("curvearrowleft") -> 16#021B6;
++entity("curvearrowright") -> 16#021B7;
++entity("cuvee") -> 16#022CE;
++entity("cuwed") -> 16#022CF;
++entity("cwconint") -> 16#02232;
++entity("cwint") -> 16#02231;
++entity("cylcty") -> 16#0232D;
++entity("dArr") -> 16#021D3;
++entity("dHar") -> 16#02965;
++entity("dagger") -> 16#02020;
++entity("daleth") -> 16#02138;
++entity("darr") -> 16#02193;
++entity("dash") -> 16#02010;
++entity("dashv") -> 16#022A3;
++entity("dbkarow") -> 16#0290F;
++entity("dblac") -> 16#002DD;
++entity("dcaron") -> 16#0010F;
++entity("dcy") -> 16#00434;
++entity("dd") -> 16#02146;
++entity("ddagger") -> 16#02021;
++entity("ddarr") -> 16#021CA;
++entity("ddotseq") -> 16#02A77;
++entity("deg") -> 16#000B0;
++entity("delta") -> 16#003B4;
++entity("demptyv") -> 16#029B1;
++entity("dfisht") -> 16#0297F;
++entity("dfr") -> 16#1D521;
++entity("dharl") -> 16#021C3;
++entity("dharr") -> 16#021C2;
++entity("diam") -> 16#022C4;
++entity("diamond") -> 16#022C4;
++entity("diamondsuit") -> 16#02666;
++entity("diams") -> 16#02666;
++entity("die") -> 16#000A8;
++entity("digamma") -> 16#003DD;
++entity("disin") -> 16#022F2;
++entity("div") -> 16#000F7;
++entity("divide") -> 16#000F7;
++entity("divideontimes") -> 16#022C7;
++entity("divonx") -> 16#022C7;
++entity("djcy") -> 16#00452;
++entity("dlcorn") -> 16#0231E;
++entity("dlcrop") -> 16#0230D;
++entity("dollar") -> 16#00024;
++entity("dopf") -> 16#1D555;
++entity("dot") -> 16#002D9;
++entity("doteq") -> 16#02250;
++entity("doteqdot") -> 16#02251;
++entity("dotminus") -> 16#02238;
++entity("dotplus") -> 16#02214;
++entity("dotsquare") -> 16#022A1;
++entity("doublebarwedge") -> 16#02306;
++entity("downarrow") -> 16#02193;
++entity("downdownarrows") -> 16#021CA;
++entity("downharpoonleft") -> 16#021C3;
++entity("downharpoonright") -> 16#021C2;
++entity("drbkarow") -> 16#02910;
++entity("drcorn") -> 16#0231F;
++entity("drcrop") -> 16#0230C;
++entity("dscr") -> 16#1D4B9;
++entity("dscy") -> 16#00455;
++entity("dsol") -> 16#029F6;
++entity("dstrok") -> 16#00111;
++entity("dtdot") -> 16#022F1;
++entity("dtri") -> 16#025BF;
++entity("dtrif") -> 16#025BE;
++entity("duarr") -> 16#021F5;
++entity("duhar") -> 16#0296F;
++entity("dwangle") -> 16#029A6;
++entity("dzcy") -> 16#0045F;
++entity("dzigrarr") -> 16#027FF;
++entity("eDDot") -> 16#02A77;
++entity("eDot") -> 16#02251;
++entity("eacute") -> 16#000E9;
++entity("easter") -> 16#02A6E;
++entity("ecaron") -> 16#0011B;
++entity("ecir") -> 16#02256;
++entity("ecirc") -> 16#000EA;
++entity("ecolon") -> 16#02255;
++entity("ecy") -> 16#0044D;
++entity("edot") -> 16#00117;
++entity("ee") -> 16#02147;
++entity("efDot") -> 16#02252;
++entity("efr") -> 16#1D522;
++entity("eg") -> 16#02A9A;
++entity("egrave") -> 16#000E8;
++entity("egs") -> 16#02A96;
++entity("egsdot") -> 16#02A98;
++entity("el") -> 16#02A99;
++entity("elinters") -> 16#023E7;
++entity("ell") -> 16#02113;
++entity("els") -> 16#02A95;
++entity("elsdot") -> 16#02A97;
++entity("emacr") -> 16#00113;
++entity("empty") -> 16#02205;
++entity("emptyset") -> 16#02205;
++entity("emptyv") -> 16#02205;
++entity("emsp") -> 16#02003;
++entity("emsp13") -> 16#02004;
++entity("emsp14") -> 16#02005;
++entity("eng") -> 16#0014B;
++entity("ensp") -> 16#02002;
++entity("eogon") -> 16#00119;
++entity("eopf") -> 16#1D556;
++entity("epar") -> 16#022D5;
++entity("eparsl") -> 16#029E3;
++entity("eplus") -> 16#02A71;
++entity("epsi") -> 16#003B5;
++entity("epsilon") -> 16#003B5;
++entity("epsiv") -> 16#003F5;
++entity("eqcirc") -> 16#02256;
++entity("eqcolon") -> 16#02255;
++entity("eqsim") -> 16#02242;
++entity("eqslantgtr") -> 16#02A96;
++entity("eqslantless") -> 16#02A95;
++entity("equals") -> 16#0003D;
++entity("equest") -> 16#0225F;
++entity("equiv") -> 16#02261;
++entity("equivDD") -> 16#02A78;
++entity("eqvparsl") -> 16#029E5;
++entity("erDot") -> 16#02253;
++entity("erarr") -> 16#02971;
++entity("escr") -> 16#0212F;
++entity("esdot") -> 16#02250;
++entity("esim") -> 16#02242;
++entity("eta") -> 16#003B7;
++entity("eth") -> 16#000F0;
++entity("euml") -> 16#000EB;
++entity("euro") -> 16#020AC;
++entity("excl") -> 16#00021;
++entity("exist") -> 16#02203;
++entity("expectation") -> 16#02130;
++entity("exponentiale") -> 16#02147;
++entity("fallingdotseq") -> 16#02252;
++entity("fcy") -> 16#00444;
++entity("female") -> 16#02640;
++entity("ffilig") -> 16#0FB03;
++entity("fflig") -> 16#0FB00;
++entity("ffllig") -> 16#0FB04;
++entity("ffr") -> 16#1D523;
++entity("filig") -> 16#0FB01;
++entity("fjlig") -> [16#00066, 16#0006A];
++entity("flat") -> 16#0266D;
++entity("fllig") -> 16#0FB02;
++entity("fltns") -> 16#025B1;
++entity("fnof") -> 16#00192;
++entity("fopf") -> 16#1D557;
++entity("forall") -> 16#02200;
++entity("fork") -> 16#022D4;
++entity("forkv") -> 16#02AD9;
++entity("fpartint") -> 16#02A0D;
++entity("frac12") -> 16#000BD;
++entity("frac13") -> 16#02153;
++entity("frac14") -> 16#000BC;
++entity("frac15") -> 16#02155;
++entity("frac16") -> 16#02159;
++entity("frac18") -> 16#0215B;
++entity("frac23") -> 16#02154;
++entity("frac25") -> 16#02156;
++entity("frac34") -> 16#000BE;
++entity("frac35") -> 16#02157;
++entity("frac38") -> 16#0215C;
++entity("frac45") -> 16#02158;
++entity("frac56") -> 16#0215A;
++entity("frac58") -> 16#0215D;
++entity("frac78") -> 16#0215E;
++entity("frasl") -> 16#02044;
++entity("frown") -> 16#02322;
++entity("fscr") -> 16#1D4BB;
++entity("gE") -> 16#02267;
++entity("gEl") -> 16#02A8C;
++entity("gacute") -> 16#001F5;
++entity("gamma") -> 16#003B3;
++entity("gammad") -> 16#003DD;
++entity("gap") -> 16#02A86;
++entity("gbreve") -> 16#0011F;
++entity("gcirc") -> 16#0011D;
++entity("gcy") -> 16#00433;
++entity("gdot") -> 16#00121;
++entity("ge") -> 16#02265;
++entity("gel") -> 16#022DB;
++entity("geq") -> 16#02265;
++entity("geqq") -> 16#02267;
++entity("geqslant") -> 16#02A7E;
++entity("ges") -> 16#02A7E;
++entity("gescc") -> 16#02AA9;
++entity("gesdot") -> 16#02A80;
++entity("gesdoto") -> 16#02A82;
++entity("gesdotol") -> 16#02A84;
++entity("gesl") -> [16#022DB, 16#0FE00];
++entity("gesles") -> 16#02A94;
++entity("gfr") -> 16#1D524;
++entity("gg") -> 16#0226B;
++entity("ggg") -> 16#022D9;
++entity("gimel") -> 16#02137;
++entity("gjcy") -> 16#00453;
++entity("gl") -> 16#02277;
++entity("glE") -> 16#02A92;
++entity("gla") -> 16#02AA5;
++entity("glj") -> 16#02AA4;
++entity("gnE") -> 16#02269;
++entity("gnap") -> 16#02A8A;
++entity("gnapprox") -> 16#02A8A;
++entity("gne") -> 16#02A88;
++entity("gneq") -> 16#02A88;
++entity("gneqq") -> 16#02269;
++entity("gnsim") -> 16#022E7;
++entity("gopf") -> 16#1D558;
++entity("grave") -> 16#00060;
++entity("gscr") -> 16#0210A;
++entity("gsim") -> 16#02273;
++entity("gsime") -> 16#02A8E;
++entity("gsiml") -> 16#02A90;
++entity("gt") -> 16#0003E;
++entity("gtcc") -> 16#02AA7;
++entity("gtcir") -> 16#02A7A;
++entity("gtdot") -> 16#022D7;
++entity("gtlPar") -> 16#02995;
++entity("gtquest") -> 16#02A7C;
++entity("gtrapprox") -> 16#02A86;
++entity("gtrarr") -> 16#02978;
++entity("gtrdot") -> 16#022D7;
++entity("gtreqless") -> 16#022DB;
++entity("gtreqqless") -> 16#02A8C;
++entity("gtrless") -> 16#02277;
++entity("gtrsim") -> 16#02273;
++entity("gvertneqq") -> [16#02269, 16#0FE00];
++entity("gvnE") -> [16#02269, 16#0FE00];
++entity("hArr") -> 16#021D4;
++entity("hairsp") -> 16#0200A;
++entity("half") -> 16#000BD;
++entity("hamilt") -> 16#0210B;
++entity("hardcy") -> 16#0044A;
++entity("harr") -> 16#02194;
++entity("harrcir") -> 16#02948;
++entity("harrw") -> 16#021AD;
++entity("hbar") -> 16#0210F;
++entity("hcirc") -> 16#00125;
++entity("hearts") -> 16#02665;
++entity("heartsuit") -> 16#02665;
++entity("hellip") -> 16#02026;
++entity("hercon") -> 16#022B9;
++entity("hfr") -> 16#1D525;
++entity("hksearow") -> 16#02925;
++entity("hkswarow") -> 16#02926;
++entity("hoarr") -> 16#021FF;
++entity("homtht") -> 16#0223B;
++entity("hookleftarrow") -> 16#021A9;
++entity("hookrightarrow") -> 16#021AA;
++entity("hopf") -> 16#1D559;
++entity("horbar") -> 16#02015;
++entity("hscr") -> 16#1D4BD;
++entity("hslash") -> 16#0210F;
++entity("hstrok") -> 16#00127;
++entity("hybull") -> 16#02043;
++entity("hyphen") -> 16#02010;
++entity("iacute") -> 16#000ED;
++entity("ic") -> 16#02063;
++entity("icirc") -> 16#000EE;
++entity("icy") -> 16#00438;
++entity("iecy") -> 16#00435;
++entity("iexcl") -> 16#000A1;
++entity("iff") -> 16#021D4;
++entity("ifr") -> 16#1D526;
++entity("igrave") -> 16#000EC;
++entity("ii") -> 16#02148;
++entity("iiiint") -> 16#02A0C;
++entity("iiint") -> 16#0222D;
++entity("iinfin") -> 16#029DC;
++entity("iiota") -> 16#02129;
++entity("ijlig") -> 16#00133;
++entity("imacr") -> 16#0012B;
++entity("image") -> 16#02111;
++entity("imagline") -> 16#02110;
++entity("imagpart") -> 16#02111;
++entity("imath") -> 16#00131;
++entity("imof") -> 16#022B7;
++entity("imped") -> 16#001B5;
++entity("in") -> 16#02208;
++entity("incare") -> 16#02105;
++entity("infin") -> 16#0221E;
++entity("infintie") -> 16#029DD;
++entity("inodot") -> 16#00131;
++entity("int") -> 16#0222B;
++entity("intcal") -> 16#022BA;
++entity("integers") -> 16#02124;
++entity("intercal") -> 16#022BA;
++entity("intlarhk") -> 16#02A17;
++entity("intprod") -> 16#02A3C;
++entity("iocy") -> 16#00451;
++entity("iogon") -> 16#0012F;
++entity("iopf") -> 16#1D55A;
++entity("iota") -> 16#003B9;
++entity("iprod") -> 16#02A3C;
++entity("iquest") -> 16#000BF;
++entity("iscr") -> 16#1D4BE;
++entity("isin") -> 16#02208;
++entity("isinE") -> 16#022F9;
++entity("isindot") -> 16#022F5;
++entity("isins") -> 16#022F4;
++entity("isinsv") -> 16#022F3;
++entity("isinv") -> 16#02208;
++entity("it") -> 16#02062;
++entity("itilde") -> 16#00129;
++entity("iukcy") -> 16#00456;
++entity("iuml") -> 16#000EF;
++entity("jcirc") -> 16#00135;
++entity("jcy") -> 16#00439;
++entity("jfr") -> 16#1D527;
++entity("jmath") -> 16#00237;
++entity("jopf") -> 16#1D55B;
++entity("jscr") -> 16#1D4BF;
++entity("jsercy") -> 16#00458;
++entity("jukcy") -> 16#00454;
++entity("kappa") -> 16#003BA;
++entity("kappav") -> 16#003F0;
++entity("kcedil") -> 16#00137;
++entity("kcy") -> 16#0043A;
++entity("kfr") -> 16#1D528;
++entity("kgreen") -> 16#00138;
++entity("khcy") -> 16#00445;
++entity("kjcy") -> 16#0045C;
++entity("kopf") -> 16#1D55C;
++entity("kscr") -> 16#1D4C0;
++entity("lAarr") -> 16#021DA;
++entity("lArr") -> 16#021D0;
++entity("lAtail") -> 16#0291B;
++entity("lBarr") -> 16#0290E;
++entity("lE") -> 16#02266;
++entity("lEg") -> 16#02A8B;
++entity("lHar") -> 16#02962;
++entity("lacute") -> 16#0013A;
++entity("laemptyv") -> 16#029B4;
++entity("lagran") -> 16#02112;
++entity("lambda") -> 16#003BB;
++entity("lang") -> 16#027E8;
++entity("langd") -> 16#02991;
++entity("langle") -> 16#027E8;
++entity("lap") -> 16#02A85;
++entity("laquo") -> 16#000AB;
++entity("larr") -> 16#02190;
++entity("larrb") -> 16#021E4;
++entity("larrbfs") -> 16#0291F;
++entity("larrfs") -> 16#0291D;
++entity("larrhk") -> 16#021A9;
++entity("larrlp") -> 16#021AB;
++entity("larrpl") -> 16#02939;
++entity("larrsim") -> 16#02973;
++entity("larrtl") -> 16#021A2;
++entity("lat") -> 16#02AAB;
++entity("latail") -> 16#02919;
++entity("late") -> 16#02AAD;
++entity("lates") -> [16#02AAD, 16#0FE00];
++entity("lbarr") -> 16#0290C;
++entity("lbbrk") -> 16#02772;
++entity("lbrace") -> 16#0007B;
++entity("lbrack") -> 16#0005B;
++entity("lbrke") -> 16#0298B;
++entity("lbrksld") -> 16#0298F;
++entity("lbrkslu") -> 16#0298D;
++entity("lcaron") -> 16#0013E;
++entity("lcedil") -> 16#0013C;
++entity("lceil") -> 16#02308;
++entity("lcub") -> 16#0007B;
++entity("lcy") -> 16#0043B;
++entity("ldca") -> 16#02936;
++entity("ldquo") -> 16#0201C;
++entity("ldquor") -> 16#0201E;
++entity("ldrdhar") -> 16#02967;
++entity("ldrushar") -> 16#0294B;
++entity("ldsh") -> 16#021B2;
++entity("le") -> 16#02264;
++entity("leftarrow") -> 16#02190;
++entity("leftarrowtail") -> 16#021A2;
++entity("leftharpoondown") -> 16#021BD;
++entity("leftharpoonup") -> 16#021BC;
++entity("leftleftarrows") -> 16#021C7;
++entity("leftrightarrow") -> 16#02194;
++entity("leftrightarrows") -> 16#021C6;
++entity("leftrightharpoons") -> 16#021CB;
++entity("leftrightsquigarrow") -> 16#021AD;
++entity("leftthreetimes") -> 16#022CB;
++entity("leg") -> 16#022DA;
++entity("leq") -> 16#02264;
++entity("leqq") -> 16#02266;
++entity("leqslant") -> 16#02A7D;
++entity("les") -> 16#02A7D;
++entity("lescc") -> 16#02AA8;
++entity("lesdot") -> 16#02A7F;
++entity("lesdoto") -> 16#02A81;
++entity("lesdotor") -> 16#02A83;
++entity("lesg") -> [16#022DA, 16#0FE00];
++entity("lesges") -> 16#02A93;
++entity("lessapprox") -> 16#02A85;
++entity("lessdot") -> 16#022D6;
++entity("lesseqgtr") -> 16#022DA;
++entity("lesseqqgtr") -> 16#02A8B;
++entity("lessgtr") -> 16#02276;
++entity("lesssim") -> 16#02272;
++entity("lfisht") -> 16#0297C;
++entity("lfloor") -> 16#0230A;
++entity("lfr") -> 16#1D529;
++entity("lg") -> 16#02276;
++entity("lgE") -> 16#02A91;
++entity("lhard") -> 16#021BD;
++entity("lharu") -> 16#021BC;
++entity("lharul") -> 16#0296A;
++entity("lhblk") -> 16#02584;
++entity("ljcy") -> 16#00459;
++entity("ll") -> 16#0226A;
++entity("llarr") -> 16#021C7;
++entity("llcorner") -> 16#0231E;
++entity("llhard") -> 16#0296B;
++entity("lltri") -> 16#025FA;
++entity("lmidot") -> 16#00140;
++entity("lmoust") -> 16#023B0;
++entity("lmoustache") -> 16#023B0;
++entity("lnE") -> 16#02268;
++entity("lnap") -> 16#02A89;
++entity("lnapprox") -> 16#02A89;
++entity("lne") -> 16#02A87;
++entity("lneq") -> 16#02A87;
++entity("lneqq") -> 16#02268;
++entity("lnsim") -> 16#022E6;
++entity("loang") -> 16#027EC;
++entity("loarr") -> 16#021FD;
++entity("lobrk") -> 16#027E6;
++entity("longleftarrow") -> 16#027F5;
++entity("longleftrightarrow") -> 16#027F7;
++entity("longmapsto") -> 16#027FC;
++entity("longrightarrow") -> 16#027F6;
++entity("looparrowleft") -> 16#021AB;
++entity("looparrowright") -> 16#021AC;
++entity("lopar") -> 16#02985;
++entity("lopf") -> 16#1D55D;
++entity("loplus") -> 16#02A2D;
++entity("lotimes") -> 16#02A34;
++entity("lowast") -> 16#02217;
++entity("lowbar") -> 16#0005F;
++entity("loz") -> 16#025CA;
++entity("lozenge") -> 16#025CA;
++entity("lozf") -> 16#029EB;
++entity("lpar") -> 16#00028;
++entity("lparlt") -> 16#02993;
++entity("lrarr") -> 16#021C6;
++entity("lrcorner") -> 16#0231F;
++entity("lrhar") -> 16#021CB;
++entity("lrhard") -> 16#0296D;
++entity("lrm") -> 16#0200E;
++entity("lrtri") -> 16#022BF;
++entity("lsaquo") -> 16#02039;
++entity("lscr") -> 16#1D4C1;
++entity("lsh") -> 16#021B0;
++entity("lsim") -> 16#02272;
++entity("lsime") -> 16#02A8D;
++entity("lsimg") -> 16#02A8F;
++entity("lsqb") -> 16#0005B;
++entity("lsquo") -> 16#02018;
++entity("lsquor") -> 16#0201A;
++entity("lstrok") -> 16#00142;
++entity("lt") -> 16#0003C;
++entity("ltcc") -> 16#02AA6;
++entity("ltcir") -> 16#02A79;
++entity("ltdot") -> 16#022D6;
++entity("lthree") -> 16#022CB;
++entity("ltimes") -> 16#022C9;
++entity("ltlarr") -> 16#02976;
++entity("ltquest") -> 16#02A7B;
++entity("ltrPar") -> 16#02996;
++entity("ltri") -> 16#025C3;
++entity("ltrie") -> 16#022B4;
++entity("ltrif") -> 16#025C2;
++entity("lurdshar") -> 16#0294A;
++entity("luruhar") -> 16#02966;
++entity("lvertneqq") -> [16#02268, 16#0FE00];
++entity("lvnE") -> [16#02268, 16#0FE00];
++entity("mDDot") -> 16#0223A;
++entity("macr") -> 16#000AF;
++entity("male") -> 16#02642;
++entity("malt") -> 16#02720;
++entity("maltese") -> 16#02720;
++entity("map") -> 16#021A6;
++entity("mapsto") -> 16#021A6;
++entity("mapstodown") -> 16#021A7;
++entity("mapstoleft") -> 16#021A4;
++entity("mapstoup") -> 16#021A5;
++entity("marker") -> 16#025AE;
++entity("mcomma") -> 16#02A29;
++entity("mcy") -> 16#0043C;
++entity("mdash") -> 16#02014;
++entity("measuredangle") -> 16#02221;
++entity("mfr") -> 16#1D52A;
++entity("mho") -> 16#02127;
++entity("micro") -> 16#000B5;
++entity("mid") -> 16#02223;
++entity("midast") -> 16#0002A;
++entity("midcir") -> 16#02AF0;
++entity("middot") -> 16#000B7;
++entity("minus") -> 16#02212;
++entity("minusb") -> 16#0229F;
++entity("minusd") -> 16#02238;
++entity("minusdu") -> 16#02A2A;
++entity("mlcp") -> 16#02ADB;
++entity("mldr") -> 16#02026;
++entity("mnplus") -> 16#02213;
++entity("models") -> 16#022A7;
++entity("mopf") -> 16#1D55E;
++entity("mp") -> 16#02213;
++entity("mscr") -> 16#1D4C2;
++entity("mstpos") -> 16#0223E;
++entity("mu") -> 16#003BC;
++entity("multimap") -> 16#022B8;
++entity("mumap") -> 16#022B8;
++entity("nGg") -> [16#022D9, 16#00338];
++entity("nGt") -> [16#0226B, 16#020D2];
++entity("nGtv") -> [16#0226B, 16#00338];
++entity("nLeftarrow") -> 16#021CD;
++entity("nLeftrightarrow") -> 16#021CE;
++entity("nLl") -> [16#022D8, 16#00338];
++entity("nLt") -> [16#0226A, 16#020D2];
++entity("nLtv") -> [16#0226A, 16#00338];
++entity("nRightarrow") -> 16#021CF;
++entity("nVDash") -> 16#022AF;
++entity("nVdash") -> 16#022AE;
++entity("nabla") -> 16#02207;
++entity("nacute") -> 16#00144;
++entity("nang") -> [16#02220, 16#020D2];
++entity("nap") -> 16#02249;
++entity("napE") -> [16#02A70, 16#00338];
++entity("napid") -> [16#0224B, 16#00338];
++entity("napos") -> 16#00149;
++entity("napprox") -> 16#02249;
++entity("natur") -> 16#0266E;
++entity("natural") -> 16#0266E;
++entity("naturals") -> 16#02115;
++entity("nbsp") -> 16#000A0;
++entity("nbump") -> [16#0224E, 16#00338];
++entity("nbumpe") -> [16#0224F, 16#00338];
++entity("ncap") -> 16#02A43;
++entity("ncaron") -> 16#00148;
++entity("ncedil") -> 16#00146;
++entity("ncong") -> 16#02247;
++entity("ncongdot") -> [16#02A6D, 16#00338];
++entity("ncup") -> 16#02A42;
++entity("ncy") -> 16#0043D;
++entity("ndash") -> 16#02013;
++entity("ne") -> 16#02260;
++entity("neArr") -> 16#021D7;
++entity("nearhk") -> 16#02924;
++entity("nearr") -> 16#02197;
++entity("nearrow") -> 16#02197;
++entity("nedot") -> [16#02250, 16#00338];
++entity("nequiv") -> 16#02262;
++entity("nesear") -> 16#02928;
++entity("nesim") -> [16#02242, 16#00338];
++entity("nexist") -> 16#02204;
++entity("nexists") -> 16#02204;
++entity("nfr") -> 16#1D52B;
++entity("ngE") -> [16#02267, 16#00338];
++entity("nge") -> 16#02271;
++entity("ngeq") -> 16#02271;
++entity("ngeqq") -> [16#02267, 16#00338];
++entity("ngeqslant") -> [16#02A7E, 16#00338];
++entity("nges") -> [16#02A7E, 16#00338];
++entity("ngsim") -> 16#02275;
++entity("ngt") -> 16#0226F;
++entity("ngtr") -> 16#0226F;
++entity("nhArr") -> 16#021CE;
++entity("nharr") -> 16#021AE;
++entity("nhpar") -> 16#02AF2;
++entity("ni") -> 16#0220B;
++entity("nis") -> 16#022FC;
++entity("nisd") -> 16#022FA;
++entity("niv") -> 16#0220B;
++entity("njcy") -> 16#0045A;
++entity("nlArr") -> 16#021CD;
++entity("nlE") -> [16#02266, 16#00338];
++entity("nlarr") -> 16#0219A;
++entity("nldr") -> 16#02025;
++entity("nle") -> 16#02270;
++entity("nleftarrow") -> 16#0219A;
++entity("nleftrightarrow") -> 16#021AE;
++entity("nleq") -> 16#02270;
++entity("nleqq") -> [16#02266, 16#00338];
++entity("nleqslant") -> [16#02A7D, 16#00338];
++entity("nles") -> [16#02A7D, 16#00338];
++entity("nless") -> 16#0226E;
++entity("nlsim") -> 16#02274;
++entity("nlt") -> 16#0226E;
++entity("nltri") -> 16#022EA;
++entity("nltrie") -> 16#022EC;
++entity("nmid") -> 16#02224;
++entity("nopf") -> 16#1D55F;
++entity("not") -> 16#000AC;
++entity("notin") -> 16#02209;
++entity("notinE") -> [16#022F9, 16#00338];
++entity("notindot") -> [16#022F5, 16#00338];
++entity("notinva") -> 16#02209;
++entity("notinvb") -> 16#022F7;
++entity("notinvc") -> 16#022F6;
++entity("notni") -> 16#0220C;
++entity("notniva") -> 16#0220C;
++entity("notnivb") -> 16#022FE;
++entity("notnivc") -> 16#022FD;
++entity("npar") -> 16#02226;
++entity("nparallel") -> 16#02226;
++entity("nparsl") -> [16#02AFD, 16#020E5];
++entity("npart") -> [16#02202, 16#00338];
++entity("npolint") -> 16#02A14;
++entity("npr") -> 16#02280;
++entity("nprcue") -> 16#022E0;
++entity("npre") -> [16#02AAF, 16#00338];
++entity("nprec") -> 16#02280;
++entity("npreceq") -> [16#02AAF, 16#00338];
++entity("nrArr") -> 16#021CF;
++entity("nrarr") -> 16#0219B;
++entity("nrarrc") -> [16#02933, 16#00338];
++entity("nrarrw") -> [16#0219D, 16#00338];
++entity("nrightarrow") -> 16#0219B;
++entity("nrtri") -> 16#022EB;
++entity("nrtrie") -> 16#022ED;
++entity("nsc") -> 16#02281;
++entity("nsccue") -> 16#022E1;
++entity("nsce") -> [16#02AB0, 16#00338];
++entity("nscr") -> 16#1D4C3;
++entity("nshortmid") -> 16#02224;
++entity("nshortparallel") -> 16#02226;
++entity("nsim") -> 16#02241;
++entity("nsime") -> 16#02244;
++entity("nsimeq") -> 16#02244;
++entity("nsmid") -> 16#02224;
++entity("nspar") -> 16#02226;
++entity("nsqsube") -> 16#022E2;
++entity("nsqsupe") -> 16#022E3;
++entity("nsub") -> 16#02284;
++entity("nsubE") -> [16#02AC5, 16#00338];
++entity("nsube") -> 16#02288;
++entity("nsubset") -> [16#02282, 16#020D2];
++entity("nsubseteq") -> 16#02288;
++entity("nsubseteqq") -> [16#02AC5, 16#00338];
++entity("nsucc") -> 16#02281;
++entity("nsucceq") -> [16#02AB0, 16#00338];
++entity("nsup") -> 16#02285;
++entity("nsupE") -> [16#02AC6, 16#00338];
++entity("nsupe") -> 16#02289;
++entity("nsupset") -> [16#02283, 16#020D2];
++entity("nsupseteq") -> 16#02289;
++entity("nsupseteqq") -> [16#02AC6, 16#00338];
++entity("ntgl") -> 16#02279;
++entity("ntilde") -> 16#000F1;
++entity("ntlg") -> 16#02278;
++entity("ntriangleleft") -> 16#022EA;
++entity("ntrianglelefteq") -> 16#022EC;
++entity("ntriangleright") -> 16#022EB;
++entity("ntrianglerighteq") -> 16#022ED;
++entity("nu") -> 16#003BD;
++entity("num") -> 16#00023;
++entity("numero") -> 16#02116;
++entity("numsp") -> 16#02007;
++entity("nvDash") -> 16#022AD;
++entity("nvHarr") -> 16#02904;
++entity("nvap") -> [16#0224D, 16#020D2];
++entity("nvdash") -> 16#022AC;
++entity("nvge") -> [16#02265, 16#020D2];
++entity("nvgt") -> [16#0003E, 16#020D2];
++entity("nvinfin") -> 16#029DE;
++entity("nvlArr") -> 16#02902;
++entity("nvle") -> [16#02264, 16#020D2];
++entity("nvlt") -> [16#0003C, 16#020D2];
++entity("nvltrie") -> [16#022B4, 16#020D2];
++entity("nvrArr") -> 16#02903;
++entity("nvrtrie") -> [16#022B5, 16#020D2];
++entity("nvsim") -> [16#0223C, 16#020D2];
++entity("nwArr") -> 16#021D6;
++entity("nwarhk") -> 16#02923;
++entity("nwarr") -> 16#02196;
++entity("nwarrow") -> 16#02196;
++entity("nwnear") -> 16#02927;
++entity("oS") -> 16#024C8;
++entity("oacute") -> 16#000F3;
++entity("oast") -> 16#0229B;
++entity("ocir") -> 16#0229A;
++entity("ocirc") -> 16#000F4;
++entity("ocy") -> 16#0043E;
++entity("odash") -> 16#0229D;
++entity("odblac") -> 16#00151;
++entity("odiv") -> 16#02A38;
++entity("odot") -> 16#02299;
++entity("odsold") -> 16#029BC;
++entity("oelig") -> 16#00153;
++entity("ofcir") -> 16#029BF;
++entity("ofr") -> 16#1D52C;
++entity("ogon") -> 16#002DB;
++entity("ograve") -> 16#000F2;
++entity("ogt") -> 16#029C1;
++entity("ohbar") -> 16#029B5;
++entity("ohm") -> 16#003A9;
++entity("oint") -> 16#0222E;
++entity("olarr") -> 16#021BA;
++entity("olcir") -> 16#029BE;
++entity("olcross") -> 16#029BB;
++entity("oline") -> 16#0203E;
++entity("olt") -> 16#029C0;
++entity("omacr") -> 16#0014D;
++entity("omega") -> 16#003C9;
++entity("omicron") -> 16#003BF;
++entity("omid") -> 16#029B6;
++entity("ominus") -> 16#02296;
++entity("oopf") -> 16#1D560;
++entity("opar") -> 16#029B7;
++entity("operp") -> 16#029B9;
++entity("oplus") -> 16#02295;
++entity("or") -> 16#02228;
++entity("orarr") -> 16#021BB;
++entity("ord") -> 16#02A5D;
++entity("order") -> 16#02134;
++entity("orderof") -> 16#02134;
++entity("ordf") -> 16#000AA;
++entity("ordm") -> 16#000BA;
++entity("origof") -> 16#022B6;
++entity("oror") -> 16#02A56;
++entity("orslope") -> 16#02A57;
++entity("orv") -> 16#02A5B;
++entity("oscr") -> 16#02134;
++entity("oslash") -> 16#000F8;
++entity("osol") -> 16#02298;
++entity("otilde") -> 16#000F5;
++entity("otimes") -> 16#02297;
++entity("otimesas") -> 16#02A36;
++entity("ouml") -> 16#000F6;
++entity("ovbar") -> 16#0233D;
++entity("par") -> 16#02225;
++entity("para") -> 16#000B6;
++entity("parallel") -> 16#02225;
++entity("parsim") -> 16#02AF3;
++entity("parsl") -> 16#02AFD;
++entity("part") -> 16#02202;
++entity("pcy") -> 16#0043F;
++entity("percnt") -> 16#00025;
++entity("period") -> 16#0002E;
++entity("permil") -> 16#02030;
++entity("perp") -> 16#022A5;
++entity("pertenk") -> 16#02031;
++entity("pfr") -> 16#1D52D;
++entity("phi") -> 16#003C6;
++entity("phiv") -> 16#003D5;
++entity("phmmat") -> 16#02133;
++entity("phone") -> 16#0260E;
++entity("pi") -> 16#003C0;
++entity("pitchfork") -> 16#022D4;
++entity("piv") -> 16#003D6;
++entity("planck") -> 16#0210F;
++entity("planckh") -> 16#0210E;
++entity("plankv") -> 16#0210F;
++entity("plus") -> 16#0002B;
++entity("plusacir") -> 16#02A23;
++entity("plusb") -> 16#0229E;
++entity("pluscir") -> 16#02A22;
++entity("plusdo") -> 16#02214;
++entity("plusdu") -> 16#02A25;
++entity("pluse") -> 16#02A72;
++entity("plusmn") -> 16#000B1;
++entity("plussim") -> 16#02A26;
++entity("plustwo") -> 16#02A27;
++entity("pm") -> 16#000B1;
++entity("pointint") -> 16#02A15;
++entity("popf") -> 16#1D561;
++entity("pound") -> 16#000A3;
++entity("pr") -> 16#0227A;
++entity("prE") -> 16#02AB3;
++entity("prap") -> 16#02AB7;
++entity("prcue") -> 16#0227C;
++entity("pre") -> 16#02AAF;
++entity("prec") -> 16#0227A;
++entity("precapprox") -> 16#02AB7;
++entity("preccurlyeq") -> 16#0227C;
++entity("preceq") -> 16#02AAF;
++entity("precnapprox") -> 16#02AB9;
++entity("precneqq") -> 16#02AB5;
++entity("precnsim") -> 16#022E8;
++entity("precsim") -> 16#0227E;
++entity("prime") -> 16#02032;
++entity("primes") -> 16#02119;
++entity("prnE") -> 16#02AB5;
++entity("prnap") -> 16#02AB9;
++entity("prnsim") -> 16#022E8;
++entity("prod") -> 16#0220F;
++entity("profalar") -> 16#0232E;
++entity("profline") -> 16#02312;
++entity("profsurf") -> 16#02313;
++entity("prop") -> 16#0221D;
++entity("propto") -> 16#0221D;
++entity("prsim") -> 16#0227E;
++entity("prurel") -> 16#022B0;
++entity("pscr") -> 16#1D4C5;
++entity("psi") -> 16#003C8;
++entity("puncsp") -> 16#02008;
++entity("qfr") -> 16#1D52E;
++entity("qint") -> 16#02A0C;
++entity("qopf") -> 16#1D562;
++entity("qprime") -> 16#02057;
++entity("qscr") -> 16#1D4C6;
++entity("quaternions") -> 16#0210D;
++entity("quatint") -> 16#02A16;
++entity("quest") -> 16#0003F;
++entity("questeq") -> 16#0225F;
++entity("quot") -> 16#00022;
++entity("rAarr") -> 16#021DB;
++entity("rArr") -> 16#021D2;
++entity("rAtail") -> 16#0291C;
++entity("rBarr") -> 16#0290F;
++entity("rHar") -> 16#02964;
++entity("race") -> [16#0223D, 16#00331];
++entity("racute") -> 16#00155;
++entity("radic") -> 16#0221A;
++entity("raemptyv") -> 16#029B3;
++entity("rang") -> 16#027E9;
++entity("rangd") -> 16#02992;
++entity("range") -> 16#029A5;
++entity("rangle") -> 16#027E9;
++entity("raquo") -> 16#000BB;
++entity("rarr") -> 16#02192;
++entity("rarrap") -> 16#02975;
++entity("rarrb") -> 16#021E5;
++entity("rarrbfs") -> 16#02920;
++entity("rarrc") -> 16#02933;
++entity("rarrfs") -> 16#0291E;
++entity("rarrhk") -> 16#021AA;
++entity("rarrlp") -> 16#021AC;
++entity("rarrpl") -> 16#02945;
++entity("rarrsim") -> 16#02974;
++entity("rarrtl") -> 16#021A3;
++entity("rarrw") -> 16#0219D;
++entity("ratail") -> 16#0291A;
++entity("ratio") -> 16#02236;
++entity("rationals") -> 16#0211A;
++entity("rbarr") -> 16#0290D;
++entity("rbbrk") -> 16#02773;
++entity("rbrace") -> 16#0007D;
++entity("rbrack") -> 16#0005D;
++entity("rbrke") -> 16#0298C;
++entity("rbrksld") -> 16#0298E;
++entity("rbrkslu") -> 16#02990;
++entity("rcaron") -> 16#00159;
++entity("rcedil") -> 16#00157;
++entity("rceil") -> 16#02309;
++entity("rcub") -> 16#0007D;
++entity("rcy") -> 16#00440;
++entity("rdca") -> 16#02937;
++entity("rdldhar") -> 16#02969;
++entity("rdquo") -> 16#0201D;
++entity("rdquor") -> 16#0201D;
++entity("rdsh") -> 16#021B3;
++entity("real") -> 16#0211C;
++entity("realine") -> 16#0211B;
++entity("realpart") -> 16#0211C;
++entity("reals") -> 16#0211D;
++entity("rect") -> 16#025AD;
++entity("reg") -> 16#000AE;
++entity("rfisht") -> 16#0297D;
++entity("rfloor") -> 16#0230B;
++entity("rfr") -> 16#1D52F;
++entity("rhard") -> 16#021C1;
++entity("rharu") -> 16#021C0;
++entity("rharul") -> 16#0296C;
++entity("rho") -> 16#003C1;
++entity("rhov") -> 16#003F1;
++entity("rightarrow") -> 16#02192;
++entity("rightarrowtail") -> 16#021A3;
++entity("rightharpoondown") -> 16#021C1;
++entity("rightharpoonup") -> 16#021C0;
++entity("rightleftarrows") -> 16#021C4;
++entity("rightleftharpoons") -> 16#021CC;
++entity("rightrightarrows") -> 16#021C9;
++entity("rightsquigarrow") -> 16#0219D;
++entity("rightthreetimes") -> 16#022CC;
++entity("ring") -> 16#002DA;
++entity("risingdotseq") -> 16#02253;
++entity("rlarr") -> 16#021C4;
++entity("rlhar") -> 16#021CC;
++entity("rlm") -> 16#0200F;
++entity("rmoust") -> 16#023B1;
++entity("rmoustache") -> 16#023B1;
++entity("rnmid") -> 16#02AEE;
++entity("roang") -> 16#027ED;
++entity("roarr") -> 16#021FE;
++entity("robrk") -> 16#027E7;
++entity("ropar") -> 16#02986;
++entity("ropf") -> 16#1D563;
++entity("roplus") -> 16#02A2E;
++entity("rotimes") -> 16#02A35;
++entity("rpar") -> 16#00029;
++entity("rpargt") -> 16#02994;
++entity("rppolint") -> 16#02A12;
++entity("rrarr") -> 16#021C9;
++entity("rsaquo") -> 16#0203A;
++entity("rscr") -> 16#1D4C7;
++entity("rsh") -> 16#021B1;
++entity("rsqb") -> 16#0005D;
++entity("rsquo") -> 16#02019;
++entity("rsquor") -> 16#02019;
++entity("rthree") -> 16#022CC;
++entity("rtimes") -> 16#022CA;
++entity("rtri") -> 16#025B9;
++entity("rtrie") -> 16#022B5;
++entity("rtrif") -> 16#025B8;
++entity("rtriltri") -> 16#029CE;
++entity("ruluhar") -> 16#02968;
++entity("rx") -> 16#0211E;
++entity("sacute") -> 16#0015B;
++entity("sbquo") -> 16#0201A;
++entity("sc") -> 16#0227B;
++entity("scE") -> 16#02AB4;
++entity("scap") -> 16#02AB8;
++entity("scaron") -> 16#00161;
++entity("sccue") -> 16#0227D;
++entity("sce") -> 16#02AB0;
++entity("scedil") -> 16#0015F;
++entity("scirc") -> 16#0015D;
++entity("scnE") -> 16#02AB6;
++entity("scnap") -> 16#02ABA;
++entity("scnsim") -> 16#022E9;
++entity("scpolint") -> 16#02A13;
++entity("scsim") -> 16#0227F;
++entity("scy") -> 16#00441;
++entity("sdot") -> 16#022C5;
++entity("sdotb") -> 16#022A1;
++entity("sdote") -> 16#02A66;
++entity("seArr") -> 16#021D8;
++entity("searhk") -> 16#02925;
++entity("searr") -> 16#02198;
++entity("searrow") -> 16#02198;
++entity("sect") -> 16#000A7;
++entity("semi") -> 16#0003B;
++entity("seswar") -> 16#02929;
++entity("setminus") -> 16#02216;
++entity("setmn") -> 16#02216;
++entity("sext") -> 16#02736;
++entity("sfr") -> 16#1D530;
++entity("sfrown") -> 16#02322;
++entity("sharp") -> 16#0266F;
++entity("shchcy") -> 16#00449;
++entity("shcy") -> 16#00448;
++entity("shortmid") -> 16#02223;
++entity("shortparallel") -> 16#02225;
++entity("shy") -> 16#000AD;
++entity("sigma") -> 16#003C3;
++entity("sigmaf") -> 16#003C2;
++entity("sigmav") -> 16#003C2;
++entity("sim") -> 16#0223C;
++entity("simdot") -> 16#02A6A;
++entity("sime") -> 16#02243;
++entity("simeq") -> 16#02243;
++entity("simg") -> 16#02A9E;
++entity("simgE") -> 16#02AA0;
++entity("siml") -> 16#02A9D;
++entity("simlE") -> 16#02A9F;
++entity("simne") -> 16#02246;
++entity("simplus") -> 16#02A24;
++entity("simrarr") -> 16#02972;
++entity("slarr") -> 16#02190;
++entity("smallsetminus") -> 16#02216;
++entity("smashp") -> 16#02A33;
++entity("smeparsl") -> 16#029E4;
++entity("smid") -> 16#02223;
++entity("smile") -> 16#02323;
++entity("smt") -> 16#02AAA;
++entity("smte") -> 16#02AAC;
++entity("smtes") -> [16#02AAC, 16#0FE00];
++entity("softcy") -> 16#0044C;
++entity("sol") -> 16#0002F;
++entity("solb") -> 16#029C4;
++entity("solbar") -> 16#0233F;
++entity("sopf") -> 16#1D564;
++entity("spades") -> 16#02660;
++entity("spadesuit") -> 16#02660;
++entity("spar") -> 16#02225;
++entity("sqcap") -> 16#02293;
++entity("sqcaps") -> [16#02293, 16#0FE00];
++entity("sqcup") -> 16#02294;
++entity("sqcups") -> [16#02294, 16#0FE00];
++entity("sqsub") -> 16#0228F;
++entity("sqsube") -> 16#02291;
++entity("sqsubset") -> 16#0228F;
++entity("sqsubseteq") -> 16#02291;
++entity("sqsup") -> 16#02290;
++entity("sqsupe") -> 16#02292;
++entity("sqsupset") -> 16#02290;
++entity("sqsupseteq") -> 16#02292;
++entity("squ") -> 16#025A1;
++entity("square") -> 16#025A1;
++entity("squarf") -> 16#025AA;
++entity("squf") -> 16#025AA;
++entity("srarr") -> 16#02192;
++entity("sscr") -> 16#1D4C8;
++entity("ssetmn") -> 16#02216;
++entity("ssmile") -> 16#02323;
++entity("sstarf") -> 16#022C6;
++entity("star") -> 16#02606;
++entity("starf") -> 16#02605;
++entity("straightepsilon") -> 16#003F5;
++entity("straightphi") -> 16#003D5;
++entity("strns") -> 16#000AF;
++entity("sub") -> 16#02282;
++entity("subE") -> 16#02AC5;
++entity("subdot") -> 16#02ABD;
++entity("sube") -> 16#02286;
++entity("subedot") -> 16#02AC3;
++entity("submult") -> 16#02AC1;
++entity("subnE") -> 16#02ACB;
++entity("subne") -> 16#0228A;
++entity("subplus") -> 16#02ABF;
++entity("subrarr") -> 16#02979;
++entity("subset") -> 16#02282;
++entity("subseteq") -> 16#02286;
++entity("subseteqq") -> 16#02AC5;
++entity("subsetneq") -> 16#0228A;
++entity("subsetneqq") -> 16#02ACB;
++entity("subsim") -> 16#02AC7;
++entity("subsub") -> 16#02AD5;
++entity("subsup") -> 16#02AD3;
++entity("succ") -> 16#0227B;
++entity("succapprox") -> 16#02AB8;
++entity("succcurlyeq") -> 16#0227D;
++entity("succeq") -> 16#02AB0;
++entity("succnapprox") -> 16#02ABA;
++entity("succneqq") -> 16#02AB6;
++entity("succnsim") -> 16#022E9;
++entity("succsim") -> 16#0227F;
++entity("sum") -> 16#02211;
++entity("sung") -> 16#0266A;
++entity("sup") -> 16#02283;
++entity("sup1") -> 16#000B9;
++entity("sup2") -> 16#000B2;
++entity("sup3") -> 16#000B3;
++entity("supE") -> 16#02AC6;
++entity("supdot") -> 16#02ABE;
++entity("supdsub") -> 16#02AD8;
++entity("supe") -> 16#02287;
++entity("supedot") -> 16#02AC4;
++entity("suphsol") -> 16#027C9;
++entity("suphsub") -> 16#02AD7;
++entity("suplarr") -> 16#0297B;
++entity("supmult") -> 16#02AC2;
++entity("supnE") -> 16#02ACC;
++entity("supne") -> 16#0228B;
++entity("supplus") -> 16#02AC0;
++entity("supset") -> 16#02283;
++entity("supseteq") -> 16#02287;
++entity("supseteqq") -> 16#02AC6;
++entity("supsetneq") -> 16#0228B;
++entity("supsetneqq") -> 16#02ACC;
++entity("supsim") -> 16#02AC8;
++entity("supsub") -> 16#02AD4;
++entity("supsup") -> 16#02AD6;
++entity("swArr") -> 16#021D9;
++entity("swarhk") -> 16#02926;
++entity("swarr") -> 16#02199;
++entity("swarrow") -> 16#02199;
++entity("swnwar") -> 16#0292A;
++entity("szlig") -> 16#000DF;
++entity("target") -> 16#02316;
++entity("tau") -> 16#003C4;
++entity("tbrk") -> 16#023B4;
++entity("tcaron") -> 16#00165;
++entity("tcedil") -> 16#00163;
++entity("tcy") -> 16#00442;
++entity("tdot") -> 16#020DB;
++entity("telrec") -> 16#02315;
++entity("tfr") -> 16#1D531;
++entity("there4") -> 16#02234;
++entity("therefore") -> 16#02234;
++entity("theta") -> 16#003B8;
++entity("thetasym") -> 16#003D1;
++entity("thetav") -> 16#003D1;
++entity("thickapprox") -> 16#02248;
++entity("thicksim") -> 16#0223C;
++entity("thinsp") -> 16#02009;
++entity("thkap") -> 16#02248;
++entity("thksim") -> 16#0223C;
++entity("thorn") -> 16#000FE;
++entity("tilde") -> 16#002DC;
++entity("times") -> 16#000D7;
++entity("timesb") -> 16#022A0;
++entity("timesbar") -> 16#02A31;
++entity("timesd") -> 16#02A30;
++entity("tint") -> 16#0222D;
++entity("toea") -> 16#02928;
++entity("top") -> 16#022A4;
++entity("topbot") -> 16#02336;
++entity("topcir") -> 16#02AF1;
++entity("topf") -> 16#1D565;
++entity("topfork") -> 16#02ADA;
++entity("tosa") -> 16#02929;
++entity("tprime") -> 16#02034;
++entity("trade") -> 16#02122;
++entity("triangle") -> 16#025B5;
++entity("triangledown") -> 16#025BF;
++entity("triangleleft") -> 16#025C3;
++entity("trianglelefteq") -> 16#022B4;
++entity("triangleq") -> 16#0225C;
++entity("triangleright") -> 16#025B9;
++entity("trianglerighteq") -> 16#022B5;
++entity("tridot") -> 16#025EC;
++entity("trie") -> 16#0225C;
++entity("triminus") -> 16#02A3A;
++entity("triplus") -> 16#02A39;
++entity("trisb") -> 16#029CD;
++entity("tritime") -> 16#02A3B;
++entity("trpezium") -> 16#023E2;
++entity("tscr") -> 16#1D4C9;
++entity("tscy") -> 16#00446;
++entity("tshcy") -> 16#0045B;
++entity("tstrok") -> 16#00167;
++entity("twixt") -> 16#0226C;
++entity("twoheadleftarrow") -> 16#0219E;
++entity("twoheadrightarrow") -> 16#021A0;
++entity("uArr") -> 16#021D1;
++entity("uHar") -> 16#02963;
++entity("uacute") -> 16#000FA;
++entity("uarr") -> 16#02191;
++entity("ubrcy") -> 16#0045E;
++entity("ubreve") -> 16#0016D;
++entity("ucirc") -> 16#000FB;
++entity("ucy") -> 16#00443;
++entity("udarr") -> 16#021C5;
++entity("udblac") -> 16#00171;
++entity("udhar") -> 16#0296E;
++entity("ufisht") -> 16#0297E;
++entity("ufr") -> 16#1D532;
++entity("ugrave") -> 16#000F9;
++entity("uharl") -> 16#021BF;
++entity("uharr") -> 16#021BE;
++entity("uhblk") -> 16#02580;
++entity("ulcorn") -> 16#0231C;
++entity("ulcorner") -> 16#0231C;
++entity("ulcrop") -> 16#0230F;
++entity("ultri") -> 16#025F8;
++entity("umacr") -> 16#0016B;
++entity("uml") -> 16#000A8;
++entity("uogon") -> 16#00173;
++entity("uopf") -> 16#1D566;
++entity("uparrow") -> 16#02191;
++entity("updownarrow") -> 16#02195;
++entity("upharpoonleft") -> 16#021BF;
++entity("upharpoonright") -> 16#021BE;
++entity("uplus") -> 16#0228E;
++entity("upsi") -> 16#003C5;
++entity("upsih") -> 16#003D2;
++entity("upsilon") -> 16#003C5;
++entity("upuparrows") -> 16#021C8;
++entity("urcorn") -> 16#0231D;
++entity("urcorner") -> 16#0231D;
++entity("urcrop") -> 16#0230E;
++entity("uring") -> 16#0016F;
++entity("urtri") -> 16#025F9;
++entity("uscr") -> 16#1D4CA;
++entity("utdot") -> 16#022F0;
++entity("utilde") -> 16#00169;
++entity("utri") -> 16#025B5;
++entity("utrif") -> 16#025B4;
++entity("uuarr") -> 16#021C8;
++entity("uuml") -> 16#000FC;
++entity("uwangle") -> 16#029A7;
++entity("vArr") -> 16#021D5;
++entity("vBar") -> 16#02AE8;
++entity("vBarv") -> 16#02AE9;
++entity("vDash") -> 16#022A8;
++entity("vangrt") -> 16#0299C;
++entity("varepsilon") -> 16#003F5;
++entity("varkappa") -> 16#003F0;
++entity("varnothing") -> 16#02205;
++entity("varphi") -> 16#003D5;
++entity("varpi") -> 16#003D6;
++entity("varpropto") -> 16#0221D;
++entity("varr") -> 16#02195;
++entity("varrho") -> 16#003F1;
++entity("varsigma") -> 16#003C2;
++entity("varsubsetneq") -> [16#0228A, 16#0FE00];
++entity("varsubsetneqq") -> [16#02ACB, 16#0FE00];
++entity("varsupsetneq") -> [16#0228B, 16#0FE00];
++entity("varsupsetneqq") -> [16#02ACC, 16#0FE00];
++entity("vartheta") -> 16#003D1;
++entity("vartriangleleft") -> 16#022B2;
++entity("vartriangleright") -> 16#022B3;
++entity("vcy") -> 16#00432;
++entity("vdash") -> 16#022A2;
++entity("vee") -> 16#02228;
++entity("veebar") -> 16#022BB;
++entity("veeeq") -> 16#0225A;
++entity("vellip") -> 16#022EE;
++entity("verbar") -> 16#0007C;
++entity("vert") -> 16#0007C;
++entity("vfr") -> 16#1D533;
++entity("vltri") -> 16#022B2;
++entity("vnsub") -> [16#02282, 16#020D2];
++entity("vnsup") -> [16#02283, 16#020D2];
++entity("vopf") -> 16#1D567;
++entity("vprop") -> 16#0221D;
++entity("vrtri") -> 16#022B3;
++entity("vscr") -> 16#1D4CB;
++entity("vsubnE") -> [16#02ACB, 16#0FE00];
++entity("vsubne") -> [16#0228A, 16#0FE00];
++entity("vsupnE") -> [16#02ACC, 16#0FE00];
++entity("vsupne") -> [16#0228B, 16#0FE00];
++entity("vzigzag") -> 16#0299A;
++entity("wcirc") -> 16#00175;
++entity("wedbar") -> 16#02A5F;
++entity("wedge") -> 16#02227;
++entity("wedgeq") -> 16#02259;
++entity("weierp") -> 16#02118;
++entity("wfr") -> 16#1D534;
++entity("wopf") -> 16#1D568;
++entity("wp") -> 16#02118;
++entity("wr") -> 16#02240;
++entity("wreath") -> 16#02240;
++entity("wscr") -> 16#1D4CC;
++entity("xcap") -> 16#022C2;
++entity("xcirc") -> 16#025EF;
++entity("xcup") -> 16#022C3;
++entity("xdtri") -> 16#025BD;
++entity("xfr") -> 16#1D535;
++entity("xhArr") -> 16#027FA;
++entity("xharr") -> 16#027F7;
++entity("xi") -> 16#003BE;
++entity("xlArr") -> 16#027F8;
++entity("xlarr") -> 16#027F5;
++entity("xmap") -> 16#027FC;
++entity("xnis") -> 16#022FB;
++entity("xodot") -> 16#02A00;
++entity("xopf") -> 16#1D569;
++entity("xoplus") -> 16#02A01;
++entity("xotime") -> 16#02A02;
++entity("xrArr") -> 16#027F9;
++entity("xrarr") -> 16#027F6;
++entity("xscr") -> 16#1D4CD;
++entity("xsqcup") -> 16#02A06;
++entity("xuplus") -> 16#02A04;
++entity("xutri") -> 16#025B3;
++entity("xvee") -> 16#022C1;
++entity("xwedge") -> 16#022C0;
++entity("yacute") -> 16#000FD;
++entity("yacy") -> 16#0044F;
++entity("ycirc") -> 16#00177;
++entity("ycy") -> 16#0044B;
++entity("yen") -> 16#000A5;
++entity("yfr") -> 16#1D536;
++entity("yicy") -> 16#00457;
++entity("yopf") -> 16#1D56A;
++entity("yscr") -> 16#1D4CE;
++entity("yucy") -> 16#0044E;
++entity("yuml") -> 16#000FF;
++entity("zacute") -> 16#0017A;
++entity("zcaron") -> 16#0017E;
++entity("zcy") -> 16#00437;
++entity("zdot") -> 16#0017C;
++entity("zeetrf") -> 16#02128;
++entity("zeta") -> 16#003B6;
++entity("zfr") -> 16#1D537;
++entity("zhcy") -> 16#00436;
++entity("zigrarr") -> 16#021DD;
++entity("zopf") -> 16#1D56B;
++entity("zscr") -> 16#1D4CF;
++entity("zwj") -> 16#0200D;
++entity("zwnj") -> 16#0200C;
++entity(_) -> undefined.
+ 
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ exhaustive_entity_test() ->
+     T = mochiweb_cover:clause_lookup_table(?MODULE, entity),
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_cookies.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cookies.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_cookies.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cookies.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -23,6 +23,7 @@
+ 
+ %% @type proplist() = [{Key::string(), Value::string()}].
+ %% @type header() = {Name::string(), Value::string()}.
++%% @type int_seconds() = integer().
+ 
+ %% @spec cookie(Key::string(), Value::string()) -> header()
+ %% @doc Short-hand for <code>cookie(Key, Value, [])</code>.
+@@ -30,7 +31,7 @@
+     cookie(Key, Value, []).
+ 
+ %% @spec cookie(Key::string(), Value::string(), Options::[Option]) -> header()
+-%% where Option = {max_age, integer()} | {local_time, {date(), time()}}
++%% where Option = {max_age, int_seconds()} | {local_time, {date(), time()}}
+ %%                | {domain, string()} | {path, string()}
+ %%                | {secure, true | false} | {http_only, true | false}
+ %%
+@@ -115,12 +116,33 @@
+         orelse erlang:error({cookie_quoting_required, V}),
+     V.
+ 
++
++%% Return a date in the form of: Wdy, DD-Mon-YYYY HH:MM:SS GMT
++%% See also: rfc2109: 10.1.2
++rfc2109_cookie_expires_date(LocalTime) ->
++    {{YYYY,MM,DD},{Hour,Min,Sec}} =
++        case calendar:local_time_to_universal_time_dst(LocalTime) of
++            [] ->
++                {Date, {Hour1, Min1, Sec1}} = LocalTime,
++                LocalTime2 = {Date, {Hour1 + 1, Min1, Sec1}},
++                case calendar:local_time_to_universal_time_dst(LocalTime2) of
++                    [Gmt]   -> Gmt;
++                    [_,Gmt] -> Gmt
++                end;
++            [Gmt]   -> Gmt;
++            [_,Gmt] -> Gmt
++        end,
++    DayNumber = calendar:day_of_the_week({YYYY,MM,DD}),
++    lists:flatten(
++      io_lib:format("~s, ~2.2.0w-~3.s-~4.4.0w ~2.2.0w:~2.2.0w:~2.2.0w GMT",
++                    [httpd_util:day(DayNumber),DD,httpd_util:month(MM),YYYY,Hour,Min,Sec])).
++
+ add_seconds(Secs, LocalTime) ->
+     Greg = calendar:datetime_to_gregorian_seconds(LocalTime),
+     calendar:gregorian_seconds_to_datetime(Greg + Secs).
+ 
+ age_to_cookie_date(Age, LocalTime) ->
+-    httpd_util:rfc1123_date(add_seconds(Age, LocalTime)).
++    rfc2109_cookie_expires_date(add_seconds(Age, LocalTime)).
+ 
+ %% @spec parse_cookie(string()) -> [{K::string(), V::string()}]
+ %% @doc Parse the contents of a Cookie header field, ignoring cookie
+@@ -203,8 +225,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ quote_test() ->
+     %% ?assertError eunit macro is not compatible with coverage module
+@@ -293,14 +315,14 @@
+     C2 = {"Set-Cookie",
+           "Customer=WILE_E_COYOTE; "
+           "Version=1; "
+-          "Expires=Tue, 15 May 2007 13:45:33 GMT; "
++          "Expires=Tue, 15-May-2007 13:45:33 GMT; "
+           "Max-Age=0"},
+     C2 = cookie("Customer", "WILE_E_COYOTE",
+                 [{max_age, -111}, {local_time, LocalTime}]),
+     C3 = {"Set-Cookie",
+           "Customer=WILE_E_COYOTE; "
+           "Version=1; "
+-          "Expires=Wed, 16 May 2007 13:45:50 GMT; "
++          "Expires=Wed, 16-May-2007 13:45:50 GMT; "
+           "Max-Age=86417"},
+     C3 = cookie("Customer", "WILE_E_COYOTE",
+                 [{max_age, 86417}, {local_time, LocalTime}]),
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_cover.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cover.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_cover.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cover.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -46,8 +46,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ foo_table(a) -> b;
+ foo_table("a") -> <<"b">>;
+ foo_table(123) -> {4, 3, 2};
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_echo.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_echo.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_echo.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_echo.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -11,11 +11,14 @@
+     mochiweb_socket_server:stop(?MODULE).
+ 
+ start() ->
+-    mochiweb_socket_server:start([{name, ?MODULE},
++    mochiweb_socket_server:start([{link, false} | options()]).
++
++options() ->
++    [{name, ?MODULE},
+                                   {port, 6789},
+                                   {ip, "127.0.0.1"},
+                                   {max, 1},
+-                                  {loop, {?MODULE, loop}}]).
++     {loop, {?MODULE, loop}}].
+ 
+ loop(Socket) ->
+     case mochiweb_socket:recv(Socket, 0, 30000) of
+@@ -33,6 +36,6 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ -endif.
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -6,22 +6,9 @@
+ -module(mochiweb).
+ -author('bob@mochimedia.com').
+ 
+--export([start/0, stop/0]).
+ -export([new_request/1, new_response/1]).
+ -export([all_loaded/0, all_loaded/1, reload/0]).
+-
+-%% @spec start() -> ok
+-%% @doc Start the MochiWeb server.
+-start() ->
+-    ensure_started(crypto),
+-    application:start(mochiweb).
+-
+-%% @spec stop() -> ok
+-%% @doc Stop the MochiWeb server.
+-stop() ->
+-    Res = application:stop(mochiweb),
+-    application:stop(crypto),
+-    Res.
++-export([ensure_started/1]).
+ 
+ reload() ->
+     [c:l(Module) || Module <- all_loaded()].
+@@ -78,8 +65,8 @@
+                           Code,
+                           mochiweb_headers:make(Headers)).
+ 
+-%% Internal API
+-
++%% @spec ensure_started(App::atom()) -> ok
++%% @doc Start the given App if it has not been started already.
+ ensure_started(App) ->
+     case application:start(App) of
+         ok ->
+@@ -92,8 +78,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ -record(treq, {path, body= <<>>, xreply= <<>>}).
+ 
+@@ -112,7 +98,7 @@
+         ssl ->
+             ServerOpts0 ++ [{ssl, true}, {ssl_opts, ssl_cert_opts()}]
+     end,
+-    {ok, Server} = mochiweb_http:start(ServerOpts),
++    {ok, Server} = mochiweb_http:start_link(ServerOpts),
+     Port = mochiweb_socket_server:get(Server, port),
+     Res = (catch ClientFun(Transport, Port)),
+     mochiweb_http:stop(Server),
+@@ -123,6 +109,8 @@
+     "/foo/bar/baz wibble quux" = R:get(path),
+     ok.
+ 
++-define(LARGE_TIMEOUT, 60).
++
+ single_http_GET_test() ->
+     do_GET(plain, 1).
+ 
+@@ -135,11 +123,13 @@
+ multiple_https_GET_test() ->
+     do_GET(ssl, 3).
+ 
+-hundred_http_GET_test() ->
+-    do_GET(plain, 100).
+-
+-hundred_https_GET_test() ->
+-    do_GET(ssl, 100).
++hundred_http_GET_test_() -> % note the underscore
++    {timeout, ?LARGE_TIMEOUT,
++     fun() -> ?assertEqual(ok, do_GET(plain,100)) end}.
++
++hundred_https_GET_test_() -> % note the underscore
++    {timeout, ?LARGE_TIMEOUT,
++     fun() -> ?assertEqual(ok, do_GET(ssl,100)) end}.
+ 
+ single_128_http_POST_test() ->
+     do_POST(plain, 128, 1).
+@@ -165,11 +155,13 @@
+ multiple_100K_https_POST_test() ->
+     do_POST(ssl, 102400, 3).
+ 
+-hundred_128_http_POST_test() ->
+-    do_POST(plain, 128, 100).
+-
+-hundred_128_https_POST_test() ->
+-    do_POST(ssl, 128, 100).
++hundred_128_http_POST_test_() -> % note the underscore
++    {timeout, ?LARGE_TIMEOUT,
++     fun() -> ?assertEqual(ok, do_POST(plain, 128, 100)) end}.
++
++hundred_128_https_POST_test_() -> % note the underscore
++    {timeout, ?LARGE_TIMEOUT,
++     fun() -> ?assertEqual(ok, do_POST(ssl, 128, 100)) end}.
+ 
+ do_GET(Transport, Times) ->
+     PathPrefix = "/whatever/",
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_headers.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_headers.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_headers.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_headers.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -6,7 +6,7 @@
+ -module(mochiweb_headers).
+ -author('bob@mochimedia.com').
+ -export([empty/0, from_list/1, insert/3, enter/3, get_value/2, lookup/2]).
+--export([delete_any/2, get_primary_value/2]).
++-export([delete_any/2, get_primary_value/2, get_combined_value/2]).
+ -export([default/3, enter_from_list/2, default_from_list/2]).
+ -export([to_list/1, make/1]).
+ -export([from_binary/1]).
+@@ -24,8 +24,8 @@
+ %% @doc Construct a headers() from the given list.
+ make(L) when is_list(L) ->
+     from_list(L);
+-%% assume a tuple is already mochiweb_headers.
+-make(T) when is_tuple(T) ->
++%% assume a non-list is already mochiweb_headers.
++make(T) ->
+     T.
+ 
+ %% @spec from_binary(iolist()) -> headers()
+@@ -112,6 +112,34 @@
+             lists:takewhile(fun (C) -> C =/= $; end, V)
+     end.
+ 
++%% @spec get_combined_value(key(), headers()) -> string() | undefined
++%% @doc Return the value from the given header using a case insensitive search.
++%%      If the value of the header is a comma-separated list where holds values
++%%      are all identical, the identical value will be returned.
++%%      undefined will be returned for keys that are not present or the
++%%      values in the list are not the same.
++%%
++%%      NOTE: The process isn't designed for a general purpose. If you need
++%%            to access all values in the combined header, please refer to
++%%            '''tokenize_header_value/1'''.
++%%
++%%      Section 4.2 of the RFC 2616 (HTTP 1.1) describes multiple message-header
++%%      fields with the same field-name may be present in a message if and only
++%%      if the entire field-value for that header field is defined as a
++%%      comma-separated list [i.e., #(values)].
++get_combined_value(K, T) ->
++    case get_value(K, T) of
++        undefined ->
++            undefined;
++        V ->
++            case sets:to_list(sets:from_list(tokenize_header_value(V))) of
++                [Val] ->
++                    Val;
++                _ ->
++                    undefined
++            end
++    end.
++
+ %% @spec lookup(key(), headers()) -> {value, {key(), string()}} | none
+ %% @doc Return the case preserved key and value for the given header using
+ %%      a case insensitive search. none will be returned for keys that are
+@@ -164,6 +192,49 @@
+ 
+ %% Internal API
+ 
++tokenize_header_value(undefined) ->
++    undefined;
++tokenize_header_value(V) ->
++    reversed_tokens(trim_and_reverse(V, false), [], []).
++
++trim_and_reverse([S | Rest], Reversed) when S=:=$ ; S=:=$\n; S=:=$\t ->
++    trim_and_reverse(Rest, Reversed);
++trim_and_reverse(V, false) ->
++    trim_and_reverse(lists:reverse(V), true);
++trim_and_reverse(V, true) ->
++    V.
++
++reversed_tokens([], [], Acc) ->
++    Acc;
++reversed_tokens([], Token, Acc) ->
++    [Token | Acc];
++reversed_tokens("\"" ++ Rest, [], Acc) ->
++    case extract_quoted_string(Rest, []) of
++        {String, NewRest} ->
++            reversed_tokens(NewRest, [], [String | Acc]);
++        undefined ->
++            undefined
++    end;
++reversed_tokens("\"" ++ _Rest, _Token, _Acc) ->
++    undefined;
++reversed_tokens([C | Rest], [], Acc) when C=:=$ ;C=:=$\n;C=:=$\t;C=:=$, ->
++    reversed_tokens(Rest, [], Acc);
++reversed_tokens([C | Rest], Token, Acc) when C=:=$ ;C=:=$\n;C=:=$\t;C=:=$, ->
++    reversed_tokens(Rest, [], [Token | Acc]);
++reversed_tokens([C | Rest], Token, Acc) ->
++    reversed_tokens(Rest, [C | Token], Acc);
++reversed_tokens(_, _, _) ->
++    undefeined.
++
++extract_quoted_string([], _Acc) ->
++    undefined;
++extract_quoted_string("\"\\" ++ Rest, Acc) ->
++    extract_quoted_string(Rest, "\"" ++ Acc);
++extract_quoted_string("\"" ++ Rest, Acc) ->
++    {Acc, Rest};
++extract_quoted_string([C | Rest], Acc) ->
++    extract_quoted_string(Rest, [C | Acc]).
++
+ expand({array, L}) ->
+     mochiweb_util:join(lists:reverse(L), ", ");
+ expand(V) ->
+@@ -195,8 +266,8 @@
+ %%
+ %% Tests.
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ make_test() ->
+     Identity = make([{hdr, foo}]),
+@@ -237,6 +308,37 @@
+        get_primary_value(<<"baz">>, H)),
+     ok.
+ 
++get_combined_value_test() ->
++    H = make([{hdr, foo}, {baz, <<"wibble,taco">>}, {content_length, "123, 123"},
++              {test, " 123,  123,     123  , 123,123 "},
++              {test2, "456,  123,     123  , 123"},
++              {test3, "123"}, {test4, " 123, "}]),
++    ?assertEqual(
++       "foo",
++       get_combined_value(hdr, H)),
++    ?assertEqual(
++       undefined,
++       get_combined_value(bar, H)),
++    ?assertEqual(
++       undefined,
++       get_combined_value(<<"baz">>, H)),
++    ?assertEqual(
++       "123",
++       get_combined_value(<<"content_length">>, H)),
++    ?assertEqual(
++       "123",
++       get_combined_value(<<"test">>, H)),
++    ?assertEqual(
++       undefined,
++       get_combined_value(<<"test2">>, H)),
++    ?assertEqual(
++       "123",
++       get_combined_value(<<"test3">>, H)),
++    ?assertEqual(
++       "123",
++       get_combined_value(<<"test4">>, H)),
++    ok.
++
+ set_cookie_test() ->
+     H = make([{"set-cookie", foo}, {"set-cookie", bar}, {"set-cookie", baz}]),
+     ?assertEqual(
+@@ -296,4 +398,23 @@
+     [] = ?MODULE:to_list(?MODULE:from_binary([<<"\r\n\r\n">>])),
+     ok.
+ 
++tokenize_header_value_test() ->
++    ?assertEqual(["a quote in a \"quote\"."],
++                 tokenize_header_value("\"a quote in a \\\"quote\\\".\"")),
++    ?assertEqual(["abc"], tokenize_header_value("abc")),
++    ?assertEqual(["abc", "def"], tokenize_header_value("abc def")),
++    ?assertEqual(["abc", "def"], tokenize_header_value("abc , def")),
++    ?assertEqual(["abc", "def"], tokenize_header_value(",abc ,, def,,")),
++    ?assertEqual(["abc def"], tokenize_header_value("\"abc def\"      ")),
++    ?assertEqual(["abc, def"], tokenize_header_value("\"abc, def\"")),
++    ?assertEqual(["\\a\\$"], tokenize_header_value("\"\\a\\$\"")),
++    ?assertEqual(["abc def", "foo, bar", "12345", ""],
++                 tokenize_header_value("\"abc def\" \"foo, bar\" , 12345, \"\"")),
++    ?assertEqual(undefined,
++                 tokenize_header_value(undefined)),
++    ?assertEqual(undefined,
++                 tokenize_header_value("umatched quote\"")),
++    ?assertEqual(undefined,
++                 tokenize_header_value("\"unmatched quote")).
++
+ -endif.
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_html.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_html.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_html.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_html.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -95,7 +95,12 @@
+     to_tokens({Tag0, [], Acc});
+ to_tokens({Tag0, Attrs, Acc}) ->
+     Tag = to_tag(Tag0),
+-    to_tokens([{Tag, Acc}], [{start_tag, Tag, Attrs, is_singleton(Tag)}]).
++    case is_singleton(Tag) of 
++        true ->
++            to_tokens([], [{start_tag, Tag, Attrs, true}]);
++        false ->
++            to_tokens([{Tag, Acc}], [{start_tag, Tag, Attrs, false}])
++    end.
+ 
+ %% @spec to_html([html_token()] | html_node()) -> iolist()
+ %% @doc Convert a list of html_token() to a HTML document.
+@@ -312,7 +317,8 @@
+             {Tag, S1} = tokenize_literal(B, ?ADV_COL(S, 2)),
+             {S2, _} = find_gt(B, S1),
+             {{end_tag, Tag}, S2};
+-        <<_:O/binary, "<", C, _/binary>> when ?IS_WHITESPACE(C) ->
++        <<_:O/binary, "<", C, _/binary>> 
++                when ?IS_WHITESPACE(C); not ?IS_LITERAL_SAFE(C) ->
+             %% This isn't really strict HTML
+             {{data, Data, _Whitespace}, S1} = tokenize_data(B, ?INC_COL(S)),
+             {{data, <<$<, Data/binary>>, false}, S1};
+@@ -501,8 +507,6 @@
+             tokenize_quoted_attr_value(B, S1, [Data|Acc], Q);
+         <<_:O/binary, Q, _/binary>> ->
+             { iolist_to_binary(lists:reverse(Acc)), ?INC_COL(S) };
+-        <<_:O/binary, $\n, _/binary>> ->
+-            { iolist_to_binary(lists:reverse(Acc)), ?INC_LINE(S) };
+         <<_:O/binary, C, _/binary>> ->
+             tokenize_quoted_attr_value(B, ?INC_COL(S), [C|Acc], Q)
+     end.
+@@ -603,32 +607,33 @@
+     end.
+ 
+ tokenize_charref(Bin, S=#decoder{offset=O}) ->
+-    tokenize_charref(Bin, S, O).
++    try
++        tokenize_charref(Bin, S, O)
++    catch
++        throw:invalid_charref ->
++            {{data, <<"&">>, false}, S}
++    end.
+ 
+ tokenize_charref(Bin, S=#decoder{offset=O}, Start) ->
+     case Bin of
+         <<_:O/binary>> ->
+-            <<_:Start/binary, Raw/binary>> = Bin,
+-            {{data, Raw, false}, S};
++            throw(invalid_charref);
+         <<_:O/binary, C, _/binary>> when ?IS_WHITESPACE(C)
+                                          orelse C =:= ?SQUOTE
+                                          orelse C =:= ?QUOTE
+                                          orelse C =:= $/
+                                          orelse C =:= $> ->
+-            Len = O - Start,
+-            <<_:Start/binary, Raw:Len/binary, _/binary>> = Bin,
+-            {{data, Raw, false}, S};
++            throw(invalid_charref);
+         <<_:O/binary, $;, _/binary>> ->
+             Len = O - Start,
+             <<_:Start/binary, Raw:Len/binary, _/binary>> = Bin,
+             Data = case mochiweb_charref:charref(Raw) of
+                        undefined ->
+-                           Start1 = Start - 1,
+-                           Len1 = Len + 2,
+-                           <<_:Start1/binary, R:Len1/binary, _/binary>> = Bin,
+-                           R;
+-                       Unichar ->
+-                           mochiutf8:codepoint_to_bytes(Unichar)
++                           throw(invalid_charref);
++                       Unichar when is_integer(Unichar) ->
++                           mochiutf8:codepoint_to_bytes(Unichar);
++                       Unichars when is_list(Unichars) ->
++                           unicode:characters_to_binary(Unichars)
+                    end,
+             {{data, Data, false}, ?INC_COL(S)};
+         _ ->
+@@ -759,8 +764,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ to_html_test() ->
+     ?assertEqual(
+@@ -1232,6 +1237,14 @@
+             { <<"img">>, [ { <<"src">>, <<"/images/icon>.png">> } ], [] }
+         ]},
+         mochiweb_html:parse(D2)),     
++
++    %% Quoted attributes can contain whitespace and newlines
++    D3 = <<"<html><a href=\"#\" onclick=\"javascript: test(1,\ntrue);\"></html>">>,
++    ?assertEqual(
++        {<<"html">>,[],[
++            { <<"a">>, [ { <<"href">>, <<"#">> }, {<<"onclick">>, <<"javascript: test(1,\ntrue);">>} ], [] }
++        ]},
++        mochiweb_html:parse(D3)),     
+     ok.
+ 
+ parse_missing_attr_name_test() ->
+@@ -1261,4 +1274,59 @@
+ 		mochiweb_html:parse(D0)),
+ 	ok.
+     
++to_html_singleton_test() ->
++    D0 = <<"<link />">>,
++    T0 = {<<"link">>,[],[]},
++    ?assertEqual(D0, iolist_to_binary(to_html(T0))),
++
++    D1 = <<"<head><link /></head>">>,
++    T1 = {<<"head">>,[],[{<<"link">>,[],[]}]},
++    ?assertEqual(D1, iolist_to_binary(to_html(T1))),
++
++    D2 = <<"<head><link /><link /></head>">>,
++    T2 = {<<"head">>,[],[{<<"link">>,[],[]}, {<<"link">>,[],[]}]},
++    ?assertEqual(D2, iolist_to_binary(to_html(T2))),
++
++    %% Make sure singletons are converted to singletons.
++    D3 = <<"<head><link /></head>">>,
++    T3 = {<<"head">>,[],[{<<"link">>,[],[<<"funny">>]}]},
++    ?assertEqual(D3, iolist_to_binary(to_html(T3))),
++
++    D4 = <<"<link />">>,
++    T4 = {<<"link">>,[],[<<"funny">>]},
++    ?assertEqual(D4, iolist_to_binary(to_html(T4))),
++
++    ok.
++
++parse_amp_test_() ->
++    [?_assertEqual(
++       {<<"html">>,[],
++        [{<<"body">>,[{<<"onload">>,<<"javascript:A('1&2')">>}],[]}]},
++       mochiweb_html:parse("<html><body onload=\"javascript:A('1&2')\"></body></html>")),
++     ?_assertEqual(
++        {<<"html">>,[],
++         [{<<"body">>,[{<<"onload">>,<<"javascript:A('1& 2')">>}],[]}]},
++        mochiweb_html:parse("<html><body onload=\"javascript:A('1& 2')\"></body></html>")),
++     ?_assertEqual(
++        {<<"html">>,[],
++         [{<<"body">>,[],[<<"& ">>]}]},
++        mochiweb_html:parse("<html><body>& </body></html>")),
++     ?_assertEqual(
++        {<<"html">>,[],
++         [{<<"body">>,[],[<<"&">>]}]},
++        mochiweb_html:parse("<html><body>&</body></html>"))].
++
++parse_unescaped_lt_test() ->
++    D1 = <<"<div> < < <a href=\"/\">Back</a></div>">>,
++    ?assertEqual(
++        {<<"div">>, [], [<<" < < ">>, {<<"a">>, [{<<"href">>, <<"/">>}], 
++                                       [<<"Back">>]}]},
++        mochiweb_html:parse(D1)),
++
++    D2 = <<"<div> << <a href=\"/\">Back</a></div>">>,
++    ?assertEqual(
++        {<<"div">>, [], [<<" << ">>, {<<"a">>, [{<<"href">>, <<"/">>}], 
++                                      [<<"Back">>]}]},
++    mochiweb_html:parse(D2)).
++
+ -endif.
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_http.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_http.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_http.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_http.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -5,13 +5,13 @@
+ 
+ -module(mochiweb_http).
+ -author('bob@mochimedia.com').
+--export([start/0, start/1, stop/0, stop/1]).
+--export([loop/2, default_body/1]).
++-export([start/1, start_link/1, stop/0, stop/1]).
++-export([loop/2]).
+ -export([after_response/2, reentry/1]).
+ -export([parse_range_request/1, range_skip_length/2]).
+ 
+--define(REQUEST_RECV_TIMEOUT, 300000).   % timeout waiting for request line
+--define(HEADERS_RECV_TIMEOUT, 30000). % timeout waiting for headers
++-define(REQUEST_RECV_TIMEOUT, 300000).   %% timeout waiting for request line
++-define(HEADERS_RECV_TIMEOUT, 30000).    %% timeout waiting for headers
+ 
+ -define(MAX_HEADERS, 1000).
+ -define(DEFAULTS, [{name, ?MODULE},
+@@ -19,9 +19,7 @@
+ 
+ parse_options(Options) ->
+     {loop, HttpLoop} = proplists:lookup(loop, Options),
+-    Loop = fun (S) ->
+-                   ?MODULE:loop(S, HttpLoop)
+-           end,
++    Loop = {?MODULE, loop, [HttpLoop]},
+     Options1 = [{loop, Loop} | proplists:delete(loop, Options)],
+     mochilists:set_defaults(?DEFAULTS, Options1).
+ 
+@@ -31,15 +29,12 @@
+ stop(Name) ->
+     mochiweb_socket_server:stop(Name).
+ 
+-start() ->
+-    start([{ip, "127.0.0.1"},
+-           {loop, {?MODULE, default_body}}]).
+-
+ %% @spec start(Options) -> ServerRet
+ %%     Options = [option()]
+ %%     Option = {name, atom()} | {ip, string() | tuple()} | {backlog, integer()}
+ %%              | {nodelay, boolean()} | {acceptor_pool_size, integer()}
+ %%              | {ssl, boolean()} | {profile_fun, undefined | (Props) -> ok}
++%%              | {link, false}
+ %% @doc Start a mochiweb server.
+ %%      profile_fun is used to profile accept timing.
+ %%      After each accept, if defined, profile_fun is called with a proplist of a subset of the mochiweb_socket_server state and timing information.
+@@ -48,62 +43,18 @@
+ start(Options) ->
+     mochiweb_socket_server:start(parse_options(Options)).
+ 
+-frm(Body) ->
+-    ["<html><head></head><body>"
+-     "<form method=\"POST\">"
+-     "<input type=\"hidden\" value=\"message\" name=\"hidden\"/>"
+-     "<input type=\"submit\" value=\"regular POST\">"
+-     "</form>"
+-     "<br />"
+-     "<form method=\"POST\" enctype=\"multipart/form-data\""
+-     " action=\"/multipart\">"
+-     "<input type=\"hidden\" value=\"multipart message\" name=\"hidden\"/>"
+-     "<input type=\"file\" name=\"file\"/>"
+-     "<input type=\"submit\" value=\"multipart POST\" />"
+-     "</form>"
+-     "<pre>", Body, "</pre>"
+-     "</body></html>"].
+-
+-default_body(Req, M, "/chunked") when M =:= 'GET'; M =:= 'HEAD' ->
+-    Res = Req:ok({"text/plain", [], chunked}),
+-    Res:write_chunk("First chunk\r\n"),
+-    timer:sleep(5000),
+-    Res:write_chunk("Last chunk\r\n"),
+-    Res:write_chunk("");
+-default_body(Req, M, _Path) when M =:= 'GET'; M =:= 'HEAD' ->
+-    Body = io_lib:format("~p~n", [[{parse_qs, Req:parse_qs()},
+-                                   {parse_cookie, Req:parse_cookie()},
+-                                   Req:dump()]]),
+-    Req:ok({"text/html",
+-            [mochiweb_cookies:cookie("mochiweb_http", "test_cookie")],
+-            frm(Body)});
+-default_body(Req, 'POST', "/multipart") ->
+-    Body = io_lib:format("~p~n", [[{parse_qs, Req:parse_qs()},
+-                                   {parse_cookie, Req:parse_cookie()},
+-                                   {body, Req:recv_body()},
+-                                   Req:dump()]]),
+-    Req:ok({"text/html", [], frm(Body)});
+-default_body(Req, 'POST', _Path) ->
+-    Body = io_lib:format("~p~n", [[{parse_qs, Req:parse_qs()},
+-                                   {parse_cookie, Req:parse_cookie()},
+-                                   {parse_post, Req:parse_post()},
+-                                   Req:dump()]]),
+-    Req:ok({"text/html", [], frm(Body)});
+-default_body(Req, _Method, _Path) ->
+-    Req:respond({501, [], []}).
+-
+-default_body(Req) ->
+-    default_body(Req, Req:get(method), Req:get(path)).
++start_link(Options) ->
++    mochiweb_socket_server:start_link(parse_options(Options)).
+ 
+ loop(Socket, Body) ->
+-    mochiweb_socket:setopts(Socket, [{packet, http}]),
++    ok = mochiweb_socket:setopts(Socket, [{packet, http}]),
+     request(Socket, Body).
+ 
+ request(Socket, Body) ->
+-    mochiweb_socket:setopts(Socket, [{active, once}]),
++    ok = mochiweb_socket:setopts(Socket, [{active, once}]),
+     receive
+         {Protocol, _, {http_request, Method, Path, Version}} when Protocol == http orelse Protocol == ssl ->
+-            mochiweb_socket:setopts(Socket, [{packet, httph}]),
++            ok = mochiweb_socket:setopts(Socket, [{packet, httph}]),
+             headers(Socket, {Method, Path, Version}, [], Body, 0);
+         {Protocol, _, {http_error, "\r\n"}} when Protocol == http orelse Protocol == ssl ->
+             request(Socket, Body);
+@@ -112,6 +63,13 @@
+         {tcp_closed, _} ->
+             mochiweb_socket:close(Socket),
+             exit(normal);
++        {ssl_closed, _} ->
++            mochiweb_socket:close(Socket),
++            exit(normal);
++        {tcp_error,_,emsgsize} ->
++            % R15B02 returns this then closes the socket, so close and exit
++            mochiweb_socket:close(Socket),
++            exit(normal);
+         _Other ->
+             handle_invalid_request(Socket)
+     after ?REQUEST_RECV_TIMEOUT ->
+@@ -126,10 +84,10 @@
+ 
+ headers(Socket, Request, Headers, _Body, ?MAX_HEADERS) ->
+     %% Too many headers sent, bad request.
+-    mochiweb_socket:setopts(Socket, [{packet, raw}]),
++    ok = mochiweb_socket:setopts(Socket, [{packet, raw}]),
+     handle_invalid_request(Socket, Request, Headers);
+ headers(Socket, Request, Headers, Body, HeaderCount) ->
+-    mochiweb_socket:setopts(Socket, [{active, once}]),
++    ok = mochiweb_socket:setopts(Socket, [{active, once}]),
+     receive
+         {Protocol, _, http_eoh} when Protocol == http orelse Protocol == ssl ->
+             Req = new_request(Socket, Request, Headers),
+@@ -141,6 +99,10 @@
+         {tcp_closed, _} ->
+             mochiweb_socket:close(Socket),
+             exit(normal);
++        {tcp_error,_,emsgsize} ->
++            % R15B02 returns this then closes the socket, so close and exit
++            mochiweb_socket:close(Socket),
++            exit(normal);
+         _Other ->
+             handle_invalid_request(Socket, Request, Headers)
+     after ?HEADERS_RECV_TIMEOUT ->
+@@ -148,14 +110,19 @@
+         exit(normal)
+     end.
+ 
++call_body({M, F, A}, Req) ->
++    erlang:apply(M, F, [Req | A]);
+ call_body({M, F}, Req) ->
+     M:F(Req);
+ call_body(Body, Req) ->
+     Body(Req).
+ 
++-spec handle_invalid_request(term()) -> no_return().
+ handle_invalid_request(Socket) ->
+-    handle_invalid_request(Socket, {'GET', {abs_path, "/"}, {0,9}}, []).
++    handle_invalid_request(Socket, {'GET', {abs_path, "/"}, {0,9}}, []),
++    exit(normal).
+ 
++-spec handle_invalid_request(term(), term(), term()) -> no_return().
+ handle_invalid_request(Socket, Request, RevHeaders) ->
+     Req = new_request(Socket, Request, RevHeaders),
+     Req:respond({400, [], []}),
+@@ -163,7 +130,7 @@
+     exit(normal).
+ 
+ new_request(Socket, Request, RevHeaders) ->
+-    mochiweb_socket:setopts(Socket, [{packet, raw}]),
++    ok = mochiweb_socket:setopts(Socket, [{packet, raw}]),
+     mochiweb:new_request({Socket, Request, lists:reverse(RevHeaders)}).
+ 
+ after_response(Body, Req) ->
+@@ -174,6 +141,7 @@
+             exit(normal);
+         false ->
+             Req:cleanup(),
++            erlang:garbage_collect(),
+             ?MODULE:loop(Socket, Body)
+     end.
+ 
+@@ -211,6 +179,8 @@
+             invalid_range;
+         {Start, End} when 0 =< Start, Start =< End, End < Size ->
+             {Start, End - Start + 1};
++        {Start, End} when 0 =< Start, Start =< End, End >= Size ->
++            {Start, Size - Start};
+         {_OutOfRange, _End} ->
+             invalid_range
+     end.
+@@ -218,8 +188,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ range_test() ->
+     %% valid, single ranges
+@@ -265,19 +235,23 @@
+     BodySizeLess1 = BodySize - 1,
+     ?assertEqual({BodySizeLess1, 1},
+                  range_skip_length({BodySize - 1, none}, BodySize)),
++    ?assertEqual({BodySizeLess1, 1},
++                 range_skip_length({BodySize - 1, BodySize+5}, BodySize)),
++    ?assertEqual({BodySizeLess1, 1},
++                 range_skip_length({BodySize - 1, BodySize}, BodySize)),
+ 
+     %% out of range, return whole thing
+     ?assertEqual({0, BodySize},
+                  range_skip_length({none, BodySize + 1}, BodySize)),
+     ?assertEqual({0, BodySize},
+                  range_skip_length({none, -1}, BodySize)),
++    ?assertEqual({0, BodySize},
++                 range_skip_length({0, BodySize + 1}, BodySize)),
+ 
+     %% invalid ranges
+     ?assertEqual(invalid_range,
+                  range_skip_length({-1, 30}, BodySize)),
+     ?assertEqual(invalid_range,
+-                 range_skip_length({0, BodySize + 1}, BodySize)),
+-    ?assertEqual(invalid_range,
+                  range_skip_length({-1, BodySize + 1}, BodySize)),
+     ?assertEqual(invalid_range,
+                  range_skip_length({BodySize, 40}, BodySize)),
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_io.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_io.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_io.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_io.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -38,9 +38,6 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
+-
+-
+-
++-include_lib("eunit/include/eunit.hrl").
+ -endif.
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_mime.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_mime.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_mime.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_mime.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -11,72 +11,393 @@
+ %% @doc Given a filename extension (e.g. ".html") return a guess for the MIME
+ %%      type such as "text/html". Will return the atom undefined if no good
+ %%      guess is available.
+-from_extension(".html") ->
+-    "text/html";
+-from_extension(".xhtml") ->
+-    "application/xhtml+xml";
+-from_extension(".xml") ->
+-    "application/xml";
+-from_extension(".css") ->
+-    "text/css";
++
++from_extension(".stl") ->
++    "application/SLA";
++from_extension(".stp") ->
++    "application/STEP";
++from_extension(".step") ->
++    "application/STEP";
++from_extension(".dwg") ->
++    "application/acad";
++from_extension(".ez") ->
++    "application/andrew-inset";
++from_extension(".ccad") ->
++    "application/clariscad";
++from_extension(".drw") ->
++    "application/drafting";
++from_extension(".tsp") ->
++    "application/dsptype";
++from_extension(".dxf") ->
++    "application/dxf";
++from_extension(".xls") ->
++    "application/excel";
++from_extension(".unv") ->
++    "application/i-deas";
++from_extension(".jar") ->
++    "application/java-archive";
++from_extension(".hqx") ->
++    "application/mac-binhex40";
++from_extension(".cpt") ->
++    "application/mac-compactpro";
++from_extension(".pot") ->
++    "application/vnd.ms-powerpoint";
++from_extension(".ppt") ->
++    "application/vnd.ms-powerpoint";
++from_extension(".dms") ->
++    "application/octet-stream";
++from_extension(".lha") ->
++    "application/octet-stream";
++from_extension(".lzh") ->
++    "application/octet-stream";
++from_extension(".oda") ->
++    "application/oda";
++from_extension(".ogg") ->
++    "application/ogg";
++from_extension(".ogm") ->
++    "application/ogg";
++from_extension(".pdf") ->
++    "application/pdf";
++from_extension(".pgp") ->
++    "application/pgp";
++from_extension(".ai") ->
++    "application/postscript";
++from_extension(".eps") ->
++    "application/postscript";
++from_extension(".ps") ->
++    "application/postscript";
++from_extension(".prt") ->
++    "application/pro_eng";
++from_extension(".rtf") ->
++    "application/rtf";
++from_extension(".smi") ->
++    "application/smil";
++from_extension(".smil") ->
++    "application/smil";
++from_extension(".sol") ->
++    "application/solids";
++from_extension(".vda") ->
++    "application/vda";
++from_extension(".xlm") ->
++    "application/vnd.ms-excel";
++from_extension(".cod") ->
++    "application/vnd.rim.cod";
++from_extension(".pgn") ->
++    "application/x-chess-pgn";
++from_extension(".cpio") ->
++    "application/x-cpio";
++from_extension(".csh") ->
++    "application/x-csh";
++from_extension(".deb") ->
++    "application/x-debian-package";
++from_extension(".dcr") ->
++    "application/x-director";
++from_extension(".dir") ->
++    "application/x-director";
++from_extension(".dxr") ->
++    "application/x-director";
++from_extension(".gz") ->
++    "application/x-gzip";
++from_extension(".hdf") ->
++    "application/x-hdf";
++from_extension(".ipx") ->
++    "application/x-ipix";
++from_extension(".ips") ->
++    "application/x-ipscript";
+ from_extension(".js") ->
+     "application/x-javascript";
+-from_extension(".jpg") ->
+-    "image/jpeg";
+-from_extension(".gif") ->
+-    "image/gif";
+-from_extension(".png") ->
+-    "image/png";
++from_extension(".skd") ->
++    "application/x-koan";
++from_extension(".skm") ->
++    "application/x-koan";
++from_extension(".skp") ->
++    "application/x-koan";
++from_extension(".skt") ->
++    "application/x-koan";
++from_extension(".latex") ->
++    "application/x-latex";
++from_extension(".lsp") ->
++    "application/x-lisp";
++from_extension(".scm") ->
++    "application/x-lotusscreencam";
++from_extension(".mif") ->
++    "application/x-mif";
++from_extension(".com") ->
++    "application/x-msdos-program";
++from_extension(".exe") ->
++    "application/octet-stream";
++from_extension(".cdf") ->
++    "application/x-netcdf";
++from_extension(".nc") ->
++    "application/x-netcdf";
++from_extension(".pl") ->
++    "application/x-perl";
++from_extension(".pm") ->
++    "application/x-perl";
++from_extension(".rar") ->
++    "application/x-rar-compressed";
++from_extension(".sh") ->
++    "application/x-sh";
++from_extension(".shar") ->
++    "application/x-shar";
+ from_extension(".swf") ->
+     "application/x-shockwave-flash";
+-from_extension(".zip") ->
+-    "application/zip";
+-from_extension(".bz2") ->
+-    "application/x-bzip2";
+-from_extension(".gz") ->
+-    "application/x-gzip";
++from_extension(".sit") ->
++    "application/x-stuffit";
++from_extension(".sv4cpio") ->
++    "application/x-sv4cpio";
++from_extension(".sv4crc") ->
++    "application/x-sv4crc";
++from_extension(".tar.gz") ->
++    "application/x-tar-gz";
++from_extension(".tgz") ->
++    "application/x-tar-gz";
+ from_extension(".tar") ->
+     "application/x-tar";
+-from_extension(".tgz") ->
+-    "application/x-gzip";
++from_extension(".tcl") ->
++    "application/x-tcl";
++from_extension(".texi") ->
++    "application/x-texinfo";
++from_extension(".texinfo") ->
++    "application/x-texinfo";
++from_extension(".man") ->
++    "application/x-troff-man";
++from_extension(".me") ->
++    "application/x-troff-me";
++from_extension(".ms") ->
++    "application/x-troff-ms";
++from_extension(".roff") ->
++    "application/x-troff";
++from_extension(".t") ->
++    "application/x-troff";
++from_extension(".tr") ->
++    "application/x-troff";
++from_extension(".ustar") ->
++    "application/x-ustar";
++from_extension(".src") ->
++    "application/x-wais-source";
++from_extension(".zip") ->
++    "application/zip";
++from_extension(".tsi") ->
++    "audio/TSP-audio";
++from_extension(".au") ->
++    "audio/basic";
++from_extension(".snd") ->
++    "audio/basic";
++from_extension(".kar") ->
++    "audio/midi";
++from_extension(".mid") ->
++    "audio/midi";
++from_extension(".midi") ->
++    "audio/midi";
++from_extension(".mp2") ->
++    "audio/mpeg";
++from_extension(".mp3") ->
++    "audio/mpeg";
++from_extension(".mpga") ->
++    "audio/mpeg";
++from_extension(".aif") ->
++    "audio/x-aiff";
++from_extension(".aifc") ->
++    "audio/x-aiff";
++from_extension(".aiff") ->
++    "audio/x-aiff";
++from_extension(".m3u") ->
++    "audio/x-mpegurl";
++from_extension(".wax") ->
++    "audio/x-ms-wax";
++from_extension(".wma") ->
++    "audio/x-ms-wma";
++from_extension(".rpm") ->
++    "audio/x-pn-realaudio-plugin";
++from_extension(".ram") ->
++    "audio/x-pn-realaudio";
++from_extension(".rm") ->
++    "audio/x-pn-realaudio";
++from_extension(".ra") ->
++    "audio/x-realaudio";
++from_extension(".wav") ->
++    "audio/x-wav";
++from_extension(".pdb") ->
++    "chemical/x-pdb";
++from_extension(".ras") ->
++    "image/cmu-raster";
++from_extension(".gif") ->
++    "image/gif";
++from_extension(".ief") ->
++    "image/ief";
++from_extension(".jpe") ->
++    "image/jpeg";
++from_extension(".jpeg") ->
++    "image/jpeg";
++from_extension(".jpg") ->
++    "image/jpeg";
++from_extension(".jp2") ->
++    "image/jp2";
++from_extension(".png") ->
++    "image/png";
++from_extension(".tif") ->
++    "image/tiff";
++from_extension(".tiff") ->
++    "image/tiff";
++from_extension(".pnm") ->
++    "image/x-portable-anymap";
++from_extension(".pbm") ->
++    "image/x-portable-bitmap";
++from_extension(".pgm") ->
++    "image/x-portable-graymap";
++from_extension(".ppm") ->
++    "image/x-portable-pixmap";
++from_extension(".rgb") ->
++    "image/x-rgb";
++from_extension(".xbm") ->
++    "image/x-xbitmap";
++from_extension(".xwd") ->
++    "image/x-xwindowdump";
++from_extension(".iges") ->
++    "model/iges";
++from_extension(".igs") ->
++    "model/iges";
++from_extension(".mesh") ->
++    "model/mesh";
++from_extension(".") ->
++    "";
++from_extension(".msh") ->
++    "model/mesh";
++from_extension(".silo") ->
++    "model/mesh";
++from_extension(".vrml") ->
++    "model/vrml";
++from_extension(".wrl") ->
++    "model/vrml";
++from_extension(".css") ->
++    "text/css";
++from_extension(".htm") ->
++    "text/html";
++from_extension(".html") ->
++    "text/html";
++from_extension(".asc") ->
++    "text/plain";
++from_extension(".c") ->
++    "text/plain";
++from_extension(".cc") ->
++    "text/plain";
++from_extension(".f90") ->
++    "text/plain";
++from_extension(".f") ->
++    "text/plain";
++from_extension(".hh") ->
++    "text/plain";
++from_extension(".m") ->
++    "text/plain";
+ from_extension(".txt") ->
+     "text/plain";
+-from_extension(".doc") ->
+-    "application/msword";
+-from_extension(".pdf") ->
+-    "application/pdf";
+-from_extension(".xls") ->
+-    "application/vnd.ms-excel";
+-from_extension(".rtf") ->
+-    "application/rtf";
++from_extension(".rtx") ->
++    "text/richtext";
++from_extension(".sgm") ->
++    "text/sgml";
++from_extension(".sgml") ->
++    "text/sgml";
++from_extension(".tsv") ->
++    "text/tab-separated-values";
++from_extension(".jad") ->
++    "text/vnd.sun.j2me.app-descriptor";
++from_extension(".etx") ->
++    "text/x-setext";
++from_extension(".xml") ->
++    "application/xml";
++from_extension(".dl") ->
++    "video/dl";
++from_extension(".fli") ->
++    "video/fli";
++from_extension(".flv") ->
++    "video/x-flv";
++from_extension(".gl") ->
++    "video/gl";
++from_extension(".mp4") ->
++    "video/mp4";
++from_extension(".mpe") ->
++    "video/mpeg";
++from_extension(".mpeg") ->
++    "video/mpeg";
++from_extension(".mpg") ->
++    "video/mpeg";
+ from_extension(".mov") ->
+     "video/quicktime";
+-from_extension(".mp3") ->
+-    "audio/mpeg";
++from_extension(".qt") ->
++    "video/quicktime";
++from_extension(".viv") ->
++    "video/vnd.vivo";
++from_extension(".vivo") ->
++    "video/vnd.vivo";
++from_extension(".asf") ->
++    "video/x-ms-asf";
++from_extension(".asx") ->
++    "video/x-ms-asx";
++from_extension(".wmv") ->
++    "video/x-ms-wmv";
++from_extension(".wmx") ->
++    "video/x-ms-wmx";
++from_extension(".wvx") ->
++    "video/x-ms-wvx";
++from_extension(".avi") ->
++    "video/x-msvideo";
++from_extension(".movie") ->
++    "video/x-sgi-movie";
++from_extension(".mime") ->
++    "www/mime";
++from_extension(".ice") ->
++    "x-conference/x-cooltalk";
++from_extension(".vrm") ->
++    "x-world/x-vrml";
++from_extension(".spx") ->
++    "audio/ogg";
++from_extension(".xhtml") ->
++    "application/xhtml+xml";
++from_extension(".bz2") ->
++    "application/x-bzip2";
++from_extension(".doc") ->
++    "application/msword";
+ from_extension(".z") ->
+     "application/x-compress";
+-from_extension(".wav") ->
+-    "audio/x-wav";
+ from_extension(".ico") ->
+     "image/x-icon";
+ from_extension(".bmp") ->
+     "image/bmp";
+ from_extension(".m4a") ->
+     "audio/mpeg";
+-from_extension(".m3u") ->
+-    "audio/x-mpegurl";
+-from_extension(".exe") ->
+-    "application/octet-stream";
+ from_extension(".csv") ->
+     "text/csv";
++from_extension(".eot") ->
++    "application/vnd.ms-fontobject";
++from_extension(".m4v") ->
++    "video/mp4";
++from_extension(".svg") ->
++    "image/svg+xml";
++from_extension(".svgz") ->
++    "image/svg+xml";
++from_extension(".ttc") ->
++    "application/x-font-ttf";
++from_extension(".ttf") ->
++    "application/x-font-ttf";
++from_extension(".vcf") ->
++    "text/x-vcard";
++from_extension(".webm") ->
++    "video/web";
++from_extension(".webp") ->
++    "image/web";
++from_extension(".woff") ->
++    "application/x-font-woff";
++from_extension(".otf") ->
++    "font/opentype";
+ from_extension(_) ->
+     undefined.
+ 
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ exhaustive_from_extension_test() ->
+     T = mochiweb_cover:clause_lookup_table(?MODULE, from_extension),
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_multipart.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_multipart.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_multipart.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_multipart.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -128,7 +128,7 @@
+ 
+ parse_multipart_request(Req, Callback) ->
+     %% TODO: Support chunked?
+-    Length = list_to_integer(Req:get_header_value("content-length")),
++    Length = list_to_integer(Req:get_combined_header_value("content-length")),
+     Boundary = iolist_to_binary(
+                  get_boundary(Req:get_header_value("content-type"))),
+     Prefix = <<"\r\n--", Boundary/binary>>,
+@@ -240,24 +240,22 @@
+             S
+     end.
+ 
+-find_in_binary(B, Data) when size(B) > 0 ->
+-    case size(Data) - size(B) of
++%% @spec find_in_binary(Pattern::binary(), Data::binary()) ->
++%%            {exact, N} | {partial, N, K} | not_found
++%% @doc Searches for the given pattern in the given binary.
++find_in_binary(P, Data) when size(P) > 0 ->
++    PS = size(P),
++    DS = size(Data),
++    case DS - PS of
+         Last when Last < 0 ->
+-            partial_find(B, Data, 0, size(Data));
++            partial_find(P, Data, 0, DS);
+         Last ->
+-            find_in_binary(B, size(B), Data, 0, Last)
++            case binary:match(Data, P) of
++                {Pos, _} -> {exact, Pos};
++                nomatch -> partial_find(P, Data, Last+1, PS-1)
++            end
+     end.
+ 
+-find_in_binary(B, BS, D, N, Last) when N =< Last->
+-    case D of
+-        <<_:N/binary, B:BS/binary, _/binary>> ->
+-            {exact, N};
+-        _ ->
+-            find_in_binary(B, BS, D, 1 + N, Last)
+-    end;
+-find_in_binary(B, BS, D, N, Last) when N =:= 1 + Last ->
+-    partial_find(B, D, N, BS - 1).
+-
+ partial_find(_B, _D, _N, 0) ->
+     not_found;
+ partial_find(B, D, N, K) ->
+@@ -295,8 +293,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ ssl_cert_opts() ->
+     EbinDir = filename:dirname(code:which(?MODULE)),
+@@ -313,7 +311,7 @@
+         ssl ->
+             ServerOpts0 ++ [{ssl, true}, {ssl_opts, ssl_cert_opts()}]
+     end,
+-    {ok, Server} = mochiweb_socket_server:start(ServerOpts),
++    {ok, Server} = mochiweb_socket_server:start_link(ServerOpts),
+     Port = mochiweb_socket_server:get(Server, port),
+     ClientOpts = [binary, {active, false}],
+     {ok, Client} = case Transport of
+@@ -821,4 +819,54 @@
+                                        10))),
+     ok.
+ 
++%% @todo Move somewhere more appropriate than in the test suite
++
++multipart_parsing_benchmark_test() ->
++  run_multipart_parsing_benchmark(1).
++
++run_multipart_parsing_benchmark(0) -> ok;
++run_multipart_parsing_benchmark(N) ->
++     multipart_parsing_benchmark(),
++     run_multipart_parsing_benchmark(N-1).
++
++multipart_parsing_benchmark() ->
++    ContentType = "multipart/form-data; boundary=----------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5",
++    Chunk = binary:copy(<<"This Is_%Some=Quite0Long4String2Used9For7BenchmarKing.5">>, 102400),
++    BinContent = <<"------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"Filename\"\r\n\r\nhello.txt\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"success_action_status\"\r\n\r\n201\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"file\"; filename=\"hello.txt\"\r\nContent-Type: application/octet-stream\r\n\r\n", Chunk/binary, "\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"Upload\"\r\n\r\nSubmit Query\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5--">>,
++    Expect = [{headers,
++               [{"content-disposition",
++                 {"form-data", [{"name", "Filename"}]}}]},
++              {body, <<"hello.txt">>},
++              body_end,
++              {headers,
++               [{"content-disposition",
++                 {"form-data", [{"name", "success_action_status"}]}}]},
++              {body, <<"201">>},
++              body_end,
++              {headers,
++               [{"content-disposition",
++                 {"form-data", [{"name", "file"}, {"filename", "hello.txt"}]}},
++                {"content-type", {"application/octet-stream", []}}]},
++              {body, Chunk},
++              body_end,
++              {headers,
++               [{"content-disposition",
++                 {"form-data", [{"name", "Upload"}]}}]},
++              {body, <<"Submit Query">>},
++              body_end,
++              eof],
++    TestCallback = fun (Next) -> test_callback(Next, Expect) end,
++    ServerFun = fun (Socket) ->
++                        ok = mochiweb_socket:send(Socket, BinContent),
++                        exit(normal)
++                end,
++    ClientFun = fun (Socket) ->
++                        Req = fake_request(Socket, ContentType,
++                                           byte_size(BinContent)),
++                        Res = parse_multipart_request(Req, TestCallback),
++                        {0, <<>>, ok} = Res,
++                        ok
++                end,
++    ok = with_socket_server(plain, ServerFun, ClientFun),
++    ok.
+ -endif.
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_request.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_request.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -3,7 +3,7 @@
+ 
+ %% @doc MochiWeb HTTP Request abstraction.
+ 
+--module(mochiweb_request, [Socket, Method, RawPath, Version, Headers]).
++-module(mochiweb_request).
+ -author('bob@mochimedia.com').
+ 
+ -include_lib("kernel/include/file.hrl").
+@@ -11,17 +11,18 @@
+ 
+ -define(QUIP, "Any of you quaids got a smint?").
+ 
+--export([get_header_value/1, get_primary_header_value/1, get/1, dump/0]).
+--export([send/1, recv/1, recv/2, recv_body/0, recv_body/1, stream_body/3]).
+--export([start_response/1, start_response_length/1, start_raw_response/1]).
+--export([respond/1, ok/1]).
+--export([not_found/0, not_found/1]).
+--export([parse_post/0, parse_qs/0]).
+--export([should_close/0, cleanup/0]).
+--export([parse_cookie/0, get_cookie_value/1]).
+--export([serve_file/2, serve_file/3]).
+--export([accepted_encodings/1]).
+--export([accepts_content_type/1]).
++-export([new/5]).
++-export([get_header_value/2, get_primary_header_value/2, get_combined_header_value/2, get/2, dump/1]).
++-export([send/2, recv/2, recv/3, recv_body/1, recv_body/2, stream_body/4]).
++-export([start_response/2, start_response_length/2, start_raw_response/2]).
++-export([respond/2, ok/2]).
++-export([not_found/1, not_found/2]).
++-export([parse_post/1, parse_qs/1]).
++-export([should_close/1, cleanup/1]).
++-export([parse_cookie/1, get_cookie_value/2]).
++-export([serve_file/3, serve_file/4]).
++-export([accepted_encodings/2]).
++-export([accepts_content_type/2, accepted_content_types/2]).
+ 
+ -define(SAVE_QS, mochiweb_request_qs).
+ -define(SAVE_PATH, mochiweb_request_path).
+@@ -32,11 +33,10 @@
+ -define(SAVE_COOKIE, mochiweb_request_cookie).
+ -define(SAVE_FORCE_CLOSE, mochiweb_request_force_close).
+ 
+-%% @type iolist() = [iolist() | binary() | char()].
+-%% @type iodata() = binary() | iolist().
+ %% @type key() = atom() | string() | binary()
+ %% @type value() = atom() | string() | binary() | integer()
+ %% @type headers(). A mochiweb_headers structure.
++%% @type request(). A mochiweb_request parameterized module instance.
+ %% @type response(). A mochiweb_response parameterized module instance.
+ %% @type ioheaders() = headers() | [{key(), value()}].
+ 
+@@ -46,50 +46,58 @@
+ % Maximum recv_body() length of 1MB
+ -define(MAX_RECV_BODY, (1024*1024)).
+ 
+-%% @spec get_header_value(K) -> undefined | Value
++%% @spec new(Socket, Method, RawPath, Version, headers()) -> request()
++%% @doc Create a new request instance.
++new(Socket, Method, RawPath, Version, Headers) ->
++    {?MODULE, [Socket, Method, RawPath, Version, Headers]}.
++
++%% @spec get_header_value(K, request()) -> undefined | Value
+ %% @doc Get the value of a given request header.
+-get_header_value(K) ->
++get_header_value(K, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) ->
+     mochiweb_headers:get_value(K, Headers).
+ 
+-get_primary_header_value(K) ->
++get_primary_header_value(K, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) ->
+     mochiweb_headers:get_primary_value(K, Headers).
+ 
++get_combined_header_value(K, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) ->
++    mochiweb_headers:get_combined_value(K, Headers).
++
+ %% @type field() = socket | scheme | method | raw_path | version | headers | peer | path | body_length | range
+ 
+-%% @spec get(field()) -> term()
++%% @spec get(field(), request()) -> term()
+ %% @doc Return the internal representation of the given field. If
+ %%      <code>socket</code> is requested on a HTTPS connection, then
+ %%      an ssl socket will be returned as <code>{ssl, SslSocket}</code>.
+ %%      You can use <code>SslSocket</code> with the <code>ssl</code>
+ %%      application, eg: <code>ssl:peercert(SslSocket)</code>.
+-get(socket) ->
++get(socket, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) ->
+     Socket;
+-get(scheme) ->
++get(scheme, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) ->
+     case mochiweb_socket:type(Socket) of
+         plain ->
+             http;
+         ssl ->
+             https
+     end;
+-get(method) ->
++get(method, {?MODULE, [_Socket, Method, _RawPath, _Version, _Headers]}) ->
+     Method;
+-get(raw_path) ->
++get(raw_path, {?MODULE, [_Socket, _Method, RawPath, _Version, _Headers]}) ->
+     RawPath;
+-get(version) ->
++get(version, {?MODULE, [_Socket, _Method, _RawPath, Version, _Headers]}) ->
+     Version;
+-get(headers) ->
++get(headers, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) ->
+     Headers;
+-get(peer) ->
++get(peer, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
+     case mochiweb_socket:peername(Socket) of
+         {ok, {Addr={10, _, _, _}, _Port}} ->
+-            case get_header_value("x-forwarded-for") of
++            case get_header_value("x-forwarded-for", THIS) of
+                 undefined ->
+                     inet_parse:ntoa(Addr);
+                 Hosts ->
+                     string:strip(lists:last(string:tokens(Hosts, ",")))
+             end;
+         {ok, {{127, 0, 0, 1}, _Port}} ->
+-            case get_header_value("x-forwarded-for") of
++            case get_header_value("x-forwarded-for", THIS) of
+                 undefined ->
+                     "127.0.0.1";
+                 Hosts ->
+@@ -100,7 +108,7 @@
+         {error, enotconn} ->
+             exit(normal)
+     end;
+-get(path) ->
++get(path, {?MODULE, [_Socket, _Method, RawPath, _Version, _Headers]}) ->
+     case erlang:get(?SAVE_PATH) of
+         undefined ->
+             {Path0, _, _} = mochiweb_util:urlsplit_path(RawPath),
+@@ -110,35 +118,35 @@
+         Cached ->
+             Cached
+     end;
+-get(body_length) ->
++get(body_length, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
+     case erlang:get(?SAVE_BODY_LENGTH) of
+         undefined ->
+-            BodyLength = body_length(),
++            BodyLength = body_length(THIS),
+             put(?SAVE_BODY_LENGTH, {cached, BodyLength}),
+             BodyLength;
+         {cached, Cached} ->
+             Cached
+     end;
+-get(range) ->
+-    case get_header_value(range) of
++get(range, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
++    case get_header_value(range, THIS) of
+         undefined ->
+             undefined;
+         RawRange ->
+             mochiweb_http:parse_range_request(RawRange)
+     end.
+ 
+-%% @spec dump() -> {mochiweb_request, [{atom(), term()}]}
++%% @spec dump(request()) -> {mochiweb_request, [{atom(), term()}]}
+ %% @doc Dump the internal representation to a "human readable" set of terms
+ %%      for debugging/inspection purposes.
+-dump() ->
++dump({?MODULE, [_Socket, Method, RawPath, Version, Headers]}) ->
+     {?MODULE, [{method, Method},
+                {version, Version},
+                {raw_path, RawPath},
+                {headers, mochiweb_headers:to_list(Headers)}]}.
+ 
+-%% @spec send(iodata()) -> ok
++%% @spec send(iodata(), request()) -> ok
+ %% @doc Send data over the socket.
+-send(Data) ->
++send(Data, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) ->
+     case mochiweb_socket:send(Socket, Data) of
+         ok ->
+             ok;
+@@ -146,16 +154,16 @@
+             exit(normal)
+     end.
+ 
+-%% @spec recv(integer()) -> binary()
++%% @spec recv(integer(), request()) -> binary()
+ %% @doc Receive Length bytes from the client as a binary, with the default
+ %%      idle timeout.
+-recv(Length) ->
+-    recv(Length, ?IDLE_TIMEOUT).
++recv(Length, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
++    recv(Length, ?IDLE_TIMEOUT, THIS).
+ 
+-%% @spec recv(integer(), integer()) -> binary()
++%% @spec recv(integer(), integer(), request()) -> binary()
+ %% @doc Receive Length bytes from the client as a binary, with the given
+ %%      Timeout in msec.
+-recv(Length, Timeout) ->
++recv(Length, Timeout, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) ->
+     case mochiweb_socket:recv(Socket, Length, Timeout) of
+         {ok, Data} ->
+             put(?SAVE_RECV, true),
+@@ -164,12 +172,12 @@
+             exit(normal)
+     end.
+ 
+-%% @spec body_length() -> undefined | chunked | unknown_transfer_encoding | integer()
++%% @spec body_length(request()) -> undefined | chunked | unknown_transfer_encoding | integer()
+ %% @doc  Infer body length from transfer-encoding and content-length headers.
+-body_length() ->
+-    case get_header_value("transfer-encoding") of
++body_length({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
++    case get_header_value("transfer-encoding", THIS) of
+         undefined ->
+-            case get_header_value("content-length") of
++            case get_combined_header_value("content-length", THIS) of
+                 undefined ->
+                     undefined;
+                 Length ->
+@@ -182,16 +190,16 @@
+     end.
+ 
+ 
+-%% @spec recv_body() -> binary()
++%% @spec recv_body(request()) -> binary()
+ %% @doc Receive the body of the HTTP request (defined by Content-Length).
+ %%      Will only receive up to the default max-body length of 1MB.
+-recv_body() ->
+-    recv_body(?MAX_RECV_BODY).
++recv_body({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
++    recv_body(?MAX_RECV_BODY, THIS).
+ 
+-%% @spec recv_body(integer()) -> binary()
++%% @spec recv_body(integer(), request()) -> binary()
+ %% @doc Receive the body of the HTTP request (defined by Content-Length).
+ %%      Will receive up to MaxBody bytes.
+-recv_body(MaxBody) ->
++recv_body(MaxBody, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
+     case erlang:get(?SAVE_BODY) of
+         undefined ->
+             % we could use a sane constant for max chunk size
+@@ -205,17 +213,18 @@
+                     true ->
+                         {NewLength, [Bin | BinAcc]}
+                     end
+-                end, {0, []}, MaxBody),
++                end, {0, []}, MaxBody, THIS),
+             put(?SAVE_BODY, Body),
+             Body;
+         Cached -> Cached
+     end.
+ 
+-stream_body(MaxChunkSize, ChunkFun, FunState) ->
+-    stream_body(MaxChunkSize, ChunkFun, FunState, undefined).
++stream_body(MaxChunkSize, ChunkFun, FunState, {?MODULE,[_Socket,_Method,_RawPath,_Version,_Headers]}=THIS) ->
++    stream_body(MaxChunkSize, ChunkFun, FunState, undefined, THIS).
+ 
+-stream_body(MaxChunkSize, ChunkFun, FunState, MaxBodyLength) ->
+-    Expect = case get_header_value("expect") of
++stream_body(MaxChunkSize, ChunkFun, FunState, MaxBodyLength,
++            {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
++    Expect = case get_header_value("expect", THIS) of
+                  undefined ->
+                      undefined;
+                  Value when is_list(Value) ->
+@@ -223,11 +232,12 @@
+              end,
+     case Expect of
+         "100-continue" ->
+-            start_raw_response({100, gb_trees:empty()});
++            _ = start_raw_response({100, gb_trees:empty()}, THIS),
++            ok;
+         _Else ->
+             ok
+     end,
+-    case body_length() of
++    case body_length(THIS) of
+         undefined ->
+             undefined;
+         {unknown_transfer_encoding, Unknown} ->
+@@ -236,7 +246,7 @@
+             % In this case the MaxBody is actually used to
+             % determine the maximum allowed size of a single
+             % chunk.
+-            stream_chunked_body(MaxChunkSize, ChunkFun, FunState);
++            stream_chunked_body(MaxChunkSize, ChunkFun, FunState, THIS);
+         0 ->
+             <<>>;
+         Length when is_integer(Length) ->
+@@ -244,62 +254,64 @@
+             MaxBodyLength when is_integer(MaxBodyLength), MaxBodyLength < Length ->
+                 exit({body_too_large, content_length});
+             _ ->
+-                stream_unchunked_body(Length, ChunkFun, FunState)
+-            end;
+-        Length ->
+-            exit({length_not_integer, Length})
++                stream_unchunked_body(Length, ChunkFun, FunState, THIS)
++            end
+     end.
+ 
+ 
+-%% @spec start_response({integer(), ioheaders()}) -> response()
++%% @spec start_response({integer(), ioheaders()}, request()) -> response()
+ %% @doc Start the HTTP response by sending the Code HTTP response and
+ %%      ResponseHeaders. The server will set header defaults such as Server
+ %%      and Date if not present in ResponseHeaders.
+-start_response({Code, ResponseHeaders}) ->
++start_response({Code, ResponseHeaders}, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
+     HResponse = mochiweb_headers:make(ResponseHeaders),
+     HResponse1 = mochiweb_headers:default_from_list(server_headers(),
+                                                     HResponse),
+-    start_raw_response({Code, HResponse1}).
++    start_raw_response({Code, HResponse1}, THIS).
+ 
+-%% @spec start_raw_response({integer(), headers()}) -> response()
++%% @spec start_raw_response({integer(), headers()}, request()) -> response()
+ %% @doc Start the HTTP response by sending the Code HTTP response and
+ %%      ResponseHeaders.
+-start_raw_response({Code, ResponseHeaders}) ->
++start_raw_response({Code, ResponseHeaders}, {?MODULE, [_Socket, _Method, _RawPath, Version, _Headers]}=THIS) ->
+     F = fun ({K, V}, Acc) ->
+                 [mochiweb_util:make_io(K), <<": ">>, V, <<"\r\n">> | Acc]
+         end,
+     End = lists:foldl(F, [<<"\r\n">>],
+                       mochiweb_headers:to_list(ResponseHeaders)),
+-    send([make_version(Version), make_code(Code), <<"\r\n">> | End]),
++    send([make_version(Version), make_code(Code), <<"\r\n">> | End], THIS),
+     mochiweb:new_response({THIS, Code, ResponseHeaders}).
+ 
+ 
+-%% @spec start_response_length({integer(), ioheaders(), integer()}) -> response()
++%% @spec start_response_length({integer(), ioheaders(), integer()}, request()) -> response()
+ %% @doc Start the HTTP response by sending the Code HTTP response and
+ %%      ResponseHeaders including a Content-Length of Length. The server
+ %%      will set header defaults such as Server
+ %%      and Date if not present in ResponseHeaders.
+-start_response_length({Code, ResponseHeaders, Length}) ->
++start_response_length({Code, ResponseHeaders, Length},
++                      {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
+     HResponse = mochiweb_headers:make(ResponseHeaders),
+     HResponse1 = mochiweb_headers:enter("Content-Length", Length, HResponse),
+-    start_response({Code, HResponse1}).
++    start_response({Code, HResponse1}, THIS).
+ 
+-%% @spec respond({integer(), ioheaders(), iodata() | chunked | {file, IoDevice}}) -> response()
++%% @spec respond({integer(), ioheaders(), iodata() | chunked | {file, IoDevice}}, request()) -> response()
+ %% @doc Start the HTTP response with start_response, and send Body to the
+ %%      client (if the get(method) /= 'HEAD'). The Content-Length header
+ %%      will be set by the Body length, and the server will insert header
+ %%      defaults.
+-respond({Code, ResponseHeaders, {file, IoDevice}}) ->
++respond({Code, ResponseHeaders, {file, IoDevice}},
++        {?MODULE, [_Socket, Method, _RawPath, _Version, _Headers]}=THIS) ->
+     Length = mochiweb_io:iodevice_size(IoDevice),
+-    Response = start_response_length({Code, ResponseHeaders, Length}),
++    Response = start_response_length({Code, ResponseHeaders, Length}, THIS),
+     case Method of
+         'HEAD' ->
+             ok;
+         _ ->
+-            mochiweb_io:iodevice_stream(fun send/1, IoDevice)
++            mochiweb_io:iodevice_stream(
++              fun (Body) -> send(Body, THIS) end,
++              IoDevice)
+     end,
+     Response;
+-respond({Code, ResponseHeaders, chunked}) ->
++respond({Code, ResponseHeaders, chunked}, {?MODULE, [_Socket, Method, _RawPath, Version, _Headers]}=THIS) ->
+     HResponse = mochiweb_headers:make(ResponseHeaders),
+     HResponse1 = case Method of
+                      'HEAD' ->
+@@ -320,35 +332,35 @@
+                          put(?SAVE_FORCE_CLOSE, true),
+                          HResponse
+                  end,
+-    start_response({Code, HResponse1});
+-respond({Code, ResponseHeaders, Body}) ->
+-    Response = start_response_length({Code, ResponseHeaders, iolist_size(Body)}),
++    start_response({Code, HResponse1}, THIS);
++respond({Code, ResponseHeaders, Body}, {?MODULE, [_Socket, Method, _RawPath, _Version, _Headers]}=THIS) ->
++    Response = start_response_length({Code, ResponseHeaders, iolist_size(Body)}, THIS),
+     case Method of
+         'HEAD' ->
+             ok;
+         _ ->
+-            send(Body)
++            send(Body, THIS)
+     end,
+     Response.
+ 
+-%% @spec not_found() -> response()
++%% @spec not_found(request()) -> response()
+ %% @doc Alias for <code>not_found([])</code>.
+-not_found() ->
+-    not_found([]).
++not_found({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
++    not_found([], THIS).
+ 
+-%% @spec not_found(ExtraHeaders) -> response()
++%% @spec not_found(ExtraHeaders, request()) -> response()
+ %% @doc Alias for <code>respond({404, [{"Content-Type", "text/plain"}
+ %% | ExtraHeaders], &lt;&lt;"Not found."&gt;&gt;})</code>.
+-not_found(ExtraHeaders) ->
++not_found(ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
+     respond({404, [{"Content-Type", "text/plain"} | ExtraHeaders],
+-             <<"Not found.">>}).
++             <<"Not found.">>}, THIS).
+ 
+-%% @spec ok({value(), iodata()} | {value(), ioheaders(), iodata() | {file, IoDevice}}) ->
++%% @spec ok({value(), iodata()} | {value(), ioheaders(), iodata() | {file, IoDevice}}, request()) ->
+ %%           response()
+ %% @doc respond({200, [{"Content-Type", ContentType} | Headers], Body}).
+-ok({ContentType, Body}) ->
+-    ok({ContentType, [], Body});
+-ok({ContentType, ResponseHeaders, Body}) ->
++ok({ContentType, Body}, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
++    ok({ContentType, [], Body}, THIS);
++ok({ContentType, ResponseHeaders, Body}, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
+     HResponse = mochiweb_headers:make(ResponseHeaders),
+     case THIS:get(range) of
+         X when (X =:= undefined orelse X =:= fail) orelse Body =:= chunked ->
+@@ -357,7 +369,7 @@
+             %% full response.
+             HResponse1 = mochiweb_headers:enter("Content-Type", ContentType,
+                                                 HResponse),
+-            respond({200, HResponse1, Body});
++            respond({200, HResponse1, Body}, THIS);
+         Ranges ->
+             {PartList, Size} = range_parts(Body, Ranges),
+             case PartList of
+@@ -366,7 +378,7 @@
+                                                         ContentType,
+                                                         HResponse),
+                     %% could be 416, for now we'll just return 200
+-                    respond({200, HResponse1, Body});
++                    respond({200, HResponse1, Body}, THIS);
+                 PartList ->
+                     {RangeHeaders, RangeBody} =
+                         mochiweb_multipart:parts_to_body(PartList, ContentType, Size),
+@@ -374,46 +386,50 @@
+                                    [{"Accept-Ranges", "bytes"} |
+                                     RangeHeaders],
+                                    HResponse),
+-                    respond({206, HResponse1, RangeBody})
++                    respond({206, HResponse1, RangeBody}, THIS)
+             end
+     end.
+ 
+-%% @spec should_close() -> bool()
++%% @spec should_close(request()) -> bool()
+ %% @doc Return true if the connection must be closed. If false, using
+ %%      Keep-Alive should be safe.
+-should_close() ->
++should_close({?MODULE, [_Socket, _Method, _RawPath, Version, _Headers]}=THIS) ->
+     ForceClose = erlang:get(?SAVE_FORCE_CLOSE) =/= undefined,
+     DidNotRecv = erlang:get(?SAVE_RECV) =:= undefined,
+     ForceClose orelse Version < {1, 0}
+         %% Connection: close
+-        orelse get_header_value("connection") =:= "close"
++        orelse is_close(get_header_value("connection", THIS))
+         %% HTTP 1.0 requires Connection: Keep-Alive
+         orelse (Version =:= {1, 0}
+-                andalso get_header_value("connection") =/= "Keep-Alive")
++                andalso get_header_value("connection", THIS) =/= "Keep-Alive")
+         %% unread data left on the socket, can't safely continue
+         orelse (DidNotRecv
+-                andalso get_header_value("content-length") =/= undefined
+-                andalso list_to_integer(get_header_value("content-length")) > 0)
++                andalso get_combined_header_value("content-length", THIS) =/= undefined
++                andalso list_to_integer(get_combined_header_value("content-length", THIS)) > 0)
+         orelse (DidNotRecv
+-                andalso get_header_value("transfer-encoding") =:= "chunked").
++                andalso get_header_value("transfer-encoding", THIS) =:= "chunked").
++
++is_close("close") ->
++    true;
++is_close(S=[_C, _L, _O, _S, _E]) ->
++    string:to_lower(S) =:= "close";
++is_close(_) ->
++    false.
+ 
+-%% @spec cleanup() -> ok
++%% @spec cleanup(request()) -> ok
+ %% @doc Clean up any junk in the process dictionary, required before continuing
+ %%      a Keep-Alive request.
+-cleanup() ->
+-    [erase(K) || K <- [?SAVE_QS,
+-                       ?SAVE_PATH,
+-                       ?SAVE_RECV,
+-                       ?SAVE_BODY,
+-                       ?SAVE_BODY_LENGTH,
+-                       ?SAVE_POST,
+-                       ?SAVE_COOKIE,
+-                       ?SAVE_FORCE_CLOSE]],
++cleanup({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}) ->
++    L = [?SAVE_QS, ?SAVE_PATH, ?SAVE_RECV, ?SAVE_BODY, ?SAVE_BODY_LENGTH,
++         ?SAVE_POST, ?SAVE_COOKIE, ?SAVE_FORCE_CLOSE],
++    lists:foreach(fun(K) ->
++                          erase(K)
++                  end, L),
+     ok.
+ 
+-%% @spec parse_qs() -> [{Key::string(), Value::string()}]
++%% @spec parse_qs(request()) -> [{Key::string(), Value::string()}]
+ %% @doc Parse the query string of the URL.
+-parse_qs() ->
++parse_qs({?MODULE, [_Socket, _Method, RawPath, _Version, _Headers]}) ->
+     case erlang:get(?SAVE_QS) of
+         undefined ->
+             {_, QueryString, _} = mochiweb_util:urlsplit_path(RawPath),
+@@ -424,17 +440,17 @@
+             Cached
+     end.
+ 
+-%% @spec get_cookie_value(Key::string) -> string() | undefined
++%% @spec get_cookie_value(Key::string, request()) -> string() | undefined
+ %% @doc Get the value of the given cookie.
+-get_cookie_value(Key) ->
+-    proplists:get_value(Key, parse_cookie()).
++get_cookie_value(Key, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
++    proplists:get_value(Key, parse_cookie(THIS)).
+ 
+-%% @spec parse_cookie() -> [{Key::string(), Value::string()}]
++%% @spec parse_cookie(request()) -> [{Key::string(), Value::string()}]
+ %% @doc Parse the cookie header.
+-parse_cookie() ->
++parse_cookie({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
+     case erlang:get(?SAVE_COOKIE) of
+         undefined ->
+-            Cookies = case get_header_value("cookie") of
++            Cookies = case get_header_value("cookie", THIS) of
+                           undefined ->
+                               [];
+                           Value ->
+@@ -446,17 +462,17 @@
+             Cached
+     end.
+ 
+-%% @spec parse_post() -> [{Key::string(), Value::string()}]
++%% @spec parse_post(request()) -> [{Key::string(), Value::string()}]
+ %% @doc Parse an application/x-www-form-urlencoded form POST. This
+ %%      has the side-effect of calling recv_body().
+-parse_post() ->
++parse_post({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
+     case erlang:get(?SAVE_POST) of
+         undefined ->
+-            Parsed = case recv_body() of
++            Parsed = case recv_body(THIS) of
+                          undefined ->
+                              [];
+                          Binary ->
+-                             case get_primary_header_value("content-type") of
++                             case get_primary_header_value("content-type",THIS) of
+                                  "application/x-www-form-urlencoded" ++ _ ->
+                                      mochiweb_util:parse_qs(Binary);
+                                  _ ->
+@@ -469,41 +485,43 @@
+             Cached
+     end.
+ 
+-%% @spec stream_chunked_body(integer(), fun(), term()) -> term()
++%% @spec stream_chunked_body(integer(), fun(), term(), request()) -> term()
+ %% @doc The function is called for each chunk.
+ %%      Used internally by read_chunked_body.
+-stream_chunked_body(MaxChunkSize, Fun, FunState) ->
+-    case read_chunk_length() of
++stream_chunked_body(MaxChunkSize, Fun, FunState,
++                    {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
++    case read_chunk_length(THIS) of
+         0 ->
+-            Fun({0, read_chunk(0)}, FunState);
++            Fun({0, read_chunk(0, THIS)}, FunState);
+         Length when Length > MaxChunkSize ->
+-            NewState = read_sub_chunks(Length, MaxChunkSize, Fun, FunState),
+-            stream_chunked_body(MaxChunkSize, Fun, NewState);
++            NewState = read_sub_chunks(Length, MaxChunkSize, Fun, FunState, THIS),
++            stream_chunked_body(MaxChunkSize, Fun, NewState, THIS);
+         Length ->
+-            NewState = Fun({Length, read_chunk(Length)}, FunState),
+-            stream_chunked_body(MaxChunkSize, Fun, NewState)
++            NewState = Fun({Length, read_chunk(Length, THIS)}, FunState),
++            stream_chunked_body(MaxChunkSize, Fun, NewState, THIS)
+     end.
+ 
+-stream_unchunked_body(0, Fun, FunState) ->
++stream_unchunked_body(0, Fun, FunState, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}) ->
+     Fun({0, <<>>}, FunState);
+-stream_unchunked_body(Length, Fun, FunState) when Length > 0 ->
++stream_unchunked_body(Length, Fun, FunState,
++                      {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) when Length > 0 ->
+     PktSize = case Length > ?RECBUF_SIZE of
+         true ->
+             ?RECBUF_SIZE;
+         false ->
+             Length
+     end,
+-    Bin = recv(PktSize),
++    Bin = recv(PktSize, THIS),
+     NewState = Fun({PktSize, Bin}, FunState),
+-    stream_unchunked_body(Length - PktSize, Fun, NewState).
++    stream_unchunked_body(Length - PktSize, Fun, NewState, THIS).
+ 
+-%% @spec read_chunk_length() -> integer()
++%% @spec read_chunk_length(request()) -> integer()
+ %% @doc Read the length of the next HTTP chunk.
+-read_chunk_length() ->
+-    mochiweb_socket:setopts(Socket, [{packet, line}]),
++read_chunk_length({?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) ->
++    ok = mochiweb_socket:setopts(Socket, [{packet, line}]),
+     case mochiweb_socket:recv(Socket, 0, ?IDLE_TIMEOUT) of
+         {ok, Header} ->
+-            mochiweb_socket:setopts(Socket, [{packet, raw}]),
++            ok = mochiweb_socket:setopts(Socket, [{packet, raw}]),
+             Splitter = fun (C) ->
+                                C =/= $\r andalso C =/= $\n andalso C =/= $
+                        end,
+@@ -513,11 +531,11 @@
+             exit(normal)
+     end.
+ 
+-%% @spec read_chunk(integer()) -> Chunk::binary() | [Footer::binary()]
++%% @spec read_chunk(integer(), request()) -> Chunk::binary() | [Footer::binary()]
+ %% @doc Read in a HTTP chunk of the given length. If Length is 0, then read the
+ %%      HTTP footers (as a list of binaries, since they're nominal).
+-read_chunk(0) ->
+-    mochiweb_socket:setopts(Socket, [{packet, line}]),
++read_chunk(0, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) ->
++    ok = mochiweb_socket:setopts(Socket, [{packet, line}]),
+     F = fun (F1, Acc) ->
+                 case mochiweb_socket:recv(Socket, 0, ?IDLE_TIMEOUT) of
+                     {ok, <<"\r\n">>} ->
+@@ -529,10 +547,10 @@
+                 end
+         end,
+     Footers = F(F, []),
+-    mochiweb_socket:setopts(Socket, [{packet, raw}]),
++    ok = mochiweb_socket:setopts(Socket, [{packet, raw}]),
+     put(?SAVE_RECV, true),
+     Footers;
+-read_chunk(Length) ->
++read_chunk(Length, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) ->
+     case mochiweb_socket:recv(Socket, 2 + Length, ?IDLE_TIMEOUT) of
+         {ok, <<Chunk:Length/binary, "\r\n">>} ->
+             Chunk;
+@@ -540,32 +558,34 @@
+             exit(normal)
+     end.
+ 
+-read_sub_chunks(Length, MaxChunkSize, Fun, FunState) when Length > MaxChunkSize ->
+-    Bin = recv(MaxChunkSize),
++read_sub_chunks(Length, MaxChunkSize, Fun, FunState,
++                {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) when Length > MaxChunkSize ->
++    Bin = recv(MaxChunkSize, THIS),
+     NewState = Fun({size(Bin), Bin}, FunState),
+-    read_sub_chunks(Length - MaxChunkSize, MaxChunkSize, Fun, NewState);
++    read_sub_chunks(Length - MaxChunkSize, MaxChunkSize, Fun, NewState, THIS);
+ 
+-read_sub_chunks(Length, _MaxChunkSize, Fun, FunState) ->
+-    Fun({Length, read_chunk(Length)}, FunState).
++read_sub_chunks(Length, _MaxChunkSize, Fun, FunState,
++                {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
++    Fun({Length, read_chunk(Length, THIS)}, FunState).
+ 
+-%% @spec serve_file(Path, DocRoot) -> Response
++%% @spec serve_file(Path, DocRoot, request()) -> Response
+ %% @doc Serve a file relative to DocRoot.
+-serve_file(Path, DocRoot) ->
+-    serve_file(Path, DocRoot, []).
++serve_file(Path, DocRoot, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
++    serve_file(Path, DocRoot, [], THIS).
+ 
+-%% @spec serve_file(Path, DocRoot, ExtraHeaders) -> Response
++%% @spec serve_file(Path, DocRoot, ExtraHeaders, request()) -> Response
+ %% @doc Serve a file relative to DocRoot.
+-serve_file(Path, DocRoot, ExtraHeaders) ->
++serve_file(Path, DocRoot, ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
+     case mochiweb_util:safe_relative_path(Path) of
+         undefined ->
+-            not_found(ExtraHeaders);
++            not_found(ExtraHeaders, THIS);
+         RelPath ->
+             FullPath = filename:join([DocRoot, RelPath]),
+             case filelib:is_dir(FullPath) of
+                 true ->
+-                    maybe_redirect(RelPath, FullPath, ExtraHeaders);
++                    maybe_redirect(RelPath, FullPath, ExtraHeaders, THIS);
+                 false ->
+-                    maybe_serve_file(FullPath, ExtraHeaders)
++                    maybe_serve_file(FullPath, ExtraHeaders, THIS)
+             end
+     end.
+ 
+@@ -575,13 +595,14 @@
+ directory_index(FullPath) ->
+     filename:join([FullPath, "index.html"]).
+ 
+-maybe_redirect([], FullPath, ExtraHeaders) ->
+-    maybe_serve_file(directory_index(FullPath), ExtraHeaders);
++maybe_redirect([], FullPath, ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
++    maybe_serve_file(directory_index(FullPath), ExtraHeaders, THIS);
+ 
+-maybe_redirect(RelPath, FullPath, ExtraHeaders) ->
++maybe_redirect(RelPath, FullPath, ExtraHeaders,
++               {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}=THIS) ->
+     case string:right(RelPath, 1) of
+         "/" ->
+-            maybe_serve_file(directory_index(FullPath), ExtraHeaders);
++            maybe_serve_file(directory_index(FullPath), ExtraHeaders, THIS);
+         _   ->
+             Host = mochiweb_headers:get_value("host", Headers),
+             Location = "http://" ++ Host  ++ "/" ++ RelPath ++ "/",
+@@ -596,16 +617,16 @@
+             "<p>The document has moved <a href=\"">>,
+             Bottom = <<">here</a>.</p></body></html>\n">>,
+             Body = <<Top/binary, LocationBin/binary, Bottom/binary>>,
+-            respond({301, MoreHeaders, Body})
++            respond({301, MoreHeaders, Body}, THIS)
+     end.
+ 
+-maybe_serve_file(File, ExtraHeaders) ->
++maybe_serve_file(File, ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
+     case file:read_file_info(File) of
+         {ok, FileInfo} ->
+             LastModified = httpd_util:rfc1123_date(FileInfo#file_info.mtime),
+-            case get_header_value("if-modified-since") of
++            case get_header_value("if-modified-since", THIS) of
+                 LastModified ->
+-                    respond({304, ExtraHeaders, ""});
++                    respond({304, ExtraHeaders, ""}, THIS);
+                 _ ->
+                     case file:open(File, [raw, binary]) of
+                         {ok, IoDevice} ->
+@@ -613,15 +634,15 @@
+                             Res = ok({ContentType,
+                                       [{"last-modified", LastModified}
+                                        | ExtraHeaders],
+-                                      {file, IoDevice}}),
+-                            file:close(IoDevice),
++                                      {file, IoDevice}}, THIS),
++                            ok = file:close(IoDevice),
+                             Res;
+                         _ ->
+-                            not_found(ExtraHeaders)
++                            not_found(ExtraHeaders, THIS)
+                     end
+             end;
+         {error, _} ->
+-            not_found(ExtraHeaders)
++            not_found(ExtraHeaders, THIS)
+     end.
+ 
+ server_headers() ->
+@@ -669,7 +690,7 @@
+         end,
+     {lists:foldr(F, [], Ranges), Size}.
+ 
+-%% @spec accepted_encodings([encoding()]) -> [encoding()] | bad_accept_encoding_value
++%% @spec accepted_encodings([encoding()], request()) -> [encoding()] | bad_accept_encoding_value
+ %% @type encoding() = string().
+ %%
+ %% @doc Returns a list of encodings accepted by a request. Encodings that are
+@@ -693,8 +714,8 @@
+ %%         accepted_encodings(["gzip", "deflate", "identity"]) ->
+ %%            ["deflate", "gzip", "identity"]
+ %%
+-accepted_encodings(SupportedEncodings) ->
+-    AcceptEncodingHeader = case get_header_value("Accept-Encoding") of
++accepted_encodings(SupportedEncodings, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
++    AcceptEncodingHeader = case get_header_value("Accept-Encoding", THIS) of
+         undefined ->
+             "";
+         Value ->
+@@ -709,7 +730,7 @@
+             )
+     end.
+ 
+-%% @spec accepts_content_type(string() | binary()) -> boolean() | bad_accept_header
++%% @spec accepts_content_type(string() | binary(), request()) -> boolean() | bad_accept_header
+ %%
+ %% @doc Determines whether a request accepts a given media type by analyzing its
+ %%      "Accept" header.
+@@ -731,16 +752,9 @@
+ %%      5) For an "Accept" header with value "text/*; q=0.0, */*":
+ %%         accepts_content_type("text/plain") -> false
+ %%
+-accepts_content_type(ContentType) when is_binary(ContentType) ->
+-    accepts_content_type(binary_to_list(ContentType));
+-accepts_content_type(ContentType1) ->
++accepts_content_type(ContentType1, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
+     ContentType = re:replace(ContentType1, "\\s", "", [global, {return, list}]),
+-    AcceptHeader = case get_header_value("Accept") of
+-        undefined ->
+-            "*/*";
+-        Value ->
+-            Value
+-    end,
++    AcceptHeader = accept_header(THIS),
+     case mochiweb_util:parse_qvalues(AcceptHeader) of
+         invalid_qvalue_string ->
+             bad_accept_header;
+@@ -761,9 +775,83 @@
+             (not lists:member({SuperType, 0.0}, QList))
+     end.
+ 
++%% @spec accepted_content_types([string() | binary()], request()) -> [string()] | bad_accept_header
++%%
++%% @doc Filters which of the given media types this request accepts. This filtering
++%%      is performed by analyzing the "Accept" header. The returned list is sorted
++%%      according to the preferences specified in the "Accept" header (higher Q values
++%%      first). If two or more types have the same preference (Q value), they're order
++%%      in the returned list is the same as they're order in the input list.
++%%
++%%      Examples
++%%
++%%      1) For a missing "Accept" header:
++%%         accepted_content_types(["text/html", "application/json"]) ->
++%%             ["text/html", "application/json"]
++%%
++%%      2) For an "Accept" header with value "text/html, application/*":
++%%         accepted_content_types(["application/json", "text/html"]) ->
++%%             ["application/json", "text/html"]
++%%
++%%      3) For an "Accept" header with value "text/html, */*; q=0.0":
++%%         accepted_content_types(["text/html", "application/json"]) ->
++%%             ["text/html"]
++%%
++%%      4) For an "Accept" header with value "text/html; q=0.5, */*; q=0.1":
++%%         accepts_content_types(["application/json", "text/html"]) ->
++%%             ["text/html", "application/json"]
++%%
++accepted_content_types(Types1, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
++    Types = lists:map(
++        fun(T) -> re:replace(T, "\\s", "", [global, {return, list}]) end,
++        Types1),
++    AcceptHeader = accept_header(THIS),
++    case mochiweb_util:parse_qvalues(AcceptHeader) of
++        invalid_qvalue_string ->
++            bad_accept_header;
++        QList ->
++            TypesQ = lists:foldr(
++                fun(T, Acc) ->
++                    case proplists:get_value(T, QList) of
++                        undefined ->
++                            [MainType, _SubType] = string:tokens(T, "/"),
++                            case proplists:get_value(MainType ++ "/*", QList) of
++                                undefined ->
++                                    case proplists:get_value("*/*", QList) of
++                                        Q when is_float(Q), Q > 0.0 ->
++                                            [{Q, T} | Acc];
++                                        _ ->
++                                            Acc
++                                    end;
++                                Q when Q > 0.0 ->
++                                    [{Q, T} | Acc];
++                                _ ->
++                                    Acc
++                            end;
++                        Q when Q > 0.0 ->
++                            [{Q, T} | Acc];
++                        _ ->
++                            Acc
++                    end
++                end,
++                [], Types),
++            % Note: Stable sort. If 2 types have the same Q value we leave them in the
++            % same order as in the input list.
++            SortFun = fun({Q1, _}, {Q2, _}) -> Q1 >= Q2 end,
++            [Type || {_Q, Type} <- lists:sort(SortFun, TypesQ)]
++    end.
++
++accept_header({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) ->
++    case get_header_value("Accept", THIS) of
++        undefined ->
++            "*/*";
++        Value ->
++            Value
++    end.
++
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ -endif.
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_request_tests.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request_tests.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_request_tests.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request_tests.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -1,12 +1,13 @@
+ -module(mochiweb_request_tests).
+ 
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ accepts_content_type_test() ->
+     Req1 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
+         mochiweb_headers:make([{"Accept", "multipart/related"}])),
+     ?assertEqual(true, Req1:accepts_content_type("multipart/related")),
++    ?assertEqual(true, Req1:accepts_content_type(<<"multipart/related">>)),
+ 
+     Req2 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
+         mochiweb_headers:make([{"Accept", "text/html"}])),
+@@ -60,4 +61,122 @@
+         mochiweb_headers:make([{"Accept", "text/html;level=1;q=0.1, text/html"}])),
+     ?assertEqual(true, Req14:accepts_content_type("text/html; level=1")).
+ 
++accepted_encodings_test() ->
++    Req1 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++                                mochiweb_headers:make([])),
++    ?assertEqual(["identity"],
++                 Req1:accepted_encodings(["gzip", "identity"])),
++
++    Req2 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make([{"Accept-Encoding", "gzip, deflate"}])),
++    ?assertEqual(["gzip", "identity"],
++                 Req2:accepted_encodings(["gzip", "identity"])),
++
++    Req3 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make([{"Accept-Encoding", "gzip;q=0.5, deflate"}])),
++    ?assertEqual(["deflate", "gzip", "identity"],
++                 Req3:accepted_encodings(["gzip", "deflate", "identity"])),
++
++    Req4 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make([{"Accept-Encoding", "identity, *;q=0"}])),
++    ?assertEqual(["identity"],
++                 Req4:accepted_encodings(["gzip", "deflate", "identity"])),
++
++    Req5 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make([{"Accept-Encoding", "gzip; q=0.1, *;q=0"}])),
++    ?assertEqual(["gzip"],
++                 Req5:accepted_encodings(["gzip", "deflate", "identity"])),
++
++    Req6 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make([{"Accept-Encoding", "gzip; q=, *;q=0"}])),
++    ?assertEqual(bad_accept_encoding_value,
++                 Req6:accepted_encodings(["gzip", "deflate", "identity"])),
++
++    Req7 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make([{"Accept-Encoding", "gzip;q=2.0, *;q=0"}])),
++    ?assertEqual(bad_accept_encoding_value,
++                 Req7:accepted_encodings(["gzip", "identity"])),
++
++    Req8 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make([{"Accept-Encoding", "deflate, *;q=0.0"}])),
++    ?assertEqual([],
++                 Req8:accepted_encodings(["gzip", "identity"])).
++
++accepted_content_types_test() ->
++    Req1 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make([{"Accept", "text/html"}])),
++    ?assertEqual(["text/html"],
++        Req1:accepted_content_types(["text/html", "application/json"])),
++
++    Req2 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make([{"Accept", "text/html, */*;q=0"}])),
++    ?assertEqual(["text/html"],
++        Req2:accepted_content_types(["text/html", "application/json"])),
++
++    Req3 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make([{"Accept", "text/*, */*;q=0"}])),
++    ?assertEqual(["text/html"],
++        Req3:accepted_content_types(["text/html", "application/json"])),
++
++    Req4 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make([{"Accept", "text/*;q=0.8, */*;q=0.5"}])),
++    ?assertEqual(["text/html", "application/json"],
++        Req4:accepted_content_types(["application/json", "text/html"])),
++
++    Req5 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make([{"Accept", "text/*;q=0.8, */*;q=0.5"}])),
++    ?assertEqual(["text/html", "application/json"],
++        Req5:accepted_content_types(["text/html", "application/json"])),
++
++    Req6 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make([{"Accept", "text/*;q=0.5, */*;q=0.5"}])),
++    ?assertEqual(["application/json", "text/html"],
++        Req6:accepted_content_types(["application/json", "text/html"])),
++
++    Req7 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make(
++            [{"Accept", "text/html;q=0.5, application/json;q=0.5"}])),
++    ?assertEqual(["application/json", "text/html"],
++        Req7:accepted_content_types(["application/json", "text/html"])),
++
++    Req8 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make([{"Accept", "text/html"}])),
++    ?assertEqual([],
++        Req8:accepted_content_types(["application/json"])),
++
++    Req9 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1},
++        mochiweb_headers:make([{"Accept", "text/*;q=0.9, text/html;q=0.5, */*;q=0.7"}])),
++    ?assertEqual(["application/json", "text/html"],
++        Req9:accepted_content_types(["text/html", "application/json"])).
++
++should_close_test() ->
++    F = fun (V, H) ->
++                (mochiweb_request:new(
++                   nil, 'GET', "/", V,
++                   mochiweb_headers:make(H)
++                  )):should_close()
++        end,
++    ?assertEqual(
++       true,
++       F({1, 1}, [{"Connection", "close"}])),
++    ?assertEqual(
++       true,
++       F({1, 0}, [{"Connection", "close"}])),
++    ?assertEqual(
++       true,
++       F({1, 1}, [{"Connection", "ClOSe"}])),
++    ?assertEqual(
++       false,
++       F({1, 1}, [{"Connection", "closer"}])),
++    ?assertEqual(
++       false,
++       F({1, 1}, [])),
++    ?assertEqual(
++       true,
++       F({1, 0}, [])),
++    ?assertEqual(
++       false,
++       F({1, 0}, [{"Connection", "Keep-Alive"}])),
++    ok.
++
+ -endif.
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_response.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_response.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_response.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_response.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -3,39 +3,47 @@
+ 
+ %% @doc Response abstraction.
+ 
+--module(mochiweb_response, [Request, Code, Headers]).
++-module(mochiweb_response).
+ -author('bob@mochimedia.com').
+ 
+ -define(QUIP, "Any of you quaids got a smint?").
+ 
+--export([get_header_value/1, get/1, dump/0]).
+--export([send/1, write_chunk/1]).
++-export([new/3, get_header_value/2, get/2, dump/1]).
++-export([send/2, write_chunk/2]).
+ 
+-%% @spec get_header_value(string() | atom() | binary()) -> string() | undefined
++%% @type response(). A mochiweb_response parameterized module instance.
++
++%% @spec new(Request, Code, Headers) -> response()
++%% @doc Create a new mochiweb_response instance.
++new(Request, Code, Headers) ->
++    {?MODULE, [Request, Code, Headers]}.
++
++%% @spec get_header_value(string() | atom() | binary(), response()) ->
++%%           string() | undefined
+ %% @doc Get the value of the given response header.
+-get_header_value(K) ->
++get_header_value(K, {?MODULE, [_Request, _Code, Headers]}) ->
+     mochiweb_headers:get_value(K, Headers).
+ 
+-%% @spec get(request | code | headers) -> term()
++%% @spec get(request | code | headers, response()) -> term()
+ %% @doc Return the internal representation of the given field.
+-get(request) ->
++get(request, {?MODULE, [Request, _Code, _Headers]}) ->
+     Request;
+-get(code) ->
++get(code, {?MODULE, [_Request, Code, _Headers]}) ->
+     Code;
+-get(headers) ->
++get(headers, {?MODULE, [_Request, _Code, Headers]}) ->
+     Headers.
+ 
+-%% @spec dump() -> {mochiweb_request, [{atom(), term()}]}
++%% @spec dump(response()) -> {mochiweb_request, [{atom(), term()}]}
+ %% @doc Dump the internal representation to a "human readable" set of terms
+ %%      for debugging/inspection purposes.
+-dump() ->
++dump({?MODULE, [Request, Code, Headers]}) ->
+     [{request, Request:dump()},
+      {code, Code},
+      {headers, mochiweb_headers:to_list(Headers)}].
+ 
+-%% @spec send(iodata()) -> ok
++%% @spec send(iodata(), response()) -> ok
+ %% @doc Send data over the socket if the method is not HEAD.
+-send(Data) ->
++send(Data, {?MODULE, [Request, _Code, _Headers]}) ->
+     case Request:get(method) of
+         'HEAD' ->
+             ok;
+@@ -43,22 +51,22 @@
+             Request:send(Data)
+     end.
+ 
+-%% @spec write_chunk(iodata()) -> ok
++%% @spec write_chunk(iodata(), response()) -> ok
+ %% @doc Write a chunk of a HTTP chunked response. If Data is zero length,
+ %%      then the chunked response will be finished.
+-write_chunk(Data) ->
++write_chunk(Data, {?MODULE, [Request, _Code, _Headers]}=THIS) ->
+     case Request:get(version) of
+         Version when Version >= {1, 1} ->
+             Length = iolist_size(Data),
+-            send([io_lib:format("~.16b\r\n", [Length]), Data, <<"\r\n">>]);
++            send([io_lib:format("~.16b\r\n", [Length]), Data, <<"\r\n">>], THIS);
+         _ ->
+-            send(Data)
++            send(Data, THIS)
+     end.
+ 
+ 
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ -endif.
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_socket_server.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_socket_server.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_socket_server.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_socket_server.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -9,7 +9,7 @@
+ 
+ -include("internal.hrl").
+ 
+--export([start/1, stop/1]).
++-export([start/1, start_link/1, stop/1]).
+ -export([init/1, handle_call/3, handle_cast/2, terminate/2, code_change/3,
+          handle_info/2]).
+ -export([get/2, set/3]).
+@@ -33,10 +33,22 @@
+ 
+ -define(is_old_state(State), not is_record(State, mochiweb_socket_server)).
+ 
+-start(State=#mochiweb_socket_server{}) ->
+-    start_server(State);
++start_link(Options) ->
++    start_server(start_link, parse_options(Options)).
++
+ start(Options) ->
+-    start(parse_options(Options)).
++    case lists:keytake(link, 1, Options) of
++        {value, {_Key, false}, Options1} ->
++            start_server(start, parse_options(Options1));
++        _ ->
++            %% TODO: https://github.com/mochi/mochiweb/issues/58
++            %%   [X] Phase 1: Add new APIs (Sep 2011)
++            %%   [_] Phase 2: Add deprecation warning
++            %%   [_] Phase 3: Change default to {link, false} and ignore link
++            %%   [_] Phase 4: Add deprecation warning for {link, _} option
++            %%   [_] Phase 5: Remove support for {link, _} option
++            start_link(Options)
++    end.
+ 
+ get(Name, Property) ->
+     gen_server:call(Name, {get, Property}).
+@@ -61,6 +73,8 @@
+ 
+ %% Internal API
+ 
++parse_options(State=#mochiweb_socket_server{}) ->
++    State;
+ parse_options(Options) ->
+     parse_options(Options, #mochiweb_socket_server{}).
+ 
+@@ -116,22 +130,22 @@
+     parse_options(Rest, State#mochiweb_socket_server{profile_fun=ProfileFun}).
+ 
+ 
+-start_server(State=#mochiweb_socket_server{ssl=Ssl, name=Name}) ->
+-    case Ssl of
+-        true ->
+-            application:start(crypto),
+-            application:start(public_key),
+-            application:start(ssl);
+-        false ->
+-            void
+-    end,
++start_server(F, State=#mochiweb_socket_server{ssl=Ssl, name=Name}) ->
++    ok = prep_ssl(Ssl),
+     case Name of
+         undefined ->
+-            gen_server:start_link(?MODULE, State, []);
++            gen_server:F(?MODULE, State, []);
+         _ ->
+-            gen_server:start_link(Name, ?MODULE, State, [])
++            gen_server:F(Name, ?MODULE, State, [])
+     end.
+ 
++prep_ssl(true) ->
++    ok = mochiweb:ensure_started(crypto),
++    ok = mochiweb:ensure_started(public_key),
++    ok = mochiweb:ensure_started(ssl);
++prep_ssl(false) ->
++    ok.
++
+ ensure_int(N) when is_integer(N) ->
+     N;
+ ensure_int(S) when is_list(S) ->
+@@ -165,27 +179,7 @@
+         {_, _, _, _, _, _, _, _} -> % IPv6
+             [inet6, {ip, Ip} | BaseOpts]
+     end,
+-    case listen(Port, Opts, State) of
+-        {stop, eacces} ->
+-            case Port < 1024 of
+-                true ->
+-                    case catch fdsrv:start() of
+-                        {ok, _} ->
+-                            case fdsrv:bind_socket(tcp, Port) of
+-                                {ok, Fd} ->
+-                                    listen(Port, [{fd, Fd} | Opts], State);
+-                                _ ->
+-                                    {stop, fdsrv_bind_failed}
+-                            end;
+-                        _ ->
+-                            {stop, fdsrv_start_failed}
+-                    end;
+-                false ->
+-                    {stop, eacces}
+-            end;
+-        Other ->
+-            Other
+-    end.
++    listen(Port, Opts, State).
+ 
+ new_acceptor_pool(Listen,
+                   State=#mochiweb_socket_server{acceptor_pool=Pool,
+@@ -271,15 +265,8 @@
+ 
+ terminate(Reason, State) when ?is_old_state(State) ->
+     terminate(Reason, upgrade_state(State));
+-terminate(_Reason, #mochiweb_socket_server{listen=Listen, port=Port}) ->
+-    mochiweb_socket:close(Listen),
+-    case Port < 1024 of
+-        true ->
+-            catch fdsrv:stop(),
+-            ok;
+-        false ->
+-            ok
+-    end.
++terminate(_Reason, #mochiweb_socket_server{listen=Listen}) ->
++    mochiweb_socket:close(Listen).
+ 
+ code_change(_OldVsn, State, _Extra) ->
+     State.
+@@ -337,8 +324,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ upgrade_state_test() ->
+     OldState = {mochiweb_socket_server,
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_util.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_util.erl
+--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_util.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_util.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -9,7 +9,7 @@
+ -export([path_split/1]).
+ -export([urlsplit/1, urlsplit_path/1, urlunsplit/1, urlunsplit_path/1]).
+ -export([guess_mime/1, parse_header/1]).
+--export([shell_quote/1, cmd/1, cmd_string/1, cmd_port/2, cmd_status/1]).
++-export([shell_quote/1, cmd/1, cmd_string/1, cmd_port/2, cmd_status/1, cmd_status/2]).
+ -export([record_to_proplist/2, record_to_proplist/3]).
+ -export([safe_relative_path/1, partition/2]).
+ -export([parse_qvalues/1, pick_accepted_encodings/3]).
+@@ -124,11 +124,17 @@
+     string:join([shell_quote(X) || X <- Argv], " ").
+ 
+ %% @spec cmd_status([string()]) -> {ExitStatus::integer(), Stdout::binary()}
+-%% @doc Accumulate the output and exit status from the given application, will be
+-%%      spawned with cmd_port/2.
++%% @doc Accumulate the output and exit status from the given application,
++%%      will be spawned with cmd_port/2.
+ cmd_status(Argv) ->
++    cmd_status(Argv, []).
++
++%% @spec cmd_status([string()], [atom()]) -> {ExitStatus::integer(), Stdout::binary()}
++%% @doc Accumulate the output and exit status from the given application,
++%%      will be spawned with cmd_port/2.
++cmd_status(Argv, Options) ->
+     Port = cmd_port(Argv, [exit_status, stderr_to_stdout,
+-                           use_stdio, binary]),
++                           use_stdio, binary | Options]),
+     try cmd_loop(Port, [])
+     after catch port_close(Port)
+     end.
+@@ -578,8 +584,8 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ 
+ make_io_test() ->
+     ?assertEqual(
+diff -wbBur apache-couchdb-1.2.1/src/mochiweb/reloader.erl apache-couchdb-1.2.1.q/src/mochiweb/reloader.erl
+--- apache-couchdb-1.2.1/src/mochiweb/reloader.erl	2012-12-21 01:24:07.000000000 +0400
++++ apache-couchdb-1.2.1.q/src/mochiweb/reloader.erl	2013-03-22 15:26:58.000000000 +0400
+@@ -59,7 +59,7 @@
+ %% @doc gen_server callback.
+ handle_info(doit, State) ->
+     Now = stamp(),
+-    doit(State#state.last, Now),
++    _ = doit(State#state.last, Now),
+     {noreply, State#state{last = Now}};
+ handle_info(_Info, State) ->
+     {noreply, State}.
+@@ -156,6 +156,6 @@
+ %%
+ %% Tests
+ %%
+--include_lib("eunit/include/eunit.hrl").
+ -ifdef(TEST).
++-include_lib("eunit/include/eunit.hrl").
+ -endif.
diff --git a/community/couchdb/configure-fix.patch b/community/couchdb/configure-fix.patch
deleted file mode 100644
index 0bb68ecfe..000000000
--- a/community/couchdb/configure-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rup apache-couchdb-1.2.0/configure apache-couchdb-1.2.0.new/configure
---- apache-couchdb-1.2.0/configure	2012-03-29 23:05:41.000000000 +0200
-+++ apache-couchdb-1.2.0.new/configure	2012-04-08 13:50:14.923693056 +0200
-@@ -18234,7 +18234,7 @@ echo "$as_me: error: $erlang_version_err
-     fi
- fi
- 
--otp_release="`${ERL} -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`"
-+otp_release="`${ERL} -smp disable -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`"
- 
-  if test x$otp_release \> xR13B03; then
-   USE_OTP_NIFS_TRUE=
-@@ -18253,7 +18253,7 @@ else
- fi
- 
- 
--has_crypto=`${ERL} -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop`
-+has_crypto=`${ERL} -smp disable -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop`
- 
- if test -n "$has_crypto"; then
-     { { echo "$as_me:$LINENO: error: Could not find the Erlang crypto library. Has Erlang been compiled with OpenSSL support?" >&5
diff --git a/community/couchdb/rc-script.patch b/community/couchdb/rc-script.patch
deleted file mode 100644
index 1dd723ffc..000000000
--- a/community/couchdb/rc-script.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- couchdb	2011-12-27 01:21:59.000000000 +0400
-+++ couchdb.my	2011-12-27 01:21:18.000000000 +0400
-@@ -1,6 +1,4 @@
--#!/bin/bash
--. /etc/rc.conf
--. /etc/rc.d/functions
-+#!/bin/sh -e
- 
- # Licensed under the Apache License, Version 2.0 (the "License"); you may not
- # use this file except in compliance with the License. You may obtain a copy of
-@@ -31,7 +29,7 @@
- NAME=couchdb
- SCRIPT_NAME=`basename $0`
- COUCHDB=/usr/bin/couchdb
--CONFIGURATION_FILE=/etc/conf.d/couchdb
-+CONFIGURATION_FILE=/etc/default/couchdb
- RUN_DIR=/var/run/couchdb
- LSB_LIBRARY=/lib/lsb/init-functions
- 
-@@ -44,14 +42,16 @@
- fi
- 
- log_daemon_msg () {
--    stat_busy $@
-+    # Dummy function to be replaced by LSB library.
-+
-+    echo $@
- }
- 
- log_end_msg () {
-+    # Dummy function to be replaced by LSB library.
-+
-     if test "$1" != "0"; then
--      stat_fail
--    else
--      stat_done
-+      echo "Error with $DESCRIPTION: $NAME"
-     fi
-     return $1
- }
-@@ -66,7 +66,7 @@
-         command="$command $COUCHDB_OPTIONS"
-     fi
-     if test -n "$COUCHDB_USER"; then
--        if su $COUCHDB_USER -s /bin/bash -c "$command"; then
-+        if su $COUCHDB_USER -c "$command"; then
-             return $SCRIPT_OK
-         else
-             return $SCRIPT_ERROR
-@@ -84,7 +84,6 @@
-     # Start Apache CouchDB as a background process.
- 
-     mkdir -p "$RUN_DIR"
--    chown -R $COUCHDB_USER "$RUN_DIR"
-     command="$COUCHDB -b"
-     if test -n "$COUCHDB_STDOUT_FILE"; then
-         command="$command -o $COUCHDB_STDOUT_FILE"
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index fb91a2a5e..e32af2610 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 82520 2013-01-20 01:50:26Z stephane $
+# $Id: PKGBUILD 87448 2013-03-31 20:30:15Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=cppcheck
-pkgver=1.58
+pkgver=1.59
 pkgrel=1
 pkgdesc="A tool for static C/C++ code analysis"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cppcheck.wiki.sourceforge.net/"
 license=('GPL')
-depends=('pcre' 'qt')
+depends=('pcre' 'qt4')
 makedepends=('docbook-xsl')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('c7f597c600c30b1a5e9c6b3228a11e9872d562e5')
+sha1sums=('686effdfa6f2ca3369d7d52e54c6fd2db2d06d97')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
    make
-   make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.77.1/manpages/docbook.xsl man
+   make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.78.0/manpages/docbook.xsl man
 
    cd gui
    export HAVE_RULES=yes 
-   qmake
+   qmake-qt4
    make
 }
 
diff --git a/community/credentials-preferences/PKGBUILD b/community/credentials-preferences/PKGBUILD
index 18a7bf61e..73b770b48 100644
--- a/community/credentials-preferences/PKGBUILD
+++ b/community/credentials-preferences/PKGBUILD
@@ -1,33 +1,33 @@
-# $Id: PKGBUILD 79485 2012-11-06 04:10:55Z bgyorgy $
+# $Id: PKGBUILD 87397 2013-03-30 21:57:57Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=credentials-preferences
 _pkgname=credentials-control-center
-pkgver=0.1.1
+pkgver=0.1.5
 pkgrel=1
 pkgdesc="Control panel for configuring online account credentials and settings"
 arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/online-accounts-gnome-control-center"
+url="https://launchpad.net/gnome-control-center-signon"
 license=('GPL' 'LGPL')
 depends=('libaccounts-glib' 'libsignon-glib' 'gtk3')
 makedepends=('gobject-introspection' 'vala' 'intltool' 'itstool')
 options=('!libtool')
 install=$pkgname.install
-source=(https://launchpad.net/online-accounts-gnome-control-center/13.04/$pkgver/+download/$_pkgname-$pkgver.tar.bz2
+source=(https://launchpad.net/gnome-control-center-signon/13.04/$pkgver/+download/$_pkgname-$pkgver.tar.xz
         http://pkgbuild.com/~bgyorgy/sources/$_pkgname-translations-20121018.tar.gz)
-md5sums=('4e42fb2350393c6f8661e38f07d0b765'
+md5sums=('deaa290c89dffee5198f3f0f6f2e1fe1'
          '702d6b39136e10ba6dfad0afd300b2af')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
-  # Install language files
-  echo 'af ar ast bn bs ca cy cs da de el en_AU en_GB eo es eu fa fi fr gd gl gu he hu it ja ko lt lv ms my nb nl oc pl pt pt_BR ro ru se sk sl sq sv tr ug uk vi zh_CN zh_HK zh_TW' >po/LINGUAS
+  # Install updated language files
   rename $_pkgname- '' ../po/$_pkgname-*.po
   mv -f -t po ../po/*
+  printf "%s\n" po/*.po | sed -e 's/po\///g' -e 's/\.po//g' >po/LINGUAS
 
-  # Fix desktop file
-  sed -i 's/X-GNOME-Settings-Panel;//' data/credentials-preferences.desktop.in.in
+  # Fix helper script
+  sed -i 's/test/test -e/' online-accounts-preferences.in
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
               --disable-static
diff --git a/community/csfml/PKGBUILD b/community/csfml/PKGBUILD
index 0a28d763e..b6fe646a4 100644
--- a/community/csfml/PKGBUILD
+++ b/community/csfml/PKGBUILD
@@ -1,59 +1,34 @@
-# $Id: PKGBUILD 70299 2012-05-04 03:01:09Z svenstaro $
+# $Id: PKGBUILD 88191 2013-04-13 15:25:43Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=csfml
-
-_git=true
-
-if [[ "${_git}" = "true" ]]; then
-    pkgver=1.99.git20120504
-fi
-
+pkgver=2.0
 pkgrel=1
 pkgdesc='C bindings for sfml'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.sfml-dev.org/'
 license=('zlib')
-depends=('sfml')
-makedepends=('git' 'cmake' 'doxygen')
-
-_gitroot='https://github.com/LaurentGomila/CSFML.git'
-_gitname='CSFML'
+depends=("sfml=${pkgver}")
+makedepends=('cmake' 'doxygen')
+source=("csfml-${pkgver}::https://github.com/LaurentGomila/CSFML/archive/2.0.tar.gz")
+md5sums=('d609c9e3b115d480d8c61911d774472c')
 
 build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
-    msg "The local files are updated."
-  else
-    git clone $_gitroot
-    cd $_gitname
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
+  cd "$srcdir"/CSFML-${pkgver}
 
   mkdir build && cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
-        -DBUILD_DOC=true
+  cmake .. \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DBUILD_DOC=true
   make
   make doc
 }
 
 package() {
-  cd "$srcdir/$_gitname-build/build/"
+  cd "$srcdir"/CSFML-${pkgver}/build
 
   make DESTDIR="$pkgdir/" install
 
-  install -Dm644 ../license.txt \
-    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  make clean
+  install -Dm644 ../license.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
diff --git a/community/cuneiform/PKGBUILD b/community/cuneiform/PKGBUILD
index 232bb124b..83f4e477e 100644
--- a/community/cuneiform/PKGBUILD
+++ b/community/cuneiform/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83315 2013-01-29 14:01:01Z spupykin $
+# $Id: PKGBUILD 87488 2013-04-01 16:09:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Maxim Vuets <maxim.vuets@gmail.com>
 
 pkgname=cuneiform
 pkgver=1.1.0
 _dpkgver=1.1
-pkgrel=6
+pkgrel=8
 pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages."
 arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/cuneiform-linux"
@@ -21,17 +21,24 @@ md5sums=('09fd160cdfc512f26442a7e91246598d')
 build() {
   cd "${_SRC_ROOT}"
   sed -i 's#lib64#lib#' install_files.cmake
-  mkdir builddir
+  mkdir -p builddir
   cd builddir
 
+  LMAGICK=`ls -1 /usr/lib/libMagick++*.so.?`
+
   cmake \
 	-DCMAKE_BUILD_TYPE=release \
 	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DImageMagick_Magick++_LIBRARY=/usr/lib/libMagick++-Q16.so.7 \
+	-DImageMagick_Magick++_LIBRARY=$LMAGICK \
+	-DImageMagick_Magick++_INCLUDE_DIR=/usr/include/ImageMagick-6 \
 	..
   make
 }
 
+check() {
+  ldd ${_SRC_ROOT}/builddir/cuneiform | grep Magick >/dev/null
+}
+
 package() {
   cd "${_SRC_ROOT}"/builddir
   make DESTDIR="${pkgdir}" install
diff --git a/community/cuyo/PKGBUILD b/community/cuyo/PKGBUILD
index 868d99392..994e167d0 100644
--- a/community/cuyo/PKGBUILD
+++ b/community/cuyo/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 60801 2011-12-18 13:21:49Z jlichtblau $
+# $Id: PKGBUILD 84769 2013-02-24 13:12:51Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=cuyo
-pkgver=2.1.2
+pkgver=2.0.0
 pkgrel=1
+epoch=1
 pkgdesc="Tetris-style puzzle game for up to two players with a twist"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.karimmi.de/cuyo/"
@@ -12,13 +13,13 @@ depends=('desktop-file-utils' 'hicolor-icon-theme' 'sdl' 'sdl_mixer' 'sdl_image'
 makedepends=('patch')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-2.~-1.2.tar.gz \
+source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz \
         $pkgname.diff)
-sha256sums=('3fb44af4e6f8d205d11d44b5a96ffa4a11eab5a4fa86897463c0c6ca0658adb0'
-            'dd81909594072f030571f2afc39cc69838eed26304d2d89949ac1c2c850dcafe')
+sha256sums=('531cfb989087199f643ac4b18ff9cc50793cc3fa07ee06f394f73d153c09ae34'
+            'efceed1489c551f5ae8909df3ad57f302f8105cbb1e735d8ece44269e886ce7c')
 
 build() {
-  cd ${srcdir}/$pkgname-2.~-1.2
+  cd ${srcdir}/$pkgname-$pkgver
 
   patch -Np0 -i ${srcdir}/$pkgname.diff
 
@@ -27,7 +28,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/$pkgname-2.~-1.2
+  cd ${srcdir}/$pkgname-$pkgver
 
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/cuyo/cuyo.changelog b/community/cuyo/cuyo.changelog
index 2212ac481..f7e64c7af 100644
--- a/community/cuyo/cuyo.changelog
+++ b/community/cuyo/cuyo.changelog
@@ -1,5 +1,8 @@
+2013-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* cuyo 2.0.0-1
+
 2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* cuyo 2.1.2-1
+	* cuyo 2.~1.2-1
 
 2009-11-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to minor release 2.1.1-4
+	* Update to minor release 2.~1.1-4
diff --git a/community/cuyo/cuyo.diff b/community/cuyo/cuyo.diff
index 3da3b1c64..e38fedbdf 100644
--- a/community/cuyo/cuyo.diff
+++ b/community/cuyo/cuyo.diff
@@ -1,11 +1,6 @@
---- icons/cuyo.desktop	2011-12-18 13:48:54.000000000 +0100
-+++ icons/cuyo.desktop	2011-12-18 13:48:54.000000000 +0100
-@@ -7,4 +7,4 @@
- Categories=Game;BlocksGame;
+--- icons/cuyo.desktop~	2011-03-26 16:20:01.000000000 +0100
++++ icons/cuyo.desktop	2013-02-24 14:00:34.385662015 +0100
+@@ -7 +6,0 @@
 -Encoding=UTF-8
- Comment=Play a tetris like game with many levels
+@@ -8,0 +8 @@
 +Comment[cs]=Hra podobná tetrisu s mnoha úrovněmi
- Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln spielen
-@@ -12,2 +12 @@
- GenericName=Tetris like game
-- 
diff --git a/community/cuyo/cuyo.install b/community/cuyo/cuyo.install
index 4c0972beb..3e6bc7c16 100644
--- a/community/cuyo/cuyo.install
+++ b/community/cuyo/cuyo.install
@@ -1,5 +1,5 @@
 post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate
   update-desktop-database -q
 }
 
diff --git a/community/cx_freeze/FreezePython.sh b/community/cx_freeze/FreezePython.sh
deleted file mode 100644
index 5bba21cac..000000000
--- a/community/cx_freeze/FreezePython.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd /usr/share/cx-freeze
-./FreezePython "$@"
diff --git a/community/cx_freeze/PKGBUILD b/community/cx_freeze/PKGBUILD
deleted file mode 100644
index 383748df3..000000000
--- a/community/cx_freeze/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 83132 2013-01-27 16:11:45Z pierre $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Roberto Alsina <ralsina@kde.org>
-
-pkgname=cx_freeze
-_tarname=cx_Freeze
-pkgver=4.2.3
-pkgrel=2
-pkgdesc="A set of utilities for freezing Python scripts into executables"
-arch=('i686' 'x86_64')
-url="http://www.python.net/crew/atuining/cx_Freeze/"
-license=('custom')
-depends=('python2')
-provides=('cxfreeze')
-source=("http://downloads.sourceforge.net/cx-freeze/$_tarname-$pkgver.tar.gz"
-        'FreezePython.sh')
-md5sums=('a524cfd23de5d37e0ec9400ba1ccd6ad'
-         '5cc60d1644eba12a57c22cc1348a4afd')
-
-package() {
-  cd "$srcdir/$_tarname-$pkgver"
-
-  python2 setup.py install --root "$pkgdir/" --optimize 1
-
-  install -d "$pkgdir"/usr/share/cx-freeze/{bases,initscripts}
-  install -m755 source/bases/* "$pkgdir/usr/share/cx-freeze/bases"
-  install -m644 initscripts/* "$pkgdir/usr/share/cx-freeze/initscripts"
-  install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/cx_freeze/COPYING"
-}
diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD
index 1042e98e0..ab4ef1bfd 100644
--- a/community/cython/PKGBUILD
+++ b/community/cython/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83887 2013-02-06 11:39:48Z spupykin $
+# $Id: PKGBUILD 88776 2013-04-22 10:14:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Igor Scabini <furester @ gmail.com>
 
 pkgname=('cython' 'cython2')
 pkgbase=cython
-pkgver=0.18
+pkgver=0.19
 pkgrel=1
 pkgdesc="C-Extensions for Python "
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ url="http://www.cython.org"
 license=('APACHE')
 makedepends=('python-distribute' 'python2-distribute')
 source=("http://cython.org/release/Cython-$pkgver.tar.gz")
-md5sums=('6a72d14e72f3df597b34ac326152f8d2')
+md5sums=('76989337dee4cf7afdcb5cde514423f8')
 
 build() {
   true
diff --git a/community/dangerdeep/PKGBUILD b/community/dangerdeep/PKGBUILD
deleted file mode 100644
index c08272acf..000000000
--- a/community/dangerdeep/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 77850 2012-10-15 09:46:31Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=dangerdeep
-pkgver=0.3.0
-pkgrel=7
-pkgdesc="submarine simulator"
-arch=(i686 x86_64)
-url="http://dangerdeep.sourceforge.net"
-license=('GPL')
-depends=('libgl' 'sdl_net' 'fftw' 'sdl_image' 'sdl_mixer' 'dangerdeep-data' 'glu')
-makedepends=('scons' 'mesa')
-source=("http://downloads.sourceforge.net/sourceforge/dangerdeep/dangerdeep-$pkgver.tar.gz"
-	"build-fix.patch")
-md5sums=('8a1d19326a9a0bd8bb91a652bfa51bd9'
-         'a4487f079e844ec6b093ef97c151dcd7')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/build-fix.patch
-  scons installbindir=$pkgdir/usr/bin datadir=/usr/share/dangerdeep install
-}
diff --git a/community/dangerdeep/build-fix.patch b/community/dangerdeep/build-fix.patch
deleted file mode 100644
index f77e07c5a..000000000
--- a/community/dangerdeep/build-fix.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -wbBur dangerdeep-0.3.0/src/bspline_test.cpp dangerdeep-0.3.0.my/src/bspline_test.cpp
---- dangerdeep-0.3.0/src/bspline_test.cpp	2007-06-11 19:16:23.000000000 +0400
-+++ dangerdeep-0.3.0.my/src/bspline_test.cpp	2012-10-08 17:33:01.034909571 +0400
-@@ -1,6 +1,8 @@
- // some test code for the 2d bsplines!
- #include "bspline.h"
- #include <fstream>
-+#include <cstdlib>
-+
- using namespace std;
- 
- double rnd() { return double(rand())/RAND_MAX; }
-diff -wbBur dangerdeep-0.3.0/src/convoy.h dangerdeep-0.3.0.my/src/convoy.h
---- dangerdeep-0.3.0/src/convoy.h	2007-06-11 19:16:23.000000000 +0400
-+++ dangerdeep-0.3.0.my/src/convoy.h	2012-10-08 17:33:01.034909571 +0400
-@@ -26,6 +26,7 @@
- #include "ai.h"
- #include "vector2.h"
- #include <new>
-+#include <memory>
- #include <list>
- class ship;
- 
-diff -wbBur dangerdeep-0.3.0/src/date.cpp dangerdeep-0.3.0.my/src/date.cpp
---- dangerdeep-0.3.0/src/date.cpp	2007-06-11 19:16:23.000000000 +0400
-+++ dangerdeep-0.3.0.my/src/date.cpp	2012-10-08 17:33:01.034909571 +0400
-@@ -20,6 +20,8 @@
- // date
- // subsim (C)+(W) Markus Petermann and Thorsten Jordan. SEE LICENSE
- 
-+#include <stdio.h>
-+#include <stdlib.h>
- #include <iomanip>
- #include "date.h"
- #include "texts.h"
-diff -wbBur dangerdeep-0.3.0/src/faulthandler.h dangerdeep-0.3.0.my/src/faulthandler.h
---- dangerdeep-0.3.0/src/faulthandler.h	2007-06-11 22:29:30.000000000 +0400
-+++ dangerdeep-0.3.0.my/src/faulthandler.h	2012-10-08 17:33:23.264909316 +0400
-@@ -50,6 +50,7 @@
- #include <signal.h>
- #include <string>
- #include <sstream>
-+#include <unistd.h>
- 
- // Note: use --export-dynamic as linker option or you won't get function names here.
- 
-diff -wbBur dangerdeep-0.3.0/src/filehelper.cpp dangerdeep-0.3.0.my/src/filehelper.cpp
---- dangerdeep-0.3.0/src/filehelper.cpp	2007-06-11 19:16:23.000000000 +0400
-+++ dangerdeep-0.3.0.my/src/filehelper.cpp	2012-10-08 17:33:01.034909571 +0400
-@@ -23,6 +23,7 @@
- #include "filehelper.h"
- #include "error.h"
- #include <vector>
-+#include <stdio.h>
- using namespace std;
- 
- #ifdef WIN32
-diff -wbBur dangerdeep-0.3.0/src/ocean_wave_generator.h dangerdeep-0.3.0.my/src/ocean_wave_generator.h
---- dangerdeep-0.3.0/src/ocean_wave_generator.h	2007-06-11 19:16:23.000000000 +0400
-+++ dangerdeep-0.3.0.my/src/ocean_wave_generator.h	2012-10-08 17:33:01.034909571 +0400
-@@ -29,6 +29,7 @@
- #include "environment.h"
- #include <complex>
- #include <vector>
-+#include <cstdlib>
- 
- // use float fftw (faster) or double (default) ?
- #ifdef WITH_FLOAT_FFTW
-diff -wbBur dangerdeep-0.3.0/src/ptrlist.h dangerdeep-0.3.0.my/src/ptrlist.h
---- dangerdeep-0.3.0/src/ptrlist.h	2007-06-11 19:16:23.000000000 +0400
-+++ dangerdeep-0.3.0.my/src/ptrlist.h	2012-10-08 17:33:01.034909571 +0400
-@@ -25,6 +25,7 @@
- 
- #include <list>
- #include <stdexcept>
-+#include <memory>
- 
- // same as std::list regarding the interface (partly), but handles pointers.
- template <class T>
-diff -wbBur dangerdeep-0.3.0/src/ptrvector.h dangerdeep-0.3.0.my/src/ptrvector.h
---- dangerdeep-0.3.0/src/ptrvector.h	2007-06-11 19:16:23.000000000 +0400
-+++ dangerdeep-0.3.0.my/src/ptrvector.h	2012-10-08 17:33:01.034909571 +0400
-@@ -25,6 +25,7 @@
- 
- #include <vector>
- #include <stdexcept>
-+#include <memory>
- 
- // same as std::vector regarding the interface, but handles pointers.
- template <class T>
-diff -wbBur dangerdeep-0.3.0/src/widget.cpp dangerdeep-0.3.0.my/src/widget.cpp
---- dangerdeep-0.3.0/src/widget.cpp	2007-06-11 19:16:23.000000000 +0400
-+++ dangerdeep-0.3.0.my/src/widget.cpp	2012-10-08 17:33:01.034909571 +0400
-@@ -32,6 +32,8 @@
- #include "datadirs.h"
- #include <set>
- #include <sstream>
-+#include <algorithm>
-+
- using std::vector;
- using std::list;
- using std::string;
diff --git a/community/darkhttpd/PKGBUILD b/community/darkhttpd/PKGBUILD
index 07a3895da..a1aba40ca 100644
--- a/community/darkhttpd/PKGBUILD
+++ b/community/darkhttpd/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 65106 2012-02-20 04:47:15Z spupykin $
+# $Id: PKGBUILD 89410 2013-04-29 10:56:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=darkhttpd
-pkgver=1.8
-pkgrel=2
+pkgver=1.9
+pkgrel=1
 pkgdesc="A small, static webserver"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dmr.ath.cx/net/darkhttpd/"
 license=('BSD')
 depends=('glibc')
 source=($url/$pkgname-$pkgver.tar.bz2)
-md5sums=('cff3861af17b109d796993a990ec4c5b')
+md5sums=('156f239af542028c3fb5c2248aa0db8d')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   install -D $srcdir/$pkgname-$pkgver/darkhttpd $pkgdir/usr/sbin/darkhttpd
   mkdir -p $pkgdir/usr/share/licenses/$pkgname
   head -n 18 darkhttpd.c >$pkgdir/usr/share/licenses/$pkgname/license
diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD
index 93e4f2578..1f504ae9e 100644
--- a/community/darkstat/PKGBUILD
+++ b/community/darkstat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79547 2012-11-07 09:14:43Z spupykin $
+# $Id: PKGBUILD 86508 2013-03-18 12:20:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=darkstat
 pkgver=3.0.715
-pkgrel=7
+pkgrel=8
 pkgdesc="Network statistics gatherer (packet sniffer)"
 url="http://dmr.ath.cx/net/darkstat/"
 license=("GPL")
@@ -17,7 +17,7 @@ source=(http://dmr.ath.cx/net/darkstat/darkstat-$pkgver.tar.bz2
 install=darkstat.install
 md5sums=('5b7abc7538dcd8e30667dac150e81d77'
          '1021f95fabe16cfab4c95f6264d535e5'
-         'e2d9efc856201146e2abae145b4c5a1f'
+         '91dd1cf9d01c2b37896f01b4570b5521'
          'aa9a9effd1e8f08860afcd6439fc94c5')
 options=(!makeflags !distcc)
 
diff --git a/community/darkstat/darkstat.service b/community/darkstat/darkstat.service
index 5b7180e45..b92eff85c 100644
--- a/community/darkstat/darkstat.service
+++ b/community/darkstat/darkstat.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Network statistics gatherer (packet sniffer)
+After=network.target
 
 [Service]
 Type=simple
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index d5bacea73..83f73824c 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD 82360 2013-01-16 10:08:28Z spupykin $
+# $Id: PKGBUILD 88866 2013-04-24 14:09:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Christian Himpel <chressie at gmail dot com>
 # Contributor: Johannes Hanika <hanatos at gmail dot com>
 
 pkgname=darktable
-pkgver=1.1.2
-_pkgver=1.1
-pkgrel=2
+pkgver=1.2
+_pkgver=1.2
+pkgrel=3
 pkgdesc="Utility to organize and develop raw images"
 arch=('i686' 'x86_64' 'mips64el')
 url=http://darktable.sf.net/
 license=('GPL3')
 depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib'
 	 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite' 'libxslt'
-	 'libsoup')
+	 'libsoup' 'gtk-engines')
 makedepends=('intltool>=0.40' 'cmake' 'librsvg')
 optdepends=('librsvg')
 install=darktable.install
 options=(!libtool)
-source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz)
-md5sums=('cdc27dc2d9d53df3ec2c6aa908a3eb3c')
+source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz)
+md5sums=('31bfd13d4786aac4f99d5155a811602b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-#  mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt
-  sed -i 's/-Werror//' src/CMakeLists.txt
   mkdir -p build
   cd build
+  CXXFLAGS+=" -fpermissive"
   cmake \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_BUILD_TYPE=Release \
@@ -42,6 +41,4 @@ package() {
   cd "$srcdir/$pkgname-$pkgver/build"
   make DESTDIR="$pkgdir" install
   mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}"
-#  mkdir -p "${pkgdir}/usr/share/gconf/schemas/"
-#  mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/"
 }
diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index f036021e6..6b388b23b 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 82595 2013-01-21 11:20:22Z spupykin $
+# $Id: PKGBUILD 84536 2013-02-19 15:03:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
 
 pkgname=dbmail
 pkgver=3.0.2
-pkgrel=8
+pkgrel=9
 pkgdesc="Fast and scalable sql based mail services"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gmime24' 'libzdb' 'mhash' 'libevent')
 makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1'
 	     'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve')
-optdepends=('postgresql-libs: for PostgreSQL storage backend'
-	    'sqlite: for SQLite storage backend'
-	    'libmysqlclient: for MySQL storage backend'
-	    'libldap: for LDAP authentication'
+optdepends=('libldap: for LDAP authentication'
 	    'libsieve: for dbmail-sieve')
 url="http://www.dbmail.org"
 license=('GPL')
 options=('!libtool' 'zipman')
-backup=(etc/conf.d/dbmail)
+backup=(etc/conf.d/dbmail
+	etc/xinetd.d/dbmail-imapd
+	etc/xinetd.d/dbmail-pop3d
+	etc/xinetd.d/dbmail-lmtpd
+	etc/xinetd.d/dbmail-timsieved)
 source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz
 	dbmail.conf.d
 	dbmail.rc.d
@@ -26,7 +27,11 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz
 	dbmail-imapd.service
 	dbmail-lmtpd.service
 	dbmail-pop3d.service
-	dbmail-timsieved.service)
+	dbmail-timsieved.service
+	dbmail-imapd.xinetd
+	dbmail-lmtpd.xinetd
+	dbmail-pop3d.xinetd
+	dbmail-timsieved.xinetd)
 md5sums=('eb32235abffdf967253ee9d004e0e4a9'
          'e7f72bc360decdb2475266391ad12329'
          '30774513fb016b9da08e9cf6f2a0b8e7'
@@ -34,7 +39,11 @@ md5sums=('eb32235abffdf967253ee9d004e0e4a9'
          '84efa46eaac66057c4eb131d9bc27fa8'
          '19560277f6a56d1f3f2fdb02315dcf0f'
          '89a0f793737eaf36291409f8c840891e'
-         'dd1b5b2c542f55d9d934a58a36d0513d')
+         'dd1b5b2c542f55d9d934a58a36d0513d'
+         '8fa791f2e4d107ba461453c054359477'
+         '069cd4285c4b2ec95dfdcebc2cfee387'
+         '44f87ce81e786fcee501daa17e55412a'
+         'a66927cb94d4f26428211e3ad2d540c8')
 
 build() {
   cd $srcdir/dbmail-${pkgver/_/-}/
@@ -56,9 +65,10 @@ package() {
   cp -r sql/* $pkgdir/usr/share/dbmail/
   cp dbmail.schema $pkgdir/usr/share/dbmail/
 
-  install -Dm0644 $srcdir/dbmail-imapd.service $pkgdir/usr/lib/systemd/system/dbmail-imapd.service
-  install -Dm0644 $srcdir/dbmail-lmtpd.service $pkgdir/usr/lib/systemd/system/dbmail-lmtpd.service
-  install -Dm0644 $srcdir/dbmail-pop3d.service $pkgdir/usr/lib/systemd/system/dbmail-pop3d.service
-  install -Dm0644 $srcdir/dbmail-timsieved.service $pkgdir/usr/lib/systemd/system/dbmail-timsieved.service
+  for i in dbmail-imapd dbmail-lmtpd dbmail-pop3d dbmail-timsieved; do
+    install -Dm0644 $srcdir/$i.service $pkgdir/usr/lib/systemd/system/$i.service
+    install -Dm0644 $srcdir/$i.xinetd $pkgdir/etc/xinetd.d/$i
+  done
+
   install -Dm0644 $srcdir/dbmail.tmpfiles $pkgdir/usr/lib/tmpfiles.d/dbmail.conf
 }
diff --git a/community/dbmail/dbmail-imapd.xinetd b/community/dbmail/dbmail-imapd.xinetd
new file mode 100644
index 000000000..eee3635df
--- /dev/null
+++ b/community/dbmail/dbmail-imapd.xinetd
@@ -0,0 +1,11 @@
+service imap
+{
+      socket_type     = stream
+      wait            = no
+      user            = nobody
+      server          = /usr/sbin/dbmail-imapd
+      protocol        = tcp
+      server_args     = -n
+      log_on_failure  += USERID
+      disable         = yes
+}
diff --git a/community/dbmail/dbmail-lmtpd.xinetd b/community/dbmail/dbmail-lmtpd.xinetd
new file mode 100644
index 000000000..63365fee4
--- /dev/null
+++ b/community/dbmail/dbmail-lmtpd.xinetd
@@ -0,0 +1,13 @@
+service lmtp
+{
+      port            = 24
+      type            = UNLISTED
+      socket_type     = stream
+      wait            = no
+      user            = nobody
+      server          = /usr/sbin/dbmail-lmtpd
+      protocol        = tcp
+      server_args     = -n
+      log_on_failure  += USERID
+      disable         = yes
+}
diff --git a/community/dbmail/dbmail-pop3d.xinetd b/community/dbmail/dbmail-pop3d.xinetd
new file mode 100644
index 000000000..6c5b06735
--- /dev/null
+++ b/community/dbmail/dbmail-pop3d.xinetd
@@ -0,0 +1,11 @@
+service pop3
+{
+      socket_type     = stream
+      wait            = no
+      user            = nobody
+      server          = /usr/sbin/dbmail-pop3d
+      protocol        = tcp
+      server_args     = -n
+      log_on_failure  += USERID
+      disable         = yes
+}
diff --git a/community/dbmail/dbmail-timsieved.xinetd b/community/dbmail/dbmail-timsieved.xinetd
new file mode 100644
index 000000000..77ed27c31
--- /dev/null
+++ b/community/dbmail/dbmail-timsieved.xinetd
@@ -0,0 +1,11 @@
+service sieve
+{
+      socket_type     = stream
+      wait            = no
+      user            = nobody
+      server          = /usr/sbin/dbmail-timsieved
+      protocol        = tcp
+      server_args     = -n
+      log_on_failure  += USERID
+      disable         = yes
+}
diff --git a/community/dcfldd/PKGBUILD b/community/dcfldd/PKGBUILD
index c28ded29f..c2dc0e67c 100644
--- a/community/dcfldd/PKGBUILD
+++ b/community/dcfldd/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=dcfldd
 pkgver=1.3.4.1
-pkgrel=3
+pkgrel=3.2
 pkgdesc="DCFL (DoD Computer Forensics Lab) dd replacement with hashing"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dcfldd.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/dcron/PKGBUILD b/community/dcron/PKGBUILD
deleted file mode 100644
index 03c03a08c..000000000
--- a/community/dcron/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 79754 2012-11-11 21:14:11Z spupykin $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Paul Mattal <paul.archlinux.org>
-
-pkgname=dcron
-pkgver=4.5
-pkgrel=4
-pkgdesc="dillon's lightweight cron daemon"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.jimpryor.net/linux/dcron.html"
-backup=('var/spool/cron/root' 'etc/conf.d/crond')
-depends=('bash')
-provides=('cron')
-conflicts=('cron')
-optdepends=('smtp-server: sending cron job output via email')
-install=$pkgname.install
-source=(http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz
-        service)
-md5sums=('078833f3281f96944fc30392b1888326'
-         'e43c3d758384ac644f5e19f460ab5f46')
-
-build() {
-	cd "$srcdir/${pkgname}-${pkgver}"
-
-	# by default, any member of group "users" can edit their own crontab
-	make \
-		PREFIX=/usr \
-		CRONTAB_GROUP=users \
-		CRONTABS=/var/spool/cron \
-		CRONSTAMPS=/var/spool/cronstamps
-}
-
-package() {
-	cd "$srcdir/${pkgname}-${pkgver}"
-	make DESTDIR="$pkgdir" install
-
-	# install standard configuration and scripts
-	install -d -m755 "$pkgdir/etc/cron."{hourly,daily,weekly,monthly} 
-
-	install -D -m755 extra/run-cron "$pkgdir/usr/sbin/run-cron"
-	install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root" 
-	install -D -m755 extra/crond.rc "$pkgdir/etc/rc.d/crond"
-	install -D -m0644 extra/crond.conf "$pkgdir/etc/conf.d/crond"
-	install -D -m644 extra/crontab.vim "$pkgdir/usr/share/vim/vimfiles/ftplugin/crontab.vim"
-	sed -i -e 's=/var/spool/cron/cronstamps=/var/spool/cronstamps=' extra/prune-cronstamps
-	install -D -m755 extra/prune-cronstamps "$pkgdir/etc/cron.d/prune-cronstamps"
-    install -Dm644  $srcdir/service $pkgdir/usr/lib/systemd/system/dcron.service
-}
diff --git a/community/dcron/dcron.install b/community/dcron/dcron.install
deleted file mode 100644
index df23d0224..000000000
--- a/community/dcron/dcron.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_upgrade() {
-	if [ $(vercmp $2 4.0) -lt 0 ]
-	then
-		echo "Restart crond, since you're upgrading to the dcron 4.x series."
-	fi
-}
diff --git a/community/dcron/service b/community/dcron/service
deleted file mode 100644
index 47265791e..000000000
--- a/community/dcron/service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Periodic Command Scheduler
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/crond
-ExecStart=/usr/sbin/crond $CROND_ARGS
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD
index c8bd17aca..a78b95e27 100644
--- a/community/dee/PKGBUILD
+++ b/community/dee/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82682 2013-01-23 00:15:51Z eric $
+# $Id: PKGBUILD 87044 2013-03-26 11:49:37Z foutrelis $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=dee
 pkgver=1.0.14
-pkgrel=4
+pkgrel=5
 pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/dee"
diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD
index 158a9ff8c..f5d469c9f 100644
--- a/community/deja-dup/PKGBUILD
+++ b/community/deja-dup/PKGBUILD
@@ -1,35 +1,34 @@
-# $Id: PKGBUILD 79462 2012-11-05 20:10:47Z bgyorgy $
+# $Id: PKGBUILD 87385 2013-03-30 14:36:30Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=deja-dup
-pkgver=24.0
-pkgrel=2
+pkgver=26.0
+pkgrel=1
 pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/deja-dup"
 license=('GPL')
-depends=('duplicity' 'libgnome-keyring' 'libpeas' 'libnotify' 'python2-gobject2' 'dconf' 'xdg-utils')
+depends=('duplicity' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs' 'xdg-utils')
 makedepends=('vala' 'intltool' 'itstool' 'nautilus')
 optdepends=('nautilus: backup extension'
-            'ubuntuone-client: backup into Ubuntu One storage')
+            'python2-boto: Amazon S3 backend'
+            'python2-oauthlib: Ubuntu One backend'
+            'ubuntuone-client: Ubuntu One backend')
 options=('!libtool')
 install=$pkgname.install
 source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
-        new-u1backend-support.patch
-        not-check-ubuntuone-couch.patch)
-md5sums=('335131d1f3c85615339fa8b212db50ae'
-         '944a4c62f042b240feba98f8d9a893b2'
-         '8d59798638982c2bdb55b2e415087245')
+        libsecret-1.vapi)
+md5sums=('0430bbf03deac852651599a979a4cc32'
+         '27ca0a3c9efbe93e86ef563c77f6ddf3')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' common/PythonChecker.vala
 
-  # Add support for the new Ubuntu One backend
-  patch -Np0 -i "$srcdir/new-u1backend-support.patch"
+  # Python2 fix
+  sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' common/PythonChecker.vala
 
-  # Now we don't need ubuntuone-couch for Ubuntu One support
-  patch -Np1 -i "$srcdir/not-check-ubuntuone-couch.patch"
+  # Add missing Vala API file
+  cp "$srcdir/libsecret-1.vapi" "vapi/libsecret-1.vapi"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
               --disable-static --disable-schemas-compile --without-unity
diff --git a/community/deja-dup/libsecret-1.vapi b/community/deja-dup/libsecret-1.vapi
new file mode 100644
index 000000000..7d3f4a3a6
--- /dev/null
+++ b/community/deja-dup/libsecret-1.vapi
@@ -0,0 +1,79 @@
+/* libsecret-1.vapi generated by vapigen-0.20, do not modify. */
+
+[CCode (cprefix = "Secret", gir_namespace = "Secret", gir_version = "1", lower_case_cprefix = "secret_")]
+namespace Secret {
+	[CCode (cheader_filename = "libsecret/secret.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "secret_schema_get_type ()")]
+	[Compact]
+	public class Schema {
+		[CCode (array_length = false, array_null_terminated = true)]
+		public weak Secret.SchemaAttribute[] attributes;
+		public Secret.SchemaFlags flags;
+		public weak string name;
+		[CCode (has_construct_function = false)]
+		public Schema (string name, Secret.SchemaFlags flags, ...);
+		[CCode (cname = "secret_schema_newv", has_construct_function = false)]
+		public Schema.newv (string name, Secret.SchemaFlags flags, GLib.HashTable<string,Secret.SchemaAttributeType> attribute_names_and_types);
+		public Secret.Schema @ref ();
+		public void unref ();
+	}
+	[CCode (cheader_filename = "libsecret/secret.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "secret_schema_attribute_get_type ()")]
+	[Compact]
+	public class SchemaAttribute {
+		public weak string name;
+		public Secret.SchemaAttributeType type;
+	}
+	[CCode (cheader_filename = "libsecret/secret.h", cprefix = "SECRET_ERROR_", has_type_id = false)]
+	public enum Error {
+		PROTOCOL,
+		IS_LOCKED,
+		NO_SUCH_OBJECT,
+		ALREADY_EXISTS;
+		public static GLib.Quark get_quark ();
+	}
+	[CCode (cheader_filename = "libsecret/secret.h", cprefix = "SECRET_SCHEMA_ATTRIBUTE_", has_type_id = false)]
+	public enum SchemaAttributeType {
+		STRING,
+		INTEGER,
+		BOOLEAN
+	}
+	[CCode (cheader_filename = "libsecret/secret.h", cprefix = "SECRET_SCHEMA_", has_type_id = false)]
+	[Flags]
+	public enum SchemaFlags {
+		NONE,
+		DONT_MATCH_NAME
+	}
+	[CCode (cheader_filename = "libsecret/secret.h", cname = "SECRET_COLLECTION_DEFAULT")]
+	public const string COLLECTION_DEFAULT;
+	[CCode (cheader_filename = "libsecret/secret.h", cname = "SECRET_COLLECTION_SESSION")]
+	public const string COLLECTION_SESSION;
+	[CCode (cheader_filename = "libsecret/secret.h")]
+	public static GLib.HashTable<string,string> attributes_build (Secret.Schema schema, ...);
+	[CCode (cheader_filename = "libsecret/secret.h")]
+	public static GLib.HashTable<string,string> attributes_buildv (Secret.Schema schema, va_list va);
+	[CCode (cheader_filename = "libsecret/secret.h")]
+	public static async bool password_clear (Secret.Schema schema, GLib.Cancellable? cancellable, ...) throws GLib.Error;
+	[CCode (cheader_filename = "libsecret/secret.h")]
+	public static bool password_clear_sync (Secret.Schema schema, GLib.Cancellable? cancellable = null, ...) throws GLib.Error;
+	[CCode (cheader_filename = "libsecret/secret.h", finish_name = "secret_password_clear_finish")]
+	public static async bool password_clearv (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable) throws GLib.Error;
+	[CCode (cheader_filename = "libsecret/secret.h")]
+	public static bool password_clearv_sync (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable = null) throws GLib.Error;
+	[CCode (cheader_filename = "libsecret/secret.h")]
+	public static async string password_lookup (Secret.Schema schema, GLib.Cancellable? cancellable, ...) throws GLib.Error;
+	[CCode (cheader_filename = "libsecret/secret.h")]
+	public static string password_lookup_sync (Secret.Schema schema, GLib.Cancellable? cancellable = null, ...) throws GLib.Error;
+	[CCode (cheader_filename = "libsecret/secret.h", finish_name = "secret_password_lookup_finish")]
+	public static async string password_lookupv (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable) throws GLib.Error;
+	[CCode (cheader_filename = "libsecret/secret.h")]
+	public static string password_lookupv_sync (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable = null) throws GLib.Error;
+	[CCode (cheader_filename = "libsecret/secret.h")]
+	public static async bool password_store (Secret.Schema schema, string? collection, string label, string password, GLib.Cancellable? cancellable, ...) throws GLib.Error;
+	[CCode (cheader_filename = "libsecret/secret.h")]
+	public static bool password_store_sync (Secret.Schema schema, string? collection, string label, string password, GLib.Cancellable? cancellable = null, ...) throws GLib.Error;
+	[CCode (cheader_filename = "libsecret/secret.h", finish_name = "secret_password_store_finish")]
+	public static async bool password_storev (Secret.Schema schema, GLib.HashTable<string,string> attributes, string? collection, string label, string password, GLib.Cancellable? cancellable) throws GLib.Error;
+	[CCode (cheader_filename = "libsecret/secret.h")]
+	public static bool password_storev_sync (Secret.Schema schema, GLib.HashTable<string,string> attributes, string? collection, string label, string password, GLib.Cancellable? cancellable = null) throws GLib.Error;
+	[CCode (cheader_filename = "libsecret/secret.h")]
+	public static void password_wipe (string? password);
+}
diff --git a/community/deja-dup/new-u1backend-support.patch b/community/deja-dup/new-u1backend-support.patch
deleted file mode 100644
index 08b918cb9..000000000
--- a/community/deja-dup/new-u1backend-support.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-=== modified file 'common/BackendU1.vala'
---- common/BackendU1.vala	2012-08-06 22:41:13 +0000
-+++ common/BackendU1.vala	2012-11-03 21:35:53 +0000
-@@ -212,21 +212,41 @@
- 
-   public override async void get_envp() throws Error
-   {
--    bool found = false;
-     var obj = get_creds_proxy();
-     if (obj.get_name_owner() == null) {
-       ask_password();
-       return;
-     }
- 
-+    var found = false;
-+    var envp = new List<string>();
-     var listener = new Listener(obj, "find_credentials", null, (name, args) => {
--      if (name == "CredentialsFound")
--        found = true;
-+      if (name == "CredentialsFound") {
-+        VariantIter iter;
-+        args.get("(a{ss})", out iter);
-+        string key, val;
-+        string consumer_key = null, consumer_secret = null, token = null, token_secret = null;
-+        while (iter.next("{ss}", out key, out val)) {
-+          if (key == "consumer_key")
-+            consumer_key = val;
-+          else if (key == "consumer_secret")
-+            consumer_secret = val;
-+          else if (key == "token")
-+            token = val;
-+          else if (key == "token_secret")
-+            token_secret = val;
-+        }
-+        if (consumer_key != null && consumer_secret != null && token != null && token_secret != null) {
-+          warning("appending: %s", "FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret));
-+          envp.append("FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret));
-+          found = true;
-+        }
-+      }
-     });
-     listener.run();
- 
-     if (found)
--      envp_ready(true, null);
-+      envp_ready(true, envp);
-     else
-       ask_password();
-   }
-
diff --git a/community/deja-dup/not-check-ubuntuone-couch.patch b/community/deja-dup/not-check-ubuntuone-couch.patch
deleted file mode 100644
index d7fb903a1..000000000
--- a/community/deja-dup/not-check-ubuntuone-couch.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur deja-dup-24.0.orig/common/BackendU1.vala deja-dup-24.0/common/BackendU1.vala
---- deja-dup-24.0.orig/common/BackendU1.vala	2012-08-07 00:20:51.000000000 +0200
-+++ deja-dup-24.0/common/BackendU1.vala	2012-11-05 16:39:34.140104977 +0100
-@@ -75,11 +75,14 @@
- 
- class U1Checker : Checker
- {
--  PythonChecker pyu1;
-   construct {
-     try {
-       var proxy = BackendU1.get_creds_proxy();
--      if (proxy.get_name_owner() == null) {
-+      if (proxy.get_name_owner() != null) {
-+        available = true;
-+        complete = true;
-+      }
-+      else {
-         available = false;
-         complete = true;
-       }
-@@ -89,24 +92,6 @@
-       available = false;
-       complete = true;
-     }
--
--    if (!complete) {
--      // A bit of abstraction leakage here; we have to keep these imports in
--      // line with what duplicity uses.  Maybe we should add to duplicity a way
--      // to ask 'can I use this backend?'
--      pyu1 = PythonChecker.get_checker("ubuntuone.platform.credentials, ubuntuone.couch.auth");
--      if (pyu1.complete) {
--        available = pyu1.available;
--        complete = pyu1.complete;
--      }
--      else {
--        pyu1.notify["complete"].connect(() => {
--          available = pyu1.available;
--          complete = pyu1.complete;
--          pyu1 = null;
--        });
--      }
--    }
-   }
- }
- 
diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD
index 832be424c..71693e130 100644
--- a/community/denemo/PKGBUILD
+++ b/community/denemo/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 76519 2012-09-21 13:30:51Z spupykin $
+# $Id: PKGBUILD 88689 2013-04-21 22:17:06Z heftig $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 # Contributor: Gnud <ach.gnud@gmail.com>
 
 pkgname=denemo
-pkgver=0.9.6
-pkgrel=1
+pkgver=1.0.0
+pkgrel=3
 pkgdesc="A music score editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.denemo.org"
@@ -16,12 +16,15 @@ depends=('aubio' 'portaudio' 'lilypond' 'gtk3' 'libxml2' 'guile' 'fftw'
 options=('!libtool')
 backup=('etc/denemo/denemo.conf')
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('48dd1b0801dba574517bcaf0b86d714a')
+md5sums=('92bfd2e661387f791e4aa6c23dc7d90b')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc
-#  sed -i 's|#include <glib/gmessages.h>|#include <glib.h>|' src/pitchrecog.c
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD
index 7905f5e16..e26f523c6 100644
--- a/community/desmume/PKGBUILD
+++ b/community/desmume/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77627 2012-10-13 11:41:54Z allan $
+# $Id: PKGBUILD 89839 2013-05-03 06:49:03Z schuay $
 # Maintainer: Jonathan Conder <jonno dot conder at gmail dot com>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Arkham <arkham at archlinux dot us>
@@ -11,15 +11,15 @@
 # Contributor: Asher256 <achrafcherti at gmail dot com>
 
 pkgname=desmume
-pkgver=0.9.8
-pkgrel=3
+pkgver=0.9.9
+pkgrel=1
 pkgdesc="Nintendo DS emulator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://desmume.org/"
 license=('GPL')
 depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap'
          'soundtouch' 'alsa-lib' 'zziplib' 'glu')
-makedepends=('intltool')
+makedepends=('intltool' 'mesa')
 install=desmume.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
 
@@ -36,4 +36,4 @@ package() {
   make DESTDIR="$pkgdir/" install
 }
 
-md5sums=('fb7c984c924087888b9eaaad8cb1875e')
+md5sums=('458b5f8b3dbb38a47e6d0518f97aa82a')
diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD
index b29d7fcc8..33d1356bf 100644
--- a/community/devil/PKGBUILD
+++ b/community/devil/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 78927 2012-10-27 23:44:18Z ebelanger $
+# $Id: PKGBUILD 88610 2013-04-20 16:45:03Z heftig $
 # Maintainer: Laurent Carlier <lordheavym@gmail.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: TheHoff <forums>
 
 pkgname=devil
 pkgver=1.7.8
-pkgrel=14
+pkgrel=15
 pkgdesc="Library for reading several different image formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openil.sourceforge.net/"
diff --git a/community/devilspie/PKGBUILD b/community/devilspie/PKGBUILD
index 579bdc74c..451337b27 100644
--- a/community/devilspie/PKGBUILD
+++ b/community/devilspie/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=devilspie
 pkgver=0.22
-pkgrel=5
+pkgrel=5.2
 pkgdesc="x11 window matching utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.burtonini.com/blog/computers/devilspie"
 license=('GPL')
 depends=('libwnck')
@@ -18,6 +18,8 @@ md5sums=('4190e12f99ab92c0427e457d9fbfe231')
 build() {
   cd $srcdir/$pkgname-$pkgver
   sed -i -e '/-DG.*_DISABLE_DEPRECATED/d' src/Makefile.am
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.in
+  sed -i 's|AM_PROG_CC_STDC|AC_PROG_CC|g' configure.in
   export LIBS="-lX11"
   ./autogen.sh
 
diff --git a/community/dgen-sdl/PKGBUILD b/community/dgen-sdl/PKGBUILD
index 411a0964f..edad3936a 100644
--- a/community/dgen-sdl/PKGBUILD
+++ b/community/dgen-sdl/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 82263 2013-01-13 21:31:21Z jsteel $
+# $Id: PKGBUILD 85586 2013-03-03 17:28:52Z dreisner $
 # Maintainer: Jonathan Steel <mail@jsteel.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Joker-jar <joker-jar@yandex.ru>
 
 pkgname=dgen-sdl
-pkgver=1.31
+pkgver=1.32
 pkgrel=2
 pkgdesc="An emulator for Sega Genesis/Mega Drive systems ported to SDL"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dgen.sourceforge.net"
 license=('BSD')
 depends=('sdl' 'libgl' 'libarchive')
-makedepends=('nasm')
+if test "$CARCH" == i686; then
+  makedepends=('nasm')
+fi
 source=(http://downloads.sourceforge.net/dgen/$pkgname-$pkgver.tar.gz)
-md5sums=('3f297010cc17c471c8c66652d9dee905')
-
+md5sums=('81b6f1c4bd612e81a9b8663c38d51890')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD
index ed33f7837..2e50cfa1e 100644
--- a/community/dia/PKGBUILD
+++ b/community/dia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69446 2012-04-16 11:44:58Z spupykin $
+# $Id: PKGBUILD 88862 2013-04-24 13:59:45Z spupykin $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=dia
 pkgver=0.97.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A GTK+ based diagram creation program"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -17,21 +17,18 @@ makedepends=('intltool' 'python2' 'docbook-xsl')
 optdepends=('python2')
 options=('!libtool' 'docs' '!emptydirs')
 source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz"
-	"dia-overflow-fix.patch"
-	"dia-0.97.2-glib.patch")
+	"dia-crash.patch::https://git.gnome.org/browse/dia/patch/?id=213bdfe956bf8fe57c86316f68a09408fef1647e")
 md5sums=('1e1180a513fb567709b09bc19f12105e'
-         '8fd9a2ad35b5a6fd8c758d7c73dbfe66'
-	 '430d39de524c112f39a4bd9801038b05')
+         '2ad4fcfbfb561930a1d0335cc942a07b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/dia-0.97.2-glib.patch
   export PYTHON=/usr/bin/python2
   for file in `find -type f -name '*.py'`; do
       sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file"
   done
   sed -i 's#python2\.1#python2 python2.1#' configure
-#  patch -p1 <$srcdir/dia-overflow-fix.patch
+  patch -p1 <$srcdir/dia-crash.patch
 
   ./configure --prefix=/usr \
     --with-cairo \
diff --git a/community/dillo/PKGBUILD b/community/dillo/PKGBUILD
index 7b3b3cf66..c799039c3 100644
--- a/community/dillo/PKGBUILD
+++ b/community/dillo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 63530 2012-02-05 11:53:50Z ibiru $
+# $Id: PKGBUILD 88466 2013-04-18 12:14:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: dorphell <dorphell@archlinux.org>
 
 pkgname=dillo
-pkgver=3.0.2
-pkgrel=2
+pkgver=3.0.3
+pkgrel=1
 pkgdesc="A small, fast graphical web browser built on FLTK"
 arch=(i686 x86_64 'mips64el')
 url="http://www.dillo.org"
@@ -13,7 +13,7 @@ depends=('fltk' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor'
          'libxi' 'libxinerama')
 backup=(etc/dillo/{dillorc,dpidrc})
 source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2)
-md5sums=('81b82112cefcc7d54fe2972a21f42930')
+md5sums=('726cd0b7a18c5e25f4d80ebeffe7607e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/directfb/DirectFB-1.4.9-libpng-1.5.patch b/community/directfb/DirectFB-1.4.9-libpng-1.5.patch
deleted file mode 100644
index 65470ea8f..000000000
--- a/community/directfb/DirectFB-1.4.9-libpng-1.5.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-From 83180b25e90721e717bf37c5332c22713508786e Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 20 Feb 2011 19:18:19 -0500
-Subject: [PATCH] png: add support for libpng 1.5.x
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- .../idirectfbimageprovider_png.c                   |   56 ++++++++++++-------
- 1 files changed, 35 insertions(+), 21 deletions(-)
-
-diff --git a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
-index 6d65ea3..7d82c5c 100644
---- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
-+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
-@@ -207,7 +207,7 @@ Construct( IDirectFBImageProvider *thiz,
-      if (!data->png_ptr)
-           goto error;
- 
--     if (setjmp( data->png_ptr->jmpbuf )) {
-+     if (setjmp( png_jmpbuf( data->png_ptr ))) {
-           D_ERROR( "ImageProvider/PNG: Error reading header!\n" );
-           goto error;
-      }
-@@ -292,7 +292,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
-           rect = dst_data->area.wanted;
-      }
- 
--     if (setjmp( data->png_ptr->jmpbuf )) {
-+     if (setjmp( png_jmpbuf( data->png_ptr ))) {
-           D_ERROR( "ImageProvider/PNG: Error during decoding!\n" );
- 
-           if (data->stage < STAGE_IMAGE)
-@@ -327,6 +327,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
-      }
-      else {
-           CoreSurfaceBufferLock lock;
-+          png_byte bit_depth = png_get_bit_depth( data->png_ptr, data->info_ptr );
- 
-           ret = dfb_surface_lock_buffer( dst_surface, CSBR_BACK, CSAID_CPU, CSAF_WRITE, &lock );
-           if (ret)
-@@ -334,7 +335,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
- 
-           switch (data->color_type) {
-                case PNG_COLOR_TYPE_PALETTE:
--                    if (dst_surface->config.format == DSPF_LUT8 && data->info_ptr->bit_depth == 8) {
-+                    if (dst_surface->config.format == DSPF_LUT8 && bit_depth == 8) {
-                          /*
-                           * Special indexed PNG to LUT8 loading.
-                           */
-@@ -377,7 +378,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
-                     }
-                     else {
-                          if (data->color_type == PNG_COLOR_TYPE_GRAY) {
--                              int num = 1 << data->info_ptr->bit_depth;
-+                              int num = 1 << bit_depth;
- 
-                               for (x=0; x<num; x++) {
-                                    int value = x * 255 / (num - 1);
-@@ -386,7 +387,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
-                               }
-                          }
- 
--                         switch (data->info_ptr->bit_depth) {
-+                         switch (bit_depth) {
-                               case 8:
-                                    for (y=0; y<data->height; y++) {
-                                         u8  *S = data->image + data->pitch * y;
-@@ -441,7 +442,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
- 
-                               default:
-                                    D_ERROR( "ImageProvider/PNG: Unsupported indexed bit depth %d!\n",
--                                            data->info_ptr->bit_depth );
-+                                            bit_depth );
-                          }
- 
-                          dfb_scale_linear_32( image_argb, data->width, data->height,
-@@ -594,16 +595,26 @@ png_info_callback( png_structp png_read_ptr,
-                    NULL, NULL, NULL );
- 
-      if (png_get_valid( data->png_ptr, data->info_ptr, PNG_INFO_tRNS )) {
-+          png_bytep     trans;
-+          png_color_16p trans_color;
-+          int           num_trans;
-+
-+          png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
-+
-           data->color_keyed = true;
- 
-           /* generate color key based on palette... */
-           if (data->color_type == PNG_COLOR_TYPE_PALETTE) {
-                u32        key;
--               png_colorp palette    = data->info_ptr->palette;
--               png_bytep  trans      = data->info_ptr->trans_alpha;
--               int        num_colors = MIN( MAXCOLORMAPSIZE,
--                                            data->info_ptr->num_palette );
--               u8         cmap[3][num_colors];
-+               png_colorp palette;
-+               int        num_colors;
-+               u8        *cmap[3];
-+
-+               png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
-+               num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
-+               cmap[0] = alloca (num_colors);
-+               cmap[1] = alloca (num_colors);
-+               cmap[2] = alloca (num_colors);
- 
-                for (i=0; i<num_colors; i++) {
-                     cmap[0][i] = palette[i].red;
-@@ -613,7 +624,7 @@ png_info_callback( png_structp png_read_ptr,
- 
-                key = FindColorKey( num_colors, &cmap[0][0] );
- 
--               for (i=0; i<data->info_ptr->num_trans; i++) {
-+               for (i=0; i<num_trans; i++) {
-                     if (!trans[i]) {
-                          palette[i].red   = (key & 0xff0000) >> 16;
-                          palette[i].green = (key & 0x00ff00) >>  8;
-
--- 
-1.7.4.1
-
-From 7a2a36fada3ecdd7f48fcfd782a552598477a8f5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 20 Feb 2011 19:38:50 -0500
-Subject: [PATCH] tools: add support for libpng 1.5.x
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tools/directfb-csource.c |   20 +++++++++++++-------
- tools/mkdfiff.c          |    2 +-
- tools/mkdgifft.cpp       |    2 +-
- 3 files changed, 15 insertions(+), 9 deletions(-)
-
-diff --git a/tools/directfb-csource.c b/tools/directfb-csource.c
-index 8f2cbf0..487ea3c 100644
---- a/tools/directfb-csource.c
-+++ b/tools/directfb-csource.c
-@@ -338,7 +338,7 @@ static DFBResult load_image (const char            *filename,
-      if (!png_ptr)
-           goto cleanup;
- 
--     if (setjmp (png_ptr->jmpbuf)) {
-+     if (setjmp (png_jmpbuf (png_ptr))) {
-           if (desc->preallocated[0].data) {
-                free (desc->preallocated[0].data);
-                desc->preallocated[0].data = NULL;
-@@ -405,17 +405,22 @@ static DFBResult load_image (const char            *filename,
-        }
- 
-      switch (src_format) {
--          case DSPF_LUT8:
--               if (info_ptr->num_palette) {
-+          case DSPF_LUT8: {
-+               png_colorp png_palette;
-+               int        num_palette;
-+
-+               png_get_PLTE( png_ptr, info_ptr, &png_palette, &num_palette );
-+
-+               if (num_palette) {
-                     png_byte *alpha;
-                     int       i, num;
- 
--                    *palette_size = MIN (info_ptr->num_palette, 256);
-+                    *palette_size = MIN (num_palette, 256);
-                     for (i = 0; i < *palette_size; i++) {
-                          palette[i].a = 0xFF;
--                         palette[i].r = info_ptr->palette[i].red;
--                         palette[i].g = info_ptr->palette[i].green;
--                         palette[i].b = info_ptr->palette[i].blue;
-+                         palette[i].r = png_palette[i].red;
-+                         palette[i].g = png_palette[i].green;
-+                         palette[i].b = png_palette[i].blue;
-                     }
-                     if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) {
-                          png_get_tRNS (png_ptr, info_ptr, &alpha, &num, NULL);
-@@ -424,6 +429,7 @@ static DFBResult load_image (const char            *filename,
-                     }
-                }
-                break;
-+          }
-           case DSPF_RGB32:
-                 png_set_filler (png_ptr, 0xFF,
- #ifdef WORDS_BIGENDIAN
-diff --git a/tools/mkdfiff.c b/tools/mkdfiff.c
-index 68a3b4f..edb58a7 100644
---- a/tools/mkdfiff.c
-+++ b/tools/mkdfiff.c
-@@ -97,7 +97,7 @@ load_image (const char            *filename,
-      if (!png_ptr)
-           goto cleanup;
- 
--     if (setjmp (png_ptr->jmpbuf)) {
-+     if (setjmp (png_jmpbuf (png_ptr))) {
-           if (desc->preallocated[0].data) {
-                free (desc->preallocated[0].data);
-                desc->preallocated[0].data = NULL;
-diff --git a/tools/mkdgifft.cpp b/tools/mkdgifft.cpp
-index 96e4220..d4b6bf4 100644
---- a/tools/mkdgifft.cpp
-+++ b/tools/mkdgifft.cpp
-@@ -595,7 +595,7 @@ load_image (const char            *filename,
-      if (!png_ptr)
-           goto cleanup;
- 
--     if (setjmp (png_ptr->jmpbuf)) {
-+     if (setjmp (png_jmpbuf (png_ptr))) {
-           if (desc->preallocated[0].data) {
-                free (desc->preallocated[0].data);
-                desc->preallocated[0].data = NULL;
--- 
-1.7.4.1
-
---- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	2012-02-14 19:04:52.000000000 -0500
-+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	2012-02-14 19:07:18.000000000 -0500
-@@ -710,10 +709,15 @@
- 
-      switch (data->color_type) {
-           case PNG_COLOR_TYPE_PALETTE: {
--               png_colorp palette    = data->info_ptr->palette;
--               png_bytep  trans      = data->info_ptr->trans_alpha;
--               int        num_trans  = data->info_ptr->num_trans;
--               int        num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette );
-+               png_colorp    palette;
-+               png_bytep     trans;
-+               png_color_16p trans_color;
-+               int           num_trans;
-+               int           num_colors;
-+
-+               png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
-+               num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
-+               png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
- 
-                for (i=0; i<num_colors; i++) {
-                     data->colors[i].a = (i < num_trans) ? trans[i] : 0xff;
---- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c.old	2012-02-14 22:40:30.000000000 -0500
-+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	2012-02-14 23:37:19.000000000 -0500
-@@ -638,12 +638,10 @@
-                data->color_key = key;
-           }
-           else {
--               /* ...or based on trans rgb value */
--               png_color_16p trans = &data->info_ptr->trans_color;
- 
--               data->color_key = (((trans->red & 0xff00) << 8) |
--                                  ((trans->green & 0xff00)) |
--                                  ((trans->blue & 0xff00) >> 8));
-+               data->color_key = (((trans_color->red & 0xff00) << 8) |
-+                                  ((trans_color->green & 0xff00)) |
-+                                  ((trans_color->blue & 0xff00) >> 8));
-           }
-      }
- 
diff --git a/community/directfb/DirectFB-1.6.1-zlib-include.patch b/community/directfb/DirectFB-1.6.1-zlib-include.patch
deleted file mode 100644
index e4f24a5cf..000000000
--- a/community/directfb/DirectFB-1.6.1-zlib-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur DirectFB-1.6.0-orig/src/core/surface.c DirectFB-1.6.0/src/core/surface.c
---- DirectFB-1.6.0-orig/src/core/surface.c	2012-06-20 02:21:36.029994460 -0400
-+++ DirectFB-1.6.0/src/core/surface.c	2012-06-20 02:22:48.533330819 -0400
-@@ -28,6 +28,8 @@
- 
- #include <config.h>
- 
-+#include <zlib.h>
-+
- #include <direct/debug.h>
- 
- #include <core/core.h>
diff --git a/community/directfb/directfb-missing_include.patch b/community/directfb/directfb-missing_include.patch
deleted file mode 100644
index 4b1af5a30..000000000
--- a/community/directfb/directfb-missing_include.patch
+++ /dev/null
@@ -1,376 +0,0 @@
---- /dev/null	2012-02-14 14:47:01.028967126 -0500
-+++ b/lib/voodoo/link.h	2012-02-14 21:19:05.000000000 -0500
-@@ -0,0 +1,85 @@
-+/*
-+   (c) Copyright 2001-2009  The world wide DirectFB Open Source Community (directfb.org)
-+   (c) Copyright 2000-2004  Convergence (integrated media) GmbH
-+
-+   All rights reserved.
-+
-+   Written by Denis Oliver Kropp <dok@directfb.org>,
-+              Andreas Hundt <andi@fischlustig.de>,
-+              Sven Neumann <neo@directfb.org>,
-+              Ville Syrjälä <syrjala@sci.fi> and
-+              Claudio Ciccani <klan@users.sf.net>.
-+
-+   This library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2 of the License, or (at your option) any later version.
-+
-+   This library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with this library; if not, write to the
-+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+*/
-+
-+#ifndef __VOODOO__LINK_H__
-+#define __VOODOO__LINK_H__
-+
-+#include <voodoo/types.h>
-+
-+
-+typedef struct {
-+     void   *ptr;
-+     size_t  length;
-+     size_t  done;
-+} VoodooChunk;
-+
-+
-+struct __V_VoodooLink {
-+     void *priv;
-+     u32   code;
-+
-+     void    (*Close)( VoodooLink *link );
-+
-+     /* See 'read(2)', blocking */
-+     ssize_t (*Read) ( VoodooLink *link,
-+                       void       *buffer,
-+                       size_t      count );
-+
-+     /* See 'write(2)', blocking */
-+     ssize_t (*Write)( VoodooLink *link,
-+                       const void *buffer,
-+                       size_t      count );
-+
-+
-+     /* For later... */
-+     DirectResult (*SendReceive)( VoodooLink  *link,
-+                                  VoodooChunk *send,
-+                                  size_t       num_send,
-+                                  VoodooChunk *recv,
-+                                  size_t       num_recv );
-+
-+     DirectResult (*WakeUp)     ( VoodooLink  *link );
-+
-+     DirectResult (*WaitForData)( VoodooLink  *link,
-+                                  int          timeout_ms );
-+};
-+
-+
-+DirectResult VOODOO_API voodoo_link_init_connect( VoodooLink *link,
-+                                                  const char *hostname,
-+                                                  int         port,
-+                                                  bool        raw );
-+
-+DirectResult VOODOO_API voodoo_link_init_local  ( VoodooLink *link,
-+                                                  const char *path,
-+                                                  bool        raw );
-+
-+DirectResult VOODOO_API voodoo_link_init_fd     ( VoodooLink *link,
-+                                                  int         fd[2] );
-+
-+#endif
---- /dev/null	2012-02-14 14:47:01.028967126 -0500
-+++ b/lib/voodoo/packet.h	2012-02-14 21:37:45.000000000 -0500
-@@ -0,0 +1,285 @@
-+/*
-+   (c) Copyright 2001-2011  The world wide DirectFB Open Source Community (directfb.org)
-+   (c) Copyright 2000-2004  Convergence (integrated media) GmbH
-+
-+   All rights reserved.
-+
-+   Written by Denis Oliver Kropp <dok@directfb.org>,
-+              Andreas Hundt <andi@fischlustig.de>,
-+              Sven Neumann <neo@directfb.org>,
-+              Ville Syrjälä <syrjala@sci.fi> and
-+              Claudio Ciccani <klan@users.sf.net>.
-+
-+   This library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2 of the License, or (at your option) any later version.
-+
-+   This library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with this library; if not, write to the
-+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+*/
-+
-+#ifndef __VOODOO__PACKET_H__
-+#define __VOODOO__PACKET_H__
-+
-+extern "C" {
-+#include <direct/fastlz.h>
-+#include <direct/list.h>
-+#include <direct/mem.h>
-+#include <direct/memcpy.h>
-+
-+
-+#include <voodoo/types.h>
-+}
-+
-+
-+typedef enum {
-+     VPHF_NONE       = 0x00000000,
-+
-+     VPHF_COMPRESSED = 0x00000001,
-+
-+     VPHF_ALL        = 0x00000001
-+} VoodooPacketHeaderFlags;
-+
-+
-+typedef struct {
-+     u32  size;
-+     u32  flags;
-+     u32  uncompressed;
-+     u32  align;
-+} VoodooPacketHeader;
-+
-+
-+class VoodooPacket {
-+public:
-+     DirectLink          link;
-+     bool                sending;
-+
-+private:
-+     void               *data;
-+     void               *current;
-+     VoodooPacketHeader  header;
-+
-+     VoodooPacket( u32   size,
-+                   void *data )
-+          :
-+          sending(false),
-+          data(data),
-+          current(data)
-+     {
-+          memset( &link, 0, sizeof(link) );
-+
-+          header.size         = size;
-+          header.flags        = VPHF_NONE;
-+          header.uncompressed = size;
-+     }
-+
-+     VoodooPacket( u32   size,
-+                   u32   flags,
-+                   u32   uncompressed,
-+                   void *data )
-+          :
-+          sending(false),
-+          data(data),
-+          current(data)
-+     {
-+          memset( &link, 0, sizeof(link) );
-+
-+          header.size         = size;
-+          header.flags        = VPHF_COMPRESSED;
-+          header.uncompressed = uncompressed;
-+     }
-+
-+     ~VoodooPacket() {};
-+
-+public:
-+/*
-+     static VoodooPacket *
-+     New( u32 size )
-+     {
-+          VoodooPacket *packet = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + size );
-+
-+          if (!packet) {
-+               D_OOM();
-+               return NULL;
-+          }
-+
-+          return new (packet) VoodooPacket( size, packet + 1 );
-+
-+
-+          if (data)
-+               this->data = data;
-+          else
-+               this->data = header + 1;
-+     }
-+*/
-+     static VoodooPacket *
-+     New( u32   size,
-+          void *data )
-+     {
-+          return new VoodooPacket( size, data );
-+     }
-+
-+     static VoodooPacket *
-+     Reset( VoodooPacket *packet,
-+            u32           size,
-+            void         *data )
-+     {
-+          return new (packet) VoodooPacket( size, data );
-+     }
-+
-+     static VoodooPacket *
-+     New( void *header,
-+          u32   size )
-+     {
-+          VoodooPacketHeader *h = (VoodooPacketHeader*) header;
-+
-+          h->size         = size;
-+          h->flags        = VPHF_NONE;
-+          h->uncompressed = size;
-+
-+          return new VoodooPacket( size, (char*) header + sizeof(VoodooPacketHeader) );
-+     }
-+
-+     static VoodooPacket *
-+     New( u32 size )
-+     {
-+          VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + VOODOO_PACKET_MAX );
-+
-+          if (!p) {
-+               D_OOM();
-+               return NULL;
-+          }
-+
-+          return new (p) VoodooPacket( size, p + 1 );
-+     }
-+
-+     static VoodooPacket *
-+     Compressed( VoodooPacket *packet )
-+     {
-+          VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + packet->header.size * 4 / 3 );
-+
-+          if (!p) {
-+               D_OOM();
-+               return NULL;
-+          }
-+
-+          int compressed = direct_fastlz_compress( packet->data, packet->header.uncompressed, p + 1 );
-+
-+          if ((size_t) compressed < packet->header.uncompressed)
-+               return new (p) VoodooPacket( compressed, VPHF_COMPRESSED, packet->header.uncompressed, p + 1 );
-+
-+          D_FREE( p );
-+
-+          return packet;
-+     }
-+
-+     static VoodooPacket *
-+     Copy( VoodooPacket *packet )
-+     {
-+          VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + packet->header.size );
-+
-+          if (!p) {
-+               D_OOM();
-+               return NULL;
-+          }
-+
-+          direct_memcpy( p + 1, packet->data_start(), packet->header.size );
-+
-+          return new (p) VoodooPacket( packet->header.size, packet->header.flags, packet->header.uncompressed, p + 1 );
-+     }
-+
-+     static VoodooPacket *
-+     Copy( u32   size,
-+           u32   flags,
-+           u32   uncompressed,
-+           void *data )
-+     {
-+          VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + size );
-+
-+          if (!p) {
-+               D_OOM();
-+               return NULL;
-+          }
-+
-+          direct_memcpy( p + 1, data, size );
-+
-+          return new (p) VoodooPacket( size, flags, uncompressed, p + 1 );
-+     }
-+
-+     inline u32
-+     size() const
-+     {
-+          return header.size;
-+     }
-+
-+     inline u32
-+     flags() const
-+     {
-+          return header.flags;
-+     }
-+
-+     inline u32
-+     uncompressed() const
-+     {
-+          return header.uncompressed;
-+     }
-+
-+     inline const void *
-+     data_header() const
-+     {
-+          D_ASSERT( data == this + 1 );
-+
-+          return &header;
-+     }
-+
-+     inline const void *
-+     data_start() const
-+     {
-+          return data;
-+     }
-+
-+     inline void *
-+     data_raw() const
-+     {
-+          return current;
-+     }
-+
-+
-+     inline bool
-+     append( size_t size )
-+     {
-+          D_ASSERT( data == this + 1 );
-+
-+          if (header.size + size > VOODOO_PACKET_MAX)
-+               return false;
-+
-+          current = (char*) data + header.size;
-+
-+          header.size         += size;
-+          header.uncompressed += size;
-+
-+          return true;
-+     }
-+
-+     inline void
-+     reset( size_t size )
-+     {
-+          D_ASSERT( data == this + 1 );
-+
-+          current = (char*) data;
-+
-+          header.size         = size;
-+          header.uncompressed = size;
-+     }
-+};
-+
-+
-+#endif
diff --git a/community/djview4/PKGBUILD b/community/djview4/PKGBUILD
index f13daa4d0..2a9d9c6f1 100644
--- a/community/djview4/PKGBUILD
+++ b/community/djview4/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63534 2012-02-05 11:54:12Z ibiru $
+# $Id: PKGBUILD 85340 2013-03-01 10:29:36Z andrea $
 # Contributor: Paulo Matias <matias.archlinux-br.org>
 # Contributor: Leslie P. Polzer <polzer.gnu.org>
 # Contributor: erm67 <erm67.yahoo.it>
@@ -6,28 +6,28 @@
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=djview4
-pkgver=4.8
+pkgver=4.9
 pkgrel=2
 pkgdesc='Portable DjVu viewer and browser plugin'
 url='http://djvu.sourceforge.net/djview4.html'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('qt' 'djvulibre')
+depends=('qt4' 'djvulibre')
 source=("http://downloads.sourceforge.net/djvu/djview-${pkgver}.tar.gz")
-sha1sums=('266d207afb63a1ee63eed054190bf88888fda572')
+sha1sums=('07f97e32919bfb34ff2d59b928c47ffbc96dcfc5')
 
 install=install
 
 build() {
-	cd "${srcdir}/djview-${pkgver}"
-	QTDIR=/usr ./configure --prefix=/usr
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	source /etc/profile.d/qt4.sh
+	./configure --prefix=/usr
 	sed 's/netscape/mozilla/g' -i nsdejavu/Makefile
-	sed 's/swap/rofl_swap/g' -i src/qdjvuwidget.cpp
 	make
 }
 
 package() {
-	cd "${srcdir}/djview-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install-djview install-nsdejavu
 
 	cd desktopfiles
diff --git a/community/djview4/install b/community/djview4/install
index f2bd04ceb..b0409600c 100644
--- a/community/djview4/install
+++ b/community/djview4/install
@@ -1,7 +1,6 @@
 post_install() {
-	if type xdg-icon-resource &>/dev/null; then
-		xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	fi
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null || true
+	update-desktop-database -q || true
 }
 
 post_upgrade() {
diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD
index b206344cd..5da4b04ab 100644
--- a/community/dmd/PKGBUILD
+++ b/community/dmd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81927 2013-01-03 14:59:08Z svenstaro $
+# $Id: PKGBUILD 84430 2013-02-18 23:24:23Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,14 +7,15 @@
 
 pkgname=('dmd' 'libphobos')
 pkgbase=dmd
-pkgver=2.061
+pkgver=2.062
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.digitalmars.com/d/2.0/"
-source=(http://ftp.digitalmars.com/$pkgname.$pkgver.zip
+#source=(http://ftp.digitalmars.com/$pkgname.$pkgver.zip
+source=(http://downloads.dlang.org.s3-website-us-east-1.amazonaws.com/releases/2013/dmd.${pkgver}.zip
         tools-${pkgver}.tar.gz::https://github.com/D-Programming-Language/tools/tarball/v${pkgver})
 license=('custom')
-md5sums=('823aba8a7e0fbb242bb2a2d922ced5c6'
+md5sums=('fd2211206532ab41a8aef764a9225d3c'
          '2e301d06071fb24c7c2d504c8ddbbc39')
 
 [[ $CARCH == "x86_64" ]] && _archbits="64"
@@ -23,6 +24,7 @@ md5sums=('823aba8a7e0fbb242bb2a2d922ced5c6'
 build() {
     cd $srcdir/dmd2/src/
 
+    echo "$pkgver" > VERSION # Fix specific release bug of 2.062
     cd dmd
     make -f posix.mak MODEL=$_archbits
 
diff --git a/community/dmd/dmd.install b/community/dmd/dmd.install
deleted file mode 100644
index 62f98d07d..000000000
--- a/community/dmd/dmd.install
+++ /dev/null
@@ -1,21 +0,0 @@
-pre_install() {
-	/bin/true
-}
-post_install() {
-  echo '==> Note: dmd does not come with a runtime library!'
-  echo '==> The D language has two competing, incompatible standard libraries.'
-  echo '==> In order for dmd to be useful, you must'
-  echo '==> install either libphobos or libtango, whichever you prefer.'
-}
-pre_upgrade() {
-	/bin/true
-}
-post_upgrade() {
-  /bin/true
-}
-pre_remove() {
-	/bin/true
-}
-post_remove() {
-	/bin/true
-}
diff --git a/community/dnstracer/PKGBUILD b/community/dnstracer/PKGBUILD
index eb985bb1c..90e1721a2 100644
--- a/community/dnstracer/PKGBUILD
+++ b/community/dnstracer/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=dnstracer
 pkgver=1.9
-pkgrel=4
+pkgrel=4.1
 pkgdesc='Determines where a given DNS server gets its information from, and follows the chain of DNS servers'
 url='http://www.mavetju.org/unix/dnstracer.php'
 license=('custom:BSD')
diff --git a/community/dopewars/PKGBUILD b/community/dopewars/PKGBUILD
index c41d3f872..ddf79d584 100644
--- a/community/dopewars/PKGBUILD
+++ b/community/dopewars/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=dopewars
 pkgver=1.5.12
-pkgrel=6.1
+pkgrel=6.2
 pkgdesc="A drug dealing game set in New York"
 url="http://dopewars.sourceforge.net/"
 license=('GPL')
diff --git a/community/dosemu/PKGBUILD b/community/dosemu/PKGBUILD
deleted file mode 100644
index 4c9fb31f6..000000000
--- a/community/dosemu/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 81027 2012-12-10 10:25:41Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Eric Belanger <belanger@astro.umontreal.ca>
-# Contributor: Bob Finch <w9ya@arrl.net>
-
-pkgname=dosemu
-pkgver=1.4.0
-pkgrel=9
-pkgdesc="DOS emulator"
-arch=('i686' 'x86_64')
-url="http://www.dosemu.org/"
-license=('GPL' 'custom')
-depends=('gpm' 'slang' 'sdl' 'libxxf86vm' 'libsndfile' 'sh' 'xorg-mkfontdir' 'xorg-bdftopcf' 'xorg-xlsfonts')
-backup=('etc/dosemu/dosemu.conf'
-	'etc/dosemu/dosemu.users'
-	'etc/dosemu/global.conf')
-install=dosemu.install
-source=(http://downloads.sourceforge.net/sourceforge/dosemu/$pkgname-$pkgver.tgz
-	http://downloads.sourceforge.net/sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz
-	kernel_version.patch
-	fix-infinite-loop.patch
-	cpu-support.patch)
-md5sums=('0bba530637266f99d404ba15e3f118d4'
-         '2e09774fe91cff4372cb4a393eb467f5'
-         '15af2ca86b2e7d8835f0f837ea663c3d'
-         'e8ea87d46c613130b26724facb5aa297'
-         'ebb17406a7d302f6c4ad2b67304f31b6')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  patch -Np1 -i ${srcdir}/kernel_version.patch
-  patch -Np1 -i ${srcdir}/fix-infinite-loop.patch
-  patch -Np1 -i ${srcdir}/cpu-support.patch
-  sed -i 's|extern int yyget_leng|extern size_t yyget_leng|' src/base/init/lexer.h
-
-  unset CFLAGS
-  ./configure --prefix=/usr --with-fdtarball=$srcdir/dosemu-freedos-1.0-bin.tgz --mandir=/usr/share/man
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  ln -s /usr/share/dosemu/drive_z $pkgdir/etc/dosemu/drives/z
-  install -dm0755 $pkgdir/etc/sysctl.d
-  echo "vm.mmap_min_addr = 0" >$pkgdir/etc/sysctl.d/dosemu.conf
-
-  install -D -m 644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-  install -D -m 644 COPYING.DOSEMU $pkgdir/usr/share/licenses/$pkgname/COPYING.DOSEMU
-}
diff --git a/community/dosemu/cpu-support.patch b/community/dosemu/cpu-support.patch
deleted file mode 100644
index 6a8d84148..000000000
--- a/community/dosemu/cpu-support.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur orig/dosemu-1.4.0/src/base/init/config.c modified/dosemu-1.4.0/src/base/init/config.c
---- orig/src/base/init/config.c	2007-05-04 22:19:41.000000000 +0800
-+++ modified/src/base/init/config.c	2012-12-06 10:05:31.780346032 +0800
-@@ -480,6 +480,8 @@
-       case 5: case 586:
-       case 6: case 686:
-       case 15:
-+      case 16:
-+      case 17:
-         config.realcpu = CPU_586;
-         cpuflags = get_proc_string_by_key("features");
-         if (!cpuflags) {
diff --git a/community/dosemu/dosemu.install b/community/dosemu/dosemu.install
deleted file mode 100644
index b5ed385d1..000000000
--- a/community/dosemu/dosemu.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  sysctl -p etc/sysctl.d/dosemu.conf
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/community/dosemu/fix-infinite-loop.patch b/community/dosemu/fix-infinite-loop.patch
deleted file mode 100644
index 7f12d9985..000000000
--- a/community/dosemu/fix-infinite-loop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- trunk/src/plugin/translate/translate.c	2011/05/24 02:28:24	2032
-+++ trunk/src/plugin/translate/translate.c	2011/10/03 23:37:46	2058
-@@ -466,7 +466,9 @@
- 			while (list->next) {
- 				list = list->next;
- 			}
--			list->next = set;
-+			if (list != set) {
-+				list->next = set;
-+			}
- 		}
- 		initialize_charset(set);
- 	}
diff --git a/community/dosemu/kernel_version.patch b/community/dosemu/kernel_version.patch
deleted file mode 100644
index 0351922d4..000000000
--- a/community/dosemu/kernel_version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wbBur dosemu-1.4.0/src/base/init/init.c dosemu-1.4.0.my/src/base/init/init.c
---- dosemu-1.4.0/src/base/init/init.c	2007-05-04 09:59:48.000000000 +0400
-+++ dosemu-1.4.0.my/src/base/init/init.c	2011-08-15 12:39:42.000000000 +0400
-@@ -280,7 +280,7 @@
-   char version[80];
- 
-   uname((struct utsname *)&unames);
--#ifdef __linux__
-+#if 0
-   strcpy(version,unames.release);
-   running_kversion = atoi(strtok(version,".")) *1000000;
-   running_kversion += atoi(strtok(NULL,".")) *1000;
diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD
index c6968ad89..9c3a09793 100644
--- a/community/drbd/PKGBUILD
+++ b/community/drbd/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 83703 2013-02-04 14:42:03Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# $Id: PKGBUILD 86842 2013-03-22 19:15:09Z seblu $
+# Maintainer: Sébastien Luttringer
 
 pkgname=drbd
-pkgver=8.3.13
-pkgrel=2
+pkgver=8.4.2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Userland tools for Distributed Replicated Block Device'
 url='http://www.drbd.org'
 license=('GPL2')
 depends=('perl' 'bash')
-source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz"
+source=("http://oss.linbit.com/drbd/8.4/$pkgname-$pkgver.tar.gz"
         "$pkgname.service")
 backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
-md5sums=('760a25459ef6b7262a2a3572c1561c5b'
+md5sums=('b081f1046adda1d51ba351c40a8b1107'
          'afbb345094db49b0a474c0b4e51c0acd')
 
 build() {
   cd $pkgname-$pkgver
+  # fix hardcoded path in udev rules
+  sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' scripts/drbd.rules
   ./configure \
     --prefix=/usr \
     --localstatedir=/var \
@@ -30,8 +32,7 @@ build() {
     --without-pacemaker \
     --without-heartbeat \
     --without-xen \
-    --with-initdir=/etc/rc.d
-    #--with-legacy_utils \
+    --without-legacy_utils
   make
 }
 
@@ -42,8 +43,6 @@ package() {
   cd "$pkgdir"
   mv sbin/* usr/sbin
   rmdir sbin
-  # fix hardcoded path in udev rules
-  sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' etc/udev/rules.d/65-drbd.rules
   # move udev files
   mv etc/udev usr/lib
   # move bash completion
@@ -51,6 +50,8 @@ package() {
   mv etc/bash_completion.d usr/share/bash-completion/completions
   # remove /var/lock
   rmdir var/lock
+  # remove embeded init stuff
+  rm -r etc/init.d
   # autoload module
   install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf
   echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf
diff --git a/community/drbd/drbd.rc b/community/drbd/drbd.rc
deleted file mode 100644
index b8b196e4b..000000000
--- a/community/drbd/drbd.rc
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-# Written by Sébastien Luttringer
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DRBDADM='/usr/sbin/drbdadm'
-PROC_DRBD='/proc/drbd'
-
-check_config() {
-  # check if module is loaded
-  if [[ ! -e $PROC_DRBD ]]; then
-    echo "Missing $PROC_DRBD. Try to load drbd module!"
-    stat_fail
-    exit 1
-  fi
-  # check if config is correct
-  if ! $DRBDADM dump &>/dev/null; then
-      echo 'Invalid configuration'
-      stat_fail
-      exit 1
-  fi
-}
-
-case "$1" in
-  start)
-    stat_busy 'Starting DRBD resources'
-    # check module and config
-    check_config
-    # load config
-    $DRBDADM adjust all 2>/dev/null || { stat_fail; exit 1; }
-    # user interruptible version of wait-connect all
-    $DRBDADM wait-con-int 2>/dev/null || { stat_fail; exit 1; }
-    # become primary if configured
-    $DRBDADM sh-b-pri all 2>/dev/nul l|| { stat_fail; exit 1; }
-    add_daemon drbd
-    stat_done
-    ;;
-  stop)
-    stat_busy 'Stopping DRBD resources'
-    # check module and config
-    check_config
-    # disconnect and detach all resources
-    $DRBDADM down all 2>/dev/null || { stat_fail; exit 1; }
-    rm_daemon drbd
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/drivel/PKGBUILD b/community/drivel/PKGBUILD
index 16057a69d..3c12768c5 100644
--- a/community/drivel/PKGBUILD
+++ b/community/drivel/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 65140 2012-02-20 05:01:22Z spupykin $
+# $Id: PKGBUILD 88291 2013-04-16 00:57:51Z bgyorgy $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # old Maintainer: Andrei "Garoth" Thorp <my-username at gmail dot com>
 # Contributor: Alexandr Nevskiy <kepkin@gmail.com>
 
 pkgname=drivel
 pkgver=3.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="GTK client for working with online journals (blogs)."
-url="http://www.dropline.net/drivel/index.php"
+url="http://drivel.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
 license=("GPL")
-depends=('curl' 'gtksourceview2' 'gtkspell' 'libgnomeui>=2.0.0' 'libsoup')
-makedepends=('perlxml' 'pkgconfig' 'intltool>=0.21' 'gnome-doc-utils>=0.3.2')
+depends=('curl' 'gnome-vfs' 'gtksourceview2' 'gtkspell' 'libsoup' 'desktop-file-utils')
+makedepends=('intltool>=0.21' 'gnome-doc-utils>=0.3.2')
 install=drivel.install
 source=(http://downloads.sourceforge.net/drivel/$pkgname-$pkgver.tar.gz)
 md5sums=('295a583d6ed652ab591070245283fb5b')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  LDFLAGS=-lm ./configure --prefix=/usr --sysconfdir=/etc
+  sed -i 's/ -Werror//' configure
+  LDFLAGS=-lm ./configure --prefix=/usr --sysconfdir=/etc \
+      --disable-desktop-update --disable-schemas-install \
+      --with-gconf-schema-file-dir=/usr/share/gconf/schemas
   make
 }
 
diff --git a/community/drivel/drivel.install b/community/drivel/drivel.install
index 47f683f79..cbb2491ce 100644
--- a/community/drivel/drivel.install
+++ b/community/drivel/drivel.install
@@ -1,13 +1,22 @@
+pkgname=drivel
+
 post_install() {
-  [ -e /usr/bin/gtk-update-icon-cache ] && gtk-update-icon-cache -q -t -f usr/share/icons
+  usr/sbin/gconfpkg --install ${pkgname}
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
+  update-mime-database usr/share/mime
 }
 
 post_upgrade() {
   post_install $1
 }
 
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
 post_remove() {
-  [ -e /usr/bin/gtk-update-icon-cache ] && gtk-update-icon-cache -q -t -f usr/share/icons
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
+  update-mime-database usr/share/mime
 }
diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD
index 030116559..58ef6d167 100644
--- a/community/dspam/PKGBUILD
+++ b/community/dspam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77118 2012-10-05 10:37:20Z spupykin $
+# $Id: PKGBUILD 86999 2013-03-25 19:16:37Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=dspam
 pkgver=3.10.2
-pkgrel=2
+pkgrel=4
 pkgdesc="A scalable, open-source statistical anti-spam filter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dspam.nuclearelephant.com/"
@@ -13,29 +13,35 @@ backup=('etc/dspam/dspam.conf'
 	'srv/http/dspam/cgi-bin/subadmins')
 license=("GPL")
 depends=(readline libcap ncurses zlib openssl)
-makedepends=('libmysqlclient' 'postgresql-libs' 'db' 'sqlite')
-optdepends=('libmysqlclient: MySQL support'
+makedepends=('libmariadbclient' 'postgresql-libs' 'db' 'sqlite' 'libldap')
+optdepends=('libmariadbclient: MariaDB support'
 	    'postgresql-libs: PostgreSQL support'
 	    'db: BerkeleyDB support'
-	    'sqlite: SQLite support')
+	    'sqlite: SQLite support'
+	    'clamav: ClamAV support'
+	    'libldap: external lookup support')
 options=('zipman' 'docs' '!libtool')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/project/dspam/dspam/dspam-$pkgver/dspam-$pkgver.tar.gz
 	dspam.logrotated
 	dspam
 	dspam.service
-	dspam.tmpfiles)
+	dspam.tmpfiles
+	dspam_maintenance.cron)
 md5sums=('0e0e405d3284485b2a43f47eaf6b09bb'
-         '2163ca41de383f09f4d754e2d35cb158'
+         'cec7e3df4cbc6feca387fb516a5b3490'
          'bb2300eff5b2a6eb987750c71a2c2169'
          '1581a94598cec370b66f37b118970676'
-         '933643f2204ccbd7e451a439f83db1ea')
+         '933643f2204ccbd7e451a439f83db1ea'
+         'ebfb0fec16a56f6e1a3a61ced2d5015d')
 
 build() {
-  OPTS="--with-dspam-owner=dspam --with-dspam-group=dspam --enable-daemon --enable-virtual-users \
+  OPTS="--with-dspam-owner=dspam --with-dspam-group=dspam --with-dspam-home-group=dspam --with-dspam-mode=2510 \
+	--enable-daemon --enable-virtual-users --enable-large-scale --enable-long-usernames --enable-external-lookup \
+	--enable-split-configuration --enable-syslog --enable-clamav \
+	--with-dspam-home=/var/lib/dspam --with-logdir=/var/log/dspam --with-logfile=/var/log/dspam/dspam.log \
 	--with-mysql-includes=/usr/include/mysql --with-mysql-libraries=/usr/lib \
-	--with-storage-driver="mysql_drv,libdb4_drv,pgsql_drv,sqlite3_drv,hash_drv" --with-dspam-home=/var/lib/dspam \
-	--with-logdir=/var/log/dspam --enable-preferences-extension --enable-large-scale"
+	--with-storage-driver="mysql_drv,libdb4_drv,pgsql_drv,sqlite3_drv,hash_drv" --enable-preferences-extension"
 
   cd $srcdir/$pkgname-$pkgver
   [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc/dspam --localstatedir=/var ${OPTS}
@@ -52,25 +58,32 @@ package() {
   find $pkgdir/srv/http/dspam/ -type f -name '*.in' -exec rm -f {} \;
 
   install -d $pkgdir/etc/logrotate.d \
-	     $pkgdir/etc/rc.d $pkgdir/var/lib/dspam/{mysql,pgsql}
+	     $pkgdir/etc/rc.d \
+	     $pkgdir/usr/share/dspam/{mysql,pgsql}
   install -m644 ../dspam.logrotated $pkgdir/etc/logrotate.d/dspam
   install -m755 ../dspam $pkgdir/etc/rc.d
 
   sed -i 's|#ServerPID|ServerPID|' $pkgdir/etc/dspam/dspam.conf
 
-  sed -e 's:^#*\(ServerDomainSocketPath[\t ]\{1,\}\).*:\1\"/var/run/dspam/dspam.sock\":gI' \
-				-e 's:^#*\(ServerPID[\t ]\{1,\}\).*:\1/var/run/dspam/dspam.pid:gI' \
+  sed -e 's:^#*\(ServerDomainSocketPath[\t ]\{1,\}\).*:\1\"/run/dspam/dspam.sock\":gI' \
+				-e 's:^#*\(ServerPID[\t ]\{1,\}\).*:\1/run/dspam/dspam.pid:gI' \
 				-i $pkgdir/etc/dspam/dspam.conf
 
   sed -i 's|/var/lib/mysql/mysql.sock|/tmp/mysql.sock|' $pkgdir/etc/dspam/dspam.conf
 
-  cp -r src/tools.mysql_drv/*.sql $pkgdir/var/lib/dspam/mysql
-  cp -r src/tools.pgsql_drv/*.sql $pkgdir/var/lib/dspam/pgsql
+  cp -r src/tools.mysql_drv/*.sql $pkgdir/usr/share/dspam/mysql
+  cp -r src/tools.pgsql_drv/*.sql $pkgdir/usr/share/dspam/pgsql
+
+  # install dspam_maintenance from contrib/
+  install -Dm0755 contrib/dspam_maintenance/dspam_maintenance.sh $pkgdir/usr/bin/dspam_maintenance
+  install -Dm0644 contrib/dspam_maintenance/dspam_maintenance.1 $pkgdir/usr/share/man/man1/dspam_maintenance.1
+  install -Dm0755 $srcdir/dspam_maintenance.cron $pkgdir/etc/cron.daily/dspam_maintenance
 
   cd $pkgdir/usr/share/man/man3
   find -type l -exec ln -sf libdspam.3 {} \;
 
-  chmod 0755 $pkgdir/usr/bin/*
+  # make logrotate happy
+  chmod 750 $pkgdir/var/log/dspam
 
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
   install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
diff --git a/community/dspam/dspam.install b/community/dspam/dspam.install
index fc74fe55e..4eac46ede 100644
--- a/community/dspam/dspam.install
+++ b/community/dspam/dspam.install
@@ -3,8 +3,10 @@ post_install() {
   groupadd -g 115 dspam && echo "done."
   echo -n "adding dspam system user... "
   useradd -c "DSPAM Daemon" -u 115 -d /var/lib/dspam -g dspam -s /bin/false dspam \
-  && echo "done."
+    && echo "done."
   passwd -l dspam &>/dev/null
+  chown root:dspam usr/bin/dspamc
+  chmod g+s usr/bin/dspamc
 
 cat << EOF
 >>> To populate the DSPAM database, you need to follow several steps.
@@ -27,6 +29,11 @@ cat << EOF
 EOF
 }
 
+post_upgrade() {
+  chown root:dspam usr/bin/dspamc
+  chmod g+s usr/bin/dspamc
+}
+
 post_remove() {
   echo -n -e "\nremoving dspam system user and group..."
   userdel dspam && echo "done."
diff --git a/community/dspam/dspam.logrotated b/community/dspam/dspam.logrotated
index 89db6f565..c73b1dcb3 100644
--- a/community/dspam/dspam.logrotated
+++ b/community/dspam/dspam.logrotated
@@ -1,5 +1,10 @@
-/var/log/dspam/sql.errors /var/log/dspam/system.log /var/log/dspam/dspam.debug /var/log/dspam/dspam.messages {
-	weekly
-	compress
-	create 0644 dspam dspam
+/var/log/dspam/sql.errors
+/var/lib/dspam/system.log
+/var/log/dspam/dspam.debug
+/var/log/dspam/dspam.messages
+/var/log/dspam/dspam.log {
+        weekly
+        compress
+        missingok
+	copytruncate
 }
diff --git a/community/dspam/dspam_maintenance.cron b/community/dspam/dspam_maintenance.cron
new file mode 100644
index 000000000..940d8aed1
--- /dev/null
+++ b/community/dspam/dspam_maintenance.cron
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# DSPAM maintenance tasks
+# check "man 1 dspam_maintenance" for more options
+
+/usr/bin/dspam_maintenance --verbose --purgescriptdir=/usr/share/dspam 1> /dev/null
diff --git a/community/dunst/PKGBUILD b/community/dunst/PKGBUILD
index fc9f7c083..c6cf9a28f 100644
--- a/community/dunst/PKGBUILD
+++ b/community/dunst/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 83044 2013-01-26 21:37:31Z dwallace $
+# $Id: PKGBUILD 88586 2013-04-20 15:35:54Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: feuri
 
 pkgname=dunst
-pkgver=0.5.0
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="a dmenu-ish notification system "
 arch=('i686' 'x86_64' 'mips64el')
 url="http://knopwob.github.com/dunst"
 license=(MIT)
-depends=(dbus libxinerama libxft libxss libxdg-basedir)
-makedepends=('perl')
+depends=(libxinerama libxss libxdg-basedir pango)
+optdepends=("libnotify: notify-send"
+            "dbus: start dunst on demand")
+makedepends=(libnotify dbus 'perl')
 provides=(notification-daemon)
 source=("${pkgname}-${pkgver}.tar.bz2::http://www.knopwob.org/public/dunst-release/$pkgname-$pkgver.tar.bz2")
-md5sums=('3805fd0ef171378cc6ff3a74ce8a4f06')
 
 build() {
 	make -C "$srcdir/$pkgname-$pkgver" X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
@@ -24,3 +25,4 @@ package() {
 	install -Dm644 "${srcdir}/$pkgname-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 # vim:set ts=2 sw=2 et:
+md5sums=('bb5fee3cdf6ee30f7e11b7edd35e6723')
diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD
index f7c359639..40d5c18d8 100644
--- a/community/duplicity/PKGBUILD
+++ b/community/duplicity/PKGBUILD
@@ -1,31 +1,34 @@
-# $Id: PKGBUILD 79464 2012-11-05 20:16:41Z bgyorgy $
+# $Id: PKGBUILD 87789 2013-04-06 16:50:31Z bgyorgy $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=duplicity
-pkgver=0.6.20
+pkgver=0.6.21
 pkgrel=2
 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nongnu.org/duplicity/'
 license=('GPL')
-depends=('librsync' 'ncftp' 'python2' 'python2-boto' 'python2-gnupginterface' 'python2-paramiko')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
-        u1-ascii-error.patch)
-md5sums=('83a56c4c17fc50961c961943867deae4'
-         '2bd2d4a3a331ab728473f46963dc87da'
-         '7e19cc49547848ce847297b1880f5a8e')
+depends=('gnupg' 'librsync' 'ncftp' 'python2-paramiko')
+optdepends=('lftp: FTPS backend'
+            'python2-boto: Amazon S3 backend'
+            'python2-gobject: GIO backend'
+            'gvfs: GIO backend'
+            'python2-gdata: Google Docs backend'
+            'python2-httplib2: Ubuntu One backend'
+            'python2-oauthlib: Ubuntu One backend'
+            'rsync: rsync backend')
+source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('4ade1de475e0af64211bb6933b593057'
+         '3521d679ba7dff46653313aa3b3e6855')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Fix ascii error in U1 backend
-  patch -Np0 -i "${srcdir}/u1-ascii-error.patch"
-
   # python2 fix
   for file in $(find . -name '*.py' -print); do
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
+    sed -i 's_^#!.*/usr/bin/python$_#!/usr/bin/python2_' $file
+    sed -i 's_^#!.*/usr/bin/env.*python$_#!/usr/bin/env python2_' $file
   done
 }
 
diff --git a/community/duplicity/u1-ascii-error.patch b/community/duplicity/u1-ascii-error.patch
deleted file mode 100644
index 0812653b9..000000000
--- a/community/duplicity/u1-ascii-error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'duplicity/backends/u1backend.py'
---- duplicity/backends/u1backend.py	2012-10-27 12:16:19 +0000
-+++ duplicity/backends/u1backend.py	2012-11-03 21:39:23 +0000
-@@ -207,7 +207,7 @@
-                    "Content-Type": content_type}
-         resp, content = self.client.request(remote_full,
-                                             method="PUT",
--                                            body=str(data),
-+                                            body=bytearray(data),
-                                             headers=headers)
- 
-     def get(self, filename, local_path):
-
diff --git a/community/dvdisaster/PKGBUILD b/community/dvdisaster/PKGBUILD
index c5cb315e2..685aca8c0 100644
--- a/community/dvdisaster/PKGBUILD
+++ b/community/dvdisaster/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=dvdisaster
 pkgver=0.72.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Provides a margin of safety against data loss on CD and DVD media caused by aging or scratches"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.dvdisaster.com/"
diff --git a/community/dvtm/PKGBUILD b/community/dvtm/PKGBUILD
index 8e2791853..435cbe191 100644
--- a/community/dvtm/PKGBUILD
+++ b/community/dvtm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74674 2012-08-01 19:22:27Z lfleischer $
+# $Id: PKGBUILD 88575 2013-04-20 13:06:56Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Giorgio Lando <patroclo7@gmail.com>
 # Contributor: bender02 at gmx dot com
 
 pkgname=dvtm
-pkgver=0.8
+pkgver=0.9
 pkgrel=1
 pkgdesc='Dynamic virtual terminal manager.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ license=('MIT')
 depends=('ncurses')
 source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'config.h')
-md5sums=('c565067557c9be4cdc63aecd0932452e'
-         '50ae76c4b33864f0cf051417443cc422')
+md5sums=('7de1103abb0ca410f7250cf89f019a38'
+         '41107e5e84a8572f70d6cb111b4e07f8')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/dvtm/config.h b/community/dvtm/config.h
index 2b00776f2..48367695a 100644
--- a/community/dvtm/config.h
+++ b/community/dvtm/config.h
@@ -1,4 +1,3 @@
-/* curses attributes for the currently focused window */
 /* valid curses attributes are listed below they can be ORed
  *
  * A_NORMAL        Normal display (no highlight)
@@ -10,23 +9,16 @@
  * A_BOLD          Extra bright or bold
  * A_PROTECT       Protected mode
  * A_INVIS         Invisible or blank mode
- *
  */
 #define BLUE            (COLORS==256 ? 68 : COLOR_BLUE)
-
-#define SELECTED_ATTR   A_NORMAL
-#define SELECTED_FG     BLUE
-#define SELECTED_BG     -1
+/* curses attributes for the currently focused window */
+#define SELECTED_ATTR   COLOR(BLUE, -1) | A_NORMAL
 /* curses attributes for normal (not selected) windows */
-#define NORMAL_ATTR     A_NORMAL
-#define NORMAL_FG       -1
-#define NORMAL_BG       -1
+#define NORMAL_ATTR     COLOR(-1, -1) | A_NORMAL
+/* curses attributes for the status bar */
+#define BAR_ATTR        COLOR(BLUE, -1) | A_NORMAL
 /* status bar (command line option -s) position */
 #define BAR_POS		BAR_TOP /* BAR_BOTTOM, BAR_OFF */
-/* curses attributes for the status bar */
-#define BAR_ATTR        A_NORMAL
-#define BAR_FG          BLUE
-#define BAR_BG          -1
 /* determines whether the statusbar text should be right or left aligned */
 #define BAR_ALIGN       ALIGN_RIGHT
 /* separator between window title and window number */
@@ -46,7 +38,7 @@
 #include "fullscreen.c"
 
 /* by default the first layout entry is used */
-Layout layouts[] = {
+static Layout layouts[] = {
 	{ "[]=", tile },
 	{ "+++", grid },
 	{ "TTT", bstack },
@@ -55,9 +47,10 @@ Layout layouts[] = {
 
 #define MOD CTRL('g')
 
-/* you can at most specifiy MAX_ARGS (2) number of arguments */
-Key keys[] = {
+/* you can at most specifiy MAX_ARGS (3) number of arguments */
+static Key keys[] = {
 	{ MOD, 'c',       { create,         { NULL }                    } },
+	{ MOD, 'C',       { create,         { NULL, NULL, "$CWD" }      } },
 	{ MOD, 'x',       { killclient,     { NULL }                    } },
 	{ MOD, 'j',       { focusnext,      { NULL }                    } },
 	{ MOD, 'u',       { focusnextnm,    { NULL }                    } },
@@ -89,14 +82,19 @@ Key keys[] = {
 	{ MOD, 'r',       { redraw,         { NULL }                    } },
 	{ MOD, 'X',       { lock,           { NULL }                    } },
 	{ MOD, 'B',       { togglebell,     { NULL }                    } },
+	{ MOD, 'v',       { copymode,       { NULL }                    } },
+	{ MOD, '/',       { copymode,       { "/" }                     } },
+	{ MOD, '?',       { copymode,       { "?" }                     } },
+	{ MOD, 'p',       { paste,          { NULL }                    } },
 	{ MOD, KEY_PPAGE, { scrollback,     { "-1" }                    } },
 	{ MOD, KEY_NPAGE, { scrollback,     { "1"  }                    } },
-	{ MOD, '?',       { create,         { "man dvtm", "dvtm help" } } },
+	{ MOD, KEY_F(1),  { create,         { "man dvtm", "dvtm help" } } },
 };
 
 static const ColorRule colorrules[] = {
-	/* title attrs     fgcolor      bgcolor */
+	{ "", A_NORMAL, -1, -1 }, /* default */
 #if 0
+	/* title attrs     fgcolor      bgcolor */
 	{ "ssh", A_NORMAL, COLOR_BLACK, 224      },
 #endif
 };
@@ -137,7 +135,7 @@ static const ColorRule colorrules[] = {
 #define ENABLE_MOUSE true /* whether to enable mouse events by default */
 
 #ifdef CONFIG_MOUSE
-Button buttons[] = {
+static Button buttons[] = {
 	{ BUTTON1_CLICKED,        { mouse_focus,      { NULL  } } },
 	{ BUTTON1_DOUBLE_CLICKED, { mouse_fullscreen, { "[ ]" } } },
 	{ BUTTON2_CLICKED,        { mouse_zoom,       { NULL  } } },
@@ -145,11 +143,15 @@ Button buttons[] = {
 };
 #endif /* CONFIG_MOUSE */
 
-Cmd commands[] = {
+static Cmd commands[] = {
 	{ "create", { create,	{ NULL } } },
 };
 
 /* gets executed when dvtm is started */
-Action actions[] = {
+static Action actions[] = {
 	{ create, { NULL } },
 };
+
+static char const * const keytable[] = {
+	/* add your custom key escape sequences */
+};
diff --git a/community/dwb/PKGBUILD b/community/dwb/PKGBUILD
index 1ef73ad83..a21b588d5 100644
--- a/community/dwb/PKGBUILD
+++ b/community/dwb/PKGBUILD
@@ -1,18 +1,19 @@
-#$Id: PKGBUILD 80801 2012-12-03 23:17:22Z dwallace $ 
+#$Id: PKGBUILD 87389 2013-03-30 14:49:30Z dwallace $ 
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: portix <portix at gmx.net>
 
 pkgname=dwb
-pkgver=2012.12.03
-pkgrel=1
+pkgver=2013.03.30
+pkgrel=2
 pkgdesc="A webkit web browser with vi-like keyboard shortcuts, stable snapshot" 
 url="http://portix.bitbucket.org/dwb/"
 arch=('i686' 'x86_64' 'mips64el')
 install=dwb.install
 license=('GPL')
 depends=('libwebkit' 'desktop-file-utils')
+makedepends=('json-c')
 source=(https://bitbucket.org/portix/"${pkgname}"/downloads/"${pkgname}"-"${pkgver}".tar.gz)
-md5sums=('cf2e0c8cbd852203deb322c14952756c')
+sha1sums=(57207525896a0c6145e1da69481e3ccc043757e9)
 
 build() {
   cd "${srcdir}"/"${pkgname}"-"${pkgver}"
@@ -20,5 +21,6 @@ build() {
 }
 package() {
   cd "${srcdir}"/"${pkgname}"-"${pkgver}"
+  export BASHCOMPLETION=/usr/share/bash-completion/completions
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/dwb/dwb.install b/community/dwb/dwb.install
index 5a5553eba..abb6d38e4 100644
--- a/community/dwb/dwb.install
+++ b/community/dwb/dwb.install
@@ -1,5 +1,7 @@
 post_install(){
     update-desktop-database -q
+    echo "==> If you are using extensions you should update the extensions with" 
+    echo "==> dwbem -u or dwbem -Nu"
 }
 
 post_upgrade(){
diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD
index 0925ec937..31915b2a4 100644
--- a/community/dwdiff/PKGBUILD
+++ b/community/dwdiff/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82683 2013-01-23 00:15:52Z eric $
+# $Id: PKGBUILD 87045 2013-03-26 11:49:38Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=dwdiff
 pkgver=2.0.4
-pkgrel=3
+pkgrel=4
 pkgdesc="A front-end for the diff program that operates at the word level instead of the line level"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://os.ghalkes.nl/dwdiff.html"
diff --git a/community/dwm/PKGBUILD b/community/dwm/PKGBUILD
index 6fad2aa73..b598b41ab 100644
--- a/community/dwm/PKGBUILD
+++ b/community/dwm/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=dwm
 pkgver=6.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A dynamic window manager for X"
 url="http://dwm.suckless.org"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/easystroke/PKGBUILD b/community/easystroke/PKGBUILD
index a657d3cee..7110d1574 100644
--- a/community/easystroke/PKGBUILD
+++ b/community/easystroke/PKGBUILD
@@ -2,17 +2,17 @@
 # Contributor: Kevin Sullivan <ksullivan@archlinux.us>
 
 pkgname=easystroke
-pkgver=0.5.6
+pkgver=0.6.0
 pkgrel=2
 pkgdesc='Use mouse gestures to initiate commands and hotkeys.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://easystroke.sourceforge.net/'
 license=('custom:ISC')
-depends=('gtkmm' 'boost-libs' 'libxtst' 'dbus-glib' 'xorg-server')
+depends=('gtkmm3' 'boost-libs' 'libxtst' 'dbus-glib' 'xorg-server')
 makedepends=('boost' 'inputproto' 'intltool' 'gettext' 'xorg-server-devel' 'help2man')
 install=easystroke.install
 source=("http://downloads.sourceforge.net/easystroke/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a9f06576a47deaf6f612bb993685af0f')
+md5sums=('3b4f25d02a6b5ac57a8b7a06545869db')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/ebtables/ebtables.conf b/community/ebtables/ebtables.conf
deleted file mode 100644
index 386f94249..000000000
--- a/community/ebtables/ebtables.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration file used to load/save configuration.
-CONFIG_FILE='/etc/ebtables.conf'
-
-# Save configuration on stop/restart.
-#SAVE_ON_STOP=yes
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ebtables/ebtables.rc b/community/ebtables/ebtables.rc
deleted file mode 100644
index a845449fe..000000000
--- a/community/ebtables/ebtables.rc
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-case "$1" in
-  start)
-    stat_busy 'Loading ebtables rules'
-    ebtables-restore < "$CONFIG_FILE" &&
-      add_daemon ${0##*/} && stat_done || stat_die
-    ;;
-  stop)
-    [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save
-    status 'Clearing ebtables rules' ebtables -F && rm_daemon ${0##*/} || exit 1
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  save)
-    stat_busy 'Saving ebtables rules'
-    ebtables-save > "$CONFIG_FILE" && stat_done || stat_die
-    ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|restart|save}" >&2
-    exit 1
-    ;;
-esac
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ecryptfs-utils/PKGBUILD b/community/ecryptfs-utils/PKGBUILD
index e0126243d..2f6a8d7be 100644
--- a/community/ecryptfs-utils/PKGBUILD
+++ b/community/ecryptfs-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80488 2012-11-22 19:34:12Z tredaelli $
+# $Id: PKGBUILD 85885 2013-03-08 11:10:34Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Richard Murri <admin@richardmurri.com>
 # Contributor: Michal Krenek <mikos@sg1.cz>
 
 pkgname=ecryptfs-utils
-pkgver=101
+pkgver=103
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux"
@@ -16,8 +16,8 @@ optdepends=('python2: for python module')
 source=("http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz"
         "${pkgname}_${pkgver}.orig.tar.gz.sig::http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/..-${pkgname}_${pkgver}.orig.tar.gz.asc")
 options=(!libtool)
-md5sums=('7a17714b2e4555a79d464e260b179f4f'
-         '51e24e3252deabec2b91811545805397')
+md5sums=('39929d850edd24b175ff0c82722e0de1'
+         '1fc46fb18d662315c8d4cb13b0e618c0')
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/community/ecryptfs-utils/symlinked_mtab.patch b/community/ecryptfs-utils/symlinked_mtab.patch
deleted file mode 100644
index 2ba0aa8bf..000000000
--- a/community/ecryptfs-utils/symlinked_mtab.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ecryptfs-utils/src/ecryptfs-utils-96/src/libecryptfs/main.c.orig
-+++ ecryptfs-utils/src/ecryptfs-utils-96/src/libecryptfs/main.c
-@@ -387,6 +387,8 @@
- 	char *fullpath_source = NULL;
- 	char *fullpath_target = NULL;
- 	int rc;
-+	char dummy;
-+	int useMtab;
- 
- 	mountent.mnt_opts = NULL;
- 	if (!source) {
-@@ -425,6 +427,13 @@
- 		syslog(LOG_ERR, "Failed to perform eCryptfs mount: [%m]\n");
- 		goto out;
- 	}
-+	/* Check if mtab is a symlink */
-+	useMtab = (readlink("/etc/mtab", &dummy, 1) < 0);
-+	if (!useMtab) {
-+		/* No need updating mtab */
-+		rc = 0;
-+		goto out;
-+	}
- 	mtab_fd = setmntent("/etc/mtab", "a");
- 	if (!mtab_fd) {
- 		rc = -EACCES;
diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD
index ff1108c9b..812a0255c 100644
--- a/community/ejabberd/PKGBUILD
+++ b/community/ejabberd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82170 2013-01-10 09:34:15Z spupykin $
+# $Id: PKGBUILD 87844 2013-04-08 09:22:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ejabberd
-pkgver=2.1.11
-pkgrel=8
+pkgver=2.1.12
+pkgrel=1
 pkgdesc="Jabber server written in Erlang"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://www.ejabberd.im/"
@@ -19,7 +19,7 @@ source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${
 	"$pkgname.logrotate"
 	"$pkgname"
 	"ejabberd.service")
-md5sums=('a70b040c4e7602f47718c8afe8780d50'
+md5sums=('7d49242cf04282f3c4cebfafa2cc2f46'
          'f97c8a96160f30e0aecc9526c12e6606'
          '2338a6230ce5f9f60be6dddcfa39bc7e'
          'df32aa17e40a7bc5d9946d3ba6fe5e16')
diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD
index 6be35c0bc..0e4cbcba9 100644
--- a/community/ekg2/PKGBUILD
+++ b/community/ekg2/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=ekg2
 pkgver=0.3.1
-pkgrel=5
+pkgrel=5.1
 pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ekg2.org/"
diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD
index 172694a9a..b045cc8d7 100644
--- a/community/electricsheep/PKGBUILD
+++ b/community/electricsheep/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 83245 2013-01-28 16:49:31Z stephane $
+# $Id: PKGBUILD 87408 2013-03-31 19:18:11Z stephane $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=electricsheep
 pkgver=2.7b33
-pkgrel=5
+pkgrel=7
 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.electricsheep.org/"
@@ -44,7 +44,7 @@ build() {
   ./autogen.sh
   CPPFLAGS+="-I/usr/include/lua5.1" ./configure --prefix=/usr
   sed -i 's|-I /usr/include/libavutil||' MSVC/SettingsGUI/Makefile 
-  make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1"
+  make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1" GLEE_LIBS="-lGLee" 
 }
 
 package() {
diff --git a/community/electricsheep/PKGBUILD.svn b/community/electricsheep/PKGBUILD.svn
deleted file mode 100644
index 2fc8a26ff..000000000
--- a/community/electricsheep/PKGBUILD.svn
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 57680 2011-11-01 05:03:57Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-pkgname=electricsheep
-pkgver=2.7b34
-pkgrel=1
-pkgdesc="Screensaver that realize the collective dream of computers all over the internet"
-arch=('x86_64' 'i686')
-url="http://community.electricsheep.org/"
-license=('GPL')
-depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade' 'tinyxml' 'boost' 'gtk2' 'lua')
-#subversion libgtk2.0 libgl1-mesa libavcodec libavformat libswscale liblua5 libcurl4-openssl libxml2 libjpeg8 libgtop2 libboost libboost-filesystem libboost-thread libtinyxml libglut3
-makedepends=('xscreensaver')
-optdepends=('xscreensaver: to use electricsheep with xscreensaver')
-_fixed_revision=107
-
-build() {
-  cd "$srcdir"
-
-  msg2 "Checking out svn revision $_fixed_revision (in lack of a Linux release for $pkgver)..."
-  if [[ -d "$pkgname/.svn" ]]; then
-    (cd "$pkgname" && svn up -r $_fixed_revision)
-  else
-    svn co \
-      http://electricsheep.googlecode.com/svn/trunk/ \
-      --config-dir ./ -r $_fixed_revision "$pkgname"
-  fi
-
-  msg2 "Setting up build directory..."
-  rm -rf "$srcdir/$pkgname-build"
-  cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build"
-  cd "$srcdir/$pkgname-build/client_generic"
-
-  #patch -p1 -i ../electricsheep-ffmpeg.patch
-  msg2 "Configuring..."
-  ./autogen.sh
-  ./configure --prefix=/usr
-
-  msg2 "Compiling..."
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-build/client_generic"
-
-  install -d "$pkgdir/usr/share/applications/screensavers"
-  install -d "$pkgdir/usr/lib/gnome-screensaver/gnome-screensaver"
-  make DESTDIR="$pkgdir" \
-    GNOME_SCREENSAVER_DATADIR="$pkgdir/usr/share/applications/screensavers" \
-    GNOME_SCREENSAVER_PRIVEXEDIR="$pkgdir/usr/lib/gnome-screensaver/gnome-screensaver" \
-    install
-  install -Dm644 electricsheep.desktop.kde \
-    "$pkgdir/usr/share/kde4/services/ScreenSavers/electricsheep.desktop"
-  install -Dm644 electricsheep.xml \
-    "$pkgdir/usr/share/xscreensaver/config/electricsheep.xml"
-  install -Dm755 electricsheep-saver \
-    "$pkgdir/usr/bin/electricsheep-saver"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/electricsheep/electricsheep-ffmpeg.patch b/community/electricsheep/electricsheep-ffmpeg.patch
deleted file mode 100644
index b04cf41b0..000000000
--- a/community/electricsheep/electricsheep-ffmpeg.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c
---- electricsheep-2.7b12.orig/electricsheep.c	2011-10-31 22:36:30.000000000 -0400
-+++ electricsheep-2.7b12/electricsheep.c	2011-10-31 22:40:04.000000000 -0400
-@@ -662,7 +662,7 @@
-     input_stream_index = -1;
-     for (j = 0; j < ictx->nb_streams; j++) {
- 	AVCodecContext *enc = ictx->streams[j]->codec;
--	if (CODEC_TYPE_VIDEO == enc->codec_type) {
-+	if (AVMEDIA_TYPE_VIDEO == enc->codec_type) {
- 	    input_stream_index = j;
- 	    break;
- 	}
-@@ -730,7 +730,7 @@
- 	av_init_packet(&opkt);
- 	if (av_parser_change(ictx->streams[input_stream_index]->parser, output_ctx->streams[0]->codec,
- 			     &opkt.data, &opkt.size, ipkt.data, ipkt.size,
--			     ipkt.flags & PKT_FLAG_KEY))
-+			     ipkt.flags & AV_PKT_FLAG_KEY))
- 	    opkt.destruct= av_destruct_packet;
- 		
- 	if (-1 == av_interleaved_write_frame(output_ctx, &opkt)) {
-diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c
---- electricsheep-2.7b12.orig/electricsheep.c	2011-11-01 00:21:51.000000000 -0400
-+++ electricsheep-2.7b12/electricsheep.c	2011-11-01 00:25:10.000000000 -0400
-@@ -686,9 +686,9 @@
- 	    }
- 	}
- 
--	output_ctx = av_alloc_format_context();
-+	output_ctx = avformat_alloc_context();
- 
--	ofmt = guess_format(NULL, fname, NULL);
-+	ofmt = av_guess_format(NULL, fname, NULL);
- 	if (!ofmt) {
- 	    fprintf(logout, "could not determine format from %s.\n", fname);
- 	    exit(1);
diff --git a/community/electricsheep/electricsheep-pref-segfault.patch b/community/electricsheep/electricsheep-pref-segfault.patch
deleted file mode 100644
index 83bcd8a0f..000000000
--- a/community/electricsheep/electricsheep-pref-segfault.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-diff -Naur electricsheep-2.7b12/electricsheep.c electricsheep-2.7~b12+svn20091224/electricsheep.c
---- electricsheep-2.7b12/electricsheep.c	2009-07-09 04:10:05.000000000 -0400
-+++ electricsheep-2.7~b12+svn20091224/electricsheep.c	2009-12-24 18:03:01.000000000 -0500
-@@ -564,6 +566,12 @@
- 	    n++;
- 	}
-     }
-+    if (n < 1) {
-+      if (debug) {
-+	fprintf(logout, "median rank undefined\n");
-+      }
-+      return;
-+    }
-     qsort(tms, n, sizeof(int), compare_ints);
-     if (0 && debug) {
- 	for (i = 0; i < n; i++)
-@@ -1915,7 +1923,7 @@
- 	if (-1 == (decoder_pid = fork())) {
- 	    perror("decoder fork");
- 	} else if (0 == decoder_pid) {
--	    char *argv[20];
-+	    char *argv[25];
- 	    int c = 0;
- 	    /* child */
- 	    snprintf(fps, 24, "%g", prefs.frame_rate);
-@@ -1934,6 +1942,7 @@
- 		cleanup_and_exit(1);
- 	      }
- 		argv[c++] = "mplayer";
-+		argv[c++] = "-nolirc";
- 		argv[c++] = "-cache";
- 		argv[c++] = "8192";
- 		argv[c++] = "-really-quiet";
-diff -Naur electricsheep-2.7b12/electricsheep.h electricsheep-2.7~b12+svn20091224/electricsheep.h
---- electricsheep-2.7b12/electricsheep.h	2009-07-09 04:10:05.000000000 -0400
-+++ electricsheep-2.7~b12+svn20091224/electricsheep.h	2009-12-24 18:03:01.000000000 -0500
-@@ -74,4 +74,4 @@
- void init_list_cmd (char *buf);
- void get_end_element(void *userData, const char *name);
- void character_handler(void *userData, const XML_Char *s, int len);
--char *encry(char *pw);
-+char *encry(char *pw, char *nick);
-diff -Naur electricsheep-2.7b12/electricsheep-preferences.c electricsheep-2.7~b12+svn20091224/electricsheep-preferences.c
---- electricsheep-2.7b12/electricsheep-preferences.c	2009-07-09 04:10:05.000000000 -0400
-+++ electricsheep-2.7~b12+svn20091224/electricsheep-preferences.c	2009-12-24 18:03:01.000000000 -0500
-@@ -108,8 +108,9 @@
-       prefs.password = strdup("");
-     } else {
-       char *pw = (char*)gtk_entry_get_text(password_entry);
-+      pw = strdup(pw);
-       if (strcmp(pw, pw_marker))
--	prefs.password = encry(pw);
-+	prefs.password = encry(pw, prefs.nick);
-     }
-     prefs.video_driver = (char*)gtk_entry_get_text(video_driver_entry);
-     prefs.frame_rate = gtk_spin_button_get_value(frame_rate_spin);
-@@ -207,72 +208,72 @@
- void get_widgets(GladeXML *xml) {
-     title_label = (GtkLabel *) glade_xml_get_widget(xml, "titleLabel");
-     if (NULL == title_label) {
--	fprintf(stderr, "titleLabel not found\n");
-+	fprintf(logout, "titleLabel not found\n");
- 	exit(1);
-     }
-     test_label = (GtkLabel *) glade_xml_get_widget(xml, "testLabel");
-     if (NULL == test_label) {
--	fprintf(stderr, "testLabel not found\n");
-+	fprintf(logout, "testLabel not found\n");
- 	exit(1);
-     }
-     test_button = (GtkButton *) glade_xml_get_widget(xml, "testButton");
-     if (NULL == test_button) {
--	fprintf(stderr, "testButton not found\n");
-+	fprintf(logout, "testButton not found\n");
- 	exit(1);
-     }
-     nick_entry = (GtkEntry *) glade_xml_get_widget(xml, "nickEntry");
-     if (NULL == nick_entry) {
--	fprintf(stderr, "nickEntry not found\n");
-+	fprintf(logout, "nickEntry not found\n");
- 	exit(1);
-     }
-     url_entry = (GtkEntry *) glade_xml_get_widget(xml, "urlEntry");
-     if (NULL == url_entry) {
--	fprintf(stderr, "urlEntry not found\n");
-+	fprintf(logout, "urlEntry not found\n");
- 	exit(1);
-     }
-     password_entry = (GtkEntry *) glade_xml_get_widget(xml, "passEntry");
-     if (NULL == password_entry) {
--	fprintf(stderr, "passEntry not found\n");
-+	fprintf(logout, "passEntry not found\n");
- 	exit(1);
-     }
-     video_driver_entry = (GtkEntry *) glade_xml_get_widget(xml, "vdEntry");
-     if (NULL == video_driver_entry) {
--	fprintf(stderr, "vdEntry not found\n");
-+	fprintf(logout, "vdEntry not found\n");
- 	exit(1);
-     }
-     frame_rate_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "frameSpin");
-     if (NULL == frame_rate_spin) {
--	fprintf(stderr, "frameSpin not found\n");
-+	fprintf(logout, "frameSpin not found\n");
- 	exit(1);
-     }
-     nrepeats_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "repeatSpin");
-     if (NULL == nrepeats_spin) {
--	fprintf(stderr, "repeatSpin not found\n");
-+	fprintf(logout, "repeatSpin not found\n");
- 	exit(1);
-     }
-     cache_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "cacheSpin");
-     if (NULL == cache_spin) {
--	fprintf(stderr, "cacheSpin not found\n");
-+	fprintf(logout, "cacheSpin not found\n");
- 	exit(1);
-     }
-     no_animation_check = (GtkCheckButton *) glade_xml_get_widget(xml, "noanimCheck");
-     if (NULL == no_animation_check) {
--	fprintf(stderr, "noanimCheck not found\n");
-+	fprintf(logout, "noanimCheck not found\n");
- 	exit(1);
-     }
-     standalone_check = (GtkCheckButton *) glade_xml_get_widget(xml, "standaloneCheck");
-     if (NULL == standalone_check) {
--	fprintf(stderr, "standaloneCheck not found\n");
-+	fprintf(logout, "standaloneCheck not found\n");
- 	exit(1);
-     }
-     hide_errors_check = (GtkCheckButton *) glade_xml_get_widget(xml, "hideCheck");
-     if (NULL == hide_errors_check) {
--	fprintf(stderr, "hideCheck not found\n");
-+	fprintf(logout, "hideCheck not found\n");
- 	exit(1);
-     }
-     save_frames_check = (GtkCheckButton *) glade_xml_get_widget(xml, "saveCheck");
-     if (NULL == save_frames_check) {
--	fprintf(stderr, "saveCheck not found\n");
-+	fprintf(logout, "saveCheck not found\n");
- 	exit(1);
-     }
- }
-diff -Naur electricsheep-2.7b12/utils.c electricsheep-2.7~b12+svn20091224/utils.c
---- electricsheep-2.7b12/utils.c	2009-07-09 04:10:05.000000000 -0400
-+++ electricsheep-2.7~b12+svn20091224/utils.c	2009-12-24 18:03:01.000000000 -0500
-@@ -69,19 +70,23 @@
-     }
- }
- 
--char *encry(char *pw) {
-+
-+char *encry(char *pw, char *nick) {
-+  static char *salt = "sh33p";
-   unsigned char digest[16];
-   char md5_pw[33];
-+  char *pw_salted = malloc(strlen(pw) + strlen(salt) + strlen(nick) + 1);
-   int i, j;
--  md5_buffer(pw, strlen(pw), digest);
-+  sprintf(pw_salted, "%s%s%s", pw, salt, nick);
-+  md5_buffer(pw_salted, strlen(pw_salted), digest);
-   for (i = 0, j = 0; i < sizeof(digest); i++) {
-     char *hex_digits = "0123456789ABCDEF";
--
-     md5_pw[j++] = hex_digits[digest[i] >> 4];
-     md5_pw[j++] = hex_digits[digest[i] & 0x0F];
-   }
-   md5_pw[j] = 0;
-   free(pw);
-+  free(pw_salted);
-   return strdup(md5_pw);
- }
- 
-@@ -97,10 +102,11 @@
- 		free(prefs->url);
- 		prefs->url = strdup(atts[i+1]);
- 	    } else if (!strcmp("password", atts[i])) {
--		free(prefs->password);
--		prefs->password = encry(strdup(atts[i+1]));
-+	        free(prefs->password);
-+		/* assume nick comes before pw in the xml XXX */
-+		prefs->password = encry(strdup(atts[i+1]), prefs->nick);
- 	    } else if (!strcmp("password_md5", atts[i])) {
--		free(prefs->password);
-+	        free(prefs->password);
- 		prefs->password = strdup(atts[i+1]);
- 	    } else if (!strcmp("video_driver", atts[i])) {
- 		free(prefs->video_driver);
-@@ -133,7 +139,7 @@
- 	    } else if (!strcmp("version", atts[i])) {
- 	      // nothing to check
- 	    } else {
--		fprintf(stderr, "ignoring attribute %s\n", atts[i]);
-+		fprintf(logout, "ignoring attribute %s\n", atts[i]);
- 	    }
- 	    i += 2;
- 	}
-@@ -146,7 +152,7 @@
- 	if (argc > 2)
- 	    strcpy(rc_file, argv[2]);
- 	else {
--	    fprintf(stderr,
-+	    fprintf(logout,
- 		    "%s: --preferences option requires a file name argument.\n",
- 		    argv[0]);
- 	    exit(1);
-@@ -155,7 +161,7 @@
-     } 
-     hom = getenv("HOME");
-     if (!hom) {
--	fprintf(stderr, "%s: HOME envar not defined\n", argv[0]);
-+	fprintf(logout, "%s: HOME envar not defined\n", argv[0]);
- 	exit(1);
-     }
-     snprintf(rc_file, PATH_MAX, "%s/.electricsheep/preferences.xml", hom);
-@@ -281,15 +287,15 @@
- 
- int mysystem(char *cmd, char *msg) {
-     int n;
--    if (0) fprintf(stderr, "subprocess; (%s)\n", cmd);
-+    if (0) fprintf(logout, "subprocess; (%s)\n", cmd);
-     if (0 != (n = interruptable_system(cmd))) {
- 	if (SIGINT != n) {
- 	    if (!prefs.hide_errors)
--		fprintf(stderr, "subprocess error: %s, %d=%d<<8+%d\n",
-+		fprintf(logout, "subprocess error: %s, %d=%d<<8+%d\n",
- 			msg, n, n>>8, n&255);
- 	    return 1;
- 	}
--	fprintf(stderr, "control-c during %s, exiting\n", msg);
-+	fprintf(logout, "control-c during %s, exiting\n", msg);
- 	cleanup_and_exit(1);
-     }
-     return 0;
-@@ -325,7 +331,7 @@
- 	int bytes_read;
- 	void *buff = XML_GetBuffer(parser, XML_BUFF_SIZE);
- 	if (buff == NULL) {
--	    fprintf(stderr, "unable to allocate buffer.\n");
-+	    fprintf(logout, "unable to allocate buffer.\n");
- 	    exit(1);
- 	}
- 
-@@ -334,7 +340,7 @@
- 	    break;
- 
- 	if (! XML_ParseBuffer(parser, bytes_read, bytes_read == 0)) {
--	    fprintf(stderr, "parse error.\n");
-+	    fprintf(logout, "parse error.\n");
- 	    exit(1);
- 	}
-     }
-@@ -441,7 +447,7 @@
- 
- void init_curl_cmd(int registration) {
- 
--  if (debug) fprintf(stderr, "init_curl_cmd %d\n", registration);
-+  if (debug) fprintf(logout, "init_curl_cmd %d\n", registration);
- 
-     if (prefs.proxy_name) {
- 	snprintf(curl_cmd, MAXBUF, "nice -n %d curl --location --proxy %s",
-@@ -472,7 +478,7 @@
- 	}
-     }
-     server = dream_server;
--    if (debug) fprintf(stderr, "curl_cmd = %s\nserver = %s\n", curl_cmd, server);
-+    if (debug) fprintf(logout, "curl_cmd = %s\nserver = %s\n", curl_cmd, server);
- }
- 
- void init_list_cmd (char *buf) {
diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD
index 52ecfc373..6b64f18e9 100644
--- a/community/elinks/PKGBUILD
+++ b/community/elinks/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81104 2012-12-12 00:47:30Z eric $
+# $Id: PKGBUILD 88677 2013-04-21 22:16:44Z heftig $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
@@ -8,39 +8,19 @@
 pkgname=elinks
 pkgver=0.13
 _commit="9313aae9062e1d9ff084858fa6844259cd8237d6"
-pkgrel=11
+pkgrel=12
 pkgdesc="An advanced and well-established feature-rich text mode web browser."
 arch=("i686" "x86_64" 'mips64el')
 url="http://elinks.or.cz"
 license=('GPL')
-depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua51' 'libidn' 'js'
+depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua51' 'libidn' 'js185'
 	 'gc' 'tre')
 makedepends=('git')
-source=()
-md5sums=()
-
-__gitroot="http://elinks.cz/elinks.git"
-__gitname="elinks"
+source=("git+http://elinks.cz/elinks.git#commit=$_commit")
+md5sums=('SKIP')
 
 build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
- 
-  if [ -d $__gitname ] ; then
-    cd $__gitname && git pull origin
-    msg "The local files are updated."
-  else
-    git clone $__gitroot
-  fi
- 
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
- 
-  rm -rf "$srcdir/$__gitname-build"
-  git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build"
-  cd "$srcdir/$__gitname-build"
-  git checkout "$_commit"
-
+  cd elinks
   [ -x configure ] || sh autogen.sh
   ./configure --prefix=/usr --mandir=/usr/share/man \
               --sysconfdir=/etc \
@@ -51,7 +31,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$__gitname-build"
+  cd elinks
   make DESTDIR="$pkgdir" install
   rm -f "$pkgdir/usr/share/locale/locale.alias"
 
diff --git a/community/emacs-nox/PKGBUILD b/community/emacs-nox/PKGBUILD
index 6b01bbd4e..0e2e9b214 100644
--- a/community/emacs-nox/PKGBUILD
+++ b/community/emacs-nox/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 76185 2012-09-12 20:05:28Z jlichtblau $
+# $Id: PKGBUILD 88621 2013-04-20 17:17:19Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Chris Brannon <cmbrannon@cox.net>
 
 pkgname=emacs-nox
-pkgver=24.2
+pkgver=24.3
 pkgrel=1
-pkgdesc="The Emacs Editor, without X11 support"
+pkgdesc="The extensible, customizable, self-documenting real-time display editor, without X11 support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
 depends=('dbus-core' 'ncurses' 'perl')
 provides=('emacs')
-conflicts=('emacs' 'emacs-cvs')
-options=('docs')
+conflicts=('emacs')
 changelog=$pkgname.changelog
 install=$pkgname.install
 source=(ftp://ftp.gnu.org/gnu/emacs/emacs-${pkgver}.tar.gz)
-sha256sums=('6d9892dff6e1761d4a5eba20712beba4f37d77a196f8021081a2e69fcb5bd357')
+sha256sums=('0098ca3204813d69cd8412045ba33e8701fa2062f4bff56bedafc064979eef41')
 
 build() {
   cd ${srcdir}/emacs-$pkgver
@@ -33,9 +32,8 @@ package() {
   # remove conflict with ctags package
   mv ${pkgdir}/usr/bin/{ctags,ctags.emacs}
   mv ${pkgdir}/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
-
-  # fix all the 777 perms on directories
-  find ${pkgdir}/usr/share/emacs/$pkgver -type d -exec chmod 755 {} \;
+  # remove conflict with texinfo
+  rm "$pkgdir"/usr/share/info/info.info.gz
   # fix user/root permissions on usr/share files
   find ${pkgdir}/usr/share/emacs/$pkgver -exec chown root.root {} \;
   # remove .desktop file and icons
diff --git a/community/emacs-nox/emacs-nox.changelog b/community/emacs-nox/emacs-nox.changelog
index 9fe1ae221..ffae307fa 100644
--- a/community/emacs-nox/emacs-nox.changelog
+++ b/community/emacs-nox/emacs-nox.changelog
@@ -1,3 +1,6 @@
+2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* emacs-nox 24.3-1
+
 2012-09-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* emacs-nox 24.2-1
 
diff --git a/community/emacs-nox/emacs-nox.install b/community/emacs-nox/emacs-nox.install
index 740640994..06dc781ee 100644
--- a/community/emacs-nox/emacs-nox.install
+++ b/community/emacs-nox/emacs-nox.install
@@ -1,15 +1,15 @@
 INFO_DIR=usr/share/info
 
-INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
-forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
+INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse
+ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake
+forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode
 org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
-speedbar tramp url vip viper widget woman)
+speedbar srecode tramp url vip viper widget wisent woman)
 
 post_install() {
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
 
@@ -20,6 +20,6 @@ post_upgrade() {
 pre_remove() {
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
diff --git a/community/emelfm2/PKGBUILD b/community/emelfm2/PKGBUILD
index 59d86b3cb..23356156b 100644
--- a/community/emelfm2/PKGBUILD
+++ b/community/emelfm2/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=emelfm2
 pkgver=0.8.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A file manager that implements the popular two-pane design"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://emelfm2.net/"
 depends=('gtk2')
 license=('GPL3')
diff --git a/community/emerillon/PKGBUILD b/community/emerillon/PKGBUILD
new file mode 100644
index 000000000..dd4e13bc1
--- /dev/null
+++ b/community/emerillon/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=emerillon
+pkgver=0.1.90
+pkgrel=4
+pkgdesc="Map viewer for OpenStreetMap"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://projects.gnome.org/emerillon/"
+license=('GPL')
+depends=('libchamplain' 'geoclue' 'libpeas' 'rest')
+makedepends=('gobject-introspection' 'gnome-doc-utils' 'intltool' 'vala')
+options=('!libtool')
+install=$pkgname.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('0648c70bc19d3bd334a5403938aba3855eb644ee337c29aeecd5ce57ea0bf085')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static --disable-schemas-compile
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/rygel/rygel.install b/community/emerillon/emerillon.install
index 2c455e952..7a903e80c 100644
--- a/community/rygel/rygel.install
+++ b/community/emerillon/emerillon.install
@@ -1,5 +1,5 @@
 post_install() {
-  xdg-icon-resource forceupdate
+  glib-compile-schemas usr/share/glib-2.0/schemas
 }
 
 post_upgrade() {
diff --git a/community/encfs/PKGBUILD b/community/encfs/PKGBUILD
index 347f59027..d338ce110 100644
--- a/community/encfs/PKGBUILD
+++ b/community/encfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83246 2013-01-28 16:49:32Z stephane $
+# $Id: PKGBUILD 87409 2013-03-31 19:18:12Z stephane $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Sven Kauber, <celeon@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=encfs
 pkgver=1.7.4
-pkgrel=9
+pkgrel=10
 pkgdesc='Encrypted filesystem in user-space'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.arg0.net/encfs'
diff --git a/community/enet/PKGBUILD b/community/enet/PKGBUILD
index ddb73dc00..f77145cca 100644
--- a/community/enet/PKGBUILD
+++ b/community/enet/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 81243 2012-12-14 12:11:24Z svenstaro $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 88352 2013-04-16 15:17:10Z svenstaro $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Bj?indeijer <bjorn@lindeijer.nl>
 
 pkgname=enet
-pkgver=1.3.6
+pkgver=1.3.7
 pkgrel=1
 pkgdesc='A relatively thin, simple and robust network communication layer on top of UDP.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +13,11 @@ license=('custom')
 depends=('glibc')
 options=('!libtool')
 source=("http://enet.bespin.org/download/${pkgname}-${pkgver}.tar.gz")
-md5sums=('215faae73d7e1f0d6dc48676884d07c7')
+sha1sums=('5611926d47ce0699c8176898496603192d5744e4')
 
 build() {
   cd "${pkgname}-${pkgver}"
-  CFLAGS+="-fPIC" ./configure --prefix=/usr
+  ./configure --prefix=/usr
   make
 }
 
diff --git a/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch b/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
deleted file mode 100644
index e077a15cf..000000000
--- a/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From d30496f52b85f82947bd07b9bd60f8482843ece8 Mon Sep 17 00:00:00 2001
-From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e>
-Date: Tue, 5 Jul 2011 09:23:38 +0000
-Subject: [PATCH 1/2] When using Poppler 0.17.0, I needed to swap the blue and
- red channels, otherwise the colors (other than black
- and white) looked wierd.
-
-git-svn-id: svn://svn.emma-soft.com/epdfview/trunk@367 cb4bfb15-1111-0410-82e2-95233c8f1c7e
----
- src/PDFDocument.cxx |   20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
-
-diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx
-index df5d75f..63b3513 100644
---- a/src/PDFDocument.cxx
-+++ b/src/PDFDocument.cxx
-@@ -20,6 +20,7 @@
- #include <time.h>
- #include <poppler.h>
- #include <unistd.h>
-+#include <algorithm>
- #include "epdfview.h"
- 
- using namespace ePDFView;
-@@ -33,6 +34,24 @@ static PageLayout convertPageLayout (gint pageLayout);
- static PageMode convertPageMode (gint pageMode);
- static gchar *getAbsoluteFileName (const gchar *fileName);
- 
-+namespace
-+{
-+    void
-+    convert_bgra_to_rgba (guint8 *data, int width, int height)
-+    {
-+        using std::swap;
-+
-+        for (int y = 0; y < height; y++)
-+        {
-+            for (int x = 0; x < width; x++)
-+            {
-+                swap(data[0], data[2]);
-+                data += 4;
-+            }
-+        }
-+    }
-+}
-+
- ///
- /// @brief Constructs a new PDFDocument object.
- ///
-@@ -650,6 +669,7 @@ PDFDocument::renderPage (gint pageNum)
-         poppler_page_render (page, context);
-         cairo_destroy(context);
-         cairo_surface_destroy (surface);
-+        convert_bgra_to_rgba(renderedPage->getData (), width, height);
- #else // !HAVE_POPPLER_0_17_0
-         // Create the pixbuf from the data and render to it.
-         GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data (renderedPage->getData (),
--- 
-1.7.7
-
diff --git a/community/epdfview/PKGBUILD b/community/epdfview/PKGBUILD
deleted file mode 100644
index 81ab34ff6..000000000
--- a/community/epdfview/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 72969 2012-06-25 18:50:56Z foutrelis $
-# Maintainer: schuay <jakob.gruber@gmail.com>
-# Contributor: Tom K <tomk@runbox.com>
-# Contributor: Thayer Williams <thayer@archlinux.org>
-
-pkgname=epdfview
-pkgver=0.1.8
-pkgrel=4
-pkgdesc="A free lightweight PDF document viewer."
-url="http://www.emma-soft.com/projects/epdfview/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2')
-makedepends=('pkgconfig')
-install='epdfview.install'
-source=("http://www.emma-soft.com/projects/${pkgname}/chrome/site/releases/${pkgname}-${pkgver}.tar.bz2"
-        "${pkgname}.desktop.patch"
-        "glib2_headers.patch"
-        "0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np0 -i "${srcdir}/${pkgname}.desktop.patch"
-  patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch"
-  patch -Np1 -i "${srcdir}/glib2_headers.patch" # FS#30116
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  for size in 24 32 48; do
-      install -Dm644 data/icon_${pkgname}-${size}.png \
-          "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}.png"
-  done
-}
-
-md5sums=('e50285b01612169b2594fea375f53ae4'
-         'fbf22bbabdbb7544db615ac5775d57e2'
-         '2fffa9c7cd4c5f0744803591c2f162a3'
-         '7f9ea101a41f5b4e999fd024f423d41f')
diff --git a/community/epdfview/epdfview.desktop.patch b/community/epdfview/epdfview.desktop.patch
deleted file mode 100644
index d86fc3088..000000000
--- a/community/epdfview/epdfview.desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/epdfview.desktop.bak	2009-04-05 16:55:56.000000000 -0700
-+++ data/epdfview.desktop	2009-04-05 16:56:33.000000000 -0700
-@@ -7,7 +7,7 @@
- GenericName=PDF Viewer
- GenericName[ca]=Visor PDF
- GenericName[es]=Visor PDF
--Icon=icon_epdfview-48
-+Icon=epdfview
- Name=ePDFViewer
- Name[ca]=ePDFViewer
- Name[es]=ePDFViewer
diff --git a/community/epdfview/glib2_headers.patch b/community/epdfview/glib2_headers.patch
deleted file mode 100644
index e9f0983b5..000000000
--- a/community/epdfview/glib2_headers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h
-index c142a7a..58fcf2e 100644
---- a/src/gtk/StockIcons.h
-+++ b/src/gtk/StockIcons.h
-@@ -18,7 +18,7 @@
- #if !defined (__STOCK_ICONS_H__)
- #define __STOCK_ICONS_H__
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/community/erlang-cl/PKGBUILD b/community/erlang-cl/PKGBUILD
index ec9bcc128..bd40ff483 100644
--- a/community/erlang-cl/PKGBUILD
+++ b/community/erlang-cl/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=erlang-cl
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 arch=('x86_64' 'i686')
 pkgdesc='OpenCL binding for Erlang'
 url="http://github.com/tonyrog/cl"
@@ -13,21 +13,21 @@ depends=('erlang' 'libcl' 'bash')
 replaces=('cl')
 makedepends=('opencl-headers')
 source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/tonyrog/cl/tar.gz/master")
-sha256sums=('e2cb407489ebe1d8e8f287283eb5c715d559ce95255f6bbcac137cb84c500be6')
-_dirname='cl-master'
+sha256sums=('76991eba2418ced8e28f4237878e1ec8bb231193c614dab63623ff518b2dc56c')
 if [ "$CARCH" = "x86_64" ]
 then
   _wordsize=64
 else
   _wordsize=32
 fi
+_dirname='cl-master'
 
 build() {
   cd "$srcdir/$_dirname/c_src"
 
   make configure
-  ./configure --with-wordsize=$_wordsize --prefix=/usr
-  make all$_wordsize
+  ./configure --with-wordsize="$_wordsize" --prefix=/usr
+  make "all$_wordsize"
   rm config.*
 }
 
@@ -36,6 +36,7 @@ package() {
 
   mkdir -p "$pkgdir/usr/lib/erlang/lib/cl-$pkgver"
   cp -r * "$pkgdir/usr/lib/erlang/lib/cl-$pkgver"
+  install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD
index 921f8cc5b..899e1e02f 100644
--- a/community/erlang-nox/PKGBUILD
+++ b/community/erlang-nox/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80307 2012-11-19 19:18:28Z arodseth $
+# $Id: PKGBUILD 85253 2013-02-28 10:04:50Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Lukas Fleischer <archlinux@cryptocrack.de>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
@@ -7,30 +7,28 @@
 # Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
 
 pkgname=erlang-nox
-pkgver=R15B03_1
-pkgrel=2
+pkgver=R16B
+pkgrel=1
 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)'
 arch=('x86_64' 'i686')
 url='http://www.erlang.org/'
 license=('custom')
 depends=('ncurses' 'openssl')
+makedepends=('perl' 'lksctp-tools' 'unixodbc')
 provides=('erlang')
 conflicts=('erlang')
-makedepends=('perl' 'lksctp-tools')
-optdepends=('unixodbc: for database support'
+optdepends=('erlang-unixodbc: database support'
             'java-environment: for Java support'
             'lksctp-tools: for SCTP support')
 source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz"
         "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz")
-sha256sums=('4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c'
-            '07980d8014c7cf8194b7078c137353f5083992add4663ced3dcba2ff91f228d8')
+sha256sums=('f01c2cfe512d3118fd3398a66bdb82bea6ad0f45b464a46a58e452264b7682cd'
+            'f7b1baa088d4ecda4a86944d3a782fcbf80c6b9161756bb50fec9e8d129176b9')
 
 build() {
   cd "$srcdir/otp_src_${pkgver/_1/}"
 
-  msg2 'Configuring...'
   ./configure --prefix=/usr --enable-smp-support --with-odbc
-  msg2 'Compiling...'
   make
 }
 
@@ -39,19 +37,22 @@ package() {
 
   make DESTDIR="$pkgdir" install
 
-  # Install documentation
+  # Documentation
   install -d "$pkgdir/usr/share/doc/erlang"
   install -m0644 "$srcdir/otp_src_${pkgver/_1/}/README.md" \
     "$srcdir"/{README,COPYRIGHT} \
     "$pkgdir/usr/share/doc/erlang"
 
-  # Install compressed man pages
+  # Compressed man pages
   for page in "$srcdir/man/man?/*"; do gzip $page; done
   cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
 
-  # Install license
+  # License
   install -Dm0644 "$srcdir/otp_src_${pkgver/_1/}/EPLICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
+
+  # Remove files that are packaged as erlang-unixodbc
+  rm -r "$pkgdir/usr/lib/erlang/"{lib/odbc*,man/man3/odbc.3.gz}
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/erlang-sdl/PKGBUILD b/community/erlang-sdl/PKGBUILD
index 7a1fbd882..4482f52ef 100644
--- a/community/erlang-sdl/PKGBUILD
+++ b/community/erlang-sdl/PKGBUILD
@@ -1,38 +1,31 @@
-# $Id: PKGBUILD 80318 2012-11-19 22:01:23Z arodseth $
+# $Id: PKGBUILD 85602 2013-03-03 21:28:43Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: kappa <kappacurve@gmail.com>
 
 pkgname=erlang-sdl
 pkgver=1.2
-pkgrel=2
-arch=('x86_64' 'i686')
-pkgdesc='SDL and OpenGL bindings for Erlang (r15b-driver-compat branch)'
+pkgrel=7
+arch=('x86_64' 'i686' 'mips64el')
+pkgdesc='SDL and OpenGL bindings for Erlang'
 url='http://esdl.sourceforge.net/'
 license=('custom')
-depends=('erlang' 'sdl' 'glu')
+depends=('erlang' 'sdl' 'glu' 'libgl' 'erlang')
+makedepends=('mesa-libgl')
 replaces=('esdl')
-source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/esdl/tar.gz/dgud/r15b-driver-compat")
-sha256sums=('a14d695229b93401a304b773874e87c02c5b304d4b5b66f35cba75e140672086')
-_dirname='esdl-dgud-r15b-driver-compat'
+source=("$pkgname-$pkgver.tar.gz::https://github.com/dgud/esdl/archive/master.tar.gz")
+sha256sums=('6a18010e12eed2abeb9b9893a2d89586e3ff14b44fce9c15b8ed091b67709438')
 
 build() {
-  cd "$srcdir/$_dirname"
+  cd "$srcdir/esdl-master"
 
   find -type f -print0 | xargs -0 chmod 644
   make
 }
 
 package() {
-  cd "$srcdir/$_dirname"
+  cd "$srcdir/esdl-master"
 
   make INSTALLDIR="$pkgdir/usr/lib/erlang/lib/esdl-$pkgver" install
-
-  ## An attempt to make wings3d compile with esdl 1.2
-  #ln -s /usr/lib/erlang/lib/wx-0.99/include/glu.hrl \
-  #  "$pkgdir/usr/lib/erlang/lib/esdl-$pkgver/include/glu.hrl"
-  #ln -s /usr/lib/erlang/lib/wx-0.99/include/gl.hrl \
-  #  "$pkgdir/usr/lib/erlang/lib/esdl-$pkgver/include/gl.hrl"
-
   install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD
index 2cdfb1b27..5888021de 100644
--- a/community/erlang/PKGBUILD
+++ b/community/erlang/PKGBUILD
@@ -1,52 +1,72 @@
-# $Id: PKGBUILD 82512 2013-01-19 21:47:45Z arodseth $
-# Maintainer:  Lukas Fleischer <archlinux@cryptocrack.de>
+# $Id: PKGBUILD 87122 2013-03-27 15:53:26Z arodseth $
+# Maintainer: Lukas Fleischer <archlinux@cryptocrack.de>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com>
 # Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
 
-pkgname=erlang
-pkgver=R15B03_1
-pkgrel=2
-pkgdesc='General-purpose concurrent functional programming language developed by Ericsson'
-arch=(i686 x86_64 mips64el)
+pkgbase=erlang
+pkgname=('erlang' 'erlang-unixodbc')
+pkgver=R16B
+pkgrel=3
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.erlang.org/'
 license=('custom')
-depends=('ncurses' 'glu' 'wxgtk' 'openssl')
-makedepends=('perl' 'mesa' 'lksctp-tools')
-optdepends=('unixodbc: for database support'
-            'lksctp-tools: for SCTP support')
+makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk' 'wxgtk2.9')
 source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz"
         "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz")
-sha256sums=('4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c'
-            '07980d8014c7cf8194b7078c137353f5083992add4663ced3dcba2ff91f228d8')
+sha256sums=('f01c2cfe512d3118fd3398a66bdb82bea6ad0f45b464a46a58e452264b7682cd'
+            'f7b1baa088d4ecda4a86944d3a782fcbf80c6b9161756bb50fec9e8d129176b9')
 
 build() {
   cd "$srcdir/otp_src_${pkgver/_1/}"
 
-  msg2 'Configuring...'
   ./configure --prefix=/usr --enable-smp-support --with-odbc
-  msg2 'Compiling...'
   make
 }
 
-package() {
+package_erlang() {
+  pkgdesc='General-purpose concurrent functional programming language developed by Ericsson'
+  depends=('ncurses' 'glu' 'wxgtk' 'wxgtk2.9' 'openssl')
+  optdepends=('erlang-unixodbc: database support'
+              'java-environment: for Java support'
+              'lksctp-tools: for SCTP support')
+
   cd "$srcdir/otp_src_${pkgver/_1/}"
 
   make DESTDIR="$pkgdir" install
 
-  # Install documentation
+  # Documentation
   install -d "$pkgdir/usr/share/doc/erlang"
   install -m0644 "$srcdir/otp_src_${pkgver/_1/}/README.md" \
     "$srcdir"/{README,COPYRIGHT} \
     "$pkgdir/usr/share/doc/erlang"
 
-  # Install compressed man pages
+  # Compressed man pages
   for page in "$srcdir/man/man?/*"; do gzip $page; done
-  cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
+  cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang/"
+
+  # License
+  install -Dm0644 "$srcdir/otp_src_${pkgver/_1/}/EPLICENCE" \
+    "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
+
+  # Move over files that will be packaged as erlang-unixodbc
+  mkdir "$srcdir/unixodbc"
+  mv "$pkgdir/usr/lib/erlang/lib/odbc"* "$srcdir/unixodbc/"
+  mv "$pkgdir/usr/lib/erlang/man/man3/odbc.3.gz" "$srcdir"
+}
+
+package_erlang-unixodbc() {
+  pkgdesc='Unixodbc support for Erlang'
+  depends=('unixodbc' 'erlang')
+
+  # Get the files that should be packaged as erlang-unixodbc
+  mkdir -p "$pkgdir/usr/lib/erlang/"{lib,man/man3}
+  mv "$srcdir/unixodbc/"* "$pkgdir/usr/lib/erlang/lib/"
+  mv "$srcdir/odbc.3.gz" "$pkgdir/usr/lib/erlang/man/man3/"
 
-  # Install license
+  # License
   install -Dm0644 "$srcdir/otp_src_${pkgver/_1/}/EPLICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
 }
diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD
index 68ae89717..e8646e4d6 100644
--- a/community/ettercap/PKGBUILD
+++ b/community/ettercap/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 80196 2012-11-17 14:33:46Z jelle $
+# $Id: PKGBUILD 88226 2013-04-14 19:02:25Z jelle $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=ettercap
 pkgname=('ettercap' 'ettercap-gtk')
-pkgver=0.7.5
+pkgver=0.7.6
 pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ettercap.github.com/ettercap/"
 license=('GPL')
+depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
 makedepends=('ghostscript' 'cmake' 'libpcap' 'libltdl' 'libnet' 'gtk2')
 options=('!libtool' '!makeflags' '!emptydirs')
-source=("https://github.com/downloads/Ettercap/$pkgbase/$pkgbase-$pkgver.tar.gz" "ettercap.desktop")
-md5sums=('ab2354bf9c91195f06ad0b5d058565a4')
-
+source=("https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz" "ettercap.desktop" "org.archlinux.pkexec.ettercap.policy")
+md5sums=('7c5f5e1fd4002afdfd13765ef92866e1'
+         '51ae9f08e37a0621b3caeedb8e4d47d7'
+         '473867a0ee6da9cfb048b3d332c3d71f')
 build() {
   cd "${srcdir}"
 
@@ -22,31 +24,50 @@ build() {
   cd ${pkgbase}-${pkgver}
   mkdir build
   cd build
-  cmake -D ENABLE_GTK=ON -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../
+  cmake -D ENABLE_GTK=OFF -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../
   make
 
   cd "$srcdir"/${pkgbase}-${pkgver}-gtk
   mkdir build
   cd build
-  cmake -D ENABLE_GTK=ON -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../
+  cmake -D ENABLE_GTK=ON -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../
   make
 }
 
 package_ettercap() {
   pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
-  depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
-  backup=('etc/etter.conf')
+  backup=('etc/ettercap/etter.conf')
+  conflicts=('ettercap-gtk')
 
   cd "${srcdir}"/${pkgbase}-${pkgver}/build
   make DESTDIR="${pkgdir}" install
 }
 
 package_ettercap-gtk() {
-  pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK"
-  depends=('ettercap' 'gtk2')
+  pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK frontend"
+  depends+=('gtk2' 'polkit')
+  backup=('etc/ettercap/etter.conf')
+  conflicts=('ettercap')
+  provides=('ettercap')
+  optdepends=('polkit-gnome')
+  install='ettercap-gtk.install'
 
+  install -d $pkgdir/usr/share/polkit-1/actions/
   cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build
-  install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop"
+  install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg"
+
+  # Install policy file
+  install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy"
+
+  # We need rename the original script
+  mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf"
+
+  # Install launcher script
+  echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap
+  echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap
+  chmod 755 ${pkgdir}/usr/bin/ettercap
+
 }
-md5sums=('037b28cd94efa086a795060fc0f76080'
-         'f9281fe1735ceba59753bfe442715bb6')
diff --git a/community/ettercap/ettercap-gtk.install b/community/ettercap/ettercap-gtk.install
index 0b09f5904..e8f6bed8f 100644
--- a/community/ettercap/ettercap-gtk.install
+++ b/community/ettercap/ettercap-gtk.install
@@ -1,10 +1,14 @@
 post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  echo 'If you use a lightweight windowmanager, remember to run'
+  echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable'
+  echo 'graphical authentication, which may be needed for pkexec to work.'
 }
 
 post_upgrade() {
-  post_install
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_remove() {
-  post_install
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
diff --git a/community/ettercap/ettercap.desktop b/community/ettercap/ettercap.desktop
index e2345d91a..71f8c8ce8 100644
--- a/community/ettercap/ettercap.desktop
+++ b/community/ettercap/ettercap.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Ettercap
 Comment=Nework sniffer/analyser
-Exec=ettercap-gtk
+Exec=ettercap -G
 Icon=ettercap
 Terminal=false
 Type=Application
diff --git a/community/ettercap/org.archlinux.pkexec.ettercap.policy b/community/ettercap/org.archlinux.pkexec.ettercap.policy
new file mode 100644
index 000000000..7908d7232
--- /dev/null
+++ b/community/ettercap/org.archlinux.pkexec.ettercap.policy
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <action id="org.archlinux.pkexec.ettercap">
+    <message>Authentication is required to run Ettercap</message>
+    <icon_name>ettercap</icon_name>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/ettercap.elf</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+
+</policyconfig>
diff --git a/community/evilwm/PKGBUILD b/community/evilwm/PKGBUILD
index 1ac5b6205..3b7c0784c 100644
--- a/community/evilwm/PKGBUILD
+++ b/community/evilwm/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 83062 2013-01-27 09:45:44Z andrea $
+# $Id$
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=evilwm
 pkgver=1.1.0
-pkgrel=1
+pkgrel=1.2
 pkgdesc="A minimalist but usable window manager for the X Window System."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://evilwm.sourceforge.net"
 license=('custom')
 depends=('libxrandr')
diff --git a/community/expac/PKGBUILD b/community/expac/PKGBUILD
index 2dd454fff..524669022 100644
--- a/community/expac/PKGBUILD
+++ b/community/expac/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 80201 2012-11-17 15:05:30Z dreisner $
+# $Id: PKGBUILD 87648 2013-04-05 00:19:21Z dreisner $
 # Maintainer: Dave Reisner <d@falconindy.com>
 
 pkgname=expac
-pkgver=1
-pkgrel=2
+pkgver=2
+pkgrel=1
 pkgdesc="pacman database extraction utility"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://github.com/falconindy/expac"
 license=('GPL')
 depends=('pacman')
 makedepends=('perl')
-source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('be8348f18e6af9db250437b14a91e443')
+source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('41a65f51009e44689bd5320f5c3aa7d4'
+         'SKIP')
 
 build() {
   make -C "$pkgname-$pkgver"
diff --git a/community/ext3grep/PKGBUILD b/community/ext3grep/PKGBUILD
index f7056634d..69758612c 100644
--- a/community/ext3grep/PKGBUILD
+++ b/community/ext3grep/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=ext3grep
 pkgver=0.10.2
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A tool to investigate an ext3 file system for deleted content and possibly recover it"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/ext3grep/"
diff --git a/community/extremetuxracer/PKGBUILD b/community/extremetuxracer/PKGBUILD
index a13168cf5..70c54b5ab 100644
--- a/community/extremetuxracer/PKGBUILD
+++ b/community/extremetuxracer/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 pkgname=extremetuxracer
 pkgver=0.4
-pkgrel=5
+pkgrel=5.1
 pkgdesc="Downhill racing game starring Tux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.extremetuxracer.com"
diff --git a/community/extundelete/extundelete-build.patch b/community/extundelete/extundelete-build.patch
deleted file mode 100644
index f068dc31f..000000000
--- a/community/extundelete/extundelete-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ruN1 extundelete-0.2.0-orig/src/extundelete.cc extundelete-0.2.0/src/extundelete.cc
---- extundelete-0.2.0-orig/src/extundelete.cc	2010-05-16 03:51:15.000000000 +0200
-+++ extundelete-0.2.0/src/extundelete.cc	2012-02-26 16:49:20.000000000 +0100
-@@ -943,3 +943,3 @@
- 	{
--		group_descriptor_table[n] = fs->group_desc[n];
-+		group_descriptor_table[n] = *ext2fs_group_desc(fs, fs->group_desc, n);
- 	}
-@@ -2613,3 +2613,4 @@
- 	inode->osd2.linux2.l_i_gid_high = le16_to_cpu( (uint16_t *) &inodebuf[item*60] );
--	inode->osd2.linux2.l_i_reserved2 = le32_to_cpu( (uint32_t *) &inodebuf[item*62] );
-+	inode->osd2.linux2.l_i_checksum_lo = le16_to_cpu( (uint16_t *) &inodebuf[item*62] );
-+	inode->osd2.linux2.l_i_reserved = le16_to_cpu( (uint16_t *) &inodebuf[item*63] );
- }
-diff -ruN1 extundelete-0.2.0-orig/src/insertionops.cc extundelete-0.2.0/src/insertionops.cc
---- extundelete-0.2.0-orig/src/insertionops.cc	2010-03-21 07:05:15.000000000 +0100
-+++ extundelete-0.2.0/src/insertionops.cc	2012-02-26 16:49:27.000000000 +0100
-@@ -65,3 +65,3 @@
-   os << "# Blocks per group: " << s_block->s_blocks_per_group << std::endl;
--  os << "# Fragments per group: " << s_block->s_frags_per_group << std::endl;
-+  os << "# Fragments per group: " << s_block->s_clusters_per_group << std::endl;
-   os << "# Inodes per group: " << s_block->s_inodes_per_group << std::endl;
diff --git a/community/f2fs-tools/PKGBUILD b/community/f2fs-tools/PKGBUILD
new file mode 100644
index 000000000..a089b0e35
--- /dev/null
+++ b/community/f2fs-tools/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Christian Hesse <mail@eworm.de>
+
+pkgname=f2fs-tools
+pkgver=1.1.0
+pkgrel=2
+pkgdesc="Tools for Flash-Friendly File System (F2FS)"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/f2fs-tools/"
+depends=('util-linux')
+license=('GPL')
+source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz')
+sha256sums=('c8cfb6895a0b3775f0df00a776fd451558739289684dd43f1fd75f876fa62867')
+
+build() {
+	cd "${pkgname}-${pkgver}"
+
+	autoreconf -fi
+	./configure --prefix=/usr
+	make
+}
+
+package() {
+	cd "${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}/" install
+}
+
diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD
index 5335f5678..6135df685 100644
--- a/community/fatrat/PKGBUILD
+++ b/community/fatrat/PKGBUILD
@@ -1,23 +1,30 @@
-# $Id: PKGBUILD 83247 2013-01-28 16:49:32Z stephane $
+# $Id: PKGBUILD 89533 2013-04-29 19:20:35Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=fatrat
 pkgver=1.2.0_beta2
-pkgrel=4
+pkgrel=7
 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fatrat.dolezel.info/"
 license=('GPL')
-depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion' 'qtwebkit')
-optdepends=('geoip: GeoIP support')
+depends=('gloox' 'libtorrent-rasterbar' 'pion' 'qtwebkit' 'curl')
+optdepends=('geoip: GeoIP support' 'java-runtime: Java plugins')
 makedepends=('boost' 'cmake' 'java-environment')
-source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.xz)
-md5sums=('ad823d2a81f0583316ece815b928c71b')
+source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.xz \
+        QTBUG-22829-workaround.diff pion-5.0.diff)
+md5sums=('ad823d2a81f0583316ece815b928c71b'
+         '9c017f227437b8a72e92219ee6d58578'
+         'd7d398e7b6415c0a81eb4960d8271997')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  . /etc/profile.d/jre.sh
-  . /etc/profile.d/jdk.sh
+  # workaround the moc bug (QTBUG-22829) with new boost
+  patch -Np1 < "$srcdir/QTBUG-22829-workaround.diff" || true
+  # fix help generation with qt4
+  sed -s 's|qcollectiongenerator|qcollectiongenerator-qt4|' -i CMakeLists.txt
+  # fix for the new pion
+  patch -Np1 < "$srcdir/pion-5.0.diff" || true
 
   cmake \
     -DWITH_EVERYTHING=ON \
diff --git a/community/fatrat/QTBUG-22829-workaround.diff b/community/fatrat/QTBUG-22829-workaround.diff
new file mode 100644
index 000000000..dc0ed0c3f
--- /dev/null
+++ b/community/fatrat/QTBUG-22829-workaround.diff
@@ -0,0 +1,12 @@
+diff -rup fatrat-1.2.0_beta2/CMakeLists.txt fatrat-1.2.0_beta2.new/CMakeLists.txt
+--- fatrat-1.2.0_beta2/CMakeLists.txt	2012-07-14 11:44:27.000000000 +0000
++++ fatrat-1.2.0_beta2.new/CMakeLists.txt	2013-03-25 16:21:03.143596960 +0000
+@@ -552,7 +552,7 @@ if(WITH_DOCUMENTATION)
+ 	)
+ endif(WITH_DOCUMENTATION)
+ 
+-qt4_wrap_cpp(fatrat_MOC_SRCS ${fatrat_MOC_HDRS})
++qt4_wrap_cpp(fatrat_MOC_SRCS ${fatrat_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
+ 
+ set(fatrat_RCS
+ 	gfx/resources.qrc
diff --git a/community/fatrat/pion-5.0.diff b/community/fatrat/pion-5.0.diff
new file mode 100644
index 000000000..ff84fb902
--- /dev/null
+++ b/community/fatrat/pion-5.0.diff
@@ -0,0 +1,1570 @@
+diff -rup fatrat-1.2.0_beta2/CMakeLists.txt fatrat-1.2.0_beta2.new/CMakeLists.txt
+--- fatrat-1.2.0_beta2/CMakeLists.txt	2012-07-14 12:44:27.000000000 +0100
++++ fatrat-1.2.0_beta2.new/CMakeLists.txt	2013-04-29 19:17:48.697623940 +0100
+@@ -148,19 +148,13 @@ if(WITH_DOCUMENTATION)
+ 	set(QT_USE_QTHELP TRUE)
+ endif(WITH_DOCUMENTATION)
+ if(WITH_WEBINTERFACE)
+-	pkg_check_modules(pion-net REQUIRED "pion-net >= 3.0.0")
++	pkg_check_modules(pion REQUIRED "pion >= 5.0.0")
+ 	
+-	if(pion-net_FOUND)
+-		include_directories(${pion-net_INCLUDE_DIRS})
+-		#message(STATUS "Pion libdir: ${pion-net_LIBDIR}")
+-		
+-		#FILE(GLOB pion_FileService "${pion-net_LIBDIR}/pion/plugins/FileService.*")
+-		#if(pion_FileService MATCHES "^$")
+-		#	message(FATAL_ERROR "Pion-net FileService plugin not found (libpion-net-plugins?) - ${pion_FileService}")
+-		#endif(pion_FileService MATCHES "^$")
+-	else(pion-net_FOUND)
+-		message(FATAL_ERROR "No pion-net library found")
+-	endif(pion-net_FOUND)
++	if(pion_FOUND)
++		include_directories(${pion_INCLUDE_DIRS})
++	else(pion_FOUND)
++		message(FATAL_ERROR "No pion library found")
++	endif(pion_FOUND)
+ endif(WITH_WEBINTERFACE)
+ 
+ #set(CMAKE_REQUIRED_INCLUDES "sys/types.h")
+@@ -570,9 +564,7 @@ ${fatrat_QRC_H} ${lrelease_outputs})
+ add_executable(fatrat-conf src/fatrat-conf.cpp)
+ 
+ # This used to be a workaround until it started causing the exact opposite... oh dear!
+-#STRING(REPLACE "-mt" "" pion-net_LIBRARIES "${pion-net_LIBRARIES}")
+-#message(STATUS ${pion-net_LIBRARIES})
+-target_link_libraries(fatrat -ldl -lpthread ${QT_LIBRARIES} ${libtorrent_LDFLAGS} ${gloox_LDFLAGS} ${curl_LDFLAGS} ${Boost_LIBRARIES} ${pion-net_LIBRARIES} ${QT_ADDITIONAL_LIBS} ${XATTR_LIBRARIES} -export-dynamic)
++target_link_libraries(fatrat -ldl -lpthread ${QT_LIBRARIES} ${libtorrent_LDFLAGS} ${gloox_LDFLAGS} ${curl_LDFLAGS} ${Boost_LIBRARIES} ${pion_LIBRARIES} ${QT_ADDITIONAL_LIBS} ${XATTR_LIBRARIES} -export-dynamic)
+ target_link_libraries(fatrat-conf ${QT_LIBRARIES})
+ 
+ set(fatrat_DEV_HEADERS
+Only in fatrat-1.2.0_beta2.new/: CMakeLists.txt.orig
+diff -rup fatrat-1.2.0_beta2/config.h.in fatrat-1.2.0_beta2.new/config.h.in
+--- fatrat-1.2.0_beta2/config.h.in	2012-07-14 12:44:27.000000000 +0100
++++ fatrat-1.2.0_beta2.new/config.h.in	2013-04-29 19:18:03.241412755 +0100
+@@ -13,7 +13,7 @@
+ #cmakedefine WITH_CXX0X
+ 
+ #ifdef WITH_WEBINTERFACE
+-#	define PION_NET_PLUGINS "${pion-net_LIBDIR}/pion/plugins"
++#	define PION_NET_PLUGINS "${pion_LIBDIR}/pion/plugins"
+ #endif
+ 
+ #cmakedefine ENABLE_FAKEDOWNLOAD
+diff -rup fatrat-1.2.0_beta2/src/remote/HttpService.cpp fatrat-1.2.0_beta2.new/src/remote/HttpService.cpp
+--- fatrat-1.2.0_beta2/src/remote/HttpService.cpp	2012-07-14 12:44:27.000000000 +0100
++++ fatrat-1.2.0_beta2.new/src/remote/HttpService.cpp	2013-04-29 19:17:17.076634049 +0100
+@@ -51,9 +51,8 @@ respects for all of the code used other
+ #include <QMultiMap>
+ #include <QProcess>
+ #include <QFile>
+-#include <pion/net/PionUser.hpp>
+-#include <pion/net/HTTPBasicAuth.hpp>
+-#include <pion/net/HTTPResponseWriter.hpp>
++#include <pion/http/basic_auth.hpp>
++#include <pion/http/response_writer.hpp>
+ #include <boost/filesystem/fstream.hpp>
+ #include "pion/FileService.hpp"
+ #include <cstdlib>
+@@ -63,7 +62,7 @@ respects for all of the code used other
+ #include <string.h>
+ #include <algorithm>
+ 
+-using namespace pion::net;
++using namespace pion::http;
+ 
+ extern QList<Queue*> g_queues;
+ extern QReadWriteLock g_queuesLock;
+@@ -172,16 +171,16 @@ void HttpService::applySettings()
+ 
+ void HttpService::setupAuth()
+ {
+-	pion::net::PionUserManagerPtr userManager(new pion::net::PionUserManager);
++	pion::user_manager_ptr userManager(new pion::user_manager);
+ 	QString password = getSettingsValue("remote/password").toString();
+ 
+-	m_auth_ptr = pion::net::HTTPAuthPtr( new pion::net::HTTPBasicAuth(userManager, "FatRat Web Interface") );
+-	m_server->setAuthentication(m_auth_ptr);
+-	m_auth_ptr->addRestrict("/");
+-
+-	m_auth_ptr->addUser("fatrat", password.toStdString());
+-	m_auth_ptr->addUser("admin", password.toStdString());
+-	m_auth_ptr->addUser("user", password.toStdString());
++	m_auth_ptr = pion::http::auth_ptr( new pion::http::basic_auth(userManager, "FatRat Web Interface") );
++	m_server->set_authentication(m_auth_ptr);
++	m_auth_ptr->add_restrict("/");
++
++	m_auth_ptr->add_user("fatrat", password.toStdString());
++	m_auth_ptr->add_user("admin", password.toStdString());
++	m_auth_ptr->add_user("user", password.toStdString());
+ }
+ 
+ void HttpService::setup()
+@@ -190,28 +189,30 @@ void HttpService::setup()
+ 	
+ 	try
+ 	{
+-		m_server = new pion::net::WebServer(m_port);
++		m_server = new pion::http::plugin_server(m_port);
+ 
+ 		setupAuth();
+ 		setupSSL();
+ 
+-		m_server->addService("/xmlrpc", new XmlRpcService);
+-		m_server->addService("/subclass", new SubclassService);
+-		m_server->addService("/log", new LogService);
+-		m_server->addService("/browse", new TransferTreeBrowserService);
+-		m_server->addService("/", new pion::plugins::FileService);
+-		m_server->setServiceOption("/", "directory", DATA_LOCATION "/data/remote");
+-		m_server->setServiceOption("/", "file", DATA_LOCATION "/data/remote/index.html");
+-		m_server->addService("/copyrights", new pion::plugins::FileService);
+-		m_server->setServiceOption("/copyrights", "file", DATA_LOCATION "/README");
+-		m_server->addService("/download", new TransferDownloadService);
+-		m_server->addService("/captcha", new CaptchaService);
++		m_server->add_service("/xmlrpc", new XmlRpcService);
++		m_server->add_service("/subclass", new SubclassService);
++		m_server->add_service("/log", new LogService);
++		m_server->add_service("/browse", new TransferTreeBrowserService);
++		m_server->add_service("/", new pion::plugins::FileService);
++		m_server->set_service_option("/", "directory", DATA_LOCATION "/data/remote");
++		m_server->set_service_option("/", "file", DATA_LOCATION "/data/remote/index.html");
++		m_server->add_service("/copyrights", new pion::plugins::FileService);
++		m_server->set_service_option("/copyrights", "file", DATA_LOCATION "/README");
++		m_server->add_service("/download", new TransferDownloadService);
++		m_server->add_service("/captcha", new CaptchaService);
+ 
+ 		m_server->start();
+ 		Logger::global()->enterLogMessage("HttpService", tr("Listening on port %1").arg(m_port));
++		std::cout << "Listening on port " << m_port << std::endl;
+ 	}
+ 	catch(const std::exception& e)
+ 	{
++		std::cerr << e.what() << std::endl;
+ 		Logger::global()->enterLogMessage("HttpService", tr("Failed to start: %1").arg(e.what()));
+ 	}
+ }
+@@ -225,29 +226,29 @@ void HttpService::setupSSL()
+ 		if (file.isEmpty() || !QFile::exists(file))
+ 		{
+ 			Logger::global()->enterLogMessage("HttpService", tr("SSL key file not found, disabling HTTPS"));
+-			m_server->setSSLFlag(false);
++			m_server->set_ssl_flag(false);
+ 			m_strSSLPem.clear();
+ 		}
+ 		else
+ 		{
+ 			Logger::global()->enterLogMessage("HttpService", tr("Loading a SSL key from %1").arg(file));
+ 			m_strSSLPem = file;
+-			m_server->setSSLKeyFile(file.toStdString());
+-			m_server->setSSLFlag(true);
++			m_server->set_ssl_key_file(file.toStdString());
++			m_server->set_ssl_flag(true);
+ 		}
+ 	}
+ 	else
+ 	{
+ 		Logger::global()->enterLogMessage("HttpService", tr("Running in plain HTTP mode"));
+-		m_server->setSSLFlag(false);
++		m_server->set_ssl_flag(false);
+ 		m_strSSLPem.clear();
+ 	}
+ }
+ 
+-void HttpService::LogService::operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn)
++void HttpService::LogService::operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn)
+ {
+-	HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn)));
+-	QString uuidTransfer = QString::fromStdString(getRelativeResource(request->getResource()));
++	pion::http::response_writer_ptr writer(pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn)));
++	QString uuidTransfer = QString::fromStdString(get_relative_resource(request->get_resource()));
+ 	QString data;
+ 
+ 	if (uuidTransfer.isEmpty())
+@@ -260,8 +261,8 @@ void HttpService::LogService::operator()
+ 
+ 		if (!q || !t)
+ 		{
+-			writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND);
+-			writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND);
++			writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_NOT_FOUND);
++			writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_NOT_FOUND);
+ 			writer->send();
+ 			return;
+ 		}
+@@ -272,16 +273,16 @@ void HttpService::LogService::operator()
+ 		g_queuesLock.unlock();
+ 	}
+ 
+-	writer->getResponse().addHeader("Content-Type", "text/plain");
++	writer->get_response().add_header("Content-Type", "text/plain");
+ 	writer->write(data.toStdString());
+ 	writer->send();
+ }
+ 
+-void HttpService::TransferTreeBrowserService::operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn)
++void HttpService::TransferTreeBrowserService::operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn)
+ {
+-	HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn)));
+-	QString uuidTransfer = QString::fromStdString(getRelativeResource(request->getResource()));
+-	QString path = QString::fromStdString(request->getQuery("path"));
++	pion::http::response_writer_ptr writer(pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn)));
++	QString uuidTransfer = QString::fromStdString(get_relative_resource(request->get_resource()));
++	QString path = QString::fromStdString(request->get_query("path"));
+ 
+ 	path = path.replace("+", " ");
+ 	path = QUrl::fromPercentEncoding(path.toUtf8());
+@@ -294,8 +295,8 @@ void HttpService::TransferTreeBrowserSer
+ 
+ 	if (path.contains("/..") || path.contains("../"))
+ 	{
+-		writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_FORBIDDEN);
+-		writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_FORBIDDEN);
++		writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_FORBIDDEN);
++		writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_FORBIDDEN);
+ 		writer->send();
+ 		return;
+ 	}
+@@ -304,8 +305,8 @@ void HttpService::TransferTreeBrowserSer
+ 
+ 	if (!q || !t)
+ 	{
+-		writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND);
+-		writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND);
++		writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_NOT_FOUND);
++		writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_NOT_FOUND);
+ 		writer->send();
+ 		return;
+ 	}
+@@ -320,8 +321,8 @@ void HttpService::TransferTreeBrowserSer
+ 
+ 	if (!dir.cd(path))
+ 	{
+-		writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND);
+-		writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND);
++		writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_NOT_FOUND);
++		writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_NOT_FOUND);
+ 		writer->send();
+ 		return;
+ 	}
+@@ -371,11 +372,11 @@ void HttpService::TransferTreeBrowserSer
+ 	writer->send();
+ }
+ 
+-void HttpService::TransferDownloadService::operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn)
++void HttpService::TransferDownloadService::operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn)
+ {
+-	HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn)));
+-	QString transfer = QString::fromStdString(request->getQuery("transfer"));
+-	QString path = QString::fromStdString(request->getQuery("path"));
++	pion::http::response_writer_ptr writer(pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn)));
++	QString transfer = QString::fromStdString(request->get_query("transfer"));
++	QString path = QString::fromStdString(request->get_query("path"));
+ 
+ 	path = path.replace("+", " ");
+ 	path = QUrl::fromPercentEncoding(path.toUtf8());
+@@ -387,8 +388,8 @@ void HttpService::TransferDownloadServic
+ 
+ 	if (path.contains("/..") || path.contains("../"))
+ 	{
+-		writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_FORBIDDEN);
+-		writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_FORBIDDEN);
++		writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_FORBIDDEN);
++		writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_FORBIDDEN);
+ 		writer->send();
+ 		return;
+ 	}
+@@ -397,8 +398,8 @@ void HttpService::TransferDownloadServic
+ 
+ 	if (!q || !t)
+ 	{
+-		writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND);
+-		writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND);
++		writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_NOT_FOUND);
++		writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_NOT_FOUND);
+ 		writer->send();
+ 		return;
+ 	}
+@@ -428,24 +429,24 @@ void HttpService::TransferDownloadServic
+ 	response_file.update();
+ 
+ 	pion::plugins::DiskFileSenderPtr sender_ptr(pion::plugins::DiskFileSender::create(response_file, request, tcp_conn, 8192));
+-	sender_ptr->getWriter()->getResponse().addHeader("Content-Disposition", disposition.toStdString());
++	sender_ptr->getWriter()->get_response().add_header("Content-Disposition", disposition.toStdString());
+ 
+ 	if (unsigned long long fileSize = response_file.getFileSize())
+ 	{
+ 		std::stringstream fileSizeStream;
+ 		fileSizeStream << fileSize;
+-		sender_ptr->getWriter()->getResponse().addHeader("Content-Length", fileSizeStream.str());
++		sender_ptr->getWriter()->get_response().add_header("Content-Length", fileSizeStream.str());
+ 	}
+ 
+ 	sender_ptr->send();
+ }
+ 
+-void HttpService::SubclassService::operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn)
++void HttpService::SubclassService::operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn)
+ {
+-	pion::net::HTTPResponseWriterPtr writer = HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn));
++	pion::http::response_writer_ptr writer = pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn));
+ 	HttpService::WriteBackImpl wb = HttpService::WriteBackImpl(writer);
+-	QString transfer = QString::fromStdString(request->getQuery("transfer"));
+-	QString method = QString::fromStdString(getRelativeResource(request->getResource()));
++	QString transfer = QString::fromStdString(request->get_query("transfer"));
++	QString method = QString::fromStdString(get_relative_resource(request->get_resource()));
+ 
+ 	Queue* q = 0;
+ 	Transfer* t = 0;
+@@ -460,15 +461,15 @@ void HttpService::SubclassService::opera
+ 			g_queuesLock.unlock();
+ 		}
+ 
+-		writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND);
+-		writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND);
++		writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_NOT_FOUND);
++		writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_NOT_FOUND);
+ 		writer->send();
+ 		return;
+ 	}
+ 
+ 	QMultiMap<QString,QString> map;
+-	pion::net::HTTPTypes::QueryParams params = request->getQueryParams();
+-	for (pion::net::HTTPTypes::QueryParams::iterator it = params.begin(); it != params.end(); it++)
++	pion::ihash_multimap params = request->get_queries();
++	for (pion::ihash_multimap::iterator it = params.begin(); it != params.end(); it++)
+ 	{
+ 		map.insert(QString::fromStdString(it->first), QString::fromStdString(it->second));
+ 	}
+@@ -481,7 +482,7 @@ void HttpService::SubclassService::opera
+ 	g_queuesLock.unlock();
+ }
+ 
+-HttpService::WriteBackImpl::WriteBackImpl(pion::net::HTTPResponseWriterPtr& writer)
++HttpService::WriteBackImpl::WriteBackImpl(pion::http::response_writer_ptr& writer)
+ 	: m_writer(writer)
+ {
+ 
+@@ -489,7 +490,7 @@ HttpService::WriteBackImpl::WriteBackImp
+ 
+ void HttpService::WriteBackImpl::writeNoCopy(void* data, size_t bytes)
+ {
+-	m_writer->writeNoCopy(data, bytes);
++	m_writer->write_no_copy(data, bytes);
+ }
+ 
+ void HttpService::WriteBackImpl::send()
+@@ -504,13 +505,13 @@ void HttpService::WriteBackImpl::write(c
+ 
+ void HttpService::WriteBackImpl::setContentType(const char* type)
+ {
+-	m_writer->getResponse().addHeader("Content-Type", type);
++	m_writer->get_response().add_header("Content-Type", type);
+ }
+ 
+ void HttpService::WriteBackImpl::writeFail(QString error)
+ {
+-	m_writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND);
+-	m_writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND);
++	m_writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_NOT_FOUND);
++	m_writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_NOT_FOUND);
+ }
+ 
+ int HttpService::findTransfer(QString transferUUID, Queue** q, Transfer** t, bool lockForWrite)
+@@ -601,9 +602,9 @@ QVariant HttpService::generateCertificat
+ 
+ 
+ /*
+-void HttpService::CaptchaService::operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn)
++void HttpService::CaptchaService::operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn)
+ {
+-	m_cap.writer = HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn));
++	m_cap.writer = pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn));
+ 
+ 	std::string upgrade, connection;
+ 	upgrade = request->getHeader("Upgrade");
+@@ -616,8 +617,8 @@ void HttpService::CaptchaService::operat
+ 
+ 	if (connection != "upgrade" || upgrade != "websocket" || m_cap.key1.empty() || m_cap.key2.empty())
+ 	{
+-		m_cap.writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_BAD_REQUEST);
+-		m_cap.writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_BAD_REQUEST);
++		m_cap.writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_BAD_REQUEST);
++		m_cap.writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_BAD_REQUEST);
+ 		m_cap.writer->send();
+ 	}
+ 
+@@ -668,30 +669,30 @@ void HttpService::CaptchaService::CapSer
+ 
+ */
+ 
+-void HttpService::CaptchaHttpResponseWriter::handleWrite(const boost::system::error_code &write_error, std::size_t bytes_written)
++void HttpService::CaptchaHttpResponseWriter::handle_write(const boost::system::error_code &write_error, std::size_t bytes_written)
+ {
+ 	if (!bytes_written)
+ 	{
+ 		// TODO: handle errors
+ 		HttpService::instance()->removeCaptchaClient(client);
+-		sendFinalChunk();
++		send_final_chunk();
+ 		delete client;
+ 	}
+ 
+-	pion::net::HTTPResponseWriter::handleWrite(write_error, bytes_written);
++	pion::http::response_writer::handle_write(write_error, bytes_written);
+ }
+ 
+-void HttpService::CaptchaService::operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn)
++void HttpService::CaptchaService::operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn)
+ {
+-	if (request->hasQuery("id"))
++	if (request->has_query("id"))
+ 	{
+-		QString id = QString::fromStdString(request->getQuery("id"));
+-		QString solution = QString::fromStdString(request->getQuery("solution"));
++		QString id = QString::fromStdString(request->get_query("id"));
++		QString solution = QString::fromStdString(request->get_query("solution"));
+ 
+ 		int iid = id.toInt();
+ 		HttpService::instance()->m_captchaHttp.captchaEntered(iid, solution);
+ 
+-		pion::net::HTTPResponseWriterPtr writer = HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn));
++		pion::http::response_writer_ptr writer = pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn));
+ 		writer->send();
+ 	}
+ 	else
+@@ -709,13 +710,13 @@ void HttpService::CaptchaService::operat
+ 		RegisteredClient* client = new RegisteredClient;
+ 
+ 		client->writer = CaptchaHttpResponseWriter::create(client, tcp_conn, *request,
+-								   boost::bind(&TCPConnection::finish, tcp_conn));
++								   boost::bind(&pion::tcp::connection::finish, tcp_conn));
+ 		HttpService::instance()->addCaptchaClient(client);
+ 
+-		client->writer->getResponse().addHeader("Content-Type", "text/event-stream");
+-		client->writer->getResponse().addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0");
+-		client->writer->getResponse().addHeader("Expires", "Tue, 03 Jul 2001 06:00:00 GMT");
+-		client->writer->getResponse().addHeader("Pragma", "no-cache");
++		client->writer->get_response().add_header("Content-Type", "text/event-stream");
++		client->writer->get_response().add_header("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0");
++		client->writer->get_response().add_header("Expires", "Tue, 03 Jul 2001 06:00:00 GMT");
++		client->writer->get_response().add_header("Pragma", "no-cache");
+ 	}
+ }
+ 
+@@ -747,7 +748,7 @@ void HttpService::RegisteredClient::push
+ 		writer->clear();
+ 
+ 		writer->write(buf.data(), buf.length());
+-		writer->sendChunk(boost::bind(&HttpService::RegisteredClient::finished, this));
++		writer->send_chunk(boost::bind(&HttpService::RegisteredClient::finished, this));
+ 	}
+ 	else
+ 		writeInProgressLock.unlock();
+@@ -760,7 +761,7 @@ void HttpService::RegisteredClient::keep
+ 
+ 	writer->clear();
+ 	writer->write(": keepalive\r\n\r\n");
+-	writer->sendChunk(boost::bind(&HttpService::RegisteredClient::finished, this));
++	writer->send_chunk(boost::bind(&HttpService::RegisteredClient::finished, this));
+ }
+ 
+ void HttpService::addCaptchaEvent(int id, QString url)
+@@ -803,5 +804,5 @@ void HttpService::keepalive()
+ 
+ void HttpService::RegisteredClient::terminate()
+ {
+-	writer->getTCPConnection()->finish();
++	writer->get_connection()->finish();
+ }
+diff -rup fatrat-1.2.0_beta2/src/remote/HttpService.h fatrat-1.2.0_beta2.new/src/remote/HttpService.h
+--- fatrat-1.2.0_beta2/src/remote/HttpService.h	2012-07-14 12:44:27.000000000 +0100
++++ fatrat-1.2.0_beta2.new/src/remote/HttpService.h	2013-04-29 19:17:17.076634049 +0100
+@@ -40,7 +40,8 @@ respects for all of the code used other
+ #include <ctime>
+ #include <openssl/ssl.h>
+ #include <boost/system/system_error.hpp>
+-#include <pion/net/HTTPResponseWriter.hpp>
++#include <pion/http/plugin_server.hpp>
++#include <pion/http/response_writer.hpp>
+ #include "captcha/CaptchaHttp.h"
+ #include "remote/TransferHttpService.h"
+ 
+@@ -48,7 +49,8 @@ respects for all of the code used other
+ #	error This file is not supposed to be included!
+ #endif
+ 
+-#include <pion/net/WebServer.hpp>
++#include <pion/http/server.hpp>
++#include <pion/http/plugin_service.hpp>
+ 
+ class Queue;
+ class Transfer;
+@@ -83,8 +85,8 @@ private:
+ 	void killCaptchaClients();
+ private:
+ 	static HttpService* m_instance;
+-	pion::net::WebServer* m_server;
+-	pion::net::HTTPAuthPtr m_auth_ptr;
++	pion::http::plugin_server* m_server;
++	pion::http::auth_ptr m_auth_ptr;
+ 	CaptchaHttp m_captchaHttp;
+ 	quint16 m_port;
+ 	QString m_strSSLPem;
+@@ -94,27 +96,27 @@ private:
+ 	QList<RegisteredClient*> m_registeredCaptchaClients;
+ 	QMutex m_registeredCaptchaClientsMutex;
+ 
+-	class LogService : public pion::net::WebService
++	class LogService : public pion::http::plugin_service
+ 	{
+-		void operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn);
++		void operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn);
+ 	};
+-	class TransferTreeBrowserService : public pion::net::WebService
++	class TransferTreeBrowserService : public pion::http::plugin_service
+ 	{
+-		void operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn);
++		void operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn);
+ 	};
+-	class TransferDownloadService : public pion::net::WebService
++	class TransferDownloadService : public pion::http::plugin_service
+ 	{
+-		void operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn);
++		void operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn);
+ 	};
+-	class SubclassService : public pion::net::WebService
++	class SubclassService : public pion::http::plugin_service
+ 	{
+ 	public:
+-		void operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn);
++		void operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn);
+ 	};
+-	/*class CaptchaService : public pion::net::WebService
++	/*class CaptchaService : public pion::http::plugin_service
+ 	{
+ 	public:
+-		void operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn);
++		void operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn);
+ 	private:
+ 		class CapServCap
+ 		{
+@@ -126,15 +128,15 @@ private:
+ 			std::string key1, key2;
+ 			char sig[8];
+ 			int inbuf;
+-			pion::net::TCPConnectionPtr tcp_conn;
++			pion::tcp::connection_ptr tcp_conn;
+ 		} m_cap;
+ 	};*/
+ 
+ 	class CaptchaHttpResponseWriter;
+-	class CaptchaService : public pion::net::WebService
++	class CaptchaService : public pion::http::plugin_service
+ 	{
+ 	public:
+-		void operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn);
++		void operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn);
+ 	};
+ 	struct RegisteredClient
+ 	{
+@@ -151,16 +153,16 @@ private:
+ 		void terminate();
+ 	};
+ 
+-	class CaptchaHttpResponseWriter : public pion::net::HTTPResponseWriter
++	class CaptchaHttpResponseWriter : public pion::http::response_writer
+ 	{
+ 	public:
+-		CaptchaHttpResponseWriter(HttpService::RegisteredClient* cl, pion::net::TCPConnectionPtr &tcp_conn, const pion::net::HTTPRequest& request, FinishedHandler handler = FinishedHandler())
+-					      : pion::net::HTTPResponseWriter(tcp_conn, request, handler), client(cl)
++		CaptchaHttpResponseWriter(HttpService::RegisteredClient* cl, pion::tcp::connection_ptr &tcp_conn, const pion::http::request& request, finished_handler_t handler = finished_handler_t())
++					      : pion::http::response_writer(tcp_conn, request, handler), client(cl)
+ 		{
+ 
+ 		}
+ 
+-		static inline boost::shared_ptr<CaptchaHttpResponseWriter> create(HttpService::RegisteredClient* cl, pion::net::TCPConnectionPtr &tcp_conn, const pion::net::HTTPRequest& request, FinishedHandler handler = FinishedHandler())
++		static inline boost::shared_ptr<CaptchaHttpResponseWriter> create(HttpService::RegisteredClient* cl, pion::tcp::connection_ptr &tcp_conn, const pion::http::request& request, finished_handler_t handler = finished_handler_t())
+ 		{
+ 			return boost::shared_ptr<CaptchaHttpResponseWriter>(new CaptchaHttpResponseWriter(cl, tcp_conn, request, handler));
+ 		}
+@@ -171,7 +173,7 @@ private:
+ 			m_http_response->prepareBuffersForSend(write_buffers, getTCPConnection()->getKeepAlive(),
+ 							       sendingChunkedMessage());
+ 		}*/
+-		virtual void handleWrite(const boost::system::error_code &write_error, std::size_t bytes_written);
++		virtual void handle_write(const boost::system::error_code &write_error, std::size_t bytes_written);
+ 
+ 		HttpService::RegisteredClient* client;
+ 	};
+@@ -179,14 +181,14 @@ private:
+ 	class WriteBackImpl : public TransferHttpService::WriteBack
+ 	{
+ 	public:
+-		WriteBackImpl(pion::net::HTTPResponseWriterPtr& writer);
++		WriteBackImpl(pion::http::response_writer_ptr& writer);
+ 		void write(const char* data, size_t bytes);
+ 		void writeFail(QString error);
+ 		void writeNoCopy(void* data, size_t bytes);
+ 		void send();
+ 		void setContentType(const char* type);
+ 	private:
+-		pion::net::HTTPResponseWriterPtr m_writer;
++		pion::http::response_writer_ptr m_writer;
+ 	};
+ };
+ 
+diff -rup fatrat-1.2.0_beta2/src/remote/pion/FileService.cpp fatrat-1.2.0_beta2.new/src/remote/pion/FileService.cpp
+--- fatrat-1.2.0_beta2/src/remote/pion/FileService.cpp	2012-07-14 12:44:27.000000000 +0100
++++ fatrat-1.2.0_beta2.new/src/remote/pion/FileService.cpp	2013-04-29 19:17:17.079967487 +0100
+@@ -15,13 +15,14 @@
+ #include <boost/algorithm/string/case_conv.hpp>
+ 
+ #include "FileService.hpp"
+-#include <pion/PionPlugin.hpp>
+-#include <pion/net/HTTPResponseWriter.hpp>
++#include <pion/plugin.hpp>
++#include <pion/http/response_writer.hpp>
+ #include <sstream>
+ #include <QFileInfo>
+ 
+ using namespace pion;
+-using namespace pion::net;
++using namespace pion::http;
++using namespace pion::tcp;
+ 
+ namespace pion {		// begin namespace pion
+ namespace plugins {		// begin namespace plugins
+@@ -49,7 +50,7 @@ FileService::FileService(void)
+ 	m_writable(false)
+ {}
+ 
+-void FileService::setOption(const std::string& name, const std::string& value)
++void FileService::set_option(const std::string& name, const std::string& value)
+ {
+ 	if (name == "directory") {
+ 		m_directory = value;
+@@ -104,10 +105,10 @@ void FileService::setOption(const std::s
+ 	}
+ }
+ 
+-void FileService::operator()(HTTPRequestPtr& request, TCPConnectionPtr& tcp_conn)
++void FileService::operator()(request_ptr& request, connection_ptr& tcp_conn)
+ {
+ 	// get the relative resource path for the request
+-	const std::string relative_path(getRelativeResource(request->getResource()));
++	const std::string relative_path(get_relative_resource(request->get_resource()));
+ 
+ 	// determine the path of the file being requested
+ 	boost::filesystem::path file_path;
+@@ -117,7 +118,7 @@ void FileService::operator()(HTTPRequest
+ 		if (m_file.empty()) {
+ 			// no file is specified, either in the request or in the options
+ 			PION_LOG_WARN(m_logger, "No file option defined ("
+-						  << getResource() << ")");
++						  << get_resource() << ")");
+ 			sendNotFoundResponse(request, tcp_conn);
+ 			return;
+ 		} else {
+@@ -129,7 +130,7 @@ void FileService::operator()(HTTPRequest
+ 		if (m_directory.empty()) {
+ 			// no directory is specified for the relative file
+ 			PION_LOG_WARN(m_logger, "No directory option defined ("
+-						  << getResource() << "): " << relative_path);
++						  << get_resource() << "): " << relative_path);
+ 			sendNotFoundResponse(request, tcp_conn);
+ 			return;
+ 		} else {
+@@ -142,7 +143,7 @@ void FileService::operator()(HTTPRequest
+ 	std::string string = file_path.string();
+ 	if (string.find(m_directory.string()) != 0) {
+ 		PION_LOG_WARN(m_logger, "Request for file outside of directory ("
+-					  << getResource() << "): " << relative_path);
++					  << get_resource() << "): " << relative_path);
+ 		static const std::string FORBIDDEN_HTML_START =
+ 			"<html><head>\n"
+ 			"<title>403 Forbidden</title>\n"
+@@ -152,14 +153,14 @@ void FileService::operator()(HTTPRequest
+ 		static const std::string FORBIDDEN_HTML_FINISH =
+ 			" is not in the configured directory.</p>\n"
+ 			"</body></html>\n";
+-		HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request,
+-									 boost::bind(&TCPConnection::finish, tcp_conn)));
+-		writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_FORBIDDEN);
+-		writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_FORBIDDEN);
+-		if (request->getMethod() != HTTPTypes::REQUEST_METHOD_HEAD) {
+-			writer->writeNoCopy(FORBIDDEN_HTML_START);
+-			writer << request->getResource();
+-			writer->writeNoCopy(FORBIDDEN_HTML_FINISH);
++		response_writer_ptr writer(response_writer::create(tcp_conn, *request,
++									 boost::bind(&connection::finish, tcp_conn)));
++		writer->get_response().set_status_code(types::RESPONSE_CODE_FORBIDDEN);
++		writer->get_response().set_status_message(types::RESPONSE_MESSAGE_FORBIDDEN);
++		if (request->get_method() != types::REQUEST_METHOD_HEAD) {
++			writer->write_no_copy(FORBIDDEN_HTML_START);
++			writer << request->get_resource();
++			writer->write_no_copy(FORBIDDEN_HTML_FINISH);
+ 		}
+ 		writer->send();
+ 		return;
+@@ -168,7 +169,7 @@ void FileService::operator()(HTTPRequest
+ 	// requests specifying directories are not allowed
+ 	if (boost::filesystem::is_directory(file_path)) {
+ 		PION_LOG_WARN(m_logger, "Request for directory ("
+-					  << getResource() << "): " << relative_path);
++					  << get_resource() << "): " << relative_path);
+ 		static const std::string FORBIDDEN_HTML_START =
+ 			"<html><head>\n"
+ 			"<title>403 Forbidden</title>\n"
+@@ -178,21 +179,21 @@ void FileService::operator()(HTTPRequest
+ 		static const std::string FORBIDDEN_HTML_FINISH =
+ 			" is a directory.</p>\n"
+ 			"</body></html>\n";
+-		HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request,
+-									 boost::bind(&TCPConnection::finish, tcp_conn)));
+-		writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_FORBIDDEN);
+-		writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_FORBIDDEN);
+-		if (request->getMethod() != HTTPTypes::REQUEST_METHOD_HEAD) {
+-			writer->writeNoCopy(FORBIDDEN_HTML_START);
+-			writer << request->getResource();
+-			writer->writeNoCopy(FORBIDDEN_HTML_FINISH);
++		response_writer_ptr writer(response_writer::create(tcp_conn, *request,
++									 boost::bind(&connection::finish, tcp_conn)));
++		writer->get_response().set_status_code(types::RESPONSE_CODE_FORBIDDEN);
++		writer->get_response().set_status_message(types::RESPONSE_MESSAGE_FORBIDDEN);
++		if (request->get_method() != types::REQUEST_METHOD_HEAD) {
++			writer->write_no_copy(FORBIDDEN_HTML_START);
++			writer << request->get_resource();
++			writer->write_no_copy(FORBIDDEN_HTML_FINISH);
+ 		}
+ 		writer->send();
+ 		return;
+ 	}
+ 
+-	if (request->getMethod() == HTTPTypes::REQUEST_METHOD_GET 
+-		|| request->getMethod() == HTTPTypes::REQUEST_METHOD_HEAD)
++	if (request->get_method() == types::REQUEST_METHOD_GET 
++		|| request->get_method() == types::REQUEST_METHOD_HEAD)
+ 	{
+ 		// the type of response we will send
+ 		enum ResponseType {
+@@ -207,7 +208,7 @@ void FileService::operator()(HTTPRequest
+ 		DiskFile response_file;
+ 
+ 		// get the If-Modified-Since request header
+-		const std::string if_modified_since(request->getHeader(HTTPTypes::HEADER_IF_MODIFIED_SINCE));
++		const std::string if_modified_since(request->get_header(types::HEADER_IF_MODIFIED_SINCE));
+ 
+ 		// check the cache for a corresponding entry (if enabled)
+ 		// note that m_cache_setting may equal 0 if m_scan_setting == 1
+@@ -225,18 +226,18 @@ void FileService::operator()(HTTPRequest
+ 					// all requests must correspond with existing cache entries
+ 					// since no match was found, just return file not found
+ 					PION_LOG_WARN(m_logger, "Request for unknown file ("
+-								  << getResource() << "): " << relative_path);
++								  << get_resource() << "): " << relative_path);
+ 					response_type = RESPONSE_NOT_FOUND;
+ 				} else {
+ 					PION_LOG_DEBUG(m_logger, "No cache entry for request ("
+-								   << getResource() << "): " << relative_path);
++								   << get_resource() << "): " << relative_path);
+ 				}
+ 
+ 			} else {
+ 				// found an existing cache entry
+ 
+ 				PION_LOG_DEBUG(m_logger, "Found cache entry for request ("
+-							   << getResource() << "): " << relative_path);
++							   << get_resource() << "): " << relative_path);
+ 
+ 				if (m_cache_setting == 0) {
+ 					// cache is disabled
+@@ -253,12 +254,12 @@ void FileService::operator()(HTTPRequest
+ 						// no need to read the file; the modified times match!
+ 						response_type = RESPONSE_NOT_MODIFIED;
+ 					} else {
+-						if (request->getMethod() == HTTPTypes::REQUEST_METHOD_HEAD) {
++						if (request->get_method() == types::REQUEST_METHOD_HEAD) {
+ 							response_type = RESPONSE_HEAD_OK;
+ 						} else {
+ 							response_type = RESPONSE_OK;
+ 							PION_LOG_DEBUG(m_logger, "Cache disabled, reading file ("
+-										   << getResource() << "): " << relative_path);
++										   << get_resource() << "): " << relative_path);
+ 						}
+ 					}
+ 
+@@ -290,7 +291,7 @@ void FileService::operator()(HTTPRequest
+ 					// get the response type
+ 					if (cache_itr->second.getLastModifiedString() == if_modified_since) {
+ 						response_type = RESPONSE_NOT_MODIFIED;
+-					} else if (request->getMethod() == HTTPTypes::REQUEST_METHOD_HEAD) {
++					} else if (request->get_method() == types::REQUEST_METHOD_HEAD) {
+ 						response_type = RESPONSE_HEAD_OK;
+ 					} else {
+ 						response_type = RESPONSE_OK;
+@@ -301,7 +302,7 @@ void FileService::operator()(HTTPRequest
+ 
+ 					PION_LOG_DEBUG(m_logger, (cache_was_updated ? "Updated" : "Using")
+ 								   << " cache entry for request ("
+-								   << getResource() << "): " << relative_path);
++								   << get_resource() << "): " << relative_path);
+ 				}
+ 			}
+ 		}
+@@ -310,7 +311,7 @@ void FileService::operator()(HTTPRequest
+ 			// make sure that the file exists
+ 			if (! boost::filesystem::exists(file_path)) {
+ 				PION_LOG_WARN(m_logger, "File not found ("
+-							  << getResource() << "): " << relative_path);
++							  << get_resource() << "): " << relative_path);
+ 				sendNotFoundResponse(request, tcp_conn);
+ 				return;
+ 			}
+@@ -318,7 +319,7 @@ void FileService::operator()(HTTPRequest
+ 			response_file.setFilePath(file_path);
+ 
+ 			PION_LOG_DEBUG(m_logger, "Found file for request ("
+-						   << getResource() << "): " << relative_path);
++						   << get_resource() << "): " << relative_path);
+ 
+ 			// determine the MIME type
+ 			response_file.setMimeType(findMIMEType( response_file.getFilePath().string() ));
+@@ -330,7 +331,7 @@ void FileService::operator()(HTTPRequest
+ 			if (response_file.getLastModifiedString() == if_modified_since) {
+ 				// no need to read the file; the modified times match!
+ 				response_type = RESPONSE_NOT_MODIFIED;
+-			} else if (request->getMethod() == HTTPTypes::REQUEST_METHOD_HEAD) {
++			} else if (request->get_method() == types::REQUEST_METHOD_HEAD) {
+ 				response_type = RESPONSE_HEAD_OK;
+ 			} else {
+ 				response_type = RESPONSE_OK;
+@@ -341,7 +342,7 @@ void FileService::operator()(HTTPRequest
+ 					}
+ 					// add new entry to the cache
+ 					PION_LOG_DEBUG(m_logger, "Adding cache entry for request ("
+-								   << getResource() << "): " << relative_path);
++								   << get_resource() << "): " << relative_path);
+ 					boost::mutex::scoped_lock cache_lock(m_cache_mutex);
+ 					m_cache_map.insert( std::make_pair(relative_path, response_file) );
+ 				}
+@@ -360,43 +361,43 @@ void FileService::operator()(HTTPRequest
+ 			// sending headers only -> use our own response object
+ 
+ 			// prepare a response and set the Content-Type
+-			HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request,
+-										 boost::bind(&TCPConnection::finish, tcp_conn)));
+-			writer->getResponse().setContentType(response_file.getMimeType());
++			response_writer_ptr writer(response_writer::create(tcp_conn, *request,
++										 boost::bind(&connection::finish, tcp_conn)));
++			writer->get_response().set_content_type(response_file.getMimeType());
+ 
+ 			// set Last-Modified header to enable client-side caching
+-			writer->getResponse().addHeader(HTTPTypes::HEADER_LAST_MODIFIED,
++			writer->get_response().add_header(types::HEADER_LAST_MODIFIED,
+ 											response_file.getLastModifiedString());
+ 
+ 			std::stringstream out;
+ 			out << response_file.getFileSize();
+-			writer->getResponse().addHeader(HTTPTypes::HEADER_CONTENT_LENGTH, out.str());
++			writer->get_response().add_header(types::HEADER_CONTENT_LENGTH, out.str());
+ 
+ 			switch(response_type) {
+ 				case RESPONSE_UNDEFINED:
+ 				case RESPONSE_NOT_FOUND:
+ 				case RESPONSE_OK:
+ 					// this should never happen
+-					throw UndefinedResponseException(request->getResource());
++					throw UndefinedResponseException(request->get_resource());
+ 					break;
+ 				case RESPONSE_NOT_MODIFIED:
+ 					// set "Not Modified" response
+-					writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_MODIFIED);
+-					writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_MODIFIED);
++					writer->get_response().set_status_code(types::RESPONSE_CODE_NOT_MODIFIED);
++					writer->get_response().set_status_message(types::RESPONSE_MESSAGE_NOT_MODIFIED);
+ 					break;
+ 				case RESPONSE_HEAD_OK:
+ 					// set "OK" response (not really necessary since this is the default)
+-					writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_OK);
+-					writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_OK);
++					writer->get_response().set_status_code(types::RESPONSE_CODE_OK);
++					writer->get_response().set_status_message(types::RESPONSE_MESSAGE_OK);
+ 					break;
+ 			}
+ 
+ 			// send the response
+ 			writer->send();
+ 		}
+-	} else if (request->getMethod() == HTTPTypes::REQUEST_METHOD_POST
+-			   || request->getMethod() == HTTPTypes::REQUEST_METHOD_PUT
+-			   || request->getMethod() == HTTPTypes::REQUEST_METHOD_DELETE)
++	} else if (request->get_method() == types::REQUEST_METHOD_POST
++			   || request->get_method() == types::REQUEST_METHOD_PUT
++			   || request->get_method() == types::REQUEST_METHOD_DELETE)
+ 	{
+ 		// If not writable, then send 405 (Method Not Allowed) response for POST, PUT or DELETE requests.
+ 		if (!m_writable) {
+@@ -409,24 +410,24 @@ void FileService::operator()(HTTPRequest
+ 			static const std::string NOT_ALLOWED_HTML_FINISH =
+ 				" is not allowed on this server.</p>\n"
+ 				"</body></html>\n";
+-			HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request,
+-										 boost::bind(&TCPConnection::finish, tcp_conn)));
+-			writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_METHOD_NOT_ALLOWED);
+-			writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_METHOD_NOT_ALLOWED);
+-			writer->writeNoCopy(NOT_ALLOWED_HTML_START);
+-			writer << request->getMethod();
+-			writer->writeNoCopy(NOT_ALLOWED_HTML_FINISH);
+-			writer->getResponse().addHeader("Allow", "GET, HEAD");
++			response_writer_ptr writer(response_writer::create(tcp_conn, *request,
++										 boost::bind(&connection::finish, tcp_conn)));
++			writer->get_response().set_status_code(types::RESPONSE_CODE_METHOD_NOT_ALLOWED);
++			writer->get_response().set_status_message(types::RESPONSE_MESSAGE_METHOD_NOT_ALLOWED);
++			writer->write_no_copy(NOT_ALLOWED_HTML_START);
++			writer << request->get_method();
++			writer->write_no_copy(NOT_ALLOWED_HTML_FINISH);
++			writer->get_response().add_header("Allow", "GET, HEAD");
+ 			writer->send();
+ 		} else {
+-			HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request,
+-										 boost::bind(&TCPConnection::finish, tcp_conn)));
+-			if (request->getMethod() == HTTPTypes::REQUEST_METHOD_POST
+-				|| request->getMethod() == HTTPTypes::REQUEST_METHOD_PUT)
++			response_writer_ptr writer(response_writer::create(tcp_conn, *request,
++										 boost::bind(&connection::finish, tcp_conn)));
++			if (request->get_method() == types::REQUEST_METHOD_POST
++				|| request->get_method() == types::REQUEST_METHOD_PUT)
+ 			{
+ 				if (boost::filesystem::exists(file_path)) {
+-					writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NO_CONTENT);
+-					writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NO_CONTENT);
++					writer->get_response().set_status_code(types::RESPONSE_CODE_NO_CONTENT);
++					writer->get_response().set_status_message(types::RESPONSE_MESSAGE_NO_CONTENT);
+ 				} else {
+ 					// The file doesn't exist yet, so it will be created below, unless the
+ 					// directory of the requested file also doesn't exist.
+@@ -440,11 +441,11 @@ void FileService::operator()(HTTPRequest
+ 						static const std::string NOT_FOUND_HTML_FINISH =
+ 							" was not found on this server.</p>\n"
+ 							"</body></html>\n";
+-						writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND);
+-						writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND);
+-						writer->writeNoCopy(NOT_FOUND_HTML_START);
+-						writer << request->getResource();
+-						writer->writeNoCopy(NOT_FOUND_HTML_FINISH);
++						writer->get_response().set_status_code(types::RESPONSE_CODE_NOT_FOUND);
++						writer->get_response().set_status_message(types::RESPONSE_MESSAGE_NOT_FOUND);
++						writer->write_no_copy(NOT_FOUND_HTML_START);
++						writer << request->get_resource();
++						writer->write_no_copy(NOT_FOUND_HTML_FINISH);
+ 						writer->send();
+ 						return;
+ 					}
+@@ -457,17 +458,17 @@ void FileService::operator()(HTTPRequest
+ 					static const std::string CREATED_HTML_FINISH =
+ 						"</p>\n"
+ 						"</body></html>\n";
+-					writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_CREATED);
+-					writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_CREATED);
+-					writer->getResponse().addHeader(HTTPTypes::HEADER_LOCATION, request->getResource());
+-					writer->writeNoCopy(CREATED_HTML_START);
+-					writer << request->getResource();
+-					writer->writeNoCopy(CREATED_HTML_FINISH);
++					writer->get_response().set_status_code(types::RESPONSE_CODE_CREATED);
++					writer->get_response().set_status_message(types::RESPONSE_MESSAGE_CREATED);
++					writer->get_response().add_header(types::HEADER_LOCATION, request->get_resource());
++					writer->write_no_copy(CREATED_HTML_START);
++					writer << request->get_resource();
++					writer->write_no_copy(CREATED_HTML_FINISH);
+ 				}
+-				std::ios_base::openmode mode = request->getMethod() == HTTPTypes::REQUEST_METHOD_POST?
++				std::ios_base::openmode mode = request->get_method() == types::REQUEST_METHOD_POST?
+ 											   std::ios::app : std::ios::out;
+ 				boost::filesystem::ofstream file_stream(file_path, mode);
+-				file_stream.write(request->getContent(), request->getContentLength());
++				file_stream.write(request->get_content(), request->get_content_length());
+ 				file_stream.close();
+ 				if (!boost::filesystem::exists(file_path)) {
+ 					static const std::string PUT_FAILED_HTML_START =
+@@ -479,21 +480,21 @@ void FileService::operator()(HTTPRequest
+ 					static const std::string PUT_FAILED_HTML_FINISH =
+ 						".</p>\n"
+ 						"</body></html>\n";
+-					writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_SERVER_ERROR);
+-					writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_SERVER_ERROR);
+-					writer->writeNoCopy(PUT_FAILED_HTML_START);
+-					writer << request->getResource();
+-					writer->writeNoCopy(PUT_FAILED_HTML_FINISH);
++					writer->get_response().set_status_code(types::RESPONSE_CODE_SERVER_ERROR);
++					writer->get_response().set_status_message(types::RESPONSE_MESSAGE_SERVER_ERROR);
++					writer->write_no_copy(PUT_FAILED_HTML_START);
++					writer << request->get_resource();
++					writer->write_no_copy(PUT_FAILED_HTML_FINISH);
+ 				}
+ 				writer->send();
+-			} else if (request->getMethod() == HTTPTypes::REQUEST_METHOD_DELETE) {
++			} else if (request->get_method() == types::REQUEST_METHOD_DELETE) {
+ 				if (!boost::filesystem::exists(file_path)) {
+ 					sendNotFoundResponse(request, tcp_conn);
+ 				} else {
+ 					try {
+ 						boost::filesystem::remove(file_path);
+-						writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NO_CONTENT);
+-						writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NO_CONTENT);
++						writer->get_response().set_status_code(types::RESPONSE_CODE_NO_CONTENT);
++						writer->get_response().set_status_message(types::RESPONSE_MESSAGE_NO_CONTENT);
+ 						writer->send();
+ 					} catch (...) {
+ 						static const std::string DELETE_FAILED_HTML_START =
+@@ -505,18 +506,18 @@ void FileService::operator()(HTTPRequest
+ 						static const std::string DELETE_FAILED_HTML_FINISH =
+ 							".</p>\n"
+ 							"</body></html>\n";
+-						writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_SERVER_ERROR);
+-						writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_SERVER_ERROR);
+-						writer->writeNoCopy(DELETE_FAILED_HTML_START);
+-						writer << request->getResource();
+-						writer->writeNoCopy(DELETE_FAILED_HTML_FINISH);
++						writer->get_response().set_status_code(types::RESPONSE_CODE_SERVER_ERROR);
++						writer->get_response().set_status_message(types::RESPONSE_MESSAGE_SERVER_ERROR);
++						writer->write_no_copy(DELETE_FAILED_HTML_START);
++						writer << request->get_resource();
++						writer->write_no_copy(DELETE_FAILED_HTML_FINISH);
+ 						writer->send();
+ 					}
+ 				}
+ 			} else {
+ 				// This should never be reached.
+-				writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_SERVER_ERROR);
+-				writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_SERVER_ERROR);
++				writer->get_response().set_status_code(types::RESPONSE_CODE_SERVER_ERROR);
++				writer->get_response().set_status_message(types::RESPONSE_MESSAGE_SERVER_ERROR);
+ 				writer->send();
+ 			}
+ 		}
+@@ -532,19 +533,19 @@ void FileService::operator()(HTTPRequest
+ 		static const std::string NOT_IMPLEMENTED_HTML_FINISH =
+ 			" is not implemented on this server.</p>\n"
+ 			"</body></html>\n";
+-		HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request,
+-									 boost::bind(&TCPConnection::finish, tcp_conn)));
+-		writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_IMPLEMENTED);
+-		writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_IMPLEMENTED);
+-		writer->writeNoCopy(NOT_IMPLEMENTED_HTML_START);
+-		writer << request->getMethod();
+-		writer->writeNoCopy(NOT_IMPLEMENTED_HTML_FINISH);
++		response_writer_ptr writer(response_writer::create(tcp_conn, *request,
++									 boost::bind(&connection::finish, tcp_conn)));
++		writer->get_response().set_status_code(types::RESPONSE_CODE_NOT_IMPLEMENTED);
++		writer->get_response().set_status_message(types::RESPONSE_MESSAGE_NOT_IMPLEMENTED);
++		writer->write_no_copy(NOT_IMPLEMENTED_HTML_START);
++		writer << request->get_method();
++		writer->write_no_copy(NOT_IMPLEMENTED_HTML_FINISH);
+ 		writer->send();
+ 	}
+ }
+ 
+-void FileService::sendNotFoundResponse(HTTPRequestPtr& http_request,
+-									   TCPConnectionPtr& tcp_conn)
++void FileService::sendNotFoundResponse(request_ptr& http_request,
++									   connection_ptr& tcp_conn)
+ {
+ 	static const std::string NOT_FOUND_HTML_START =
+ 		"<html><head>\n"
+@@ -555,21 +556,21 @@ void FileService::sendNotFoundResponse(H
+ 	static const std::string NOT_FOUND_HTML_FINISH =
+ 		" was not found on this server.</p>\n"
+ 		"</body></html>\n";
+-	HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *http_request,
+-								 boost::bind(&TCPConnection::finish, tcp_conn)));
+-	writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND);
+-	writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND);
+-	if (http_request->getMethod() != HTTPTypes::REQUEST_METHOD_HEAD) {
+-		writer->writeNoCopy(NOT_FOUND_HTML_START);
+-		writer << http_request->getResource();
+-		writer->writeNoCopy(NOT_FOUND_HTML_FINISH);
++	response_writer_ptr writer(response_writer::create(tcp_conn, *http_request,
++								 boost::bind(&connection::finish, tcp_conn)));
++	writer->get_response().set_status_code(types::RESPONSE_CODE_NOT_FOUND);
++	writer->get_response().set_status_message(types::RESPONSE_MESSAGE_NOT_FOUND);
++	if (http_request->get_method() != types::REQUEST_METHOD_HEAD) {
++		writer->write_no_copy(NOT_FOUND_HTML_START);
++		writer << http_request->get_resource();
++		writer->write_no_copy(NOT_FOUND_HTML_FINISH);
+ 	}
+ 	writer->send();
+ }
+ 
+ void FileService::start(void)
+ {
+-	PION_LOG_DEBUG(m_logger, "Starting up resource (" << getResource() << ')');
++	PION_LOG_DEBUG(m_logger, "Starting up resource (" << get_resource() << ')');
+ 
+ 	// scan directory/file if scan setting != 0
+ 	if (m_scan_setting != 0) {
+@@ -594,7 +595,7 @@ void FileService::start(void)
+ 
+ void FileService::stop(void)
+ {
+-	PION_LOG_DEBUG(m_logger, "Shutting down resource (" << getResource() << ')');
++	PION_LOG_DEBUG(m_logger, "Shutting down resource (" << get_resource() << ')');
+ 	// clear cached files (if started again, it will re-scan)
+ 	boost::mutex::scoped_lock cache_lock(m_cache_mutex);
+ 	m_cache_map.clear();
+@@ -602,7 +603,7 @@ void FileService::stop(void)
+ 
+ void FileService::scanDirectory(const boost::filesystem::path& dir_path)
+ {
+-	PION_LOG_DEBUG(m_logger, "Scanning directory (" << getResource() << "): "
++	PION_LOG_DEBUG(m_logger, "Scanning directory (" << get_resource() << "): "
+ 				   << dir_path.string());
+ 
+ 	// iterate through items in the directory
+@@ -705,7 +706,7 @@ void DiskFile::update(void)
+ 	// set file_size and last_modified
+ 	m_file_size = QFileInfo(QString::fromStdString(m_file_path.string())).size();
+ 	m_last_modified = boost::filesystem::last_write_time( m_file_path );
+-	m_last_modified_string = HTTPTypes::get_date_string( m_last_modified );
++	m_last_modified_string = types::get_date_string( m_last_modified );
+ }
+ 
+ void DiskFile::read(void)
+@@ -737,7 +738,7 @@ bool DiskFile::checkUpdated(void)
+ 	// update file_size and last_modified timestamp
+ 	m_file_size = cur_size;
+ 	m_last_modified = cur_modified;
+-	m_last_modified_string = HTTPTypes::get_date_string( m_last_modified );
++	m_last_modified_string = types::get_date_string( m_last_modified );
+ 
+ 	// read new contents
+ 	read();
+@@ -748,11 +749,11 @@ bool DiskFile::checkUpdated(void)
+ 
+ // DiskFileSender member functions
+ 
+-DiskFileSender::DiskFileSender(DiskFile& file, pion::net::HTTPRequestPtr& request,
+-							   pion::net::TCPConnectionPtr& tcp_conn,
++DiskFileSender::DiskFileSender(DiskFile& file, pion::http::request_ptr& request,
++							   pion::tcp::connection_ptr& tcp_conn,
+ 							   unsigned long max_chunk_size)
+ 	: m_logger(PION_GET_LOGGER("pion.FileService.DiskFileSender")), m_disk_file(file),
+-	m_writer(pion::net::HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn))),
++	m_writer(pion::http::response_writer::create(tcp_conn, *request, boost::bind(&connection::finish, tcp_conn))),
+ 	m_max_chunk_size(max_chunk_size), m_file_bytes_to_send(0), m_bytes_sent(0)
+ {
+ 	PION_LOG_DEBUG(m_logger, "Preparing to send file"
+@@ -760,15 +761,15 @@ DiskFileSender::DiskFileSender(DiskFile&
+ 				   << m_disk_file.getFilePath().string());
+ 
+ 		// set the Content-Type HTTP header using the file's MIME type
+-	m_writer->getResponse().setContentType(m_disk_file.getMimeType());
++	m_writer->get_response().set_content_type(m_disk_file.getMimeType());
+ 
+ 	// set Last-Modified header to enable client-side caching
+-	m_writer->getResponse().addHeader(HTTPTypes::HEADER_LAST_MODIFIED,
++	m_writer->get_response().add_header(types::HEADER_LAST_MODIFIED,
+ 									  m_disk_file.getLastModifiedString());
+ 
+ 	// use "200 OK" HTTP response
+-	m_writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_OK);
+-	m_writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_OK);
++	m_writer->get_response().set_status_code(types::RESPONSE_CODE_OK);
++	m_writer->get_response().set_status_message(types::RESPONSE_MESSAGE_OK);
+ }
+ 
+ void DiskFileSender::send(void)
+@@ -827,13 +828,13 @@ void DiskFileSender::send(void)
+ 	}
+ 
+ 	// send the content
+-	m_writer->writeNoCopy(file_content_ptr, m_file_bytes_to_send);
++	m_writer->write_no_copy(file_content_ptr, m_file_bytes_to_send);
+ 
+ 	if (m_bytes_sent + m_file_bytes_to_send >= m_disk_file.getFileSize()) {
+ 		// this is the last piece of data to send
+ 		if (m_bytes_sent > 0) {
+ 			// send last chunk in a series
+-			m_writer->sendFinalChunk(boost::bind(&DiskFileSender::handleWrite,
++			m_writer->send_final_chunk(boost::bind(&DiskFileSender::handleWrite,
+ 												 shared_from_this(),
+ 												 boost::asio::placeholders::error,
+ 												 boost::asio::placeholders::bytes_transferred));
+@@ -846,7 +847,7 @@ void DiskFileSender::send(void)
+ 		}
+ 	} else {
+ 		// there will be more data -> send a chunk
+-		m_writer->sendChunk(boost::bind(&DiskFileSender::handleWrite,
++		m_writer->send_chunk(boost::bind(&DiskFileSender::handleWrite,
+ 										shared_from_this(),
+ 										boost::asio::placeholders::error,
+ 										boost::asio::placeholders::bytes_transferred));
+@@ -860,7 +861,7 @@ void DiskFileSender::handleWrite(const b
+ 
+ 	if (write_error) {
+ 		// encountered error sending response data
+-		m_writer->getTCPConnection()->setLifecycle(TCPConnection::LIFECYCLE_CLOSE);	// make sure it will get closed
++		m_writer->get_connection()->set_lifecycle(connection::LIFECYCLE_CLOSE);	// make sure it will get closed
+ 		PION_LOG_WARN(m_logger, "Error sending file (" << write_error.message() << ')');
+ 	} else {
+ 		// response data sent OK
+@@ -874,7 +875,7 @@ void DiskFileSender::handleWrite(const b
+ 			PION_LOG_DEBUG(m_logger, "Sent "
+ 						   << (m_file_bytes_to_send < m_disk_file.getFileSize() ? "file chunk" : "complete file")
+ 						   << " of " << m_file_bytes_to_send << " bytes (finished"
+-						   << (m_writer->getTCPConnection()->getKeepAlive() ? ", keeping alive)" : ", closing)") );
++						   << (m_writer->get_connection()->get_keep_alive() ? ", keeping alive)" : ", closing)") );
+ 		} else {
+ 			// NOT finished sending
+ 			PION_LOG_DEBUG(m_logger, "Sent file chunk of " << m_file_bytes_to_send << " bytes");
+@@ -884,10 +885,10 @@ void DiskFileSender::handleWrite(const b
+ 	}
+ 
+ 	if (finished_sending) {
+-		// TCPConnection::finish() calls TCPServer::finishConnection, which will either:
++		// connection::finish() calls TCPServer::finishConnection, which will either:
+ 		// a) call HTTPServer::handleConnection again if keep-alive is true; or,
+ 		// b) close the socket and remove it from the server's connection pool
+-		m_writer->getTCPConnection()->finish();
++		m_writer->get_connection()->finish();
+ 	} else {
+ 		send();
+ 	}
+@@ -897,7 +898,7 @@ void DiskFileSender::handleWrite(const b
+ }	// end namespace plugins
+ }	// end namespace pion
+ 
+-
++#if 0
+ /// creates new FileService objects
+ extern "C" PION_SERVICE_API pion::plugins::FileService *pion_create_FileService(void)
+ {
+@@ -909,3 +910,5 @@ extern "C" PION_SERVICE_API void pion_de
+ {
+ 	delete service_ptr;
+ }
++#endif
++
+diff -rup fatrat-1.2.0_beta2/src/remote/pion/FileService.hpp fatrat-1.2.0_beta2.new/src/remote/pion/FileService.hpp
+--- fatrat-1.2.0_beta2/src/remote/pion/FileService.hpp	2012-07-14 12:44:27.000000000 +0100
++++ fatrat-1.2.0_beta2.new/src/remote/pion/FileService.hpp	2013-04-29 19:17:17.079967487 +0100
+@@ -16,13 +16,13 @@
+ #include <boost/thread/once.hpp>
+ #include <boost/thread/mutex.hpp>
+ #include <boost/shared_array.hpp>
+-#include <pion/PionLogger.hpp>
+-#include <pion/PionException.hpp>
+-#include <pion/PionHashMap.hpp>
+-#include <pion/net/WebService.hpp>
+-#include <pion/net/HTTPRequest.hpp>
+-#include <pion/net/HTTPResponseWriter.hpp>
+-#include <pion/net/HTTPServer.hpp>
++#include <pion/logger.hpp>
++#include <pion/error.hpp>
++#include <pion/hash_map.hpp>
++#include <pion/http/plugin_service.hpp>
++#include <pion/http/request.hpp>
++#include <pion/http/response_writer.hpp>
++#include <pion/http/server.hpp>
+ #include <string>
+ #include <map>
+ 
+@@ -144,8 +144,8 @@ public:
+ 	 */
+ 	static inline boost::shared_ptr<DiskFileSender>
+ 		create(DiskFile& file,
+-			   pion::net::HTTPRequestPtr& request,
+-			   pion::net::TCPConnectionPtr& tcp_conn,
++			   pion::http::request_ptr& request,
++			   pion::tcp::connection_ptr& tcp_conn,
+ 			   unsigned long max_chunk_size = 0) 
+ 	{
+ 		return boost::shared_ptr<DiskFileSender>(new DiskFileSender(file, request,
+@@ -161,11 +161,11 @@ public:
+ 	void send(void);
+ 
+ 	/// sets the logger to be used
+-	inline void setLogger(PionLogger log_ptr) { m_logger = log_ptr; }
++	inline void setLogger(pion::logger log_ptr) { m_logger = log_ptr; }
+ 
+ 	/// returns the logger currently in use
+-	inline PionLogger getLogger(void) { return m_logger; }
+-	inline pion::net::HTTPResponseWriterPtr getWriter() { return m_writer; }
++	inline pion::logger getLogger(void) { return m_logger; }
++	inline pion::http::response_writer_ptr getWriter() { return m_writer; }
+ 
+ 
+ protected:
+@@ -179,8 +179,8 @@ protected:
+ 	 * @param max_chunk_size sets the maximum chunk size
+ 	 */
+ 	DiskFileSender(DiskFile& file,
+-				   pion::net::HTTPRequestPtr& request,
+-				   pion::net::TCPConnectionPtr& tcp_conn,
++				   pion::http::request_ptr& request,
++				   pion::tcp::connection_ptr& tcp_conn,
+ 				   unsigned long max_chunk_size);
+ 
+ 	/**
+@@ -194,7 +194,7 @@ protected:
+ 
+ 
+ 	/// primary logging interface used by this class
+-	PionLogger								m_logger;
++	pion::logger								m_logger;
+ 
+ 
+ private:
+@@ -203,7 +203,7 @@ private:
+ 	DiskFile								m_disk_file;
+ 
+ 	/// the HTTP response we are sending
+-	pion::net::HTTPResponseWriterPtr		m_writer;
++	pion::http::response_writer_ptr		m_writer;
+ 
+ 	/// used to read the file from disk if it is not already cached in memory
+ 	boost::filesystem::ifstream				m_file_stream;
+@@ -233,73 +233,78 @@ typedef boost::shared_ptr<DiskFileSender
+ /// FileService: web service that serves regular files
+ /// 
+ class FileService :
+-	public pion::net::WebService
++	public pion::http::plugin_service
+ {
+ public:
+ 
+ 	/// exception thrown if the directory configured is not found
+-	class DirectoryNotFoundException : public PionException {
++	class DirectoryNotFoundException : public pion::exception {
+ 	public:
+ 		DirectoryNotFoundException(const std::string& dir)
+-			: PionException("FileService directory not found: ", dir) {}
++			: pion::exception("FileService directory not found") {}
+ 	};
+ 
+ 	/// exception thrown if the directory configuration option is not a directory
+-	class NotADirectoryException : public PionException {
++	class NotADirectoryException : public pion::exception {
+ 	public:
+ 		NotADirectoryException(const std::string& dir)
+-			: PionException("FileService option is not a directory: ", dir) {}
++			: pion::exception("FileService option is not a directory") {}
+ 	};
+ 
+ 	/// exception thrown if the file configured is not found
+-	class FileNotFoundException : public PionException {
++	class FileNotFoundException : public pion::exception {
+ 	public:
+ 		FileNotFoundException(const std::string& file)
+-			: PionException("FileService file not found: ", file) {}
++			: pion::exception("FileService file not found") {}
+ 	};
+ 
+ 	/// exception thrown if the file configuration option is not a file
+-	class NotAFileException : public PionException {
++	class NotAFileException : public pion::exception {
+ 	public:
+ 		NotAFileException(const std::string& file)
+-			: PionException("FileService option is not a file: ", file) {}
++			: pion::exception("FileService option is not a file") {}
+ 	};
+ 
+ 	/// exception thrown if the cache option is set to an invalid value
+-	class InvalidCacheException : public PionException {
++	class InvalidCacheException : public pion::exception {
+ 	public:
+ 		InvalidCacheException(const std::string& value)
+-			: PionException("FileService invalid value for cache option: ", value) {}
++			: pion::exception("FileService invalid value for cache option") {}
+ 	};
+ 
+ 	/// exception thrown if the scan option is set to an invalid value
+-	class InvalidScanException : public PionException {
++	class InvalidScanException : public pion::exception {
+ 	public:
+ 		InvalidScanException(const std::string& value)
+-			: PionException("FileService invalid value for scan option: ", value) {}
++			: pion::exception("FileService invalid value for scan option") {}
+ 	};
+ 
+ 	/// exception thrown if an option is set to an invalid value
+-	class InvalidOptionValueException : public PionException {
++	class InvalidOptionValueException : public pion::exception {
+ 	public:
+ 		InvalidOptionValueException(const std::string& option, const std::string& value)
+-			: PionException("FileService invalid value for " + option + " option: ", value) {}
++			: pion::exception("FileService invalid value for " + option + " option") {}
+ 	};
+ 
+ 	/// exception thrown if we are unable to read a file from disk
+-	class FileReadException : public PionException {
++	class FileReadException : public pion::exception {
+ 	public:
+ 		FileReadException(const std::string& value)
+-			: PionException("FileService unable to read file: ", value) {}
++			: pion::exception("FileService unable to read file: "+value) {}
+ 	};
+ 
+ 	/// exception thrown if we do not know how to respond (should never happen)
+-	class UndefinedResponseException : public PionException {
++	class UndefinedResponseException : public pion::exception {
+ 	public:
+ 		UndefinedResponseException(const std::string& value)
+-			: PionException("FileService has an undefined response: ", value) {}
++			: pion::exception("FileService has an undefined response: "+value) {}
+ 	};
+ 
++	class UnknownOptionException : public pion::exception {
++	public:
++		UnknownOptionException(const std::string& value)
++			: pion::exception("FileService invalid option name: "+value) {}
++	};
+ 
+ 	// default constructor and destructor
+ 	FileService(void);
+@@ -315,11 +320,11 @@ public:
+ 	 * max_chunk_size:
+ 	 * writable:
+ 	 */
+-	virtual void setOption(const std::string& name, const std::string& value);
++	virtual void set_option(const std::string& name, const std::string& value);
+ 
+ 	/// handles requests for FileService
+-	virtual void operator()(pion::net::HTTPRequestPtr& request,
+-							pion::net::TCPConnectionPtr& tcp_conn);
++	virtual void operator()(pion::http::request_ptr& request,
++							pion::tcp::connection_ptr& tcp_conn);
+ 
+ 	/// called when the web service's server is starting
+ 	virtual void start(void);
+@@ -328,10 +333,10 @@ public:
+ 	virtual void stop(void);
+ 
+ 	/// sets the logger to be used
+-	inline void setLogger(PionLogger log_ptr) { m_logger = log_ptr; }
++	inline void setLogger(pion::logger log_ptr) { m_logger = log_ptr; }
+ 
+ 	/// returns the logger currently in use
+-	inline PionLogger getLogger(void) { return m_logger; }
++	inline pion::logger getLogger(void) { return m_logger; }
+ 
+ 
+ protected:
+@@ -372,11 +377,11 @@ protected:
+ 	 */
+ 	static std::string findMIMEType(const std::string& file_name);
+ 
+-	void sendNotFoundResponse(pion::net::HTTPRequestPtr& http_request,
+-							  pion::net::TCPConnectionPtr& tcp_conn);
++	void sendNotFoundResponse(pion::http::request_ptr& http_request,
++							  pion::tcp::connection_ptr& tcp_conn);
+ 
+ 	/// primary logging interface used by this class
+-	PionLogger					m_logger;
++	pion::logger					m_logger;
+ 
+ 
+ private:
+diff -rup fatrat-1.2.0_beta2/src/remote/XmlRpcService.cpp fatrat-1.2.0_beta2.new/src/remote/XmlRpcService.cpp
+--- fatrat-1.2.0_beta2/src/remote/XmlRpcService.cpp	2012-07-14 12:44:27.000000000 +0100
++++ fatrat-1.2.0_beta2.new/src/remote/XmlRpcService.cpp	2013-04-29 19:17:17.079967487 +0100
+@@ -37,10 +37,10 @@ respects for all of the code used other
+ #include <QStringList>
+ #include <QFileInfo>
+ #include <QTemporaryFile>
+-#include <pion/net/HTTPResponseWriter.hpp>
++#include <pion/http/response_writer.hpp>
+ #include <QtDebug>
+ 
+-using namespace pion::net;
++using namespace pion::http;
+ 
+ extern QList<Queue*> g_queues;
+ extern QReadWriteLock g_queuesLock;
+@@ -151,9 +151,9 @@ void XmlRpcService::globalInit()
+ 
+ }
+ 
+-void XmlRpcService::operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn)
++void XmlRpcService::operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn)
+ {
+-	if (request->getMethod() != pion::net::HTTPTypes::REQUEST_METHOD_POST)
++	if (request->get_method() != pion::http::types::REQUEST_METHOD_POST)
+ 	{
+ 		static const std::string NOT_ALLOWED_HTML_START =
+ 				"<html><head>\n"
+@@ -164,20 +164,20 @@ void XmlRpcService::operator()(pion::net
+ 		static const std::string NOT_ALLOWED_HTML_FINISH =
+ 				" is not allowed on this server.</p>\n"
+ 				"</body></html>\n";
+-		HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn)));
+-		writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_METHOD_NOT_ALLOWED);
+-		writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_METHOD_NOT_ALLOWED);
+-		writer->writeNoCopy(NOT_ALLOWED_HTML_START);
+-		writer << request->getMethod();
+-		writer->writeNoCopy(NOT_ALLOWED_HTML_FINISH);
+-		writer->getResponse().addHeader("Allow", "GET, HEAD");
++		pion::http::response_writer_ptr writer(pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn)));
++		writer->get_response().set_status_code(types::RESPONSE_CODE_METHOD_NOT_ALLOWED);
++		writer->get_response().set_status_message(types::RESPONSE_MESSAGE_METHOD_NOT_ALLOWED);
++		writer->write_no_copy(NOT_ALLOWED_HTML_START);
++		writer << request->get_method();
++		writer->write_no_copy(NOT_ALLOWED_HTML_FINISH);
++		writer->get_response().add_header("Allow", "GET, HEAD");
+ 		writer->send();
+ 		return;
+ 	}
+ 
+ 	QByteArray data;
+ 
+-	qDebug() << "XML-RPC call:" << request->getContent();
++	qDebug() << "XML-RPC call:" << request->get_content();
+ 
+ 	try
+ 	{
+@@ -185,7 +185,7 @@ void XmlRpcService::operator()(pion::net
+ 		QList<QVariant> args;
+ 		QVariant returnValue;
+ 
+-		XmlRpc::parseCall(request->getContent(), function, args);
++		XmlRpc::parseCall(request->get_content(), function, args);
+ 
+ 		if(function == "Queue.getTransfers")
+ 		{
+@@ -240,7 +240,7 @@ void XmlRpcService::operator()(pion::net
+ 		throw "400 Bad Request";
+ 	}
+ 
+-	HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn)));
++	pion::http::response_writer_ptr writer(pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn)));
+ 	writer->write(data.data(), data.size());
+ 	writer->send();
+ }
+diff -rup fatrat-1.2.0_beta2/src/remote/XmlRpcService.h fatrat-1.2.0_beta2.new/src/remote/XmlRpcService.h
+--- fatrat-1.2.0_beta2/src/remote/XmlRpcService.h	2012-07-14 12:44:27.000000000 +0100
++++ fatrat-1.2.0_beta2.new/src/remote/XmlRpcService.h	2013-04-29 19:17:17.079967487 +0100
+@@ -34,7 +34,8 @@ respects for all of the code used other
+ #include <QVariantMap>
+ #include <QQueue>
+ #include <QPair>
+-#include <pion/net/WebServer.hpp>
++#include <pion/http/server.hpp>
++#include <pion/http/plugin_service.hpp>
+ 
+ #ifndef WITH_WEBINTERFACE
+ #	error This file is not supposed to be included!
+@@ -43,12 +44,12 @@ respects for all of the code used other
+ class Queue;
+ class Transfer;
+ 
+-class XmlRpcService : public QObject, public pion::net::WebService
++class XmlRpcService : public QObject, public pion::http::plugin_service
+ {
+ Q_OBJECT
+ public:
+ 	XmlRpcService();
+-	void operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn);
++	void operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn);
+ 	static void globalInit();
+ 	static void registerFunction(QString name, QVariant (*func)(QList<QVariant>&), QVector<QVariant::Type> arguments);
+ 	static void deregisterFunction(QString name);
diff --git a/community/fbgrab/PKGBUILD b/community/fbgrab/PKGBUILD
index 16ff78eaa..088ba85e0 100644
--- a/community/fbgrab/PKGBUILD
+++ b/community/fbgrab/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=fbgrab
 pkgver=1.0
-pkgrel=6
+pkgrel=6.1
 pkgdesc="A framebuffer screenshot grabber"
 arch=(i686 x86_64 'mips64el')
 url="http://hem.bredband.net/gmogmo/fbgrab/"
diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD
index b6493861c..a555f65ac 100644
--- a/community/fbreader/PKGBUILD
+++ b/community/fbreader/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 80756 2012-12-03 10:06:37Z spupykin $
+# $Id: PKGBUILD 85342 2013-03-01 10:29:55Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=fbreader
 pkgver=0.99.4
-pkgrel=1
+pkgrel=2
 pkgdesc="An e-book reader for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fbreader.org/"
 license=('GPL')
-depends=('fribidi' 'bzip2' 'curl' 'qt' 'liblinebreak' 'sqlite')
+depends=('fribidi' 'bzip2' 'curl' 'qt4' 'liblinebreak' 'sqlite')
 makedepends=('ccache')
 source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz)
 md5sums=('ed13a9c3aeb68aaa98a1dd6f7947a31d')
@@ -19,8 +19,11 @@ build() {
   export UI_TYPE=qt4
   export TARGET_STATUS=release
   cd $srcdir/fbreader-$pkgver
-  sed -i 's|moc-qt4|moc|g' makefiles/arch/desktop.mk
   sed -i 's|-lunibreak|-llinebreak|g' makefiles/config.mk zlibrary/text/Makefile
-  make ZLSHARED=no
+  make ZLSHARED=no MOC=/usr/bin/moc-qt4
+}
+
+package() {
+  cd $srcdir/fbreader-$pkgver
   make ZLSHARED=no DESTDIR=$pkgdir install
 }
diff --git a/community/fbreader/build-fix.patch b/community/fbreader/build-fix.patch
deleted file mode 100644
index 7316464b8..000000000
--- a/community/fbreader/build-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- config.mk.orig	2010-02-23 18:22:10.000000000 +0000
-+++ config.mk	2010-02-28 13:55:11.000000000 +0000
-@@ -21,7 +21,7 @@
- ARCHIVER_LIBS ?= -lz -lbz2
- NETWORK_LIBS ?= -lcurl
- 
--CFLAGS += -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\"
-+CFLAGS += -I$(srcdir)/liblinebreak-20080321 -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\"
- ifeq "$(ZLSHARED)" "yes"
-   CFLAGS += -fPIC -DZLSHARED
- endif
-@@ -38,6 +38,8 @@
- 	LDFLAGS += -pg
- endif
- 
-+LDFLAGS += -L$(srcdir)/liblinebreak-20080321/DebugDir
-+
- ZINCLUDE = -I $(ROOTDIR)/zlibrary/core/include -I $(ROOTDIR)/zlibrary/text/include
- 
- ZLSHARED ?= yes
diff --git a/community/fbshot/PKGBUILD b/community/fbshot/PKGBUILD
deleted file mode 100644
index 3d52335d6..000000000
--- a/community/fbshot/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 63550 2012-02-05 11:55:26Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: sp42b <sp42b|a_t|gmx.net>
-
-pkgname=fbshot
-pkgver=0.3
-pkgrel=4
-pkgdesc="Takes screenshots (PNG) from your framebuffer device (e.g. console)."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.sfires.net/fbshot/"
-license=('GPL')
-depends=('libpng')
-source=(http://www.sfires.net/stuff/fbshot/$pkgname-$pkgver.tar.gz)
-md5sums=('2cc6cc25cdc4cd447a8b0a9662907635')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i '1,1i#include <zlib.h>' fbshot.c
-  make
-  install -Dm755 fbshot $pkgdir/usr/bin/fbshot
-  install -Dm644 fbshot.1.man $pkgdir/usr/share/man/man1/fbshot.1
-}
diff --git a/community/fbv/PKGBUILD b/community/fbv/PKGBUILD
index dcc9518c5..bb408ed0b 100644
--- a/community/fbv/PKGBUILD
+++ b/community/fbv/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=fbv
 pkgver=1.0b
-pkgrel=5
+pkgrel=5.1
 pkgdesc="FrameBuffer image viewer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://s-tech.elsat.net.pl/fbv/"
diff --git a/community/fceux/PKGBUILD b/community/fceux/PKGBUILD
index 08764250c..86ba33163 100644
--- a/community/fceux/PKGBUILD
+++ b/community/fceux/PKGBUILD
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD 83618 2013-02-03 23:24:07Z arodseth $
+# $Id: PKGBUILD 86026 2013-03-11 13:34:12Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contriutor: Eric Belanger <eric@archlinux.org>
 # Contributor: Jo Christian Bergskås <jcberg@gmail.com>
 
 pkgname=fceux
-pkgver=2.2.0
-pkgrel=2
+pkgver=2.2.1.1
+pkgrel=1
 url='http://www.fceux.com/'
 pkgdesc='Fast and ultra-compatible NES/Famicom emulator'
 arch=('x86_64' 'i686' 'mips64el')
 license=('GPL')
 depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils' 'lua51' 'libgl')
-makedepends=('scons' 'mesa' 'glu')
+makedepends=('scons' 'mesa-libgl' 'glu')
 optdepends=('xchm: for viewing the manual')
-install=$pkgname.install
-source=("https://sourceforge.net/projects/fceultra/files/Source%20Code/$pkgver%20src/$pkgname-$pkgver.src.tar.gz")
-sha256sums=('31ad7b478d5c0911a67a4eaeae9de915d44fc95844148a135114e27d7fd1a694')
+install="$pkgname.install"
+source=("https://downloads.sourceforge.net/project/fceultra/Source%20Code/2.2.1%20src/$pkgname-$pkgver.src.tar.gz")
+sha256sums=('afb0b3b8e1d2eea40c59777ef538b69b16164ae53c406106e541099534db828c')
 
 build() {
-  cd "$srcdir/$pkgname"
+  cd "$srcdir/$pkgname-$pkgver"
 
   msg2 'Compiling...'
   scons
 }
 
 package() {
-  cd "$srcdir/$pkgname"
+  cd "$srcdir/$pkgname-$pkgver"
 
   msg2 'Packaging binaries, data and man-pages...'
   scons install --prefix="$pkgdir/usr"
diff --git a/community/fceux/fceux.desktop b/community/fceux/fceux.desktop
deleted file mode 100644
index c20271a77..000000000
--- a/community/fceux/fceux.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Fceux
-GenericName=NES/Famicom emulator
-Exec=fceux
-Icon=fceux
-Type=Application
-Categories=Game;Emulator;
-Encoding=UTF-8
-MimeType=application/x-nes;application/x-nes-rom
diff --git a/community/fceux/fceux.png b/community/fceux/fceux.png
deleted file mode 100644
index 1cf27b1fd..000000000
--- a/community/fceux/fceux.png
+++ /dev/null
diff --git a/community/fcgiwrap/PKGBUILD b/community/fcgiwrap/PKGBUILD
index f3d818fea..dd461bd70 100644
--- a/community/fcgiwrap/PKGBUILD
+++ b/community/fcgiwrap/PKGBUILD
@@ -1,29 +1,23 @@
-# $Id: PKGBUILD 79378 2012-11-03 21:00:27Z lfleischer $
+# $Id: PKGBUILD 84283 2013-02-15 14:33:33Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Aaron Bull Schaefer <aaron@elasticdog.com>
 # Contributor: Ron Huang <ronhuang+aur at gmail dot com>
 
 pkgname=fcgiwrap
-pkgver=1.0.3
-_gitrev='b9f03e6'
-pkgrel=4
+pkgver=1.1.0
+pkgrel=1
 pkgdesc='A simple server for running CGI applications over FastCGI.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://nginx.localdomain.pl/wiki/FcgiWrap'
 license=('MIT')
 depends=('fcgi' 'systemd')
-backup=('etc/conf.d/fcgiwrap')
-source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${_gitrev}.tar.gz"
-        'fcgiwrap.conf.d'
-        'fcgiwrap.rc.d'
+source=("https://github.com/gnosek/fcgiwrap/archive/${pkgver}.tar.gz"
         'LICENSE')
-md5sums=('96d5f5a82b96f6eb7b4117fbab5e1e58'
-         '9fbb5b0e861ffea74e655143a4c1a8f9'
-         '71ea12f43aebca39f73ff2e0b684f361'
+md5sums=('d14f56bda6758a6e02aa7b3fb125cbce'
          '5aee62c27b4308f25ab32f05da387366')
 
 build() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   autoreconf --install
   ./configure --prefix=/usr --mandir=/share/man
@@ -31,10 +25,8 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
-  install -Dm0644 ../fcgiwrap.conf.d "${pkgdir}/etc/conf.d/${pkgname}"
-  install -Dm0755 ../fcgiwrap.rc.d "${pkgdir}/etc/rc.d/${pkgname}"
   install -Dm0644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/community/fcgiwrap/fcgiwrap.conf.d b/community/fcgiwrap/fcgiwrap.conf.d
deleted file mode 100644
index 906f597a0..000000000
--- a/community/fcgiwrap/fcgiwrap.conf.d
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# parameters for fcgiwrap daemon
-#
-
-SPAWNER='/usr/bin/spawn-fcgi'
-
-FCGI_ADDRESS='127.0.0.1'
-FCGI_PORT='9001'
-FCGI_USER='http'
-FCGI_GROUP='http'
-FCGI_EXTRA_OPTIONS=''
-
-SPAWNER_ARGS="-a $FCGI_ADDRESS -p $FCGI_PORT -u $FCGI_USER -g $FCGI_GROUP $FCGI_EXTRA_OPTIONS -- /usr/sbin/fcgiwrap"
diff --git a/community/fcgiwrap/fcgiwrap.rc.d b/community/fcgiwrap/fcgiwrap.rc.d
deleted file mode 100644
index 42787d149..000000000
--- a/community/fcgiwrap/fcgiwrap.rc.d
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON=fcgiwrap
-
-# source application-specific settings
-[ -f /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON
-
-# set defaults if settings are missing
-[ -z "$SPAWNER" ] && SPAWNER='/usr/bin/spawn-fcgi'
-[ -z "$SPAWNER_ARGS" ] && SPAWNER_ARGS='-a 127.0.0.1 -p 9001 -u http -g http -- /usr/sbin/fcgiwrap'
-
-get_pid() {
-  pidof -o %PPID $DAEMON
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $DAEMON daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$DAEMON.pid ] && rm -f /var/run/$DAEMON.pid
-      # RUN
-      $SPAWNER $SPAWNER_ARGS &> /dev/null
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$DAEMON.pid
-        add_daemon $DAEMON
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $DAEMON daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$DAEMON.pid &> /dev/null
-      rm_daemon $DAEMON
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $DAEMON status";
-    ck_status $DAEMON
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/community/fcitx-libpinyin/PKGBUILD b/community/fcitx-libpinyin/PKGBUILD
index 7209e0699..61bad23d0 100644
--- a/community/fcitx-libpinyin/PKGBUILD
+++ b/community/fcitx-libpinyin/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 81661 2012-12-26 06:37:02Z fyan $
+# $Id: PKGBUILD 89876 2013-05-04 04:07:04Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: poplarch <poplarch@gmail.com>
 
 pkgname=fcitx-libpinyin
-pkgver=0.2.1
-pkgrel=3
+pkgver=0.2.92
+pkgrel=1
 pkgdesc="Fcitx Wrapper for libpinyin, Library to deal with pinyin"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/fcitx/fcitx-libpinyin"
 license=('GPL')
-depends=('fcitx>=4.2.0' 'libpinyin>=0.3.0')
+depends=('fcitx' 'libpinyin')
 makedepends=('cmake' 'intltool' 'wget')
-provides=('fcitx-libpinyin')
-source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
-install='fcitx-libpinyin.install'
+source=("https://fcitx.googlecode.com/files/${pkgname}-${pkgver}_dict.tar.xz")
+install=$pkgname.install
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
@@ -32,4 +31,4 @@ package() {
   cd "$srcdir/${pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('9ff621f6f16ab426ff01652b1ffc06a7')
+sha512sums=('bea86b1041fa311a9bbcd2a6d74ab36d9659ebb6c92122307d3bd4dc44bcb0567d4aeafe62f3b6fe6a85160b369722f391063b47765dc88ec9a9b569cfca640f')
diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD
index 484c8671e..f702f9ace 100644
--- a/community/fcitx-mozc/PKGBUILD
+++ b/community/fcitx-mozc/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 82225 2013-01-12 16:39:34Z fyan $
+# $Id: PKGBUILD 88241 2013-04-15 00:59:54Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
 ## Mozc compile option
 _bldtype=Release
 
-_zipcoderel=201211 #201212 is broken, for now
-_protobuf_ver=2.4.1
+_zipcoderel=201303
+_protobuf_ver=2.5.0
 
 _pkgbase=mozc
 pkgname=fcitx-mozc
 pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
-pkgver=1.6.1187.102
-_patchver=${pkgver}.3
-pkgrel=5
+pkgver=1.10.1390.102
+_patchver=${pkgver}.2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/mozc/"
 license=('custom')
-depends=('qt' 'fcitx' 'zinnia')
-makedepends=('pkg-config' 'python2' 'gtest' 'qt' 'curl' 'fcitx' 'gtk2')
+depends=('qt4' 'fcitx' 'zinnia')
+makedepends=('pkg-config' 'python2' 'gtest' 'curl' 'gtk2' 'mesa')
 replaces=('mozc-fcitx')
 conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
 source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2
@@ -26,18 +26,39 @@ source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2
         http://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcoderel}.zip
         http://protobuf.googlecode.com/files/protobuf-${_protobuf_ver}.tar.bz2
         http://fcitx.googlecode.com/files/fcitx-mozc-${_patchver}.patch
+	http://fcitx.googlecode.com/files/fcitx-mozc-icon.tar.gz
+	mozc_1.10.1390.102_remove_warn_as_error.patch
 )
 
 build() {
   cd "$srcdir"
-  ln -sf `which python2` ./python
-  PATH="${srcdir}:${PATH}"
 
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  #source /etc/profile.d/qt4.sh
+
+  # Update: Fix qt4 include path too
+  # Fix compatibility with google-glog 0.3.3 (symbol conflict)
+  #CFLAGS="${CFLAGS} -DFLAGS_log_dir=FLAGS_mozc_log_dir"
+  #CXXFLAGS="${CXXFLAGS} -DFLAGS_log_dir=FLAGS_mozc_log_dir"
+  CFLAGS="${CFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
+  CXXFLAGS="${CXXFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
 
+  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  
+  # Apply fcitx patch
   rm unix/fcitx -rf
   patch -Np2 -i ${srcdir}/fcitx-mozc-${_patchver}.patch
 
+  # Fix qt4 binary path
+  sed -i 's|(qt_dir)/bin|(qt_dir)/lib/qt4/bin|' gui/*.gyp{,i}
+  sed -i 's|(qt_dir_env)/bin|(qt_dir_env)/lib/qt4/bin|' gui/*.gyp{,i}
+
+  # Patch for gcc>=4.8
+  patch -p0 -i "${srcdir}/mozc_1.10.1390.102_remove_warn_as_error.patch"
+
+  # Adjust to use python2
+  find . -name  \*.py        -type f -exec sed -i -e "1s|python.*$|python2|"  {} +
+  find . -regex '.*\.gypi?$' -type f -exec sed -i -e "s|'python'|'python2'|g" {} +
+
   # Generate zip code seed
   msg "Generating zip code seed..."
   python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/KEN_ALL.CSV" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt
@@ -49,7 +70,6 @@ build() {
   msg "Starting make..."
 
   _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx/fcitx.gyp:fcitx-mozc"
-  _qmnames="qmake-qt4 qmake4 qmake"
 
   QTDIR=/usr python2 build_mozc.py gyp --channel_dev=0
   python2 build_mozc.py build_tools -c $_bldtype
@@ -80,21 +100,21 @@ package() {
   install -D -m 644 unix/fcitx/mozc.conf "${pkgdir}/usr/share/fcitx/inputmethod/mozc.conf"
 
   install -d "${pkgdir}/usr/share/fcitx/mozc/icon"
-  install -m 644 data/images/product_icon_32bpp-128.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc.png"
-  install -m 644 data/images/unix/ui-alpha_full.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_full.png"
-  install -m 644 data/images/unix/ui-alpha_half.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_half.png"
-  install -m 644 data/images/unix/ui-direct.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-direct.png"
-  install -m 644 data/images/unix/ui-hiragana.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-hiragana.png"
-  install -m 644 data/images/unix/ui-katakana_full.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_full.png"
-  install -m 644 data/images/unix/ui-katakana_half.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_half.png"
-  install -m 644 data/images/unix/ui-dictionary.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-dictionary.png"
-  install -m 644 data/images/unix/ui-properties.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-properties.png"
-  install -m 644 data/images/unix/ui-tool.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-alpha_full.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_full.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-alpha_half.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_half.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-direct.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-direct.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-hiragana.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-hiragana.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-katakana_full.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_full.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-katakana_half.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_half.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-dictionary.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-dictionary.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-properties.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-properties.png"
+  install -m 644 "$srcdir/fcitx-mozc-icons/mozc-tool.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png"
 }
-
-
-md5sums=('e5246d17a81d2e942e9e8de0c3240c95'
-         'e61df4b5754f3869ca504d269dc9641d'
-         '59c5f7e9c734b40197454318f228859f'
-         'ed436802019c9e1f40cc750eaf78f318'
-         '3c947ef02d9bf3341192ba22916f3605')
+md5sums=('ff1611354703cbaa76cd562007ba57e9'
+         '63310f8bad30f528ba10a6574b807952'
+         'bb9fa83c00dece4de5f92ca1773e2bc5'
+         'a72001a9067a4c2c4e0e836d0f92ece4'
+         '1d94b16b5379f0ccd9f4e372c59b8190'
+         '80fe2ef127b70649df22d133822ac8a7'
+         '36689e236c97e570c1a8c98f947755bb')
diff --git a/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch b/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch
new file mode 100644
index 000000000..ff6e9f09b
--- /dev/null
+++ b/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch
@@ -0,0 +1,12 @@
+Index: gyp/common.gypi

+===================================================================

+--- gyp/common.gypi	(revision 151)

++++ gyp/common.gypi	(working copy)

+@@ -58,7 +58,6 @@

+     # warning_cflags will be shared with Mac and Linux.
+     'warning_cflags': [
+       '-Wall',
+-      '-Werror',
+       '-Wno-char-subscripts',
+       '-Wno-sign-compare',
+       '-Wno-deprecated-declarations',
diff --git a/community/fcitx-qt5/PKGBUILD b/community/fcitx-qt5/PKGBUILD
new file mode 100644
index 000000000..e761ce6e3
--- /dev/null
+++ b/community/fcitx-qt5/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 85500 2013-03-02 04:37:50Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+
+pkgname=fcitx-qt5
+pkgver=0.1.1
+pkgrel=5
+pkgdesc="QT5 IM Module for Fcitx"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/fcitx"
+license=('GPL')
+depends=('fcitx>=4.2.7' 'qt5-base')
+makedepends=('cmake')
+source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
+
+build() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+
+  mkdir -p build
+  cd build
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_LIBDIR=lib ..
+  make
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}/build"
+  make install DESTDIR="${pkgdir}"
+}
+md5sums=('c93a4922ddc4f042749e707673f0fa41')
diff --git a/community/fcitx-unikey/PKGBUILD b/community/fcitx-unikey/PKGBUILD
index a67d97ea2..015e1b78f 100644
--- a/community/fcitx-unikey/PKGBUILD
+++ b/community/fcitx-unikey/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 82956 2013-01-26 06:38:02Z fyan $
+# $Id: PKGBUILD 85345 2013-03-01 10:30:29Z andrea $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=fcitx-unikey
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Fcitx Wrapper for unikey"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx"
 license=('GPL')
 depends=('fcitx>=4.2.7')
-optdepends=('qt: To run the fcitx unikey macro editor')
-makedepends=('cmake' 'intltool' 'qt')
+optdepends=('qt4: To run the fcitx unikey macro editor')
+makedepends=('cmake' 'qt4')
 source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
 install=fcitx-unikey.install
 
 build(){
     cd "$srcdir/${pkgname}-${pkgver}"
-    rm -rf build
-    mkdir build
+    mkdir -p build
     cd build
     
     cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
index afae00724..7cd37be7d 100644
--- a/community/fcitx/PKGBUILD
+++ b/community/fcitx/PKGBUILD
@@ -1,24 +1,38 @@
-# $Id: PKGBUILD 82948 2013-01-26 02:17:24Z fyan $
+# $Id: PKGBUILD 88848 2013-04-24 06:26:30Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: csslayer <wengxt AT gmail com>
 
 pkgbase=fcitx
-pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
+pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
 pkgver=4.2.7
-pkgrel=1
+pkgrel=8
 groups=('fcitx-im')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx/"
 license=('GPL')
-makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' \
-             'iso-codes' 'gobject-introspection' 'libxkbfile')
-source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz)
+makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' \
+             'iso-codes' 'gobject-introspection' 'libxkbfile' 'git')
+source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz
+	https://github.com/fcitx/fcitx/commit/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch
+	https://github.com/fcitx/fcitx/commit/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch
+	https://github.com/fcitx/fcitx/commit/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch
+	https://github.com/fcitx/fcitx/commit/a9e6570046f9c1477dd6ec6e30e91e020e62d698.patch
+)
 
 build() {
-  cd "${srcdir}"
+  #source /etc/profile.d/qt4.sh
+
+  cd "$srcdir/$pkgbase-$pkgver"
+  patch -Np1 -i "$srcdir/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch"
+  patch -Np1 -i "$srcdir/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch"
+  git apply -v -p1 "$srcdir/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch"
+  patch -Np1 -i "$srcdir/a9e6570046f9c1477dd6ec6e30e91e020e62d698.patch"
+
+  cd "$srcdir"
   mkdir -p build
   cd build
+
   cmake ../${pkgbase}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -28,7 +42,8 @@ build() {
     -DENABLE_TEST=ON \
     -DENABLE_GTK2_IM_MODULE=ON \
     -DENABLE_GTK3_IM_MODULE=ON \
-    -DENABLE_QT_IM_MODULE=ON
+    -DENABLE_QT_IM_MODULE=ON \
+    -DQT_QMAKE_EXECUTABLE=qmake-qt4
   make
 }
 
@@ -43,7 +58,7 @@ package_fcitx() {
            'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \
            'libxfixes' 'dbus-core' 'icu')
   optdepends=('enchant: for word predication support'
-	      'opencc: optional engine to do chinese convert'
+              'opencc: optional engine to do chinese convert'
   	      'fcitx-anthy: Hiragana text to Kana Kanji mixed text Japanese input method'
 	      'fcitx-chewing: Intelligent Zhuyin input method library for traditional Chinese'
 	      'fcitx-cloudpinyin: Standalone module for fcitx that uses pinyin API on the internet to provide additional input candidates'
@@ -56,7 +71,7 @@ package_fcitx() {
 	      'fcitx-libpinyin: Fcitx Wrapper for libpinyin, Library to deal with pinyin'
 	      'fcitx-m17n: Multilingual text processing library'
 	      'fcitx-mozc: Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)'
-	      'fcitx-qt: QT IM Module for fcitx'
+	      'fcitx-qt4: QT4 IM Module for fcitx'
 	      'fcitx-rime: Rime input method engine (Traditional Chinese)'
   	      'fcitx-sunpinyin: Statistical Language Model based pinyin IME by Sun'
 	      'fcitx-table-extra: Extra tables for Fcitx, including Boshiamy, Zhengma, Cangjie3, Cangjie5'
@@ -70,7 +85,7 @@ package_fcitx() {
   cd "${srcdir}/build"
   make DESTDIR="${pkgdir}" install
 
-  rm -r "${pkgdir}/usr/lib/"{gtk-2.0,gtk-3.0,qt}
+  rm -r "${pkgdir}/usr/lib/"{gtk-2.0,gtk-3.0,qt4}
   rm -r "${pkgdir}/usr/lib/fcitx/qt"
   rm -r "${pkgdir}/usr/include/fcitx-qt"
   rm "${pkgdir}/usr/bin/fcitx-qt-gui-wrapper"
@@ -96,9 +111,12 @@ package_fcitx-gtk3() {
   make DESTDIR="${pkgdir}" install
 }
 
-package_fcitx-qt() {
-  pkgdesc='QT IM Module for fcitx'
-  depends=('qt' "fcitx>=$pkgver")
+package_fcitx-qt4() {
+  pkgdesc='QT4 IM Module for fcitx'
+  depends=('qt4' "fcitx>=$pkgver")
+  replaces=('fcitx-qt')
+  provides=('fcitx-qt')
+  conflicts=('fcitx-qt')
 
   cd "${srcdir}/build/src/frontend/qt"
   make DESTDIR="${pkgdir}" install
@@ -110,4 +128,8 @@ package_fcitx-qt() {
   make DESTDIR="${pkgdir}" install
 }
 
-md5sums=('6e291717c24615b9dc9bfaa2949af3a7')
+md5sums=('6e291717c24615b9dc9bfaa2949af3a7'
+         '246e36c2232f107ed1692a52ebc43c39'
+         '6f420547bc8af9627db2e5290f758433'
+         '51e53377e1b83661f2896e25d1a46242'
+         '5e9f90817722a138b459b2bf6a926f96')
diff --git a/community/fdm/GNUmakefile.patch b/community/fdm/GNUmakefile.patch
deleted file mode 100644
index 8320b9af5..000000000
--- a/community/fdm/GNUmakefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- fdm-1,6/GNUmakefile	2008-12-22 21:50:05.000000000 +0530
-+++ fdm-1.6/GNUmakefile	2009-05-09 19:07:21.000000000 +0530
-@@ -8,10 +8,7 @@
- 
- #DEBUG= 1
- 
--PREFIX?= /usr/local
--
--BIN_OWNER= bin
--BIN_GROUP= root
-+PREFIX?= /usr
- 
- CC= gcc
- 
-@@ -27,8 +24,8 @@
- endif
- 
- INSTALLDIR= install -d
--INSTALLBIN= install -g $(BIN_OWNER) -o $(BIN_GROUP) -m 555
--INSTALLMAN= install -g $(BIN_OWNER) -o $(BIN_GROUP) -m 444
-+INSTALLBIN= install -m 0755
-+INSTALLMAN= install -m 0644
- 
- SRCS= fdm.c \
-       attach.c buffer.c cleanup.c command.c connect.c io.c log.c netrc.c \
-@@ -72,7 +69,7 @@
- endif
- 
- OBJS= $(patsubst %.c,%.o,$(SRCS))
--CPPFLAGS+= $(DEFS) -I. -I- $(INCDIRS)
-+CPPFLAGS+= $(DEFS) -I. -iquote. $(INCDIRS)
- ifdef DEBUG
- CFLAGS+= -g -ggdb -DDEBUG
- LDFLAGS+= -rdynamic
-@@ -115,10 +112,10 @@
- install:
- 	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/bin
- 	$(INSTALLBIN) $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
--	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man1
--	$(INSTALLMAN) $(PROG).1 $(DESTDIR)$(PREFIX)/man/man1/$(PROG).1
--	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man5
--	$(INSTALLMAN) $(PROG).conf.5 $(DESTDIR)$(PREFIX)/man/man5/$(PROG).conf.5
-+	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/share/man/man1
-+	$(INSTALLMAN) $(PROG).1 $(DESTDIR)$(PREFIX)/share/man/man1/$(PROG).1
-+	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/share/man/man5
-+	$(INSTALLMAN) $(PROG).conf.5 $(DESTDIR)$(PREFIX)/share/man/man5/$(PROG).conf.5
- 
- clean:
- 	rm -f $(CLEANFILES)
diff --git a/community/fdm/PKGBUILD b/community/fdm/PKGBUILD
index a0bf2a771..c02b55953 100644
--- a/community/fdm/PKGBUILD
+++ b/community/fdm/PKGBUILD
@@ -1,34 +1,35 @@
-# $Id: PKGBUILD 55396 2011-09-11 20:59:09Z bisson $
+# $Id: PKGBUILD 88671 2013-04-21 20:30:45Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Grigorios Bouzakis <grbzks@gmail.com>
 
 pkgname=fdm
-pkgver=1.6
-pkgrel=3.1
+pkgver=1.7
+pkgrel=1
 pkgdesc='Program to fetch and deliver mail'
+arch=('i686' 'x86_64' 'mips64el')
 url='http://fdm.sourceforge.net/'
 license=('BSD')
-arch=('i686' 'x86_64' 'mips64el')
-options=('!makeflags')
 depends=('openssl' 'tdb' 'zlib')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"
-	'GNUmakefile.patch')
-sha1sums=('fb8042f2355062848ff142c9604069b6657e6a82'
-          '0bddf0b0403ccee62190355f43fae84932c37436')
+makedepends=('patch' 'sed')
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('484474094f124ce438c89dfab05519fe7b3aa8c8346d00f790a512ab950cef2a')
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../GNUmakefile.patch
-        sed -i 's/LIBS+= -lssl -ltdb -lz/LIBS+= -lssl -lcrypto -ltdb -lz/' GNUmakefile
-	make
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  ./configure
+  make PREFIX=/usr MANDIR=/usr/share/man
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  make DESTDIR=${pkgdir} PREFIX=/usr MANDIR=/usr/share/man install
 
-	install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}"
-	sed '3,17p;d' fdm.c > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	mv examples "${pkgdir}/usr/share/doc/${pkgname}"
+  install -d ${pkgdir}/usr/share/{doc,licenses}/${pkgname}
+  sed '3,17p;d' fdm.c > ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  mv examples ${pkgdir}/usr/share/doc/${pkgname}
 }
diff --git a/community/fdm/fdm.conf b/community/fdm/fdm.conf
deleted file mode 100644
index ad58f3606..000000000
--- a/community/fdm/fdm.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Default system-wide configuration file for fdm.
-# You probably want to make a ~/.fdm.conf, and not edit this file.
diff --git a/community/fdupes/PKGBUILD b/community/fdupes/PKGBUILD
index 3b22f0e41..f458d9ad4 100644
--- a/community/fdupes/PKGBUILD
+++ b/community/fdupes/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=fdupes
 pkgver=1.40
-pkgrel=6
+pkgrel=6.1
 pkgdesc="a program for identifying or deleting duplicate files residing within specified directories"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fdupes/"
diff --git a/community/ffmpeg-compat/PKGBUILD b/community/ffmpeg-compat/PKGBUILD
index 8805a74c2..96fa9f3fd 100644
--- a/community/ffmpeg-compat/PKGBUILD
+++ b/community/ffmpeg-compat/PKGBUILD
@@ -6,13 +6,17 @@
 
 pkgname=ffmpeg-compat
 pkgver=20120509
-pkgrel=2
+pkgrel=3
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ffmpeg.org/"
 license=('GPL')
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
-makedepends=('yasm' 'git' 'libvdpau')
+depends=(alsa-lib bzip2 gsm lame libpulse libtheora libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
+makedepends=('git')
+if [ "$CARCH" != "mips64el" ]; then
+  depends+=(libva)
+  makedepends+=('yasm' 'libvdpau')
+fi
 #git clone git://git.videolan.org/ffmpeg.git
 source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-$pkgver.tar.xz)
 md5sums=('a35359e424608f369d380f03e4dc9966')
diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD
index 7cfa0b279..01dcc7dda 100644
--- a/community/ffmpeg2theora/PKGBUILD
+++ b/community/ffmpeg2theora/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 76759 2012-09-29 12:51:22Z ibiru $
+# $Id: PKGBUILD 84348 2013-02-16 22:50:27Z ioni $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 pkgname=ffmpeg2theora
 pkgver=0.29
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple converter to create Ogg Theora files"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://www.v2v.cc/~j/ffmpeg2theora/"
diff --git a/community/ffmpegsource/PKGBUILD b/community/ffmpegsource/PKGBUILD
new file mode 100755
index 000000000..c434b18b0
--- /dev/null
+++ b/community/ffmpegsource/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 88204 2013-04-13 20:20:33Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+
+pkgname=ffmpegsource
+pkgver=753
+pkgrel=1
+pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://code.google.com/p/ffmpegsource/"
+license=('MIT')
+depends=('ffmpeg')
+makedepends=('svn')
+options=('!libtool')
+source=("${pkgname}::svn+http://ffmpegsource.googlecode.com/svn/trunk/"
+        'autoconf.patch')
+sha256sums=('SKIP'
+            'b09a7e9a08a16bdaf19d43c7ad8d3ec455f6fecec2f4f5ada417345343adda93')
+
+pkgver() {
+  cd "${SRCDEST}"/${pkgname}
+
+  svnversion | tr -d [A-z]
+}
+
+prepare() {
+  cd "${srcdir}"/${pkgname}
+
+  patch -Np1 -i ../autoconf.patch
+}
+
+build() {
+  cd "${srcdir}"/${pkgname}
+
+  ./autogen.sh --prefix=/usr --enable-shared --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}
+
+  make DESTDIR="${pkgdir}" install
+
+  install -dm 755 "${pkgdir}"/usr/share/licenses/ffmpegsource
+  install -m 644 COPYING "${pkgdir}"/usr/share/licenses/ffmpegsource/LICENSE
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/ffmpegsource/autoconf.patch b/community/ffmpegsource/autoconf.patch
new file mode 100755
index 000000000..e15e4522c
--- /dev/null
+++ b/community/ffmpegsource/autoconf.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,7 +6,7 @@ pkgconfig_DATA = ffms2.pc
+ 
+ dist_doc_DATA = doc/ffms2-api.html doc/ffms2-changelog.html doc/style.css
+ 
+-INCLUDES = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
++AM_CPPFLAGS = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @LIBAV_CFLAGS@ @ZLIB_CPPFLAGS@ -include config.h
+ 
+ lib_LTLIBRARIES = src/core/libffms2.la
+ src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,7 @@ if test -z "$CXXFLAGS"; then
+     CXXFLAGS="$OPT_FLAGS"
+ fi
+ 
+-AM_CONFIG_HEADER([src/config/config.h])
++AC_CONFIG_HEADERS([src/config/config.h])
+ AC_PROG_CC
+ AC_PROG_CXX
+ LT_INIT([static disable-shared])
diff --git a/community/fillets-ng/fillets-ng.desktop b/community/fillets-ng/fillets-ng.desktop
deleted file mode 100644
index 69731d098..000000000
--- a/community/fillets-ng/fillets-ng.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Fillets-NG
-GenericName=Fish Fillets
-Comment=Wonderful puzzle game Fish Fillets
-Comment[cs]=Podmořská logická hra ve které ovládáte dva rybí agenty
-Icon=fillets-ng
-Exec=fillets
-StartupNotify=true
-Terminal=false
-Categories=Game;LogicGame;
diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD
index c3df5c8be..bca39bdd2 100644
--- a/community/fish/PKGBUILD
+++ b/community/fish/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75266 2012-08-17 10:28:57Z bpiotrowski $
+# $Id: PKGBUILD 84315 2013-02-16 11:41:49Z bpiotrowski $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=fish
 pkgver=2.0b2
-pkgrel=3
+pkgrel=4
 pkgdesc='Smart and user friendly shell intended mostly for interactive use'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://ridiculousfish.com/shell/'
@@ -31,9 +31,6 @@ package() {
   cd "$srcdir"/fishfish
   make DESTDIR="$pkgdir" install
 
-  # compress man pages
-  find "$pkgdir"/usr/share/fish/man/ -type f | xargs gzip -9
-
   # use python2
   find "$pkgdir"/usr/share/fish/tools/ -type f -exec sed -e "1s|python|python2|" -i {} \;
 }
diff --git a/community/flam3/PKGBUILD b/community/flam3/PKGBUILD
index 19006c9c9..803b72b9a 100644
--- a/community/flam3/PKGBUILD
+++ b/community/flam3/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=flam3
 pkgver=3.0.1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Tools to create/display fractal flames: algorithmically generated images and animations"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://flam3.com/"
diff --git a/community/flickcurl/PKGBUILD b/community/flickcurl/PKGBUILD
index 1a287da02..17e87ce17 100644
--- a/community/flickcurl/PKGBUILD
+++ b/community/flickcurl/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 59867 2011-12-01 13:14:32Z spupykin $
+# $Id: PKGBUILD 88309 2013-04-16 13:27:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=flickcurl
-pkgver=1.21
-pkgrel=3
+pkgver=1.24
+pkgrel=1
 pkgdesc="C library for the Flickr API"
 arch=(i686 x86_64 'mips64el')
 url="http://librdf.org/flickcurl/"
 license=('GPL')
 depends=('raptor' 'curl')
 source=(http://download.dajobe.org/flickcurl/flickcurl-$pkgver.tar.gz)
-md5sums=('d4d364231505dc22a6af42be7bc85edf')
+md5sums=('7cf6a627465471d76a5f4dc31099d9cf')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD
index 7005c0ff2..0b4dfe25e 100644
--- a/community/flightgear/PKGBUILD
+++ b/community/flightgear/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 77631 2012-10-13 11:42:12Z allan $
+# $Id: PKGBUILD 84414 2013-02-18 20:13:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 # Contributor: Hans Janssen <hans@janserv.xs4all.nl>
 
 pkgname=flightgear
-pkgver=2.8.0
-pkgrel=2
+pkgver=2.10.0
+pkgrel=1
 pkgdesc="An open-source, multi-platform flight simulator"
 arch=(i686 x86_64)
 depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu')
-makedepends=('boost' 'cmake')
+makedepends=('boost' 'cmake' 'mesa')
 license=("GPL")
 url="http://www.flightgear.org"
 options=('!makeflags')
 #source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver")
 #source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2")
 source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2")
-md5sums=('9499194146f414323efef8cb3451b750')
+md5sums=('ae7fc8d1e446c5d1fe2aa82ee41dcac5')
 
 build() {
   cd $srcdir/flightgear-$pkgver
diff --git a/community/floyd/PKGBUILD b/community/floyd/PKGBUILD
index adedd0855..58a4df2e5 100644
--- a/community/floyd/PKGBUILD
+++ b/community/floyd/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=floyd
 pkgver=2.0.1
-pkgrel=4
+pkgrel=4.1
 pkgdesc="displays system load with pulse of keyboard LED"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.asahi-net.or.jp/~pi9s-nnb/floyd/"
diff --git a/community/fltk2/PKGBUILD b/community/fltk2/PKGBUILD
deleted file mode 100644
index 581d24d2d..000000000
--- a/community/fltk2/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 63560 2012-02-05 11:56:02Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=fltk2
-pkgver=2.0
-_pkgver=2.0.x-alpha-r9166
-pkgrel=8
-pkgdesc="Graphical user interface toolkit for X"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL')
-url="http://www.fltk.org/"
-depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext' 'libxi' 'libxinerama')
-makedepends=('mesa')
-source=(http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/fltk-${_pkgver}.tar.bz2)
-md5sums=('d5e7cd859d2aeb9bb6e13ee298e8b2aa')
-
-build() {
-  cd $srcdir/fltk-${_pkgver}
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
-  patch -p0 src/filename_list.cxx <<EOF
-66c66
-<   int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
----
->   int n = scandir(d, list, 0, (int(*)(const dirent64**,const dirent64**))sort);
-EOF
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community/fmodex/PERMISSION b/community/fmodex/PERMISSION
deleted file mode 100644
index be7e15ff8..000000000
--- a/community/fmodex/PERMISSION
+++ /dev/null
@@ -1,25 +0,0 @@
-Hi Sven,
-sounds ok to me.
-regards,
-
-Brett Paterson | CEO
-FMOD by Firelight Technologies Pty Ltd
-Interactive Audio Middleware | www.fmod.org
-PH: +61 3 96635947 Fax: +61 3 96635951
-
-
------Original Message-----
-From: Sven-Hendrik Haase [mailto:sh@lutzhaase.com] 
-Sent: Thursday, 15 July 2010 9:51 AM
-To: sales@fmod.org
-Subject: Redistribution for Arch Linux
-
- Hello,
-
- I'm a packager for the Arch Linux project (http://www.archlinux.org) and
- I would like to ask you for permission for redistributing FMOD in binary
- form in our project. Arch Linux is a free operating system and is run
- entirely by volunteers. There is no commercial context.
-
- Regards,
- Sven-Hendrik Haase
diff --git a/community/fmodex/PKGBUILD b/community/fmodex/PKGBUILD
deleted file mode 100644
index 8bb9b7e2c..000000000
--- a/community/fmodex/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 80347 2012-11-20 11:44:56Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-# Note: This packae is proprietary and distribution is limited. However, we
-# have written permission to by the FMOD CEO to distribute this in binary form.
-pkgname=fmodex
-pkgver=4.44.01
-pkgrel=1
-pkgdesc="An advanced audio engine"
-arch=('i686' 'x86_64')
-url="http://www.fmod.org/"
-license=('custom')
-source=("http://www.fmod.org/index.php/release/version/fmodapi${pkgver//./}linux.tar.gz")
-md5sums=('3f32d8e74ac5cc6e581f7c32c71f4d20')
-
-build() {
-  cd fmodapi${pkgver//./}linux
-
-  mkdir -p ${pkgdir}/usr/lib
-  mkdir -p ${pkgdir}/usr/include/fmodex
-
-  cp -d api/lib/* ${pkgdir}/usr/lib/
-  [[ $CARCH == "i686" ]] && rm ${pkgdir}/usr/lib/*64*
-
-  if [[ $CARCH == "x86_64" ]]; then
-    cd ${pkgdir}/usr/lib
-    ln -sf libfmodex64-${pkgver}.so libfmodex-${pkgver}.so
-    ln -sf libfmodexL64-${pkgver}.so libfmodexL-${pkgver}.so
-    cd ${srcdir}/fmodapi${pkgver//./}linux
-  fi
-
-  cp api/inc/* ${pkgdir}/usr/include/fmodex/
-
-  install -Dm644 documentation/LICENSE.TXT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  mkdir -p ${pkgdir}/usr/share/doc/fmodex
-  cp -r documentation examples ${pkgdir}/usr/share/doc/fmodex
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD
index 1a0dfc363..04e4c51ed 100644
--- a/community/fox/PKGBUILD
+++ b/community/fox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 80103 2012-11-16 06:59:27Z spupykin $
+# $Id: PKGBUILD 88311 2013-04-16 13:27:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=fox
-pkgver=1.6.47
+pkgver=1.6.49
 pkgrel=1
 pkgdesc="Free Objects for X: GUI Toolkit for C++"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('mesa')
 optdepends=('perl')
 options=('!libtool')
 source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz)
-md5sums=('9bd233adff5af3fc2d1139c8a22f556c')
+md5sums=('e120647d26a27ed37cd5fed8b75c8a3d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/fpc/Makefile-mk382.diff b/community/fpc/Makefile-mk382.diff
deleted file mode 100644
index 00909766d..000000000
--- a/community/fpc/Makefile-mk382.diff
+++ /dev/null
@@ -1,174 +0,0 @@
---- Makefile.fpc.orig	2011-04-02 01:15:34.000000000 +0400
-+++ Makefile.fpc	2011-08-05 22:29:44.000000000 +0400
-@@ -4,7 +4,7 @@
- 
- [package]
- name=compiler
--version=2.4.4
-+version=2.5.1
- 
- [target]
- programs=pp
-@@ -32,7 +32,7 @@
- unexport FPC_VERSION FPC_COMPILERINFO
- 
- # Which platforms are ready for inclusion in the cycle
--CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb # mipsel mips
-+CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr
- 
- # All supported targets used for clean
- ALLTARGETS=$(CYCLETARGETS)
-@@ -148,6 +148,12 @@
- ifeq ($(CPC_TARGET),arm)
- CPUSUF=arm
- endif
-+ifeq ($(CPC_TARGET),mips)
-+CPUSUF=mips
-+endif
-+ifeq ($(CPC_TARGET),mipsel)
-+CPUSUF=mipsel
-+endif
- 
- # Do not define the default -d$(CPU_TARGET) because that
- # will conflict with our -d$(CPC_TARGET)
-@@ -224,12 +230,39 @@
- override LOCALOPT+=
- endif
- 
-+# mipsel specific
-+ifeq ($(PPC_TARGET),mipsel)
-+override LOCALOPT+=-Fumips
-+endif
-+
-+
-+OPTWPOCOLLECT=-OWdevirtcalls,optvmts -FW$(BASEDIR)/pp1.wpo
-+OPTWPOPERFORM=-Owdevirtcalls,optvmts -Fw$(BASEDIR)/pp1.wpo
-+# symbol liveness WPO requires nm, smart linking and no stripping (the latter
-+# is forced by the Makefile when necessary)
-+ifneq ($(findstring $(OS_TARGET),darwin linux freebsd solaris),)
-+ifdef LINKSMART
-+ifdef CREATESMART
-+OPTWPOCOLLECT+=-OWsymbolliveness -Xs-
-+OPTWPOPERFORM+=-Owsymbolliveness
-+endif
-+endif
-+endif
-+
-+
- [rules]
- #####################################################################
- # Setup Targets
- #####################################################################
- 
- ifeq ($(OS_TARGET),win32)
-+USE_CMP_FOR_DIFF=1
-+endif
-+ifeq ($(OS_TARGET),win64)
-+USE_CMP_FOR_DIFF=1
-+endif
-+
-+ifdef USE_CMP_FOR_DIFF
- ifdef CMP
- override DIFF:=$(CMP) -i218
- endif
-@@ -267,6 +300,8 @@
- TEMPNAME1=ppc1$(EXEEXT)
- TEMPNAME2=ppc2$(EXEEXT)
- TEMPNAME3=ppc3$(EXEEXT)
-+TEMPWPONAME1=ppcwpo1$(EXEEXT)
-+TEMPWPONAME2=ppcwpo2$(EXEEXT)
- MAKEDEP=ppdep$(EXEEXT)
- MSG2INC=./msg2inc$(EXEEXT)
- ifdef CROSSINSTALL
-@@ -327,15 +362,15 @@
-         -$(DEL) $(addsuffix /*$(PPUEXT),$(COMPILERSOURCEDIR))
- 
- tempclean:
--        -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC)
-+        -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC) pp1.wpo pp2.wpo
- 
- execlean :
--        -$(DEL) ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) $(EXENAME)
-+        -$(DEL) ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME) $(TEMPWPONAME1) $(TEMPWPONAME2)
- 
- $(addsuffix _clean,$(ALLTARGETS)):
-         -$(DELTREE) $(addprefix $(subst _clean,,$@),/units)
-         -$(DEL) $(addprefix $(subst _clean,,$@)/,*$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT))
--        -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcppc$(EXEEXT) $(EXENAME))
-+        -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME))
- 
- cycleclean: cleanall $(addsuffix _clean,$(CPC_TARGET))
-         -$(DEL) $(EXENAME)
-@@ -444,6 +479,28 @@
- # Normal cycle
- #
- 
-+ifndef NOWPOCYCLE
-+ifdef RELEASE
-+DOWPOCYCLE=1
-+# Two WPO cycles in case of RELEASE=1
-+wpocycle:
-+# don't use cycle_clean, it will delete the compiler utilities again
-+        $(RM) $(EXENAME)
-+        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOCOLLECT)' compiler
-+        $(RM) $(EXENAME)
-+        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(RTLOPT) $(OPTWPOPERFORM)' rtlclean rtl
-+        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOPERFORM) $(subst pp1.wpo,pp2.wpo,$(OPTWPOCOLLECT))' $(addsuffix _clean,$(ALLTARGETS)) compiler
-+        $(MOVE) $(EXENAME) $(TEMPWPONAME1)
-+        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(RTLOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' rtlclean rtl
-+        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(LOCALOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' $(addsuffix _clean,$(ALLTARGETS)) compiler
-+        $(COPY) $(EXENAME) $(TEMPWPONAME2)
-+endif
-+endif
-+
-+ifndef DOWPOCYCLE
-+wpocycle:
-+endif
-+
- # Used to avoid unnecessary steps
- ifdef DIFF
- ifdef OLDFPC
-@@ -490,6 +547,7 @@
-         $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OLDFPC=$(BASEDIR)/$(TEMPNAME2)' next
-         $(DIFF) $(TEMPNAME3) $(EXENAME)
-         $(MAKE) $(addsuffix _all,$(TARGET_DIRS)) 'FPC=$(BASEDIR)/$(EXENAME)'
-+        $(MAKE) wpocycle
-         $(MAKE) echotime
- 
- else
-@@ -508,8 +566,11 @@
- # ppc<ARCH> (target native)
- ifndef CROSSINSTALL
-         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl
-+# building a native compiler for embedded targets is not possible
-+ifneq ($(OS_TARGET),embedded)
-         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' cycleclean compiler
- endif
-+endif
- 
- endif
- 
-@@ -523,10 +584,10 @@
- # ppc3/ppcXXX = native (skipped for cross installation)
- #
- 
-+cycle: override FPC=
- cycle:
- # ppc (source native)
- # Clear detected compiler binary, because it can be existing crosscompiler binary, but we need native compiler here
--override FPC=
-         $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 rtlclean rtl
-         $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) EXENAME=$(TEMPNAME) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 cycleclean compiler
- # ppcross<ARCH> (source native)
-@@ -535,8 +596,11 @@
- # ppc<ARCH> (target native)
- ifndef CROSSINSTALL
-         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' rtlclean rtl
-+# building a native compiler for embedded targets is not possible
-+ifneq ($(OS_TARGET),embedded)
-         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' cycleclean compiler
- endif
-+endif
- 
- endif
- 
diff --git a/community/fpc/PKGBUILD b/community/fpc/PKGBUILD
index 2c9b5a6da..cdb0b6857 100644
--- a/community/fpc/PKGBUILD
+++ b/community/fpc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 82304 2013-01-14 17:20:39Z spupykin $
+# $Id: PKGBUILD 84832 2013-02-25 10:36:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Valeriy Lyasotskiy <onestep@ukr.net>
 # Contributor: Jan Willemson <janwil@hot.ee>
@@ -8,9 +8,9 @@
 # See http://bbs.archlinux.org/viewtopic.php?t=9318&highlight=fpc
 
 pkgname=fpc
-pkgver=2.6.0
+pkgver=2.6.2
 _gdbver=7.5.1
-pkgrel=4
+pkgrel=1
 pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freepascal.org/"
@@ -22,25 +22,25 @@ options=(zipman)
 source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz
 	http://ftp.gnu.org/gnu/gdb/gdb-${_gdbver}.tar.bz2
 	fpc-gdb.patch)
-md5sums=('17375e665a4e1311f85812fe2754f609'
+md5sums=('89c7e60db6280f3d5cc006a4a9ff43a9'
          '3f48f468b24447cf24820054ff6e85b1'
          '1e45ece6b5d4ee60b860e75926b4122d')
 
 build() {
   cd ${srcdir}/gdb-${_gdbver}
-  ./configure --prefix=/usr --disable-nls --without-python --disable-werror --disable-tui
-  make
-  make -C gdb libgdb.a
-  cp libdecnumber/libdecnumber.a gdb/
+#  ./configure --prefix=/usr --disable-nls --without-python --disable-werror --disable-tui
+#  make
+#  make -C gdb libgdb.a
+#  cp libdecnumber/libdecnumber.a gdb/
 
   cd ${srcdir}/fpcbuild-$pkgver
-  patch -p1 <$srcdir/fpc-gdb.patch
+#  patch -p1 <$srcdir/fpc-gdb.patch
   export GDBLIBDIR=${srcdir}/gdb-${_gdbver}/gdb
   export LIBGDBFILE=$GDBLIBDIR/libgdb.a
   pushd fpcsrc/compiler
   fpcmake -Tall
   popd
-  make build
+  make build NOGDB=1
 }
 
 package() {
diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD
index 750f9a1f9..e792e1619 100644
--- a/community/freedroidrpg/PKGBUILD
+++ b/community/freedroidrpg/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname='freedroidrpg'
 pkgver=0.15.1
-pkgrel=3
+pkgrel=3.1
 arch=('i686' 'x86_64' 'mips64el')
 depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'glu')
 makedepends=('mesa')
diff --git a/community/freeimage/PKGBUILD b/community/freeimage/PKGBUILD
index c1d50fd01..1a3a5837e 100644
--- a/community/freeimage/PKGBUILD
+++ b/community/freeimage/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: scippio <scippio@berounet.cz>
 
 pkgname=freeimage
-pkgver=3.15.3
-pkgrel=2
+pkgver=3.15.4
+pkgrel=1
 pkgdesc="Library project for developers who would like to support popular graphics image formats"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'custom:FIPL')
@@ -14,7 +14,7 @@ url="http://freeimage.sourceforge.net/"
 depends=('gcc-libs')
 makedepends=('dos2unix')
 source=("http://downloads.sourceforge.net/project/freeimage/Source%20Distribution/${pkgver}/FreeImage${pkgver//./}.zip")
-md5sums=('6c305b4086500ff8541c596ea6fc7cd7')
+md5sums=('9f9a3b2c3c1b4fd24fe479e8aaee86b1')
 
 build() {
   if [ "$CARCH" != "i686" ] ; then
@@ -30,15 +30,17 @@ build() {
   export CXXFLAGS="$CXXFLAGS -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS"
 
   cd FreeImage
+  sed -i "1 i #include <cstring>" Source/OpenEXR/IlmImf/ImfAutoArray.h
   make
 
   cd ${srcdir}/FreeImagefip
+  sed -i "1 i #include <cstring>" Source/OpenEXR/IlmImf/ImfAutoArray.h
   make -f Makefile.fip 
 }
 
 package() {
   cd FreeImage
-  make DESTDIR=${pkgdir} install || true
+  make DESTDIR=${pkgdir} install
 
   cd ${srcdir}/FreeImagefip
   make -f Makefile.fip DESTDIR=${pkgdir} install
diff --git a/community/freeimage/gcc4.5_ln.patch b/community/freeimage/gcc4.5_ln.patch
deleted file mode 100644
index 317a48004..000000000
--- a/community/freeimage/gcc4.5_ln.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Naur FreeImage.orig//Makefile.fip FreeImage.new//Makefile.fip
---- FreeImage.orig//Makefile.fip	2010-08-10 19:15:20.000000000 +0200
-+++ FreeImage.new//Makefile.fip	2010-09-12 23:29:36.000000000 +0200
-@@ -15,9 +15,9 @@
- 

- MODULES = $(SRCS:.c=.o)

- MODULES := $(MODULES:.cpp=.o)

--CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS

-+CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS

- CFLAGS += $(INCLUDE)

--CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy

-+CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy

- CXXFLAGS += $(INCLUDE)

- 

- ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)

-diff -Naur FreeImage.orig//Makefile.gnu FreeImage.new//Makefile.gnu
---- FreeImage.orig//Makefile.gnu	2010-08-10 19:15:20.000000000 +0200
-+++ FreeImage.new//Makefile.gnu	2010-09-12 23:01:57.000000000 +0200
-@@ -15,9 +15,9 @@
- 

- MODULES = $(SRCS:.c=.o)

- MODULES := $(MODULES:.cpp=.o)

--CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS

-+CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS

- CFLAGS += $(INCLUDE)

--CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy

-+CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy

- CXXFLAGS += $(INCLUDE)

- 

- ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)

-@@ -65,9 +65,6 @@
- 	install -m 644 -o root -g root $(HEADER) $(INCDIR)

- 	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)

- 	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)

--	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)

--	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	

--	ldconfig

- 

- clean:

- 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)

-diff -Naur FreeImage.orig//Source/FreeImageToolkit/Background.cpp FreeImage.new//Source/FreeImageToolkit/Background.cpp
---- FreeImage.orig//Source/FreeImageToolkit/Background.cpp	2010-08-10 19:15:20.000000000 +0200
-+++ FreeImage.new//Source/FreeImageToolkit/Background.cpp	2010-08-10 19:16:12.000000000 +0200
-@@ -21,6 +21,7 @@
- 

- #include "FreeImage.h"

- #include "Utilities.h"

-+#include <limits.h>

- 

- /** @brief Determines, whether a palletized image is visually greyscale or not.

-  

-diff -Naur FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h
---- FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h	2010-08-10 19:15:20.000000000 +0200
-+++ FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h	2010-08-10 21:43:26.000000000 +0200
-@@ -51,6 +51,7 @@
- 

- #include <iostream>

- #include <iomanip>

-+#include <cstring>

- 

- #if (defined _WIN32 || defined _WIN64) && defined _MSC_VER

- // suppress exception specification warnings

diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD
index 36da22bf8..568c14d97 100644
--- a/community/freemat/PKGBUILD
+++ b/community/freemat/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 77872 2012-10-15 10:33:45Z spupykin $
+# $Id: PKGBUILD 85346 2013-03-01 10:30:37Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=freemat
 pkgver=4.1
-pkgrel=6
+pkgrel=7
 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freemat.sourceforge.net"
 license=('GPL')
-depends=('qt' 'ffcall' 'fftw' 'portaudio' 'libffi' 'glu')
+depends=('qt4' 'ffcall' 'fftw' 'portaudio' 'libffi' 'glu')
 makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2' 'mesa')
 install=freemat.install
 source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz
diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD
index 09b6154c9..6c13a2e3f 100644
--- a/community/freeorion/PKGBUILD
+++ b/community/freeorion/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 83429 2013-01-31 23:07:12Z arodseth $
+# $Id: PKGBUILD 87411 2013-03-31 19:18:15Z stephane $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Elmo Todurov <todurov@gmail.com>
 # Contributor: guini <sidtrun@googlemail.com>
-# Contributor: Forrest Loomis <cybercyst _ at _ gmail dot com>
+# Contributor: Forrest Loomis <cybercyst@gmail.com>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: fana-m <geminin@gmx.net>
 
 pkgname=freeorion
-pkgver=0.4.1
-pkgrel=6
+pkgver=0.4.2
+pkgrel=4
 pkgdesc='Turn-based galactic conquest game inspired by Master of Orion'
 arch=('x86_64' 'i686')
 url='http://www.freeorion.org/'
@@ -18,10 +19,9 @@ then
 else
   depends=('nvidia-cg-toolkit')
 fi
-depends=('bullet>=2.81' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils')
-makedepends=('boost>=1.49.0' 'ogre' 'sdl' 'gigi>=0.8.0-12' 'graphviz' 'clang'
-             'desktop-file-utils' 'setconf' 'cmake' 'gendesk' 'subversion'
-             'libogg')
+depends=('bullet' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils' 'libgl')
+makedepends=('boost' 'ogre=1.8.1-4' 'sdl' 'gigi>0.8.0-18' 'graphviz' 'mesa-libgl'
+             'desktop-file-utils' 'setconf' 'cmake' 'gendesk' 'subversion' 'libogg')
 options=('!strip' '!emptydirs')
 install=$pkgname.install
 source=("$pkgname.sh"
@@ -32,7 +32,7 @@ sha256sums=('111532e460aec847ff455ee67dd64f46e2fa5ceba39a0349d25a84b69c646eaf'
             '3dbe8df9c3a4a0d6451f42727ebf9bcb21fed41a08d1181d1cf77ef4ab5ee81a')
 _svnrepo='https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/'
 _pyversion=2.7
-_revision=5671 #5379
+_revision=5771
 
 build() {
   cd "$srcdir"
@@ -40,10 +40,9 @@ build() {
 
   #msg2 'Looking up revision from version number...'
   #_releaserevision=`curl --progress-bar -o- ${url}index.php/Compile | grep "$pkgver" | cut -d':' -f2 | cut -d' ' -f10 | tail -1`
-  #msg2 "The revision for the latest official release is $_releaserevision"
+  #msg2 'The revision for the latest official release is $_releaserevision"
   ## _revision=$_releaserevision
-
-  msg2 "Compiling with revision $_revision"
+  #msg2 "Compiling with revision $_revision"
 
   msg2 "Checking out svn revision $_revision..."
   if [[ -d "$pkgname/.svn" ]]; then
@@ -52,31 +51,31 @@ build() {
     svn co "$_svnrepo" --config-dir ./ -r "$_revision" "$pkgname"
   fi
 
-  msg2 "Setting up build directory..."
+  msg2 'Setting up build directory...'
   rm -rf "$srcdir/$pkgname-build"
   cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build"
   cd "$srcdir/$pkgname-build"
 
-  msg2 "CMake/Python fix..."
+  msg2 'CMake/Python fix...'
   patch -N -p1 -i "$srcdir/cmake_python.patch"
 
-  msg2 "Generating makefiles..."
+  msg2 'Generating makefiles...'
   cmake \
     -DPYTHON_INCLUDE_DIR:PATH="/usr/include/python$_pyversion" \
     -DPYTHON_LIBRARY:FILEPATH="/usr/lib/libpython$_pyversion.so" \
     -G "Unix Makefiles"
   
-  msg2 "GLU fix..."
-  setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING \
-    "'-march=x86-64 -mtune=generic -O2 -fno-var-tracking -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU '"
+  msg2 'GLU fix...'
+  if [ "$CARCH" == "x86_64" ]
+  then
+    setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING \
+      "'-march=native -mtune=generic -O2 -fno-var-tracking -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU -rpath=/usr/lib '"
+  fi
 
-  #msg2 "Boost fix..."
-  #sed -i 's:TIME_UTC:TIME_UTC_:' util/MultiplayerCommon.cpp
-  
-  msg2 "Compiling..."
+  msg2 'Compiling...'
   make -j1
 
-  msg2 "OGRE fix..."
+  msg2 'OGRE fix...'
   sed -i 's:PluginFolder=.:PluginFolder=/usr/lib/OGRE/:g' \
     "$srcdir/$pkgname-build/ogre_plugins.cfg"
 }
@@ -84,38 +83,38 @@ build() {
 package() {
   cd "$srcdir/$pkgname-build"
 
-  msg2 "Packaging documentation..."
+  msg2 'Packaging documentation...'
   install -Dm644 loki_setup/README.txt \
     "$pkgdir/usr/share/doc/$pkgname/README.txt"
 
-  msg2 "Packaging binaries..."
+  msg2 'Packaging binaries...'
   install -Dm 755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/freeorion"
   install -Dm 755 freeorion "$pkgdir/usr/bin/freeorion.elf"
   install -Dm 755 freeorionca "$pkgdir/usr/bin/freeorionca"
   install -Dm 755 freeoriond "$pkgdir/usr/bin/freeoriond"
 
-  msg2 "Packaging data..."
+  msg2 'Packaging data...'
   mkdir -p "$pkgdir/usr/share/$pkgname" "$pkgdir/usr/lib/$pkgname"
   cp -r default "$pkgdir/usr/share/$pkgname"
-  install -Dm 644 OISInput.cfg "$pkgdir/usr/share/OISInput.cfg"
+  install -Dm 644 OISInput.cfg "$pkgdir/usr/share/$pkgname/OISInput.cfg"
 
-  msg2 "Packaging license..."
+  msg2 'Packaging license...'
   install -Dm 644 default/COPYING \
     "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 
   cd "$srcdir"
 
-  msg2 "Packaging icon and shortcut..."
+  msg2 'Packaging icon and shortcut...'
   install -Dm 644 "$pkgname.png" \
     "$pkgdir/usr/share/pixmaps/freeorion.png"
   install -Dm 644 "$pkgname.desktop" \
     "$pkgdir/usr/share/applications/freeorion.desktop"
 
-  msg2 "Packaging OGRE plugins configuration..."
+  msg2 'Packaging OGRE plugins configuration...'
   install -Dm 644 "$srcdir/$pkgname-build/ogre_plugins.cfg" \
     "$pkgdir/usr/share/freeorion/ogre_plugins.cfg"
 
-  msg2 "Cleaning up..."
+  msg2 'Cleaning up...'
   find "$pkgdir" -name ".svn" -print0 | xargs -0 rm -rf
 }
 
diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD
index f75a1fa80..d4ac8dcc1 100644
--- a/community/freeradius/PKGBUILD
+++ b/community/freeradius/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 77120 2012-10-05 10:52:14Z spupykin $
+# $Id: PKGBUILD 87000 2013-03-25 19:16:38Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jason R Begley (jayray@digitalgoat.com>
 
 pkgname=freeradius
 pkgver=2.2.0
-pkgrel=3
+pkgrel=5
 pkgdesc="The premier open source RADIUS server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freeradius.org/"
 license=('GPL')
-depends=('krb5' 'pth' 'net-snmp' 'postgresql-libs' 'libmysqlclient')
+depends=('krb5' 'pth' 'net-snmp' 'postgresql-libs' 'libmariadbclient')
 makedepends=('libpcap' 'unixodbc' 'python2')
 optdepends=('libpcap' 'unixodbc' 'python2')
 options=('!libtool' '!makeflags')
@@ -35,7 +35,8 @@ build() {
 	      --prefix=/usr --enable-heimdal-krb5 \
 	      --localstatedir=/var \
 	      --sysconfdir=/etc \
-	      --libdir=/usr/lib/freeradius
+	      --libdir=/usr/lib/freeradius \
+	      --with-udpfromto
   make
 }
 
diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD
index 0104917e1..e21783928 100644
--- a/community/freerdp/PKGBUILD
+++ b/community/freerdp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81895 2013-01-03 10:03:44Z spupykin $
+# $Id: PKGBUILD 84350 2013-02-16 22:50:28Z ioni $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
 
 pkgname=freerdp
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Free RDP client"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freerdp.sourceforge.net"
diff --git a/community/freevo/PKGBUILD b/community/freevo/PKGBUILD
deleted file mode 100644
index 1d7a95dea..000000000
--- a/community/freevo/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 73149 2012-07-02 12:22:07Z giovanni $
-# Maintainer: Ronald van Haren  <ronald.archlinux.org>
-
-pkgname=freevo
-pkgver=1.9.0
-pkgrel=8
-pkgdesc="An open-source home theatre PC platform"
-url="http://freevo.sourceforge.net/"
-license=('GPL2')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('lame' 'flac' 'faad2' 'cdparanoia' 'vorbis-tools' 'fbset' 
-         'smpeg' 'pil' 'python-pysqlite-legacy' 'pyxml' 'lsdvd' 
-         'twisted' 'python2-numpy' 'python-pygame' 'kaa-metadata' 
-         'kaa-imlib2' 'python2-beautifulsoup3' 'python-html5lib')
-optdepends=('mplayer: most features' 
-            'xine-lib: can be used instead of mplayer' 
-            'tvtime: watching tv' 
-            'xmltv: parsing online tv guides')
-install=freevo.install
-options=('docs')
-source=("http://downloads.sourceforge.net/freevo/$pkgname-$pkgver.tar.gz"
-        'freevo.desktop'
-        'imdb-html5lib.patch')
-sha1sums=('0533a2d4ff8a7b09b3b233fdf303ff56bda22d16'
-          '5f6e76dc58496f072aca29257c24be5ffa9c6c7d'
-          '57e1099527603500c594fbffa2cb7233b636eed1')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # patch from http://sourceforge.net/tracker/index.php?func=detail&aid=2924872&group_id=46652&atid=446895
-  patch -p0 < ${srcdir}/imdb-html5lib.patch
-  python2 setup.py install --prefix=${pkgdir}/usr
-  
-  install -Dm644 local_conf.py.example ${pkgdir}/usr/share/doc/freevo/local_conf.py.example
-
-  # install .desktop file and icon
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/share/icons/misc/freevo_app.png \
-        ${pkgdir}/usr/share/pixmaps/freevo.png
-  install -Dm644 ${srcdir}/freevo.desktop \
-        ${pkgdir}/usr/share/applications/freevo.desktop
-
-  # fix executable for python 2.7
-  sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
-        $(find ${pkgdir} -regex ".*.py\|.*.recipe")
-  sed -i "s:python:python2:g" ${pkgdir}/usr/share/freevo/htdocs/downloadurl
-}
diff --git a/community/freevo/freevo.desktop b/community/freevo/freevo.desktop
deleted file mode 100644
index 1b57043be..000000000
--- a/community/freevo/freevo.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Freevo
-GenericName=Freevo
-Comment=Home theatre
-Exec=freevo
-Terminal=false
-Type=Application
-Icon=/usr/share/pixmaps/freevo.png
-Categories=AudioVideo;
-
diff --git a/community/freevo/freevo.install b/community/freevo/freevo.install
deleted file mode 100644
index 06734569d..000000000
--- a/community/freevo/freevo.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-  if [ ! -d /etc/freevo ]; then
-    mkdir /etc/freevo
-  fi
-
-  if [ ! -f /etc/freevo/local_conf.py ]; then
-    cp /usr/share/doc/freevo/local_conf.py.example /etc/freevo/local_conf.py
-  fi
-
-cat << _EOF
-
-==> freevo installation notes:
----------------------------------------
-   Run 'freevo setup --help' and follow the instructions. Then edit  
-   /etc/freevo/local_conf.py to suit your needs. This file can be 
-   installed on a per-user basis in ~/.freevo and will take precedence  
-   over the one in /etc/freevo/.
-
-_EOF
-
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/community/freevo/imdb-html5lib.patch b/community/freevo/imdb-html5lib.patch
deleted file mode 100644
index 6f454246e..000000000
--- a/community/freevo/imdb-html5lib.patch
+++ /dev/null
@@ -1,301 +0,0 @@
-Index: src/helpers/imdb.py
-===================================================================
---- src/helpers/imdb.py	(revision 11608)
-+++ src/helpers/imdb.py	(working copy)
-@@ -53,19 +53,19 @@
-     parser = OptionParser(version='%prog 1.0', conflict_handler='resolve', usage="""
- Search IMDB for a movie or a TV show
- 
--freevo imdb [options] <search> [<output> <video file> [<video file>]]
-+freevo imdb [options] | [<result> <fxd file> <video file> [<video file>]]
- 
--Generate <output>.fxd for the movie.  Files is a list of files that belongs to
--this movie.  Use [dvd|vcd] to add the whole disc or use [dvd|vcd][title] to add
--a special DVD or VCD title to the list of files""")
-+Generate a fxd for the movie.  Files is a list of files that belongs to this
-+movie.  Use [dvd|vcd] to add the whole disc or use [dvd|vcd][title] to add a
-+special DVD or VCD title to the list of files""")
-     parser.add_option('-v', '--verbose', action='count', default=0,
-         help='set the level of verbosity [default:%default]')
-     parser.add_option('-s', '--search', action='store_true', dest='search', default=False,
-         help='search imdb for string [default:%default]')
-     parser.add_option('-g', '--guess', action='store_true', dest='guess', default=False,
-         help='search imdb for possible filename match [default:%default]')
--    parser.add_option('--tv', action='store_true', dest='tv', default=False,
--        help='specify the search is a tv programme [default:%default]')
-+    parser.add_option('--tv', action='store', dest='tv', default=None,
-+        help='specify the id of a tv programme for a eipsode search [default:%default]')
-     parser.add_option('--season', dest='season', default=None,
-         help='specify the season in the search [default:%default]')
-     parser.add_option('--episode', dest='episode', default=None,
-@@ -116,7 +116,9 @@
-         sys.exit(u'--search requires <search pattern>')
-     elif opts.guess and len(args) < 1:
-         sys.exit(u'--guess requires <guess pattern>')
--    tv_marker = (opts.tv or opts.season or opts.episode) and '"' or ''
-+    #elif opts.tv and len(args) < 1:
-+    #    sys.exit(u'--tv requires <imdb id>')
-+    tv_marker = (opts.season or opts.episode) and '"' or ''
- 
-     if opts.rom_drive is not None:
-         driveset = True
-@@ -176,6 +178,23 @@
-             print '%s' % title.encode(opts.encoding)
-         sys.exit(0)
- 
-+    if opts.tv:
-+        print "Searching IMDB for '%s' season:%s episode:%s..." % (opts.tv, opts.season, opts.episode)
-+        results = fxd.getIMDBid(opts.tv, opts.season, opts.episode)
-+        if len(results) == 0:
-+            print 'No results'
-+        #for result in results:
-+        #    if result[3]:
-+        #        title = 'http://www.imdb.com/title/tt%s/  %s  %s (%s) %s' % (result[:1] + result[:4])
-+        #    elif result[2]:
-+        #        title = 'http://www.imdb.com/title/tt%s/  %s  %s (%s)' % (result[:1] + result[:3])
-+        #    else:
-+        #        title = 'http://www.imdb.com/title/tt%s/  %s  %s' % (result[:1] + result[:2])
-+        #    title = results
-+        title = 'http://www.imdb.com/title/tt%s/  %s' % (results, results)
-+        print '%s' % title.encode(opts.encoding)
-+        sys.exit(0)
-+
-     # normal usage
-     if len(args) < 3:
-         sys.exit(u'requires <imdb id> <fxd filename> <video file>|<cd id>')
-Index: src/util/fxdimdb.py
-===================================================================
---- src/util/fxdimdb.py	(revision 11608)
-+++ src/util/fxdimdb.py	(working copy)
-@@ -48,8 +48,15 @@
- import codecs
- import os
- import traceback
--from BeautifulSoup import BeautifulSoup, NavigableString
--import HTMLParser
-+from pprint import pprint, pformat
-+try:
-+    from html5lib import HTMLParser, treebuilders
-+    from html5lib.treebuilders.soup import NavigableString
-+    using_html5lib = True
-+except ImportError:
-+    import HTMLParser
-+    from BeautifulSoup import BeautifulSoup, BeautifulStoneSoup, NavigableString
-+    using_html5lib = False
- 
- import config
- import util
-@@ -232,6 +239,7 @@
-         response.close()
- 
-         _debug_('id_list has %s items' % (len(self.id_list)))
-+        #print 'id_list=%s' % (pformat(self.id_list))
-         if len(self.id_list) > 20:
-             # too many results, check if there are stupid results in the list
-             words = []
-@@ -311,7 +319,11 @@
-         dvd = 0
- 
-         try:
--            soup = BeautifulSoup(results.read(), convertEntities='xml')
-+            if using_html5lib:
-+                parser = HTMLParser(tree=treebuilders.getTreeBuilder('beautifulsoup'))
-+                soup = parser.parse(results.read())
-+            else:
-+                soup = BeautifulSoup(results.read(), convertEntities=BeautifulStoneSoup.HTML_ENTITIES)
-         except UnicodeDecodeError:
-             print "Unicode error: check that /usr/lib/python2.x/site.py has the correct default encoding"
-             traceback.print_exc()
-@@ -336,68 +348,61 @@
-             self.info['year'] = y[1:-1]
-         except (AttributeError, TypeError, ValueError):
-             self.info['title'] = self.title
--            self.info['year'] = title.find('a').string.strip()
-+            try:
-+                self.info['year'] = title.find('a').contents[0].strip()
-+            except AttributeError:
-+                self.info['year'] = ''
- 
-         # Find the <div> with class info, each <h5> under this provides info
-+        wanted_keys = ('release_date', 'genre', 'tagline', 'plot', 'plot_keywords',
-+                       'also_known_as', 'mpaa', 'runtime', 'country', 'language', 
-+                       'color', 'aspect_ratio', 'sound_mix', 'certification',
-+                       )
-+        
-         for info in main.findAll('div', {'class' : 'info'}):
-             infoh5 = info.find('h5')
-             if not infoh5:
-                 continue
-             try:
--                infostr = infoh5.next
--                key = infostr.string.strip(':').lower().replace(' ', '_')
--                nextsibling = nextsibling = infoh5.nextSibling.strip()
--                sections = info.findAll('a', { 'href' : re.compile('/Sections') })
--                lists = info.findAll('a', { 'href' : re.compile('/List') })
--                if len(nextsibling) > 0:
--                    self.info[key] = nextsibling
-+                infostr = infoh5.find(text=True)
-+                key = infostr.strip().strip(':').lower().replace(' ', '_')
-+                if key not in wanted_keys:
-+                    continue
-+                content = info.find('div', {'class' : 'info-content'})
-+                infocontent = content.find(text=True)
-+                if infocontent:
-+                    infocontent = infocontent.strip()
-+                sections = info.findAll('a', { 'href' : re.compile('^/Sections') })
-+                lists = info.findAll('a', { 'href' : re.compile('^/List') })
-+                keywords = info.findAll('a', { 'href' : re.compile('^/keyword') })
-+                #print 'key=%s content=%r keywords=%r sections=%r lists=%r' % (key, infocontent, keywords, sections, lists)
-+                if len(infocontent) > 0:
-+                    self.info[key] = infocontent
-                 elif len(sections) > 0:
-                     items = []
-                     for item in sections:
--                        items.append(item.string)
-+                        items.append(item.contents[0].strip())
-                     self.info[key] = ' / '.join(items)
-                 elif len(lists) > 0:
-                     items = []
-                     for item in lists:
--                        items.append(item.string)
-+                        items.append(item.contents[0].strip())
-                     self.info[key] = ' / '.join(items)
-+                elif len(keywords) > 0:
-+                    items = []
-+                    for item in keywords:
-+                        items.append(item.contents[0].strip())
-+                    self.info[key] = ' / '.join(items)
-             except:
-                 pass
- 
--        # Find Plot Outline/Summary:
--        # Normally the tag is named "Plot Outline:" - however sometimes
--        # the tag is "Plot Summary:" or just "Plot:". Search for all strings.
--        imdb_result = soup.find(text='Plot Outline:')
--        if not imdb_result:
--            imdb_result = soup.find(text='Plot Summary:')
--        if not imdb_result:
--            imdb_result = soup.find(text='Plot:')
--        if imdb_result:
--            self.info['plot'] = imdb_result.next.strip()
--        else:
--            self.info['plot'] = u''
--
--        # Find tagline - sometimes the tagline is missing.
--        # Use an empty string if no tagline could be found.
--        imdb_result = soup.find(text='Tagline:')
--        if imdb_result:
--            self.info['tagline'] = imdb_result.next.strip()
--        else:
--            self.info['tagline'] = u''
--
-         rating = soup.find(text='User Rating:').findNext(text=re.compile('/10'))
--        if rating:
-+        try:
-             votes = rating.findNext('a')
--            self.info['rating'] = rating.strip() + ' (' + votes.string.strip() + ')'
--        else:
-+            self.info['rating'] = rating.strip() + ' (' + votes.contents[0].strip() + ')'
-+        except AttributeError:
-             self.info['rating'] = ''
- 
--        runtime = soup.find(text='Runtime:')
--        if runtime and runtime.next:
--            self.info['runtime'] = runtime.next.strip()
--        else:
--            self.info['runtime'] = ''
--
-         # Replace special characters in the items
-         for (k,v) in self.info.items():
-             self.info[k] = self.convert_entities(v)
-@@ -794,10 +799,14 @@
-         _debug_('parsesearchdata(results=%r, url=%r, id=%r)' % (results, url, id))
- 
-         self.id_list = []
--        m = re.compile('/title/tt([0-9]*)/')
--        y = re.compile('\(([^)]+)\)')
-+        m = re.compile('/title/tt(\d+)/')
-+        y = re.compile('\((\d+)\) *(.*)')
-         try:
--            soup = BeautifulSoup(results.read(), convertEntities='xml')
-+            if using_html5lib:
-+                parser = HTMLParser(tree=treebuilders.getTreeBuilder('beautifulsoup'))
-+                soup = parser.parse(results.read())
-+            else:
-+                soup = BeautifulSoup(results.read(), convertEntities=BeautifulStoneSoup.HTML_ENTITIES)
-         except HTMLParser.HTMLParseError, why:
-             traceback.print_exc()
-             _debug_('Cannot parse %r: %s' % (url, why), DWARNING)
-@@ -806,28 +815,37 @@
-             traceback.print_exc()
-             _debug_('Cannot parse %r: %s' % (url, why), DWARNING)
-             return self.id_list
--        items = soup.findAll('a', href=re.compile('/title/tt'))
-+        items = soup.findAll('a', href=re.compile('^/title/tt'))
-         ids = set([])
-         for item in items:
--            idm = m.search(item['href'])
-+            idm = item.attrMap['href']
-             if not idm:
-                 continue
--            if isinstance(item.next.next, NavigableString):
--                yrm = y.findall(item.next.next)
--
--            id = idm.group(1)
--            name = item.string
--            # skip empty names
--            if not name:
-+            m_match = m.match(idm)
-+            if not m_match:
-+                # skip invalid titles
-                 continue
--            # skip duplicate ids
-+            id = m_match.group(1)
-             if id in ids:
-+                # skip duplicate ids
-                 continue
-+            name = item.contents[0]
-+            if not isinstance(name, NavigableString):
-+                # skip empty names
-+                continue
-+            if isinstance(item.next.next, NavigableString):
-+                yrm = item.next.next.strip()
-             ids.add(id)
--            year = len(yrm) > 0 and yrm[0] or '0000'
--            type = len(yrm) > 1 and yrm[1] or ''
-+            y_match = y.match(yrm)
-+            if y_match:
-+                year = y_match.group(1)
-+                type = y_match.group(2)
-+            else:
-+                year = '0000'
-+                type = ''
-             #print 'url', item['href']
-             #print item.parent.findChildren(text=re.compile('[^ ]'))
-+            #print 'id=%s name=%s year=%s type=%s' % (id, name, year, type)
-             self.id_list += [ ( id, name, year, type ) ]
- 
-         for item in self.id_list:
-@@ -840,7 +858,11 @@
-         Returns a new id for getIMDBid with TV series episode data
-         """
-         try:
--            soup = BeautifulSoup(results.read(), convertEntities='xml')
-+            if using_html5lib:
-+                parser = HTMLParser(tree=treebuilders.getTreeBuilder('beautifulsoup'))
-+                soup = parser.parse(results.read())
-+            else:
-+                soup = BeautifulSoup(results.read(), convertEntities=BeautifulStoneSoup.HTML_ENTITIES)
-         except UnicodeDecodeError:
-             print "Unicode error; check that /usr/lib/python2.x/site.py has the correct default encoding"
-             pass
-@@ -968,9 +990,6 @@
-         self.image = vfs.basename(self.image)
- 
-         _debug_('Downloaded cover image from %s' % (self.image_url))
--        print "Freevo knows nothing about the copyright of this image, please"
--        print "go to %s to check for more information about private." % self.image_url
--        print "use of this image"
- 
- 
-     def str2XML(self, line):
diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD
index 2290488fd..64feb6a07 100644
--- a/community/freewrl/PKGBUILD
+++ b/community/freewrl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 78928 2012-10-27 23:44:21Z ebelanger $
+# $Id: PKGBUILD 88678 2013-04-21 22:16:45Z heftig $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=freewrl
 pkgver=1.22.13.1
 _pkgver=1.22.13
-pkgrel=3
+pkgrel=4
 pkgdesc="VRML viewer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freewrl.sourceforge.net/"
diff --git a/community/freewrl/build-fix.patch b/community/freewrl/build-fix.patch
deleted file mode 100644
index c0de71d07..000000000
--- a/community/freewrl/build-fix.patch
+++ /dev/null
@@ -1,1201 +0,0 @@
-diff -wbBur freewrl-1.22.10/src/lib/non_web3d_formats/ColladaParser.c freewrl-1.22.10.my/src/lib/non_web3d_formats/ColladaParser.c
---- freewrl-1.22.10/src/lib/non_web3d_formats/ColladaParser.c	2010-08-19 06:20:36.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/non_web3d_formats/ColladaParser.c	2011-07-04 01:19:07.000000000 +0400
-@@ -54,7 +54,7 @@
- #include "ColladaParser.h"
- 
- #if HAVE_EXPAT_H
--# include <expat.h>
-+# include </usr/include/expat.h>
- #endif
- 
- #define PROTOINSTANCE_MAX_LEVELS 10
-diff -wbBur freewrl-1.22.10/src/lib/world_script/fieldGet.c freewrl-1.22.10.my/src/lib/world_script/fieldGet.c
---- freewrl-1.22.10/src/lib/world_script/fieldGet.c	2010-10-13 23:45:26.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/fieldGet.c	2011-07-04 20:21:21.000000000 +0400
-@@ -412,7 +412,7 @@
- 				/* create a new SFFloat object */
- 				
- 				fp = (float *)fp_in; 
--				newjsval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)*fp));
-+				newjsval = JS_NewJSVal(cx,(double)*fp);
- 				fp_in = offsetPointer_deref(float *,fp_in,elementlen);
- 
- 				/* put this object into the MF class */
-@@ -449,7 +449,7 @@
- 				/* create a new SFTime object */
- 				
- 				fp = (float *)fp_in; 
--				newjsval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)*fp));
-+				newjsval = JS_NewJSVal(cx,(double)*fp);
- 				fp_in = offsetPointer_deref(float *,fp_in,elementlen);
- 
- 				/* put this object into the MF class */
-diff -wbBur freewrl-1.22.10/src/lib/world_script/fieldSet.c freewrl-1.22.10.my/src/lib/world_script/fieldSet.c
---- freewrl-1.22.10/src/lib/world_script/fieldSet.c	2010-09-22 00:00:25.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/fieldSet.c	2011-07-04 20:03:53.000000000 +0400
-@@ -748,7 +748,7 @@
- 
- 	#ifdef SETFIELDVERBOSE
- 	strval = JS_ValueToString(scriptContext, JSglobal_return_val);
--       	strp = JS_GetStringBytes(strval);
-+	strp = JS_EncodeString(scriptContext, strval);
- 	printf ("start of setField_javascriptEventOut, to %ld:%d = %p, fieldtype %d string %s\n",(long)tn, tptr, memptr, fieldType, strp);
- 	#endif
- 
-@@ -813,7 +813,7 @@
- 		case FIELDTYPE_SFImage: {
- 			/* the string should be saved as an SFImage */
- 			strval = JS_ValueToString(scriptContext, JSglobal_return_val);
--	        	strp = JS_GetStringBytes(strval);
-+	        	strp = JS_EncodeString(scriptContext, strval);
- 
- 			Parser_scanStringValueToMem(tn, tptr, FIELDTYPE_SFImage, strp, FALSE);
- 			break;
-@@ -824,7 +824,7 @@
- 			uintptr_t *newptr;
- 
- 			strval = JS_ValueToString(scriptContext, JSglobal_return_val);
--	        	strp = JS_GetStringBytes(strval);
-+	        	strp = JS_EncodeString(scriptContext, strval);
- 
- 			/* copy the string over, delete the old one, if need be */
- 			/* printf ("fieldSet SFString, tn %d tptr %d offset from struct %d\n",
-@@ -844,7 +844,7 @@
- 				struct X3D_Node *mynode;
- 
- 				strval = JS_ValueToString(scriptContext, JSglobal_return_val);
--	        		strp = JS_GetStringBytes(strval);
-+	        		strp = JS_EncodeString(scriptContext, strval);
- 				
- 				/* we will have at least one node here, in an ascii string */
- 				while ((*strp > '\0') && (*strp <= ' ')) strp ++;
-@@ -1227,7 +1227,7 @@
- 			JSString *_tmpStr;
- 
- 	                _tmpStr = JS_ValueToString(cx, mainElement);
--			strp = JS_GetStringBytes(_tmpStr);
-+			strp = JS_EncodeString(scriptContext, _tmpStr);
- 	                printf ("sub element %d is \"%s\" \n",i,strp);  
- 
- 			if (JSVAL_IS_OBJECT(mainElement)) printf ("sub element %d is an OBJECT\n",i);
-@@ -1329,7 +1329,7 @@
- 				JSString *strval;
- 	
- 	                        strval = JS_ValueToString(cx, mainElement);
--	                        strp = JS_GetStringBytes(strval);
-+	                        strp = JS_EncodeString(cx, strval);
- 	
- 				#ifdef SETFIELDVERBOSE
- 				printf ("getJSMultiNumType, got string %s\n",strp); 
-@@ -1441,7 +1441,7 @@
- 			return;
- 		}
- 		strval = JS_ValueToString(cx, _v);
--		valStr = JS_GetStringBytes(strval);
-+		valStr = JS_EncodeString(cx, strval);
- 
- 		/* printf ("new string %d is %s\n",i,valStr); */
- 
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsUtils.c freewrl-1.22.10.my/src/lib/world_script/jsUtils.c
---- freewrl-1.22.10/src/lib/world_script/jsUtils.c	2010-06-03 23:38:37.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsUtils.c	2011-07-04 20:21:44.000000000 +0400
-@@ -134,7 +134,7 @@
- 			nf = OBJECT_TO_JSVAL(me);
- 
- 			#ifdef JSVRMLCLASSESVERBOSE
--			printf ("parentField is %u \"%s\"\n", pf, JS_GetStringBytes(JSVAL_TO_STRING(pf)));
-+			printf ("parentField is %u \"%s\"\n", pf, JS_EncodeString(cx, JSVAL_TO_STRING(pf)));
- 			#endif
- 
- 			if (!setSFNodeField (cx, par, pf, &nf)) {
-@@ -197,7 +197,7 @@
-         		char *_id_c;
- 
-         		_idStr = JS_ValueToString(cx, *newval);
--        		_id_c = JS_GetStringBytes(_idStr);
-+        		_id_c = JS_EncodeString(cx, _idStr);
- 
- 			oldS = (struct Uni_String *) *((uintptr_t *)Data);
- 
-@@ -305,12 +305,12 @@
- 
- 		case FIELDTYPE_SFFloat:	{
- 			memcpy ((void *) &fl, Data, datalen);
--			*newval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)fl));
-+			*newval = JS_NewJSVal(cx,(double)fl);
- 			break;
- 		}
- 		case FIELDTYPE_SFTime:	{
- 			memcpy ((void *) &dl, Data, datalen);
--			*newval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,dl));
-+			*newval = JS_NewJSVal(cx,dl);
- 			break;
- 		}
- 		case FIELDTYPE_SFBool:
-@@ -824,7 +824,7 @@
- 	struct X3D_Node *node;
- 
- 	_idStr = JS_ValueToString(context, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(context, _idStr);
- 	
- 	#ifdef JSVRMLCLASSESVERBOSE
- 	printf ("\ngetSFNodeField called on name %s object %u\n",_id_c, obj);
-@@ -912,7 +912,7 @@
- 
- 	/* get the id field... */
- 
--	_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id));
-+	_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id));
- 	
- 	#ifdef JSVRMLCLASSESVERBOSE
- 	printf ("\nsetSFNodeField called on name %s object %u, jsval %u\n",_id_c, obj, *vp);
-@@ -1131,10 +1131,10 @@
- 	char *_id_c = "(no value in string)";
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	/* printf ("hmmm...js_SetPropertyCheck called on string \"%s\" object %u, jsval %u\n",_id_c, obj, *vp); */
- 	} else if (JSVAL_IS_DOUBLE(id)) {
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyCheck called on double %s object %u, jsval %u\n",_id_c, obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1192,7 +1192,7 @@
- 	/* get the id field... */
- 
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_GetPropertyDebug called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1211,7 +1211,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1229,7 +1229,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug1 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1247,7 +1247,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	printf ("...js_SetPropertyDebug2 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1265,7 +1265,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug3 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1283,7 +1283,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug4 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1301,7 +1301,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug5 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1319,7 +1319,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug6 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1337,7 +1337,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug7 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1355,7 +1355,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug8 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1373,7 +1373,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug9 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLBrowser.c freewrl-1.22.10.my/src/lib/world_script/jsVRMLBrowser.c
---- freewrl-1.22.10/src/lib/world_script/jsVRMLBrowser.c	2010-08-02 23:55:57.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLBrowser.c	2011-07-04 20:06:25.000000000 +0400
-@@ -336,7 +336,7 @@
- 			return JS_FALSE;
- 		}
- 		_str = JS_ValueToString(context, argv[0]);
--		_costr = JS_GetStringBytes(_str);
-+		_costr = JS_EncodeString(context, _str);
- 
- 		/* sanitize string, for the EAI_RW call (see EAI_RW code) */
- 		tptr = _costr;
-@@ -385,10 +385,10 @@
- 			return JS_FALSE;
- 		}
- 		_str[0] = JS_ValueToString(context, argv[0]);
--		_costr[0] = JS_GetStringBytes(_str[0]);
-+		_costr[0] = JS_EncodeString(context, _str[0]);
- 
- 		_str[1] = JS_ValueToString(context, argv[1]);
--		_costr[1] = JS_GetStringBytes(_str[1]);
-+		_costr[1] = JS_EncodeString(context, _str[1]);
- 
- 		/* we use the EAI code for this - so reformat this for the EAI format */
- 		{
-@@ -575,7 +575,7 @@
- 	/* third parameter should be a string */
- 	if (JSVAL_IS_STRING(argv[2])) {
- 		_str[1] = JSVAL_TO_STRING(argv[2]);
--		fieldStr = JS_GetStringBytes(_str[1]);
-+		fieldStr = JS_EncodeString(context, _str[1]);
- 		#ifdef JSVERBOSE
- 		printf ("field string is :%s:\n",fieldStr); 
- 		#endif
-@@ -590,7 +590,7 @@
- 
- 	/* get the URL listing as a string */
- 	_str[0] = JS_ValueToString(context, argv[0]);
--	_costr0 = JS_GetStringBytes(_str[0]);
-+	_costr0 = JS_EncodeString(context, _str[0]);
- 
- 
- 	#ifdef JSVERBOSE
-@@ -690,7 +690,7 @@
- 	for (count=0; count < argc; count++) {
- 		if (JSVAL_IS_STRING(argv[count])) {
- 			_str = JSVAL_TO_STRING(argv[count]);
--			_id_c = JS_GetStringBytes(_str);
-+			_id_c = JS_EncodeString(context, _str);
- 			#if defined(AQUA) || defined(_MSC_VER)
- 			BrowserPrintConsoleMessage(_id_c); /* statusbar hud */
- 			consMsgCount = 0; /* reset the "Maximum" count */
-@@ -850,7 +850,7 @@
- 
- 	/* parameter should be a string */
- 	if (JSVAL_IS_STRING(argv[0])) {
--		target = JS_GetStringBytes( JSVAL_TO_STRING(argv[0]));
-+		target = JS_EncodeString(context,  JSVAL_TO_STRING(argv[0]));
- 		#ifdef JSVERBOSE
- 		printf ("field string is %s\n",target); 
- 		#endif
-@@ -930,7 +930,7 @@
- 
- 	/* parameters should be a string */
- 	if (JSVAL_IS_STRING(argv[0])) {
--		targetDevice = JS_GetStringBytes( JSVAL_TO_STRING(argv[0]));
-+		targetDevice = JS_EncodeString(cx,  JSVAL_TO_STRING(argv[0]));
- 		#ifdef JSVERBOSE
- 		printf ("field string is %s\n",targetDevice); 
- 		#endif
-@@ -939,7 +939,7 @@
- 		return -1;
- 	}
- 	if (JSVAL_IS_STRING(argv[1])) {
--		targetController = JS_GetStringBytes( JSVAL_TO_STRING(argv[1]));
-+		targetController = JS_EncodeString(cx,  JSVAL_TO_STRING(argv[1]));
- 		#ifdef JSVERBOSE
- 		printf ("field string is %s\n",targetController); 
- 		#endif
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.c
---- freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.c	2010-09-22 23:40:48.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.c	2011-07-04 20:08:03.000000000 +0400
-@@ -935,7 +935,7 @@
-                 		        printf( "JS_NewDouble failed for %f in simplecopyelements.\n",dd);
-                         		return JS_FALSE;
-                 		}
--                		val = DOUBLE_TO_JSVAL(dp);
-+                		val = DOUBLE_TO_JSVAL(*dp);
- 
- 			}
- 		}
-@@ -1108,7 +1108,7 @@
- 
- 		printf ("HAVE STRING HERE!\n");
- 		_str = JS_ValueToString(cx, id);
--		asciiStr = JS_GetStringBytes(_str);
-+		asciiStr = JS_EncodeString(context, _str);
- 		printf ("we have as a parameter :%s:\n",asciiStr);
- 		#endif
- 
-@@ -1185,7 +1185,7 @@
- 			if (_tmpStr==NULL) {
- 				_tmp_valStr = "NULL";
- 			} else {
--				_tmp_valStr = JS_GetStringBytes(_tmpStr);
-+				_tmp_valStr = JS_EncodeString(cx, _tmpStr);
- 			}
- 		}
- 
-@@ -1281,7 +1281,7 @@
- 	#endif
- 
- 	str = JS_ValueToString(cx, id);
--	p = JS_GetStringBytes(str);
-+	p = JS_EncodeString(cx, str);
- 	#ifdef JSVRMLCLASSESVERBOSE
- 		printf("\tid string  %s\n ",p);
- 	#endif
-@@ -1368,12 +1368,12 @@
- 	char * _c;
- 		printf ("doMFSetProperty, for object %u, vp %u\n", obj,*vp);
- 		_str = JS_ValueToString(cx, id);
--		_c = JS_GetStringBytes(_str);
-+		_c = JS_EncodeString(cx, _str);
- 		printf ("id is %s\n",_c);
- 
- 		_sstr = JS_ValueToString(cx, *vp);
- 		printf ("looking up value for %d %x object %p\n",*vp,*vp,obj);
--			_cc = JS_GetStringBytes(_sstr);
-+			_cc = JS_EncodeString(cx, _sstr);
- 			printf("\tdoMFSetProperty:%d: obj = %p, id = %s, vp = %s\n",type,
- 			   obj, _c, _cc);
- 		if (JSVAL_IS_OBJECT(*vp)) { printf ("doMFSet, vp is an OBJECT\n"); }
-@@ -1397,7 +1397,7 @@
- 
- 			if (!JS_ValueToInt32(cx, *vp, &i)) {
- 				_sstr = JS_ValueToString(cx, *vp);
--				_cc = JS_GetStringBytes(_sstr);
-+				_cc = JS_EncodeString(cx, _sstr);
- 				printf ("can not convert %s to an integer in doMFAddProperty for type %d\n",_cc,type);
- 				return JS_FALSE;
- 			}
-@@ -1408,7 +1408,7 @@
- 		#ifdef JSVRMLCLASSESVERBOSE
- 		printf ("doMFSetProperty - ensure that this is a DOUBLE ");
- 				_sstr = JS_ValueToString(cx, *vp);
--				_cc = JS_GetStringBytes(_sstr);
-+				_cc = JS_EncodeString(cx, _sstr);
- 				printf ("value is  %s \n",_cc);
- 		#endif
- 
-@@ -1420,7 +1420,7 @@
-                		        printf( "JS_NewDouble failed for %f in simplecopyelements.\n",dd);
-                        		return JS_FALSE;
-                		}
--               		*vp = DOUBLE_TO_JSVAL(dp);
-+               		*vp = DOUBLE_TO_JSVAL(*dp);
- 
- 		}
- 	}
-@@ -1511,7 +1511,7 @@
- 			nf = OBJECT_TO_JSVAL(me);
- 
- 			#ifdef JSVRMLCLASSESVERBOSE
--			printf ("parentField is %u \"%s\"\n", pf, JS_GetStringBytes(JSVAL_TO_STRING(pf)));
-+			printf ("parentField is %u \"%s\"\n", pf, JS_EncodeString(cx, JSVAL_TO_STRING(pf)));
- 			#endif
- 
- 			if (!setSFNodeField (cx, par, pf, &nf)) {
-@@ -1535,7 +1535,7 @@
- 	unsigned int i, j = 0;
- 
- 	_str = JS_ValueToString(cx, *vp);
--	_buff = JS_GetStringBytes(_str);
-+	_buff = JS_EncodeString(cx, _str);
- 	_buff_len = strlen(_buff) + 1;
- 
- 	#ifdef JSVRMLCLASSESVERBOSE
-@@ -1719,14 +1719,14 @@
- 	size_t len = 0;
- 
- 	_idStr = JS_ValueToString(context, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(context, _idStr);
- 
-         /* "register" this ECMA value for routing changed flag stuff */
-        	setInECMATable(context, _id_c);
- 
- 	if (JSVAL_IS_STRING(*vp)) {
- 		_vpStr = JS_ValueToString(context, *vp);
--		_vp_c = JS_GetStringBytes(_vpStr);
-+		_vp_c = JS_EncodeString(context, _vpStr);
- 
- 		len = strlen(_vp_c);
- 
-@@ -1752,7 +1752,7 @@
- 	} else {
- 		#ifdef JSVRMLCLASSESVERBOSE
- 		_vpStr = JS_ValueToString(context, *vp);
--		_vp_c = JS_GetStringBytes(_vpStr);
-+		_vp_c = JS_EncodeString(cx, _vpStr);
- 		printf("setECMANative: obj = %p, id = \"%s\", vp = %s\n",
- 			   obj, _id_c, _vp_c);
- 		#endif
-@@ -1770,9 +1770,9 @@
- 	JSString *_idStr, *_vpStr;
- 	char *_id_c, *_vp_c;
- 		_idStr = JS_ValueToString(cx, id);
--		_id_c = JS_GetStringBytes(_idStr);
-+		_id_c = JS_EncodeString(cx, _idStr);
- 		_vpStr = JS_ValueToString(cx, *vp);
--		_vp_c = JS_GetStringBytes(_vpStr);
-+		_vp_c = JS_EncodeString(cx, _vpStr);
- 		printf("getAssignProperty: obj = %p, id = \"%s\", vp = %s\n",
- 			   obj, _id_c, _vp_c);
- 	printf ("what is vp? \n");
-@@ -1803,7 +1803,7 @@
- 
- 	if (JSVAL_IS_STRING(id)) {
- 		_str = JSVAL_TO_STRING(id);
--		_id_c = JS_GetStringBytes(_str);
-+		_id_c = JS_EncodeString(cx, _str);
- 		if (!JS_ConvertValue(cx, *vp, JSTYPE_OBJECT, &newVal)) {
- 			printf( "JS_ConvertValue failed in setAssignProperty.\n");
- 			return JS_FALSE;
-@@ -1834,9 +1834,9 @@
-                 if (JSVAL_IS_DOUBLE(id)) printf ("id is an DOUBLE\n");
-                 if (JSVAL_IS_INT(id)) printf ("id is an INT\n");
- 
--		printf ("id is %s\n",JS_GetStringBytes(JS_ValueToString(cx,id)));
--		printf ("initVal is %s\n",JS_GetStringBytes(JS_ValueToString(cx,initVal)));
--		printf ("newVal is %s\n",JS_GetStringBytes(JS_ValueToString(cx,newVal)));
-+		printf ("id is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,id)));
-+		printf ("initVal is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,initVal)));
-+		printf ("newVal is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,newVal)));
- 
- 		#endif
- 
-@@ -1859,7 +1859,7 @@
- 	} else {
- 		#ifdef JSVRMLCLASSESVERBOSE
- 			_str = JS_ValueToString(cx, id);
--			_id_c = JS_GetStringBytes(_str);
-+			_id_c = JS_EncodeString(cx, _str);
- 			printf("setAssignProperty: obj = %p, id = \"%s\"\n",
- 				   obj, _id_c);
- 		#endif
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.h freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.h
---- freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.h	2010-10-13 23:45:26.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.h	2011-07-04 20:24:53.000000000 +0400
-@@ -30,6 +30,21 @@
- #ifndef __FREEWRL_JS_VRML_CLASSES_H__
- #define __FREEWRL_JS_VRML_CLASSES_H__
- 
-+static inline jsval JS_NewJSVal(JSContext *cx, jsdouble d)
-+{
-+	jsval ret;
-+	JS_NewNumberValue(cx, d, &ret);
-+	return ret;
-+}
-+
-+static inline jsdouble * JS_NewDouble(JSContext *cx, jsdouble d)
-+{
-+	static jsdouble ret;
-+	jsval rv;
-+	JS_NewNumberValue(cx, d, &rv);
-+	ret = JSVAL_TO_DOUBLE(rv);
-+	return &ret;
-+}
- 
- #ifndef UNUSED
- #define UNUSED(v) ((void) v)
-@@ -80,14 +95,14 @@
- 
- 
- #define SET_JS_TICKTIME_FALSE(possibleRetVal) { jsval zimbo; \
--        zimbo = DOUBLE_TO_JSVAL(JS_NewDouble(cx, TickTime));  \
-+        zimbo = JS_NewJSVal(cx, TickTime);  \
-         if (!JS_DefineProperty(cx,obj, "__eventInTickTime", zimbo, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB2, JSPROP_PERMANENT)) {  \
-                 printf( "JS_DefineProperty failed for \"__eventInTickTime\" at %s:%d.\n",__FILE__,__LINE__); \
-                 return possibleRetVal; \
-         }}
- 
- #define SET_JS_TICKTIME() { jsval zimbo; \
--        zimbo = DOUBLE_TO_JSVAL(JS_NewDouble(cx, TickTime));  \
-+        zimbo = JS_NewJSVal(cx, TickTime);  \
-         if (!JS_DefineProperty(cx,obj, "__eventInTickTime", zimbo, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB2, JSPROP_PERMANENT)) {  \
-                 printf( "JS_DefineProperty failed for \"__eventInTickTime\" at %s:%d.\n",__FILE__,__LINE__); \
-                 return FALSE; \
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRML_MFClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRML_MFClasses.c
---- freewrl-1.22.10/src/lib/world_script/jsVRML_MFClasses.c	2010-09-22 23:40:48.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsVRML_MFClasses.c	2011-07-04 20:08:44.000000000 +0400
-@@ -596,7 +596,7 @@
- 			return;
- 		}
- 
--		val = DOUBLE_TO_JSVAL(dp);
-+		val = DOUBLE_TO_JSVAL(*dp);
- 
- 		if (!JS_SetElement(cx, obj, (jsint) i, &val)) {
- 			printf( "JS_DefineElement failed for arg %u in VrmlMatrixSetTransform.\n", i);
-@@ -1212,7 +1212,7 @@
- /*
-                 if (JSVAL_IS_STRING(id)==TRUE) {
-                 printf("        is a common string :%s:\n",
--                        JS_GetStringBytes(JS_ValueToString(cx, id)));
-+                        JS_EncodeString(cx, JS_ValueToString(cx, id)));
-                 }
-                 if (JSVAL_IS_OBJECT(id)==TRUE) {
-                         printf ("       parameter is an object\n");
-@@ -1231,7 +1231,7 @@
- 		_index = JSVAL_TO_INT(id);
- 
- 		if (_index >= _length) {
--			*vp = DOUBLE_TO_JSVAL(&zerojsdouble);
-+			*vp = DOUBLE_TO_JSVAL(zerojsdouble);
- 			if (!JS_DefineElement(cx, obj, (jsint) _index, *vp, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
- 				printf( "JS_DefineElement failed in VrmlMatrixGetProperty.\n");
- 				return JS_FALSE;
-@@ -1331,7 +1331,7 @@
- 	printf("MFStringAddProperty: vp = %p\n", obj);
-                 if (JSVAL_IS_STRING(*vp)==TRUE) {
- 		printf("	is a common string :%s:\n",
--                        JS_GetStringBytes(JS_ValueToString(cx, *vp)));
-+                        JS_EncodeString(cx, JS_ValueToString(cx, *vp)));
-                 }
-                 if (JSVAL_IS_OBJECT(*vp)==TRUE) {
-                         printf ("       parameter is an object\n");
-@@ -1345,7 +1345,7 @@
- 		printf("MFStringAddProperty: id = %p\n", obj);
-                 if (JSVAL_IS_STRING(id)==TRUE) {
- 		printf("	is a common string :%s:\n",
--                        JS_GetStringBytes(JS_ValueToString(cx, id)));
-+                        JS_EncodeString(cx, JS_ValueToString(cx, id)));
-                 }
-                 if (JSVAL_IS_OBJECT(id)==TRUE) {
-                         printf ("       parameter is an object\n");
-@@ -1494,7 +1494,7 @@
- 		if (JSVAL_IS_STRING(argv[i])==TRUE) {
-         	        printf (" Common String, is");
- 			_str = JS_ValueToString(cx, argv[i]);
--			printf (JS_GetStringBytes(_str));
-+			printf (JS_EncodeString(cx, _str));
- 			printf ("..");
- 		
- 	        }                                          
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRML_SFClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRML_SFClasses.c
---- freewrl-1.22.10/src/lib/world_script/jsVRML_SFClasses.c	2010-09-25 00:22:05.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsVRML_SFClasses.c	2011-07-04 20:09:01.000000000 +0400
-@@ -161,7 +161,7 @@
- 			printf( "JS_NewDouble failed for %f in SFColorGetHSV.\n", xp[i]);
- 			return JS_FALSE;
- 		}
--		_v = DOUBLE_TO_JSVAL(dp);
-+		_v = DOUBLE_TO_JSVAL(*dp);
-         	JS_SetElement(cx, result, (jsint)i, &_v); 
-         } 
- 
-@@ -336,7 +336,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -346,7 +346,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -356,7 +356,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	}
-@@ -387,13 +387,13 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 
- 		}
-@@ -422,18 +422,18 @@
- 	*rval = OBJECT_TO_JSVAL(_arrayObj);
- 
- 	/* construct new double before conversion? */
--	_v = DOUBLE_TO_JSVAL(&hue);
-+	_v = DOUBLE_TO_JSVAL(hue);
- 	if (!JS_SetElement(cx, _arrayObj, 0, &_v)) {
- 		printf( "JS_SetElement failed for hue in SFColorRGBAGetHSV.\n");
- 		return JS_FALSE;
- 	}
--	_v = DOUBLE_TO_JSVAL(&saturation);
-+	_v = DOUBLE_TO_JSVAL(saturation);
- 	if (!JS_SetElement(cx, _arrayObj, 1, &_v)) {
- 		printf( "JS_SetElement failed for saturation in SFColorRGBAGetHSV.\n");
- 		return JS_FALSE;
- 	}
- 
--	_v = DOUBLE_TO_JSVAL(&value);
-+	_v = DOUBLE_TO_JSVAL(value);
- 	if (!JS_SetElement(cx, _arrayObj, 2, &_v)) {
- 		printf( "JS_SetElement failed for value in SFColorRGBAGetHSV.\n");
- 		return JS_FALSE;
-@@ -601,7 +601,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -611,7 +611,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -621,7 +621,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 3:
- 			d = (ptr->v).c[3];
-@@ -631,7 +631,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	}
-@@ -662,16 +662,16 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 		case 3:
--			(ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 
- 		}
-@@ -983,7 +983,7 @@
- 	} else if (argc == 1) {
- 		/* is this a string, or a number indicating a node? */
- 		myStr = JS_ValueToString(cx, argv[0]);
--		cString = JS_GetStringBytes(myStr);
-+		cString = JS_EncodeString(cx, myStr);
- 		#ifdef JSVRMLCLASSESVERBOSE
- 		printf ("SFNodeConstr, argc =1l string %s\n",cString);
- 		#endif
-@@ -1067,13 +1067,13 @@
-         		char *_id_c;
- 
- 			_idStr = JS_ValueToString(cx, argv[0]);
--			_id_c = JS_GetStringBytes(_idStr);
-+			_id_c = JS_EncodeString(cx, _idStr);
- 			/* printf ("first string :%s:\n",_id_c); */
- 
- 			cString = STRDUP(_id_c);
- 
- 			_idStr = JS_ValueToString(cx, argv[1]);
--			_id_c = JS_GetStringBytes(_idStr);
-+			_id_c = JS_EncodeString(cx, _idStr);
- 			/* printf ("second string :%s:\n",_id_c); */
- 
- 			if (sscanf (_id_c,"%p",&newHandle) != 1) {
-@@ -1190,7 +1190,7 @@
- 	jsval rval;
- 
-         _idStr = JS_ValueToString(cx, id);
--        _id_c = JS_GetStringBytes(_idStr);
-+        _id_c = JS_EncodeString(cx, _idStr);
- 
- 	#ifdef JSVRMLCLASSESVERBOSE
- 	printf ("start of SFNodeGetProperty... id is %s\n",_id_c);
-@@ -1264,10 +1264,10 @@
- 
- 
- 	_idStr = JS_ValueToString(cx, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 
- 	_valStr = JS_ValueToString(cx, *vp);
--	_val_c = JS_GetStringBytes(_valStr);
-+	_val_c = JS_EncodeString(cx, _valStr);
- 
- 	#ifdef JSVRMLCLASSESVERBOSE
- 		printf("SFNodeSetProperty: obj = %p, id = %s, vp = %s\n",
-@@ -1904,7 +1904,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -1914,7 +1914,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -1924,7 +1924,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 3:
- 			d = (ptr->v).c[3];
-@@ -1934,7 +1934,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	}
-@@ -1969,16 +1969,16 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 3:
--			(ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-@@ -2051,7 +2051,7 @@
- 			 * it get created in javascript? */
- 			if (param_isString) {
- 				_str = JS_ValueToString(cx, *argv);
--				charString = JS_GetStringBytes(_str);
-+				charString = JS_EncodeString(cx, _str);
- 
- 				if (sscanf(charString, "%lf %lf",
- 							&(pars[0]), &(pars[1])) != 2) {
-@@ -2143,7 +2143,7 @@
- 			printf( "JS_NewDouble failed for %f in SFVec2f.\n",d);
- 			return JS_FALSE;
- 		}
--		*rval = DOUBLE_TO_JSVAL(dp);
-+		*rval = DOUBLE_TO_JSVAL(*dp);
- 	}
- 
- 	#ifdef JSVRMLCLASSESVERBOSE
-@@ -2332,7 +2332,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -2342,7 +2342,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	}
-@@ -2373,13 +2373,13 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-@@ -2458,7 +2458,7 @@
- 			 * it get created in javascript? */
- 			if (param_isString) {
- 				_str = JS_ValueToString(cx, *argv);
--				charString = JS_GetStringBytes(_str);
-+				charString = JS_EncodeString(cx, _str);
- 
- 				if (sscanf(charString, "%lf %lf %lf",
- 							&(pars[0]), &(pars[1]), &(pars[2])) != 3) {
-@@ -2580,7 +2580,7 @@
- 			printf( "JS_NewDouble failed for %f in SFVec3f.\n",d);
- 			return JS_FALSE;
- 		}
--		*rval = DOUBLE_TO_JSVAL(dp);
-+		*rval = DOUBLE_TO_JSVAL(*dp);
- 	}
- 	#ifdef JSVRMLCLASSESVERBOSE
- 	if (retSFVec3f){
-@@ -2792,9 +2792,9 @@
- 	char *_id_c;
- 
- 	_idStr = JS_ValueToString(cx, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 	_idStr = JS_ValueToString(cx, *vp);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 
- 	#endif
- 
-@@ -2813,7 +2813,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -2823,7 +2823,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -2833,7 +2833,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	} else {
-@@ -2869,13 +2869,13 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-@@ -2949,7 +2949,7 @@
- 			 * it get created in javascript? */
- 			if (param_isString) {
- 				_str = JS_ValueToString(cx, *argv);
--				charString = JS_GetStringBytes(_str);
-+				charString = JS_EncodeString(cx, _str);
- 
- 				if (sscanf(charString, "%lf %lf %lf",
- 							&(pars[0]), &(pars[1]), &(pars[2])) != 3) {
-@@ -3071,7 +3071,7 @@
- 			printf( "JS_NewDouble failed for %f in SFVec3d.\n",d);
- 			return JS_FALSE;
- 		}
--		*rval = DOUBLE_TO_JSVAL(dp);
-+		*rval = DOUBLE_TO_JSVAL(*dp);
- 	}
- 	#ifdef JSVRMLCLASSESVERBOSE
- 	if (retSFVec3d){
-@@ -3282,9 +3282,9 @@
- 	char *_id_c;
- 
- 	_idStr = JS_ValueToString(cx, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 	_idStr = JS_ValueToString(cx, *vp);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 
- 	#endif
- 
-@@ -3303,7 +3303,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -3313,7 +3313,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -3323,7 +3323,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	} else {
-@@ -3359,13 +3359,13 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-@@ -3513,9 +3513,9 @@
- 	char *_id_c;
- 
- 	_idStr = JS_ValueToString(cx, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 	_idStr = JS_ValueToString(cx, *vp);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 
- 	#endif
- 
-@@ -3534,7 +3534,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -3544,7 +3544,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -3554,7 +3554,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 3:
- 			d = (ptr->v).c[3];
-@@ -3564,7 +3564,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	} else {
-@@ -3600,16 +3600,16 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 3:
--			(ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-@@ -3758,9 +3758,9 @@
- 	char *_id_c;
- 
- 	_idStr = JS_ValueToString(cx, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 	_idStr = JS_ValueToString(cx, *vp);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 
- 	#endif
- 
-@@ -3779,7 +3779,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -3789,7 +3789,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -3799,7 +3799,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 3:
- 			d = (ptr->v).c[3];
-@@ -3809,7 +3809,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	} else {
-@@ -3845,16 +3845,16 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 3:
--			(ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-diff -wbBur freewrl-1.22.10/src/lib/x3d_parser/X3DParser.c freewrl-1.22.10.my/src/lib/x3d_parser/X3DParser.c
---- freewrl-1.22.10/src/lib/x3d_parser/X3DParser.c	2010-09-22 20:54:59.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/x3d_parser/X3DParser.c	2011-07-04 01:19:07.000000000 +0400
-@@ -54,7 +54,7 @@
- #include "X3DProtoScript.h"
- 
- #if HAVE_EXPAT_H
--# include <expat.h>
-+# include </usr/include/expat.h>
- #endif
- //#define X3DPARSERVERBOSE 1
- 
diff --git a/community/frei0r-plugins/PKGBUILD b/community/frei0r-plugins/PKGBUILD
index 71094aa94..2b4c27802 100644
--- a/community/frei0r-plugins/PKGBUILD
+++ b/community/frei0r-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79555 2012-11-07 13:11:40Z spupykin $
+# $Id: PKGBUILD 86724 2013-03-21 13:55:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=frei0r-plugins
-pkgver=1.3
-pkgrel=6
+pkgver=1.4
+pkgrel=1
 pkgdesc="A minimalistic plugin API for video sources and filters"
 arch=(i686 x86_64 'mips64el')
 url="http://www.piksel.org/frei0r"
@@ -12,15 +12,15 @@ depends=('gcc-libs' 'gavl>=1.0.0' 'opencv>=2.4.3')
 makedepends=('doxygen')
 options=('!emptydirs')
 source=(http://ftp.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz)
-md5sums=('a2eb63feeeb0c5cf439ccca276cbf70c')
+md5sums=('202375d1bcb545c1b6eb8f34e0260ec5')
 
 build() {
-  cd "$srcdir/frei0r-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/frei0r-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/frogatto/PKGBUILD b/community/frogatto/PKGBUILD
deleted file mode 100644
index dd0d29b6b..000000000
--- a/community/frogatto/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 78929 2012-10-27 23:44:28Z ebelanger $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Tom Wambold <tom5760@gmail.com>
-
-pkgname='frogatto'
-arch=('i686' 'x86_64')
-pkgver=1.2
-pkgrel=7
-pkgdesc="An old-school 2d platformer game, starring a certain quixotic frog"
-url="http://www.frogatto.com"
-license=('GPL')
-depends=('glew' 'sdl' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'libpng' 'boost-libs' 'frogatto-data')
-makedepends=('mesa' 'boost')
-source=("frogatto-$pkgver.tar.gz::https://github.com/frogatto/frogatto/tarball/$pkgver"
-        frogatto
-        frogatto.desktop)
-md5sums=('b60924f384e04728eb6e76cdd48ab8f9'
-         '9ed2c9ea59e95fe3c0b3ad49e58f8890'
-         'e31563b04748a39292a59aaad633ff58')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgname"*
-
-  sed -i 's/ccache //g' Makefile
-  sed -i 's/-lprofiler//g' Makefile
-  sed -i 's/\.io_service/\.get_io_service/g' src/server.cpp
-  sed -i 's/-lboost_regex-mt/-lboost_regex/g' Makefile
-  sed -i 's/-lboost_system-mt/-lboost_system/g' Makefile
-  sed -i 's/-lboost_thread-mt/-lboost_thread/g' Makefile
-  sed -i 's/-lboost_iostreams-mt/-lboost_iostreams/g' Makefile
-  make game server
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgname"*
-
-  install -D -m755 game $pkgdir/opt/frogatto/game
-  install -D -m755 server $pkgdir/opt/frogatto/server
-
-  install -D -m644 src/LICENSE $pkgdir/usr/share/licenses/frogatto/LICENSE
-
-  cd $srcdir
-  install -DT -m755 frogatto $pkgdir/usr/bin/frogatto
-  install -D -m644 frogatto.desktop $pkgdir/usr/share/applications/frogatto.desktop
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/frogatto/frogatto b/community/frogatto/frogatto
deleted file mode 100644
index 0d741e0de..000000000
--- a/community/frogatto/frogatto
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/frogatto
-exec /opt/frogatto/game $*
diff --git a/community/frogatto/frogatto.desktop b/community/frogatto/frogatto.desktop
deleted file mode 100644
index b0795467a..000000000
--- a/community/frogatto/frogatto.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Frogatto
-GenericName=Old-school 2D platformer
-Comment=Old-school 2D platformer
-Exec=/usr/bin/frogatto
-Terminal=false
-MultipleArgs=false
-Type=Application
-Icon=/opt/frogatto/images/window-icon.png
-Categories=Game;ArcadeGame
diff --git a/community/fssos-nsvs/PKGBUILD b/community/fssos-nsvs/PKGBUILD
index c9b4a13e2..22c2c43e3 100644
--- a/community/fssos-nsvs/PKGBUILD
+++ b/community/fssos-nsvs/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 83140 2013-01-27 16:14:12Z pierre $
+# $Id: PKGBUILD 87001 2013-03-25 19:16:40Z bpiotrowski $
 # Maintainer: Dale Blount <dale@archlinux.org>
 
 pkgname=fssos-nsvs
 pkgver=0.5
-pkgrel=9
+pkgrel=10
 pkgdesc="NSVS for FSSOS"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://fssos.sourceforge.net/"
 license=('GPL')
-depends=('bash' 'mysql')
+depends=('bash' 'mariadb')
 backup=('etc/nsvsd.conf')
 options=('!libtool' '!makeflags')
 install=$pkgname.install
diff --git a/community/fwbuilder/PKGBUILD b/community/fwbuilder/PKGBUILD
index ae7574fdf..cb4d7a718 100644
--- a/community/fwbuilder/PKGBUILD
+++ b/community/fwbuilder/PKGBUILD
@@ -2,25 +2,29 @@
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# vim: set ft=sh:
 
 pkgname=fwbuilder
 pkgver=5.1.0.3599
-pkgrel=2
+pkgrel=4
 pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms"
 url="http://www.fwbuilder.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libxslt' 'net-snmp' 'qt')
+depends=('libxslt' 'net-snmp' 'qt4')
 conflicts=('libfwbuilder')
 install=fwbuilder.install
 source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/${pkgver%.*}/fwbuilder-${pkgver}.tar.gz"
+		'fwbuilder.xml'
 		'fwbuilder-gcc47.patch')
 sha256sums=('452514a1ec0be1416bfca93603e6c89deb91d1a3a19671c64b5a8868a3743daf'
+			'f8eacaa9895b17af3a1c148064b5ad8381b83f7983acb14687faef488ac8fede'
 			'd7c602d5b99c6e40403c0b02e34abf15de83802257ca5ce80ad53d486b692f27')
 
 build() {
   cd "${srcdir}/fwbuilder-${pkgver}"
   patch -p1 -i "$srcdir/fwbuilder-gcc47.patch"
+  export CXXFLAGS="$CXXFLAGS -fno-var-tracking-assignments"
   ./autogen.sh
   ./configure --prefix=/usr
   make
@@ -29,4 +33,6 @@ build() {
 package() {
   cd "${srcdir}/fwbuilder-${pkgver}"
   make INSTALL_ROOT="${pkgdir}" install
+  echo "MimeType=text/x-xml-fwbuilder;" >> "$pkgdir/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 "$srcdir/fwbuilder.xml" "$pkgdir/usr/share/mime/packages/fwbuilder.xml"
 }
diff --git a/community/fwbuilder/fwbuilder.install b/community/fwbuilder/fwbuilder.install
index 45f0c2242..b2d479931 100644
--- a/community/fwbuilder/fwbuilder.install
+++ b/community/fwbuilder/fwbuilder.install
@@ -1,5 +1,7 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q /usr/share/applications &> /dev/null
+	update-mime-database usr/share/mime &> /dev/null
 }
 
 post_upgrade() {
diff --git a/community/fwbuilder/fwbuilder.xml b/community/fwbuilder/fwbuilder.xml
new file mode 100644
index 000000000..31db9f1f1
--- /dev/null
+++ b/community/fwbuilder/fwbuilder.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="text/x-xml-fwbuilder">
+    <generic-icon name="fwbuilder"/>
+    <comment>FWBuilder configuration file</comment>
+    <glob pattern="*.fwb"/>
+    <magic priority="60">
+        <match value="&lt;!DOCTYPE FWObjectDatabase SYSTEM &quot;fwbuilder.dtd&quot;&gt;" type="string" offset="0:100"/>
+    </magic>
+  </mime-type>
+</mime-info>
diff --git a/community/galculator/PKGBUILD b/community/galculator/PKGBUILD
index 813d5bf74..26be1d2ff 100644
--- a/community/galculator/PKGBUILD
+++ b/community/galculator/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81934 2013-01-03 21:00:53Z bpiotrowski $
+# $Id: PKGBUILD 84391 2013-02-17 21:32:04Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=galculator
-pkgver=2.0.1
+pkgver=2.1
 pkgrel=1
 pkgdesc='GTK+ based scientific calculator'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('gtk3' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils
 makedepends=('intltool')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2)
-md5sums=('c4436478adfef4f3a7d6c42ce8286d34')
+sha256sums=('f3ae03601a123287cddf6f79e79cf37bbe5ce87a98997e0fd623f1cd08e6f6be')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
deleted file mode 100644
index 18ba72120..000000000
--- a/community/gambas2/PKGBUILD
+++ /dev/null
@@ -1,925 +0,0 @@
-# $Id: PKGBUILD 82215 2013-01-12 08:15:28Z andrea $
-# Maintainer : Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Biru Ionut <ionut@archlinux.ro>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Toni Foerster <stonerl@skeps.de>
-
-pkgbase="gambas2"
-pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help'
-         'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
-         'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
-         'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
-         'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
-         'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg'
-         'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
-         'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
-         'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
-         'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
-         '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.24.0
-pkgrel=9
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net"
-makedepends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'glu' 'gtk2' 'librsvg' 'xdg-utils'
-         'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'mesa'
-         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft'
-         'libxcursor' 'libsm' 'intltool' 'mysql' 'postgresql')
-license=('GPL2')
-options=('!emptydirs' '!makeflags')
-groups=('gambas2')
-replaces=('gambas2')
-conflicts=('gambas2')
-source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2
-        'fix-gbi-gba-path.patch'
-	'gambas2-script.install' 'gambas2-runtime.install'
-	'poppler-0.20.patch')
-md5sums=('b59072b6f57b681d586cc84c02333690'
-         '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
-         '870ff5b4b33cd75aa9c290539e6fdd5d'
-         'ab5667175c4945282d2f40a35d0e9e5b'
-         '5eb70afe712c0f8667a700df4d9a6735')
-_gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc"
-
-_buildgbcomp() {
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp/src/$1
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
-  install $1.gambas ${pkgdir}/usr/lib/gambas2/
-  install .component ${pkgdir}/usr/lib/gambas2/$1.component
-  chmod a-x ${pkgdir}/usr/lib/gambas2/$1.component
-  install .info ${pkgdir}/usr/share/gambas2/info/$1.info
-  chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.info
-  install .list ${pkgdir}/usr/share/gambas2/info/$1.list
-  chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.list
-  if test -d control; then
-    install -d ${pkgdir}/usr/share/gambas2/control/$1
-    install control/*.png ${pkgdir}/usr/share/gambas2/control/$1
-    chmod a-x ${pkgdir}/usr/share/gambas2/control/$1/*.png
-  fi
-}
-
-build() {
-  cd "${srcdir}/$pkgbase-$pkgver"
-
-  msg "Applying patches ..."
-  # workaround to allow package splitting
-  patch -Np1 -i ../fix-gbi-gba-path.patch
-  # fix building with poppler-0.20.x (merged upstream)
-  cd gb.pdf
-  patch -Np0 -i ../../poppler-0.20.patch
-  cd ..
-  # replace obsolete AM_CONFIG_HEADER
-  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/g' -i acinclude.m4
-
-  ./reconf-all
-  ##
-  
-  . /etc/profile.d/kde3.sh
-  . /etc/profile.d/qt3.sh
-
-  ./configure -C --disable-qte --prefix=/usr
-  make bindir=${pkgdir}/usr/bin
-}
-
-package_gambas2-meta() {
-  depends=('gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help'
-           'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
-           'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
-           'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
-           'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
-           'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg'
-           'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
-           'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
-           'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
-           'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
-           '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')
-  pkgdesc="Gambas2 meta package"
-}
-
-package_gambas2-runtime() {
-  depends=('libffi' 'xdg-utils')
-  pkgdesc="Gambas2 runtime environment"
-  provides=('gambas2-gb-gui')
-  conflicts=('gambas2-gb-gui')
-  install=gambas2-runtime.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/lib/gb.component \
-    ${pkgdir}/usr/lib/gambas2
-  ln -s gbx2 ${pkgdir}/usr/bin/gbr2
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  rm ${pkgdir}/usr/lib/gambas2/gb.{qt.*,so*,la}
-  rm ${pkgdir}/usr/share/gambas2/info/gb.qt*
-  
-  ## needed for postinst with xdg-utils
-  install -d -m755 ${pkgdir}/usr/share/gambas2/mime
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \
-    ${pkgdir}/usr/share/gambas2/mime/
-  install -d -m755 ${pkgdir}/usr/share/gambas2/icons
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/application-x-gambas.png \
-    ${pkgdir}/usr/share/gambas2/icons/application-x-gambas.png
-}
-
-package_gambas2-devel() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 development environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-ide() {
-  depends=('gambas2-gb-qt-ext' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' 'gambas2-gb-settings'
-           'gambas2-gb-db' 'gambas2-gb-desktop' 'gambas2-devel')
-  pkgdesc="Gambas2 Integrated Development Environment"
-#  arch=('any')
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  _buildgbcomp gb.form
-  _buildgbcomp gb.form.dialog
-  _buildgbcomp gb.form.mdi
-  _buildgbcomp gb.settings
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2-database-manager
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib
-  rm ${pkgdir}/usr/bin/gbx2
-  ##
-
-  install -m755 gambas2/gambas2.gambas ${pkgdir}/usr/bin
-  install -m755 gambas2-database-manager/gambas2-database-manager.gambas ${pkgdir}/usr/bin
-  ln -s gambas2.gambas ${pkgdir}/usr/bin/gambas2
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.desktop \
-    ${pkgdir}/usr/share/applications/gambas2.desktop
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.png \
-    ${pkgdir}/usr/share/pixmaps/gambas2.png
-}
-
-package_gambas2-examples() {
-  depends=('gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
-           'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
-           'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
-           'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
-           'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg'
-           'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
-           'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
-           'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
-           'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
-           'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
-           'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
-  pkgdesc="Gambas2 examples"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  rm -r ${pkgdir}/usr/bin ${pkgdir}/usr/lib
-  rm -r ${pkgdir}/usr/share/gambas2/{help,info}
-}
-
-package_gambas2-help() {
-  depends=()
-  pkgdesc="Gambas2 help files"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/help
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  #fix help
-  chown root:root -R ${pkgdir}/usr/share/gambas2/help/help
-}
-
-package_gambas2-script() {
-  depends=('gambas2-devel')
-  pkgdesc="Gambas2 scripter and server programs support"
-  install=gambas2-script.install
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gbs2
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
-  install -m755 gbs2.gambas ${pkgdir}/usr/bin
-
-  ln -s gbs2.gambas ${pkgdir}/usr/bin/gbs2
-  ln -s gbs2.gambas ${pkgdir}/usr/bin/gbw2  
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib
-  rm ${pkgdir}/usr/bin/gbx2
-  ##
-
-  ## needed for postinst with xdg-utils
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
-  install -d -m755 ${pkgdir}/usr/share/gambas2/mime
-  install -D -m644 *.xml ${pkgdir}/usr/share/gambas2/mime/
-  install -D -m644 *.png ${pkgdir}/usr/share/gambas2/mime/
-  ##
-}
-
-package_gambas2-gb-chart() {
-  depends=('gambas2-gb-form')
-  pkgdesc="Gambas2 chart component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.form
-  _buildgbcomp gb.chart
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.form*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.form*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-compress() {
-  depends=('gambas2-runtime' 'bzip2' 'zlib')
-  pkgdesc="Gambas2 compression support component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/compress
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-corba() {
-  depends=('gambas2-runtime' 'omniorb')
-  pkgdesc="Gambas2 corba component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.corba
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-crypt() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 MD5/DES crypting component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-firebird() {
-  depends=('gambas2-gb-db' 'libfbclient')
-  pkgdesc="Gambas2 Firebird database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.firebird
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-form() {
-  depends=('gambas2-gb-db' 'gambas2-gb-form')
-  pkgdesc="Gambas2 database form component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.db.form
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.db.{info,list}}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.db.{so*,la,component}}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-db-mysql() {
-  depends=('gambas2-gb-db' 'libmysqlclient')
-  pkgdesc="Gambas2 MySQL database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-odbc() {
-  depends=('gambas2-gb-db' 'unixodbc')
-  pkgdesc="Gambas2 ODBC database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-postgresql() {
-  depends=('gambas2-gb-db' 'postgresql-libs>=8.4.1')
-  pkgdesc="Gambas2 PostgreSQL database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-sqlite2() {
-  depends=('gambas2-gb-db' 'sqlite2' 'gcc-libs')
-  pkgdesc="Gambas2 Sqlite2 database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-sqlite3() {
-  depends=('gambas2-gb-db' 'sqlite' 'gcc-libs')
-  pkgdesc="Gambas2 Sqlite3 database access component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-desktop() {
-  depends=('gambas2-runtime' 'libsm' 'libxtst')
-  pkgdesc="Gambas2 desktop component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.{so*,la},gb.qt*,gb.draw*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-form() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 form component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.form
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-form-dialog() {
-  depends=('gambas2-gb-form')
-  pkgdesc="Gambas2 form dialog component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.form
-  _buildgbcomp gb.form.dialog
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-form-mdi() {
-  depends=('gambas2-gb-form')
-  pkgdesc="Gambas2 form MDI component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.form
-  _buildgbcomp gb.form.mdi
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-gtk() {
-  depends=('gambas2-runtime' 'gtk2')
-  pkgdesc="Gambas2 graphical GTK+ toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.gtk.ext*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.gtk.ext*,gb.{so*,la}}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-gtk-ext() {
-  depends=('gambas2-gb-gtk')
-  pkgdesc="Gambas2 graphical GTK+ toolkit extension component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/ext
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-gtk-svg() {
-  depends=('gambas2-gb-gtk' 'librsvg')
-  pkgdesc="Gambas2 graphical GTK+ toolkit svg component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk.svg
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-image() {
-  depends=('gambas2-runtime' 'gcc-libs')
-  pkgdesc="Gambas2 image processing component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-info() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 info component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  _buildgbcomp gb.info
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-net() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 networking component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-net-curl() {
-  depends=('gambas2-runtime' 'curl')
-  pkgdesc="Gambas2 advanced networking component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-net-smtp() {
-  depends=('gambas2-runtime' 'glib2')
-  pkgdesc="Gambas2 SMTP component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-opengl() {
-  depends=('gambas2-runtime' 'glu')
-  pkgdesc="Gambas2 OpenGL component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-option() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 command-line options component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/option
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-pcre() {
-  depends=('gambas2-runtime' 'pcre')
-  pkgdesc="Gambas2 PCRE component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-pdf() {
-  depends=('gambas2-runtime' 'poppler-glib')
-  pkgdesc="Gambas2 PDF component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-qt() {
-  depends=('gambas2-runtime' 'qt3')
-  pkgdesc="Gambas2 graphical QT toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt.ext*,gb.qt.opengl*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt.ext*,gb.qt.opengl*,gb.{so*,la}}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-qt-ext() {
-  depends=('gambas2-gb-qt')
-  pkgdesc="Gambas2 graphical QT toolkit extension component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/ext
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-qt-opengl() {
-  depends=('gambas2-gb-qt' 'libgl')
-  pkgdesc="Gambas2 graphical QT toolkit OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/opengl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-qt-kde() {
-  depends=('gambas2-gb-qt' 'kdelibs3')
-  pkgdesc="Gambas2 KDE component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  rm ${pkgdir}/usr/share/gambas2/info/gb.qt.kde.html*
-  rm ${pkgdir}/usr/lib/gambas2/gb.qt.kde.html*
-}
-
-package_gambas2-gb-qt-kde-html() {
-  depends=('gambas2-gb-qt-kde')
-  pkgdesc="Gambas2 KHTML component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde/src/html
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-report() {
-  depends=('gambas2-runtime' 'gambas2-gb-form')
-  pkgdesc="Gambas2 report component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  _buildgbcomp gb.form
-  _buildgbcomp gb.report
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*,gb.db*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*,gb.db*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-sdl() {
-  depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'glu')
-  pkgdesc="Gambas2 SDL component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-sdl-sound() {
-  depends=('gambas2-runtime' 'sdl_mixer')
-  pkgdesc="Gambas2 SDL sound component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-settings() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 settings management component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  _buildgbcomp gb.settings
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-v4l() {
-  depends=('gambas2-runtime' 'libjpeg' 'libpng')
-  pkgdesc="Gambas2 V4L component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-vb() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 VB transitional component"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/vb
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-web() {
-  depends=('gambas2-runtime')
-  pkgdesc="Gambas2 CGI component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  _buildgbcomp gb.web
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-xml() {
-  depends=('gambas2-runtime' 'libxml2')
-  pkgdesc="Gambas2 xml component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.xml.{xslt*,rpc*},gb.{info,list},gb.net*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.xml.{xslt*,rpc*},gb.{so*,la},gb.net*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-xml-rpc() {
-  depends=('gambas2-gb-xml' 'gambas2-gb-net' 'gambas2-gb-net-curl')
-  pkgdesc="Gambas2 xml-rpc component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{{info,list},xml.{info,list},xml.xslt.{info,list},net.*}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{{so*,la},xml.{so*,la,component},xml.xslt.*,net.*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-xml-xslt() {
-  depends=('gambas2-gb-xml' 'libxslt')
-  pkgdesc="Gambas2 xml-xslt component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
diff --git a/community/gambas2/fix-gbi-gba-path.patch b/community/gambas2/fix-gbi-gba-path.patch
deleted file mode 100644
index 9be8e921e..000000000
--- a/community/gambas2/fix-gbi-gba-path.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- component.am	2010-03-15 20:54:43.000000000 +0100
-+++ ../component.am	2010-04-30 15:00:47.218700833 +0200
-@@ -6,17 +6,17 @@
- 	@if test -d $(COMPONENT); then \
- 		echo "Compiling the $(COMPONENT) project..."; \
- 		( \
--			$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \
-+			$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \
- 			cd $(COMPONENT); \
--			$(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \
--			$(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \
-+			$(GBFILES)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \
-+			$(GBFILES)/gba$(GAMBAS_VERSION); \
- 			rm -rf .gambas; \
- 			$(INSTALL) $(COMPONENT).gambas $(DESTDIR)$(gblibdir); \
- 		) \
- 	fi
- 	@echo
- 	@echo "Creating the information files for $(COMPONENT) component..."
--	@$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT)
-+	@$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT)
- 	@echo
- 
- uninstall-hook:
diff --git a/community/gambas2/gambas2-runtime.install b/community/gambas2/gambas2-runtime.install
deleted file mode 100644
index 4729f7ef6..000000000
--- a/community/gambas2/gambas2-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambas.png application-x-gambas
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/gambas2/gambas2-script.install b/community/gambas2/gambas2-script.install
deleted file mode 100644
index 86558e434..000000000
--- a/community/gambas2/gambas2-script.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambasscript.png application-x-gambasscript
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambasserverpage.png application-x-gambasserverpage
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambasscript.xml
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasscript.xml
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasserverpage.xml
-}
diff --git a/community/gambas2/gambas2.install b/community/gambas2/gambas2.install
deleted file mode 100644
index 4729f7ef6..000000000
--- a/community/gambas2/gambas2.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambas.png application-x-gambas
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/gambas2/poppler-0.20.patch b/community/gambas2/poppler-0.20.patch
deleted file mode 100644
index a73d42a7f..000000000
--- a/community/gambas2/poppler-0.20.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Index: src/CPdfDocument.cpp
-===================================================================
---- src/CPdfDocument.cpp	(révision 4732)
-+++ src/CPdfDocument.cpp	(copie de travail)
-@@ -407,7 +407,11 @@
- 	white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF;
- 	THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white);
- 		
-+	#if POPPLER_VERSION_0_20
-+	THIS->dev->startDoc(THIS->doc);
-+	#else
- 	THIS->dev->startDoc(THIS->doc->getXRef ());
-+	#endif
- 
- 	outline=THIS->doc->getOutline();
- 	if (outline) THIS->index=outline->getItems();
-@@ -833,13 +837,22 @@
- 
- 	if ( (w<0) || (h<0) ) return NULL;
- 
-+	#if POPPLER_VERSION_0_20
- 	THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
- 			   rotation,
- 			   gFalse,
- 			   gTrue,
- 			   x,y,w,h,
-+			   gFalse);
-+	#else
-+	THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
-+			   rotation,
- 			   gFalse,
-+			   gTrue,
-+			   x,y,w,h,
-+			   gFalse,
- 			   THIS->doc->getCatalog ());
-+	#endif
- 
- 	map=THIS->dev->getBitmap();
- 	
-@@ -929,9 +942,14 @@
- 	w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth());
- 	h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight());
- 
-+	#if POPPLER_VERSION_0_20
-+	dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse);
-+	gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL);
-+	#else
- 	dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse);
- 	gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, \
-                                 gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL);
-+	#endif
- 	
- 	THIS->page->display(gfx);
- 	dev->endPage();
-@@ -960,7 +978,9 @@
- 
- void aux_fill_links(void *_object)
- {
--	#if POPPLER_VERSION_0_17
-+	#if POPPLER_VERSION_0_20
-+	THIS->links = new Links (THIS->page->getAnnots ());
-+	#elif POPPLER_VERSION_0_17
- 	THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
- 	#else
- 	Object obj;
-@@ -1200,12 +1220,21 @@
- 
- 	if (!MISSING(Sensitive)) sensitive=VARG(Sensitive);
- 
-+	#if POPPLER_VERSION_0_20
-+	textdev = new TextOutputDev (NULL, true, 0, false, false);
-+	THIS->page->display (textdev, 72, 72, 0, false, false, false);
-+	#else
- 	textdev = new TextOutputDev (NULL, true, false, false);
- 	THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog());
-+	#endif
- 
- 	if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; }
- 
-+	#if POPPLER_VERSION_0_20
-+	while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1))
-+	#else
- 	while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1))
-+	#endif
- 	{
- 		if (!THIS->Found) {
- 			GB.NewArray(POINTER(&THIS->Found),sizeof(FoundRect),1);
-Index: configure.ac
-===================================================================
---- configure.ac	(révision 4732)
-+++ configure.ac	(copie de travail)
-@@ -25,6 +25,8 @@
-   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3)
-   pkg-config --atleast-version=0.17.0 poppler
-   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17)
-+  pkg-config --atleast-version=0.20.0 poppler
-+  AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20)
- fi
- 
- AC_OUTPUT( \
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index d3b3e70f7..0bb0ac8ab 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,1349 +1,899 @@
-# $Id: PKGBUILD 82216 2013-01-12 08:15:30Z andrea $
+# $Id: PKGBUILD 88616 2013-04-20 16:45:10Z heftig $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor : sebikul <sebikul@gmail.com>
 
 pkgbase=gambas3
-pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart'
-         'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-data' 'gambas3-gb-db' 'gambas3-gb-db-form'
-         'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3'
-         'gambas3-gb-desktop' 'gambas3-gb-desktop-gnome' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi'
-	 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-image'
-         'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-media' 'gambas3-gb-mime'
-         'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl'  'gambas3-gb-net-pop3' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu'
-         'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext'
-         'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings'
-         'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc'
-         'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
-pkgver=3.3.4
-pkgrel=3
+_components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-complex'
+         'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-data' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 
+         'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' 'gambas3-gb-db' 
+         'gambas3-gb-desktop-gnome' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-httpd' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 
+         'gambas3-gb-form-stock' 'gambas3-gb-form' 'gambas3-gb-gsl' 'gambas3-gb-gtk-opengl' 'gambas3-gb-gtk' 'gambas3-gb-image-effect'
+         'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-image' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-map'
+         'gambas3-gb-media' 'gambas3-gb-memcached' 'gambas3-gb-mime' 'gambas3-gb-mysql' 'gambas3-gb-ncurses' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3'
+         'gambas3-gb-net-smtp' 'gambas3-gb-net' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-opengl' 'gambas3-gb-option'
+         'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-qt4'
+         'gambas3-gb-report' 'gambas3-gb-sdl-sound' 'gambas3-gb-sdl' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb'
+         'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web')
+pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples')
+pkgver=3.4.1
+pkgrel=1
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gambas.sourceforge.net/"
 license=('GPL2')
 groups=('gambas3')
-makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
-         'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2'
-         'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg'
+makedepends=('intltool' 'mariadb' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
+         'zlib' 'mesa' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2'
+         'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg'
          'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
          'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring'
 	 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm'
-	 'gmime' 'glu')
-options=('!emptydirs')
-source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
-        'gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch'
-        'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('ec3971de80901737dcc614059f441848'
-         '85b6b02bccd022bf0879fcbf21e83567'
-         'b284be39d147ec799f1116a6abc068b4'
-         '6d9e080b66443e7246387b1716d24e31')
+	 'gmime')
+options=(!emptydirs)
+source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2")
+md5sums=('eef35861d1e95808180ac7ed5a436569')
+
+create_dirs() {
+  install -dm755 ${pkgdir}/usr/lib/gambas3
+  install -dm755 ${pkgdir}/usr/share/gambas3/info/control
+}
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
 
-  # Fix build with LLVM 3.2
-  patch -Np1 -i ${srcdir}/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch
-  # replace obsolete AM_CONFIG_HEADER
-  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/g' -i acinclude.m4
-
   ./reconf-all
   ./configure --prefix=/usr -C
 
   make bindir=${pkgdir}/usr/bin
+  
+  mkdir -p ${srcdir}/fakeinstall
+  make -j1 XDG_UTILS='' DESTDIR=${srcdir}/fakeinstall install
 }
 
-package_gambas3-runtime() {
-  depends=('libffi' 'xdg-utils')
-  pkgdesc="Runtime environment"
-  conflicts=('gambas3-gb-gui')
-  replaces=('gambas3-gb-gui')
-  provides=("gambas3-gb-gui=${pkgver}")
-  install=gambas3-runtime.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make -j1 DESTDIR="${pkgdir}" install
-
-  cd ../gbx
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ../lib/debug
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ../eval
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ../draw
-  make -j1 DESTDIR="${pkgdir}" install
-  install -D -m644 ../gb.component \
-    ${pkgdir}/usr/lib/gambas3
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  ln -s gbx3 ${pkgdir}/usr/bin/gbr3
-  gbc/gbi3 -r ${pkgdir}/usr gb
-  rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la}
-
-  ## needed for postinst with xdg-utils
-  install -d -m755 ${pkgdir}/usr/share/gambas3/mime
-  install -D -m644 mime/* \
-    ${pkgdir}/usr/share/gambas3/mime/
-  install -d -m755 ${pkgdir}/usr/share/gambas3/icons
-  install -D -m644 mime/application-x-gambas3.png \
-    ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui.opengl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make DESTDIR="${pkgdir}" uninstall
-  ##  
-}
-
-package_gambas3-devel() {
+package_gambas3-gb-args() {
   depends=('gambas3-runtime')
-  pkgdesc="Development environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make -j1 DESTDIR="${pkgdir}" install
-}
-
-package_gambas3-ide() {
-  depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight'
-           'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect'
-           'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit')
-  pkgdesc="Integrated Development Environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  pkgdesc="Command-line options analyzer component"
 
-  #!! with the ide !!
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \
-    ${pkgdir}/usr/share/applications/gambas3.desktop
-  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \
-    ${pkgdir}/usr/share/pixmaps/gambas3.png
-
-  rm -r ${pkgdir}/usr/bin/gb*
-  rm -r ${pkgdir}/usr/lib
-  rm -r ${pkgdir}/usr/share/gambas3
-}
-
-package_gambas3-script() {
-  depends=('gambas3-devel')
-  pkgdesc="Scripter and server programs support"
-  install=gambas3-script.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## needed for postinst with xdg-utils
-  cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
-  install -d -m755 ${pkgdir}/usr/share/gambas3/mime
-  install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/
-  install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/
-  ##
-
-  rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}}
-  rm -r ${pkgdir}/usr/lib
-  rm -r ${pkgdir}/usr/share/gambas3/[c-i]*
-}
-
-package_gambas3-examples() {
-  depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress' 'gambas3-gb-complex' 'gambas3-gb-crypt'
-           'gambas3-gb-data' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2'
-           'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog'
-           'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
-           'gambas3-gb-image-io' 'gambas3-gb-media' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3'
-           'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf'
-           'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl'
-           'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml'
-           'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
-  pkgdesc="Applications examples"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  rm -r ${pkgdir}/usr/{bin,lib}
-  rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl}
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.args.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.args.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-cairo() {
   depends=('gambas3-runtime' 'cairo')
   pkgdesc="Cairo component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.cairo.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.cairo.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-chart() {
   depends=('gambas3-gb-form')
   pkgdesc="Chart component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]*
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.chart.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.chart.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-complex() {
   depends=('gambas3-runtime')
   pkgdesc="Complex numbers component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{comp{r,o}*,[d-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{compr*,[d-v]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.complex.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.complex.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-compress() {
   depends=('gambas3-runtime' 'bzip2' 'zlib')
   pkgdesc="Compression support component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp{o,l}*,gb.[d-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{compl*,[d-v]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.compress.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.compress.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-crypt() {
   depends=('gambas3-runtime')
   pkgdesc="MD5/DES crypting component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.crypt.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.crypt.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-data() {
   depends=('gambas3-runtime')
   pkgdesc="Data containers component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{c*,d{b,e,r}*,[e-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{c*,d{b,e}*,[e-v]*}
-  ##
-}
-
-package_gambas3-gb-db() {
-  depends=('gambas3-runtime')
-  pkgdesc="Database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{a,e,r}*,gb.[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.d{a,e}*,gb.[e-z]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.data.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.data.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-db-form() {
   depends=('gambas3-gb-db' 'gambas3-gb-form')
   pkgdesc="Database form component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.db.form.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.db.form.* ${pkgdir}/usr/share/gambas3/info/
+  mv -v usr/share/gambas3/control/gb.db.form ${pkgdir}/usr/share/gambas3/control/
 }
 
 package_gambas3-gb-db-mysql() {
-  depends=('gambas3-gb-db' 'libmysqlclient')
+  depends=('gambas3-gb-db' 'libmariadbclient')
   pkgdesc="MySQL database access component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.db.mysql.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.db.mysql.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-db-odbc() {
   depends=('gambas3-gb-db' 'unixodbc')
   pkgdesc="ODBC database access component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.db.odbc.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.db.odbc.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-db-postgresql() {
   depends=('gambas3-gb-db' 'postgresql-libs')
   pkgdesc="PostgreSQL database access component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.db.postgresql.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.db.postgresql.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-db-sqlite2() {
   depends=('gambas3-gb-db' 'sqlite2' 'gcc-libs')
   pkgdesc="Sqlite2 database access component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.db.sqlite2.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.db.sqlite2.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-db-sqlite3() {
   depends=('gambas3-gb-db' 'sqlite' 'gcc-libs')
   pkgdesc="Sqlite3 database access component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.db.sqlite3.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.db.sqlite3.* ${pkgdir}/usr/share/gambas3/info/
 }
 
-package_gambas3-gb-desktop() {
-  depends=('gambas3-gb-image' 'libsm' 'libxtst')
-  pkgdesc="Desktop component"
+package_gambas3-gb-db() {
+  depends=('gambas3-runtime')
+  pkgdesc="Database access component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.db.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.db.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop/src/gnome
-  make DESTDIR="${pkgdir}" uninstall
+package_gambas3-gb-dbus() {
+  depends=('gambas3-runtime' 'dbus-core')
+  pkgdesc="DBUS component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.dbus.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.dbus.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-desktop-gnome() {
   depends=('gambas3-gb-desktop' 'libgnome-keyring')
   pkgdesc="Desktop component for Gnome"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop/src/gnome
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.desktop.gnome.* ${pkgdir}/usr/lib/gambas3/
 }
 
-package_gambas3-gb-dbus() {
-  depends=('gambas3-runtime' 'dbus-core')
-  pkgdesc="DBUS component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus
-  make -j1 DESTDIR="${pkgdir}" install
+package_gambas3-gb-desktop() {
+  depends=('gambas3-gb-image' 'libsm' 'libxtst')
+  pkgdesc="Desktop component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.desktop.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.desktop.* ${pkgdir}/usr/share/gambas3/info/
+  mv -v usr/share/gambas3/control/gb.desktop ${pkgdir}/usr/share/gambas3/control/
 }
 
 package_gambas3-gb-eval-highlight() {
   depends=('gambas3-runtime')
   pkgdesc="Expression evaluator highlight component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-d]*,[f-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-d]*,[f-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  ##
-}
-
-package_gambas3-gb-form() {
-  depends=('gambas3-runtime')
-  pkgdesc="Form component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.eval.highlight.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.eval.highlight.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-form-dialog() {
   depends=('gambas3-gb-form')
   pkgdesc="Form dialog component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.form.dialog.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.form.dialog.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-form-mdi() {
   depends=('gambas3-gb-form')
   pkgdesc="Form MDI component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.form.mdi.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.form.mdi.* ${pkgdir}/usr/share/gambas3/info/
+  mv -v usr/share/gambas3/control/gb.form.mdi ${pkgdir}/usr/share/gambas3/control/
 }
 
 package_gambas3-gb-form-stock() {
   depends=('gambas3-runtime')
   pkgdesc="Default stock icons component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.form.stock.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.form.stock.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
+package_gambas3-gb-form() {
+  depends=('gambas3-runtime')
+  pkgdesc="Form component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  # rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*}
-  # rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[m-w]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[m-w]*
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.form.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.form.* ${pkgdir}/usr/share/gambas3/info/
+  mv -v usr/share/gambas3/control/gb.form ${pkgdir}/usr/share/gambas3/control/
 }
 
-package_gambas3-gb-gtk() {
-  depends=('gambas3-gb-image' 'gtk2' 'librsvg')
-  pkgdesc="GTK+ toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+package_gambas3-gb-gsl() {
+  depends=('gambas3-runtime' 'gsl')
+  pkgdesc="The GNU Scientific Library component"
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/fakeinstall
   
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.gsl.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.gsl.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-gtk-opengl() {
-  depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu')
+  depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext')
   pkgdesc="GTK+ toolkit OpenGL component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.gtk.opengl.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.gtk.opengl.* ${pkgdir}/usr/share/gambas3/info/
 }
 
-package_gambas3-gb-gsl() {
-  depends=('gambas3-runtime' 'gsl')
-  pkgdesc="The GNU Scientific Library component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-gtk() {
+  depends=('gambas3-gb-image' 'gtk2' 'librsvg')
+  pkgdesc="GTK+ toolkit component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.gtk.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.gtk.* ${pkgdir}/usr/share/gambas3/info/
 }
 
-package_gambas3-gb-image() {
+package_gambas3-gb-httpd() {
   depends=('gambas3-runtime')
-  pkgdesc="Image component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  pkgdesc="Embedded HTTP server for the interpreter"
 
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.httpd.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.httpd.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-image-effect() {
   depends=('gambas3-gb-image' 'gcc-libs')
   pkgdesc="Image effect component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.image.effect.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.image.effect.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-image-imlib() {
   depends=('gambas3-gb-image' 'imlib2')
   pkgdesc="Imlib component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.image.imlib.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.image.imlib.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-image-io() {
   depends=('gambas3-gb-image' 'gdk-pixbuf2')
   pkgdesc="Input/Output image component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.image.io.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.image.io.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-image() {
+  depends=('gambas3-runtime')
+  pkgdesc="Image component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.image.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.image.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-jit() {
   depends=('gambas3-runtime' 'llvm')
   pkgdesc="Just-in-time compiler component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.jit
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.jit.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.jit.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-libxml() {
   depends=('gambas3-runtime' 'libxml2')
   pkgdesc="libxml2 component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.libxml.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.libxml.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.libxml
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-map() {
+  depends=('gambas3-gb-image-io' 'gambas3-gb-form')
+  pkgdesc="Display maps component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.map.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.map.* ${pkgdir}/usr/share/gambas3/info/
+  mv -v usr/share/gambas3/control/gb.map ${pkgdir}/usr/share/gambas3/control/
 }
 
 package_gambas3-gb-media() {
   depends=('gambas3-runtime' 'gstreamer0.10' 'gstreamer0.10-base')
   pkgdesc="Simplified interface to the GStreamer library component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.media.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.media.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.media
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-memcached() {
+  depends=('gambas3-gb-net')
+  pkgdesc="Memcached client component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.memcached.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.memcached.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-mime() {
   depends=('gambas3-runtime' 'gmime')
   pkgdesc="MIME message component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.mime.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.mime.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-mysql() {
+  depends=('gambas3-runtime' 'gambas3-gb-db-mysql')
+  pkgdesc="Mysql extra component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.mysql.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.mysql.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-ncurses() {
   depends=('gambas3-runtime' 'ncurses')
   pkgdesc="Ncurses component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.ncurses
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-net() {
-  depends=('gambas3-runtime')
-  pkgdesc="Network component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.ncurses.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.ncurses.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-net-curl() {
   depends=('gambas3-gb-net' 'curl')
   pkgdesc="Curl component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.net.curl.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.net.curl.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-net-pop3() {
   depends=('gambas3-gb-net' 'gambas3-gb-mime')
   pkgdesc="POP3 component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[f-m]*,[s-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[f-m]*,[s-w]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.net.pop3.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.net.pop3.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-net-smtp() {
   depends=('gambas3-runtime' 'glib2')
   pkgdesc="SMTP component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.net.smtp.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.net.smtp.* ${pkgdir}/usr/share/gambas3/info/
 }
 
-package_gambas3-gb-opengl() {
-  depends=('gambas3-runtime' 'glew')
-  pkgdesc="OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-net() {
+  depends=('gambas3-runtime')
+  pkgdesc="Network component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.net.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.net.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-opengl-glu() {
   depends=('gambas3-gb-opengl')
   pkgdesc="GL Utility component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.opengl.glu.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.opengl.glu.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-opengl-glsl() {
   depends=('gambas3-gb-opengl')
   pkgdesc="GLSL component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.opengl.glsl.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.opengl.glsl.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-opengl() {
+  depends=('gambas3-runtime' 'glew')
+  pkgdesc="OpenGL component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.opengl.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.opengl.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-option() {
   depends=('gambas3-runtime')
   pkgdesc="Getopt component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.option.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.option.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-pcre() {
   depends=('gambas3-runtime' 'pcre')
   pkgdesc="PCRE component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.pcre.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.pcre.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-pdf() {
   depends=('gambas3-runtime' 'poppler')
   pkgdesc="PDF component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-qt4() {
-  depends=('gambas3-gb-image' 'qt')
-  pkgdesc="Qt4 toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.pdf.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.pdf.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-qt4-ext() {
   depends=('gambas3-gb-qt4')
   pkgdesc="Qt4 toolkit extended component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.qt4.ext.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.qt4.ext.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-qt4-opengl() {
   depends=('gambas3-gb-qt4' 'gambas3-gb-opengl')
   pkgdesc="Qt4 toolkit OpenGL component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.qt4.opengl.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.qt4.opengl.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-qt4-webkit() {
   depends=('gambas3-gb-qt4' 'qtwebkit')
   pkgdesc="Qt4 toolkit webkit component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.qt4.webkit.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.qt4.webkit.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-qt4() {
+  depends=('gambas3-gb-image' 'qt4')
+  pkgdesc="Qt4 toolkit component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.qt4.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.qt4.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-report() {
   depends=('gambas3-gb-form' 'gambas3-gb-image-io')
   pkgdesc="Report component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]*
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*}
-  ##
-}
-
-package_gambas3-gb-sdl() {
-  depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew')
-  pkgdesc="SDL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.report.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.report.* ${pkgdir}/usr/share/gambas3/info/
+  mv -v usr/share/gambas3/control/gb.report ${pkgdir}/usr/share/gambas3/control/
 }
 
 package_gambas3-gb-sdl-sound() {
   depends=('gambas3-runtime' 'sdl_mixer')
   pkgdesc="SDL sound component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.sdl.sound.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.sdl.sound.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-sdl() {
+  depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew')
+  pkgdesc="SDL component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.sdl.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.sdl.* ${pkgdir}/usr/share/gambas3/info/
+  mv -v usr/share/gambas3/gb.sdl ${pkgdir}/usr/share/gambas3
 }
 
 package_gambas3-gb-settings() {
   depends=('gambas3-runtime')
   pkgdesc="Setting component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.settings.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.settings.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-signal() {
   depends=('gambas3-runtime')
   pkgdesc="POSIX Signals component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## cleanup the workaround
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.signal.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.signal.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-v4l() {
   depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng')
   pkgdesc="Video4linux component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.v4l.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.v4l.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-vb() {
   depends=('gambas3-runtime')
   pkgdesc="Visual Basic transitional component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]*
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.vb.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.vb.* ${pkgdir}/usr/share/gambas3/info/
 }
 
-package_gambas3-gb-xml() {
-  depends=('gambas3-runtime' 'gcc-libs')
-  pkgdesc="XML component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-web() {
+  depends=('gambas3-runtime')
+  pkgdesc="CGI component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/fakeinstall
   
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  create_dirs
   
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  mv -v usr/lib/gambas3/gb.web.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.web.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-xml-html() {
   depends=('gambas3-gb-xml')
   pkgdesc="HTML generator component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.xml.html.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.xml.html.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-xml-rpc() {
   depends=('gambas3-gb-xml' 'gambas3-gb-net-curl')
   pkgdesc="XML-RPC component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm ${pkgdir}/usr/lib/gambas3/gb.xml.[c-l]*
-  rm ${pkgdir}/usr/lib/gambas3/gb.xml.[s-x]*
-  rm ${pkgdir}/usr/share/gambas3/info/gb.xml.[h-l]*
-  rm ${pkgdir}/usr/share/gambas3/info/gb.xml.xslt.*
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.xml.rpc.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.xml.rpc.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-xml-xslt() {
   depends=('gambas3-gb-xml' 'libxslt')
   pkgdesc="XML-XSLT component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.xml.xslt.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.xml.xslt.* ${pkgdir}/usr/share/gambas3/info/
+}
+
+package_gambas3-gb-xml() {
+  depends=('gambas3-runtime' 'gcc-libs')
+  pkgdesc="XML component"
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.xml.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.xml.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+package_gambas3-runtime() {
+  depends=('libffi' 'xdg-utils')
+  pkgdesc="Runtime environment"
+  conflicts=('gambas3-gb-gui')
+  replaces=('gambas3-gb-gui')
+  provides=("gambas3-gb-gui=${pkgver}")
+  install=gambas3-runtime.install
+  
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  install -dm755 ${pkgdir}/usr/bin
+  install -dm755 ${pkgdir}/usr/share/gambas3/{icons,mime}
+   
+  mv -v usr/bin/gb{r,x}3 ${pkgdir}/usr/bin
+  mv -v usr/lib/gambas3/* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/* ${pkgdir}/usr/share/gambas3/info/
+  install -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* ${pkgdir}/usr/share/gambas3/mime/
+  install -m644 ${pkgdir}/usr/share/gambas3/mime/application-x-gambas3.png ${pkgdir}/usr/share/gambas3/icons/
 }
 
-package_gambas3-gb-web() {
+package_gambas3-devel() {
   depends=('gambas3-runtime')
-  pkgdesc="CGI component"
+  pkgdesc="Development environment"
+
+  cd ${srcdir}/fakeinstall
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  install -dm755 ${pkgdir}/usr/bin
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
+  mv -v usr/bin/gb{a,c,i}3 ${pkgdir}/usr/bin
+}
+
+package_gambas3-ide() {
+  depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight'
+           'gambas3-gb-form-dialog' 'gambas3-gb-form-stock' 'gambas3-gb-settings' 'gambas3-gb-form-mdi'
+           'gambas3-gb-image-effect' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit')
+  pkgdesc="Integrated Development Environment"
+
+  cd ${srcdir}/fakeinstall
+
+  install -dm755 ${pkgdir}/usr/{bin,share/{applications,pixmaps}}
+
+  mv -v usr/bin/gambas3* ${pkgdir}/usr/bin/
+  
+  install -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop ${pkgdir}/usr/share/applications/
+  install -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png ${pkgdir}/usr/share/pixmaps/
+}
+
+package_gambas3-script() {
+  depends=('gambas3-devel')
+  pkgdesc="Scripter and server programs support"
+  install=gambas3-script.install
+
+  cd ${srcdir}/fakeinstall
+
+  install -dm755 ${pkgdir}/usr/bin
+  install -dm755 ${pkgdir}/usr/share/gambas3/mime
+
+  mv -v usr/bin/gb{s,w}3* ${pkgdir}/usr/bin/
+  install -m644 ${srcdir}/${pkgbase}-${pkgver}/app/mime/* ${pkgdir}/usr/share/gambas3/mime/
+}
+
+package_gambas3-examples() {
+  depends=(${_components[@]} 'gambas3-runtime' 'gambas3-ide')
+  pkgdesc="Applications examples"
+
+  cd ${srcdir}/fakeinstall
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]*
-  ##
+  install -dm755 ${pkgdir}/usr/share/gambas3
+  
+  mv -v usr/share/gambas3/examples ${pkgdir}/usr/share/gambas3/
 }
diff --git a/community/gambas3/fix-typedef-structure.patch b/community/gambas3/fix-typedef-structure.patch
deleted file mode 100644
index 8a5965a5f..000000000
--- a/community/gambas3/fix-typedef-structure.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- gambas/branches/3.2/main/lib/signal/csignal.c	2012/07/07 22:18:14	4902
-+++ gambas/branches/3.2/main/lib/signal/csignal.c	2012/07/07 22:46:07	4903
-@@ -40,10 +40,12 @@
- #define SIGPWR -1
- #endif
- 
--#if !defined(OS_BSD) && !defined(OS_CYGWIN)
-+// How could the following fix a BSD warning if it is not compiled on BSD systems?
-+
-+/*#if !defined(OS_BSD) && !defined(OS_CYGWIN)
- typedef
- 	struct siginfo siginfo_t;
--#endif
-+#endif*/
- 
- // The -1 signal is used for ignored signal numbers
- 
diff --git a/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch b/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch
deleted file mode 100644
index 61224b9b0..000000000
--- a/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -upr gambas3-3.3.4.orig/gb.jit/src/jit_codegen.cpp gambas3-3.3.4/gb.jit/src/jit_codegen.cpp
---- gambas3-3.3.4.orig/gb.jit/src/jit_codegen.cpp	2012-09-25 17:04:41.000000000 +0300
-+++ gambas3-3.3.4/gb.jit/src/jit_codegen.cpp	2012-12-25 03:55:54.000000000 +0200
-@@ -3614,7 +3614,7 @@ void TryExpression::codegen(){
- 		create_gep(temp_errcontext1, TARGET_BITS, 0, TARGET_BITS, 0));
- 	
- 	llvm::Function* f = llvm::cast<llvm::Function>(get_global_function(_setjmp, 'i', "p"));
--	f->addFnAttr(llvm::Attribute::ReturnsTwice);
-+	f->addFnAttr(llvm::Attributes::ReturnsTwice);
- 	
- 	llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf);
- 	
-@@ -3665,7 +3665,7 @@ void LargeTryExpression::codegen(){
- 		create_gep(temp_errcontext2, TARGET_BITS, 0, TARGET_BITS, 0));
- 	
- 	llvm::Function* f = llvm::cast<llvm::Function>(get_global_function(_setjmp, 'i', "p"));
--	f->addFnAttr(llvm::Attribute::ReturnsTwice);
-+	f->addFnAttr(llvm::Attributes::ReturnsTwice);
- 	
- 	llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf);
- 	
-diff -upr gambas3-3.3.4.orig/gb.jit/src/jit_gambas_pass.cpp gambas3-3.3.4/gb.jit/src/jit_gambas_pass.cpp
---- gambas3-3.3.4.orig/gb.jit/src/jit_gambas_pass.cpp	2012-09-25 17:04:41.000000000 +0300
-+++ gambas3-3.3.4/gb.jit/src/jit_gambas_pass.cpp	2012-12-25 03:38:36.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- #include "llvm/Pass.h"
- #include "llvm/Function.h"
--#include "llvm/Support/IRBuilder.h"
-+#include "llvm/IRBuilder.h"
- #include "llvm/Support/raw_ostream.h"
- 
- #include "main.h"
-diff -upr gambas3-3.3.4.orig/gb.jit/src/jit.h gambas3-3.3.4/gb.jit/src/jit.h
---- gambas3-3.3.4.orig/gb.jit/src/jit.h	2012-09-25 17:04:41.000000000 +0300
-+++ gambas3-3.3.4/gb.jit/src/jit.h	2012-12-25 03:38:23.000000000 +0200
-@@ -39,7 +39,7 @@
- #include "llvm/Support/TargetSelect.h"
- #include "llvm/Support/ManagedStatic.h"
- #include "llvm/Support/raw_ostream.h"
--#include "llvm/Support/IRBuilder.h"
-+#include "llvm/IRBuilder.h"
- #include "llvm/Support/DynamicLibrary.h"
- #include "llvm/Support/CFG.h"
- #include "llvm/PassManager.h"
diff --git a/community/gambas3/poppler-0-20.patch b/community/gambas3/poppler-0-20.patch
deleted file mode 100644
index 3b0e4612a..000000000
--- a/community/gambas3/poppler-0-20.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -ur gb.pdf/configure.ac gb.pdf.fixed/configure.ac
---- gb.pdf/configure.ac	2012-05-14 08:55:02.448921378 +0200
-+++ gb.pdf.fixed/configure.ac	2012-05-14 08:52:19.098596499 +0200
-@@ -24,6 +24,8 @@
-   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3)
-   pkg-config --atleast-version=0.17.0 poppler
-   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17)
-+  pkg-config --atleast-version=0.20.0 poppler
-+  AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20)
- fi
- 
- AC_OUTPUT( \
-diff -ur gb.pdf/src/CPdfDocument.cpp gb.pdf.fixed/src/CPdfDocument.cpp
---- gb.pdf/src/CPdfDocument.cpp	2012-05-14 08:55:02.388922483 +0200
-+++ gb.pdf.fixed/src/CPdfDocument.cpp	2012-05-15 09:25:45.168457227 +0200
-@@ -449,9 +449,13 @@
- 
- 	white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF;
- 	THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white);
--		
--	THIS->dev->startDoc(THIS->doc->getXRef ());
- 
-+	#if POPPLER_VERSION_0_20
-+	THIS->dev->startDoc(THIS->doc);
-+	#else
-+	THIS->dev->startDoc(THIS->doc->getXRef ());
-+	#endif
-+	
- 	outline=THIS->doc->getOutline();
- 	if (outline) THIS->index=outline->getItems();
- 	
-@@ -875,6 +879,14 @@
- 
- 	if ( (w<0) || (h<0) ) return NULL;
- 
-+	#if POPPLER_VERSION_0_20
-+	THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
-+			   rotation,
-+			   gFalse,
-+			   gTrue,
-+			   x,y,w,h,
-+			   gFalse);
-+	#else
- 	THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
- 			   rotation,
- 			   gFalse,
-@@ -882,7 +894,8 @@
- 			   x,y,w,h,
- 			   gFalse,
- 			   THIS->doc->getCatalog ());
--
-+	#endif
-+	
- 	map=THIS->dev->getBitmap();
- 	
- 	data=(uint32_t*)map->getDataPtr();
-@@ -940,9 +953,14 @@
- 	w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth());
- 	h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight());
- 
-+	#if POPPLER_VERSION_0_20
-+	dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse);
-+	gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL);
-+	#else
- 	dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse);
- 	gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL);
--	
-+	#endif
-+
- 	THIS->page->display(gfx);
- 	dev->endPage();
- 
-@@ -970,7 +988,9 @@
- 
- void aux_fill_links(void *_object)
- {
--	#if POPPLER_VERSION_0_17
-+	#if POPPLER_VERSION_0_20
-+	THIS->links = new Links (THIS->page->getAnnots ());
-+	#elif POPPLER_VERSION_0_17
- 	THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
- 	#else
- 	Object obj;
-@@ -1152,13 +1172,22 @@
- 
- 	if (!MISSING(Sensitive)) sensitive=VARG(Sensitive);
- 
-+	#if POPPLER_VERSION_0_20
-+	textdev = new TextOutputDev (NULL, true, 0, false, false);
-+	THIS->page->display (textdev, 72, 72, 0, false, false, false);
-+	#else
- 	textdev = new TextOutputDev (NULL, true, false, false);
- 	THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog());
-+	#endif
- 
- 	if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; }
- 
- 	count = 0;
-+	#if POPPLER_VERSION_0_20
-+	while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1))
-+	#else
- 	while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1))
-+	#endif
- 	{
- 		if (!THIS->Found)
- 			GB.NewArray(POINTER(&THIS->Found),sizeof(CPDFFIND),1);
diff --git a/community/gammu/PKGBUILD b/community/gammu/PKGBUILD
index cf50f6cf2..3548d92f3 100644
--- a/community/gammu/PKGBUILD
+++ b/community/gammu/PKGBUILD
@@ -1,35 +1,35 @@
-# $Id: PKGBUILD 73714 2012-07-14 13:31:58Z schiv $
+# $Id: PKGBUILD 87059 2013-03-26 14:42:55Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=gammu
 pkgver=1.32.0
-pkgrel=1
+pkgrel=3
 pkgdesc="GNU All Mobile Management Utilities"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wammu.eu/"
 license=('GPL')
-depends=('bluez' 'curl' 'libmysqlclient'
-         'postgresql-libs' 'python2' 'libusb')
-makedepends=('cmake' 'doxygen' 'mysql')
+depends=('bluez' 'curl' 'libmariadbclient'
+         'postgresql-libs' 'libusb')
+makedepends=('cmake' 'doxygen' 'mariadb')
 optdepends=('dialog: support for the gammu-config script')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
 md5sums=('8ea16c6b3cc48097a8e62311fe0e25b9')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   # bash completion dir change
-  sed -e 's,DESTINATION "/etc/bash_completion.d",DESTINATION "/usr/share/bash-completion/completions",' -i contrib/CMakeLists.txt
+  sed -i 's,DESTINATION "/etc/bash_completion.d",DESTINATION "/usr/share/bash-completion/completions",' contrib/CMakeLists.txt
 
-  cmake . -DCMAKE_INSTALL_PREFIX="/usr"
+  cmake . -DCMAKE_INSTALL_PREFIX="/usr" -DLIB_SUFFIX=""
 
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD
index a3eb291c0..e28887768 100644
--- a/community/gdal/PKGBUILD
+++ b/community/gdal/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 82847 2013-01-25 01:53:13Z svenstaro $
+# $Id: PKGBUILD 87003 2013-03-25 19:16:43Z bpiotrowski $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gdal
-pkgver=1.9.1
+pkgver=1.9.2
 pkgrel=1
 pkgdesc="A translator library for raster geospatial data formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gdal.org/"
 license=('custom')
-depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf'  'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmysqlclient' 'postgresql-libs')
-makedepends=('perl' 'swig')
+depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf'  'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs')
+makedepends=('perl' 'swig' 'chrpath')
 optdepends=('postgresql: postgresql database support'
-            'mysql: mysql database support'
+            'mariadb: mariab database support'
             'perl:  perl binding support'
             'swig:  perl binding support')
 options=('!libtool')
 changelog=$pkgname.changelog
 source=(http://download.osgeo.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
         gdal-1.5.1-python-install.patch)
-md5sums=('c5cf09b92dac1f5775db056e165b34f5'
+md5sums=('3f39db89f4710269b3a8bf94178e07aa'
          '81afc1c26d29cee84aadb6924fe33861')
 
 build() {
@@ -29,8 +29,8 @@ build() {
   # bug 23654
   export LDFLAGS="$LDFLAGS -Wl,--as-needed" 
 
-  cd ${srcdir}/$pkgname-$pkgver
-  patch -Np0 -i ${srcdir}/gdal-1.5.1-python-install.patch
+  cd "${srcdir}/$pkgname-$pkgver"
+  patch -Np0 -i "${srcdir}/gdal-1.5.1-python-install.patch"
 
 # python2 fixes
   sed -i 's_python python1.5_python2 python python1.5_' configure
@@ -45,19 +45,24 @@ build() {
 # workaround for bug #13646
   sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
   sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile
-  install -d ${pkgdir}/usr/lib/python2.7/site-packages/
 
   make
 }
 
 package () {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/$pkgname-$pkgver"
+  install -d "${pkgdir}/usr/lib/python2.7/site-packages/"
+  make DESTDIR="${pkgdir}" install
 
 # install license
-  install -D -m644 LICENSE.TXT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m644 LICENSE.TXT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
 #FS15477 clean up junks
-  rm -f ${pkgdir}/usr/bin/*.dox
+  rm -f "${pkgdir}"/usr/bin/*.dox
+
+  # Remove RPATH
+  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OSR/OSR.so
+  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OGR/OGR.so
+  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/GDAL/GDAL.so
+  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/GDAL/Const/Const.so
 }
diff --git a/community/gdk-pixbuf/PKGBUILD b/community/gdk-pixbuf/PKGBUILD
index d4289b1c8..a33ce9a07 100644
--- a/community/gdk-pixbuf/PKGBUILD
+++ b/community/gdk-pixbuf/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=gdk-pixbuf
 pkgver=0.22.0
-pkgrel=9.1
+pkgrel=9.2
 pkgdesc="Image loading and manipulation library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
@@ -34,6 +34,7 @@ build() {
   patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-loaders.patch
   patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0.patch
   patch -Np1 -i ${srcdir}/libpng15.patch
+  sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -e '/AM_PROG_CC_STDC/d' configure.in
   libtoolize --force --copy --automake
   autoreconf --force --install
   ./configure --prefix=/usr --disable-gtk-doc
diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD
index 35c7e297d..fd0692e96 100644
--- a/community/geany-plugins/PKGBUILD
+++ b/community/geany-plugins/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 81735 2012-12-27 22:27:45Z arodseth $
+# $Id: PKGBUILD 86001 2013-03-10 22:54:56Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>  
 # Contributor: djgera
 # Contributor: Patrick Melo <patrick@patrickmelo.eti.br>
 
 pkgname=geany-plugins
-pkgver=1.22
-pkgrel=5
-pkgdesc='Combined plugins release for Geany'
+pkgver=1.23
+pkgrel=1
+pkgdesc='Plugins for Geany'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://plugins.geany.org/'
 license=('GPL')
-depends=('geany=1.22' 'lua51' 'gtkspell' 'libwebkit' 'ctpl' 'gpgme' 'vte' 'desktop-file-utils' 'gtk-update-icon-cache')
+depends=("geany=$pkgver" 'gtkspell' 'libwebkit' 'ctpl' 'gpgme' 'vte'
+         'desktop-file-utils' 'gtk-update-icon-cache' 'lua51')
 makedepends=('intltool' 'vala' 'gdb' 'cppcheck')
 optdepends=('hspell: hebrew spell checker')
 options=('!libtool')
-install=geany-plugins.install
-source=("http://plugins.geany.org/geany-plugins/$pkgname-$pkgver.tar.bz2")
-sha256sums=('a0dcf0cb00ac260670ef8fae682aade60c7c3075c88121fd21f3aecdff84e1ce')
+install="$pkgname.install"
+source=("http://plugins.geany.org/$pkgname/$pkgname-$pkgver.tar.bz2")
+sha256sums=('ff26860edd1cbaea88c73bd8c2bd02f9ba04046674f05d3696baf66582e2bf58')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # the geanylua plugin currently doesn't work with lua 5.2, only 5.1
-  ./configure --prefix=/usr --libexecdir=/usr/lib # --disable-geanylua
+  # The geanylua plugin currently doesn't work with lua 5.2, only 5.1
+  ./configure --prefix=/usr --libexecdir=/usr/lib
   make 
 }
 
diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD
index 2ebf57afe..516ee77b2 100644
--- a/community/geany/PKGBUILD
+++ b/community/geany/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83915 2013-02-06 14:27:16Z arodseth $
+# $Id: PKGBUILD 86000 2013-03-10 22:54:45Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Ionut Biru  <ibiru@archlinux.ro>
@@ -6,32 +6,35 @@
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 
 pkgname=geany
-pkgver=1.22
-pkgrel=3
+pkgver=1.23
+pkgrel=1
 pkgdesc='Fast and lightweight IDE'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.geany.org/"
 license=('GPL')
 depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('perlxml' 'setconf' 'intltool')
-optdepends=('vte: for terminal support' 'python2')
-install=geany.install
-source=("http://download.geany.org/$pkgname-$pkgver.tar.bz2")
+optdepends=('vte: for terminal support'
+            'geany-plugins: various extra features'
+            'python2')
+install="$pkgname.install"
 options=('!libtool')
-sha256sums=('901a35a7395ef10a80fb10b3ab63bae3871693a4e82d56388e9521a27877577e')
+source=("http://download.geany.org/$pkgname-$pkgver.tar.bz2")
+sha256sums=('cdd4a772694803c837ae59e56f7bdc2faba174509317211f522e7d25dfcbe8b0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  msg2 "Configuring..."
   ./configure --prefix=/usr
-  msg2 "Compiling..."
   make
-  msg2 "Python2 fix..."
+
+  # Python2 fix
 	sed -i '0,/on/s//on2/' data/templates/files/main.py
-  msg2 "Fixing FS#10318..."
+
+  # Fix for FS#10318
   setconf geany.desktop MimeType ''
-  msg2 "Enabling syntax highlighting for PKGBUILD files..."
+
+  # Syntax highlighting for PKGBUILD files
   sed -i 's/Sh=/Sh=PKGBUILD;/' data/filetype_extensions.conf
 }
 
diff --git a/community/geary/PKGBUILD b/community/geary/PKGBUILD
new file mode 100755
index 000000000..b9b769daa
--- /dev/null
+++ b/community/geary/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 89890 2013-05-04 23:09:02Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
+# Contributor : sebikul <sebikul@gmail.com>
+# Contributor : Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+
+pkgname=geary
+pkgver=0.3.1
+pkgrel=4
+pkgdesc="A lightweight email client for the GNOME desktop"
+arch=('i686' 'x86_64')
+url="http://www.yorba.org/projects/geary/"
+license=('GPL3')
+depends=('desktop-file-utils' 'gmime' 'hicolor-icon-theme' 'libcanberra' 'libgee06' 'libgnome-keyring' 'libnotify' 'libunique3' 'webkitgtk3')
+makedepends=('cmake' 'gobject-introspection' 'intltool' 'vala')
+install=${pkgname}.install
+source=("http://www.yorba.org/download/${pkgname}/${pkgver%.?}/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('a1bf8cc95022ce0894a340dea0ab94047ac7a7ea0066b8602b136c74e93ffaed')
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --disable-{desktop-update,icon-update,schemas-compile}
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/geary/geary.install b/community/geary/geary.install
new file mode 100755
index 000000000..20def33a9
--- /dev/null
+++ b/community/geary/geary.install
@@ -0,0 +1,17 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade()
+{
+  post_install
+}
+
+post_remove()
+{
+  post_install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/gebabbel/PKGBUILD b/community/gebabbel/PKGBUILD
index 322843866..8eb8d9c89 100644
--- a/community/gebabbel/PKGBUILD
+++ b/community/gebabbel/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 67652 2012-03-13 15:27:16Z lcarlier $
+# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: pfm <nl081130@yahoo.de>
 
 pkgname=gebabbel
 pkgver=0.4
-pkgrel=5
+pkgrel=6
 pkgdesc="GUI for gpsbabel"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gebabbel.sourceforge.net/"
 license=('GPL2')
-depends=('qt' 'gpsbabel')
+depends=('qt4' 'gpsbabel')
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/Gebabbel-$pkgver-Src.tar.gz \
         http://$pkgname.sourceforge.net/GebabbelLogo.png \
@@ -25,7 +25,7 @@ build() {
 
   patch -Np0 -i ${srcdir}/$pkgname-$pkgver.patch
 
-  qmake
+  qmake-qt4
   make
 }
 
diff --git a/community/geda-gaf/PKGBUILD b/community/geda-gaf/PKGBUILD
index d68b0fe6b..4a9a1caae 100644
--- a/community/geda-gaf/PKGBUILD
+++ b/community/geda-gaf/PKGBUILD
@@ -15,15 +15,12 @@ optdepends=('python2: for two of the commands (garchive, tragesym)'
   'gawk: for sw2asc')
 replaces=('geda-suite' 'geda-libs')
 install=geda-gaf.install
-source=(http://ftp.geda-project.org/geda-gaf/stable/v1.8/$pkgver/$pkgname-$pkgver.tar.gz
-	geda-1.6.2-correct_glib_include.patch)
-md5sums=('3c5ef297e403b493fdf7a5d47bbeeb73'
-	 'af28867b393e0351b97d5d23cdefc812')
+source=(http://ftp.geda-project.org/geda-gaf/stable/v1.8/$pkgver/$pkgname-$pkgver.tar.gz)
+md5sums=('3c5ef297e403b493fdf7a5d47bbeeb73')
 
 build ()
 {
   cd "$srcdir/$pkgname-$pkgver/"
-  patch -Np1 -i ${srcdir}/geda-1.6.2-correct_glib_include.patch
   ./configure --prefix=/usr --disable-update-xdg-database 
   make 
 }
diff --git a/community/geda-gaf/geda-1.6.2-correct_glib_include.patch b/community/geda-gaf/geda-1.6.2-correct_glib_include.patch
deleted file mode 100644
index a8cfa96be..000000000
--- a/community/geda-gaf/geda-1.6.2-correct_glib_include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- geda-gaf-1.6.2.orig/libgeda/src/s_path.c
-+++ geda-gaf-1.6.2/libgeda/src/s_path.c
-@@ -37,9 +37,7 @@
- #include <stdlib.h>
- #include <string.h>
- 
--#include <glib/gmem.h>
--#include <glib/gmessages.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- #include "libgeda_priv.h"
- 
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index 4389b442f..ab057abec 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79119 2012-10-30 23:06:21Z heftig $
+# $Id: PKGBUILD 88687 2013-04-21 22:17:03Z heftig $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Hugo Doria <hugo@archlinux.org>
@@ -6,20 +6,20 @@
 # Contributor: zhuqin <zhuqin83@gmail.com>
 
 pkgname=gedit-plugins
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Plugins for gedit"
 arch=('x86_64' 'i686' 'mips64el')
-license=('GPL')
+license=(GPL)
 url="http://live.gnome.org/GeditPlugins"
-depends=('gedit' 'dbus-python')
+depends=(gedit python-dbus)
+makedepends=(intltool gnome-doc-utils vte3)
 optdepends=('gucharmap: for charmap plugin'
             'vte3: for embedded terminal')
-makedepends=('intltool' 'gnome-doc-utils' 'vte3')
 options=('!libtool' '!emptydirs')
 install=gedit-plugins.install
 source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz")
-sha256sums=('c5e92830e6029110bf1117bd9f31b23a9ad907210b8cb37039772f5bfcf6d174')
+sha256sums=('659d379f9edfbba2db37522991c734c5d50e03eb1f70985e978d93a718273141')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/gemrb/PKGBUILD b/community/gemrb/PKGBUILD
index 4a2ea9180..1a21ccf02 100644
--- a/community/gemrb/PKGBUILD
+++ b/community/gemrb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82325 2013-01-15 11:15:34Z stativ $
+# $Id: PKGBUILD 89424 2013-04-29 11:47:02Z bpiotrowski $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=gemrb
-pkgver=0.7.2
-pkgrel=2
+pkgver=0.8.0
+pkgrel=1
 pkgdesc="OSS implementation of Bioware's Infinity Engine which supports eg. Baldur's Gate"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gemrb.org/"
 license=('GPL')
 depends=('python2' 'openal' 'libpng' 'sdl_mixer')
@@ -13,7 +13,7 @@ makedepends=('cmake')
 install=gemrb.install
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/gemrb/$pkgname-$pkgver.tar.gz")
-md5sums=('4260fcd42f42ce9232668b202b320b29')
+md5sums=('dc0306d4d301726ac449225313285ea1')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gen2shp/PKGBUILD b/community/gen2shp/PKGBUILD
index f164dda17..d0379a3ef 100644
--- a/community/gen2shp/PKGBUILD
+++ b/community/gen2shp/PKGBUILD
@@ -1,26 +1,31 @@
-# $Id: PKGBUILD 66526 2012-02-25 23:23:48Z lfleischer $
+# $Id: PKGBUILD 86465 2013-03-17 20:20:40Z cinelli $
+# Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=gen2shp
 pkgver=0.3.1
-pkgrel=6
+pkgrel=7
 pkgdesc='Converts ArcInfo generate format to shapefile format'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.intevation.de/~jan/gen2shp/'
 license=('GPL')
-depends=('shapelib')
-source=("http://intevation.de/%7Ejan/gen2shp/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1cf9f1c2097825ef96290f7e9a7eb195')
+depends=('glibc' 'shapelib')
+source=("http://web.archive.org/web/20110716144136/http://intevation.de/~jan/gen2shp/$pkgname-$pkgver.tar.gz"
+	"link.patch")
+md5sums=('1cf9f1c2097825ef96290f7e9a7eb195'
+         'cc9ad41a7577c0cbfebb637d3a83c2aa')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd "$pkgname-$pkgver"
 
   # fix conflicting function names
   sed -i 's/getline/get_line/' gen2shp.c utils.c utils.h
+  # Fix linking.
+  patch -p1 -i "$srcdir/link.patch"
 
   make
 }
 
 package() {
-  install -D ${pkgname}-${pkgver}/gen2shp ${pkgdir}/usr/bin/gens2shp
+  install -D "$pkgname-$pkgver/gen2shp" "$pkgdir/usr/bin/gens2shp"
 }
diff --git a/community/gen2shp/link.patch b/community/gen2shp/link.patch
new file mode 100644
index 000000000..71e40de1b
--- /dev/null
+++ b/community/gen2shp/link.patch
@@ -0,0 +1,11 @@
+--- gen2shp-0.3.1/Makefile.orig	2013-03-18 12:20:49.925820131 +0100
++++ gen2shp-0.3.1/Makefile	2013-03-18 12:20:57.757895932 +0100
+@@ -10,7 +10,7 @@
+ 	$(CC) -c utils.c
+ 
+ gen2shp: gen2shp.c utils.o
+-	$(CC) $(CFLAGS) -o $@ -lshp gen2shp.c utils.o
++	$(CC) $(CFLAGS) -o $@ gen2shp.c utils.o -lshp
+ 
+ test: gen2shp
+ 	rm -f pnttest.dbf pnttest.shp pnttest.shx
diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD
index 1559f9465..cbea9fbae 100644
--- a/community/gendesk/PKGBUILD
+++ b/community/gendesk/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD 71021 2012-05-21 22:04:13Z arodseth $
-# Maintainer: Alexander R�dseth <rodseth@gmail.com>
+# $Id: PKGBUILD 86359 2013-03-15 17:39:45Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 
 # Thanks to Moonprincessluna at DeviantArt for the default icon:
 # http://mylittlepixel.deviantart.com/gallery/35405924#/d4pt23a
 
 pkgname=gendesk
-pkgver=0.4.2
+pkgver=0.4.4
 pkgrel=1
 pkgdesc="Utility to generate .desktop files and download icons"
 arch=('x86_64' 'i686')
 url="http://roboticoverlords.org/gendesk/"
 license=('MIT')
 depends=('glibc')
-makedepends=('go>=2:1-2')
-conflicts=('go-hg')
-source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.gz"
+makedepends=('go')
+source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.xz"
         "http://roboticoverlords.org/images/default.png")
-sha256sums=('10b2a294f5d57fcc2fd8612ca9cba7f0f82af03b1bd38d93a3ef757689d20a8a'
+sha256sums=('23ca20823dc225ebc35baf53fa07558a1ddf314fe3f9cb9d2c5fc6523ca62334'
             '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  msg2 "Compiling..."
   go build
 }
 
@@ -31,6 +29,7 @@ package() {
 
   install -Dm755 "$pkgname-$pkgver" "$pkgdir/usr/bin/$pkgname"
   install -Dm644 "$srcdir/default.png" "$pkgdir/usr/share/pixmaps/default.png"
+  install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
diff --git a/community/geos/PKGBUILD b/community/geos/PKGBUILD
index 7e8122199..08b44619c 100644
--- a/community/geos/PKGBUILD
+++ b/community/geos/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82441 2013-01-18 06:33:26Z jlichtblau $
+# $Id: PKGBUILD 88623 2013-04-20 17:34:23Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=geos
-pkgver=3.3.6
+pkgver=3.3.8
 pkgrel=1
 pkgdesc="C++ port of the Java Topology Suite"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('gcc-libs' 'bash')
 options=('!libtool' '!emptydirs')
 changelog=$pkgname.changelog
 source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7ee6c1da9a1b87a3e29209e7cddbf19d36f9689d8e44fec2c9bcf6a1b1be3898')
+sha256sums=('ebecd4d1a71bcc28e5e883296cd8c52a80d5596335e74728f320989734fa503b')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/geos/geos.changelog b/community/geos/geos.changelog
index ce733ca84..a230f5fcf 100644
--- a/community/geos/geos.changelog
+++ b/community/geos/geos.changelog
@@ -1,3 +1,9 @@
+2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* geos 3.3.8-1
+
+2013-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* geos 3.3.7-1
+
 2013-01-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* geos 3.3.6-1
 
diff --git a/community/giggle/PKGBUILD b/community/giggle/PKGBUILD
index 3f043f65a..2452a990f 100644
--- a/community/giggle/PKGBUILD
+++ b/community/giggle/PKGBUILD
@@ -1,31 +1,40 @@
-# $Id: PKGBUILD 79629 2012-11-09 09:55:35Z ibiru $
+# $Id: PKGBUILD 88688 2013-04-21 22:17:05Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: neodreams <yanbrodeur@gmail.com>
 
 pkgname=giggle
 pkgver=0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Git repository viewer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/giggle"
-license=('GPL')
-depends=('git' 'gtksourceview3' 'vte3')
-makedepends=('intltool' 'itstool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.7/$pkgname-$pkgver.tar.xz)
+license=(GPL)
+depends=(git gtksourceview3 vte3 desktop-file-utils hicolor-icon-theme)
+makedepends=(intltool itstool)
 options=(!libtool)
 install=giggle.install
-sha256sums=('ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59')
+source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.7/$pkgname-$pkgver.tar.xz
+        gtksourceview3.7.patch)
+sha256sums=('ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59'
+            'ca0b841d11bb5072741784dbeb72705eddf8e2bde780b8712355d5b66e456b37')
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
+  patch -Np1 -i ../gtksourceview3.7.patch
+}
 
-  ./configure \
-    --prefix=/usr
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
   make
 }
 
-package() {
+check() {
   cd $pkgname-$pkgver
+  make check
+}
 
+package() {
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/giggle/gtksourceview3.7.patch b/community/giggle/gtksourceview3.7.patch
new file mode 100644
index 000000000..eb86cdeef
--- /dev/null
+++ b/community/giggle/gtksourceview3.7.patch
@@ -0,0 +1,36 @@
+From 9999a7ff573b7f3320c2065e8d0eaf0fea32a41b Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Wed, 03 Apr 2013 20:26:17 +0000
+Subject: Directly include gtksourcebuffer.h
+
+Until gtksourceview 3.7, it was included indirectly by gtksourceview.h.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=697220
+---
+diff --git a/src/giggle-diff-view.c b/src/giggle-diff-view.c
+index 3ded28d..ff6bbe3 100644
+--- a/src/giggle-diff-view.c
++++ b/src/giggle-diff-view.c
+@@ -29,6 +29,8 @@
+ #include <glib/gi18n.h>
+ #include <string.h>
+ 
++#include <gtksourceview/gtksourcebuffer.h>
++
+ typedef struct GiggleDiffViewPriv GiggleDiffViewPriv;
+ typedef struct GiggleDiffViewFile GiggleDiffViewFile;
+ typedef struct GiggleDiffViewHunk GiggleDiffViewHunk;
+diff --git a/src/giggle-view-file.c b/src/giggle-view-file.c
+index 130af4a..517858d 100644
+--- a/src/giggle-view-file.c
++++ b/src/giggle-view-file.c
+@@ -40,6 +40,7 @@
+ 
+ #include <gtksourceview/gtksourcelanguagemanager.h>
+ #include <gtksourceview/gtksourceview.h>
++#include <gtksourceview/gtksourcebuffer.h>
+ 
+ #define GIGGLE_TYPE_VIEW_FILE_SNAPSHOT            (giggle_view_file_snapshot_get_type ())
+ #define GIGGLE_VIEW_FILE_SNAPSHOT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIGGLE_TYPE_VIEW_FILE_SNAPSHOT, GiggleViewFileSnapshot))
+--
+cgit v0.9.1
diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD
index be9a68f2b..1ee55cbb8 100644
--- a/community/gigi/PKGBUILD
+++ b/community/gigi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83897 2013-02-06 12:43:24Z arodseth $
+# $Id: PKGBUILD 87412 2013-03-31 19:18:16Z stephane $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: fana-m <geminin@gmx.net>
@@ -7,15 +7,15 @@
 
 pkgname=gigi
 pkgver=0.8.0
-pkgrel=17
-_fixedrevision=5407
+pkgrel=19
+_fixedrevision=5780 #5407
 pkgdesc='Small, efficient and feature rich GUI for OpenGL and C++ (freeorion fork)'
-url='http://freeorion.svn.sourceforge.net/viewvc/freeorion/trunk/FreeOrion/GG/'
 #url='http://gigi.sourceforge.net/'
+url='http://freeorion.svn.sourceforge.net/viewvc/freeorion/trunk/FreeOrion/GG/'
 arch=('x86_64' 'i686')
 license=('LGPL')
 depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python')
-makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa')
+makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa-libgl')
 
 build() {
   cd "$srcdir"
@@ -39,7 +39,8 @@ build() {
   setconf cmake/GiGiSDL.pc.in prefix /usr
   # It would be better if CMAKE_INSTALL_PREFIX or the resulting Makefiles
   # could be re-configured in the package() function, but this works too.
-  cmake -D CMAKE_INSTALL_PREFIX="$srcdir/pkg/usr" \
+  cmake \
+    -D CMAKE_INSTALL_PREFIX="$srcdir/pkg/usr" \
     -D BUILD_TUTORIALS=OFF \
     -D CPACK_GENERATOR=GiGiDevel \
     -D CMAKE_C_FLAGS_RELEASE='-DNDEBUG' \
diff --git a/community/gimp-gap/PKGBUILD b/community/gimp-gap/PKGBUILD
deleted file mode 100644
index f541a468b..000000000
--- a/community/gimp-gap/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 83144 2013-01-27 16:15:18Z pierre $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gimp-gap
-pkgver=2.6.0
-pkgrel=3
-pkgdesc="A Plug-In collection to edit and create animations for the Gimp"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gimp.org/downloads/"
-depends=('gimp' 'xvidcore' 'bash' 'libjpeg')
-makedepends=('intltool')
-options=('!makeflags')
-source=(ftp://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/$pkgname-$pkgver.tar.bz2)
-md5sums=('249ed829de8b78675c0fe4ef4212089f')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  [ "$CARCH" = "x86_64" ] && CFLAGS+="-fPIC"
-  ./configure --prefix=/usr 
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/gimp-ufraw/PKGBUILD b/community/gimp-ufraw/PKGBUILD
index c6642e188..d49c47cfa 100644
--- a/community/gimp-ufraw/PKGBUILD
+++ b/community/gimp-ufraw/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 83473 2013-02-01 16:28:18Z arodseth $
+# $Id: PKGBUILD 86296 2013-03-14 20:51:33Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Martin Sugioarto <nakal@web.de>
 
 pkgname=gimp-ufraw
-pkgver=0.18
-pkgrel=6
-pkgdesc='Standalone or gimp plugin converter for raw files'
+pkgver=0.19
+pkgrel=1
+pkgdesc='Converter for raw files; utility and GIMP plugin'
 url='http://ufraw.sourceforge.net/'
 arch=('x86_64' 'i686')
 license=('GPL')
@@ -14,20 +14,21 @@ depends=('gtkimageview' 'exiv2' 'lcms' 'bzip2' 'desktop-file-utils' 'cfitsio' 'l
 makedepends=('gimp' 'cinepaint')
 optdepends=('gimp: to use the gimp import plugin for raw images'
             'cinepaint: to use the cinepaint import plugin for raw images')
-install=gimp-ufraw.install
+install="$pkgname.install"
 source=("http://downloads.sourceforge.net/ufraw/ufraw-$pkgver.tar.gz")
-sha256sums=('24fe739c61e9e14de1900008477c8662553e93427569c1d595556d440e6b9205')
+sha256sums=('12d551418c5e69ae904cb92e9ac11b4d2e4327a857ee13ac890f34320eb58b9a')
 
 build() {
   cd "$srcdir/ufraw-$pkgver"
 
-  ./configure --prefix=/usr \
-              --enable-extras \
-              --enable-mime \
-              --enable-openmp \
-	      --with-gimp \
-	      --with-cinepaint \
-	      --enable-contrast
+  ./configure \
+    --prefix=/usr \
+    --enable-extras \
+    --enable-mime \
+    --enable-openmp \
+	  --with-gimp \
+	  --with-cinepaint \
+	  --enable-contrast
   sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile
   make
 }
diff --git a/community/gitg/PKGBUILD b/community/gitg/PKGBUILD
index 53f0c8ac6..db1946954 100644
--- a/community/gitg/PKGBUILD
+++ b/community/gitg/PKGBUILD
@@ -1,36 +1,28 @@
-# $Id: PKGBUILD 57270 2011-10-25 06:09:22Z ebelanger $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Blaž Tomžič <blaz.tomazic@gmail.com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-# Contributor: M Rawash <mrawash@gmail.com>
-# Contributor: DonVla <donvla@users.sourceforge.net>
+# $Id: PKGBUILD 88690 2013-04-21 22:17:07Z heftig $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gitg
-pkgver=0.2.5
+pkgver=0.2.7
 pkgrel=1
 pkgdesc='A GIT repository viewer based on GTK+'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://trac.novowork.com/gitg/'
+url='https://git.gnome.org/browse/gitg/'
 license=('GPL')
-depends=('dconf' 'gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas' \
+depends=('gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas' \
          'hicolor-icon-theme')
 makedepends=('intltool')
 options=('!libtool')
-install="${pkgname}.install"
-source=("ftp://ftp.gnome.org/pub/GNOME/sources/gitg/0.2/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('d3dfff65834d8371d43b2e91926af1421f8ec2128580dfeceb6925b6b1ce6d8c')
+install=gitg.install
+source=(ftp://ftp.gnome.org/pub/GNOME/sources/gitg/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('7b1428819666e4797d64dc94bb1624d5e7b75e6a')
 
 build() {
-  	cd "${srcdir}/${pkgname}-${pkgver}"
-
-  	./configure \
-    		--prefix=/usr
-  	make
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
-  	cd "${srcdir}/${pkgname}-${pkgver}"
-
-  	make DESTDIR="${pkgdir}" install
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/gitg/gitg.install b/community/gitg/gitg.install
index 7b356a632..4b90c879e 100644
--- a/community/gitg/gitg.install
+++ b/community/gitg/gitg.install
@@ -1,19 +1,13 @@
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: DonVla <donvla@users.sourceforge.net>
-# gitg install file
-
 post_install() {
-	usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  	update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
-  	post_install $1
+  post_install $1
 }
 
 post_remove() {
-	usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  	update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install $1
 }
diff --git a/community/glabels/fix-gschema.patch b/community/glabels/fix-gschema.patch
deleted file mode 100644
index 51e197096..000000000
--- a/community/glabels/fix-gschema.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in
---- glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in	2012-04-09 13:58:25.256413359 +0000
-+++ glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in	2012-04-09 13:59:40.495830152 +0000
-@@ -2,10 +2,10 @@
- 
- 
-   <schema id="org.gnome.glabels-3" path="/apps/glabels-3/" gettext-domain="glabels-3.0">
--    <child name="ui" schema="org.gnome.glabels.ui"/>
--    <child name="locale" schema="org.gnome.glabels.locale"/>
--    <child name="objects" schema="org.gnome.glabels.objects"/>
--    <child name="history" schema="org.gnome.glabels.history"/>
-+    <child name="ui" schema="org.gnome.glabels-3.ui"/>
-+    <child name="locale" schema="org.gnome.glabels-3.locale"/>
-+    <child name="objects" schema="org.gnome.glabels-3.objects"/>
-+    <child name="history" schema="org.gnome.glabels-3.history"/>
-   </schema>
- 
- 
-diff -Naur glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in.in glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in.in
---- glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in.in	2012-04-09 13:58:25.256413359 +0000
-+++ glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in.in	2012-04-09 13:59:32.232560783 +0000
-@@ -2,10 +2,10 @@
- 
- 
-   <schema id="org.gnome.glabels-3" path="/apps/glabels-3/" gettext-domain="@GETTEXT_PACKAGE@">
--    <child name="ui" schema="org.gnome.glabels.ui"/>
--    <child name="locale" schema="org.gnome.glabels.locale"/>
--    <child name="objects" schema="org.gnome.glabels.objects"/>
--    <child name="history" schema="org.gnome.glabels.history"/>
-+    <child name="ui" schema="org.gnome.glabels-3.ui"/>
-+    <child name="locale" schema="org.gnome.glabels-3.locale"/>
-+    <child name="objects" schema="org.gnome.glabels-3.objects"/>
-+    <child name="history" schema="org.gnome.glabels-3.history"/>
-   </schema>
- 
- 
diff --git a/community/glee/Makefile b/community/glee/Makefile
new file mode 100644
index 000000000..06425fd82
--- /dev/null
+++ b/community/glee/Makefile
@@ -0,0 +1,55 @@
+all: libGLee.so
+
+MAJOR=5
+MINOR=4
+
+SOURCES = $(shell find . -name "*.c")
+
+SHARED_OBJS = $(SOURCES:.c=.shared.o)
+STATIC_OBJS = $(SOURCES:.c=.static.o)
+
+EXTRA_CFLAGS= $(CFLAGS)
+SHARED_CFLAGS= -Wall $(EXTRA_CFLAGS) -fPIC
+
+LDFLAGS= -Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined
+EXTRA_LDFLAGS=
+LIBS=-lGL
+EXTRA_LIBS=
+
+libGLee.so.$(MAJOR).$(MINOR): $(SHARED_OBJS)
+	g++ $(LDFLAGS) $(EXTRA_LDFLAGS) -shared \
+		-Wl,-soname,libGLee.so.$(MAJOR) \
+		-o libGLee.so.$(MAJOR).$(MINOR) \
+		$+ -o $@ $(EXTRA_LIBS) $(LIBS)
+
+libGLee.so: libGLee.so.$(MAJOR).$(MINOR)
+	rm -f $@.$(MAJOR)
+	ln -s $@.$(MAJOR).$(MINOR) $@.$(MAJOR)
+	rm -f $@
+	ln -s $@.$(MAJOR) $@
+
+%.shared.o: %.cpp
+	g++ -o $@ -c $+ $(SHARED_CFLAGS)
+
+%.shared.o: %.c
+	gcc -o $@ -c $+ $(SHARED_CFLAGS)
+
+%.so : %.o
+	g++ $(LDFLAGS) $(EXTRA_LDFLAGS) -shared $^ -o $@
+
+clean:
+	rm -f $(SHARED_OBJS)
+	rm -f $(FIXED_OBJS)
+	rm -f *.so *.so* *~
+
+DESTDIR=
+
+install: libGLee.so
+	install -d "$(DESTDIR)/usr/lib/"
+	cp -a *.so* "$(DESTDIR)/usr/lib/"
+	install -d "$(DESTDIR)/usr/include/"
+	install -Dm644 *.h "$(DESTDIR)/usr/include/"
+	install -d "$(DESTDIR)/usr/lib/pkgconfig/"
+	install -Dm644 glee.pc "$(DESTDIR)/usr/lib/pkgconfig/"
+	install -d  "$(DESTDIR)/usr/share/licenses/glee"
+	sed '9,32!d' readme.txt > "$(DESTDIR)/usr/share/licenses/glee/LICENSE"
diff --git a/community/glee/PKGBUILD b/community/glee/PKGBUILD
index 928cb04b8..3ad4e3649 100644
--- a/community/glee/PKGBUILD
+++ b/community/glee/PKGBUILD
@@ -1,38 +1,31 @@
-# $Id: PKGBUILD 72465 2012-06-14 23:53:43Z ebelanger $
-# Maintainer : SpepS <dreamspepser at yahoo dot it>
-# Contributor: Philipp Brüschweiler <blei42 at gmail dot com >
+# $Id: PKGBUILD 86549 2013-03-19 04:49:29Z speps $
+# Maintainer : speps <speps at aur dot archlinux dot org>
 
 pkgname=glee
-pkgver=5.4
-pkgrel=4
-pkgdesc="Free cross-platform extension loading library for OpenGL."
+pkgver=5.4.0
+pkgrel=1
+pkgdesc="Free cross-platform extension loading library for OpenGL"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://elf-stone.com/glee.php"
-license=('BSD')
+license=('custom:BSD')
 depends=('gcc-libs' 'libgl')
 makedepends=('mesa')
-source=("http://elf-stone.com/downloads/GLee/GLee-5.4.0-src.tar.gz")
-md5sums=('0bd03db136dbc075488b6c6e83f326ae')
+#source=("http://elf-stone.com/downloads/GLee/GLee-$pkgver-src.tar.gz")
+md5sums=('0bd03db136dbc075488b6c6e83f326ae'
+         '937a48856486291070943488fa2824d0'
+         'b59e8d11402fb2ee6c4a92bf6916b3aa')
+_spkg=GLee-$pkgver-src.tar.gz
+source=("http://pkgs.fedoraproject.org/repo/pkgs/GLee/$_spkg/$md5sums/$_spkg"
+        glee.pc Makefile) # implement FS#32670 + fix TEXTREL for i686
 
 build() {
   cd "$srcdir"
-
-  [ "$CARCH" != 'i686' ] && export CXXFLAGS="$CXXFLAGS -fPIC"
-
-  ./configure --prefix=/usr
   make
 }
 
 package() {
   cd "$srcdir"
-
-  # lib and headers
-  install -Dm755 libGLee.so "$pkgdir/usr/lib/libGLee.so"
-  install -Dm644 GLee.h "$pkgdir/usr/include/GLee.h"
-
-  # license
-  install -Dm644 readme.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  sed -i '9,32!d' "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  make DESTDIR="$pkgdir/" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/glee/glee.pc b/community/glee/glee.pc
new file mode 100644
index 000000000..0f03b450a
--- /dev/null
+++ b/community/glee/glee.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: GLee
+Description: GL Easy Extension library
+Version: 5.4.0
+Requires: 
+Conflicts: 
+Libs: -L${libdir} -lglee
+Cflags: -I${includedir}
diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD
index 3624620f9..1990e63b0 100644
--- a/community/glfw/PKGBUILD
+++ b/community/glfw/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79769 2012-11-12 09:00:25Z svenstaro $
+# $Id: PKGBUILD 87832 2013-04-07 21:39:10Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: philefou <tuxication AT gmail DOT com>
 # Contributor: lindquist <tomas@famolsen.dk>
@@ -7,7 +7,7 @@
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=glfw
-pkgver=2.7.7
+pkgver=2.7.8
 pkgrel=1
 pkgdesc="A free, open source, portable framework for OpenGL application development"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ license=('custom:ZLIB')
 depends=('libgl' 'libxrandr' 'glu')
 makedepends=('mesa')
 source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('873a721fc415268e2b794d4dd08c558f')
+md5sums=('a2e1b13e46a7c637a7760c94b72896cd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/glitz/PKGBUILD b/community/glitz/PKGBUILD
index 16945df94..e96fd2b35 100644
--- a/community/glitz/PKGBUILD
+++ b/community/glitz/PKGBUILD
@@ -1,29 +1,31 @@
-# $Id: PKGBUILD 66602 2012-02-26 14:06:03Z lfleischer $
+# $Id: PKGBUILD 85262 2013-02-28 10:34:33Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=glitz
 pkgver=0.5.6
-pkgrel=3
-pkgdesc="OpenGL image compositing library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://cairographics.org/"
+pkgrel=4
+pkgdesc='OpenGL image compositing library'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://cairographics.org/'
 license=('BSD')
-depends=('libgl')
-makedepends=('mesa')
+depends=('libgl' 'glibc')
+makedepends=('mesa-libgl')
 options=('!libtool')
-source=("http://cairographics.org/snapshots/${pkgname}-${pkgver}.tar.gz")
-md5sums=('c507f140ecccc06aed8888c958edda4c')
+source=("http://cairographics.org/snapshots/$pkgname-$pkgver.tar.gz")
+sha256sums=('132adf06e48531f4c01b6ba5843881e2b584a170c5222353d03cbef736d4a471')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD
index 3d9858279..98c8c8c3c 100644
--- a/community/glob2/PKGBUILD
+++ b/community/glob2/PKGBUILD
@@ -1,41 +1,38 @@
-# $Id: PKGBUILD 83780 2013-02-05 07:28:52Z arodseth $
+# $Id: PKGBUILD 87413 2013-03-31 19:18:17Z stephane $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=15
+pkgrel=17
 pkgdesc='RTS game which minimizes micro-management by automatically assigning tasks to units'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.globulation2.org/'
 license=('GPL3')
 depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu'
-         'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('scons' 'boost' 'mesa')
-install=glob2.install
-source=("http://dl.sv.nongnu.org/releases/$pkgname/0.9.4/$pkgname-$pkgver.tar.gz"
-	'glob2-0.9.4.1-gcc44.patch')
+         'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'libgl')
+makedepends=('scons' 'boost' 'mesa-libgl')
+install="$pkgname.install"
+source=("http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz"
+        "$pkgname-${pkgver%.*}.1-gcc44.patch")
 sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
             '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch"
-  scons \
-    LINKFLAGS="-lboost_system"
+  patch -Np0 -i "$srcdir/$pkgname-${pkgver%.*}.1-gcc44.patch"
+  scons LINKFLAGS="-lboost_system"
 }
 
 package () {
   cd "$srcdir/$pkgname-$pkgver"
 
-  scons install \
-    BINDIR="$pkgdir/usr/bin" \
-    INSTALLDIR="$pkgdir/usr/share"
+  scons install BINDIR="$pkgdir/usr/bin" INSTALLDIR="$pkgdir/usr/share"
   find "$pkgdir/usr/share" -type f -exec chmod 644 '{}' \;
-  install -Dm644 data/icons/glob2-icon-48x48.png \
-    "$pkgdir/usr/share/pixmaps/glob2-icon-48x48.png"
+  install -Dm644 "data/icons/$pkgname-icon-48x48.png" \
+    "$pkgdir/usr/share/pixmaps/$pkgname-icon-48x48.png"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD
index 64b1f3e54..29bdf76b6 100644
--- a/community/glom/PKGBUILD
+++ b/community/glom/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83252 2013-01-28 16:49:38Z stephane $
+# $Id: PKGBUILD 87414 2013-03-31 19:18:18Z stephane $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=glom
 pkgver=1.22.0
-pkgrel=3
+pkgrel=5
 pkgdesc="An easy-to-use database designer and user interface"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.glom.org/"
diff --git a/community/glpng/Makefile b/community/glpng/Makefile
deleted file mode 100644
index d6772798f..000000000
--- a/community/glpng/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-CFLAGS+=-fPIC -Iinclude
-LDFLAGS+=-lpng -lGL
-SHAREDLIBFLAGS=-shared
-DESTDIR=/usr/local
-LIB=lib
-
-all: libglpng.a libglpng.so.1.45
-
-libglpng.a: glpng.o
-	ar rv $@ $<
-
-libglpng.so.1.45: glpng.o
-	gcc $(CFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname=libglpng.so.1 -Wl,--whole-archive $< -Wl,--no-whole-archive $(LDFLAGS) -o $@
-
-glpng.o: src/glpng.c
-	gcc $(CFLAGS) -c $<
-
-clean:
-	rm glpng.o libglpng.*
-
-install:
-	for i in include include/GL $(LIB); do \
-		install -m 755 -d $(DESTDIR)/$$i; \
-	done
-	install -p -m 644 include/GL/glpng.h $(DESTDIR)/include/GL
-	install -m 755 libglpng.* $(DESTDIR)/$(LIB)
-	ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so.1
-	ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so
-
-.PHONY: clean install
diff --git a/community/glpng/PKGBUILD b/community/glpng/PKGBUILD
deleted file mode 100644
index bcb6d09be..000000000
--- a/community/glpng/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 63590 2012-02-05 11:58:33Z ibiru $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=glpng
-pkgver=1.45
-pkgrel=5
-pkgdesc="Toolkit for loading PNG images as OpenGL textures"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.fifi.org/doc/libglpng-dev/glpng.html"
-license=('custom')
-depends=('libpng' 'libgl')
-makedepends=('mesa')
-source=(http://ftp.de.debian.org/debian/pool/main/libg/libglpng/libglpng_${pkgver}.orig.tar.gz
-        Makefile
-        libpng15.patch
-        license)
-build() {
-  cd "$srcdir/libglpng-1.45.orig"
-
-  patch -Np1 -i "$srcdir/libpng15.patch"
-
-  cp "$srcdir/Makefile" .
-  make libglpng.so.1.45
-}
-
-package() {
-  cd "$srcdir/libglpng-1.45.orig"
-  make DESTDIR="$pkgdir/usr" install
-  install -Dm644 "$srcdir/license" \
-    "$pkgdir/usr/share/licenses/glpng/license"
-}
-md5sums=('9e0daad8e39fbf3179c73c0d3f74f104'
-         '0b24e9cb527d4ed1c43dd743d49d2b54'
-         'f3f0c0a3f867c5856d922c18677ef2a2'
-         'cd066652a6e5dbd7c1fc303b8e03417a')
diff --git a/community/glpng/libpng15.patch b/community/glpng/libpng15.patch
deleted file mode 100644
index 89e9bf67e..000000000
--- a/community/glpng/libpng15.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -aur libglpng-1.45.orig/include/GL/glpng.h libglpng-1.45.new/include/GL/glpng.h
---- libglpng-1.45.orig/include/GL/glpng.h	2000-07-10 21:27:00.000000000 +0200
-+++ libglpng-1.45.new/include/GL/glpng.h	2012-01-19 19:34:43.994280259 +0100
-@@ -57,7 +57,7 @@
- #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS

- 
- /* Transparency parameters */

--#define PNG_CALLBACK  -3 /* Call the callback function to generate alpha   */
-+#define PNG_CALLBACKT  -3 /* Call the callback function to generate alpha   */
- #define PNG_ALPHA     -2 /* Use alpha channel in PNG file, if there is one */
- #define PNG_SOLID     -1 /* No transparency                                */
- #define PNG_STENCIL    0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise       */
-diff -aur libglpng-1.45.orig/src/glpng.c libglpng-1.45.new/src/glpng.c
---- libglpng-1.45.orig/src/glpng.c	2000-07-10 21:27:10.000000000 +0200
-+++ libglpng-1.45.new/src/glpng.c	2012-01-19 19:39:37.379311651 +0100
-@@ -29,7 +29,7 @@
- #include <GL/gl.h>

- #include <stdlib.h>
- #include <math.h>
--#include "png/png.h"
-+#include <png.h>
- 

- /* Used to decide if GL/gl.h supports the paletted extension */

- #ifdef GL_COLOR_INDEX1_EXT

-@@ -113,6 +113,7 @@
- 	}
- }
- 

-+#ifdef _WIN32
- static int ExtSupported(const char *x) {
- 	static const GLubyte *ext = NULL;
- 	const char *c;
-@@ -129,6 +130,7 @@
- 
- 	return 0;
- }
-+#endif
- 

- #define GET(o) ((int)*(data + (o)))

- 

-@@ -269,14 +271,14 @@
- 	if (pinfo == NULL) return 0;
- 
- 	fread(header, 1, 8, fp);
--	if (!png_check_sig(header, 8)) return 0;
-+	if (!png_sig_cmp(header, 0, 8)) return 0;
- 
- 	png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- 	info = png_create_info_struct(png);
- 	endinfo = png_create_info_struct(png);
- 
- 	// DH: added following lines

--	if (setjmp(png->jmpbuf))

-+	if (setjmp(png_jmpbuf(png)))

- 	{

- 		png_destroy_read_struct(&png, &info, &endinfo);

- 		return 0;

-@@ -373,14 +375,14 @@
- 	png_uint_32 i;
- 
- 	fread(header, 1, 8, fp);
--	if (!png_check_sig(header, 8)) return 0;
-+	if (png_sig_cmp(header, 0, 8)) return 0;
- 
- 	png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- 	info = png_create_info_struct(png);
- 	endinfo = png_create_info_struct(png);
- 
- 	// DH: added following lines

--	if (setjmp(png->jmpbuf))

-+	if (setjmp(png_jmpbuf(png)))

- 	{

- 		png_destroy_read_struct(&png, &info, &endinfo);

- 		return 0;

-@@ -559,7 +561,7 @@
- 			#define ALPHA *q
- 
- 			switch (trans) {
--				case PNG_CALLBACK:
-+				case PNG_CALLBACKT:
- 					FORSTART
- 						ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
- 					FOREND
diff --git a/community/glpng/license b/community/glpng/license
deleted file mode 100644
index a526262b5..000000000
--- a/community/glpng/license
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * PNG loader library for OpenGL v1.45 (10/07/00)
- * by Ben Wyatt ben@wyatt100.freeserve.co.uk
- * Using LibPNG 1.0.2 and ZLib 1.1.3
- *
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the author be held liable for any damages arising from the
- * use of this software.
- *
- * Permission is hereby granted to use, copy, modify, and distribute this
- * source code, or portions hereof, for any purpose, without fee, subject to
- * the following restrictions:
- *
- * 1. The origin of this source code must not be misrepresented. You must not
- *    claim that you wrote the original software. If you use this software in
- *    a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered versions must be plainly marked as such and must not be
- *    misrepresented as being the original source.
- * 3. This notice must not be removed or altered from any source distribution.
- */
diff --git a/community/gluon/PKGBUILD b/community/gluon/PKGBUILD
index 78b666d40..274fd2f6d 100644
--- a/community/gluon/PKGBUILD
+++ b/community/gluon/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 72719 2012-06-21 07:09:44Z andrea $
+# $Id: PKGBUILD 85350 2013-03-01 10:31:40Z andrea $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>
 
 pkgname=gluon
 pkgver=0.71.0
 _pkgver=0.71
-pkgrel=4
+pkgrel=5
 pkgdesc="A free and open source platform for creating and distributing games"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gluon.gamingfreedom.org/"
@@ -27,11 +27,16 @@ build() {
   cd build
   cmake ../$pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON
   make
 }
 
 package() {
   cd "$srcdir"/build
   make DESTDIR="$pkgdir" install
+
+  if [[ "$CARCH" == "x86_64" ]]; then
+    mv "${pkgdir}"/usr/lib64 "${pkgdir}"/usr/lib
+  fi
 }
diff --git a/community/gmerlin-avdecoder/PKGBUILD b/community/gmerlin-avdecoder/PKGBUILD
deleted file mode 100644
index 114bf9e46..000000000
--- a/community/gmerlin-avdecoder/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 82330 2013-01-15 11:35:00Z allan $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=gmerlin-avdecoder
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="Media decoding library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://gmerlin.sourceforge.net/avdec_frame.html"
-license=('GPL')
-depends=('gmerlin' 'openjpeg' 'flac' 'smbclient' 'libmad' 'libmpcdec' 'speex'
-         'libdca' 'libmpeg2' 'a52dec')
-source=(http://downloads.sourceforge.net/sourceforge/gmerlin/gmerlin-avdecoder-$pkgver.tar.gz)
-md5sums=('37b19266b098d9d05bb05ebef138ffbd')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  rm -f cpuinfo.sh
-  ./configure --prefix=/usr --without-doxygen
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD
index bc20723c3..8d56c3831 100644
--- a/community/gmerlin/PKGBUILD
+++ b/community/gmerlin/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 82329 2013-01-15 11:35:00Z allan $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 86093 2013-03-12 00:46:53Z cinelli $
+# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
 
 pkgname=gmerlin
 pkgver=1.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Multimedia architecture for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openmovieeditor.sourceforge.net/HomePage"
 license=('GPL')
-depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'libvisual' 'libcdio-paranoia'
-         'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libgl')
-makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils' 'mesa')
+depends=('gavl' 'gtk2' 'libxv' 'libvisual' 'libcdio-paranoia' 'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libquicktime' 'jack')
+makedepends=('alsa-lib' 'pulseaudio' 'v4l-utils' 'mesa-libgl')
 optdepends=('alsa-lib: for ALSA support'
 	    'jack: for JACK support'
 	    'libquicktime: for movie encoding'
@@ -19,14 +18,17 @@ optdepends=('alsa-lib: for ALSA support'
 options=('!libtool')
 install=gmerlin.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-        cdio-api-fixes.patch)
+        cdio-api-fixes.patch
+	gmerlin-texi.patch)
 md5sums=('2f2a0880e738e71486f04c929ba067f4'
-         'd0e407f01435394a0cfe04acb3c1a4cc')
+         'd0e407f01435394a0cfe04acb3c1a4cc'
+	 '33a4dce06b7560fc839055c5a872435f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   patch -Np1 -i "$srcdir/cdio-api-fixes.patch"
+  patch -Np1 -i "$srcdir/gmerlin-texi.patch"
 
   rm -rf cpuinfo.sh
 
diff --git a/community/gmerlin/gmerlin-texi.patch b/community/gmerlin/gmerlin-texi.patch
new file mode 100644
index 000000000..b352bf3ff
--- /dev/null
+++ b/community/gmerlin/gmerlin-texi.patch
@@ -0,0 +1,1846 @@
+diff -Naur gmerlin-1.2.0.orig/doc/gmerlin.orig.texi gmerlin-1.2.0/doc/gmerlin.orig.texi
+--- gmerlin-1.2.0.orig/doc/gmerlin.orig.texi	1969-12-31 16:00:00.000000000 -0800
++++ gmerlin-1.2.0/doc/gmerlin.orig.texi	2013-02-27 16:04:03.847930671 -0800
+@@ -0,0 +1,1830 @@
++\input texinfo   @c -*-texinfo-*-
++@comment %**start of header
++@setfilename gmerlin.info
++@include version.texi
++@settitle Gmerlin @value{VERSION}
++@dircategory Gmerlin
++@direntry
++* Gmerlin: (gmerlin).           Gmerlin multimedia applications
++@end direntry
++
++
++@syncodeindex pg cp
++@comment %**end of header
++@copying
++This manual is for Gmerlin
++(version @value{VERSION}, @value{UPDATED}).
++
++Copyright @copyright{} 2001-2008 Members of the Gmerlin project.
++
++@quotation
++Permission is granted to copy, distribute and/or modify this document
++under the terms of the GNU Free Documentation License, Version 1.1 or
++any later version published by the Free Software Foundation; with no
++Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
++and with the Back-Cover Texts as in (a) below.  A copy of the
++license is included in the section entitled ``GNU Free Documentation
++License.''
++
++(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
++this GNU Manual, like GNU software.  Copies published by the Free
++Software Foundation raise funds for GNU development.''
++@end quotation
++@end copying
++@titlepage
++@title Gmerlin
++@subtitle for version @value{VERSION}, @value{UPDATED}
++@author Burkhard Plaum (@email{gmerlin@@users.sourceforge.net})
++@page
++@vskip 0pt plus 1filll
++@insertcopying
++@end titlepage
++
++@contents
++
++@ifnottex
++@node Top, Basics, (dir), (dir)
++@top Gmerlin userguide
++Gmerlin user guide.
++
++@insertcopying
++@end ifnottex
++
++@menu
++* Basics::
++* Installation::
++* General usage information::
++* Applications::
++* Plugins::
++* FAQ::
++* Get involved::
++@end menu
++
++@node Basics, Installation, Top, Top
++@chapter Basics
++This manual should help you to get familiar with gmerlin software. The
++gmerlin software is quite modular, because it consists of multiple
++packages, most of which can be used independently. In this document,
++it is assumed, that you have all packages installed (See Installation below).
++
++@node Installation, General usage information, Basics, Top
++@chapter Installation
++
++@menu
++* Requirements::
++* Compilation and installation::
++* Binary codecs::
++@end menu
++
++@node Requirements
++@section Requirements
++
++For compiling x264, you need @uref{http://nasm.sourceforge.net/, nasm}
++(@uref{http://www.tortall.net/projects/yasm/, yasm} on x86_64).
++They are included in
++most distributions. Required libraries can be installed from source or from
++binary packages. In the latter case, you must install the development
++packages (e.g. libfoo-devel-1.2.3-4.i386.rpm) also. This is what you need:
++
++@table @emph
++
++@item @uref{http://www.alsa-project.org/, Alsa}
++It's the recommended audio architecture
++
++@item @uref{http://www.tux.org/~ricdude/EsounD.html, esound}
++Only needed if neither Alsa nor OSS work for you.
++
++@item @uref{http://flac.sourceforge.net/, flac}
++For en-/decoding flac files (optional).
++
++@item @uref{http://www.gtk.org/, gtk-2.4.x}
++This is needed for compiling the GUI applications. Without it you'll
++get just the core library, which won't be of much use.
++
++@item @uref{http://www.ijg.org/, libjpeg}
++For reading and writing single JPEG images (strongly recommended)
++
++@item @uref{http://www.libpng.org/pub/png/libpng.html, libpng}
++For reading and writing single PNG images (strongly recommended).
++Also for decoding png encoded Quicktime and AVI files
++
++@item @uref{http://www.remotesensing.org/libtiff/, libtiff}
++For reading and writing single TIFF images (Optional)
++
++@item @uref{http://www.xmlsoft.org/, libxml}
++Required. All kinds of configuration files as well as the media
++tree are xml based.
++
++@item @uref{http://www.vorbis.com/, vorbis}
++Needed for en-/decoding Vorbis files. Also required for the
++theora encoding.
++
++@item @uref{http://musicbrainz.org/products/client/index.html, libmusicbrainz}
++Needed for getting Audio CD metadata using
++@uref{http://musicbrainz.org/, musicbrainz}
++
++@item @uref{http://libcddb.sourceforge.net/, libcddb}
++Needed for getting Audio CD metadata from CDDB servers
++
++@item Headers for libXv and libXinerama
++These are usually shipped with X11 but some distributions pack the header
++files separately (e.g. libxv-dev, libxinerama-dev). libXv is needed for
++hardware accelerated video playback, libXinerama adds support for
++multi-screen configurations.
++
++@item @uref{http://www.samba.org/, libsmbclient}
++For loading smb:// URLs (optional).
++
++@item @uref{http://sourceforge.net/projects/libvisual, libvisual}
++For using libvisual plugins (optional).
++
++@item @uref{http://www.ladspa.org, Ladspa plugins}
++Optional for audio filters/effects. Good experiences were made with
++the plugin packages @uref{http://www.ladspa.org/cmt/,cmt},
++@uref{http://plugin.org.uk, swh-plugins} and
++@uref{http://tap-plugins.sourceforge.net, tap-plugins}. Gmerlin looks for them
++at runtime, so you can install them at any time.
++
++@end table
++
++From now on, there are 2 ways to proceed:
++@itemize @bullet
++@item You can download the
++@uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=151779, gmerlin-dependencies}
++package, unpack it and install it using the instructions in the README file.
++A full dependencies install will provide you with the complete codec support,
++but some packages you already have might be installed a second time.
++Everything, however, gets into /opt/gmerlin, so there will be no conflicts.
++
++@item To have more control over the process, download and install the
++libraries listed below manually. 
++@end itemize
++
++@table @emph
++@item @uref{http://www.gnu.org/software/libcdio/, libcdio}
++Neccessary for the VCD, Audio CD and DVD plugins.
++
++@item @uref{http://www.audiocoding.com/, faad2}
++Needed for MPEG-4 audio support (mp4, aac files).
++
++@item @uref{http://www.audiocoding.com/, faac}
++Needed for MPEG-4 audio encoding (.aac files) and for AAC encoding via
++libquicktime.
++
++@item @uref{http://www.ffmpeg.org/, FFmpeg}
++Many codecs, strongly recommended. You should get a sufficiently new
++version from @uref{http://ffmpeg.mplayerhq.hu/download.html, ffmpeg SVN}
++and use --enable-shared when calling configure. Another option is the
++version in the
++@uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=151779, gmerlin-dependencies} package.
++
++@item @uref{http://www.mp3dev.org/, lame}
++For encoding mp3 files and AVIs with mp3 audio streams with libquicktime.
++
++@item @uref{http://mad.sourceforge.net/, mad}
++For playing MPEG-1/2 audio (e.g. mp3)
++
++@item @uref{http://freshmeat.net/redir/libdvdread/17926/url_homepage/downloads.shtml, libdvdread}
++For playing DVDs. Gmerlins method of accessing DVD drives doesn't
++differ much from others. Thus, DVD playback howtos found in the web
++apply for gmerlin as well.
++
++@item @uref{http://developers.videolan.org/x264.html, x264}
++For H.264 encoding with libquicktime.
++
++@item @uref{http://www.videolan.org/developers/libdca.html, libdca}
++For decoding DTS streams.
++
++@item @uref{http://libmpeg2.sourceforge.net/, libmpeg2}
++For decoding MPEG-1/2 Video (like .mpg files and DVD video)
++
++@item @uref{http://liba52.sourceforge.net/, liba52}
++For playing AC3 (aka DVD audio) streams.
++
++@item @uref{http://www.musepack.net/, libmpcdec}
++For playing musepack files (optional).
++
++@item @uref{http://www.theora.org/, theora}
++For en-/decoding theora video (optional).
++ 
++@item @uref{http://www.speex.org/, speex}
++For en-/decoding Speex streams (optional).
++
++@item @uref{http://libquicktime.sourceforge.net/, libquicktime}
++Optional, for the libquicktime based encoding and decoding plugins.
++Mostly necessary if you want to encode video. For decoding Quicktime,
++gmerlin_avdecoder is a lot better.
++
++@item @uref{http://mjpeg.sourceforge.net/, mjpegtools}
++Optional for en-/decoding yuv4mpeg streams and for encoding high
++quality MPEG video using mpeg2enc and friends.
++
++@end table
++
++@node Compilation and installation
++@section Compilation and installation
++
++If you downloaded a release, make sure, that you have the latest
++version of all packages. Alternatively, you can download the latest
++@uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=151778, gmerlin-all-in-one}
++package. It contains all source packages together
++with optional scripts to build and install them. Check the included
++README file.
++
++We always try to be compatible ther GNU build system. This means, that
++all gmerlin packages are compiled using the usual
++@code{./configure; make; su; make install} prodecure. Type
++@code{./configure --help} to see the supported options.
++
++The order is the following:
++
++@itemize
++@item @uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=50349, gavl}
++@item @uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=14511, gmerlin}
++@item @uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=124659, gmerlin_avdecoder}
++@item @uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=152799, gmerlin-encoders}
++@item @uref{http://sourceforge.net/project/showfiles.php?group_id=19684&package_id=124661, gmerlin-visualizer}
++@end itemize
++
++@node Binary codecs
++@section Binary codecs
++
++These must be downloaded from the @uref{http://www1.mplayerhq.hu/MPlayer/releases/codecs/, MPlayer codec page}. Download the file
++essential-YYYYMMDD.tar.bz2, where YYYYMMDD is some date. Unpack the
++.tar.bz2 and move the included files to /usr/lib/codecs. At this
++location, the DLLs will also be found by other players.
++
++@node General usage information, Applications, Installation, Top
++@chapter General usage information
++
++@menu
++* Configuration data::
++* GUI::
++* GML Syntax: gml.
++* Setting parameters from the commandline::
++@end menu
++
++@node Configuration data
++@section Configuration data
++
++They are saved in the directory @code{~/.gmerlin}, which has subdirectories
++for all applications. The directory "generic" stores common configuration
++data for applications, which have no config dialog. Plugins used by these
++programs can be configured with the gmerlin_plugincfg application. If a
++program misbehaves, especially after a version upgrade, delete the file
++@code{~/.gmerlin/application_dir/config.xml}, where @code{application_dir}
++corresponds to the application. Normally, this shouldn't be necessary.
++
++@node GUI
++@section GUI
++
++@menu
++* Introduction: gui_intro.
++* Static and dynamic parameters: gui_statdyn.
++* Configuring input plugins: gui_i.
++* Configuring filters: gui_f.
++* Log messages: gui_log.
++* Tips: gui_tips.
++@end menu
++
++@node gui_intro
++@subsection Introduction
++
++We try to make this as consistent as possible across the applications.
++In many windows, you'll see context sensitive menus when you right
++click somewhere. Furthermore, tooltips are enabled in all programs by
++default. You can, however, switch them off if they bother you. 
++
++@node gui_statdyn
++@subsection Static and dynamic parameters
++
++All GUI applications have their own configuration data.
++This means, that plugin configurations are not shared between
++these applications.
++
++There is a strict separation between static and plugin dependent
++configurations. 
++
++Most applications have one or more config dialogs
++@ifhtml
++(
++@image{../img/config_16}
++)
++@end ifhtml
++which let you change settings either for several subsystems of the
++application or for plugins, depending on the context.
++To change the plugins themselves, there are separate plugin dialogs
++@ifhtml
++(
++@image{../img/plugin_16}
++)
++@end ifhtml
++which let you select and configure plugins.
++
++It might be a bit tricky to find out if a special option can be set
++via the the plugin dialog or via
++the global config dialog. The general rule is: All features, which are
++supported by the core architecture, are configured in some global
++dialog. You can expect them to be present on every gmerlin installation
++of the same version. The plugin options vary depending on what plugins
++are installed (that's the reason, why they are separated).
++
++@node gui_i
++@subsection Configuring input plugins 
++
++@ifhtml
++@image{../img/gui_i}
++@end ifhtml
++
++This dialog lets you control, how input plugins (or image reader plugins)
++are loaded. The widgets on the right are valid for the plugin, which is selected
++on the left. You have the following options:
++
++@table @b
++@item Parameters
++@ifhtml
++@image{../img/config_16}
++@end ifhtml
++Lets you set parameters of the plugin. These will be valid when an instance of
++the plugin is opened the next time. If you configure hardware plugins in the player,
++you must close and reopen all device albums for the changes to become effective.
++For plugins, which have no options, this button is disabled.
++@item Info
++@ifhtml
++@image{../img/info_16}
++@end ifhtml
++Pops up a window showing much of the information, which is known to the plugin
++registry.
++@item Priority
++This lets you change the priority of the plugin, if multiple plugins are
++available for a gml. The value can be between 1 and 10. Usually, the default
++priorities are ok. But for image files, the priorities of the ``Image stills input plugin'' and the ``Image video input plugin'' decide, whether images are displayed
++as a slideshow or a video.
++@item Protocols
++Lets you configure the supported network protocols. The protocols should rarely
++be changed and changes are overwritten by a new install of the plugin. For plugins,
++which don't support network streams, the protocols cannot be changed.
++@item Extensions
++Lets you configure the file extensions, which are associated with the plugin.
++If you change the extensions, they are overwritten by a new install of the plugin.
++That's a good reason to report missing file extensions to the developers.
++@end table
++
++@node gui_f
++@subsection Configuring filters
++
++@ifhtml
++@image{../img/gui_f}
++@end ifhtml
++
++This dialog lets you build a filter chain to apply additional changes to the
++A/V data. The GUI player will apply most changes during playback (reinitializing the
++playback pipelines if necessary), the transcoder can change filter chains only per
++track. The filters are processed in top-to-bottom order.
++
++You have the following buttons:
++
++@table @b
++@item Add filter
++@ifhtml
++@image{../img/add_16}
++@end ifhtml
++Pops up a dialog, which will let you add new filters to the chain.
++Filter are always added to the end of the chain.
++@item Remove filter
++@ifhtml
++@image{../img/trash_16}
++@end ifhtml
++Deletes the currently selected filter
++@item Configure filter
++@ifhtml
++@image{../img/config_16}
++@end ifhtml
++Set parameters of the currently selected filter 
++@item Move to top
++@ifhtml
++@image{../img/top_16}
++@end ifhtml
++Move filter to the top (= the beginning) of the chain
++@item Move up
++@ifhtml
++@image{../img/up_16}
++@end ifhtml
++Move filter up by one
++@item Move down
++@ifhtml
++@image{../img/down_16}
++@end ifhtml
++Move filter down by one
++@item Move to top
++@ifhtml
++@image{../img/bottom_16}
++@end ifhtml
++Move filter to the bottom (= the end) of the chain
++@end table
++
++@b{Note for the player}
++
++Even though filter parameters are changed on the fly,
++pressing ``cancel'', without pressing ``apply'' before will
++revert all changes you made.
++
++@node gui_log
++@subsection Log messages
++
++@ifhtml
++@image{../img/gui_log}
++
++@end ifhtml
++Messages from pretty much everywhere in the applications are sent through the
++logging mechanism, and finally show up in the log window. It's the first place to
++look, if something does not work as expected (e.g. an URL does not load).
++There are 4 different types of messages, @b{error}, @b{warning}, @b{info} and
++@b{debug}. In the configuration for the log window, you can select, which message
++you want to see, the colors of the messages and the history size.
++@node gui_tips
++@subsection Tips
++
++@itemize
++@item Many buttons, which are associated with a list, are disabled unless you select an item in the list
++@item Doubleclicking onto the background of a slider (@strong{not} the slider itself) resets it to the
++      factory default
++@end itemize
++
++@node gml
++@section GML Syntax
++
++GMLs (Gmerlin media locations) are pretty much similar to URLs or
++MRLs with the difference, that device plugins support passing the device.
++This makes it possible to use gmls with hardware setups, which have
++multiple devices for each plugin.
++
++A gml can be:
++
++@table @bullet
++@item A regular filename
++Optionally preceeded with ``file://''. This means, that @b{/files/music.mp3} is the same as
++@b{file:///files/music.mp3}.
++@item A dash ``-'' or the string ``stdin://'' for reading from stdin
++@item Any valid network URL
++Examples: @b{http://webstream.example.com:8080}, @b{ftp://user:pass@@ftp.example.com/music.mp3}
++@item A "hardare protocol" followed by the device like @b{cda:///dev/hdc}.
++Known hardware protocols are @b{cda} (Audio CD), @b{vcd}, @b{dvd} and
++@b{dvb}. The supported protocols may vary according to your installation.
++@end table
++
++
++@node Setting parameters from the commandline
++@section Setting parameters from the commandline
++
++Gmerlin configuration handling provides the same features for both GUI
++applications and commandline programs. The natural result is, that the
++commandline syntax is a bit more complicated, since parameters can be
++nested.
++
++In General options have the form
++
++@code{'parameter1=value1:parameter2=value2...'}
++
++The quotes are necessary, if the string contains characters, which
++have a special meaning for the shell.
++
++The syntax of values depends on the type:
++@table @strong
++@item Boolean
++Value can be either 0 or 1.
++@item Integer values
++An integer number.
++@item Float values
++A floating point (i.e. fractional) number.
++@item Strings
++A string. Colons ':' should be escaped with '\'.
++@item Time
++Time is in the format @code{@{[[HH:]MM:]SS@}} while the seconds can be
++fractional. Hours and Minutes are optional, thus any format of
++@code{@{5.5@}}, @code{@{0:05.5@}} or @code{@{0:00:05.5}@} is valid for a time
++of 5.5 seconds. Writing @code{0} instead of @code{00} is also ok.
++@item Enumeration with suboptions
++Value is in the form
++@code{string[@{subparameter1=subvalue1:subparameter2=subvalue2...@}]}.
++The subparameters are optional. E.g. if the option is for selecting a
++plugin, setting string to @code{foo} will select the plugin @code{foo} and
++pass the subparameters (if avaliable) to the @code{foo} plugin.
++@item List or chain with suboptions
++This is like enumeration with suboptions with the difference, that
++you can concatenate multiple options together with colons (:) and
++must enclose everything with braces. For example:
++
++@code{@{opt1@{param1=value1@}:opt2@{param2=value2@}@}}
++
++If you use @code{-help}, you'll also see supported ranges for
++numeric types, or supported options for strings (if available).
++
++@end table
++
++@node Applications, Plugins, General usage information, Top
++@chapter Applications
++
++@menu
++* GUI Player::
++* Player remote control::
++* GUI Transcoder::
++* Transcoder remote control::
++* Commandline player::
++* Commandline recorder::
++* Alsamixer::
++* Visualizer::
++* Keyboard daemon::
++@end menu
++
++@node GUI Player
++@section GUI Player
++Type @code{gmerlin} with optionally any number of files or URLs to start this.
++
++@menu
++* Invoking gmerlin: gmerlin_player_usage.
++* Main window::
++* Media tree::
++* Video window::
++* Track information: gmerlin_player_trackinfo.
++* Configuring playback pipelines: gmerlin_player_avconfig.
++* Shortcuts: gmerlin_player_shortcuts.
++@end menu
++
++@node gmerlin_player_usage
++@subsection Invoking gmerlin
++
++@include gmerlin_player.texi
++
++@node Main window
++@subsection Main window
++@ifhtml
++@image{../img/player_mainwin}
++
++@end ifhtml
++
++It's a usual player window, with self explanatory buttons.
++
++@menu
++* Main menu: player_mainmenu.
++* Display: player_display.
++@end menu
++
++@node player_mainmenu
++@subsubsection Main menu
++
++The menu button will show the main menu of the player. Here, you can
++control practically the whole application:
++
++@table @b
++@item Audio, video and subtitles
++  See @ref{gmerlin_player_avconfig, Configuring playback pipelines}.
++@item Chapters
++@ifhtml
++@image{../img/player_chapters}
++
++@end ifhtml
++Chapters in gmerlin are just seekpoints with optional labels.
++If an input plugin supports chapters (e.g. of DVDs), gmerlin will
++make them available through the chapter menu.
++@item Visualizations
++@ifhtml
++@image{../img/player_vis}
++
++@end ifhtml
++If the upper menu item is enabled and the video window isn't used otherwise,
++Visualizations will be turned on.
++The audio stream of an Audio/video track can be visualized by disabling the video stream
++of that file (See @ref{gmerlin_player_avconfig, Configuring playback pipelines}).
++
++Then you can set some plugin-independent options
++@ifhtml
++@image{../img/config_16}
++@end ifhtml
++and finally the plugin itself 
++@ifhtml
++@image{../img/plugin_16}
++@end ifhtml
++. The menu for visualization plugin works exactly the same as for output plugins
++(See @ref{gmerlin_player_avconfig, Configuring playback pipelines}).
++
++@item Windows
++@ifhtml
++@image{../img/player_windows}
++
++@end ifhtml
++Here, you can show or hide the @ref{gui_log, Log window}, the
++@ref{gmerlin_player_trackinfo, Track info window} and the @ref{Media tree}.
++
++@item Options
++@ifhtml
++@image{../img/player_options}
++
++@end ifhtml
++Here, you can set @b{Preferences}
++@ifhtml
++@image{../img/config_16}
++@end ifhtml
++, configure @ref{gui_i, Input plugins}
++@ifhtml
++@image{../img/plugin_16}
++@end ifhtml
++, select
++@b{skins} or configure the @ref{Keyboard daemon}.
++
++@item Commands
++@ifhtml
++@image{../img/player_commands}
++
++@end ifhtml
++Here you have some commonly used commands. The good news about the
++shortcuts is, that they work in the
++media tree and in the video window as well.
++
++Only exception are the shortcuts, which map to ASCII-characters
++(Pause and Seek to start), they don't work in the media tree and in albums.
++
++Use this menu as a quick-help for all global
++shortcuts.
++
++@item Accessories
++@ifhtml
++@image{../img/player_accessories}
++
++@end ifhtml
++Here, you can conventiently fire up some other gmerlin applications
++like the @ref{GUI Transcoder}, the @ref{Visualizer} and the
++@ref{Alsamixer}.
++
++@end table
++
++@node player_display
++@subsubsection Display
++
++@ifhtml
++@image{../img/player_display}
++
++@end ifhtml
++The display is divided into several areas. Left of the
++time display, gmerlin shows an icon denoting the current
++operation mode (playing, paused etc.). Right of the time display,
++you have 2 fields. By left-clicking into the upper field, you can
++change the displayed time value. Options are
++@table @b
++@item Default
++Time is counted since track start
++@item ALL
++Time is counted since album start
++@item REM
++Remaining time until track end
++@item ALL REM
++Remaining time until album end
++@end table
++
++In the lower field, you can left-click to change the repeat mode.
++Options are @b{no repeat}, @b{repeat current track} and
++@b{repeat current album}.
++
++At the bottom, there is the scrolltext. It displayes the name of the currently played
++track (which can change e.g. for live radio stations), or a brief error messages if
++something goes wrong. Note, that in the latter case, you get more information from the
++@ref{gui_log, Log Window}.
++
++@node Media tree
++@subsection Media tree
++
++@ifhtml
++@image{../img/player_tree_tabbed}
++@end ifhtml
++
++The media tree can be used to store and organize your media collection.
++It consists of virtual folders called @emph{albums}. You can create albums,
++subalbums and move stuff between them like you want. The media files
++always stay at the same place in the filesystem. The albums can be either
++in own windows (Windowed mode) or as tabs in the tree window (tabbed mode). You
++cah switch this with the right-click menu of the tree widget.
++The tree- and album windows remember their screen positions.
++
++@menu
++* Tree widget: player_treewidget.
++* Album widget: player_albumwidget.
++@end menu
++
++@node player_treewidget
++@subsubsection Tree widget
++
++@b{Doubleclicking} an album opens it if it was closed or vice versa.
++
++@b{Creating albums} is done by right selecting the parent album in
++the tree and click the ``New album'' button
++@ifhtml
++@image{../img/folder_new_16}
++@end ifhtml
++or ``Album->New'' in the right-click menu. In the new empty album, you can then
++load files or URLs. Another option to import whole directory trees, is to
++click ``Album->New from directory''. It will pop up a directory selection dialog.
++The directory can optionally be scanned recursively. The tracks are either in one
++(flat) album, or in subalbums according to the directory structure.
++Note that importing large directories takes some time.
++
++@b{Deleting albums} is done by selecting them in the tree and
++clicking the ``remove'' button
++@ifhtml
++@image{../img/trash_16}
++@end ifhtml
++(or by choosing Album->Remove in the right click menu. Please note
++the following:
++
++@itemize @bullet
++@item Removing albums is done without confirmation
++@item All subalbums are removed as well
++@item This (as well as removing tracks) cannot be undone
++@item Good news: gmerlin @b{never} removes media files from disk
++@end itemize
++
++@b{Moving albums} is done with Drag & Drop
++
++@b{Loading files or URLs} into an open or closed album can be done by
++dragging it from a filemanager or webbrowser into the target album in the tree widget.
++
++Some @b{special albums} are automatically created in addition to the
++regular albums (which are created by you):
++
++@itemize @bullet
++@item @emph{Incoming:}
++@ifhtml
++@image{../img/incoming_closed_16}
++@end ifhtml
++
++It's the destination for tracks, which come from
++the comandline or from the remote.
++
++@item @emph{Favourites:}
++@ifhtml
++@image{../img/favourites_closed_16}
++@end ifhtml
++
++Each regular album has a Favourites button
++@ifhtml
++@image{../img/favourites_16}
++@end ifhtml
++, which
++lets you copy the selected tracks to the favourites. It's useful for
++quickly making a selection of tracks from multiple different albums.
++
++@item @emph{Plugin and device albums:}
++@ifhtml
++@image{../img/hardware_16}
++@end ifhtml
++
++Each plugin, which handles devices like removable disc drives
++@ifhtml
++@image{../img/drive_running_16}
++@end ifhtml
++or tuners
++@ifhtml
++@image{../img/tuner_16}
++@end ifhtml
++will create a plugin album. The available devices are
++then autoscanned and added as subalbums. Device albums are a bit limited:
++You can delete or reorder tracks, but you cannot move tracks from/to other
++albums.
++
++@end itemize
++
++@node player_albumwidget
++@subsubsection Album widget
++
++The album widget can either be in an own window (when the tree is in tabbed mode)
++or in a notebook right of the tree widget. It lists all tracks of that album.
++At the bottom there is a toolbar and a display of the total playback time of the album.
++
++A @b{track} in gmerlin is a piece of media, which can have an arbitrary number of audio-,
++video- and subtitle @b{streams}. A track can be divided into @b{chapters} (which are just
++seekpoints). Some files (like ALBW wrapped mp3s or concatenated Ogg streams), will show
++up as multiple tracks. You can move them around in the whole tree as if they were separate
++files.
++
++@b{Doubleclicking} an album opens it if it was closed or vice versa.
++
++The @b{right click menu} offers lots of options and shortcuts, not all of them are
++documented here.
++
++@b{Adding tracks} can happen in multiple ways:
++
++@itemize @bullet
++@item Drag Files or URLs from filenanagers or webbrowsers into an album
++@item Use the buttons
++@ifhtml
++@image{../img/folder_open_16}
++@end ifhtml
++@ifhtml
++@image{../img/earth_16}
++@end ifhtml
++in the album toolbar, or the right click menu
++@end itemize
++
++@b{Drag and Drop} is supported:
++@itemize @bullet
++@item From most webbrowsers and filenmanagers into the album (see above)
++@item From one regular album to another. By default, tracks are moved.
++  Press the @key{CTRL}-key before dragging, and the tracks will be copied.
++@item Inside all albums to sort the tracks
++@item From an album window into the tree window to transfer tracks to
++  another album
++@item From the album to text editors or graphics programs, which support
++dropping text. You'll get a string representation of the tracks, which
++will make designing disk covers easier.
++@end itemize
++
++@b{Error tracks} are tracks, which failed to load last time you tried.
++They are marked red but remain in the album. If they are on removable
++disks or in the network, you might retry playing them when they become
++available. To delete all error tracks, go to ``Select error tracks'' in the
++right click menu to select them. Then, press @kbd{@key{CTRL}+DELETE}
++to get rid of them.
++
++For keyboard commands, see @ref{gmerlin_player_shortcuts, Shortcuts}.
++
++@node Video window
++@subsection Video window
++
++This comes only when gmerlin has to show some video or still images. It
++is created and owned by the video output plugin (i.e. it has nothing to
++do with the core GUI). Currently, only an X11 plugin is available. It
++has some special features: You can zoom or squeeze the image to make
++your favourite tradeoff between aspect ratio distortion, black borders
++or cropped images. All global gmerlin @ref{gmerlin_player_shortcuts, Shortcuts} work
++also in the video window, as well as some special ones.
++
++@node gmerlin_player_trackinfo
++@subsection Track information
++@ifhtml
++@image{../img/player_trackinfo}
++
++@end ifhtml
++
++Here, you see detailed information of the currently (or last) played track
++in a tree structure. The right-click menu lets you copy either the whole contents or
++the currently selected row to the clipboard as plain text.
++
++@node gmerlin_player_avconfig
++@subsection Configuring playback pipelines
++
++The configuration for audio, video and subtitle handling is almost the same.
++
++@b{Stream menu}
++
++For each category, you have a stream menu.
++
++@ifhtml
++@image{../img/player_avconfig_menu}
++@end ifhtml
++
++In the upper part, you can select the available streams.
++You can also switch the stream off.
++
++In the lower part, you can set global (= plugin independent) options
++@ifhtml
++@image{../img/config_16}
++@end ifhtml
++, Filters
++@ifhtml
++@image{../img/filter_16}
++@end ifhtml
++ (See @ref{gui_f, Configuring filters})
++and the output plugin
++@ifhtml
++@image{../img/plugin_16}
++@end ifhtml
++.
++
++@b{Output plugin menu}
++
++@ifhtml
++@image{../img/player_avconfig_plugin}
++@end ifhtml
++
++In the upper part, you can change the output plugin (even during playback).
++In the lower part, you can configure
++@ifhtml
++@image{../img/config_16}
++@end ifhtml
++the plugin or show information  
++@ifhtml
++@image{../img/info_16}
++@end ifhtml
++about the plugin.
++
++@node gmerlin_player_shortcuts
++@subsection Shortcuts
++
++The following global shortcuts are available in the main window, the media
++tree including albums and the video window:
++
++@table @kbd
++@item @key{CTRL}+G
++Pop up current album and goto current track
++
++@item @key{CTRL}+O
++Pop up preferences dialog
++
++@item @key{CTRL}+P
++Pop up input plugin dialog
++
++@item @key{CTRL}+Q
++Quit program
++
++@item @key{CTRL}+PAGEDOWN
++Goto next track
++
++@item @key{CTRL}+PAGEUP
++Goto previous track
++
++@item @key{CTRL}+@key{SHIFT}+PAGEDOWN
++Goto next chapter
++
++@item @key{CTRL}+@key{SHIFT}+PAGEUP
++Goto previous chapter
++
++@item @key{CTRL}+RIGHT
++Seek forward
++
++@item @key{CTRL}+LEFT
++Seek backward
++
++@item @key{SHIFT}+RIGHT
++Decrease volume
++
++@item @key{SHIFT}+LEFT
++Increase volume
++
++@item @key{CTRL}+M
++Toggle mute
++
++@item 0
++(Zero) Seek to start. This is not available in the media tree and the albums.
++
++@item Space
++Toggle pause. This is not available in the media tree and the albums.
++
++@item @key{CTRL}+G
++Goto current track. This raises the current album and moves to the
++current track within that album.
++
++@item F9
++Copy current track to favourites
++
++@item @key{CTRL}+Q
++Quit gmerlin
++@end table
++
++The following additional chortcuts are available in the @ref{Video window}:
++
++@table @kbd
++
++@item CTRL+PLUS/MINUS
++Increase/decrease aspect ratio (squeeze). Zoom and squeeze are a simple way to choose your
++personal tradeoff between aspect ratio distortion, missing image parts and black borders.
++
++@item CTRL+MOUSEWHEEL
++Increase/decrease aspect ratio (squeeze).
++
++@item ALT+PLUS/MINUS
++Increase/decrease zoom factor
++
++@item ALT+MOUSEWHEEL
++Increase/decrease zoom factor
++
++@item @key{CTRL}+HOME
++Reset zoom and squeeze
++
++@item HOME
++Resize the window to the size of the video. If the video has nonsquare
++pixels, the window width is adjustetd accordingly.
++
++@item @key{SHIFT}+HOME
++Shrink the window such that no black borders are visible abound the video
++
++@item B/b
++Increase/decrease brightness. 
++
++@item S/s
++Increase/decrease saturation.
++
++@item C/c
++Increase/decrease contrast.
++
++Brightness, saturation and contrast work only, if the hardware and the currently used display driver
++support this.
++
++@item TAB
++Toggle fullscreen/windowed mode
++@item f
++Toggle fullscreen/windowed mode
++@item Esc
++Exit fullscreen mode
++@end table
++
++The following additional shortcuts are available inside @ref{player_albumwidget, albums}:
++
++@table @kbd
++@item UP/DOWN
++Move the cursor one track up/down
++
++@item PAGEUP/PAGEDOWN
++Move the cursor one page up/down
++
++@item Mousewheel
++Scroll
++
++@item SHIFT+UP/DOWN
++Move the cursor one track up/down and select track
++
++@item SHIFT+PAGEUP/PAGEDOWN
++Move the cursor one page up/down and select tracks
++
++@item @key{CTRL}+UP/DOWN
++Move the cursor one track up/down and unselect track
++
++@item ALT+HOME
++Move selected tracks to the top
++
++@item ALT+END
++Move selected tracks to the bottom
++
++@item ALT+MOUSEWHEEL
++Increase/decrease zoom factor
++
++
++@item @key{CTRL}+C
++Copy selected tracks to clipboard
++
++@item @key{CTRL}+X
++Cut selected tracks to clipboard
++
++@item @key{CTRL}+V
++Paste tracks from clipboard at the current cursor position
++
++@item @key{CTRL}+DELETE
++Delete selected tracks
++
++@item @key{CTRL}+F
++Search for tracks
++
++@item @key{CTRL}+I
++Display info about the currently selected track
++
++@item F10
++Copy selected tracks to favourites
++@end table
++
++@node Player remote control
++@section Player remote control
++
++@code{gmerlin_remote} is the command for remotely controlling the
++GUI player. It can be used as a helper application if webbrowsers
++or filenmanagers or for all kinds of remote control methods (including
++keyboard- or infrared-daemons), which can execute arbitrary shell
++commands. One example for a generic keyboard daemon, which can call
++@code{gmerlin_remote} is the @ref{Keyboard daemon, Gmerlin Keyboard daemon}.
++
++@menu
++* Invoking gmerlin_remote: gmerlin_remote.
++* Examples: gmerlin_remote_examples.
++@end menu
++
++@node gmerlin_remote
++@subsection Invoking gmerlin_remote
++
++@include gmerlin_remote.texi
++
++@node gmerlin_remote_examples
++@subsection Examples
++
++@table @code
++@item gmerlin_remote -play
++Play the current track (same as pressing the ``play'' button)
++
++@item gmerlin_remote -host remote.example.com -play
++Connect to @code{remote.example.com} and play the current track there
++
++@item gmerlin_remote -seek-rel -10.0
++Seek 10 seconds backwards
++
++@item gmerlin_remote -next
++Go to next track
++
++@item gmerlin_remote -chapter +
++Go to next chapter
++
++@item gmerlin_remote -openplay cda:///dev/scd0
++Open and play an audio CD in the first SCSI drive and start playing.
++Use commands like this in your desktop configuration for handling removable
++media.
++
++@item gmerlin_remote -launch -addplay http://webradio.example.com/stream.ogg
++Add the given gml to the Incoming
++@ifhtml
++@image{../img/incoming_closed_16}
++@end ifhtml
++album (launching a new player if necessary) and play it. Use commands like this as
++MIME-Handler in webbrowsers and filemanagers. A shortcut for this command is the
++script
++@code{gmerlin_launcher}.
++@end table
++
++
++@node GUI Transcoder
++@section GUI Transcoder
++
++@menu
++* Invoking gmerlin_transcoder: gmerlin_transcoder.
++* Quick intro: gmerlin_transcoder_intro.
++* Main window: gmerlin_transcoder_window.
++* Configuring encoder plugins: gmerlin_transcoder_enc.
++* Configuring tracks: gmerlin_transcoder_tracks.
++@end menu
++
++@node gmerlin_transcoder
++@subsection Invoking gmerlin_transcoder
++
++@include gmerlin_transcoder.texi
++
++@node gmerlin_transcoder_intro
++@subsection Quick intro
++
++Gmerlin transoder can transcode every supported input file
++to any of the supported output files. It has some unique features,
++which seperate it from other transcoding applications. Most notably:
++
++@table @b
++@item Per stream settings
++All settings are configured for each stream separately. This means,
++different streams can have different formats, different filters and
++even different codecs (of course only if the container supports it)
++
++@item Subtitle support
++There are plugins for exporting subitles to separate files or to the
++same file, where the A/V data gets written. Alternatively, you can
++blend subtitles onto the video frames (for containers, which don't
++support subtitles).
++
++@item Profile support
++Finding out the right encoder parameters can be a time-consuming task.
++@code{gmerlin_transcoder} allows you to save all settings and load them later.
++Once you have found out your favourite encoder settings for a specific task,
++transcoding is a matter of
++@itemize @bullet
++@item Loading the profile
++@item Adding tracks to the tasklist
++@item Clicking the transcode button
++@end itemize
++
++@item Postprocessing support
++There are postprocessors, which take the encoded files and
++make e.g. Audio CDs (with cdtext) from it. It also contains a frontend for cdrdao,
++so you can burn them as well.
++
++@item Chapter support
++@code{gmerlin_transcoder} imports all chapter seekpoints from the source, and writes
++them  into the file (currently only supported for Quicktime and mp4).
++You can also edit chapter lists or create new ones
++@item Language codes
++@code{gmerlin_transcoder} lets you import, edit and export language codes for
++the Audio- and subtitle streams
++@item 2 Pass encoding
++For plugins, which support it, we can do 2-transcoding. There is also a
++generic volume normalizer built in.
++@end table
++
++There is a @ref{transcoder_tasklist, tasklist},
++in which the tracks are queued. All newly loaded tracks
++get the globally configured settings (plugins, formats, filters). You can then
++fine-tune the tracks by configuring them individually. Changing track
++parameters for multiple tracks at once isn't possible. Instead, make the
++settings, save them to a profile and load the profile before loading the
++tracks.
++
++@node gmerlin_transcoder_window
++@subsection Main window
++
++@ifhtml
++@image{../img/transcoder_mainwin}
++@end ifhtml
++
++The window contains of the following elements:
++
++@menu
++* Menu bar: transcoder_menubar.
++* Display: transcoder_display.
++* Progress bar: transcoder_progressbar.
++* Tasklist: transcoder_tasklist.
++@end menu
++
++@node transcoder_menubar
++@subsubsection Menu bar
++
++Here you have all @b{global} commands and settings.
++The item @b{Tasklist} has @b{per track} commands and settings.
++
++@b{File menu}
++
++@table @b
++@item Load tasklist...
++@ifhtml
++@image{../img/folder_open_16}
++@end ifhtml
++Pops up a file selection dialog and loads the chosen tasklist.
++The tracks are appended to already existing tracks in the list.
++Has a shortcut in the @b{upper} toolbar.
++@item Save tasklist...
++@ifhtml
++@image{../img/save_16}
++@end ifhtml
++Pops up a file selection dialog for saving the current tasklist.
++Has a shortcut in the @b{upper} toolbar.
++@item Quit
++@ifhtml
++@image{../img/quit_16}
++@end ifhtml
++Stop the current transcoding action (if any) and quit
++Has a shortcut in the @b{upper} toolbar.
++@end table
++
++@b{Options menu}
++@table @b
++@item Preferences
++@ifhtml
++@image{../img/config_16}
++@end ifhtml
++Here, you configure the GUI and the default settings for newly added tracks.
++The preferences are saved in the profile.
++
++@item Configure plugins
++@ifhtml
++@image{../img/plugin_16}
++@end ifhtml
++Here, you set the default plugins for newly added tracks. You can
++configure input plugins (See @ref{gui_i, Configuring input plugins})
++and encoders (See @ref{gmerlin_transcoder_enc, Configuring encoders}).
++The plugin settings are saved in the profile.
++
++@item Load profile...
++@ifhtml
++@image{../img/folder_open_16}
++@end ifhtml
++Pops up a file selection dialog and loads the chosen profile.
++All configuration and plugin settings for new tracks will be
++changed immediately.
++@item Save profile...
++@ifhtml
++@image{../img/save_16}
++@end ifhtml
++Pops up a file selection dialog for saving the current configuration
++to a profile.
++
++@end table
++
++@b{Actions}
++
++@table @b
++@item Start transcoding
++@ifhtml
++@image{../img/run_16}
++@end ifhtml
++This will start transcoding of the tracks in the trasklist in top-to-bottom
++order. While transcoding you can still add/delete/edit tracks in the list.
++Has a shortcut in the @b{upper} toolbar.
++@item Stop transcoding
++@ifhtml
++@image{../img/stop_16}
++@end ifhtml
++Stops transcoding. If the currently transcoded track is not a
++live stream, the produced files are deleted from disk (unless you disable
++this in the preferences). The currently decoded track is moved back to the
++top of the tasklist.
++Has a shortcut in the @b{upper} toolbar.
++@end table
++
++@b{Tasklist}
++
++This menu acts on the tasklist as a whole or the selected track(s).
++
++@table @b
++@item Add... -> Files...
++@ifhtml
++@image{../img/folder_open_16}
++@end ifhtml
++Pops up a file selection dialog, which lets you add files (optionally
++with a specific input plugin) to the end of the tasklist. 
++Has a shortcut in the @b{lower} toolbar.
++@item Add... -> URLs...
++@ifhtml
++@image{../img/earth_16}
++@end ifhtml
++Pops up a window, which lets you enter an URL (optionally
++with a specific input plugin) to the end of the tasklist. 
++Has a shortcut in the @b{lower} toolbar.
++@item Add... -> Drives...
++@ifhtml
++@image{../img/drive_running_16}
++@end ifhtml
++Pops up a window, which lets open a removeable disk (e.g.
++and Audio CD) and append it's tracks to the end of the
++tasklist. You must specify the device @b{and} the plugin.
++Has a shortcut in the @b{lower} toolbar.
++@item Selected... -> Move up...
++@ifhtml
++@image{../img/top_16}
++@end ifhtml
++Move the selected tracks to the top of the list, so they will be
++transcoded first.
++@item Selected... -> Move down...
++@ifhtml
++@image{../img/down_16}
++@end ifhtml
++Move the selected tracks to the bottom of the list, so they will be
++transcoded last
++@item Selected... -> Remove...
++@ifhtml
++@image{../img/trash_16}
++@end ifhtml
++Remove the selected tracks (without confirmation or undo).
++Has a shortcut in the @b{lower} toolbar.
++@item Selected... -> Configure...
++@ifhtml
++@image{../img/config_16}
++@end ifhtml
++Configure the selected track. 
++Has a shortcut in the @b{lower} toolbar.
++@item Selected... -> Edit chapters...
++@ifhtml
++@image{../img/chapter_16}
++@end ifhtml
++Pop up the chapter editor. If the source has chapters, you'll
++find them here. You can also add/delete/move chapters. Chapters
++can also have names (currently only supported by the libquicktime encoder).
++Has a shortcut in the @b{lower} toolbar.
++
++@item Selected... -> Change encoders...
++@ifhtml
++@image{../img/plugin_16}
++@end ifhtml
++Here, you set the encoding plugins of the selected tracks.
++(See @ref{gmerlin_transcoder_enc, Configuring encoders}).
++Has a shortcut in the @b{lower} toolbar.
++
++@item Edit... -> Cut
++@ifhtml
++@image{../img/cut_16}
++@end ifhtml
++Cut selected tracks to the clipboard.
++Has a shortcut in the @b{lower} toolbar.
++
++@item Edit... -> Copy
++@ifhtml
++@image{../img/copy_16}
++@end ifhtml
++Copy selected tracks to the clipboard.
++Has a shortcut in the @b{lower} toolbar.
++
++@item Edit... -> Paste
++@ifhtml
++@image{../img/paste_16}
++@end ifhtml
++Paste tracks or album entries from the @ref{GUI Player}
++from the clipboard. Has a shortcut in the @b{lower} toolbar.
++@item Postprocess...
++Pops up a dialog to configure postprocessing.
++Postprocessing plugins are invoked whenever
++the tasklist gets empty. It adds all tracks, which have
++been encoded since batch transcoding was started.
++Postprocessors make some sanity checks of the files they get,
++and won't try to burn e.g. audio CDs with MPEG data.
++@end table
++
++@b{Windows}
++
++Here, you can show and hide the @ref{gui_log, log window}.
++
++@node transcoder_display
++@subsubsection Display
++Displays the currently performed action and the estimated
++remaining time for the current action. The time display in the lower right
++corner shows the total playback time of the tasklist.
++
++@node transcoder_progressbar
++@subsubsection Progress bar
++Displays the progress of the current action.
++
++@node transcoder_tasklist
++@subsubsection Tasklist
++
++A queue for tracks to be transcoded. Right clicking into the
++list pops up a menu, which is the same as in the menubar.
++
++New tracks can be added in various ways:
++
++@itemize @bullet
++@item By dragging files or URLs from filenanagers or webbrowsers into the tasklist
++@item By using the buttons in lower toolbar or the right click menu
++@item From the @ref{GUI Player} by right clicking into an album end select Selected->Transcode. If multiple transcoders are open, the
++instance, which listens on the remote port (can be only one at a time),
++gets the track.
++@item By dragging tracks from a gmerlin album into the tasklist
++@end itemize
++
++@node gmerlin_transcoder_enc
++@subsection Configuring encoders
++@ifhtml
++@image{../img/transcoder_enc}
++@end ifhtml
++
++This dialog exists in the global settings as well as in the per track
++settings. It describes a complete encoder setup.
++
++There are 2 different modes for encoding: Either all A/V streams go into
++one file, or into separate files (i.e. it's not possible to group some
++A/V streams and write others separately). You control this by clicking
++``Encode audio into video file'' checkbox. Subtitles can be written into
++the video file, or into a separate file. You can select this independently for
++text- and overlay subtitles with the corresponding checkbuttons.
++
++Note, that some streams are always written to a separate file (regardless
++of the check-box settings) if the video encoder plugin doesn't support streams
++of that type.
++
++Then, you can set encoder plugins for each stream type. The menu selects
++the plugin. Right of the menu, there are buttons for displaying plugin info
++@ifhtml
++@image{../img/info_16}
++@end ifhtml
++and setting global options 
++@ifhtml
++@image{../img/config_16}
++@end ifhtml
++(like ID3 generation or fileformat flavours). These settings can be changed
++on a per track basis in the @ref{gmerlin_transcoder_tracks,
++ track configuration dialog}.
++
++Finally, there are the default audio-
++@ifhtml
++@image{../img/audio_16}
++@end ifhtml
++and video
++@ifhtml
++@image{../img/video_16}
++@end ifhtml
++settings. Here, you mostly configure codec parameters like bitrates, etc.
++To further tweak these settings of a per stream base, you'll find the
++same options for each stream in the @ref{gmerlin_transcoder_tracks,
++ track configuration dialog}.
++
++@node gmerlin_transcoder_tracks
++@subsection Configuring tracks
++@ifhtml
++@image{../img/transcoder_track}
++@end ifhtml
++
++It's a standard gmerlin configuration dialog, which is built dynamically
++depending on the stream layout of the source and the encoder setup. On
++the left you see a tree structure of all settings:
++@table @b
++@item General
++Sets global settings like basename of the file and an optional subdirectory
++of the encoding directory, where the file(s) will be written. Note, that
++the toplevel destination directory is configured globally, not per track.
++
++If you select ``postprocess only'', the input file will be sent directly
++to the postprocessing plugin. Enable this for files, which already have a
++format supported by the postprocessor.
++
++Finally you can choose to transcode only a certain selection given by
++the start- and/or end time.
++
++@item Metadata
++Here, any available metadata are imported from the input, and you can
++edit them. Note that not all medatada fields are supported by all output
++formats. Some formats don't support metadata at all.
++
++@item Global encoder options
++For each enabled encoding plugin, you can configure global settings here.
++
++@item Stream options
++For each stream, you have @b{Generic options}. Here you can en- or disable
++the stream, set the language and the format. In addition for subtitles,
++you can choose whether to convert text- to overlay subtitles, blend
++subtitles onto video frames or encode them separately.
++
++For Audio and video streams, you can also set up @ref{gui_f, filters}.
++
++For text subtitles, the @b{render options} let you configure the
++font and colors of the subtitles, if they are converted to overlay
++subtitles.
++
++The @b{default format} of subtitles is for the rare case, that you want
++to convert subtitles to a video stream. It's only used if you encode subtitles
++but no corresponding video stream.
++
++The last tree- node for each stream has always the codec option of the
++output plugin for the respective streams. Here, you can change encoder
++settings for each stream separately. 
++@end table
++
++@node Transcoder remote control
++@section Transcoder remote control
++
++@menu
++* Invoking gmerlin_transcoder_remote: gmerlin_transcoder_remote.
++@end menu
++
++@node gmerlin_transcoder_remote
++@subsection Invoking gmerlin_transcoder_remote
++
++@include gmerlin_transcoder_remote.texi
++
++
++@node Commandline player
++@section Commandline player
++
++@menu
++* Invoking gmerlin_play: gmerlin_play.
++@end menu
++
++@node gmerlin_play
++@subsection Invoking gmerlin_play
++
++@include gmerlin_play.texi
++
++@node Commandline recorder
++@section Commandline recorder
++
++@menu
++* Invoking gmerlin-record: gmerlin-record.
++@end menu
++
++@node gmerlin-record
++@subsection Invoking gmerlin-record
++
++@include gmerlin_record.texi
++
++@node Alsamixer
++@section Alsamixer
++
++@ifhtml
++@image{../img/alsamixer}
++@end ifhtml
++
++Type @code{gmerlin_alsamixer} to start this.
++This is a mixer program, which is still convenient, if you have
++multiple soundcards with 100s of options each. It provides widgets
++for almost all soundcard parameters, which are supported by alsa.
++
++By right clicking on a control, you get a menu where you can:
++
++@itemize @bullet
++@item Move controls inside the window
++@ifhtml
++@image{../img/first_16}
++@image{../img/left_16}
++@image{../img/right_16}
++@image{../img/last_16}
++@end ifhtml
++
++@item Move controls to own windows
++@ifhtml
++@image{../img/windowed_16}
++@end ifhtml
++. To move them back to main window,
++  simply close the control-windows. 
++@item Pop up an options dialog
++@ifhtml
++@image{../img/config_16}
++@end ifhtml
++, where you can select which controls should be shown at all.
++@end itemize
++
++All window configurations and coordinates are remembered. The actual mixer
++settings are @emph{not} remembered, since this is done globally by the
++Alsa startup scripts.
++
++@node Visualizer
++@section Visualizer
++
++@ifhtml
++@image{../img/visualizer}
++
++@end ifhtml
++
++Type @code{gmerlin_visualizer} to start this.
++Gmerlin visualizer opens your soundard for recording and displays a
++visualization in a window. It supports fullscreen and mouse- and
++keyboard interaction with visuals for visualization plugins, which
++support this.
++If you move the mouse or press the ``Menu key'', the toolbar will show
++up (either method can be disabled). It will be hidden again after
++the mouse is idle for some seconds.
++
++In the @b{upper left row}, you can change the input plugin, show info
++about the plugin
++@ifhtml
++@image{../img/info_16}
++@end ifhtml
++or configure the visualization
++@ifhtml
++@image{../img/config_16}
++@end ifhtml
++.
++
++In the @b{lower left row}, you can change the recording- and
++display plugins
++@ifhtml
++@image{../img/plugin_16}
++@end ifhtml
++, set global (plugin independent) options 
++@ifhtml
++@image{../img/config_16}
++@end ifhtml
++, restart the visualization
++@ifhtml
++@image{../img/refresh_16}
++@end ifhtml
++, switch to fullscreen
++@ifhtml
++@image{../img/fullscreen_16}
++@end ifhtml
++or back
++@ifhtml
++@image{../img/windowed_16}
++@end ifhtml
++. Moreover you can show or hide the @ref{gui_log, Log window}
++@ifhtml
++@image{../img/log_16}
++@end ifhtml
++or exit
++@ifhtml
++@image{../img/quit_16}
++@end ifhtml
++the application.
++
++The @b{VU-meter} at the right displays the recording level as it comes
++from the device (i.e. @b{before} the visualizer gain is applied).
++
++You have the following @b{Shortcuts}:
++
++@table @kbd
++@item f
++Toggle fullscreen mode
++@item Tab
++Toggle fullscreen mode
++@item Escape
++Exit fullscreen mode
++@item Menu
++Show toolbar
++@end table
++
++All other keyboard- and mouse events are propagated to the display
++plugin and then to the visualization plugin.
++
++@node Keyboard daemon
++@section Keyboard daemon
++@ifhtml
++@image{../img/kbd_mainwin}
++
++@end ifhtml
++The gmerlin keyboard daemon is an X11 application, which grabs key combinations
++and executes commands. You will communicate mostly via
++the configuration utility @code{gmerlin_kbd_config}. It's independent of
++keyboard model definitions, because it allows to enter the keyboard combination
++in the config dialog directly. It's independent of gmerlin or any other
++multimedia architecture, since the actions can be arbitrary shell commands.
++
++You can manually start and stop the keyboard daemon, add, edit and delete
++key combinations and tell the daemon to apply the changes.
++
++To automatically start the keyboard daemon at each X11 start, find out
++where to enter start commands in your desktop configuration add the
++command @code{/usr/local/bin/gmerlin_kbd}. Change @code{/usr/local} to
++your install prefix if necessary.
++
++Messages from the keyboard daemon show up in @file{/var/log/messages} or
++in another syslog file depending on your system setup.
++
++@node Plugins, FAQ, Applications, Top
++@chapter Plugins
++
++@include plugins.texi
++
++@node FAQ, Get involved, Plugins, Top
++@chapter FAQ
++
++@menu
++* General questions::
++* Installation questions::
++* Usage questions::
++@end menu
++
++@node General questions
++@section General questions
++
++@node Installation questions
++@section Installation questions
++
++@strong{Q:} @emph{Why do I have to install so many packages to get all features?}
++
++@strong{A:} Because having one huge package is not good for people, who want to use
++only one small subset of the included libraries or applications. To make installation
++a bit easier, there are the gmerlin-dependencies and gmerlin-all-in-one packages.
++
++@strong{Q:} @emph{How do I enable Ladspa plugins?}
++
++@strong{A:} Gmerlin looks for Ladspa plugins in @code{/usr/lib/ladspa} and
++@code{/usr/local/lib/ladspa} by default. Additional paths can be set with the
++@code{LADSPA_PATH} enviromnent variable.
++
++@strong{Q:} @emph{Which Ladspa plugins work with gmerlin?}
++
++@strong{A:} All plugins, which have either 1 or 2 input and output ports. The numbers
++of input- and output ports must be equal.
++
++@strong{Q:} How do I enable DVB?
++
++@strong{A:} Gmerlin looks for DVB devices in /dev/dvb. Then, you must pass gmerlin
++  a channel configuration file created with the @uref{http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps,dvb-apps}
++  tools. Check the documentation coming with dvb-apps for how to create channel files. Gmerlin looks for channel maps
++  in the directories @code{$HOME/.szap}, @code{$HOME/.tzap}, @code{$HOME/.czap},
++  @code{$HOME/.azap}, @code{$HOME/.mplayer} and @code{$HOME/.xine}. The first time, you load the DVB plugin,
++  and each time you changed your channel map, the plugin will tune to each transponder and get the full
++  information about the programs (the information provided by dvp-apps is not sufficient). This can take some time.
++  
++@node Usage questions
++@section Usage questions
++
++@strong{Q:} @emph{Ok, I compiled gmerlin and started the player, now how do I  play a file?}
++
++@strong{A:} The easiest way is to open the Incoming or Favourites album
++and use one of the buttons at the bottom to open a file or URL. Or drag the
++file from a filemanager into an album. Later you might want to create
++your own albums.
++
++@strong{Q:} @emph{Can I play a VCD image from harddisk before burning?}
++
++@strong{A:} Yes. If you use vcdimager, you have 2 files: a .bin file and a .cue
++   file. If you load the .cue file with the avdecoder plugin, you'll be
++   able to play the VCD image.
++
++@strong{Q:} @emph{Can I play a DVD image from harddisk or from a mounted DVD drive?}
++
++@strong{A:} Yes, in the dvd directory, go to the subdirectory @code{video_ts} and load the
++   file @code{video_ts.ifo}.
++   
++@strong{Q:} @emph{Can I play an audio CD image from harddisk before burning?}
++
++@strong{A:} Not yet.
++
++@strong{Q:} @emph{How can I make gmerlin the default audio CD player on my Desktop environment?}
++
++@strong{A:} First, find out how to configure the default audio CD player on your system.
++   Usually, you can set a command, which is executed, when a new audio cd is inserted.
++   Assuming your cdrom device is @code{/dev/hdd}, the command for opening and playing
++   an audio cd is:
++
++   @code{gmerlin_remote -launch -openplay cda:///dev/hdd}
++
++   If you just want ot open the CD (without starting playback), use:
++
++   @code{gmerlin_remote -launch -open cda:///dev/hdd}
++   
++@strong{Q:} @emph{How can I make gmerlin the default DVD player on my Desktop environment?}
++
++@strong{A:} Same as for audio CDs, but replace @code{cda://} with @code{dvd://}.
++
++@strong{Q:} @emph{How can I configure gmerlin as a Mime handler for media files on my Desktop environment?}
++
++@strong{A:} Find out how to set up mime handlers (e.g. right click onto a file and select ``Open with...'').
++   Then, enter the command @code{gmerlin_launcher}.
++   
++@strong{Q:} @emph{How can I map multimedia keys on my keyboard to gmerlin functions?}
++
++@strong{A:} You need some way to configure custom shell commands for multimedia keys. Check the
++documentation of your Desktop system. To remote control gmerlin, use the commandline program
++@code{gmerlin_remote}. Type @code{gmerlin_remote -help} for supported options and commands.
++   
++@node Get involved, , FAQ, Top
++@chapter Get involved
++
++Contribution to gmerlin can happen at several skill levels:
++
++@itemize @bullet
++@item Report bugs and installation problems, tell about features you'd like to see.
++@item Tell us about files, which cannot be played. An URL and some infos (other applications
++      which play the file fine) can help a lot.
++@item Make skins. In /usr/local/gmerlin/skins/Default/skin.xml, you'll find an example skin description file.
++@item Assembler gurus can write more speed optimized routines for gavl
++@item Mathematics gurus can write more accurate routines for the higher quality
++levels of gavl. 
++@end itemize
++
++@bye
++
+diff -Naur gmerlin-1.2.0.orig/doc/gmerlin.texi gmerlin-1.2.0/doc/gmerlin.texi
+--- gmerlin-1.2.0.orig/doc/gmerlin.texi	2013-02-27 16:56:41.202827892 -0800
++++ gmerlin-1.2.0/doc/gmerlin.texi	2013-02-27 16:58:29.743890528 -0800
+@@ -461,7 +461,7 @@
+ 
+ A gml can be:
+ 
+-@table @bullet
++@table @b
+ @item A regular filename
+ Optionally preceeded with ``file://''. This means, that @b{/files/music.mp3} is the same as
+ @b{file:///files/music.mp3}.
diff --git a/community/gmerlin/libpng.patch b/community/gmerlin/libpng.patch
deleted file mode 100644
index c01105e63..000000000
--- a/community/gmerlin/libpng.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -wbBur gmerlin-1.0.0/plugins/png/ir_png.c gmerlin-1.0.0.my/plugins/png/ir_png.c
---- gmerlin-1.0.0/plugins/png/ir_png.c	2011-01-07 18:37:06.000000000 +0300
-+++ gmerlin-1.0.0.my/plugins/png/ir_png.c	2011-11-07 14:46:25.000000000 +0400
-@@ -127,13 +127,8 @@
-         bits = 16;
-         }
-       if(bit_depth < 8)
--#if BG_MAKE_BUILD(PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE) < BG_MAKE_BUILD(1,2,9)
--        png_set_gray_1_2_4_to_8(png->png_ptr);
--#else
-       png_set_expand_gray_1_2_4_to_8(png->png_ptr);
--#endif
- 
--        png_set_gray_1_2_4_to_8(png->png_ptr);
-       if (png_get_valid(png->png_ptr, png->info_ptr, PNG_INFO_tRNS))
-         {
-         png_set_tRNS_to_alpha(png->png_ptr);
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index 56e2f337c..e9ef43fef 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 82913 2013-01-25 17:29:35Z spupykin $
+# $Id: PKGBUILD 88860 2013-04-24 13:40: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,23 +6,30 @@
 
 pkgbase=gmic
 pkgname=("gmic" "gimp-plugin-gmic" "zart")
-pkgver=1.5.3.0
+pkgver=1.5.5.2
 pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
+arch=("i686" "x86_64" "mips64el")
 url="http://gmic.sourceforge.net"
 license=("custom:CeCILL")
-makedepends=("gimp" "qt" "fftw" "openexr" "opencv")
+makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
 #options=('!emptydirs')
 source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz"
         "opencv-buildfix.patch")
-md5sums=('2b3c385d727556d201767d338d97946f'
+md5sums=('ec68076448166ea18d15c0a69489dd25'
          '120319b0d6c81c5af186abe2281b79ca')
 
-build() {
+prepare() {
   cd "${srcdir}/gmic-${pkgver}"
   patch -p1 -i "${srcdir}/opencv-buildfix.patch"
   find "${srcdir}/gmic-${pkgver}/zart" -type f -execdir chmod 644 '{}' \;
   find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \;
+  sed -i 's|qmake zart.pro|qmake-qt4 zart.pro|' src/Makefile
+}
+md5sums=('7d3a8e5cf9e866dd8979dc7c759a21a6'
+         '120319b0d6c81c5af186abe2281b79ca')
+
+build() {
+  cd "${srcdir}/gmic-${pkgver}"
   make -C src all
 }
 
@@ -39,7 +46,7 @@ package_gmic() {
 
 package_zart() {
   pkgdesc="A GUI for G'MIC real-time manipulations on the output of a webcam"
-  depends=("opencv" "fftw" "qt")
+  depends=("opencv" "fftw" "qt4")
 
   cd "${srcdir}/gmic-${pkgver}"
   make -C src install DESTDIR="$pkgdir" USR="/usr"
diff --git a/community/gmime24/PKGBUILD b/community/gmime24/PKGBUILD
index 48573dffa..64f2d9f7e 100644
--- a/community/gmime24/PKGBUILD
+++ b/community/gmime24/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67635 2012-03-13 14:57:11Z spupykin $
+# $Id: PKGBUILD 87490 2013-04-01 16:50:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gmime24
-pkgver=2.4.32
+pkgver=2.4.33
 pkgrel=1
 pkgdesc="Core mime parsing library"
 arch=(i686 x86_64 mips64el)
@@ -14,7 +14,7 @@ depends=('glib2' 'zlib')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/gmime/2.4/gmime-${pkgver}.tar.xz)
-md5sums=('46a52361d43769d20dbd87aa225bc3f9')
+md5sums=('a4dc6e553c0cf3b7d96dfef8ab633163')
 
 build() {
   # get rid of that .wapi errors in fakeroot
@@ -26,8 +26,11 @@ build() {
 	--disable-mono \
 	--disable-static
   make
-  make DESTDIR=${pkgdir} install
+}
 
+package() {
+  cd ${srcdir}/gmime-${pkgver}
+  make DESTDIR=${pkgdir} install
   # These are gmime alternatives for the same shareutils tools
   rm -rf ${pkgdir}/usr/bin/uuencode ${pkgdir}/usr/bin/uudecode ${pkgdir}/usr/share
 }
diff --git a/community/gmpc/PKGBUILD b/community/gmpc/PKGBUILD
index 623600656..bea9562cc 100644
--- a/community/gmpc/PKGBUILD
+++ b/community/gmpc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83148 2013-01-27 16:16:24Z pierre $
+# $Id$
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 
@@ -6,7 +6,7 @@ pkgname=gmpc
 pkgver=11.8.16
 pkgrel=1
 pkgdesc="A GTK2 client for MPD"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gmpclient.org/home"
 license=('GPL')
 depends=('libunique' 'libmpd' 'libsoup' 'sqlite' 'hicolor-icon-theme' 'xdg-utils')
@@ -19,6 +19,7 @@ md5sums=('223aeb000e41697d8fdf54ccedee89d5')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i 's|GNOME;AudioVideo;|GTK;AudioVideo;Player;|' data/gmpc.desktop.in
+  export LDFLAGS="$LDFLAGS -lm"
   ./configure --prefix=/usr
   make
 }
diff --git a/community/gmrun/PKGBUILD b/community/gmrun/PKGBUILD
index 5e35d38a1..c752bdf7b 100644
--- a/community/gmrun/PKGBUILD
+++ b/community/gmrun/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=gmrun
 pkgver=0.9.2
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A simple program which provides a run program window"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sf.net/projects/gmrun"
diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD
index bd3f7d791..0eb992ba1 100644
--- a/community/gnash/PKGBUILD
+++ b/community/gnash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83253 2013-01-28 16:49:39Z stephane $
+# $Id: PKGBUILD 87415 2013-03-31 19:18:19Z stephane $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=gnash
 pkgname=(gnash-common gnash-gtk)
 pkgver=0.8.10
-pkgrel=6
+pkgrel=7
 arch=(i686 x86_64 mips64el)
 url="http://www.gnu.org/software/gnash/"
 license=(GPL3)
diff --git a/community/gnome-applets/01_battstat_upower.patch b/community/gnome-applets/01_battstat_upower.patch
new file mode 100644
index 000000000..fa31e720b
--- /dev/null
+++ b/community/gnome-applets/01_battstat_upower.patch
@@ -0,0 +1,622 @@
+From 18a2f4aa3ba2c8c9fc3718b15a9ab366fdd35f05 Mon Sep 17 00:00:00 2001
+From: Joachim Breitner <mail@joachim-breitner.de>
+Date: Mon, 5 Jul 2010 12:20:04 +0200
+Subject: [PATCH] [battstat applet] upower support
+
+As HAL is being deprecated, the battstat applet is adjusted to talk to
+upower, using libupower-glib. (Bug #607254)
+---
+ battstat/Makefile.am          |    6 +-
+ battstat/battstat-upower.c    |  330 +++++++++++++++++++++++++++++++++++++++++
+ battstat/battstat-upower.h    |   33 ++++
+ battstat/battstat_applet.c    |    7 +-
+ battstat/docs/C/battstat.xml  |   18 ++-
+ battstat/docs/de/battstat.xml |   22 +++-
+ battstat/docs/eu/battstat.xml |   20 ++-
+ battstat/power-management.c   |   66 +++++++--
+ configure.in                  |   22 +++
+ 9 files changed, 493 insertions(+), 31 deletions(-)
+ create mode 100644 battstat/battstat-upower.c
+ create mode 100644 battstat/battstat-upower.h
+
+Index: gnome-applets-3.4.1/battstat/Makefile.am
+===================================================================
+--- gnome-applets-3.4.1.orig/battstat/Makefile.am	2012-04-13 19:02:29.000000000 +0200
++++ gnome-applets-3.4.1/battstat/Makefile.am	2012-04-19 00:28:17.246029051 +0200
+@@ -27,6 +27,7 @@
+ 	$(GNOME_APPLETS_CFLAGS)			\
+ 	$(LIBNOTIFY_CFLAGS)			\
+ 	$(HAL_CFLAGS)				\
++	$(UPOWER_CFLAGS)			\
+ 	$(APMINC)				\
+ 	$(ACPIINC)				\
+ 	$(WARN_CFLAGS)				\
+@@ -48,13 +49,17 @@
+ 	acpi-freebsd.c \
+ 	acpi-freebsd.h \
+ 	battstat-hal.c \
+-	battstat-hal.h
++	battstat-hal.h \
++	battstat-upower.c \
++	battstat-upower.h
+ 
+ 
+ battstat_applet_2_LDADD = \
+ 		     $(GNOME_APPLETS_LIBS) \
+ 		     $(LIBNOTIFY_LIBS) \
+ 		     $(HAL_LIBS) \
++		     $(UPOWER_LIBS) \
++		     $(LIBM) \
+ 		     $(APMLIB)
+ 
+ schemasdir   = @GCONF_SCHEMA_FILE_DIR@
+Index: gnome-applets-3.4.1/battstat/battstat-upower.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gnome-applets-3.4.1/battstat/battstat-upower.c	2012-04-19 00:28:17.246029051 +0200
+@@ -0,0 +1,301 @@
++/*
++ *  Copyright (C) 2010 by Joachim Breitner <mail@joachim-breitner.de>
++ *
++ * Based on battstat-hal.c:
++ * Copyright (C) 2005 by Ryan Lortie <desrt@desrt.ca>
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
++ *
++ * $Id$
++ */
++
++#include <config.h>
++
++#ifdef HAVE_UPOWER
++
++#include <upower.h>
++#include <math.h>
++
++#include "battstat-upower.h"
++
++static UpClient *upc;
++static void (*status_updated_callback) (void);
++
++
++/* status_updated_callback() can not be called directly because at the time of
++ * the device-remove signal, the device is not actually removed from the list
++ * of devices known to the up_client object (see libupower-glib/up-client.c in
++ * upower). Waiting for the next idle timer works around this issue and has has
++ * the additionaly benefit of possibly running status_updated_callback only
++ * once when several events happen very soon after each other.
++ */
++static gboolean status_update_scheduled;
++
++static gboolean
++update_status_idle (gpointer junk)
++{
++  if (status_updated_callback)
++    status_updated_callback ();
++
++  return status_update_scheduled = FALSE;
++}
++
++static void
++schedule_status_callback (void)
++{
++  if (status_update_scheduled)
++    return;
++
++  status_update_scheduled = TRUE;
++  g_idle_add (update_status_idle, NULL);
++}
++
++static void
++device_cb (UpClient *client, UpDevice *device, gpointer user_data) {
++  schedule_status_callback();
++}
++
++/* ---- public functions ---- */
++
++char *
++battstat_upower_initialise (void (*callback) (void))
++{
++  status_updated_callback = callback;
++
++  if( upc != NULL )
++    return g_strdup( "Already initialised!" );
++
++  if( (upc = up_client_new() ) == NULL )
++    goto error_out;
++
++  if (! up_client_enumerate_devices_sync( upc, NULL, NULL ) ) {
++    goto error_shutdownclient;
++  }
++
++  g_signal_connect_after( upc, "device-changed", device_cb, NULL );
++  g_signal_connect_after( upc, "device-added", device_cb, NULL );
++  g_signal_connect_after( upc, "device-removed", device_cb, NULL );
++
++  return NULL;
++
++error_shutdownclient:
++  g_object_unref( upc );
++  upc = NULL;
++
++error_out:
++  return "Can not initialize upower";
++}
++
++void
++battstat_upower_cleanup( void )
++{
++  if( upc == NULL )
++    return;
++  
++  g_object_unref( upc );
++  upc = NULL;
++}
++
++#include "battstat.h"
++
++/* This function currently exists to allow the multiple batteries supported
++ * by the upower backend to appear as a single composite battery device (since
++ * at the current time this is all that battstat supports).
++ *
++ * This entire function is filled with logic to make multiple batteries
++ * appear as one "composite" battery.  Comments included as appropriate.
++ *
++ * For more information about some of the assumptions made in the following
++ * code please see the following mailing list post and the resulting thread:
++ *
++ *   http://lists.freedesktop.org/archives/hal/2005-July/002841.html
++ */
++void
++battstat_upower_get_battery_info( BatteryStatus *status )
++{
++
++  GPtrArray *devices = up_client_get_devices( upc );
++
++  /* The calculation to get overall percentage power remaining is as follows:
++   *
++   *    Sum( Current charges ) / Sum( Full Capacities )
++   *
++   * We can't just take an average of all of the percentages since this
++   * doesn't deal with the case that one battery might have a larger
++   * capacity than the other.
++   *
++   * In order to do this calculation, we need to keep a running total of
++   * current charge and full capacities.
++   */
++  double current_charge_total = 0, full_capacity_total = 0;
++
++  /* Record the time remaining as reported by upower.  This is used in the event
++   * that the system has exactly one battery (since, then, upower is capable
++   * of providing an accurate time remaining report and we should trust it.)
++   */
++  gint64 remaining_time = 0;
++
++  /* The total (dis)charge rate of the system is the sum of the rates of
++   * the individual batteries.
++   */
++  double rate_total = 0;
++
++  /* We need to know if we should report the composite battery as present
++   * at all.  The logic is that if at least one actual battery is installed
++   * then the composite battery will be reported to exist.
++   */
++  int present = 0;
++
++  /* We need to know if we are on AC power or not.  Eventually, we can look
++   * at the AC adaptor upower devices to determine that.  For now, we assume that
++   * if any battery is discharging then we must not be on AC power.  Else, by
++   * default, we must be on AC.
++   */
++  int on_ac_power = 1;
++
++  /* Finally, we consider the composite battery to be "charging" if at least
++   * one of the actual batteries in the system is charging.
++   */
++  int charging = 0;
++
++  /* For each physical battery bay... */
++  int i;
++  for( i = 0; i < devices->len; i++ )
++  {
++    UpDevice *upd = g_ptr_array_index( devices, i );
++
++    int type, state;
++    double current_charge, full_capacity, rate;
++    gint64 time_to_full, time_to_empty;
++    
++    g_object_get( upd,
++      "kind", &type,
++      "state", &state,
++      "energy", &current_charge,
++      "energy-full", &full_capacity,
++      "energy-rate", &rate,
++      "time-to-full", &time_to_full,
++      "time-to-empty", &time_to_empty,
++      NULL );
++
++    /* Only count batteries here */
++
++    if (type != UP_DEVICE_KIND_BATTERY)
++      continue;
++
++    /* At least one battery present -> composite battery is present. */
++    present++;
++
++    /* At least one battery charging -> composite battery is charging. */
++    if( state == UP_DEVICE_STATE_CHARGING )
++      charging = 1;
++
++    /* At least one battery is discharging -> we're not on AC. */
++    if( state == UP_DEVICE_STATE_DISCHARGING )
++      on_ac_power = 0;
++
++    /* Sum the totals for current charge, design capacity, (dis)charge rate. */
++    current_charge_total += current_charge;
++    full_capacity_total += full_capacity;
++    rate_total += rate;
++
++    /* Record remaining time too, incase this is the only battery. */
++    remaining_time = (state == UP_DEVICE_STATE_DISCHARGING ? time_to_empty : time_to_full);
++  }
++
++  if( !present || full_capacity_total <= 0 || (charging && !on_ac_power) )
++  {
++    /* Either no battery is present or something has gone horribly wrong.
++     * In either case we must return that the composite battery is not
++     * present.
++     */
++    status->present = FALSE;
++    status->percent = 0;
++    status->minutes = -1;
++    status->on_ac_power = TRUE;
++    status->charging = FALSE;
++
++    g_ptr_array_unref( devices );
++    return;
++  }
++
++  /* Else, our composite battery is present. */
++  status->present = TRUE;
++
++  /* As per above, overall charge is:
++   *
++   *    Sum( Current charges ) / Sum( Full Capacities )
++   */
++  status->percent = ( current_charge_total / full_capacity_total ) * 100.0 + 0.5;
++
++  if( present == 1 )
++  {
++    /* In the case of exactly one battery, report the time remaining figure
++     * from upower directly since it might have come from an authorative source
++     * (ie: the PMU or APM subsystem).
++     *
++     * upower gives remaining time in seconds with a 0 to mean that the
++     * remaining time is unknown.  Battstat uses minutes and -1 for 
++     * unknown time remaining.
++     */
++
++    if( remaining_time == 0 )
++      status->minutes = -1;
++    else
++      status->minutes = (remaining_time + 30) / 60;
++  }
++  /* Rest of cases to deal with multiple battery systems... */
++  else if( !on_ac_power && rate_total != 0 )
++  {
++    /* Then we're discharging.  Calculate time remaining until at zero. */
++
++    double remaining;
++
++    remaining = current_charge_total;
++    remaining /= rate_total;
++    status->minutes = (int) floor( remaining * 60.0 + 0.5 );
++  }
++  else if( charging && rate_total != 0 )
++  {
++    /* Calculate time remaining until charged.  For systems with more than
++     * one battery, this code is very approximate.  The assumption is that if
++     * one battery reaches full charge before the other that the other will
++     * start charging faster due to the increase in available power (similar
++     * to how a laptop will charge faster if you're not using it).
++     */
++
++    double remaining;
++
++    remaining = full_capacity_total - current_charge_total;
++    if( remaining < 0 )
++      remaining = 0;
++    remaining /= rate_total;
++
++    status->minutes = (int) floor( remaining * 60.0 + 0.5 );
++  }
++  else
++  {
++    /* On AC power and not charging -or- rate is unknown. */
++    status->minutes = -1;
++  }
++
++  /* These are simple and well-explained above. */
++  status->charging = charging;
++  status->on_ac_power = on_ac_power;
++  
++  g_ptr_array_unref( devices );
++}
++
++#endif /* HAVE_UPOWER */
+Index: gnome-applets-3.4.1/battstat/battstat-upower.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gnome-applets-3.4.1/battstat/battstat-upower.h	2012-04-19 00:28:17.254029051 +0200
+@@ -0,0 +1,33 @@
++/*
++ * Copyright (C) 2010 by Joachim Breitner <mail@joachim-breitner.de>
++ *
++ * Based on battstat-hal.h:
++ * Copyright (C) 2005 by Ryan Lortie <desrt@desrt.ca>
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
++ *
++ * $Id$
++ */
++
++#ifndef _battstat_upower_h_
++#define _battstat_upower_h_
++
++char *battstat_upower_initialise (void (*) (void));
++void battstat_upower_cleanup (void);
++
++#include "battstat.h"
++void battstat_upower_get_battery_info (BatteryStatus *status);
++
++#endif /* _battstat_upower_h_ */
+Index: gnome-applets-3.4.1/battstat/battstat_applet.c
+===================================================================
+--- gnome-applets-3.4.1.orig/battstat/battstat_applet.c	2012-04-13 19:02:29.000000000 +0200
++++ gnome-applets-3.4.1/battstat/battstat_applet.c	2012-04-19 00:28:17.254029051 +0200
+@@ -1188,9 +1188,12 @@
+ 
+   char *comments = g_strdup_printf ("%s\n\n%s",
+ 		  _("This utility shows the status of your laptop battery."),
+-		  power_management_using_hal () ?
++		  power_management_using_upower () ?
++		  	/* true */ _("upower backend enabled.") :
++		  (power_management_using_hal () ?
+ 		  	/* true */ _("HAL backend enabled.") :
+-			/* false */ _("Legacy (non-HAL) backend enabled."));
++			/* false */ _("Legacy (non-HAL) backend enabled.")
++		  ));
+ 
+   gtk_show_about_dialog( NULL,
+     "version",             VERSION,
+Index: gnome-applets-3.4.1/battstat/docs/C/battstat.xml
+===================================================================
+--- gnome-applets-3.4.1.orig/battstat/docs/C/battstat.xml	2012-04-15 15:49:58.000000000 +0200
++++ gnome-applets-3.4.1/battstat/docs/C/battstat.xml	2012-04-19 00:28:17.254029051 +0200
+@@ -226,10 +226,13 @@
+      <title>Power Management Backends</title>
+ 
+      <para>
+-      The battery monitor supports a number of power management backends. If it
+-      is available, the monitor will attempt to use the freedesktop.org
+-      <ulink url="http://freedesktop.org/Software/hal">HAL (Hardware Abstraction
+-      Layer)</ulink>. If it is unavailable or unsupported on your platform, the
++      The battery monitor supports a number of power management backends.
++      If it is available, the monitor will attempt to use the freedesktop.org
++      <ulink url="http://upower.freedesktop.org/">upower</ulink> interface.
++      If it is unavailable or unsupported on your platform, it will fall back
++      to the freedesktop.org
++      <ulink url="http://freedesktop.org/Software/hal">HAL (Hardware
++      Abstraction Layer)</ulink>. If that is also not availble, the
+       battery monitor will attempt direct access to the power management system.
+      </para>
+      <para>
+@@ -410,10 +413,10 @@
+     <sect2 id="battstat-troubleshooting-backends">
+      <title>Determining the backend</title>
+      <para>
+-       If you are using the Hardware Abstraction Layer
+-       (see <xref linkend="battstat-power-backends"/>) then that will be
+-       indicated in the about dialog by placing a star next to the author of the
+-       HAL backend.
++       If you are using the upower interface, or the the Hardware
++       Abstraction Layer (see <xref linkend="battstat-power-backends"/>) then
++       that will be indicated in the about dialog by placing a star next to the
++       author of the HAL backend.
+     <figure id="battstat-credits-hal"> 
+       <title>Check you're using the HAL backend</title> 
+       <screenshot> 
+Index: gnome-applets-3.4.1/battstat/power-management.c
+===================================================================
+--- gnome-applets-3.4.1.orig/battstat/power-management.c	2012-04-13 19:02:29.000000000 +0200
++++ gnome-applets-3.4.1/battstat/power-management.c	2012-04-19 00:28:17.254029051 +0200
+@@ -41,6 +41,7 @@
+ 
+ #include "battstat.h"
+ #include "battstat-hal.h"
++#include "battstat-upower.h"
+ 
+ #define ERR_ACPID _("Can't access ACPI events in /var/run/acpid.socket! "    \
+                     "Make sure the ACPI subsystem is working and "           \
+@@ -66,6 +67,9 @@
+ #ifdef HAVE_HAL
+ static int using_hal;
+ #endif
++#ifdef HAVE_UPOWER
++static int using_upower;
++#endif
+ 
+ /*
+  * What follows is a series of platform-specific apm_readinfo functions
+@@ -390,6 +394,14 @@
+     return NULL;
+   }
+ 
++#ifdef HAVE_UPOWER
++  if( using_upower )
++  {
++    battstat_upower_get_battery_info( status );
++    return NULL;
++  }
++#endif
++
+ #ifdef HAVE_HAL
+   if( using_hal )
+   {
+@@ -430,27 +442,36 @@
+ const char *
+ power_management_initialise (int no_hal, void (*callback) (void))
+ {
++  char *err;
++  err = g_strdup( ":(" );
+ #ifdef __linux__
+   struct stat statbuf;
+ #endif
+-#ifdef HAVE_HAL
+-  char *err;
++#ifdef HAVE_UPOWER
++  err = battstat_upower_initialise (callback);
+ 
+-  if( no_hal )
+-    err = g_strdup( ":(" );
+-  else
+-    err = battstat_hal_initialise (callback);
+-
+-
+-  if( err == NULL ) /* HAL is up */
++  if( err == NULL ) /* UPOWER is up */
+   {
+     pm_initialised = 1;
+-    using_hal = TRUE;
++    using_upower = TRUE;
+     return NULL;
++  } 
++#endif
++
++#ifdef HAVE_HAL
++  if(! no_hal ) {
++    err = battstat_hal_initialise (callback);
++
++    if( err == NULL ) /* HAL is up */
++    {
++      pm_initialised = 1;
++      using_hal = TRUE;
++      return NULL;
++    }
+   }
+-  else
+-    /* fallback to legacy methods */
+-    g_free( err );
++
++  /* fallback to legacy methods */
++  g_free( err );
+ #endif
+     
+ #ifdef __linux__
+@@ -498,6 +519,15 @@
+ void
+ power_management_cleanup( void )
+ {
++#ifdef HAVE_UPOWER
++  if( using_upower )
++  {
++    battstat_upower_cleanup();
++    pm_initialised = 1;
++    return;
++  }
++#endif
++
+ #ifdef HAVE_HAL
+   if( using_hal )
+   {
+@@ -525,6 +555,16 @@
+ }
+ 
+ int
++power_management_using_upower( void )
++{
++#ifdef HAVE_UPOWER
++  return using_upower;
++#else
++  return 0;
++#endif
++}
++
++int
+ power_management_using_hal( void )
+ {
+ #ifdef HAVE_HAL
+Index: gnome-applets-3.4.1/configure.in
+===================================================================
+--- gnome-applets-3.4.1.orig/configure.in	2012-04-15 15:45:36.000000000 +0200
++++ gnome-applets-3.4.1/configure.in	2012-04-19 00:28:17.254029051 +0200
+@@ -23,6 +23,7 @@
+ LIBWNCK_REQUIRED=2.91.0
+ LIBNOTIFY_REQUIRED=0.7
+ HAL_REQUIRED=0.5.3
++UPOWER_REQUIRED=0.9.4
+ DBUS_REQUIRED=1.1.2
+ DBUS_GLIB_REQUIRED=0.74
+ PYGOBJECT_REQUIRED=2.26
+@@ -223,6 +224,30 @@
+ AC_SUBST(HAL_CFLAGS)
+ AC_SUBST(HAL_LIBS)
+ 
++dnl -- check for libupower-glib (optional) --------------------------------------------
++UPOWER_CFLAGS=
++UPOWER_LIBS=
++AC_ARG_WITH(upower,[  --without-upower           build without upower support])
++
++if test "x$with_upower" != xno; then
++	PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED,
++		  HAVE_UPOWER="yes",
++		  HAVE_UPOWER="no")
++
++	LT_LIB_M
++	if test "x$HAVE_UPOWER" = "xyes"; then
++		AC_DEFINE(HAVE_UPOWER, 1, [UPOWER available])
++	fi
++else
++	AC_MSG_WARN(["upower support disabled"])
++fi
++
++AC_SUBST(UPOWER_CFLAGS)
++AC_SUBST(UPOWER_LIBS)
++AC_SUBST(LIBM)
++
++
++
+ dnl -- check for gucharmap (optional) -----------------------------------------
+ 
+ PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2.90 >= $GUCHARMAP3_REQUIRED],
+@@ -739,5 +764,6 @@
+ 	Using DBUS:			$HAVE_DBUS
+ 	Using NetworkManager:		$HAVE_NETWORKMANAGER
+ 	Using HAL:			$HAVE_HAL
++	Using UPOWER:			$HAVE_UPOWER
+ 	Enabling IPv6:			$have_ipv6
+ " >&2
diff --git a/community/gnome-applets/PKGBUILD b/community/gnome-applets/PKGBUILD
new file mode 100644
index 000000000..a9b2165c5
--- /dev/null
+++ b/community/gnome-applets/PKGBUILD
@@ -0,0 +1,61 @@
+# $Id: PKGBUILD 88683 2013-04-21 22:16:53Z heftig $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-applets
+pkgver=3.5.92
+pkgrel=3
+pkgdesc="Small applications for the GNOME panel"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('cpupower' 'gucharmap' 'gstreamer0.10-base-plugins' 'gnome-panel' 'libgtop' 'upower')
+makedepends=('gnome-common' 'gnome-doc-utils' 'intltool' 'networkmanager' 'rarian')
+url="https://live.gnome.org/GnomeApplets"
+install=$pkgname.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        gnome-applets-cpupower.patch
+        disable-gweather-applet.patch
+        fix-autoconf.patch
+        01_battstat_upower.patch)
+sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83'
+            '942276d7cc18224d9f5b1b57314746ad4d713ee0dcf4aedb25fa72e92db75e65'
+            '47f6b477c0f76ebb1e8ffc6fe9bd2fac9ac7f511f059cf4bb2687f8425bfb4a8'
+            '0acd58aee458345e378d5f77256e04b13e3a4c06b166aac390a92309b864e8a4'
+            '364c9264c76721b42e85eecc48443852ead1bd730d9de937dd2ae00889db836a')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' invest-applet/invest/*
+
+  # Use cpupower instead of cpufreq
+  patch -Np1 -i "$srcdir/gnome-applets-cpupower.patch"
+
+  # Add UPower support
+  patch -Np1 -i "$srcdir/01_battstat_upower.patch"
+
+  # Disable gweather applet, because it's not compatible with libgweather 3.8
+  patch -Np1 -i "$srcdir/disable-gweather-applet.patch"
+
+  # Fix build
+  patch -Np1 -i "$srcdir/fix-autoconf.patch"
+
+  # Turn off unneeded warnings
+  CFLAGS="$CFLAGS -w"
+
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+              --disable-static --disable-schemas-install --disable-scrollkeeper \
+              --enable-mixer-applet \
+              PYTHON=/usr/bin/python2
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  mkdir -m755 -p "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -r "$pkgdir"/etc/gconf
+}
diff --git a/community/gnome-applets/disable-gweather-applet.patch b/community/gnome-applets/disable-gweather-applet.patch
new file mode 100644
index 000000000..26f7e4d6b
--- /dev/null
+++ b/community/gnome-applets/disable-gweather-applet.patch
@@ -0,0 +1,12 @@
+diff -Naur gnome-applets-3.5.92.orig/configure.in gnome-applets-3.5.92/configure.in
+--- gnome-applets-3.5.92.orig/configure.in	2012-09-20 03:07:34.000000000 +0200
++++ gnome-applets-3.5.92/configure.in	2013-04-09 10:39:54.214243015 +0200
+@@ -251,7 +251,7 @@
+ 
+  dnl -- check for libgweather (required for gweather applet) ------------------
+ build_libgweather_applets=false
+-PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED,
++PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED gweather-3.0 <= 3.7,
+ 	          build_libgweather_applets=true,
+ 		  AC_MSG_WARN([libgweather not found. Not building the weather applet.]))
+ AC_SUBST(LIBGWEATHER_CFLAGS)
diff --git a/community/gnome-applets/fix-autoconf.patch b/community/gnome-applets/fix-autoconf.patch
new file mode 100644
index 000000000..fc36c743c
--- /dev/null
+++ b/community/gnome-applets/fix-autoconf.patch
@@ -0,0 +1,12 @@
+diff -Naur gnome-applets-3.5.92.orig/configure.in gnome-applets-3.5.92/configure.in
+--- gnome-applets-3.5.92.orig/configure.in	2012-09-20 03:07:34.000000000 +0200
++++ gnome-applets-3.5.92/configure.in	2013-04-09 09:48:48.427334056 +0200
+@@ -4,7 +4,7 @@
+ AC_INIT(gnome-applets, 3.5.92)
+ AC_PREREQ(2.59)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
+ AC_CONFIG_MACRO_DIR(m4)
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/community/gnome-applets/gnome-applets-cpupower.patch b/community/gnome-applets/gnome-applets-cpupower.patch
new file mode 100644
index 000000000..134a617fc
--- /dev/null
+++ b/community/gnome-applets/gnome-applets-cpupower.patch
@@ -0,0 +1,12 @@
+diff -up gnome-applets-3.1.90/configure.in.cpupower gnome-applets-3.1.90/configure.in
+--- gnome-applets-3.1.90/configure.in.cpupower	2011-08-31 18:49:00.628945807 -0400
++++ gnome-applets-3.1.90/configure.in	2011-08-31 18:49:17.397946966 -0400
+@@ -518,7 +518,7 @@ AC_CHECK_HEADER(cpufreq.h, have_libcpufr
+ LIBCPUFREQ_LIBS=
+ if test "x$have_libcpufreq" = "xyes"; then
+    AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
+-   LIBCPUFREQ_LIBS=-lcpufreq
++   LIBCPUFREQ_LIBS=-lcpupower
+ fi
+ AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
+ AC_SUBST(LIBCPUFREQ_LIBS)
diff --git a/community/gnome-applets/gnome-applets.install b/community/gnome-applets/gnome-applets.install
new file mode 100644
index 000000000..e3441e722
--- /dev/null
+++ b/community/gnome-applets/gnome-applets.install
@@ -0,0 +1,24 @@
+pkgname=gnome-applets
+
+post_install() {
+  gconfpkg --install ${pkgname}
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/community/gnome-media/PKGBUILD b/community/gnome-media/PKGBUILD
new file mode 100644
index 000000000..2b60a714d
--- /dev/null
+++ b/community/gnome-media/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 87933 2013-04-08 20:25:18Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-media
+pkgver=3.4.0
+pkgrel=2
+pkgdesc="Sound recorder and GStreamer 0.10 configuration tool for GNOME"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libgnome-media-profiles' 'gstreamer0.10-good-plugins' 'hicolor-icon-theme')
+makedepends=('intltool' 'gnome-doc-utils')
+optdepends=('gstreamer0.10-ugly-plugins: Record sound into mp3 format')
+url="https://git.gnome.org/browse/gnome-media"
+install=$pkgname.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz
+        grecord-add-PULSEPROPmediarole.patch
+        grecord-Should-call-gnome-control-center-sound-not.patch
+        grecord-send-eos-before-we-stop-record.patch)
+sha256sums=('a76fac286f24d3836137ddbaab66f05e19eb5fb83cca6e375dbef040765a1d1f'
+            '7abd86638ccde30232455ea66a7aff244f5c1cc5f3620b85f0215bf4bd07d546'
+            '6c8af4bf741d702ce3722cc2bfd1b7caa44f142776706157851184fb2bc55e04'
+            '5feb1e447f9ac575b282b05be9bfc946794635f98f63cf24603f931767ec8f9d')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # Upstream fixes
+  patch -Np1 -i "$srcdir/grecord-add-PULSEPROPmediarole.patch"
+  patch -Np1 -i "$srcdir/grecord-Should-call-gnome-control-center-sound-not.patch"
+  patch -Np1 -i "$srcdir/grecord-send-eos-before-we-stop-record.patch"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # Sound theme moved to gnome-control-center
+  rm -rf "$pkgdir"/usr/share/{gnome-media,sounds}
+}
diff --git a/community/gnome-media/gnome-media.install b/community/gnome-media/gnome-media.install
new file mode 100644
index 000000000..0574e8765
--- /dev/null
+++ b/community/gnome-media/gnome-media.install
@@ -0,0 +1,26 @@
+pkgname=gnome-sound-recorder
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  if [ "$(vercmp 3.4.0-2 "$2")" -eq 1 ]; then
+    usr/sbin/gconfpkg --uninstall gnome-media
+  else
+    usr/sbin/gconfpkg --uninstall ${pkgname}
+  fi
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
diff --git a/community/gnome-media/grecord-Should-call-gnome-control-center-sound-not.patch b/community/gnome-media/grecord-Should-call-gnome-control-center-sound-not.patch
new file mode 100644
index 000000000..e3908d3cc
--- /dev/null
+++ b/community/gnome-media/grecord-Should-call-gnome-control-center-sound-not.patch
@@ -0,0 +1,35 @@
+From ea6fee0fbf8662a32a5cd2b5c96c1f75a9233813 Mon Sep 17 00:00:00 2001
+From: Sebastien Bacher <seb128@ubuntu.com>
+Date: Thu, 07 Jun 2012 16:26:26 +0000
+Subject: grecord: Should call "gnome-control-center sound" not the old g-v-c
+
+Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=667402
+---
+diff --git a/grecord/src/gsr-window.c b/grecord/src/gsr-window.c
+index bebb991..bd802d6 100644
+--- a/grecord/src/gsr-window.c
++++ b/grecord/src/gsr-window.c
+@@ -805,16 +805,16 @@ run_mixer_cb (GtkAction *action,
+ 	       GSRWindow *window)
+ {
+ 	char *mixer_path;
+-	char *argv[4] = {NULL, "--page", "recording",  NULL};
++	char *argv[4] = {NULL, "sound", "input",  NULL};
+ 	GError *error = NULL;
+ 	gboolean ret;
+ 
+ 	/* Open the mixer */
+-	mixer_path = g_find_program_in_path ("gnome-volume-control");
++	mixer_path = g_find_program_in_path ("gnome-control-center");
+ 	if (mixer_path == NULL) {
+ 		show_error_dialog (GTK_WINDOW (window), NULL,
+ 		                   _("%s is not installed in the path."),
+-		                   "gnome-volume-control");
++		                   "gnome-control-center");
+ 		return;
+ 	}
+ 
+--
+cgit v0.9.1
diff --git a/community/gnome-media/grecord-add-PULSEPROPmediarole.patch b/community/gnome-media/grecord-add-PULSEPROPmediarole.patch
new file mode 100644
index 000000000..b75dd3c5c
--- /dev/null
+++ b/community/gnome-media/grecord-add-PULSEPROPmediarole.patch
@@ -0,0 +1,26 @@
+From 5453719b61ada75f635f0c3ad3c78651102d7615 Mon Sep 17 00:00:00 2001
+From: Oleksij Rempel <bug-track@fisher-privat.net>
+Date: Wed, 06 Jun 2012 11:50:04 +0000
+Subject: grecord: add "PULSE_PROP_media.role"
+
+For more details see:
+http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/ApplicationProperties
+
+Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=644908
+---
+diff --git a/grecord/src/gnome-recorder.c b/grecord/src/gnome-recorder.c
+index c6c7b7e..c7ec5cc 100644
+--- a/grecord/src/gnome-recorder.c
++++ b/grecord/src/gnome-recorder.c
+@@ -190,6 +190,7 @@ main (int argc,
+ 
+ 	g_option_context_free (ctx);
+ 	gtk_window_set_default_icon_name ("gnome-sound-recorder");
++	g_setenv ("PULSE_PROP_media.role", "production", TRUE);
+ 
+ 	/* use it like a singleton */
+ 	gconf_client = gconf_client_get_default ();
+--
+cgit v0.9.1
diff --git a/community/gnome-media/grecord-send-eos-before-we-stop-record.patch b/community/gnome-media/grecord-send-eos-before-we-stop-record.patch
new file mode 100644
index 000000000..e760b7e3b
--- /dev/null
+++ b/community/gnome-media/grecord-send-eos-before-we-stop-record.patch
@@ -0,0 +1,41 @@
+From 99e7a41b2e4c217aca7faffb7668b1ac84ae1ed2 Mon Sep 17 00:00:00 2001
+From: Oleksij Rempel <bug-track@fisher-privat.net>
+Date: Thu, 07 Jun 2012 17:11:02 +0000
+Subject: grecord: send eos before we stop record.
+
+Current grecord produces files without EOS. This can be tested
+with tool "ogginfo".
+
+accodrding to this documentation:
+http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseSrc.html
+"Controlled shutdown of live sources in applications"
+"Since GStreamer 0.10.16 an application may send an EOS event to a source element to make it perform the EOS logic".
+
+So this patch make sure we send EOS before we stop recording.
+
+Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=677644
+---
+diff --git a/grecord/src/gsr-window.c b/grecord/src/gsr-window.c
+index bd802d6..850ebf0 100644
+--- a/grecord/src/gsr-window.c
++++ b/grecord/src/gsr-window.c
+@@ -1279,8 +1279,14 @@ stop_cb (GtkAction *action,
+ 		GST_DEBUG ("Stopping play pipeline");
+ 		set_pipeline_state_to_null (priv->play->pipeline);
+ 	} else if (priv->record && priv->record->state == GST_STATE_PLAYING) {
++		GstMessage *msg;
++
+ 		GST_DEBUG ("Stopping recording source");
+-		/* GstBaseSrc will automatically send an EOS when stopping */
++		gst_element_send_event (priv->record->src, gst_event_new_eos ());
++		/* wait one second for EOS message on the pipeline bus */
++		msg = gst_bus_timed_pop_filtered (GST_ELEMENT_BUS (priv->record->pipeline), GST_SECOND, GST_MESSAGE_EOS | GST_MESSAGE_ERROR);
++		gst_message_unref (msg);
++
+ 		gst_element_set_state (priv->record->src, GST_STATE_NULL);
+ 		gst_element_get_state (priv->record->src, NULL, NULL, -1);
+ 		gst_element_set_locked_state (priv->record->src, TRUE);
+--
+cgit v0.9.1
diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD
index 34d54730a..9e8fa4811 100644
--- a/community/gnome-packagekit/PKGBUILD
+++ b/community/gnome-packagekit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 79120 2012-10-30 23:06:26Z heftig $
+# $Id: PKGBUILD 88703 2013-04-21 22:24:13Z heftig $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 pkgname=gnome-packagekit
-pkgver=3.6.0
+pkgver=3.8.1
 pkgrel=1
 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ optdepends=('polkit-gnome: required for privileged actions'
 options=('!emptydirs' '!libtool')
 install="$pkgname.install"
 source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
-sha256sums=('9f096ec72fb81a78c426d9747145405a8b99e1d8418978828796768c8532d676')
+sha256sums=('fe0a6368ee5a67419c9332a3b0031ecf1e3e92aa2fe0eb30aa4273f6224d070a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch b/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch
new file mode 100644
index 000000000..92f317cea
--- /dev/null
+++ b/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch
@@ -0,0 +1,95 @@
+From a5b951654b856d899e8c6a4116b4ccc4f18aac91 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha@ubuntu.com>
+Date: Sun, 24 Feb 2013 17:22:29 -0500
+Subject: [PATCH] Add the GNOME Flashback session
+
+This was removed from gnome-session 3.7.4 so let's it add it back here
+(under new name)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=694625
+---
+ data/Makefile.am                        |   18 +++++++++++++++++-
+ data/gnome-flashback.desktop.in         |    7 +++++++
+ data/gnome-flashback.session.desktop.in |    3 +++
+ po/POTFILES.in                          |    2 ++
+ 4 files changed, 29 insertions(+), 1 deletion(-)
+ create mode 100644 data/gnome-flashback.desktop.in
+ create mode 100644 data/gnome-flashback.session.desktop.in
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 83f82e2..84e1954 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -30,17 +30,33 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
+ 
+ @GSETTINGS_RULES@
+ 
++sessiondir = $(datadir)/gnome-session/sessions
++session_in_files = gnome-flashback.session.desktop.in
++session_DATA = $(session_in_files:.session.desktop.in=.session)
++
++xsessiondir = $(datadir)/xsessions
++xsession_in_files = gnome-flashback.desktop.in
++xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
++
++%.session: %.session.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
++
++@INTLTOOL_DESKTOP_RULE@
++
+ default_layoutdir   = $(datadir)/gnome-panel
+ default_layout_DATA = panel-default-layout.layout
+ 
+ EXTRA_DIST =				\
+ 	$(gsettings_schemas_in_in)	\
++	$(session_in_files)		\
++	$(xsession_in_files)		\
+ 	$(default_layout_DATA)
+ 
+ CLEANFILES =			\
+ 	$(gsettings__enum_file)	\
+ 	$(gsettings_SCHEMAS_in)	\
+ 	$(gsettings_SCHEMAS)	\
+-	*.gschema.valid
++	*.gschema.valid		\
++	$(session_DATA)		\
++	$(xsession_DATA)
+ 
+ -include $(top_srcdir)/git.mk
+diff --git a/data/gnome-flashback.desktop.in b/data/gnome-flashback.desktop.in
+new file mode 100644
+index 0000000..4856f75
+--- /dev/null
++++ b/data/gnome-flashback.desktop.in
+@@ -0,0 +1,7 @@
++[Desktop Entry]
++_Name=GNOME Flashback
++_Comment=This session logs you into GNOME with the traditional panel
++Exec=gnome-session --session=gnome-flashback
++TryExec=gnome-session
++Icon=
++Type=Application
+diff --git a/data/gnome-flashback.session.desktop.in b/data/gnome-flashback.session.desktop.in
+new file mode 100644
+index 0000000..c012c58
+--- /dev/null
++++ b/data/gnome-flashback.session.desktop.in
+@@ -0,0 +1,3 @@
++[GNOME Session]
++_Name=GNOME Flashback
++RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;nautilus-classic;notification-daemon;gnome-fallback-background-helper;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index bc65c4c..a6aa6c7 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -23,6 +23,8 @@ applets/wncklet/window-menu.c
+ applets/wncklet/wncklet.c
+ applets/wncklet/workspace-switcher.c
+ [type: gettext/glade]applets/wncklet/workspace-switcher.ui
++data/gnome-flashback.desktop.in
++data/gnome-flashback.session.desktop.in
+ data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
+ data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in
+ data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in
+-- 
+1.7.10.4
+
diff --git a/community/gnome-panel/18_fix_force_quit_applet.patch b/community/gnome-panel/18_fix_force_quit_applet.patch
new file mode 100644
index 000000000..8a72c9262
--- /dev/null
+++ b/community/gnome-panel/18_fix_force_quit_applet.patch
@@ -0,0 +1,98 @@
+Description: Fix Force-Quit panel applet
+ This patch implements handling of XInput2 extension events in the applet.
+ Without this patch, the applet fails to recognize such events (either mouse
+ click for killing application, or escape key for exiting), hence freezing the
+ desktop.
+ .
+ Also fix the event mask in call of gdk_device_grab() for keyboard.
+Author: Sébastien Villemot <sebastien@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698740
+Forwarded: no
+Last-Update: 2013-01-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/gnome-panel/panel-force-quit.c
++++ b/gnome-panel/panel-force-quit.c
+@@ -32,6 +32,8 @@
+ #include <X11/Xlib.h>
+ #include <X11/keysym.h>
+ 
++#include <X11/extensions/XInput2.h>
++
+ #include "panel-icon-names.h"
+ #include "panel-stock-icons.h"
+ 
+@@ -246,22 +248,23 @@
+ 
+ static void 
+ handle_button_press_event (GtkWidget *popup,
+-			   XKeyEvent *event)
++			   Display *display,
++			   Window subwindow)
+ {
+ 	Window window;
+ 
+ 	remove_popup (popup);
+ 
+-	if (event->subwindow == None)
++	if (subwindow == None)
+ 		return;
+ 
+ 	if (wm_state_atom == None)
+-		wm_state_atom = XInternAtom (event->display, "WM_STATE", FALSE);
++		wm_state_atom = XInternAtom (display, "WM_STATE", FALSE);
+ 
+-	window = find_managed_window (event->display, event->subwindow);
++	window = find_managed_window (display, subwindow);
+ 
+ 	if (window != None) {
+-		if (!gdk_x11_window_lookup_for_display (gdk_x11_lookup_xdisplay (event->display), window))
++		if (!gdk_x11_window_lookup_for_display (gdk_x11_lookup_xdisplay (display), window))
+ 			kill_window_question ((gpointer) window);
+ 	}
+ }
+@@ -272,10 +275,12 @@
+ 	      GtkWidget *popup)
+ {
+ 	XEvent *xevent = (XEvent *) gdk_xevent;
++	XIEvent *xiev;
++	XIDeviceEvent *xidev;
+ 
+ 	switch (xevent->type) {
+ 	case ButtonPress:
+-		handle_button_press_event (popup, &xevent->xkey);
++		handle_button_press_event (popup, xevent->xbutton.display, xevent->xbutton.subwindow);
+ 		return GDK_FILTER_REMOVE;
+ 	case KeyPress:
+ 		if (xevent->xkey.keycode == XKeysymToKeycode (xevent->xany.display, XK_Escape)) {
+@@ -283,6 +288,21 @@
+ 			return GDK_FILTER_REMOVE;
+ 		}
+ 		break;
++	case GenericEvent:
++		xiev = (XIEvent *) xevent->xcookie.data;
++		xidev = (XIDeviceEvent *) xiev;
++		switch (xiev->evtype) {
++		case XI_KeyPress:
++			if (xidev->detail == XKeysymToKeycode (xevent->xany.display, XK_Escape)) {
++				remove_popup (popup);
++				return GDK_FILTER_REMOVE;
++			}
++			break;
++		case XI_ButtonPress:
++			handle_button_press_event (popup, xidev->display, xidev->child);
++			return GDK_FILTER_REMOVE;
++		}
++		break;
+ 	default:
+ 		break;
+ 	}
+@@ -331,7 +351,7 @@
+ 
+ 	status = gdk_device_grab (keyboard, root,
+ 				  GDK_OWNERSHIP_NONE, FALSE,
+-				  GDK_KEY_PRESS | GDK_KEY_RELEASE,
++				  GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
+ 				  NULL, time);
+ 	if (status != GDK_GRAB_SUCCESS) {
+ 		g_warning ("Keyboard grab failed\n");
diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD
new file mode 100644
index 000000000..616751ca6
--- /dev/null
+++ b/community/gnome-panel/PKGBUILD
@@ -0,0 +1,79 @@
+# $Id: PKGBUILD 88932 2013-04-24 22:25:52Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=gnome-panel
+pkgname=('gnome-panel' 'gnome-flashback-session')
+pkgver=3.6.2
+pkgrel=5
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+pkgdesc="Legacy GNOME panel"
+url="https://live.gnome.org/GnomePanel"
+depends=('dconf' 'evolution-data-server' 'gconf' 'gnome-desktop' 'gnome-menus' 'librsvg'
+         'libwnck3' 'telepathy-glib')
+makedepends=('gobject-introspection' 'intltool' 'yelp-tools' 'networkmanager' 'gnome-common')
+install=$pkgbase.install
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz
+        gnome-desktop-3.8.patch
+        drop-gweather-xml-include.patch
+        18_fix_force_quit_applet.patch
+        0001-Add-the-GNOME-Flashback-session.patch
+        fix-autoconf.patch)
+sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079'
+            '3a67f4b07a7dd356fad6b40a43983f3945123ed40080eb153396a481b34efc0c'
+            'e3298c62bc577969817c5d6752be83a5129004fd344e4f7998a0d8aa61874305'
+            '9d742f675d9e09a032bfe00e0523a4ef7e234589a74a6086243bf335ce212775'
+            '9db0d1dadd2183777ed39e84caca1096a857897bbcf0e18ad599996dd397f1e0'
+            '6828c097505d2dbbf465ed7ff694adbd646a0af2105c8dd864d1061bf0afea71')
+
+build() {
+  cd "$pkgbase-$pkgver"
+
+  # Port to gnome-desktop 3.8
+  patch -Np1 -i "$srcdir/gnome-desktop-3.8.patch"
+
+  # Fix build with libgweather 3.8
+  patch -Np0 -i "$srcdir/drop-gweather-xml-include.patch"
+
+  # Fix force quit applet to avoid freeze
+  patch -Np1 -i "$srcdir/18_fix_force_quit_applet.patch"
+
+  # Add GNOME Flashback session
+  # https://bugzilla.gnome.org/show_bug.cgi?id=694625
+  patch -Np1 -i "$srcdir/0001-Add-the-GNOME-Flashback-session.patch"
+
+  # Fix build
+  patch -Np1 -i "$srcdir/fix-autoconf.patch"
+
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgbase \
+              --disable-static --disable-schemas-compile \
+              PYTHON=/usr/bin/python2 
+  make
+}
+
+package_gnome-panel() {
+  cd "$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # Remove unneeded script
+  rm "$pkgdir/usr/lib/gnome-panel/gnome-panel-add"
+
+  # Split out the session files
+  rm -r "$pkgdir"/usr/share/{gnome-session,xsessions}
+}
+
+package_gnome-flashback-session() {
+  pkgdesc="Shell for Gnome 3 which was initially called Gnome Fallback"
+  url="https://live.gnome.org/GnomeFlashback"
+  depends=('gnome-screensaver' 'gnome-panel' 'gnome-session' 'gnome-settings-daemon'
+           'gnome-settings-daemon-compat' 'gnome-themes-standard' 'metacity' 'nautilus'
+           'notification-daemon' 'polkit-gnome')
+  install=
+
+  cd "$pkgbase-$pkgver"
+  make -C data DESTDIR="$pkgdir" install-sessionDATA
+  make -C data DESTDIR="$pkgdir" install-xsessionDATA
+}
diff --git a/community/gnome-panel/drop-gweather-xml-include.patch b/community/gnome-panel/drop-gweather-xml-include.patch
new file mode 100644
index 000000000..3b3a559f0
--- /dev/null
+++ b/community/gnome-panel/drop-gweather-xml-include.patch
@@ -0,0 +1,10 @@
+--- applets/clock/clock.c.orig	2012-12-25 14:38:00.101601746 -0600
++++ applets/clock/clock.c	2012-12-25 14:38:30.331443803 -0600
+@@ -54,7 +54,6 @@
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+ #include <libgnome-desktop/gnome-wall-clock.h>
+ 
+-#include <libgweather/gweather-xml.h>
+ #include <libgweather/location-entry.h>
+ #include <libgweather/timezone-menu.h>
+ #include <libgweather/gweather-enum-types.h>
diff --git a/community/gnome-panel/fix-autoconf.patch b/community/gnome-panel/fix-autoconf.patch
new file mode 100644
index 000000000..17d9e025c
--- /dev/null
+++ b/community/gnome-panel/fix-autoconf.patch
@@ -0,0 +1,11 @@
+diff -Naur gnome-panel-3.6.2.orig/configure.ac gnome-panel-3.6.2/configure.ac
+--- gnome-panel-3.6.2.orig/configure.ac	2012-11-12 18:51:14.000000000 +0100
++++ gnome-panel-3.6.2/configure.ac	2013-04-10 14:50:14.132509059 +0200
+@@ -1,6 +1,6 @@
+ AC_INIT([gnome-panel], [3.6.2],
+         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar -Wno-portability])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
diff --git a/community/gnome-panel/gnome-desktop-3.8.patch b/community/gnome-panel/gnome-desktop-3.8.patch
new file mode 100644
index 000000000..3c8823cd2
--- /dev/null
+++ b/community/gnome-panel/gnome-desktop-3.8.patch
@@ -0,0 +1,199 @@
+diff -Naur gnome-panel-3.6.2.orig/applets/clock/calendar-window.c gnome-panel-3.6.2/applets/clock/calendar-window.c
+--- gnome-panel-3.6.2.orig/applets/clock/calendar-window.c	2012-11-12 18:35:17.000000000 +0100
++++ gnome-panel-3.6.2/applets/clock/calendar-window.c	2013-04-08 23:10:30.451012763 +0200
+@@ -42,9 +42,6 @@
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+ 
+-#define GNOME_DESKTOP_USE_UNSTABLE_API
+-#include <libgnome-desktop/gnome-desktop-utils.h>
+-
+ #include "calendar-window.h"
+ 
+ #include "clock.h"
+@@ -168,6 +165,13 @@
+ 		return;
+ 	}
+ 
++	/* FIXME: reintroduce terminal support if a proper GAppInfo port of gnome-panel is ever done */
++	if (terminal) {
++		g_printerr ("Terminal-based calendar/tasks applications are no longer supported, sorry. "
++		            "Please configure a different application.\n");
++		return;
++	}
++
+ 	command_line = g_find_program_in_path (program);
+ 	if (command_line == NULL) {
+ 		g_printerr ("Cannot launch calendar/tasks application: %s in path\n", program);
+@@ -189,9 +193,6 @@
+ 	screen = gtk_widget_get_screen (calwin->priv->calendar);
+ 	error = NULL;
+ 
+-	if (terminal)
+-		gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
+-
+ 	display = gdk_screen_make_display_name (screen);
+ 
+ 	result = g_spawn_async (NULL, /* working directory */
+diff -Naur gnome-panel-3.6.2.orig/gnome-panel/panel-run-dialog.c gnome-panel-3.6.2/gnome-panel/panel-run-dialog.c
+--- gnome-panel-3.6.2.orig/gnome-panel/panel-run-dialog.c	2012-11-12 18:35:17.000000000 +0100
++++ gnome-panel-3.6.2/gnome-panel/panel-run-dialog.c	2013-04-08 23:10:52.408175181 +0200
+@@ -25,6 +25,7 @@
+  *	Havoc Pennington <hp@pobox.com>
+  *      George Lebl <jirka@5z.com>
+  *	Mark McLoughlin <mark@skynet.ie>
++ *	Tom Tromey (Copyright (C) 1998)
+  */
+ 
+ #include <config.h>
+@@ -42,8 +43,6 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <gmenu-tree.h>
+ 
+-#include <libgnome-desktop/gnome-desktop-utils.h>
+-
+ #include <libpanel-util/panel-error.h>
+ #include <libpanel-util/panel-glib.h>
+ #include <libpanel-util/panel-gtk.h>
+@@ -335,6 +334,132 @@
+ 	 */
+ }
+ 
++
++/**
++ * panel_run_dialog_prepend_terminal_to_vector:
++ * @argc: a pointer to the vector size
++ * @argv: a pointer to the vector
++ *
++ * Description:  Prepends a terminal (either the one configured as default in
++ * the user's GNOME setup, or one of the common xterm emulators) to the passed
++ * in vector, modifying it in the process.  The vector should be allocated with
++ * #g_malloc, as this will #g_free the original vector.  Also all elements must
++ * have been allocated separately.  That is the standard glib/GNOME way of
++ * doing vectors however.  If the integer that @argc points to is negative, the
++ * size will first be computed.  Also note that passing in pointers to a vector
++ * that is empty, will just create a new vector for you.
++ **/
++/* TODO: throw out this function if there ever is a proper GAppInfo port */
++static void
++panel_run_dialog_prepend_terminal_to_vector (int *argc, char ***argv)
++{
++        char **real_argv;
++        int real_argc;
++        int i, j;
++	char **term_argv = NULL;
++	int term_argc = 0;
++	GSettings *settings;
++
++	gchar *terminal = NULL;
++
++	char **the_argv;
++
++        g_return_if_fail (argc != NULL);
++        g_return_if_fail (argv != NULL);
++
++	/* sanity */
++        if(*argv == NULL)
++                *argc = 0;
++
++	the_argv = *argv;
++
++	/* compute size if not given */
++	if (*argc < 0) {
++		for (i = 0; the_argv[i] != NULL; i++)
++			;
++		*argc = i;
++	}
++
++	settings = g_settings_new ("org.gnome.desktop.default-applications.terminal");
++	terminal = g_settings_get_string (settings, "exec");
++
++	if (terminal) {
++		gchar *command_line;
++		gchar *exec_flag;
++
++		exec_flag = g_settings_get_string (settings, "exec-arg");
++
++		if (exec_flag == NULL)
++			command_line = g_strdup (terminal);
++		else
++			command_line = g_strdup_printf ("%s %s", terminal,
++							exec_flag);
++
++		g_shell_parse_argv (command_line,
++				    &term_argc,
++				    &term_argv,
++				    NULL /* error */);
++
++		g_free (command_line);
++		g_free (exec_flag);
++		g_free (terminal);
++	}
++
++	g_object_unref (settings);
++
++	if (term_argv == NULL) {
++		char *check;
++
++		term_argc = 2;
++		term_argv = g_new0 (char *, 3);
++
++		check = g_find_program_in_path ("gnome-terminal");
++		if (check != NULL) {
++			term_argv[0] = check;
++			/* Note that gnome-terminal takes -x and
++			 * as -e in gnome-terminal is broken we use that. */
++			term_argv[1] = g_strdup ("-x");
++		} else {
++			if (check == NULL)
++				check = g_find_program_in_path ("nxterm");
++			if (check == NULL)
++				check = g_find_program_in_path ("color-xterm");
++			if (check == NULL)
++				check = g_find_program_in_path ("rxvt");
++			if (check == NULL)
++				check = g_find_program_in_path ("xterm");
++			if (check == NULL)
++				check = g_find_program_in_path ("dtterm");
++			if (check == NULL) {
++				g_warning (_("Cannot find a terminal, using "
++					     "xterm, even if it may not work"));
++				check = g_strdup ("xterm");
++			}
++			term_argv[0] = check;
++			term_argv[1] = g_strdup ("-e");
++		}
++	}
++
++        real_argc = term_argc + *argc;
++        real_argv = g_new (char *, real_argc + 1);
++
++        for (i = 0; i < term_argc; i++)
++                real_argv[i] = term_argv[i];
++
++        for (j = 0; j < *argc; j++, i++)
++                real_argv[i] = (char *)the_argv[j];
++
++	real_argv[i] = NULL;
++
++	g_free (*argv);
++	*argv = real_argv;
++	*argc = real_argc;
++
++	/* we use g_free here as we sucked all the inner strings
++	 * out from it into real_argv */
++	g_free (term_argv);
++}
++
+ static gboolean
+ panel_run_dialog_launch_command (PanelRunDialog *dialog,
+ 				 const char     *command,
+@@ -354,7 +479,7 @@
+ 	screen = gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog));
+ 
+ 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->terminal_checkbox)))
+-		gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
++		panel_run_dialog_prepend_terminal_to_vector (&argc, &argv);
+ 
+ 	display = gdk_screen_make_display_name (screen);
+ 
diff --git a/community/gnome-panel/gnome-panel.install b/community/gnome-panel/gnome-panel.install
new file mode 100644
index 000000000..f7e8c46ac
--- /dev/null
+++ b/community/gnome-panel/gnome-panel.install
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/gnome-phone-manager/PKGBUILD b/community/gnome-phone-manager/PKGBUILD
new file mode 100644
index 000000000..6a6068a8d
--- /dev/null
+++ b/community/gnome-phone-manager/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 88702 2013-04-21 22:24:11Z heftig $
+# Maintainer: Roman Kyrylych <roman@archlinux.org>
+
+pkgname=gnome-phone-manager
+pkgver=0.69
+pkgrel=1
+pkgdesc="Control your mobile phone from your GNOME desktop."
+arch=('i686' 'x86_64' 'mips64el')
+url="http://live.gnome.org/PhoneManager"
+license=('GPL')
+depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' 'libcanberra' 'gconf')
+makedepends=('intltool')
+options=('!emptydirs' '!libtool')
+install=gnome-phone-manager.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz
+        gnome-phone-manager-0.68-eds.patch)
+sha256sums=('35e038ea3afaacdf451046e87af876096cf1520efc04fc3f5b63ea22e0297175'
+            '232a72108836ddd46d329993d166c38550e2923f161b4dc814d75af4ed5ccc79')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i ../gnome-phone-manager-0.68-eds.patch
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
+
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-phone-manager "${pkgdir}"/etc/gconf/schemas/*.schemas
+  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
+}
diff --git a/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch b/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch
new file mode 100644
index 000000000..924201196
--- /dev/null
+++ b/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch
@@ -0,0 +1,470 @@
+diff -up gnome-phone-manager-0.68/configure.eds gnome-phone-manager-0.68/configure
+--- gnome-phone-manager-0.68/configure.eds	2012-10-30 15:03:19.515929969 -0400
++++ gnome-phone-manager-0.68/configure	2012-10-30 15:03:54.979862209 -0400
+@@ -13939,12 +13939,12 @@ if test -n "$PHONEMGR_CFLAGS"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	\$GNOME_BLUETOOTH_REQS \$evo_pc_file libedataserverui-3.0
++	\$GNOME_BLUETOOTH_REQS \$evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ ") 2>&5
+   ac_status=$?
+@@ -13952,7 +13952,7 @@ if test -n "$PHONEMGR_CFLAGS"; then
+   test $ac_status = 0; }; then
+   pkg_cv_PHONEMGR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ " 2>/dev/null`
+ else
+@@ -13967,12 +13967,12 @@ if test -n "$PHONEMGR_LIBS"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	\$GNOME_BLUETOOTH_REQS \$evo_pc_file libedataserverui-3.0
++	\$GNOME_BLUETOOTH_REQS \$evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ ") 2>&5
+   ac_status=$?
+@@ -13980,7 +13980,7 @@ if test -n "$PHONEMGR_LIBS"; then
+   test $ac_status = 0; }; then
+   pkg_cv_PHONEMGR_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ " 2>/dev/null`
+ else
+@@ -14004,13 +14004,13 @@ fi
+         if test $_pkg_short_errors_supported = yes; then
+ 	        PHONEMGR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ " 2>&1`
+         else
+ 	        PHONEMGR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ " 2>&1`
+         fi
+@@ -14019,7 +14019,7 @@ fi
+ 
+ 	as_fn_error $? "Package requirements (gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ ) were not met:
+ 
+diff -up gnome-phone-manager-0.68/configure.in.eds gnome-phone-manager-0.68/configure.in
+--- gnome-phone-manager-0.68/configure.in.eds	2012-10-30 15:03:24.151921087 -0400
++++ gnome-phone-manager-0.68/configure.in	2012-10-30 15:03:33.865897797 -0400
+@@ -47,7 +47,7 @@ PKG_CHECK_MODULES(LIBGSM, glib-2.0 gobje
+ 
+ PKG_CHECK_MODULES(PHONEMGR, gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ )
+ 
+diff -up gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c.eds gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c
+--- gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c.eds	2012-07-29 22:06:12.000000000 -0400
++++ gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c	2012-10-30 15:02:47.177996584 -0400
+@@ -38,11 +38,6 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ 
+-#include <libedataserver/e-source.h>
+-#include <libebook/e-book.h>
+-#include <libebook/e-book-view.h>
+-#include <libebook/e-contact.h>
+-
+ #include "e-contact-entry.h"
+ #include "econtactentry-marshal.h"
+ 
+@@ -59,7 +54,7 @@ static int signals[LAST_SIGNAL] = { 0 };
+ /* Properties */
+ enum {
+   PROP_0, /* TODO: why? */
+-  PROP_SOURCE_LIST,
++  PROP_REGISTRY,
+   PROP_COMPLETE_LENGTH,
+ };
+ 
+@@ -70,7 +65,7 @@ enum {
+ struct EContactEntryPriv {
+   GtkEntryCompletion *completion;
+   GtkListStore *store;
+-  ESourceList *source_list;
++  ESourceRegistry *registry;
+   /* A list of EntryLookup structs we are searching */
+   GList *lookup_entries;
+   /* Number of characters to start searching at */
+@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact *
+   emails = e_contact_get (contact, E_CONTACT_EMAIL);
+   for (l = emails; l != NULL; l = l->next) {
+     item = g_new0 (EContactEntyItem, 1);
+-    item->identifier = item->identifier = g_strdup (l->data);
++    item->identifier = g_strdup (l->data);
+     item->display_string = g_strdup_printf ("%s <%s>", (char*)e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG), item->identifier);
+ 
+     items = g_list_prepend (items, item);
+@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GLi
+       return;
+ 
+     photo = e_contact_get (contact, E_CONTACT_PHOTO);
+-#ifndef HAVE_ECONTACTPHOTOTYPE
+-    if (photo) {
+-#else
+     if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
+-#endif
+       GdkPixbufLoader *loader;
+ 
+       loader = gdk_pixbuf_loader_new ();
+ 
+-#ifndef HAVE_ECONTACTPHOTOTYPE
+-      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data,
+-			      photo->length, NULL))
+-#else
+       if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data,
+ 			      photo->data.inlined.length, NULL))
+-#endif
+         pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+ 
+       if (pixbuf) {
+@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GLi
+  * The query on the EBookView has completed.
+  */
+ static void
+-view_completed_cb (EBookView *book_view, EBookViewStatus status, gpointer user_data)
++view_completed_cb (EBookView *book_view, EBookViewStatus status, const gchar *message, gpointer user_data)
+ {
+   EntryLookup *lookup;
+   g_return_if_fail (user_data != NULL);
+-  /* TODO: handle status != OK */
+-  g_return_if_fail (status == E_BOOK_ERROR_OK);
+   g_return_if_fail (book_view != NULL);
+ 
+   lookup = (EntryLookup*)user_data;
+   g_object_unref (lookup->bookview);
++  lookup->bookview = NULL;
+ }
+ 
+ /**
+@@ -373,8 +358,8 @@ bookview_cb (EBook *book, EBookStatus st
+   lookup->bookview = book_view;
+   g_object_add_weak_pointer ((GObject*)book_view, (gpointer*)&lookup->bookview);
+   
+-  g_signal_connect (book_view, "contacts_added", (GCallback)view_contacts_added_cb, lookup);
+-  g_signal_connect (book_view, "sequence_complete", (GCallback)view_completed_cb, lookup);
++  g_signal_connect (book_view, "contacts-added", (GCallback)view_contacts_added_cb, lookup);
++  g_signal_connect (book_view, "view_complete", (GCallback)view_completed_cb, lookup);
+   
+   e_book_view_start (book_view);
+ }
+@@ -396,6 +381,7 @@ entry_changed_cb (GtkEditable *editable,
+       if (lookup->bookview) {
+         e_book_view_stop (lookup->bookview);
+         g_object_unref (lookup->bookview);
++        lookup->bookview = NULL;
+       }
+     }
+     
+@@ -410,7 +396,7 @@ entry_changed_cb (GtkEditable *editable,
+       if (!lookup->open)
+         continue;
+       
+-      if (e_book_async_get_book_view (lookup->book, query, NULL, 11, (EBookBookViewCallback)bookview_cb, lookup) != 0) {
++      if (e_book_async_get_book_view (lookup->book, query, NULL, MAX_ENTRIES, (EBookBookViewCallback)bookview_cb, lookup) == FALSE) {
+         g_signal_emit (entry, signals[ERROR], 0, _("Cannot create searchable view."));
+       }
+     }
+@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus
+  */
+ 
+ void
+-e_contact_entry_set_source_list (EContactEntry *entry,
+-    				  ESourceList *source_list)
++e_contact_entry_set_registry (EContactEntry *entry,
++    			      ESourceRegistry *registry)
+ {
++  GList *list, *link;
++  const gchar *extension_name;
+   GError *error = NULL;
+-  GSList *list, *l;
+ 
+   g_return_if_fail (E_IS_CONTACT_ENTRY (entry));
+ 
+@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContac
+     g_list_foreach (entry->priv->lookup_entries, (GFunc)lookup_entry_free, NULL);
+     g_list_free (entry->priv->lookup_entries);
+   }
+-  if (entry->priv->source_list) {
+-    g_object_unref (entry->priv->source_list);
++  if (entry->priv->registry) {
++    g_object_unref (entry->priv->registry);
+   }
+ 
+   /* If we have no new sources, disable and return here */
+-  if (source_list == NULL) {
++  if (registry == NULL) {
+     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
+-    entry->priv->source_list = NULL;
++    entry->priv->registry = NULL;
+     entry->priv->lookup_entries = NULL;
+     return;
+   }
+ 
+-  entry->priv->source_list = source_list;
+-  /* So that the list isn't going away underneath us */
+-  g_object_ref (entry->priv->source_list);
++  entry->priv->registry = registry;
++  /* So that the registry isn't going away underneath us */
++  g_object_ref (entry->priv->registry);
+ 
+-  /* That gets us a list of ESourceGroup */
+-  list = e_source_list_peek_groups (source_list);
+   entry->priv->lookup_entries = NULL;
+ 
+-  for (l = list; l != NULL; l = l->next) {
+-    ESourceGroup *group = l->data;
+-    GSList *sources = NULL, *m;
+-    /* That should give us a list of ESource */
+-    sources = e_source_group_peek_sources (group);
+-    for (m = sources; m != NULL; m = m->next) {
+-      ESource *source = m->data;
+-      ESource *s = e_source_copy (source);
+-      EntryLookup *lookup;
+-      char *uri;
++  extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
++  list = e_source_registry_list_sources (registry, extension_name);
+ 
+-      uri = g_strdup_printf("%s/%s", e_source_group_peek_base_uri (group), e_source_peek_relative_uri (source));
+-      e_source_set_absolute_uri (s, uri);
+-      g_free (uri);
+-
+-      /* Now add those to the lookup entries list */
+-      lookup = g_new0 (EntryLookup, 1);
+-      lookup->entry = entry;
+-      lookup->status = E_BOOK_ERROR_OK;
+-      lookup->open = FALSE;
++  for (link = list; link != NULL; link = g_list_next (link)) {
++    ESource *source = E_SOURCE (link->data);
++    EntryLookup *lookup;
+ 
+-      if ((lookup->book = e_book_new (s, &error)) == NULL) {
+-        /* TODO handle this better, fire the error signal I guess */
++    /* Now add those to the lookup entries list */
++    lookup = g_new0 (EntryLookup, 1);
++    lookup->entry = entry;
++    lookup->status = E_BOOK_ERROR_OK;
++    lookup->open = FALSE;
++
++    if ((lookup->book = e_book_new (source, &error)) == NULL) {
++      /* TODO handle this better, fire the error signal I guess */
++      if (error) {
+         g_warning ("%s", error->message);
+-	g_error_free (error);
+-	g_free (lookup);
+-      } else {
+-        entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
+-	e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
++        g_error_free (error);
++        error = NULL;
+       }
+-
+-      g_object_unref (s);
++      g_free (lookup);
++    } else {
++      entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
++      e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
+     }
+   }
+ 
+@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContac
+     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
+ }
+ 
+-ESourceList *
+-e_contact_entry_get_source_list (EContactEntry *entry)
++ESourceRegistry *
++e_contact_entry_get_registry (EContactEntry *entry)
+ {
+   g_return_val_if_fail (E_IS_CONTACT_ENTRY (entry), NULL);
+ 
+-  return entry->priv->source_list;
++  return entry->priv->registry;
+ }
+ 
+ void
+@@ -601,8 +578,8 @@ e_contact_entry_set_property (GObject *o
+   entry = E_CONTACT_ENTRY (object);
+   
+   switch (property_id) {
+-  case PROP_SOURCE_LIST:
+-    e_contact_entry_set_source_list (entry, g_value_get_object (value));
++  case PROP_REGISTRY:
++    e_contact_entry_set_registry (entry, g_value_get_object (value));
+     break;
+   case PROP_COMPLETE_LENGTH:
+     e_contact_entry_set_complete_length (entry, g_value_get_int (value));
+@@ -620,8 +597,8 @@ e_contact_entry_get_property (GObject *o
+   entry = E_CONTACT_ENTRY (object);
+   
+   switch (property_id) {
+-  case PROP_SOURCE_LIST:
+-    g_value_set_object (value, e_contact_entry_get_source_list (entry));
++  case PROP_REGISTRY:
++    g_value_set_object (value, e_contact_entry_get_registry (entry));
+     break;
+   case PROP_COMPLETE_LENGTH:
+     g_value_set_int (value, e_contact_entry_get_complete_length (entry));
+@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *objec
+     g_list_free (entry->priv->lookup_entries);
+     g_object_unref (entry->priv->completion);
+     g_object_unref (entry->priv->store);
+-    g_object_unref (entry->priv->source_list);
++    g_object_unref (entry->priv->registry);
+ 
+     if (entry->priv->display_destroy) {
+       entry->priv->display_destroy (entry->priv->display_func);
+@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *objec
+ static void
+ reset_search_fields (EContactEntry *entry)
+ {
+-  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, E_CONTACT_ORG, 0 };
++  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, 0 };
+ 
+   g_free (entry->priv->search_fields);
+   entry->priv->search_fields = g_new0 (EContactField, G_N_ELEMENTS (fields));
+@@ -716,9 +693,9 @@ e_contact_entry_class_init (EContactEntr
+   object_class->finalize = e_contact_entry_finalize;
+ 
+   /* Properties */
+-  g_object_class_install_property (object_class, PROP_SOURCE_LIST,
+-                                   g_param_spec_object ("source-list", "Source List", "The source list to search for contacts.",
+-                                                        E_TYPE_SOURCE_LIST, G_PARAM_READWRITE));
++  g_object_class_install_property (object_class, PROP_REGISTRY,
++                                   g_param_spec_object ("registry", "Registry", "Data source registry.",
++                                                        E_TYPE_SOURCE_REGISTRY, G_PARAM_READWRITE));
+   
+   g_object_class_install_property (object_class, PROP_COMPLETE_LENGTH,
+                                    g_param_spec_int ("complete-length", "Complete length", "Number of characters to start a search on.",
+@@ -771,6 +748,7 @@ lookup_entry_free (EntryLookup *lookup)
+   if (lookup->bookview) {
+     g_warning("EBookView still around");
+     g_object_unref (lookup->bookview);
++    lookup->bookview = NULL;
+   }
+   if (lookup->book) {
+     g_object_unref (lookup->book);
+diff -up gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h.eds gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h
+--- gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h.eds	2012-07-29 22:06:12.000000000 -0400
++++ gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h	2012-10-30 15:02:47.177996584 -0400
+@@ -23,10 +23,8 @@
+ #ifndef CONTACT_ENTRY_H
+ #define CONTACT_ENTRY_H
+ 
+-#include <libedataserver/e-source-group.h>
+-#include <libedataserver/e-source-list.h>
+-#include <libebook/e-contact.h>
+ #include <gtk/gtk.h>
++#include <libebook/libebook.h>
+ 
+ G_BEGIN_DECLS
+ 
+@@ -71,8 +69,8 @@ GType e_contact_entry_get_type (void);
+ 
+ GtkWidget *e_contact_entry_new (void);
+ 
+-void e_contact_entry_set_source_list (EContactEntry *entry, ESourceList *list);
+-ESourceList *e_contact_entry_get_source_list (EContactEntry *entry);
++void e_contact_entry_set_registry (EContactEntry *entry, ESourceRegistry *registry);
++ESourceRegistry *e_contact_entry_get_registry (EContactEntry *entry);
+ 
+ void e_contact_entry_set_complete_length(EContactEntry *entry, int length);
+ int e_contact_entry_get_complete_length(EContactEntry *entry);
+diff -up gnome-phone-manager-0.68/libgsm/phonemgr-utils.c.eds gnome-phone-manager-0.68/libgsm/phonemgr-utils.c
+--- gnome-phone-manager-0.68/libgsm/phonemgr-utils.c.eds	2012-07-29 22:06:12.000000000 -0400
++++ gnome-phone-manager-0.68/libgsm/phonemgr-utils.c	2012-10-30 15:02:47.177996584 -0400
+@@ -27,7 +27,7 @@
+ #include <glib.h>
+ #include <glib/gstdio.h>
+ #include <glib-object.h>
+-#include <libebook/e-contact.h>
++#include <libebook/libebook.h>
+ #include <gnokii.h>
+ 
+ #include <bluetooth/bluetooth.h>
+diff -up gnome-phone-manager-0.68/src/e-phone-entry.c.eds gnome-phone-manager-0.68/src/e-phone-entry.c
+--- gnome-phone-manager-0.68/src/e-phone-entry.c.eds	2012-07-29 22:06:12.000000000 -0400
++++ gnome-phone-manager-0.68/src/e-phone-entry.c	2012-10-30 15:04:13.471829767 -0400
+@@ -31,8 +31,6 @@
+ 
+ #include <gtk/gtk.h>
+ #include <string.h>
+-#include <libedataserver/e-source-list.h>
+-#include <libedataserverui/e-client-utils.h>
+ #include "e-phone-entry.h"
+ 
+ #define CONTACT_FORMAT "%s (%s)"
+@@ -181,25 +179,25 @@ e_phone_entry_finalize (GObject *object)
+ }
+ 
+ static void
+-add_sources (EContactEntry *entry)
+-{
+-	ESourceList *source_list;
+-
+-	if (e_client_utils_get_sources (&source_list,
+-					E_CLIENT_SOURCE_TYPE_CONTACTS,
+-					NULL)) {
+-		e_contact_entry_set_source_list (E_CONTACT_ENTRY (entry),
+-						 source_list);
+-		g_object_unref (source_list);
+-	}
+-}
+-
+-static void
+ e_phone_entry_init (EPhoneEntry *entry)
+ {
+ 	EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_NICKNAME, E_CONTACT_ORG, E_CONTACT_PHONE_MOBILE, 0 };
++	ESourceRegistry *registry;
++	GError *error = NULL;
++
++	/* XXX This call blocks while a D-Bus connection is made, possibly
++	 *     requiring activation.  Might be better to create the registry
++	 *     in main(), pass it to ui_init(), and have e_phone_entry_new()
++	 *     take it as an argument.  Calling this from main() means if it
++	 *     fails you can abort cleanly with a console error message. */
++	registry = e_source_registry_new_sync (NULL, &error);
++	if (registry == NULL) {
++		g_error ("%s: %s", G_STRFUNC, error->message);
++		g_assert_not_reached ();
++	}
++	e_contact_entry_set_registry (E_CONTACT_ENTRY (entry), registry);
++	g_object_unref (registry);
+ 
+-	add_sources (E_CONTACT_ENTRY (entry));
+ 	e_contact_entry_set_search_fields (E_CONTACT_ENTRY (entry), (const EContactField *)fields);
+ 	e_contact_entry_set_display_func (E_CONTACT_ENTRY (entry), test_display_func, NULL, NULL);
+ 	g_signal_connect (G_OBJECT (entry), "contact_selected",
diff --git a/community/gnome-phone-manager/gnome-phone-manager.install b/community/gnome-phone-manager/gnome-phone-manager.install
new file mode 100644
index 000000000..91212fa2e
--- /dev/null
+++ b/community/gnome-phone-manager/gnome-phone-manager.install
@@ -0,0 +1,17 @@
+pkgname=gnome-phone-manager
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
diff --git a/community/gnome-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD
new file mode 100644
index 000000000..90347bdf1
--- /dev/null
+++ b/community/gnome-screensaver/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 88685 2013-04-21 22:16:59Z heftig $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-screensaver
+pkgver=3.6.1
+pkgrel=3
+pkgdesc="Legacy GNOME screensaver"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url="http://live.gnome.org/GnomeScreensaver"
+backup=(etc/pam.d/gnome-screensaver)
+depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop')
+makedepends=('intltool' 'gnome-common')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+       gnome-screensaver.pam
+       move-desktop-file.patch
+       fix-autoconf.patch)
+sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
+            'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
+            '4bb96f62aa069c83b629204a79a3f63b146bcaf773569aee8b5dd23fbcd88974'
+            'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # Upstream patch that moves gnome-screensaver desktop file out of autostart
+  patch -Np1 -i "$srcdir/move-desktop-file.patch"
+
+  # Fix build
+  patch -Np1 -i "$srcdir/fix-autoconf.patch"
+
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+              --with-mit-ext
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver"
+}
diff --git a/community/gnome-screensaver/fix-autoconf.patch b/community/gnome-screensaver/fix-autoconf.patch
new file mode 100644
index 000000000..653b42bc8
--- /dev/null
+++ b/community/gnome-screensaver/fix-autoconf.patch
@@ -0,0 +1,12 @@
+diff -Naur gnome-screensaver-3.6.1.orig/configure.ac gnome-screensaver-3.6.1/configure.ac
+--- gnome-screensaver-3.6.1.orig/configure.ac	2012-10-16 04:28:59.000000000 +0200
++++ gnome-screensaver-3.6.1/configure.ac	2013-04-10 14:24:44.844833193 +0200
+@@ -10,7 +10,7 @@
+ AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz tar-ustar])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AM_MAINTAINER_MODE([enable])
+ 
diff --git a/community/gnome-screensaver/gnome-screensaver.pam b/community/gnome-screensaver/gnome-screensaver.pam
new file mode 100644
index 000000000..8d3baf085
--- /dev/null
+++ b/community/gnome-screensaver/gnome-screensaver.pam
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth        substack     system-login
+-auth        optional     pam_gnome_keyring.so
diff --git a/community/gnome-screensaver/move-desktop-file.patch b/community/gnome-screensaver/move-desktop-file.patch
new file mode 100644
index 000000000..d918405ad
--- /dev/null
+++ b/community/gnome-screensaver/move-desktop-file.patch
@@ -0,0 +1,34 @@
+From 1940dc6bc8ad5ee2c029714efb1276c05ca80bd4 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <tim@feathertop.org>
+Date: Thu, 18 Oct 2012 23:08:56 +0000
+Subject: move gnome-screensaver desktop file out of autostart
+
+https://bugzilla.gnome.org/show_bug.cgi?id=683060
+---
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1dd5d46..97ffa07 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -47,7 +47,7 @@ noinst_PROGRAMS = 	\
+ 	test-window	\
+ 	$(NULL)
+ 
+-desktopdir = $(sysconfdir)/xdg/autostart
++desktopdir = $(datadir)/applications
+ desktop_in_files = gnome-screensaver.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+diff --git a/src/gnome-screensaver.desktop.in.in b/src/gnome-screensaver.desktop.in.in
+index fae80c4..82d6d6f 100644
+--- a/src/gnome-screensaver.desktop.in.in
++++ b/src/gnome-screensaver.desktop.in.in
+@@ -5,7 +5,6 @@ _Comment=Launch screensaver and locker program
+ Icon=preferences-desktop-screensaver
+ Exec=gnome-screensaver
+ OnlyShowIn=GNOME;
+-AutostartCondition=GNOME3 if-session gnome-fallback
+ NoDisplay=true
+ X-GNOME-Autostart-Phase=Application
+ X-GNOME-Autostart-Notify=true
+--
+cgit v0.9.1
diff --git a/community/gnome-settings-daemon-compat/PKGBUILD b/community/gnome-settings-daemon-compat/PKGBUILD
new file mode 100644
index 000000000..8c2ae9f43
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/PKGBUILD
@@ -0,0 +1,75 @@
+# $Id: PKGBUILD 88930 2013-04-24 22:24:31Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=gnome-settings-daemon-compat
+_pkgname=gnome-settings-daemon
+pkgver=3.6.4
+pkgrel=3
+pkgdesc="Compatibility package that provides background, media keys and mount helpers for the Gnome Flashback session"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gnome-settings-daemon')
+makedepends=('docbook-xsl' 'intltool' 'xf86-input-wacom')
+url="https://live.gnome.org/GnomeFlashback"
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz
+        standalone-background-helper.patch
+        standalone-media-keys-helper.patch
+        draw-background-unconditionally.patch
+        sessionisactive-port.patch
+        revert-input-sources.patch
+        xinput.patch 
+        remove-libgsd-dependency.patch
+        move-desktop-file.patch)
+sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15'
+            '2e7e40175533556493bb58795a2c1b4e53b4baba35d151e632b933c6077456d9'
+            'ddc4dfaa8083ff24a7d2fb6138b8c3fee5d4e6c60c24b4e80a39392d0c8f2162'
+            '1b6b8216434b766e1389e876cba5d6ab61498c5824f6d2cc5d67dcf58a07842a'
+            '0821f469cd168f3a131da513a5f9dd352c06f9bc31d57d79de4dc063fa2de915'
+            '02da2467e287620c3b717c7ff5ffea7403cce714d5aa32e27d051b6571451e2a'
+            'fe8cafee074e36a7a393c9ae7f65db1c13a0959213aaae94ab8a3543bf20a25d'
+            '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c'
+            'c58ace67581a1e14dc21efc8d22dd1f385cd05483d67e8a385b0767a8daf9fb4')
+
+build() {
+  cd $_pkgname-$pkgver
+
+  # Build background and media keys helpers as a stand alone binary
+  patch -Np1 -i ../standalone-background-helper.patch
+  patch -Np1 -i ../standalone-media-keys-helper.patch
+
+  # Always draw background
+  patch -Np1 -i ../draw-background-unconditionally.patch
+
+  # Port to gnome-session's SessionIsActive property
+  patch -Np1 -i ../sessionisactive-port.patch
+
+  # Add compatibility patches for media keys plugin
+  patch -Np1 -i ../revert-input-sources.patch
+  patch -Np1 -i ../xinput.patch
+
+  # Remove libgsd dependency
+  patch -Np1 -i ../remove-libgsd-dependency.patch
+
+  # Move desktop files out of autostart, so they can be easily reusable in custom sessions
+  patch -Np1 -i ../move-desktop-file.patch
+
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$_pkgname \
+              --disable-static --enable-systemd
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make -C plugins/common
+  make -C plugins/automount
+  make -C plugins/background
+  make -C plugins/media-keys
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make -C plugins/automount DESTDIR="$pkgdir" install
+  make -C plugins/background DESTDIR="$pkgdir" install
+  make -C plugins/media-keys DESTDIR="$pkgdir" install
+}
diff --git a/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch b/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch
new file mode 100644
index 000000000..c279420de
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch
@@ -0,0 +1,162 @@
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c	2013-04-10 16:33:15.858860586 +0200
+@@ -69,110 +69,6 @@
+ 
+ static gpointer manager_object = NULL;
+ 
+-static gboolean
+-dont_draw_background (GsdBackgroundManager *manager)
+-{
+-        return !g_settings_get_boolean (manager->priv->settings,
+-                                        "draw-background");
+-}
+-
+-static gboolean
+-nautilus_is_drawing_background (GsdBackgroundManager *manager)
+-{
+-       Atom           window_id_atom;
+-       Window         nautilus_xid;
+-       Atom           actual_type;
+-       int            actual_format;
+-       unsigned long  nitems;
+-       unsigned long  bytes_after;
+-       unsigned char *data;
+-       Atom           wmclass_atom;
+-       gboolean       running;
+-       gint           error;
+-       gboolean       show_desktop_icons;
+-
+-       show_desktop_icons = g_settings_get_boolean (manager->priv->settings,
+-                                                     "show-desktop-icons");
+-       if (! show_desktop_icons) {
+-               return FALSE;
+-       }
+-
+-       window_id_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+-                                     "NAUTILUS_DESKTOP_WINDOW_ID", True);
+-
+-       if (window_id_atom == None) {
+-               return FALSE;
+-       }
+-
+-       XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+-                           GDK_ROOT_WINDOW (),
+-                           window_id_atom,
+-                           0,
+-                           1,
+-                           False,
+-                           XA_WINDOW,
+-                           &actual_type,
+-                           &actual_format,
+-                           &nitems,
+-                           &bytes_after,
+-                           &data);
+-
+-       if (data != NULL) {
+-               nautilus_xid = *(Window *) data;
+-               XFree (data);
+-       } else {
+-               return FALSE;
+-       }
+-
+-       if (actual_type != XA_WINDOW) {
+-               return FALSE;
+-       }
+-       if (actual_format != 32) {
+-               return FALSE;
+-       }
+-
+-       wmclass_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLASS", False);
+-
+-       gdk_error_trap_push ();
+-
+-       XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+-                           nautilus_xid,
+-                           wmclass_atom,
+-                           0,
+-                           24,
+-                           False,
+-                           XA_STRING,
+-                           &actual_type,
+-                           &actual_format,
+-                           &nitems,
+-                           &bytes_after,
+-                           &data);
+-
+-       error = gdk_error_trap_pop ();
+-
+-       if (error == BadWindow) {
+-               return FALSE;
+-       }
+-
+-       if (actual_type == XA_STRING &&
+-           nitems == 24 &&
+-           bytes_after == 0 &&
+-           actual_format == 8 &&
+-           data != NULL &&
+-           !strcmp ((char *)data, "desktop_window") &&
+-           !strcmp ((char *)data + strlen ((char *)data) + 1, "Nautilus")) {
+-               running = TRUE;
+-       } else {
+-               running = FALSE;
+-       }
+-
+-       if (data != NULL) {
+-               XFree (data);
+-       }
+-
+-       return running;
+-}
+-
+ static void
+ on_crossfade_finished (GsdBackgroundManager *manager)
+ {
+@@ -189,11 +85,6 @@
+         int         i;
+ 
+ 
+-        if (nautilus_is_drawing_background (manager) ||
+-            dont_draw_background (manager)) {
+-                return;
+-        }
+-
+         gnome_settings_profile_start (NULL);
+ 
+         display = gdk_display_get_default ();
+@@ -408,8 +299,7 @@
+                          const char           *key,
+                          GsdBackgroundManager *manager)
+ {
+-        if (dont_draw_background (manager) == FALSE)
+-                setup_bg_and_draw_background (manager);
++        setup_bg_and_draw_background (manager);
+ }
+ 
+ gboolean
+@@ -422,24 +312,8 @@
+         gnome_settings_profile_start (NULL);
+ 
+         manager->priv->settings = g_settings_new ("org.gnome.desktop.background");
+-        g_signal_connect (manager->priv->settings, "changed::draw-background",
+-                          G_CALLBACK (draw_background_changed), manager);
+ 
+-        /* If this is set, nautilus will draw the background and is
+-	 * almost definitely in our session.  however, it may not be
+-	 * running yet (so is_nautilus_running() will fail).  so, on
+-	 * startup, just don't do anything if this key is set so we
+-	 * don't waste time setting the background only to have
+-	 * nautilus overwrite it.
+-	 */
+-        show_desktop_icons = g_settings_get_boolean (manager->priv->settings,
+-                                                     "show-desktop-icons");
+-
+-        if (!show_desktop_icons) {
+-                setup_bg (manager);
+-        } else {
+-                draw_background_after_session_loads (manager);
+-        }
++        setup_bg (manager);
+ 
+         gnome_settings_profile_end (NULL);
+ 
diff --git a/community/gnome-settings-daemon-compat/move-desktop-file.patch b/community/gnome-settings-daemon-compat/move-desktop-file.patch
new file mode 100644
index 000000000..fe9272767
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/move-desktop-file.patch
@@ -0,0 +1,60 @@
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in
+--- gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in	2013-04-24 23:13:10.169941000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in	2013-04-24 23:13:41.064001562 +0200
+@@ -9,4 +9,3 @@
+ NoDisplay=true
+ OnlyShowIn=GNOME;Unity;
+ X-GNOME-Autostart-Notify=true
+-AutostartCondition=GNOME3 if-session gnome-fallback
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am
+--- gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am	2013-04-24 23:13:12.830004000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am	2013-04-24 23:13:36.613896914 +0200
+@@ -21,7 +21,7 @@
+ 	$(SYSTEMD_LIBS)			\
+ 	$(AUTOMOUNT_LIBS)
+ 
+-autostartdir = $(sysconfdir)/xdg/autostart
++autostartdir = $(datadir)/applications
+ autostart_in_files = gnome-fallback-mount-helper.desktop.in
+ autostart_in_in_files = gnome-fallback-mount-helper.desktop.in.in
+ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-24 23:13:07.229872000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-24 23:13:43.670729520 +0200
+@@ -9,4 +9,3 @@
+ NoDisplay=true
+ OnlyShowIn=GNOME;Unity;
+ X-GNOME-Autostart-Notify=true
+-AutostartCondition=GNOME3 if-session gnome-fallback
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am	2013-04-24 23:13:04.913151000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am	2013-04-24 23:13:47.907495798 +0200
+@@ -17,7 +17,7 @@
+ 	$(SETTINGS_PLUGIN_LIBS)		\
+ 	$(BACKGROUND_LIBS)
+ 
+-autostartdir = $(sysconfdir)/xdg/autostart
++autostartdir = $(datadir)/applications
+ autostart_in_files = gnome-fallback-background-helper.desktop.in
+ autostart_in_in_files = gnome-fallback-background-helper.desktop.in.in
+ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in
+--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 23:12:58.579668000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 23:13:51.747586073 +0200
+@@ -9,4 +9,3 @@
+ NoDisplay=true
+ OnlyShowIn=GNOME;Unity;
+ X-GNOME-Autostart-Notify=true
+-AutostartCondition=GNOME3 if-session gnome-fallback
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am
+--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am	2013-04-24 23:13:02.026416000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am	2013-04-24 23:13:54.570985777 +0200
+@@ -75,7 +75,7 @@
+ 	$(MEDIA_KEYS_LIBS)			\
+ 	-lm
+ 
+-autostartdir = $(sysconfdir)/xdg/autostart
++autostartdir = $(datadir)/applications
+ autostart_in_files = gnome-fallback-media-keys-helper.desktop.in
+ autostart_in_in_files = gnome-fallback-media-keys-helper.desktop.in.in
+ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
diff --git a/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch b/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch
new file mode 100644
index 000000000..b843ac2ce
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch
@@ -0,0 +1,160 @@
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gsd-automount-manager.c gnome-settings-daemon-3.6.4/plugins/automount/gsd-automount-manager.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/automount/gsd-automount-manager.c	2013-04-10 17:19:51.796298000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/automount/gsd-automount-manager.c	2013-04-10 17:31:27.382311947 +0200
+@@ -28,13 +28,43 @@
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+ 
+-#include "gnome-settings-profile.h"
+-#include "gnome-settings-session.h"
+ #include "gsd-automount-manager.h"
+ #include "gsd-autorun.h"
+ 
+ #define GSD_AUTOMOUNT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_AUTOMOUNT_MANAGER, GsdAutomountManagerPrivate))
+ 
++#define GNOME_SESSION_DBUS_NAME      "org.gnome.SessionManager"
++#define GNOME_SESSION_DBUS_OBJECT    "/org/gnome/SessionManager"
++#define GNOME_SESSION_DBUS_INTERFACE "org.gnome.SessionManager"
++
++GDBusProxy *
++get_session_proxy (void)
++{
++        static GDBusProxy *session_proxy;
++        GError *error =  NULL;
++
++        if (session_proxy != NULL) {
++                g_object_ref (session_proxy);
++        } else {
++                session_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
++                                                               G_DBUS_PROXY_FLAGS_NONE,
++                                                               NULL,
++                                                               GNOME_SESSION_DBUS_NAME,
++                                                               GNOME_SESSION_DBUS_OBJECT,
++                                                               GNOME_SESSION_DBUS_INTERFACE,
++                                                               NULL,
++                                                               &error);
++                if (error) {
++                        g_warning ("Failed to connect to the session manager: %s", error->message);
++                        g_error_free (error);
++                } else {
++                        g_object_add_weak_pointer (G_OBJECT (session_proxy), (gpointer*)&session_proxy);
++                }
++        }
++
++        return session_proxy;
++}
++
+ struct GsdAutomountManagerPrivate
+ {
+         GSettings   *settings;
+@@ -315,7 +345,7 @@
+ static void
+ do_initialize_session (GsdAutomountManager *manager)
+ {
+-        manager->priv->session = gnome_settings_session_get_session_proxy ();
++        manager->priv->session = get_session_proxy ();
+         g_signal_connect (manager->priv->session, "g-properties-changed",
+                           G_CALLBACK (session_props_changed), manager);
+         session_props_changed (manager->priv->session, NULL, NULL, manager);
+@@ -490,13 +520,10 @@
+                                        GError              **error)
+ {
+         g_debug ("Starting automounting manager");
+-        gnome_settings_profile_start (NULL);
+ 
+         manager->priv->settings = g_settings_new ("org.gnome.desktop.media-handling");
+         setup_automounter (manager);
+ 
+-        gnome_settings_profile_end (NULL);
+-
+         return TRUE;
+ }
+ 
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am
+--- gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am	2013-04-10 17:33:09.697997021 +0200
+@@ -8,7 +8,6 @@
+ 	gsd-autorun.h
+ 
+ gnome_fallback_mount_helper_CPPFLAGS = \
+-	-I$(top_srcdir)/gnome-settings-daemon		\
+ 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+ 	$(AM_CPPFLAGS)
+ 
+@@ -20,8 +19,7 @@
+ gnome_fallback_mount_helper_LDADD =	\
+ 	$(SETTINGS_PLUGIN_LIBS)		\
+ 	$(SYSTEMD_LIBS)			\
+-	$(AUTOMOUNT_LIBS)		\
+-	$(top_builddir)/gnome-settings-daemon/libgsd.la
++	$(AUTOMOUNT_LIBS)
+ 
+ autostartdir = $(sysconfdir)/xdg/autostart
+ autostart_in_files = gnome-fallback-mount-helper.desktop.in
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c	2013-04-10 17:19:51.792965000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c	2013-04-10 17:22:46.930334951 +0200
+@@ -42,7 +42,6 @@
+ #include <libgnome-desktop/gnome-bg.h>
+ #include <X11/Xatom.h>
+ 
+-#include "gnome-settings-profile.h"
+ #include "gsd-background-manager.h"
+ 
+ #define GSD_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_BACKGROUND_MANAGER, GsdBackgroundManagerPrivate))
+@@ -85,8 +84,6 @@
+         int         i;
+ 
+ 
+-        gnome_settings_profile_start (NULL);
+-
+         display = gdk_display_get_default ();
+         n_screens = gdk_display_get_n_screens (display);
+ 
+@@ -121,8 +118,6 @@
+ 
+                 cairo_surface_destroy (surface);
+         }
+-
+-        gnome_settings_profile_end (NULL);
+ }
+ 
+ static void
+@@ -309,14 +304,11 @@
+         gboolean show_desktop_icons;
+ 
+         g_debug ("Starting background manager");
+-        gnome_settings_profile_start (NULL);
+ 
+         manager->priv->settings = g_settings_new ("org.gnome.desktop.background");
+ 
+         setup_bg (manager);
+ 
+-        gnome_settings_profile_end (NULL);
+-
+         return TRUE;
+ }
+ 
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am	2013-04-10 17:43:32.768975155 +0200
++++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am	2013-04-10 17:43:19.115328380 +0200
+@@ -6,18 +6,16 @@
+ 	gsd-background-manager.h
+ 
+ gnome_fallback_background_helper_CPPFLAGS = \
+-	-I$(top_srcdir)/gnome-settings-daemon		\
+ 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+ 	$(AM_CPPFLAGS)
+ 
+ gnome_fallback_background_helper_CFLAGS =	\
+ 	$(SETTINGS_PLUGIN_CFLAGS)	\
+ 	$(BACKGROUND_CFLAGS)
+ 
+ gnome_fallback_background_helper_LDADD =	\
+ 	$(SETTINGS_PLUGIN_LIBS)		\
+-	$(BACKGROUND_LIBS)		\
+-	$(top_builddir)/gnome-settings-daemon/libgsd.la
++	$(BACKGROUND_LIBS)
+ 
+ autostartdir = $(sysconfdir)/xdg/autostart
+ autostart_in_files = gnome-fallback-background-helper.desktop.in
diff --git a/community/gnome-settings-daemon-compat/revert-input-sources.patch b/community/gnome-settings-daemon-compat/revert-input-sources.patch
new file mode 100644
index 000000000..dc769de4e
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/revert-input-sources.patch
@@ -0,0 +1,123 @@
+From cc45fec342713745f391533a202976e97670f9e5 Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos@gmail.com>
+Date: Wed, 12 Dec 2012 09:31:40 +0000
+Subject: Revert "media-keys: Add key bindings to switch input sources"
+
+These are now provided by gnome-shell.
+
+This reverts commit fc58c347900f906e304591135ca6c13d9950ab4d.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=690106
+---
+diff --git a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
+index b56b5d1..25e5f3e 100644
+--- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
++++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
+@@ -175,16 +175,6 @@
+       <_summary>Magnifier zoom out</_summary>
+       <_description>Binding for the magnifier to zoom out</_description>
+     </key>
+-    <key name="switch-input-source" type="s">
+-      <default>''</default>
+-      <_summary>Switch input source</_summary>
+-      <_description>Binding to select the next input source</_description>
+-    </key>
+-    <key name="switch-input-source-backward" type="s">
+-      <default>''</default>
+-      <_summary>Switch input source backward</_summary>
+-      <_description>Binding to select the previous input source</_description>
+-    </key>
+   </schema>
+ 
+   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.media-keys.custom-keybinding">
+diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
+index e5977d0..cd6fbc2 100644
+--- a/plugins/media-keys/gsd-media-keys-manager.c
++++ b/plugins/media-keys/gsd-media-keys-manager.c
+@@ -98,10 +98,6 @@ static const gchar introspection_xml[] =
+ #define VOLUME_STEP 6           /* percents for one volume button press */
+ #define MAX_VOLUME 65536.0
+ 
+-#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources"
+-#define KEY_CURRENT_INPUT_SOURCE "current"
+-#define KEY_INPUT_SOURCES        "sources"
+-
+ #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate))
+ 
+ typedef struct {
+@@ -1807,40 +1803,6 @@ do_keyboard_brightness_action (GsdMediaKeysManager *manager,
+ }
+ 
+ static void
+-do_switch_input_source_action (GsdMediaKeysManager *manager,
+-                               MediaKeyType         type)
+-{
+-        GSettings *settings;
+-        GVariant *sources;
+-        gint i, n;
+-
+-        settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR);
+-        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
+-
+-        n = g_variant_n_children (sources);
+-        if (n < 2)
+-                goto out;
+-
+-        i = g_settings_get_uint (settings, KEY_CURRENT_INPUT_SOURCE);
+-
+-        if (type == SWITCH_INPUT_SOURCE_KEY)
+-                i += 1;
+-        else
+-                i -= 1;
+-
+-        if (i < 0)
+-                i = n - 1;
+-        else if (i >= n)
+-                i = 0;
+-
+-        g_settings_set_uint (settings, KEY_CURRENT_INPUT_SOURCE, i);
+-
+- out:
+-        g_variant_unref (sources);
+-        g_object_unref (settings);
+-}
+-
+-static void
+ do_custom_action (GsdMediaKeysManager *manager,
+                   MediaKey            *key,
+                   gint64               timestamp)
+@@ -1999,10 +1961,6 @@ do_action (GsdMediaKeysManager *manager,
+         case BATTERY_KEY:
+                 do_execute_desktop (manager, "gnome-power-statistics.desktop", timestamp);
+                 break;
+-        case SWITCH_INPUT_SOURCE_KEY:
+-        case SWITCH_INPUT_SOURCE_BACKWARD_KEY:
+-                do_switch_input_source_action (manager, type);
+-                break;
+         /* Note, no default so compiler catches missing keys */
+         case CUSTOM_KEY:
+                 g_assert_not_reached ();
+diff --git a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h
+index a16d0e7..437ed2c 100644
+--- a/plugins/media-keys/shortcuts-list.h
++++ b/plugins/media-keys/shortcuts-list.h
+@@ -80,8 +80,6 @@ typedef enum {
+         KEYBOARD_BRIGHTNESS_DOWN_KEY,
+         KEYBOARD_BRIGHTNESS_TOGGLE_KEY,
+         BATTERY_KEY,
+-        SWITCH_INPUT_SOURCE_KEY,
+-        SWITCH_INPUT_SOURCE_BACKWARD_KEY,
+         CUSTOM_KEY
+ } MediaKeyType;
+ 
+@@ -148,8 +146,6 @@ static struct {
+         { KEYBOARD_BRIGHTNESS_UP_KEY, NULL, "XF86KbdBrightnessUp" },
+         { KEYBOARD_BRIGHTNESS_DOWN_KEY, NULL, "XF86KbdBrightnessDown" },
+         { KEYBOARD_BRIGHTNESS_TOGGLE_KEY, NULL, "XF86KbdLightOnOff" },
+-        { SWITCH_INPUT_SOURCE_KEY, "switch-input-source", NULL },
+-        { SWITCH_INPUT_SOURCE_BACKWARD_KEY, "switch-input-source-backward", NULL },
+         { BATTERY_KEY, NULL, "XF86Battery" },
+ };
+ 
+--
+cgit v0.9.1
diff --git a/community/gnome-settings-daemon-compat/sessionisactive-port.patch b/community/gnome-settings-daemon-compat/sessionisactive-port.patch
new file mode 100644
index 000000000..dc5fd260e
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/sessionisactive-port.patch
@@ -0,0 +1,73 @@
+From 32b0b2d85629ae765543df1d940a5ca3c37dcec1 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Tue, 06 Nov 2012 22:47:05 +0000
+Subject: [wip] Port to gnome-session's SessionIsActive property
+
+Rather than maintaining the systemd code here, monitor gnome-session's
+SessionIsActive property.  This allows us to drop the compile-time
+dependency on systemd.
+
+The power plugin is declared dependent on systemd at runtime, but the
+rest of the code should operate in more "basic functionality" mode.
+---
+(limited to 'plugins/automount')
+
+diff --git a/plugins/automount/gsd-automount-manager.c b/plugins/automount/gsd-automount-manager.c
+index 7912f19..d8e9e07 100644
+--- a/plugins/automount/gsd-automount-manager.c
++++ b/plugins/automount/gsd-automount-manager.c
+@@ -42,7 +42,7 @@ struct GsdAutomountManagerPrivate
+ 	GVolumeMonitor *volume_monitor;
+ 	unsigned int automount_idle_id;
+ 
+-        GnomeSettingsSession *session;
++        GDBusProxy *session;
+         gboolean session_is_active;
+         gboolean screensaver_active;
+         guint ss_watch_id;
+@@ -288,17 +288,21 @@ mount_added_callback (GVolumeMonitor *monitor,
+ 
+ 
+ static void
+-session_state_changed (GnomeSettingsSession *session, GParamSpec *pspec, gpointer user_data)
++session_props_changed (GDBusProxy *session, GVariant *v, char **props, gpointer user_data)
+ {
+         GsdAutomountManager *manager = user_data;
+         GsdAutomountManagerPrivate *p = manager->priv;
++        GVariant *active_v = NULL;
++        gboolean is_active;
+ 
+-        if (gnome_settings_session_get_state (session) == GNOME_SETTINGS_SESSION_STATE_ACTIVE) {
+-                p->session_is_active = TRUE;
+-        }
+-        else {
+-                p->session_is_active = FALSE;
+-        }
++        active_v = g_dbus_proxy_get_cached_property (session, "SessionIsActive");
++        if (!active_v)
++                return;
++
++        g_variant_get (active_v, "b", &is_active);
++        g_variant_unref (active_v);
++        g_printerr ("AUTOMOUNT: session is active: %d -> %d\n", p->session_is_active, is_active);
++        p->session_is_active = is_active;
+ 
+         if (!p->session_is_active) {
+                 if (p->volume_queue != NULL) {
+@@ -311,10 +315,10 @@ session_state_changed (GnomeSettingsSession *session, GParamSpec *pspec, gpointe
+ static void
+ do_initialize_session (GsdAutomountManager *manager)
+ {
+-        manager->priv->session = gnome_settings_session_new ();
+-        g_signal_connect (manager->priv->session, "notify::state",
+-                          G_CALLBACK (session_state_changed), manager);
+-        session_state_changed (manager->priv->session, NULL, manager);
++        manager->priv->session = gnome_settings_session_get_session_proxy ();
++        g_signal_connect (manager->priv->session, "g-properties-changed",
++                          G_CALLBACK (session_props_changed), manager);
++        session_props_changed (manager->priv->session, NULL, NULL, manager);
+ }
+ 
+ #define SCREENSAVER_NAME "org.gnome.ScreenSaver"
+--
+cgit v0.9.1
diff --git a/community/gnome-settings-daemon-compat/standalone-background-helper.patch b/community/gnome-settings-daemon-compat/standalone-background-helper.patch
new file mode 100644
index 000000000..b52de042f
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/standalone-background-helper.patch
@@ -0,0 +1,437 @@
+diff -Naur gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+--- gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-04-10 17:39:36.446882275 +0200
+@@ -2,7 +2,6 @@
+   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins" path="/org/gnome/settings-daemon/plugins/">
+     <child name="a11y-keyboard" schema="org.gnome.settings-daemon.plugins.a11y-keyboard"/>
+     <child name="a11y-settings" schema="org.gnome.settings-daemon.plugins.a11y-settings"/>
+-    <child name="background" schema="org.gnome.settings-daemon.plugins.background"/>
+     <child name="clipboard" schema="org.gnome.settings-daemon.plugins.clipboard"/>
+     <child name="color" schema="org.gnome.settings-daemon.plugins.color"/>
+     <child name="cursor" schema="org.gnome.settings-daemon.plugins.cursor"/>
+@@ -45,18 +44,6 @@
+       <_summary>Priority to use for this plugin</_summary>
+       <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
+     </key>
+-  </schema>
+-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.background" path="/org/gnome/settings-daemon/plugins/background/">
+-    <key name="active" type="b">
+-      <default>true</default>
+-      <_summary>Activation of this plugin</_summary>
+-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
+-    </key>
+-    <key name="priority" type="i">
+-      <default>97</default>
+-      <_summary>Priority to use for this plugin</_summary>
+-      <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
+-    </key>
+   </schema>
+   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.clipboard" path="/org/gnome/settings-daemon/plugins/clipboard/">
+     <key name="active" type="b">
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/background.gnome-settings-plugin.in gnome-settings-daemon-3.6.4/plugins/background/background.gnome-settings-plugin.in
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/background.gnome-settings-plugin.in	2012-04-07 15:21:20.000000000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/background/background.gnome-settings-plugin.in	1970-01-01 01:00:00.000000000 +0100
+@@ -1,8 +0,0 @@
+-[GNOME Settings Plugin]
+-Module=background
+-IAge=0
+-_Name=Background
+-_Description=Background plugin
+-Authors=
+-Copyright=Copyright © 2007
+-Website=
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.c gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.c	1970-01-01 01:00:00.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.c	2013-04-10 17:39:36.450215685 +0200
+@@ -0,0 +1,65 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2010 Red Hat, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ * Author: Tomas Bzatek <tbzatek@redhat.com>
++ */
++
++#include "config.h"
++
++#include <glib.h>
++#include <glib/gi18n.h>
++#include <unistd.h>
++#include <gtk/gtk.h>
++
++#include "gsd-background-manager.h"
++
++int
++main (int argc,
++      char **argv)
++{
++        GMainLoop *loop;
++        GsdBackgroundManager *manager;
++        GError *error = NULL;
++
++        g_type_init ();
++        gtk_init (&argc, &argv);
++
++        bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR);
++        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++        textdomain (GETTEXT_PACKAGE);
++
++        loop = g_main_loop_new (NULL, FALSE);
++        manager = gsd_background_manager_new ();
++
++        gsd_background_manager_start (manager, &error);
++
++        if (error != NULL) {
++                g_printerr ("Unable to start the background manager: %s",
++                            error->message);
++
++                g_error_free (error);
++                _exit (1);
++        }
++
++        g_main_loop_run (loop);
++
++        gsd_background_manager_stop (manager);
++        g_main_loop_unref (loop);
++
++        return 0;
++}
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in	1970-01-01 01:00:00.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in	2013-04-10 17:39:36.450215685 +0200
+@@ -0,0 +1,12 @@
++[Desktop Entry]
++_Name=Background
++_Comment=Background plugin
++Exec=@LIBEXECDIR@/gnome-fallback-background-helper
++Icon=desktop
++Terminal=false
++Type=Application
++Categories=
++NoDisplay=true
++OnlyShowIn=GNOME;Unity;
++X-GNOME-Autostart-Notify=true
++AutostartCondition=GNOME3 if-session gnome-fallback
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.c	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,104 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+- *
+- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+- *
+- */
+-
+-#include "config.h"
+-
+-#include <glib/gi18n-lib.h>
+-#include <gmodule.h>
+-
+-#include "gnome-settings-plugin.h"
+-#include "gsd-background-plugin.h"
+-#include "gsd-background-manager.h"
+-
+-struct GsdBackgroundPluginPrivate {
+-        GsdBackgroundManager *manager;
+-};
+-
+-#define GSD_BACKGROUND_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginPrivate))
+-
+-GNOME_SETTINGS_PLUGIN_REGISTER (GsdBackgroundPlugin, gsd_background_plugin)
+-
+-static void
+-gsd_background_plugin_init (GsdBackgroundPlugin *plugin)
+-{
+-        plugin->priv = GSD_BACKGROUND_PLUGIN_GET_PRIVATE (plugin);
+-
+-        g_debug ("GsdBackgroundPlugin initializing");
+-
+-        plugin->priv->manager = gsd_background_manager_new ();
+-}
+-
+-static void
+-gsd_background_plugin_finalize (GObject *object)
+-{
+-        GsdBackgroundPlugin *plugin;
+-
+-        g_return_if_fail (object != NULL);
+-        g_return_if_fail (GSD_IS_BACKGROUND_PLUGIN (object));
+-
+-        g_debug ("GsdBackgroundPlugin finalizing");
+-
+-        plugin = GSD_BACKGROUND_PLUGIN (object);
+-
+-        g_return_if_fail (plugin->priv != NULL);
+-
+-        if (plugin->priv->manager != NULL) {
+-                g_object_unref (plugin->priv->manager);
+-        }
+-
+-        G_OBJECT_CLASS (gsd_background_plugin_parent_class)->finalize (object);
+-}
+-
+-static void
+-impl_activate (GnomeSettingsPlugin *plugin)
+-{
+-        gboolean res;
+-        GError  *error;
+-
+-        g_debug ("Activating background plugin");
+-
+-        error = NULL;
+-        res = gsd_background_manager_start (GSD_BACKGROUND_PLUGIN (plugin)->priv->manager, &error);
+-        if (! res) {
+-                g_warning ("Unable to start background manager: %s", error->message);
+-                g_error_free (error);
+-        }
+-}
+-
+-static void
+-impl_deactivate (GnomeSettingsPlugin *plugin)
+-{
+-        g_debug ("Deactivating background plugin");
+-        gsd_background_manager_stop (GSD_BACKGROUND_PLUGIN (plugin)->priv->manager);
+-}
+-
+-static void
+-gsd_background_plugin_class_init (GsdBackgroundPluginClass *klass)
+-{
+-        GObjectClass           *object_class = G_OBJECT_CLASS (klass);
+-        GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass);
+-
+-        object_class->finalize = gsd_background_plugin_finalize;
+-
+-        plugin_class->activate = impl_activate;
+-        plugin_class->deactivate = impl_deactivate;
+-
+-        g_type_class_add_private (klass, sizeof (GsdBackgroundPluginPrivate));
+-}
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.h gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.h
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.h	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.h	1970-01-01 01:00:00.000000000 +0100
+@@ -1,59 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+- *
+- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+- *
+- */
+-
+-#ifndef __GSD_BACKGROUND_PLUGIN_H__
+-#define __GSD_BACKGROUND_PLUGIN_H__
+-
+-#include <glib.h>
+-#include <glib-object.h>
+-#include <gmodule.h>
+-
+-#include "gnome-settings-plugin.h"
+-
+-G_BEGIN_DECLS
+-
+-#define GSD_TYPE_BACKGROUND_PLUGIN                (gsd_background_plugin_get_type ())
+-#define GSD_BACKGROUND_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPlugin))
+-#define GSD_BACKGROUND_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginClass))
+-#define GSD_IS_BACKGROUND_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_BACKGROUND_PLUGIN))
+-#define GSD_IS_BACKGROUND_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_BACKGROUND_PLUGIN))
+-#define GSD_BACKGROUND_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginClass))
+-
+-typedef struct GsdBackgroundPluginPrivate GsdBackgroundPluginPrivate;
+-
+-typedef struct
+-{
+-        GnomeSettingsPlugin    parent;
+-        GsdBackgroundPluginPrivate *priv;
+-} GsdBackgroundPlugin;
+-
+-typedef struct
+-{
+-        GnomeSettingsPluginClass parent_class;
+-} GsdBackgroundPluginClass;
+-
+-GType   gsd_background_plugin_get_type            (void) G_GNUC_CONST;
+-
+-/* All the plugins must implement this function */
+-G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
+-
+-G_END_DECLS
+-
+-#endif /* __GSD_BACKGROUND_PLUGIN_H__ */
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am	2013-04-10 17:40:20.117885180 +0200
+@@ -1,80 +1,34 @@
+-NULL =
++libexec_PROGRAMS = gnome-fallback-background-helper
+ 
+-plugin_name = background
++gnome_fallback_background_helper_SOURCES = \
++	gnome-fallback-background-helper.c \
++	gsd-background-manager.c \
++	gsd-background-manager.h
+ 
+-libexec_PROGRAMS = gsd-test-background
+-
+-gsd_test_background_SOURCES =		\
+-	test-background.c		\
+-	gsd-background-manager.h	\
+-	gsd-background-manager.c	\
+-	$(NULL)
+-
+-gsd_test_background_CPPFLAGS =				\
++gnome_fallback_background_helper_CPPFLAGS = \
+ 	-I$(top_srcdir)/gnome-settings-daemon		\
+-	-I$(top_srcdir)/plugins/common			\
+ 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+ 	$(AM_CPPFLAGS)
+ 
+-gsd_test_background_CFLAGS = \
+-	$(PLUGIN_CFLAGS)		\
++gnome_fallback_background_helper_CFLAGS =	\
+ 	$(SETTINGS_PLUGIN_CFLAGS)	\
+-	$(BACKGROUND_CFLAGS)		\
+-	$(AM_CFLAGS)
+-
+-gsd_test_background_LDADD =				\
+-	$(top_builddir)/gnome-settings-daemon/libgsd.la	\
+-	$(SETTINGS_PLUGIN_LIBS)				\
+-	$(BACKGROUND_LIBS)				\
+-	$(NULL)
+-
+-plugin_LTLIBRARIES = \
+-	libbackground.la		\
+-	$(NULL)
+-
+-libbackground_la_SOURCES =		\
+-	gsd-background-plugin.h		\
+-	gsd-background-plugin.c		\
+-	gsd-background-manager.h	\
+-	gsd-background-manager.c	\
+-	$(NULL)
++	$(BACKGROUND_CFLAGS)
+ 
+-libbackground_la_CPPFLAGS = \
+-	-I$(top_srcdir)/gnome-settings-daemon		\
+-	-I$(top_srcdir)/plugins/background/libbackground   \
+-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+-	$(AM_CPPFLAGS)
+-
+-libbackground_la_CFLAGS = \
+-	$(SETTINGS_PLUGIN_CFLAGS)	\
+-	$(BACKGROUND_CFLAGS)		\
+-	$(AM_CFLAGS)
+-
+-libbackground_la_LDFLAGS =		\
+-	$(GSD_PLUGIN_LDFLAGS)		\
+-	$(NULL)
+-
+-libbackground_la_LIBADD  =		\
++gnome_fallback_background_helper_LDADD =	\
+ 	$(SETTINGS_PLUGIN_LIBS)		\
+ 	$(BACKGROUND_LIBS)		\
+-	$(NULL)
+-
+-plugin_in_files =		\
+-	background.gnome-settings-plugin.in	\
+-	$(NULL)
++	$(top_builddir)/gnome-settings-daemon/libgsd.la
+ 
+-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
++autostartdir = $(sysconfdir)/xdg/autostart
++autostart_in_files = gnome-fallback-background-helper.desktop.in
++autostart_in_in_files = gnome-fallback-background-helper.desktop.in.in
++autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+ 
+-EXTRA_DIST = 			\
+-	$(plugin_in_files)	\
+-	$(NULL)
++$(autostart_in_files): $(autostart_in_in_files)
++	@sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+ 
+-CLEANFILES = 			\
+-	$(plugin_DATA)		\
+-	$(NULL)
++@INTLTOOL_DESKTOP_RULE@
+ 
+-DISTCLEANFILES =		\
+-	$(plugin_DATA)		\
+-	$(NULL)
++EXTRA_DIST = $(autostart_in_in_files)
+ 
+-@GSD_INTLTOOL_PLUGIN_RULE@
++CLEANFILES = $(autostart_DATA) $(autostart_in_files)
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/test-background.c gnome-settings-daemon-3.6.4/plugins/background/test-background.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/background/test-background.c	2012-06-01 22:02:53.000000000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/background/test-background.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,7 +0,0 @@
+-#define NEW gsd_background_manager_new
+-#define START gsd_background_manager_start
+-#define STOP gsd_background_manager_stop
+-#define MANAGER GsdBackgroundManager
+-#include "gsd-background-manager.h"
+-
+-#include "test-plugin.h"
+diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.in gnome-settings-daemon-3.6.4/po/POTFILES.in
+--- gnome-settings-daemon-3.6.4.orig/po/POTFILES.in	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/po/POTFILES.in	2013-04-10 17:39:36.450215685 +0200
+@@ -21,9 +21,9 @@
+ [type: gettext/glade]plugins/a11y-keyboard/gsd-a11y-preferences-dialog.ui
+ [type: gettext/ini]plugins/a11y-settings/a11y-settings.gnome-settings-plugin.in
+ plugins/automount/gnome-fallback-mount-helper.desktop.in.in
++plugins/background/gnome-fallback-background-helper.desktop.in.in
+ plugins/automount/gsd-automount-manager.c
+ plugins/automount/gsd-autorun.c
+-[type: gettext/ini]plugins/background/background.gnome-settings-plugin.in
+ [type: gettext/ini]plugins/clipboard/clipboard.gnome-settings-plugin.in
+ [type: gettext/ini]plugins/color/color.gnome-settings-plugin.in
+ plugins/color/gsd-color-manager.c
+diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip gnome-settings-daemon-3.6.4/po/POTFILES.skip
+--- gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip	2012-04-07 18:58:07.000000000 +0200
++++ gnome-settings-daemon-3.6.4/po/POTFILES.skip	2013-04-10 17:39:36.453549095 +0200
+@@ -20,6 +20,7 @@
+ data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in
+ data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
+ data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
++plugins/background/gnome-fallback-background-helper.desktop.in
+ plugins/automount/gnome-fallback-mount-helper.desktop.in
+ plugins/power/org.gnome.settings-daemon.plugins.power.policy.in
+ plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in
diff --git a/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch b/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch
new file mode 100644
index 000000000..61be1737e
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch
@@ -0,0 +1,564 @@
+diff -Naur gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+--- gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-04-24 03:11:02.893859531 +0200
++++ gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in	2013-04-24 13:43:11.128884064 +0200
+@@ -9,7 +9,6 @@
+     <child name="gsdwacom" schema="org.gnome.settings-daemon.plugins.gsdwacom"/>
+     <child name="housekeeping" schema="org.gnome.settings-daemon.plugins.housekeeping"/>
+     <child name="keyboard" schema="org.gnome.settings-daemon.plugins.keyboard"/>
+-    <child name="media-keys" schema="org.gnome.settings-daemon.plugins.media-keys"/>
+     <child name="mouse" schema="org.gnome.settings-daemon.plugins.mouse"/>
+     <child name="orientation" schema="org.gnome.settings-daemon.plugins.orientation"/>
+     <child name="power" schema="org.gnome.settings-daemon.plugins.power"/>
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.c gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.c	1970-01-01 01:00:00.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.c	2013-04-24 13:43:11.132217470 +0200
+@@ -0,0 +1,65 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2010 Red Hat, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ * Author: Tomas Bzatek <tbzatek@redhat.com>
++ */
++
++#include "config.h"
++
++#include <glib.h>
++#include <glib/gi18n.h>
++#include <unistd.h>
++#include <gtk/gtk.h>
++
++#include "gsd-media-keys-manager.h"
++
++int
++main (int argc,
++      char **argv)
++{
++        GMainLoop *loop;
++        GsdMediaKeysManager *manager;
++        GError *error = NULL;
++
++        g_type_init ();
++        gtk_init (&argc, &argv);
++
++        bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR);
++        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++        textdomain (GETTEXT_PACKAGE);
++
++        loop = g_main_loop_new (NULL, FALSE);
++        manager = gsd_media_keys_manager_new ();
++
++        gsd_media_keys_manager_start (manager, &error);
++
++        if (error != NULL) {
++                g_printerr ("Unable to start the media-keys manager: %s",
++                            error->message);
++
++                g_error_free (error);
++                _exit (1);
++        }
++
++        g_main_loop_run (loop);
++
++        gsd_media_keys_manager_stop (manager);
++        g_main_loop_unref (loop);
++
++        return 0;
++}
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in
+--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	1970-01-01 01:00:00.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in	2013-04-24 13:43:11.132217470 +0200
+@@ -0,0 +1,12 @@
++[Desktop Entry]
++_Name=Media keys
++_Comment=Media keys plugin
++Exec=@LIBEXECDIR@/gnome-fallback-media-keys-helper
++Icon=multimedia
++Terminal=false
++Type=Application
++Categories=
++NoDisplay=true
++OnlyShowIn=GNOME;Unity;
++X-GNOME-Autostart-Notify=true
++AutostartCondition=GNOME3 if-session gnome-fallback
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-manager.c	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c	2013-04-24 13:43:11.132217470 +0200
+@@ -44,7 +44,6 @@
+ #include <gudev/gudev.h>
+ #endif
+ 
+-#include "gnome-settings-profile.h"
+ #include "gsd-marshal.h"
+ #include "gsd-media-keys-manager.h"
+ 
+@@ -622,8 +621,6 @@
+         char **custom_paths;
+         int i;
+ 
+-        gnome_settings_profile_start (NULL);
+-
+         gdk_error_trap_push ();
+ 
+         manager->priv->keys = g_ptr_array_new_with_free_func ((GDestroyNotify) media_key_free);
+@@ -661,8 +658,6 @@
+         gdk_flush ();
+         if (gdk_error_trap_pop ())
+                 g_warning ("Grab failed for some keys, another application may already have access the them.");
+-
+-        gnome_settings_profile_end (NULL);
+ }
+ 
+ static void
+@@ -2090,7 +2085,6 @@
+         char *theme_name;
+ 
+         g_debug ("Starting media_keys manager");
+-        gnome_settings_profile_start (NULL);
+ 
+         manager->priv->settings = g_settings_new (SETTINGS_BINDING_DIR);
+         g_signal_connect (G_OBJECT (manager->priv->settings), "changed",
+@@ -2137,19 +2131,14 @@
+ 
+         /* Start filtering the events */
+         for (l = manager->priv->screens; l != NULL; l = l->next) {
+-                gnome_settings_profile_start ("gdk_window_add_filter");
+-
+                 g_debug ("adding key filter for screen: %d",
+                          gdk_screen_get_number (l->data));
+ 
+                 gdk_window_add_filter (gdk_screen_get_root_window (l->data),
+                                        (GdkFilterFunc) filter_key_events,
+                                        manager);
+-                gnome_settings_profile_end ("gdk_window_add_filter");
+         }
+ 
+-        gnome_settings_profile_end (NULL);
+-
+         manager->priv->start_idle_id = 0;
+ 
+         return FALSE;
+@@ -2161,8 +2150,6 @@
+ {
+         const char * const subsystems[] = { "input", "usb", "sound", NULL };
+ 
+-        gnome_settings_profile_start (NULL);
+-
+         if (supports_xinput2_devices (&manager->priv->opcode) == FALSE) {
+                 g_debug ("No Xinput2 support, disabling plugin");
+                 return TRUE;
+@@ -2179,8 +2166,6 @@
+          * The rest (grabbing and setting the keys) can happen in an
+          * idle.
+          */
+-        gnome_settings_profile_start ("gvc_mixer_control_new");
+-
+         manager->priv->volume = gvc_mixer_control_new ("GNOME Volume Control Media Keys");
+ 
+         g_signal_connect (manager->priv->volume,
+@@ -2198,14 +2183,10 @@
+ 
+         gvc_mixer_control_open (manager->priv->volume);
+ 
+-        gnome_settings_profile_end ("gvc_mixer_control_new");
+-
+         manager->priv->start_idle_id = g_idle_add ((GSourceFunc) start_media_keys_idle_cb, manager);
+ 
+         register_manager (manager_object);
+ 
+-        gnome_settings_profile_end (NULL);
+-
+         return TRUE;
+ }
+ 
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.c gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.c	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,104 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+- *
+- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+- *
+- */
+-
+-#include "config.h"
+-
+-#include <glib/gi18n-lib.h>
+-#include <gmodule.h>
+-
+-#include "gnome-settings-plugin.h"
+-#include "gsd-media-keys-plugin.h"
+-#include "gsd-media-keys-manager.h"
+-
+-struct GsdMediaKeysPluginPrivate {
+-        GsdMediaKeysManager *manager;
+-};
+-
+-#define GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginPrivate))
+-
+-GNOME_SETTINGS_PLUGIN_REGISTER (GsdMediaKeysPlugin, gsd_media_keys_plugin)
+-
+-static void
+-gsd_media_keys_plugin_init (GsdMediaKeysPlugin *plugin)
+-{
+-        plugin->priv = GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE (plugin);
+-
+-        g_debug ("GsdMediaKeysPlugin initializing");
+-
+-        plugin->priv->manager = gsd_media_keys_manager_new ();
+-}
+-
+-static void
+-gsd_media_keys_plugin_finalize (GObject *object)
+-{
+-        GsdMediaKeysPlugin *plugin;
+-
+-        g_return_if_fail (object != NULL);
+-        g_return_if_fail (GSD_IS_MEDIA_KEYS_PLUGIN (object));
+-
+-        g_debug ("GsdMediaKeysPlugin finalizing");
+-
+-        plugin = GSD_MEDIA_KEYS_PLUGIN (object);
+-
+-        g_return_if_fail (plugin->priv != NULL);
+-
+-        if (plugin->priv->manager != NULL) {
+-                g_object_unref (plugin->priv->manager);
+-        }
+-
+-        G_OBJECT_CLASS (gsd_media_keys_plugin_parent_class)->finalize (object);
+-}
+-
+-static void
+-impl_activate (GnomeSettingsPlugin *plugin)
+-{
+-        gboolean res;
+-        GError  *error;
+-
+-        g_debug ("Activating media_keys plugin");
+-
+-        error = NULL;
+-        res = gsd_media_keys_manager_start (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager, &error);
+-        if (! res) {
+-                g_warning ("Unable to start media_keys manager: %s", error->message);
+-                g_error_free (error);
+-        }
+-}
+-
+-static void
+-impl_deactivate (GnomeSettingsPlugin *plugin)
+-{
+-        g_debug ("Deactivating media_keys plugin");
+-        gsd_media_keys_manager_stop (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager);
+-}
+-
+-static void
+-gsd_media_keys_plugin_class_init (GsdMediaKeysPluginClass *klass)
+-{
+-        GObjectClass           *object_class = G_OBJECT_CLASS (klass);
+-        GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass);
+-
+-        object_class->finalize = gsd_media_keys_plugin_finalize;
+-
+-        plugin_class->activate = impl_activate;
+-        plugin_class->deactivate = impl_deactivate;
+-
+-        g_type_class_add_private (klass, sizeof (GsdMediaKeysPluginPrivate));
+-}
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.h gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.h
+--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.h	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.h	1970-01-01 01:00:00.000000000 +0100
+@@ -1,59 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+- *
+- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+- *
+- */
+-
+-#ifndef __GSD_MEDIA_KEYS_PLUGIN_H__
+-#define __GSD_MEDIA_KEYS_PLUGIN_H__
+-
+-#include <glib.h>
+-#include <glib-object.h>
+-#include <gmodule.h>
+-
+-#include "gnome-settings-plugin.h"
+-
+-G_BEGIN_DECLS
+-
+-#define GSD_TYPE_MEDIA_KEYS_PLUGIN                (gsd_media_keys_plugin_get_type ())
+-#define GSD_MEDIA_KEYS_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPlugin))
+-#define GSD_MEDIA_KEYS_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass))
+-#define GSD_IS_MEDIA_KEYS_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN))
+-#define GSD_IS_MEDIA_KEYS_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MEDIA_KEYS_PLUGIN))
+-#define GSD_MEDIA_KEYS_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass))
+-
+-typedef struct GsdMediaKeysPluginPrivate GsdMediaKeysPluginPrivate;
+-
+-typedef struct
+-{
+-        GnomeSettingsPlugin    parent;
+-        GsdMediaKeysPluginPrivate *priv;
+-} GsdMediaKeysPlugin;
+-
+-typedef struct
+-{
+-        GnomeSettingsPluginClass parent_class;
+-} GsdMediaKeysPluginClass;
+-
+-GType   gsd_media_keys_plugin_get_type            (void) G_GNUC_CONST;
+-
+-/* All the plugins must implement this function */
+-G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
+-
+-G_END_DECLS
+-
+-#endif /* __GSD_MEDIA_KEYS_PLUGIN_H__ */
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am
+--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am	2013-01-10 14:37:58.000000000 +0100
++++ gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am	2013-04-24 14:26:01.414463895 +0200
+@@ -1,17 +1,11 @@
+ icondir = $(datadir)/icons/hicolor
+ context = actions
+ 
+-plugin_name = media-keys
+-
+-NULL =
+-
+ SUBDIRS = cut-n-paste
+-plugin_LTLIBRARIES = libmedia-keys.la
+ 
+ BUILT_SOURCES = 			\
+ 	gsd-marshal.h			\
+-	gsd-marshal.c			\
+-	$(NULL)
++	gsd-marshal.c
+ 
+ gsd-marshal.c: gsd-marshal.list
+ 	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --body --internal > $@
+@@ -19,62 +13,16 @@
+ gsd-marshal.h: gsd-marshal.list
+ 	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --internal > $@
+ 
+-libmedia_keys_la_SOURCES = 		\
+-	gsd-media-keys-plugin.h		\
+-	gsd-media-keys-plugin.c		\
+-	gsd-media-keys-manager.h	\
+-	gsd-media-keys-manager.c	\
+-	gsd-osd-window.c		\
+-	gsd-osd-window.h		\
+-	gsd-osd-window-private.h	\
+-	shortcuts-list.h		\
+-	$(BUILT_SOURCES)		\
+-	$(NULL)
+-
+-libmedia_keys_la_CPPFLAGS = \
+-	-I$(top_srcdir)/data/					\
+-	-I$(top_srcdir)/gnome-settings-daemon			\
+-	-I$(top_srcdir)/plugins/common				\
+-	-I$(top_srcdir)/plugins/media-keys/cut-n-paste		\
+-	-DBINDIR=\"$(bindir)\"					\
+-	-DPIXMAPDIR=\""$(pkgdatadir)"\"				\
+-	-DGTKBUILDERDIR=\""$(pkgdatadir)"\"			\
+-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
+-	$(AM_CPPFLAGS)
+-
+-libmedia_keys_la_CFLAGS = \
+-	$(PLUGIN_CFLAGS)		\
+-	$(SETTINGS_PLUGIN_CFLAGS)	\
+-	$(MEDIA_KEYS_CFLAGS)		\
+-	$(AM_CFLAGS)
+-
+-libmedia_keys_la_LDFLAGS = 		\
+-	$(GSD_PLUGIN_LDFLAGS)
+-
+-libmedia_keys_la_LIBADD  = 		\
+-	$(top_builddir)/plugins/common/libcommon.la			\
+-	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
+-	$(MEDIA_KEYS_LIBS)						\
+-	$(SETTINGS_PLUGIN_LIBS)						\
+-	-lm
+-
+-plugin_in_files = 		\
+-	media-keys.gnome-settings-plugin.in
+-
+-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
+-
+ noinst_PROGRAMS = test-media-window
+ 
+ test_media_window_SOURCES =			\
+ 	gsd-osd-window.c			\
+ 	gsd-osd-window.h			\
+ 	gsd-osd-window-private.h		\
+-	test-media-window.c			\
+-	$(NULL)
++	test-media-window.c
+ 
+ test_media_window_CPPFLAGS = \
+ 	-I$(top_srcdir)/data/					\
+-	-I$(top_srcdir)/gnome-settings-daemon			\
+ 	-I$(top_srcdir)/plugins/common				\
+ 	-I$(top_srcdir)/plugins/media-keys/cut-n-paste		\
+ 	-DDATADIR=\""$(datadir)"\"				\
+@@ -93,21 +41,19 @@
+ 	$(SETTINGS_PLUGIN_LIBS)			\
+ 	-lm
+ 
+-libexec_PROGRAMS = gsd-test-media-keys
++libexec_PROGRAMS = gnome-fallback-media-keys-helper
+ 
+-gsd_test_media_keys_SOURCES =			\
++gnome_fallback_media_keys_helper_SOURCES =	\
+ 	gsd-media-keys-manager.c		\
+ 	gsd-media-keys-manager.h		\
+ 	gsd-osd-window.c			\
+ 	gsd-osd-window.h			\
+ 	gsd-osd-window-private.h		\
+-	test-media-keys.c			\
+-	$(BUILT_SOURCES)			\
+-	$(NULL)
++	gnome-fallback-media-keys-helper.c	\
++	$(BUILT_SOURCES)
+ 
+-gsd_test_media_keys_CPPFLAGS = \
++gnome_fallback_media_keys_helper_CPPFLAGS = \
+ 	-I$(top_srcdir)/data/					\
+-	-I$(top_srcdir)/gnome-settings-daemon			\
+ 	-I$(top_srcdir)/plugins/common				\
+ 	-I$(top_srcdir)/plugins/media-keys/cut-n-paste		\
+ 	-DBINDIR=\"$(bindir)\"					\
+@@ -116,14 +62,12 @@
+ 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
+ 	$(AM_CPPFLAGS)
+ 
+-gsd_test_media_keys_CFLAGS = \
++gnome_fallback_media_keys_helper_CFLAGS = \
+ 	$(PLUGIN_CFLAGS)		\
+ 	$(SETTINGS_PLUGIN_CFLAGS)	\
+-	$(MEDIA_KEYS_CFLAGS)		\
+-	$(AM_CFLAGS)
++	$(MEDIA_KEYS_CFLAGS)
+ 
+-gsd_test_media_keys_LDADD = \
+-	$(top_builddir)/gnome-settings-daemon/libgsd.la		\
++gnome_fallback_media_keys_helper_LDADD = \
+ 	$(top_builddir)/plugins/common/libcommon.la			\
+ 	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
+ 	$(SETTINGS_DAEMON_LIBS)			\
+@@ -131,17 +75,24 @@
+ 	$(MEDIA_KEYS_LIBS)			\
+ 	-lm
+ 
++autostartdir = $(sysconfdir)/xdg/autostart
++autostart_in_files = gnome-fallback-media-keys-helper.desktop.in
++autostart_in_in_files = gnome-fallback-media-keys-helper.desktop.in.in
++autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
++
++$(autostart_in_files): $(autostart_in_in_files)
++	@sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
++ 
++@INTLTOOL_DESKTOP_RULE@
++
+ EXTRA_DIST = 				\
+ 	gsd-marshal.list		\
+ 	README.media-keys-API		\
+ 	test-media-window-clutter.c	\
+-	$(plugin_in_files)
++	$(autostart_in_in_files)
+ 
+ CLEANFILES = 			\
+ 	$(BUILT_SOURCES)	\
+-	$(plugin_DATA)
+-
+-DISTCLEANFILES =		\
+-	$(plugin_DATA)
++	$(autostart_DATA)	\
++	$(autostart_in_files)
+ 
+-@GSD_INTLTOOL_PLUGIN_RULE@
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/media-keys.gnome-settings-plugin.in gnome-settings-daemon-3.6.4/plugins/media-keys/media-keys.gnome-settings-plugin.in
+--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/media-keys.gnome-settings-plugin.in	2012-04-07 15:21:20.000000000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/media-keys/media-keys.gnome-settings-plugin.in	1970-01-01 01:00:00.000000000 +0100
+@@ -1,8 +0,0 @@
+-[GNOME Settings Plugin]
+-Module=media-keys
+-IAge=0
+-_Name=Media keys
+-_Description=Media keys plugin
+-Authors=
+-Copyright=Copyright © 2007
+-Website=
+diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/test-media-keys.c gnome-settings-daemon-3.6.4/plugins/media-keys/test-media-keys.c
+--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/test-media-keys.c	2012-06-01 22:02:53.000000000 +0200
++++ gnome-settings-daemon-3.6.4/plugins/media-keys/test-media-keys.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,7 +0,0 @@
+-#define NEW gsd_media_keys_manager_new
+-#define START gsd_media_keys_manager_start
+-#define STOP gsd_media_keys_manager_stop
+-#define MANAGER GsdMediaKeysManager
+-#include "gsd-media-keys-manager.h"
+-
+-#include "test-plugin.h"
+diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.in gnome-settings-daemon-3.6.4/po/POTFILES.in
+--- gnome-settings-daemon-3.6.4.orig/po/POTFILES.in	2013-04-24 03:11:02.897192946 +0200
++++ gnome-settings-daemon-3.6.4/po/POTFILES.in	2013-04-24 13:43:11.132217470 +0200
+@@ -34,7 +34,7 @@
+ [type: gettext/ini]plugins/keyboard/keyboard.gnome-settings-plugin.in
+ plugins/media-keys/cut-n-paste/gvc-mixer-control.c
+ plugins/media-keys/gsd-media-keys-manager.c
+-[type: gettext/ini]plugins/media-keys/media-keys.gnome-settings-plugin.in
++plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in
+ plugins/mouse/gsd-mouse-manager.c
+ [type: gettext/ini]plugins/mouse/mouse.gnome-settings-plugin.in
+ plugins/power/gpm-common.c
+diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip gnome-settings-daemon-3.6.4/po/POTFILES.skip
+--- gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip	2013-04-24 03:11:02.897192946 +0200
++++ gnome-settings-daemon-3.6.4/po/POTFILES.skip	2013-04-24 13:43:11.132217470 +0200
+@@ -22,5 +22,6 @@
+ data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
+ plugins/background/gnome-fallback-background-helper.desktop.in
+ plugins/automount/gnome-fallback-mount-helper.desktop.in
++plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in
+ plugins/power/org.gnome.settings-daemon.plugins.power.policy.in
+ plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in
diff --git a/community/gnome-settings-daemon-compat/xinput.patch b/community/gnome-settings-daemon-compat/xinput.patch
new file mode 100644
index 000000000..67c8082cb
--- /dev/null
+++ b/community/gnome-settings-daemon-compat/xinput.patch
@@ -0,0 +1,36 @@
+From 14f92b1479aa065edf3f0aa86b87d4c4ff1fe2ba Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Thu, 07 Feb 2013 04:14:22 +0000
+Subject: Fix media-keys handling with GTK+ 3.7.8
+
+GDK now requests XI 2.3 and if the X server supports that
+version, subsequent requests for a lower version yield
+a BadValue. Therefore, we need to change the code in
+gsd-input-helper.c to request 2.3 as well.
+---
+diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c
+index 54427af..d5d2a2a 100644
+--- a/plugins/common/gsd-input-helper.c
++++ b/plugins/common/gsd-input-helper.c
+@@ -144,18 +144,11 @@ supports_xinput2_devices (int *opcode)
+         gdk_error_trap_push ();
+ 
+         major = 2;
+-        minor = 0;
++        minor = 3;
+ 
+         if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
+                 gdk_error_trap_pop_ignored ();
+-                /* try for 2.2, maybe gtk has already announced 2.2 support */
+-                gdk_error_trap_push ();
+-                major = 2;
+-                minor = 2;
+-                if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
+-                    gdk_error_trap_pop_ignored ();
+                     return FALSE;
+-                }
+         }
+         gdk_error_trap_pop_ignored ();
+ 
+--
+cgit v0.9.1
diff --git a/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
deleted file mode 100644
index ceee6db82..000000000
--- a/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
+++ /dev/null
@@ -1,1476 +0,0 @@
-From f418ff2cd04b233dbffc1129e856630d8c96cd07 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 21 Sep 2012 11:56:53 +0100
-Subject: [PATCH] power and media-keys: Use logind for suspending and
- rebooting the system
-
-Use the new logind features to suspend and resume but making sure we opt out
-of logind handling the sleep and power keys, and also inhibiting for lid close
-auto-suspend if there is an external monitor connected.
-
-Also use a delay inihibit for logind so that we can do actions on suspend like
-blanking the screen using the screensaver and also poking the screensaver on
-resume.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=680689
-
-Conflicts:
-	plugins/power/gsd-power-manager.c
----
- plugins/common/Makefile.am                  |   4 +-
- plugins/common/gsd-power-helper.c           | 203 --------
- plugins/common/gsd-power-helper.h           |  35 --
- plugins/media-keys/gsd-media-keys-manager.c | 156 +++++--
- plugins/power/gsd-power-manager.c           | 697 +++++++++++++++++++---------
- 5 files changed, 594 insertions(+), 501 deletions(-)
- delete mode 100644 plugins/common/gsd-power-helper.c
- delete mode 100644 plugins/common/gsd-power-helper.h
-
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 7e50db4..b0e907c 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -6,9 +6,7 @@ libcommon_la_SOURCES = \
-	gsd-keygrab.c		\
-	gsd-keygrab.h		\
-	gsd-input-helper.c	\
--	gsd-input-helper.h	\
--	gsd-power-helper.c	\
--	gsd-power-helper.h
-+	gsd-input-helper.h
-
- libcommon_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)
-diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c
-deleted file mode 100644
-index 27d0eda..0000000
---- a/plugins/common/gsd-power-helper.c
-+++ /dev/null
-@@ -1,203 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- */
--
--#include "config.h"
--
--#include "gsd-power-helper.h"
--
--#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
--#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
--#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
--
--#define CONSOLEKIT_DBUS_NAME                    "org.freedesktop.ConsoleKit"
--#define CONSOLEKIT_DBUS_PATH_MANAGER            "/org/freedesktop/ConsoleKit/Manager"
--#define CONSOLEKIT_DBUS_INTERFACE_MANAGER       "org.freedesktop.ConsoleKit.Manager"
--
--#ifdef HAVE_SYSTEMD
--static void
--systemd_stop (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "PowerOff",
--                                g_variant_new ("(b)", FALSE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_suspend (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Suspend",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_hibernate (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Hibernate",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--#else /* HAVE_SYSTEMD */
--
--static void
--consolekit_stop_cb (GObject *source_object,
--                    GAsyncResult *res,
--                    gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't stop using ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--consolekit_stop (void)
--{
--        GError *error = NULL;
--        GDBusProxy *proxy;
--
--        /* power down the machine in a safe way */
--        proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
--                                               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                               NULL,
--                                               CONSOLEKIT_DBUS_NAME,
--                                               CONSOLEKIT_DBUS_PATH_MANAGER,
--                                               CONSOLEKIT_DBUS_INTERFACE_MANAGER,
--                                               NULL, &error);
--        if (proxy == NULL) {
--                g_warning ("cannot connect to ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--        g_dbus_proxy_call (proxy,
--                           "Stop",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           consolekit_stop_cb, NULL);
--        g_object_unref (proxy);
--}
--static void
--upower_sleep_cb (GObject *source_object,
--                 GAsyncResult *res,
--                 gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't sleep using UPower: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--upower_suspend (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Suspend",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--
--static void
--upower_hibernate (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Hibernate",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--#endif /* HAVE_SYSTEMD */
--
--void
--gsd_power_suspend (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_suspend ();
--#else
--	upower_suspend (upower_proxy);
--#endif
--}
--
--void
--gsd_power_poweroff (void)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_stop ();
--#else
--	consolekit_stop ();
--#endif
--}
--
--void
--gsd_power_hibernate (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_hibernate ();
--#else
--	upower_hibernate (upower_proxy);
--#endif
--}
-diff --git a/plugins/common/gsd-power-helper.h b/plugins/common/gsd-power-helper.h
-deleted file mode 100644
-index e3be14f..0000000
---- a/plugins/common/gsd-power-helper.h
-+++ /dev/null
-@@ -1,35 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- */
--
--#ifndef __GSD_POWER_HELPER_H
--#define __GSD_POWER_HELPER_H
--
--#include <glib.h>
--
--G_BEGIN_DECLS
--
--#include <gio/gio.h>
--
--void gsd_power_suspend   (GDBusProxy *upower_proxy);
--void gsd_power_hibernate (GDBusProxy *upower_proxy);
--void gsd_power_poweroff  (void);
--
--G_END_DECLS
--
--#endif /* __GSD_POWER_HELPER_H */
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index 9c84d7f..a2f277e 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -39,6 +39,7 @@
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- #include <gio/gdesktopappinfo.h>
-+#include <gio/gunixfdlist.h>
-
- #ifdef HAVE_GUDEV
- #include <gudev/gudev.h>
-@@ -51,7 +52,6 @@
- #include "shortcuts-list.h"
- #include "gsd-osd-window.h"
- #include "gsd-input-helper.h"
--#include "gsd-power-helper.h"
- #include "gsd-enums.h"
-
- #include <canberra.h>
-@@ -105,6 +105,10 @@ static const gchar introspection_xml[] =
- #define KEY_CURRENT_INPUT_SOURCE "current"
- #define KEY_INPUT_SOURCES        "sources"
-
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate))
-
- typedef struct {
-@@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate
-
-         /* Power stuff */
-         GSettings       *power_settings;
--        GDBusProxy      *upower_proxy;
-         GDBusProxy      *power_screen_proxy;
-         GDBusProxy      *power_keyboard_proxy;
-
-+        /* systemd stuff */
-+        GDBusProxy      *logind_proxy;
-+        gint             inhibit_keys_fd;
-+
-         /* Multihead stuff */
-         GdkScreen       *current_screen;
-         GSList          *screens;
-@@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager)
- }
-
- static void
-+power_action_suspend (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
-+power_action_hibernate (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
- do_config_power_action (GsdMediaKeysManager *manager,
-                         const gchar *config_key)
- {
-@@ -1627,14 +1666,14 @@ do_config_power_action (GsdMediaKeysManager *manager,
-                                            config_key);
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                power_action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 gnome_session_shutdown (manager);
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                power_action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-         case GSD_POWER_ACTION_NOTHING:
-@@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-         }
- #endif /* HAVE_GUDEV */
-
-+        g_clear_object (&priv->logind_proxy);
-         if (priv->settings) {
-                 g_object_unref (priv->settings);
-                 priv->settings = NULL;
-@@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-                 priv->power_keyboard_proxy = NULL;
-         }
-
--        if (priv->upower_proxy) {
--                g_object_unref (priv->upower_proxy);
--                priv->upower_proxy = NULL;
--        }
--
-         if (priv->cancellable != NULL) {
-                 g_cancellable_cancel (priv->cancellable);
-                 g_object_unref (priv->cancellable);
-@@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass)
- }
-
- static void
-+inhibit_done (GObject      *source,
-+              GAsyncResult *result,
-+              gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit keypresses: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_keys_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
- gsd_media_keys_manager_init (GsdMediaKeysManager *manager)
- {
-+        GError *error;
-+        GDBusConnection *bus;
-+
-+        error = NULL;
-         manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
-+
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-+        if (bus == NULL) {
-+                g_warning ("Failed to connect to system bus: %s",
-+                           error->message);
-+                g_error_free (error);
-+                return;
-+        }
-+
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_sync (bus,
-+                                       0,
-+                                       NULL,
-+                                       SYSTEMD_DBUS_NAME,
-+                                       SYSTEMD_DBUS_PATH,
-+                                       SYSTEMD_DBUS_INTERFACE,
-+                                       NULL,
-+                                       &error);
-+
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("Failed to connect to systemd: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        g_object_unref (bus);
-+
-+        g_debug ("Adding system inhibitors for power keys");
-+        manager->priv->inhibit_keys_fd = -1;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "handle-power-key:handle-suspend-key:handle-hibernate-key",
-+                                                            g_get_user_name (),
-+                                                            "GNOME handling keypresses",
-+                                                            "block"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_done,
-+                                             manager);
-+
- }
-
- static void
-@@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object)
-
-         if (media_keys_manager->priv->start_idle_id != 0)
-                 g_source_remove (media_keys_manager->priv->start_idle_id);
-+        if (media_keys_manager->priv->inhibit_keys_fd != -1)
-+                close (media_keys_manager->priv->inhibit_keys_fd);
-
-         G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object);
- }
-@@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject             *source_object,
- }
-
- static void
--upower_ready_cb (GObject             *source_object,
--                 GAsyncResult        *res,
--                 GsdMediaKeysManager *manager)
--{
--        GError *error = NULL;
--
--        manager->priv->upower_proxy = g_dbus_proxy_new_finish (res, &error);
--        if (manager->priv->upower_proxy == NULL) {
--                g_warning ("Failed to get proxy for upower: %s",
--                           error->message);
--                g_error_free (error);
--        }
--}
--
--static void
- power_screen_ready_cb (GObject             *source_object,
-                        GAsyncResult        *res,
-                        GsdMediaKeysManager *manager)
-@@ -2517,16 +2615,6 @@ register_manager (GsdMediaKeysManager *manager)
-                    manager->priv->bus_cancellable,
-                    (GAsyncReadyCallback) on_bus_gotten,
-                    manager);
--
--        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
--                                  G_DBUS_PROXY_FLAGS_NONE,
--                                  NULL,
--                                  "org.freedesktop.UPower",
--                                  "/org/freedesktop/UPower",
--                                  "org.freedesktop.UPower",
--                                  NULL,
--                                  (GAsyncReadyCallback) upower_ready_cb,
--                                  manager);
- }
-
- GsdMediaKeysManager *
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 1c594d8..bb7224c 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-  *
-  * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- * Copyright (C) 2011 Richard Hughes <richard@hughsie.com>
-+ * Copyright (C) 2011-2012 Richard Hughes <richard@hughsie.com>
-  * Copyright (C) 2011 Ritesh Khadgaray <khadgaray@gmail.com>
-  *
-  * This program is free software; you can redistribute it and/or modify
-@@ -32,6 +32,7 @@
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
- #include <canberra-gtk.h>
-+#include <gio/gunixfdlist.h>
-
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libgnome-desktop/gnome-rr.h>
-@@ -43,7 +44,6 @@
- #include "gnome-settings-session.h"
- #include "gsd-enums.h"
- #include "gsd-power-manager.h"
--#include "gsd-power-helper.h"
-
- #define GNOME_SESSION_DBUS_NAME                 "org.gnome.SessionManager"
- #define GNOME_SESSION_DBUS_PATH                 "/org/gnome/SessionManager"
-@@ -78,6 +78,10 @@
- #define GSD_POWER_MANAGER_RECALL_DELAY                  30 /* seconds */
- #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT      30 /* seconds */
-
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- /* Keep this in sync with gnome-shell */
- #define SCREENSAVER_FADE_TIME                           10 /* seconds */
-
-@@ -193,15 +197,21 @@ struct GsdPowerManagerPrivate
-         ca_context              *canberra_context;
-         ca_proplist             *critical_alert_loop_props;
-         guint32                  critical_alert_timeout_id;
--        GDBusProxy              *screensaver_proxy;
-         GDBusProxy              *session_proxy;
-         GDBusProxy              *session_presence_proxy;
-         GpmIdletime             *idletime;
-         GsdPowerIdleMode         current_idle_mode;
--        guint                    lid_close_safety_timer_id;
-         GtkStatusIcon           *status_icon;
-         guint                    xscreensaver_watchdog_timer_id;
-         gboolean                 is_virtual_machine;
-+
-+        /* systemd stuff */
-+        GDBusProxy              *logind_proxy;
-+        gint                     inhibit_lid_switch_fd;
-+        gboolean                 inhibit_lid_switch_taken;
-+        gint                     inhibit_suspend_fd;
-+        gboolean                 inhibit_suspend_taken;
-+        guint                    inhibit_lid_switch_timer_id;
- };
-
- enum {
-@@ -218,8 +228,8 @@ static GIcon    *engine_get_icon (GsdPowerManager *manager);
- static gchar    *engine_get_summary (GsdPowerManager *manager);
- static void      do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type);
- static void      do_lid_closed_action (GsdPowerManager *manager);
--static void      lock_screensaver (GsdPowerManager *manager);
--static void      kill_lid_close_safety_timer (GsdPowerManager *manager);
-+static void      uninhibit_lid_switch (GsdPowerManager *manager);
-+static gboolean  external_monitor_is_connected (GnomeRRScreen *screen);
-
- G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT)
-
-@@ -2049,6 +2059,57 @@ gnome_session_shutdown (void)
- }
-
- static void
-+action_poweroff (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "PowerOff",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_hibernate (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
- do_power_action_type (GsdPowerManager *manager,
-                       GsdPowerActionType action_type)
- {
-@@ -2057,19 +2118,19 @@ do_power_action_type (GsdPowerManager *manager,
-
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-                 gnome_session_shutdown ();
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 /* this is only used on critically low battery where
-                  * hibernate is not available and is marginally better
-                  * than just powering down the computer mid-write */
--                gsd_power_poweroff ();
-+                action_poweroff (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -2141,85 +2202,20 @@ upower_kbd_toggle (GsdPowerManager *manager,
-         return ret;
- }
-
--static void
--do_lid_open_action (GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* play a sound, using sounds from the naming spec */
--        ca_context_play (manager->priv->canberra_context, 0,
--                         CA_PROP_EVENT_ID, "lid-open",
--                         /* TRANSLATORS: this is the sound description */
--                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
--                         NULL);
--
--        /* ensure we turn the panel back on after lid open */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after lid open: %s",
--                           error->message);
--                g_clear_error (&error);
--        }
--
--        /* only toggle keyboard if present and already toggled off */
--        if (manager->priv->upower_kdb_proxy != NULL &&
--            manager->priv->kbd_brightness_old != -1) {
--                ret = upower_kbd_toggle (manager, &error);
--                if (!ret) {
--                        g_warning ("failed to turn the kbd backlight on: %s",
--                                   error->message);
--                        g_error_free (error);
--                }
--        }
--
--        kill_lid_close_safety_timer (manager);
--}
--
- static gboolean
--is_on (GnomeRROutput *output)
-+inhibit_lid_switch_timer_cb (GsdPowerManager *manager)
- {
--	GnomeRRCrtc *crtc;
--
--	crtc = gnome_rr_output_get_crtc (output);
--	if (!crtc)
--		return FALSE;
--	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
--}
--
--static gboolean
--non_laptop_outputs_are_all_off (GnomeRRScreen *screen)
--{
--        GnomeRROutput **outputs;
--        int i;
--
--        outputs = gnome_rr_screen_list_outputs (screen);
--        for (i = 0; outputs[i] != NULL; i++) {
--                if (gnome_rr_output_is_laptop (outputs[i]))
--                        continue;
--
--                if (is_on (outputs[i]))
--                        return FALSE;
-+        if (!external_monitor_is_connected (manager->priv->x11_screen) ||
-+            g_settings_get_boolean (manager->priv->settings,
-+                                    "lid-close-suspend-with-external-monitor")) {
-+                g_debug ("no external monitors for a while; uninhibiting lid close");
-+                uninhibit_lid_switch (manager);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                return G_SOURCE_REMOVE;
-         }
-
--        return TRUE;
--}
--
--/* Timeout callback used to check conditions when the laptop's lid is closed but
-- * the machine is not suspended yet.  We try to suspend again, so that the laptop
-- * won't overheat if placed in a backpack.
-- */
--static gboolean
--lid_close_safety_timer_cb (GsdPowerManager *manager)
--{
--        manager->priv->lid_close_safety_timer_id = 0;
--
--        g_debug ("lid has been closed for a while; trying to suspend again");
--        do_lid_closed_action (manager);
--
--        return FALSE;
-+        g_debug ("external monitor still there; trying again later");
-+        return G_SOURCE_CONTINUE;
- }
-
- /* Sets up a timer to be triggered some seconds after closing the laptop lid
-@@ -2227,82 +2223,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager)
-  * again in the timeout handler to see if we can suspend then.
-  */
- static void
--setup_lid_close_safety_timer (GsdPowerManager *manager)
-+setup_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0)
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("lid close safety timer already set up");
-                 return;
-+        }
-+
-+        g_debug ("setting up lid close safety timer");
-
--        manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
--                                                                          (GSourceFunc) lid_close_safety_timer_cb,
-+        manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
-+                                                                          (GSourceFunc) inhibit_lid_switch_timer_cb,
-                                                                           manager);
--        g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer");
-+        g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer");
- }
-
- static void
--kill_lid_close_safety_timer (GsdPowerManager *manager)
-+restart_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0) {
--                g_source_remove (manager->priv->lid_close_safety_timer_id);
--                manager->priv->lid_close_safety_timer_id = 0;
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("restarting lid close safety timer");
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                setup_inhibit_lid_switch_timer (manager);
-         }
- }
-
- static void
--suspend_with_lid_closed (GsdPowerManager *manager)
-+do_lid_open_action (GsdPowerManager *manager)
- {
-         gboolean ret;
-         GError *error = NULL;
--        GsdPowerActionType action_type;
-
--        /* maybe lock the screen if the lid is closed */
--        lock_screensaver (manager);
--
--        /* we have different settings depending on AC state */
--        if (up_client_get_on_battery (manager->priv->up_client)) {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-battery-action");
--        } else {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-ac-action");
--        }
--
--        /* check we won't melt when the lid is closed */
--        if (action_type != GSD_POWER_ACTION_SUSPEND &&
--            action_type != GSD_POWER_ACTION_HIBERNATE) {
--                if (up_client_get_lid_force_sleep (manager->priv->up_client)) {
--                        g_warning ("to prevent damage, now forcing suspend");
--                        do_power_action_type (manager, GSD_POWER_ACTION_SUSPEND);
--                        return;
--                }
--        }
-+        /* play a sound, using sounds from the naming spec */
-+        ca_context_play (manager->priv->canberra_context, 0,
-+                         CA_PROP_EVENT_ID, "lid-open",
-+                         /* TRANSLATORS: this is the sound description */
-+                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
-+                         NULL);
-
--        /* ensure we turn the panel back on after resume */
-+        /* ensure we turn the panel back on after lid open */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_OFF,
-+                                             GNOME_RR_DPMS_ON,
-                                              &error);
-         if (!ret) {
--                g_warning ("failed to turn the panel off after lid close: %s",
-+                g_warning ("failed to turn the panel on after lid open: %s",
-                            error->message);
-                 g_clear_error (&error);
-         }
-
--        /* only toggle keyboard if present and not already toggled */
--        if (manager->priv->upower_kdb_proxy &&
--            manager->priv->kbd_brightness_old == -1) {
-+        /* only toggle keyboard if present and already toggled off */
-+        if (manager->priv->upower_kdb_proxy != NULL &&
-+            manager->priv->kbd_brightness_old != -1) {
-                 ret = upower_kbd_toggle (manager, &error);
-                 if (!ret) {
--                        g_warning ("failed to turn the kbd backlight off: %s",
-+                        g_warning ("failed to turn the kbd backlight on: %s",
-                                    error->message);
-                         g_error_free (error);
-                 }
-         }
--
--        do_power_action_type (manager, action_type);
- }
-
- static void
- do_lid_closed_action (GsdPowerManager *manager)
- {
-+        gboolean ret;
-+        GError *error = NULL;
-+
-         /* play a sound, using sounds from the naming spec */
-         ca_context_play (manager->priv->canberra_context, 0,
-                          CA_PROP_EVENT_ID, "lid-close",
-@@ -2310,21 +2297,22 @@ do_lid_closed_action (GsdPowerManager *manager)
-                          CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"),
-                          NULL);
-
-+        /* turn the panel off if the lid is closed (mainly for Dells...) */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_OFF,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel off after lid close: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-         /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */
-         gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */
-
--        /* perform policy action */
--        if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor")
--            || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) {
--                g_debug ("lid is closed; suspending or hibernating");
--                suspend_with_lid_closed (manager);
--        } else {
--                g_debug ("lid is closed; not suspending nor hibernating since some external monitor outputs are still active");
--                setup_lid_close_safety_timer (manager);
--        }
-+        restart_inhibit_lid_switch_timer (manager);
- }
-
--
- static void
- up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
- {
-@@ -2344,6 +2332,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
-         if (manager->priv->lid_is_closed == tmp)
-                 return;
-         manager->priv->lid_is_closed = tmp;
-+        g_debug ("up changed: lid is now %s", tmp ? "closed" : "open");
-
-         /* fake a keypress */
-         if (tmp)
-@@ -3302,30 +3291,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass)
- }
-
- static void
--sleep_cb_screensaver_proxy_ready_cb (GObject *source_object,
--                            GAsyncResult *res,
--                            gpointer user_data)
--{
--        GError *error = NULL;
--        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
--
--        manager->priv->screensaver_proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
--        if (manager->priv->screensaver_proxy == NULL) {
--                g_warning ("Could not connect to gnome-screensaver: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--
--        /* Finish the upower_notify_sleep_cb() call by locking the screen */
--        g_debug ("gnome-screensaver activated, doing gnome-screensaver lock");
--        g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                           "Lock",
--                           NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                           NULL, NULL, NULL);
--}
--
--static void
- idle_dbus_signal_cb (GDBusProxy *proxy,
-                      const gchar *sender_name,
-                      const gchar *signal_name,
-@@ -3477,75 +3442,38 @@ out:
- }
-
- static void
--lock_screensaver (GsdPowerManager *manager)
-+lock_screensaver (GsdPowerManager *manager,
-+                  GSourceFunc      done_cb)
- {
-         gboolean do_lock;
-
-         do_lock = g_settings_get_boolean (manager->priv->settings_screensaver,
-                                           "lock-enabled");
--        if (!do_lock)
-+        if (!do_lock && done_cb) {
-+                done_cb (manager);
-                 return;
--
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_debug ("doing gnome-screensaver lock");
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "Lock",
--                                   NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                                   NULL, NULL, NULL);
--        } else {
--                /* connect to the screensaver first */
--                g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
--                                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                          NULL,
--                                          GS_DBUS_NAME,
--                                          GS_DBUS_PATH,
--                                          GS_DBUS_INTERFACE,
--                                          NULL,
--                                          sleep_cb_screensaver_proxy_ready_cb,
--                                          manager);
--        }
--}
--
--static void
--upower_notify_sleep_cb (UpClient *client,
--                        UpSleepKind sleep_kind,
--                        GsdPowerManager *manager)
--{
--        lock_screensaver (manager);
--}
--
--static void
--upower_notify_resume_cb (UpClient *client,
--                         UpSleepKind sleep_kind,
--                         GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* this displays the unlock dialogue so the user doesn't have
--         * to move the mouse or press any key before the window comes up */
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "SimulateUserActivity",
--                                   NULL,
--                                   G_DBUS_CALL_FLAGS_NONE,
--                                   -1, NULL, NULL, NULL);
-         }
-
--        /* close existing notifications on resume, the system power
--         * state is probably different now */
--        notify_close_if_showing (manager->priv->notification_low);
--        notify_close_if_showing (manager->priv->notification_discharging);
--
--        /* ensure we turn the panel back on after resume */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after resume: %s",
--                           error->message);
--                g_error_free (error);
--        }
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "Lock",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* Wait until gnome-shell shield animation is done
-+         *
-+         * FIXME: the shell should mark the lock as active
-+         * when the shield is down, then we could wait for
-+         * that. This would also fix the problem that we wait
-+         * needlessly when the shell has already locked the
-+         * screen because it is initiating the suspend.
-+         *
-+         * https://bugzilla.gnome.org/show_bug.cgi?id=685053
-+         */
-+        g_timeout_add (500, done_cb, manager);
- }
-
- static void
-@@ -3755,6 +3683,287 @@ out:
-         return ret;
- }
-
-+static void
-+inhibit_lid_switch_done (GObject      *source,
-+                         GAsyncResult *result,
-+                         gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit lid switch: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
-+inhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        GVariant *params;
-+
-+        if (manager->priv->inhibit_lid_switch_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding lid switch system inhibitor");
-+        manager->priv->inhibit_lid_switch_taken = TRUE;
-+
-+        params = g_variant_new ("(ssss)",
-+                                "handle-lid-switch",
-+                                g_get_user_name (),
-+                                "Multiple displays attached",
-+                                "block");
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             params,
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_lid_switch_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                g_debug ("no lid-switch inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing lid switch system inhibitor");
-+        close (manager->priv->inhibit_lid_switch_fd);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_lid_switch_taken = FALSE;
-+}
-+
-+static void
-+inhibit_suspend_done (GObject      *source,
-+                      GAsyncResult *result,
-+                      gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit suspend: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_suspend_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+/* We take a delay inhibitor here, which causes logind to send a
-+ * PrepareToSleep signal, which gives us a chance to lock the screen
-+ * and do some other preparations.
-+ */
-+static void
-+inhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding suspend delay inhibitor");
-+        manager->priv->inhibit_suspend_taken = TRUE;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "sleep",
-+                                                            g_get_user_name (),
-+                                                            "GNOME needs to lock the screen",
-+                                                            "delay"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_suspend_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_fd == -1) {
-+                g_debug ("no suspend delay inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing suspend delay inhibitor");
-+        close (manager->priv->inhibit_suspend_fd);
-+        manager->priv->inhibit_suspend_fd = -1;
-+        manager->priv->inhibit_suspend_taken = FALSE;
-+}
-+
-+static gboolean
-+randr_output_is_on (GnomeRROutput *output)
-+{
-+	GnomeRRCrtc *crtc;
-+
-+	crtc = gnome_rr_output_get_crtc (output);
-+	if (!crtc)
-+		return FALSE;
-+	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
-+}
-+
-+static gboolean
-+external_monitor_is_connected (GnomeRRScreen *screen)
-+{
-+        GnomeRROutput **outputs;
-+        guint i;
-+
-+        if (g_file_test ("/tmp/external_connected", G_FILE_TEST_EXISTS))
-+                return TRUE;
-+
-+        /* see if we have more than one screen plugged in */
-+        outputs = gnome_rr_screen_list_outputs (screen);
-+        for (i = 0; outputs[i] != NULL; i++) {
-+                if (randr_output_is_on (outputs[i]) &&
-+                    !gnome_rr_output_is_laptop (outputs[i]))
-+                        return TRUE;
-+        }
-+
-+        return FALSE;
-+}
-+
-+static void
-+on_randr_event (GnomeRRScreen *screen, gpointer user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+
-+        /* when a second monitor is plugged in, we take the
-+         * handle-lid-switch inhibitor lock of logind to prevent
-+         * it from suspending.
-+         *
-+         * Uninhibiting is done in the inhibit_lid_switch_timer,
-+         * since we want to give users a few seconds when unplugging
-+         * and replugging an external monitor, not suspend right away.
-+         */
-+        if (external_monitor_is_connected (screen) &&
-+            !g_settings_get_boolean (manager->priv->settings,
-+                                     "lid-close-suspend-with-external-monitor")) {
-+                inhibit_lid_switch (manager);
-+                setup_inhibit_lid_switch_timer (manager);
-+        }
-+        else {
-+                restart_inhibit_lid_switch_timer (manager);
-+        }
-+}
-+
-+static gboolean
-+screen_lock_done_cb (gpointer data)
-+{
-+        GsdPowerManager *manager = data;
-+
-+        /* lift the delay inhibit, so logind can proceed */
-+        uninhibit_suspend (manager);
-+
-+        return FALSE;
-+}
-+
-+static void
-+handle_suspend_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        lock_screensaver (manager, screen_lock_done_cb);
-+}
-+
-+static void
-+handle_resume_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* this displays the unlock dialogue so the user doesn't have
-+         * to move the mouse or press any key before the window comes up */
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "SimulateUserActivity",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* close existing notifications on resume, the system power
-+         * state is probably different now */
-+        notify_close_if_showing (manager->priv->notification_low);
-+        notify_close_if_showing (manager->priv->notification_discharging);
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        /* set up the delay again */
-+        inhibit_suspend (manager);
-+}
-+
-+static void
-+logind_proxy_signal_cb (GDBusProxy  *proxy,
-+                        const gchar *sender_name,
-+                        const gchar *signal_name,
-+                        GVariant    *parameters,
-+                        gpointer     user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        gboolean is_about_to_suspend;
-+
-+        if (g_strcmp0 (signal_name, "PrepareForSleep") != 0)
-+                return;
-+        g_variant_get (parameters, "(b)", &is_about_to_suspend);
-+        if (is_about_to_suspend) {
-+                handle_suspend_actions (manager);
-+        } else {
-+                handle_resume_actions (manager);
-+        }
-+}
-+
- gboolean
- gsd_power_manager_start (GsdPowerManager *manager,
-                          GError **error)
-@@ -3764,6 +3973,25 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         g_debug ("Starting power manager");
-         gnome_settings_profile_start (NULL);
-
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+                                               0,
-+                                               NULL,
-+                                               SYSTEMD_DBUS_NAME,
-+                                               SYSTEMD_DBUS_PATH,
-+                                               SYSTEMD_DBUS_INTERFACE,
-+                                               NULL,
-+                                               error);
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return FALSE;
-+        }
-+        g_signal_connect (manager->priv->logind_proxy, "g-signal",
-+                          G_CALLBACK (logind_proxy_signal_cb),
-+                          manager);
-+        /* Set up a delay inhibitor to be informed about suspend attempts */
-+        inhibit_suspend (manager);
-+
-         /* track the active session */
-         manager->priv->session = gnome_settings_session_new ();
-         g_signal_connect (manager->priv->session, "notify::state",
-@@ -3778,10 +4006,6 @@ gsd_power_manager_start (GsdPowerManager *manager,
-                           G_CALLBACK (engine_settings_key_changed_cb), manager);
-         manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver");
-         manager->priv->up_client = up_client_new ();
--        g_signal_connect (manager->priv->up_client, "notify-sleep",
--                          G_CALLBACK (upower_notify_sleep_cb), manager);
--        g_signal_connect (manager->priv->up_client, "notify-resume",
--                          G_CALLBACK (upower_notify_resume_cb), manager);
-         manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client);
-         g_signal_connect (manager->priv->up_client, "device-added",
-                           G_CALLBACK (engine_device_added_cb), manager);
-@@ -3895,6 +4119,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
-                           G_CALLBACK (idle_idletime_reset_cb), manager);
-         g_signal_connect (manager->priv->idletime, "alarm-expired",
-                           G_CALLBACK (idle_idletime_alarm_expired_cb), manager);
-+        g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager);
-+        /* set up initial state */
-+        on_randr_event (manager->priv->x11_screen, manager);
-
-         /* ensure the default dpms timeouts are cleared */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -3927,6 +4154,11 @@ gsd_power_manager_stop (GsdPowerManager *manager)
- {
-         g_debug ("Stopping power manager");
-
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+        }
-+
-         if (manager->priv->bus_cancellable != NULL) {
-                 g_cancellable_cancel (manager->priv->bus_cancellable);
-                 g_object_unref (manager->priv->bus_cancellable);
-@@ -3938,8 +4170,6 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-                 manager->priv->introspection_data = NULL;
-         }
-
--        kill_lid_close_safety_timer (manager);
--
-         g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager);
-
-         g_clear_object (&manager->priv->connection);
-@@ -3947,6 +4177,19 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-         g_clear_object (&manager->priv->settings);
-         g_clear_object (&manager->priv->settings_screensaver);
-         g_clear_object (&manager->priv->up_client);
-+
-+        if (manager->priv->inhibit_lid_switch_fd != -1) {
-+                close (manager->priv->inhibit_lid_switch_fd);
-+                manager->priv->inhibit_lid_switch_fd = -1;
-+                manager->priv->inhibit_lid_switch_taken = FALSE;
-+        }
-+        if (manager->priv->inhibit_suspend_fd != -1) {
-+                close (manager->priv->inhibit_suspend_fd);
-+                manager->priv->inhibit_suspend_fd = -1;
-+                manager->priv->inhibit_suspend_taken = FALSE;
-+        }
-+
-+        g_clear_object (&manager->priv->logind_proxy);
-         g_clear_object (&manager->priv->x11_screen);
-
-         g_ptr_array_unref (manager->priv->devices_array);
-@@ -3980,6 +4223,8 @@ static void
- gsd_power_manager_init (GsdPowerManager *manager)
- {
-         manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_suspend_fd = -1;
- }
-
- static void
---
-1.8.0
-
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index 1480326d9..ed35c77b5 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82410 2013-01-16 23:40:08Z jconder $
+# $Id: PKGBUILD 88701 2013-04-21 22:24:09Z heftig $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 _pkgname=gnome-settings-daemon
 pkgname=$_pkgname-updates
-pkgver=3.6.4
-pkgrel=2
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="Updates plugin for the GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -14,28 +14,20 @@ options=('!emptydirs' '!libtool')
 install=$_pkgname.install
 url="http://www.gnome.org"
 source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
-	'0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch'
 	'arch.patch')
-sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15'
-            'dbea64c93db308cbcae52cf0c512986c6f07a0bd5023b0641255416af863011e'
+sha256sums=('367a770ec7affff3c85a43bc39ced5a02a1b1761780d954329f6b21c0f2efcee'
 	    '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
-  patch -Np1 -i "$srcdir/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch"
   patch -Np1 -i "$srcdir/arch.patch"
 
-  aclocal
-  autoconf
-  automake --add-missing
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --localstatedir=/var \
               --libexecdir=/usr/lib/gnome-settings-daemon \
-              --disable-static \
-              --enable-systemd \
-	      --disable-ibus
+              --disable-static
 
   #https://bugzilla.gnome.org/show_bug.cgi?id=656231
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
diff --git a/community/gnome-settings-daemon-updates/screensaver.patch b/community/gnome-settings-daemon-updates/screensaver.patch
deleted file mode 100644
index bbcfe3430..000000000
--- a/community/gnome-settings-daemon-updates/screensaver.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From b47e4019a12ac84fba31e1c631d878ce03fa3808 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Wed, 17 Oct 2012 22:44:54 +0000
-Subject: power: Add a watchdog to keep X's builtin screen saver disabled
-
-X's builtin screen saver may activate DPMS. Since we want to activate
-DPMS ourselves according to our own policy we must make sure that X's
-screen saver remains disabled.
-
-This code is a copy of the original found in gs-watcher-x11.c from
-gnome-screensaver which stopped being used in GNOME 3.6.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686339
----
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 0e06495..070cf32 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -27,6 +27,7 @@
- #include <stdio.h>
- #include <sys/wait.h>
- #include <glib/gi18n.h>
-+#include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
-@@ -80,6 +81,8 @@
- /* Keep this in sync with gnome-shell */
- #define SCREENSAVER_FADE_TIME                           10 /* seconds */
- 
-+#define XSCREENSAVER_WATCHDOG_TIMEOUT                   120 /* seconds */
-+
- enum {
-         GSD_POWER_IDLETIME_NULL_ID,
-         GSD_POWER_IDLETIME_DIM_ID,
-@@ -197,6 +200,7 @@ struct GsdPowerManagerPrivate
-         GsdPowerIdleMode         current_idle_mode;
-         guint                    lid_close_safety_timer_id;
-         GtkStatusIcon           *status_icon;
-+        guint                    xscreensaver_watchdog_timer_id;
- };
- 
- enum {
-@@ -3621,6 +3625,77 @@ engine_session_active_changed_cb (GnomeSettingsSession *session,
-         idle_set_mode (manager, GSD_POWER_IDLE_MODE_NORMAL);
- }
- 
-+/* This timer goes off every few minutes, whether the user is idle or not,
-+   to try and clean up anything that has gone wrong.
-+
-+   It calls disable_builtin_screensaver() so that if xset has been used,
-+   or some other program (like xlock) has messed with the XSetScreenSaver()
-+   settings, they will be set back to sensible values (if a server extension
-+   is in use, messing with xlock can cause the screensaver to never get a wakeup
-+   event, and could cause monitor power-saving to occur, and all manner of
-+   heinousness.)
-+
-+   This code was originally part of gnome-screensaver, see
-+   http://git.gnome.org/browse/gnome-screensaver/tree/src/gs-watcher-x11.c?id=fec00b12ec46c86334cfd36b37771cc4632f0d4d#n530
-+ */
-+static gboolean
-+disable_builtin_screensaver (gpointer unused)
-+{
-+        int current_server_timeout, current_server_interval;
-+        int current_prefer_blank,   current_allow_exp;
-+        int desired_server_timeout, desired_server_interval;
-+        int desired_prefer_blank,   desired_allow_exp;
-+
-+        XGetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-+                         &current_server_timeout,
-+                         &current_server_interval,
-+                         &current_prefer_blank,
-+                         &current_allow_exp);
-+
-+        desired_server_timeout  = current_server_timeout;
-+        desired_server_interval = current_server_interval;
-+        desired_prefer_blank    = current_prefer_blank;
-+        desired_allow_exp       = current_allow_exp;
-+
-+        desired_server_interval = 0;
-+
-+        /* I suspect (but am not sure) that DontAllowExposures might have
-+           something to do with powering off the monitor as well, at least
-+           on some systems that don't support XDPMS?  Who know... */
-+        desired_allow_exp = AllowExposures;
-+
-+        /* When we're not using an extension, set the server-side timeout to 0,
-+           so that the server never gets involved with screen blanking, and we
-+           do it all ourselves.  (However, when we *are* using an extension,
-+           we tell the server when to notify us, and rather than blanking the
-+           screen, the server will send us an X event telling us to blank.)
-+        */
-+        desired_server_timeout = 0;
-+
-+        if (desired_server_timeout     != current_server_timeout
-+            || desired_server_interval != current_server_interval
-+            || desired_prefer_blank    != current_prefer_blank
-+            || desired_allow_exp       != current_allow_exp) {
-+
-+                g_debug ("disabling server builtin screensaver:"
-+                         " (xset s %d %d; xset s %s; xset s %s)",
-+                         desired_server_timeout,
-+                         desired_server_interval,
-+                         (desired_prefer_blank ? "blank" : "noblank"),
-+                         (desired_allow_exp ? "expose" : "noexpose"));
-+
-+                XSetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-+                                 desired_server_timeout,
-+                                 desired_server_interval,
-+                                 desired_prefer_blank,
-+                                 desired_allow_exp);
-+
-+                XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-+        }
-+
-+        return TRUE;
-+}
-+
- gboolean
- gsd_power_manager_start (GsdPowerManager *manager,
-                          GError **error)
-@@ -3778,6 +3853,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         /* set the initial dim time that can adapt for the user */
-         refresh_idle_dim_settings (manager);
- 
-+        manager->priv->xscreensaver_watchdog_timer_id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT,
-+                                                                               disable_builtin_screensaver,
-+                                                                               NULL);
-         gnome_settings_profile_end (NULL);
-         return TRUE;
- }
-@@ -3829,6 +3907,11 @@ gsd_power_manager_stop (GsdPowerManager *manager)
- 
-         g_clear_object (&manager->priv->idletime);
-         g_clear_object (&manager->priv->status_icon);
-+
-+        if (manager->priv->xscreensaver_watchdog_timer_id > 0) {
-+                g_source_remove (manager->priv->xscreensaver_watchdog_timer_id);
-+                manager->priv->xscreensaver_watchdog_timer_id = 0;
-+        }
- }
- 
- static void
---
-cgit v0.9.0.2
diff --git a/community/gnome-settings-daemon-updates/systemd-fallback.patch b/community/gnome-settings-daemon-updates/systemd-fallback.patch
deleted file mode 100644
index ffe953c63..000000000
--- a/community/gnome-settings-daemon-updates/systemd-fallback.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-commit b9ded09387f0b99ece97baee18595eb9e86a5b9b
-Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-Date:   Mon Mar 12 01:52:54 2012 +0100
-
-    Fallback to CK if systemd is not available
-
-    Be nice to distributions where systemd is optional. This will select
-    the code path at runtime depending on whether the system was booted
-    using systemd.
-
-diff --git a/configure.ac b/configure.ac
-index 3b4789f..d522852 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -299,7 +299,7 @@ AC_ARG_ENABLE([systemd],
-               [with_systemd=$enableval],
-               [with_systemd=no])
- if test "$with_systemd" = "yes" ; then
--  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
-+  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
-   AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
-   SESSION_TRACKING=systemd
- else
-diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c
-index 5786300..83fe21e 100644
---- a/gnome-settings-daemon/gnome-settings-session.c
-+++ b/gnome-settings-daemon/gnome-settings-session.c
-@@ -30,6 +30,7 @@
- #include "gnome-settings-session.h"
-
- #ifdef HAVE_SYSTEMD
-+#include <systemd/sd-daemon.h>
- #include <systemd/sd-login.h>
-
- typedef struct
-@@ -130,10 +131,9 @@ struct GnomeSettingsSessionPrivate
- {
- #ifdef HAVE_SYSTEMD
-         GSource                   *sd_source;
--#else
-+#endif
-	GDBusProxy		*proxy_session;
-	GCancellable		*cancellable;
--#endif
-	gchar			*session_id;
-	GnomeSettingsSessionState state;
- };
-@@ -237,7 +237,7 @@ sessions_changed (gpointer user_data)
-         return TRUE;
- }
-
--#else /* HAVE_SYSTEMD */
-+#endif /* HAVE_SYSTEMD */
-
- static void
- gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy,
-@@ -371,22 +371,25 @@ got_manager_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_d
-	g_object_unref (proxy_manager);
- }
-
--#endif /* HAVE_SYSTEMD */
--
- static void
- gnome_settings_session_init (GnomeSettingsSession *session)
- {
-	session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session);
-
- #ifdef HAVE_SYSTEMD
--        sd_pid_get_session (getpid(), &session->priv->session_id);
-+        session->priv->sd_source = NULL;
-+
-+        if (sd_booted () > 0) {
-+                sd_pid_get_session (getpid(), &session->priv->session_id);
-
--        session->priv->sd_source = sd_source_new ();
--        g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
--        g_source_attach (session->priv->sd_source, NULL);
-+                session->priv->sd_source = sd_source_new ();
-+                g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
-+                g_source_attach (session->priv->sd_source, NULL);
-
--        sessions_changed (session);
--#else
-+                sessions_changed (session);
-+                return;
-+        }
-+#endif
-	session->priv->cancellable = g_cancellable_new ();
-
-	/* connect to ConsoleKit */
-@@ -399,7 +402,6 @@ gnome_settings_session_init (GnomeSettingsSession *session)
-				  session->priv->cancellable,
-				  got_manager_proxy_cb,
-				  session);
--#endif
- }
-
- static void
-@@ -415,15 +417,17 @@ gnome_settings_session_finalize (GObject *object)
-         if (session->priv->sd_source != NULL) {
-                 g_source_destroy (session->priv->sd_source);
-                 g_source_unref (session->priv->sd_source);
-+                goto out;
-         }
--#else
-+#endif
-+
-	g_cancellable_cancel (session->priv->cancellable);
-
-	if (session->priv->proxy_session != NULL)
-		g_object_unref (session->priv->proxy_session);
-	g_object_unref (session->priv->cancellable);
--#endif
-
-+out:
-	G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object);
- }
-
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 8db04e5..9883d76 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -2031,7 +2031,7 @@ systemd_stop (void)
-         g_object_unref (bus);
- }
-
--#else
-+#endif
-
- static void
- consolekit_stop_cb (GObject *source_object,
-@@ -2081,7 +2081,6 @@ consolekit_stop (void)
-                            consolekit_stop_cb, NULL);
-         g_object_unref (proxy);
- }
--#endif
-
- static void
- upower_sleep_cb (GObject *source_object,
-@@ -2135,10 +2134,11 @@ do_power_action_type (GsdPowerManager *manager,
-                  * hibernate is not available and is marginally better
-                  * than just powering down the computer mid-write */
- #ifdef HAVE_SYSTEMD
--                systemd_stop ();
--#else
--                consolekit_stop ();
-+                if (sd_booted () > 0)
-+                        systemd_stop ();
-+                else
- #endif
-+                        consolekit_stop ();
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
diff --git a/community/gnome-subtitles/PKGBUILD b/community/gnome-subtitles/PKGBUILD
index b2f9fc5d9..3e4363d8e 100644
--- a/community/gnome-subtitles/PKGBUILD
+++ b/community/gnome-subtitles/PKGBUILD
@@ -1,34 +1,31 @@
-# $Id: PKGBUILD 69058 2012-04-08 21:20:04Z bgyorgy $
+# $Id: PKGBUILD 87454 2013-03-31 21:57:58Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=gnome-subtitles
-pkgver=1.2
-pkgrel=3
+pkgver=1.3
+pkgrel=1
 pkgdesc="Video subtitle editor for GNOME"
 arch=('i686' 'x86_64')
 url="http://gnomesubtitles.org/"
 license=('GPL')
-depends=('gstreamer0.10-base-plugins' 'gconf-sharp' 'gtkspell' 'desktop-file-utils')
+depends=('gst-plugins-base' 'gconf-sharp' 'gtkspell' 'desktop-file-utils')
 makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
-            'gstreamer0.10-bad-plugins: Extra media codecs'            
-            'gstreamer0.10-ugly-plugins: Extra media codecs'
-            'gstreamer0.10-ffmpeg: Extra media codecs')
+optdepends=('gst-plugins-good: Extra media codecs'
+            'gst-plugins-bad: Extra media codecs'            
+            'gst-plugins-ugly: Extra media codecs'
+            'gst-libav: Extra media codecs')
 options=('!libtool')
 install=$pkgname.install
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-        fix-help.patch)
-md5sums=('b7f3175b7a189471821d809171121d62'
-         '7645bc18812ea52137adddd6e87942d5')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('b0570134af6626d4e6c018c5f7774964')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/fix-help.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-install --disable-scrollkeeper \
+              --disable-static --disable-schemas-install \
               --with-gconf-schema-file-dir=/usr/share/gconf/schemas
-  make
+  make -j1
 }
 
 package() {
diff --git a/community/gnome-subtitles/fix-help.patch b/community/gnome-subtitles/fix-help.patch
deleted file mode 100644
index e888bfb41..000000000
--- a/community/gnome-subtitles/fix-help.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0b66f14b812bb83ca149bc29906716c17f388da1 Mon Sep 17 00:00:00 2001
-From: Pedro Castro <pedro@gnomesubtitles.org>
-Date: Sat, 10 Mar 2012 11:32:28 +0000
-Subject: Fix #671567 (Fix opening help), based on a patch from György Balló.
-
-Fix keyboard shortcuts url.
----
-diff --git a/src/GnomeSubtitles/Core/EventHandlers.cs b/src/GnomeSubtitles/Core/EventHandlers.cs
-index 014fc54..6de82b0 100644
---- a/src/GnomeSubtitles/Core/EventHandlers.cs
-+++ b/src/GnomeSubtitles/Core/EventHandlers.cs
-@@ -392,15 +392,11 @@ public class EventHandlers {
- 	/*	Help Menu */
- 	
- 	public void OnHelpContents (object o, EventArgs args) {
--		const string arg = "ghelp:gnome-subtitles";
--		if ((!Util.OpenUrl("gnome-help " + arg)) && (!Util.OpenUrl("yelp " + arg))) {
--			BasicErrorDialog errorDialog = new BasicErrorDialog(Catalog.GetString("The Gnome Subtitles Manual could not be found."), Catalog.GetString("Please verify that your installation has been completed successfully."));
--			errorDialog.Show();
--		}
-+		Util.OpenUrl("ghelp:gnome-subtitles");
- 	}
- 	
- 	public void OnHelpKeyboardShortcuts (object o, EventArgs args) {
--		Util.OpenUrl("http://gnome-subtitles.sourceforge.net/shortcuts");
-+		Util.OpenUrl("http://gnomesubtitles.org/shortcuts");
- 	}
- 
- 	public void OnHelpRequestFeature (object o, EventArgs args) {
---
-cgit v0.9.0.2
diff --git a/community/gnomesu/PKGBUILD b/community/gnomesu/PKGBUILD
deleted file mode 100644
index bf26c6a3f..000000000
--- a/community/gnomesu/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 65528 2012-02-21 08:44:37Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
-# Contributor: Kritoke <kritoke@nospam.gmail.com>
-
-pkgname=gnomesu
-pkgver=0.3.1
-pkgrel=7
-pkgdesc="A program that allows a user to su to root in a Gnome environment."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gtkfiles.org/app.php/GnomeSu"
-license=("GPL")
-depends=('libgnomeui' 'libzvt')
-makedepends=('pkgconfig')
-conflicts=('libgnomesu')
-source=(http://downloads.sourceforge.net/sourceforge/xsu/$pkgname-$pkgver.tar.gz)
-md5sums=('8ebcf248b4f8430c96d80379ec2acdd8')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i 's/1.4/1.10/' configure
-  sed -i 's/gsu/gnomesu/' xsu.desktop.in
-  sed -i 's/gnome-warning/dialog-warning/' xsu.desktop.in
-  sed -i 's|gnome-warning|/usr/share/icons/gnome/16x16/status/dialog-warning|' src/xsu.c
-  ./configure --prefix=/usr --mandir=/usr/share --build=$CHOST
-  make CFLAGS+=-Wl,-export-dynamic
-  make DESTDIR=$pkgdir install
-  install -D -m644 xsu.desktop $pkgdir/usr/share/applications/gnomesu.desktop
-  rm -r $pkgdir/usr/share/gnome
-  mv $pkgdir/usr/doc $pkgdir/usr/share/doc
-}
diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD
index b94941c8e..66fb6f91d 100644
--- a/community/gnote/PKGBUILD
+++ b/community/gnote/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 82837 2013-01-24 20:04:23Z ioni $
+# $Id: PKGBUILD 88699 2013-04-21 22:24:06Z heftig $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: uastasi <uastasi@archlinux.us>
 pkgname=gnote
-pkgver=3.6.2
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="A note taking application."
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool' 'boost')
 options=('!libtool')
 install=gnote.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('38f3b069874658f281445e04b8376d946580e4a5e39620f7e30fdd8216d46c1e')
+sha256sums=('603e2cc8782f910a5b4fdfd3588d955d59f0f4ddcd5685d1f2feadb955e0e9e6')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/community/gnuchess/PKGBUILD b/community/gnuchess/PKGBUILD
index ee192edc3..cbc34b8a9 100644
--- a/community/gnuchess/PKGBUILD
+++ b/community/gnuchess/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 76871 2012-10-01 14:52:29Z bisson $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 88493 2013-04-18 15:55:51Z jsteel $
+# Maintainer: Jonathan Steel <mail@jsteel.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gnuchess
-pkgver=6.0.2
-pkgrel=1.1
+pkgver=6.0.3
+pkgrel=1
 pkgdesc="Lets most modern computers play a full game of chess"
 url="http://www.gnu.org/software/chess/chess.html"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc' 'ncurses' 'readline')
-source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz{,.sig})
-md5sums=('566a145479c47f2f9d7d9b7b8119e1b0'
-         '044487606aa14ecb29ab9613f83918d9')
+optdepends=('xboard: for a GUI')
+source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz)
+md5sums=('28625afb8f48b86211ee1d217c308064')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
+
   ./configure --prefix=/usr
+
   make  
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
+  cd "$srcdir"/$pkgname-$pkgver
+
+  make prefix="$pkgdir"/usr install
 }
diff --git a/community/gnujump/PKGBUILD b/community/gnujump/PKGBUILD
index 0da4248af..961115c5d 100644
--- a/community/gnujump/PKGBUILD
+++ b/community/gnujump/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnujump
 pkgver=1.0.8
 pkgrel=3
 pkgdesc="A clone of the simple yet addictive game Xjump"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gnujump.es.gnu.org"
 license=('GPL3')
 depends=('libgl' 'sdl_image' 'sdl_mixer')
diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD
index 913043f8a..bbd4c1c58 100644
--- a/community/gnunet/PKGBUILD
+++ b/community/gnunet/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 81577 2012-12-24 15:00:46Z spupykin $
+# $Id: PKGBUILD 84387 2013-02-17 20:28:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: wahnby <wahnby@yahoo.fr>
 
 pkgname=gnunet
-pkgver=0.9.5
+pkgver=0.9.5_a
 pkgrel=1
 pkgdesc="A framework for secure peer-to-peer networking"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,26 +15,26 @@ makedepends=('gettext' 'pkgconfig')
 backup=(etc/gnunetd.conf)
 options=('!libtool' '!makeflags')
 install=gnunet.install
-source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-$pkgver.tar.gz
+source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-${pkgver/_/}.tar.gz
 	gnunet.rc
 	gnunet.service
 	gnunet.conf.d
 	defaults.conf)
-md5sums=('9f617b1d5955283e5487e30bd661d3b5'
+md5sums=('b0e204cf9711f9799baaeb477992e66a'
          '5baf691913b007fb33e365239e3f7217'
          '54cce3d2415d95b2e5bd1bd88db3a0ea'
          'f161b46915736e4017e77ad735521453'
          '0fe23b2ca5b3fc47a0b5645e04406da0')
 
 build() {
-  cd $srcdir/gnunet-$pkgver
+  cd $srcdir/gnunet-${pkgver/_/}
   sed -i 's|contrib doc|doc|' Makefile.*
   [ -f Makefile ] || ./configure --prefix=/usr --without-mysql
   make
 }
 
 package() {
-  cd $srcdir/gnunet-$pkgver
+  cd $srcdir/gnunet-${pkgver/_/}
   make DESTDIR=$pkgdir install
   install -D -m0755 $srcdir/gnunet.rc $pkgdir/etc/rc.d/gnunetd
   install -D -m0644 $srcdir/gnunet.conf.d $pkgdir/etc/conf.d/gnunetd
diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD
index 7c4689184..a33628ea4 100644
--- a/community/gnustep-base/PKGBUILD
+++ b/community/gnustep-base/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=gnustep-base
 pkgver=1.24.0
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc="The GNUstep base package"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index b874f8a2e..f2c3a085f 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83899 2013-02-06 13:13:38Z arodseth $
+# $Id: PKGBUILD 89827 2013-05-02 17:23:12Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Rémy Oudompheng  <remy@archlinux.org>
@@ -7,10 +7,9 @@
 # Contributor: Christian Himpel <chressie@gmail.com>
 # Contributor: Mike Rosset <mike.rosset@gmail.com>
 # Contributor: Daniel YC Lin <dlin.tw@gmail.com>
-
 pkgname=go
-pkgver=1.0.3
-pkgrel=6
+pkgver=1.1rc1
+pkgrel=1
 epoch=2
 pkgdesc='Google Go compiler and tools'
 arch=('x86_64' 'i686')
@@ -18,42 +17,46 @@ url='http://golang.org/'
 license=('custom')
 depends=('perl' 'gawk')
 makedepends=('inetutils')
-options=('!strip' '!emptydirs')
-install=go.install
+options=('!strip')
+install="$pkgname.install"
 backup=('usr/lib/go/bin')
-source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz"
-        "$pkgname.sh")
-sha256sums=('7fba3533d172f13629d3d8a79e57c620632b0bd075abe11d7698b338be0ae3df'
+if [ "$CARCH" == 'x86_64' ]; then
+  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz"
+          "$pkgname.sh")
+  sha256sums=('fc76b716b031d8afba3f3e6bcaca410e8dbf5fb625db5def00fbaaaa960e108c'
             'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892')
+else
+  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz"
+          "$pkgname.sh")
+  sha256sums=('b4eb8d9b55ae4a78c86213fa968755163ab3a8efa3f5c9f3a472b182b9d9a52e'
+              'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892')
+fi
 
 build() {
-  cd "$srcdir/$pkgname"
+  cd "$srcdir/$pkgname/src"
 
-  if [ "$CARCH" == 'x86_64' ]; then
-    export GOARCH=amd64
-  elif [ "$CARCH" == 'i686' ]; then
-    export GOARCH=386
-  else
-    export GOARCH=arm
-  fi
   export GOROOT_FINAL=/usr/lib/go
-  export GOOS=linux
 
-  cd src
+  # Enable ARM crosscompilation for linux
+  export GOOS=linux
+  export GOARCH=arm
   bash make.bash
 
-  # Enable ARM crosscompilation for non-arm platforms
-  if [ "$CARCH" == 'x86_64' ]; then
-    export GOARCH=arm
-  elif [ "$CARCH" == 'i686' ]; then
-    export GOARCH=arm
-  fi
-  bash make.bash
+  # Crosscompilation for other platforms too (including linux i686 and x86_64)
+  for os in linux; do # also possible: darwin freebsd windows
+    for arch in amd64 386; do
+      export GOOS=$os
+      export GOARCH=$arch
+      bash make.bash
+    done
+  done
 }
 
 check() {
   cd "$srcdir/$pkgname"
 
+  # Only test for linux and the architecture we're on
+  export GOOS=linux
   if [ "$CARCH" == 'x86_64' ]; then
     export GOARCH=amd64
   elif [ "$CARCH" == 'i686' ]; then
@@ -84,13 +87,13 @@ package() {
     $pkgdir/usr/share/zsh/site-functions/_go
 
   for f in ftdetect/gofiletype.vim autoload/go/complete.vim indent/go.vim \
-    ftplugin/go/fmt.vim ftplugin/go/godoc.vim ftplugin/go/import.vim \
-    syntax/go.vim syntax/godoc.vim plugin/godoc.vim;
+    ftplugin/go/fmt.vim ftplugin/go/import.vim syntax/go.vim syntax/godoc.vim \
+    plugin/godoc.vim;
   do
     install -Dm644 misc/vim/$f $pkgdir/usr/share/vim/vimfiles/$f
   done
 
-  mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}}
+  mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src,lib/go/site}}
 
   cp -r doc misc -t $pkgdir/usr/share/go
   ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc
@@ -134,7 +137,7 @@ package() {
   install -Dm644 VERSION $pkgdir/usr/lib/go/VERSION
 
   # Clean up
-  rm -r "$pkgdir/usr/bin/linux_arm"
+  #rm -r "$pkgdir/usr/bin/linux_arm"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/goaccess/PKGBUILD b/community/goaccess/PKGBUILD
new file mode 100644
index 000000000..96f6db64a
--- /dev/null
+++ b/community/goaccess/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 84906 2013-02-26 01:29:13Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Josh VanderLinden <arch@cloudlery.com>
+# Contributor: Nicolas Storme <nicolas@atelier-web.com>
+
+pkgname=goaccess
+pkgver=0.5
+pkgrel=2
+pkgdesc="An open source real-time web log analyzer and interactive viewer"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://goaccess.prosoftcorp.com"
+license=('GPL')
+depends=('ncurses' 'geoip' 'glib2')
+source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('ab2c4efac072040d9d566c234ef3c510')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --enable-geoip
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make prefix="$pkgdir/usr" install
+}
diff --git a/community/gocr/PKGBUILD b/community/gocr/PKGBUILD
index 4b712698a..11d1f2588 100644
--- a/community/gocr/PKGBUILD
+++ b/community/gocr/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65536 2012-02-21 08:47:11Z spupykin $
+# $Id: PKGBUILD 88468 2013-04-18 12:15:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gocr
-pkgver=0.49
-pkgrel=2
+pkgver=0.50
+pkgrel=1
 pkgdesc="Open-source character recognition (OCR)"
 arch=("i686" "x86_64" 'mips64el')
 url="http://jocr.sourceforge.net/index.html"
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('glibc' 'netpbm')
 optdepends=('tk: to use the tk frontend')
 source=(http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-${pkgver}.tar.gz)
-md5sums=('4e527bc4bdd97c2be15fdd818857507f')
+md5sums=('553ea40c2b3a1a0b03a30675d0e0aba1')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD
index 1d716610f..7b8128956 100644
--- a/community/golangide/PKGBUILD
+++ b/community/golangide/PKGBUILD
@@ -1,16 +1,16 @@
-#$Id: PKGBUILD 83985 2013-02-07 22:46:23Z arodseth $
+#$Id: PKGBUILD 85352 2013-03-01 10:31:59Z andrea $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: spambanane <happy.house@gmx.de>
 # Contributor: Matteo <matteo.dek@gmail.com>
 
 pkgname=golangide
 pkgver=17
-pkgrel=1
+pkgrel=2
 pkgdesc='IDE for editing and building projects written in the Go programming language (now LiteIDE X)'
 license=('LGPL')
 arch=('x86_64' 'i686')
 url='https://github.com/visualfc/liteide'
-depends=('go' 'libpng12' 'glib2' 'qt' 'qjson' 'qtwebkit')
+depends=('go' 'libpng12' 'glib2' 'qt4' 'qjson')
 makedepends=('gendesk')
 options=('!strip')
 _name=('Golang IDE')
@@ -19,7 +19,7 @@ _name=('Golang IDE')
 source=("$pkgname.tgz::https://nodeload.github.com/visualfc/liteide/tar.gz/master"
         'golangide.png'
         'golangide.sh')
-sha256sums=('abc30259bc5d87d23713479e2e464cadd152e588a95400415f6a1247004cfeff'
+sha256sums=('88fae4a43a82ecb12739bfe6612d736fa963d8beaf30dccfb305c335929c3871'
             '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697'
             'aa5ea27f9c3626431a9cb45e5267771a1eeff48b2e3927c0574eaef9302cfd74')
 
diff --git a/community/goldendict/PKGBUILD b/community/goldendict/PKGBUILD
index 728d5407c..a615d0664 100644
--- a/community/goldendict/PKGBUILD
+++ b/community/goldendict/PKGBUILD
@@ -1,33 +1,33 @@
-# $Id: PKGBUILD 61073 2011-12-21 20:50:41Z andrea $
+# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: m0rph <m0rph.mailbox@gmail.com>
 
 pkgname=goldendict
 pkgver=1.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Feature-rich dictionary lookup program"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://goldendict.berlios.de/"
 license=('GPL3')
-depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qt' 'qtwebkit' 'phonon')
-makedepds=('patch')
+depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qtwebkit' 'phonon')
+makedepends=('patch')
 provides=('stardict')
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2
         $pkgname-paths.diff
-	goldendict-1.0.1-gcc-4.7.patch)
+        gcc47.patch)
 sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6'
             '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589'
-	    'd61d95f464e82ed83493cbb5ded3ecc59a34eb879eb9c7140d801ee6e0c4454e')
+            '2e13857d047186e781c3bd9de3cfdf794f4d44e8e28f9d18dda8df50cfe13c6e')
 
 build(){
   cd ${srcdir}
 
   patch -Np0 -i ${srcdir}/$pkgname-paths.diff
-  patch -Np1 -i ${srcdir}/goldendict-1.0.1-gcc-4.7.patch
-  qmake
+  patch -p1 -i ${srcdir}/gcc47.patch
+
+  qmake-qt4
   make
-  qmake
 }
 
 package() {
diff --git a/community/goldendict/gcc47.patch b/community/goldendict/gcc47.patch
new file mode 100644
index 000000000..6496d4292
--- /dev/null
+++ b/community/goldendict/gcc47.patch
@@ -0,0 +1,23 @@
+diff -urN goldendict-1.0.1-src.orig/processwrapper.cc goldendict-1.0.1-src/processwrapper.cc
+--- goldendict-1.0.1-src.orig/processwrapper.cc	2010-12-04 02:42:46.000000000 +0530
++++ goldendict-1.0.1-src/processwrapper.cc	2012-08-04 20:51:45.835055609 +0530
+@@ -94,6 +94,8 @@
+ 

+ #else

+ 

++#include <unistd.h>

++

+ unsigned int ProcessWrapper::currentProcessId()

+ {

+     return getpid();

+diff -urN goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp
+--- goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp	2010-12-04 02:42:46.000000000 +0530
++++ goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp	2012-08-04 20:48:47.761593825 +0530
+@@ -50,6 +50,7 @@
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+ 
+ namespace QtLP_Private {
diff --git a/community/goobox/PKGBUILD b/community/goobox/PKGBUILD
index 79957b933..aa8f02b51 100644
--- a/community/goobox/PKGBUILD
+++ b/community/goobox/PKGBUILD
@@ -1,30 +1,27 @@
-# $Id: PKGBUILD 79409 2012-11-04 15:53:30Z bgyorgy $
+# $Id: PKGBUILD 87383 2013-03-30 13:01:13Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=goobox
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.2.0
+pkgrel=1
 pkgdesc="CD player and ripper for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://people.gnome.org/~paobac/goobox/"
 license=('GPL')
-depends=('brasero' 'gstreamer0.10-base-plugins' 'libmusicbrainz3' 'libnotify' 'xdg-utils')
-makedepends=('gconf' 'intltool' 'gnome-doc-utils')
-optdepends=('gstreamer0.10-good-plugins: rip CDs into flac and wav format')
+depends=('gst-plugins-base' 'brasero' 'libmusicbrainz5' 'libdiscid' 'libcoverart' 'libnotify' 'xdg-utils')
+makedepends=('intltool' 'itstool')
+optdepends=('gst-plugins-good: rip CDs into flac and wav formats')
 install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        fix-notifications.patch)
-sha256sums=('344351ab8a9aee9e1c7f490e84c972a0df57eec5b44d31247c7ef268bf4cb60e'
-            '41f1307c271ee003d2e7435d6e9a7c5f72d3668ce0cc50842769c34f97c7fe99')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('0bd5c31d53635588f46ad4d254866ff74356caee5edb45c1a3bce9c754cc6cb6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # https://bugzilla.gnome.org/show_bug.cgi?id=674121
-  patch -Np1 -i "$srcdir/fix-notifications.patch"
+  sed -i 's/LIBCOVERART_REQUIRED=1.0.0beta1/LIBCOVERART_REQUIRED=1.0.0/' configure{,.ac}
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-scrollkeeper --disable-schemas-compile
+              --disable-static --disable-schemas-compile
   make
 }
 
diff --git a/community/goobox/fix-notifications.patch b/community/goobox/fix-notifications.patch
deleted file mode 100644
index 6ca9c65cb..000000000
--- a/community/goobox/fix-notifications.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur goobox-3.0.1.orig/src/main.c goobox-3.0.1/src/main.c
---- goobox-3.0.1.orig/src/main.c	2011-08-22 19:55:45.000000000 +0200
-+++ goobox-3.0.1/src/main.c	2012-04-15 02:59:34.476683867 +0200
-@@ -729,15 +729,15 @@
- 						window,
- 						NULL);
- 
--		notify_notification_set_hint_byte (notification,
--						   "action-icons",
--						   TRUE);
-+		notify_notification_set_hint (notification,
-+					      "action-icons",
-+					      g_variant_new_boolean (TRUE));
- 	}
- 
- 	if (notification_supports_persistence)
--		notify_notification_set_hint_byte (notification,
--						    "resident" /* "transient" */,
--						    TRUE);
-+		notify_notification_set_hint (notification,
-+					      "resident" /* "transient" */,
-+					      g_variant_new_boolean (TRUE));
- 
- 	notify_notification_show (notification, NULL);
- 
diff --git a/community/google-gadgets/PKGBUILD b/community/google-gadgets/PKGBUILD
index 34c643492..3407d7a9c 100644
--- a/community/google-gadgets/PKGBUILD
+++ b/community/google-gadgets/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61075 2011-12-21 20:50:53Z andrea $
+# $Id: PKGBUILD 85354 2013-03-01 10:32:21Z andrea $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 
 pkgbase=google-gadgets
@@ -8,25 +8,25 @@ _basedir="$startdir/pkg/base"
 pkgver=0.11.2
 _sover=1.0
 _sobump=0.0.0
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/google-gadgets-for-linux/"
 license=('APACHE')
 makedepends=('gstreamer0.10-base-plugins' 'libwebkit'
              'desktop-file-utils' 'xdg-utils'
              'librsvg' 'curl' 'libsoup-gnome'
-             'qt' 'qtwebkit'
+             'qtwebkit'
              'networkmanager'
              'zip' 'flex')
 options=('!libtool')
 source=("http://google-gadgets-for-linux.googlecode.com/files/$_realname-$pkgver.tar.bz2"
 	"wifi-types.patch"
-	"google-gadgets-0.11.2-glib-2.31.patch"
-	"google-gadgets-0.11.2-gcc-4.7.patch")
+  'gcc47.patch'
+  'glibc231.patch')
 md5sums=('279305553bcbf74f3e3615f6abc36a5e'
          'f0df71c60a174e9d629db87b8bd9e102'
-	 '1b9c7769d6659ea77069e9c22592797a'
-	 'b62bc8592b5a44cb34cb7a7e4a6cf62e')
+         'b62bc8592b5a44cb34cb7a7e4a6cf62e'
+         '4b96d1da79a375ef2fb58ff01a76f684')
 
 build() {
   cd "$srcdir/$_realname-$pkgver"
@@ -36,9 +36,10 @@ build() {
   #
   # xulrunner 2.0 is incompatible;
   #   we build without smjs-script/browser-element
-  patch -Np1 -i ${srcdir}/google-gadgets-0.11.2-glib-2.31.patch
-  patch -Np1 -i ${srcdir}/google-gadgets-0.11.2-gcc-4.7.patch
+
   patch -p1 <$srcdir/wifi-types.patch
+  patch -p1 -i "${srcdir}"/gcc47.patch
+  patch -p0 -i "${srcdir}"/glibc231.patch
   ./configure --prefix=/usr \
               --disable-werror \
               --disable-update-desktop-database \
@@ -129,7 +130,7 @@ package_google-gadgets-qt() {
   pkgdesc="Desktop widgets from Google (partial Qt front-end)"
   groups=('google-gadgets')
   install=$pkgbase.install
-  depends=('google-gadgets-common' 'qt' 'qtwebkit'
+  depends=('google-gadgets-common' 'qtwebkit'
            'desktop-file-utils' 'xdg-utils'
            'gstreamer0.10-base-plugins' 'libwebkit')
   optdepends=('networkmanager: desktop integration')
diff --git a/community/google-gadgets/google-gadgets-0.11.2-gcc-4.7.patch b/community/google-gadgets/gcc47.patch
index 2e77e10fd..2e77e10fd 100644
--- a/community/google-gadgets/google-gadgets-0.11.2-gcc-4.7.patch
+++ b/community/google-gadgets/gcc47.patch
diff --git a/community/google-gadgets/glibc231.patch b/community/google-gadgets/glibc231.patch
new file mode 100644
index 000000000..61de05162
--- /dev/null
+++ b/community/google-gadgets/glibc231.patch
@@ -0,0 +1,25 @@
+--- ggadget/gtk/main_loop.cc
++++ ggadget/gtk/main_loop.cc
+@@ -16,9 +16,8 @@
+ 
+ #include <fcntl.h>
+ #include <stdint.h>
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+-#include <glib/gthread.h>
+ #include <ggadget/common.h>
+ #include "main_loop.h"
+ #include "utilities.h"
+--- hosts/gtk/main.cc
++++ hosts/gtk/main.cc
+@@ -14,8 +14,8 @@
+   limitations under the License.
+ */
+ 
++#include <glib.h>
+ #include <gtk/gtk.h>
+-#include <glib/gthread.h>
+ #include <locale.h>
+ #include <signal.h>
+ #include <unistd.h>
diff --git a/community/google-gadgets/google-gadgets-0.11.2-glib-2.31.patch b/community/google-gadgets/google-gadgets-0.11.2-glib-2.31.patch
deleted file mode 100644
index 912f47235..000000000
--- a/community/google-gadgets/google-gadgets-0.11.2-glib-2.31.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- google-gadgets-for-linux-0.11.2.orig/ggadget/gtk/main_loop.cc	2009-12-28 05:39:59.000000000 -0500
-+++ google-gadgets-for-linux-0.11.2/ggadget/gtk/main_loop.cc	2012-12-03 19:27:35.160966552 -0500
-@@ -16,9 +16,8 @@
- 
- #include <fcntl.h>
- #include <stdint.h>
--#include <glib/ghash.h>
-+#include <glib.h>
- #include <gtk/gtk.h>
--#include <glib/gthread.h>
- #include <ggadget/common.h>
- #include "main_loop.h"
- #include "utilities.h"
-
---- google-gadgets-for-linux-0.11.2.orig/hosts/gtk/main.cc	2009-09-22 04:12:00.000000000 -0500
-+++ google-gadgets-for-linux-0.11.2/hosts/gtk/main.cc	2012-12-01 03:56:37.320907813 -0500
-@@ -15,7 +15,7 @@
- */
- 
- #include <gtk/gtk.h>
--#include <glib/gthread.h>
-+#include <glib.h>
- #include <locale.h>
- #include <signal.h>
- #include <unistd.h>
diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD
index e04878246..9d605467a 100644
--- a/community/gource/PKGBUILD
+++ b/community/gource/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 83364 2013-01-30 11:48:44Z svenstaro $
+# $Id: PKGBUILD 89529 2013-04-29 19:09:10Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
 # Contributor: Olivier Ramonat <olivier at ramonat dot fr>
 pkgname=gource
-pkgver=0.39
+pkgver=0.40
 pkgrel=1
 pkgdesc="software version control visualization"
 license=(GPL3)
@@ -12,7 +12,7 @@ url=http://code.google.com/p/gource/
 depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew' 'boost-libs')
 makedepends=('boost' 'glm' 'mesa')
 source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('31d2d34f3f6a0c044243f477e925b8b4')
+md5sums=('89c608a7aa3c901661eb1f2db6117492')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD
index 72e242bb4..8c32bda92 100644
--- a/community/gpac/PKGBUILD
+++ b/community/gpac/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 77646 2012-10-13 11:43:41Z allan $
+# $Id: PKGBUILD 86125 2013-03-12 06:02:35Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gpac
-pkgver=4065
-pkgrel=2
+pkgver=4288
+pkgrel=1
 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gpac.sourceforge.net"
 license=('LGPL')
-depends=('ffmpeg' 'libjpeg' 'libpng' 'glu')
-makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad' 'mesa')
+depends=('ffmpeg' 'libjpeg' 'libpng' 'glu' 'libxv')
+makedepends=('jack' 'a52dec' 'freetype2' 'faad2' 'libmad' 'mesa')
 optdepends=('jack: for jack support' 'a52dec: for A52 support'
             'faad2: for AAC support' 'libmad: for mp3 support')
 options=('!makeflags')
 source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
-sha1sums=('9a60014c4467acf3ac070e4e4a42d13b35575da8'
-          'a015cef1fd003c57bd91a6d0959ccd58df2357d4')
+sha1sums=('6ba29de672b6e4260e510e0e16d5bc0ab09cabb6'
+          '794b0e4a497af527e093ff0328f1acc8995f2b04')
 
 # source PKGBUILD && mksource
 mksource() {
   [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
-  _svnver=$pkgver
+  _svnver=${pkgver}
   _svntrunk="https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac"
-  _svnmod="$pkgname-$pkgver"
-  mkdir ${pkgname}-$pkgver
-  pushd ${pkgname}-$pkgver
+  _svnmod="$pkgname-${pkgver}"
+  mkdir ${pkgname}-${pkgver}
+  pushd ${pkgname}-${pkgver}
   svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
+  revision="$(svnversion ${pkgname}-${pkgver})"
+  echo "#define GPAC_SVN_REVISION     \"$revision\"" > ${pkgname}-${pkgver}/include/gpac/revision.h
   find . -depth -type d -name .svn -exec rm -rf {} \;
-  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
+  tar -cJf ../${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
   popd
   rm -r ${pkgname}-${pkgver}
   gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
diff --git a/community/gpg-crypter/gpg-crypter.desktop b/community/gpg-crypter/gpg-crypter.desktop
deleted file mode 100644
index 446efc414..000000000
--- a/community/gpg-crypter/gpg-crypter.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=GPG Crypter
-Comment=GPG Crypter utility
-Exec=gpg-crypter
-Terminal=false
-Type=Application
-Icon=gpg-crypter
-Categories=Utility;
diff --git a/community/gphpedit/PKGBUILD b/community/gphpedit/PKGBUILD
index 81d1cfd2e..8fdf88e6b 100644
--- a/community/gphpedit/PKGBUILD
+++ b/community/gphpedit/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 65586 2012-02-21 09:11:19Z spupykin $
+# $Id: PKGBUILD 88295 2013-04-16 02:34:03Z bgyorgy $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gphpedit
 pkgver=0.9.98RC1
-pkgrel=3
+pkgrel=4
 pkgdesc="a scintilla/gnome based editor specialized on php-files"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
-depends=('libgnomeui>=2.18.1-2' 'libgtkhtml>=2.11.0' 'desktop-file-utils' 'libwebkit')
+depends=('gconf' 'webkitgtk2' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('intltool')
 url="http://www.gphpedit.org/"
 options=('!makeflags')
@@ -21,12 +21,11 @@ md5sums=('cc3c5f50704fa0ed3ef3d4ac983db525'
 
 build() {
   cd ${srcdir}/*$pkgname*
-  patch -Np1 -i ${srcdir}/gphpedit-0.9.98RC1-gmodule.patch
-  ./autogen.sh
-  LDFLAGS=`pkg-config --libs gtk+-2.0` ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  LDFLAGS=`pkg-config --libs gmodule-2.0` ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
+}
+
+package() {
+  cd ${srcdir}/*$pkgname*
   make DESTDIR=$pkgdir install
-  # extend MimeType declaration
-  echo "MimeType=application/x-php;text-x-php-text/x-php-source;" >> \
-    $pkgdir/usr/share/applications/gphpedit.desktop
 }
diff --git a/community/gphpedit/gphpedit.install b/community/gphpedit/gphpedit.install
index 39bc96919..8e46769be 100644
--- a/community/gphpedit/gphpedit.install
+++ b/community/gphpedit/gphpedit.install
@@ -1,5 +1,6 @@
 post_install() {
   update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/community/gpointing-device-settings/PKGBUILD b/community/gpointing-device-settings/PKGBUILD
new file mode 100644
index 000000000..65ef2fe48
--- /dev/null
+++ b/community/gpointing-device-settings/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 89372 2013-04-29 00:10:30Z bgyorgy $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Thomas Mudrunka <harvie@@email..cz>
+
+pkgname=gpointing-device-settings
+pkgver=1.5.1
+pkgrel=4
+pkgdesc="GUI tool for setting pointing device such as TrackPoint or Touchpad"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://live.gnome.org/GPointingDeviceSettings"
+depends=('gtk2' 'gconf')
+makedepends=('gnome-settings-daemon' 'intltool')
+options=('!libtool')
+source=("http://keihanna.dl.sourceforge.jp/gsynaptics/45812/${pkgname}-${pkgver}.tar.gz")
+md5sums=('1d1491473df8eabca3c15c997a975d7f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Enable deprecations
+  sed -i -e '/DISABLE_DEPRECATED/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
+
+  # Disable GSD plugin (won't build with GSD 3.8)
+  sed -i 's/ gnome-settings-daemon-plugins//' modules/Makefile.am
+
+  autoreconf -fi
+  ./configure  --prefix=/usr --sysconfdir=/etc \
+               --disable-static --disable-schemas-install \
+               --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
+
+  # Remove GConf schema (used by GSD plugin)
+  rm -r "${pkgdir}/usr/share/gconf"
+}
diff --git a/community/gprolog/PKGBUILD b/community/gprolog/PKGBUILD
index 99a1f32dd..c2ef1465c 100644
--- a/community/gprolog/PKGBUILD
+++ b/community/gprolog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80909 2012-12-06 10:51:57Z spupykin $
+# $Id: PKGBUILD 89518 2013-04-29 16:43:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Contributer: Jason Chu <jchu@xentac.net>
 
 pkgname=gprolog
-pkgver=1.4.2
+pkgver=1.4.4
 pkgrel=1
 pkgdesc="GNU Prolog"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url="http://www.gprolog.org/"
 depends=()
 license=('GPL')
 source=(ftp://ftp.gnu.org/gnu/gprolog/gprolog-$pkgver.tar.gz)
-md5sums=('e9266515435dffbcabf5af8fcd2f2204')
+md5sums=('37009da471e5217ff637ad1c516448c8')
 
 build() {
    cd "$srcdir/gprolog-$pkgver/src"
diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD
index ddff78f8b..2717468ee 100644
--- a/community/gpsbabel/PKGBUILD
+++ b/community/gpsbabel/PKGBUILD
@@ -1,23 +1,21 @@
-# $Id: PKGBUILD 76414 2012-09-17 13:51:33Z spupykin $
+# $Id: PKGBUILD 85355 2013-03-01 10:32:31Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gpsbabel
 pkgver=1.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gpsbabel.org"
 license=('GPL')
 depends=('libusb-compat' 'expat')
-makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment=6' 'docbook-xsl')
-optdepends=('qt' 'qtwebkit')
+makedepends=('fop' 'qt4' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment' 'docbook-xsl')
+optdepends=('qt4' 'qtwebkit')
 options=('docs')
-source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz"
-	"gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD")
-md5sums=('6c4c8f0cb9fcf9f8302585148878f174'
-         '7bdbd243e29a8831842d31c079f04c45')
+source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz")
+md5sums=('6c4c8f0cb9fcf9f8302585148878f174')
 
 build() {
   cd $srcdir/gpsbabel-$pkgver
@@ -34,7 +32,7 @@ package() {
   # GUI
   install -Dm755 gui/objects/gpsbabelfe-bin ${pkgdir}/usr/bin/gpsbabelfe-bin
   install -Dm644 gui/images/appicon.png $pkgdir/usr/share/pixmaps/gpsbabel.png
-  install -Dm644 $srcdir/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop
+  install -Dm644 gui/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop
 
   # Header install
   mkdir -p $pkgdir/usr/include/gpsbabel
diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD
index e3d57b2b4..56eef566e 100644
--- a/community/gpsdrive/PKGBUILD
+++ b/community/gpsdrive/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83255 2013-01-28 16:49:42Z stephane $
+# $Id: PKGBUILD 87417 2013-03-31 19:18:21Z stephane $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: damir <damir@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=gpsdrive
 pkgver=2.11
 _pkgver=20120928
-pkgrel=15
+pkgrel=17
 pkgdesc="A car (bike, ship, plane) navigation system"
 arch=("i686" "x86_64" 'mips64el')
 url="http://www.gpsdrive.de/"
diff --git a/community/gpsdrive/gpsd-2.96.patch b/community/gpsdrive/gpsd-2.96.patch
deleted file mode 100644
index bc6c7475f..000000000
--- a/community/gpsdrive/gpsd-2.96.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -wbBur gpsdrive-2.11/src/gps_handler.c gpsdrive-2.11.my/src/gps_handler.c
---- gpsdrive-2.11/src/gps_handler.c	2010-06-24 19:53:32.000000000 +0000
-+++ gpsdrive-2.11.my/src/gps_handler.c	2011-04-18 13:21:33.000000000 +0000
-@@ -264,7 +264,8 @@
- #define GPS_TIMER 500
- 
- static gint gps_timeout_source = 0;
--static struct gps_data_t *gpsdata;
-+static struct gps_data_t __gd;
-+static struct gps_data_t *gpsdata = &__gd;
- 
- /* SYMBOLS USED IN LIBGPS:
-  * 
-@@ -410,9 +411,10 @@
- 	 */
- 	gps_query (gpsdata, "oys\n");
- #else
--	if (gps_waiting(gpsdata))
-+	if (gps_waiting(gpsdata, 1000000))
- 	{
--		gps_poll (gpsdata);
-+		gps_read (gpsdata);
-+		gps_hook_cb(gpsdata, NULL);
- 	}
- #endif
- 
-@@ -447,7 +449,7 @@
- 	}
- 
- 	/* try to open connection */
--	gpsdata =  gps_open (local_config.gpsd_server, local_config.gpsd_port);
-+	gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port, gpsdata) ? NULL : &__gd;
- 	if (!gpsdata)
- 	{
- 		g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n",
-@@ -466,7 +468,7 @@
- 	gps_sats = g_new (gps_satellite_struct, MAXCHANNELS);
- 
- 	/* set hook function to handle gps data */
--	gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb);
-+//	gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb);
- 
- #ifndef LIBGPS_OLD
- 	/* enable watch mode to get data stream from gpsd */
diff --git a/community/gpsmanshp/PKGBUILD b/community/gpsmanshp/PKGBUILD
index 312c95c5d..d700d7b35 100644
--- a/community/gpsmanshp/PKGBUILD
+++ b/community/gpsmanshp/PKGBUILD
@@ -1,37 +1,36 @@
-# $Id: PKGBUILD 81604 2012-12-25 00:34:09Z foutrelis $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# $Id: PKGBUILD 86486 2013-03-18 11:13:27Z andrea $
+# Maintainer:  Federico Cinelli   <cinelli@aur.archlinux.org>
 
 pkgname=gpsmanshp
 pkgver=1.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A Tcl package to read and write shapefiles"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gpsmanshp.sourceforge.net/"
 license=('GPL')
 depends=('glibc' 'shapelib' 'tcl')
-source=("http://sourceforge.net/projects/${pkgname}/files/distr/${pkgname}_${pkgver}.tgz")
+source=("http://sourceforge.net/projects/$pkgname/files/distr/${pkgname}_$pkgver.tgz")
 md5sums=('c2876d7f67c8215b46b336b5b859d49f')
 
 build() {
-  cd "${pkgname}_${pkgver}"
+  cd "${pkgname}_$pkgver"
 
   mv Makefile8.5 Makefile
   sed -i -e "s:shapefil.h:libshp/shapefil.h:g" gpsmanshp.c
+  sed -i -e 's:$(LINKOPT) gpsmanshp.o:gpsmanshp.o $(LINKOPT):' Makefile
 
-  install -d ${pkgdir}/usr/lib/
+  install -d "$srcdir/${pkgname}_$pkgver/usr/lib/"
 
-  # set install path
-  sed -i -e "s|/usr/lib/tcl\$(TCLVERSION)|${pkgdir}/usr/lib/gpsmanshp|g" Makefile
+  sed -i -e "s|/usr/lib/tcl\$(TCLVERSION)|$srcdir/${pkgname}_$pkgver/usr/lib/gpsmanshp|g" Makefile
   sed -i -e "s|tclsh\$(TCLVERSION)|tclsh|g" Makefile
   sed -i "s|package-8.3.tcl|/usr/lib/tcl8.6/package.tcl|g" Makefile
   sed -i "s|8.4|8.6|g" Makefile
-
+  
   make
 }
 
 package() {
-  cd "${pkgname}_${pkgver}"
+  cd "${pkgname}_$pkgver"
 
   make install
 }
diff --git a/community/gputils/PKGBUILD b/community/gputils/PKGBUILD
index 6ea946bc2..942b55e23 100644
--- a/community/gputils/PKGBUILD
+++ b/community/gputils/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 75360 2012-08-21 09:13:35Z ebelanger $
+# $Id: PKGBUILD 88505 2013-04-19 06:14:12Z cinelli $
+# Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Johannes Martin <honzor@gmx.net>
 # Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=gputils
-pkgver=0.14.2
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="PIC Programming Utilities"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gputils.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('90fa2803e77723de32b482f6a57d9c5a')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('2bff2c595b6570ac9bd6efb692fde274')
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "$srcdir/$pkgname-$pkgver"
 	./configure --prefix=/usr
 	make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
 }
diff --git a/community/gq/PKGBUILD b/community/gq/PKGBUILD
index 0f4c9e28e..595f70f28 100644
--- a/community/gq/PKGBUILD
+++ b/community/gq/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=gq
 pkgver=1.3.4
-pkgrel=2
+pkgrel=2.1
 pkgdesc="interactive graphical LDAP browser"
 url="http://sourceforge.net/projects/gqclient"
 license=("GPL")
diff --git a/community/grafx2/grafx2.desktop b/community/grafx2/grafx2.desktop
deleted file mode 100644
index d58bc5ed3..000000000
--- a/community/grafx2/grafx2.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-GenericName=GrafX2
-Name=GrafX2
-Comment=Pixelart-oriented painting program
-Exec=grafx2 %U
-TryExec=grafx2
-Icon=grafx2
-Terminal=false
-Type=Application
-Categories=Graphics;2DGraphics;RasterGraphics
-MimeType=image/bmp;image/gif;image/png;image/x-tga;image/tiff
diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD
index 3047069fd..9b557fac7 100644
--- a/community/gsmartcontrol/PKGBUILD
+++ b/community/gsmartcontrol/PKGBUILD
@@ -2,18 +2,18 @@
 
 pkgname=gsmartcontrol
 pkgver=0.8.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gsmartcontrol.berlios.de/home/index.php/en/Home"
 license=('GPL3')
-depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm' 'glib2' 'xorg-xmessage')
-optdepends=('polkit: to run gparted directly from menu')
+depends=('smartmontools' 'gtkmm' 'xorg-xmessage' 'hicolor-icon-theme' 'polkit')
+optdepends=('polkit-gnome: to run gsmartcontrol directly from menu')
 install=${pkgname}.install
-source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2 org.archlinux.pkexec.gsmartcontrol.policy gsmartcontrol.desktop)
+source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2
+        org.archlinux.pkexec.gsmartcontrol.policy)
 md5sums=('6d104c2ffc1e693cd1a8052a6d7e3b30'
-         'e7b9380849cdcaa4356a42559ea7954f'
-         '19b20293a639e51fa2abb929a3faae01')
+         'e403f8e06e6b8a3d1a99da5e584b2257')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -31,11 +31,20 @@ package() {
 
 	make DESTDIR=${pkgdir} install
 
-        # Install pexec fixed desktop file
-        install -Dm755 $srcdir/gsmartcontrol.desktop $pkgdir/usr/share/applications/gsmartcontrol.desktop
+        # We need rename the original binary
+        mv "${pkgdir}/usr/bin/gsmartcontrol" "${pkgdir}/usr/bin/gsmartcontrol.elf"
 
-        # Install pexec file
-        install -Dm766 $srcdir/org.archlinux.pkexec.gsmartcontrol.policy \
-        $pkgdir/usr/share/polkit-1/actions/org.archlinux.pkexec.gsmartcontrol.policy 
+        # Install launcher script
+        echo '#!/bin/sh' > ${pkgdir}/usr/bin/gsmartcontrol
+        echo 'pkexec --disable-internal-agent "/usr/bin/gsmartcontrol.elf" "$@"' \
+                >> ${pkgdir}/usr/bin/gsmartcontrol
+        chmod 755 ${pkgdir}/usr/bin/gsmartcontrol
+
+        # Modify desktop file
+        sed -i -e "s|^Exec=.*|Exec=/usr/bin/gsmartcontrol|" \
+                "${pkgdir}/usr/share/applications/gsmartcontrol.desktop"
 
-      }
+        # Install policy file
+        install -Dm766 $srcdir/org.archlinux.pkexec.gsmartcontrol.policy \
+                $pkgdir/usr/share/polkit-1/actions/org.archlinux.pkexec.gsmartcontrol.policy
+}
diff --git a/community/gsmartcontrol/gsmartcontrol.install b/community/gsmartcontrol/gsmartcontrol.install
index b95cc069d..f636406f2 100644
--- a/community/gsmartcontrol/gsmartcontrol.install
+++ b/community/gsmartcontrol/gsmartcontrol.install
@@ -1,9 +1,12 @@
 post_install() {
   which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+  echo 'If you use a lightweight windowmanager, remember to run'
+  echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable'
+  echo 'graphical authentication, which may be needed for pkexec to work.'
 }
 
 post_upgrade() {
-  post_install $1
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
 }
 
 post_remove() {
diff --git a/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy
index fb985df87..b71db7904 100644
--- a/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy
+++ b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy
@@ -5,14 +5,14 @@
 <policyconfig>
 
   <action id="org.archlinux.pkexec.gsmartcontrol">
-    <message>Authentication is required to run the gsmartcontrol</message>
+    <message>Authentication is required to run the GSmartControl</message>
     <icon_name>gsmartcontrol</icon_name>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin</allow_active>
     </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gsmartcontrol</annotate>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gsmartcontrol.elf</annotate>
     <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
   </action>
 
diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD
index 6dc801d68..ef25e78f4 100644
--- a/community/gsoap/PKGBUILD
+++ b/community/gsoap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82656 2013-01-22 15:07:23Z spupykin $
+# $Id: PKGBUILD 87262 2013-03-29 11:58:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tor Krill <tor@krill.nu>
 # Contributor: Lee.MaRS <leemars@gmail.com>
 
 pkgname=gsoap
-pkgver=2.8.13
+pkgver=2.8.14
 pkgrel=1
 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++"
 url="http://www.cs.fsu.edu/~engelen/soap.html"
@@ -14,7 +14,7 @@ depends=('openssl' 'zlib' 'gcc-libs')
 makedepends=('autoconf' 'automake')
 source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip
 	LICENSE)
-md5sums=('55324ce514886d336511407b440b8bc5'
+md5sums=('a032616b7c3b613ce67260a89db9df74'
          '27aaa3f5166db94d44044c11a7b2c37b')
 
 build() {
diff --git a/community/gsql/PKGBUILD b/community/gsql/PKGBUILD
index a9127c50a..92166ac5a 100644
--- a/community/gsql/PKGBUILD
+++ b/community/gsql/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 63614 2012-02-05 12:00:35Z ibiru $
+# $Id: PKGBUILD 88439 2013-04-17 16:49:53Z bgyorgy $
 # Contributor: Michael Kanis <mkanis@gmx.de>
 
 pkgname=gsql
 pkgver=0.2.2
-pkgrel=4
+pkgrel=6
 pkgdesc="Integrated database development tool for GNOME"
 url="http://gsql.org/"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('gtk2>=2.12' 'gtksourceview2' 'vte' 'libgnomeui' 'gconf'
-	 'desktop-file-utils' 'libnotify')
-makedepends=('libmysqlclient' 'postgresql-libs' 'libssh')
-optdepends=('libmysqlclient' 'postgresql-libs' 'libssh')
+depends=('gtk2>=2.12' 'gtksourceview2' 'libglade' 'gconf'
+	 'desktop-file-utils' 'libnotify' 'hicolor-icon-theme')
+makedepends=('vte' 'libmariadbclient' 'postgresql-libs' 'libssh')
+optdepends=('libmariadbclient: MySQL engine'
+            'libssh: SSH tunneling plugin'
+            'postgresql-libs: PostgreSQL engine'
+            'vte: Terminal session plugin')
 install=gsql.install
-options=(!libtool)
+options=(!libtool !emptydirs)
 source=(http://gsql.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('8f3322a75390584729e84a8570e08bea')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   sed -i 's/notify_notification_new (subj, message, NULL, NULL);/notify_notification_new (subj, message, NULL);/' libgsql/notify.c
-  ./configure --prefix=/usr --sysconfdir=/etc
+  LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`" ./configure --prefix=/usr --sysconfdir=/etc \
+              --disable-static --without-gnome
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
   install -d "${pkgdir}/usr/share/gconf/schemas"
   gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
   rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
diff --git a/community/gstreamermm/PKGBUILD b/community/gstreamermm/PKGBUILD
index 921304117..050059c9f 100644
--- a/community/gstreamermm/PKGBUILD
+++ b/community/gstreamermm/PKGBUILD
@@ -17,7 +17,7 @@ sha256sums=('12b5f377363594a69cb79f2f5cd0a8b1813ca6553680c3216e6354cfd682ebc6')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/gstreamermm-0.10.10-glib.patch
+
   ./configure --prefix=/usr
   make
 }
diff --git a/community/gstreamermm/gstreamermm-0.10.10-glib.patch b/community/gstreamermm/gstreamermm-0.10.10-glib.patch
deleted file mode 100644
index f21dea635..000000000
--- a/community/gstreamermm/gstreamermm-0.10.10-glib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gstreamermm-0.10.10.orig/gstreamer/gstreamermm/wrap.cc	2010-02-11 16:32:18.000000000 -0500
-+++ gstreamermm-0.10.10/gstreamer/gstreamermm/wrap.cc	2013-01-05 18:43:27.815010415 -0500
-@@ -20,8 +20,7 @@
-  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
--#include <glib/gtypes.h>
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- #include <vector>
- #include <gstreamermm/miniobject.h>
diff --git a/community/gsynaptics/PKGBUILD b/community/gsynaptics/PKGBUILD
deleted file mode 100644
index 78919e90e..000000000
--- a/community/gsynaptics/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 55543 2011-09-14 08:26:19Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=gsynaptics
-pkgver=0.9.16
-pkgrel=2
-pkgdesc="A settings tool for Synaptics touchpad driver"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://gsynaptics.sourceforge.jp/"
-license=('GPL')
-depends=('libgnomeui' 'synaptics')
-makedepends=('intltool' 'gettext' 'gnome-doc-utils')
-install=$pkgname.install
-source=("http://sourceforge.jp/frs/redir.php?m=iij&f=/${pkgname}/38463/${pkgname}-${pkgver}.tar.gz"
-        do-not-set-zero.dpatch
-        dot-fixes.dpatch
-        build-filename.dpatch)
-md5sums=('571828ddca2f1d9d6ea47e072db1959d'
-         'd6308d93fd4d04c686ba24422ed99905'
-         '4c35d5d0803296233d50146963a0bcbc'
-         'd227a70304bef3cc0272b37c5e322463')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/dot-fixes.dpatch
-  patch -p1 -i "${srcdir}"/do-not-set-zero.dpatch
-  patch -p1 -i "${srcdir}"/build-filename.dpatch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/gsynaptics/build-filename.dpatch b/community/gsynaptics/build-filename.dpatch
deleted file mode 100644
index 404e6fab7..000000000
--- a/community/gsynaptics/build-filename.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## build-filename.dpatch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: https://sourceforge.jp/tracker/index.php?func=detail&aid=12568&group_id=1720&atid=6435
-## DP: Missing terminating NULL for g_build_filename call.
-
-@DPATCH@
-diff -urNad gsynaptics-0.9.14~/src/main.c gsynaptics-0.9.14/src/main.c
---- gsynaptics-0.9.14~/src/main.c	2008-02-28 23:27:28.000000000 +0100
-+++ gsynaptics-0.9.14/src/main.c	2008-05-17 08:34:04.000000000 +0200
-@@ -690,7 +690,7 @@
- 
- 	gtk_window_set_default_size (GTK_WINDOW (widget), 400, -1);
- 
--	path = g_build_filename (DATADIR "/pixmaps", "touchpad.png", NULL);
-+	path = g_build_filename (DATADIR, "pixmaps", "touchpad.png", NULL);
- 	if (path)
- 	{
- 		icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
diff --git a/community/gsynaptics/do-not-set-zero.dpatch b/community/gsynaptics/do-not-set-zero.dpatch
deleted file mode 100644
index f3a4aee72..000000000
--- a/community/gsynaptics/do-not-set-zero.dpatch
+++ /dev/null
@@ -1,189 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## do-not-set-zero.dpatch by Michal Čihař <nijel@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Do not set to 0 when some keys are not defined.
-## DP: Debian bug #480744.
-## DP: Forwarded to https://sourceforge.jp/tracker/index.php?func=detail&aid=12545&group_id=1720&atid=6435
-
-@DPATCH@
-diff -urNad gsynaptics-0.9.14~/src/init.c gsynaptics-0.9.14/src/init.c
---- gsynaptics-0.9.14~/src/init.c	2008-02-28 23:27:41.000000000 +0100
-+++ gsynaptics-0.9.14/src/init.c	2008-05-17 09:14:12.000000000 +0200
-@@ -36,63 +36,148 @@
- {
- 	gboolean b_value;
- 	gint i_value;
-+    GConfValue *gval = NULL;
- 
- 	if (!gconf_client_dir_exists (gconf, DIRNAME, NULL))
- 		return;
- 
- 	/* touchpad on/off */	
--	b_value = gconf_client_get_bool (gconf, OFF_KEY, NULL);
--	g_synaptics_set_enabled (synaptics, b_value ? 1 : 0);
-+	gval = gconf_client_get (gconf, OFF_KEY, NULL);
-+	if (gval != NULL) {
-+		if (gval->type == GCONF_VALUE_BOOL) {
-+			b_value = gconf_value_get_bool(gval);
-+			g_synaptics_set_enabled (synaptics, b_value ? 1 : 0);
-+		}
-+		gconf_value_free(gval);
-+	}
- 	
- 	/* vertical scroll delta */
--	i_value = gconf_client_get_int (gconf, VERTSCROLLDELTA_KEY, NULL);
--	g_synaptics_set_vertical_scroll_delta (synaptics, i_value);
-+	gval = gconf_client_get (gconf, VERTSCROLLDELTA_KEY, NULL);
-+	if (gval != NULL) {
-+		if (gval->type == GCONF_VALUE_INT) {
-+			i_value = gconf_value_get_int(gval);
-+			g_synaptics_set_vertical_scroll_delta (synaptics, i_value);
-+		}
-+		gconf_value_free(gval);
-+	}
- 	
- 	/* horizontal scroll delta */
--	i_value = gconf_client_get_int (gconf, HORIZSCROLLDELTA_KEY, NULL);
--	g_synaptics_set_horizontal_scroll_delta (synaptics, i_value);
-+	gval = gconf_client_get (gconf, HORIZSCROLLDELTA_KEY, NULL);
-+	if (gval != NULL) {
-+		if (gval->type == GCONF_VALUE_INT) {
-+			i_value = gconf_value_get_int(gval);
-+			g_synaptics_set_horizontal_scroll_delta (synaptics, i_value);
-+		}
-+		gconf_value_free(gval);
-+	}
- 	
- 	/* circular scroll */
--	i_value = gconf_client_get_int (gconf, CIRCSCROLLDELTA_KEY, NULL);
--	b_value = gconf_client_get_bool (gconf, CIRCULARSCROLLING_KEY, NULL);
--	g_synaptics_set_circular_scroll_delta (synaptics, i_value);
--	g_synaptics_set_circular_scroll_enabled (synaptics, b_value);
-+	gval = gconf_client_get (gconf, CIRCSCROLLDELTA_KEY, NULL);
-+	if (gval != NULL) {
-+		if (gval->type == GCONF_VALUE_INT) {
-+			i_value = gconf_value_get_int(gval);
-+			g_synaptics_set_circular_scroll_delta (synaptics, i_value);
-+		}
-+		gconf_value_free(gval);
-+	}
-+	gval = gconf_client_get (gconf, CIRCULARSCROLLING_KEY, NULL);
-+	if (gval != NULL) {
-+		if (gval->type == GCONF_VALUE_BOOL) {
-+			b_value = gconf_value_get_bool(gval);
-+			g_synaptics_set_circular_scroll_enabled (synaptics, b_value);
-+		}
-+		gconf_value_free(gval);
-+	}
- 	/* the trigger of circular scrolling */
--	i_value = gconf_client_get_int (gconf, CIRCSCROLLTRIGGER_KEY, NULL);
--	g_synaptics_set_circular_scroll_trigger (synaptics, i_value);
-+	gval = gconf_client_get (gconf, CIRCSCROLLTRIGGER_KEY, NULL);
-+	if (gval != NULL) {
-+		if (gval->type == GCONF_VALUE_INT) {
-+			i_value = gconf_value_get_int(gval);
-+			g_synaptics_set_circular_scroll_trigger (synaptics, i_value);
-+		}
-+		gconf_value_free(gval);
-+	}
- 	
- 	
- 	/* tapping time */
--	i_value = gconf_client_get_int (gconf, MAXTAPTIME_KEY, NULL);
--	g_synaptics_set_tap_time (synaptics, i_value);
-+	gval = gconf_client_get (gconf, MAXTAPTIME_KEY, NULL);
-+	if (gval != NULL) {
-+		if (gval->type == GCONF_VALUE_INT) {
-+			i_value = gconf_value_get_int(gval);
-+			g_synaptics_set_tap_time (synaptics, i_value);
-+		}
-+		gconf_value_free(gval);
-+	}
- 	
- 	/* fast taps */
--	b_value = gconf_client_get_bool (gconf, FASTTAPS_KEY, NULL);
--	g_synaptics_set_fast_taps (synaptics, b_value);
-+	gval = gconf_client_get (gconf, FASTTAPS_KEY, NULL);
-+	if (gval != NULL) {
-+		if (gval->type == GCONF_VALUE_BOOL) {
-+			b_value = gconf_value_get_bool(gval);
-+			g_synaptics_set_fast_taps (synaptics, b_value);
-+		}
-+		gconf_value_free(gval);
-+	}
- 	
- 	/* sensitivity */
--	i_value = gconf_client_get_int (gconf, SENSITIVITY_KEY, NULL);
--	g_synaptics_set_sensitivity (synaptics, i_value);
-+	gval = gconf_client_get (gconf, SENSITIVITY_KEY, NULL);
-+	if (gval != NULL) {
-+		if (gval->type == GCONF_VALUE_INT) {
-+			i_value = gconf_value_get_int(gval);
-+			g_synaptics_set_sensitivity (synaptics, i_value);
-+		}
-+		gconf_value_free(gval);
-+	}
- 
- 	/* coasting */
--	b_value = gconf_client_get_bool (gconf, COASTENABLE_KEY, NULL);
--	g_synaptics_set_coasting_enabled (synaptics, b_value);
-+	gval = gconf_client_get (gconf, COASTENABLE_KEY, NULL);
-+	if (gval != NULL) {
-+		if (gval->type == GCONF_VALUE_BOOL) {
-+			b_value = gconf_value_get_bool(gval);
-+			g_synaptics_set_coasting_enabled (synaptics, b_value);
-+		}
-+		gconf_value_free(gval);
-+	}
- 	
- 	/* edge motion */
--	b_value = gconf_client_get_bool (gconf, EDGEMOTIONUSEALWAYS_KEY, NULL);
--	g_synaptics_set_edge_motion_enabled (synaptics, b_value);
-+	gval = gconf_client_get (gconf, EDGEMOTIONUSEALWAYS_KEY, NULL);
-+	if (gval != NULL) {
-+		if (gval->type == GCONF_VALUE_BOOL) {
-+			b_value = gconf_value_get_bool(gval);
-+			g_synaptics_set_edge_motion_enabled (synaptics, b_value);
-+		}
-+		gconf_value_free(gval);
-+	}
- 
- 	/* min speed */
--	i_value = gconf_client_get_int (gconf, MINSPEED_KEY, NULL);
--	g_synaptics_set_min_speed (synaptics, i_value);
-+	gval = gconf_client_get (gconf, MINSPEED_KEY, NULL);
-+	if (gval != NULL) {
-+		if (gval->type == GCONF_VALUE_INT) {
-+			i_value = gconf_value_get_int(gval);
-+			g_synaptics_set_min_speed (synaptics, i_value);
-+		}
-+		gconf_value_free(gval);
-+	}
- 
- 	/* max speed */
--	i_value = gconf_client_get_int (gconf, MAXSPEED_KEY, NULL);
--	g_synaptics_set_max_speed (synaptics, i_value);
-+	gval = gconf_client_get (gconf, MAXSPEED_KEY, NULL);
-+	if (gval != NULL) {
-+		if (gval->type == GCONF_VALUE_INT) {
-+			i_value = gconf_value_get_int(gval);
-+			g_synaptics_set_max_speed (synaptics, i_value);
-+		}
-+		gconf_value_free(gval);
-+	}
- 
- 	/* accel factor */
--	i_value = gconf_client_get_int (gconf, ACCELFACTOR_KEY, NULL);
--	g_synaptics_set_accel_factor (synaptics, i_value);
-+	gval = gconf_client_get (gconf, ACCELFACTOR_KEY, NULL);
-+	if (gval != NULL) {
-+		if (gval->type == GCONF_VALUE_INT) {
-+			i_value = gconf_value_get_int(gval);
-+			g_synaptics_set_accel_factor (synaptics, i_value);
-+		}
-+		gconf_value_free(gval);
-+	}
- 
- }
- 
diff --git a/community/gsynaptics/dot-fixes.dpatch b/community/gsynaptics/dot-fixes.dpatch
deleted file mode 100644
index ec8e06fcd..000000000
--- a/community/gsynaptics/dot-fixes.dpatch
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## dot-fixces.dpatch by Unknown
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix format strings to always use . as decimal separator, see 
-## DP: https://sourceforge.jp/tracker/index.php?func=detail&aid=12498&group_id=1720&atid=6435
-## DP: Forwarded to https://sourceforge.jp/tracker/index.php?func=detail&aid=12544&group_id=1720&atid=6435
-
-@DPATCH@
-diff -urNad gsynaptics-0.9.14~/src/gsynaptics.c gsynaptics-0.9.14/src/gsynaptics.c
---- gsynaptics-0.9.14~/src/gsynaptics.c	2008-02-28 23:21:17.000000000 +0100
-+++ gsynaptics-0.9.14/src/gsynaptics.c	2008-05-17 08:36:54.000000000 +0200
-@@ -713,8 +713,9 @@
- 	if (priv->synclient)
- 	{
- 		gchar *command;
--		command = g_strdup_printf ("synclient AccelFactor=%f",
--			       		   (gdouble)value / 1000);
-+		char strval[G_ASCII_DTOSTR_BUF_SIZE];
-+		g_ascii_dtostr(strval, sizeof(strval), (gdouble)value / 1000);
-+		command = g_strdup_printf ("synclient AccelFactor=%s", strval);
- 		g_spawn_command_line_async (command, NULL);
- 		g_free (command);
- 	}
-@@ -734,8 +735,9 @@
- 	if (priv->synclient)
- 	{
- 		gchar *command;
--		command = g_strdup_printf ("synclient MaxSpeed=%f",
--			       		   (gdouble)value / 1000);
-+		char strval[G_ASCII_DTOSTR_BUF_SIZE];
-+		g_ascii_dtostr(strval, sizeof(strval), (gdouble)value / 1000);
-+		command = g_strdup_printf ("synclient MaxSpeed=%s", strval);
- 		g_spawn_command_line_async (command, NULL);
- 		g_free (command);
- 	}
-@@ -755,8 +757,9 @@
- 	if (priv->synclient)
- 	{
- 		gchar *command;
--		command = g_strdup_printf ("synclient MinSpeed=%f",
--			       		   (gdouble)value / 1000);
-+		char strval[G_ASCII_DTOSTR_BUF_SIZE];
-+		g_ascii_dtostr(strval, sizeof(strval), (gdouble)value / 1000);
-+		command = g_strdup_printf ("synclient MinSpeed=%s", strval);
- 		g_spawn_command_line_async (command, NULL);
- 		g_free (command);
- 	}
-@@ -822,8 +825,10 @@
- 	if (priv->synclient)
- 	{
- 		gchar *command;
--		command = g_strdup_printf ("synclient CoastingSpeedThreshold=%f",
--			       		   thresh);
-+		char strval[G_ASCII_DTOSTR_BUF_SIZE];
-+		g_ascii_dtostr(strval, sizeof(strval), thresh);
-+		command = g_strdup_printf ("synclient CoastingSpeed=%s",
-+			       		   strval);
- 		g_spawn_command_line_async (command, NULL);
- 		g_free (command);
- 	}
-@@ -843,8 +848,9 @@
- 	if (priv->synclient)
- 	{
- 		gchar *command;
--		command = g_strdup_printf ("synclient CircScrollDelta=%f",
--			       		   (gdouble)delta / 1000);
-+		char strval[G_ASCII_DTOSTR_BUF_SIZE];
-+		g_ascii_dtostr(strval, sizeof(strval), (gdouble)delta / 1000);
-+		command = g_strdup_printf ("synclient CircScrollDelta=%s", strval);
- 		g_spawn_command_line_async (command, NULL);
- 		g_free (command);
- 	}
diff --git a/community/gsynaptics/gsynaptics.install b/community/gsynaptics/gsynaptics.install
deleted file mode 100644
index 5b505b7b3..000000000
--- a/community/gsynaptics/gsynaptics.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-cat << EOF
->>>
->>> This tool can only be used if "SHMConfig" "true" is set
->>> in the  synaptics section in your xorg.conf
->>>
->>> Also have gsynaptics-init start with gnome by going to
->>> [Desktop] - [Preferences] - [Sessions] - [Startup Programs]
->>> Non-GNOME users can start it with their .xinitrc or .xsession
->>>
-EOF
-}
diff --git a/community/gtk-aurora-engine/PKGBUILD b/community/gtk-aurora-engine/PKGBUILD
index b1dae6d08..9487a1838 100644
--- a/community/gtk-aurora-engine/PKGBUILD
+++ b/community/gtk-aurora-engine/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=gtk-aurora-engine
 pkgver=1.5.1
-pkgrel=3
+pkgrel=3.1
 pkgdesc="gtk-engine: latest member of the clearlooks family"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome-look.org/content/show.php/Aurora+Gtk+Engine?content=56438"
@@ -13,13 +13,16 @@ license=('GPL')
 depends=('gtk2')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://www.gnome-look.org/CONTENT/content-files/56438-aurora-${pkgver}.tar.bz2)
-md5sums=('5eeea57c5938306ad7ccfc7cd71d009d')
+source=(http://www.gnome-look.org/CONTENT/content-files/56438-aurora-${pkgver}.tar.bz2
+	gtk-aurora-engine-1.5.1-glib.patch)
+md5sums=('5eeea57c5938306ad7ccfc7cd71d009d'
+	 '2ca6931d6e0bd5d84efdaa21ec482716')
 
 build() {
 	cd ${srcdir}
 	tar xzf aurora-gtk-engine-1.5.tar.gz -C ${srcdir}
 	cd ${srcdir}/aurora-1.5
+	patch -Np1 -i ${srcdir}/gtk-aurora-engine-1.5.1-glib.patch
 	./configure --prefix=/usr --enable-animation
 	make
 }
diff --git a/community/gtk-aurora-engine/gtk-aurora-engine-1.5.1-glib.patch b/community/gtk-aurora-engine/gtk-aurora-engine-1.5.1-glib.patch
new file mode 100644
index 000000000..4c4d29677
--- /dev/null
+++ b/community/gtk-aurora-engine/gtk-aurora-engine-1.5.1-glib.patch
@@ -0,0 +1,11 @@
+--- aurora-1.5.orig/src/animation.c	2008-05-04 14:59:36.000000000 -0500
++++ aurora-1.5/src/animation.c	2013-02-10 18:57:26.648315428 -0500
+@@ -7,7 +7,7 @@
+ #include "animation.h"
+ 
+ #ifdef HAVE_ANIMATION
+-#include <glib/gtimer.h>
++#include <glib.h>
+ 
+ struct _AnimationInfo {
+ 	GTimer *timer;
diff --git a/community/gtk-kde4/PKGBUILD b/community/gtk-kde4/PKGBUILD
deleted file mode 100644
index 9891313ae..000000000
--- a/community/gtk-kde4/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 57913 2011-11-04 12:08:54Z lcarlier $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Viliam Pucik <viliam dot pucik at gmail dot com>
-
-pkgname=gtk-kde4
-pkgver=0.9.5b
-pkgrel=2
-pkgdesc='Allows you to change style, icons, font of GTK applications in KDE4.'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://kde-look.org/content/show.php?content=74689'
-license=('GPL')
-depends=('kdebase-workspace' 'gtk-engines')
-makedepends=('cmake' 'automoc4')
-provides=('gtk-qt-engine')
-source=("http://betta.houa.org/no-site/${pkgname}(src)${pkgver}.tar.gz"
-        'fix-permission.patch')
-md5sums=('d5998e4ccd4bd4b4d6a61e7afe8bbecb'
-         'f52fa3288c728e5fad72c5d136b49bc5')
-
-build() {
-  cd ${pkgname}
-
-  patch -p1 -i ${srcdir}/fix-permission.patch
-  cmake -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr
-
-  make
-}
-
-package() {
-  cd ${pkgname}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community/gtk-kde4/fix-permission.patch b/community/gtk-kde4/fix-permission.patch
deleted file mode 100644
index 29d6c3903..000000000
--- a/community/gtk-kde4/fix-permission.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- gtk-kde4/CMakeLists.txt~	2010-09-28 11:16:32.000000000 -0700
-+++ gtk-kde4/CMakeLists.txt	2010-10-26 12:31:35.400040780 -0700
-@@ -32,15 +32,8 @@
- 
- add_subdirectory(kcm/helper)
- 
--INSTALL(FILES ${PROJECT_BINARY_DIR}/daemon/gtk-kde4 DESTINATION ${KDE4_BIN_INSTALL_DIR} PERMISSIONS WORLD_EXECUTE)
--#INSTALL(FILES ${PROJECT_BINARY_DIR}/.gtkrc-2.0-kde4 DESTINATION $ENV{HOME} PERMISSIONS WORLD_READ)
--
--string(LENGTH conf len)
--IF (NOT len)
--  INSTALL(FILES ${PROJECT_BINARY_DIR}/daemon/gtk-kde4.desktop DESTINATION $ENV{XDG_CONFIG_DIRS}/autostart PERMISSIONS WORLD_EXECUTE)
--ELSE()
--  INSTALL(FILES ${PROJECT_BINARY_DIR}/daemon/gtk-kde4.desktop DESTINATION /etc/xdg/autostart PERMISSIONS WORLD_EXECUTE WORLD_READ)
--ENDIF()
-+INSTALL(PROGRAMS daemon/gtk-kde4 DESTINATION ${KDE4_BIN_INSTALL_DIR})
-+INSTALL(PROGRAMS daemon/gtk-kde4.desktop DESTINATION /etc/xdg/autostart)
- 
- FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
-  
-@@ -74,4 +67,4 @@
-  
-         ENDFOREACH(_poFile ${PO_FILES})
-  
--ENDIF(NOT GETTEXT_MSGFMT_EXECUTABLE)
-\ No newline at end of file
-+ENDIF(NOT GETTEXT_MSGFMT_EXECUTABLE)
diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD
index 303c49e6e..edf0440f6 100644
--- a/community/gtk2hs-buildtools/PKGBUILD
+++ b/community/gtk2hs-buildtools/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 83991 2013-02-08 04:15:23Z td123 $
+# $Id: PKGBUILD 89286 2013-04-28 16:52:07Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=gtk2hs-buildtools
-pkgver=0.12.3.1
-pkgrel=4
+pkgver=0.12.4
+pkgrel=2
 pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries."
 url="http://hackage.haskell.org/package/gtk2hs-buildtools"
 license=('GPL2')
@@ -12,16 +12,11 @@ makedepends=('ghc' 'alex' 'happy' 'haskell-random')
 depends=('gmp')
 options=('strip')
 provides=('haskell-gtk2hs-buildtools')
-source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz
-        '0001-fix-for-ghc-7.6.1-changes.patch')
-md5sums=('612611d831635024c953d2817b124e29'
-         'b6551d8085c97bc2c6600ab397833101')
+source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz)
+md5sums=('ad3d78bf7c25fdb4c713c3528d137a81')
 
 build() {
     cd ${srcdir}/gtk2hs-buildtools-$pkgver
-
-    patch -Np1 -i ${srcdir}/0001-fix-for-ghc-7.6.1-changes.patch
-
     runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname}
     runhaskell Setup build
 }
diff --git a/community/gtkpod/PKGBUILD b/community/gtkpod/PKGBUILD
index 5cb27cb9b..795c9eeff 100644
--- a/community/gtkpod/PKGBUILD
+++ b/community/gtkpod/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 83150 2013-01-27 16:17:12Z pierre $
+# $Id: PKGBUILD 89564 2013-04-30 05:59:32Z cinelli $
+# Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=gtkpod
 pkgver=2.1.3
-pkgrel=1
+pkgrel=3
 pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
 arch=('i686' 'x86_64')
 url="http://gtkpod.sourceforge.net"
 license=('GPL')
-depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'dconf' 'libwebkit3')
-makedepends=('flex' 'intltool' 'libvorbis' 'faad2')
+depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'libwebkit3')
+makedepends=('flex' 'intltool' 'faad2' 'libvorbis')
 optdepends=('libmp4v2: MP4/h264 support'
             'vorbis-tools: OGG support'
 	    'libvorbis: OGG support'
@@ -18,20 +19,22 @@ optdepends=('libmp4v2: MP4/h264 support'
             'faad2: m4a conversion support')
 install=gtkpod.install
 options=('!libtool')
-source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz"
-        gtkpod-2.1.3-gdl-3.6.patch)
+source=("http://downloads.sourceforge.net/gtkpod/$pkgname-$pkgver.tar.gz"
+	gtkpod-2.1.3-gdl-3.6.patch)
 md5sums=('57f04578de6e3262a436ec574422b144'
-         '8d725015081bd89bc8f9a4521d170aef')
+	 '94a4cc0b47ba8895c0a51e53e94da517')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/gtkpod-2.1.3-gdl-3.6.patch"
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -p1 -i "$srcdir/gtkpod-2.1.3-gdl-3.6.patch"
   sed -i 's#python#python2#' scripts/sync-palm-jppy.py
+
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/gtkpod/gtkpod-2.1.3-gdl-3.6.patch b/community/gtkpod/gtkpod-2.1.3-gdl-3.6.patch
index b794fa11b..109ec08a9 100644
--- a/community/gtkpod/gtkpod-2.1.3-gdl-3.6.patch
+++ b/community/gtkpod/gtkpod-2.1.3-gdl-3.6.patch
@@ -1,7 +1,7 @@
-Index: gtkpod-2.1.2/src/anjuta-action-callbacks.c
+Index: gtkpod-2.1.3/src/anjuta-action-callbacks.c
 ===================================================================
---- gtkpod-2.1.2.orig/src/anjuta-action-callbacks.c
-+++ gtkpod-2.1.2/src/anjuta-action-callbacks.c
+--- gtkpod-2.1.3.orig/src/anjuta-action-callbacks.c
++++ gtkpod-2.1.3/src/anjuta-action-callbacks.c
 @@ -65,7 +65,7 @@ void
  on_layout_lock_toggle (GtkAction *action, AnjutaApp *app)
  {
@@ -11,10 +11,10 @@ Index: gtkpod-2.1.2/src/anjuta-action-callbacks.c
  					  gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)),
  					  NULL);
  }
-Index: gtkpod-2.1.2/src/anjuta-app.c
+Index: gtkpod-2.1.3/src/anjuta-app.c
 ===================================================================
---- gtkpod-2.1.2.orig/src/anjuta-app.c
-+++ gtkpod-2.1.2/src/anjuta-app.c
+--- gtkpod-2.1.3.orig/src/anjuta-app.c
++++ gtkpod-2.1.3/src/anjuta-app.c
 @@ -252,7 +252,7 @@ static void on_gdl_style_changed(GSettin
      else if (g_strcmp0(pr_style, "Tabs") == 0)
          style = GDL_SWITCHER_STYLE_TABS;
@@ -42,3 +42,18 @@ Index: gtkpod-2.1.2/src/anjuta-app.c
              G_CALLBACK (on_layout_locked_notify), app);
  
      /* UI engine */
+Index: gtkpod-2.1.3/src/gtkpod.c
+===================================================================
+--- gtkpod-2.1.3.orig/src/gtkpod.c
++++ gtkpod.2.1.3/src/gtkpod.c
+@@ -235,8 +235,8 @@ void
+     session_dir = get_user_session_dir();
+     anjuta_shell_session_save(ANJUTA_SHELL(app), session_dir, NULL);
+     g_free(session_dir);
+-
+-    anjuta_shell_notify_exit(ANJUTA_SHELL(app), NULL);
++    
++    /* anjuta_shell_notify_exit(ANJUTA_SHELL(app), NULL); */
+ 
+     if (!gtkpod_cleanup_quit()) {
+         // Dont want to quit so avoid signalling any destroy event
diff --git a/community/gtksourceviewmm/PKGBUILD b/community/gtksourceviewmm/PKGBUILD
index 772cdf873..10e838d35 100644
--- a/community/gtksourceviewmm/PKGBUILD
+++ b/community/gtksourceviewmm/PKGBUILD
@@ -1,10 +1,10 @@
-#$Id: PKGBUILD 82071 2013-01-07 09:40:20Z arodseth $
+#$Id: PKGBUILD 88691 2013-04-21 22:17:11Z heftig $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceviewmm
 pkgver=3.2.0
-pkgrel=2
+pkgrel=4
 pkgdesc='C++ bindings for the gtksourceview library'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://projects.gnome.org/gtksourceviewmm/'
diff --git a/community/gtkspell3/PKGBUILD b/community/gtkspell3/PKGBUILD
index a7dcee2f6..bb8f162ed 100644
--- a/community/gtkspell3/PKGBUILD
+++ b/community/gtkspell3/PKGBUILD
@@ -1,32 +1,30 @@
-# $Id: PKGBUILD 69145 2012-04-09 20:12:18Z bgyorgy $
+# $Id: PKGBUILD 87235 2013-03-28 21:25:14Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gtkspell3
-_pkgname=gtkspell
-pkgver=3.0.0.hg20110814
-_pkgver=3.0.0~hg20110814
+pkgver=3.0.2
 pkgrel=1
 url="http://gtkspell.sourceforge.net/"
 pkgdesc="Provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtk3' 'enchant')
-makedepends=('intltool')
+makedepends=('intltool' 'gobject-introspection' 'vala')
 options=('!libtool')
-source=(http://pkgbuild.com/~bgyorgy/sources/${pkgname}_$_pkgver.orig.tar.gz)
-md5sums=('7cebcfa281f1f21fcb419f559a3e9e56')
+source=(http://gtkspell.sourceforge.net/download/$pkgname-$pkgver.tar.gz)
+md5sums=('5db501ead123ffbe8aad7d5f76c44c71')
 
 build() {
-  cd "$srcdir/$_pkgname-3.0.0+dev"
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr --disable-static
   make
 }
 
 package() {
-  cd "$srcdir/$_pkgname-3.0.0+dev"
+  cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD
index e61a9cd9d..5054d37be 100644
--- a/community/gtkwave/PKGBUILD
+++ b/community/gtkwave/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 76513 2012-09-20 19:33:36Z kkeen $
+# $Id: PKGBUILD 89164 2013-04-27 12:32:34Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Jared Casper <jaredcasper@gmail.com>
 
 pkgname=gtkwave
-pkgver=3.3.40
+pkgver=3.3.45
 pkgrel=1
 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2')
 makedepends=('gperf')
 install='gtkwave.install'
 source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz")
-md5sums=('f7b4cd0d056084f6725173b7f939152c')
+md5sums=('d746e1ce0584155e3af1d7ba5b0e56f0')
 
 build() {
   cd "${srcdir}/gtkwave-${pkgver}"
diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD
index 061476cc2..8172c0ac2 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -1,34 +1,42 @@
-# $Id: PKGBUILD 82444 2013-01-18 06:43:16Z jlichtblau $
+# $Id: PKGBUILD 88692 2013-04-21 22:17:13Z heftig $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: Christer Solskogen (solskogen@carebears.mine.nu)
 
 pkgname=gtranslator
 pkgver=2.91.6
-pkgrel=1
-pkgdesc="An enhanced gettext po file editor for the GNOME"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://projects.gnome.org/gtranslator/"
+pkgrel=4
+pkgdesc='Enhanced gettext po file editor for the GNOME'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://projects.gnome.org/gtranslator/'
 license=('GPL')
 depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell3' 'iso-codes' 'libgda' 'libpeas' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf')
-makedepends=('intltool' 'itstool' 'gnome-doc-utils' 'gucharmap' 'json-glib')
+makedepends=('intltool' 'itstool' 'gnome-doc-utils' 'gucharmap' 'json-glib' 'gnome-common' 'yelp-tools')
 optdepends=('gucharmap: for charmap plugin'
             'json-glib: for open-tran plugin')
 options=('!libtool')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz)
-sha256sums=('a1fd4b17b1f32cc7223a31d34e34f95b20acc7b5a23768351a34ff0b7a4bcdf6')
+install="$pkgname.install"
+source=("http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz"
+        'gtkspell3-port.patch')
+sha256sums=('a1fd4b17b1f32cc7223a31d34e34f95b20acc7b5a23768351a34ff0b7a4bcdf6'
+            '29afb55c692869cbd47d0181ddd93acdd53f5b236ebabd9a96a983da66d4cb9d')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
 
+  # port to the new gtkspell3
+  patch -Np1 -i "$srcdir/gtkspell3-port.patch"
+
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/gtranslator/disable-dockbar.patch b/community/gtranslator/disable-dockbar.patch
deleted file mode 100644
index aa8de6c60..000000000
--- a/community/gtranslator/disable-dockbar.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Naur gtranslator-2.91.5.orig/src/gtr-tab.c gtranslator-2.91.5/src/gtr-tab.c
---- gtranslator-2.91.5.orig/src/gtr-tab.c	2012-06-07 13:48:56.000000000 +0200
-+++ gtranslator-2.91.5/src/gtr-tab.c	2012-11-05 19:18:01.899014670 +0100
-@@ -149,9 +149,6 @@
-   g_return_if_fail (GTR_IS_TAB (tab));
-   g_return_if_fail (filename != NULL);
- 
--  gdl_dock_layout_save_layout (tab->priv->layout_manager, name);
--  if (!gdl_dock_layout_save_to_file (tab->priv->layout_manager, filename))
--    g_warning ("Saving dock layout to '%s' failed!", filename);
- }
- 
- static void
-@@ -160,23 +157,6 @@
-                      const gchar *name)
- {
-   g_return_if_fail (GTR_IS_TAB (tab));
--
--  if (!layout_filename ||
--      !gdl_dock_layout_load_from_file (tab->priv->layout_manager,
--                                       layout_filename))
--    {
--      gchar *path;
--
--      path = gtr_dirs_get_ui_file ("layout.xml");
--
--      if (!gdl_dock_layout_load_from_file (tab->priv->layout_manager,
--                                           path))
--        g_warning ("Loading layout from '%s' failed!!", path);
--      g_free (path);
--    }
--
--  if (!gdl_dock_layout_load_layout (tab->priv->layout_manager, name))
--    g_warning ("Loading layout failed!!");
- }
- 
- static void
-@@ -702,7 +682,6 @@
-   GtkWidget *vertical_box;
-   GtkWidget *msgid_label;
-   GtkWidget *scroll;
--  GtkWidget *dockbar;
-   GtrTabPrivate *priv;
- 
-   tab->priv = GTR_TAB_GET_PRIVATE (tab);
-@@ -727,22 +706,6 @@
-   gtk_widget_show (priv->dock);
-   gtk_box_pack_end (GTK_BOX (hbox), priv->dock, TRUE, TRUE, 0);
- 
--  dockbar = gdl_dock_bar_new (GDL_DOCK (priv->dock));
--  gtk_widget_show (dockbar);
--  gtk_box_pack_start (GTK_BOX (hbox), dockbar, FALSE, FALSE, 0);
--
--  priv->layout_manager = gdl_dock_layout_new (GDL_DOCK (priv->dock));
--  g_signal_connect (priv->layout_manager->master,
--                    "layout-changed",
--                    G_CALLBACK (on_layout_changed),
--                    tab);
--
--  g_settings_bind (priv->ui_settings,
--                   GTR_SETTINGS_PANEL_SWITCHER_STYLE,
--                   priv->layout_manager->master,
--                   "switcher-style",
--                   G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
--
-   /* Message table */
-   priv->message_table = gtr_message_table_new (GTK_WIDGET (tab));
-   gtk_widget_show (priv->message_table);
-@@ -904,7 +867,6 @@
-   g_clear_object (&priv->files_settings);
-   g_clear_object (&priv->editor_settings);
-   g_clear_object (&priv->state_settings);
--  g_clear_object (&priv->layout_manager);
- 
-   G_OBJECT_CLASS (gtr_tab_parent_class)->dispose (object);
- }
diff --git a/community/gtranslator/gtkspell3-port.patch b/community/gtranslator/gtkspell3-port.patch
new file mode 100644
index 000000000..e12e3a9d6
--- /dev/null
+++ b/community/gtranslator/gtkspell3-port.patch
@@ -0,0 +1,97 @@
+From cf33d8761dbfc7f6c8b27c3146efcad81f8fbde9 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember@gmail.com>
+Date: Sun, 13 Jan 2013 13:19:40 +0000
+Subject: Port to gtkspell3
+
+https://bugzilla.gnome.org/show_bug.cgi?id=691655
+---
+diff --git a/configure.ac b/configure.ac
+index c1ba5b6..3fe9c46 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -84,7 +84,7 @@ GDL_REQUIRED=3.6.0
+ GDA_REQUIRED=4.2.3
+ PEAS_REQUIRED=1.2.0
+ GDICT_OPTIONAL=0.11.0
+-GTKSPELL_OPTIONAL=2.99.99
++GTKSPELL_OPTIONAL=3.0.0
+ JSON_GLIB_OPTIONAL=0.12.0
+ 
+ AC_ARG_WITH(gda,
+@@ -174,14 +174,14 @@ dnl -------------------------------------------------------------------
+ dnl Check for gtkspell >= 3.0 and use it if found
+ dnl -------------------------------------------------------------------
+ have_gtkspell=no
+-AC_ARG_WITH(gtkspell3,
++AC_ARG_WITH(gtkspell,
+             AS_HELP_STRING([--with-gtkspell],[Build with spell support]),,
+             with_gtkspell=auto)
+ 
+ if test x"$with_gtkspell" != "xno"
+ then
+         PKG_CHECK_MODULES([GTKSPELL], [
+-                gtkspell-3.0 >= $GTKSPELL_OPTIONAL
++                gtkspell3-3.0 >= $GTKSPELL_OPTIONAL
+         ], have_gtkspell=yes, have_gtkspell=no)
+ 
+         if test x"$have_gtkspell" = "xyes"
+@@ -339,7 +339,7 @@ if [ test x"$have_gtkspell" = "xyes" ]; then
+ 	echo "Building spell support: ................................YES"
+ else
+ 	echo "Building spell support: ................................NO"
+-		echo "        Requires gtkspell >= $GTKSPELL_OPTIONAL"
++		echo "        Requires gtkspell3 >= $GTKSPELL_OPTIONAL"
+ fi
+ 
+ echo "
+diff --git a/src/gtr-view.c b/src/gtr-view.c
+index 59f18e8..b9c4f6a 100644
+--- a/src/gtr-view.c
++++ b/src/gtr-view.c
+@@ -65,7 +65,7 @@ struct _GtrViewPrivate
+   gchar *search_text;
+ 
+ #ifdef HAVE_GTKSPELL
+-  GtkSpell *spell;
++  GtkSpellChecker *spell;
+ #endif
+ };
+ 
+@@ -75,11 +75,10 @@ gtr_attach_gtkspell (GtrView * view)
+ {
+   GError *error = NULL;
+   gchar *errortext = NULL;
+-  view->priv->spell = NULL;
+ 
+-  view->priv->spell =
+-    gtkspell_new_attach (GTK_TEXT_VIEW (view), NULL, &error);
+-  if (view->priv->spell == NULL)
++  view->priv->spell = gtk_spell_checker_new ();
++  gtk_spell_checker_set_language (view->priv->spell, NULL, &error);
++  if (error)
+     {
+       g_warning (_("gtkspell error: %s\n"), error->message);
+       errortext =
+@@ -90,6 +89,11 @@ gtr_attach_gtkspell (GtrView * view)
+       g_error_free (error);
+       g_free (errortext);
+     }
++  else
++    {
++      gtk_spell_checker_attach (view->priv->spell,
++                                GTK_TEXT_VIEW (view));
++    }
+ }
+ #endif
+ 
+@@ -263,7 +267,7 @@ gtr_view_enable_spellcheck (GtrView * view, gboolean enable)
+ #ifdef HAVE_GTKSPELL
+       if (!view->priv->spell)
+         return;
+-      gtkspell_detach (view->priv->spell);
++      gtk_spell_checker_detach (view->priv->spell);
+ #endif
+     }
+ }
+--
+cgit v0.9.1
diff --git a/community/gtranslator/gtranslator.changelog b/community/gtranslator/gtranslator.changelog
index 9dbf32879..393b0e71c 100644
--- a/community/gtranslator/gtranslator.changelog
+++ b/community/gtranslator/gtranslator.changelog
@@ -1,3 +1,7 @@
+2013-03-28 Balló György <ballogyor+arch at gmail dot com>
+	* gtranslator 2.91.6-3
+	rebuild for the new gtkspell3
+
 2013-01-18 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
 	* gtranslator 2.91.6-1
 
diff --git a/community/guake/0001-Retrieve-port-as-int.2.patch b/community/guake/0001-Retrieve-port-as-int.2.patch
deleted file mode 100644
index 3fde26dc2..000000000
--- a/community/guake/0001-Retrieve-port-as-int.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From efcd1d8d3cdc354f46bc2485e7e3394f8578b7ba Mon Sep 17 00:00:00 2001
-From: pingou <pingou@pingoured.fr>
-Date: Mon, 23 Aug 2010 09:54:35 +0200
-Subject: [PATCH] Retrieve port as int
-
----
- src/guake.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/guake.py b/src/guake.py
-index 6214fb2..40e688f 100644
---- a/src/guake.py
-+++ b/src/guake.py
-@@ -1099,7 +1099,7 @@ class Guake(SimpleGladeApp):
-                 ssl_port = port
-             else:
-                 ssl_host = self.client.get_string('/system/proxy/secure_host')
--                ssl_port = self.client.get_string('/system/proxy/secure_port')
-+                ssl_port = self.client.get_int('/system/proxy/secure_port')
- 
-             if self.client.get_bool(proxy + 'use_authentication'):
-                 auth_user = self.client.get_string(
--- 
-1.7.2.1
-
diff --git a/community/guake/guake-fix-pref.desktop.patch b/community/guake/guake-fix-pref.desktop.patch
deleted file mode 100644
index 6bd256d28..000000000
--- a/community/guake/guake-fix-pref.desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- guake-0.4.2-orig/data/guake-prefs.desktop.in	2009-12-01 12:51:08.000000000 +0100
-+++ guake-0.4.2/data/guake-prefs.desktop.in	2012-05-21 17:07:05.982022360 +0200
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- Name=Guake Preferences
- Name[pt_BR]=Preferências do Guake
--Comment=Comment=Configure your Guake sessions
-+Comment=Configure your Guake sessions
- Comment[pt_BR]=Configurações do terminal Guake
- TryExec=guake-prefs
- Exec=guake-prefs
diff --git a/community/guake/guake-glib2.32.patch b/community/guake/guake-glib2.32.patch
deleted file mode 100644
index a370e123c..000000000
--- a/community/guake/guake-glib2.32.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 0353da88e550031b4694a4168bd6d489f873d68a
-Author: max ulidtko <ulidtko@gmail.com>
-Date:   Fri Mar 2 07:51:38 2012 +0200
-
-    globalhotkeys build fix for glib 2.31
-    
-    apply patch from #425
-
-diff --git a/src/globalhotkeys/keybinder.h b/src/globalhotkeys/keybinder.h
-index 00e532d..69a50c0 100644
---- a/src/globalhotkeys/keybinder.h
-+++ b/src/globalhotkeys/keybinder.h
-@@ -2,7 +2,7 @@
- #ifndef __KEY_BINDER_H__
- #define __KEY_BINDER_H__
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/community/guayadeque/PKGBUILD b/community/guayadeque/PKGBUILD
new file mode 100755
index 000000000..7d0863cec
--- /dev/null
+++ b/community/guayadeque/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 86605 2013-03-20 15:17:37Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: Sial <sial@cpan.org>
+# Contributor: Martin Herndl <martin.herndl@gmail.com>
+
+pkgname=guayadeque
+pkgver=0.3.5
+pkgrel=5
+pkgdesc="Lightweight music player"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://guayadeque.org/"
+license=('GPL3')
+depends=('curl' 'dbus' 'desktop-file-utils' 'flac' 'libgpod' 'taglib' 'wxgtk')
+makedepends=('cmake')
+optdepends=('gstreamer0.10-good-plugins: Support for additional file formats'
+            'gvfs: Support for external devices')
+install=$pkgname.install
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+sha256sums=('8281286a715731b567097238e1c0aaf962e052fbc7e2761b10f36407eb6ec4d5')
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+# Build
+  ./build
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+# Install
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/calibre/calibre.install b/community/guayadeque/guayadeque.install
index 6210bd0ab..0294d6a5b 100644..100755
--- a/community/calibre/calibre.install
+++ b/community/guayadeque/guayadeque.install
@@ -1,12 +1,13 @@
 post_install() {
   update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
 }
 
-post_upgrade() {
+post_upgrade(){
   post_install
 }
 
-post_remove() {
+post_remove(){
   post_install
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/community/gupnp-dlna/PKGBUILD b/community/gupnp-dlna/PKGBUILD
deleted file mode 100644
index dba60702f..000000000
--- a/community/gupnp-dlna/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 68452 2012-03-24 21:52:20Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=gupnp-dlna
-pkgver=0.6.6
-pkgrel=1
-pkgdesc="Library to ease DLNA-related bits for applications using gupnp"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://gupnp.org/"
-license=('LGPL')
-depends=('gstreamer0.10-base-plugins')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('82a1e75c398379567a5a5db9acd19bd01334b4f0053c8a166a77bc09bf0ca047')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community/guvcview/PKGBUILD b/community/guvcview/PKGBUILD
index cae37825b..f0da4e0fc 100644
--- a/community/guvcview/PKGBUILD
+++ b/community/guvcview/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81531 2012-12-23 08:58:59Z giovanni $
+# $Id: PKGBUILD 85669 2013-03-04 16:14:23Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Maxwell Pray a.k.a. Synthead <synthead@gmail.com>
 
 pkgname=guvcview
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.7.0
+pkgrel=1
 pkgdesc="A video viewer and capturer for the linux uvc driver" 
 arch=('i686' 'x86_64' 'mips64el')
 url="http://guvcview.sourceforge.net/"
@@ -14,7 +14,7 @@ makedepends=('pkg-config' 'intltool')
 optdepends=('pulseaudio: for PulseAudio support')
 options=('!docs')
 source=("http://downloads.sourceforge.net/project/${pkgname}/source/${pkgname}-src-${pkgver}.tar.gz")
-md5sums=('b3dfd04d8aae0c807d5f5d6ba035580f')
+md5sums=('fe141fe2fe2a16df69f7866c27334a56')
 
 build() {
   cd "${srcdir}/${pkgname}-src-${pkgver}"
diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD
index 24b5f89d8..902455871 100644
--- a/community/gwenhywfar/PKGBUILD
+++ b/community/gwenhywfar/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 74856 2012-08-07 14:18:41Z spupykin $
+# $Id: PKGBUILD 85356 2013-03-01 10:32:40Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
 pkgname=gwenhywfar
 pkgver=4.3.3
 _dnrel=67
-pkgrel=1
+pkgrel=2
 pkgdesc="OS abstraction functions for various projects"
 arch=(i686 x86_64 'mips64el')
 url="http://www.aquamaniac.de"
 options=('!libtool')
 license=("LGPL")
 depends=('openssl' 'gnutls' 'libgcrypt')
-makedepends=('gtk2' 'qt')
-optdepends=('gtk2' 'qt')
+makedepends=('gtk2' 'qt4')
+optdepends=('gtk2' 'qt4')
 source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=${_dnrel}&file=01&dummy=gwenhywfar-$pkgver.tar.gz")
 md5sums=('c5b9d52a25960f84f9264a5a5dd484d1')
 
@@ -23,5 +23,9 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc --enable-ssl
   sed -i 's|gnutls_transport_set_lowat||g' src/sio/syncio_tls.c
   make
+}
+
+package() {
+  cd $srcdir/gwenhywfar-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD
index 476a1c3e2..1bb2f3054 100644
--- a/community/gwibber/PKGBUILD
+++ b/community/gwibber/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 83023 2013-01-26 16:24:38Z bgyorgy $
+# $Id: PKGBUILD 88679 2013-04-21 22:16:47Z heftig $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=gwibber
 pkgver=3.6.0
-pkgrel=2
+pkgrel=4
 pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gwibber.com/"
 license=('GPL')
-depends=('libgee' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf')
+depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf')
 makedepends=('intltool' 'vala')
 options=('!libtool')
 install=$pkgname.install
 source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz
         lp_934530.patch
         lp_1051801.patch
-        lp_1088775.patch)
+        lp_1088775.patch
+        gtkspell3-port.patch)
 md5sums=('5988e36e9f592c6eca6537ba6878307a'
          '8c43ae0ed96c52602befeff640a8672a'
          '0eb53f4f248a6c600b6c6dfaac12341f'
-         '5698a3b1699c018719b193362486c9b5')
+         '5698a3b1699c018719b193362486c9b5'
+         'e8c657543542d8141fdfe4b87a24d7fe')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -30,6 +32,9 @@ build() {
   patch -Np1 -i "$srcdir/lp_1051801.patch"
   patch -Np1 -i "$srcdir/lp_1088775.patch"
 
+  # Port to the new gtkspell3
+  patch -Np1 -i "$srcdir/gtkspell3-port.patch"
+
   # Use the standalone accounts configuration panel
   sed -i 's/"gnome-control-center", "credentials", "application=gwibber"/"credentials-preferences"/' client/gwibber-client.vala
   sed -i 's/"gnome-control-center", "credentials"/"credentials-preferences"/' gwibber/microblog/dispatcher.py
@@ -37,6 +42,8 @@ build() {
   # Remove unneeded dependency on libdbusmenu
   sed -i '/Dbusmenu-0.4/ d' client/Makefile.{am,in}
 
+  autoreconf -fi
+  intltoolize --force
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
               --disable-static --disable-schemas-compile --disable-unity
   make
diff --git a/community/gwibber/gtkspell3-port.patch b/community/gwibber/gtkspell3-port.patch
new file mode 100644
index 000000000..a7cc5da37
--- /dev/null
+++ b/community/gwibber/gtkspell3-port.patch
@@ -0,0 +1,29 @@
+diff -Naur gwibber-3.6.0.orig/configure.ac gwibber-3.6.0/configure.ac
+--- gwibber-3.6.0.orig/configure.ac	2012-10-03 02:09:08.000000000 +0200
++++ gwibber-3.6.0/configure.ac	2013-03-28 21:34:39.227995294 +0100
+@@ -159,10 +159,10 @@
+ 
+ if test "x$enable_spell" = "xyes"; then
+         PKG_CHECK_MODULES(GTKSPELL,
+-                  gtkspell-3.0)
++                  gtkspell3-3.0)
+         AC_SUBST(GTKSPELL_CFLAGS)
+         AC_SUBST(GTKSPELL_CFLAGS)
+-	GTKSPELL_PKG="--pkg gtkspell-3.0"
++	GTKSPELL_PKG="--pkg gtkspell3-3.0"
+         AC_SUBST(GTKSPELL_PKG)
+ fi
+ 
+diff -Naur gwibber-3.6.0.orig/libgwibber-gtk/entry.vala gwibber-3.6.0/libgwibber-gtk/entry.vala
+--- gwibber-3.6.0.orig/libgwibber-gtk/entry.vala	2012-08-21 06:14:19.000000000 +0200
++++ gwibber-3.6.0/libgwibber-gtk/entry.vala	2013-03-28 21:36:32.830637428 +0100
+@@ -141,7 +141,8 @@
+ #if HAVE_GTKSPELL
+             try
+             {
+-              var spell = new Gtk.Spell.attach(this, null);
++              var spell = new GtkSpell.Checker();
++              spell.attach(this);
+             }
+             catch (Error e)
+             {
diff --git a/community/gwibber/lp_959068.patch b/community/gwibber/lp_959068.patch
deleted file mode 100644
index 66b288ba7..000000000
--- a/community/gwibber/lp_959068.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-=== modified file 'libgwibber/streams.vala'
---- old/libgwibber/streams.vala	2012-03-19 13:35:30 +0000
-+++ new/libgwibber/streams.vala	2012-04-04 20:53:49 +0000
-@@ -213,13 +213,21 @@
-                 model = create_model ();
-               }
-               model.row_removed.connect((_m, _i) => {
-+                var to_remove = new GLib.List <string> ();
-                 foreach (var v in seen.entries)
-                 {
-                   if (v.value == _i)
-                   {
--                    seen.unset(v.key);
-+                    /* defer calling unset until after we are done iterating 
-+                     * the HashMap, it will resize making the iterator invalid
-+                     * This is fixed in the 0.7 series of libgee
-+                     * https://bugzilla.gnome.org/show_bug.cgi?id=671327
-+                     */
-+                    to_remove.prepend (v.key);
-                   }
-                 }
-+                foreach (var v in to_remove)
-+                  seen.unset(v);
-               });
-               Idle.add(() => {
-                 refresh_model_async.begin ();
-
diff --git a/community/hacburn/PKGBUILD b/community/hacburn/PKGBUILD
deleted file mode 100644
index 42d7a1eb0..000000000
--- a/community/hacburn/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 55602 2011-09-14 23:25:07Z dreisner $
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-pkgname=hacburn
-pkgver=0.3.5
-pkgrel=4
-pkgdesc="HacBurn is a script written in perl to aid in writing CDs. It is a graphical interface (using gtk+) to cdrtools, mpg321 and ogg123."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://hacburn.sourceforge.net/"
-license=('GPL')
-depends=('gtk2-perl' 'glib-perl' 'cdrkit' 'mpg321' 'vorbis-tools' 'gtk2' 'xorg-server' 'perl' 'cddb_get' 'lame')
-conflicts=('hacburn-cvs')
-source=(http://downloads.sourceforge.net/sourceforge/hacburn/HacBurn-$pkgver.tar.bz2)
-md5sums=('1e4b3e4b49de58259a446b7752f59f22')
-
-build() {
-  install -D -m755 $startdir/src/HacBurn-$pkgver/hacburn \
-  $startdir/pkg/usr/bin/hacburn
-  mkdir -p $startdir/pkg/usr/share/pixmaps
-  cp $startdir/src/HacBurn-$pkgver/hacburn.png \
-  $startdir/pkg/usr/share/pixmaps/hacburn.png
-}
diff --git a/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch b/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch
deleted file mode 100644
index 2e687db21..000000000
--- a/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c60f2ab90f6e39fdb515cc0305467e534f718a7d Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 11 Sep 2012 07:43:41 -0700
-Subject: [PATCH] fix incorrect types in documentation/haddock
-
----
- src/Documentation/Haddock.hs | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/Documentation/Haddock.hs b/src/Documentation/Haddock.hs
-index 60bb314..8fd9674 100644
---- a/src/Documentation/Haddock.hs
-+++ b/src/Documentation/Haddock.hs
-@@ -59,6 +59,7 @@ import Haddock.Types
- import Haddock.Options
- import Haddock.Utils
- import Main
-+import GHC (Ghc)
- 
- 
- -- | Create 'Interface' structures from a given list of Haddock command-line
-@@ -68,7 +69,7 @@ import Main
- createInterfaces
-   :: [Flag]         -- ^ A list of command-line flags
-   -> [String]       -- ^ File or module names
--  -> IO [Interface] -- ^ Resulting list of interfaces
-+  -> Ghc [Interface] -- ^ Resulting list of interfaces
- createInterfaces flags modules = do
-   (_, ifaces, _) <- readPackagesAndProcessModules flags modules
-   return ifaces
--- 
-1.7.12
-
diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD
index c5d633e16..474997193 100644
--- a/community/haddock/PKGBUILD
+++ b/community/haddock/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 83992 2013-02-08 04:15:24Z td123 $
+# $Id: PKGBUILD 89287 2013-04-28 16:52:08Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haddock
 pkgver=2.13.1
-pkgrel=2
+pkgrel=4
 pkgdesc='Tool for generating documentation for Haskell libraries'
 url='http://hackage.haskell.org/package/haddock/'
 license=('custom:BSD3')
 arch=('x86_64' 'i686' 'mips64el')
 makedepends=('alex' 'happy')
-depends=('ghc=7.6.2-1' 'haskell-xhtml=3000.2.1' 'haskell-ghc-paths=0.1.0.8')
+depends=('ghc=7.6.3-1' 'haskell-xhtml=3000.2.1' 'haskell-ghc-paths')
 install=$pkgname.install
 source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
 sha256sums=('6e5e2295cd191e43a046c12544f2f4e8b4260cfda8282d48b15a7a35d8a24e7f')
diff --git a/community/handbrake/PKGBUILD b/community/handbrake/PKGBUILD
deleted file mode 100644
index b70180a97..000000000
--- a/community/handbrake/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 74053 2012-07-18 17:33:26Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Sebastien Piccand <sebcactus gmail com>
-
-pkgname=('handbrake' 'handbrake-cli')
-pkgver=0.9.8
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://handbrake.fr/"
-license=('GPL')
-makedepends=('intltool' 'python2' 'yasm' 'wget' 'bzip2' 'gcc-libs' 'libnotify'
-             'gstreamer0.10-base' 'gtk2' 'dbus-glib' 'fribidi')
-source=(http://downloads.sourceforge.net/project/handbrake/$pkgver/HandBrake-$pkgver.tar.bz2)
-sha256sums=('dba75a9ff772e419c01d75532c1bf0d7253e73d7ead184eee755cd4c133dc798')
-
-build() {
-  cd "$srcdir/HandBrake-$pkgver"
-
-  # Use Python 2
-  sed -i 's/python /python2 /' gtk/src/Makefile.am
-
-  ./configure --prefix=/usr --force --disable-gtk-update-checks
-  cd build
-  make
-}
-
-package_handbrake() {
-  pkgdesc="Multithreaded video transcoder"
-  depends=('bzip2' 'gcc-libs' 'gstreamer0.10-base' 'libnotify' 'dbus-glib'
-           'fribidi' 'gtk2' 'desktop-file-utils' 'hicolor-icon-theme')
-  install=$pkgname.install
-
-  cd "$srcdir/HandBrake-$pkgver/build"
-
-  make DESTDIR="$pkgdir" install
-  rm "$pkgdir/usr/bin/HandBrakeCLI"
-}
-
-package_handbrake-cli() {
-  pkgdesc="Multithreaded video transcoder (CLI)"
-  depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi')
-
-  cd "$srcdir/HandBrake-$pkgver/build"
-  install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/handbrake/handbrake.install b/community/handbrake/handbrake.install
deleted file mode 100644
index 87c29e4db..000000000
--- a/community/handbrake/handbrake.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/happy/PKGBUILD b/community/happy/PKGBUILD
index e906df7ec..5f63b6e6a 100644
--- a/community/happy/PKGBUILD
+++ b/community/happy/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 83993 2013-02-08 04:15:25Z td123 $
+# $Id: PKGBUILD 89288 2013-04-28 16:52:09Z td123 $
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 # Contributor: Vesa Kaihlavirta <vegai@iki.fi>
  
 pkgname=happy
 pkgver=1.18.10
-pkgrel=2
+pkgrel=3
 pkgdesc="The Parser Generator for Haskell"
 url="http://hackage.haskell.org/package/happy"
 arch=('i686' 'x86_64')
 license=("custom:BSD3")
 depends=('gmp')
-makedepends=('ghc=7.6.2-1' 'haskell-mtl=2.1.2-2')
+makedepends=('ghc=7.6.3-1' 'haskell-mtl=2.1.2-3')
 source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('a1638e89434427e57f68ef311761dc30')
 
diff --git a/community/hardinfo/PKGBUILD b/community/hardinfo/PKGBUILD
deleted file mode 100644
index 432b9bda3..000000000
--- a/community/hardinfo/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 70023 2012-04-28 09:24:14Z allan $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=hardinfo
-pkgver=0.5.1
-pkgrel=5
-pkgdesc="A system information and benchmark tool."
-arch=('i686' 'x86_64')
-url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
-license=('GPL2')
-depends=('gtk2' 'libsoup')
-options=('!emptydirs')
-source=(http://download.berlios.de/hardinfo/${pkgname}-${pkgver}.tar.bz2 \
-        fixsensors.patch hardinfo.distro)
-sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64'
-          'd2151dce76dca238102937d0e15541f172bca530'
-          '4c31cbbfbdeb48593641ff600c8d4fb7bda2b01c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../fixsensors.patch
-  sed -i 's|/usr/lib64|/usr/lib|' configure
-  ./configure --prefix=/usr
-  sed -i 's|lib64|lib|' binreloc.c
-  sed -i 's|{ DB_PREFIX "debian_version",	"deb"  },|{ DB_PREFIX "hardinfo.distro",       "arch"  },{ DB_PREFIX "debian_version",	"deb"  },|' computer.h
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 ../hardinfo.distro "${pkgdir}/etc/hardinfo.distro"
-}
diff --git a/community/hardinfo/fixsensors.patch b/community/hardinfo/fixsensors.patch
deleted file mode 100644
index 812c29458..000000000
--- a/community/hardinfo/fixsensors.patch
+++ /dev/null
@@ -1,13 +0,0 @@
- diff -upNr hardinfo-0.4.2.2.orign/util.c hardinfo-0.4.2.2/util.c
---- hardinfo-0.4.2.2.orign/util.c	2007-07-20 16:45:08.000000000 +0200
-+++ hardinfo-0.4.2.2/util.c	2007-07-26 10:15:32.000000000 +0200
-@@ -996,7 +996,8 @@ gchar *h_strdup_cprintf(const gchar * fo
-     if (source) {
- 	retn = g_strconcat(source, buffer, NULL);
- 	g_free(buffer);
--        g_free(source);
-+        if(strlen(source))
-+		 g_free(source);
-     } else {
- 	retn = buffer;
-     }
diff --git a/community/hardinfo/hardinfo.distro b/community/hardinfo/hardinfo.distro
deleted file mode 100644
index 850183eeb..000000000
--- a/community/hardinfo/hardinfo.distro
+++ /dev/null
@@ -1 +0,0 @@
-Arch Linux
diff --git a/community/haskell-base64-bytestring/PKGBUILD b/community/haskell-base64-bytestring/PKGBUILD
new file mode 100644
index 000000000..f74265df9
--- /dev/null
+++ b/community/haskell-base64-bytestring/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Arch Haskell Team <>
+# Contributor: Lex Black <autumn-wind at web dot de>
+
+_hkgname=base64-bytestring
+pkgname=haskell-base64-bytestring
+pkgver=1.0.0.1
+pkgrel=2
+pkgdesc="Fast base64 encoding and deconding for ByteStrings"
+url="https://github.com/bos/base64-bytestring"
+license=(custom:BSD3)
+arch=('i686' 'x86_64')
+makedepends=('ghc')
+depends=('haskell-bytestring')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+install="$pkgname.install"
+sha256sums=('ab25abf4b00a2f52b270bc3ed43f1d59f16c8eec9d7dffb14df1e9265b233b50')
+
+build() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
+    --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
+}
diff --git a/community/haskell-base64-bytestring/haskell-base64-bytestring.install b/community/haskell-base64-bytestring/haskell-base64-bytestring.install
new file mode 100644
index 000000000..434874e99
--- /dev/null
+++ b/community/haskell-base64-bytestring/haskell-base64-bytestring.install
@@ -0,0 +1,23 @@
+HS_DIR=usr/share/haskell/haskell-base64-bytestring
+
+post_install() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+  $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+  $HS_DIR/unregister.sh
+}
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-blaze-builder/PKGBUILD b/community/haskell-blaze-builder/PKGBUILD
new file mode 100644
index 000000000..03ca1928d
--- /dev/null
+++ b/community/haskell-blaze-builder/PKGBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Arch Haskell Team <>
+# Contributor: Lex Black <autumn-wind at web dot de>
+
+pkgname=haskell-blaze-builder
+_hkgname=blaze-builder
+pkgver=0.3.1.1
+pkgrel=2
+pkgdesc="Efficient buffered output."
+url="http://github.com/meiersi/blaze-builder"
+license=(custom:BSD3)
+arch=('i686' 'x86_64')
+makedepends=('ghc')
+depends=('haskell-bytestring' 'haskell-text')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+install="$pkgname.install"
+sha256sums=('a12506f8afd650e4ed90e1e2379750035f8e83032a2d260eacc3757fe52cdcde')
+
+build() {
+  cd "$srcdir/$_hkgname-$pkgver"
+
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
+    --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
+}
diff --git a/community/haskell-blaze-builder/haskell-blaze-builder.install b/community/haskell-blaze-builder/haskell-blaze-builder.install
new file mode 100644
index 000000000..1f2b9ed67
--- /dev/null
+++ b/community/haskell-blaze-builder/haskell-blaze-builder.install
@@ -0,0 +1,24 @@
+HS_DIR=usr/share/haskell/haskell-blaze-builder
+
+# functions
+post_install() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+  $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+  $HS_DIR/unregister.sh
+}
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-blaze-html/PKGBUILD b/community/haskell-blaze-html/PKGBUILD
new file mode 100644
index 000000000..28b88312c
--- /dev/null
+++ b/community/haskell-blaze-html/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Aleksandar Micovic <metaleks@gmail.com>
+_hkgname=blaze-html
+pkgname=haskell-blaze-html
+pkgver=0.6.1.1
+pkgrel=2
+pkgdesc="A blazingly fast HTML combinator library for Haskell"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+makedepends=()
+depends=('ghc' 'haskell-blaze-builder<0.4' 'haskell-blaze-markup<0.6' 'haskell-bytestring-show' 'haskell-text>=0.11.0.5')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=$pkgname.install
+md5sums=('f9eda0a990cda190538b9e6ff73b05f3')
+
+build() {
+  cd "${srcdir}/${_hkgname}-${pkgver}"
+  runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+package() {
+  cd "${srcdir}/${_hkgname}-${pkgver}"
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/${_hkgname}"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
+}
diff --git a/community/haskell-blaze-html/haskell-blaze-html.install b/community/haskell-blaze-html/haskell-blaze-html.install
new file mode 100644
index 000000000..9887d3a8d
--- /dev/null
+++ b/community/haskell-blaze-html/haskell-blaze-html.install
@@ -0,0 +1,23 @@
+HS_DIR=usr/share/haskell/haskell-blaze-html
+
+post_install() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+  $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+  $HS_DIR/unregister.sh
+}
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-blaze-markup/PKGBUILD b/community/haskell-blaze-markup/PKGBUILD
new file mode 100644
index 000000000..6c0d5e4a9
--- /dev/null
+++ b/community/haskell-blaze-markup/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Lex Black <autumn-wind at web dot de>
+
+_hkgname=blaze-markup
+pkgname=haskell-blaze-markup
+pkgver=0.5.1.5
+pkgrel=2
+pkgdesc="Core modules of a blazingly fast markup combinator library for the Haskell programming language"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=(custom:BSD3)
+arch=('i686' 'x86_64')
+makedepends=('ghc')
+depends=('haskell-blaze-builder' 'haskell-bytestring-show' 'haskell-text')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=$pkgname.install
+md5sums=('faf0c80851b34987e74541b23cef3218')
+
+build() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
+}
diff --git a/community/haskell-blaze-markup/haskell-blaze-markup.install b/community/haskell-blaze-markup/haskell-blaze-markup.install
new file mode 100644
index 000000000..fa5fb8064
--- /dev/null
+++ b/community/haskell-blaze-markup/haskell-blaze-markup.install
@@ -0,0 +1,22 @@
+HS_DIR=usr/share/haskell/haskell-blaze-markup
+
+post_install() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+  $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+  $HS_DIR/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD
index 61a752e91..99fd4ebb6 100644
--- a/community/haskell-bytestring-show/PKGBUILD
+++ b/community/haskell-bytestring-show/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 83994 2013-02-08 04:15:26Z td123 $
+# $Id: PKGBUILD 89293 2013-04-28 16:52:14Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-bytestring-show
 pkgver=0.3.5.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Efficient conversion of values into readable byte strings."
 url="http://hackage.haskell.org/package/bytestring-show"
 license=("BSD3")
diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD
index 92bb5dff3..eb6a48ed4 100644
--- a/community/haskell-cairo/PKGBUILD
+++ b/community/haskell-cairo/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 83995 2013-02-08 04:15:27Z td123 $
+# $Id: PKGBUILD 89294 2013-04-28 16:52:15Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-cairo
 pkgver=0.12.4
-pkgrel=2
+pkgrel=4
 pkgdesc="Binding to the cairo library for Gtk2Hs."
 url="http://hackage.haskell.org/package/cairo"
 license=('LGPL2.1')
 arch=('i686' 'x86_64')
+# deps adjusted to specific versions in package()
 depends=('ghc' 'cairo' 'haskell-mtl')
 makedepends=("gtk2hs-buildtools")
 options=('strip')
@@ -31,7 +32,9 @@ build() {
 }
 
 package() {
-    depends=("ghc=`pacman -Q ghc | cut -f2 -d\ |cut -f1 -d-`" 'cairo' "haskell-mtl=`pacman -Q haskell-mtl | cut -f2 -d\ |cut -f1 -d-`")
+    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
+    _hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\  | cut -f1 -d-`
+    depends=("ghc=${_ghcver}" "cairo" "haskell-mtl=${_hglibver}")
 
     cd ${srcdir}/cairo-${pkgver}
     install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh
diff --git a/community/haskell-citeproc-hs/PKGBUILD b/community/haskell-citeproc-hs/PKGBUILD
new file mode 100644
index 000000000..9e3bfdcf3
--- /dev/null
+++ b/community/haskell-citeproc-hs/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Arch Haskell Team <>
+# Contributor: Lex Black <autumn-wind at web dot de>
+
+_hkgname=citeproc-hs
+pkgname=haskell-citeproc-hs
+pkgver=0.3.8
+pkgrel=2
+pkgdesc="A Citation Style Language implementation in Haskell"
+url="http://gorgias.mine.nu/repos/citeproc-hs/"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+makedepends=('ghc')
+depends=(haskell-http haskell-bytestring haskell-containers haskell-directory
+         haskell-filepath haskell-json haskell-mtl haskell-old-locale
+         haskell-pandoc-types haskell-parsec haskell-syb haskell-time haskell-utf8-string haskell-xml)
+source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/${_hkgname}-${pkgver}.tar.gz")
+install=$pkgname.install
+sha256sums=('e873673b2960d0eebbcede9d8c18e2acea0e4fed295552fa635814f4bae48e72')
+
+build() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
+    --libsubdir=\$compiler/site-local/\$pkgid -f generic
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  install -D -m744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
+}
diff --git a/community/haskell-citeproc-hs/haskell-citeproc-hs.install b/community/haskell-citeproc-hs/haskell-citeproc-hs.install
new file mode 100644
index 000000000..b2c962877
--- /dev/null
+++ b/community/haskell-citeproc-hs/haskell-citeproc-hs.install
@@ -0,0 +1,23 @@
+HS_DIR=usr/share/haskell/haskell-citeproc-hs
+
+post_install() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+  $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+  $HS_DIR/unregister.sh
+}
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-data-default-class/PKGBUILD b/community/haskell-data-default-class/PKGBUILD
new file mode 100644
index 000000000..e2950265b
--- /dev/null
+++ b/community/haskell-data-default-class/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
+_hkgname=data-default-class
+pkgname=haskell-data-default-class
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="A class for types with a default value"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+makedepends=()
+depends=('ghc=7.6.3')
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('abfd756bcc6d92e47436992c80ccdb80')
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
+       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-data-default-class/haskell-data-default-class.install b/community/haskell-data-default-class/haskell-data-default-class.install
new file mode 100644
index 000000000..037788be4
--- /dev/null
+++ b/community/haskell-data-default-class/haskell-data-default-class.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-data-default-class
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-data-default-instances-base/PKGBUILD b/community/haskell-data-default-instances-base/PKGBUILD
new file mode 100644
index 000000000..f433e99e1
--- /dev/null
+++ b/community/haskell-data-default-instances-base/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
+_hkgname=data-default-instances-base
+pkgname=haskell-data-default-instances-base
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="Default instances for types in base"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+makedepends=()
+depends=('ghc=7.6.3' 'haskell-data-default-class')
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('37fc6531e0227bcf9cfbbf85f04e759d')
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
+       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-data-default-instances-base/haskell-data-default-instances-base.install b/community/haskell-data-default-instances-base/haskell-data-default-instances-base.install
new file mode 100644
index 000000000..3d9e5d1e0
--- /dev/null
+++ b/community/haskell-data-default-instances-base/haskell-data-default-instances-base.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-data-default-instances-base
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-data-default-instances-containers/PKGBUILD b/community/haskell-data-default-instances-containers/PKGBUILD
new file mode 100644
index 000000000..5a77dca00
--- /dev/null
+++ b/community/haskell-data-default-instances-containers/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
+_hkgname=data-default-instances-containers
+pkgname=haskell-data-default-instances-containers
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="Default instances for types in containers"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+makedepends=()
+depends=('ghc=7.6.3' 'haskell-containers=0.5.0.0' 'haskell-data-default-class=0.0.1')
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('1c574d87bf9bc69d4748e3236d575a3c')
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
+       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-data-default-instances-containers/haskell-data-default-instances-containers.install b/community/haskell-data-default-instances-containers/haskell-data-default-instances-containers.install
new file mode 100644
index 000000000..7d5535739
--- /dev/null
+++ b/community/haskell-data-default-instances-containers/haskell-data-default-instances-containers.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-data-default-instances-containers
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-data-default-instances-dlist/PKGBUILD b/community/haskell-data-default-instances-dlist/PKGBUILD
new file mode 100644
index 000000000..6bd021546
--- /dev/null
+++ b/community/haskell-data-default-instances-dlist/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
+_hkgname=data-default-instances-dlist
+pkgname=haskell-data-default-instances-dlist
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="Default instances for types in dlist"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+makedepends=()
+depends=('ghc=7.6.3' 'haskell-data-default-class=0.0.1' 'haskell-dlist=0.5-24')
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('6683d943ab70b7077ff6837fce75b4de')
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
+       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-data-default-instances-dlist/haskell-data-default-instances-dlist.install b/community/haskell-data-default-instances-dlist/haskell-data-default-instances-dlist.install
new file mode 100644
index 000000000..8e6e1563c
--- /dev/null
+++ b/community/haskell-data-default-instances-dlist/haskell-data-default-instances-dlist.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-data-default-instances-dlist
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-data-default-instances-old-locale/PKGBUILD b/community/haskell-data-default-instances-old-locale/PKGBUILD
new file mode 100644
index 000000000..fbfe9959b
--- /dev/null
+++ b/community/haskell-data-default-instances-old-locale/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
+_hkgname=data-default-instances-old-locale
+pkgname=haskell-data-default-instances-old-locale
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="Default instances for types in old-locale"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+makedepends=()
+depends=('ghc=7.6.3' 'haskell-data-default-class' 'haskell-old-locale=1.0.0.5')
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('43bd868049d870ee722eda6bdd89fc28')
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
+       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-data-default-instances-old-locale/haskell-data-default-instances-old-locale.install b/community/haskell-data-default-instances-old-locale/haskell-data-default-instances-old-locale.install
new file mode 100644
index 000000000..b6f986d6d
--- /dev/null
+++ b/community/haskell-data-default-instances-old-locale/haskell-data-default-instances-old-locale.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-data-default-instances-old-locale
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-data-default/PKGBUILD b/community/haskell-data-default/PKGBUILD
new file mode 100644
index 000000000..819635eaf
--- /dev/null
+++ b/community/haskell-data-default/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
+_hkgname=data-default
+pkgname=haskell-data-default
+pkgver=0.5.3
+pkgrel=1
+pkgdesc="A class for types with a default value"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+makedepends=()
+depends=('ghc=7.6.3' 'haskell-data-default-class' 'haskell-data-default-instances-base' 'haskell-data-default-instances-containers' 'haskell-data-default-instances-dlist' 'haskell-data-default-instances-old-locale')
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('03a98d999273ad20d5bc0c711bf1c533')
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
+       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-data-default/haskell-data-default.install b/community/haskell-data-default/haskell-data-default.install
new file mode 100644
index 000000000..0b0a72558
--- /dev/null
+++ b/community/haskell-data-default/haskell-data-default.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-data-default
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD
index 48409695b..0232eb2c1 100644
--- a/community/haskell-dataenc/PKGBUILD
+++ b/community/haskell-dataenc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83996 2013-02-08 04:15:28Z td123 $
+# $Id: PKGBUILD 89297 2013-04-28 16:52:18Z td123 $
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.5
@@ -6,12 +6,12 @@
 _hkgname=dataenc
 pkgname=haskell-dataenc
 pkgver=0.14.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Data encoding library"
 url="http://hackage.haskell.org/package/dataenc"
 license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.6.2-1' sh)
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.3-1' sh)
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz
         '0001-update-build-deps-for-ghc-7.6.1.patch')
 install=${pkgname}.install
diff --git a/community/haskell-digest/PKGBUILD b/community/haskell-digest/PKGBUILD
new file mode 100644
index 000000000..3293c8322
--- /dev/null
+++ b/community/haskell-digest/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Arch Haskell Team <>
+# Contributor: Lex Black <autumn-wind at web dot de>
+
+_hkgname=digest
+pkgname=haskell-digest
+pkgver=0.0.1.2
+pkgrel=1
+pkgdesc='Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now.'
+url="http://hackage.haskell.org/package/$_hkgname"
+license=(custom:BSD3)
+arch=('i686' 'x86_64')
+depends=('ghc' 'zlib')
+source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz")
+install=$pkgname.install
+sha256sums=('641717eb16392abf8965986a9e8dc21eebf1d97775bbb6923c7b7f8fee17fe11')
+
+build() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
+    --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/${_hkgname}"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
+}
diff --git a/community/haskell-digest/haskell-digest.install b/community/haskell-digest/haskell-digest.install
new file mode 100644
index 000000000..d0637a0cb
--- /dev/null
+++ b/community/haskell-digest/haskell-digest.install
@@ -0,0 +1,23 @@
+HS_DIR=usr/share/haskell/haskell-digest
+
+post_install() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+  $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+  $HS_DIR/unregister.sh
+}
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-dlist/PKGBUILD b/community/haskell-dlist/PKGBUILD
new file mode 100644
index 000000000..d43156f40
--- /dev/null
+++ b/community/haskell-dlist/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 89299 2013-04-28 16:52:20Z td123 $
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Don Stewart <dons@galois.com>
+# Contributor: Lex Black <autumn-wind at web dot de>
+
+pkgname=haskell-dlist
+pkgver=0.5
+_hkgname=dlist
+_licensefile=LICENSE
+pkgrel=24
+pkgdesc="Differences lists"
+url="http://code.haskell.org/~dons/code/dlist/"
+license=("BSD3")
+arch=('i686' 'x86_64')
+makedepends=('ghc=7.6.3-1')
+depends=('ghc=7.6.3-1')
+options=('strip')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+sha256sums=('4780e5409eff55bbfdd7470ef802a087a04048c9cd5efe0482c82878292f19ea')
+install="${pkgname}.install"
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+        --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
+        --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
+}
diff --git a/community/haskell-dlist/haskell-dlist.install b/community/haskell-dlist/haskell-dlist.install
new file mode 100644
index 000000000..c08242863
--- /dev/null
+++ b/community/haskell-dlist/haskell-dlist.install
@@ -0,0 +1,26 @@
+# custom variables
+pkgname=haskell-dlist
+HS_DIR=/usr/share/haskell/${pkgname}
+
+# functions
+post_install() {
+    ${HS_DIR}/register.sh
+    (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+    ${HS_DIR}/unregister.sh
+}
+
+post_upgrade() {
+    ${HS_DIR}/register.sh
+    (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+    ${HS_DIR}/unregister.sh
+}
+
+post_remove() {
+    (cd /usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-extensible-exceptions/PKGBUILD b/community/haskell-extensible-exceptions/PKGBUILD
index 2a0606832..784b9ebba 100644
--- a/community/haskell-extensible-exceptions/PKGBUILD
+++ b/community/haskell-extensible-exceptions/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 83997 2013-02-08 04:15:30Z td123 $
+# $Id: PKGBUILD 89300 2013-04-28 16:52:21Z td123 $
 # Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
 
 _hkgname=extensible-exceptions
 pkgname=haskell-${_hkgname}
 pkgver=0.1.1.4
-pkgrel=4
+pkgrel=5
 pkgdesc="extensible exceptions for both new and old versions of GHC"
 url="http://hackage.haskell.org/package/extensible-exceptions"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.2-1' sh)
+depends=('ghc=7.6.3-1' sh)
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=$pkgname.install
 md5sums=('fa1cadd15c1c7aa362618d41c6e17d8b')
diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD
index 49709b42a..d6776e052 100644
--- a/community/haskell-ghc-paths/PKGBUILD
+++ b/community/haskell-ghc-paths/PKGBUILD
@@ -3,17 +3,17 @@
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haskell-ghc-paths
-pkgver=0.1.0.8
-pkgrel=11
+pkgver=0.1.0.9
+pkgrel=2
 pkgdesc="Knowledge of GHC's installation directories"
 url='http://hackage.haskell.org/package/ghc-paths'
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
 arch=('x86_64' 'i686')
-depends=('ghc=7.6.2-1')
+depends=('ghc=7.6.3-1')
 source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz")
-install=haskell-ghc-paths.install
-sha256sums=('8672c1e65525555481091443f44abf738f9442516c612d67dde12ebfe02f0c56')
+install="$pkgname.install"
+sha256sums=('afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945')
 
 build() {
   cd "$srcdir/ghc-paths-$pkgver"
diff --git a/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch b/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch
deleted file mode 100644
index 845beb2bd..000000000
--- a/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 7e677b1c633d2b426fc956fcfa084a82ef6df861 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Thu, 27 Sep 2012 04:48:10 -0700
-Subject: [PATCH] compatibility with ghc 7.6.1
-
----
- System/Glib/GObject.chs  | 4 +---
- System/Glib/MainLoop.chs | 4 ++--
- 2 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/System/Glib/GObject.chs b/System/Glib/GObject.chs
-index 5f0fe5c..9925d2c 100644
---- a/System/Glib/GObject.chs
-+++ b/System/Glib/GObject.chs
-@@ -127,8 +127,6 @@ makeNewGObject (constr, objectUnref) generator = do
- 
- {#pointer GDestroyNotify as DestroyNotify#}
- 
--foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify
--
- -- | This function wraps any newly created objects that derives from
- -- GInitiallyUnowned also known as objects with
- -- \"floating-references\". The object will be refSink (for glib
-@@ -225,4 +223,4 @@ isA obj gType =
- -- at this point we would normally implement the notify signal handler;
- -- I've moved this definition into the Object class of the gtk package
- -- since there's a quite a bit of machinery missing here (generated signal
---- register functions and the problem of recursive modules)
-\ No newline at end of file
-+-- register functions and the problem of recursive modules)
-diff --git a/System/Glib/MainLoop.chs b/System/Glib/MainLoop.chs
-index 72fecb6..feb4c77 100644
---- a/System/Glib/MainLoop.chs
-+++ b/System/Glib/MainLoop.chs
-@@ -71,7 +71,7 @@ import System.Glib.GObject	(DestroyNotify, destroyFunPtr)
- 
- {#pointer SourceFunc#}
- 
--foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc
-+foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc
- 
- type HandlerId = {#type guint#}
- 
-@@ -79,7 +79,7 @@ type HandlerId = {#type guint#}
- --
- makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify)
- makeCallback fun = do
--  funPtr <- mkSourceFunc fun
-+  funPtr <- mkSourceFunc (const fun)
-   return (funPtr, destroyFunPtr)
- 
- -- | Sets a function to be called at regular intervals, with the default
--- 
-1.7.12.1
-
diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD
index 7f7a34efe..6d73d2e55 100644
--- a/community/haskell-glib/PKGBUILD
+++ b/community/haskell-glib/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 83999 2013-02-08 04:15:32Z td123 $
+# $Id: PKGBUILD 89302 2013-04-28 16:52:23Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-glib
 pkgver=0.12.4
-pkgrel=2
+pkgrel=4
 pkgdesc="Binding to the GLIB library for Gtk2Hs."
 url="http://hackage.haskell.org/package/glib"
 license=('LGPL2.1')
 arch=('i686' 'x86_64')
+# deps adjusted to specific versions in package()
 depends=('ghc' 'glib2')
 makedepends=("gtk2hs-buildtools")
 options=('strip')
@@ -15,16 +16,11 @@ install=gtk2hs-glib.install
 provides=('gtk2hs-glib')
 replaces=('gtk2hs-glib')
 conflicts=('gtk2hs-glib')
-source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz
-        '0001-compatibility-with-ghc-7.6.1.patch')
-md5sums=('3172907258183466f1e604a435285c51'
-         'b00660b7102542942b0b9d84b59d1f3c')
+source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz)
+md5sums=('3172907258183466f1e604a435285c51')
 
 build() {
     cd glib-$pkgver
-
-#    patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch
-
     runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
       --prefix=/usr --docdir=/usr/share/doc/haskell-glib \
       --libsubdir=\$compiler/site-local/\$pkgid
diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD
index 8322b0120..c7b150561 100644
--- a/community/haskell-gtk/PKGBUILD
+++ b/community/haskell-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84000 2013-02-08 04:15:33Z td123 $
+# $Id: PKGBUILD 89303 2013-04-28 16:52:24Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-gtk
 pkgver=0.12.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Binding to the gtk library for Gtk2Hs."
 url="http://hackage.haskell.org/package/gtk"
 license=('LGPL2.1')
diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD
index 4fa2f6fac..7cd9ccb27 100644
--- a/community/haskell-haskeline/PKGBUILD
+++ b/community/haskell-haskeline/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84001 2013-02-08 04:15:34Z td123 $
+# $Id: PKGBUILD 89304 2013-04-28 16:52:25Z td123 $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
@@ -6,12 +6,12 @@
 _hkgname=haskeline
 pkgname=haskell-haskeline
 pkgver=0.7.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A command-line interface for user input, written in Haskell."
 url="http://hackage.haskell.org/package/haskeline"
 license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.6.2-1' 'sh' 'haskell-utf8-string=0.3.7-4' 'haskell-mtl=2.1.2-2' 'haskell-terminfo=0.3.2.5-2')
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.3-1' 'sh' 'haskell-utf8-string=0.3.7-5' 'haskell-mtl=2.1.2-3' 'haskell-terminfo=0.3.2.5-3')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('3a78043dc80b5510202e71e77c0a9923')
diff --git a/community/haskell-highlighting-kate/PKGBUILD b/community/haskell-highlighting-kate/PKGBUILD
new file mode 100644
index 000000000..b4050abd1
--- /dev/null
+++ b/community/haskell-highlighting-kate/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+# Contributor: Lex Black <autumn-wind at web dot de>
+
+_hkgname=highlighting-kate
+pkgname=haskell-highlighting-kate
+pkgver=0.5.3.8
+pkgrel=2
+pkgdesc="Syntax highlighting"
+url="http://hackage.haskell.org/package/$_hkgname"
+license=('GPL')
+arch=('i686' 'x86_64')
+makedepends=('ghc')
+depends=('haskell-blaze-html>=0.4.2' 'haskell-containers' 'haskell-filepath' 'haskell-mtl' 'haskell-parsec' 'haskell-pcre-light')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=$pkgname.install
+md5sums=('c3fdfadddfdf198af6192b9bf437a422')
+
+build() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  runhaskell Setup configure -O --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+}
diff --git a/community/haskell-highlighting-kate/haskell-highlighting-kate.install b/community/haskell-highlighting-kate/haskell-highlighting-kate.install
new file mode 100644
index 000000000..c03138b71
--- /dev/null
+++ b/community/haskell-highlighting-kate/haskell-highlighting-kate.install
@@ -0,0 +1,23 @@
+HS_DIR=usr/share/haskell/haskell-highlighting-kate
+
+post_install() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+  $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+  $HS_DIR/unregister.sh
+}
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD
index 1b5a6c585..aa4edb5f6 100644
--- a/community/haskell-hslogger/PKGBUILD
+++ b/community/haskell-hslogger/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84002 2013-02-08 04:15:35Z td123 $
+# $Id: PKGBUILD 89306 2013-04-28 16:52:27Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haskell-hslogger
 pkgver=1.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Versatile logging framework"
 url="http://hackage.haskell.org/package/hslogger"
 license=('LGPL')
diff --git a/community/haskell-html/PKGBUILD b/community/haskell-html/PKGBUILD
index 2f7527752..05cd89c76 100644
--- a/community/haskell-html/PKGBUILD
+++ b/community/haskell-html/PKGBUILD
@@ -1,16 +1,17 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
 
 _hkgname=html
 pkgname=haskell-html
 pkgver=1.0.1.2
-pkgrel=13
+pkgrel=15
 pkgdesc="HTML combinator library"
 url="http://hackage.haskell.org/package/html"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' sh)
+depends=('ghc=7.6.3-1' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('2a7de5a2af9a2f80d39825d6a95ee445')
diff --git a/community/haskell-json/PKGBUILD b/community/haskell-json/PKGBUILD
new file mode 100644
index 000000000..b1ed11582
--- /dev/null
+++ b/community/haskell-json/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+
+_hkgname=json
+pkgname=haskell-json
+pkgver=0.7
+pkgrel=5
+pkgdesc="Support for serialising Haskell to and from JSON"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=(custom:BSD3)
+arch=('i686' 'x86_64')
+depends=(ghc haskell-array 'haskell-base>=4' haskell-bytestring
+         haskell-containers haskell-text haskell-mtl 'haskell-syb>=0.3.3')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+install=$pkgname.install
+sha256sums=("d3654272caa269bc65f6f2af82b583ef05434613fe5272d57053fb3bfada68a3")
+
+build() {
+  cd "$srcdir/$_hkgname-$pkgver"
+
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
+    --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  install -D -m744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/${_hkgname}"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
+}
diff --git a/community/haskell-json/haskell-json.install b/community/haskell-json/haskell-json.install
new file mode 100644
index 000000000..5be36b5cc
--- /dev/null
+++ b/community/haskell-json/haskell-json.install
@@ -0,0 +1,23 @@
+HS_DIR=usr/share/haskell/haskell-json
+
+post_install() {
+    $HS_DIR/register.sh
+    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+    $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+    $HS_DIR/register.sh
+    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+    $HS_DIR/unregister.sh
+}
+
+post_remove() {
+    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-pandoc-types/PKGBUILD b/community/haskell-pandoc-types/PKGBUILD
new file mode 100644
index 000000000..b7c7a47c3
--- /dev/null
+++ b/community/haskell-pandoc-types/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Arch Haskell Team <>
+# Contributor: Lex Black <autumn-wind at web dot de>
+
+_hkgname=pandoc-types
+pkgname=haskell-pandoc-types
+pkgver=1.10
+pkgrel=2
+pkgdesc="Types for representing a structured document"
+url="http://johnmacfarlane.net/pandoc"
+license=("GPL")
+arch=('i686' 'x86_64')
+makedepends=('ghc')
+depends=('haskell-containers' 'haskell-syb')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+install=$pkgname.install
+sha256sums=('e65b983aece74d57db53c6f611f92b9df9dd876e5f022f3a8612c092d6db78f5')
+
+build() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
+    --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  install -D -m744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install    -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/COPYING"
+}
diff --git a/community/haskell-pandoc-types/haskell-pandoc-types.install b/community/haskell-pandoc-types/haskell-pandoc-types.install
new file mode 100644
index 000000000..72e17a9e2
--- /dev/null
+++ b/community/haskell-pandoc-types/haskell-pandoc-types.install
@@ -0,0 +1,23 @@
+HS_DIR=usr/share/haskell/haskell-pandoc-types
+
+post_install() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+  $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+  $HS_DIR/unregister.sh
+}
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-pandoc/PKGBUILD b/community/haskell-pandoc/PKGBUILD
new file mode 100644
index 000000000..31f7f6a59
--- /dev/null
+++ b/community/haskell-pandoc/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Aleksandar Micovic <metaleks@gmail.com>
+# Contributor: Lex Black <autumn-wind at web dot de>
+
+_hkgname=pandoc
+pkgname=haskell-pandoc
+pkgver=1.11.1
+pkgrel=2
+pkgdesc="Conversion between markup formats"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('GPL')
+arch=('i686' 'x86_64')
+makedepends=('ghc')
+depends=('haskell-base64-bytestring' 'haskell-blaze-html' 'haskell-blaze-markup' 'haskell-bytestring' 'haskell-citeproc-hs' 'haskell-containers' 'haskell-directory' 'haskell-extensible-exceptions' 'haskell-filepath' 'haskell-highlighting-kate' 'haskell-http' 'haskell-json' 'haskell-mtl' 'haskell-network' 'haskell-old-locale' 'haskell-pandoc-types' 'haskell-parsec' 'haskell-process' 'haskell-random' 'haskell-syb' 'haskell-tagsoup' 'haskell-temporary' 'haskell-texmath' 'haskell-time' 'haskell-utf8-string' 'haskell-xml' 'haskell-zip-archive' 'haskell-zlib' haskell-data-default)
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=$pkgname.install
+md5sums=('e895b22745affba37c0ba5e6e6d0f17c')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
+       --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   $pkgdir/usr/share/haskell/$pkgname/register.sh
+    install    -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
+    install -d -m755 $pkgdir/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/$pkgname/html $pkgdir/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=$pkgdir
+}
diff --git a/community/haskell-pandoc/haskell-pandoc.install b/community/haskell-pandoc/haskell-pandoc.install
new file mode 100644
index 000000000..24a22db9c
--- /dev/null
+++ b/community/haskell-pandoc/haskell-pandoc.install
@@ -0,0 +1,23 @@
+HS_DIR=usr/share/haskell/haskell-pandoc
+
+post_install() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+  $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+  $HS_DIR/unregister.sh
+}
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD
index b3b66793c..2d52b6be3 100644
--- a/community/haskell-pango/PKGBUILD
+++ b/community/haskell-pango/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 84004 2013-02-08 04:15:36Z td123 $
+# $Id: PKGBUILD 89311 2013-04-28 16:52:32Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-pango
 pkgver=0.12.4
-pkgrel=2
+pkgrel=4
 pkgdesc="Binding to the pango library for Gtk2Hs."
 url="http://hackage.haskell.org/package/pango"
 license=('LGPL2.1')
 arch=('i686' 'x86_64')
+# deps adjusted to specific versions in package()
 depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo')
 makedepends=("gtk2hs-buildtools")
 provides=('gtk2hs-pango')
diff --git a/community/haskell-pcre-light/PKGBUILD b/community/haskell-pcre-light/PKGBUILD
new file mode 100644
index 000000000..bbd9e0173
--- /dev/null
+++ b/community/haskell-pcre-light/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+
+_hkgname=pcre-light
+pkgname=haskell-pcre-light
+pkgver=0.4
+pkgrel=22
+pkgdesc="A small, efficient and portable regex library for Perl 5 compatible regular expressions"
+url="http://code.haskell.org/~dons/code/pcre-light"
+license=(custom:BSD3)
+arch=('i686' 'x86_64')
+makedepends=()
+depends=("ghc>=7.0.3-2"
+         "sh"
+         "haskell-bytestring-show"
+         "pcre")
+options=('strip')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+install="$pkgname.install"
+sha256sums=("b37f6ffab07b56540ba4cc410f3ad3c4e0e6e226c610c33f4b7daf70559c31f6")
+
+build() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
+    --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
+}
diff --git a/community/haskell-pcre-light/haskell-pcre-light.install b/community/haskell-pcre-light/haskell-pcre-light.install
new file mode 100644
index 000000000..0a9d80b19
--- /dev/null
+++ b/community/haskell-pcre-light/haskell-pcre-light.install
@@ -0,0 +1,23 @@
+HS_DIR=usr/share/haskell/haskell-pcre-light
+
+post_install() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+  $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+  $HS_DIR/unregister.sh
+}
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-primitive/PKGBUILD b/community/haskell-primitive/PKGBUILD
index 7fa6e2ccb..088f5e029 100644
--- a/community/haskell-primitive/PKGBUILD
+++ b/community/haskell-primitive/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84005 2013-02-08 04:15:37Z td123 $
+# $Id: PKGBUILD 89313 2013-04-28 16:52:35Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-primitive
 pkgver=0.5.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Wrappers for primitive operations"
 url="http://hackage.haskell.org/package/primitive"
 license=("custom:BSD3")
diff --git a/community/haskell-quickcheck/PKGBUILD b/community/haskell-quickcheck/PKGBUILD
index e8bb06285..937d26326 100644
--- a/community/haskell-quickcheck/PKGBUILD
+++ b/community/haskell-quickcheck/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 84006 2013-02-08 04:15:38Z td123 $
+# $Id: PKGBUILD 89314 2013-04-28 16:52:36Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 _hkgname=QuickCheck
 pkgname=haskell-quickcheck
-pkgver=2.5.1.1
+pkgver=2.6
 pkgrel=2
 pkgdesc='Automatic testing of Haskell programs'
 url='http://hackage.haskell.org/package/QuickCheck'
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-depends=('ghc=7.6.2-1' 'haskell-random=1.0.1.1-4' 'sh')
+depends=('ghc=7.6.3-1' 'haskell-random=1.0.1.1-5' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
 install=${pkgname}.install
-sha256sums=('98492011a2e546eccf2b747a990e82a726d68af9822f9d2d620cd1232aacc2b9')
+sha256sums=('8001c00a1892714d914e5007ba72cdd428c1ea4c6b8418c6cb5e7809753d970d')
 
 build() {
   cd "$srcdir/$_hkgname-$pkgver"
 
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-    --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup configure -O -p \
+    --enable-split-objs \
+    --enable-shared \
+    --prefix=/usr \
+    --docdir="/usr/share/doc/$pkgname" \
+    --libsubdir=\$compiler/site-local/\$pkgid
   runhaskell Setup build
   runhaskell Setup haddock
   runhaskell Setup register   --gen-script
@@ -31,13 +35,15 @@ build() {
 package() {
   cd "$srcdir/$_hkgname-$pkgver"
 
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-  runhaskell Setup copy --destdir=${pkgdir}
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh \
+    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s "/usr/share/doc/$pkgname/html" \
+    "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD
index ca0e07d8e..c966e3963 100644
--- a/community/haskell-regex-base/PKGBUILD
+++ b/community/haskell-regex-base/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84007 2013-02-08 04:15:39Z td123 $
+# $Id: PKGBUILD 89315 2013-04-28 16:52:37Z td123 $
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
@@ -6,12 +6,12 @@
 _hkgname=regex-base
 pkgname=haskell-regex-base
 pkgver=0.93.2
-pkgrel=9
+pkgrel=13
 pkgdesc='Interface API for regex-posix,pcre,parsec,tdfa,dfa'
 url='http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base'
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-depends=('ghc=7.6.2-1' 'sh' 'haskell-mtl=2.1.2')
+depends=('ghc=7.6.3-1' 'sh' 'haskell-mtl=2.1.2')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
 install=$pkgname.install
 sha256sums=('20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278')
diff --git a/community/haskell-regex-compat/PKGBUILD b/community/haskell-regex-compat/PKGBUILD
index 62c4e99e3..fc0738ada 100644
--- a/community/haskell-regex-compat/PKGBUILD
+++ b/community/haskell-regex-compat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84008 2013-02-08 04:15:40Z td123 $
+# $Id: PKGBUILD 89316 2013-04-28 16:52:38Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
@@ -6,12 +6,12 @@
 _hkgname=regex-compat
 pkgname=haskell-regex-compat
 pkgver=0.95.1
-pkgrel=4
+pkgrel=5
 pkgdesc='Replaces and enhances Text.Regex'
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-depends=('ghc=7.6.2-1' 'sh' 'haskell-regex-base=0.93.2' 'haskell-regex-posix=0.95.2')
+depends=('ghc=7.6.3-1' 'sh' 'haskell-regex-base=0.93.2' 'haskell-regex-posix=0.95.2')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 sha256sums=('d57cb1a5a4d66753b18eaa37a1621246f660472243b001894f970037548d953b')
diff --git a/community/haskell-regex-posix/PKGBUILD b/community/haskell-regex-posix/PKGBUILD
index 374044a61..45597f8d6 100644
--- a/community/haskell-regex-posix/PKGBUILD
+++ b/community/haskell-regex-posix/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84009 2013-02-08 04:15:40Z td123 $
+# $Id: PKGBUILD 89317 2013-04-28 16:52:39Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
@@ -6,12 +6,12 @@
 _hkgname=regex-posix
 pkgname=haskell-regex-posix
 pkgver=0.95.2
-pkgrel=3
+pkgrel=4
 pkgdesc='The posix regex backend for regex-base'
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.2-1' 'sh' 'haskell-regex-base=0.93.2')
+depends=('ghc=7.6.3-1' 'sh' 'haskell-regex-base=0.93.2')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 sha256sums=('56019921cd4a4c9682b81ec614236fea816ba8ed8785a1640cd66d8b24fc703e')
diff --git a/community/haskell-stm/PKGBUILD b/community/haskell-stm/PKGBUILD
index 83f07905e..0fa5c7670 100644
--- a/community/haskell-stm/PKGBUILD
+++ b/community/haskell-stm/PKGBUILD
@@ -4,19 +4,19 @@
 _hkgname=stm
 pkgname=haskell-stm
 pkgver=2.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A modular composable concurrency abstraction."
 url="http://hackage.haskell.org/package/stm"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.2-1' 'sh')
+depends=('ghc=7.6.3-1' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
 md5sums=('a0008fce2e12a18ab230516132d4117e')
 
 build() {
     cd ${srcdir}/${_hkgname}-$pkgver
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
+    runhaskell Setup configure -O  --enable-split-objs --enable-shared --prefix=/usr \
       --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
     runhaskell Setup haddock
diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD
index 57fb85526..dee27a3c4 100644
--- a/community/haskell-syb/PKGBUILD
+++ b/community/haskell-syb/PKGBUILD
@@ -2,17 +2,17 @@
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 _hkgname=syb
 pkgname=haskell-syb
-pkgver=0.3.7
+pkgver=0.4.0
 pkgrel=2
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.2-1' sh)
+depends=('ghc=7.6.3-1' sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('fa653976a4ee43918cc7546089f94b60')
+md5sums=('ec2719d444a6561b2424dcef10b4fe34')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-tagsoup/PKGBUILD b/community/haskell-tagsoup/PKGBUILD
new file mode 100644
index 000000000..5f7712866
--- /dev/null
+++ b/community/haskell-tagsoup/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+_hkgname=tagsoup
+pkgname=haskell-tagsoup
+pkgver=0.12.8
+pkgrel=3
+pkgdesc="Parsing and extracting information from (possibly malformed) HTML/XML documents"
+url="http://community.haskell.org/~ndm/tagsoup/"
+license=(custom:BSD3)
+arch=('i686' 'x86_64')
+depends=("ghc" "haskell-text")
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+install=$pkgname.install
+sha256sums=('a31e49133690b546a6b948a9ab9f924aaf5bd94f9e3e0afb99bb570c104c9515')
+
+build() {
+  cd $srcdir/${_hkgname}-${pkgver}
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
+    --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd $srcdir/${_hkgname}-${pkgver}
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
+}
diff --git a/community/haskell-tagsoup/haskell-tagsoup.install b/community/haskell-tagsoup/haskell-tagsoup.install
new file mode 100644
index 000000000..2e0c845a5
--- /dev/null
+++ b/community/haskell-tagsoup/haskell-tagsoup.install
@@ -0,0 +1,23 @@
+HS_DIR=usr/share/haskell/haskell-tagsoup
+
+post_install() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+  $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+  $HS_DIR/unregister.sh
+}
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch b/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch
deleted file mode 100644
index b8c2264bc..000000000
--- a/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bd14edd6240c72baa22822338fc872e6827af680 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 11 Sep 2012 06:24:09 -0700
-Subject: [PATCH] update changed time code for ghc 7.6.1
-
----
- Codec/Archive/Tar/Pack.hs | 9 +++++----
- tar.cabal                 | 2 +-
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/Codec/Archive/Tar/Pack.hs b/Codec/Archive/Tar/Pack.hs
-index 8e43091..0af6103 100644
---- a/Codec/Archive/Tar/Pack.hs
-+++ b/Codec/Archive/Tar/Pack.hs
-@@ -28,8 +28,8 @@ import qualified System.FilePath as FilePath.Native
- import System.Directory
-          ( getDirectoryContents, doesDirectoryExist, getModificationTime
-          , Permissions(..), getPermissions )
--import System.Time
--         ( ClockTime(..) )
-+import Data.Time.Clock.POSIX
-+         ( utcTimeToPOSIXSeconds )
- import System.IO
-          ( IOMode(ReadMode), openBinaryFile, hFileSize )
- import System.IO.Unsafe (unsafeInterleaveIO)
-@@ -170,5 +170,6 @@ recurseDirectories base (dir:dirs) = unsafeInterleaveIO $ do
- 
- getModTime :: FilePath -> IO EpochTime
- getModTime path = do
--  (TOD s _) <- getModificationTime path
--  return $! fromIntegral s
-+  utcTime <- getModificationTime path
-+  let s = truncate . utcTimeToPOSIXSeconds $ utcTime
-+  return $! s
-diff --git a/tar.cabal b/tar.cabal
-index e748b07..d85b0da 100644
---- a/tar.cabal
-+++ b/tar.cabal
-@@ -25,7 +25,7 @@ source-repository head
- 
- library
-   build-depends: base >= 3 && < 5, filepath,
--                 directory, old-time, bytestring
-+                 directory, bytestring, time
- 
-   exposed-modules:
-     Codec.Archive.Tar
--- 
-1.7.12
-
diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD
index eab40145f..968bcb1cd 100644
--- a/community/haskell-tar/PKGBUILD
+++ b/community/haskell-tar/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 84012 2013-02-08 04:15:43Z td123 $
+# $Id: PKGBUILD 89321 2013-04-28 16:52:43Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haskell-tar
 pkgver=0.4.0.1
-pkgrel=2
+pkgrel=5
 pkgdesc='Reading, writing and manipulating tar archive files'
 url='http://hackage.haskell.org/package/tar'
 license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.6.1-1')
+arch=('x86_64' 'i686')
+depends=('ghc=7.6.3-1')
 source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz")
 install=haskell-tar.install
 sha256sums=('a408274d8325f4e3144c5aa154d72f1ee7b0a7342570fd6805e3be3fe0d97a6d')
diff --git a/community/haskell-temporary/PKGBUILD b/community/haskell-temporary/PKGBUILD
new file mode 100644
index 000000000..af3453656
--- /dev/null
+++ b/community/haskell-temporary/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+_hkgname=temporary
+pkgname=haskell-temporary
+pkgver=1.1.2.4
+pkgrel=3
+pkgdesc="Portable temporary file and directory support for Windows and Unix, based on code from Cabal"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+makedepends=()
+depends=('ghc' 'haskell-directory' 'haskell-filepath' 'haskell-unix')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=$pkgname.install
+sha1sums=('310b6d07014064b2ecafb794393c1bba76286a33')
+
+build() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+package() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/${_hkgname}"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
+}
diff --git a/community/haskell-temporary/haskell-temporary.install b/community/haskell-temporary/haskell-temporary.install
new file mode 100644
index 000000000..39a0a49ff
--- /dev/null
+++ b/community/haskell-temporary/haskell-temporary.install
@@ -0,0 +1,23 @@
+HS_DIR=usr/share/haskell/haskell-temporary
+
+post_install() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+  $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+  $HS_DIR/unregister.sh
+}
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD
index 25f7a63ff..e35f7da1a 100644
--- a/community/haskell-terminfo/PKGBUILD
+++ b/community/haskell-terminfo/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 84013 2013-02-08 04:15:44Z td123 $
+# $Id: PKGBUILD 89323 2013-04-28 16:52:45Z td123 $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 _hkgname=terminfo
 pkgname=haskell-terminfo
 pkgver=0.3.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Haskell bindings to the terminfo library."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.6.2-1' 'sh')
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.3-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
 md5sums=('7ef09acfac9f6fc499ed3bb804ae2ab3')
diff --git a/community/haskell-texmath/PKGBUILD b/community/haskell-texmath/PKGBUILD
new file mode 100644
index 000000000..50d844037
--- /dev/null
+++ b/community/haskell-texmath/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Arch Haskell Team <>
+# Contributor: Lex Black <autumn-wind at web dot de>
+
+pkgname=haskell-texmath
+_hkgname=texmath
+pkgver=0.6.1.3
+pkgrel=2
+pkgdesc="Conversion of LaTeX math formulas to MathML."
+url="https://github.com/jgm/texmath"
+license=("GPL")
+arch=('i686' 'x86_64')
+makedepends=('ghc')
+depends=(haskell-containers haskell-parsec haskell-syb haskell-xml)
+source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz")
+install=$pkgname.install
+md5sums=('6737a06392f51886e8b1ca8aa6dc2168')
+
+build() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
+    --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
+}
diff --git a/community/haskell-texmath/haskell-texmath.install b/community/haskell-texmath/haskell-texmath.install
new file mode 100644
index 000000000..a442219ec
--- /dev/null
+++ b/community/haskell-texmath/haskell-texmath.install
@@ -0,0 +1,23 @@
+HS_DIR=usr/share/haskell/haskell-texmath
+
+post_install() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+  $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+  $HS_DIR/unregister.sh
+}
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-utf8-string/PKGBUILD b/community/haskell-utf8-string/PKGBUILD
index 112a5737f..cbe6930f6 100644
--- a/community/haskell-utf8-string/PKGBUILD
+++ b/community/haskell-utf8-string/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 84014 2013-02-08 04:15:45Z td123 $
+# $Id: PKGBUILD 89325 2013-04-28 16:52:49Z td123 $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
 _hkgname=utf8-string
 pkgname=haskell-utf8-string
 pkgver=0.3.7
-pkgrel=4
+pkgrel=5
 pkgdesc="Support for reading and writing UTF8 Strings"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.6.2-1' 'sh')
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.3-1' 'sh')
 install=${pkgname}.install
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 md5sums=('50e5c395713e716e0e4a56da73f87ccd')
diff --git a/community/haskell-vector/PKGBUILD b/community/haskell-vector/PKGBUILD
index 25bbbf5fb..bbd867873 100644
--- a/community/haskell-vector/PKGBUILD
+++ b/community/haskell-vector/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 84015 2013-02-08 04:15:45Z td123 $
+# $Id: PKGBUILD 89326 2013-04-28 16:52:52Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-vector
 pkgver=0.10.0.1
-pkgrel=2
+pkgrel=4
 pkgdesc="Efficient Arrays"
 url="http://code.haskell.org/vector"
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
 makedepends=()
-depends=("ghc" "haskell-primitive")
+depends=("ghc=7.6.3" "haskell-primitive")
 options=('strip')
 install="${pkgname}.install"
 source=("http://hackage.haskell.org/packages/archive/vector/${pkgver}/vector-${pkgver}.tar.gz")
diff --git a/community/haskell-x11-xft/PKGBUILD b/community/haskell-x11-xft/PKGBUILD
index ee39ea56b..a2ef0e0f2 100644
--- a/community/haskell-x11-xft/PKGBUILD
+++ b/community/haskell-x11-xft/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 84017 2013-02-08 04:15:47Z td123 $
+# $Id: PKGBUILD 89328 2013-04-28 16:52:54Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 _hkgname=X11-xft
 pkgname=haskell-x11-xft
 pkgver=0.3.1
-pkgrel=6
+pkgrel=9
 pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('LGPL')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.6.2-1' 'haskell-x11=1.6.0.2-2' 'haskell-utf8-string=0.3.7-4' 'libxft')
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.3-1' 'haskell-x11=1.6.1.1-3' 'haskell-utf8-string=0.3.7' 'libxft')
 options=('strip')
 install=haskell-x11-xft.install
 source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz)
@@ -17,7 +17,7 @@ md5sums=('ad885150a59f63de328e73abe5ffc79e')
 
 build() {
   cd ${srcdir}/${_hkgname}-${pkgver}
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+  runhaskell Setup configure -O  --enable-split-objs --enable-shared \
     --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
   runhaskell Setup build
   runhaskell Setup haddock
diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD
index cb1f90eb9..9410e92d5 100644
--- a/community/haskell-x11/PKGBUILD
+++ b/community/haskell-x11/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 84016 2013-02-08 04:15:46Z td123 $
+# $Id: PKGBUILD 89327 2013-04-28 16:52:53Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: shild <sxp@bk.ru>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 _hkgname=X11
 pkgname=haskell-x11
-pkgver=1.6.0.2
-pkgrel=2
+pkgver=1.6.1.1
+pkgrel=3
 pkgdesc="A Haskell binding to the X11 graphics library."
 arch=(i686 x86_64 'mips64el')
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
 license=('custom:BSD3')
 options=('strip')
-depends=("ghc=7.6.2-1" "haskell-syb=0.3.7-2" 'libx11' 'libxinerama' 'libxrandr')
+depends=("ghc=7.6.3-1" "libx11" "libxinerama" "libxrandr" "haskell-data-default=0.5.3")
 conflicts=(haskell-x11-extras)
 install=hsmod.install
 source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
-md5sums=('0227ba7a8788c3cfd146e952a5fafc82')
+md5sums=('80638b99238f72d4cc351b4fbd7274fc')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    runhaskell Setup configure -O  --enable-split-objs --enable-shared \
       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
     runhaskell Setup haddock
diff --git a/community/haskell-xhtml/PKGBUILD b/community/haskell-xhtml/PKGBUILD
index 7104a7869..67ee0ad24 100644
--- a/community/haskell-xhtml/PKGBUILD
+++ b/community/haskell-xhtml/PKGBUILD
@@ -6,12 +6,12 @@
 _hkgname=xhtml
 pkgname=haskell-xhtml
 pkgver=3000.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc='Combinators for producing XHTML 1.0'
 url='http://hackage.haskell.org/package/xhtml'
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-depends=('ghc=7.6.2-1' 'sh')
+depends=('ghc=7.6.3-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz")
 install=$pkgname.install
 sha256sums=('33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8')
diff --git a/community/haskell-xml/PKGBUILD b/community/haskell-xml/PKGBUILD
new file mode 100644
index 000000000..1dbd9f84a
--- /dev/null
+++ b/community/haskell-xml/PKGBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Don Stewart <dons@galois.com>
+# Contributor: Lex Black <autumn-wind at web dot de>
+
+_hkgname=xml
+pkgname=haskell-xml
+pkgver=1.3.13
+pkgrel=2
+pkgdesc="A simple XML library."
+url="http://code.galois.com"
+license=(custom:BSD3)
+arch=('i686' 'x86_64')
+makedepends=()
+depends=("ghc" "haskell-bytestring" "haskell-text")
+options=('strip')
+source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz")
+install=$pkgname.install
+sha256sums=('c33607cef8a48d878b0e617e115135fc6f025fe43dcb65c2c7afb8285415b813')
+
+build() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
+    --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd "$srcdir/$_hkgname-$pkgver"
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
+}
diff --git a/community/haskell-xml/haskell-xml.install b/community/haskell-xml/haskell-xml.install
new file mode 100644
index 000000000..8ab99b5b7
--- /dev/null
+++ b/community/haskell-xml/haskell-xml.install
@@ -0,0 +1,23 @@
+HS_DIR=usr/share/haskell/haskell-xml
+
+post_install() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+  $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+  $HS_DIR/unregister.sh
+}
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-zip-archive/PKGBUILD b/community/haskell-zip-archive/PKGBUILD
new file mode 100644
index 000000000..af589729e
--- /dev/null
+++ b/community/haskell-zip-archive/PKGBUILD
@@ -0,0 +1,43 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Arch Haskell Team <>
+# Contributor: Lex Black <autumn-wind at web dot de>
+
+pkgname=haskell-zip-archive
+_hkgname=zip-archive
+pkgver=0.1.3.4
+pkgrel=3
+pkgdesc="Library for creating and modifying zip archives."
+url="http://github.com/jgm/zip-archive"
+license=(custom:BSD3)
+arch=('i686' 'x86_64')
+makedepends=('ghc')
+depends=(haskell-array haskell-binary haskell-bytestring haskell-containers
+         haskell-digest haskell-directory haskell-filepath haskell-mtl
+         haskell-old-time haskell-pretty haskell-utf8-string haskell-zlib)
+source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/${_hkgname}-${pkgver}.tar.gz")
+install=$pkgname.install
+sha256sums=('cbef41120d995a87702f7bb0c1ed8107f3f36a61714b2e31d9d19df5466e7643')
+
+build() {
+  cd "$srcdir/$_hkgname-$pkgver"
+
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/$pkgname \
+    --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${srcdir}/${_hkgname}-${pkgver}
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
+}
diff --git a/community/haskell-zip-archive/haskell-zip-archive.install b/community/haskell-zip-archive/haskell-zip-archive.install
new file mode 100644
index 000000000..3fc2845ef
--- /dev/null
+++ b/community/haskell-zip-archive/haskell-zip-archive.install
@@ -0,0 +1,23 @@
+HS_DIR=usr/share/haskell/haskell-zip-archive
+
+post_install() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+  $HS_DIR/unregister.sh
+}
+
+post_upgrade() {
+  $HS_DIR/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+  $HS_DIR/unregister.sh
+}
+
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD
index 7ffbf42ff..a0ebc3229 100644
--- a/community/haveged/PKGBUILD
+++ b/community/haveged/PKGBUILD
@@ -1,39 +1,32 @@
-# $Id: PKGBUILD 81287 2012-12-16 08:30:34Z bpiotrowski $
+# $Id: PKGBUILD 86268 2013-03-14 14:36:13Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: kfgz <kfgz at interia dot pl>
 # Contributor: pootzko <pootzko at gmail dot com>
 
 pkgname=haveged
-pkgver=1.6
+pkgver=1.7.a
+_pkgver=${pkgver/.a/a}
 pkgrel=1
 pkgdesc='Entropy harvesting daemon using CPU timings'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.issihosts.com/haveged'
 license=('GPL')
 depends=('glibc')
-source=($url/$pkgname-$pkgver.tar.gz
-        rc.d service)
-md5sums=('5a386a530e89bfbc6c8d22717b16e2a8'
-         '264b725be5271288b40f363d7cfc6b68'
-         'fc62a480f520377364503aca9efff0b0')
+source=($url/$pkgname-$_pkgver.tar.gz
+        service)
+sha256sums=('8e7b0779bd8a4b9b73769ddaf626918355e2a542d3ac35e5ec31b74a58b9b051'
+            '85aed005b7d0d0bae74f7fc0ca70907a6f67ddbcb2df77ca004f9a919028564a')
 
 build() {
-  cd $srcdir/$pkgname-${pkgver/a/}
+  cd $srcdir/$pkgname-$_pkgver
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-${pkgver/a/}
+  cd $srcdir/$pkgname-$_pkgver
   make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/etc/init.d
 
-  install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/haveged
+  rm -rf $pkgdir/etc/init.d
   install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/haveged.service
 }
-md5sums=('c1f34be00c3f438ec83862e90e192e4b'
-         '264b725be5271288b40f363d7cfc6b68'
-         'fc62a480f520377364503aca9efff0b0')
-md5sums=('5a386a530e89bfbc6c8d22717b16e2a8'
-         '264b725be5271288b40f363d7cfc6b68'
-         'fc62a480f520377364503aca9efff0b0')
diff --git a/community/haveged/haveged b/community/haveged/haveged
deleted file mode 100644
index c0e13b40d..000000000
--- a/community/haveged/haveged
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-##
-# chkconfig: 2345 75 25
-# description: havege entropy daemon
-#
-# source function library
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-RETVAL=0
-prog="haveged"
-
-case "$1" in
-start)
-  stat_busy $"Starting $prog"
-  /usr/sbin/$prog -w 1024 -v 1
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    add_daemon $prog
-    stat_done
-  fi
-  ;;
-
-stop)
-  stat_busy $"Stopping $prog"
-  kill `cat /var/run/$prog.pid`
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    rm_daemon $prog
-    stat_done
-    rm -f /var/lock/$prog
-  fi
-  ;;
-  
-restart)
-  $0 stop
-  $0 start
-  ;;
-
-*)
-  echo "usage: $prog [start|stop|restart]"
-esac
diff --git a/community/haveged/haveged-1.7-build.patch b/community/haveged/haveged-1.7-build.patch
new file mode 100644
index 000000000..c32d1927e
--- /dev/null
+++ b/community/haveged/haveged-1.7-build.patch
@@ -0,0 +1,13 @@
+Index: haveged-1.7/src/Makefile.am
+===================================================================
+--- haveged-1.7.orig/src/Makefile.am
++++ haveged-1.7/src/Makefile.am
+@@ -27,7 +27,7 @@ pkginclude_HEADERS = havege.h
+ 
+ haveged_SOURCES = haveged.c haveged.h
+ 
+-haveged_LDADD = @HA_LDFLAGS@ $(top_builddir)/src/libhavege.la
++haveged_LDADD = @HA_LDFLAGS@ libhavege.la
+ ##libtool_end##
+ 
+ MAINTAINERCLEANFILES = Makefile.in
diff --git a/community/haveged/haveged.service b/community/haveged/haveged.service
deleted file mode 100644
index 6803a0dec..000000000
--- a/community/haveged/haveged.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Entropy Harvesting Daemon
-Documentation=man:haveged(8)
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/haveged -w 1024 -v 1
-PIDFile=/var/run/haveged.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/haveged/rc.d b/community/haveged/rc.d
deleted file mode 100644
index c0e13b40d..000000000
--- a/community/haveged/rc.d
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-##
-# chkconfig: 2345 75 25
-# description: havege entropy daemon
-#
-# source function library
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-RETVAL=0
-prog="haveged"
-
-case "$1" in
-start)
-  stat_busy $"Starting $prog"
-  /usr/sbin/$prog -w 1024 -v 1
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    add_daemon $prog
-    stat_done
-  fi
-  ;;
-
-stop)
-  stat_busy $"Stopping $prog"
-  kill `cat /var/run/$prog.pid`
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    rm_daemon $prog
-    stat_done
-    rm -f /var/lock/$prog
-  fi
-  ;;
-  
-restart)
-  $0 stop
-  $0 start
-  ;;
-
-*)
-  echo "usage: $prog [start|stop|restart]"
-esac
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index 26413b64d..95316307e 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 84019 2013-02-08 04:15:49Z td123 $
+# $Id: PKGBUILD 89332 2013-04-28 16:53:03Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hedgewars
 pkgver=0.9.18
-pkgrel=5
+pkgrel=7
 pkgdesc="Free Worms-like turn based strategy game"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hedgewars.org"
 license=('GPL' 'custom')
-depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51')
+depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51')
 makedepends=('fpc' 'cmake'
 	     # haskell specific
-	     'ghc=7.6.2-1'
-	     'haskell-network=2.4.1.0-1'
-             'haskell-bytestring-show=0.3.5.4-3'
-	     'haskell-utf8-string=0.3.7-4'
-             'haskell-dataenc=0.14.0.5-1'
-	     'haskell-hslogger=1.2.1-3'
-             'haskell-vector=0.10.0.1-2')
+	     'ghc=7.6.3-1'
+	     'haskell-network=2.4.1.2-1'
+             'haskell-bytestring-show=0.3.5.4-4'
+	     'haskell-utf8-string=0.3.7-5'
+             'haskell-dataenc=0.14.0.5-2'
+	     'haskell-hslogger=1.2.1-4'
+             'haskell-vector=0.10.0.1-4')
 source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver-3.tar.bz2
 	hedgewars.desktop
 	hedgewars.png)
@@ -32,8 +32,8 @@ build() {
   cmake \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DDATA_INSTALL_DIR=/usr/share \
-	-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \
-	-DQT_MOC_EXECUTABLE=/usr/bin/moc \
+	-DQT_QMAKE_EXECUTABLE=/usr/lib/qt4/bin/qmake \
+	-DQT_MOC_EXECUTABLE=/usr/lib/qt4/bin/moc \
 	-DWITH_SERVER=1 .
   make
 }
diff --git a/community/hercules/PKGBUILD b/community/hercules/PKGBUILD
index 4f49a03bf..bce962aad 100644
--- a/community/hercules/PKGBUILD
+++ b/community/hercules/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 83152 2013-01-27 16:17:47Z pierre $
+# $Id: PKGBUILD 85609 2013-03-03 23:25:19Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Kevin Piche <kevin@archlinux.org>
 
 pkgname=hercules
-pkgver=3.07
-pkgrel=2
-pkgdesc="A software implementation of the mainframe System/370 and ESA/390 architectures"
-url="http://www.hercules-390.org/"
-source=("http://www.hercules-390.org/$pkgname-$pkgver.tar.gz")
-arch=('i686' 'x86_64')
+pkgver=3.08
+pkgrel=1
+arch=('x86_64' 'i686' 'mips64el')
+pkgdesc='Software implementation of System/370 and ESA/390'
+url='http://www.hercules-390.eu/'
+source=("http://downloads.hercules-390.eu/$pkgname-$pkgver.tar.gz")
 license=('custom')
 options=('!libtool')
-depends=('bzip2' 'libgcrypt' 'zlib')
-md5sums=('a12aa1645b0695b25b7fc0c9a3ccab3a')
+depends=('bzip2' 'libgcrypt' 'zlib' 'perl')
+sha256sums=('85e217773587f2278d4b6cb6bc815e042cfc982d0fc14baa0da4a84dea399e9d')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
+
   # Change module extension from .la to .so.
   sed '/HDL_MODULE_SUFFIX/ s/\.la/.so/' -i hdl.h
   ./configure --prefix=/usr
-  make
+  make -j1
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
-  install -D -m644 COPYRIGHT \
-    $pkgdir/usr/share/licenses/hercules/qpl1
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make prefix="$pkgdir/usr" install
+  install -Dm644 COPYRIGHT \
+    "$pkgdir/usr/share/licenses/hercules/qpl1"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/herqq/PKGBUILD b/community/herqq/PKGBUILD
index e1492c5f2..c7ff73ea4 100644
--- a/community/herqq/PKGBUILD
+++ b/community/herqq/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 83154 2013-01-27 16:18:20Z pierre $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 85358 2013-03-01 10:33:17Z andrea $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=herqq
 pkgver=1.0.0
-pkgrel=1
-pkgdesc="A software library for building UPnP devices (HUPnP)"
-arch=('i686' 'x86_64')
-url="http://www.herqq.org/"
+pkgrel=2
+pkgdesc='Software library for building UPnP devices (HUPnP)'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.herqq.org/'
 license=('GPL')
-depends=('qt')
-source=("http://downloads.sourceforge.net/hupnp/${pkgname}-${pkgver}.zip")
-md5sums=('45a0632f7c7b64bc0fdab852d36c1e61')
+depends=('qt4')
+source=("http://downloads.sourceforge.net/hupnp/$pkgname-$pkgver.zip")
+sha256sums=('cbcfc76f72d561d822a7ff5374b97e80d1731b610a5c257edbf5c013bfe6748e')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   qmake PREFIX=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make INSTALL_ROOT="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make INSTALL_ROOT="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/higan-gtk/PKGBUILD b/community/higan-gtk/PKGBUILD
new file mode 100755
index 000000000..dfe77182c
--- /dev/null
+++ b/community/higan-gtk/PKGBUILD
@@ -0,0 +1,74 @@
+# $Id: PKGBUILD 85869 2013-03-07 23:37:24Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+
+pkgname=higan-gtk
+pkgver=092
+pkgrel=4
+pkgdesc="Nintendo multi-system emulator - GTK version"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/higan/"
+license=('GPL3')
+depends=('libao' 'libpulse' 'libxv' 'openal' 'sdl' 'xdialog')
+makedepends=('mesa')
+optdepends=('beat: Delta patcher')
+conflicts=('higan-qt')
+source=("http://higan.googlecode.com/files/higan_v${pkgver}-source.tar.xz" "http://higan.googlecode.com/files/purify_v03-source.tar.xz" 'higan' 'higan.desktop' 'purify.desktop')
+sha1sums=('a205005f118f6e138065af6e0d14ed990b8f1ce1'
+          '2aa16f492c879d2cc1d4ffa28f4729a5ed5bb1c3'
+          '931baedc3bbdd343d2decda72c13b7d0efdcba3c'
+          '55f4de0a65d6428840d013f9b003d88158c131c7'
+          '093643998a2fb676d795c316e35d49cf6293ce86')
+
+_profiles="accuracy balanced performance"
+
+build() {
+# Compile libananke
+  cd "${srcdir}"/purify_v03-source/ananke
+  make compiler=gcc platform=x phoenix=gtk
+
+# Compile purify
+  cd "${srcdir}"/purify_v03-source/purify
+  make compiler=gcc platform=x link='-s -lX11 -ldl -Wl,-export-dynamic' phoenix=gtk
+
+# Compile higan
+  cd "${srcdir}"/higan_v${pkgver}-source/higan
+  sed -i 's|flags += -march=native|flags += -mtune=generic|' Makefile
+  for _profile in ${_profiles} ; do
+    make compiler=gcc platform=x target=ethos phoenix=gtk profile=${_profile}
+    mv out/higan out/higan-${_profile}
+    make clean
+  done
+}
+
+package() {
+# Install common files
+  cd "${srcdir}"/higan_v${pkgver}-source
+  install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{applications,pixmaps,higan}}
+  install -m 755 "${srcdir}"/higan "${pkgdir}"/usr/bin/higan
+  install -m 644 "${srcdir}"/higan.desktop "${pkgdir}"/usr/share/applications/higan.desktop
+  install -m 644 higan/data/higan.png "${pkgdir}"/usr/share/pixmaps/higan.png
+  cp -dr --no-preserve=ownership higan/{profile/*,data/cheats.bml} "${pkgdir}"/usr/share/higan/
+  cp -dr --no-preserve=ownership shaders "${pkgdir}/usr/share/higan/Video Shaders"
+
+# Fix some permissions
+  find "${pkgdir}"/usr/share/higan/ -type d -exec chmod 755 {} +
+  find "${pkgdir}"/usr/share/higan/ -type f -exec chmod 644 {} +
+
+# Install libananke
+  cd "${srcdir}"/purify_v03-source/ananke
+  install -m 644 libananke.so "${pkgdir}"/usr/lib/libananke.so.1
+  ln -s /usr/lib/libananke.so.1 "${pkgdir}"/usr/lib/libananke.so
+
+# Install purify
+  cd "${srcdir}"/purify_v03-source/purify
+  install -m 755 purify "${pkgdir}"/usr/bin/purify
+  install -m 644 "${srcdir}"/purify.desktop "${pkgdir}"/usr/share/applications/purify.desktop
+
+# Install higan
+  cd "${srcdir}"/higan_v${pkgver}-source/higan
+  for _profile in ${_profiles} ; do
+    install -m 755 out/higan-${_profile} "${pkgdir}"/usr/bin/higan-${_profile}
+  done
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/higan-gtk/higan b/community/higan-gtk/higan
new file mode 100755
index 000000000..29fc0b7bb
--- /dev/null
+++ b/community/higan-gtk/higan
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Shared folders workaround
+cp -ru /usr/share/higan ~/.config/
+
+# Check for profiles and prompt user with a GUI
+[ -e /usr/bin/higan-accuracy ] && tag1=accuracy
+[ -e /usr/bin/higan-balanced ] && tag2=balanced
+[ -e /usr/bin/higan-performance ] && tag3=performance
+profile="$(Xdialog --stdout --no-tags --title "higan" --radiolist "Choose a profile" 0 0 0 "$tag1" "Accuracy" off "$tag2" "Balanced" off "$tag3" "Performance" off)"
+
+# Launch selected profile
+exec higan-$profile "$@"
diff --git a/community/higan-gtk/higan.desktop b/community/higan-gtk/higan.desktop
new file mode 100755
index 000000000..c9cd3c14b
--- /dev/null
+++ b/community/higan-gtk/higan.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=higan
+Comment=Nintendo multi-system emulator
+Exec=higan %u
+Icon=higan
+Terminal=false
+Type=Application
+Categories=Game;Emulator;
diff --git a/community/higan-gtk/purify.desktop b/community/higan-gtk/purify.desktop
new file mode 100755
index 000000000..354dc2849
--- /dev/null
+++ b/community/higan-gtk/purify.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=purify
+Comment=ROM purifier
+Exec=/usr/bin/purify
+Icon=higan
+Terminal=false
+Type=Application
+Categories=Game;Emulator;
diff --git a/community/higan-qt/PKGBUILD b/community/higan-qt/PKGBUILD
new file mode 100755
index 000000000..8fb2e10de
--- /dev/null
+++ b/community/higan-qt/PKGBUILD
@@ -0,0 +1,80 @@
+# $Id: PKGBUILD 85871 2013-03-07 23:53:25Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+
+pkgname=higan-qt
+pkgver=092
+pkgrel=6
+pkgdesc="Nintendo multi-system emulator - QT version"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/higan/"
+license=('GPL3')
+depends=('libao' 'libpulse' 'openal' 'qt4' 'sdl' 'xdialog')
+makedepends=('mesa')
+optdepends=('beat: Delta patcher')
+conflicts=('higan-gtk')
+source=("http://higan.googlecode.com/files/higan_v${pkgver}-source.tar.xz" "http://higan.googlecode.com/files/purify_v03-source.tar.xz" 'higan' 'higan.desktop' 'purify.desktop')
+sha1sums=('a205005f118f6e138065af6e0d14ed990b8f1ce1'
+          '2aa16f492c879d2cc1d4ffa28f4729a5ed5bb1c3'
+          '931baedc3bbdd343d2decda72c13b7d0efdcba3c'
+          '55f4de0a65d6428840d013f9b003d88158c131c7'
+          '093643998a2fb676d795c316e35d49cf6293ce86')
+
+_profiles="accuracy balanced performance"
+
+build() {
+# QT 4.8.0 fix
+  cd "${srcdir}"
+  moc-qt4 -i -Ipurify_v03-source/ananke/phoenix/qt/ -o purify_v03-source/ananke/phoenix/qt/platform.moc purify_v03-source/ananke/phoenix/qt/platform.moc.hpp
+  moc-qt4 -i -Ipurify_v03-source/purify/phoenix/qt/ -o purify_v03-source/purify/phoenix/qt/platform.moc purify_v03-source/purify/phoenix/qt/platform.moc.hpp
+  moc-qt4 -i -Ihigan_v${pkgver}-source/higan/phoenix/qt/ -o higan_v${pkgver}-source/higan/phoenix/qt/platform.moc higan_v${pkgver}-source/higan/phoenix/qt/platform.moc.hpp
+
+# Compile libananke
+  cd "${srcdir}"/purify_v03-source/ananke
+  make compiler=gcc platform=x phoenix=qt
+
+# Compile purify
+  cd "${srcdir}"/purify_v03-source/purify
+  make compiler=gcc platform=x link='-s -lX11 -ldl -Wl,-export-dynamic' phoenix=qt
+
+# Compile higan
+  cd "${srcdir}"/higan_v${pkgver}-source/higan
+  sed -i 's|flags += -march=native|flags += -mtune=generic|' Makefile
+  for _profile in ${_profiles} ; do
+    make compiler=gcc platform=x target=ethos phoenix=qt profile=${_profile}
+    mv out/higan out/higan-${_profile}
+    make clean
+  done
+}
+
+package() {
+# Install common files
+  cd "${srcdir}"/higan_v${pkgver}-source
+  install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{applications,pixmaps,higan}}
+  install -m 755 "${srcdir}"/higan "${pkgdir}"/usr/bin/higan
+  install -m 644 "${srcdir}"/higan.desktop "${pkgdir}"/usr/share/applications/higan.desktop
+  install -m 644 higan/data/higan.png "${pkgdir}"/usr/share/pixmaps/higan.png
+  cp -dr --no-preserve=ownership higan/{profile/*,data/cheats.bml} "${pkgdir}"/usr/share/higan/
+  cp -dr --no-preserve=ownership shaders "${pkgdir}/usr/share/higan/Video Shader"s
+
+# Fix some permissions
+  find "${pkgdir}"/usr/share/higan -type d -exec chmod 755 {} +
+  find "${pkgdir}"/usr/share/higan -type f -exec chmod 644 {} +
+
+# Install libananke
+  cd "${srcdir}"/purify_v03-source/ananke
+  install -m 644 libananke.so "${pkgdir}"/usr/lib/libananke.so.1
+  ln -s /usr/lib/libananke.so.1 "${pkgdir}"/usr/lib/libananke.so
+
+# Install purify
+  cd "${srcdir}"/purify_v03-source/purify
+  install -m 755 purify "${pkgdir}"/usr/bin/purify
+  install -m 644 "${srcdir}"/purify.desktop "${pkgdir}"/usr/share/applications/purify.desktop
+
+# Install higan
+  cd "${srcdir}"/higan_v${pkgver}-source/higan
+  for _profile in ${_profiles} ; do
+    install -m 755 out/higan-${_profile} "${pkgdir}"/usr/bin/higan-${_profile}
+  done
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/higan-qt/higan b/community/higan-qt/higan
new file mode 100755
index 000000000..29fc0b7bb
--- /dev/null
+++ b/community/higan-qt/higan
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Shared folders workaround
+cp -ru /usr/share/higan ~/.config/
+
+# Check for profiles and prompt user with a GUI
+[ -e /usr/bin/higan-accuracy ] && tag1=accuracy
+[ -e /usr/bin/higan-balanced ] && tag2=balanced
+[ -e /usr/bin/higan-performance ] && tag3=performance
+profile="$(Xdialog --stdout --no-tags --title "higan" --radiolist "Choose a profile" 0 0 0 "$tag1" "Accuracy" off "$tag2" "Balanced" off "$tag3" "Performance" off)"
+
+# Launch selected profile
+exec higan-$profile "$@"
diff --git a/community/higan-qt/higan.desktop b/community/higan-qt/higan.desktop
new file mode 100755
index 000000000..c9cd3c14b
--- /dev/null
+++ b/community/higan-qt/higan.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=higan
+Comment=Nintendo multi-system emulator
+Exec=higan %u
+Icon=higan
+Terminal=false
+Type=Application
+Categories=Game;Emulator;
diff --git a/community/higan-qt/purify.desktop b/community/higan-qt/purify.desktop
new file mode 100755
index 000000000..354dc2849
--- /dev/null
+++ b/community/higan-qt/purify.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=purify
+Comment=ROM purifier
+Exec=/usr/bin/purify
+Icon=higan
+Terminal=false
+Type=Application
+Categories=Game;Emulator;
diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD
index da325b4b5..e7dc92f58 100644
--- a/community/highlight/PKGBUILD
+++ b/community/highlight/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 83937 2013-02-07 08:11:31Z bluewind $
+# $Id: PKGBUILD 85360 2013-03-01 10:33:34Z andrea $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Jan Fader <jan.fader@web.de>
 pkgbase=highlight
 pkgname=(highlight highlight-gui)
 pkgver=3.13
-pkgrel=1
+pkgrel=2
 url="http://www.andre-simon.de/doku/highlight/highlight.html"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=(qt lua51 boost)
+makedepends=(qt4 lua51 boost)
 source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc})
 md5sums=('2b5e217c80c441853360926dbb7777e9'
          'c68f6dd20af61ca1061d910879d910a8')
@@ -30,7 +30,7 @@ package_highlight() {
 
 package_highlight-gui() {
   pkgdesc="Fast and flexible source code highlighter (QT version)"
-  depends=('qt' 'highlight')
+  depends=('qt4' 'highlight')
   cd "$srcdir/$pkgbase-$pkgver"
 
   install -dm755 "$pkgdir/usr/bin"
diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD
index 95fdf5673..5c00b8aac 100644
--- a/community/hostapd/PKGBUILD
+++ b/community/hostapd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82275 2013-01-14 09:20:19Z spupykin $
+# $Id: PKGBUILD 85915 2013-03-08 23:40:40Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hostapd
 pkgver=2.0
-pkgrel=1
+pkgrel=3
 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://w1.fi/hostapd/"
diff --git a/community/hostapd/hostap_allow-linking-with-libnl-3.2.patch b/community/hostapd/hostap_allow-linking-with-libnl-3.2.patch
deleted file mode 100644
index 8e7cd9a97..000000000
--- a/community/hostapd/hostap_allow-linking-with-libnl-3.2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Subject: [RFC] hostap: Allow linking with libnl-3.
-Date: Tue, 15 Nov 2011 14:30:04 -0000
-From: Ben Greear <greearb@candelatech.com>
-
-I needed this patch to compile against the latest
-libnl code.  I added this to my config file:
-
-CONFIG_LIBNL32=y
-
-Signed-hostap: Ben Greear <greearb@candelatech.com>
-rediffed against 0.7.3 by Stefan Lippers-Hollmann <s.l-h@gmx.de>
-
----
-:100644 100644 5caeec5... 0cc81f9... M  src/drivers/drivers.mak
- src/drivers/drivers.mak |   21 ++++++++++++++-------
- 2 files changed, 29 insertions(+), 14 deletions(-)
-
---- a/src/drivers/drivers.mak
-+++ b/src/drivers/drivers.mak
-@@ -31,11 +31,18 @@ NEED_SME=y
- NEED_AP_MLME=y
- NEED_NETLINK=y
- NEED_LINUX_IOCTL=y
--DRV_LIBS += -lnl
-+ifdef CONFIG_LIBNL32
-+  DRV_LIBS += -lnl-3
-+  DRV_LIBS += -lnl-genl-3
-+  DRV_CFLAGS += -DCONFIG_LIBNL20
-+  DRV_CFLAGS += -I/usr/include/libnl3/
-+else
-+  DRV_LIBS += -lnl
- 
--ifdef CONFIG_LIBNL20
--DRV_LIBS += -lnl-genl
--DRV_CFLAGS += -DCONFIG_LIBNL20
-+  ifdef CONFIG_LIBNL20
-+    DRV_LIBS += -lnl-genl
-+    DRV_CFLAGS += -DCONFIG_LIBNL20
-+  endif
- endif
- endif
- 
diff --git a/community/hping/PKGBUILD b/community/hping/PKGBUILD
index a37160586..f312479fb 100644
--- a/community/hping/PKGBUILD
+++ b/community/hping/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=hping
 pkgver=3.0.0
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc='A command-line oriented TCP/IP packet assembler/analyzer.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.hping.org'
diff --git a/community/html2text/PKGBUILD b/community/html2text/PKGBUILD
index 0a418b15b..db2a328ce 100644
--- a/community/html2text/PKGBUILD
+++ b/community/html2text/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=html2text
 pkgver=1.3.2a
-pkgrel=9
+pkgrel=9.1
 pkgdesc="A HTML to text converter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mbayer.de/html2text"
diff --git a/community/htmldoc/PKGBUILD b/community/htmldoc/PKGBUILD
deleted file mode 100644
index a83e59bb8..000000000
--- a/community/htmldoc/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 64143 2012-02-09 02:03:02Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Simon Rutishauser <simon.rutishauser@gmx.ch>
-
-pkgname=htmldoc
-pkgver=1.9.0svn1700
-pkgrel=1
-pkgdesc="Produce PDF or Postscript from HTML documents including TOCs and Indices"
-arch=(i686 x86_64 'mips64el')
-url="http://www.htmldoc.org"
-license=('GPL')
-depends=('libjpeg' 'libpng' 'openssl' 'fltk' 'gcc' 'libxft' 'libxpm')
-makedepends=('subversion')
-__svntrunk=http://svn.easysw.com/public/htmldoc/trunk/
-__svnmod=htmldoc
-source=()
-md5sums=()
-md5sums=()
-md5sums=()
-
-build() {
-  cd "$srcdir"
-
-  if [ -d $__svnmod/.svn ]; then
-    (cd $__svnmod && svn up)
-  else
-    svn co $__svntrunk --config-dir ./ $__svnmod
-  fi
-
-  msg "SVN checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$__svnmod-build"
-  cp -r "$srcdir/$__svnmod" "$srcdir/$__svnmod-build"
-  cd "$srcdir/$__svnmod-build"
-
-  #
-  # BUILD
-  #
-  [ -x configure ] || autoconf
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$__svnmod-build"
-
-  make install \
-	prefix=${pkgdir}/usr \
-	bindir=$pkgdir/usr/bin \
-	datadir=$pkgdir/usr/share \
-	datarootdir=$pkgdir/usr/share \
-	docdir=$pkgdir/usr/share/doc/htmldoc \
-	exec_prefix=$pkgdir/usr \
-	mandir=$pkgdir/usr/share/man \
-	prefix=$pkgdir/usr \
-	sysconfdir=$pkgdir/etc
-
- # fix freedesktop stuff
-  install -Dm 644 desktop/htmldoc-128.png \
-    ${pkgdir}/usr/share/pixmaps/htmldoc.png
-  echo "MimeType=application/vnd.htmldoc-book;" >> desktop/htmldoc.desktop
-  sed -i 's|X-Red-Hat.*$||' desktop/htmldoc.desktop
-  install -Dm 644 desktop/htmldoc.desktop \
-    ${pkgdir}/usr/share/applications/htmldoc.desktop
-}
diff --git a/community/httptunnel/PKGBUILD b/community/httptunnel/PKGBUILD
index 1d923e6de..de0930cad 100644
--- a/community/httptunnel/PKGBUILD
+++ b/community/httptunnel/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=httptunnel
 pkgver=3.3
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Creates a bidirectional virtual data connection tunnelled in HTTP requests"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nocrew.org/software/httptunnel"
diff --git a/community/hubbub/PKGBUILD b/community/hubbub/PKGBUILD
index 5b24c72be..1a84ac701 100644
--- a/community/hubbub/PKGBUILD
+++ b/community/hubbub/PKGBUILD
@@ -1,32 +1,33 @@
-# $Id: PKGBUILD 70911 2012-05-18 23:52:08Z arodseth $
+# $Id: PKGBUILD 89120 2013-04-26 23:11:48Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 
 pkgname=hubbub
-pkgver=0.1.2
+pkgver=0.2.0
 pkgrel=1
-pkgdesc="HTML5 compliant parsing library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.netsurf-browser.org/projects/hubbub/"
+pkgdesc='HTML5 compliant parsing library'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.netsurf-browser.org/projects/hubbub/'
 license=('MIT')
-depends=('libparserutils')
-source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz")
-sha256sums=('95a1d5a71055b28a8e4ce4dc8516b8f0ed691c5ee03525bf73600495657f1b52')
+depends=('libparserutils>=0.1.2')
+makedepends=('netsurf-buildsystem')
+source=("http://download.netsurf-browser.org/libs/releases/lib$pkgname-$pkgver-src.tar.gz")
+sha256sums=('91c90965fdbbfb9137c7881b33736a03fc80bd16f5cd7808e1efff3d63000eaf')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/lib$pkgname-$pkgver"
 
   sed -i 's:-Werror::' Makefile
-  make PREFIX=/usr COMPONENT_TYPE="lib-shared"
-  make PREFIX=/usr COMPONENT_TYPE="lib-static"
+  make PREFIX=/usr COMPONENT_TYPE='lib-shared'
+  make PREFIX=/usr COMPONENT_TYPE='lib-static'
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/lib$pkgname-$pkgver"
 
-  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared"   
-  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
+  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE='lib-shared'   
+  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE='lib-static'
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD
index 4035112ac..42cb74bb0 100644
--- a/community/hwinfo/PKGBUILD
+++ b/community/hwinfo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75503 2012-08-26 12:50:22Z arodseth $
+# $Id: PKGBUILD 89408 2013-04-29 10:54:52Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Gergely Imreh <imrehgATgmailDOTcom>
@@ -8,8 +8,8 @@
 # Contributor: ninja_pt
 
 pkgname=hwinfo
-pkgver=20.0
-_subver=1.4
+pkgver=20.1
+_subver=3.10
 pkgrel=1
 pkgdesc='Hardware detection tool from openSUSE'
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,28 +19,28 @@ depends=('perl' 'libx86emu')
 makedepends=('sysfsutils' 'rpmextract' 'flex')
 source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$pkgver-$_subver.src.rpm"
         'custom_ioctl.patch')
-sha256sums=('466423b00fda00bc5e927352fb8d2f52b4d4e4b298401cd44c48231951c2a26b'
+sha256sums=('b0e2e51b4dd754071fb40843deaaafb0755388de5335b1d2c4c081d0f6393841'
             '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d')
 
-build() {
+prepare() {
   cd "$srcdir"
 
-  msg2 "Extracting source rpm..."
   rpmextract.sh "$pkgname-$pkgver-$_subver.src.rpm"
   tar jxf $pkgname-$pkgver.tar.bz2
   cd "$pkgname-$pkgver"
-  msg2 "Patching..."
-  patch -p0 < ../custom_ioctl.patch
-  msg2 "Compiling..."
+  patch -p0 -i ../custom_ioctl.patch
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   make -j1 CFLAGS+="-fPIC -I$srcdir/$pkgname-$pkgver/src/hd" LIBDIR=/usr/lib
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  msg2 "Packaging files..."
   make LIBDIR=/usr/lib DESTDIR="$pkgdir" install
-  msg2 "Cleaning up..."
   rmdir "$pkgdir/sbin"
 }
 
diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD
index 318020e6a..8146341b4 100644
--- a/community/i3-wm/PKGBUILD
+++ b/community/i3-wm/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 81566 2012-12-24 12:23:53Z ttoepper $
+# $Id: PKGBUILD 86553 2013-03-19 09:17:14Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3-wm
 _pkgsourcename=i3
-pkgver=4.4
-pkgrel=2
+pkgver=4.5.1
+pkgrel=1
 pkgdesc="An improved dynamic tiling window manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://i3wm.org/"
 license=('BSD')
 replaces=("i3" "i3bar")
 groups=("i3")
-depends=('libxcursor' 'xcb-util-keysyms' 'xcb-util-wm' 'libev' 'yajl' 'startup-notification' 'pango')
+depends=('libxcursor' 'xcb-util-keysyms' 'xcb-util-wm' 'libev' 'yajl'
+         'startup-notification' 'pango' 'perl')
 makedepends=('bison' 'flex')
 optdepends=('dmenu: As menu.'
             'i3lock: For locking your screen.'
-            'i3status: To display systeminformation with a bar.'
-            'perl: To migrate your configuration to v4 format.')
+            'i3status: To display systeminformation with a bar.')
 options=('docs' '!strip')
 source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2")
-md5sums=('fa2b8aae3d2e10c5ee480bd370366f5b')
+md5sums=('a448388a9e26b7ae371534ff9f6ca353')
 
 build() {
   cd "$srcdir/$_pkgsourcename-$pkgver"
diff --git a/community/i3status/PKGBUILD b/community/i3status/PKGBUILD
index 91a799014..a2ba5074f 100644
--- a/community/i3status/PKGBUILD
+++ b/community/i3status/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 77036 2012-10-03 18:05:35Z ttopper $
+# $Id: PKGBUILD 85172 2013-02-27 14:41:02Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3status
-pkgver=2.6
+pkgver=2.7
 pkgrel=1
 pkgdesc="Generates status bar to use with dzen2 or xmobar"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ backup=('etc/i3status.conf')
 install=i3status.install
 options=('docs')
 source=("http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2")
-md5sums=('98f649429d7845682846de36fb38f780')
+md5sums=('f0a39e84aebb65496af3dcec9d8cfeb8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/i7z/PKGBUILD b/community/i7z/PKGBUILD
index bd3cda36c..b1242f3ab 100644
--- a/community/i7z/PKGBUILD
+++ b/community/i7z/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 76391 2012-09-17 08:17:57Z svenstaro $
+# $Id: PKGBUILD 85361 2013-03-01 10:33:44Z andrea $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Nathan O <ndowens.aur at gmail dot com>
 
 pkgname=i7z
 pkgver=0.27.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A better i7 (and now i3, i5) reporting tool for Linux"
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('ncurses')
-makedepends=('qt')
-optdepends=('qt: for i7z-gui')
+makedepends=('qt4')
+optdepends=('qt4: for i7z-gui')
 url="http://code.google.com/p/i7z/"
 source=("http://i7z.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 md5sums=('7f2c4928146b722d67ecdd0d905a4353')
diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD
index a168569bc..d8eb2f017 100644
--- a/community/iasl/PKGBUILD
+++ b/community/iasl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78869 2012-10-26 09:53:06Z lcarlier $
+# $Id: PKGBUILD 87689 2013-04-05 09:27:30Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com>
 
 pkgname=iasl
-pkgver=20121018
+pkgver=20130328
 pkgrel=1
 pkgdesc="Intel ACPI Source Language compiler"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,9 +14,9 @@ depends=('glibc')
 makedepends=('flex' 'bison')
 options=('!makeflags')
 #install=iasl.install
-source=(http://acpica.org/download/acpica-unix-${pkgver}.tar.gz
+source=(http://acpica.org/sites/acpica/files/acpica-unix-${pkgver}.tar.gz
 	LICENSE)
-md5sums=('07b8137a6870e3dad862e5752c87de75'
+md5sums=('99fa19c67c8fa95f90cb7ec0f29d6242'
          '8615526144f69ea4e870d9bc37df9b29')
 
 build() {
@@ -26,8 +26,11 @@ build() {
 
   if [[ $CARCH == i686 ]]; then
     make BITS=32
-  else
+  elif [[ $CARCH == x86_64 ]]; then
     make BITS=64
+  else
+    sed -i 's|$(BITSFLAG)||g' Makefile.config
+    make
   fi
 }
 
diff --git a/community/ibus-libpinyin/PKGBUILD b/community/ibus-libpinyin/PKGBUILD
index 0f9c45631..551020f0b 100644
--- a/community/ibus-libpinyin/PKGBUILD
+++ b/community/ibus-libpinyin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79787 2012-11-12 15:24:58Z fyan $
+# $Id: PKGBUILD 89875 2013-05-04 04:07:03Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor:  Yangtse Su<yangtsesu@gmail.com>
 # Contributor:  Jekyll Wu<adaptee [at] gmail [dot] com>
@@ -7,25 +7,27 @@
 # Contributor: Lee.MaRS<leemars at gmail.com>
 
 pkgname=ibus-libpinyin
-pkgver=1.4.93
+pkgver=1.6.91
 pkgrel=1
 pkgdesc="Intelligent Pinyin engine based on libpinyin for IBus"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-url="https://github.com/libpinyin"
-depends=('ibus>=1.4' 'libpinyin')
+url="https://github.com/libpinyin/ibus-libpinyin"
+depends=('ibus' 'libpinyin')
 makedepends=('git' 'intltool' 'gnome-common')
-source=(https://github.com/downloads/libpinyin/ibus-libpinyin/${pkgname}-${pkgver}.tar.gz)
-md5sums=("95f6143323deddaf6d82020dcc14a1af")
+source=(https://github.com/libpinyin/ibus-libpinyin/archive/$pkgver.tar.gz
+	automake-1.13.patch)
 
 build() {
-  cd ${srcdir}
-  rm -rf "${srcdir}/${pkgname}-build"
-  cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-build"
-  cd "${srcdir}/${pkgname}-build"
+  cd "$srcdir"
+  rm -rf "$srcdir/$pkgname-build"
+  cp -r "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-build"
+  cd "$srcdir/$pkgname-build"
+
+  patch -Np1 -i "$srcdir/automake-1.13.patch"
 
   msg "Starting make..."
-  cd "${srcdir}/${pkgname}-build"
+  cd "$srcdir/$pkgname-build"
 
   # python2 fix
   for file in $(find . -name '*.py' -print); do
@@ -37,11 +39,16 @@ build() {
     sed -i 's_exec python_exec python2_' $file
   done
 
+  export REQUIRED_AUTOMAKE_VERSION=1.13 automake_progs=automake-1.13
+
   ./autogen.sh --prefix=/usr --libexecdir=/usr/lib/$pkgname
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-build"
-  make NO_INDEX=true DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-build"
+  make NO_INDEX=true DESTDIR="$pkgdir" install
 }
+
+sha512sums=('6e1fb4f1fe3c5c6c37e60c8228b79728c388ffd171b68cea87bc2131e27430cdad6eff174a41111cb0694559f6307be3578ea1c960629bbfc99c41f4dbfc344e'
+            'fbb30cddd1ec140860ce0d5a5a42ad644ae6a1794fb2e805f782fdb43436ad13d2f6f8149b5b68540bbb9beba16dbbdb1d14153cef7fb805de342a8d1bb77965')
diff --git a/community/ibus-libpinyin/automake-1.13.patch b/community/ibus-libpinyin/automake-1.13.patch
new file mode 100644
index 000000000..f7f7cc0c9
--- /dev/null
+++ b/community/ibus-libpinyin/automake-1.13.patch
@@ -0,0 +1,10 @@
+--- a/autogen.sh	2013-03-18 22:55:12.210703327 +0800
++++ b/autogen.sh	2013-03-18 23:01:11.842675010 +0800
+@@ -19,6 +19,6 @@
+ }
+ 
+ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
+-REQUIRED_AUTOMAKE_VERSION=1.8
++REQUIRED_AUTOMAKE_VERSION=1.13
+ 
+ . gnome-autogen.sh "$@"
diff --git a/community/ibus-pinyin/ibus-pinyin.install b/community/ibus-pinyin/ibus-pinyin.install
deleted file mode 100644
index 3771d9bec..000000000
--- a/community/ibus-pinyin/ibus-pinyin.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    echo "Creating INDEX. Please wait..."
-    cd usr/share/ibus-pinyin/db
-    echo "Creating index for android.db..."
-    sqlite3 android.db '.read create_index.sql'
-    echo "Creating index for open-phrase.db..."
-    sqlite3 open-phrase.db '.read create_index.sql'
-    echo "Done."
-}
-
-post_upgrade() {
-    post_install $1
-}
diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD
index 3a573ba6a..e59fc4e32 100644
--- a/community/ibus-qt/PKGBUILD
+++ b/community/ibus-qt/PKGBUILD
@@ -1,25 +1,22 @@
-# $Id: PKGBUILD 82685 2013-01-23 00:15:54Z eric $
+# $Id: PKGBUILD 87047 2013-03-26 11:49:40Z foutrelis $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: garion < garion @ mailoo.org >
 # Contributor: leemars
 
 pkgname=ibus-qt
-pkgver=1.3.1
-pkgrel=7
+pkgver=1.3.2
+pkgrel=1
 pkgdesc='IBus qt library and IBus qt input method plugin'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url='http://ibus.googlecode.com'
-depends=('qt' 'ibus' 'icu>=50')
+depends=('qt4' 'ibus' 'icu')
 makedepends=('cmake' 'automoc4' 'doxygen')
-source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz"
-	0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch)
+source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz")
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source"
-  patch -p1 -i ../0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch
-
   mkdir build
   cd build
   
@@ -31,5 +28,4 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source/build"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('769e8872ca8a59327b2073ce2f142589'
-         'c30f52b1a9018132e5ecd0c14616cb65')
+md5sums=('e53cb59f993d0c93ba968330dbc62c22')
diff --git a/community/ibus-table/PKGBUILD b/community/ibus-table/PKGBUILD
deleted file mode 100644
index 404d48e59..000000000
--- a/community/ibus-table/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 79721 2012-11-11 15:10:35Z fyan $
-# Maintainer: Felix Yan <felixonmars@gmail.com>
-# Contributor: coderoar <coderoar@gmail.com>
-# Contributor: leemars <leemars@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=ibus-table
-pkgver=1.4.99.20121112
-pkgrel=1
-pkgdesc='The IM Engine framework for table-based input methods, such as ZhengMa, WuBi, ErBi, CangJie and so on.'
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/ibus/"
-license=('LGPL')
-depends=('python2-pyenchant' 'ibus' 'aspell-en')
-source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # python2 fix
-  find -type f -exec sed -i -e 's_exec python_exec python2_' -e 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' -e 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' {} \;
-
-  PYTHON=/usr/bin/python2 ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/ibus
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('85c3a57bcbb052d3222c5b6d07e0e565')
diff --git a/community/icewm-utils/PKGBUILD b/community/icewm-utils/PKGBUILD
index af2251d13..cb8825e45 100644
--- a/community/icewm-utils/PKGBUILD
+++ b/community/icewm-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58602 2011-11-16 15:27:25Z spupykin $
+# $Id: PKGBUILD 87991 2013-04-09 21:31:23Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Dominika Solarz <dominikasolarz@gmail.com>
 
@@ -17,7 +17,7 @@ _iconcvtver=1.0
 _rrunver=0.5
 _mergeprefsver=0.5
 
-pkgrel=6
+pkgrel=6.1
 pkgdesc="Suite of tools for IceWM"
 arch=('i686' 'x86_64' 'mips64el')
 license=("GPL")
@@ -50,11 +50,6 @@ md5sums=('cb2afc6efaa0f9d77b0119b29d528667'
          '5116da930c0063dd8c478dd8e473b08f')
 
 build() {
-  mkdir -p $pkgdir/usr/bin
-
-  . /etc/profile.d/qt3.sh
-  export PATH=/opt/qt/bin:$PATH
-
   cd $srcdir
   # fix default global path to IceWM
   for file in icewoed-$_woedver/qcentralwidget.cpp \
@@ -73,40 +68,43 @@ build() {
   (cd icets-$_tsver && patch -p0 <$srcdir/icets-fix-icewmtray-crash.diff)
 
   cd $srcdir/icemc-$_mcver
-  qmake
-  make
-  cp icemc $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icets-$_tsver
-  qmake
-  make
-  cp icets $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icebgset-$_bgsetver
-  qmake
-  make
-  cp icebgset $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/iceked-$_kedver
-  qmake 
-  make
-  cp iceked $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icecc-$_ccver
-  qmake 
-  make
-  cp icecc $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icesndcfg-$_sndcfgver
-  qmake 
-  make
-  cp icesndcfg $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icewoed-$_woedver
-  qmake 
-  make
-  cp icewoed $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
+}
 
+package() {
+  mkdir -p $pkgdir/usr/bin
+  cp $srcdir/icemc-$_mcver/icemc $pkgdir/usr/bin/
+  cp $srcdir/icets-$_tsver/icets $pkgdir/usr/bin/
+  cp $srcdir/icebgset-$_bgsetver/icebgset $pkgdir/usr/bin/
+  cp $srcdir/iceked-$_kedver/iceked $pkgdir/usr/bin/
+  cp $srcdir/icecc-$_ccver/icecc $pkgdir/usr/bin/
+  cp $srcdir/icesndcfg-$_sndcfgver/icesndcfg $pkgdir/usr/bin/
+  cp $srcdir/icewoed-$_woedver/icewoed $pkgdir/usr/bin/
   cp $srcdir/icecursorscfg-$_cursorscfgver/icecurcfg.py $pkgdir/usr/bin/icecurcfg
   cp $srcdir/iceiconcvt-$_iconcvtver/iceiconcvt.py $pkgdir/usr/bin/iceiconcvt
   cp $srcdir/icemergeprefs-$_mergeprefsver/icemergeprefs.py $pkgdir/usr/bin/icemergeprefs
diff --git a/community/ifuse/PKGBUILD b/community/ifuse/PKGBUILD
index 04ec13ca0..ce3e41ec8 100644
--- a/community/ifuse/PKGBUILD
+++ b/community/ifuse/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 74618 2012-07-31 19:56:08Z ebelanger $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# $Id: PKGBUILD 86105 2013-03-12 01:35:28Z cinelli $
+# Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
+# Contributor: Thomas Dziedzic  < gostrc at gmail >
 # Contributor: Gabriel Martinez < reitaka at gmail dot com >
 
 pkgname=ifuse
 pkgver=1.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch'
 url='http://libimobiledevice.org/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
 depends=('libimobiledevice' 'fuse')
-source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2")
+source=("http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2")
 md5sums=('4152526b2ac3c505cb41797d997be14d')
 
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
 
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/iksemel/PKGBUILD b/community/iksemel/PKGBUILD
deleted file mode 100644
index eab6eb7bf..000000000
--- a/community/iksemel/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 55571 2011-09-14 10:35:20Z andrea $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: Guillermo Vaya driadan@willinux.net
-
-pkgname=iksemel
-pkgver=1.4
-pkgrel=2
-pkgdesc="XML parser library for Jabber applications in ANSI C"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/iksemel/"
-license=('LGPL')
-depends=('glibc')
-install=iksemel.install
-source=("http://iksemel.googlecode.com/files/${pkgname}-$pkgver.tar.gz")
-md5sums=('532e77181694f87ad5eb59435d11c1ca')
-options=('!libtool')
-
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  ./configure --prefix=/usr \
-  	--infodir=/usr/share/info
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-  mv "${pkgdir}"/usr/share/info/$pkgname "${pkgdir}"/usr/share/info/$pkgname.info
-  rm -rf "${pkgdir}"/usr/share/info/dir
-}
diff --git a/community/iksemel/iksemel.install b/community/iksemel/iksemel.install
deleted file mode 100644
index 1cd1dbf31..000000000
--- a/community/iksemel/iksemel.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(iksemel.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/community/imdbpy/PKGBUILD b/community/imdbpy/PKGBUILD
index 8d51f7b5b..a06ee7734 100644
--- a/community/imdbpy/PKGBUILD
+++ b/community/imdbpy/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=imdbpy
 _realname=IMDbPY
 pkgver=4.9
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Python bindings for the Internet Movie Database (IMDb)"
 url="http://imdbpy.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/inotify-tools/PKGBUILD b/community/inotify-tools/PKGBUILD
index 8736a5a43..7a4ddbeb4 100644
--- a/community/inotify-tools/PKGBUILD
+++ b/community/inotify-tools/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=inotify-tools
 pkgver=3.14
-pkgrel=2
+pkgrel=2.1
 pkgdesc="inotify-tools is a C library and a set of command-line programs for Linux providing a simple interface to inotify."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://inotify-tools.sourceforge.net/"
diff --git a/community/instead-launcher/PKGBUILD b/community/instead-launcher/PKGBUILD
index 1a2676f90..7ec18e89c 100644
--- a/community/instead-launcher/PKGBUILD
+++ b/community/instead-launcher/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 76496 2012-09-19 14:12:35Z spupykin $
+# $Id: PKGBUILD 85363 2013-03-01 10:34:01Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Peter Kosyh <p.kosyhgmail.com>
 
 pkgname=instead-launcher
 pkgver=0.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="launcher and games downloader for INSTEAD quest interpreter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://instead-launcher.googlecode.com/"
 license=('GPL')
-makedepends=('sed' 'qt')
+makedepends=('sed' 'qt4')
 source=(http://instead-launcher.googlecode.com/files/instead-launcher_$pkgver.tar.gz)
 md5sums=('b2136e535dbb77eacb79e3357dc2a173')
 
@@ -21,7 +21,7 @@ build() {
 }
 
 package() {
-  depends=('qt' 'instead')
+  depends=('qt4' 'instead')
   cd $srcdir/instead-launcher-$pkgver
   make INSTALL_ROOT=$pkgdir install
 }
diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD
index 1ed42894c..42e769c6f 100644
--- a/community/instead/PKGBUILD
+++ b/community/instead/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 83203 2013-01-28 10:07:31Z spupykin $
+# $Id: PKGBUILD 88145 2013-04-12 13:33:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Peter Kosyh <p.kosyhgmail.com>
 
 pkgname=instead
-pkgver=1.8.3
+pkgver=1.9.0
 pkgrel=1
 pkgdesc="a quest interpreter"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua')
 optdepends=('instead-launcher: install and update INSTEAD games from net')
 source=(http://instead.googlecode.com/files/instead_${pkgver}.tar.gz)
-md5sums=('4ec9f3e9f3300ce5a01b0d2b98974868')
+md5sums=('c7082772f7cb972d825e8e183e9af90f')
 
 build() {
   cd "${srcdir}/instead-${pkgver}"
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index d73e1f951..126f175f5 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 83501 2013-02-02 11:16:21Z stativ $
+# $Id: PKGBUILD 89105 2013-04-26 19:07:54Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=intellij-idea-libs
-pkgver=12.0.3
-_pkgver=123.155
+pkgver=12.1.2
+_pkgver=129.354
 pkgrel=1
 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.jetbrains.org/"
 license=('apache')
 depends=('glibc')
+options=(!strip)
 source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('6a378255d11f1634759d738eef0424fa')
+md5sums=('ad9f4bbd7c8c7a86a4708d3f4bb093ed')
 
 package() {
   cd "$srcdir"
diff --git a/community/iperf/iperf.conf b/community/iperf/iperf.conf
deleted file mode 100644
index 0685ff011..000000000
--- a/community/iperf/iperf.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh noet:
-
-# daemon pid file
-#PIDFILE='/run/iperf.pid'
-
-# daemon options. treated as an array.
-#DAEMON_OPTS='--port 5001'
diff --git a/community/iperf/iperf.rc b/community/iperf/iperf.rc
deleted file mode 100644
index 617b666ad..000000000
--- a/community/iperf/iperf.rc
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-# You can use this script to run iperf as tcp and udp.
-# Copy and rename this script to /etc/rc.d/iperf-udp and copy config file to
-# /etc/conf.d/iperf-udp and add -u to daemon options
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[[ -r /etc/conf.d/${0##*/} ]] && . /etc/conf.d/${0##*/}
-
-DAEMON=${DAEMON:-/usr/bin/iperf}
-PIDFILE=${PIDFILE:-/run/${0##*/}.pid}
-DAEMON_OPTS="--server $DAEMON_OPTS"
-
-# check pid
-[[ -r "$PIDFILE" ]] &&
-	read PID < "$PIDFILE" && [[ -n $PID ]] && kill -0 $PID &>/dev/null || unset PID
-
-case "$1" in
-	start)
-		stat_busy "Starting ${0##*/} daemon"
-		[[ -z $PID ]] &&
-			{ $DAEMON $DAEMON_OPTS </dev/null &>/dev/null & } &&
-			echo "$!" > "$PIDFILE" &&
-			disown %% &&
-			add_daemon ${0##*/} &&
-			stat_done &&
-			exit 0
-		stat_fail
-	;;
-  stop)
-		stat_busy "Stopping ${0##*/} daemon"
-		[[ -n $PID ]] && kill $PID &> /dev/null &&
-			rm_daemon ${0##*/} &&
-			rm -f "$PIDFILE" &&
-			stat_done &&
-			exit 0
-		stat_fail
-	;;
-  restart)
-		$0 stop
-		$0 start
-		exit 0
-	;;
-  *)
-		echo "usage: ${0##*/} {start|stop|restart}" >&2
-	;;
-esac
-
-exit 1
-
-# vim:set ts=2 sw=2 ft=sh noet:
diff --git a/community/iperf/iperf.service b/community/iperf/iperf.service
deleted file mode 100644
index 1bdcf86e9..000000000
--- a/community/iperf/iperf.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Iperf Server
-
-[Service]
-ExecStart=/usr/bin/iperf -s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD
index bf47cf2b2..9e89943fe 100644
--- a/community/ipsec-tools/PKGBUILD
+++ b/community/ipsec-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82168 2013-01-10 09:22:20Z spupykin $
+# $Id: PKGBUILD 86151 2013-03-12 12:49:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Allan Henriksen <allan.henriksen@gmail.com>
 
 pkgname=ipsec-tools
-pkgver=0.8.0
-pkgrel=6
+pkgver=0.8.1
+pkgrel=1
 pkgdesc="KAME IPSec tools ported to Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ipsec-tools.sourceforge.net/"
@@ -16,16 +16,22 @@ source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgve
 	racoon.rc
 	ipsec.rc
 	racoon.service
-	ipsec.service)
-md5sums=('b79aae3055a51f8de5c0f1b8ca6cf619'
+	ipsec.service
+	ipsec-tools-linux-3.7-compat.patch)
+md5sums=('d38b39f291ba2962387c3232e7335dd8'
          '416b8e362d86987b8c55f7153cdafbeb'
          '90d0810267cbd847383ae3101699b192'
          '1632fce55ba5592dea1f8bf661106e7d'
-         '5bf7478590c751b465617681a31619fe')
+         '5bf7478590c751b465617681a31619fe'
+         'ae1dd20c83dcfce3dedb46ee73e83613')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  sed -i 's#-Werror##' configure
+
+  patch -p1 <$srcdir/ipsec-tools-linux-3.7-compat.patch
+  sed -i 's#-Werror##' configure.ac
+
+  ./bootstrap
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 	--enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \
 	--enable-adminport --enable-gssapi
diff --git a/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch b/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch
new file mode 100644
index 000000000..46b11ee51
--- /dev/null
+++ b/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch
@@ -0,0 +1,50 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,9 +74,10 @@ case "$host_os" in
+ 	    [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ])
+ 
+     AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, ,
+-	[ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
+-	  KERNEL_INCLUDE=/usr/src/linux/include ,
+-	  [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] )
++	[ AC_CHECK_HEADER($KERNEL_INCLUDE/uapi/linux/pfkeyv2.h, ,
++	  [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
++	    KERNEL_INCLUDE=/usr/src/linux/include ,
++	    [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ] )
+     AC_SUBST(KERNEL_INCLUDE)
+     # We need the configure script to run with correct kernel headers.
+     # However we don't want to point to kernel source tree in compile time,
+@@ -643,7 +644,14 @@ AC_EGREP_CPP(yes,
+ #ifdef SADB_X_EXT_NAT_T_TYPE
+ yes
+ #endif
+-], [kernel_natt="yes"])
++], [kernel_natt="yes"], [
++  AC_EGREP_CPP(yes,
++  [#include <uapi/linux/pfkeyv2.h>
++  #ifdef SADB_X_EXT_NAT_T_TYPE
++  yes
++  #endif
++  ], [kernel_natt="yes"])
++])
+ 	;;
+ freebsd*|netbsd*)
+ # NetBSD case
+--- a/src/include-glibc/Makefile.am
++++ b/src/include-glibc/Makefile.am
+@@ -1,14 +1,7 @@
+-
+-.includes: ${top_builddir}/config.status
+-	ln -snf $(KERNEL_INCLUDE)/linux
+-	touch .includes
+-
+-all: .includes
+-
+ EXTRA_DIST = \
+   glibc-bugs.h \
+   net/pfkeyv2.h \
+   netinet/ipsec.h \
+   sys/queue.h
+ 
+-DISTCLEANFILES = .includes linux
++DISTCLEANFILES = linux
diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD
index 93dfedb16..c4361a3da 100644
--- a/community/ipset/PKGBUILD
+++ b/community/ipset/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82785 2013-01-24 12:55:11Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 88370 2013-04-16 20:03:40Z seblu $
+# Maintainer: Sébastien Luttringer
 
 pkgname=ipset
-pkgver=6.16.1
-pkgrel=2
+pkgver=6.18
+pkgrel=1
 pkgdesc='Administration tool for IP sets'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://ipset.netfilter.org'
@@ -14,7 +14,7 @@ options=('!libtool')
 source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
         "$pkgname.systemd"
         "$pkgname.service")
-md5sums=('9fd70c825f052db7dc9d5ba0562b7083'
+md5sums=('776de6afe32ae386e6827a51c025464f'
          '7daa4f163eef9db216cb4c428e0342a3'
          'b032241b96b5802975fe4321cc511c6b')
 
diff --git a/community/ipset/ipset.conf b/community/ipset/ipset.conf
deleted file mode 100644
index d5d3cb699..000000000
--- a/community/ipset/ipset.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration file used to load/save configuration.
-CONFIG_FILE='/etc/ipset.conf'
-
-# Save configuration on stop/restart.
-#SAVE_ON_STOP=yes
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ipset/ipset.rc b/community/ipset/ipset.rc
deleted file mode 100644
index 517eff1ea..000000000
--- a/community/ipset/ipset.rc
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-case "$1" in
-  start)
-    stat_busy 'Loading IP sets'
-    ipset restore < "$CONFIG_FILE" && add_daemon ${0##*/} && stat_done || stat_die
-    ;;
-  stop)
-    [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save
-    stat_busy 'Clearing IP sets'
-    ipset destroy &&
-      rm_daemon ${0##*/} && stat_done || stat_die
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  save)
-    stat_busy 'Saving IP sets'
-    ipset save > "$CONFIG_FILE" &&
-      stat_done || stat_die
-    ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|restart|save}" >&2
-    exit 1
-    ;;
-esac
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ipvsadm/ipvsadm.conf b/community/ipvsadm/ipvsadm.conf
deleted file mode 100644
index b9a98a36e..000000000
--- a/community/ipvsadm/ipvsadm.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration file used to load/save configuration.
-CONFIG_FILE='/etc/ipvsadm.conf'
-
-# Save configuration on stop/restart.
-#SAVE_ON_STOP=yes
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ipvsadm/ipvsadm.rc b/community/ipvsadm/ipvsadm.rc
deleted file mode 100644
index b810dcd62..000000000
--- a/community/ipvsadm/ipvsadm.rc
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-case "$1" in
-  start)
-    stat_busy 'Loading IPVS table'
-    ipvsadm-restore < "$CONFIG_FILE" &&
-      add_daemon ${0##*/} && stat_done || stat_die
-    ;;
-  stop)
-    [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save
-    stat_busy 'Clearing IPVS table'
-    ipvsadm -C && rm_daemon ${0##*/} && stat_done || stat_die
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  save)
-    stat_busy 'Saving IPVS table'
-    ipvsadm-save -n > "$CONFIG_FILE" && stat_done || stat_die
-    ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|restart|save}" >&2
-    exit 1
-esac
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/isomaster/PKGBUILD b/community/isomaster/PKGBUILD
deleted file mode 100644
index 5e32e9ac9..000000000
--- a/community/isomaster/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 73565 2012-07-09 23:28:25Z ebelanger $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Mefju <mefju@o2.pl>
-
-pkgname=isomaster
-pkgver=1.3.9
-pkgrel=1
-pkgdesc="CD image editor written in GTK2"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://littlesvr.ca/isomaster"
-license=('GPL2')
-depends=('gtk2' 'desktop-file-utils')
-makedepends=('iniparser')
-install=isomaster.install
-source=("http://littlesvr.ca/isomaster/releases/$pkgname-$pkgver.tar.bz2"
-        isomaster-1.3.9-asneeded.patch)
-md5sums=('ba7b44303979fd193df04b8f5f7ce4f8'
-         '79ac690bd7edf69dfb53e9916fc1182d')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p0 -i ../isomaster-1.3.9-asneeded.patch
-  make PREFIX=/usr
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make PREFIX=/usr DESTDIR="$pkgdir" install
-}
diff --git a/community/isomaster/isomaster-1.3.9-asneeded.patch b/community/isomaster/isomaster-1.3.9-asneeded.patch
deleted file mode 100644
index 102f54db4..000000000
--- a/community/isomaster/isomaster-1.3.9-asneeded.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -75,9 +75,9 @@
- isomaster: $(OBJECTS) lib iniparser
- 	@echo 'Linking isomaster'
- ifndef USE_SYSTEM_INIPARSER
--	@$(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a -o isomaster
-+	@$(CC) $(LDFLAGS) $(OBJECTS) -o isomaster bk/bk.a iniparser-2.17/libiniparser.a `pkg-config --libs gtk+-2.0` 
- else
--	@$(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a -liniparser -o isomaster
-+	@$(CC) $(LDFLAGS) $(OBJECTS) -o isomaster bk/bk.a -liniparser `pkg-config --libs gtk+-2.0`
- endif
- 
- # static pattern rule
diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD
index 26d285379..f03152b49 100644
--- a/community/jack2/PKGBUILD
+++ b/community/jack2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81344 2012-12-18 10:05:59Z schiv $
+# $Id: PKGBUILD 84828 2013-02-25 06:15:43Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Daniele Paolella <danielepaolella@email.it>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
@@ -9,13 +9,13 @@ pkgname=('jack2' 'jack2-dbus')
 #pkgname= # single build (overrides split)
 _tarname=jack
 pkgver=1.9.9.5
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://jackaudio.org/"
 backup=(etc/security/limits.d/99-audio.conf)
 license=('GPL')
-makedepends=('python2' 'libffado' 'celt'
-             'libsamplerate' 'dbus-core')
+makedepends=('python2' 'celt' 'libsamplerate')
+[ "$CARCH" != "mips64el" ] && makedepends+=('libffado')
 source=("https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2"
         '99-audio.conf'
         '40-hpet-permissions.rules')
@@ -36,7 +36,7 @@ _wafconf() {
   fi
   python2 waf configure --prefix=/usr \
                         --alsa \
-                        --firewire $@
+                        $firewire $@
 
   # not building with doxygen
   # see https://github.com/jackaudio/jack2/issues/22
@@ -85,12 +85,8 @@ package_jack2() {
 
   pkgdesc="The next-generation JACK with SMP support"
   depends=('libsamplerate' 'celt')
-  optdepends=('libffado: FireWire support'
-              'dbus-core: jackdbus'
-              'python2: jack_control')
-[ "$CARCH" = "mips64el" ] && \
-  optdepends=('dbus-core: jackdbus'
-              'python2: jack_control')
+  optdepends=('python2: jack_control')
+  [ "$CARCH" != "mips64el" ] && depends+=('libffado')
   conflicts=('jack')
   provides=('jack' 'jackmp' 'jackdmp' 'jackdbus')
 
@@ -114,10 +110,8 @@ package_jack2-dbus() {
   ! _isbuild jack2-dbus && return 0
 
   pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)"
-  depends=('libsamplerate' 'celt' 'dbus-core')
-  optdepends=('libffado: FireWire support'
-              'python2: jack_control')
-[ "$CARCH" = "mips64el" ] && \
+  depends=('libsamplerate' 'celt')
+  [ "$CARCH" != "mips64el" ] && depends+=('libffado')
   optdepends=('python2: jack_control')
   conflicts=('jack' 'jack2')
   provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus')
diff --git a/community/jack2/ffado_setbuffsize-jack2.patch b/community/jack2/ffado_setbuffsize-jack2.patch
deleted file mode 100644
index 0c74aad24..000000000
--- a/community/jack2/ffado_setbuffsize-jack2.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001
-From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
-Date: Sat, 17 Mar 2012 22:36:30 +0100
-Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size
-
-This is a port of Jonathan Woithe's patch from jackd1.
-With sufficiently recent versions of FFADO, it allows to change
-the buffersize at runtime.
----
- linux/firewire/JackFFADODriver.cpp |   65 ++++++++++++++++++++++++++++++++----
- linux/firewire/JackFFADODriver.h   |    6 ++++
- 2 files changed, 65 insertions(+), 6 deletions(-)
-
-diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp
-index b33e1cd..085b78a 100644
---- a/linux/firewire/JackFFADODriver.cpp
-+++ b/linux/firewire/JackFFADODriver.cpp
-@@ -3,6 +3,7 @@
- Copyright (C) 2004 Grame
- Copyright (C) 2007 Pieter Palmers
- Copyright (C) 2009 Devin Anderson
-+Copyright (C) 2012 Jonathan Woithe, Adrian Knoth
- 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
-@@ -48,7 +49,10 @@
- namespace Jack
- {
- 
-+// Basic functionality requires API version 8.  If version 9 or later
-+// is present the buffers can be resized at runtime.
- #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8
-+#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9
- 
- #define jack_get_microseconds GetMicroSeconds
- 
-@@ -281,19 +285,68 @@
- int
- JackFFADODriver::SetBufferSize (jack_nframes_t nframes)
- {
--    printError("Buffer size change requested but not supported!!!");
-+    ffado_driver_t* driver = (ffado_driver_t*)fDriver;
-+    signed int chn;
-+
-+    // The speed of this function isn't critical; we can afford the
-+    // time to check the FFADO API version.
-+    if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE ||
-+		    ffado_streaming_set_period_size == NULL) {
-+	    printError("unsupported on current version of FFADO; please upgrade FFADO");
-+	    return -1;
-+    }
- 
--    /*
-     driver->period_size = nframes;
-     driver->period_usecs =
-             (jack_time_t) floor ((((float) nframes) / driver->sample_rate)
-                                  * 1000000.0f);
--    */
-+
-+
-+    // Reallocate the null and scratch buffers.
-+    driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
-+    if(driver->nullbuffer == NULL) {
-+	    printError("could not allocate memory for null buffer");
-+	    return -1;
-+    }
-+    driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
-+    if(driver->scratchbuffer == NULL) {
-+	    printError("could not allocate memory for scratch buffer");
-+	    return -1;
-+    }
-+
-+    // MIDI buffers need reallocating
-+    for (chn = 0; chn < driver->capture_nchannels; chn++) {
-+	    if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) {
-+		    // setup the midi buffer
-+		    if (driver->capture_channels[chn].midi_buffer != NULL)
-+			    free(driver->capture_channels[chn].midi_buffer);
-+		    driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
-+	    }
-+    }
-+    for (chn = 0; chn < driver->playback_nchannels; chn++) {
-+	    if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) {
-+		    if (driver->playback_channels[chn].midi_buffer != NULL)
-+			    free(driver->playback_channels[chn].midi_buffer);
-+		    driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
-+	    }
-+    }
-+
-+    // Notify FFADO of the period size change
-+    if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) {
-+	    printError("could not alter FFADO device period size");
-+	    return -1;
-+    }
-+
-+    // This is needed to give the shadow variables a chance to
-+    // properly update to the changes.
-+    sleep(1);
- 
-     /* tell the engine to change its buffer size */
--    //driver->engine->set_buffer_size (driver->engine, nframes);
-+    JackAudioDriver::SetBufferSize(nframes);  // Generic change, never fails
- 
--    return -1; // unsupported
-+    UpdateLatencies();
-+
-+    return 0;
- }
- 
- typedef void (*JackDriverFinishFunction) (jack_driver_t *);
-@@ -306,7 +359,7 @@
- 
-     assert(params);
- 
--    if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) {
-+    if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) {
-         printError("Incompatible libffado version! (%s)", ffado_get_version());
-         return NULL;
-     }
-diff --git a/linux/firewire/JackFFADODriver.h b/linux/firewire/JackFFADODriver.h
-index cb2a45d..790f4dd 100644
---- a/linux/firewire/JackFFADODriver.h
-+++ b/linux/firewire/JackFFADODriver.h
-@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver
-         int Read();
-         int Write();
- 
-+        // BufferSize can be changed
-+        bool IsFixedBufferSize()
-+        {
-+            return false;
-+        }
-+
-         int SetBufferSize(jack_nframes_t nframes);
- };
- 
--- 
-1.7.10
-
diff --git a/community/jad/PKGBUILD b/community/jad/PKGBUILD
new file mode 100644
index 000000000..840929b94
--- /dev/null
+++ b/community/jad/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 86961 2013-03-25 11:13:01Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: astaroth <astaroth_@web.de>
+
+pkgname=jad
+pkgver=1.5.8e
+pkgrel=4
+pkgdesc='Java decompiler'
+license=('custom')
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.varaneckas.com/jad'
+source=("http://www.varaneckas.com/$pkgname/${pkgname}${pkgver//./}.linux.static.zip"
+        'jad.html::http://www.varaneckas.com/jad')
+sha256sums=('2878e19fc1fdd725b516f538a57b02aaec1b2d1e4b106d550230381ffa9c0c81'
+            '4acee94ff29fe01ea2a9c4c0b47f22fb5a93fc667ee2dd8b6740f7f36bcbcdf2')
+
+build() {
+  cd "$srcdir"
+
+  grep '<code>' jad.html -A18 | sed 's:<code>::' | sed 's:</code>::' > LICENSE
+}
+
+package() {
+  cd "$srcdir"
+
+  install -Dm755 "$srcdir/$pkgname" "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 Readme.txt "$pkgdir/usr/share/doc/$pkgname/README"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/jemalloc/PKGBUILD b/community/jemalloc/PKGBUILD
new file mode 100644
index 000000000..e5ccd4fea
--- /dev/null
+++ b/community/jemalloc/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 88096 2013-04-11 13:54:05Z mtorromeo $
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+# Contributor: Kovivchak Evgen <oneonfire@gmail.com>
+
+pkgname=jemalloc
+pkgver=3.3.1
+pkgrel=1
+pkgdesc="General-purpose scalable concurrent malloc implementation"
+arch=('i686' 'x86_64')
+license=('BSD')
+url="http://www.canonware.com/jemalloc/"
+depends=('glibc')
+makedepends=('autoconf' 'make')
+source=(http://www.canonware.com/download/jemalloc/$pkgname-$pkgver.tar.bz2)
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	./configure --prefix=/usr
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
+	mv "$pkgdir"/usr/bin/{,jemalloc-}pprof
+	chmod 644 "$pkgdir"/usr/lib/*.a
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+sha256sums=('35c433cc1df5cdf9eb58b7980338552fc1d7aa64f89fe5643a972ccedb7cf20a')
diff --git a/community/jhead/PKGBUILD b/community/jhead/PKGBUILD
index 9619fd27a..3dc0e1518 100644
--- a/community/jhead/PKGBUILD
+++ b/community/jhead/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 73309 2012-07-06 06:23:17Z andrea $
-# Maintainer: François Charette <francois ατ archlinux δοτ org>
+# $Id: PKGBUILD 84285 2013-02-15 14:37:36Z lfleischer $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: François Charette <francois ατ archlinux δοτ org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=jhead
-pkgver=2.96
-pkgrel=1.1
-pkgdesc="EXIF JPEG info parser and thumbnail remover"
+pkgver=2.97
+pkgrel=1
+pkgdesc='EXIF JPEG info parser and thumbnail remover'
 url="http://www.sentex.net/~mwandel/jhead/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('glibc')
 optdepends=('libjpeg: to up-right images according to rotation tag')
-source=(http://www.sentex.net/~mwandel/${pkgname}/${pkgname}-${pkgver}.tar.gz 
+source=("http://www.sentex.net/~mwandel/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         LICENSE)
-md5sums=('562b45d4d82f64196debed8c520c1cab'
+md5sums=('23b037d0c54211973a3951e41a97c924'
          '1f0db611d2642a981719f45252762a45')
 
 build() {
@@ -23,7 +24,8 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  install -D -m755 jhead "${pkgdir}/usr/bin/jhead"
-  install -D -m644 jhead.1 "${pkgdir}/usr/share/man/man1/jhead.1"
-  install -D -m644 ${srcdir}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  install -Dm755 jhead "${pkgdir}/usr/bin/jhead"
+  install -Dm644 jhead.1 "${pkgdir}/usr/share/man/man1/jhead.1"
+  install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD
index 43470d592..89cc68c17 100644
--- a/community/john/PKGBUILD
+++ b/community/john/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=john
 pkgver=1.7.9
-pkgrel=7
+pkgrel=7.1
 _jumbover=7
 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/judy/PKGBUILD b/community/judy/PKGBUILD
index 4ad02f728..1af50ede4 100644
--- a/community/judy/PKGBUILD
+++ b/community/judy/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=judy
 pkgver=1.0.5
-pkgrel=3
+pkgrel=3.1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="C library creating and accessing dynamic arrays"
 makedepends=(gcc)
diff --git a/community/kaa-imlib2/PKGBUILD b/community/kaa-imlib2/PKGBUILD
index 9fa2cf127..e6f0e6b62 100644
--- a/community/kaa-imlib2/PKGBUILD
+++ b/community/kaa-imlib2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 68027 2012-03-17 01:32:31Z giovanni $
+# $Id: PKGBUILD 86681 2013-03-21 01:58:58Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: DonVla <donvla@users.sourceforge.net>
 
 pkgname=kaa-imlib2
 pkgver=0.2.3
-pkgrel=5
+pkgrel=5.1
 pkgdesc="KAA imlib2 package"
 url="http://freevo.sourceforge.net/"
 license=('GPL2')
@@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el')
 source=(http://downloads.sourceforge.net/freevo/$pkgname-$pkgver.tar.gz)
 md5sums=('64828ede785ab0dd2d3c1f2f36c99342')
 
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  python2 setup.py install --prefix=$pkgdir/usr
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 setup.py install --prefix="$pkgdir/usr"
 }
diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD
index a3a29e6ae..52b2303f9 100644
--- a/community/kadu/PKGBUILD
+++ b/community/kadu/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 82749 2013-01-23 20:16:18Z bpiotrowski $
+# $Id: PKGBUILD 89897 2013-05-05 09:24:04Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Mateusz Herych
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 
 pkgname=kadu
 pkgver=0.12.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Qt-based Jabber/XMPP and Gadu-Gadu client'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kadu.net/'
 license=('GPL')
 depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl'
          'libidn' 'libmpdclient' 'qtwebkit' 'xdg-utils')
-makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl')
+makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'optipng')
 install=kadu.install
 source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2)
 sha256sums=('d607bbd0d00b01bfb70dd15f15c8be4076896a935041651e67a3887ad12ab8a8')
 
+prepare() {
+  find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
+
 build() {
-  cd $srcdir
   mkdir build
   cd build
 
@@ -29,7 +32,7 @@ build() {
 }
 
 package() {
-  cd $srcdir/build
+  cd build
   make DESTDIR=$pkgdir LIBDIR=/usr/lib install
 
   mv $pkgdir/usr/sdk $pkgdir/usr/share/kadu/sdk
diff --git a/community/kbibtex/PKGBUILD b/community/kbibtex/PKGBUILD
new file mode 100644
index 000000000..9bac69f64
--- /dev/null
+++ b/community/kbibtex/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 87529 2013-04-02 15:44:34Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Antonio Rojas <nqn1976 @ gmail.com>
+# Contributor: cmorlok <christianmorlok@web.de>
+
+pkgname=kbibtex
+pkgver=0.4.1
+_branch=0.4
+pkgrel=2
+pkgdesc="A BibTeX editor for KDE"
+arch=('i686' 'x86_64' 'mips64el')
+url='http://home.gna.org/kbibtex/'
+license=('GPL')
+depends=('kdebase-runtime' 'kdegraphics-okular')
+makedepends=('cmake' 'automoc4')
+install=$pkgname.install
+source=("http://download.gna.org/$pkgname/$_branch/$pkgname-$pkgver.tar.bz2")
+md5sums=('657eda1da48198a3c336ff268ce46d6f')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/audex/audex.install b/community/kbibtex/kbibtex.install
index 81ce5c4b0..139cb5694 100644
--- a/community/audex/audex.install
+++ b/community/kbibtex/kbibtex.install
@@ -1,6 +1,7 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  update-desktop-database -q
 }
 
 post_upgrade() {
@@ -10,3 +11,5 @@ post_upgrade() {
 post_remove() {
 	post_install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/kcheckers/PKGBUILD b/community/kcheckers/PKGBUILD
index d0cd583ab..817533abb 100644
--- a/community/kcheckers/PKGBUILD
+++ b/community/kcheckers/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 55424 2011-09-12 07:36:46Z ebelanger $
+# $Id: PKGBUILD 85364 2013-03-01 10:34:09Z andrea $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=kcheckers
 pkgver=0.8.1
-pkgrel=7
+pkgrel=8
 pkgdesc="Qt4-based checkers boardgame"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qcheckers.sourceforge.net/"
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 source=(http://downloads.sourceforge.net/qcheckers/${pkgname}-${pkgver}.tar.gz kcheckers.desktop)
 md5sums=('793736a007cd92122dfd91bcfd14ab69'
-         '8b8682edd870c2692f9c7d538263e0f5')
+         '25b2605f4d605615e265150b722f1897')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/kcheckers/kcheckers.desktop b/community/kcheckers/kcheckers.desktop
index a1f4e1209..815cfb4a8 100644
--- a/community/kcheckers/kcheckers.desktop
+++ b/community/kcheckers/kcheckers.desktop
@@ -2,7 +2,7 @@
 Name=Kcheckers
 Comment=Checkers/Daughts game using Qt4 toolkit
 Exec=kcheckers
-Icon=/usr/share/kcheckers/icons/theme/kingwhite.png
+Icon=/usr/share/kcheckers/themes/simple_small/kingwhite.png
 Terminal=false
 Type=Application
 Encoding=UTF-8
diff --git a/community/kchmviewer/PKGBUILD b/community/kchmviewer/PKGBUILD
index d929dc729..435fb15bb 100644
--- a/community/kchmviewer/PKGBUILD
+++ b/community/kchmviewer/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 61052 2011-12-20 23:58:31Z jlichtblau $
+# $Id: PKGBUILD 85365 2013-03-01 10:34:18Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Bogdanov <andorn@gmail.com>
 
 pkgname=kchmviewer
 pkgver=6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A .chm files (MS HTML help file format) viewer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kchmviewer.sourceforge.net/"
 license=('GPL')
-depends=('desktop-file-utils' 'chmlib' 'kdebase-runtime' 'qt' 'xdg-utils')
+depends=('desktop-file-utils' 'chmlib' 'kdebase-runtime' 'xdg-utils')
 makedepends=('automoc4' 'cmake')
 options=('libtool')
 install=$pkgname.install
@@ -33,8 +33,8 @@ package() {
   install -D -m644 ${srcdir}/$pkgname-$pkgver/packages/$pkgname.png \
     ${pkgdir}/usr/share/pixmaps/$pkgname.png
 
-#msits.protocol file provided by kdegraphics package
+#msits.protocol file provided by kdegraphics-okular package
   rm -rf ${pkgdir}/usr/share/kde4
-#kio_msits.so file provided by kdegraphics package - FS#14376
+#kio_msits.so file provided by kdegraphics-okular package - FS#14376
   rm -rf ${pkgdir}/usr/lib
 }
diff --git a/community/kcm-fcitx/PKGBUILD b/community/kcm-fcitx/PKGBUILD
index b999708f9..693cc4901 100644
--- a/community/kcm-fcitx/PKGBUILD
+++ b/community/kcm-fcitx/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 82954 2013-01-26 06:35:46Z fyan $
+# $Id: PKGBUILD 85498 2013-03-02 02:59:40Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: poplarch <poplarch@gmail.com>
 
 pkgname=kcm-fcitx
 pkgver=0.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Config Module for Fcitx"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/fcitx/kcm-fcitx"
 license=('GPL')
-depends=('fcitx>=4.2.7' 'kdebase-runtime' 'fcitx-qt')
+depends=('fcitx>=4.2.7' 'kdebase-runtime' 'fcitx-qt4')
 makedepends=('cmake' 'automoc4')
 source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
 
@@ -19,7 +19,7 @@ build() {
   mkdir -p build
   cd build
     
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DQT_QMAKE_EXECUTABLE=qmake-qt4 ..
   make
 }
 
diff --git a/community/kdbg/PKGBUILD b/community/kdbg/PKGBUILD
index 2f99878f7..3b75b9788 100644
--- a/community/kdbg/PKGBUILD
+++ b/community/kdbg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 75968 2012-09-07 11:44:58Z spupykin $
+# $Id: PKGBUILD 88516 2013-04-19 10:30:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Eric Belanger <belanger@astro.umontreal.ca>
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
 # Contributor: Georg Grabler <ggrabler@chello.at>
 
 pkgname=kdbg
-pkgver=2.5.2
+pkgver=2.5.3
 pkgrel=1
 pkgdesc="A gdb GUI for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('kdebase-runtime' 'gdb')
 makedepends=('automoc4' 'cmake')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/project/kdbg/Source%20Code/$pkgver/kdbg-$pkgver.tar.gz")
-md5sums=('392f477f0a4c1f1b921ce7d6c7128fcb')
+md5sums=('345183d07eb11a9c841d3dc34b734613')
 
 build() {
   cd $srcdir
diff --git a/community/kde-gtk-config/PKGBUILD b/community/kde-gtk-config/PKGBUILD
new file mode 100644
index 000000000..88840a813
--- /dev/null
+++ b/community/kde-gtk-config/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 89140 2013-04-27 07:58:51Z lcarlier $
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Contributor: birdflesh <antkoul at gmail dot com>
+
+pkgname=kde-gtk-config
+pkgver=2.2.1
+pkgrel=1
+pkgdesc="GTK2 and GTK3 Configurator for KDE"
+arch=('i686' 'x86_64')
+url="https://projects.kde.org/kde-gtk-config"
+license=('GPL3')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4' 'gtk2' 'gtk3')
+optdepends=('gtk2: GTK+ v2 support'
+	    'gtk3: GTK+ v3 support')
+source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz")
+md5sums=('d155ed431d509e54a60383a70b700e1c')
+install=$pkgname.install
+
+build() {
+  cd "$srcdir"
+
+  mkdir -p build && cd build
+
+  cmake ../$pkgname-$pkgver \
+    -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package(){
+  cd "$srcdir/build"
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/kde-gtk-config/kde-gtk-config.install b/community/kde-gtk-config/kde-gtk-config.install
new file mode 100644
index 000000000..6905e303e
--- /dev/null
+++ b/community/kde-gtk-config/kde-gtk-config.install
@@ -0,0 +1,11 @@
+post_install() {
+xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+        post_install
+}
+
+post_remove() {
+        post_install
+}
\ No newline at end of file
diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD
index 5a3305dc1..002cba8ab 100644
--- a/community/kdenlive/PKGBUILD
+++ b/community/kdenlive/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83307 2013-01-29 09:59:04Z spupykin $
+# $Id: PKGBUILD 87846 2013-04-08 09:22:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zuf <kontakt.zuf@gmail.com>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=kdenlive
-pkgver=0.9.4
+pkgver=0.9.6
 pkgrel=1
 pkgdesc="A non-linear video editor for Linux"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ optdepends=('recordmydesktop: screen capture'
 install=kdenlive.install
 options=('docs')
 source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.bz2)
-md5sums=('fed17b584aca6a9811a49f2348b4f6db')
+md5sums=('3bd3a511b860490acc367e7c9d7ffa43')
 
 build() {
   export LDFLAGS="$LDFLAGS -lX11"
diff --git a/community/kdenlive/glu.patch b/community/kdenlive/glu.patch
deleted file mode 100644
index a4c2f21fb..000000000
--- a/community/kdenlive/glu.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -wbBur kdenlive-0.8.2/src/videoglwidget.cpp kdenlive-0.8.2.my/src/videoglwidget.cpp
---- kdenlive-0.8.2/src/videoglwidget.cpp	2011-10-31 22:46:21.000000000 +0400
-+++ kdenlive-0.8.2.my/src/videoglwidget.cpp	2011-11-02 14:54:10.000000000 +0400
-@@ -2,6 +2,7 @@
- #include <QtGui>
- #include <QtOpenGL>
- #include "videoglwidget.h"
-+#include <GL/glu.h>
- 
- #ifndef GL_TEXTURE_RECTANGLE_EXT
- #define GL_TEXTURE_RECTANGLE_EXT GL_TEXTURE_RECTANGLE_NV
diff --git a/community/kdesvn/kdesvn-1.5.5-doctype-version.patch b/community/kdesvn/kdesvn-1.5.5-doctype-version.patch
deleted file mode 100644
index 908960b72..000000000
--- a/community/kdesvn/kdesvn-1.5.5-doctype-version.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/doc/nl/index.docbook	2010-08-09 19:00:17.000000000 +0200
-+++ b/doc/nl/index.docbook	2010-08-09 19:00:26.000000000 +0200
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kdesvn "<application>kdesvn</application>">
-   <!ENTITY kappname "&kdesvn;"><!-- Do *not* replace kappname-->
-   <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
diff --git a/community/kdesvn/kdesvn-1.5.5-qt48.patch b/community/kdesvn/kdesvn-1.5.5-qt48.patch
deleted file mode 100644
index a1ac51b51..000000000
--- a/community/kdesvn/kdesvn-1.5.5-qt48.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: Ubuntu
-https://launchpad.net/ubuntu/precise/+source/kdesvn/1.5.5-3ubuntu1
-
---- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h
-+++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h
-@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil
- /**
- 	@author Rajko Albrecht <ral@alwins-world.de>
- */
--class RevGraphView : virtual public QGraphicsView
-+class RevGraphView : public QGraphicsView
- {
-     Q_OBJECT
- public:
diff --git a/community/keepalived/ip_vs_moved.patch b/community/keepalived/ip_vs_moved.patch
deleted file mode 100644
index e27873810..000000000
--- a/community/keepalived/ip_vs_moved.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- keepalived-1.2.2/configure	2011-01-06 01:51:33.000000000 +0100
-+++ keepalived-1.2.2.orig/configure	2011-11-24 19:36:32.051486626 +0100
-@@ -3973,7 +3973,7 @@
- 
- IPVS_SUPPORT="_WITHOUT_LVS_"
- if test "$enable_lvs" != "no"; then
--  ac_fn_c_check_header_mongrel "$LINENO" "net/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default"
-+  ac_fn_c_check_header_mongrel "$LINENO" "linux/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default"
- if test "x$ac_cv_header_net_ip_vs_h" = x""yes; then :
-   IPVS_SUPPORT="_WITH_LVS_"
- else
-diff -ru keepalived-1.2.2/configure.in keepalived-1.2.2.orig/configure.in
---- keepalived-1.2.2/configure.in	2011-01-06 01:51:30.000000000 +0100
-+++ keepalived-1.2.2.orig/configure.in	2011-11-24 19:36:11.797860077 +0100
-@@ -124,7 +124,7 @@
- dnl ----[ Checks for LVS and VRRP support ]----
- IPVS_SUPPORT="_WITHOUT_LVS_"
- if test "$enable_lvs" != "no"; then
--  AC_CHECK_HEADER([net/ip_vs.h],
-+  AC_CHECK_HEADER([linux/ip_vs.h],
-     [IPVS_SUPPORT="_WITH_LVS_"],
-     [
-       IPVS_SUPPORT="_WITHOUT_LVS_"
diff --git a/community/keepalived/keepalived.conf b/community/keepalived/keepalived.conf
deleted file mode 100644
index 225f02bf9..000000000
--- a/community/keepalived/keepalived.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh et:
-# Options for keepalived. See `keepalived --help' output and keepalived(8) and
-# keepalived.conf(5) man pages for a list of all options. Here are the most
-# common ones :
-#
-# --vrrp               -P    Only run with VRRP subsystem.
-# --check              -C    Only run with Health-checker subsystem.
-# --dont-release-vrrp  -V    Dont remove VRRP VIPs & VROUTEs on daemon stop.
-# --dont-release-ipvs  -I    Dont remove IPVS topology on daemon stop.
-# --dump-conf          -d    Dump the configuration data.
-# --log-detail         -D    Detailed log messages.
-# --log-facility       -S    0-7 Set local syslog facility (default=LOG_DAEMON)
-#
-
-DAEMON_OPTS='-D'
-
diff --git a/community/keepalived/keepalived.rc b/community/keepalived/keepalived.rc
deleted file mode 100644
index 0ecfc7ded..000000000
--- a/community/keepalived/keepalived.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-DAEMON=/usr/sbin/keepalived
-PID=$(pidof -o %PPID $DAEMON)
-
-case "$1" in
-  start)
-    stat_busy "Starting ${0##*/} daemon"
-    [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0
-    stat_fail
-  ;;
-  stop)
-    stat_busy "Stopping ${0##*/} daemon"
-    [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
-    stat_fail
-  ;;
-  restart)
-    $0 stop
-    $0 start
-    exit 0
-  ;;
-  reload)
-    stat_busy "Reloading ${0##*/} daemon"
-    [[ $PID ]] && kill -HUP $PID &> /dev/null && stat_done && exit 0
-    stat_fail
-  ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|restart|reload}" >&2
-  ;;
-esac
-
-exit 1
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/keepassx/PKGBUILD b/community/keepassx/PKGBUILD
index 6600013ce..61c8d359b 100644
--- a/community/keepassx/PKGBUILD
+++ b/community/keepassx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80120 2012-11-16 16:43:09Z spupykin $
+# $Id: PKGBUILD 86727 2013-03-21 15:05:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Greg Bouzakis <gregbouzakis@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -6,12 +6,12 @@
 
 pkgname=keepassx
 pkgver=0.4.3
-pkgrel=3
+pkgrel=4.1
 pkgdesc='Password manager'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.keepassx.org'
 license=('GPL2')
-depends=('libxtst' 'qt' 'shared-mime-info')
+depends=('libxtst' 'qt4' 'shared-mime-info')
 install=keepassx.install
 source=(http://downloads.sourceforge.net/keepassx/$pkgname-$pkgver.tar.gz)
 md5sums=('1df67bb22b2e08df49f09e61d156f508')
@@ -19,7 +19,7 @@ md5sums=('1df67bb22b2e08df49f09e61d156f508')
 build() {
   cd $srcdir/$pkgname-$pkgver
   sed -i '1,1i#include <unistd.h>' src/lib/random.cpp
-  qmake
+  qmake-qt4
   make
 }
 
diff --git a/community/kicad/PKGBUILD b/community/kicad/PKGBUILD
index 330a87a86..57ae032a4 100644
--- a/community/kicad/PKGBUILD
+++ b/community/kicad/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 80124 2012-11-16 17:08:40Z kkeen $
+# $Id: PKGBUILD 89177 2013-04-27 13:49:24Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Marq Schneider <queueRAM@gmail.com>
 
 pkgname=kicad
-pkgver=20120119
+pkgver=20130331
 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
-_pkgbzr=3256
-pkgrel=4
+_pkgbzr=4008
+pkgrel=1
 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://iut-tice.ujf-grenoble.fr/kicad/"
 license=('GPL')
 depends=('glu' 'wxgtk' 'hicolor-icon-theme' 'desktop-file-utils')
@@ -16,16 +16,21 @@ makedepends=('cmake' 'zlib' 'mesa')
 optdepends=('kicad-docs-bzr: for documentation' 
             'kicad-library-bzr: for footprints')
 install=kicad.install
-source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}_sources-$_pkgver-BZR$_pkgbzr-stable.zip
+source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}-sources_stable_${_pkgver}_BZR${_pkgbzr}.zip
         kicad-boost-polygon-declare-gtlsort-earlier.patch)
-md5sums=('d65574c42efd72638aed80adef367c3b'
+md5sums=('9c88273a5b323b6622d1704a90ffa399'
          'a2c39704238946e74a5ed0c38326345f')
 
 build() {
-  cd "$srcdir/KiCad_sources"
+  cd "$srcdir/stable_${_pkgver}_BZR${_pkgbzr}"
 
   patch -p0 < "$srcdir/kicad-boost-polygon-declare-gtlsort-earlier.patch"
 
+  # harmless build blocking error
+  # see https://lists.launchpad.net/kicad-developers/msg07841.html
+  # for proper fix
+  sed -i 's|^#.*error "You must use|//&|' include/common.h
+
   # FS#31559
   sed -i 's/-O2/-O1/' CMakeLists.txt
 
@@ -39,10 +44,11 @@ build() {
 }
 
 package() {
-  cd "$srcdir/KiCad_sources/build/Release"
+  cd "$srcdir/stable_${_pkgver}_BZR${_pkgbzr}/build/Release"
 
   make DESTDIR="$pkgdir" install
 
   # copy updated linux icons
   #cp -r -n "$srcdir/$pkgname-icons/resources/linux/mime/icons" "$pkgdir/usr/share/"
 }
+
diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD
index d61da8a27..703697c71 100644
--- a/community/kid3/PKGBUILD
+++ b/community/kid3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 81297 2012-12-16 18:48:19Z jlichtblau $
+# $Id: PKGBUILD 86189 2013-03-12 21:45:28Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 
 pkgname=kid3
-pkgver=2.2.1
+pkgver=2.3
 pkgrel=1
 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ options=('!makeflags')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('2ac3ab6bbf8d2fdcc070a753ebdce868a5e9a2f0b3daddcc7c5b953ff39781b0')
+sha256sums=('8426b40b065f5a968796d1ff92da8d7a96d67cd963df837ce30ff1cf795ae301')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/kid3/ffmpeg-0.11.diff b/community/kid3/ffmpeg-0.11.diff
deleted file mode 100644
index 349ca4b3d..000000000
--- a/community/kid3/ffmpeg-0.11.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2a91bff2810281e58948f478e9396c73e5c6154a Mon Sep 17 00:00:00 2001
-From: Urs Fleisch <ufleisch@users.sourceforge.net>
-Date: Mon, 4 Jun 2012 15:23:36 +0200
-Subject: [PATCH 1/1] Support building with ffmpeg-0.11.
-
----
- src/core/import/fingerprintcalculator.cpp |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/import/fingerprintcalculator.cpp b/src/core/import/fingerprintcalculator.cpp
-index 05158ae..6ac632c 100644
---- a/src/core/import/fingerprintcalculator.cpp
-+++ b/src/core/import/fingerprintcalculator.cpp
-@@ -218,7 +218,7 @@ public:
-   }
- 
-   bool createForCodec(const Codec& codecCtx) {
--    m_ptr = ::av_audio_convert_alloc(SAMPLE_FMT_S16, codecCtx.channels(),
-+    m_ptr = ::av_audio_convert_alloc(AV_SAMPLE_FMT_S16, codecCtx.channels(),
-                  codecCtx.sampleFormat(), codecCtx.channels(), 0, 0);
-     return m_ptr != 0;
-   }
-@@ -342,7 +342,7 @@ FingerprintCalculator::Result::Error FingerprintCalculator::decodeAudioFile(
-     return Result::NoCodecFound;
- 
-   Converter converter;
--  if (codec.sampleFormat() != SAMPLE_FMT_S16) {
-+  if (codec.sampleFormat() != AV_SAMPLE_FMT_S16) {
-     if (!converter.createForCodec(codec))
-       return Result::NoConverterFound;
-   }
--- 
-1.7.4.1
-
diff --git a/community/kid3/kid3.changelog b/community/kid3/kid3.changelog
index 7d608279b..9376c5d71 100644
--- a/community/kid3/kid3.changelog
+++ b/community/kid3/kid3.changelog
@@ -1,3 +1,6 @@
+2013-03-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* kid3 2.3-1
+
 2012-12-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* kid3 2.2.1-1
 
diff --git a/community/kio-mtp/PKGBUILD b/community/kio-mtp/PKGBUILD
new file mode 100644
index 000000000..0706d1899
--- /dev/null
+++ b/community/kio-mtp/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 86399 2013-03-16 10:03:49Z fyan $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Antonio Rojas < nqn1976 @ gmail.com >
+
+pkgname=kio-mtp
+pkgver=0.75
+pkgrel=1
+arch=('i686' 'x86_64' 'mips64el')
+pkgdesc="Provides KIO Access to MTP devices using the mtp:/// protocol"
+url='https://projects.kde.org/projects/playground/base/kio-mtp'
+license=('GPL')
+depends=('kdebase-runtime' 'libmtp')
+makedepends=('cmake' 'automoc4')
+source=("$pkgname-$pkgver.tar.gz::http://quickgit.kde.org/?p=kio-mtp.git&a=snapshot&h=7de86bae3623192eb468772bb187f6afffc03fe0&fmt=tgz")
+
+build() {
+  mkdir build
+  cd build
+  cmake ../${pkgname} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package(){
+  cd build
+  make DESTDIR="${pkgdir}" install
+}
+md5sums=('813d9de196ce969b84a14f68e1b320b9')
diff --git a/community/kiwi/PKGBUILD b/community/kiwi/PKGBUILD
index d9e7ffd20..feb6e9870 100644
--- a/community/kiwi/PKGBUILD
+++ b/community/kiwi/PKGBUILD
@@ -1,5 +1,5 @@
-# $Id: PKGBUILD 66623 2012-02-26 15:04:14Z lfleischer $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
+# $Id: PKGBUILD 85550 2013-03-03 03:09:38Z cinelli $
+# Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
@@ -10,7 +10,7 @@ pkgdesc="A set of classes and wrappers for PyGTK"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.async.com.br/projects/kiwi"
 license=("LGPL")
-depends=('pygtk')
+depends=('python2' 'python' 'pygtk' 'gtk')
 makedepends=('gettext')
 source=("http://download.gnome.org/sources/$pkgname/1.9/$pkgname-$pkgver.tar.bz2")
 sha256sums=('0ffa912cd180b3092b3ff636c582ab2c40f0f8eb541ada07b1432631a2d49e90')
@@ -18,14 +18,15 @@ sha256sums=('0ffa912cd180b3092b3ff636c582ab2c40f0f8eb541ada07b1432631a2d49e90')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-	# python2 fix
+  # Apply Python2 fix.
   for file in bin/{kiwi-i18n,kiwi-ui-test} setup.py; do
-    echo "Applying python2 fix for ${file}"
-    sed -i 's_/usr/bin/env python_/usr/bin/env python2_' ${file}
+    echo "Applying python2 fix for $file"
+    sed -i 's_/usr/bin/env python_/usr/bin/env python2_' "$file"
   done
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
+
   python2 setup.py install --root="$pkgdir"
 }
diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD
index d330f0c0b..a4275df84 100644
--- a/community/klavaro/PKGBUILD
+++ b/community/klavaro/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 83424 2013-01-31 21:14:34Z stativ $
+# $Id: PKGBUILD 87583 2013-04-03 13:18:34Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=klavaro
-pkgver=1.9.6
+pkgver=1.9.7
 pkgrel=1
 pkgdesc="Free touch typing tutor program"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('intltool')
 optdepends=('espeakup: voice output')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('1b44cd541303af6167f5f971b57a745c')
+md5sums=('e28114568ac20f64b372f5af53abc5a3')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/kmscon/PKGBUILD b/community/kmscon/PKGBUILD
index 11cb9492d..801f87927 100644
--- a/community/kmscon/PKGBUILD
+++ b/community/kmscon/PKGBUILD
@@ -1,37 +1,48 @@
+# $Id: PKGBUILD 85313 2013-02-28 21:20:56Z thestinger $
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 # Contributor: David Herrmann <dh.herrmann@googlemail.com>
 pkgname=kmscon
-pkgver=6
-pkgrel=3
+pkgver=7
+pkgrel=1
 pkgdesc='Terminal emulator based on Kernel Mode Setting (KMS)'
 arch=(i686 x86_64)
 url='https://github.com/dvdhrm/kmscon'
 license=('MIT')
 depends=(systemd libdrm mesa libegl libgbm libgles pango libxkbcommon libpciaccess xkeyboard-config)
-makedepends=('libxslt' 'docbook-xsl' 'linux-api-headers')
+makedepends=(git libxslt docbook-xsl linux-api-headers)
 options=(!libtool)
-source=(https://github.com/downloads/dvdhrm/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('12f6966cef8e846f31dbcad916a9f347')
+
+__gitroot=https://github.com/dvdhrm/kmscon.git
+__gitname=kmscon
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr \
-    --enable-kmscon \
-    --disable-wlterm \
-    --enable-multi-seat \
-    --enable-hotplug \
-    --enable-pciaccess \
-    --with-video=fbdev,dumb,drm \
-    --with-fonts=pango,freetype2,8x16 \
-    --with-sessions=dummy,terminal
+  cd "$srcdir"
+
+  msg "Connecting to GIT server...."
+
+  if [[ -d "$__gitname" ]]; then
+    cd "$__gitname" && git pull origin
+    msg "The local files are updated."
+  else
+    git clone "$__gitroot" "$__gitname"
+  fi
+
+  msg "GIT checkout done or server timeout"
+  msg "Starting build..."
+
+  rm -rf "$srcdir/$__gitname-build"
+  git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build"
+  cd "$srcdir/$__gitname-build"
+
+  git checkout $pkgname-$pkgver
+  ./autogen.sh --prefix=/usr --disable-wlterm
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$__gitname-build"
   make DESTDIR="$pkgdir/" install
   mkdir -p "$pkgdir/usr/share/licenses/$pkgname" "$pkgdir/usr/lib/systemd/system"
   cp COPYING "$pkgdir/usr/share/licenses/$pkgname/"
-  cp docs/kmscon{,@}.service "$pkgdir/usr/lib/systemd/system/"
+  cp docs/kmscon{,vt@}.service "$pkgdir/usr/lib/systemd/system/"
 }
diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD
index 3adb00505..4cd33a88f 100644
--- a/community/knemo/PKGBUILD
+++ b/community/knemo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81173 2012-12-12 18:41:15Z lcarlier $
+# $Id: PKGBUILD 85916 2013-03-08 23:40:41Z foutrelis $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -6,12 +6,12 @@
 
 pkgname=knemo
 pkgver=0.7.6
-pkgrel=1
+pkgrel=3
 pkgdesc="The KDE Network Monitor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde-apps.org/content/show.php?content=12956"
 license=('GPL')
-depends=('kdebase-workspace' 'wireless_tools' 'iw' 'gtk-update-icon-cache')
+depends=('kdebase-workspace' 'wireless_tools' 'iw' 'libnl' 'gtk-update-icon-cache')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 options=('libtool')
diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD
index 1012a35ad..68b047e41 100644
--- a/community/kphotoalbum/PKGBUILD
+++ b/community/kphotoalbum/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 76830 2012-09-30 21:12:00Z lcarlier $
+# $Id: PKGBUILD 84672 2013-02-21 14:40:13Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com>
@@ -6,7 +6,7 @@
 # Contributor: chfoxli <lg ][ romandie ? com>
 
 pkgname=kphotoalbum
-pkgver=4.3
+pkgver=4.4
 pkgrel=1
 pkgdesc="KDE Photo Album, picture collection manager"
 url="http://www.kphotoalbum.org/"
@@ -19,7 +19,7 @@ optdepends=('kdeedu-marble: integration with Marble'
 	'kdemultimedia-mplayerthumbs: video thumbnails')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('09b5ba7d44ee7426802b233454927b8f')
+md5sums=('84cc7741c8e8c62e097ebb5e81d40979')
 
 build() {
   cd ${srcdir}
diff --git a/community/kphotoalbum/fix-docbook-build.patch b/community/kphotoalbum/fix-docbook-build.patch
deleted file mode 100644
index 575a4271e..000000000
--- a/community/kphotoalbum/fix-docbook-build.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-diff -up kphotoalbum-4.1.1/doc/index.docbook.docbook_fix kphotoalbum-4.1.1/doc/index.docbook
---- kphotoalbum-4.1.1/doc/index.docbook.docbook_fix	2009-11-15 15:16:29.000000000 -0600
-+++ kphotoalbum-4.1.1/doc/index.docbook	2010-06-13 13:03:02.815174744 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application>KPhotoAlbum</application>">
-   <!ENTITY kappname "&kphotoalbum;">
-   <!ENTITY package "kdeextragear-2">
-@@ -41,12 +41,6 @@
-     <date>2004-08-06</date>
-     <releaseinfo>2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword>KDE</keyword>
--      <keyword>kdeextragear-2</keyword>
--      <keyword>KPhotoAlbum</keyword>
--      <keyword>Image Database</keyword>
--    </keywordset>
-     <abstract><para>
-   This is the user manual for &kphotoalbum;. If you are
-   not the type who likes reading documentation, but rather just want to try
-@@ -64,6 +58,12 @@ menu and select <guimenuitem>Run &kphoto
- on long HTML document at <ulink
- url="http://www.kphotoalbum.org/">&kphotoalbum;'s Homepage</ulink></para>
- </abstract>
-+    <keywordset>
-+      <keyword>KDE</keyword>
-+      <keyword>kdeextragear-2</keyword>
-+      <keyword>KPhotoAlbum</keyword>
-+      <keyword>Image Database</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
-diff -up kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook
---- kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:07.000000000 -0600
-+++ kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:10:06.145165665 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application
- >KPhotoAlbum</application
- >">
-@@ -65,16 +65,6 @@
-     <releaseinfo
- >2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword
-->KDE</keyword>
--      <keyword
-->kdeextragear-2</keyword>
--      <keyword
-->KPhotoAlbum</keyword>
--      <keyword
-->Bilddatenbank</keyword>
--    </keywordset>
-     <abstract
- ><para
- >Dies ist das Benutzerhandbuch für &kphotoalbum;. Wenn Sie nicht gerne Handbücher lesen, sondern lieber gleich Funktionen ausprobieren möchten, haben Sie folgende Alternativen zu diesem Handbuch: <itemizedlist>
-@@ -102,6 +92,12 @@
- >HTML</acronym
- >-Dokument zum Herunterladen.</para>
- </abstract>
-+    <keywordset>
-+      <keyword>KDE</keyword>
-+      <keyword>kdeextragear-2</keyword>
-+      <keyword>KPhotoAlbum</keyword>
-+      <keyword>Bilddatenbank</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
-diff -up kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook
---- kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:20.000000000 -0600
-+++ kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:11:18.860165964 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application
- >KPhotoAlbum</application
- >">
-@@ -65,16 +65,6 @@
-     <releaseinfo
- >2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword
-->KDE</keyword>
--      <keyword
-->kdeextragear-2</keyword>
--      <keyword
-->KPhotoAlbum</keyword>
--      <keyword
-->Piltide andmebaas</keyword>
--    </keywordset>
-     <abstract
- ><para
- >See on &kphotoalbum;i käsiraamat. Kui sa ei armasta eriti käsiraamatuid lugeda, vaid soovid lihtsalt proovida, mis mida teeb, siis on sinu ees lahti mitu võimalust: <itemizedlist>
-@@ -100,6 +90,12 @@
- >&kphotoalbum;i koduleheküljelt</ulink
- >.</para>
- </abstract>
-+    <keywordset>
-+      <keyword>KDE</keyword>
-+      <keyword>kdeextragear-2</keyword>
-+      <keyword>KPhotoAlbum</keyword>
-+      <keyword>Piltide andmebaas</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
-diff -up kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook
---- kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:57.000000000 -0600
-+++ kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:12:00.978165382 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application
- >KPhotoAlbum</application
- >">
-@@ -65,16 +65,6 @@
-     <releaseinfo
- >2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword
-->KDE</keyword>
--      <keyword
-->kdeextragear-2</keyword>
--      <keyword
-->KPhotoAlbum</keyword>
--      <keyword
-->Banca dati immagini</keyword>
--    </keywordset>
-     <abstract
- ><para
- >Questo è il manuale utente di &kphotoalbum;. Se non sei il tipo a cui piace leggere la documentazione, ma che preferisce provare a far funzionare le cose, eccoti delle alternative: <itemizedlist>
-@@ -100,6 +90,12 @@
- >homepage di &kphotoalbum;</ulink
- ></para>
- </abstract>
-+    <keywordset>
-+       <keyword>KDE</keyword>
-+       <keyword>kdeextragear-2</keyword>
-+       <keyword>KPhotoAlbum</keyword>
-+       <keyword>Banca dati immagini</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
-diff -up kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook
---- kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:19:13.000000000 -0600
-+++ kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:12:45.765165840 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application
- >KPhotoAlbum</application
- >">
-@@ -65,16 +65,6 @@
-     <releaseinfo
- >2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword
-->KDE</keyword>
--      <keyword
-->kdeextragear-2</keyword>
--      <keyword
-->Kfotoalbum</keyword>
--      <keyword
-->Bilddatabas</keyword>
--    </keywordset>
-     <abstract
- ><para
- >Det här är användarmanualen för Kfotoalbum. Om du inte är den som gillar att läsa dokumentation, utan istället bara vill försöka dig på saker och ting, ges här några alternativ: <itemizedlist>
-@@ -100,6 +90,12 @@
- >Kfotoalbums hemsida</ulink
- ></para>
- </abstract>
-+    <keywordset>
-+      <keyword>KDE</keyword>
-+      <keyword>kdeextragear-2</keyword>
-+      <keyword>Kfotoalbum</keyword>
-+      <keyword>Bilddatabas</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
-diff -up kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook
---- kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:19:26.000000000 -0600
-+++ kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:13:28.217166055 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application
- >KPhotoAlbum</application
- >">
-@@ -65,16 +65,6 @@
-     <releaseinfo
- >2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword
-->KDE</keyword>
--      <keyword
-->kdeextragear-2</keyword>
--      <keyword
-->KPhotoAlbum</keyword>
--      <keyword
-->База даних зображень</keyword>
--    </keywordset>
-     <abstract
- ><para
- >Це інструкція користувача для &kphotoalbum;. Якщо ви не любитель або любителька читання документації і надаєте перевагу самостійному вивченню програми шляхом експериментів, ви можете піти одним з таких шляхів: <itemizedlist>
-@@ -100,6 +90,12 @@
- >домашній сторінці &kphotoalbum;</ulink
- ></para>
- </abstract>
-+    <keywordset>
-+      <keyword>KDE</keyword>
-+      <keyword>kdeextragear-2</keyword>
-+      <keyword>KPhotoAlbum</keyword>
-+      <keyword>База даних зображень</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
diff --git a/community/kphotoalbum/fix-with-exiv2-0.21.patch b/community/kphotoalbum/fix-with-exiv2-0.21.patch
deleted file mode 100644
index 65baf235d..000000000
--- a/community/kphotoalbum/fix-with-exiv2-0.21.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- kphotoalbum-4.1.1/Exif/Info.cpp.orig	2010/08/16 08:04:32	1164187
-+++ kphotoalbum-4.1.1/Exif/Info.cpp	2011/01/09 06:50:40	1213128
-@@ -106,6 +106,28 @@
-         return res;
- 
-     QList<const Exiv2::TagInfo*> tags;
-+    std::ostringstream s;
-+
-+#if (EXIV2_TEST_VERSION(0,21,0))
-+    const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList();
-+    while (gi->tagList_ != 0) {
-+	    Exiv2::TagListFct tl     = gi->tagList_;
-+	    const Exiv2::TagInfo* ti = tl();
-+
-+	    while (ti->tag_ != 0xFFFF) {
-+		    tags << ti;
-+		    ++ti;
-+	    }
-+        ++gi;
-+    }
-+
-+    for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it) {
-+        while ( (*it)->tag_ != 0xffff ) {
-+            res.insert(QString::fromLatin1(Exiv2::ExifKey(**it).key().c_str()));
-+            ++(*it);
-+        }
-+    }
-+#else
-     tags <<
-         Exiv2::ExifTags::ifdTagList() <<
-         Exiv2::ExifTags::exifTagList() <<
-@@ -121,7 +143,6 @@
-     // Now the ugly part -- exiv2 doesn't have any way to get a list of
-     // MakerNote tags in a reasonable form, so we have to parse it from strings
- 
--    std::ostringstream s;
-     for ( Exiv2::IfdId kind = Exiv2::canonIfdId; kind < Exiv2::lastIfdId;
-             kind = static_cast<Exiv2::IfdId>( kind + 1 ) ) {
- #if EXIV2_TEST_VERSION(0,17,0)
-@@ -130,6 +151,7 @@
-         Exiv2::ExifTags::makerTaglist( s, kind );
- #endif
-     }
-+#endif
- 
-     // IPTC tags use yet another format...
-     Exiv2::IptcDataSets::dataSetList( s );
diff --git a/community/kradio/PKGBUILD b/community/kradio/PKGBUILD
deleted file mode 100644
index 66a5f20dc..000000000
--- a/community/kradio/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 83293 2013-01-28 23:02:36Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kradio
-pkgver=4.0.7
-pkgrel=1
-arch=('x86_64' 'i686')
-license=('GPL2')
-pkgdesc='Comfortable KDE internet and AM/FM radio application'
-url='http://kradio.sourceforge.net/'
-depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg')
-makedepends=('automoc4' 'cmake' 'boost')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc})
-sha256sums=('53d1a706f08cfd5a405142cf34cf9c0b03397b03961936651dfae7206003959c'
-            'cc6e801e10dbb7971cd09f2083d9fad0dc20ffc59ce3301486a985b8718d0c97')
-
-build() {
-  cd "$srcdir"
-
-  mkdir build
-  cd build
-  cmake "../${pkgname}4-$pkgver" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/kradio/kradio.install b/community/kradio/kradio.install
deleted file mode 100644
index 364567b9d..000000000
--- a/community/kradio/kradio.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/krecipes/PKGBUILD b/community/krecipes/PKGBUILD
index f8301f1a8..25847dcc0 100644
--- a/community/krecipes/PKGBUILD
+++ b/community/krecipes/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 87005 2013-03-25 19:16:45Z bpiotrowski $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: shamrok <szamrok@gmail.com>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
@@ -7,14 +7,14 @@
 pkgname=krecipes
 pkgver=2.0beta2
 _pkgver=2.0-beta2
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool designed to make organizing your personal recipes collection fast and easy"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://extragear.kde.org/apps/krecipes/"
 license=('GPL')
 depends=('kdebase-runtime' 'qimageblitz' 'hicolor-icon-theme')
 makedepends=('cmake' 'automoc4' 'docbook-xsl')
-optdepends=('mysql' 'postgresql')
+optdepends=('matriadb' 'postgresql')
 install=${pkgname}.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.gz)
 md5sums=('4c01ccad7ad1409cb35c824a61250fe2')
diff --git a/community/krusader/PKGBUILD b/community/krusader/PKGBUILD
deleted file mode 100644
index 0443763d4..000000000
--- a/community/krusader/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 149613 2012-02-08 20:20:01Z pierre $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-
-pkgname=krusader
-pkgver=2.4.0beta3
-_pkgver=2.4.0-beta3
-pkgrel=2
-pkgdesc="An alternative file manager for KDE resembling Midnight Commander"
-arch=('i686' 'x86_64')
-url="http://krusader.sourceforge.net/"
-license=('GPL')
-depends=('kdebase-runtime' 'kdebase-lib' 'kdebase-katepart')
-makedepends=('cmake' 'automoc4' 'kdeutils-ark')
-optdepends=('kdebase-keditbookmarks: to edit bookmarks'
-            'kdeutils-ark: extract archive with right-click'
-            'kdebase-konsole: open an embedded terminal')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2")
-md5sums=('62a02db3f213bb76805ca6c958e9e263')
-
-build() {
-  cd "$srcdir/$pkgname-$_pkgver"
-
-  cmake . \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$_pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/krusader/krusader.install b/community/krusader/krusader.install
deleted file mode 100644
index e70c054ec..000000000
--- a/community/krusader/krusader.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/community/kshutdown/PKGBUILD b/community/kshutdown/PKGBUILD
index 9803fb1f2..0af0d8a40 100644
--- a/community/kshutdown/PKGBUILD
+++ b/community/kshutdown/PKGBUILD
@@ -1,30 +1,32 @@
-# $Id: PKGBUILD 83158 2013-01-27 16:19:25Z pierre $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# $Id: PKGBUILD 88132 2013-04-12 11:15:41Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kshutdown
-pkgver=3.0beta5
+pkgver=3.0beta7
 pkgrel=1
-pkgdesc="Shutdown Utility for KDE"
-arch=('i686' 'x86_64')
-url="http://kshutdown.sourceforge.net/"
+pkgdesc='Shutdown Utility for KDE'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://kshutdown.sourceforge.net/'
 license=('GPL')
 depends=('kdebase-workspace')
 makedepends=('cmake' 'automoc4')
-install='kshutdown.install'
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip")
-sha1sums=('108e27a7d1cef505c296656f92ab071d8c53bce3')
+install="$pkgname.install"
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-source-$pkgver.zip")
+sha256sums=('5de50c532a9fd2e65706376232b7e641b05bbc5f54677f06d27bce0e0f9825ac')
 
 build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr
+  mkdir "$srcdir/build"
+  cd "$srcdir/build"
+  cmake "../$pkgname-$pkgver" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/build"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/kshutdown/kshutdown.install b/community/kshutdown/kshutdown.install
index 1c0de2e4f..0583fc931 100644
--- a/community/kshutdown/kshutdown.install
+++ b/community/kshutdown/kshutdown.install
@@ -9,3 +9,5 @@ post_upgrade() {
 post_remove() {
   post_install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD
index e34dd78f6..20d2ea51f 100644
--- a/community/ktoblzcheck/PKGBUILD
+++ b/community/ktoblzcheck/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 80490 2012-11-22 19:42:25Z spupykin $
+# $Id: PKGBUILD 88778 2013-04-22 10:14:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
 
 pkgname=ktoblzcheck
-pkgver=1.40
+pkgver=1.41
 pkgrel=1
 pkgdesc="A library to check account numbers and bank codes of German banks"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ depends=('gcc-libs' 'python')
 optdepends=('perl')
 source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz
 	ktoblzcheck-python3.patch)
-md5sums=('fe29ec3ef8b48adf0302fd9d2607580b'
+md5sums=('48f6d0086d780d1c101b17b5b63706f3'
          'a81a697bb3aaeffb7fac0ad7d9166e3f')
 
 build() {
diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD
index f1ce496a5..d5b2fd11f 100644
--- a/community/kvirc/PKGBUILD
+++ b/community/kvirc/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 73246 2012-07-04 09:21:45Z spupykin $
+# $Id: PKGBUILD 85367 2013-03-01 10:34:38Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=kvirc
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt-based IRC client"
 url="http://www.kvirc.net"
-depends=('python2' 'qt' 'libxss' 'qtwebkit')
-arch=(i686 x86_64 'mips64el')
+depends=('python2' 'libxss' 'qtwebkit')
+arch=(i686 x86_64 mips64el)
 makedepends=('cmake')
 license=('GPL')
 options=("!libtool")
diff --git a/community/kyotocabinet/PKGBUILD b/community/kyotocabinet/PKGBUILD
index a46e0fcfd..73d936f2e 100644
--- a/community/kyotocabinet/PKGBUILD
+++ b/community/kyotocabinet/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80585 2012-11-26 11:05:40Z fyan $
+# $Id: PKGBUILD 85954 2013-03-10 07:13:55Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Alexander Duscheleit <jinks@archlinux.us>
 # Contributor: Joaquim Pedro (osmano807) <osmano807@gmail.com>
 
 pkgname=kyotocabinet
 pkgver=1.2.76
-pkgrel=1.1
+pkgrel=2
 pkgdesc="a modern implementation of DBM in C++"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fallabs.com/kyotocabinet"
diff --git a/community/lash/PKGBUILD b/community/lash/PKGBUILD
index 5e9c66475..bf3632c61 100644
--- a/community/lash/PKGBUILD
+++ b/community/lash/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=lash
 pkgver=0.6.0~rc2
 _relver=0.6.0.594
-pkgrel=6
+pkgrel=6.1
 pkgdesc="A session management system for JACK and ALSA"
 arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool')
diff --git a/community/launchy/PKGBUILD b/community/launchy/PKGBUILD
index cb13e6510..731d2e9c5 100644
--- a/community/launchy/PKGBUILD
+++ b/community/launchy/PKGBUILD
@@ -1,14 +1,15 @@
+# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $
 # Contributor: Andrew Burkett <burkett.andrew@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=launchy
 pkgver=2.5
-pkgrel=2
-pkgdesc="Launchy indexes the programs in your start menu and can launch your documents, project files, folders, and bookmarks with just a few keystrokes!"
+pkgrel=3
+pkgdesc="Indexes the programs in your start menu and can launch your documents, project files, folders, and bookmarks with just a few keystrokes!"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.launchy.net/"
 license=('GPL')
-depends=('qt' 'xdg-utils')
+depends=('qt4' 'xdg-utils')
 makedepends=('gcc' 'boost')
 source=("http://downloads.sourceforge.net/launchy/launchy-${pkgver}.tar.gz"
 	fix-linking.patch)
@@ -21,7 +22,7 @@ build() {
   # fix linking against libX11
   patch -Np1 -i ../fix-linking.patch
 
-  qmake -r Launchy.pro
+  qmake-qt4 -r Launchy.pro
   make
 }
 
diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD
index 2b6b6df37..bfdee003e 100644
--- a/community/lazarus/PKGBUILD
+++ b/community/lazarus/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83817 2013-02-05 10:54:36Z spupykin $
+# $Id: PKGBUILD 86718 2013-03-21 12:30:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jens Adam (byte/jra) <j_adam@web.de>
 # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 
 pkgbase=lazarus
 pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt')
-pkgver=1.0.6
+pkgver=1.0.8
 _pkgsubver=0
 pkgrel=1
 url='http://www.lazarus.freepascal.org/'
@@ -15,7 +15,7 @@ makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync')
 options=('!emptydirs' '!makeflags')
 source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz"
 	'lazcontrols2.diff')
-md5sums=('bfab7c877996df911d883ca749c7cc4e'
+md5sums=('ef5085859be265a189db4aa20c648c2d'
          '288bca6ad5ade79deec34c3602daaaa9')
 
 build() {
diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD
index 4db3ef56e..653997fd2 100644
--- a/community/ldc/PKGBUILD
+++ b/community/ldc/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 81801 2012-12-30 15:21:03Z foutrelis $
+# $Id: PKGBUILD 84438 2013-02-19 02:32:24Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=ldc
-pkgver=20121225
+pkgver=20130219
 pkgrel=1
 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2"
 arch=('i686' 'x86_64')
@@ -10,8 +10,8 @@ license=('BSD')
 depends=('llvm' 'libconfig')
 makedepends=('git' 'cmake')
 backup=('etc/ldc2.conf')
-source=(fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch)
-md5sums=('0dacd8e4b8f88030c107dbb2a35bcc42')
+source=()
+md5sums=()
 
 _gitroot=git://github.com/ldc-developers/ldc.git
 _gitname=ldc
@@ -38,9 +38,6 @@ build() {
   git clone --recursive "$srcdir/$_gitname" "$srcdir/$_gitname-build"
   cd "$srcdir/$_gitname-build"
 
-  # llvm/Support/IRBuilder.h was relocated in LLVM 3.2
-  patch -Np1 -i "$srcdir/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch"
-
   mkdir build && cd build
   cmake \
       -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/community/ldc/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch b/community/ldc/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch
deleted file mode 100644
index f5977e4a4..000000000
--- a/community/ldc/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 984207e348fe9ef1444cbec897cb8c429859a9c0 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Tue, 25 Dec 2012 04:55:30 +0200
-Subject: [PATCH] Fix llvm/IRBuilder.h include when using LLVM 3.2
-
----
- gen/passes/GarbageCollect2Stack.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gen/passes/GarbageCollect2Stack.cpp b/gen/passes/GarbageCollect2Stack.cpp
-index f20bdd4..9927615 100644
---- a/gen/passes/GarbageCollect2Stack.cpp
-+++ b/gen/passes/GarbageCollect2Stack.cpp
-@@ -27,7 +27,7 @@
- #include "llvm/Intrinsics.h"
- #include "llvm/Support/CallSite.h"
- #include "llvm/Support/CommandLine.h"
--#if LDC_LLVM_VER >= 303
-+#if LDC_LLVM_VER >= 302
- #include "llvm/IRBuilder.h"
- #else
- #include "llvm/Support/IRBuilder.h"
--- 
-1.8.0.2
-
diff --git a/community/leafnode/PKGBUILD b/community/leafnode/PKGBUILD
index 1eb7bf8fb..6e2ce806d 100644
--- a/community/leafnode/PKGBUILD
+++ b/community/leafnode/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=leafnode
 pkgver=1.11.8
-pkgrel=5
+pkgrel=5.1
 pkgdesc="implements a store & forward NNTP proxy (client and server) with IPv4 and IPv6"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://leafnode.sourceforge.net/"
diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD
index 87c697e4d..8c2dd5d96 100644
--- a/community/leptonica/PKGBUILD
+++ b/community/leptonica/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 81033 2012-12-10 15:15:51Z spupykin $
+# $Id: PKGBUILD 87567 2013-04-03 09:46:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Christoph Drexler <chrdr at gmx dot at>
 
 pkgname=leptonica
 pkgver=1.69
-pkgrel=5
+pkgrel=6
 pkgdesc="Software that is broadly useful for image processing and image analysis applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.leptonica.com/"
 license=('custom')
 options=(!libtool)
-depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp=0.2.1')
+depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp')
 source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz)
 md5sums=('d4085c302cbcab7f9af9d3d6f004ab22')
 
diff --git a/community/lgi/PKGBUILD b/community/lgi/PKGBUILD
index 093562a04..30fb56785 100644
--- a/community/lgi/PKGBUILD
+++ b/community/lgi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81847 2013-01-02 00:52:50Z seblu $
+# $Id: PKGBUILD 85686 2013-03-04 23:40:53Z seblu $
 # Maintainer: speps <speps at aur dot archlinux dot org>
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Maintainer: Sébastien Luttringer
 
 pkgbase=lgi
 pkgname=(lua-lgi)
-pkgver=0.6.2
+pkgver=0.7.1
 pkgrel=1
 pkgdesc='Lua bindings for gnome/gobject using gobject-introspection library'
 arch=(i686 x86_64 mips64el)
@@ -13,8 +13,8 @@ license=('custom:MIT')
 depends=('glibc' 'glib2' 'libffi' 'lua' 'gobject-introspection')
 replaces=('lgi')
 conflicts=('lgi')
-source=("https://github.com/downloads/pavouk/lgi/$pkgbase-$pkgver.tar.gz")
-md5sums=('9ae2c0740e9ea536b6b6afacea5bd21b')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/pavouk/$pkgbase/archive/$pkgver.tar.gz")
+md5sums=('de7367aee8e39f7df7c2229675c5ff2d')
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/community/libaccounts-glib/PKGBUILD b/community/libaccounts-glib/PKGBUILD
index b966dc92f..3ed87c459 100644
--- a/community/libaccounts-glib/PKGBUILD
+++ b/community/libaccounts-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 83007 2013-01-26 14:48:10Z bgyorgy $
+# $Id: PKGBUILD 85006 2013-02-26 17:28:47Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=libaccounts-glib
-pkgver=1.6
+pkgver=1.8
 pkgrel=1
 pkgdesc="Glib-based client library for accessing the online accounts database"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('dbus-glib' 'libxml2' 'sqlite3')
 makedepends=('python2-gobject')
 options=('!libtool')
 source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('56a876c15558b894c687c4a0b6fedfc9318f8cd1')
+sha1sums=('5d827392f6da2ff74e342a6b3a50fbe3486b49b0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libaccounts-glib/fix-docdir.patch b/community/libaccounts-glib/fix-docdir.patch
deleted file mode 100644
index a535000ec..000000000
--- a/community/libaccounts-glib/fix-docdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur -i libaccounts-glib-1.3.orig/Makefile.am libaccounts-glib-1.3/Makefile.am
---- libaccounts-glib-1.3.orig/Makefile.am	2012-03-13 15:18:32.000000000 +0100
-+++ libaccounts-glib-1.3/Makefile.am	2012-10-16 21:38:42.156352344 +0200
-@@ -12,7 +12,7 @@
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libaccounts-glib.pc
- 
--libaccountsdocdir = ${prefix}/doc/reference
-+libaccountsdocdir = ${docdir}
- libaccountsdoc_DATA= README COPYING AUTHORS ChangeLog INSTALL NEWS
- 
- backupconfdir = ${prefix}/share/backup-framework/applications
diff --git a/community/libaccounts-glib/make-tests-optional.patch b/community/libaccounts-glib/make-tests-optional.patch
deleted file mode 100644
index a5c3d1ba5..000000000
--- a/community/libaccounts-glib/make-tests-optional.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-commit c34f64423776d214fc5a24b76c7c606119988d7e
-Author: David King <david.king@canonical.com>
-Date:   Mon Oct 22 08:12:40 2012 +0100
-
-    Make tests optional at configure time
-    
-    http://code.google.com/p/accounts-sso/issues/detail?id=124
-
-diff --git a/Makefile.am b/Makefile.am
-index 97979a6..358a923 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,10 @@
--SUBDIRS = libaccounts-glib docs tests tools
-+SUBDIRS = libaccounts-glib docs tools
- if ENABLE_PYTHON
- SUBDIRS += pygobject
- endif
-+if ENABLE_TESTS
-+SUBDIRS += tests
-+endif
- 
- ACLOCAL_AMFLAGS = -I m4
- 
-diff --git a/configure.ac b/configure.ac
-index cbaf8d5..50b95ea 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,7 +22,25 @@ PKG_CHECK_MODULES(
- AC_SUBST(LIBACCOUNTS_CFLAGS)
- AC_SUBST(LIBACCOUNTS_LIBS)
- 
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
-+# Build tests.
-+
-+CHECK_REQUIRED="check >= 0.9.4"
-+
-+AC_ARG_ENABLE([tests],
-+  [AS_HELP_STRING([--disable-tests], [build with testing support disabled])])
-+
-+AS_IF([test "x$enable_tests" != "xno"],
-+  [PKG_CHECK_EXISTS([$CHECK_REQUIRED], [have_check=yes], [have_check=no])],
-+  [have_check=no])
-+
-+AS_IF([test "x$have_check" = "xyes"],
-+  [PKG_CHECK_MODULES([CHECK], [$CHECK_REQUIRED])
-+   AC_SUBST([CHECK_CFLAGS])
-+   AC_SUBST([CHECK_LIBS])],
-+  [AS_IF([test "x$enable_tests" = "xyes"],
-+      [AC_MSG_ERROR([tests enabled but required dependencies were not found])])])
-+
-+AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_check" = "xyes"])
- 
- AC_ISC_POSIX
- AC_PROG_CC
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index db5aa3f..f6c8dbf 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -7,7 +7,7 @@ dist_check_SCRIPTS = \
- check_SCRIPTS = accounts-glib-test.sh
- 
- accounts_glib_testsuite_SOURCES = check_ag.c
--accounts_glib_testsuite_CFLAGS = $(CHECK_FLAGS) -I$(top_srcdir)
-+accounts_glib_testsuite_CFLAGS = $(CHECK_CFLAGS) -I$(top_srcdir)
- accounts_glib_testsuite_LDADD = \
- 	$(CHECK_LIBS) \
- 	$(LIBACCOUNTS_LIBS) \
diff --git a/community/libaccounts-qt/PKGBUILD b/community/libaccounts-qt/PKGBUILD
index eaf192c81..1e372f88d 100644
--- a/community/libaccounts-qt/PKGBUILD
+++ b/community/libaccounts-qt/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 83016 2013-01-26 15:16:16Z bgyorgy $
+# $Id: PKGBUILD 85369 2013-03-01 10:34:56Z andrea $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgbase=libaccounts-qt
 _pkgbase=accounts-qt
 pkgname=('libaccounts-qt' 'libaccounts-qt-doc')
-pkgver=1.4
-pkgrel=1
+pkgver=1.6
+pkgrel=2
 pkgdesc="Qt-based client library for accessing the online accounts database"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/accounts-sso/"
 license=('LGPL')
-depends=('qt' 'libaccounts-glib')
+depends=('qt4' 'libaccounts-glib')
 makedepends=('doxygen' 'graphviz' 'ttf-dejavu')
 options=('!emptydirs')
 source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2)
-sha1sums=('135fdaa766da070b2ad41ff4c33c663f4d321c8e')
+sha1sums=('bd2c02b747384d53b75767c18b1e026bcf2211c5')
 
 build() {
   cd "$srcdir/$_pkgbase-$pkgver"
diff --git a/community/libalkimia/PKGBUILD b/community/libalkimia/PKGBUILD
index fd6c170ac..107e048ee 100644
--- a/community/libalkimia/PKGBUILD
+++ b/community/libalkimia/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libalkimia
 pkgver=4.3.2
-pkgrel=1
+pkgrel=1.1
 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/libbsd/LICENSE b/community/libbsd/LICENSE
deleted file mode 100644
index 7dcbfc2ba..000000000
--- a/community/libbsd/LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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/community/libbsd/PKGBUILD b/community/libbsd/PKGBUILD
deleted file mode 100644
index 60a62913c..000000000
--- a/community/libbsd/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 75426 2012-08-23 01:07:04Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-
-pkgname=libbsd
-pkgver=0.4.2
-pkgrel=1
-pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://libbsd.freedesktop.org"
-license=('custom')
-depends=('glibc')
-source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.gz)
-md5sums=('591fc9de4ca22f78cf87a94e648a92f4')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD
index 2e45d9b3f..63dd754c4 100644
--- a/community/libcec/PKGBUILD
+++ b/community/libcec/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 83326 2013-01-29 17:19:32Z spupykin $
+# $Id: PKGBUILD 85975 2013-03-10 17:23:41Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: Philippe Cherel <philippe.cherel@mayenne.org>
+# vim: ft=sh:
 
 pkgname=libcec
-pkgver=2.0.5
+pkgver=2.1.1
 pkgrel=1
 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,9 +12,9 @@ url="https://github.com/Pulse-Eight/libcec"
 license=('GPL')
 depends=('udev' 'lockdev')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver")
-_srcfolder=Pulse-Eight-libcec-e1599e0
+_srcfolder=Pulse-Eight-libcec-605d913
 options=(!libtool)
-sha256sums=('83d99cf759531d8c8a217f360f4748159cb9cedac98d77a4615450bad6d570c4')
+sha256sums=('085cabf38bbe82c0a1c78fc4a0cc318b3c4f5fadae325b3d648821d2a4bf694d')
 
 build() {
   mv "$_srcfolder" "$pkgname-$pkgver"
diff --git a/community/libcoverart/PKGBUILD b/community/libcoverart/PKGBUILD
new file mode 100644
index 000000000..1a2a6cfc4
--- /dev/null
+++ b/community/libcoverart/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 87381 2013-03-30 13:00:20Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=libcoverart
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="C/C++ library for accessing the MusicBrainz Cover Art Archive"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://musicbrainz.org/doc/libcoverart"
+license=('LGPL')
+depends=('neon' 'jansson')
+makedepends=('cmake')
+source=(https://github.com/downloads/metabrainz/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('6380056bb4bc1a69790e706b4d506f50')
+
+build() {
+  cd "$srcdir/$pkgname-{PROJECT_VERSION}"
+
+  cmake . \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-{PROJECT_VERSION}"
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/libcryptui/PKGBUILD b/community/libcryptui/PKGBUILD
index 335780a1d..c2b8d28ab 100644
--- a/community/libcryptui/PKGBUILD
+++ b/community/libcryptui/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 77551 2012-10-12 03:46:14Z bgyorgy $
+# $Id: PKGBUILD 87353 2013-03-30 10:43:50Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=libcryptui
-pkgver=3.6.0
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="Library for OpenPGP prompts"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://git.gnome.org/browse/libcryptui/"
 license=('GPL')
-depends=('gtk3' 'libsm' 'gpgme' 'dbus-glib' 'libnotify' 'libgnome-keyring' 'dconf')
+depends=('gtk3' 'gpgme' 'dbus-glib' 'libnotify' 'libgnome-keyring' 'dconf')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0a4a747fff33acd03d1381d27454f8aa5eaca026b7475e24c4b8f8272bbe1c87')
+sha256sums=('10eed96e33b6d7286795a7c678a5655a86ae099fb98d1f7211aa28aa636c0837')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libcss/PKGBUILD b/community/libcss/PKGBUILD
index db7543522..05a2b7e1c 100644
--- a/community/libcss/PKGBUILD
+++ b/community/libcss/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 70921 2012-05-19 18:26:38Z arodseth $
+# $Id: PKGBUILD 89131 2013-04-27 00:42:21Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=libcss
-pkgver=0.1.2
-pkgrel=2
-pkgdesc="CSS parser and selection engine"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.netsurf-browser.org/projects/libcss/"
+pkgver=0.2.0
+pkgrel=1
+pkgdesc='CSS parser and selection engine'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.netsurf-browser.org/projects/libcss/'
 license=('MIT')
-depends=('libparserutils>=0.1.1' 'libwapcaplet>=0.1.1')
+depends=('libparserutils>=0.1.2' 'libwapcaplet>=0.2.0')
+makedepends=('netsurf-buildsystem')
 source=("http://download.netsurf-browser.org/libs/releases/libcss-$pkgver-src.tar.gz")
-sha256sums=('92c112a059bc5ae490392439401005b47ca5c270f891f6317b64aac738ae1f5e')
+sha256sums=('31b08f6f2259366ccad8b455440f364dc33e7dc78cdb0cf4905da56d5372f613')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libdbi-drivers/PKGBUILD b/community/libdbi-drivers/PKGBUILD
index 142ee9da8..573816667 100644
--- a/community/libdbi-drivers/PKGBUILD
+++ b/community/libdbi-drivers/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 64177 2012-02-09 17:50:10Z ttopper $
+# $Id: PKGBUILD 87120 2013-03-27 15:21:01Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Olivier Médoc <o_medoc@yahoo.fr>
 # Contributor: Ashok `ScriptDevil` Gautham <ScriptDevil.Arch@gmail.com>
 
 pkgname=libdbi-drivers
-pkgver=0.8.3_1
-_pkgver=0.8.3-1
-pkgrel=3
+pkgver=0.9.0
+pkgrel=1
 pkgdesc="Database drivers for libdbi (MySQL, PostgreSQL, and SQLite)"
 url="http://libdbi-drivers.sourceforge.net/"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libdbi')
-makedepends=('postgresql-libs' 'libmysqlclient' 'sqlite2' 'sqlite3')
+makedepends=('postgresql-libs' 'libmariadbclient' 'sqlite2' 'sqlite')
 optdepends=("postgresql-libs: To work with postgresql using libdbdpgsql "
 			"sqlite3: To work with sqlite3 using libdbdsqlite3"
-			"libmysqlclient: To work with mysql using libdbdmysql"
+			"libmariadbclient: To work with mysql using libdbdmysql"
 			"sqlite2: To work with sqlite2 using libdbdsqlite")
 options=(!libtool)
 install=libdbi-drivers.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}/${pkgname}-${_pkgver}/${pkgname}-${_pkgver}.tar.gz")
-md5sums=('4de79b323162a5a7652b65b608eca6cd')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('8472875d30c216540d48d591b442e40ba4f7df5d')
 
 build() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
   	--disable-docs \
   	--with-libdbi \
@@ -35,7 +34,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR=${pkgdir} install
 }
 
diff --git a/community/libdbi/PKGBUILD b/community/libdbi/PKGBUILD
index 33d422607..0959bad92 100644
--- a/community/libdbi/PKGBUILD
+++ b/community/libdbi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59571 2011-11-28 08:58:19Z ttopper $
+# $Id: PKGBUILD 87114 2013-03-27 13:46:18Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Carl Flippin <carlf@photocarl.org>
 
 pkgname=libdbi
-pkgver=0.8.4
-pkgrel=2
+pkgver=0.9.0
+pkgrel=1
 pkgdesc="A database independant abstraction layer for C"
 url="http://libdbi.sourceforge.net"
 license=('LGPL')
@@ -13,7 +13,7 @@ depends=('glibc')
 options=(!libtool)
 install=libdbi.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('c5f15407ef7b07ba854cd8c9b15b88ff')
+sha1sums=('6c1ecfb78f43a921d5f914299304bd6c82cb0e23')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/libdlna/ffmpeg-0.8.patch b/community/libdlna/ffmpeg-0.8.patch
deleted file mode 100644
index 63b33a451..000000000
--- a/community/libdlna/ffmpeg-0.8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -aur libdlna-0.2.3/src/profiles.c libdlna-0.2.3.new/src/profiles.c
---- libdlna-0.2.3/src/profiles.c	2007-11-26 21:47:43.000000000 +0100
-+++ libdlna-0.2.3.new/src/profiles.c	2011-10-31 16:06:34.000000000 +0100
-@@ -205,13 +205,13 @@
-   for (i = 0; i < ctx->nb_streams; i++)
-   {
-     if (audio_stream == -1 &&
--        ctx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
-+        ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
-     {
-       audio_stream = i;
-       continue;
-     }
-     else if (video_stream == -1 &&
--             ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO)
-+             ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
-     {
-       video_stream = i;
-       continue;
diff --git a/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch b/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch
deleted file mode 100644
index 8620ab2eb..000000000
--- a/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=297872
-http://hg.geexbox.org/libdlna/raw-rev/4113a728a2ca
-
-From 81130b9ade274bfc53900999ccc6f963ae9ce9d7 Mon Sep 17 00:00:00 2001
-From: Jeremy Olexa <darkside@gentoo.org>
-Date: Tue, 22 Dec 2009 00:22:42 -0600
-Subject: [PATCH] Update reference to ffmpeg header files
-
----
- configure             |    4 ++--
- src/av_mpeg4_part10.c |    2 +-
- src/av_mpeg4_part2.c  |    2 +-
- src/containers.c      |    2 +-
- src/profiles.h        |    4 ++--
- 5 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/configure b/configure
-index 8acbd9d..85c1091 100755
---- a/configure
-+++ b/configure
-@@ -610,9 +610,9 @@ if [ -n "$ffmpegdir" ]; then
- fi
- 
- echolog "Checking for libavformat ..."
--check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
-+check_lib libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
- echolog "Checking for libavcodec ..."
--check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
-+check_lib libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
- 
- #################################################
- #   version
-diff --git a/src/av_mpeg4_part10.c b/src/av_mpeg4_part10.c
-index bd17022..f9c8ee5 100644
---- a/src/av_mpeg4_part10.c
-+++ b/src/av_mpeg4_part10.c
-@@ -26,7 +26,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- 
- #include "dlna_internals.h"
- #include "profiles.h"
-diff --git a/src/av_mpeg4_part2.c b/src/av_mpeg4_part2.c
-index 0148384..823e1b6 100644
---- a/src/av_mpeg4_part2.c
-+++ b/src/av_mpeg4_part2.c
-@@ -26,7 +26,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- 
- #include "dlna_internals.h"
- #include "profiles.h"
-diff --git a/src/containers.c b/src/containers.c
-index 71b51f7..ca0819b 100644
---- a/src/containers.c
-+++ b/src/containers.c
-@@ -4,7 +4,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
--#include <ffmpeg/avformat.h>
-+#include <libavformat/avformat.h>
- 
- #include "containers.h"
- #include "profiles.h"
-diff --git a/src/profiles.h b/src/profiles.h
-index 7b86d33..a7fc0fd 100644
---- a/src/profiles.h
-+++ b/src/profiles.h
-@@ -22,8 +22,8 @@
- #ifndef _PROFILES_H_
- #define _PROFILES_H_
- 
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
- 
- #include "dlna_internals.h"
- #include "containers.h"
--- 
-1.6.4.4
-
diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD
index c7dd280e1..2ba06e4b6 100644
--- a/community/libdnet/PKGBUILD
+++ b/community/libdnet/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libdnet
 pkgver=1.12
-pkgrel=6
+pkgrel=6.1
 pkgdesc="A simplified, portable interface to several low-level networking routines"
 arch=(i686 x86_64 'mips64el')
 makedepends=(python2)
@@ -17,7 +17,7 @@ md5sums=('9253ef6de1b5e28e9c9a62b882e44cc9')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.in
   autoreconf -I config --force --install
   ./configure --prefix=/usr
   make
diff --git a/community/libdom/PKGBUILD b/community/libdom/PKGBUILD
new file mode 100644
index 000000000..0ee76677c
--- /dev/null
+++ b/community/libdom/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 89135 2013-04-27 01:19:34Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+
+pkgname=libdom
+pkgver=0.0.1
+pkgrel=1
+pkgdesc='Implementation of the W3C DOM'
+arch=('x86_64' 'i686')
+url='http://www.netsurf-browser.org/projects/libdom/'
+license=('MIT')
+depends=('hubbub>=0.2.0' 'libwapcaplet>=0.2.0' 'expat')
+makedepends=('netsurf-buildsystem')
+source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz")
+sha256sums=('2aa75861c8a8291b6b3d1a3856c65ca615677afeec64ccfdf35a113a292c36b1')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  
+  export CFLAGS="-Wno-error=unused-but-set-variable"
+  make PREFIX=/usr COMPONENT_TYPE="lib-shared"
+  make PREFIX=/usr COMPONENT_TYPE="lib-static"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  
+  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared"
+  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/libee/PKGBUILD b/community/libee/PKGBUILD
index bea44e452..133b11128 100644
--- a/community/libee/PKGBUILD
+++ b/community/libee/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libee
 pkgver=0.4.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="event expression library inspired by CEE"
 url="http://www.libee.org/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/libestr/PKGBUILD b/community/libestr/PKGBUILD
index d779bb0f1..69b5a4d80 100644
--- a/community/libestr/PKGBUILD
+++ b/community/libestr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 76517 2012-09-21 10:06:06Z spupykin $
+# $Id: PKGBUILD 88518 2013-04-19 10:30:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Brian Knox <taotetek@gmail.com>
 
 pkgname=libestr
-pkgver=0.1.4
+pkgver=0.1.5
 pkgrel=1
 pkgdesc="essentials for string handling (and a bit more)"
 url="http://libestr.adiscon.com/"
@@ -12,7 +12,7 @@ license=('LGPL2.1')
 depends=()
 options=(!libtool)
 source=("http://libestr.adiscon.com/files/download/libestr-$pkgver.tar.gz")
-md5sums=('ee3ff39f421f47b2a9551a7f9011d084')
+md5sums=('f180c0cdc82883d161eba3f2e8a34eb4')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/libexosip2/PKGBUILD b/community/libexosip2/PKGBUILD
index 3b9916ac0..c56473b94 100644
--- a/community/libexosip2/PKGBUILD
+++ b/community/libexosip2/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 61348 2011-12-28 15:42:18Z spupykin $
+# $Id: PKGBUILD 88347 2013-04-16 14:01:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=libexosip2
+epoch=1
 pkgver=3.6.0
 pkgrel=1
 pkgdesc="A library that hides the complexity of using SIP for multimedia session establishement"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://savannah.nongnu.org/projects/exosip/"
 license=('GPL')
-depends=('libosip2>=3.6.0' 'openssl')
+depends=('libosip2>=4.0.0' 'openssl')
 options=(!libtool)
 source=(http://download.savannah.nongnu.org/releases/exosip/libeXosip2-${pkgver/_/-}.tar.gz)
 md5sums=('6fef4c110f1305048a8b307f440933d9')
diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD
index 99c911799..4832ce7c8 100644
--- a/community/libextractor/PKGBUILD
+++ b/community/libextractor/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 78771 2012-10-24 12:21:52Z spupykin $
+# $Id: PKGBUILD 85587 2013-03-03 17:28:54Z dreisner $
 # Maintainer: Sergej Pupykin <pupykin.s@gmail.com>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=libextractor
 pkgver=1.0.1
-pkgrel=2
+pkgrel=4
 pkgdesc="A library used to extract meta-data from files of arbitrary type"
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
 url="http://gnunet.org/libextractor/"
 depends=('libltdl')
-makedepends=('flac' 'poppler' 'exiv2' 'qt' 'libvorbis' 'gtk2' 'libgsf' 'libmpeg2')
+makedepends=('flac' 'poppler' 'exiv2' 'qt4' 'libvorbis' 'gtk2' 'libgsf' 'libmpeg2')
 optdepends=('flac: flac support'
 	    'poppler: pdf support'
 	    'exiv2: metadata support'
diff --git a/community/libfakekey/PKGBUILD b/community/libfakekey/PKGBUILD
index 8e19da917..708f37af1 100644
--- a/community/libfakekey/PKGBUILD
+++ b/community/libfakekey/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libfakekey
 pkgver=0.1
-pkgrel=5
+pkgrel=5.1
 pkgdesc='X virtual keyboard library.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://matchbox-project.org/'
diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD
index 0d7520599..44cb112af 100644
--- a/community/libfbclient/PKGBUILD
+++ b/community/libfbclient/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82686 2013-01-23 00:15:55Z eric $
+# $Id: PKGBUILD 88481 2013-04-18 13:13:14Z lcarlier $
 # Maintainer: Carlier Laurent <lordheavym@gmail.com>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgname=libfbclient
-pkgver=2.5.2.26539
-pkgrel=2
+pkgver=2.5.2.26540
+pkgrel=1
 pkgdesc="Client library for Firebird."
 arch=('i686' 'x86_64')
 url="http://www.firebirdsql.org/"
@@ -13,7 +13,7 @@ depends=('gcc-libs' 'icu')
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/firebird/Firebird-$pkgver-0.tar.bz2
         LICENSE)
-md5sums=('adf2d2f9d48a53dc6c490ba1e44631fd'
+md5sums=('21154d2004e025c8a3666625b0357bb5'
          '0d61798861e159c85dbdf0f30fe2f2ce')
 
 build() {
diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD
index 113c5ab6b..71186aad9 100644
--- a/community/libfm/PKGBUILD
+++ b/community/libfm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80049 2012-11-15 19:06:07Z bpiotrowski $
+# $Id: PKGBUILD 87492 2013-04-01 17:16:51Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Unknown47 <unknown47r@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=libfm
 pkgver=1.1.0
-pkgrel=3.1
+pkgrel=4
 pkgdesc='Library for file management'
 url='http://pcmanfm.sourceforge.net/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ license=('GPL')
 groups=('lxde')
 options=('!libtool')
 install=libfm.install
-depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils' 'vala')
+depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils')
 source=(http://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.gz)
 md5sums=('a5bc8b8291cf810c659bfb3af378b5de')
 
@@ -33,6 +33,6 @@ package() {
   make DESTDIR=$pkgdir install
 
   # Temporary fix to FS#32361
-  rm $pkgdir/usr/include/libfm
+  rm -r $pkgdir/usr/include/libfm
   mv $pkgdir/usr/include/libfm-1.0/ $pkgdir/usr/include/libfm 
 }
diff --git a/community/libgda4/PKGBUILD b/community/libgda4/PKGBUILD
deleted file mode 100644
index 080555e83..000000000
--- a/community/libgda4/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 57409 2011-10-27 03:51:27Z ebelanger $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=libgda4
-pkgver=4.2.10
-pkgrel=1
-pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtksourceview2' 'libunique' 'libxslt' 'libsoup'
-         'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring'
-         'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('intltool' 'gobject-introspection' )
-options=('!libtool')
-url="http://www.gnome-db.org"
-install=libgda.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/libgda/${pkgver%.*}/libgda-${pkgver}.tar.xz)
-sha256sums=('cfaf228c62fbdb461c3bfedad919d5dfeb6a2e624c223910e275a53b97d3a431')
-
-build() {
-  cd "${srcdir}/libgda-${pkgver}"
-  sed -i '1s/python$/&2/' libgda-report/RML/trml*/trml*.py
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --with-bdb=/usr --with-bdb-libdir-name=lib \
-      --disable-static \
-      --disable-gtk-doc 
-  make
-}
-
-package() {
-  cd "${srcdir}/libgda-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "$pkgdir/usr/share/icons"
-  rm -rf "$pkgdir/usr/share/gtk-doc"
-  rm -rf "$pkgdir"/usr/bin/{gda-list-config,gda-list-server-op,gda-sql}
-  rm -rf "$pkgdir"/usr/share/man/man1/gda-sql.1
-}
diff --git a/community/libgda4/libgda.install b/community/libgda4/libgda.install
deleted file mode 100644
index eb5d48353..000000000
--- a/community/libgda4/libgda.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/libgda-4.0/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community/libgdamm/PKGBUILD b/community/libgdamm/PKGBUILD
index d9e1dd036..8c8a70e8f 100644
--- a/community/libgdamm/PKGBUILD
+++ b/community/libgdamm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59045 2011-11-20 22:55:36Z heftig $
+# $Id: PKGBUILD 87026 2013-03-25 19:19:10Z bpiotrowski $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Jan de Groot <jan@jgc.homeip.net>
 
 pkgbase=libgdamm
 pkgname=(libgdamm libgdamm-docs)
 pkgver=4.99.6
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('libgda' 'libsigc++' 'glibmm' 'glibmm-docs')
 url="http://www.gtkmm.org/"
diff --git a/community/libgexiv2/PKGBUILD b/community/libgexiv2/PKGBUILD
index e44c6fb7c..6b5759978 100644
--- a/community/libgexiv2/PKGBUILD
+++ b/community/libgexiv2/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 81868 2013-01-02 15:41:00Z jelle $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 87061 2013-03-26 15:12:47Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libgexiv2
-pkgver=0.5.0
+pkgver=0.6.1
 pkgrel=1
-pkgdesc="GObject-based wrapper around the Exiv2 library."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://redmine.yorba.org/projects/gexiv2"
+pkgdesc='GObject-based wrapper around the Exiv2 library'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://redmine.yorba.org/projects/gexiv2'
 license=('GPL2')
-depends=('exiv2' 'glib2')
+depends=('exiv2' 'gobject-introspection')
 options=('!libtool')
-source=("http://yorba.org/download/gexiv2/0.5/$pkgname-$pkgver.tar.xz")
-md5sums=('655528168648fd681a061bddaabc79ee')
+source=("http://yorba.org/download/gexiv2/${pkgver%.1}/${pkgname}_$pkgver.tar.xz")
+sha256sums=('72ee2fcc6a98c9e83467adea45b10d1b61c55654c204dcce9c2463615389a9e3')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --enable-introspection
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/libgit2/PKGBUILD b/community/libgit2/PKGBUILD
index 3a093b9af..07d9ad5bb 100644
--- a/community/libgit2/PKGBUILD
+++ b/community/libgit2/PKGBUILD
@@ -1,27 +1,33 @@
-# $Id$
+# $Id: PKGBUILD 88415 2013-04-17 09:17:05Z thestinger $
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 # Contributor: Hilton Medeiros <medeiros.hilton@gmail.com>
 # Contributor: Dave Reisner <d@falconindy.com>
 
 pkgname=libgit2
-pkgver=0.17.0
-pkgrel=2
+pkgver=0.18.0
+pkgrel=1
 pkgdesc="A linkable library for Git"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libgit2.github.com/"
-depends=('zlib')
+depends=(zlib openssl)
 makedepends=(cmake python)
 license=('GPL2')
 source=("src-$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/tarball/v$pkgver")
-md5sums=('5a09dd1118d1354375407119d19e0f2c')
+md5sums=('50409ddb0c34713677b33ef617e92c94')
 
 build() {
-  cd "$srcdir"/$pkgname-*
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+  cd $pkgname-*
+  export LANG=en_US.UTF-8
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DTHREADSAFE=ON
   make
 }
 
+check() {
+  cd $pkgname-*
+  make test
+}
+
 package() {
-  cd "$srcdir"/$pkgname-*
+  cd $pkgname-*
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/libgnome-media-profiles/PKGBUILD b/community/libgnome-media-profiles/PKGBUILD
new file mode 100644
index 000000000..6fc7c2a8f
--- /dev/null
+++ b/community/libgnome-media-profiles/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 87928 2013-04-08 18:08:07Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=libgnome-media-profiles
+pkgver=3.0.0
+pkgrel=4
+pkgdesc="Library for management of audio recording profiles"
+arch=('i686' 'x86_64')
+url="https://git.gnome.org/browse/libgnome-media-profiles"
+license=('GPL2')
+depends=('gconf' 'gtk3' 'gstreamer0.10-base-plugins')
+makedepends=('intltool' 'gnome-doc-utils')
+options=('!libtool')
+install=$pkgname.install
+source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('ab1288e53a8fccca3e8fa59757ef586901e236e09a737a1178eeb8d74428c061')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --disable-static --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/libgnome-media-profiles/libgnome-media-profiles.install b/community/libgnome-media-profiles/libgnome-media-profiles.install
new file mode 100644
index 000000000..1c2bfeac0
--- /dev/null
+++ b/community/libgnome-media-profiles/libgnome-media-profiles.install
@@ -0,0 +1,21 @@
+pkgname=gnome-media-profiles
+
+post_install(){
+    usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+    pre_remove $1
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+pre_remove() {
+    if [ "$(vercmp 3.0.0-4 "$2")" -eq 1 ]; then
+      usr/sbin/gconfpkg --uninstall libgnome-media-profiles
+    else
+      usr/sbin/gconfpkg --uninstall ${pkgname}
+    fi
+}
diff --git a/community/libgoom2/PKGBUILD b/community/libgoom2/PKGBUILD
index c7725410f..a50c3ad34 100644
--- a/community/libgoom2/PKGBUILD
+++ b/community/libgoom2/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libgoom2
 pkgver=2k4
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="Shared library part of the Goom visualization plugin"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fovea.cc/?page=details_produits&id=goom"
diff --git a/community/libgtksourceviewmm2/PKGBUILD b/community/libgtksourceviewmm2/PKGBUILD
index ad2ea0a95..6c710e88a 100644
--- a/community/libgtksourceviewmm2/PKGBUILD
+++ b/community/libgtksourceviewmm2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 63642 2012-02-05 12:02:56Z ibiru $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
+# $Id: PKGBUILD 88627 2013-04-20 17:41:57Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.orgg>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=libgtksourceviewmm2
-pkgver=2.10.1
-pkgrel=2.1
+pkgver=2.10.3
+pkgrel=1
 pkgdesc='A C++ API for gtksourceview2'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://projects.gnome.org/gtksourceviewmm/'
@@ -12,14 +12,11 @@ license=('LGPL')
 depends=('gtkmm' 'gtksourceview2')
 makedepends=('doxygen' 'glibmm-docs')
 options=('!libtool' '!emptydirs')
-source=("http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/2.10/gtksourceviewmm-$pkgver.tar.bz2"
-	"libgtksourceviewmm2-2.10.1-glib.patch")
-md5sums=('83d1b3dc061f02f4ff1766b37302058e'
-	 '266f8102e5cc4727ca565796f0254f76')
+source=(http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/2.10/gtksourceviewmm-$pkgver.tar.xz)
+sha256sums=('0000df1b582d7be2e412020c5d748f21c0e6e5074c6b2ca8529985e70479375b')
 
 build() {
   cd gtksourceviewmm-${pkgver}
-  patch -Np1 -i ${srcdir}/libgtksourceviewmm2-2.10.1-glib.patch
   ./configure \
     --prefix=/usr
 
diff --git a/community/libhx/PKGBUILD b/community/libhx/PKGBUILD
index e43bb8af0..782cd278a 100644
--- a/community/libhx/PKGBUILD
+++ b/community/libhx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80149 2012-11-16 20:29:24Z spupykin $
+# $Id: PKGBUILD 89905 2013-05-05 14:47:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Max Roder <maxroder@web.de>
 # Contributor: Nathan Owe <ndowens.aur at gmail dot com>
 
 pkgname='libhx'
-pkgver=3.14
+pkgver=3.15
 pkgrel=1
 pkgdesc='A library providing queue, tree, I/O and utility functions'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=()
 options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/libHX-${pkgver}.tar.xz")
-md5sums=('a2a2dd32aaff33234e53517c6afd694a')
+md5sums=('0165d6aa994a094b2a170d93a48599e0')
 
 build() {
   cd ${srcdir}/libHX-${pkgver}
diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD
index 420451b09..fa37455c0 100644
--- a/community/libinfinity/PKGBUILD
+++ b/community/libinfinity/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69176 2012-04-10 00:10:15Z spupykin $
+# $Id: PKGBUILD 89907 2013-05-05 14:48:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Gregory Haynes <greg@greghaynes.net>
 
 pkgname=libinfinity
-pkgver=0.5.2
+pkgver=0.5.3
 pkgrel=1
 pkgdesc="An implementation of the Infininote protocol written in GObject-based C"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ optdepends=('avahi: zeroconf support'
             'gtk2: gtk support')
 options=('!libtool')
 source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1b2eee8150654baa7bba5900b96ffdc3')
+md5sums=('1a784b00fe26c6984c03cd5a09eb2cd6')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/liblockfile/PKGBUILD b/community/liblockfile/PKGBUILD
index 9429a7d50..a44fb49d3 100644
--- a/community/liblockfile/PKGBUILD
+++ b/community/liblockfile/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=liblockfile
 pkgver=1.08_4
 _basever=1.08
-pkgrel=2
+pkgrel=2.1
 pkgdesc="a library with NFS-safe locking functions"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/community/libmaa/PKGBUILD b/community/libmaa/PKGBUILD
index ea5a4e14e..1537dc611 100644
--- a/community/libmaa/PKGBUILD
+++ b/community/libmaa/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 1528 2009-08-25 09:47:25Z spupykin $
+# $Id: PKGBUILD 88315 2013-04-16 13:28:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libmaa
-pkgver=1.3.1
+pkgver=1.3.2
 pkgrel=1
 pkgdesc="Provides many low-level data structures which are helpful for writing compilers"
 url="http://sourceforge.net/projects/dict/"
@@ -12,7 +12,7 @@ depends=('glibc')
 makedepends=('flex')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/dict/${pkgname}-${pkgver}.tar.gz")
-md5sums=('04fcb72e8767c0795059bf397f5a0355')
+md5sums=('01dab2cde2e0a322653e45bfa63537ee')
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
diff --git a/community/libmatchbox/PKGBUILD b/community/libmatchbox/PKGBUILD
index 6eed5ba11..2bb4f119a 100644
--- a/community/libmatchbox/PKGBUILD
+++ b/community/libmatchbox/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id: PKGBUILD 63648 2012-02-05 12:03:24Z ibiru $
+# $Id: PKGBUILD 88317 2013-04-16 13:28:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com>
 
 pkgname=libmatchbox
-pkgver=1.9
-pkgrel=5
+pkgver=1.10
+pkgrel=1
 pkgdesc="Base library for Matchbox WM"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('pango' 'libpng' 'libjpeg>=7' 'xsettings-client' 'libxext')
 options=('!libtool')
 url="http://matchbox-project.org/"
-source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2
-	libpng15.patch)
-md5sums=('9f73e7515cc4679171a5db180dc1343b'
-         '09f782c76fe313efd0e87fabb276e2fe')
+source=(http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$pkgver/libmatchbox-$pkgver.tar.gz)
+md5sums=('042c5874631dfb95151aa793dc1434b8')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|png_check_sig( header, 8 )|png_sig_cmp( header, 0, 8 ) == 0|' libmb/mbpixbuf.c
-  patch -Rp1 <$srcdir/libpng15.patch
+#  sed -i 's|png_check_sig( header, 8 )|png_sig_cmp( header, 0, 8 ) == 0|' libmb/mbpixbuf.c
+#  patch -Rp1 <$srcdir/libpng15.patch
   LDFLAGS="-lX11" ./configure --prefix=/usr --enable-pango --enable-jpeg --enable-xsettings
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/libmatio/PKGBUILD b/community/libmatio/PKGBUILD
index df42830cd..308190675 100644
--- a/community/libmatio/PKGBUILD
+++ b/community/libmatio/PKGBUILD
@@ -1,27 +1,34 @@
-# $Id: PKGBUILD 70169 2012-05-01 11:20:31Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 88815 2013-04-23 01:03:57Z eric $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=libmatio
-pkgver=1.5.0
+pkgver=1.5.1
 pkgrel=1
-pkgdesc="A C library with a fortran 90/95 module interface for reading/writing MATLAB MAT-files"
-arch=('i686' 'x86_64' 'mips64el')
+pkgdesc='C library with a fortran 90/95 module interface for reading/writing MATLAB MAT-files'
+arch=('x86_64' 'i686' 'mips64el')
 license=('LGPL')
-url="http://sourceforge.net/projects/matio"
+url='http://sourceforge.net/projects/matio'
 depends=('zlib')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/matio/matio-$pkgver.tar.gz")
-sha1sums=('70dbf09984ade6adfb38c1b62ae5585ff7f85e05')
+options=('!libtool' '!emptydirs')
+source=("http://downloads.sourceforge.net/matio/matio-$pkgver.tar.bz2")
+sha1sums=('12b8ed59688b2f41903ddc3e7975f21f10fe42bb')
 
 build() {
-  cd "${srcdir}"/matio-$pkgver
+  cd matio-$pkgver
   ./configure --prefix=/usr --enable-shared 
   make
 }
+
+check() {
+  cd matio-$pkgver
+  make check
+}
  
 package() {
-  cd "${srcdir}"/matio-$pkgver
-  make DESTDIR="${pkgdir}" install
+  cd matio-$pkgver
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD
index 0522a68cb..81d516f9f 100644
--- a/community/libmediainfo/PKGBUILD
+++ b/community/libmediainfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 78757 2012-10-24 10:01:02Z spupykin $
+# $Id: PKGBUILD 84838 2013-02-25 10:38:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  hydro <hydro@freenet.de>
 
 pkgname=libmediainfo
-pkgver=0.7.61
+pkgver=0.7.62
 pkgrel=1
 pkgdesc="shared library for mediainfo"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('libtool' 'automake' 'autoconf')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2
 	libmediainfo-0.7.50-libmms.patch)
-md5sums=('371519c1c24e4de84448d6624fc41aa8'
+md5sums=('df890b982250711055f5cb6d948251bb'
          '2f4b21cc250f663d52b497dedb963e3b')
 
 build() {
diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD
index 6de777534..47a902e6c 100644
--- a/community/libmicrohttpd/PKGBUILD
+++ b/community/libmicrohttpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83879 2013-02-06 10:39:46Z spupykin $
+# $Id: PKGBUILD 89934 2013-05-05 21:30:28Z 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.25
+pkgver=0.9.27
 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=('4f3b8ccd50e7133283f2aec5cc21620f')
+md5sums=('a10496b7f1b495aaf6897584da52f51b')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -32,6 +32,6 @@ package() {
 	${pkgdir}/usr/include/$pkgname/platform.h
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/plibc/plibc.h \
 	${pkgdir}/usr/include/$pkgname/plibc.h
-  sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' \
+  sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I${includedir}/libmicrohttpd#' \
 	$pkgdir/usr/lib/pkgconfig/libmicrohttpd.pc
 }
diff --git a/community/libmilter/PKGBUILD b/community/libmilter/PKGBUILD
index 3d842fb77..6256f409f 100644
--- a/community/libmilter/PKGBUILD
+++ b/community/libmilter/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 60205 2011-12-07 15:22:36Z spupykin $
+# $Id: PKGBUILD 88321 2013-04-16 13:29:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: mutantmonkey <mutantmonkey@gmail.com>
 
 pkgname=libmilter
-pkgver=8.14.5
+pkgver=8.14.6
 pkgrel=1
 pkgdesc="libmilter"
 arch=(i686 x86_64)
 url="http://www.postfix.org/MILTER_README.html"
 license=('custom:Sendmail open source license')
 source="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${pkgver}.tar.gz"
-md5sums=('02ccfc331cc81ed00ec8bb5ecfc69018')
+md5sums=('9eeed3d1baecbf4e17d829d2ec005553')
 
 build(){
   cd "${srcdir}/sendmail-${pkgver}"
diff --git a/community/libnetfilter_acct/PKGBUILD b/community/libnetfilter_acct/PKGBUILD
index c2b21f98c..55ca10d73 100644
--- a/community/libnetfilter_acct/PKGBUILD
+++ b/community/libnetfilter_acct/PKGBUILD
@@ -1,13 +1,13 @@
 # $Id: PKGBUILD 71613 2012-05-31 08:51:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Maintainer: Sébastien Luttringer
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 # Maintainer: Filip Wojciechowski, filip at loka dot pl
 
 pkgname=libnetfilter_acct
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=1
-pkgdesc='userspace library providing interface to extended accounting infrastructure'
+pkgdesc='Library providing interface to extended accounting infrastructure'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.netfilter.org/projects/libnetfilter_acct/index.html"
 license=('GPL')
@@ -15,7 +15,7 @@ depends=('libnfnetlink' 'libmnl')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('4755429cbd46ad0ed32bb30f84da0dee')
+md5sums=('2118d9514c079839ebd9cb3144ad2ad7')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/libnetfilter_conntrack/PKGBUILD b/community/libnetfilter_conntrack/PKGBUILD
index 84a8ced75..e8a8431ad 100644
--- a/community/libnetfilter_conntrack/PKGBUILD
+++ b/community/libnetfilter_conntrack/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 77383 2012-10-09 10:14:26Z seblu $
+# $Id: PKGBUILD 85675 2013-03-04 19:37:18Z seblu $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Maintainer: Sébastien Luttringer
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=libnetfilter_conntrack
-pkgver=1.0.2
+pkgver=1.0.3
 pkgrel=1
 pkgdesc='Library providing an API to the in-kernel connection tracking state table'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ url='http://www.netfilter.org/projects/libnetfilter_conntrack/'
 license=('GPL')
 options=('!libtool')
 source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('447114b5d61bb9a9617ead3217c3d3ff')
+md5sums=('73394a3d8d0cfecc6abb6027b4792d52')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/libnewt/PKGBUILD b/community/libnewt/PKGBUILD
index 8dc497fb9..356aebee0 100644
--- a/community/libnewt/PKGBUILD
+++ b/community/libnewt/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 81605 2012-12-25 00:34:10Z foutrelis $
+# $Id: PKGBUILD 88638 2013-04-20 19:08:21Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Tom Killian <tomk@runbox.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=libnewt
-pkgver=0.52.12
+pkgver=0.52.15
+pkgrel=1
 _tclver=8.6
-pkgrel=5
 pkgdesc="Not Erik's Windowing Toolkit - text mode windowing with slang"
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.redhat.com/'
+url='https://fedorahosted.org/newt/'
 license=('GPL')
 depends=('slang' 'popt' 'gpm')
 makedepends=("tcl>=$_tclver" 'python2')
@@ -18,15 +18,20 @@ optdepends=('tcl: whiptcl support' \
             'python2: libnewt api through _snack module')
 options=('!makeflags')
 source=("https://fedorahosted.org/releases/n/e/newt/newt-$pkgver.tar.gz")
-sha256sums=('2ba88dc3d118daf509c58e3707c43ad57dd3415d8164054e93fe76439f348529')
+sha256sums=('7a6151923e7a8a950f9a8a21668a5780d09b0f35f9d76a7ec606c71c35a0e241')
 
-build() {
+prepare() {
   cd "$srcdir/newt-$pkgver"
   
   sed -i "s:tcl8.4:tcl$_tclver:" Makefile.in
   sed -i 's:bin/python:bin/python2:' *.py
-  ./configure --prefix=/usr --with-gpm-support
   echo '#define USE_INTERP_RESULT 1' >> config.h
+}
+
+build() {
+  cd "$srcdir/newt-$pkgver"
+
+  ./configure --prefix=/usr --with-gpm-support
   make
 }
 
diff --git a/community/libnfs/PKGBUILD b/community/libnfs/PKGBUILD
index 6f3bbd140..1065c9616 100644
--- a/community/libnfs/PKGBUILD
+++ b/community/libnfs/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 68570 2012-03-28 10:32:51Z idevolder $
+# $Id: PKGBUILD 87823 2013-04-07 09:29:35Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 
 pkgname=libnfs
-pkgver=1.3.0
+pkgver=1.5.0
 pkgrel=1
 pkgdesc="client library for accessing NFS shares"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/sahlberg/libnfs"
 license=('GPL')
 depends=('glibc')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/sahlberg/libnfs/tarball/$pkgname-$pkgver")
-_srcfolder=sahlberg-libnfs-47e5a2c
-sha256sums=('0acda3029db699c3978684080843f71d222ad35b30a2ff0d220d144e98854948')
+source=("https://github.com/downloads/sahlberg/$pkgname/$pkgname-$pkgver.tar.gz")
+#_srcfolder=sahlberg-libnfs-47e5a2c
+sha256sums=('5663355dc18e75c893e09b133ca3ef70cf00754acfea863257f509922b5e5faa')
 options=(!libtool)
 
 build() {
-  mv "$_srcfolder" "$pkgname-$pkgver"
+  #mv "$_srcfolder" "$pkgname-$pkgver"
 
   cd "$pkgname-$pkgver"
 
diff --git a/community/libnsbmp/PKGBUILD b/community/libnsbmp/PKGBUILD
index 87fdc09fb..392c8257d 100644
--- a/community/libnsbmp/PKGBUILD
+++ b/community/libnsbmp/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 59663 2011-11-29 08:59:46Z arodseth $
+# $Id: PKGBUILD 89122 2013-04-26 23:30:55Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
 pkgname=libnsbmp
-pkgver=0.0.3
-pkgrel=3
-pkgdesc="Decoding library for BMP and ICO image file formats"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.netsurf-browser.org/projects/libnsbmp/"
+pkgver=0.1.0
+pkgrel=1
+pkgdesc='Decoding library for BMP and ICO image file formats'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.netsurf-browser.org/projects/libnsbmp/'
 license=('MIT')
 depends=('glibc')
+makedepends=('netsurf-buildsystem')
 source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz")
-md5sums=('b418fd3f73a42190046e4e1ab98d799e')
+sha256sums=('fb576af6bd4d02d3626d5c2092bc06c80b2a80089a14decf40c813d9ec80ddc0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libnsgif/PKGBUILD b/community/libnsgif/PKGBUILD
index b13722707..0fb40c823 100644
--- a/community/libnsgif/PKGBUILD
+++ b/community/libnsgif/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 59664 2011-11-29 09:06:33Z arodseth $
+# $Id: PKGBUILD 89124 2013-04-26 23:34:05Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
+
 pkgname=libnsgif
-pkgver=0.0.3
-pkgrel=3
-pkgdesc="Decoding library for the GIF image file format"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.netsurf-browser.org/projects/libnsgif/"
+pkgver=0.1.0
+pkgrel=1
+pkgdesc='Decoding library for the GIF image file format'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.netsurf-browser.org/projects/libnsgif/'
 license=('MIT')
 depends=('glibc')
+makedepends=('netsurf-buildsystem')
 source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz")
-md5sums=('1f9efcdbbf0096eee639dc1e263b20dc')
+sha256sums=('e7dc7ee887fefc19e7c7985c5a2b057870e0fa3dd0dcfc1fdb4e98da1f36593c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/liboping/PKGBUILD b/community/liboping/PKGBUILD
index ee0568597..02cd017ea 100644
--- a/community/liboping/PKGBUILD
+++ b/community/liboping/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=liboping
 pkgver=1.6.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc='C library to generate ICMP echo requests, better known as "ping packets"'
 url='http://verplant.org/liboping/'
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/libosip2/PKGBUILD b/community/libosip2/PKGBUILD
index ee400283b..8e845335a 100644
--- a/community/libosip2/PKGBUILD
+++ b/community/libosip2/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 61350 2011-12-28 15:43:02Z spupykin $
+# $Id: PKGBUILD 88345 2013-04-16 13:58:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Michal Hybner <dta081@gmail.com>
 
 pkgname=libosip2
+epoch=1
 pkgver=3.6.0
 pkgrel=1
 pkgdesc="oSIP is an implementation of SIP"
@@ -39,6 +40,10 @@ diff -wbBur libosip2-3.1.0/src/osip2/port_sema.c libosip2-3.1.0.my/src/osip2/por
 EOF
 
   ./configure --prefix=/usr --disable-semaphore --enable-sysv
-  make 
+  make
+}
+
+package() {
+  cd $srcdir/libosip2-${pkgver/_/-}/
   make DESTDIR=$pkgdir install
 }
diff --git a/community/libparserutils/PKGBUILD b/community/libparserutils/PKGBUILD
index 5dea780d8..8d9a6edc4 100644
--- a/community/libparserutils/PKGBUILD
+++ b/community/libparserutils/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 64884 2012-02-18 19:31:38Z arodseth $
+# $Id: PKGBUILD 89113 2013-04-26 21:37:10Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=libparserutils
-pkgver=0.1.1
-pkgrel=2
-pkgdesc="Library for building efficient parsers"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.netsurf-browser.org/projects/libparserutils"
+pkgver=0.1.2
+pkgrel=1
+pkgdesc='Library for building efficient parsers'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.netsurf-browser.org/projects/libparserutils'
 license=('MIT')
-source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz")
 depends=('glibc')
-sha256sums=('2d3f1887d3027b7df1fcacd5f74aba16d3c22a86c169816cd712857a1be0aaf3')
+makedepends=('netsurf-buildsystem')
+source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz")
+sha256sums=('0a21efd3882c19965f57161c4ecda85a363a71dbe090030dfa69f9aecd2160aa')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD
index 9ee1c424e..7c697afde 100644
--- a/community/libpinyin/PKGBUILD
+++ b/community/libpinyin/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 80277 2012-11-19 05:28:17Z fyan $
+# $Id: PKGBUILD 89874 2013-05-04 04:07:02Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Yangtse <yangtsesu@gmail.com> 
 # Contributor: WU Jun <quark at lihdd dot net>
 
 pkgname=libpinyin
-pkgver=0.8.0
+pkgver=0.9.91
 pkgrel=1
-pkgdesc="Library to deal with pinyin."
+pkgdesc="Library to deal with pinyin"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/libpinyin/libpinyin"
 license=('GPL')
 depends=('db' 'glib2')
 options=(!libtool)
-source=("https://github.com/downloads/libpinyin/libpinyin/${pkgname}-lite-${pkgver}.tar.gz"
-	'https://github.com/downloads/libpinyin/libpinyin/model.text.tar.gz')
-noextract=("model.text.tar.gz")
+source=("https://github.com/libpinyin/libpinyin/archive/${pkgver}.tar.gz"
+        "http://downloads.sourceforge.net/libpinyin/model6.text.tar.gz")
+noextract=("model6.text.tar.gz")
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  cp "${srcdir}/model.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/"
-  sed -i '/wget.*model\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am
+
+  cp "${srcdir}/model6.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/"
+  sed -i '/wget.*model6\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am
 
   aclocal && libtoolize --force && autoheader && automake -a && autoconf
   ./configure --prefix=/usr && make
@@ -29,5 +30,5 @@ package() {
   cd "${srcdir}/libpinyin-$pkgver"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('e53cc51355a79acf187d768befbfcff8'
-         '59be0e37b0834e41be9786d3b2fcc129')
+sha512sums=('40263ff3b0e4ac6f68ed51d90b07c9431beec70d2b93ab3c0fec36a35b662380a022478bf15d81305a5e84c0eb95d662fed70c7213ff5c0d11a964b232bf1be2'
+            '8719d99b2efb22438ec067c046f8d45addb3e0d336e8d6ec4b8ed22370fe81366d19a34934bb059230f86e74c379acb62822ee3458850437880d531de8ff3e0e')
diff --git a/community/libpqxx/build-fix.patch b/community/libpqxx/build-fix.patch
deleted file mode 100644
index 12795e517..000000000
--- a/community/libpqxx/build-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -wbBur libpqxx-3.1/include/pqxx/compiler-internal.hxx libpqxx-3.1.my/include/pqxx/compiler-internal.hxx
---- libpqxx-3.1/include/pqxx/compiler-internal.hxx	2010-02-16 02:21:36.000000000 +0300
-+++ libpqxx-3.1.my/include/pqxx/compiler-internal.hxx	2011-11-21 15:56:00.000000000 +0400
-@@ -18,6 +18,7 @@
- #ifndef PQXX_H_COMPILER_INTERNAL
- #define PQXX_H_COMPILER_INTERNAL
- 
-+#include <cstddef>
- 
- // Workarounds & definitions needed to compile libpqxx into a library
- #include "pqxx/config-internal-compiler.h"
diff --git a/community/libquicktime/PKGBUILD b/community/libquicktime/PKGBUILD
deleted file mode 100644
index 3003dbd3a..000000000
--- a/community/libquicktime/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 80154 2012-11-16 23:35:56Z ioni $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=libquicktime
-pkgver=1.2.4
-pkgrel=3
-pkgdesc="A library for reading and writing quicktime files"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://libquicktime.sourceforge.net/"
-depends=('gtk2'  'ffmpeg' 'libxv' 'libgl' 'libxaw' 'faad2' 'faac')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-  	--enable-gpl \
-	--with-ffmpeg \
-	--with-x264 \
-	--without-doxygen
-	make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD
index 50a78c5e4..00d6905c4 100644
--- a/community/libraw/PKGBUILD
+++ b/community/libraw/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=libraw
 pkgver=0.14.7
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libraw.org/"
diff --git a/community/librime/PKGBUILD b/community/librime/PKGBUILD
index 2e0957917..9e9f3822d 100644
--- a/community/librime/PKGBUILD
+++ b/community/librime/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 83484 2013-02-02 03:46:07Z fyan $
+# $Id: PKGBUILD 87418 2013-03-31 19:18:22Z stephane $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: GONG Chen <chen dot sst at gmail dot com>
 # Contributor: 網軍總司令
 
 pkgname=librime
 pkgver=0.9.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Rime input method engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/rimeime/"
 license=('GPL3')
-depends=('boost' 'google-glog' 'kyotocabinet' 'opencc' 'yaml-cpp0.3')
+depends=('boost' 'google-glog' 'kyotocabinet' 'opencc' 'yaml-cpp')
 optdepends=('brise: Rime schema repository')
 makedepends=('cmake')
 source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz")
diff --git a/community/librtfcomp/PKGBUILD b/community/librtfcomp/PKGBUILD
index eecc73f66..d55eb48ed 100644
--- a/community/librtfcomp/PKGBUILD
+++ b/community/librtfcomp/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 66204 2012-02-23 03:18:55Z spupykin $
+# $Id: PKGBUILD 88520 2013-04-19 10:31:06Z spupykin $
 # Contributor: Bartek Iwaniec <hash87 [at] gmail [dot] com>
 
 pkgname=librtfcomp
-pkgver=1.1
-pkgrel=5
+pkgver=1.2
+pkgrel=1
 pkgdesc="SynCE librtfcomp library"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://www.synce.org/"
 depends=(pyrex)
 source=(http://downloads.sourceforge.net/synce/${pkgname}-${pkgver}.tar.gz)
-md5sums=('b7f70dc41687d920ec9f47c01f56d6ce')
+md5sums=('cdff301ff346905595d0bb6efd432850')
 
 build() {
-
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
-  make DESTDIR="${pkgdir}" install
-#Remove the conflicting binary file (conflict with core-utils). I don't know any other workaround.
-  rm ${pkgdir}/usr/bin/test
-  cd ..
+}
 
-} 
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -dm0755 $pkgdir/usr/bin
+  install -m0755 tests/{to,from}rtf $pkgdir/usr/bin
+}
diff --git a/community/libshairport/PKGBUILD b/community/libshairport/PKGBUILD
index 0e1b81faa..b662faa13 100644
--- a/community/libshairport/PKGBUILD
+++ b/community/libshairport/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 68571 2012-03-28 10:35:14Z idevolder $
+# $Id: PKGBUILD 87587 2013-04-03 13:29:16Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 
 pkgname=libshairport
 _developer='amejia1'
-_version=1.2.1
-_commithash='aeb4987'
+_version=1.2.1.20121215
+_commithash='16395d8'
 pkgver=${_version}
-pkgrel=2
+pkgrel=1
 pkgdesc="emulates an AirPort Express"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/amejia1/libshairport'
 license=('GPL')
 depends=('openssl' 'libao')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/amejia1/libshairport/tarball/$_commithash")
-sha256sums=('003c65f56123a7cb090b2d7249f0facbef668f7db6048f4b458713892a6911ca')
+sha256sums=('98b73313d0a8f2abcb32e11f4fd4b422777a495cd62dbe881d5061b91959d1d5')
 options=(!libtool)
 
 _srcfolder=$_developer-$pkgname-$_commithash
diff --git a/community/libsignon-glib/PKGBUILD b/community/libsignon-glib/PKGBUILD
index 18b2d0d2d..d09fba005 100644
--- a/community/libsignon-glib/PKGBUILD
+++ b/community/libsignon-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 83004 2013-01-26 14:44:32Z bgyorgy $
+# $Id: PKGBUILD 84337 2013-02-16 20:27:53Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=libsignon-glib
-pkgver=1.8
+pkgver=1.9
 pkgrel=1
 pkgdesc="GLib-based client library for applications handling account authentication through the Online Accounts Single Sign-On service"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('signon')
 makedepends=('python2-gobject')
 options=('!libtool')
 source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('74c2718ea5423747c68b47e52b85a6e273cac085')
+sha1sums=('09e0b8da14f4ea9450e33eb5f6808afeefdbbe03')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libsignon-glib/fix-docdir.patch b/community/libsignon-glib/fix-docdir.patch
deleted file mode 100644
index b42c7faf8..000000000
--- a/community/libsignon-glib/fix-docdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libsignon-glib-1.6.orig/Makefile.am libsignon-glib-1.6/Makefile.am
---- libsignon-glib-1.6.orig/Makefile.am	2012-08-13 10:09:23.000000000 +0200
-+++ libsignon-glib-1.6/Makefile.am	2012-10-16 22:04:28.805736477 +0200
-@@ -11,7 +11,7 @@
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libsignon-glib.pc
- 
--libsignondocdir = ${prefix}/doc/reference
-+libsignondocdir = ${docdir}
- libsignondoc_DATA= README COPYING AUTHORS ChangeLog INSTALL NEWS
- 
- EXTRA_DIST = \
diff --git a/community/libsignon-glib/make-tests-optional.patch b/community/libsignon-glib/make-tests-optional.patch
deleted file mode 100644
index cc1e72848..000000000
--- a/community/libsignon-glib/make-tests-optional.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-commit 65e1948097695f26aa13f4104336a8a76a678b87
-Author: David King <david.king@canonical.com>
-Date:   Tue Oct 30 09:24:27 2012 +0000
-
-    Make tests optional at configure time
-    
-    http://code.google.com/p/accounts-sso/issues/detail?id=124
-
-diff --git a/Makefile.am b/Makefile.am
-index 86b3a55..5740d45 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,12 +2,16 @@ ACLOCAL_AMFLAGS = -I m4
- DISTCHECK_CONFIGURE_FLAGS = \
- 	--enable-gtk-doc \
- 	--enable-introspection=yes
--SUBDIRS = libsignon-glib docs tests
-+SUBDIRS = libsignon-glib docs
- 
- if ENABLE_PYTHON
- SUBDIRS += pygobject
- endif
- 
-+if ENABLE_TESTS
-+SUBDIRS += tests
-+endif
-+
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libsignon-glib.pc
- 
-diff --git a/configure.ac b/configure.ac
-index af5e663..d09661e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,7 +19,25 @@ PKG_CHECK_MODULES(
- AC_SUBST(DEPS_CFLAGS)
- AC_SUBST(DEPS_LIBS)
- 
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
-+# Build tests.
-+
-+CHECK_REQUIRED="check >= 0.9.4"
-+
-+AC_ARG_ENABLE([tests],
-+  [AS_HELP_STRING([--disable-tests], [build with testing support disabled])])
-+
-+AS_IF([test "x$enable_tests" != "xno"],
-+  [PKG_CHECK_EXISTS([$CHECK_REQUIRED], [have_check=yes], [have_check=no])],
-+  [have_check=no])
-+
-+AS_IF([test "x$have_check" = "xyes"],
-+  [PKG_CHECK_MODULES([CHECK], [$CHECK_REQUIRED])
-+   AC_SUBST([CHECK_CFLAGS])
-+   AC_SUBST([CHECK_LIBS])],
-+  [AS_IF([test "x$enable_tests" = "xyes"],
-+    [AC_MSG_ERROR([tests enabled but required dependencies were not found])])])
-+
-+AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_check" = "xyes"])
- 
- AC_ISC_POSIX
- AC_PROG_CC
diff --git a/community/libtaginfo/PKGBUILD b/community/libtaginfo/PKGBUILD
new file mode 100644
index 000000000..841fba7b0
--- /dev/null
+++ b/community/libtaginfo/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 88454 2013-04-18 04:14:11Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+
+pkgname=libtaginfo
+pkgver=0.1.6
+pkgrel=1
+pkgdesc="Library for reading media metadata"
+arch=('i686' 'x86_64' 'mips64el')
+url="https://bitbucket.org/shuerhaaken/libtaginfo"
+depends=('taglib' 'gcc-libs')
+license=('GPL2')
+source=("https://bitbucket.org/shuerhaaken/libtaginfo/downloads/$pkgname-$pkgver.tar.gz")
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./autogen.sh --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+md5sums=('781361a667767e8553735682d63670ca')
diff --git a/community/libtlen/PKGBUILD b/community/libtlen/PKGBUILD
deleted file mode 100644
index 04cb44677..000000000
--- a/community/libtlen/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 67517 2012-03-12 22:14:18Z lcarlier $
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-
-pkgname=libtlen
-pkgver=20041113
-pkgrel=5
-pkgdesc="A Tlen.pl protocol library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://libtlen.sourceforge.net/"
-license=("GPL")
-depends=(glibc)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('b77c0a3234a21d1b79df8a8b9a9b9534')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community/libtommath/PKGBUILD b/community/libtommath/PKGBUILD
index c8e835202..0fc15778e 100644
--- a/community/libtommath/PKGBUILD
+++ b/community/libtommath/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=libtommath
 pkgver=0.42.0
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Highly optimized and portable routines for integer based number theoretic applications"
 url="http://www.libtom.org/"
 license=('custom')
diff --git a/community/libuser/PKGBUILD b/community/libuser/PKGBUILD
index 6b3a0f420..ff1143354 100644
--- a/community/libuser/PKGBUILD
+++ b/community/libuser/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 80627 2012-11-27 13:52:32Z spupykin $
+# $Id: PKGBUILD 88522 2013-04-19 10:31:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 
 pkgname=libuser
-pkgver=0.58
+pkgver=0.59
 pkgrel=1
 pkgdesc='A standardized interface for manipulating and administering user and group accounts.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('python2' 'glib2' 'popt')
 options=('!libtool')
 backup=('etc/libuser.conf')
 source=("https://fedorahosted.org/releases/l/i/libuser/libuser-${pkgver}.tar.xz")
-md5sums=('1fc3ef3f3a3955b2d78562ff4daed793')
+md5sums=('22835cbfec894b1e9491845ed5023244')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index c98646495..1619b5b1e 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83408 2013-01-31 16:11:20Z spupykin $
+# $Id: PKGBUILD 89909 2013-05-05 14:49:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=1.0.2
-pkgrel=2
+pkgver=1.0.5
+pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvirt.org/"
@@ -19,7 +19,8 @@ optdepends=('bridge-utils: for briged networking (default)'
 	    'kvm'
 	    'openbsd-netcat: for remote management over ssh'
 	    'qemu'
-	    'radvd')
+	    'radvd'
+	    'ebtables')
 [ "$CARCH" != "mips64el" ] && optdepends+=('dmidecode')
 options=('emptydirs' '!libtool')
 backup=('etc/conf.d/libvirtd'
@@ -34,15 +35,13 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	libvirtd.conf.d
 	libvirtd-guests.rc.d
 	libvirtd-guests.conf.d
-	libvirt.tmpfiles.d
-	python.patch)
-md5sums=('7e268ed702c4331d393e5b43449cae13'
+	libvirt.tmpfiles.d)
+md5sums=('91c4145f49bcf92e89470fa3fb28fff6'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '0ee5b6c58590ff392a266f20f7928d1f'
          '0a96ed876ffb1fcb9dff5a9b3a609c1e'
-         '020971887442ebbf1b6949e031c8dd3f'
-         '4280310abbdebbb7ad756840e4ff5671')
+         '020971887442ebbf1b6949e031c8dd3f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -54,8 +53,6 @@ build() {
     sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
-  patch -p1 <$srcdir/python.patch
-
   export LDFLAGS=-lX11
   export RADVD=/usr/sbin/radvd
   [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \
@@ -64,10 +61,15 @@ build() {
 	--with-qemu-user=nobody --with-qemu-group=nobody \
 	--without-netcf --with-interface
   make
+
   sed -i 's|/etc/sysconfig/libvirtd|/etc/conf.d/libvirtd|' daemon/libvirtd.service
-  sed -i 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' tools/libvirt-guests.service
-  sed -i 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' tools/libvirt-guests.service
+  sed -i \
+    -e 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' \
+    -e 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' \
+    -e 's|After=.*|After=syslog.target network.target libvirtd.service|' \
+    tools/libvirt-guests.service
   sed -i 's|@sbindir@|/usr/sbin|g' src/virtlockd.service
+  sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf
 }
 
 package() {
@@ -85,9 +87,6 @@ package() {
   install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf
   mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/
 
-  sed -i \
-	's|After=.*|After=syslog.target network.target libvirtd.service|' \
-	"$pkgdir"/usr/lib/systemd/system/libvirt-guests.service
 
   rm -rf \
 	"$pkgdir"/var/run \
diff --git a/community/libvirt/libvirt-libnl3.patch b/community/libvirt/libvirt-libnl3.patch
deleted file mode 100644
index 1e5f141b9..000000000
--- a/community/libvirt/libvirt-libnl3.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -wbBur libvirt-0.9.12/configure.ac libvirt-0.9.12.my/configure.ac
---- libvirt-0.9.12/configure.ac	2012-05-14 06:15:40.000000000 +0400
-+++ libvirt-0.9.12.my/configure.ac	2012-05-17 13:18:22.000000000 +0400
-@@ -71,7 +71,7 @@
- LIBCURL_REQUIRED="7.18.0"
- OPENWSMAN_REQUIRED="2.2.3"
- LIBPCAP_REQUIRED="1.0.0"
--LIBNL_REQUIRED="1.1"
-+LIBNL_REQUIRED="3.2"
- LIBSSH2_REQUIRED="1.0"
- LIBBLKID_REQUIRED="2.17"
- DBUS_REQUIRED="1.0.0"
-@@ -2652,21 +2652,9 @@
-     PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [
-         have_libnl=yes
-         AC_DEFINE([HAVE_LIBNL3], [1], [Use libnl-3.0])
--        AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is available])
-         PKG_CHECK_MODULES([LIBNL_ROUTE3], [libnl-route-3.0])
-         LIBNL_CFLAGS="$LIBNL_CFLAGS $LIBNL_ROUTE3_CFLAGS"
-         LIBNL_LIBS="$LIBNL_LIBS $LIBNL_ROUTE3_LIBS"
--    ], [PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [
--            have_libnl=yes
--            AC_DEFINE_UNQUOTED([HAVE_LIBNL], [1],
--             [whether the netlink library is available])
--            AC_DEFINE_UNQUOTED([HAVE_LIBNL1], [1],
--             [whether the netlink v1 library is available])
--        ], [
--            if test "$with_macvtap" = "yes"; then
--                AC_MSG_ERROR([libnl-devel >= $LIBNL_REQUIRED is required for macvtap support])
--            fi
--        ])
-     ])
- fi
- AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"])
-diff -wbBur libvirt-0.9.12/daemon/Makefile.am libvirt-0.9.12.my/daemon/Makefile.am
---- libvirt-0.9.12/daemon/Makefile.am	2012-04-20 08:25:25.000000000 +0400
-+++ libvirt-0.9.12.my/daemon/Makefile.am	2012-05-17 13:18:22.000000000 +0400
-@@ -96,6 +96,7 @@
- 	$(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \
- 	$(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) \
- 	$(WARN_CFLAGS) \
-+	$(LIBNL_CFLAGS) \
- 	$(COVERAGE_CFLAGS) \
- 	-DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \
- 	-DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\""
-diff -wbBur libvirt-0.9.12/src/Makefile.am libvirt-0.9.12.my/src/Makefile.am
---- libvirt-0.9.12/src/Makefile.am	2012-05-05 16:53:48.000000000 +0400
-+++ libvirt-0.9.12.my/src/Makefile.am	2012-05-17 13:18:22.000000000 +0400
-@@ -16,6 +16,7 @@
- 
- AM_CFLAGS =	$(DRIVER_MODULE_CFLAGS)				\
- 		$(LIBXML_CFLAGS)				\
-+                $(LIBNL_CFLAGS)                                 \
- 		$(WARN_CFLAGS)					\
- 		$(LOCK_CHECKING_CFLAGS)				\
- 		$(WIN32_EXTRA_CFLAGS)				\
-diff -wbBur libvirt-0.9.12/src/util/virnetdevmacvlan.c libvirt-0.9.12.my/src/util/virnetdevmacvlan.c
---- libvirt-0.9.12/src/util/virnetdevmacvlan.c	2012-05-09 05:21:54.000000000 +0400
-+++ libvirt-0.9.12.my/src/util/virnetdevmacvlan.c	2012-05-17 13:25:21.000000000 +0400
-@@ -27,6 +27,10 @@
- 
- #include <config.h>
- 
-+#include <netlink/msg.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/if_link.h>
-+
- #include "virnetdevmacvlan.h"
- #include "virmacaddr.h"
- #include "util.h"
-diff -wbBur libvirt-0.9.12/src/util/virnetdevvportprofile.c libvirt-0.9.12.my/src/util/virnetdevvportprofile.c
---- libvirt-0.9.12/src/util/virnetdevvportprofile.c	2012-05-09 05:21:54.000000000 +0400
-+++ libvirt-0.9.12.my/src/util/virnetdevvportprofile.c	2012-05-17 13:27:54.000000000 +0400
-@@ -22,6 +22,10 @@
- 
- #include <config.h>
- 
-+#include <netlink/msg.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/if_link.h>
-+
- #include "virnetdevvportprofile.h"
- #include "virterror_internal.h"
- 
-diff -wbBur libvirt-0.9.12/src/util/virnetlink.c libvirt-0.9.12.my/src/util/virnetlink.c
---- libvirt-0.9.12/src/util/virnetlink.c	2012-05-09 16:41:41.000000000 +0400
-+++ libvirt-0.9.12.my/src/util/virnetlink.c	2012-05-17 13:38:08.000000000 +0400
-@@ -49,7 +49,7 @@
- 
- #define NETLINK_ACK_TIMEOUT_S  2
- 
--#if defined(__linux__) && defined(HAVE_LIBNL)
-+#if defined(__linux__) && defined(HAVE_LIBNL3)
- /* State for a single netlink event handle */
- struct virNetlinkEventHandle {
-     int watch;
-diff -wbBur libvirt-0.9.12/src/util/virnetlink.h libvirt-0.9.12.my/src/util/virnetlink.h
---- libvirt-0.9.12/src/util/virnetlink.h	2012-05-09 05:21:54.000000000 +0400
-+++ libvirt-0.9.12.my/src/util/virnetlink.h	2012-05-17 13:27:37.000000000 +0400
-@@ -23,9 +23,10 @@
- # include "config.h"
- # include "internal.h"
- 
--# if defined(__linux__) && defined(HAVE_LIBNL)
-+# if defined(__linux__) && defined(HAVE_LIBNL3)
- 
- #  include <netlink/msg.h>
-+#  include <stdint.h>
- 
- # else
- 
diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch
deleted file mode 100644
index 5538c892d..000000000
--- a/community/libvirt/openbsd-netcat-default.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -wbBur libvirt-0.10.0.org/src/qemu/qemu_migration.c libvirt-0.10.0/src/qemu/qemu_migration.c
---- libvirt-0.10.0.org/src/qemu/qemu_migration.c	2012-08-27 06:12:21.000000000 +0400
-+++ libvirt-0.10.0/src/qemu/qemu_migration.c	2012-08-29 13:36:23.000000000 +0400
-@@ -1910,7 +1910,7 @@
-                                            spec->dest.unix_socket.file);
-         } else {
-             const char *args[] = {
--                "nc", "-U", spec->dest.unix_socket.file, NULL
-+                "nc.openbsd", "-U", spec->dest.unix_socket.file, NULL
-             };
-             ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args);
-         }
-diff -wbBur libvirt-0.10.0.org/src/remote/remote_driver.c libvirt-0.10.0/src/remote/remote_driver.c
---- libvirt-0.10.0.org/src/remote/remote_driver.c	2012-08-27 06:12:21.000000000 +0400
-+++ libvirt-0.10.0/src/remote/remote_driver.c	2012-08-29 13:36:32.000000000 +0400
-@@ -693,7 +693,7 @@
-                                                 username,
-                                                 !tty,
-                                                 !verify,
--                                                netcat ? netcat : "nc",
-+                                                netcat ? netcat : "nc.openbsd",
-                                                 keyfile,
-                                                 sockname)))
-             goto failed;
-diff -wbBur libvirt-0.10.0.org/src/rpc/virnetclient.c libvirt-0.10.0/src/rpc/virnetclient.c
---- libvirt-0.10.0.org/src/rpc/virnetclient.c	2012-08-28 07:44:50.000000000 +0400
-+++ libvirt-0.10.0/src/rpc/virnetclient.c	2012-08-29 13:36:38.000000000 +0400
-@@ -469,7 +469,7 @@
-     DEFAULT_VALUE(host, "localhost");
-     DEFAULT_VALUE(port, "22");
-     DEFAULT_VALUE(username, "root");
--    DEFAULT_VALUE(netcatPath, "nc");
-+    DEFAULT_VALUE(netcatPath, "nc.openbsd");
-     DEFAULT_VALUE(knownHostsVerify, "normal");
- 
-     virBufferEscapeShell(&buf, netcatPath);
-diff -wbBur libvirt-0.10.0.org/src/rpc/virnetsocket.c libvirt-0.10.0/src/rpc/virnetsocket.c
---- libvirt-0.10.0.org/src/rpc/virnetsocket.c	2012-08-22 14:00:59.000000000 +0400
-+++ libvirt-0.10.0/src/rpc/virnetsocket.c	2012-08-29 13:36:44.000000000 +0400
-@@ -698,7 +698,7 @@
-         virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
- 
-     if (!netcat)
--        netcat = "nc";
-+        netcat = "nc.openbsd";
- 
-     virCommandAddArgList(cmd, nodename, "sh", "-c", NULL);
- 
-diff -wbBur libvirt-0.10.0.org/tests/virnetsockettest.c libvirt-0.10.0/tests/virnetsockettest.c
---- libvirt-0.10.0.org/tests/virnetsockettest.c	2012-08-10 06:26:04.000000000 +0400
-+++ libvirt-0.10.0/tests/virnetsockettest.c	2012-08-29 13:36:53.000000000 +0400
-@@ -593,7 +593,7 @@
- 
-     struct testSSHData sshData7 = {
-         .nodename = "somehost",
--        .netcat = "nc -4",
-+        .netcat = "nc.openbsd -4",
-         .path = "/tmp/socket",
-         .expectOut = "somehost sh -c 'if ''nc -4'' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then "
-                                          "ARG=-q0;"
diff --git a/community/libvirt/python.patch b/community/libvirt/python.patch
deleted file mode 100644
index c791a54e9..000000000
--- a/community/libvirt/python.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/python/generator.py b/python/generator.py
-index 5d27f66..71ca883 100755
---- a/python/generator.py
-+++ b/python/generator.py
-@@ -123,7 +123,7 @@ class docParser(xml.sax.handler.ContentHandler):
-                     self.function_return_field = attrs['field']
-         elif tag == 'enum':
-             if (attrs['file'] == "libvirt" or
--                attrs['file'] == "virterror"):
-+                attrs['file'] == "virerror"):
-                 enum(attrs['type'],attrs['name'],attrs['value'])
-             elif attrs['file'] == "libvirt-lxc":
-                 lxc_enum(attrs['type'],attrs['name'],attrs['value'])
-@@ -137,7 +137,7 @@ class docParser(xml.sax.handler.ContentHandler):
-             if self.function != None:
-                 if (self.function_module == "libvirt" or
-                     self.function_module == "virevent" or
--                    self.function_module == "virterror"):
-+                    self.function_module == "virerror"):
-                     function(self.function, self.function_descr,
-                              self.function_return, self.function_args,
-                              self.function_file, self.function_module,
diff --git a/community/libvirt/xdg.patch b/community/libvirt/xdg.patch
deleted file mode 100644
index 0a12c83b5..000000000
--- a/community/libvirt/xdg.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 0b32ffe..08dfbb0 100644
---- a/src/rpc/virnetsocket.c
-+++ b/src/rpc/virnetsocket.c
-@@ -97,6 +97,9 @@ static int virNetSocketForkDaemon(const char *binary)
-                                              NULL);
- 
-     virCommandAddEnvPassCommon(cmd);
-+    virCommandAddEnvPass(cmd, "XDG_CACHE_HOME");
-+    virCommandAddEnvPass(cmd, "XDG_CONFIG_HOME");
-+    virCommandAddEnvPass(cmd, "XDG_RUNTIME_DIR");
-     virCommandClearCaps(cmd);
-     virCommandDaemonize(cmd);
-     ret = virCommandRun(cmd, NULL);
diff --git a/community/libwapcaplet/PKGBUILD b/community/libwapcaplet/PKGBUILD
index 2d3485874..0ebecac37 100644
--- a/community/libwapcaplet/PKGBUILD
+++ b/community/libwapcaplet/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 70913 2012-05-18 23:56:14Z arodseth $
+# $Id: PKGBUILD 89126 2013-04-26 23:37:42Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=libwapcaplet
-pkgver=0.1.1
+pkgver=0.2.0
 pkgrel=1
-pkgdesc="String internment library with rapid string comparison"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.netsurf-browser.org/projects/libwapcaplet/"
+pkgdesc='String internment library with rapid string comparison'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.netsurf-browser.org/projects/libwapcaplet/'
 license=('MIT')
+depends=('glibc')
+makedepends=('netsurf-buildsystem')
 source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz")
-sha256sums=('cf05159d7d515523697ce07228cff6a6339dc6bdcfec3e02e3b72d8b773f5258')
+sha256sums=('5fb49841ba335b0c7a1420d92c3a60480df63696c50353c02724aa8c6b45cb24')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libxkbcommon/PKGBUILD b/community/libxkbcommon/PKGBUILD
deleted file mode 100644
index e65cefa7d..000000000
--- a/community/libxkbcommon/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Mladen Pejakovic <pejakm@gmail.com>
-
-pkgname=libxkbcommon
-pkgver=0.2.0
-pkgrel=3
-pkgdesc="Keyboard handling library using XKB data"
-arch=(i686 x86_64)
-url="http://xkbcommon.org/"
-license=('custom')
-depends=(glibc)
-makedepends=(doxygen xorg-util-macros)
-source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.bz2")
-md5sums=('2be3d4a255d02c7d46fc6a9486f21f6a')
-options=('!libtool')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/community/libzdb/PKGBUILD b/community/libzdb/PKGBUILD
index 5119d2c21..89ea48e74 100644
--- a/community/libzdb/PKGBUILD
+++ b/community/libzdb/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 82597 2013-01-21 11:20:45Z spupykin $
+# $Id: PKGBUILD 88544 2013-04-19 13:27:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libzdb
-pkgver=2.11.1
+pkgver=2.11.2
 pkgrel=1
 pkgdesc="Zild Database Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tildeslash.com/libzdb/"
 license=('GPL')
-depends=('postgresql-libs' 'sqlite' 'libmysqlclient')
+depends=('postgresql-libs' 'sqlite' 'libmariadbclient')
 options=('!libtool')
 source=(http://www.tildeslash.com/libzdb/dist/libzdb-$pkgver.tar.gz)
-md5sums=('155e89d96df4ec22e984442137f75289')
+md5sums=('f3ebd6c32c47be084643a44d34459499')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD
new file mode 100755
index 000000000..325e46415
--- /dev/null
+++ b/community/lightdm-gtk3-greeter/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 86256 2013-03-14 11:39:30Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: Padfoot <padfoot@exemail.com.au>
+
+pkgname=lightdm-gtk3-greeter
+pkgver=1.3.1
+pkgrel=1
+epoch=1
+pkgdesc="GTK+ greeter for LightDM"
+arch=('i686' 'x86_64' 'mips64el')
+url="https://launchpad.net/lightdm-gtk-greeter"
+license=('GPL3' 'LGPL3')
+depends=('gtk3' 'lightdm')
+makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool')
+provides=("${pkgname/3/}")
+backup=('etc/lightdm/lightdm-gtk-greeter.conf')
+source=("https://launchpad.net/${pkgname/3/}/1.4/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz")
+sha256sums=('a384b6413a52e6c6aeaf3242b2420e857ad7e2e4e5bec47da663e67076c0ee87')
+
+build() {
+  cd "${srcdir}"/${pkgname/3/}-${pkgver}
+
+# Build
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname/3/}-${pkgver}
+
+# Install
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/lightdm-kde-greeter/PKGBUILD b/community/lightdm-kde-greeter/PKGBUILD
new file mode 100755
index 000000000..2922226ef
--- /dev/null
+++ b/community/lightdm-kde-greeter/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 88435 2013-04-17 15:31:11Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+# Contributor: Mladen Pejakovic <pejakm@gmail.com>
+# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+
+pkgname=lightdm-kde-greeter
+pkgver=0.3.2.1
+pkgrel=1
+pkgdesc="KDE greeter for LightDM"
+arch=('i686' 'x86_64' 'mips64el')
+url="https://projects.kde.org/projects/playground/base/lightdm"
+license=('GPL')
+depends=('kdelibs' 'liblightdm-qt4')
+makedepends=('cmake' 'automoc4')
+backup=('etc/lightdm/lightdm-kde-greeter.conf'
+        'etc/dbus-1/system.d/org.kde.kcontrol.kcmlightdm.conf')
+source=("ftp://ftp.kde.org/pub/kde/unstable/${pkgname%-*}/src/${pkgname%-*}-${pkgver}.tar.bz2"
+        'lightdm-kde-greeter.conf')
+sha256sums=('65b2a1bab2c88bf55a07e62cbe0eb8ac3660638636c5825e5925b28d03f12188'
+            'a8fe10ef68d553781b91b1377106f95915c3ca14d835bd66910e08f922ef64c8')
+
+build() {
+  cd "${srcdir}"/lightdm-${pkgver}
+
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/lightdm-${pkgver}/build
+
+  make DESTDIR="${pkgdir}" install
+  install -dm 755 "${pkgdir}"/etc/lightdm
+  install -m 644 ../../lightdm-kde-greeter.conf "${pkgdir}"/etc/lightdm/lightdm-kde-greeter.conf
+}
+
+# vim ts=2 sw=2 et:
diff --git a/community/lightdm-kde-greeter/lightdm-kde-greeter.conf b/community/lightdm-kde-greeter/lightdm-kde-greeter.conf
new file mode 100755
index 000000000..09c4ad281
--- /dev/null
+++ b/community/lightdm-kde-greeter/lightdm-kde-greeter.conf
@@ -0,0 +1,2 @@
+[greeter]
+theme-name=classic
diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD
new file mode 100755
index 000000000..cf3540412
--- /dev/null
+++ b/community/lightdm/PKGBUILD
@@ -0,0 +1,118 @@
+# $Id: PKGBUILD 88301 2013-04-16 08:19:06Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: Morfeo <morfeo89@hotmail.it>
+
+pkgbase=lightdm
+pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
+pkgver=1.6.0
+pkgrel=1
+epoch=1
+pkgdesc="A lightweight display manager"
+arch=('i686' 'x86_64' 'mips64el')
+url="https://launchpad.net/lightdm"
+license=('GPL3' 'LGPL3')
+groups=('lightdm')
+makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'qt4' 'qt5-base' 'yelp-tools')
+options=('!emptydirs' '!libtool')
+source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz"
+        'lightdm.service'
+        'lightdm.tmpfiles'
+        'lightdm.pam'
+        'lightdm-autologin.pam'
+        'lightdm.rules'
+        'lightdm-default-config.patch'
+        'lightdm-lock-screen-before-switch.patch'
+        'xsession')
+sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419'
+            '2e03423cbe88c9fdc3a9684d6d14221aa6e92d105f9d1d53b08747d966c45125'
+            'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f'
+            'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
+            '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
+            'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
+            '6d5a754f41e9c7e52c51d2ff018b926ddaabb807e9a0b88c4a7bde1acffa3b1c'
+            '4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822'
+            '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4')
+
+prepare() {
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+
+  patch -Np1 -i ../lightdm-default-config.patch
+  patch -Np1 -i ../lightdm-lock-screen-before-switch.patch
+  sed -i 's/MOC5 --qt=qt5/MOC5/' configure
+}
+
+build() {
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+
+   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${pkgbase} --with-greeter-user=lightdm --with-greeter-session=lightdm-gtk-greeter --disable-{static,tests}
+   make
+}
+
+package_lightdm() {
+depends=('libxklavier' 'systemd')
+optdepends=('xorg-server-xephyr: LightDM test mode'
+            'accountsservice: limit visible accounts')
+backup=('etc/apparmor.d/lightdm-guest-session'
+        'etc/lightdm/keys.conf'
+        'etc/lightdm/lightdm.conf'
+        'etc/lightdm/users.conf')
+install=${pkgbase}.install
+
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall
+  rm -rf "${pkgdir}"/etc/init
+
+# Persistent home
+  install -dm 770 "${pkgdir}"/var/lib/lightdm
+  chmod +t "${pkgdir}"/var/lib/lightdm
+  echo 'GDK_CORE_DEVICE_EVENTS=true' > "${pkgdir}"/var/lib/lightdm/.pam_environment
+  chmod 644 "${pkgdir}"/var/lib/lightdm/.pam_environment
+
+# Session wrapper
+  install -m 755 ../xsession "${pkgdir}"/etc/lightdm/xsession
+
+# PAM
+  install -m 644 ../lightdm.pam "${pkgdir}"/etc/pam.d/lightdm
+  install -m 644 ../lightdm-autologin.pam "${pkgdir}"/etc/pam.d/lightdm-autologin
+
+# PolicyKit
+  install -dm 700 "${pkgdir}"/usr/share/polkit-1/rules.d
+  install -m 644 ../lightdm.rules "${pkgdir}"/usr/share/polkit-1/rules.d/lightdm.rules
+
+# Systemd
+  install -dm 755 "${pkgdir}"/usr/lib/{systemd/system,tmpfiles.d}
+  install -m 644 ../lightdm.service "${pkgdir}"/usr/lib/systemd/system/lightdm.service
+  install -m 644 ../lightdm.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lightdm.conf
+}
+
+package_liblightdm-qt4() {
+pkgdesc=('LightDM Qt client library')
+depends=('lightdm' 'qt4')
+
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+
+  make DESTDIR="${pkgdir}" -C liblightdm-gobject install
+  make DESTDIR="${pkgdir}" -C liblightdm-qt install
+  make DESTDIR="${pkgdir}" -C liblightdm-gobject uninstall
+  find "${pkgdir}" -type d -name *qt5* -exec rm -rf {} +
+  find "${pkgdir}" -type f  -name *qt5* -exec rm {} +
+  find "${pkgdir}" -type l  -name *qt5* -exec rm {} +
+}
+
+package_liblightdm-qt5() {
+pkgdesc=('LightDM Qt client library')
+depends=('lightdm' 'qt5-base')
+
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+
+  make DESTDIR="${pkgdir}" -C liblightdm-gobject install
+  make DESTDIR="${pkgdir}" -C liblightdm-qt install
+  make DESTDIR="${pkgdir}" -C liblightdm-gobject uninstall
+  find "${pkgdir}" -type d -name *qt[!5]* -exec rm -rf {} +
+  find "${pkgdir}" -type f  -name *qt[!5]* -exec rm {} +
+  find "${pkgdir}" -type l  -name *qt[!5]* -exec rm {} +
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/lightdm/lightdm-autologin.pam b/community/lightdm/lightdm-autologin.pam
new file mode 100755
index 000000000..0b1f79e3e
--- /dev/null
+++ b/community/lightdm/lightdm-autologin.pam
@@ -0,0 +1,13 @@
+#%PAM-1.0
+auth        required    pam_env.so
+auth        required    pam_tally.so file=/var/log/faillog onerr=succeed
+auth        required    pam_shells.so
+auth        required    pam_nologin.so
+auth        [success=1 default=ignore]  pam_succeed_if.so user ingroup autologin
+auth        required    pam_unix.so
+auth        required    pam_permit.so
+-auth       optional    pam_gnome_keyring.so
+account     include     system-local-login
+password    include     system-local-login
+session     include     system-local-login
+-session    optional    pam_gnome_keyring.so auto_start
diff --git a/community/lightdm/lightdm-default-config.patch b/community/lightdm/lightdm-default-config.patch
new file mode 100755
index 000000000..42d49536d
--- /dev/null
+++ b/community/lightdm/lightdm-default-config.patch
@@ -0,0 +1,43 @@
+diff -rupN lightdm-1.5.1.orig/data/lightdm.conf lightdm-1.5.1/data/lightdm.conf
+--- lightdm-1.5.1.orig/data/lightdm.conf	2013-03-06 03:40:10.000000000 +0100
++++ lightdm-1.5.1/data/lightdm.conf	2013-03-12 22:59:22.494743200 +0100
+@@ -24,7 +24,7 @@
+ #user-authority-in-system-dir=false
+ #guest-account-script=guest-account
+ #log-directory=/var/log/lightdm
+-#run-directory=/var/run/lightdm
++run-directory=/run/lightdm
+ #cache-directory=/var/cache/lightdm
+ #xsessions-directory=/usr/share/xsessions
+ #remote-sessions-directory=/usr/share/lightdm/remote-sessions
+@@ -77,7 +77,7 @@
+ #user-session=default
+ #allow-guest=true
+ #guest-session=UNIMPLEMENTED
+-#session-wrapper=lightdm-session
++session-wrapper=/etc/lightdm/xsession
+ #display-setup-script=
+ #greeter-setup-script=
+ #session-setup-script=
+@@ -86,6 +86,7 @@
+ #autologin-user=
+ #autologin-user-timeout=0
+ #autologin-session=UNIMPLEMENTED
++pam-service=lightdm-autologin
+ #exit-on-failure=false
+
+ #
+diff -rupN lightdm-1.5.1.orig/data/users.conf lightdm-1.5.1/data/users.conf
+--- lightdm-1.5.1.orig/data/users.conf	2013-03-06 03:40:10.000000000 +0100
++++ lightdm-1.5.1/data/users.conf	2013-03-12 22:54:29.398854700 +0100
+@@ -8,7 +8,7 @@
+ # hidden-users = Users that are not shown to the user
+ # hidden-shells = Shells that indicate a user cannot login
+ #
+-[UserAccounts]
+-minimum-uid=500
++[UserList]
++minimum-uid=1000
+ hidden-users=nobody nobody4 noaccess
+-hidden-shells=/bin/false /usr/sbin/nologin
++hidden-shells=/bin/false /sbin/nologin
diff --git a/community/lightdm/lightdm-lock-screen-before-switch.patch b/community/lightdm/lightdm-lock-screen-before-switch.patch
new file mode 100755
index 000000000..b8b1d559c
--- /dev/null
+++ b/community/lightdm/lightdm-lock-screen-before-switch.patch
@@ -0,0 +1,55 @@
+# HG changeset patch
+# Parent b329fa1badaa454239690c3feb93d53324134915
+try to lock the screen before switching users
+
+diff --git a/utils/gdmflexiserver b/utils/gdmflexiserver
+--- a/utils/gdmflexiserver
++++ b/utils/gdmflexiserver
+@@ -9,9 +9,47 @@
+ #
+ # See http://www.gnu.org/copyleft/gpl.html for the full text of the license.
+ 
++PATH=/usr/local/bin:/bin:/usr/bin
++export PATH
++
+ if [ -z "$XDG_SEAT_PATH" ]; then
+   # something went wrong
+   exit 1
+ fi
+ 
++find_command () {
++    cmd="$1"
++    oIFS="${IFS}"; IFS=:
++    set -- ${PATH}
++    IFS="${oIFS}"
++
++    for part; do
++        [ -x "${part}/${cmd}" ] && return 0
++    done
++    return 1
++}
++
++lock_screen () {
++    for lock_cmd in \
++        "xscreensaver-command -lock" \
++        "gnome-screensaver-command --lock" \
++        "dbus-send --session --dest=org.freedesktop.ScreenSaver --type=method_call /ScreenSaver org.freedesktop.ScreenSaver.Lock"
++    do
++        ${lock_cmd} >/dev/null 2>&1 && return
++    done
++
++    for lock_cmd in \
++        "slock" \
++        "xlock -mode blank"
++    do
++        set -- ${lock_cmd}
++        if find_command "$1"; then
++            ${lock_cmd} >/dev/null 2>&1 &
++            return
++        fi
++    done
++}
++
++lock_screen
++
+ dbus-send --system --type=method_call --print-reply --dest=org.freedesktop.DisplayManager $XDG_SEAT_PATH org.freedesktop.DisplayManager.Seat.SwitchToGreeter
diff --git a/community/lightdm/lightdm.install b/community/lightdm/lightdm.install
new file mode 100755
index 000000000..7d9d99a26
--- /dev/null
+++ b/community/lightdm/lightdm.install
@@ -0,0 +1,18 @@
+post_install() {
+  getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm
+  getent passwd lightdm > /dev/null 2>&1 || useradd -c 'Light Display Manager' -u 620 -g lightdm -d /var/lib/lightdm -s /sbin/nologin lightdm
+  passwd -l lightdm > /dev/null
+  chown -R lightdm:lightdm /var/lib/lightdm > /dev/null
+  systemd-tmpfiles --create lightdm.conf
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  getent passwd lightdm > /dev/null 2>&1 && userdel lightdm
+  getent group lightdm > /dev/null 2>&1 && groupdel lightdm
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/lightdm/lightdm.pam b/community/lightdm/lightdm.pam
new file mode 100755
index 000000000..76b8869a2
--- /dev/null
+++ b/community/lightdm/lightdm.pam
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth        include     system-login
+-auth       optional    pam_gnome_keyring.so
+account     include     system-login
+password    include     system-login
+session     include     system-login
+-session    optional    pam_gnome_keyring.so auto_start
diff --git a/community/lightdm/lightdm.rules b/community/lightdm/lightdm.rules
new file mode 100755
index 000000000..eda155bf3
--- /dev/null
+++ b/community/lightdm/lightdm.rules
@@ -0,0 +1,15 @@
+polkit.addRule(function(action, subject) {
+    if (subject.user == "lightdm") {
+        polkit.log("action=" + action);
+        polkit.log("subject=" + subject);
+        if (action.id.indexOf("org.freedesktop.login1.") == 0) {
+            return polkit.Result.YES;
+        }
+        if (action.id.indexOf("org.freedesktop.consolekit.system.") == 0) {
+            return polkit.Result.YES;
+        }
+        if (action.id.indexOf("org.freedesktop.upower.") == 0) {
+            return polkit.Result.YES;
+        }
+    }
+});
diff --git a/community/lightdm/lightdm.service b/community/lightdm/lightdm.service
new file mode 100755
index 000000000..7eb46ceba
--- /dev/null
+++ b/community/lightdm/lightdm.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Light Display Manager
+Documentation=man:lightdm(1)
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/sbin/lightdm
+StandardOutput=syslog
+Restart=always
+IgnoreSIGPIPE=no
+BusName=org.freedesktop.DisplayManager
+
+[Install]
+Alias=display-manager.service
diff --git a/community/lightdm/lightdm.tmpfiles b/community/lightdm/lightdm.tmpfiles
new file mode 100755
index 000000000..d8ef132d3
--- /dev/null
+++ b/community/lightdm/lightdm.tmpfiles
@@ -0,0 +1 @@
+d /run/lightdm 0711 lightdm lightdm
diff --git a/community/lightdm/xsession b/community/lightdm/xsession
new file mode 100755
index 000000000..589205342
--- /dev/null
+++ b/community/lightdm/xsession
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+# LightDM wrapper to run around X sessions.
+
+echo "Running X session wrapper"
+
+# Load profile
+for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
+    if [ -f "$file" ]; then
+        echo "Loading profile from $file";
+        . "$file"
+    fi
+done
+
+# Load resources
+for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
+    if [ -f "$file" ]; then
+        echo "Loading resource: $file"
+        xrdb -nocpp -merge "$file"
+    fi
+done
+
+# Load keymaps
+for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+    if [ -f "$file" ]; then
+        echo "Loading keymap: $file"
+        setxkbmap `cat "$file"`
+        XKB_IN_USE=yes
+    fi
+done
+
+# Load xmodmap if not using XKB
+if [ -z "$XKB_IN_USE" ]; then
+    for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+        if [ -f "$file" ]; then
+           echo "Loading modmap: $file"
+           xmodmap "$file"
+        fi
+    done
+fi
+
+unset XKB_IN_USE
+
+# Run all system xinitrc shell scripts.
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+    for script in $xinitdir/*; do
+        echo "Loading xinit script $script"
+        if [ -x "$script" -a ! -d "$script" ]; then
+            . "$script"
+        fi
+    done
+fi
+
+# Load xsession scripts
+xsessionddir="/etc/X11/xsession.d"
+if [ -d "$xsessionddir" ]; then
+    for i in `ls $xsessionddir`; do
+        script="$xsessionddir/$i"
+        echo "Loading X session script $script"
+        if [ -r "$script"  -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
+            . "$script"
+        fi
+    done
+fi
+if [ -x "$HOME/.xsession" -a -f "$HOME/.xsession" ]; then
+    echo "Loading user X session script"
+        . "$HOME/.xsession"
+fi
+
+echo "X session wrapper complete, running session $@"
+
+exec $@
diff --git a/community/lksctp-tools/PKGBUILD b/community/lksctp-tools/PKGBUILD
index 9ac4b38d3..20fd553c4 100644
--- a/community/lksctp-tools/PKGBUILD
+++ b/community/lksctp-tools/PKGBUILD
@@ -1,9 +1,9 @@
 # $Id$
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Maintainer: Sébastien Luttringer
 # Contributer: Nicolas Martyanoff <khaelin@gmail.com>
 
 pkgname=lksctp-tools
-pkgver=1.0.13
+pkgver=1.0.14
 pkgrel=1
 pkgdesc='An implementation of the SCTP protocol'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,15 +11,11 @@ url='http://lksctp.sourceforge.net/'
 license=('GPL2' 'LGPL2.1')
 depends=('bash')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/lksctp/$pkgname-$pkgver.tar.gz"
-        '0001-Modernize-autotools.patch')
-md5sums=('96436a1b0d30ae588d0a13f6b646549a'
-         '84635abc83bcd85ef263160b6f435336')
+source=("http://downloads.sourceforge.net/sourceforge/lksctp/$pkgname-$pkgver.tar.gz")
+md5sums=('12bc67f9b47ea631328a592ce7a53ca1')
 
 build() {
   cd $pkgname-$pkgver
-  # fix autotools
-  patch -p1 -i "$srcdir/0001-Modernize-autotools.patch"
   ./bootstrap
   ./configure --prefix=/usr
   make
diff --git a/community/llvm-amdgpu-snapshot/PKGBUILD b/community/llvm-amdgpu-snapshot/PKGBUILD
index b36b421f0..65dd5a138 100644
--- a/community/llvm-amdgpu-snapshot/PKGBUILD
+++ b/community/llvm-amdgpu-snapshot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 82677 2013-01-22 22:38:25Z lcarlier $
+# $Id: PKGBUILD 87738 2013-04-05 20:58:51Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Roberto Alsina <ralsina@kde.org>
@@ -7,7 +7,7 @@
 # Contributor: Tomas Wilhelmsson <tomas.wilhelmsson@gmail.com>
 
 pkgname=llvm-amdgpu-snapshot
-pkgver=20121230
+pkgver=20130403
 pkgrel=1
 pkgdesc='Low Level Virtual Machine with AMDGPU enabled to build r600g shader llvm support'
 arch=('i686' 'x86_64')
@@ -15,11 +15,11 @@ url="http://llvm.org"
 license=('custom:University of Illinois/NCSA Open Source License')
 depends=('libffi' 'python2' 'ocaml')
 conflicts=('llvm')
-source=(ftp://ftp.archlinux.org/other/community/llvm-amdgpu/llvm-amdgpu-master.20121230.tar.gz)
-md5sums=('dbf9ad608a68fc758192c3d4716600d9')
+source=(ftp://ftp.archlinux.org/other/community/llvm-amdgpu/llvm-amdgpu-master.${pkgver}.tar.gz)
+md5sums=('4baa7b8da9eff4811952b6f855c141ca')
 
 build() {
-  cd "$srcdir"/llvm-master
+  cd "$srcdir"/llvm-c*
 
   sed -i 's/python$/python2/' utils/llvm-build/llvm-build
 
@@ -39,7 +39,7 @@ build() {
     --enable-shared \
     --enable-libffi \
     --enable-targets=all \
-    --enable-experimental-targets=AMDGPU \
+    --enable-experimental-targets=R600 \
     --disable-expensive-checks \
     --with-binutils-include=/usr/include \
     --$_optimized_switch-optimized
@@ -48,7 +48,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir"/llvm-master
+  cd "$srcdir"/llvm-c*
 
   make DESTDIR="$pkgdir" install
 
@@ -59,3 +59,4 @@ package() {
 
   install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD
index e278ff74d..5712c0027 100644
--- a/community/lmms/PKGBUILD
+++ b/community/lmms/PKGBUILD
@@ -1,30 +1,31 @@
-# $Id: PKGBUILD 80173 2012-11-17 12:51:55Z lfleischer $
+# $Id: PKGBUILD 89669 2013-05-02 08:58:00Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Storyteller <spiralsorrow@hotmail.com>
 
 pkgname=lmms
-pkgver=0.4.13
-pkgrel=2
+pkgver=0.4.14
+pkgrel=1
 pkgdesc='The Linux MultiMedia Studio.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://lmms.sourceforge.net/'
 license=('GPL')
-depends=('sdl' 'glib2' 'fluidsynth' 'libpng' 'libvorbis' 'libxft' 'libxinerama' 'qt' 'sdl_sound'
+depends=('sdl' 'glib2' 'fluidsynth' 'libpng' 'libvorbis' 'libxft' 'libxinerama' 'qt4' 'sdl_sound'
          'libsamplerate' 'shared-mime-info')
 optdepends=('wine: VST support (experimental)'
             'fftw: SpectrumAnalyzer plugin'
             'stk: STK instruments plugins'
             'pulseaudio: PulseAudio output')
-makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk' 'wine')
+makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk')
+[[ $CARCH = i686 ]] && makedepends+=('wine')
 provides=('lmms-extras')
 conflicts=('lmms-extras')
 options=('!libtool' '!makeflags')
 install=lmms.install
 source=("http://downloads.sourceforge.net/sourceforge/lmms/${pkgname}-${pkgver}.tar.bz2"
         zynaddsubfx_unlink.patch)
-md5sums=('80db0dc5263041d443f474220410991f'
+md5sums=('a30e4fcc24c117a1fb4fd7bef891f7e8'
          'd2ea78ac0cf2979505f140c6845617cf')
 
 build() {
diff --git a/community/lockfile-progs/PKGBUILD b/community/lockfile-progs/PKGBUILD
index 8d2b6c30f..b307e95b2 100644
--- a/community/lockfile-progs/PKGBUILD
+++ b/community/lockfile-progs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 66210 2012-02-23 03:23:57Z spupykin $
+# $Id: PKGBUILD 88325 2013-04-16 13:30:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
 
 pkgname=lockfile-progs
-pkgver=0.1.15
-pkgrel=2
+pkgver=0.1.17
+pkgrel=1
 pkgdesc="programs for locking and unlocking files and mailboxes"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,15 +12,15 @@ url="http://packages.debian.org/unstable/misc/lockfile-progs"
 depends=('glibc')
 makedepends=('gcc' 'make' 'liblockfile')
 source=(http://ftp.debian.org/debian/pool/main/l/lockfile-progs/${pkgname}_${pkgver}.tar.gz)
-md5sums=('abfcda83a1868073673f4d78066b8f8a')
+md5sums=('64424a766fbc8cf6d613fcc14a096e14')
 
 build() {
-    cd $srcdir/sid
+    cd $srcdir/lockfile-progs-$pkgver
     make CFLAGS="-g -Wall -O2"
 }
 
 package() {
-    cd $srcdir/sid
+    cd $srcdir/lockfile-progs-$pkgver
     mkdir -p $pkgdir/usr/bin
     install -s bin/* $pkgdir/usr/bin
     mkdir -p $pkgdir/usr/share/man/man1
diff --git a/community/log4cpp/PKGBUILD b/community/log4cpp/PKGBUILD
index 8bfe31720..b0ded1abc 100644
--- a/community/log4cpp/PKGBUILD
+++ b/community/log4cpp/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 58314 2011-11-11 08:13:40Z stativ $
+# $Id: PKGBUILD 89526 2013-04-29 18:41:08Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor : Geraud Le Falher <daureg@gmail.com>
 
 pkgname=log4cpp
-pkgver=1.0
-pkgrel=6
+pkgver=1.1
+pkgrel=1
 pkgdesc="A library of C++ classes for flexible logging to files, syslog, IDSA and other destinations."
 arch=('i686' 'x86_64' 'mips64el')
-url="http://log4cpp.hora-obscura.de/"
+url="http://log4cpp.sourceforge.net/"
 license=('LGPL')
 depends=('gcc-libs')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz gcc43.patch)
-md5sums=('1face50ead0790d1297dfb04bacf273c'
-         '09a6fd8ab6527a417c97c4db5215e558')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('b9ef6244baa5e5e435f35e0b9474b35d')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir"/gcc43.patch
-  ./configure --prefix=/usr --disable-doxygen --disable-dot --without-idsa
+	cd "$srcdir/$pkgname"
+  ./configure --prefix=/usr --disable-doxygen --disable-dot --without-idsa \
+	--build=$CHOST
 	make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/community/log4cpp/gcc43.patch b/community/log4cpp/gcc43.patch
deleted file mode 100644
index a60f986e9..000000000
--- a/community/log4cpp/gcc43.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: log4cpp-1.0/src/BasicLayout.cpp
-===================================================================
---- log4cpp-1.0.orig/src/BasicLayout.cpp	2008-03-14 16:06:57.000000000 -0400
-+++ log4cpp-1.0/src/BasicLayout.cpp	2008-03-14 16:07:11.000000000 -0400
-@@ -15,6 +15,8 @@
- #include <sstream>
- #endif
- 
-+#include <memory>
-+
- namespace log4cpp {
- 
-     BasicLayout::BasicLayout() {
-Index: log4cpp-1.0/src/PatternLayout.cpp
-===================================================================
---- log4cpp-1.0.orig/src/PatternLayout.cpp	2008-03-14 16:07:33.000000000 -0400
-+++ log4cpp-1.0/src/PatternLayout.cpp	2008-03-14 16:07:49.000000000 -0400
-@@ -370,7 +370,7 @@
-                         literal = "";
-                     }
-                     if ((minWidth != 0) || (maxWidth != 0)) {
--                        component = new FormatModifierComponent(component, std::abs(minWidth), maxWidth, minWidth < 0);
-+                        component = new FormatModifierComponent(component, std::abs((float)minWidth), maxWidth, minWidth < 0);
-                         minWidth = maxWidth = 0;
-                     }
-                     _components.push_back(component);
diff --git a/community/lsdvd/PKGBUILD b/community/lsdvd/PKGBUILD
index 69fca75c9..68fba6d7f 100644
--- a/community/lsdvd/PKGBUILD
+++ b/community/lsdvd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lsdvd
 pkgver=0.16
 pkgrel=6
 pkgdesc="A C application for reading the contents of a DVD and printing the contents to your terminal"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/lsdvd/"
 depends=('libdvdread')
 license=('GPL2')
diff --git a/community/lshw/PKGBUILD b/community/lshw/PKGBUILD
index 2ae65f146..1d511ce1b 100644
--- a/community/lshw/PKGBUILD
+++ b/community/lshw/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80847 2012-12-04 12:38:54Z spupykin $
+# $Id: PKGBUILD 87848 2013-04-08 09:23:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com>
 # Contributor: Chuck Yang <Chuck.Yang@gmail.com>
 
 pkgname=lshw
 pkgver=B.02.16
-pkgrel=2
+pkgrel=4
 pkgdesc="A small tool to provide detailed information on the hardware configuration of the machine."
 url="http://ezix.org/project/wiki/HardwareLiSter"
 license=('GPL')
@@ -18,6 +18,7 @@ md5sums=('67479167add605e8f001097c30e96d0d')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  sed -i 's|/usr/bin/gtk-lshw|/usr/sbin/gtk-lshw|' src/gui/integration/gtk-lshw.desktop
   make
   make gui
 }
@@ -26,5 +27,8 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir/ install
   make DESTDIR=$pkgdir/ install-gui
+  install -Dm0644 src/gui/integration/gtk-lshw.desktop $pkgdir/usr/share/applications/gtk-lshw.desktop
+  install -Dm0644 src/gui/integration/gtk-lshw.pam $pkgdir/usr/share/doc/$pkgname/gtk-lshw.pam
+  install -Dm0644 src/gui/integration/console.apps $pkgdir/usr/share/doc/$pkgname/console.apps
   rm -f $pkgdir/usr/share/lshw/{pci,usb}.ids
 }
diff --git a/community/lua-zlib/PKGBUILD b/community/lua-zlib/PKGBUILD
index ce7b21d48..8e277dd62 100644
--- a/community/lua-zlib/PKGBUILD
+++ b/community/lua-zlib/PKGBUILD
@@ -1,30 +1,46 @@
-# $Id: PKGBUILD 81123 2012-12-12 00:49:35Z eric $
+# $Id: PKGBUILD 86219 2013-03-13 13:38:07Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
-pkgname=lua-zlib
+pkgname=(lua-zlib lua51-zlib)
+pkgbase=lua-zlib
 pkgver=0.2
-pkgrel=3
+pkgrel=4
 _gitver=8d07669
-_luaver=5.2
 url="http://github.com/brimworks/lua-zlib"
 pkgdesc='Simple streaming interface to zlib for Lua.'
 arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
-depends=('lua' 'zlib')
-makedepends=('cmake')
+makedepends=('cmake' 'lua' 'lua51' 'zlib')
 conflicts=('lua-lzlib')
 source=("lua-zlib-$pkgver.zip::https://github.com/brimworks/lua-zlib/zipball/v$pkgver")
-md5sums=('28ce556fccb2d364bc5392f63c6f89ee')
+md5sums=('e6c780c0c4b6dcb88cf16949bb751be7')
 
 build() {
+  cp -a $srcdir/brimworks-lua-zlib-${_gitver} $srcdir/brimworks-lua51-zlib-${_gitver}
+
   cd $srcdir/brimworks-lua-zlib-${_gitver}
-  sed -i "s#share/lua/cmod#lib/lua/${_luaver}#" CMakeLists.txt
+  sed -i "s#share/lua/cmod#lib/lua/5.2#" CMakeLists.txt
+  cmake -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_PREFIX=/usr .
+
+  cd $srcdir/brimworks-lua51-zlib-${_gitver}
+  sed -i "s#share/lua/cmod#lib/lua/5.1#" CMakeLists.txt
   cmake -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_INSTALL_PREFIX=/usr .
 }
 
-package() {
+package_lua-zlib() {
+  depends=('zlib' 'lua')
+
   cd $srcdir/brimworks-lua-zlib-${_gitver}
   make DESTDIR="$pkgdir" install
-  install -D -m644 "README" "$pkgdir/usr/share/licenses/lua-zlib/README"
+  install -D -m644 "README" "$pkgdir/usr/share/licenses/$pkgname/README"
+}
+
+package_lua51-zlib() {
+  depends=('zlib' 'lua51')
+
+  cd $srcdir/brimworks-lua51-zlib-${_gitver}
+  make DESTDIR="$pkgdir" install
+  install -D -m644 "README" "$pkgdir/usr/share/licenses/$pkgname/README"
 }
diff --git a/community/luaexpat/newconfig b/community/luaexpat/newconfig
deleted file mode 100644
index bc5b25d8f..000000000
--- a/community/luaexpat/newconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-LUA_LIBDIR= usr/lib/lua/5.2
-LUA_DIR= usr/share/lua/5.2
-LUA_INC= /usr/include
-EXPAT_INC= /usr/include
-
-# OS dependent
-LIB_OPTION= -shared
-
-LIBNAME= $T.so.$V
-LUA_VERSION_NUM= 521
-COMPAT_DIR= ../compat/src
-
-# Compilation parameters
-CWARNS = -Wall -pedantic \
-        -Waggregate-return \
-        -Wcast-align \
-        -Wmissing-prototypes \
-        -Wstrict-prototypes \
-        -Wnested-externs \
-        -Wpointer-arith \
-        -Wshadow \
-        -Wwrite-strings
-
-CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \
-   -I$(COMPAT_DIR) -I$(EXPAT_INC) -fPIC
-CC = gcc
diff --git a/community/luajit/Makefile.patch b/community/luajit/Makefile.patch
deleted file mode 100644
index 395a04501..000000000
--- a/community/luajit/Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	2012-10-16 20:30:00.000000000 +0200
-+++ Makefile	2012-10-17 17:17:05.707727130 +0200
-@@ -34,7 +34,7 @@
- INSTALL_SHARE= $(DPREFIX)/share
- INSTALL_INC=   $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
- 
--INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
-+INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit
- INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
- INSTALL_LMODD= $(INSTALL_SHARE)/lua
- INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
-@@ -43,7 +43,7 @@
- INSTALL_MAN= $(INSTALL_SHARE)/man/man1
- INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
- 
--INSTALL_TNAME= luajit-$(VERSION)
-+INSTALL_TNAME= $(INSTALL_TSYMNAME)
- INSTALL_TSYMNAME= luajit
- INSTALL_ANAME= libluajit-$(ABIVER).a
- INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD
index d2221f378..708c4736e 100644
--- a/community/luajit/PKGBUILD
+++ b/community/luajit/PKGBUILD
@@ -1,25 +1,28 @@
-# $Id: PKGBUILD 81293 2012-12-16 11:27:38Z bpiotrowski $
+# $Id: PKGBUILD 85940 2013-03-09 14:50:34Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Chris Brannon <chris@the-brannons.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Anders Bergh <anders1@gmail.com>
 
 pkgname=luajit
-pkgver=2.0.0
-pkgrel=3.1
-pkgdesc='Just-in-time compiler and replacement for Lua 5.1'
+pkgver=2.0.1
+pkgrel=2
+pkgdesc='Just-in-time compiler and drop-in replacement for Lua 5.1'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://luajit.org/'
 license=('MIT')
 depends=('gcc-libs') 
-source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz)
-md5sums=('97a2b87cc0490784f54b64cfb3b8f5ad')
+source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz
+        http://luajit.org/download/v2.0.1_hotfix1.patch)
+sha256sums=('2371cceb53453d8a7b36451e6a0ccdb66236924545d6042ddd4c34e9668990c0'
+            '143898de3fe84455684fddb92947d36c1a51c6a6e3884813fe5e025bd4652368')
 
 build() { 
   cd $srcdir/LuaJIT-$pkgver
 
   [ "$CARCH" = "mips64el" ] && extra="XCFLAGS=-DLUAJIT_DISABLE_JIT"
 
+  patch -Np1 -i $srcdir//v2.0.1_hotfix1.patch
   make amalg PREFIX=/usr $extra
 }
 
diff --git a/community/luajit/luaconf.patch b/community/luajit/luaconf.patch
deleted file mode 100644
index ba9373b52..000000000
--- a/community/luajit/luaconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/luaconf.h.orig	2010-08-24 15:00:00.000000000 +0200
-+++ src/luaconf.h	2010-09-06 15:52:22.043333530 +0200
-@@ -33,7 +33,7 @@
- #define LUA_CPATH_DEFAULT \
-   ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
- #else
--#define LUA_ROOT	"/usr/local/"
-+#define LUA_ROOT	"/usr/"
- #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
- #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
- #ifdef LUA_XROOT
diff --git a/community/luajit/luajit-arch.patch b/community/luajit/luajit-arch.patch
deleted file mode 100644
index 689a87d4e..000000000
--- a/community/luajit/luajit-arch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN LuaJIT-1.1.4.orig/src/luaconf.h LuaJIT-1.1.3/src/luaconf.h
---- LuaJIT-1.1.4.orig/src/luaconf.h	2007-05-24 13:30:00.000000000 +0200
-+++ LuaJIT-1.1.4/src/luaconf.h	2007-11-02 06:28:59.000000000 +0100
-@@ -94,7 +94,7 @@
- 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
- 
- #else
--#define LUA_ROOT	"/usr/local/"
-+#define LUA_ROOT	"/usr/"
- #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
- #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
- #define LUA_PATH_DEFAULT  \
diff --git a/community/luarocks/PKGBUILD b/community/luarocks/PKGBUILD
deleted file mode 100644
index 2c710e072..000000000
--- a/community/luarocks/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 73676 2012-07-13 11:41:36Z cbrannon $
-# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-
-pkgname=luarocks
-pkgver=2.0.10
-pkgrel=1
-pkgdesc='Deployment and management system for Lua modules'
-arch=('i686' 'x86_64' 'mips64el')
-url="http://luarocks.org/"
-depends=('lua' 'unzip' 'zip' 'curl')
-optdepends=('cvs: for fetching sources from CVS repositories'
-            'git: for fetching sources from git repositories'
-            'mercurial: for fetching sources from mercurial repositories'
-            'luasec: HTTPS support'
-            'cmake: for building rocks that use the cmake build system')
-license=('custom')
-options=('!makeflags')
-source=(http://luarocks.org/releases/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # I added --with-downloader=curl, because luarocks already uses curl
-  # for uploading.  May as well use curl for downloading.
-  ./configure --prefix=/usr --sysconfdir=/etc/luarocks --with-downloader=curl
-  make 
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make install DESTDIR="$pkgdir"
-  install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-md5sums=('85cccdbd995b489ae1a9aab33c14b7fc')
diff --git a/community/luarocks/packbinary.patch b/community/luarocks/packbinary.patch
deleted file mode 100644
index 59a46f6e1..000000000
--- a/community/luarocks/packbinary.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
-index af098f3..3c7f440 100644
---- a/src/luarocks/build.lua
-+++ b/src/luarocks/build.lua
-@@ -3,6 +3,7 @@
- -- Builds a rock, compiling its C parts if any.
- module("luarocks.build", package.seeall)
- 
-+local pack = require("luarocks.pack")
- local path = require("luarocks.path")
- local util = require("luarocks.util")
- local rep = require("luarocks.rep")
diff --git a/community/luasec/ChangeLog b/community/luasec/ChangeLog
deleted file mode 100644
index 4a64bc6a7..000000000
--- a/community/luasec/ChangeLog
+++ /dev/null
@@ -1,60 +0,0 @@
-2010-02-15  Dwayne Bent  <dbb.1@liqd.org>
-
-	* PKGBUILD:
-	Install license file
-	[ea00bf4731a9] [tip]
-
-	* PKGBUILD:
-	Updated email address
-	[7dbb9017cecc]
-
-2009-12-19  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.4-1 for changeset 91906cc7dfbd
-	[3c36a2298de6]
-
-	* PKGBUILD, luasec.patch:
-	New upstream version
-	[91906cc7dfbd] [v0.4-1]
-
-2009-08-19  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.3.3-1 for changeset 9635074f31a3
-	[e6b3934bbbba]
-
-	* PKGBUILD:
-	New upstream version
-	[9635074f31a3] [v0.3.3-1]
-
-2009-07-01  Dwayne Bent  <dbb.0@liqd.org>
-
-	* PKGBUILD, luasec.patch:
-	Changed to using custom patch
-	[30893f6a9840]
-
-	* PKGBUILD:
-	Added minimum versions to dependencies
-	[b538b6270f60]
-
-2009-05-22  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.3.2-1 for changeset eacacff733b2
-	[f93b17e1495c]
-
-	* PKGBUILD:
-	New upstream version
-	[eacacff733b2] [v0.3.2-1]
-
-2009-05-11  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.3.1-1 for changeset 9f9bd46fe838
-	[9d25feaa12a5]
-
-	* PKGBUILD:
-	Initial commit.
-	[9f9bd46fe838] [v0.3.1-1]
-
diff --git a/community/luasec/luasec.patch b/community/luasec/luasec.patch
deleted file mode 100644
index 7b0c9d6cc..000000000
--- a/community/luasec/luasec.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.orig	2009-12-19 14:54:45.000000000 -0500
-+++ Makefile	2009-12-19 14:57:22.000000000 -0500
-@@ -1,11 +1,11 @@
- # Inform the location to intall the modules
--LUAPATH=/usr/local/share/lua/5.1
--LUACPATH=/usr/local/lib/lua/5.1
-+LUAPATH=/usr/share/lua/5.1
-+LUACPATH=/usr/lib/lua/5.1
- 
- # Edit the lines below to inform new path, if necessary
- #
--#INCDIR=-I/usr/local/lua-5.1/include -I/usr/local/openssl-0.9.8/include
--#LIBDIR=-L/usr/local/openssl-0.9.8/lib -R/usr/local/openssl-0.9.8/lib
-+INCDIR=-I/usr/include -I/usr/include/openssl
-+LIBDIR=-L/usr/lib
- 
- # For Mac OS X: set the system version
- MACOSX_VERSION=10.4
-@@ -26,7 +26,7 @@
- 	@echo "  * macosx"
- 
- install:
--	@cd src ; $(MAKE) LUACPATH="$(LUACPATH)" LUAPATH="$(LUAPATH)" install
-+	@cd src ; $(MAKE) LUACPATH="$(DESTDIR)$(LUACPATH)" LUAPATH="$(DESTDIR)$(LUAPATH)" install
- 
- linux:
- 	@echo "---------------------"
diff --git a/community/luasocket/lua52.patch b/community/luasocket/lua52.patch
deleted file mode 100644
index 4eef574ee..000000000
--- a/community/luasocket/lua52.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-diff -wbBur luasocket-2.0.2/src/auxiliar.c luasocket-2.0.2.my/src/auxiliar.c
---- luasocket-2.0.2/src/auxiliar.c	2007-10-15 08:21:05.000000000 +0400
-+++ luasocket-2.0.2.my/src/auxiliar.c	2012-11-14 18:23:14.000000000 +0400
-@@ -24,7 +24,7 @@
- * Creates a new class with given methods
- * Methods whose names start with __ are passed directly to the metatable.
- \*-------------------------------------------------------------------------*/
--void auxiliar_newclass(lua_State *L, const char *classname, luaL_reg *func) {
-+void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func) {
-     luaL_newmetatable(L, classname); /* mt */
-     /* create __index table to place methods */
-     lua_pushstring(L, "__index");    /* mt,"__index" */
-diff -wbBur luasocket-2.0.2/src/auxiliar.h luasocket-2.0.2.my/src/auxiliar.h
---- luasocket-2.0.2/src/auxiliar.h	2007-10-15 08:21:05.000000000 +0400
-+++ luasocket-2.0.2.my/src/auxiliar.h	2012-11-14 18:23:42.000000000 +0400
-@@ -35,7 +35,7 @@
- #include "lauxlib.h"
- 
- int auxiliar_open(lua_State *L);
--void auxiliar_newclass(lua_State *L, const char *classname, luaL_reg *func);
-+void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func);
- void auxiliar_add2group(lua_State *L, const char *classname, const char *group);
- void auxiliar_setclass(lua_State *L, const char *classname, int objidx);
- void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx);
-diff -wbBur luasocket-2.0.2/src/except.c luasocket-2.0.2.my/src/except.c
---- luasocket-2.0.2/src/except.c	2007-10-15 08:21:05.000000000 +0400
-+++ luasocket-2.0.2.my/src/except.c	2012-11-14 18:23:23.000000000 +0400
-@@ -21,7 +21,7 @@
- static int do_nothing(lua_State *L);
- 
- /* except functions */
--static luaL_reg func[] = {
-+static luaL_Reg func[] = {
-     {"newtry",    global_newtry},
-     {"protect",   global_protect},
-     {NULL,        NULL}
-diff -wbBur luasocket-2.0.2/src/inet.c luasocket-2.0.2.my/src/inet.c
---- luasocket-2.0.2/src/inet.c	2007-10-15 08:21:05.000000000 +0400
-+++ luasocket-2.0.2.my/src/inet.c	2012-11-14 18:23:47.000000000 +0400
-@@ -21,7 +21,7 @@
- static int inet_global_gethostname(lua_State *L);
- 
- /* DNS functions */
--static luaL_reg func[] = {
-+static luaL_Reg func[] = {
-     { "toip", inet_global_toip },
-     { "tohostname", inet_global_tohostname },
-     { "gethostname", inet_global_gethostname},
-diff -wbBur luasocket-2.0.2/src/luasocket.c luasocket-2.0.2.my/src/luasocket.c
---- luasocket-2.0.2/src/luasocket.c	2007-10-15 08:21:05.000000000 +0400
-+++ luasocket-2.0.2.my/src/luasocket.c	2012-11-14 18:23:26.000000000 +0400
-@@ -47,7 +47,7 @@
- /*-------------------------------------------------------------------------*\
- * Modules and functions
- \*-------------------------------------------------------------------------*/
--static const luaL_reg mod[] = {
-+static const luaL_Reg mod[] = {
-     {"auxiliar", auxiliar_open},
-     {"except", except_open},
-     {"timeout", timeout_open},
-@@ -59,7 +59,7 @@
-     {NULL, NULL}
- };
- 
--static luaL_reg func[] = {
-+static luaL_Reg func[] = {
-     {"skip",      global_skip},
-     {"__unload",  global_unload},
-     {NULL,        NULL}
-diff -wbBur luasocket-2.0.2/src/mime.c luasocket-2.0.2.my/src/mime.c
---- luasocket-2.0.2/src/mime.c	2007-10-15 08:21:05.000000000 +0400
-+++ luasocket-2.0.2.my/src/mime.c	2012-11-14 18:23:31.000000000 +0400
-@@ -48,7 +48,7 @@
- static size_t qppad(UC *input, size_t size, luaL_Buffer *buffer);
- 
- /* code support functions */
--static luaL_reg func[] = {
-+static luaL_Reg func[] = {
-     { "dot", mime_global_dot },
-     { "b64", mime_global_b64 },
-     { "eol", mime_global_eol },
-diff -wbBur luasocket-2.0.2/src/select.c luasocket-2.0.2.my/src/select.c
---- luasocket-2.0.2/src/select.c	2007-10-15 08:21:05.000000000 +0400
-+++ luasocket-2.0.2.my/src/select.c	2012-11-14 18:23:35.000000000 +0400
-@@ -27,7 +27,7 @@
- static int global_select(lua_State *L);
- 
- /* functions in library namespace */
--static luaL_reg func[] = {
-+static luaL_Reg func[] = {
-     {"select", global_select},
-     {NULL,     NULL}
- };
-diff -wbBur luasocket-2.0.2/src/tcp.c luasocket-2.0.2.my/src/tcp.c
---- luasocket-2.0.2/src/tcp.c	2007-10-15 08:21:05.000000000 +0400
-+++ luasocket-2.0.2.my/src/tcp.c	2012-11-14 18:23:38.000000000 +0400
-@@ -38,7 +38,7 @@
- static int meth_dirty(lua_State *L);
- 
- /* tcp object methods */
--static luaL_reg tcp[] = {
-+static luaL_Reg tcp[] = {
-     {"__gc",        meth_close},
-     {"__tostring",  auxiliar_tostring},
-     {"accept",      meth_accept},
-@@ -73,7 +73,7 @@
- };
- 
- /* functions in library namespace */
--static luaL_reg func[] = {
-+static luaL_Reg func[] = {
-     {"tcp", global_create},
-     {NULL, NULL}
- };
-diff -wbBur luasocket-2.0.2/src/timeout.c luasocket-2.0.2.my/src/timeout.c
---- luasocket-2.0.2/src/timeout.c	2007-10-15 08:21:05.000000000 +0400
-+++ luasocket-2.0.2.my/src/timeout.c	2012-11-14 18:23:21.000000000 +0400
-@@ -33,7 +33,7 @@
- static int timeout_lua_gettime(lua_State *L);
- static int timeout_lua_sleep(lua_State *L);
- 
--static luaL_reg func[] = {
-+static luaL_Reg func[] = {
-     { "gettime", timeout_lua_gettime },
-     { "sleep", timeout_lua_sleep },
-     { NULL, NULL }
-diff -wbBur luasocket-2.0.2/src/udp.c luasocket-2.0.2.my/src/udp.c
---- luasocket-2.0.2/src/udp.c	2007-10-15 08:21:05.000000000 +0400
-+++ luasocket-2.0.2.my/src/udp.c	2012-11-14 18:23:44.000000000 +0400
-@@ -43,7 +43,7 @@
- static int meth_dirty(lua_State *L);
- 
- /* udp object methods */
--static luaL_reg udp[] = {
-+static luaL_Reg udp[] = {
-     {"__gc",        meth_close},
-     {"__tostring",  auxiliar_tostring},
-     {"close",       meth_close},
-@@ -76,7 +76,7 @@
- };
- 
- /* functions in library namespace */
--static luaL_reg func[] = {
-+static luaL_Reg func[] = {
-     {"udp", global_create},
-     {NULL, NULL}
- };
-diff -wbBur luasocket-2.0.2/src/unix.c luasocket-2.0.2.my/src/unix.c
---- luasocket-2.0.2/src/unix.c	2007-10-15 08:21:05.000000000 +0400
-+++ luasocket-2.0.2.my/src/unix.c	2012-11-14 18:23:17.000000000 +0400
-@@ -39,7 +39,7 @@
- static const char *unix_trybind(p_unix un, const char *path);
- 
- /* unix object methods */
--static luaL_reg un[] = {
-+static luaL_Reg un[] = {
-     {"__gc",        meth_close},
-     {"__tostring",  auxiliar_tostring},
-     {"accept",      meth_accept},
-@@ -71,7 +71,7 @@
- };
- 
- /* our socket creation function */
--static luaL_reg func[] = {
-+static luaL_Reg func[] = {
-     {"unix", global_create},
-     {NULL,          NULL}
- };
diff --git a/community/luasocket/luasocket-arch.patch b/community/luasocket/luasocket-arch.patch
deleted file mode 100644
index f578831eb..000000000
--- a/community/luasocket/luasocket-arch.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -wbBur luasocket-2.0.2/config luasocket-2.0.2.my/config
---- luasocket-2.0.2/config	2007-10-15 08:21:05.000000000 +0400
-+++ luasocket-2.0.2.my/config	2007-10-15 12:22:16.000000000 +0400
-@@ -30,8 +30,8 @@
- #
- #INSTALL_TOP_SHARE=/usr/local/share/lua/5.0
- #INSTALL_TOP_LIB=/usr/local/lib/lua/5.0
--INSTALL_TOP_SHARE=/usr/local/share/lua/5.1
--INSTALL_TOP_LIB=/usr/local/lib/lua/5.1
-+INSTALL_TOP_SHARE=$(DESTDIR)/usr/share/lua/5.1
-+INSTALL_TOP_LIB=$(DESTDIR)/usr/lib/lua/5.1
- 
- INSTALL_DATA=cp
- INSTALL_EXEC=cp
diff --git a/community/luasql/PKGBUILD b/community/luasql/PKGBUILD
index a52f2da10..cab6c3e84 100644
--- a/community/luasql/PKGBUILD
+++ b/community/luasql/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81397 2012-12-19 13:39:14Z seblu $
+# $Id: PKGBUILD 87008 2013-03-25 19:16:48Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sébastien Luttringer <seblu@archlinux.org>
 # Contributor: Anders Bergh <anders1@gmail.com>
@@ -6,11 +6,11 @@
 pkgbase=luasql
 pkgname=('lua-sql-mysql' 'lua-sql-postgres' 'lua-sql-sqlite')
 pkgver=2.2.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.keplerproject.org/luasql/'
 license=('MIT')
-makedepends=('lua' 'libmysqlclient' 'postgresql-libs' 'sqlite')
+makedepends=('lua' 'libmariadbclient' 'postgresql-libs' 'sqlite')
 source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz"
         'lua52.patch')
 md5sums=('59d72db444c6369c936d4f03694db6b7'
@@ -30,7 +30,7 @@ build() {
 
 package_lua-sql-mysql() {
   pkgdesc='MySQL module for Lua'
-  depends=('lua' 'libmysqlclient')
+  depends=('lua' 'libmariadbclient')
   conflicts=('luasql-mysql')
   replaces=('luasql-mysql')
 
diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD
index 3ccb9e0fc..f52844ac4 100644
--- a/community/luminancehdr/PKGBUILD
+++ b/community/luminancehdr/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 78933 2012-10-27 23:44:52Z ebelanger $
+# $Id: PKGBUILD 88633 2013-04-20 18:17:17Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Dmitry N. Shilov <stormblast@land.ru>
 
 pkgname=luminancehdr
-pkgver=2.3.0
-pkgrel=4
+pkgver=2.3.1
+pkgrel=1
 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qtpfsgui.sourceforge.net/'
 license=('GPL')
-depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qt' 'qtwebkit')
-makedepends=('cmake')
+depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qtwebkit')
+makedepends=('cmake' 'boost' 'gtest')
 optdepends=('hugin: align image stack functionality')
 install=$pkgname.install
 changelog=$pkgname.changelog
 options=('!emptydirs')
 source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/luminance-hdr-${pkgver}.tar.bz2)
-sha256sums=('dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676')
+sha256sums=('7a2a81cd0f2da6b6780bdd47e5f902c9dfaeb8107d763ea63007b6fcdcb4d23b')
 
 build() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
+  cd "${srcdir}"
 
+  # x86-specific options.
+  sed -i '/ADD_DEFINITIONS(-ffast-math -msse2 -msse)/d' cmake/CompilerSettings.cmake
   cmake -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
+  cd "${srcdir}"
 
   make DESTDIR="${pkgdir}" install
 }
diff --git a/community/luminancehdr/luminance-hdr-2.1.0-libraw.patch b/community/luminancehdr/luminance-hdr-2.1.0-libraw.patch
deleted file mode 100644
index 8472a7422..000000000
--- a/community/luminancehdr/luminance-hdr-2.1.0-libraw.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp.orig
-+++ luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp
-@@ -94,7 +94,6 @@
-   RawProcessor.set_progress_handler(cb, callback_data);
-   int ret;
- 
--  OUT.filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
-   OUT.output_bps = 16;
- 
-   //OUT.gamm[0] = 1/2.4;   //sRGB
diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog
index c3c1f1197..908eb4476 100644
--- a/community/luminancehdr/luminancehdr.changelog
+++ b/community/luminancehdr/luminancehdr.changelog
@@ -1,3 +1,6 @@
+2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* luminancehdr 2.3.1-1
+
 2012-07-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* luminancehdr 2.3.0-2 exiv2-0.23 rebuild
 
diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD
index 684fe2a9c..166c74c70 100644
--- a/community/luxrays/PKGBUILD
+++ b/community/luxrays/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 83257 2013-01-28 16:49:44Z stephane $
+# $Id: PKGBUILD 87419 2013-03-31 19:18:23Z stephane $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=luxrays
-pkgver=1.1
-_pkgver=589aa5dac899
-pkgrel=4
+pkgver=1.2
+_pkgver=475fbf15f0ca
+pkgrel=2
 pkgdesc="Accelerate the ray intersection process by using GPUs"
 arch=('i686' 'x86_64')
 url="http://www.luxrender.net/"
 license=('GPL')
-depends=('freeimage' 'freeglut' 'glew' 'libcl')
-makedepends=('cmake' 'boost' 'mesa' 'opencl-headers')
+depends=('freeimage' 'libcl' 'libgl')
+optdepends=('glew: demos (SmallLuxGPU etc.)' 'freeglut: demos (SmallLuxGPU etc.)'
+            'boost-libs: demos (SmallLuxGPU etc.)')
+makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut')
 source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('7513d71148fa14bc1779b816816580b9')
+md5sums=('ac98e9a42ecc20d97d4c12dcdf17e315')
 
 build() {
   cd "$srcdir/luxrender-$pkgname-$_pkgver"
diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD
deleted file mode 100644
index e3c6f12e6..000000000
--- a/community/luxrender/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 83258 2013-01-28 16:49:44Z stephane $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Initial contributor: flixie <69one@gmx.net>
-# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
-pkgname=luxrender
-pkgver=1.1
-_pkgver=4b4289cda943
-pkgrel=4
-pkgdesc="Rendering system for physically correct, unbiased image synthesis"
-arch=('i686' 'x86_64')
-url="http://www.luxrender.net/"
-license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr' 'libcl')
-optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
-            'python: Python interface (pylux)'
-            'nvidia-utils: OpenCL support for nVidia GPUs' \
-            'amdstream: OpenCL support for AMD GPUs' \
-            'intel-opencl-sdk: OpenCL support for Intel CPUs')
-makedepends=('cmake' 'boost' 'mesa' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers')
-source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2)
-md5sums=('accca65afdc4cc38db49a6e54f20e0f2')
-
-build() {
-  cd "$srcdir"/luxrender-lux-$_pkgver
-
-  # fix the installation
-  sed -i '/.*wxgui.*/ d' CMakeLists.txt
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLUXRAYS_DISABLE_OPENCL=OFF \
-    -DPYTHON_CUSTOM=ON \
-    -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \
-    -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \
-    .
-  make
-}
-
-package() {
-  cd "$srcdir"/luxrender-lux-$_pkgver
-  make DESTDIR="$pkgdir" install
-
-  # fix library path on x86_64
-  [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
-
-  #install pylux
-  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/luxrender/boost_1.50_fix.diff b/community/luxrender/boost_1.50_fix.diff
deleted file mode 100644
index d7231867e..000000000
--- a/community/luxrender/boost_1.50_fix.diff
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -rup luxrender-lux-008805644181/core/film.cpp luxrender-lux-008805644181.new/core/film.cpp
---- luxrender-lux-008805644181/core/film.cpp	2012-06-02 08:40:33.000000000 +0200
-+++ luxrender-lux-008805644181.new/core/film.cpp	2012-07-07 15:44:59.867492295 +0200
-@@ -618,7 +618,7 @@ Film::Film(u_int xres, u_int yres, Filte
- 	int yRealHeight = Floor2Int(yPixelStart + .5f + yPixelCount + filter->yWidth) - Floor2Int(yPixelStart + .5f - filter->yWidth);
- 	samplePerPass = xRealWidth * yRealHeight;
- 
--	boost::xtime_get(&creationTime, boost::TIME_UTC);
-+	boost::xtime_get(&creationTime, boost::TIME_UTC_);
- 
- 	//Queryable parameters
- 	AddIntAttribute(*this, "xResolution", "Horizontal resolution (pixels)", &Film::GetXResolution);
-@@ -855,7 +855,7 @@ void Film::AddSampleCount(float count) {
- 	if (haltTime > 0) {
- 		// Check if we have met the enough rendering time condition
- 		boost::xtime t;
--		boost::xtime_get(&t, boost::TIME_UTC);
-+		boost::xtime_get(&t, boost::TIME_UTC_);
- 		if (t.sec - creationTime.sec > haltTime)
- 			enoughSamplesPerPixel = true;
- 	}
-diff -rup luxrender-lux-008805644181/core/photonmap.cpp luxrender-lux-008805644181.new/core/photonmap.cpp
---- luxrender-lux-008805644181/core/photonmap.cpp	2012-06-02 08:40:33.000000000 +0200
-+++ luxrender-lux-008805644181.new/core/photonmap.cpp	2012-07-07 15:44:59.870825579 +0200
-@@ -474,13 +474,13 @@ void PhotonMapPreprocess(const RandomGen
- 
- 	boost::xtime photonShootingStartTime;
- 	boost::xtime lastUpdateTime;
--	boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC);
--	boost::xtime_get(&lastUpdateTime, boost::TIME_UTC);
-+	boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC_);
-+	boost::xtime_get(&lastUpdateTime, boost::TIME_UTC_);
- 	u_int nshot = 0;
- 	while ((!radianceDone || !directDone || !causticDone || !indirectDone) && !scene.terminated) {
- 		// Dade - print some progress information
- 		boost::xtime currentTime;
--		boost::xtime_get(&currentTime, boost::TIME_UTC);
-+		boost::xtime_get(&currentTime, boost::TIME_UTC_);
- 		if (currentTime.sec - lastUpdateTime.sec > 5) {
- 			ss.str("");
- 			ss << "Photon shooting progress: Direct[" << directPhotons.size();
-@@ -686,7 +686,7 @@ void PhotonMapPreprocess(const RandomGen
- 		return;
- 
- 	boost::xtime photonShootingEndTime;
--	boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC);
-+	boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC_);
- 	LOG(LUX_INFO,LUX_NOERROR) << "Photon shooting done (" << ( photonShootingEndTime.sec - photonShootingStartTime.sec ) << "s)";
- 
- 	if (computeRadianceMap) {
-@@ -700,7 +700,7 @@ void PhotonMapPreprocess(const RandomGen
- 		for (u_int i = 0; i < radiancePhotons.size(); ++i) {
- 			// Dade - print some progress info
- 			boost::xtime currentTime;
--			boost::xtime_get(&currentTime, boost::TIME_UTC);
-+			boost::xtime_get(&currentTime, boost::TIME_UTC_);
- 			if (currentTime.sec - lastUpdateTime.sec > 5) {
- 				LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computation progress: " << i << " (" << (100 * i / radiancePhotons.size()) << "%)";
- 
-@@ -740,7 +740,7 @@ void PhotonMapPreprocess(const RandomGen
- 
- 
- 		boost::xtime radianceComputeEndTime;
--		boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC);
-+		boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC_);
- 		LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computed (" << ( radianceComputeEndTime.sec - photonShootingEndTime.sec ) << "s)";
- 	}
- 
-diff -rup luxrender-lux-008805644181/core/renderfarm.cpp luxrender-lux-008805644181.new/core/renderfarm.cpp
---- luxrender-lux-008805644181/core/renderfarm.cpp	2012-06-02 08:40:33.000000000 +0200
-+++ luxrender-lux-008805644181.new/core/renderfarm.cpp	2012-07-07 15:44:59.870825579 +0200
-@@ -100,7 +100,7 @@ void FilmUpdaterThread::updateFilm(FilmU
- 	// Dade - thread to update the film with data from servers
- 
- 	boost::xtime reft;
--	boost::xtime_get(&reft, boost::TIME_UTC);
-+	boost::xtime_get(&reft, boost::TIME_UTC_);
- 
- 	while (filmUpdaterThread->signal == SIG_NONE) {
- 		// Dade - check signal every 1 sec
-@@ -108,7 +108,7 @@ void FilmUpdaterThread::updateFilm(FilmU
- 		for(;;) {
- 			// Dade - sleep for 1 sec
- 			boost::xtime xt;
--			boost::xtime_get(&xt, boost::TIME_UTC);
-+			boost::xtime_get(&xt, boost::TIME_UTC_);
- 			xt.sec += 1;
- 			boost::thread::sleep(xt);
- 
-diff -rup luxrender-lux-008805644181/film/fleximage.cpp luxrender-lux-008805644181.new/film/fleximage.cpp
---- luxrender-lux-008805644181/film/fleximage.cpp	2012-06-02 08:40:33.000000000 +0200
-+++ luxrender-lux-008805644181.new/film/fleximage.cpp	2012-07-07 15:44:59.877492150 +0200
-@@ -191,7 +191,7 @@ FlexImageFilm::FlexImageFilm(u_int xres,
- 	m_CameraResponseEnabled = d_CameraResponseEnabled = m_CameraResponseFile != "";
- 
- 	// init timer
--	boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC);
-+	boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC_);
- 	lastWriteFLMTime = lastWriteImageTime;
- }
- 
-@@ -812,7 +812,7 @@ void FlexImageFilm::CheckWriteOuputInter
- {
- 	// Check write output interval
- 	boost::xtime currentTime;
--	boost::xtime_get(&currentTime, boost::TIME_UTC);
-+	boost::xtime_get(&currentTime, boost::TIME_UTC_);
- 	bool timeToWriteImage = (currentTime.sec - lastWriteImageTime.sec > writeInterval);
- 	bool timeToWriteFLM = (currentTime.sec - lastWriteFLMTime.sec > flmWriteInterval);
- 
-@@ -834,7 +834,7 @@ void FlexImageFilm::CheckWriteOuputInter
- 	// WriteImage can take a very long time to be executed (i.e. by saving
- 	// the film. It is better to refresh timestamps after the
- 	// execution of WriteImage instead than before.
--	boost::xtime_get(&currentTime, boost::TIME_UTC);
-+	boost::xtime_get(&currentTime, boost::TIME_UTC_);
- 
- 	if (timeToWriteImage)
- 		lastWriteImageTime = currentTime;
-diff -rup luxrender-lux-008805644181/renderers/sppmrenderer.h luxrender-lux-008805644181.new/renderers/sppmrenderer.h
---- luxrender-lux-008805644181/renderers/sppmrenderer.h	2012-06-02 08:40:33.000000000 +0200
-+++ luxrender-lux-008805644181.new/renderers/sppmrenderer.h	2012-07-07 15:44:59.874158864 +0200
-@@ -126,7 +126,7 @@ public:
- 	{
- 		while (state == PAUSE && !boost::this_thread::interruption_requested()) {
- 			boost::xtime xt;
--			boost::xtime_get(&xt, boost::TIME_UTC);
-+			boost::xtime_get(&xt, boost::TIME_UTC_);
- 			xt.sec += 1;
- 			boost::thread::sleep(xt);
- 		}
diff --git a/community/lwm/PKGBUILD b/community/lwm/PKGBUILD
index 31e705bb3..f8e5cb508 100644
--- a/community/lwm/PKGBUILD
+++ b/community/lwm/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=lwm
 pkgver=1.2.2
-pkgrel=3
+pkgrel=3.1
 pkgdesc="a very light weight window manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.jfc.org.uk/software/lwm.html"
diff --git a/community/lwp/PKGBUILD b/community/lwp/PKGBUILD
index 8035e127b..0b7fd4329 100644
--- a/community/lwp/PKGBUILD
+++ b/community/lwp/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=lwp
 pkgver=2.6
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Light weight process library"
 arch=(i686 x86_64 'mips64el')
 url="http://www.coda.cs.cmu.edu"
diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD
index 618c70728..e5944628f 100644
--- a/community/lxc/PKGBUILD
+++ b/community/lxc/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 80003 2012-11-15 11:55:57Z spupykin $
+# $Id: PKGBUILD 87850 2013-04-08 09:23:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 # Contributor: Jonathan Liu <net147@gmail.com>
 # Maintainer: Jon Nordby <jononor@gmail.com>
 
 pkgname=lxc
-pkgver=0.8.0
+pkgver=0.9.0
 epoch=1
-pkgrel=2
+pkgrel=1
 pkgdesc="Linux Containers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lxc.sourceforge.net/"
 depends=('bash' 'perl')
 license=('LGPL')
 source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz")
-md5sums=('7304fa57146ce687f749b5df876bb20d')
+md5sums=('8552a4479090616f4bc04d8473765fc9')
 
 build() {
   cd "$srcdir/$pkgname-${pkgver/_/-}"
diff --git a/community/lxde-common/PKGBUILD b/community/lxde-common/PKGBUILD
deleted file mode 100644
index 2bf03bb55..000000000
--- a/community/lxde-common/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 53456 2011-08-03 20:00:26Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=lxde-common
-pkgver=0.5.5
-pkgrel=1
-pkgdesc="Common files of the LXDE Desktop"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
-groups=('lxde')
-depends=('libx11' 'glib2' 'lxde-icon-theme')
-url="http://lxde.org/"
-# startlxde is useless without lxsession 
-makedepends=(automake)
-optdepends=(lxsession-lite)
-backup=(etc/xdg/lxsession/LXDE/{desktop.conf,autostart})
-source=("http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e51a6b2a815a89fda1f497b509465a97')
-
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    autoreconf
-    ./configure --sysconfdir=/etc --prefix=/usr
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-    install -Dm644 lxde-logout.desktop \
-      ${pkgdir}/usr/share/applications/lxde-logout.desktop
-}
diff --git a/community/lxde-common/lxde-common.install b/community/lxde-common/lxde-common.install
deleted file mode 100644
index d2226670d..000000000
--- a/community/lxde-common/lxde-common.install
+++ /dev/null
@@ -1,13 +0,0 @@
-ICON_PATH=usr/share/icons/nuoveXT2
-
-post_install() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-}
diff --git a/community/lxdm/lxdm-daemon b/community/lxdm/lxdm-daemon
deleted file mode 100644
index 68eb6225d..000000000
--- a/community/lxdm/lxdm-daemon
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID `which lxdm-binary`)
-case "$1" in
-  start)
-    stat_busy "Starting LXDM Display Manager"
-    [ -z "$PID" ] && /usr/sbin/lxdm -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lxdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping LXDM Display Manager"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lxdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/lxnm/PKGBUILD b/community/lxnm/PKGBUILD
index 342dcd481..93b03e616 100644
--- a/community/lxnm/PKGBUILD
+++ b/community/lxnm/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=lxnm
 pkgver=0.2.2
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A Network Manager (Part of LXDE)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
diff --git a/community/lxtask/PKGBUILD b/community/lxtask/PKGBUILD
index fc6aec61a..526fbfd53 100644
--- a/community/lxtask/PKGBUILD
+++ b/community/lxtask/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 pkgname=lxtask
 pkgver=0.1.4
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc="Task manager of the LXDE Desktop"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -16,6 +16,7 @@ md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
+	sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac
 	autoreconf
 	./configure --sysconfdir=/etc --prefix=/usr
 	make
diff --git a/community/mac/PKGBUILD b/community/mac/PKGBUILD
deleted file mode 100644
index 3e9bef667..000000000
--- a/community/mac/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: schuay <jakob.gruber@gmail.com>
-# Contributor: stonecrest <stonecrest[at]gmail[dot]com>
-
-pkgname=mac
-pkgver='3.99u4b5'
-_pkgver='3.99-u4-b5-s7'
-pkgrel=5
-pkgdesc='APE codec and decompressor'
-arch=('i686' 'x86_64')
-url='http://etree.org/shnutils/shntool/'
-license=('custom')
-depends=('gcc-libs')
-makedepends=('yasm')
-_baseurl='http://etree.org/shnutils/shntool/support/formats/ape/unix'
-source=("${_baseurl}/${_pkgver}/${pkgname}-${_pkgver}.tar.gz")
-md5sums=('74df3c96476636387ddd12255b03bebe')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${_pkgver}
-
-  ./configure --prefix=/usr --enable-assembly=yes 
-  make
-}
-package() {
-  cd "${srcdir}"/${pkgname}-${_pkgver}
-
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 src/License.htm \
-      "${pkgdir}"/usr/share/licenses/${pkgname}/license.htm
-}
diff --git a/community/macchanger/PKGBUILD b/community/macchanger/PKGBUILD
index 4d9b37ea1..a42f7aa87 100644
--- a/community/macchanger/PKGBUILD
+++ b/community/macchanger/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 82851 2013-01-25 02:08:04Z kkeen $
+# $Id: PKGBUILD 87606 2013-04-04 02:46:04Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=macchanger
-pkgver=1.5.0
-pkgrel=6
+pkgver=1.6.0
+pkgrel=1
 pkgdesc="A small utility to change your NIC's MAC address"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ftp.gnu.org/gnu/macchanger"
 license=('GPL')
 source=(http://ftp.gnu.org/gnu/macchanger/${pkgname}-${pkgver}.tar.gz)
-md5sums=('79b7cdaeca3d8ebafa764c4b0dd03ab7')
+md5sums=('1257b18e9067a8192c9747da52aabdda')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/madman/PKGBUILD b/community/madman/PKGBUILD
index 2a6cc72c7..c5b08cbfc 100644
--- a/community/madman/PKGBUILD
+++ b/community/madman/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56740 2011-10-11 17:41:27Z spupykin $
+# $Id: PKGBUILD 87994 2013-04-09 21:36:20Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
 # Contributor: Hugo Ideler <hugoideler@dse.nl>
@@ -29,7 +29,6 @@ md5sums=('36e7a4619ebe83ed939c7ae09c16d535'
          '685a6fb13c861b82950dd6a77fd02120')
 
 build() {
-  . /etc/profile.d/qt3.sh
   cd $srcdir/$pkgname-$pkgver.orig
 
   patch -p1 -i $srcdir/madman_0.94beta1.20060611-2.diff
@@ -42,11 +41,17 @@ build() {
 	,build/release/designer/tsetlistview.h
   sed -i '26,1i#include <memory>' utility/base.h
   sed -i 's|python|python2|' designer/make_imagedata httpd/make_webdata doc/update_format_tag
-  cp $srcdir/fake-g++.sh ./g++
+  install -m755 $srcdir/fake-g++.sh ./g++
   export PATH=.:$PATH
 
-  scons
-  scons install_to=$pkgdir/usr prefix=/usr install
+  scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver.orig
+
+  scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3 \
+    install_to=$pkgdir/usr prefix=/usr install
 
   install -Dm644 $srcdir/madman_logo.png $pkgdir/usr/share/icons/madman_logo.png
   install -Dm644 $srcdir/madman_logo_mini.png $pkgdir/usr/share/icons/mini/madman_logo_mini.png
diff --git a/community/mailman/mailman.rc b/community/mailman/mailman.rc
deleted file mode 100644
index 79c1cd661..000000000
--- a/community/mailman/mailman.rc
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-MAILMANCTL=/usr/lib/mailman/bin/mailmanctl
-
-case "$1" in
-  start)
-    status 'Starting GNU Mailing List Manager' $MAILMANCTL -q start &&
-      add_daemon ${0##*/} || exit 1
-  ;;
-  stop)
-    status 'Stoping GNU Mailing List Manager' $MAILMANCTL -q stop &&
-      rm_daemon ${0##*/} || exit 1
-  ;;
-  reload)
-    status 'Reloading GNU Mailing List Manager' $MAILMANCTL -q restart
-  ;;
-  restart)
-    $0 stop && $0 start
-  ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|restart|reload}" >&2
-  ;;
-esac
-
-:
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/makedev/PKGBUILD b/community/makedev/PKGBUILD
index 882035c9d..d6cf65b99 100644
--- a/community/makedev/PKGBUILD
+++ b/community/makedev/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=makedev
 pkgver=3.23_1
-pkgrel=1
+pkgrel=1.1
 pkgdesc='The ubiquitous script to create static device nodes'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
diff --git a/community/mandvd/PKGBUILD b/community/mandvd/PKGBUILD
index 4c5abc0cc..3519ac8dd 100644
--- a/community/mandvd/PKGBUILD
+++ b/community/mandvd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65689 2012-02-21 21:57:30Z jlichtblau $
+# $Id: PKGBUILD 87997 2013-04-09 21:40:35Z eric $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com>
 # Contributor: Jesus Lazaro Plaza <jesuslazaro84@gmail.com>
@@ -12,16 +12,18 @@ url="http://www.kde-apps.org/content/show.php/ManDVD?content=83906"
 license=('GPL')
 depends=('dvd+rw-tools>=5.21.4' 'dvd-slideshow>=0.7.5' 'mjpegtools>=1.8.0' 'mplayer' 'qt3' 'xine-ui>=0.99.4')
 changelog=$pkgname.changelog
-source=(http://ftp.sh.cvut.cz/MIRRORS/vector/veclinux-7.0/source/abs/xap/$pkgname/$pkgname-$pkgver-1.fc12.tar.gz)
+source=(http://vectorlinux.osuosl.org/veclinux-7.0/source/abs/xap/$pkgname/$pkgname-$pkgver-1.fc12.tar.gz)
 sha256sums=('967fd66da31f0619001b3aaea494ab41579ab7ffdc6a1b0a51a4a4add012eb9c')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 
-  source /etc/profile.d/qt3.sh
-  ${QTDIR}/bin/qmake
+  qmake-qt3
   sed -i "s|O2|O1|" ./Makefile
-  make
+  sed -i 's|-I$(QTDIR)/include|-I/usr/include/qt3|' Makefile
+  sed -i '55 i\#include <unistd.h>' main.cpp
+  sed -i '28 i\#include <unistd.h>' mandvd.cpp
+  make QTDIR=/usr MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3
 }
 
 package() {
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index 0f39e4a93..2d1d0983e 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83819 2013-02-05 10:57:53Z spupykin $
+# $Id: PKGBUILD 87421 2013-03-31 19:18:26Z stephane $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Dent <thewinch@gmail.com>
 # Contributor: orbisvicis <orbisvicis@gmail.com>
 
 pkgname=mapnik
 pkgver=2.1.0
-pkgrel=7
+pkgrel=9
 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mapnik.org/"
@@ -23,11 +23,17 @@ optdepends=('libxslt:         Web Map Service'
             'mod_wsgi2:       Web Map Service')
 makedepends=('scons' 'boost')
 install="mapnik.install"
-source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2")
-md5sums=('d580c558a957444873bec9e24526b0a0')
+source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2"
+        "mapnik-2.1.0-compile-fix-for-boost-1.53.patch")
+md5sums=('d580c558a957444873bec9e24526b0a0'
+         'fb456216b052742319428f65f1c979d6')
 
 build() {
   cd "$srcdir/$pkgname-v$pkgver"
+
+  # https://github.com/mapnik/mapnik/issues/1658
+  patch -Np1 -i "$srcdir/mapnik-2.1.0-compile-fix-for-boost-1.53.patch"
+
   sed -i 's|lib64|lib|g' SConstruct
   sed -i 's|python|python2|' \
 	utils/performance/mapnik-speed-check \
@@ -36,7 +42,7 @@ build() {
     PREFIX="/usr" \
     INPUT_PLUGINS=all \
     DESTDIR="$pkgdir"
-  scons
+  scons $MAKEFLAGS
 }
 
 package(){
diff --git a/community/mapnik/gcc47.patch b/community/mapnik/gcc47.patch
deleted file mode 100644
index 0532e0c21..000000000
--- a/community/mapnik/gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mapnik-0.7.1/include/mapnik/factory.hpp~	2010-03-22 16:40:04.000000000 +0000
-+++ mapnik-0.7.1/include/mapnik/factory.hpp	2012-04-05 15:55:13.460191219 +0000
-@@ -84,7 +84,7 @@
-             {
-                 return (pos->second)(file);
-             }
--            return on_unknown_type(key);
-+            return this->on_unknown_type(key);
-         }
-     };
- }
diff --git a/community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch b/community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
new file mode 100644
index 000000000..00b37c08f
--- /dev/null
+++ b/community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
@@ -0,0 +1,36 @@
+From cf70b9959a45b9ab6af4a34824a5e4e80ce1d05c Mon Sep 17 00:00:00 2001
+From: Dane Springmeyer <dane@dbsgeo.com>
+Date: Sun, 10 Feb 2013 07:24:35 -0800
+Subject: [PATCH] fix compile of json feature_collection grammar when building
+ against >= boost 1.52 - refs #1658 and #1716
+
+---
+ src/json/feature_collection_parser.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/json/feature_collection_parser.cpp b/src/json/feature_collection_parser.cpp
+index 3faeda7..51ad824 100644
+--- a/src/json/feature_collection_parser.cpp
++++ b/src/json/feature_collection_parser.cpp
+@@ -20,12 +20,17 @@
+  *
+  *****************************************************************************/
+ 
++// TODO https://github.com/mapnik/mapnik/issues/1658
++#include <boost/version.hpp>
++#if BOOST_VERSION >= 105200
++#define BOOST_SPIRIT_USE_PHOENIX_V3
++#endif
++
+ // mapnik
+ #include <mapnik/json/feature_collection_parser.hpp>
+ #include <mapnik/json/feature_collection_grammar.hpp>
+ 
+ // boost
+-#include <boost/version.hpp>
+ #include <boost/spirit/include/qi.hpp>
+ #include <boost/spirit/include/support_multi_pass.hpp>
+ 
+-- 
+1.8.1.5
+
diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD
deleted file mode 100644
index d2a361d9d..000000000
--- a/community/mariadb/PKGBUILD
+++ /dev/null
@@ -1,140 +0,0 @@
-# $Id: PKGBUILD 83403 2013-01-31 12:12:11Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-
-pkgbase=mariadb
-pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
-pkgver=5.5.29
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://mariadb.org/"
-makedepends=('cmake' 'openssl' 'zlib')
-options=('!libtool')
-source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz
-        service rc.d tmpfiles.conf)
-sha256sums=('b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74'
-            'd9f3d0a897e2e8d5d07c19898ed4c1a4a1c08dfe09f6854f90e79e055e48c02e'
-            'a0bfe75c035fa32a10d04238932f5e7ad11829b7fbdb1b8f8997ee645ae1b924'
-            '08daa863ddd50aff0b608621ed26936919211e286440951dca5866141291004d')
-
-build() {
-  cd $srcdir
-  mkdir build
-  cd build
-
-  # CFLAGS/CXXFLAGS as suggested upstream
-  CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
-  CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
-
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc/mysql \
-    -DMYSQL_DATADIR=/var/lib/mysql \
-    -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
-    -DDEFAULT_CHARSET=utf8 \
-    -DDEFAULT_COLLATION=utf8_general_ci \
-    -DENABLED_LOCAL_INFILE=ON \
-    -DINSTALL_INFODIR=share/mysql/docs \
-    -DINSTALL_MANDIR=share/man \
-    -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
-    -DINSTALL_SCRIPTDIR=bin \
-    -DINSTALL_INCLUDEDIR=include/mysql \
-    -DINSTALL_DOCREADMEDIR=share/mysql \
-    -DINSTALL_SUPPORTFILESDIR=share/mysql \
-    -DINSTALL_MYSQLSHAREDIR=share/mysql \
-    -DINSTALL_DOCDIR=share/mysql/docs \
-    -DINSTALL_SHAREDIR=share/mysql \
-    -DWITH_READLINE=ON \
-    -DWITH_ZLIB=system \
-    -DWITH_SSL=system \
-    -DWITH_LIBWRAP=OFF \
-    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
-    -DWITH_EXTRA_CHARSETS=complex \
-    -DWITH_EMBEDDED_SERVER=ON \
-    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
-    -DWITH_PARTITION_STORAGE_ENGINE=1 \
-    -DWITH_PBXT_STORAGE_ENGINE=1 \
-    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
-    -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-
-  make
-}
-
-package_libmariadbclient(){
-  pkgdesc="MariaDB client libraries"
-  depends=('openssl')
-  conflicts=('libmysqlclient')
-  provides=("libmysqlclient=${pkgver}")
-  
-  cd "${srcdir}"/build
-  for dir in include libmysql libmysqld libservices; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
-
-  install -d "${pkgdir}"/usr/bin
-  install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/
-  install -d "${pkgdir}"/usr/share/man/man1
-  for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
-  done
-}
-
-package_mariadb-clients() {
-  pkgdesc="MariaDB client tools"
-  depends=('libmariadbclient')
-  conflicts=('mysql-clients')
-  provides=("mysql-clients=${pkgver}")
-  
-  cd "${srcdir}"/build
-  make -C client DESTDIR="${pkgdir}" install
-
-  # install man pages
-  install -d "${pkgdir}"/usr/share/man/man1
-  for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
-  done
-
-  # provided by mariadb
-  rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
-}
-
-package_mariadb() {
-  pkgdesc="A fast SQL database server, drop-in replacement for MySQL"
-  backup=('etc/mysql/my.cnf')
-  install=mariadb.install
-  depends=('mariadb-clients')
-  conflicts=('mysql')
-  provides=("mysql=${pkgver}")
-  optdepends=('perl-dbi' 'perl-dbd-mysql')
-  options=('emptydirs')
-
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf
-  install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/mysqld
-
-  install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/mysqld.service
-  install -Dm644 "${srcdir}"/tmpfiles.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysql.conf
-
-  # provided by libmariadbclient
-  rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm "${pkgdir}"/usr/lib/libmysql*
-  rm -r "${pkgdir}"/usr/include/
-  rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-  
-  # provided by mariadb-clients
-  rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
-  rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
-
-  # not needed
-  rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench}
-  rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
-
-  install -dm700 "${pkgdir}"/var/lib/mysql
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/mariadb/mariadb.install b/community/mariadb/mariadb.install
deleted file mode 100644
index 4ac50ec94..000000000
--- a/community/mariadb/mariadb.install
+++ /dev/null
@@ -1,47 +0,0 @@
-post_install(){
-  groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-  usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-  chown -R mysql:mysql var/lib/mysql &>/dev/null
-
-  if [[ ! -d run/mysqld ]]; then
-    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf
-  fi
-}
-
-post_upgrade(){
-  getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
-  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-
-  if [[ ! -d run/mysqld ]]; then
-    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf
-  fi
-
-  if [[ "$(vercmp $2 5.5)" -lt 0 ]]; then
-    echo ">>> Major version update. Consider restart the service, and"
-    echo "    then running mysql_upgrade after it."
-  fi
-
-  if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
-    for x in data/*; do
-      cp -r $x var/lib/mysql/
-    done
-    rm -rf data
-  fi
-
-  if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then
-    echo ">>> mysql.service has been renamed to mysqld.service to keep"
-    echo "    consistency with MySQL package." 
-  fi
-}
-
-post_remove(){
-  if getent passwd mysql >/dev/null 2>&1; then
-    userdel mysql
-  fi
-  if getent group mysql >/dev/null 2>&1; then
-    groupdel mysql
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/mariadb/mysqld b/community/mariadb/mysqld
deleted file mode 100755
index e9fe8f5a8..000000000
--- a/community/mariadb/mysqld
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-getPID() {
-   echo $(pgrep -u mysql mysqld 2>/dev/null);
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting MariaDB Server"
-    [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
-    if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        timeo=30
-        while [ $timeo -gt 0 ]; do
-          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-          echo "$response" | grep -q "mysqld is alive" && break
-          sleep 1
-          let timeo=${timeo}-1
-        done
-        if [ $timeo -eq 0 ]; then
-          stat_fail
-          exit 1
-        else
-          echo $(getPID) > /var/run/mysqld/mysqld.pid
-          add_daemon mysqld
-          stat_done
-        fi
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping MariaDB Server"
-    if [ ! -z "$(getPID)" ]; then
-      timeo=30
-      kill $(getPID) &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      fi
-      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
-        sleep 1
-        let timeo=${timeo}-1
-      done
-      if [ -z "$(getPID)" ]; then
-        rm -f /var/run/mysqld/mysqld.pid &>/dev/null
-        rm_daemon mysqld
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/mariadb/rc.d b/community/mariadb/rc.d
deleted file mode 100755
index e9fe8f5a8..000000000
--- a/community/mariadb/rc.d
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-getPID() {
-   echo $(pgrep -u mysql mysqld 2>/dev/null);
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting MariaDB Server"
-    [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
-    if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        timeo=30
-        while [ $timeo -gt 0 ]; do
-          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-          echo "$response" | grep -q "mysqld is alive" && break
-          sleep 1
-          let timeo=${timeo}-1
-        done
-        if [ $timeo -eq 0 ]; then
-          stat_fail
-          exit 1
-        else
-          echo $(getPID) > /var/run/mysqld/mysqld.pid
-          add_daemon mysqld
-          stat_done
-        fi
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping MariaDB Server"
-    if [ ! -z "$(getPID)" ]; then
-      timeo=30
-      kill $(getPID) &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      fi
-      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
-        sleep 1
-        let timeo=${timeo}-1
-      done
-      if [ -z "$(getPID)" ]; then
-        rm -f /var/run/mysqld/mysqld.pid &>/dev/null
-        rm_daemon mysqld
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/mariadb/service b/community/mariadb/service
deleted file mode 100644
index 1b3a50082..000000000
--- a/community/mariadb/service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=MariaDB database server
-After=syslog.target network.target
-
-[Service]
-User=mysql
-Group=mysql
-
-ExecStart=/usr/bin/mysqld --pid-file=/var/run/mysqld/mysqld.pid
-ExecStop=/bin/kill -15 $MAINPID
-PIDFile=/var/run/mysqld/mysqld.pid
-WorkingDirectory=/usr
-
-# We rely on systemd, not mysqld_safe, to restart mysqld if it dies
-Restart=always
-
-# Place temp files in a secure directory, not /tmp
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/mariadb/tmpfiles.conf b/community/mariadb/tmpfiles.conf
deleted file mode 100644
index 74cd5f836..000000000
--- a/community/mariadb/tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/mysqld 0755 mysql mysql -
diff --git a/community/mashup/PKGBUILD b/community/mashup/PKGBUILD
index 91f998f70..1b41676c8 100644
--- a/community/mashup/PKGBUILD
+++ b/community/mashup/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=mashup
 pkgver=3.5
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Adjusting images on a sheet of paper for printing"
 url="http://kornelix.squarespace.com/$pkgname"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/matchbox-desktop/PKGBUILD b/community/matchbox-desktop/PKGBUILD
index 17c4bb82a..3bce436ed 100644
--- a/community/matchbox-desktop/PKGBUILD
+++ b/community/matchbox-desktop/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=matchbox-desktop
 pkgver=2.0
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A PDA style application launcher or 'item browser'."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/community/matchbox-keyboard/PKGBUILD b/community/matchbox-keyboard/PKGBUILD
index 9ab673e54..f701991ba 100644
--- a/community/matchbox-keyboard/PKGBUILD
+++ b/community/matchbox-keyboard/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=matchbox-keyboard
 pkgver=0.1
-pkgrel=4
+pkgrel=4.1
 pkgdesc="An on screen virtual keyboard"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('cairo' 'libfakekey' 'libxft')
diff --git a/community/matchbox-panel/PKGBUILD b/community/matchbox-panel/PKGBUILD
index 6739273e6..f8375a492 100644
--- a/community/matchbox-panel/PKGBUILD
+++ b/community/matchbox-panel/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=matchbox-panel
 pkgver=0.9.3
-pkgrel=5
+pkgrel=5.1
 pkgdesc="A flexible always present 'window bar' for holding application launchers and small 'applet' style applications"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/community/matchbox-window-manager/PKGBUILD b/community/matchbox-window-manager/PKGBUILD
index 6bb34ac29..7c7717e1e 100644
--- a/community/matchbox-window-manager/PKGBUILD
+++ b/community/matchbox-window-manager/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=matchbox-window-manager
 pkgver=1.2
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A pretty much unique X window manager with a classic PDA management policy"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/community/mayavi/PKGBUILD b/community/mayavi/PKGBUILD
index 888251cd7..a4498094c 100644
--- a/community/mayavi/PKGBUILD
+++ b/community/mayavi/PKGBUILD
@@ -1,13 +1,12 @@
-# $Id: PKGBUILD 76178 2012-09-12 16:35:27Z aginiewicz $
+# $Id: PKGBUILD 88238 2013-04-14 20:02:10Z aginiewicz $
 # Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
 
 pkgname=mayavi
-pkgver=4.2.0
-_githubtag=a1e562a
-pkgrel=4
+pkgver=4.3.0
+pkgrel=1
 pkgdesc="A 3-dimensional visualizer of scientific data"
 arch=('i686' 'x86_64')
-url="http://code.enthought.com/projects/mayavi/"
+url="https://github.com/enthought/mayavi"
 license=('BSD')
 depends=('ipython2' 'vtk' 'python2-envisage' 'wxpython')
 makedepends=('python2-distribute' 'python2-sphinx' 'xorg-server-xvfb' 'twisted')
@@ -15,16 +14,11 @@ replaces=('python2-mayavi')
 provides=('python2-mayavi')
 options=(!emptydirs)
 
-source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/mayavi/tarball/${pkgver}"
-        vtk-5.10.patch)
-md5sums=('b46fb048176002738de64eed8d2b447a'
-         '01b8375392b5d3f587e81ba388a8089f')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/mayavi/archive/${pkgver}.tar.gz")
+md5sums=('7708d85a77c427c8dfbeb914630d31be')
 
 build() {
-  cd "$srcdir"/enthought-mayavi-${_githubtag}
-
-  # Add compatibility for vtk 5.10 (FS#31498)
-  patch -p1 < ../vtk-5.10.patch
+  cd "$srcdir"/mayavi-$pkgver
 
   # Use python2-sphinx provided sphinx-build2
   sed -i -e 's/sphinx-build/sphinx-build2/' docs/Makefile*
@@ -42,8 +36,6 @@ build() {
     build/lib.linux-$CARCH-2.7/mayavi/preferences/preferences.ini
   ln -s "$srcdir"/enthought-mayavi-${_githubtag}/tvtk/plugins/scene/preferences.ini \
     build/lib.linux-$CARCH-2.7/tvtk/plugins/scene/preferences.ini
-  ln -s "$srcdir"/enthought-mayavi-${_githubtag}/mayavi/core/lut \
-    build/lib.linux-$CARCH-2.7/mayavi/core/lut
 
   # now this is ugly, but docs do not build without X. We setup X according to:
   # http://docs.enthought.com/mayavi/mayavi/tips.html#rendering-using-the-virtual-framebuffer
@@ -58,11 +50,10 @@ build() {
   rm build/lib.linux-$CARCH-2.7/tvtk/tvtk_classes.zip
   rm build/lib.linux-$CARCH-2.7/mayavi/preferences/preferences.ini
   rm build/lib.linux-$CARCH-2.7/tvtk/plugins/scene/preferences.ini
-  rm build/lib.linux-$CARCH-2.7/mayavi/core/lut
 }
 
 package() {
-  cd "$srcdir"/enthought-mayavi-${_githubtag}
+  cd "$srcdir"/mayavi-$pkgver
 
   python2 setup.py install --root="$pkgdir"/ --optimize=1
 
diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD
index 6de98e94e..f6493bd0d 100644
--- a/community/mcelog/PKGBUILD
+++ b/community/mcelog/PKGBUILD
@@ -1,32 +1,32 @@
-# $Id: PKGBUILD 78891 2012-10-26 13:18:06Z spupykin $
+# $Id: PKGBUILD 88089 2013-04-11 09:34:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Thomas Mudrunka <harvie@@email..cz>
 # Maintainer: Thomas Mudrunka <harvie@@email..cz>
 
 pkgname=mcelog
-pkgver=1.0pre3
-pkgrel=5
+pkgver=20130411
+pkgrel=1
 pkgdesc="Print machine check event log from x86-64 kernel"
 url="http://freshmeat.net/projects/mcelog/"
 license=("GPL")
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
+makedepends=('git')
 options=('docs')
 backup=('etc/mcelog/mcelog.conf')
-#source=("ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/${pkgname}-${pkgver}.tar.gz"
-source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+source=("git://github.com/andikleen/mcelog.git"
 	"${pkgname}.rc"
 	"mcelog.service")
-md5sums=('b42f2214de6f4feb992556149edc67fa'
+md5sums=('SKIP'
          'f039a77d7bde3518d3d695b144816e8a'
-         'a8859012781f017624bbfe61c9d700bb')
+         'b71eb82e532aed3918ebf6b30e158e7f')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/mcelog"
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/mcelog"
   mkdir -p $pkgdir/usr/share/doc/mcelog
   make install prefix=$pkgdir/usr etcprefix=$pkgdir DOCDIR=$pkgdir/usr/share/doc/mcelog
   install -Dm0755 mcelog.cron "${pkgdir}/usr/sbin/mcelog.cron"
diff --git a/community/mcelog/mcelog.service b/community/mcelog/mcelog.service
index c689bee77..35c18bc6f 100644
--- a/community/mcelog/mcelog.service
+++ b/community/mcelog/mcelog.service
@@ -3,8 +3,8 @@ Description=Machine Check Exception Logging Daemon
 After=syslog.target
 
 [Service]
-PIDFile=/var/run/mcelog.pid
-ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground --pidfile /var/run/mcelog.pid
+PIDFile=/run/mcelog.pid
+ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground --pidfile /run/mcelog.pid
 StandardOutput=syslog
 
 [Install]
diff --git a/community/me-tv/PKGBUILD b/community/me-tv/PKGBUILD
deleted file mode 100644
index aa0223965..000000000
--- a/community/me-tv/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-#Maintainer: jakob gruber <jakob.gruber@gmail.com>
-#Contributor: gborzi
-#Previous Contributor: Vinzenz Vietzke <vinz@archlinux.us>
-#Previous Contributor: Heiko Baums <heiko@baums-on-web.de>
-#Previous Contributor: Jeff Bailes <thepizzaking@gmail.com>
-
-pkgname=me-tv
-pkgver=1.4.0.12
-pkgrel=1
-epoch=1
-pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/me-tv"
-license=('GPL')
-depends=('glibmm' 'gtkmm' 'gconfmm' 'glib2' 'xine-lib' 'sqlite' 'linuxtv-dvb-apps' 'libunique' 'libxml++' 'vlc' 'gstreamer0.10-base')
-makedepends=('intltool' 'gnome-common')
-install='me-tv.install'
-source=("http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver:0:5}/+download/${pkgname}-${pkgver}.tar.gz")
-options=('!emptydirs')
-
-build() {
-
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./autogen.sh
-	./configure CXXFLAGS="$CXXFLAGS -D__KERNEL_STRICT_NAMES" --prefix=/usr
-
-	# Missing unistd.h includes :| https://bugs.launchpad.net/me-tv/+bug/1020690
-	for file in common/common.cc server/thread.cc; do
-		sed -i '1 i\
-			#include <unistd.h>' $file
-	done
-
-	make
-
-}
-
-package() {
-
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-	install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-	gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \
-        --domain me-tv "${pkgdir}/usr/etc/gconf/schemas/${pkgname}.schemas"
-
-	rm -rf "${pkgdir}/usr/etc/"
-
-}
-
-md5sums=('28c7fd5523fd6ea8f5de89b297eb1391')
diff --git a/community/me-tv/me-tv.install b/community/me-tv/me-tv.install
deleted file mode 100644
index ca1279c14..000000000
--- a/community/me-tv/me-tv.install
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgname=me-tv
-
-post_install() {
-	usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-	pre_remove $1
-}
-
-post_upgrade() {
-	post_install $1
-	echo "If you run into errors after upgrading, try deleting ~/.local/share/me-tv/"
-}
-
-pre_remove() {
-	usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD
index e4c12194e..2d3c2de1e 100644
--- a/community/mediainfo-gui/PKGBUILD
+++ b/community/mediainfo-gui/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 78761 2012-10-24 10:02:27Z spupykin $
+# $Id: PKGBUILD 84844 2013-02-25 10:39:41Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: hydro <hydro@freenet.de>
 
 pkgname=mediainfo-gui
-pkgver=0.7.61
+pkgver=0.7.62
 pkgrel=1
 pkgdesc="GUI for mediainfo"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk')
 makedepends=('libtool' 'automake' 'autoconf')
 install=mediainfo-gui.install
 source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2)
-md5sums=('46fd776968ec1047cd2a5056a906cdf2')
+md5sums=('a9a8bc398cc5d2ca8723fae024f6e891')
 
 build() {
   cd $srcdir/MediaInfo/Project/GNU/GUI
diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD
index ed5af89c5..fd9740384 100644
--- a/community/mediainfo/PKGBUILD
+++ b/community/mediainfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 78759 2012-10-24 10:01:48Z spupykin $
+# $Id: PKGBUILD 84842 2013-02-25 10:39:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: hydro <hydro@freenet.de>
 
 pkgname=mediainfo
-pkgver=0.7.61
+pkgver=0.7.62
 pkgrel=1
 pkgdesc="supplies technical and tag information about a video or audio file"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('libmediainfo')
 makedepends=('libtool' 'automake' 'autoconf')
 source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2)
-md5sums=('46fd776968ec1047cd2a5056a906cdf2')
+md5sums=('a9a8bc398cc5d2ca8723fae024f6e891')
 
 build() {
   cd $srcdir/MediaInfo/Project/GNU/CLI
diff --git a/community/medit/medit-terminal.patch b/community/medit/medit-terminal.patch
deleted file mode 100644
index 434bb4829..000000000
--- a/community/medit/medit-terminal.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- moo/moopython/plugins/terminal.py.org	2011-12-03 13:12:42.000000000 +0100
-+++ moo/moopython/plugins/terminal.py	2011-12-03 13:15:19.000000000 +0100
-@@ -60,8 +60,8 @@
-             moo.prefs_set_string(COLOR_SCHEME_KEY, None)
- 
-     def font_item_activated(self, *whatever):
--        dlg = moo.FontSelectionDialog(D_("Pick a Font", "gtk20"))
--        dlg.fontsel.set_property('monospace', True)
-+        dlg = gtk.FontSelectionDialog(D_("Pick a Font", "gtk20"))
-+        # dlg.fontsel.set_property('monospace', True)
-         old_font = self.get_font()
-         if old_font:
-             dlg.set_font_name(old_font.to_string())
diff --git a/community/mednafen/ChangeLog b/community/mednafen/ChangeLog
deleted file mode 100644
index 54b01d58f..000000000
--- a/community/mednafen/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2012-02-23 Allan McRae <allan@archlinux.org>
-    * Rebuild for libcdio soname bumps
-
-2011-05-17 Angel Velasquez <angvp@archlinux.org>
-    * Updated to 0.8.D.3
-	* Removed fix_build patch
-	* Cleaned PKGBUILD
-	* Adding ChangeLog
-
diff --git a/community/mednafen/mednafen-0.8.13.3-zlib-1.2.6.patch b/community/mednafen/mednafen-0.8.13.3-zlib-1.2.6.patch
deleted file mode 100644
index 9437f76ce..000000000
--- a/community/mednafen/mednafen-0.8.13.3-zlib-1.2.6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- mednafen.orig/src/file.cpp
-+++ mednafen/src/file.cpp
-@@ -229,7 +229,7 @@
-    goto doret;
-   }
- 
--  while((howmany = gzread(tz, tmp->data + cur_size, cur_alloced - cur_size)) > 0)
-+  while((howmany = gzread((gzFile)tz, tmp->data + cur_size, cur_alloced - cur_size)) > 0)
-   {
-    cur_size += howmany;
-    cur_alloced <<= 1;
-@@ -282,7 +282,7 @@
-  }
-  else if(type == MDFN_FILETYPE_GZIP)
-  {
--  gzclose(tz);
-+  gzclose((gzFile)tz);
-  }
-  else if(type == MDFN_FILETYPE_ZIP)
-  {
-@@ -444,7 +444,7 @@
- 
-    if(!(fceufp = MakeMemWrap(t, 1)))
-    {
--    gzclose(t);
-+    gzclose((gzFile)t);
-     return(0);
-    }
- 
diff --git a/community/menu-cache/PKGBUILD b/community/menu-cache/PKGBUILD
index 1c6e9ad24..f730fe4cd 100644
--- a/community/menu-cache/PKGBUILD
+++ b/community/menu-cache/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80045 2012-11-15 18:59:35Z bpiotrowski $
+# $Id: PKGBUILD 84578 2013-02-20 05:00:21Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=menu-cache
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc='Caching mechanism for freedesktop.org compliant menus'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,16 +14,12 @@ groups=('lxde')
 depends=('intltool' 'glib2')
 options=('!libtool')
 makedepends=('pkgconfig')
-source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
-        menu-cache-gen.h)
-md5sums=('c63029a6c65e370ed5d9409f30265950'
-         '4edc9545b9640ee7698324d3f9683dc7')
+source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz)
+sha256sums=('4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  install -m644 $srcdir/menu-cache-gen.h menu-cache-gen/
-
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/menu-cache \
               --disable-static
diff --git a/community/menu-cache/menu-cache-gen.h b/community/menu-cache/menu-cache-gen.h
deleted file mode 100644
index 7d9be4207..000000000
--- a/community/menu-cache/menu-cache-gen.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __MENU_CACHE_GEN_H__
-#define __MENU_CACHE_GEN_H__ 1
-G_BEGIN_DECLS
-
-guint32 menu_cache_get_de_flag (const char* de_name);
-
-G_END_DECLS
-#endif
\ No newline at end of file
diff --git a/community/mesa-dri1/PKGBUILD b/community/mesa-dri1/PKGBUILD
index f63f0d717..3fa2266bf 100644
--- a/community/mesa-dri1/PKGBUILD
+++ b/community/mesa-dri1/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=mesa-dri1
 pkgname=('unichrome-dri' 'i810-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri')
 
 pkgver=7.11.2
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 makedepends=('glproto>=1.4.14' 'dri2proto' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 
              'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'llvm' 'udev')
@@ -35,21 +35,21 @@ build() {
 }
 
 package_unichrome-dri() {
-  depends=("libgl")
+  depends=("mesa-libgl")
   pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome"
 
   make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install
 }
 
 package_i810-dri() {
-  depends=("libgl")
+  depends=("mesa-libgl")
   pkgdesc="Mesa DRI drivers for Intel i810"
 
   make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install
 }
 
 package_mach64-dri() {
-  depends=("libgl")
+  depends=("mesa-libgl")
   pkgdesc="Mesa DRI drivers for ATI Mach64"
   conflicts=('xf86-video-mach64<6.8.2')
 
@@ -57,7 +57,7 @@ package_mach64-dri() {
 }
 
 package_mga-dri() {
-  depends=("libgl")
+  depends=("mesa-libgl")
   pkgdesc="Mesa DRI drivers for Matrox"
   conflicts=('xf86-video-mga<1.4.11')
 
@@ -65,7 +65,7 @@ package_mga-dri() {
 }
 
 package_r128-dri() {
-  depends=("libgl")
+  depends=("mesa-libgl")
   pkgdesc="Mesa DRI drivers for ATI Rage128"
   conflicts=('xf86-video-r128<6.8.1')
 
@@ -73,7 +73,7 @@ package_r128-dri() {
 }
 
 package_savage-dri() {
-  depends=("libgl")
+  depends=("mesa-libgl")
   pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage"
   conflicts=('xf86-video-savage<2.3.1')
 
@@ -81,7 +81,7 @@ package_savage-dri() {
 }
 
 package_sis-dri() {
-  depends=("libgl")
+  depends=("mesa-libgl")
   pkgdesc="Mesa DRI drivers for SiS"
   conflicts=('xf86-video-sis<0.10.2')
 
@@ -89,7 +89,7 @@ package_sis-dri() {
 }
 
 package_tdfx-dri() {
-  depends=("libgl")
+  depends=("mesa-libgl")
   pkgdesc="Mesa DRI drivers for 3dfx"
   conflicts=('xf86-video-tdfx<1.4.3')
 
diff --git a/community/metacity/PKGBUILD b/community/metacity/PKGBUILD
new file mode 100644
index 000000000..546268cbf
--- /dev/null
+++ b/community/metacity/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id: PKGBUILD 88820 2013-04-23 01:21:30Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=metacity
+pkgver=2.34.13
+pkgrel=5
+pkgdesc="Legacy GNOME window manager"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('dconf' 'libcanberra' 'libgtop' 'gsettings-desktop-schemas' 'gtk2' 'startup-notification' 'zenity')
+makedepends=('intltool' 'itstool')
+url="https://live.gnome.org/Metacity"
+options=('!libtool')
+install=metacity.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        fix_compositing_startup.patch
+        fix_force_quit.patch
+        fix_shadows.patch
+        enable_compositing.patch
+        application-switcher.patch)
+sha256sums=('8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075'
+            '5094a0ffe3eb8289ed752829877c2e1b743eddf938ad3fc92fb4574b42765ae2'
+            '917760ac3375894ebb4052dfc7c8dff1ac556fb81033d7a7caf02123ceede50d'
+            'a0981477e9b3fd108fd03b7637bfd1f17a1f6cb13ec703d86b424b55076096f3'
+            'e53c1c20e19cd3d94d05d08045c7a9a373ce52051928ccc69bf3068081f30f9a'
+            '177ded8203c3ff25f59a24445145cb54da9aba4216a0014c34979b7c12f3c099')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=658036
+  patch -Np1 -i "$srcdir/fix_compositing_startup.patch"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=687938
+  patch -Np1 -i "$srcdir/fix_force_quit.patch"
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=648340
+  patch -Np1 -i "$srcdir/fix_shadows.patch"
+
+  # Enable compositing by default (required for the desktop rendering feature of nautilus)
+  patch -Np1 -i "$srcdir/enable_compositing.patch"
+
+  # Rename switch-windows to switch-applications (required for GNOME 3.8 compatibility)
+  patch -Np1 -i "$srcdir/application-switcher.patch"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+              --disable-static --disable-schemas-compile
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/metacity/application-switcher.patch b/community/metacity/application-switcher.patch
new file mode 100644
index 000000000..2832d262c
--- /dev/null
+++ b/community/metacity/application-switcher.patch
@@ -0,0 +1,26 @@
+diff -Naur metacity-2.34.13.orig/src/50-metacity-navigation.xml.in metacity-2.34.13/src/50-metacity-navigation.xml.in
+--- metacity-2.34.13.orig/src/50-metacity-navigation.xml.in	2012-10-15 20:06:27.000000000 +0200
++++ metacity-2.34.13/src/50-metacity-navigation.xml.in	2013-04-23 02:35:18.000734619 +0200
+@@ -29,7 +29,7 @@
+ 	<KeyListEntry name="move-to-workspace-down"
+ 	              _description="Move window one workspace down" />
+ 
+-	<KeyListEntry name="switch-windows"
++	<KeyListEntry name="switch-applications"
+ 	              _description="Switch applications"/>
+ 
+ 	<KeyListEntry name="switch-group"
+diff -Naur metacity-2.34.13.orig/src/include/all-keybindings.h metacity-2.34.13/src/include/all-keybindings.h
+--- metacity-2.34.13.orig/src/include/all-keybindings.h	2012-02-09 19:07:40.000000000 +0100
++++ metacity-2.34.13/src/include/all-keybindings.h	2013-04-23 02:34:22.632775305 +0200
+@@ -126,8 +126,8 @@
+ keybind (switch-group, handle_switch, META_TAB_LIST_GROUP, BINDING_REVERSES)
+ keybind (switch-group-backward, handle_switch, META_TAB_LIST_GROUP,
+          REVERSES_AND_REVERSED)
+-keybind (switch-windows, handle_switch, META_TAB_LIST_NORMAL, BINDING_REVERSES)
+-keybind (switch-windows-backward, handle_switch, META_TAB_LIST_NORMAL,
++keybind (switch-applications, handle_switch, META_TAB_LIST_NORMAL, BINDING_REVERSES)
++keybind (switch-applications-backward, handle_switch, META_TAB_LIST_NORMAL,
+          REVERSES_AND_REVERSED)
+ keybind (switch-panels, handle_switch, META_TAB_LIST_DOCKS, BINDING_REVERSES)
+ keybind (switch-panels-backward, handle_switch, META_TAB_LIST_DOCKS,
diff --git a/community/metacity/enable_compositing.patch b/community/metacity/enable_compositing.patch
new file mode 100644
index 000000000..3c5f09666
--- /dev/null
+++ b/community/metacity/enable_compositing.patch
@@ -0,0 +1,12 @@
+diff -Naur metacity-2.34.13.orig/src/org.gnome.metacity.gschema.xml.in metacity-2.34.13/src/org.gnome.metacity.gschema.xml.in
+--- metacity-2.34.13.orig/src/org.gnome.metacity.gschema.xml.in	2012-02-15 18:31:44.000000000 +0100
++++ metacity-2.34.13/src/org.gnome.metacity.gschema.xml.in	2013-04-10 20:14:39.837033219 +0200
+@@ -3,7 +3,7 @@
+   <schema id="org.gnome.metacity" path="/org/gnome/metacity/"
+           gettext-domain="@GETTEXT_PACKAGE@">
+     <key name="compositing-manager" type="b">
+-      <default>false</default>
++      <default>true</default>
+       <_summary>Compositing Manager</_summary>
+       <_description>
+         Determines whether Metacity is a compositing manager.
diff --git a/community/metacity/fix_compositing_startup.patch b/community/metacity/fix_compositing_startup.patch
new file mode 100644
index 000000000..56b218ae7
--- /dev/null
+++ b/community/metacity/fix_compositing_startup.patch
@@ -0,0 +1,12 @@
+diff -Naur metacity-2.34.5.orig/src/compositor/compositor-xrender.c metacity-2.34.5/src/compositor/compositor-xrender.c
+--- metacity-2.34.5.orig/src/compositor/compositor-xrender.c	2011-11-10 15:14:34.000000000 +0100
++++ metacity-2.34.5/src/compositor/compositor-xrender.c	2012-08-28 14:23:04.093750568 +0200
+@@ -3066,6 +3057,8 @@
+ #endif
+ 
+   xrc->enabled = TRUE;
++  xrc->show_redraw = FALSE;
++  xrc->debug = FALSE;
+   g_timeout_add (2000, (GSourceFunc) timeout_debug, xrc);
+ 
+   return compositor;
diff --git a/community/metacity/fix_force_quit.patch b/community/metacity/fix_force_quit.patch
new file mode 100644
index 000000000..020f427c4
--- /dev/null
+++ b/community/metacity/fix_force_quit.patch
@@ -0,0 +1,222 @@
+diff -Naur metacity-2.34.13.orig/src/core/delete.c metacity-2.34.13/src/core/delete.c
+--- metacity-2.34.13.orig/src/core/delete.c	2011-11-10 15:14:34.000000000 +0100
++++ metacity-2.34.13/src/core/delete.c	2012-11-08 21:36:48.373976906 +0100
+@@ -90,23 +90,41 @@
+       return;
+     }
+ 
+-  window_title = g_locale_from_utf8 (window->title, -1, NULL, NULL, NULL);
++  /* This is to get a better string if the title isn't representable
++   * in the locale encoding; actual conversion to UTF-8 is done inside
++   * meta_show_dialog */
++
++  if (window->title && window->title[0])
++    {
++      tmp = g_locale_from_utf8 (window->title, -1, NULL, NULL, NULL);
++      if (tmp == NULL)
++        window_title = NULL;
++      else
++        window_title = window->title;
++      g_free (tmp);
++    }
++  else
++    {
++      window_title = NULL;
++    }
+ 
+   /* Translators: %s is a window title */
+-  tmp = g_strdup_printf (_("<tt>%s</tt> is not responding."),
+-                         window_title);
++  if (window_title)
++    tmp = g_markup_printf_escaped (_("<tt>%s</tt> is not responding."),
++                                   window_title);
++  else
++    tmp = g_strdup (_("Application is not responding."));
++
+   window_content = g_strdup_printf (
+       "<big><b>%s</b></big>\n\n<i>%s</i>",
+       tmp,
+       _("You may choose to wait a short while for it to "
+         "continue or force the application to quit entirely."));
+ 
+-  g_free (window_title);
+-
+   dialog_pid =
+     meta_show_dialog ("--question",
+-                      window_content, 0,
+-                      window->screen->number,
++                      window_content, NULL,
++                      window->screen->screen_name,
+                       _("_Wait"), _("_Force Quit"), window->xwindow,
+                       NULL, NULL);
+ 
+diff -Naur metacity-2.34.13.orig/src/core/session.c metacity-2.34.13/src/core/session.c
+--- metacity-2.34.13.orig/src/core/session.c	2011-11-10 15:14:34.000000000 +0100
++++ metacity-2.34.13/src/core/session.c	2012-11-08 21:35:56.896216322 +0100
+@@ -1809,7 +1809,7 @@
+                            "and will have to be restarted manually next time "
+                            "you log in."),
+                          "240",
+-                         meta_screen_get_screen_number (meta_get_display()->active_screen),
++                         meta_get_display()->active_screen->screen_name,
+                          NULL, NULL,
+                          None,
+                          columns,
+diff -Naur metacity-2.34.13.orig/src/core/util.c metacity-2.34.13/src/core/util.c
+--- metacity-2.34.13.orig/src/core/util.c	2011-11-10 15:14:34.000000000 +0100
++++ metacity-2.34.13/src/core/util.c	2012-11-08 21:36:41.373828115 +0100
+@@ -538,11 +538,30 @@
+     }
+ }
+ 
++/* Command line arguments are passed in the locale encoding; in almost
++ * all cases, we'd hope that is UTF-8 and no conversion is necessary.
++ * If it's not UTF-8, then it's possible that the message isn't
++ * representable in the locale encoding.
++ */
++static void
++append_argument (GPtrArray  *args,
++                 const char *arg)
++{
++  char *locale_arg = g_locale_from_utf8 (arg, -1, NULL, NULL, NULL);
++
++  /* This is cheesy, but it's better to have a few ???'s in the dialog
++   * for an unresponsive application than no dialog at all appear */
++  if (!locale_arg)
++    locale_arg = g_strdup ("???");
++
++  g_ptr_array_add (args, locale_arg);
++}
++
+ GPid
+ meta_show_dialog (const char *type,
+                   const char *message,
+                   const char *timeout,
+-                  const gint screen_number,
++                  const char *display,
+                   const char *ok_text,
+                   const char *cancel_text,
+                   const int transient_for,
+@@ -550,61 +569,58 @@
+                   GSList *entries)
+ {
+   GError *error = NULL;
+-  char *screen_number_text = g_strdup_printf("%d", screen_number);
+   GSList *tmp;
+-  int i=0;
+   GPid child_pid;
+-  const char **argvl = g_malloc(sizeof (char*) *
+-                                (17 +
+-                                 g_slist_length (columns)*2 +
+-                                 g_slist_length (entries)));
+-
+-  argvl[i++] = "zenity";
+-  argvl[i++] = type;
+-  argvl[i++] = "--screen";
+-  argvl[i++] = screen_number_text;
+-  argvl[i++] = "--class";
+-  argvl[i++] = "metacity-dialog";
+-  argvl[i++] = "--title";
++  GPtrArray *args;
++
++  args = g_ptr_array_new ();
++
++  append_argument (args, "zenity");
++  append_argument (args, type);
++  append_argument (args, "--display");
++  append_argument (args, display);
++  append_argument (args, "--class");
++  append_argument (args, "metaicty-dialog");
++  append_argument (args, "--title");
+   /* Translators: This is the title used on dialog boxes */
+-  argvl[i++] = _("Metacity");
+-  argvl[i++] = "--text";
+-  argvl[i++] = message;
+-  
++  append_argument (args, _("Metacity"));
++  append_argument (args, "--text");
++  append_argument (args, message);
++
+   if (timeout)
+     {
+-      argvl[i++] = "--timeout";
+-      argvl[i++] = timeout;
++      append_argument (args, "--timeout");
++      append_argument (args, timeout);
+     }
+ 
+   if (ok_text)
+     {
+-      argvl[i++] = "--ok-label";
+-      argvl[i++] = ok_text;
++      append_argument (args, "--ok-label");
++      append_argument (args, ok_text);
+      }
+ 
+   if (cancel_text)
+     {
+-      argvl[i++] = "--cancel-label";
+-      argvl[i++] = cancel_text;
++      append_argument (args, "--cancel-label");
++      append_argument (args, cancel_text);
+     }
+-  
++
+   tmp = columns;
+   while (tmp)
+     {
+-      argvl[i++] = "--column";
+-      argvl[i++] = tmp->data;
++      append_argument (args, "--column");
++      append_argument (args, tmp->data);
+       tmp = tmp->next;
+     }
+ 
+   tmp = entries;
+   while (tmp)
+     {
+-      argvl[i++] = tmp->data;
++      append_argument (args, tmp->data);
+       tmp = tmp->next;
+     }
+-    
+-  argvl[i] = NULL;
++
++  g_ptr_array_add (args, NULL); /* NULL-terminate */
+ 
+   if (transient_for)
+     {
+@@ -615,7 +631,7 @@
+ 
+   g_spawn_async (
+                  "/",
+-                 (gchar**) argvl, /* ugh */
++                 (gchar**) args->pdata,
+                  NULL,
+                  G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+                  NULL, NULL,
+@@ -626,8 +642,7 @@
+   if (transient_for)
+     unsetenv ("WINDOWID");
+ 
+-  g_free (argvl);
+-  g_free (screen_number_text);
++  g_ptr_array_free (args, TRUE);
+ 
+   if (error)
+     {
+diff -Naur metacity-2.34.13.orig/src/include/util.h metacity-2.34.13/src/include/util.h
+--- metacity-2.34.13.orig/src/include/util.h	2011-11-10 15:14:34.000000000 +0100
++++ metacity-2.34.13/src/include/util.h	2012-11-08 21:36:27.206860608 +0100
+@@ -99,9 +99,9 @@
+ void  meta_free_gslist_and_elements (GSList *list_to_deep_free);
+ 
+ GPid meta_show_dialog (const char *type,
+-                       const char *title,
+                        const char *message,
+-                       gint timeout,
++                       const char *timeout,
++                       const char *display,
+                        const char *ok_text,
+                        const char *cancel_text,
+                        const int transient_for,
diff --git a/community/metacity/fix_shadows.patch b/community/metacity/fix_shadows.patch
new file mode 100644
index 000000000..8d4bf9939
--- /dev/null
+++ b/community/metacity/fix_shadows.patch
@@ -0,0 +1,39 @@
+diff -Naur metacity-2.34.13.orig/src/compositor/compositor-xrender.c metacity-2.34.13/src/compositor/compositor-xrender.c
+--- metacity-2.34.13.orig/src/compositor/compositor-xrender.c	2011-11-10 15:14:34.000000000 +0100
++++ metacity-2.34.13/src/compositor/compositor-xrender.c	2012-11-09 13:51:42.492411570 +0100
+@@ -905,35 +905,6 @@
+       }
+     }
+ 
+-  /* Never put a shadow around shaped windows */
+-  if (cw->shaped) {
+-    meta_verbose ("Window has no shadow as it is shaped\n");
+-    return FALSE;
+-  }
+-
+-  /* Don't put shadow around DND icon windows */
+-  if (cw->type == META_COMP_WINDOW_DND ||
+-      cw->type == META_COMP_WINDOW_DESKTOP) {
+-    meta_verbose ("Window has no shadow as it is DND or Desktop\n");
+-    return FALSE;
+-  }
+-
+-  if (cw->mode != WINDOW_ARGB) {
+-    meta_verbose ("Window has shadow as it is not ARGB\n");
+-    return TRUE;
+-  }
+-
+-  if (cw->type == META_COMP_WINDOW_MENU || 
+-      cw->type == META_COMP_WINDOW_DROP_DOWN_MENU) {
+-    meta_verbose ("Window has shadow as it is a menu\n");
+-    return TRUE;
+-  }
+-
+-  if (cw->type == META_COMP_WINDOW_TOOLTIP) {
+-    meta_verbose ("Window has shadow as it is a tooltip\n");
+-    return TRUE;
+-  }
+-
+   meta_verbose ("Window has no shadow as it fell through\n");
+   return FALSE;
+ }
diff --git a/community/metacity/metacity.install b/community/metacity/metacity.install
new file mode 100644
index 000000000..ba0feffc1
--- /dev/null
+++ b/community/metacity/metacity.install
@@ -0,0 +1,19 @@
+pkgname=metacity
+
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+pre_upgrade() {
+    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
+        /usr/sbin/gconfpkg --uninstall $pkgname
+    fi
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/meteorjs/PKGBUILD b/community/meteorjs/PKGBUILD
deleted file mode 100644
index b514b39f3..000000000
--- a/community/meteorjs/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 83547 2013-02-02 18:38:31Z mtorromeo $
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-# Contributor: Parth Buch <parthbuch115 at gmail dot com>
-# Contributor: Tom Vincent <http://tlvince.com/contact/>
-
-pkgname=meteorjs
-pkgver=0.5.4
-pkgrel=1
-pkgdesc="Open-source platform for building top-quality web apps in a fraction of the time."
-arch=('i686' 'x86_64')
-url="https://github.com/meteor/meteor"
-license=('MIT')
-depends=('nodejs' 'mongodb')
-options=('!strip')
-
-sha256sums=('64dbdfd1788e3859f54bbe36e99ca60574e625c68d41b9bfc9384b253b345798'
-            'a3ac659c52b652676da0530f2148025e0f8bfa84bccf63431c20eb72d3bc5cb7')
-
-if [ "$CARCH" == x86_64 ]; then
-    _arch="amd64"
-else
-    _arch="i386"
-    sha256sums[0]='7a3c1eaa8588876ed8bec6bab20b0be99f7e36fce839b3d70b776018ca606f89'
-fi
-
-source=("http://d3sqy0vbqsdhku.cloudfront.net/meteor_$pkgver-1_$_arch.deb" meteor)
-
-package() {
-    tar xf data.tar.gz -C "$pkgdir" ./usr/lib/meteor
-
-    install -Dm644 "$pkgdir/usr/lib/meteor/LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
-    install -Dm755 "$srcdir/meteor" "$pkgdir/usr/bin/meteor"
-
-    cd "$pkgdir/usr/lib/meteor"
-    rm -rf LICENSE.txt lib/node lib/dtrace lib/node_modules/npm share include \
-           lib/node_modules/mongodb/node_modules/bson/build/Release/obj.target/bson.node
-
-    # mongodb links
-    rm -rf mongodb
-    install -dm755 mongodb/bin
-    ln -s /usr/bin/mongod mongodb/bin/mongod
-    ln -s /usr/bin/mongo mongodb/bin/mongo
-
-    # node links
-    rm -rf bin
-    install -dm755 bin
-    ln -s /usr/bin/node bin/node
-    ln -s /usr/bin/node-waf bin/node-waf
-    ln -s /usr/bin/npm bin/npm
-}
diff --git a/community/meteorjs/meteor b/community/meteorjs/meteor
deleted file mode 100644
index 252f4afe3..000000000
--- a/community/meteorjs/meteor
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-if [ "$(ulimit -n)" != "unlimited" ] ; then
-    ulimit -n 16384 > /dev/null 2>&1 || \
-    ulimit -n 8192 > /dev/null 2>&1 || \
-    ulimit -n 4096 > /dev/null 2>&1 || \
-    ulimit -n 2048 > /dev/null 2>&1 || \
-    ulimit -n 1024 > /dev/null 2>&1 || \
-    ulimit -n 512 > /dev/null 2>&1
-fi
-
-METEORDIR=/usr/lib/meteor
-export NODE_PATH=$METEORDIR/lib/node_modules
-exec /usr/bin/node $METEORDIR/app/meteor/meteor.js "$@"
diff --git a/community/mfs/PKGBUILD b/community/mfs/PKGBUILD
index ded698166..2fc29c3d5 100644
--- a/community/mfs/PKGBUILD
+++ b/community/mfs/PKGBUILD
@@ -1,43 +1,35 @@
-# $Id: PKGBUILD 75321 2012-08-19 15:17:28Z arodseth $
+# $Id: PKGBUILD 87206 2013-03-28 15:53:12Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 
 pkgbase=mfs
 pkgname=('mfs-master' 'mfs-chunkserver' 'mfs-client')
-pkgver=1.6.26
+pkgver=1.6.27_1
 pkgrel=1
 pkgdesc='MooseFS, fault tolerant, network distributed file system'
-license=('GPL3')
+url='http://www.moosefs.com/'
 arch=('x86_64' 'i686' 'mips64el')
-options=('!libtool')
+license=('GPL3')
 depends=('zlib' 'fuse' 'python2' 'bash' 'xfsprogs')
-url='http://www.moosefs.com/'
-install=mfs.install
-source=("http://www.moosefs.org/tl_files/mfscode/mfs-$pkgver.tar.gz"
+install="$pkgbase.install"
+options=('!libtool')
+source=("http://www.moosefs.org/tl_files/${pkgbase}code/$pkgbase-${pkgver/_/-}.tar.gz"
         'mfsmaster.service'
         'mfschunkserver.service'
         'mfsmetalogger.service'
-        'mfscgiserv.service'
-        'mfsmaster'
-        'mfschunkserver'
-        'mfsmetalogger'
-        'mfscgiserv')
-sha256sums=('f250f97c6f2a229277fdbf9fe96036873fd6c95a38f484f06e6b87a404c01885'
+        'mfscgiserv.service')
+sha256sums=('dfe682f0b184ed13e602274825148cd9a7ddfe4f0894e1ab9c1823f66208cb28'
             'b24fc4f699e7d11fcda00d83a1feb45aa0e6f4f448e675a1857edcf315427fe0'
             '19262bde4dbefb1d3eba09ba7d507595aed9647328a0a7822bbc1915ae3201a7'
             'bf92e93be68308d53f649de84dc5bbb0fb433e33306b8d0c303be6c6c3e59a55'
-            '6725a732c6294ee8817be6c24e3811481bf05e97a0a64108908e2312d7687f1a'
-            '7c307f7be520644ac5d9c71e39ff7ec7e26800aa77c8a18c51a2d0087e5b2f48'
-            '2d07e544f4bfeb497c24276936d3a8ce9f906597d6b9c898dc491426b21e74e0'
-            'd9c072cbb9d9645e5131d08b08628ccc2a2bef0a4e9c6fd8c3c33e50efce39f3'
-            'a2e1951888887e928e68a3a010047fa3528182e93c086e4addb5abc14ea72c3b')
+            '6725a732c6294ee8817be6c24e3811481bf05e97a0a64108908e2312d7687f1a')
 
 build() {
   cd "$srcdir"
 
   msg2 'Building client...'
-  cp -r $pkgbase-$pkgver $pkgbase-client
-  cd $pkgbase-client
+  cp -r "$pkgbase-${pkgver%_1}" "$pkgbase-client"
+  cd "$pkgbase-client"
   ./configure \
       --prefix=/usr \
       --sysconfdir=/etc/mfs \
@@ -50,8 +42,8 @@ build() {
   cd ..
   
   msg2 'Building chunkserver...'
-  cp -r $pkgbase-$pkgver $pkgbase-chunk
-  cd $pkgbase-chunk
+  cp -r "$pkgbase-${pkgver%_1}" "$pkgbase-chunk"
+  cd "$pkgbase-chunk"
   ./configure \
       --prefix=/usr \
       --sysconfdir=/etc/mfs \
@@ -64,8 +56,8 @@ build() {
   cd ..
   
   msg2 'Building master...'
-  cp -r $pkgbase-$pkgver $pkgbase-master
-  cd $pkgbase-master
+  cp -r "$pkgbase-${pkgver%_1}" "$pkgbase-master"
+  cd "$pkgbase-master"
   ./configure \
       --prefix=/usr \
       --sysconfdir=/etc/mfs \
@@ -98,9 +90,6 @@ package_mfs-chunkserver() {
   install -Dm644 "$srcdir/mfschunkserver.service" \
     "$pkgdir/usr/lib/systemd/system/mfschunkserver.service"
 
-  msg2 'Packaging initscript...'
-  install -Dm755 "$srcdir/mfschunkserver" "$pkgdir/etc/rc.d/mfschunkserver"
-
   msg2 'Cleaning up...'
   rm -rf "$pkgdir/usr/share/man/man7"
   rmdir "$pkgdir/usr/share/man/man1"
@@ -120,9 +109,8 @@ package_mfs-master() {
   install -Dm644 NEWS "$pkgdir/usr/share/doc/$pkgbase/NEWS"
   install -Dm644 UPGRADE "$pkgdir/usr/share/doc/$pkgbase/UPGRADE"
 
-  msg2 'Packaging Systemd services and initscripts...'
+  msg2 'Packaging Systemd services...'
   for fn in master metalogger cgiserv; do
-    install -Dm755 "$srcdir/mfs$fn" "$pkgdir/etc/rc.d/mfs$fn"
     install -Dm644 "$srcdir/mfs$fn.service" \
       "$pkgdir/usr/lib/systemd/system/mfs$fn.service"
   done
diff --git a/community/mfs/mfs.install b/community/mfs/mfs.install
index 906932aaa..433595cb0 100644
--- a/community/mfs/mfs.install
+++ b/community/mfs/mfs.install
@@ -17,8 +17,7 @@ post_install() {
   echo 'To troubleshoot a service, like "mfschunkserver", just running'
   echo '"/usr/bin/mfschunkserver start" can be helpful.'
   echo
-  echo '"systemctl enable mfschunkserver" can be used to enable a service'
-  echo "at boot, if you're using systemd."
+  echo 'Systemd is supported for starting services at boot.'
   echo
 }
 
diff --git a/community/mfs/mfscgiserv b/community/mfs/mfscgiserv
deleted file mode 100644
index 2f176d239..000000000
--- a/community/mfs/mfscgiserv
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(ps aux | grep -v grep | grep /usr/bin/mfscgiserv | awk '{print $2}')
-case "$1" in
-  start)
-    stat_busy "Starting MooseFS CGI Web Frontend Daemon"
-    [ -z "$PID" ] && /usr/bin/mfscgiserv &> /dev/null
-    if [ $? = 0 ]; then
-      add_daemon mfscgiserv
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping MooseFS CGI Web Frontend Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mfscgiserv
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/mfs/mfschunkserver b/community/mfs/mfschunkserver
deleted file mode 100644
index 606d00f48..000000000
--- a/community/mfs/mfschunkserver
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/mfschunkserver`
-case "$1" in
-  start)
-    stat_busy "Starting MooseFS Chunkserver Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/bin/mfschunkserver start
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID /usr/bin/mfschunkserver`
-      echo $PID > /var/run/mfsmetalogger.pid
-      add_daemon mfschunkserver
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping MooseFS Chunkserver Daemon"
-    [ ! -z "$PID" ]  && /usr/bin/mfschunkserver stop &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mfschunkserver
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/mfs/mfsmaster b/community/mfs/mfsmaster
deleted file mode 100644
index b0cfd8299..000000000
--- a/community/mfs/mfsmaster
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID -x /usr/bin/mfsmaster`
-case "$1" in
-  start)
-    stat_busy "Starting MooseFS Master Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/bin/mfsmaster start
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID -x /usr/bin/mfsmaster`
-      echo $PID > /var/run/mfsmaster.pid
-      add_daemon mfsmaster
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping MooseFS Master Daemon"
-    [ ! -z "$PID" ]  && /usr/bin/mfsmaster stop &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mfsmaster
-      rm /var/run/mfsmaster.pid
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/mfs/mfsmetalogger b/community/mfs/mfsmetalogger
deleted file mode 100644
index a870cc5a7..000000000
--- a/community/mfs/mfsmetalogger
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/mfsmetalogger`
-case "$1" in
-  start)
-    stat_busy "Starting MooseFS Metalogger Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/bin/mfsmetalogger start
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID /usr/bin/mfsmetalogger`
-      echo $PID > /var/run/mfsmetalogger.pid
-      add_daemon mfsmetalogger
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping MooseFS Metalogger Daemon"
-    [ ! -z "$PID" ]  && /usr/bin/mfsmetalogger stop &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mfsmetalogger
-      rm /var/run/mfsmetalogger.pid
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/midori/0.4.7-private-mode.patch b/community/midori/0.4.7-private-mode.patch
deleted file mode 100644
index 599780b78..000000000
--- a/community/midori/0.4.7-private-mode.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur midori-0.4.7/katze/midori-paths.vala midori-0.4.7.patch/katze/midori-paths.vala
---- midori-0.4.7/katze/midori-paths.vala	2012-09-19 23:17:43.000000000 +0200
-+++ midori-0.4.7.patch/katze/midori-paths.vala	2012-09-24 20:36:04.585209437 +0200
-@@ -74,7 +74,7 @@
-             else if (mode == RuntimeMode.PRIVATE || mode == RuntimeMode.APP) {
-                 /* Use mock folders in development builds */
-                 if ("." in MIDORI_VERSION_SUFFIX)
--                    config_dir = cache_dir = user_data_dir = config_base;
-+                    config_dir = cache_dir = user_data_dir = config_base ?? Path.DIR_SEPARATOR_S;
-                 else
-                     config_dir = cache_dir = user_data_dir = "/";
-                 readonly_dir = config_base ?? Path.build_path (Path.DIR_SEPARATOR_S,
diff --git a/community/midori/0001-Fix-libsoup-version-check-defines.patch b/community/midori/0001-Fix-libsoup-version-check-defines.patch
deleted file mode 100644
index 2debc92fe..000000000
--- a/community/midori/0001-Fix-libsoup-version-check-defines.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c7c172f7ffc9316be5954c920654e1deb9f470b7 Mon Sep 17 00:00:00 2001
-From: Christian Dywan <christian@twotoasts.de>
-Date: Mon, 16 Apr 2012 17:17:23 +0000
-Subject: Fix libsoup version check #defines
-
-Fixes: https://bugs.launchpad.net/midori/+bug/983137
----
-diff --git a/wscript b/wscript
-index db74324..c7a0c87 100644
---- a/wscript
-+++ b/wscript
-@@ -260,11 +260,11 @@ def configure (conf):
-     check_pkg ('libsoup-2.4', '2.27.90')
-     conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4'))
-     if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 3):
--        conf.define ('LIBSOUP_2_29_3', 1)
-+        conf.define ('HAVE_LIBSOUP_2_29_3', 1)
-     if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 91):
--        conf.define ('LIBSOUP_2_29_91', 1)
-+        conf.define ('HAVE_LIBSOUP_2_29_91', 1)
-     if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1):
--        conf.define ('LIBSOUP_2_37_1', 1)
-+        conf.define ('HAVE_LIBSOUP_2_37_1', 1)
-     check_pkg ('libxml-2.0', '2.6')
-     check_pkg ('sqlite3', '3.0', True, var='SQLITE')
- 
---
-cgit v0.9.0.3
diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD
index 6c3e654e2..87815fc98 100644
--- a/community/midori/PKGBUILD
+++ b/community/midori/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83885 2013-02-06 11:36:28Z arodseth $
+# $Id: PKGBUILD 87825 2013-04-07 13:05:16Z arodseth $
 # Maintainer:  Alexander Rødseth <rodseth@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -7,33 +7,24 @@
 # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
 
 pkgname=midori
-pkgver=0.4.8
+pkgver=0.5.0
 pkgrel=1
 pkgdesc='Lightweight web browser based on Gtk WebKit'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.twotoasts.de/index.php?/pages/midori_summary.html'
 license=('LGPL2.1')
 install=midori.install
-depends=('libzeitgeist' 'libwebkit' 'libnotify' 'libxss' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'gcr')
-makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 'vala')
+depends=('libzeitgeist' 'libwebkit' 'libnotify' 'libxss' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 'vala' 'gcr')
 optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support'
             'aria2: download utility')
 options=('!emptydirs')
-source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
-        'fix-copying.patch')
-sha256sums=('40bf23f84a3537f54d7eb45df1da40ebef54c321b1b34d0d0c8e45bb0cce5e9f'
-            'd4395ac994d8d614f93ae4863bbf6289b1980e0ed84aef52ca95a678b464b959')
+source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2")
+sha256sums=('d280c19bb135f2b644a67d9f34d1ec1c148ceb14b5de11ce6c23f64c15be5df0')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  # FS#32229
-  patch -s -Np1 -i ../fix-copying.patch > /dev/null || true
-
-  # Python 2 
-  export PYTHON=/usr/bin/python2
-  sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
-  
   ./configure --prefix=/usr \
               --jobs=${MAKEFLAGS/-j/} \
               --enable-addons \
diff --git a/community/midori/fix-copying.patch b/community/midori/fix-copying.patch
deleted file mode 100644
index ab3581900..000000000
--- a/community/midori/fix-copying.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/midori/midori-browser.c b/midori/midori-browser.c
-index 28aca95..b33e2e4 100644
---- a/midori/midori-browser.c
-+++ b/midori/midori-browser.c
-@@ -1041,7 +1041,7 @@ midori_browser_save_uri (MidoriBrowser* browser,
-     GtkWidget* dialog;
-     const gchar* title = midori_view_get_display_title (view);
-     gchar* filename;
--    GList* resources = midori_view_get_subresources (view);
-+    GList* resources = midori_view_get_resources (view);
-     gboolean file_only = TRUE;
-     GtkWidget* checkbox = NULL;
- 
-diff --git a/midori/midori-view.c b/midori/midori-view.c
-index 37cc78f..2c71f55 100644
---- a/midori/midori-view.c
-+++ b/midori/midori-view.c
-@@ -1993,21 +1993,22 @@ midori_web_view_menu_image_new_tab_activate_cb (GtkWidget*  widget,
- }
- 
- GList*
--midori_view_get_subresources (MidoriView* view)
-+midori_view_get_resources (MidoriView* view)
- {
-     WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view);
-     WebKitWebFrame* frame = webkit_web_view_get_main_frame (web_view);
-     WebKitWebDataSource* data_source = webkit_web_frame_get_data_source (frame);
--    return webkit_web_data_source_get_subresources (data_source);
-+    GList* resources = webkit_web_data_source_get_subresources (data_source);
-+    return g_list_prepend (resources, webkit_web_data_source_get_main_resource (data_source));
- }
- 
- static GString*
- midori_view_get_data_for_uri (MidoriView*  view,
-                               const gchar* uri)
- {
--    GList* resources = midori_view_get_subresources (view);
-+    GList* resources = midori_view_get_resources (view);
-     GList* list;
--    GString* result;
-+    GString* result = NULL;
- 
-     for (list = resources; list; list = g_list_next (list))
-     {
-@@ -2032,7 +2033,8 @@ midori_view_clipboard_get_image_cb (GtkClipboard*     clipboard,
-     MidoriView* view = MIDORI_VIEW (g_object_get_data (user_data, "view"));
-     WebKitHitTestResult* hit_test = user_data;
-     gchar* uri = katze_object_get_string (hit_test, "image-uri");
--    /* if (gtk_selection_data_targets_include_image (selection_data, TRUE)) */
-+
-+    if (gtk_targets_include_image(&selection_data->target, 1, TRUE))
-     {
-         GString* data = midori_view_get_data_for_uri (view, uri);
-         if (data != NULL)
-@@ -2052,7 +2054,7 @@ midori_view_clipboard_get_image_cb (GtkClipboard*     clipboard,
-         else
-             g_warn_if_reached ();
-     }
--    /* if (gtk_selection_data_targets_include_text (selection_data)) */
-+    if (gtk_targets_include_text(&selection_data->target, 1))
-         gtk_selection_data_set_text (selection_data, uri, -1);
-     g_free (uri);
- }
diff --git a/community/midori/webkit_search.diff b/community/midori/webkit_search.diff
deleted file mode 100644
index 620cdc96f..000000000
--- a/community/midori/webkit_search.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001
-From: Christian Dywan <christian@twotoasts.de>
-Date: Wed, 21 Sep 2011 21:50:51 +0000
-Subject: Use DOM API to get selected text in WebKitGTK+ 1.5.1
-
-Fixes: https://bugs.launchpad.net/midori/+bug/799603
----
-diff --git a/midori/midori-view.c b/midori/midori-view.c
-index 0d7a96e..e426e7f 100644
---- a/midori/midori-view.c
-+++ b/midori/midori-view.c
-@@ -39,9 +39,11 @@
-     #include <sys/utsname.h>
- #endif
- 
-+#if !WEBKIT_CHECK_VERSION (1, 5, 1)
- /* This is unstable API, so we need to declare it */
- gchar*
- webkit_web_view_get_selected_text (WebKitWebView* web_view);
-+#endif
- 
- static void
- midori_view_construct_web_view (MidoriView* view);
-@@ -4167,10 +4169,33 @@ midori_view_get_link_uri (MidoriView* view)
- gboolean
- midori_view_has_selection (MidoriView* view)
- {
-+#if WEBKIT_CHECK_VERSION (1, 5, 1)
-+    WebKitDOMDocument* doc;
-+    WebKitDOMDOMWindow* window;
-+    WebKitDOMDOMSelection* selection;
-+    WebKitDOMRange* range;
-+#endif
-+
-     g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
- 
-+
-+#if WEBKIT_CHECK_VERSION (1, 5, 1)
-+    doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view));
-+    window = webkit_dom_document_get_default_view (doc);
-+    selection = webkit_dom_dom_window_get_selection (window);
-+    if (selection == NULL)
-+        return FALSE;
-+
-+    range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL);
-+    if (range == NULL)
-+        return FALSE;
-+
-+    katze_assign (view->selected_text, webkit_dom_range_get_text (range));
-+#else
-     katze_assign (view->selected_text, webkit_web_view_get_selected_text (
-         WEBKIT_WEB_VIEW (view->web_view)));
-+#endif
-+
-     if (view->selected_text && *view->selected_text)
-         return TRUE;
-     else
---
-cgit 
diff --git a/community/milkytracker/PKGBUILD b/community/milkytracker/PKGBUILD
index 8d427a35b..45c6ed0aa 100644
--- a/community/milkytracker/PKGBUILD
+++ b/community/milkytracker/PKGBUILD
@@ -1,32 +1,37 @@
-# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $
+# $Id: PKGBUILD 88664 2013-04-21 13:23:51Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Christopher O'Neill <milkytracker@chrisoneill.co.uk>
 # Contributor: Maks Verver <maksverver@geocities.com>
 
 pkgname=milkytracker
 pkgver=0.90.85
-pkgrel=7
-pkgdesc="Fast Tracker II inspired music tracker"
+pkgrel=8
+pkgdesc='Fast Tracker II inspired music tracker'
 arch=('x86_64' 'i686' 'mips64el')
 url="http://www.milkytracker.org/"
 license=('GPL3')
-depends=('sdl>=1.2.0' 'alsa-lib' 'zlib' 'gcc-libs' 'setconf' 'gendesk')
-makedepends=('jack-audio-connection-kit')
+depends=('sdl' 'alsa-lib' 'zlib' 'gcc-libs')
+makedepends=('jack-audio-connection-kit' 'gendesk')
 optdepends=('jack-audio-connection-kit: JACK audio support')
 options=('docs' '!strip')
-install=$pkgname.install
+install="$pkgname.install"
 source=("http://milkytracker.org/files/$pkgname-$pkgver.tar.bz2"
-        'arch.patch')
+        "$pkgname.patch")
 sha256sums=('59a0d294d63752be74b157e07b0c70252c9198c312d9b1ad0ca460129fe5bd80'
-            'c0cf7adc0db78519644a64321c319b04a6ee6c26de1f0620b581137791f596c3')
+            '0b701bf97375343f13d1af8a30df052c85b526e527bf6402634c37c7e9fa5b42')
 _name=('MilkyTracker')
+_categories=('AudioVideo;Audio;AudioVideoEditing;')
 
-build() {
+prepare() {
   cd "$srcdir"
+
   gendesk -n
-  setconf "$pkgname.desktop" Categories 'AudioVideo;Audio;AudioVideoEditing;'
+  patch -p0 -i "$pkgname.patch"
+}
+
+build() {
   cd "$pkgname-$pkgver"
-  patch -p1 -i ../arch.patch 
+
   ./configure --prefix=/usr --with-alsa --with-jack
   make
 }
diff --git a/community/milkytracker/milkytracker.desktop b/community/milkytracker/milkytracker.desktop
deleted file mode 100644
index 0309121cc..000000000
--- a/community/milkytracker/milkytracker.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=MilkyTracker
-Type=Application
-Comment=FastTracker 2 inspired music tracker
-Exec=milkytracker
-TryExec=milkytracker
-Icon=milkytracker.png
-Categories=AudioVideo;Audio;AudioVideoEditing;
diff --git a/community/milkytracker/milkytracker.install b/community/milkytracker/milkytracker.install
index aeef78890..f415655f7 100644
--- a/community/milkytracker/milkytracker.install
+++ b/community/milkytracker/milkytracker.install
@@ -1,6 +1,4 @@
 post_upgrade() {
-  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-  update-desktop-database -q
   echo 'If you wish to use jack (or jack2), use this command the first time'
   echo 'you start milkytracker: SDL_AUDIODRIVER=jack milkytracker'
   echo 'Then select the jack driver in milkytracker and connect the audio'
diff --git a/community/milkytracker/arch.patch b/community/milkytracker/milkytracker.patch
index f7ade306f..ee292a87c 100644
--- a/community/milkytracker/arch.patch
+++ b/community/milkytracker/milkytracker.patch
@@ -203,8 +203,8 @@ diff -c -x .svn milkytracker-0.90.85/docs/MilkyTracker.html milkytracker-trunk/d
   
   
 Only in milkytracker-0.90.85/docs/: MilkyTracker.rtf
---- x/src/compression/DecompressorGZIP.cpp	2012-08-28 17:54:46.000000000 +0200
-+++ y/src/compression/DecompressorGZIP.cpp	2012-08-28 17:55:21.000000000 +0200
+--- milkytracker-0.90.85/src/compression/DecompressorGZIP.cpp	2012-08-28 17:54:46.000000000 +0200
++++ milkytracker-trunk/src/compression/DecompressorGZIP.cpp	2012-08-28 17:55:21.000000000 +0200
 @@ -57,11 +57,11 @@
  	
  bool DecompressorGZIP::decompress(const PPSystemString& outFileName, Hints hint)
diff --git a/community/minbif/PKGBUILD b/community/minbif/PKGBUILD
index f34717346..b96561236 100644
--- a/community/minbif/PKGBUILD
+++ b/community/minbif/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=minbif
 pkgver=1.0.5
-pkgrel=2
+pkgrel=2.1
 pkgdesc='An IRC gateway to IM networks that uses libpurple.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://minbif.im/'
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index b72d9c712..67fb86bd4 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79502 2012-11-06 11:19:57Z spupykin $
+# $Id: PKGBUILD 84354 2013-02-16 22:50:32Z ioni $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=minidlna
 pkgver=1.0.25
-pkgrel=4
+pkgrel=5
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/minidlna/"
diff --git a/community/minidlna/ffmpeg-compat.patch b/community/minidlna/ffmpeg-compat.patch
deleted file mode 100644
index aa6f982e5..000000000
--- a/community/minidlna/ffmpeg-compat.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -wbBur minidlna-1.0.24/genconfig.sh minidlna-1.0.24.my/genconfig.sh
---- minidlna-1.0.24/genconfig.sh	2012-01-21 04:34:13.000000000 +0400
-+++ minidlna-1.0.24.my/genconfig.sh	2012-07-09 09:51:09.000000000 +0400
-@@ -47,15 +47,15 @@
- [ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING"
- [ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING"
- [ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING"
--[ ! -e "/usr/include/ffmpeg/avutil.h" -a \
-+[ ! -e "/usr/include/ffmpeg-compat/avutil.h" -a \
-   ! -e "/usr/include/libavutil/avutil.h" -a \
--  ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING"
--[ ! -e "/usr/include/ffmpeg/avformat.h" -a \
-+  ! -e "/usr/include/ffmpeg-compat/libavutil/avutil.h" ] && MISSING="libavutil $MISSING"
-+[ ! -e "/usr/include/ffmpeg-compat/avformat.h" -a \
-   ! -e "/usr/include/libavformat/avformat.h" -a \
--  ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING"
--[ ! -e "/usr/include/ffmpeg/avcodec.h" -a \
-+  ! -e "/usr/include/ffmpeg-compat/libavformat/avformat.h" ] && MISSING="libavformat $MISSING"
-+[ ! -e "/usr/include/ffmpeg-compat/avcodec.h" -a \
-   ! -e "/usr/include/libavcodec/avcodec.h" -a \
--  ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING"
-+  ! -e "/usr/include/ffmpeg-compat/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING"
- if [ -n "$MISSING" ]; then
- 	echo -e "\nERROR!  Cannot continue."
- 	echo -e "The following required libraries are either missing, or are missing development headers:\n"
-diff -wbBur minidlna-1.0.24/Makefile minidlna-1.0.24.my/Makefile
---- minidlna-1.0.24/Makefile	2012-01-18 02:49:01.000000000 +0400
-+++ minidlna-1.0.24.my/Makefile	2012-07-09 10:01:10.000000000 +0400
-@@ -13,9 +13,9 @@
- #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
- #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
- CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
--	 -I/usr/include/ffmpeg \
--	 -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
--	 -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
-+	 -I/usr/include/ffmpeg-compat \
-+	 -I/usr/include/ffmpeg-compat/libavutil -I/usr/include/ffmpeg-compat/libavcodec -I/usr/include/ffmpeg-compat/libavformat
-+LDFLAGS+= -L/usr/lib/ffmpeg-compat -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat
- #STATIC_LINKING: CFLAGS += -DSTATIC
- #STATIC_LINKING: LDFLAGS = -static
- CC = gcc
-@@ -64,7 +64,7 @@
- 	$(INSTALL) -d $(ETCINSTALLDIR)
- 	$(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
- 
--minidlna:	$(BASEOBJS) $(LNXOBJS) $(LIBS)
-+minidlna:	$(BASEOBJS) $(LNXOBJS)
- 	@echo Linking $@
- 	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
- 
diff --git a/community/minidlna/ffmpeg_0.11.diff b/community/minidlna/ffmpeg_0.11.diff
deleted file mode 100644
index f43831add..000000000
--- a/community/minidlna/ffmpeg_0.11.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -rup minidlna-1.0.24/metadata.c minidlna-1.0.24.new/metadata.c
---- minidlna-1.0.24/metadata.c	2012-02-14 19:44:56.000000000 +0100
-+++ minidlna-1.0.24.new/metadata.c	2012-07-10 10:28:01.373163002 +0200
-@@ -1514,10 +1548,10 @@ GetVideoMetadata(const char * path, char
- 	{
- 		if( ctx->metadata )
- 		{
--			AVMetadataTag *tag = NULL;
-+			AVDictionaryEntry *tag = NULL;
- 
- 			//DEBUG DPRINTF(E_DEBUG, L_METADATA, "Metadata:\n");
--			while( (tag = av_metadata_get(ctx->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX)) )
-+			while( (tag = av_dict_get(ctx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX)) )
- 			{
- 				//DEBUG DPRINTF(E_DEBUG, L_METADATA, "  %-16s: %s\n", tag->key, tag->value);
- 				if( strcmp(tag->key, "title") == 0 )
diff --git a/community/minidlna/minidlna.conf b/community/minidlna/minidlna.conf
deleted file mode 100644
index 98be33c0d..000000000
--- a/community/minidlna/minidlna.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# systemd tmpfile settings for minidlna
-# See tmpfiles.d(5) for details
-
-d /var/run/minidlna 0755 nobody nobody -
diff --git a/community/minitube/PKGBUILD b/community/minitube/PKGBUILD
index ef95aa934..ed80bc65e 100644
--- a/community/minitube/PKGBUILD
+++ b/community/minitube/PKGBUILD
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('phonon')
 install="$pkgname.install"
 source=("http://flavio.tordini.org/files/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('7df1e44b86a4744a492ccc414c0fa77d')
+md5sums=('0da4cb8940034aad832e41acc52df365')
 
 build() {
   cd "$srcdir/$pkgname"
diff --git a/community/minitube/fix-build.patch b/community/minitube/fix-build.patch
deleted file mode 100644
index 9ac61d21b..000000000
--- a/community/minitube/fix-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- minitube/src/qtsingleapplication/qtlocalpeer.cpp~	2012-06-29 18:13:35.133070928 +0000
-+++ minitube/src/qtsingleapplication/qtlocalpeer.cpp	2012-06-29 18:14:16.359420453 +0000
-@@ -57,6 +57,8 @@
- static PProcessIdToSessionId pProcessIdToSessionId = 0;
- #endif
- #if defined(Q_OS_UNIX)
-+#include <sys/types.h>
-+#include <unistd.h>
- #include <time.h>
- #endif
- 
diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD
index 590db4288..cb1607a7e 100644
--- a/community/mixxx/PKGBUILD
+++ b/community/mixxx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73315 2012-07-06 08:33:12Z lfleischer $
+# $Id: PKGBUILD 86767 2013-03-22 00:23:48Z eric $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com>
 # Contributor: Ryan Coyner <rcoyner@gmail.com>
@@ -6,23 +6,23 @@
 
 pkgname=mixxx
 pkgver=1.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Free, open source software for digital DJ'ing."
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mixxx.org'
 license=('GPL')
 depends=('fftw' 'libid3tag' 'libmad' 'libogg' 'libshout' 'libsndfile' 'portaudio' 'portmidi'
-         'qt>=4.5' 'taglib' 'qtwebkit')
-makedepends=('mesa' 'scons' 'libshout')
+         'taglib' 'qtwebkit')
+makedepends=('mesa' 'scons' 'libshout' 'glu')
 source=("http://downloads.mixxx.org/${pkgname}-${pkgver}/${pkgname}-${pkgver}-src.tar.gz")
 md5sums=('765bc5216ec8102c2186dd3ea80187a9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  scons qtdir=/usr/lib/qt prefix=/usr install_root="${pkgdir}/usr"
+  scons qtdir=/usr/lib/qt4 prefix=/usr
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  scons qtdir=/usr/lib/qt prefix=/usr install_root="${pkgdir}/usr" install
+  scons qtdir=/usr/lib/qt4 prefix=/usr install_root="${pkgdir}/usr" install
 }
diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD
index 460532db8..3acfd055e 100644
--- a/community/mksh/PKGBUILD
+++ b/community/mksh/PKGBUILD
@@ -1,33 +1,32 @@
-# $Id: PKGBUILD 80731 2012-12-01 17:21:44Z ttoepper $
+# $Id: PKGBUILD 89899 2013-05-05 12:20:12Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Daniel Hommel <dhommel@gmail.com>
 
 pkgname=mksh
-pkgver=R41
+pkgver=R46
 pkgrel=1
 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh'
 url='https://www.mirbsd.org/mksh.htm'
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
+depends=('gcc-libs')
 install=mksh.install
 source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.tgz"
         'https://www.mirbsd.org/TaC-mksh.txt')
-depends=('gcc-libs')
-md5sums=('70eca50d9340412714ef09b7060ebde9'
-         '124164b14263f5ee09d2135fffce7282')
+md5sums=('77c108d8143a6e7670954d77517d216d'
+         'a231b325d5f2155a6c667a9323986718')
 
 build() {
   cd "$srcdir/$pkgname"
 
   sh Build.sh -r -c lto
   ./test.sh
-  gzip -n9 mksh.1
 }
 
 package() {
   cd "$srcdir/$pkgname"
-  install -D -m 755 mksh "$pkgdir/bin/mksh"
-  install -D -m 644 mksh.1.gz "$pkgdir/usr/share/man/man1/mksh.1.gz"
+  install -D -m 755 mksh "$pkgdir/usr/bin/mksh"
+  install -D -m 644 mksh.1 "$pkgdir/usr/share/man/man1/mksh.1"
   install -D -m 644 dot.mkshrc "$pkgdir/etc/skel/.mkshrc"
   install -D -m 644 "$srcdir/TaC-mksh.txt" "$pkgdir/usr/share/licenses/mksh/TaC-mksh.txt"
 }
diff --git a/community/mktorrent/PKGBUILD b/community/mktorrent/PKGBUILD
index 77c48b811..6aa2180bb 100644
--- a/community/mktorrent/PKGBUILD
+++ b/community/mktorrent/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=mktorrent
 pkgver=1.0
-pkgrel=3
+pkgrel=3.1
 pkgdesc='Simple command line utility to create BitTorrent metainfo files'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://mktorrent.sourceforge.net/'
diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD
index 0b7b7f60a..fcfce8731 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83305 2013-01-29 09:44:40Z spupykin $
+# $Id: PKGBUILD 86716 2013-03-21 12:08:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
 # Contributor: funkyou <spamopfer@nickname.berlin.de>
@@ -8,30 +8,30 @@
 pkgbase=mlt
 pkgname=('mlt' 'mlt-python-bindings')
 pkgver=0.8.8
-pkgrel=1
+pkgrel=4
 pkgdesc="An open source multimedia framework"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mltframework.org"
 license=('GPL')
-makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
+makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt4' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
 	     'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-	ffmpeg.patch)
+	fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
 md5sums=('06de4052cffd6760c468d7da9557edae'
-         'c28b4691d1715432d4de0055f4e2f5eb')
+         '8227e7a1b059b1b16901166d2a508317')
 
 build() {
   # mlt
   cd "$srcdir/mlt-$pkgver"
 
-#  patch -p1 <$srcdir/ffmpeg.patch
+  patch -p1 <$srcdir/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
 
   [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2=
 #  SSE2=--disable-sse2
 
   msg "SSE2=$SSE2"
   ./configure --prefix=/usr --enable-gpl --enable-gpl3 \
-	--qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/Qt \
+	--qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/qt4 \
 	--avformat-vdpau \
 	--avformat-swscale $SSE2
   make
@@ -46,7 +46,7 @@ build() {
 
 package_mlt() {
   depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 'frei0r-plugins')
-  optdepends=('jack' 'libexif' 'qt' 'gtk2' "ladspa")
+  optdepends=('jack' 'libexif' 'qt4' 'gtk2' "ladspa")
   conflicts=('mlt++<=0.3.8')
 
   cd "$srcdir/mlt-$pkgver"
diff --git a/community/mlt/ffmpeg.patch b/community/mlt/ffmpeg.patch
deleted file mode 100644
index 7bd4903db..000000000
--- a/community/mlt/ffmpeg.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -wbBur mlt-0.8.2/src/modules/avformat/consumer_avformat.c mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c
---- mlt-0.8.2/src/modules/avformat/consumer_avformat.c	2012-08-28 20:25:58.000000000 +0400
-+++ mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c	2012-11-06 16:03:07.269782436 +0400
-@@ -237,11 +237,7 @@
- 		mlt_properties_set_data( properties, "acodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL );
- 		mlt_properties_set_data( doc, "audio_codecs", codecs, 0, NULL, NULL );
- 		while ( ( codec = av_codec_next( codec ) ) )
--#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0)
--			if ( ( codec->encode || codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO )
--#else
--			if ( codec->encode && codec->type == CODEC_TYPE_AUDIO )
--#endif
-+			if ( ( codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO )
- 			{
- 				snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) );
- 				mlt_properties_set( codecs, key, codec->name );
-@@ -261,11 +257,7 @@
- 		mlt_properties_set_data( properties, "vcodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL );
- 		mlt_properties_set_data( doc, "video_codecs", codecs, 0, NULL, NULL );
- 		while ( ( codec = av_codec_next( codec ) ) )
--#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0)
--			if ( (codec->encode || codec->encode2) && codec->type == CODEC_TYPE_VIDEO )
--#else
--			if ( codec->encode && codec->type == CODEC_TYPE_VIDEO )
--#endif
-+			if ( (codec->encode2) && codec->type == CODEC_TYPE_VIDEO )
- 			{
- 				snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) );
- 				mlt_properties_set( codecs, key, codec->name );
diff --git a/community/mlt/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch b/community/mlt/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
new file mode 100644
index 000000000..eb81f33f4
--- /dev/null
+++ b/community/mlt/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
@@ -0,0 +1,37 @@
+From ef749d7b526f0762a00a369ea35b5b12c18142fb Mon Sep 17 00:00:00 2001
+From: Nicolas Boichat <nicolas@boichat.ch>
+Date: Wed, 20 Mar 2013 16:50:56 +0800
+Subject: [PATCH] Fix Segmentation fault at exit by calling
+ av_lockmgr_register( NULL );
+
+---
+ src/modules/avformat/factory.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
+index ddf05fe..a273537 100644
+--- a/src/modules/avformat/factory.c
++++ b/src/modules/avformat/factory.c
+@@ -83,6 +83,11 @@ static int avformat_lockmgr(void **mutex, enum AVLockOp op)
+    return 0;
+ }
+ 
++static void avformat_exit( )
++{
++	av_lockmgr_register( NULL );
++}
++
+ static void avformat_init( )
+ {
+ 	// Initialise avformat if necessary
+@@ -98,6 +103,7 @@ static void avformat_init( )
+ 		avformat_network_init();
+ #endif
+ 		av_log_set_level( mlt_log_get_level() );
++		atexit(avformat_exit);
+ 	}
+ }
+ 
+-- 
+1.8.1.5
+
diff --git a/community/mod_wsgi2/PKGBUILD b/community/mod_wsgi2/PKGBUILD
index 07d26f45f..1e0e0c3c0 100644
--- a/community/mod_wsgi2/PKGBUILD
+++ b/community/mod_wsgi2/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 80683 2012-11-29 03:29:49Z arodseth $
+# $Id: PKGBUILD 89811 2013-05-02 13:55:03Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Ryan Coyner <rcoyner@gmail.com>
 
 pkgname=mod_wsgi2
 pkgver=3.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Python2 WSGI adapter module for Apache'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.modwsgi.org/'
 license=('APACHE')
 depends=('apache' 'python2')
 conflicts=('mod_wsgi')
-install=$pkgname.install
+install="$pkgname.install"
 source=("http://modwsgi.googlecode.com/files/mod_wsgi-$pkgver.tar.gz")
 sha256sums=('ae85c98e9e146840ab3c3e4490e6774f9bef0f99b9f679fca786b2adb5b4b6e8')
 
 build() {
   cd "$srcdir/mod_wsgi-$pkgver"
 
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --with-apxs=/usr/sbin/apxs \
     --with-python=/usr/bin/python2
   make
diff --git a/community/mod_wsgi2/mod_wsgi2.install b/community/mod_wsgi2/mod_wsgi2.install
index d26d61631..a7f0290c2 100644
--- a/community/mod_wsgi2/mod_wsgi2.install
+++ b/community/mod_wsgi2/mod_wsgi2.install
@@ -1,9 +1,9 @@
 post_install() {
-/bin/cat << ENDOFMESSAGE
+  cat << ENDOFMESSAGE
 ==>
 ==>
 ==>  To install mod_wsgi, add the following line in 
-==>  /etc/httpd/conf/httpd.conf file :
+==>  /etc/httpd/conf/httpd.conf file:
 ==>
 ==>  LoadModule wsgi_module modules/mod_wsgi.so
 ==>
@@ -12,3 +12,5 @@ post_install() {
 ==>
 ENDOFMESSAGE
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch b/community/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch
deleted file mode 100644
index 40dd48b42..000000000
--- a/community/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3f6b2390102ea9d808c7075b5aaeec743b7d104e Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 10 Apr 2012 19:30:35 -0500
-Subject: [PATCH 1/2] Backport for mongodb 2.0.4 "Ignore --fork and --logpath
- when using --shutdown SERVER-5186 SERVER-5187"
-
-https://github.com/mongodb/mongo/commit/fa2e2ef95c5c934eef63fff4b98d5eb060c5653923
-
-Backported in preparation for backporting the fix for https://jira.mongodb.org/browse/SERVER-5358
----
- db/cmdline.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/db/cmdline.cpp b/db/cmdline.cpp
-index fd759a7..346a9ae 100644
---- a/db/cmdline.cpp
-+++ b/db/cmdline.cpp
-@@ -239,7 +239,7 @@ namespace mongo {
-             cmdLine.noUnixSocket = true;
-         }
- 
--        if (params.count("fork")) {
-+        if (params.count("fork") && !params.count("shutdown")) {
-             if ( ! params.count( "logpath" ) ) {
-                 cout << "--fork has to be used with --logpath" << endl;
-                 ::exit(-1);
-@@ -304,7 +304,7 @@ namespace mongo {
-         }
- 
- #endif
--        if (params.count("logpath")) {
-+        if (params.count("logpath") && !params.count("shutdown")) {
-             if ( logpath.size() == 0 )
-                 logpath = params["logpath"].as<string>();
-             uassert( 10033 ,  "logpath has to be non-zero" , logpath.size() );
--- 
-1.7.10
-
diff --git a/community/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch b/community/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch
deleted file mode 100644
index aff066450..000000000
--- a/community/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 77f78f64c192572e6eb956b0fe28ecd975ff6461 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 10 Apr 2012 19:38:58 -0500
-Subject: [PATCH 2/2] Backport for mongodb 2.0.4 "Don't check /proc/pid/exe in
- --shutdown SERVER-5358"
-
-Backported to fix https://jira.mongodb.org/browse/SERVER-5358
-
-https://github.com/mongodb/mongo/commit/c28d97d1a14a36ffc056bfd9ba7262b0a1509b5b
----
- db/db.cpp |   16 ----------------
- 1 file changed, 16 deletions(-)
-
-diff --git a/db/db.cpp b/db/db.cpp
-index b1d1db8..0a21f4d 100644
---- a/db/db.cpp
-+++ b/db/db.cpp
-@@ -989,22 +989,6 @@ int main(int argc, char* argv[]) {
-                     procPath = (str::stream() << "/proc/" << pid);
-                     if (!boost::filesystem::exists(procPath))
-                         failed = true;
--
--                    string exePath = procPath + "/exe";
--                    if (boost::filesystem::exists(exePath)){
--                        char buf[256];
--                        int ret = readlink(exePath.c_str(), buf, sizeof(buf)-1);
--                        buf[ret] = '\0'; // readlink doesn't terminate string
--                        if (ret == -1) {
--                            int e = errno;
--                            cerr << "Error resolving " << exePath << ": " << errnoWithDescription(e);
--                            failed = true;
--                        }
--                        else if (!endsWith(buf, "mongod")){
--                            cerr << "Process " << pid << " is running " << buf << " not mongod" << endl;
--                            ::exit(-1);
--                        }
--                    }
-                 }
-                 catch (const std::exception& e){
-                     cerr << "Error reading pid from lock file [" << name << "]: " << e.what() << endl;
--- 
-1.7.10
-
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 2ca7a8d4f..cd8b21b41 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83665 2013-02-04 10:18:57Z fyan $
+# $Id: PKGBUILD 88850 2013-04-24 10:16:56Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -6,7 +6,7 @@
 # Contributor: Alec Thomas
 
 pkgname=mongodb
-pkgver=2.2.3
+pkgver=2.4.3
 pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,8 +19,8 @@ optdepends=('libpcap: needed for mongosniff')
 backup=('etc/mongodb.conf')
 install=mongodb.install
 source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
-        'mongodb.rc' 'mongodb.conf' 'mongodb.service'
-        'SConscript.client.patch' 'boost1.50.patch')
+        'mongodb.conf' 'mongodb.service' 'SConscript.client.patch'
+        'removeWerror.patch')
 
 build() {
   # fucking mongo aint no fun to package
@@ -31,8 +31,8 @@ build() {
   # fix https://jira.mongodb.org/browse/SERVER-5575
   patch -Np1 -i ${srcdir}/SConscript.client.patch
 
-  # fix boost incompatibility
-  patch -Np1 -i ${srcdir}/boost1.50.patch
+  # failed to build with -Werror since 2.4.0
+  patch -Np1 -i "$srcdir/removeWerror.patch"
 
   scons all --use-system-boost # --sharedclient currently fails
 }
@@ -54,21 +54,18 @@ package() {
 
   scons install --use-system-boost --full --prefix=$pkgdir/usr # --sharedclient currently fails
 
-  install -Dm755 $srcdir/mongodb.rc $pkgdir/etc/rc.d/mongodb
-  install -Dm644 $srcdir/mongodb.conf $pkgdir/etc/mongodb.conf
-  [[ -f $pkgdir/usr/lib ]] && rm $pkgdir/usr/lib # wtf mongo
-  install -Dm644 $srcdir/mongodb.service $pkgdir/usr/lib/systemd/system/mongodb.service
-  install -dm700 $pkgdir/var/lib/mongodb
-  install -dm755 $pkgdir/var/log/mongodb
+  install -Dm644 "$srcdir/mongodb.conf" "$pkgdir/etc/mongodb.conf"
+  [[ -f "$pkgdir/usr/lib" ]] && rm "$pkgdir/usr/lib" # wtf mongo
+  install -Dm644 "$srcdir/mongodb.service" "$pkgdir/usr/lib/systemd/system/mongodb.service"
+  install -dm700 "$pkgdir/var/lib/mongodb"
+  install -dm755 "$pkgdir/var/log/mongodb"
 
   # the earlier SConscript patch actually gives us some trouble on x86_64 so we need to hack it out again
   mv ${pkgdir}/usr/lib64/libmongoclient.a ${pkgdir}/usr/lib/ || true
   rm -r ${pkgdir}/usr/lib64 || true
-
 }
-md5sums=('4308c72b1342236dc585e0df0201db48'
-         '9c67e00f4626ad761a8f7d4e037a54d7'
+md5sums=('ff6a9c90bdaca66a7e997ba8490fc222'
          '4839fe1d638187ca3226e8267b947318'
          '96ab4517b48974ce0e566d9746a75a4f'
          'a9529e2a6e392ffecef7a9178394c814'
-         'da8a9d78e4a38d1ed8e92a210d4b5ba7')
+         'c97f3fd59bbbdd9f0f6916322d95feb4')
diff --git a/community/mongodb/boost-1.50.patch b/community/mongodb/boost-1.50.patch
deleted file mode 100644
index 4ccb898ec..000000000
--- a/community/mongodb/boost-1.50.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/db.cpp mongodb-src-r2.0.6-patched/db/db.cpp
---- mongodb-src-r2.0.6/db/db.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/db.cpp	2012-07-10 22:27:16.496886220 +0200
-@@ -326,7 +326,7 @@
-         boost::filesystem::path path( dbpath );
-         for ( boost::filesystem::directory_iterator i( path );
-                 i != boost::filesystem::directory_iterator(); ++i ) {
--            string fileName = boost::filesystem::path(*i).leaf();
-+            string fileName = boost::filesystem::path(*i).leaf().string();
-             if ( boost::filesystem::is_directory( *i ) &&
-                     fileName.length() && fileName[ 0 ] == '$' )
-                 boost::filesystem::remove_all( *i );
-@@ -655,11 +655,6 @@
-     dbExecCommand = argv[0];
- 
-     srand(curTimeMicros());
--#if( BOOST_VERSION >= 104500 )
--    boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
--#else
--    boost::filesystem::path::default_name_check( boost::filesystem::no_check );
--#endif
- 
-     {
-         unsigned x = 0x12345678;
-@@ -976,7 +971,7 @@
-         if (params.count("shutdown")){
-             bool failed = false;
- 
--            string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
-+            string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string();
-             if ( !boost::filesystem::exists( name ) || boost::filesystem::file_size( name ) == 0 )
-                 failed = true;
- 
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur.cpp mongodb-src-r2.0.6-patched/db/dur.cpp
---- mongodb-src-r2.0.6/db/dur.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/dur.cpp	2012-07-10 21:56:28.866778732 +0200
-@@ -692,7 +692,7 @@
- 
-             bool samePartition = true;
-             try {
--                const string dbpathDir = boost::filesystem::path(dbpath).native_directory_string();
-+                const string dbpathDir = boost::filesystem::path(dbpath).string();
-                 samePartition = onSamePartition(getJournalDir().string(), dbpathDir);
-             }
-             catch(...) {
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_journal.cpp mongodb-src-r2.0.6-patched/db/dur_journal.cpp
---- mongodb-src-r2.0.6/db/dur_journal.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/dur_journal.cpp	2012-07-10 22:04:18.583472723 +0200
-@@ -169,7 +169,7 @@
-                 for ( boost::filesystem::directory_iterator i( getJournalDir() );
-                         i != boost::filesystem::directory_iterator();
-                         ++i ) {
--                    string fileName = boost::filesystem::path(*i).leaf();
-+                    string fileName = boost::filesystem::path(*i).leaf().string();
-                     if( str::startsWith(fileName, "j._") )
-                         return true;
-                 }
-@@ -185,7 +185,7 @@
-                 for ( boost::filesystem::directory_iterator i( getJournalDir() );
-                         i != boost::filesystem::directory_iterator();
-                         ++i ) {
--                    string fileName = boost::filesystem::path(*i).leaf();
-+                    string fileName = boost::filesystem::path(*i).leaf().string();
-                     if( str::startsWith(fileName, "j._") ) {
-                         try {
-                             removeOldJournalFile(*i);
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_recover.cpp mongodb-src-r2.0.6-patched/db/dur_recover.cpp
---- mongodb-src-r2.0.6/db/dur_recover.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/dur_recover.cpp	2012-07-10 22:02:18.226799055 +0200
-@@ -71,7 +71,7 @@
-                     i != filesystem::directory_iterator();
-                     ++i ) {
-                 filesystem::path filepath = *i;
--                string fileName = filesystem::path(*i).leaf();
-+                string fileName = filesystem::path(*i).leaf().string();
-                 if( str::startsWith(fileName, "j._") ) {
-                     unsigned u = str::toUnsigned( str::after(fileName, '_') );
-                     if( m.count(u) ) {
-@@ -84,7 +84,7 @@
-                 if( i != m.begin() && m.count(i->first - 1) == 0 ) {
-                     uasserted(13532,
-                     str::stream() << "unexpected file in journal directory " << dir.string()
--                      << " : " << filesystem::path(i->second).leaf() << " : can't find its preceeding file");
-+                      << " : " << filesystem::path(i->second).leaf().string() << " : can't find its preceeding file");
-                 }
-                 files.push_back(i->second);
-             }
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/instance.cpp mongodb-src-r2.0.6-patched/db/instance.cpp
---- mongodb-src-r2.0.6/db/instance.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/instance.cpp	2012-07-10 22:08:55.213488817 +0200
-@@ -645,13 +645,13 @@
-                 i != boost::filesystem::directory_iterator(); ++i ) {
-             if ( directoryperdb ) {
-                 boost::filesystem::path p = *i;
--                string dbName = p.leaf();
-+                string dbName = p.leaf().string();
-                 p /= ( dbName + ".ns" );
-                 if ( MMF::exists( p ) )
-                     names.push_back( dbName );
-             }
-             else {
--                string fileName = boost::filesystem::path(*i).leaf();
-+                string fileName = boost::filesystem::path(*i).leaf().string();
-                 if ( fileName.length() > 3 && fileName.substr( fileName.length() - 3, 3 ) == ".ns" )
-                     names.push_back( fileName.substr( 0, fileName.length() - 3 ) );
-             }
-@@ -893,7 +893,7 @@
-     }
- 
-     void acquirePathLock(bool doingRepair) {
--        string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
-+        string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string();
- 
-         bool oldFile = false;
- 
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/pdfile.cpp mongodb-src-r2.0.6-patched/db/pdfile.cpp
---- mongodb-src-r2.0.6/db/pdfile.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/pdfile.cpp	2012-07-10 22:11:44.103498643 +0200
-@@ -1987,7 +1987,7 @@
-             virtual bool apply( const Path &p ) {
-                 if ( !boost::filesystem::exists( p ) )
-                     return false;
--                boostRenameWrapper( p, newPath_ / ( p.leaf() + ".bak" ) );
-+                boostRenameWrapper( p, newPath_ / ( p.leaf().string() + ".bak" ) );
-                 return true;
-             }
-             virtual const char * op() const {
-@@ -2093,7 +2093,7 @@
-             uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ?
-                                 "backup" : "$tmp" );
-         BOOST_CHECK_EXCEPTION( boost::filesystem::create_directory( reservedPath ) );
--        string reservedPathString = reservedPath.native_directory_string();
-+        string reservedPathString = reservedPath.string();
- 
-         bool res;
-         {
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/dbtests/framework.cpp mongodb-src-r2.0.6-patched/dbtests/framework.cpp
---- mongodb-src-r2.0.6/dbtests/framework.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/dbtests/framework.cpp	2012-07-10 22:29:20.610226773 +0200
-@@ -281,7 +281,7 @@
-                 boost::filesystem::create_directory(p);
-             }
- 
--            string dbpathString = p.native_directory_string();
-+            string dbpathString = p.string();
-             dbpath = dbpathString.c_str();
- 
-             cmdLine.prealloc = false;
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/pch.h mongodb-src-r2.0.6-patched/pch.h
---- mongodb-src-r2.0.6/pch.h	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/pch.h	2012-07-10 21:35:57.133373738 +0200
-@@ -79,7 +79,7 @@
- //#include <boost/any.hpp>
- #include "boost/thread/once.hpp"
- //#include <boost/archive/iterators/transform_width.hpp>
--#define BOOST_FILESYSTEM_VERSION 2
-+#define BOOST_FILESYSTEM_VERSION 3
- #include <boost/filesystem/convenience.hpp>
- #include <boost/filesystem/exception.hpp>
- #include <boost/filesystem/operations.hpp>
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/shell/shell_utils.cpp mongodb-src-r2.0.6-patched/shell/shell_utils.cpp
---- mongodb-src-r2.0.6/shell/shell_utils.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/shell/shell_utils.cpp	2012-07-10 22:38:58.443593723 +0200
-@@ -388,7 +388,7 @@
- #endif
-                 }
- 
--                argv_.push_back( programPath.native_file_string() );
-+                argv_.push_back( programPath.string() );
- 
-                 port_ = -1;
- 
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/restore.cpp mongodb-src-r2.0.6-patched/tools/restore.cpp
---- mongodb-src-r2.0.6/tools/restore.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/tools/restore.cpp	2012-07-10 22:45:00.046948094 +0200
-@@ -131,7 +131,7 @@
-         log(2) << "drillDown: " << root.string() << endl;
- 
-         // skip hidden files and directories
--        if (root.leaf()[0] == '.' && root.leaf() != ".")
-+        if (root.leaf().string()[0] == '.' && root.leaf().string() != ".")
-             return;
- 
-         if ( is_directory( root ) ) {
-@@ -210,7 +210,7 @@
-             ns += "." + _coll;
-         }
-         else {
--            string l = root.leaf();
-+            string l = root.leaf().string();
-             l = l.substr( 0 , l.find_last_of( "." ) );
-             ns += "." + l;
-         }
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/tool.cpp mongodb-src-r2.0.6-patched/tools/tool.cpp
---- mongodb-src-r2.0.6/tools/tool.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/tools/tool.cpp	2012-07-10 22:23:53.356874403 +0200
-@@ -113,12 +113,6 @@
-         // we want durability to be disabled.
-         cmdLine.dur = false;
- 
--#if( BOOST_VERSION >= 104500 )
--    boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
--#else
--    boost::filesystem::path::default_name_check( boost::filesystem::no_check );
--#endif
--
-         _name = argv[0];
- 
-         /* using the same style as db.cpp */
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/background.cpp mongodb-src-r2.0.6-patched/util/background.cpp
---- mongodb-src-r2.0.6/util/background.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/util/background.cpp	2012-07-10 21:47:40.420081320 +0200
-@@ -89,7 +89,7 @@
-             if ( msTimeOut ) {
-                 // add msTimeOut millisecond to current time
-                 boost::xtime xt;
--                boost::xtime_get( &xt, boost::TIME_UTC );
-+                boost::xtime_get( &xt, boost::TIME_UTC_ );
- 
-                 unsigned long long ns = msTimeOut * 1000000ULL; // milli to nano
-                 if ( xt.nsec + ns < 1000000000 ) {
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/concurrency/mutex.h mongodb-src-r2.0.6-patched/util/concurrency/mutex.h
---- mongodb-src-r2.0.6/util/concurrency/mutex.h	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/util/concurrency/mutex.h	2012-07-10 21:45:51.333408307 +0200
-@@ -29,7 +29,7 @@
- 
-     inline boost::xtime incxtimemillis( long long s ) {
-         boost::xtime xt;
--        boost::xtime_get(&xt, boost::TIME_UTC);
-+        boost::xtime_get(&xt, boost::TIME_UTC_);
-         xt.sec += (int)( s / 1000 );
-         xt.nsec += (int)(( s % 1000 ) * 1000000);
-         if ( xt.nsec >= 1000000000 ) {
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/queue.h mongodb-src-r2.0.6-patched/util/queue.h
---- mongodb-src-r2.0.6/util/queue.h	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/util/queue.h	2012-07-10 22:14:00.243506560 +0200
-@@ -82,7 +82,7 @@
-             Timer timer;
- 
-             boost::xtime xt;
--            boost::xtime_get(&xt, boost::TIME_UTC);
-+            boost::xtime_get(&xt, boost::TIME_UTC_);
-             xt.sec += maxSecondsToWait;
- 
-             scoped_lock l( _lock );
diff --git a/community/mongodb/boost1.50.patch b/community/mongodb/boost1.50.patch
deleted file mode 100644
index 203826ae7..000000000
--- a/community/mongodb/boost1.50.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
-index 6a80fe9..4a42e73 100644
---- a/src/mongo/db/db.cpp
-+++ b/src/mongo/db/db.cpp
-@@ -18,6 +18,7 @@
- 
- #include "mongo/pch.h"
- 
-+#include <boost/version.hpp>
- #include <boost/thread/thread.hpp>
- #include <boost/filesystem/operations.hpp>
- #include <fstream>
-@@ -348,7 +349,7 @@ namespace mongo {
-         boost::filesystem::path path( dbpath );
-         for ( boost::filesystem::directory_iterator i( path );
-                 i != boost::filesystem::directory_iterator(); ++i ) {
--            string fileName = boost::filesystem::path(*i).leaf();
-+            string fileName = boost::filesystem::path(*i).leaf().string();
-             if ( boost::filesystem::is_directory( *i ) &&
-                     fileName.length() && fileName[ 0 ] == '$' )
-                 boost::filesystem::remove_all( *i );
-@@ -748,11 +749,6 @@ static int mongoDbMain(int argc, char* argv[]) {
-     dbExecCommand = argv[0];
- 
-     srand(curTimeMicros());
--#if( BOOST_VERSION >= 104500 )
--    boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
--#else
--    boost::filesystem::path::default_name_check( boost::filesystem::no_check );
--#endif
- 
-     {
-         unsigned x = 0x12345678;
-@@ -1083,7 +1079,7 @@ static int mongoDbMain(int argc, char* argv[]) {
-         if (params.count("shutdown")){
-             bool failed = false;
- 
--            string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
-+            string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string();
-             if ( !boost::filesystem::exists( name ) || boost::filesystem::file_size( name ) == 0 )
-                 failed = true;
- 
-diff --git a/src/mongo/db/dur.cpp b/src/mongo/db/dur.cpp
-index b83957b..242fe00 100644
---- a/src/mongo/db/dur.cpp
-+++ b/src/mongo/db/dur.cpp
-@@ -770,7 +770,7 @@ namespace mongo {
- 
-             bool samePartition = true;
-             try {
--                const string dbpathDir = boost::filesystem::path(dbpath).native_directory_string();
-+                const string dbpathDir = boost::filesystem::path(dbpath).string();
-                 samePartition = onSamePartition(getJournalDir().string(), dbpathDir);
-             }
-             catch(...) {
-diff --git a/src/mongo/db/dur_journal.cpp b/src/mongo/db/dur_journal.cpp
-index 9957d41..9f693b9 100644
---- a/src/mongo/db/dur_journal.cpp
-+++ b/src/mongo/db/dur_journal.cpp
-@@ -176,7 +176,7 @@ namespace mongo {
-                 for ( boost::filesystem::directory_iterator i( getJournalDir() );
-                         i != boost::filesystem::directory_iterator();
-                         ++i ) {
--                    string fileName = boost::filesystem::path(*i).leaf();
-+                    string fileName = boost::filesystem::path(*i).leaf().string();
-                     if( anyFiles || str::startsWith(fileName, "j._") )
-                         return true;
-                 }
-@@ -194,7 +194,7 @@ namespace mongo {
-                 for ( boost::filesystem::directory_iterator i( getJournalDir() );
-                         i != boost::filesystem::directory_iterator();
-                         ++i ) {
--                    string fileName = boost::filesystem::path(*i).leaf();
-+                    string fileName = boost::filesystem::path(*i).leaf().string();
-                     if( str::startsWith(fileName, "j._") ) {
-                         try {
-                             removeOldJournalFile(*i);
-diff --git a/src/mongo/db/dur_recover.cpp b/src/mongo/db/dur_recover.cpp
-index a7efd4d..e352db6 100644
---- a/src/mongo/db/dur_recover.cpp
-+++ b/src/mongo/db/dur_recover.cpp
-@@ -72,7 +72,7 @@ namespace mongo {
-                     i != boost::filesystem::directory_iterator();
-                     ++i ) {
-                 boost::filesystem::path filepath = *i;
--                string fileName = boost::filesystem::path(*i).leaf();
-+                string fileName = boost::filesystem::path(*i).leaf().string();
-                 if( str::startsWith(fileName, "j._") ) {
-                     unsigned u = str::toUnsigned( str::after(fileName, '_') );
-                     if( m.count(u) ) {
-@@ -85,7 +85,7 @@ namespace mongo {
-                 if( i != m.begin() && m.count(i->first - 1) == 0 ) {
-                     uasserted(13532,
-                     str::stream() << "unexpected file in journal directory " << dir.string()
--                      << " : " << boost::filesystem::path(i->second).leaf() << " : can't find its preceeding file");
-+                      << " : " << boost::filesystem::path(i->second).leaf().string() << " : can't find its preceeding file");
-                 }
-                 files.push_back(i->second);
-             }
-diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp
-index 218fb9e..42794f0 100644
---- a/src/mongo/db/instance.cpp
-+++ b/src/mongo/db/instance.cpp
-@@ -833,13 +833,13 @@ namespace mongo {
-                 i != boost::filesystem::directory_iterator(); ++i ) {
-             if ( directoryperdb ) {
-                 boost::filesystem::path p = *i;
--                string dbName = p.leaf();
-+                string dbName = p.leaf().string();
-                 p /= ( dbName + ".ns" );
-                 if ( exists( p ) )
-                     names.push_back( dbName );
-             }
-             else {
--                string fileName = boost::filesystem::path(*i).leaf();
-+                string fileName = boost::filesystem::path(*i).leaf().string();
-                 if ( fileName.length() > 3 && fileName.substr( fileName.length() - 3, 3 ) == ".ns" )
-                     names.push_back( fileName.substr( 0, fileName.length() - 3 ) );
-             }
-@@ -1102,7 +1102,7 @@ namespace mongo {
-     }
- 
-     void acquirePathLock(bool doingRepair) {
--        string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
-+        string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string();
- 
-         bool oldFile = false;
- 
-diff --git a/src/mongo/db/pdfile.cpp b/src/mongo/db/pdfile.cpp
-index 0c424f0..9fbbde7 100644
---- a/src/mongo/db/pdfile.cpp
-+++ b/src/mongo/db/pdfile.cpp
-@@ -1675,7 +1675,7 @@ namespace mongo {
-             virtual bool apply( const Path &p ) {
-                 if ( !boost::filesystem::exists( p ) )
-                     return false;
--                boostRenameWrapper( p, newPath_ / ( p.leaf() + ".bak" ) );
-+                boostRenameWrapper( p, newPath_ / ( p.leaf().string() + ".bak" ) );
-                 return true;
-             }
-             virtual const char * op() const {
-@@ -1783,7 +1783,7 @@ namespace mongo {
-             uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ?
-                                 "backup" : "_tmp" );
-         MONGO_ASSERT_ON_EXCEPTION( boost::filesystem::create_directory( reservedPath ) );
--        string reservedPathString = reservedPath.native_directory_string();
-+        string reservedPathString = reservedPath.string();
- 
-         bool res;
-         {
-diff --git a/src/mongo/dbtests/framework.cpp b/src/mongo/dbtests/framework.cpp
-index 813705a..d0a3ba4 100644
---- a/src/mongo/dbtests/framework.cpp
-+++ b/src/mongo/dbtests/framework.cpp
-@@ -199,7 +199,7 @@ namespace mongo {
-                 boost::filesystem::create_directory(p);
-             }
- 
--            string dbpathString = p.native_directory_string();
-+            string dbpathString = p.string();
-             dbpath = dbpathString.c_str();
- 
-             cmdLine.prealloc = false;
-diff --git a/src/mongo/pch.h b/src/mongo/pch.h
-index 7044097..6bb9df6 100644
---- a/src/mongo/pch.h
-+++ b/src/mongo/pch.h
-@@ -44,7 +44,7 @@
- #include "string.h"
- #include "limits.h"
- 
--#define BOOST_FILESYSTEM_VERSION 2
-+#define BOOST_FILESYSTEM_VERSION 3
- #include <boost/shared_ptr.hpp>
- #include <boost/smart_ptr.hpp>
- #include <boost/function.hpp>
-diff --git a/src/mongo/shell/shell_utils_launcher.cpp b/src/mongo/shell/shell_utils_launcher.cpp
-index 60af4f3..fa0d6ad 100644
---- a/src/mongo/shell/shell_utils_launcher.cpp
-+++ b/src/mongo/shell/shell_utils_launcher.cpp
-@@ -184,7 +184,7 @@ namespace mongo {
-             }
- #endif
- 
--            _argv.push_back( programPath.native_file_string() );
-+            _argv.push_back( programPath.string() );
- 
-             _port = -1;
- 
-diff --git a/src/mongo/tools/restore.cpp b/src/mongo/tools/restore.cpp
-index d7779e6..5c68bde 100644
---- a/src/mongo/tools/restore.cpp
-+++ b/src/mongo/tools/restore.cpp
-@@ -174,7 +174,7 @@ public:
-         log(2) << "drillDown: " << root.string() << endl;
- 
-         // skip hidden files and directories
--        if (root.leaf()[0] == '.' && root.leaf() != ".")
-+        if (root.leaf().string()[0] == '.' && root.leaf().string() != ".")
-             return;
- 
-         if ( is_directory( root ) ) {
-@@ -255,7 +255,7 @@ public:
- 
-         verify( ns.size() );
- 
--        string oldCollName = root.leaf(); // Name of the collection that was dumped from
-+        string oldCollName = root.leaf().string(); // Name of the collection that was dumped from
-         oldCollName = oldCollName.substr( 0 , oldCollName.find_last_of( "." ) );
-         if (use_coll) {
-             ns += "." + _coll;
-@@ -287,7 +287,7 @@ public:
-             if (!boost::filesystem::exists(metadataFile.string())) {
-                 // This is fine because dumps from before 2.1 won't have a metadata file, just print a warning.
-                 // System collections shouldn't have metadata so don't warn if that file is missing.
--                if (!startsWith(metadataFile.leaf(), "system.")) {
-+                if (!startsWith(metadataFile.leaf().string(), "system.")) {
-                     log() << metadataFile.string() << " not found. Skipping." << endl;
-                 }
-             } else {
-diff --git a/src/mongo/tools/tool.cpp b/src/mongo/tools/tool.cpp
-index c092cdb..76834fa 100644
---- a/src/mongo/tools/tool.cpp
-+++ b/src/mongo/tools/tool.cpp
-@@ -118,12 +118,6 @@ namespace mongo {
-         // we want durability to be disabled.
-         cmdLine.dur = false;
- 
--#if( BOOST_VERSION >= 104500 )
--    boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
--#else
--    boost::filesystem::path::default_name_check( boost::filesystem::no_check );
--#endif
--
-         _name = argv[0];
- 
-         /* using the same style as db.cpp */
diff --git a/community/mongodb/mongodb.rc b/community/mongodb/mongodb.rc
deleted file mode 100644
index 30f2bbf79..000000000
--- a/community/mongodb/mongodb.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# vim: syntax=sh
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof /usr/bin/mongod)
-case "$1" in
-  start)
-    stat_busy "Starting mongodb"
-    [ -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --fork" > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mongodb
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mongodb"
-    [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mongodb
-      while [ ! -z "$(pidof /usr/bin/mongod)" ]; do
-        sleep 1;
-      done
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/mongodb/removeWerror.patch b/community/mongodb/removeWerror.patch
new file mode 100644
index 000000000..dd96084da
--- /dev/null
+++ b/community/mongodb/removeWerror.patch
@@ -0,0 +1,21 @@
+--- a/SConstruct	2013-03-16 02:59:55.000000000 +0800
++++ b/SConstruct	2013-03-20 10:55:20.009645869 +0800
+@@ -692,7 +692,7 @@
+                          "-Winvalid-pch"] )
+     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
+     if linux:
+-        env.Append( CCFLAGS=["-Werror", "-pipe"] )
++        env.Append( CCFLAGS=["-pipe"] )
+         if not has_option('clang'):
+             env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
+ 
+--- a/src/third_party/v8/SConscript	2013-04-17 03:21:23.000000000 +0800
++++ b/src/third_party/v8/SConscript	2013-04-18 17:41:29.878618892 +0800
+@@ -47,7 +47,6 @@
+   'gcc': {
+     'all': {
+       'CCFLAGS':      ['-Wall',
+-                       '-Werror',
+                        '-W',
+                        '-Wno-unused-parameter',
+                        '-Woverloaded-virtual',
diff --git a/community/monica/PKGBUILD b/community/monica/PKGBUILD
index 3c24c4e7d..30b21a1b8 100644
--- a/community/monica/PKGBUILD
+++ b/community/monica/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=monica
 pkgver=3.7
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A monitor calibration tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pcbypaul.com/software/monica.html"
 license=('BSD')
 depends=('fltk' 'xorg-xgamma')
diff --git a/community/mosh/PKGBUILD b/community/mosh/PKGBUILD
index a15b1229d..9b4aaf29e 100644
--- a/community/mosh/PKGBUILD
+++ b/community/mosh/PKGBUILD
@@ -4,15 +4,16 @@
 # Contributor: Thomas Weißschuh <thomas_weissschuh lavabit.com>
 
 pkgname=mosh
-pkgver=1.2.3
-pkgrel=3
+pkgver=1.2.4
+pkgrel=1
 pkgdesc='Mobile shell, surviving disconnects with local echo and line editing'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://mosh.mit.edu/'
 license=('GPL3')
 depends=('protobuf' 'ncurses' 'zlib' 'openssh' 'perl' 'perl-io-tty' 'libutempter')
-source=("https://github.com/downloads/keithw/mosh/$pkgname-$pkgver.tar.gz")
-sha256sums=('93f09fda77e57f05485a61f3ac679bf9f3f359a9b0b93c216ddd53cd124a768f')
+source=("http://$pkgname.mit.edu/$pkgname-$pkgver.tar.gz")
+sha256sums=('e74d0d323226046e402dd469a176075fc2013b69b0e67cea49762c957175df46')
+optdepends=('ufw-extras')
 options=('!emptydirs')
 
 build() {
@@ -29,8 +30,6 @@ package() {
   make DESTDIR="$pkgdir" install
   install -Dm644 "conf/bash_completion.d/$pkgname" \
     "$pkgdir/usr/share/bash-completion/completions/$pkgname"
-  install -Dm644 "conf/ufw/applications.d/$pkgname" \
-    "$pkgdir/usr/share/mosh/ufw-${pkgname}.example"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD
index 6f29bd109..e5778de03 100644
--- a/community/motion/PKGBUILD
+++ b/community/motion/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 76588 2012-09-24 09:58:09Z spupykin $
+# $Id: PKGBUILD 84356 2013-02-16 22:50:34Z ioni $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=motion
 pkgver=3.2.12
-pkgrel=7
+pkgrel=8
 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/community/mp3splt-gtk/PKGBUILD b/community/mp3splt-gtk/PKGBUILD
index 7d9f8a2bb..4c0edfd93 100644
--- a/community/mp3splt-gtk/PKGBUILD
+++ b/community/mp3splt-gtk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 76430 2012-09-18 04:50:32Z jlichtblau $
+# $Id: PKGBUILD 88581 2013-04-20 15:31:43Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=mp3splt-gtk
-pkgver=0.7.3
+pkgver=0.8.2
 pkgrel=1
 pkgdesc="Split mp3 and ogg files without decoding"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('pkgconfig')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz)
-sha256sums=('7300383453ca8d3268776163e2afb9b03a0d907d2f29ec6fc1826b41679d4e1c')
+sha256sums=('5634d0a6d15f73affc361c49cafb96a5e53fa2e65a6d7723e74a3a79d3f27c88')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/mp3splt-gtk/mp3splt-gtk.changelog b/community/mp3splt-gtk/mp3splt-gtk.changelog
index 939aa6841..724bd3ded 100644
--- a/community/mp3splt-gtk/mp3splt-gtk.changelog
+++ b/community/mp3splt-gtk/mp3splt-gtk.changelog
@@ -1,3 +1,9 @@
+2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* mp3splt-gtk 0.8.2-1
+
+2013-03-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* mp3splt-gtk 0.8.1-1
+
 2012-09-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* mp3splt-gtk 0.7.3-1
 
diff --git a/community/mp3splt-gtk/mp3splt-gtk.desktop b/community/mp3splt-gtk/mp3splt-gtk.desktop
deleted file mode 100644
index 3862295bf..000000000
--- a/community/mp3splt-gtk/mp3splt-gtk.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Mp3splt-gtk audio splitter
-GenericName=Sound Splitter
-Comment=Split mp3 and ogg files without decoding
-Comment[cs]=Rozdělit mp3 a ogg soubory bez dekódování
-Icon=mp3splt-gtk_ico
-Exec=mp3splt-gtk
-StartupNotify=false
-Terminal=false
-Categories=Audio;AudioVideo;AudioVideoEditing;
-MimeType=application/ogg;audio/x-mp3;
-
diff --git a/community/mpck/PKGBUILD b/community/mpck/PKGBUILD
index a1b381592..dde60051f 100644
--- a/community/mpck/PKGBUILD
+++ b/community/mpck/PKGBUILD
@@ -4,10 +4,10 @@
 
 pkgname=mpck
 pkgver=0.19
-pkgrel=2
+pkgrel=2.1
 license=('GPL')
 pkgdesc="Reads MP3 files and tries to determine if they are correct"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://checkmate.gissen.nl/"
 depends=('glibc')
 source=("http://checkmate.gissen.nl/checkmate-${pkgver}.tar.gz")
diff --git a/community/mpdscribble/mpdscribble b/community/mpdscribble/mpdscribble
deleted file mode 100644
index 8071c0dbe..000000000
--- a/community/mpdscribble/mpdscribble
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/mpdscribble`
-case "$1" in
-  start)
-    stat_busy "Starting mpdscribble"
-    [ -z "$PID" ] && /usr/bin/mpdscribble &
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/mpdscribble.pid
-      add_daemon mpdscribble
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mpdscribble"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/mpdscribble.pid
-      rm_daemon mpdscribble
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/mpdscribble/rc.d b/community/mpdscribble/rc.d
deleted file mode 100644
index 8071c0dbe..000000000
--- a/community/mpdscribble/rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/mpdscribble`
-case "$1" in
-  start)
-    stat_busy "Starting mpdscribble"
-    [ -z "$PID" ] && /usr/bin/mpdscribble &
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/mpdscribble.pid
-      add_daemon mpdscribble
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mpdscribble"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/mpdscribble.pid
-      rm_daemon mpdscribble
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/mplayer-vaapi/PKGBUILD b/community/mplayer-vaapi/PKGBUILD
deleted file mode 100644
index ddc3302cb..000000000
--- a/community/mplayer-vaapi/PKGBUILD
+++ /dev/null
@@ -1,74 +0,0 @@
-# $Id: PKGBUILD 80155 2012-11-16 23:35:57Z ioni $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=mplayer-vaapi
-pkgver=35107
-pkgrel=3
-pkgdesc="A movie player, compiled with vaapi support"
-arch=('i686' 'x86_64')
-url="http://gitorious.org/vaapi/mplayer"
-license=('GPL')
-depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl'
-         'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu'
-         'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2'
-         'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
-         'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi'
-         'libbluray' 'libva' 'libass' 'desktop-file-utils')
-makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa')
-provides=("mplayer=$pkgver")
-conflicts=('mplayer')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz
-        tweak-desktop-file.patch)
-options=('!buildflags' '!emptydirs')
-install=mplayer-vaapi.install
-sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56'
-            '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b')
-
-build() {
-  cd "$srcdir/mplayer-vaapi-$pkgver"
-
-  patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch"
-
-  ./configure \
-    --prefix=/usr \
-    --enable-runtime-cpudetection \
-    --disable-gui \
-    --disable-arts \
-    --disable-liblzo \
-    --disable-speex \
-    --disable-cdparanoia \
-    --disable-openal \
-    --disable-libdv \
-    --disable-musepack \
-    --disable-esd \
-    --disable-mga \
-    --disable-ass-internal \
-    --enable-xvmc \
-    --enable-radio \
-    --enable-radio-capture \
-    --disable-vdpau \
-    --enable-vaapi \
-    --language=all \
-    --confdir=/etc/mplayer
-
-  [[ $CARCH == i686 ]] && sed -i 's|-march=i486|-march=i686|g' config.mak
-
-  make
-}
-
-package() {
-  cd "$srcdir/mplayer-vaapi-$pkgver"
-
-  make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
-  install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
-  install -Dm644 etc/mplayer.desktop "$pkgdir/usr/share/applications/mplayer.desktop"
-  install -d "$pkgdir/usr/share/mplayer/"
-  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
-  rm -rf "$pkgdir/usr/share/mplayer/font"
-  install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/mplayer-vaapi/tweak-desktop-file.patch b/community/mplayer-vaapi/tweak-desktop-file.patch
deleted file mode 100644
index 606e356b0..000000000
--- a/community/mplayer-vaapi/tweak-desktop-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mplayer.desktop.orig	2012-07-08 22:18:27.000000000 +0300
-+++ mplayer.desktop	2012-07-08 22:19:08.000000000 +0300
-@@ -23,8 +23,9 @@ Comment[fr]=Lit les films et musiques
- Comment[it]=Riproduce filmati e musica
- Comment[ja]=動画や音声のファイルを再生します
- Icon=mplayer
--TryExec=gmplayer
--Exec=gmplayer %F
-+TryExec=mplayer
-+Exec=mplayer -really-quiet %F
- Terminal=false
-+NoDisplay=true
- Categories=GTK;AudioVideo;Audio;Video;Player;TV;
- MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
index 018c8470a..d2235a39c 100644
--- a/community/mplayer2/PKGBUILD
+++ b/community/mplayer2/PKGBUILD
@@ -1,43 +1,43 @@
-# $Id: PKGBUILD 82332 2013-01-15 11:35:04Z allan $
+# $Id: PKGBUILD 88818 2013-04-23 01:19:34Z eric $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Martin Panter <vadmium+aur@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=mplayer2
-pkgver=20121128
-pkgrel=2
+pkgver=20130309
+pkgrel=1
 pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.mplayer2.org/"
 install=$pkgname.install
-depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig'
-         'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss'
-         'libdvdnav' 'libdvdread' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora'
-         'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
+depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg'
+         'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray'
+         'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 'libdvdread'
+         'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora'
+         'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm'
+         'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
+makedepends=('unzip' 'python' 'python-docutils')
 if [ "$CARCH" != "mips64el" ]; then
-depends+=('libgl' 'libvdpau' 'lirc-utils')
+  depends+=('libgl' 'libvdpau' 'lirc-utils')
+  makedepends+=('mesa' 'mesa-libgl' 'yasm')
 fi
-makedepends=('mesa' 'unzip' 'yasm' 'python' 'python-docutils')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 provides=('mplayer')
 conflicts=('mplayer')
 options=(!emptydirs)
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz
-        cdio-api-fixes.patch)
-md5sums=('696adb2503b2202fe39de6c98b573cd6'
-         '5ff5fa9d0fd50239ed3a1756b31e6a9d')
+source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
+sha256sums=('03aeccbd82b3598e0656b54ae6ab60c79afdb78eabe1b2915e7912db7efbd343'
+            'SKIP')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop
   find -type f -exec sed -e 's/python3/python/' -i {} \;
 
   [ "$CARCH" != "mips64el" ] && extra="--enable-runtime-cpudetection"
 
-  patch -Np1 -i $srcdir/cdio-api-fixes.patch
-
   ./configure --prefix=/usr --confdir=/etc/mplayer \
               --enable-translation --language=all \
               --enable-joystick \
@@ -50,7 +50,7 @@ build() {
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR=$pkgdir install
 
   install -Dm644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer/
diff --git a/community/mplayer2/cdio-api-fixes.patch b/community/mplayer2/cdio-api-fixes.patch
deleted file mode 100644
index eeb9f0589..000000000
--- a/community/mplayer2/cdio-api-fixes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -upr mplayer2-20121128.orig/stream/stream_cdda.c mplayer2-20121128/stream/stream_cdda.c
---- mplayer2-20121128.orig/stream/stream_cdda.c	2013-01-10 19:37:31.000000000 +0200
-+++ mplayer2-20121128/stream/stream_cdda.c	2013-01-10 20:23:25.000000000 +0200
-@@ -17,8 +17,8 @@
-  */
- 
- #include "config.h"
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- #include <cdio/cdio.h>
- 
- #include <stdio.h>
-@@ -116,25 +116,25 @@ const m_option_t cdda_opts[] = {
- };
- 
- static const char *cdtext_name[] = {
--    [CDTEXT_ARRANGER] = "Arranger",
--    [CDTEXT_COMPOSER] = "Composer",
--    [CDTEXT_MESSAGE]  =  "Message",
--    [CDTEXT_ISRC] =  "ISRC",
--    [CDTEXT_PERFORMER] = "Performer",
--    [CDTEXT_SONGWRITER] =  "Songwriter",
--    [CDTEXT_TITLE] =  "Title",
--    [CDTEXT_UPC_EAN] = "UPC_EAN",
-+    [CDTEXT_FIELD_ARRANGER] = "Arranger",
-+    [CDTEXT_FIELD_COMPOSER] = "Composer",
-+    [CDTEXT_FIELD_MESSAGE]  =  "Message",
-+    [CDTEXT_FIELD_ISRC] =  "ISRC",
-+    [CDTEXT_FIELD_PERFORMER] = "Performer",
-+    [CDTEXT_FIELD_SONGWRITER] =  "Songwriter",
-+    [CDTEXT_FIELD_TITLE] =  "Title",
-+    [CDTEXT_FIELD_UPC_EAN] = "UPC_EAN",
- };
- 
- static bool print_cdtext(stream_t *s, int track)
- {
-     cdda_priv* p = (cdda_priv*)s->priv;
--    cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio, track);
-+    cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio);
-     if (text) {
-         mp_msg(MSGT_SEEK, MSGL_INFO, "CD-Text (%s):\n", track ? "track" : "CD");
-         for (int i = 0; i < sizeof(cdtext_name) / sizeof(cdtext_name[0]); i++) {
-             const char *name = cdtext_name[i];
--            const char *value = cdtext_get_const(i, text);
-+            const char *value = cdtext_get_const(text, i, track);
-             if (name && value)
-                 mp_msg(MSGT_SEEK, MSGL_INFO, "  %s: '%s'\n", name, value);
-         }
diff --git a/community/mplayer2/mplayer2-20120729-fix-vf_lavc-compilation.patch b/community/mplayer2/mplayer2-20120729-fix-vf_lavc-compilation.patch
deleted file mode 100644
index a50161305..000000000
--- a/community/mplayer2/mplayer2-20120729-fix-vf_lavc-compilation.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f5e0365c8e76e2ef797027134f1819e613764d7e Mon Sep 17 00:00:00 2001
-From: Anton Khirnov <anton@khirnov.net>
-Date: Wed, 19 Sep 2012 12:00:01 +0000
-Subject: vf_lavc: fix compilation with latest libav
-
-Remove a pointless and broken check for avctx->codec->encode.
-
-1) The check does not test for anything useful.
-2) AVCodecContext.encode is a private field and is not supposed to be
-   accessed from outside of lavc.
-2a) AVCodecContext.encode does not exist anymore in latest libavcodec,
-    so this block fails to build.
----
-diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c
-index b2c1dd7..65e93a1 100644
---- a/libmpcodecs/vf_lavc.c
-+++ b/libmpcodecs/vf_lavc.c
-@@ -76,11 +76,6 @@ static int config(struct vf_instance *vf,
- 	return 0;
-     }
- 
--    if (lavc_venc_context.codec->encode == NULL) {
--	mp_msg(MSGT_VFILTER,MSGL_ERR,"avcodec init failed (ctx->codec->encode == NULL)!\n");
--	return 0;
--    }
--
-     return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_MPEGPES);
- }
- 
---
-cgit v0.9
diff --git a/community/mplayer2/mplayer2-20120729-libquvi-support.patch b/community/mplayer2/mplayer2-20120729-libquvi-support.patch
deleted file mode 100644
index f27fa690d..000000000
--- a/community/mplayer2/mplayer2-20120729-libquvi-support.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-From 37c124805c00ae0f2570c95f9543e39ce69793a6 Mon Sep 17 00:00:00 2001
-From: wm4 <wm4@mplayer2.org>
-Date: Fri, 02 Mar 2012 19:24:34 +0000
-Subject: quvi: Add support for streaming sites using libquvi
-
-This enables playing URLs from libquvi supported streaming sites
-directly, e.g. "mplayer http://www.youtube.com/watch?v=...."
-
-Anything opened with mplayer is checked with libquvi. If it looks like
-a URL of a supported streaming site, libquvi is used to extract the
-media URL, which is then passed to the lower level mplayer code
-instead of the HTML URL. Hopefully the libquvi URL checker works well
-enough that it doesn't cause any problems with normal URLs, files, or
-whatever else mplayer's stream layer accepts.
-
-Add the --quvi-format option. The option value is directly passed
-to libquvi as requested format. The only values that seem to work for
-any streaming site seem to be "best" (best quality) and "default"
-(lowest quality). The mplayer option defaults to "best" (overriding
-libquvi's default).
-
-Outstanding issues:
-- Does libquvi checking every opened file really not cause problems?
-  Should there be a runtime option to disable libquvi use?
-  (Probably not an issue.)
-- Should we check/set the supported protocol? By default libquvi has
-  support for all protocols enabled. In the worst case, it might
-  return an URL using a protocol not supported by mplayer, even though
-  it could extract URLs with other protocols too.
-  (Probably not an issue.)
-- Somehow export metadata (like media title) to the mplayer frontend?
----
-diff --git a/cfg-mplayer.h b/cfg-mplayer.h
-index 5440de9..d8d556a 100644
---- a/cfg-mplayer.h
-+++ b/cfg-mplayer.h
-@@ -517,6 +517,8 @@ const m_option_t common_opts[] = {
- 
-     OPT_MAKE_FLAGS("hr-mp3-seek", hr_mp3_seek, 0),
- 
-+    OPT_STRING("quvi-format", quvi_format, 0),
-+
-     { "rawaudio", (void *)&demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
-     { "rawvideo", (void *)&demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
- 
-diff --git a/configure b/configure
-index 5c1e288..18bc404 100755
---- a/configure
-+++ b/configure
-@@ -335,6 +335,7 @@ Optional features:
-   --enable-winsock2_h    enable winsock2_h [autodetect]
-   --enable-smb           enable Samba (SMB) input [autodetect]
-   --enable-live          enable LIVE555 Streaming Media [disable]
-+  --enable-libquvi       enable libquvi [autodetect]
-   --enable-nemesi        enable Nemesi Streaming Media [autodetect]
-   --disable-vcd          disable VCD support [autodetect]
-   --disable-bluray       disable Blu-ray support [autodetect]
-@@ -650,6 +651,7 @@ _pvr=auto
- networking=yes
- _winsock2_h=auto
- _smb=auto
-+_libquvi=auto
- _joystick=no
- _xvid=auto
- _libnut=auto
-@@ -1009,6 +1011,8 @@ for ac_option do
-   --disable-winsock2_h) _winsock2_h=no  ;;
-   --enable-smb)         _smb=yes        ;;
-   --disable-smb)        _smb=no ;;
-+  --enable-libquvi)     _libquvi=yes    ;;
-+  --disable-libquvi)    _libquvi=no     ;;
-   --enable-joystick)    _joystick=yes   ;;
-   --disable-joystick)   _joystick=no    ;;
-   --enable-xvid)        _xvid=yes       ;;
-@@ -3610,6 +3614,19 @@ else
- fi
- echores "$_smb"
- 
-+echocheck "libquvi support"
-+if test "$_libquvi" = auto ; then
-+    _libquvi=no
-+    if pkg_config_add libquvi ; then
-+        _libquvi=yes
-+    fi
-+fi
-+if test "$_libquvi" = yes; then
-+    def_libquvi="#define CONFIG_LIBQUVI 1"
-+else
-+    def_libquvi="#undef CONFIG_LIBQUVI"
-+fi
-+echores "$_libquvi"
- 
- #########
- # VIDEO #
-@@ -6325,6 +6342,7 @@ LIBNEMESI = $_nemesi
- LIBNUT = $_libnut
- LIBPOSTPROC = $libpostproc
- LIBSMBCLIENT = $_smb
-+LIBQUVI = $_libquvi
- LIBTHEORA = $_theora
- LIRC = $_lirc
- LIVE555 = $_live
-@@ -6668,6 +6686,7 @@ $def_live
- $def_nemesi
- $def_networking
- $def_smb
-+$def_libquvi
- $def_socklen_t
- $def_vstream
- 
-diff --git a/options.h b/options.h
-index 48f5c53..89324bd 100644
---- a/options.h
-+++ b/options.h
-@@ -78,6 +78,7 @@ typedef struct MPOpts {
-     char **audio_lang;
-     char **sub_lang;
-     int hr_mp3_seek;
-+    char *quvi_format;
- 
-     char *audio_stream;
-     int audio_stream_cache;
-diff --git a/stream/open.c b/stream/open.c
-index ce0a415..91e9ae2 100644
---- a/stream/open.c
-+++ b/stream/open.c
-@@ -26,12 +26,14 @@
- 
- #include "config.h"
- #include "mp_msg.h"
-+#include "talloc.h"
- 
- #ifdef __FreeBSD__
- #include <sys/cdrio.h>
- #endif
- 
- #include "m_option.h"
-+#include "options.h"
- #include "stream.h"
- #include "libmpdemux/demuxer.h"
- 
-@@ -42,6 +44,62 @@ char* cdrom_device=NULL;
- char* dvd_device=NULL;
- int dvd_title=0;
- 
-+#ifdef CONFIG_LIBQUVI
-+
-+#include <quvi/quvi.h>
-+
-+static const char *resolve_quvi(const char *url, struct MPOpts *opts)
-+{
-+    char *media_title, *media_url;
-+    quvi_media_t m;
-+    QUVIcode rc;
-+    quvi_t q;
-+
-+    rc = quvi_init(&q);
-+    if (rc != QUVI_OK)
-+        return NULL;
-+
-+    // Don't try to use quvi on an URL that's not directly supported, since
-+    // quvi will do a network access anyway in order to check for HTTP
-+    // redirections etc.
-+    // The documentation says this will fail on "shortened" URLs.
-+    if (quvi_supported(q, (char *)url) != QUVI_OK) {
-+        quvi_close(&q);
-+        return NULL;
-+    }
-+
-+    mp_msg(MSGT_OPEN, MSGL_INFO, "[quvi] Checking URL...\n");
-+
-+    // Can use quvi_query_formats() to get a list of formats like this:
-+    // "fmt05_240p|fmt18_360p|fmt34_360p|fmt35_480p|fmt43_360p|fmt44_480p"
-+    // (This example is youtube specific.)
-+    // That call requires an extra net access. quvi_next_media_url() doesn't
-+    // seem to do anything useful. So we can't really do anything useful
-+    // except pass through the user's format setting.
-+    quvi_setopt(q, QUVIOPT_FORMAT, opts->quvi_format
-+                                   ? opts->quvi_format : "best");
-+
-+    rc = quvi_parse(q, (char *)url, &m);
-+    if (rc != QUVI_OK) {
-+        mp_msg(MSGT_OPEN, MSGL_ERR, "[quvi] %s\n", quvi_strerror(q, rc));
-+        quvi_close(&q);
-+        return NULL;
-+    }
-+
-+    quvi_getprop(m, QUVIPROP_PAGETITLE, &media_title);
-+    quvi_getprop(m, QUVIPROP_MEDIAURL, &media_url);
-+
-+    mp_msg(MSGT_OPEN, MSGL_INFO, "[quvi] Site media title: '%s'\n",
-+           media_title);
-+    media_url = talloc_strdup(NULL, media_url);
-+
-+    quvi_parse_close(&m);
-+    quvi_close(&q);
-+
-+    return media_url;
-+}
-+#endif
-+
- // Open a new stream  (stdin/file/vcd/url)
- 
- stream_t* open_stream(const char *filename, struct MPOpts *options,
-@@ -59,7 +117,16 @@ if(!filename) {
-    return NULL;
- }
- 
--//============ Open STDIN or plain FILE ============
-+  const char *resolved = NULL;
-+
-+#ifdef CONFIG_LIBQUVI
-+  resolved = resolve_quvi(filename, options);
-+#endif
-+
-+  if (resolved)
-+      filename = resolved;
- 
--  return open_stream_full(filename,STREAM_READ,options,file_format);
-+  stream_t *res = open_stream_full(filename,STREAM_READ,options,file_format);
-+  talloc_free((void *)resolved);
-+  return res;
- }
---
-cgit v0.9
-From 86f7fe1ba61a465fb25bc30deaaa4fcf12600a43 Mon Sep 17 00:00:00 2001
-From: wm4 <wm4@nowhere>
-Date: Sun, 02 Sep 2012 18:45:11 +0000
-Subject: configure: add version check for libquvi
-
-I do not know what exactly is the minimum working version. Require the
-latest version currently released, which is about half a year old.
----
-diff --git a/configure b/configure
-index 2cf7aff..6a3298f 100755
---- a/configure
-+++ b/configure
-@@ -3445,7 +3445,7 @@ echores "$_smb"
- echocheck "libquvi support"
- if test "$_libquvi" = auto ; then
-     _libquvi=no
--    if pkg_config_add libquvi ; then
-+    if pkg_config_add 'libquvi >= 0.4.1' ; then
-         _libquvi=yes
-     fi
- fi
---
-cgit v0.9
-diff --git a/cfg-mplayer.h b/cfg-mplayer.h
-index b889661..8b07091 100644
---- a/cfg-mplayer.h
-+++ b/cfg-mplayer.h
-@@ -485,7 +485,7 @@ const m_option_t common_opts[] = {
- 
-     OPT_MAKE_FLAGS("hr-mp3-seek", hr_mp3_seek, 0),
- 
--    OPT_STRING("quvi-format", quvi_format, 0),
-+    OPT_STRING("quvi-format", quvi_format, 0, OPTDEF_STR("best")),
- 
-     { "rawaudio", (void *)&demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
-     { "rawvideo", (void *)&demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
-diff --git a/stream/open.c b/stream/open.c
-index 91e9ae2..16d0dc3 100644
---- a/stream/open.c
-+++ b/stream/open.c
-@@ -76,8 +76,7 @@ static const char *resolve_quvi(const char *url, struct MPOpts *opts)
-     // That call requires an extra net access. quvi_next_media_url() doesn't
-     // seem to do anything useful. So we can't really do anything useful
-     // except pass through the user's format setting.
--    quvi_setopt(q, QUVIOPT_FORMAT, opts->quvi_format
--                                   ? opts->quvi_format : "best");
-+    quvi_setopt(q, QUVIOPT_FORMAT, opts->quvi_format);
- 
-     rc = quvi_parse(q, (char *)url, &m);
-     if (rc != QUVI_OK) {
---
-cgit v0.9
diff --git a/community/mrtg/PKGBUILD b/community/mrtg/PKGBUILD
index ac3238d72..8058a925d 100644
--- a/community/mrtg/PKGBUILD
+++ b/community/mrtg/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=mrtg
 pkgver=2.17.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Multi Router Traffic Grapher."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://oss.oetiker.ch/mrtg/"
 license=('GPL')
 depends=('gd' 'perl')
diff --git a/community/mtpfs/PKGBUILD b/community/mtpfs/PKGBUILD
index 7f34f7b56..9401f7e19 100644
--- a/community/mtpfs/PKGBUILD
+++ b/community/mtpfs/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=mtpfs
 pkgver=1.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A FUSE filesystem that supports reading and writing from any MTP device"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.adebenham.com/mtpfs/"
diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index cd001c143..0aab45c6d 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -1,38 +1,44 @@
-# $Id: PKGBUILD 83982 2013-02-07 22:09:51Z bgyorgy $
+# $Id: PKGBUILD 89864 2013-05-03 19:33:13Z faidoc $
+# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Adam Hani Schakaki <adam@schakaki.net>
 # Contributor: Ner0
 
 pkgname=muffin
-pkgver=1.1.2
-pkgrel=3
+pkgver=1.7.5
+pkgrel=1
 pkgdesc="Cinnamon window manager based on Mutter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/linuxmint/muffin"
 license=('GPL')
-depends=('libsm' 'clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \
+depends=('clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \
 		 'libcanberra' 'startup-notification' 'zenity' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils')
-provides=('muffin-wm')
-conflicts=('muffin-wm')
-replaces=('muffin-wm')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
 options=('!libtool' '!emptydirs')
 install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver")
-md5sums=('0950fa5c00a165c7fed73b0898d072d5')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
+        "switch-applications.patch"
+        "fix-dnd.patch")
+sha256sums=('ef10c19353e5d2ff86d24c2fa40bd53ba3c7eeb03e9d3c8fbd3f4b56d16a2f07'
+            '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96'
+            '745dd3ef7eb8a496c68f5a728253205a849ac63851c0c0930c42442aec5af939')
 
 build() {
-  cd linuxmint-muffin-*
+  cd ${pkgname}-${pkgver}
 
-  autoreconf -vfi
-  PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
+  # Fix windows switcher keybinding with default settings in GNOME 3.8
+  patch -Np1 -i ../switch-applications.patch
+
+  # Fix unresponsive panel on DND
+  patch -RNp1 -i ../fix-dnd.patch
+
+  PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
   				 			 --localstatedir=/var --disable-static --disable-schemas-compile
   make
 }
 
 package() {
-  cd linuxmint-muffin-*
+  cd ${pkgname}-${pkgver}
   make DESTDIR="$pkgdir/" install
 }
 
-
 # vim:set ts=2 sw=2 et:
diff --git a/community/muffin/fix-dnd.patch b/community/muffin/fix-dnd.patch
new file mode 100644
index 000000000..f30e22521
--- /dev/null
+++ b/community/muffin/fix-dnd.patch
@@ -0,0 +1,29 @@
+From fca9ce4a1218837aef1886f8d98c8e5a5d124843 Mon Sep 17 00:00:00 2001
+From: luyikei <luyikei.qmltu@gmail.com>
+Date: Wed, 16 Jan 2013 14:09:39 +0900
+Subject: [PATCH] Put the rest of  redirect window types into the top window
+ group
+
+---
+ src/compositor/meta-window-actor.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
+index 4113e72..66ba3c4 100644
+--- a/src/compositor/meta-window-actor.c
++++ b/src/compositor/meta-window-actor.c
+@@ -1513,7 +1513,10 @@ const char *meta_window_actor_get_description (MetaWindowActor *self)
+   
+   if (window->type == META_WINDOW_DROPDOWN_MENU ||
+       window->type == META_WINDOW_POPUP_MENU ||
+-      window->type == META_WINDOW_COMBO){
++      window->type == META_WINDOW_COMBO ||
++      window->type == META_WINDOW_NOTIFICATION ||
++      window->type == META_WINDOW_DND ||
++      window->type == META_WINDOW_OVERRIDE_OTHER){
+     clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group),
+ 			       CLUTTER_ACTOR (self));
+   }
+-- 
+1.8.1.6
+
diff --git a/community/muffin/switch-applications.patch b/community/muffin/switch-applications.patch
new file mode 100644
index 000000000..61b727b57
--- /dev/null
+++ b/community/muffin/switch-applications.patch
@@ -0,0 +1,20 @@
+diff -Naur linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c linuxmint-muffin-1ad6bd4/src/core/keybindings.c
+--- linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c	2013-04-15 15:53:35.000000000 +0200
++++ linuxmint-muffin-1ad6bd4/src/core/keybindings.c	2013-04-24 18:37:54.028549911 +0200
+@@ -3774,14 +3774,14 @@
+                           handle_switch, META_TAB_LIST_GROUP);
+ 
+   add_builtin_keybinding (display,
+-                          "switch-windows",
++                          "switch-applications",
+                           SCHEMA_COMMON_KEYBINDINGS,
+                           META_KEY_BINDING_REVERSES,
+                           META_KEYBINDING_ACTION_SWITCH_WINDOWS,
+                           handle_switch, META_TAB_LIST_NORMAL);
+ 
+   add_builtin_keybinding (display,
+-                          "switch-windows-backward",
++                          "switch-applications-backward",
+                           SCHEMA_COMMON_KEYBINDINGS,
+                           REVERSES_AND_REVERSED,
+                           META_KEYBINDING_ACTION_SWITCH_WINDOWS_BACKWARD,
diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD
deleted file mode 100644
index fb733c493..000000000
--- a/community/multipath-tools/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 81789 2012-12-30 08:24:14Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Thomas S Hatch <thatch45 ar gmail dot com>
-# Contributor: Michael P <ptchinster@archlinux.us>
-# Contributor: Matt Heagney <matt@heagney.com>
-
-pkgname=multipath-tools
-pkgver=0.4.9
-pkgrel=12
-pkgdesc='Multipath tools for Linux'
-arch=('i686' 'x86_64' 'mips64el')
-url="http://christophe.varoqui.free.fr/"
-license=('GPL')
-depends=('bash' 'libaio' 'device-mapper')
-backup=('etc/multipath.conf' 'etc/multipath.conf.annotated')
-install=multipath-tools.install
-options=(!emptydirs)
-source=(http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2
-        rc.d service multipath.conf multipath.conf.annotated
-        fix-build.patch buffer-overflows.patch log_enquery_overflow.patch
-        blacklist-cciss-devices.patch explicitly-include-posix_types.h.patch)
-md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765'
-         '7c04ef96441363b0d43a2ebb13a87659'
-         '4843e91a83660e4b3acfb2d804fa344e'
-         '9324ff0ba8330dcb21b2fcf64988026f'
-         'be11462922eeeb9fcd2ba5f3f137b7d9'
-         '885c0ba9c90b73cc93aa3f78005f81d6'
-         'c5aab36777b0304a3525533cdd31bddc'
-         '00eae05e02f1b85062e998574ab1b833'
-         '61b4038c4c145ca52e836145ea6bdd6c'
-         'd99beb6d8a9b84f90125c7cacf8a6006')
-
-build() {
-  patch -Np1 -i fix-build.patch
-  patch -Np1 -i buffer-overflows.patch
-  patch -Np1 -i log_enquery_overflow.patch
-  patch -Np1 -i blacklist-cciss-devices.patch
-  patch -Np1 -i explicitly-include-posix_types.h.patch
-
-  # Needs to be fixed upstream. Refer to
-  # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814
-  export LDFLAGS=${LDFLAGS/-Wl,--as-needed}
-  
-  make LIB='usr/lib'
-}
-
-package() {
-  make LIB='usr/lib' \
-       DESTDIR="$pkgdir" \
-       bindir='/usr/bin' \
-       libudevdir='/usr/lib/udev' install
-
-  install -Dm644 multipath.conf "$pkgdir"/etc/multipath.conf
-  install -Dm644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated
-  install -Dm755 rc.d "$pkgdir"/etc/rc.d/multipathd
-  install -Dm644 service "$pkgdir"/usr/lib/systemd/system/multipathd.service
-
-  sed -i 's/sbin/bin/g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
-}
diff --git a/community/multipath-tools/blacklist-cciss-devices.patch b/community/multipath-tools/blacklist-cciss-devices.patch
deleted file mode 100644
index 497121c36..000000000
--- a/community/multipath-tools/blacklist-cciss-devices.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Fri, 3 Oct 2008 12:39:48 +0200
-Subject: [PATCH] blacklist cciss devices
-
-cciss support isn't complete in 0.4.8 and the half functioning causes
-problems in d-i among other things.
-Closes: #500991
----
- libmultipath/blacklist.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
-index f369517..2e5efc8 100644
---- a/libmultipath/blacklist.c
-+++ b/libmultipath/blacklist.c
-@@ -121,6 +121,12 @@ setup_default_blist (struct config * conf)
- 	if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
- 		return 1;
- 
-+	str = STRDUP("^cciss!c[0-9]d[0-9]*");
-+	if (!str)
-+		return 1;
-+	if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
-+		return 1;
-+
- 	vector_foreach_slot (conf->hwtable, hwe, i) {
- 		if (hwe->bl_product) {
- 			if (alloc_ble_device(conf->blist_device))
--- 
diff --git a/community/multipath-tools/buffer-overflows.patch b/community/multipath-tools/buffer-overflows.patch
deleted file mode 100644
index 38719aceb..000000000
--- a/community/multipath-tools/buffer-overflows.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- multipath-tools-0.4.9.orig/libmultipath/prioritizers/datacore.c	2010-05-22 05:01:58.000000000 -0700
-+++ multipath-tools-0.4.9/libmultipath/prioritizers/datacore.c	2010-11-28 12:22:12.037228583 -0800
-@@ -94,7 +94,7 @@
- 	if ((io_hdr.info & SG_INFO_OK_MASK) != SG_INFO_OK)
- 		return 0;
- 
--	snprintf(vendor, 9, "%.8s\n", inqBuffp + 8);
-+	snprintf(vendor, 8, "%.8s\n", inqBuffp + 8);
- 	snprintf(product, 17, "%.16s", inqBuffp + 16);
- 	snprintf(luname, 21, "%.19s", inqBuffp + 36);
- 	snprintf(wwpn, 17, "%.16s", inqBuffp + 96);
---- multipath-tools-0.4.9.orig/libmultipath/prioritizers/hds.c	2010-05-22 05:01:58.000000000 -0700
-+++ multipath-tools-0.4.9/libmultipath/prioritizers/hds.c	2010-11-28 12:22:44.199483997 -0800
-@@ -123,7 +123,7 @@
- 		return -1;
- 	}
- 
--	snprintf (vendor, 9, "%.8s", inqBuffp + 8);
-+	snprintf (vendor, 8, "%.8s", inqBuffp + 8);
- 	snprintf (product, 17, "%.16s", inqBuffp + 16);
- 	snprintf (serial, 5, "%.4s", inqBuffp + 40);
- 	snprintf (ldev, 5, "%.4s", inqBuffp + 44);
diff --git a/community/multipath-tools/explicitly-include-posix_types.h.patch b/community/multipath-tools/explicitly-include-posix_types.h.patch
deleted file mode 100644
index 6cbbc3ba1..000000000
--- a/community/multipath-tools/explicitly-include-posix_types.h.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Sat, 5 Dec 2009 18:11:00 +0100
-Subject: [PATCH] explicitly include posix_types.h
-
-to get the correct type for __kernel_old_dev_t
-
-Closes: #558990
----
- kpartx/lopart.c |   13 +------------
- 1 files changed, 1 insertions(+), 12 deletions(-)
-
-Index: mpath/kpartx/lopart.c
-===================================================================
---- mpath.orig/kpartx/lopart.c	2012-02-09 18:02:23.808800332 +0530
-+++ mpath/kpartx/lopart.c	2012-02-09 18:15:24.400671080 +0530
-@@ -26,18 +26,7 @@
- #include <sys/stat.h>
- #include <sys/mman.h>
- #include <sysmacros.h>
--
--#if defined(__hppa__) || defined(__powerpc64__) || defined (__alpha__) \
-- || defined (__x86_64__)
--typedef unsigned long __kernel_old_dev_t;
--#elif defined(__powerpc__) || defined(__ia64__) || (defined(__sparc__) && defined (__arch64__))
--typedef unsigned int __kernel_old_dev_t;
--#else
--typedef unsigned short __kernel_old_dev_t;
--#endif
--
--#define dev_t __kernel_old_dev_t
--
-+#include <asm/posix_types.h>
- #include <linux/loop.h>
- 
- #include "lopart.h"
diff --git a/community/multipath-tools/fix-build.patch b/community/multipath-tools/fix-build.patch
deleted file mode 100644
index ff8f6824c..000000000
--- a/community/multipath-tools/fix-build.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-diff -rupN upstream/Makefile.inc devel/Makefile.inc
---- upstream/Makefile.inc	2010-05-22 14:01:58.000000000 +0200
-+++ devel/Makefile.inc	2012-05-26 10:14:46.969786387 +0200
-@@ -32,11 +32,10 @@ rcdir	    = $(prefix)/etc/init.d
- syslibdir   = $(prefix)/$(LIB)
- libdir	    = $(prefix)/$(LIB)/multipath
- 
--GZIP        = /bin/gzip -9 -c
- INSTALL_PROGRAM = install
- 
--OPTFLAGS     = -pipe -g -Wall -Wunused -Wstrict-prototypes
--CFLAGS	     = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
-+OPTFLAGS     = -Wall -Wunused -Wstrict-prototypes
-+CFLAGS	     += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
- SHARED_FLAGS = -shared
- 
- %.o:	%.c
-diff -rupN upstream/kpartx/Makefile devel/kpartx/Makefile
---- upstream/kpartx/Makefile	2010-05-22 14:01:58.000000000 +0200
-+++ devel/kpartx/Makefile	2012-05-26 10:23:38.909780754 +0200
-@@ -6,7 +6,7 @@ include ../Makefile.inc
- 
- CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- 
--LDFLAGS = -ldevmapper
-+LIBS = -ldevmapper
- OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \
-        gpt.o mac.o crc32.o lopart.o xstrncpy.o devmapper.o
- EXEC = kpartx
-@@ -14,22 +14,22 @@ EXEC = kpartx
- all: $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 	
- install: $(EXEC) $(EXEC).8
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
- 	$(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
--	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
--	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
-+	$(INSTALL_PROGRAM) -d $(DESTDIR)/usr/lib/udev/rules.d
-+	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/usr/lib/udev/rules.d/66-kpartx.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 
- uninstall:
- 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
--	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
-+	rm -f $(DESTDIR)/usr/lib/udev/rules.d/66-kpartx.rules
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
-diff -rupN upstream/kpartx/kpartx.rules devel/kpartx/kpartx.rules
---- upstream/kpartx/kpartx.rules	2010-05-22 14:01:58.000000000 +0200
-+++ devel/kpartx/kpartx.rules	2012-05-26 10:30:32.769776372 +0200
-@@ -27,9 +27,9 @@ ENV{DM_PART}=="?*", \
- 
- # Create dm tables for partitions
- ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="mpath-*", \
--        RUN+="/sbin/kpartx -a -p -part /dev/$name"
-+        RUN+="/usr/sbin/kpartx -a -p -part /dev/$name"
- ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="dmraid-*", \
--        RUN+="/sbin/kpartx -a -p -part /dev/$name"
-+        RUN+="/usr/sbin/kpartx -a -p -part /dev/$name"
- 
- LABEL="kpartx_end"
- 
-diff -rupN upstream/multipath/Makefile devel/multipath/Makefile
---- upstream/multipath/Makefile	2010-05-22 14:01:58.000000000 +0200
-+++ devel/multipath/Makefile	2012-05-26 10:22:38.819781391 +0200
-@@ -7,32 +7,30 @@ include ../Makefile.inc
- OBJS = main.o
- 
- CFLAGS += -I$(multipathdir)
--LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
-+LIBS = -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath
- 
- EXEC = multipath
- 
- all: $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
--	$(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
--	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
--	$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/
-+	$(INSTALL_PROGRAM) -d $(DESTDIR)/usr/lib/udev/rules.d
-+	$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/usr/lib/udev/rules.d/65-multipath.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
- 
- uninstall:
--	rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
--	rm $(DESTDIR)$(bindir)/$(EXEC)
--	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
--	rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
-+	rm -f $(DESTDIR)/usr/lib/udev/rules.d/65-multipath.rules
-+	rm -f $(DESTDIR)$(bindir)/$(EXEC)
-+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
-+	rm -f $(DESTDIR)$(man5dir)/$(EXEC).conf.5
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
-diff -rupN upstream/multipath/multipath.rules devel/multipath/multipath.rules
---- upstream/multipath/multipath.rules	2010-05-22 14:01:58.000000000 +0200
-+++ devel/multipath/multipath.rules	2012-05-26 10:17:34.849784609 +0200
-@@ -1,7 +1,24 @@
--#
--# udev rules for multipathing.
--# The persistent symlinks are created with the kpartx rules
--#
-+# multipath wants the devmaps presented as meaninglful device names
-+# so name them after their devmap name
-+SUBSYSTEM!="block", GOTO="end_mpath"
- 
--# socket for uevents
--SUBSYSTEM=="block", RUN+="socket:/org/kernel/dm/multipath_event"
-+ENV{MPATH_SBIN_PATH}="/sbin"
-+TEST!="$env{MPATH_SBIN_PATH}/multipath", ENV{MPATH_SBIN_PATH}="/usr/sbin"
-+
-+ACTION=="add", ENV{DEVTYPE}!="partition", \
-+   ENV{DM_MULTIPATH_DEVICE_PATH}!="1", \
-+   PROGRAM=="$env{MPATH_SBIN_PATH}/multipath -c $tempnode", \
-+   ENV{DM_MULTIPATH_DEVICE_PATH}="1"
-+
-+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", ENV{DEVTYPE}!="partition", \
-+   RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}"
-+
-+RUN+="socket:/org/kernel/dm/multipath_event"
-+KERNEL!="dm-*", GOTO="end_mpath"
-+ACTION!="change", GOTO="end_mpath"
-+ENV{DM_UUID}=="mpath-?*|part[0-9]*-mpath-?*", OPTIONS+="link_priority=10"
-+ENV{DM_UUID}!="mpath-?*", GOTO="end_mpath"
-+ENV{DM_SUSPENDED}=="1", GOTO="end_mpath"
-+ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath"
-+RUN+="$env{MPATH_SBIN_PATH}/kpartx -a -p p $tempnode"
-+LABEL="end_mpath"
-diff -rupN upstream/multipath-tools.spec.in devel/multipath-tools.spec.in
---- upstream/multipath-tools.spec.in	2010-05-22 14:01:58.000000000 +0200
-+++ devel/multipath-tools.spec.in	2012-05-26 10:24:16.989780353 +0200
-@@ -47,8 +47,8 @@ rm -rf $RPM_BUILD_ROOT
- %{prefix}/usr/share/man/man8/multipathd.8.gz
- %{prefix}/usr/share/man/man5/multipath.conf.5.gz
- %{prefix}/sbin/multipathd
--%{prefix}/etc/udev/rules.d/multipath.rules
--%{prefix}/etc/udev/rules.d/kpartx.rules
-+%{prefix}/usr/lib/udev/rules.d/multipath.rules
-+%{prefix}/usr/lib/udev/rules.d/kpartx.rules
- %{prefix}/lib/udev/kpartx_id
- %{prefix}/lib/multipath/*.so
- 
-diff -rupN upstream/multipathd/Makefile devel/multipathd/Makefile
---- upstream/multipathd/Makefile	2010-05-22 14:01:58.000000000 +0200
-+++ devel/multipathd/Makefile	2012-05-26 10:14:46.969786387 +0200
-@@ -6,8 +6,8 @@ include ../Makefile.inc
- # basic flags setting
- #
- CFLAGS += -I$(multipathdir)
--LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
--	   -lmultipath -L$(multipathdir)
-+LIBS = -lpthread -ldevmapper -lreadline -lncurses -ldl \
-+	   -L$(multipathdir) -lmultipath
- 
- #
- # debuging stuff
-@@ -28,21 +28,20 @@ OBJS = main.o pidfile.o uxlsnr.o uxclnt.
- all : $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 
- uninstall:
- 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
- 	rm -f $(DESTDIR)$(rcdir)/$(EXEC)
--	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
- 
diff --git a/community/multipath-tools/log_enquery_overflow.patch b/community/multipath-tools/log_enquery_overflow.patch
deleted file mode 100644
index 67367c9f4..000000000
--- a/community/multipath-tools/log_enquery_overflow.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From e1d69df0cdd1627676501df3a533b25ffadaeff0 Mon Sep 17 00:00:00 2001
-From: Arkadiusz Miskiewicz <arekm@maven.pl>
-Date: Sat, 27 Nov 2010 19:21:21 +0100
-Subject: [PATCH] multipath-tools overflow
-
-On Saturday 27 of November 2010, you wrote:
-
-[...]
-
-> the whole logarea is memset to 0 by logarea_init(), and each dequeued
-> message is also memset to 0 by log_dequeue(), so it seems normal that
-> msg->str value is 0x0, but it's really its address that matters.
-
-Ok, got it. Pointers, memory areas in my debugging session - are looking
-good then.
-
->
-> It's not clear to me : are you actually hitting a bug or is it your
-> debug session that puzzles you ?
-
-I'm hitting a bug. multipathd dies for me at that strcpy(). Now I think
-the bug is strcpy usage instead of memcpy because I'm building with
--O2 -D_FORTIFY_SOURCE=2 which turns on special glibc overflow
-detection.
-
-That detection seem to be smart enough to know that &str area is not
-a string memory and aborts the program.
-
-Found similar problem discussed here
-http://sourceware.org/ml/binutils/2005-11/msg00308.html
-
-glibc aborts the program:
-[pid 13432] writev(2, [{"*** ", 4}, {"buffer overflow detected", 24},
-{" ***: ", 6}, {"/home/users/arekm/rpm/BUILD/multipath-tools-0.4.9
-/multipathd/multipathd", 71}, {" terminated\n", 12}], 5) = 117
-
-same for valgrind:
-**13436** *** strcpy_chk: buffer overflow detected ***: program terminated
-==13436==    at 0x4024997: VALGRIND_PRINTF_BACKTRACE (valgrind.h:4477)
-==13436==    by 0x40265F8: __strcpy_chk (mc_replace_strmem.c:781)
-==13436==    by 0x40EDC06: log_enqueue (string3.h:107)
-==13436==    by 0x40ED68A: log_safe (log_pthread.c:24)
-==13436==    by 0x40E296A: dlog (debug.c:36)
-==13436==    by 0x804ECEC: pidfile_create (pidfile.c:37)
-==13436==    by 0x804E731: main (main.c:1424)
-
-The bug is not visible if I run multipathd in debug mode (-d).
-
-This patch fixes the problem for me by avoiding false positive on strcpy_chk.
----
- libmultipath/log.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libmultipath/log.c b/libmultipath/log.c
-index e56e46b..57b7696 100644
---- a/libmultipath/log.c
-+++ b/libmultipath/log.c
-@@ -142,7 +142,7 @@ int log_enqueue (int prio, const char * fmt, va_list ap)
- 	la->empty = 0;
- 	msg = (struct logmsg *)la->tail;
- 	msg->prio = prio;
--	strcpy((void *)&msg->str, buff);
-+	memcpy((void *)&msg->str, buff, strlen(buff) + 1);
- 	lastmsg->next = la->tail;
- 	msg->next = la->head;
- 
--- 
-1.7.6.5
-
diff --git a/community/multipath-tools/multipath-tools.install b/community/multipath-tools/multipath-tools.install
deleted file mode 100644
index fa58bbc35..000000000
--- a/community/multipath-tools/multipath-tools.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-
-    echo " * For full functonality ensure that the dm_multipath kernel module is loaded"
-}
diff --git a/community/multipath-tools/multipath.conf b/community/multipath-tools/multipath.conf
deleted file mode 100644
index 6dacf093d..000000000
--- a/community/multipath-tools/multipath.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Very Basic Multipath Configuration File
-#
-
-defaults {
-	getuid_callout "/usr/lib/udev/scsi_id -g -u -d /dev/%n"
-}
-
diff --git a/community/multipath-tools/multipath.conf.annotated b/community/multipath-tools/multipath.conf.annotated
deleted file mode 100644
index b79488413..000000000
--- a/community/multipath-tools/multipath.conf.annotated
+++ /dev/null
@@ -1,362 +0,0 @@
-##
-## This is a template multipath-tools configuration file
-## Uncomment the lines relevent to your environment
-##
-#
-##
-## name  : defaults
-## desc  : multipath-tools default settings
-##
-#defaults {
-#	#
-#	# name    : udev_dir
-#	# desc    : directory where udev creates its device nodes
-#	# default : /dev
-#	#
-#	udev_dir	/dev
-#
-#	#
-#	# name    : polling_interval
-#	# scope   : multipathd
-#	# desc    : interval between two path checks in seconds
-#	# default : 5
-#	#
-#	polling_interval 10
-#
-#	#
-#	# name    : selector
-#	# scope   : multipath
-#	# desc    : the default path selector algorithm to use
-#	#           these algorithms are offered by the kernel multipath target
-#	# values  : "round-robin 0"
-#	# default : "round-robin 0"
-#	#
-#	selector	"round-robin 0"
-#
-#	#
-#	# name    : path_grouping_policy
-#	# scope   : multipath
-#	# desc    : the default path grouping policy to apply to unspecified
-#	#           multipaths
-#	# default : multibus
-#	#
-#	path_grouping_policy	multibus
-#
-#	#
-#	# name    : getuid_callout
-#	# scope   : multipath
-#	# desc    : the default program and args to callout to obtain a unique 
-#	#           path identifier. Absolute path required
-#	# default : /usr/lib/udev/scsi_id -g -u -s
-#	#
-#	getuid_callout	"/usr/lib/udev/scsi_id -g -u -s /block/%n"
-#
-#	#
-#	# name    : prio_callout
-#	# scope   : multipath
-#	# desc    : the default program and args to callout to obtain a path 
-#	#           priority value. The ALUA bits in SPC-3 provide an
-#	#           exploitable prio value for example. "none" is a valid value
-#	# default : (null)
-#	#
-#	#prio_callout	"/bin/true"
-#
-#	#
-#	# name    : path_checker
-#	# scope   : multipath & multipathd
-#	# desc    : the default method used to determine the paths' state
-#	# values  : readsector0|tur|emc_clariion|hp_sw|directio
-#	# default : directio
-#	#
-#	#path_checker	directio
-#
-#	#
-#	# name    : rr_min_io
-#	# scope   : multipath
-#	# desc    : the number of IO to route to a path before switching
-#	#           to the next in the same path group
-#	# default : 1000
-#	#
-#	rr_min_io	100
-#
-#	#
-#	# name    : rr_weight
-#	# scope   : multipath
-#	# desc    : if set to priorities the multipath configurator will assign
-#	#	    path weights as "path prio * rr_min_io"
-#	# values  : priorities|uniform
-#	# default : uniform
-#	#
-#	rr_weight	priorities
-#
-#	#
-#	# name    : failback
-#	# scope   : multipathd
-#	# desc    : tell the daemon to manage path group failback, or not to.
-#	#	    0 means immediate failback, values >0 means deffered failback
-#	#	    expressed in seconds.
-#	# values  : manual|immediate|n > 0
-#	# default : immediate
-#	#
-#	failback	manual
-#
-#	#
-#	# name    : no_path_retry
-#	# scope   : multipath & multipathd
-#	# desc    : tell the number of retries until disable queueing, or
-#	#           "fail" means immediate failure (no queueing),
-#	#           "queue" means never stop queueing
-#	# values  : queue|fail|n (>0)
-#	# default : (null)
-#	#
-#	#no_path_retry  queue
-#
-#	#
-#	# name    : user_friendly_names
-#	# scope   : multipath
-#	# desc    : If set to "yes", using the bindings file
-#	#           /var/lib/multipath/bindings to assign a persistent and
-#	#           unique alias to the multipath, in the form of mpath<n>.
-#	#           If set to "no" use the WWID as the alias. In either case
-#	#           this be will be overriden by any specific aliases in this
-#	#           file.
-#	# values  : yes|no
-#	# default : no
-#	user_friendly_names no
-#
-#}
-#	
-##
-## name    : blacklist
-## scope   : multipath & multipathd
-## desc    : list of device names to discard as not multipath candidates
-## default : cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop
-##
-#blacklist {
-#       wwid 26353900f02796769
-#	devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"
-#	devnode "^hd[a-z][[0-9]*]"
-#	devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]"
-#       device {
-#               vendor DEC.*
-#               product MSA[15]00
-#       }
-#}
-##
-## name    : blacklist_exceptions
-## scope   : multipath & multipathd
-## desc    : list of device names to be treated as multipath candidates
-##           even if they are on the blacklist.
-##           Note: blacklist exceptions are only valid in the same class.
-##           It is not possible to blacklist devices using the devnode keyword
-##           and to exclude some devices of them using the wwid keyword.
-## default : -
-##
-#blacklist_exceptions {
-#       devnode "^dasd[c-d]+[0-9]*"
-#       wwid    "IBM.75000000092461.4d00.34"
-#       wwid    "IBM.75000000092461.4d00.35"
-#       wwid    "IBM.75000000092461.4d00.36"
-#}
-#
-##
-## name    : multipaths
-## scope   : multipath & multipathd
-## desc    : list of multipaths finest-grained settings
-##
-#multipaths {
-#	#
-#	# name  : multipath
-#	# scope : multipath & multipathd
-#	# desc  : container for settings that apply to one specific multipath
-#	#
-#	multipath {
-#		#
-#		# name  : wwid
-#		# scope : multipath & multipathd
-#		# desc  : index of the container
-#		#
-#		wwid			3600508b4000156d700012000000b0000
-#
-#		#
-#		# name    : alias
-#		# scope   : multipath
-#		# desc    : symbolic name for the multipath
-#		#
-#		alias			yellow
-#
-#		#
-#		# name    : path_grouping_policy
-#		# scope   : multipath
-#		# desc    : path grouping policy to apply to this multipath
-#		# values  : failover, multibus, group_by_serial
-#		# default : failover
-#		#
-#		path_grouping_policy	multibus
-#
-#		#
-#		# name    : path_checker
-#		# scope   : multipathd
-#		# desc    : path checking alorithm to use to check path state
-#		# values  : readsector0|tur|emc_clariion|hp_sw|directio
-#		# default : directio
-#		#
-#		# path_checker		directio
-#		
-#		#
-#		# name    : path_selector
-#		# desc    : the path selector algorithm to use for this mpath
-#		#           these algo are offered by the kernel mpath target
-#		# values  : "round-robin 0"
-#		# default : "round-robin 0"
-#		#
-#		path_selector		"round-robin 0"
-#
-#		#
-#		# name    : failback
-#		# scope   : multipathd
-#		# desc    : tell the daemon to manage path group failback, or not to.
-#		#	    0 means immediate failback, values >0 means deffered failback
-#		#	    expressed in seconds.
-#		# values  : manual|immediate|n > 0
-#		# default : immediate
-#		#
-#		failback		manual
-#
-#		#
-#		# name    : no_path_retry
-#		# scope   : multipath & multipathd
-#		# desc    : tell the number of retries until disable queueing, or
-#		#           "fail" means immediate failure (no queueing),
-#		#           "queue" means never stop queueing
-#		# values  : queue|fail|n (>0)
-#		# default : (null)
-#		#
-#		#no_path_retry  queue
-#
-#		#
-#		# name    : rr_min_io
-#		# scope   : multipath
-#		# desc    : the number of IO to route to a path before switching
-#		#           to the next in the same path group
-#		# default : 1000
-#		#
-#		rr_min_io	100
-#	}
-#	multipath {
-#		wwid	1DEC_____321816758474
-#		alias	red
-#		rr_weight		priorities
-#	}
-#}
-#
-##
-## name  : devices
-## scope : multipath & multipathd
-## desc  : list of per storage controller settings
-##	  overrides default settings (device_maps block)
-##         overriden by per multipath settings (multipaths block)
-##
-#devices {
-#	#
-#	# name  : device
-#	# scope : multipath & multipathd
-#	# desc  : settings for this specific storage controller
-#	#
-#	device {
-#		#
-#		# name  : vendor, product
-#		# scope : multipath & multipathd
-#		# desc  : index for the block
-#		#
-#		vendor			"COMPAQ  "
-#		product			"HSV110 (C)COMPAQ"
-#
-#		#
-#		# name    : path_grouping_policy
-#		# scope   : multipath
-#		# desc    : path grouping policy to apply to multipath hosted
-#		#           by this storage controller
-#		# values  : failover        = 1 path per priority group
-#		#           multibus        = all valid paths in 1 priority
-#		#                             group
-#		#           group_by_serial = 1 priority group per detected
-#		#                             serial number
-#		# default : failover
-#		#
-#		path_grouping_policy	multibus
-#
-#		#
-#		# name    : getuid_callout
-#		# scope   : multipath
-#		# desc    : the program and args to callout to obtain a unique 
-#		#           path identifier. Absolute path required
-#		# default : /usr/lib/udev/scsi_id -g -u -s
-#		#
-#		getuid_callout          "/usr/lib/udev/scsi_id -g -u -s /block/%n"
-#
-#		#
-#		# name    : prio_callout
-#		# scope   : multipath
-#		# desc    : the program and args to callout to obtain a path 
-#		#           weight. Weights are summed for each path group to
-#		#	    determine the next PG to use case of failure.
-#		#	    "none" is a valid value.
-#		# default : no callout, all paths equals
-#		#
-#		prio_callout          "/sbin/mpath_prio_balance_units %d"
-#
-#		#
-#		# name    : path_checker
-#		# scope   : multipathd
-#		# desc    : path checking alorithm to use to check path state
-#		# values  : readsector0|tur|emc_clariion|hp_sw|directio
-#		# default : directio
-#		#
-#		path_checker		directio
-#
-#		#
-#		# name    : path_selector
-#		# desc    : the path selector algorithm to use for this mpath
-#		#           these algo are offered by the kernel mpath target
-#		# values  : "round-robin 0"
-#		# default : "round-robin 0"
-#		#
-#		path_selector		"round-robin 0"
-#
-#		#
-#		# name    : failback
-#		# scope   : multipathd
-#		# desc    : tell the daemon to manage path group failback, or not to.
-#		#	    0 means immediate failback, values >0 means deffered failback
-#		#	    expressed in seconds.
-#		# values  : manual|immediate|n > 0
-#		# default : immediate
-#		#
-#		failback		30
-#
-#		#
-#		# name    : rr_min_io
-#		# scope   : multipath
-#		# desc    : the number of IO to route to a path before switching
-#		#           to the next in the same path group
-#		# default : 1000
-#		#
-#		rr_min_io	100
-#
-#		#
-#		# name    : product_blacklist
-#		# scope   : multipath & multipathd
-#		# desc    : product strings to blacklist for this vendor
-#		# default : none
-#		#
-#		product_blacklist	LUN_Z
-#	}
-#	device {
-#		vendor			"COMPAQ  "
-#		product			"MSA1000         "
-#		path_grouping_policy	multibus
-#		path_checker		tur
-#		rr_weight		priorities
-#	}
-#}
diff --git a/community/multipath-tools/multipathd.rc b/community/multipath-tools/multipathd.rc
deleted file mode 100644
index 7f5ef5d6a..000000000
--- a/community/multipath-tools/multipathd.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting multipathd"
-    /usr/bin/multipathd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon multipathd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping multipathd"
-    [ -f /var/run/multipathd.pid ] && kill `cat /var/run/multipathd.pid` >/dev/null 2>&1 
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon multipathd
-        stat_done
-      fi 
-      ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/multipath-tools/rc.d b/community/multipath-tools/rc.d
deleted file mode 100644
index 7f5ef5d6a..000000000
--- a/community/multipath-tools/rc.d
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting multipathd"
-    /usr/bin/multipathd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon multipathd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping multipathd"
-    [ -f /var/run/multipathd.pid ] && kill `cat /var/run/multipathd.pid` >/dev/null 2>&1 
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon multipathd
-        stat_done
-      fi 
-      ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/multipath-tools/service b/community/multipath-tools/service
deleted file mode 100644
index a70d0ee1f..000000000
--- a/community/multipath-tools/service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Device-Mapper Multipath Device Controller
-After=syslog.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/multipathd.pid
-ExecStart=/sbin/multipathd
-ExecReload=/sbin/multipathd reconfigure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/multitail/PKGBUILD b/community/multitail/PKGBUILD
index 3a1815863..9ed1ad429 100644
--- a/community/multitail/PKGBUILD
+++ b/community/multitail/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=multitail
 pkgver=5.2.12
 pkgrel=1
 pkgdesc="Lets you view one or multiple files like the original tail program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.vanheusden.com/multitail"
 depends=('ncurses')
diff --git a/community/mumble/PKGBUILD b/community/mumble/PKGBUILD
index f5c5f5c4f..5247c9d2c 100644
--- a/community/mumble/PKGBUILD
+++ b/community/mumble/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64801 2012-02-18 06:36:47Z svenstaro $
+# $Id: PKGBUILD 85446 2013-03-01 18:21:21Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lauri Niskanen <ape@ape3000.com>
 # Contributor: Sebastian.Salich@gmx.de
@@ -9,26 +9,24 @@
 
 pkgname=mumble
 pkgver=1.2.3
-pkgrel=5
+pkgrel=7
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A voice chat application similar to TeamSpeak"
-license=('GPL')
-depends=('qt' 'speex' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf' 'libpulse')
+license=('BSD')
+depends=('qt4' 'speex' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf' 'libpulse')
 makedepends=('boost' 'mesa' 'avahi')
 #optdepends=('portaudio: for portaudio back-end' 'g15daemon: G15 Keyboard support')
 options=('!libtool') 
 install=mumble.install
 url="http://mumble.sourceforge.net/"
-source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz" \
-  mumble11x.desktop )
-md5sums=('55804e3dfe98b16eeb40abca6c254625'
-         '70dcaa8ad2ecf68c6ba52ea03d112bcd')
+source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz")
+md5sums=('55804e3dfe98b16eeb40abca6c254625')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
   # Building mumble
-  /usr/bin/qmake main.pro \
+  qmake main.pro \
     CONFIG+="bundled-celt no-bundled-speex no-speechd no-g15 no-xevie no-server \
     no-embed-qt-translations no-update packaged" \
     DEFINES+="PLUGIN_PATH=/usr/lib/mumble"
@@ -40,7 +38,6 @@ package() {
 
   # bin stuff
   install -m755 -D ./release/mumble $pkgdir/usr/bin/mumble
-  install -m755 -D ./release/mumble11x $pkgdir/usr/bin/mumble11x
   install -m755 -D ./scripts/mumble-overlay $pkgdir/usr/bin/mumble-overlay
 
   # lib stuff
@@ -54,7 +51,6 @@ package() {
 
   # other stuff
   install -m644 -D ./scripts/mumble.desktop $pkgdir/usr/share/applications/mumble.desktop
-  install -m644 -D $srcdir/mumble11x.desktop $pkgdir/usr/share/applications/mumble11x.desktop
   install -m755 -d $pkgdir/usr/share/man/man1
   install -m644 -D ./man/mum* $pkgdir/usr/share/man/man1/
   install -m644 -D ./icons/mumble.svg $pkgdir/usr/share/icons/hicolor/scalable/apps/mumble.svg
diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD
index 4c2b0ee2d..b04d9c8b9 100644
--- a/community/mupdf/PKGBUILD
+++ b/community/mupdf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75333 2012-08-20 06:45:01Z bpiotrowski $
+# $Id: PKGBUILD 87740 2013-04-05 21:06:47Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
@@ -6,23 +6,24 @@
 # Contributor: xduugu (.desktop and install files)
 
 pkgname=mupdf
-pkgver=1.1
-pkgrel=1
-pkgdesc="lightweight PDF viewer and toolkit written in portable C"
+pkgver=1.2
+pkgrel=2
+pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://mupdf.com"
+url='http://mupdf.com'
 license=('GPL3')
 depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext' 'desktop-file-utils' 'xdg-utils')
 install=mupdf.install
-source=("http://mupdf.com/download/$pkgname-$pkgver-source.tar.gz")
-md5sums=('f7b5fd753f40aca207e9afd70d8f8edf')
+source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.zip)
+sha256sums=('9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b')
 
 build() {
-    CFLAGS+=" -fPIC"
-    CXXFLAGS+=" -fPIC"
+    CFLAGS+=' -fPIC'
+    CXXFLAGS+=' -fPIC'
 
 	cd "$srcdir"/$pkgname-$pkgver-source
-	make build=release prefix="$pkgdir"/usr
+	rm -rf thirdparty
+	make build=release prefix=/usr
 }
 
 package() {
diff --git a/community/mupen64plus/PKGBUILD b/community/mupen64plus/PKGBUILD
deleted file mode 100644
index c7835c0f0..000000000
--- a/community/mupen64plus/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 78487 2012-10-19 16:17:59Z jelle $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Zephyr
-
-pkgname=mupen64plus
-pkgver=1.99.5
-pkgrel=3
-pkgdesc='Nintendo64 Emulator'
-arch=('i686' 'x86_64')
-url='http://code.google.com/p/mupen64plus/'
-license=('GPL')
-depends=('glu' 'libgl' 'libsamplerate' 'libpng' 'sdl' 'freetype2')
-makedepends=('mesa')
-source=("http://mupen64plus.googlecode.com/files/mupen64plus-bundle-src-${pkgver}.tar.gz")
-md5sums=('93772a6d6fc6a63353462deae8a6db71')
-
-build() {
-  cd mupen64plus-bundle-src-${pkgver}
-
-  sh m64p_build.sh
-}
-
-package() {
-  cd mupen64plus-bundle-src-$pkgver
-  
-  # set LDCONFIG since we are using fakeroot and scripts run root commands by checking the uid
-  ./m64p_install.sh DESTDIR="$pkgdir" PREFIX='/usr' MANDIR='/usr/share/man/man6' LDCONFIG='true'
-}
-
-# vim: ts=2:sw=2:et
diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD
index d2e827884..367f52bbc 100644
--- a/community/murmur/PKGBUILD
+++ b/community/murmur/PKGBUILD
@@ -1,41 +1,30 @@
-# $Id: PKGBUILD 81777 2012-12-29 07:18:42Z svenstaro $
+# $Id: PKGBUILD 87551 2013-04-02 23:01:31Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com>
 # Contributor: Malte Rabenseifner <malte@zearan.de> 
 
 pkgname=murmur
 pkgver=1.2.3
-pkgrel=9
+pkgrel=13
 pkgdesc="The voice chat application server for Mumble"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mumble.sourceforge.net"
-license=('GPL')
-depends=('avahi' 'lsb-release' 'protobuf' 'qt' 'icu')
+license=('BSD')
+depends=('avahi' 'lsb-release' 'protobuf' 'qt4' 'icu')
 makedepends=('boost')
-conflicts=('murmur-ice' 'murmur-static' 'murmur-git')
-backup=("etc/murmur.ini"
-        "etc/logrotate.d/murmur"
-        "etc/conf.d/murmur" )
+backup=("etc/murmur.ini")
 install="murmur.install"
 source=("http://downloads.sourceforge.net/mumble/mumble-$pkgver.tar.gz"
-        "murmur.rc.d"
-        "murmur.conf.d"
         "murmur.dbus.conf"
-        "murmur.logrotate.d"
-        "murmur.service"
-        "murmur.conf")
+        "murmur.service")
 md5sums=('55804e3dfe98b16eeb40abca6c254625'
-         'a4f6fc515f258eb4db437a226e16de5d'
-         '11c1cc875e8021739ec2087252cf0533'
          'eddea4cdbd0bde4b960a67e16b5d5478'
-         'c56726cb267ead68f37f35c28e36e6fa'
-         '5ad8798aea4f8b70f47f16df64f755b3'
-         'e00d0d2610b77efebce5b3556609251f')
+         '4ce52d399ba2d95705e997146e0e2544')
 
 build() {
   cd ${srcdir}/mumble-$pkgver
 
-  qmake main.pro CONFIG+="no-client no-ice"
+  qmake-qt4 main.pro CONFIG+="no-client no-ice"
   make release
 }
 
@@ -44,23 +33,16 @@ package() {
 
   sed -e "1i# vi:ft=cfg" \
     -e "s|database=|database=/var/lib/murmur/murmur.sqlite|" \
-    -e "s|dbus=session|#dbus=system|" \
-    -e "s|#logfile=murmur.log|logfile=/var/log/murmur/murmur.log|" \
-    -e "s|#pidfile=|pidfile=/var/run/murmur/murmur.pid|" \
+    -e "s|#logfile=murmur.log|logfile=|" \
     -e "s|#uname=|uname=murmur|" \
     -i scripts/murmur.ini
 
   install -dm755 ${pkgdir}/var/lib/murmur
-  install -dm755 ${pkgdir}/var/log/murmur
   install -Dm755 release/murmurd ${pkgdir}/usr/sbin/murmurd
   install -Dm644 scripts/murmur.ini ${pkgdir}/etc/murmur.ini
-  install -Dm755 ${srcdir}/murmur.rc.d ${pkgdir}/etc/rc.d/murmur
-  install -Dm644 ${srcdir}/murmur.conf.d ${pkgdir}/etc/conf.d/murmur
   install -Dm644 ${srcdir}/murmur.dbus.conf ${pkgdir}/etc/dbus-1/system.d/murmur.conf
-  install -Dm644 ${srcdir}/murmur.logrotate.d ${pkgdir}/etc/logrotate.d/murmur
   install -Dm644 README ${pkgdir}/usr/share/doc/murmur/README
   install -Dm644 man/murmurd.1 ${pkgdir}/usr/share/man/man1/murmurd.1
-  install -Dm644 ${srcdir}/murmur.conf ${pkgdir}/usr/lib/tmpfiles.d/murmur.conf
   install -Dm644 ${srcdir}/murmur.service ${pkgdir}/usr/lib/systemd/system/murmur.service
 }
 
diff --git a/community/murmur/murmur.conf b/community/murmur/murmur.conf
deleted file mode 100644
index 0cc583c40..000000000
--- a/community/murmur/murmur.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/murmur 0775 murmur murmur -
diff --git a/community/murmur/murmur.conf.d b/community/murmur/murmur.conf.d
deleted file mode 100644
index 592194be9..000000000
--- a/community/murmur/murmur.conf.d
+++ /dev/null
@@ -1,2 +0,0 @@
-# Use /etc/murmur.ini as configuration file
-PARAMS="-ini /etc/murmur.ini"
diff --git a/community/murmur/murmur.install b/community/murmur/murmur.install
index 562ec4171..fecd2c2ca 100644
--- a/community/murmur/murmur.install
+++ b/community/murmur/murmur.install
@@ -1,19 +1,16 @@
 post_install() {
-    systemd-tmpfiles --create usr/lib/tmpfiles.d/murmur.conf
+    getent group murmur > /dev/null || groupadd -r -g 86 murmur 1>/dev/null
+    getent passwd murmur > /dev/null || useradd -r -u 86 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null
 
-	getent group murmur > /dev/null || groupadd -r -g 86 murmur 1>/dev/null
-	getent passwd murmur > /dev/null || useradd -r -u 86 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null
+    chown -R murmur:murmur /var/lib/murmur
 
-	chown -R murmur:murmur /var/lib/murmur 
-	chown -R murmur:murmur /var/log/murmur
-
-	echo "You might have to reload dbus before launching murmur:"
+    echo "You might have to reload dbus before launching murmur:"
     echo "    systemctl reload bus"
-	echo "Don't forget to set the superuser password:"
-	echo "    murmurd -ini /etc/murmur.ini -supw <your-password>"
+    echo "Don't forget to set the superuser password:"
+    echo "    murmurd -ini /etc/murmur.ini -supw <your-password>"
 }
 
 post_remove() {
-	getent passwd murmur > /dev/null && userdel murmur 1>/dev/null
-	getent group murmur > /dev/null && groupdel murmur 1>/dev/null
+    getent passwd murmur > /dev/null && userdel murmur 1>/dev/null
+    getent group murmur > /dev/null && groupdel murmur 1>/dev/null
 }
diff --git a/community/murmur/murmur.logrotate.d b/community/murmur/murmur.logrotate.d
deleted file mode 100644
index e113175ab..000000000
--- a/community/murmur/murmur.logrotate.d
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/murmur/murmur.log {
-	missingok
-	postrotate
-        /bin/kill -HUP `cat /var/run/murmur/murmur.pid 2>/dev/null` 2> /dev/null || true
-	endscript
-}
diff --git a/community/murmur/murmur.rc.d b/community/murmur/murmur.rc.d
deleted file mode 100644
index e26a2a3db..000000000
--- a/community/murmur/murmur.rc.d
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-CONF=/etc/conf.d/murmur
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f $CONF ] && . $CONF
-
-PID=$(pidof -o %PPID /usr/sbin/murmurd)
-case "$1" in
-  start)
-    stat_busy "Starting murmur"
-
-    [ -d /var/run/murmur ] || mkdir -p /var/run/murmur
-    chown murmur:murmur /var/run/murmur
-
-    [ -z "$PID" ] && /usr/sbin/murmurd $PARAMS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon murmur
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping murmur"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon murmur
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/murmur/murmur.service b/community/murmur/murmur.service
index b0097796e..9d58077ab 100644
--- a/community/murmur/murmur.service
+++ b/community/murmur/murmur.service
@@ -3,9 +3,8 @@ Description=Mumble Daemon
 After=network.target
 
 [Service]
-Type=forking
-PIDFile=/run/murmur/murmur.pid
-ExecStart=/usr/sbin/murmurd -ini /etc/murmur.ini
+Type=simple
+ExecStart=/usr/sbin/murmurd -ini /etc/murmur.ini -fg
 Restart=always
 
 [Install]
diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD
index 0654fb335..86ca0ac94 100644
--- a/community/mygui/PKGBUILD
+++ b/community/mygui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83261 2013-01-28 16:49:48Z stephane $
+# $Id: PKGBUILD 87423 2013-03-31 19:18:29Z stephane $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Andrew Belitsky <belitsky.a@gmail.com>
 pkgbase=mygui
 pkgname=('mygui' 'mygui-docs')
 pkgver=3.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A multilayer and overlappable GUI System for OGRE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mygui.info/"
diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD
index 32826b2c6..a514ea801 100644
--- a/community/myodbc/PKGBUILD
+++ b/community/myodbc/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 83893 2013-02-06 12:11:01Z spupykin $
+# $Id: PKGBUILD 87009 2013-03-25 19:16:48Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=myodbc
 pkgver=5.2.4
-pkgrel=1
-pkgdesc="ODBC driver/connector for MySQL"
-arch=(i686 x86_64 'mips64el')
+pkgrel=2
+pkgdesc="ODBC driver/connector for mariadb"
+arch=(i686 x86_64 mips64el)
 url="http://dev.mysql.com/downloads/connector/odbc/"
-depends=('unixodbc' 'libmysqlclient')
+depends=('unixodbc' 'libmariadbclient')
 makedepends=('cmake')
 license=('GPL')
 options=('libtool')
diff --git a/community/mysql++/PKGBUILD b/community/mysql++/PKGBUILD
index 5ee9f8bf0..70ac6b22b 100644
--- a/community/mysql++/PKGBUILD
+++ b/community/mysql++/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 66225 2012-02-23 05:01:23Z spupykin $
+# $Id: PKGBUILD 87010 2013-03-25 19:16:50Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Markus Härer <markus.haerer@gmx.net>
 
 pkgname=mysql++
 pkgver=3.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A C++ wraper for MySQLs C API"
 arch=("i686" "x86_64" 'mips64el')
 url="http://tangentsoft.net/mysql++/"
 license=("LGPL" "custom")
-depends=("libmysqlclient")
+depends=("libmariadbclient")
 options=('docs')
 source=("http://tangentsoft.net/mysql++/releases/$pkgname-$pkgver.tar.gz"
 	"mysql++-fix-cstring.patch"
diff --git a/community/mythplugins/php54.patch b/community/mythplugins/php54.patch
deleted file mode 100644
index afbe8f953..000000000
--- a/community/mythplugins/php54.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-*** includes/sorting.php.old	2011-04-03 06:05:31.000000000 -0500
---- includes/sorting.php	2012-03-27 05:05:51.000000000 -0500
-***************
-*** 123,129 ****
-      function by_user_choice(&$a, &$b) {
-          foreach ($GLOBALS['user_sort_choice'] as $sort) {
-              $function = 'by_'.$sort['field'];
-!             $response = $function(&$a, &$b);
-          // Identical response, go on to the next sort choice
-              if (!$response)
-                  continue;
---- 123,129 ----
-      function by_user_choice(&$a, &$b) {
-          foreach ($GLOBALS['user_sort_choice'] as $sort) {
-              $function = 'by_'.$sort['field'];
-!             $response = $function($a, $b);
-          // Identical response, go on to the next sort choice
-              if (!$response)
-                  continue;
-*** modules/tv/tmpl/default/schedules.php.old	2011-04-03 06:05:31.000000000 -0500
---- modules/tv/tmpl/default/schedules.php	2012-03-27 05:37:40.000000000 -0500
-***************
-*** 90,95 ****
---- 90,100 ----
-  </tr>
-  </thead>
-  <?php
-+         // Hack:  Disable warnings about "Creating default
-+         // object from empty value" from below line
-+         // "$schedule->channel->name = '[ '.t('Any').' ]';"
-+         ini_set('error_reporting', E_ERROR);
-+ 
-          $prev_group = '';
-          $cur_group  = '';
-          foreach ($the_schedules as $schedule) {
diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD
index 0a345b8fb..a9fd7c5cc 100644
--- a/community/mythtv/PKGBUILD
+++ b/community/mythtv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83332 2013-01-29 17:35:51Z spupykin $
+# $Id: PKGBUILD 87011 2013-03-25 19:16:52Z bpiotrowski $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=mythtv
 pkgver=0.26.0
-pkgrel=5
+pkgrel=8
 epoch=1
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
@@ -15,10 +15,10 @@ url="http://www.mythtv.org/"
 license=('GPL')
 depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883'
          'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils'
-	 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6'
+	 'mariadb-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6'
 	 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber'
 	 'x264')
-makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'openssl' 'yasm')
+makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'mesa-libgl' 'openssl' 'yasm')
 optdepends=('glew: for GPU commercial flagging'
             'libcec: for consumer electronics control capabilities'
 	    'libxml2: to read blu-ray metadata'
@@ -30,14 +30,10 @@ backup=('etc/conf.d/mythbackend')
 install='mythtv.install'
 source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
         'alsa.patch'
-        'mythbackend.rc'
-        'mythbackend.conf'
 	'mythbackend.service'
 	'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.patch')
 md5sums=('f57066bf75e6f14824c494d41639f4f9'
          'f64b8219e3d27a2edf96733b851e576b'
-         'c8f935d42fb8617e9279bd539811ca5f'
-         'ab962d83614cbd0ac11ce3fcc929829d'
          'e4d572dcc307d6d8ae26bee5aebf9f3a'
          '6e156c9fc0b369346d93ccafad46cba3')
 
@@ -67,8 +63,6 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make INSTALL_ROOT="$pkgdir" install
 
-  install -D -m755 "$srcdir/mythbackend.rc" "$pkgdir/etc/rc.d/mythbackend"
-  install -D -m644 "$srcdir/mythbackend.conf" "$pkgdir/etc/conf.d/mythbackend"
   install -D -m644 "$srcdir/mythbackend.service" "$pkgdir/usr/lib/systemd/system/mythbackend.service"
   install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql"
 
diff --git a/community/mythtv/mythbackend.conf b/community/mythtv/mythbackend.conf
deleted file mode 100644
index 49bbca877..000000000
--- a/community/mythtv/mythbackend.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) by the MythTV Development Team.
-#
-# Derived from work by:
-#
-#     Michael Thomson <linux at m-thomson dot net>
-#     Stu Tomlinson <stu at nosnilmot dot com>
-#     Axel Thimm <axel.thimm at atrpms dot net>
-# Adopted for ArchLinux:
-#     Jürgen Hoetzel <juergen@archinux.org>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-###############################################################################
-#
-# User who should start the mythbackend process
-#
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can 
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# MBE_USER='root'
-
-#
-# Startup options for mythbackend (see 'mythbackend --help' for a list).
-#
-# MBE_OPTS=''
-
-#
-# Directory holding the mythbackend log file
-#
-# LOG_PATH='/var/log/mythtv'
-
-#
-# Logging options for mythbackend (see 'mythbackend -v help' for a list)
-#
-# LOG_OPTS=''
diff --git a/community/mythtv/mythbackend.rc b/community/mythtv/mythbackend.rc
deleted file mode 100644
index 488b4cb8e..000000000
--- a/community/mythtv/mythbackend.rc
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/profile
-
-###############################################################################
-# Default values to use if none are supplied in the config file.
-#
-# User who should start the mythbackend process
-MBE_USER='mythtv'
-
-# Startup options for mythbackend
-MBE_OPTS=''
-
-# Directory holding the mythbackend log file
-LOG_PATH='/var/log/mythtv'
-
-# Logging options for mythbackend
-LOG_OPTS=''
-###############################################################################
-
-CONFIG_FILE=/etc/conf.d/mythbackend
-PIDFILE=/var/run/mythbackend.pid
-
-if [[ -r "$CONFIG_FILE" ]]; then
-  . "$CONFIG_FILE"
-fi
-
-PID="$(cat "$PIDFILE" 2> /dev/null || pidof mythbackend)"
-export HOME="$(getent passwd "$MBE_USER" | cut -d : -f 6)"
-
-case "$1" in
-  start)
-    stat_busy "Starting MythTV Backend"
-
-    if [[ "$PID" -gt 0 ]] && kill -0 "$PID"; then
-      stat_fail
-      exit 0
-    fi
-
-    touch "$PIDFILE"
-    chown "$MBE_USER" "$PIDFILE" "$LOG_PATH"
-
-    MBE_CMD="/usr/bin/mythbackend --daemon \
-                                  --logpath "$LOG_PATH" $LOG_OPTS \
-                                  --pidfile "$PIDFILE" $MBE_OPTS"
-    if su "$MBE_USER" -c "$MBE_CMD"; then
-      add_daemon mythbackend
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping MythTV Backend"
-    if [[ "$PID" -gt 0 ]] && kill "$PID" &> /dev/null; then
-      rm_daemon mythbackend
-      stat_done
-      rm -f "$PIDFILE"
-    else
-      stat_fail
-    fi
-    ;;
-  restart)
-    "$0" stop
-    "$0" start
-    ;;
-  *)
-    echo "usage: $0 (start|stop|restart)"
-    ;;
-esac
-exit 0
diff --git a/community/mythtv/mythtv_0.25_gcc_4.7.patch b/community/mythtv/mythtv_0.25_gcc_4.7.patch
deleted file mode 100644
index 83c8244a0..000000000
--- a/community/mythtv/mythtv_0.25_gcc_4.7.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-*** a/libs/libmythbase/compat.h		2012-03-31 20:52:30.430461503 -0400
---- b/libs/libmythbase/compat.h		2012-03-31 20:59:05.935585911 -0400
-***************
-*** 44,49 ****
---- 44,51 ----
-  # include <sys/resource.h> // for setpriority
-  # include <sys/socket.h>
-  # include <sys/wait.h>     // For WIFEXITED on Mac OS X
-+ # include <stdio.h>        // for snprintf(), used by inline dlerror()
-+ # include <unistd.h>       // for usleep()
-  #endif
-  
-  #ifdef USING_MINGW
-*** a/libs/libmyth/rssparse.h		2012-03-31 20:52:30.427453729 -0400
---- b/libs/libmyth/rssparse.h		2012-03-31 21:51:11.687438044 -0400
-***************
-*** 13,18 ****
---- 13,19 ----
-  #include <QPair>
-  #include <QMap>
-  #include <QVariant>
-+ #include <sys/types.h>
-  
-  #include "mythexp.h"
-  
-*** a/libs/libmythtv/audioinput.h	2012-03-31 22:41:55.626923063 -0400
---- b/libs/libmythtv/audioinput.h	2012-03-31 22:41:22.478248297 -0400
-***************
-*** 22,27 ****
---- 22,28 ----
-  #define _AUDIOINPUT_H_
-  
-  #include <QString>
-+ #include <unistd.h>
-  
-  class AudioInput
-  {
-*** a/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c	2012-03-31 20:52:29.923150437 -0400
---- b/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c	2012-03-31 21:58:48.422270780 -0400
-***************
-*** 398,404 ****
-              "2:                         \n\t"\
-              \
-              : "+a"(src), "+c"(dst)\
-!             : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
-              : "memory"\
-          );\
-          src += 4-(h+5)*srcStride;\
---- 398,404 ----
-              "2:                         \n\t"\
-              \
-              : "+a"(src), "+c"(dst)\
-!             : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
-              : "memory"\
-          );\
-          src += 4-(h+5)*srcStride;\
-***************
-*** 446,452 ****
-              QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
-              "2:                     \n\t"\
-              : "+a"(src)\
-!             : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\
-              : "memory"\
-              );\
-          tmp += 4;\
---- 446,452 ----
-              QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
-              "2:                     \n\t"\
-              : "+a"(src)\
-!             : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\
-              : "memory"\
-              );\
-          tmp += 4;\
-***************
-*** 823,829 ****
-          "2:                          \n\t"\
-          \
-          : "+a"(src), "+c"(dst)\
-!         : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
-          : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
-                         "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
-            "memory"\
---- 823,829 ----
-          "2:                          \n\t"\
-          \
-          : "+a"(src), "+c"(dst)\
-!         : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
-          : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
-                         "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
-            "memory"\
-***************
-*** 878,884 ****
-              QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
-              "2:                         \n\t"
-              : "+a"(src)
-!             : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)
-              : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
-                             "%xmm4", "%xmm5", "%xmm6", "%xmm7",)
-                "memory"
---- 878,884 ----
-              QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
-              "2:                         \n\t"
-              : "+a"(src)
-!             : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)
-              : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
-                             "%xmm4", "%xmm5", "%xmm6", "%xmm7",)
-                "memory"
diff --git a/community/nautilus-sound-converter/PKGBUILD b/community/nautilus-sound-converter/PKGBUILD
deleted file mode 100644
index 00157594d..000000000
--- a/community/nautilus-sound-converter/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 79481 2012-11-06 03:41:36Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=nautilus-sound-converter
-pkgver=3.0.2
-pkgrel=2
-pkgdesc="Nautilus extension to convert audio files formats"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/nautilus-sound-converter/"
-license=('GPL')
-depends=('nautilus' 'libgnome-media-profiles')
-makedepends=('intltool')
-optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
-            'gstreamer0.10-ugly-plugins: Extra media codecs'
-            'gstreamer0.10-bad-plugins: Extra media codecs'
-            'gstreamer0.10-ffmpeg: Extra media codecs')
-conflicts=('totem>=3.6.0')
-options=('!libtool')
-install=$pkgname.install
-source=(http://nautilus-sound-converter.googlecode.com/files/$pkgname-$pkgver.tar.xz)
-sha1sums=('f0799af3c7f14e2cd4cf70499d9bde07ec4ab89d')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-install \
-              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community/nautilus-sound-converter/nautilus-sound-converter.install b/community/nautilus-sound-converter/nautilus-sound-converter.install
deleted file mode 100644
index d2da24898..000000000
--- a/community/nautilus-sound-converter/nautilus-sound-converter.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=nautilus-sound-converter
-
-post_install() {
-  gconfpkg --install $pkgname
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD
index 62e927ec3..ed01dd9fa 100644
--- a/community/nbd/PKGBUILD
+++ b/community/nbd/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 74302 2012-07-24 10:33:15Z svenstaro $
+# $Id: PKGBUILD 88083 2013-04-11 08:51:54Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Christian Hesse <mail@eworm.de>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
 
 pkgname=nbd
-pkgver=3.2
-pkgrel=3
+pkgver=3.3
+pkgrel=1
 pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://nbd.sourceforge.net"
@@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
 backup=('etc/nbd-server/config')
 depends=('glib2')
 install=nbd.install
-md5sums=('9cafce4ecfb55e670d7ded4c8f4e6bc9'
+md5sums=('cde8fe6e870b8a7459f12e5dcf572d86'
          '2d05d426b8c2708d5f8a0d028fcbae05'
          'e7b13a8b3369e11927d9917664557efa'
          '5d1acc143018117174f79eff15afa038')
diff --git a/community/ncrack/PKGBUILD b/community/ncrack/PKGBUILD
index 09e369a4d..4b3977436 100644
--- a/community/ncrack/PKGBUILD
+++ b/community/ncrack/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.4a
 _realver=0.4ALPHA
 pkgrel=2
 pkgdesc='A high-speed network authentication cracking tool'
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url='http://nmap.org/ncrack/'
 license=(GPL)
 depends=(openssl)
diff --git a/community/ndisc6/PKGBUILD b/community/ndisc6/PKGBUILD
index a84eac204..f7f2b94d5 100644
--- a/community/ndisc6/PKGBUILD
+++ b/community/ndisc6/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82792 2013-01-24 13:20:12Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# $Id: PKGBUILD 86933 2013-03-25 01:19:53Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: Chris Brannon <chris@the-brannons.com>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
 
 pkgname=ndisc6
 pkgver=1.0.2
-pkgrel=5
+pkgrel=6
 pkgdesc='Collection of IPv6 networking utilities'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.remlab.net/ndisc6/'
diff --git a/community/ndisc6/ndisc6.install b/community/ndisc6/ndisc6.install
index 7d917ca19..fb1d5c926 100644
--- a/community/ndisc6/ndisc6.install
+++ b/community/ndisc6/ndisc6.install
@@ -2,7 +2,7 @@
 
 # arg 1:  the new package version
 post_install() {
-  systemd-tmpfiles --create usr/lib/tmpfiles.d/ndisc6.conf
+  systemd-tmpfiles --create ndisc6.conf
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ndisc6/rdnssd.confd b/community/ndisc6/rdnssd.confd
deleted file mode 100644
index 306c3d7f6..000000000
--- a/community/ndisc6/rdnssd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# This default merge hook adds IPv6 DNS resolvers
-# before the existing IPv4 ones in /etc/resolv.conf.
-MERGEHOOK="/etc/rdnssd/merge-hook"
-
-# User who runs rdnssd.
-RUN_AS="nobody"
-
diff --git a/community/ndisc6/rdnssd.rc.d b/community/ndisc6/rdnssd.rc.d
deleted file mode 100644
index 3c0a6a53c..000000000
--- a/community/ndisc6/rdnssd.rc.d
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/rdnssd
-
-PIDFILE="/var/run/rdnssd.pid"
-PID=`cat "$PIDFILE" 2>/dev/null`
-case "$1" in
-  start)
-    stat_busy "Starting RDNSS Daemon"
-    if [ ! -z "$PID" -a -e "/proc/$PID" ]; then
-      stat_append "-- Already running"
-      stat_die
-    else
-      /usr/sbin/rdnssd -p "$PIDFILE"    \
-        ${MERGEHOOK/*/-H}  "$MERGEHOOK" \
-        ${RUN_AS/*/-u}     "$RUN_AS"
-
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon rdnssd
-        stat_done
-      fi
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping RDNSS Daemon"
-    if [ -z "$PID" ]; then
-      stat_append "-- Not running"
-      stat_die
-    else
-      kill $PID &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon sshd
-        stat_done
-      fi
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/ndiswrapper/PKGBUILD b/community/ndiswrapper/PKGBUILD
deleted file mode 100644
index 873b2ab9b..000000000
--- a/community/ndiswrapper/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 79177 2012-10-31 07:25:04Z tpowa $
-# Maintainer:  Thorsten Töpper <atsutane-tu@freethoughts.de>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-_extramodules=extramodules-3.6-ARCH
-pkgname=ndiswrapper
-pkgver=1.57
-pkgrel=26
-pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors."
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://ndiswrapper.sourceforge.net"
-install=ndiswrapper.install
-depends=('linux>=3.6' 'linux<3.7' 'wireless_tools' 'perl')
-makedepends=('linux-headers')
-provides=("$pkgname-utils" "$pkgname-bin")
-replaces=("$pkgname-utils" "$pkgname-bin")
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-        "linux33.patch")
-options=('!strip')
-md5sums=('7a401dc540938bf07893c67f418b6152'
-         '061e59a934ca3ae4be55a86d86b2c1f5')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  _kver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
-  # modinfo path fix
-  sed -i "/modinfo/s/s/usr\//" driver/Makefile
-  patch -i "$srcdir/linux33.patch" -N -p0
-
-  # make sure we point to the right build directory
-  sed -i "/^KBUILD/ s,.*,KBUILD = $(readlink -f /usr/lib/modules/$_kver/build)," driver/Makefile
-
-  make KVERS=$_kver
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  _kver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
-  make INST_DIR="usr/lib/modules/$_extramodules" \
-    KVERS=$_kver DESTDIR="$pkgdir/" install
-
-  gzip "$pkgdir/usr/lib/modules/$_extramodules/$pkgname.ko"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/ndiswrapper/linux33.patch b/community/ndiswrapper/linux33.patch
deleted file mode 100644
index 3998c8450..000000000
--- a/community/ndiswrapper/linux33.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- driver/ndis.c	2011-12-31 21:30:16.000000000 +0100
-+++ driver/ndis.c.new	2012-04-08 11:14:16.746614153 +0200
-@@ -2654,9 +2654,15 @@
- 	(ULONG *idle, ULONG *kernel_user, ULONG *index)
- {
- 	int cpu = smp_processor_id();
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
-+	*idle = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE];
-+	*kernel_user = kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM] +
-+	 kcpustat_cpu(cpu).cpustat[CPUTIME_USER];
-+#else
- 	*idle = kstat_cpu(cpu).cpustat.idle;
- 	*kernel_user = kstat_cpu(cpu).cpustat.system +
- 		kstat_cpu(cpu).cpustat.user;
-+#endif
- 	*index = cpu;
- }
- 
---- driver/wrapndis.c	2011-12-31 21:30:16.000000000 +0100
-+++ driver/wrapndis.c.new	2012-04-08 11:13:00.574116936 +0200
-@@ -1684,6 +1684,7 @@
- 		return 0;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
- static u32 ndis_get_rx_csum(struct net_device *dev)
- {
- 	struct ndis_device *wnd = netdev_priv(dev);
-@@ -1735,18 +1736,21 @@
- 	else
- 		return -EOPNOTSUPP;
- }
-+#endif
- 
- static struct ethtool_ops ndis_ethtool_ops = {
- 	.get_drvinfo	= ndis_get_drvinfo,
- 	.get_link	= ndis_get_link,
- 	.get_wol	= ndis_get_wol,
- 	.set_wol	= ndis_set_wol,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
- 	.get_tx_csum	= ndis_get_tx_csum,
- 	.get_rx_csum	= ndis_get_rx_csum,
- 	.set_tx_csum	= ndis_set_tx_csum,
- 	.set_rx_csum	= ndis_set_rx_csum,
- 	.get_sg		= ndis_get_sg,
- 	.set_sg		= ndis_set_sg,
-+#endif
- };
- 
- static int notifier_event(struct notifier_block *notifier, unsigned long event,
diff --git a/community/ndiswrapper/ndiswrapper.install b/community/ndiswrapper/ndiswrapper.install
deleted file mode 100644
index ef505811a..000000000
--- a/community/ndiswrapper/ndiswrapper.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install()
-{
-  post_upgrade
-}
-
-post_upgrade()
-{
-  EXTRAMODULES='extramodules-3.6-ARCH'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove()
-{
-  post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD
index 64fce4172..77ac92c0c 100644
--- a/community/nemiver/PKGBUILD
+++ b/community/nemiver/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 82907 2013-01-25 12:43:46Z arodseth $
+# $Id: PKGBUILD 89588 2013-04-30 08:28:34Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: jordz <jordz@archlinux.us>
 
 pkgname=nemiver
 pkgver=0.9.4
-pkgrel=1
+pkgrel=3
 pkgdesc='C/C++ debugger for GNOME'
 arch=('x86_64' 'i686' 'mips64el')
 license=('GPL')
 url='http://www.gnome.org/projects/nemiver/'
-depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'dconf' 'gsettings-desktop-schemas' 'itstool')
-makedepends=('boost' 'intltool' 'gnome-doc-utils')
-install=nemiver.install
+install="$pkgname.install"
+depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'dconf' 'gsettings-desktop-schemas')
+makedepends=('boost' 'intltool' 'itstool')
 source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz")
 options=('!libtool' '!emptydirs')
 sha256sums=('12cc5b6092ba720f2524f59928bee4d736e5e5ffeeffb6fd06f99695f17d683f')
@@ -28,8 +28,8 @@ build() {
     --disable-scrollkeeper \
     --enable-symsvis=yes \
     --enable-memoryview=yes \
-    --disable-schemas-compile \
     --enable-gsettings=yes
+#    --disable-schemas-compile \
   make
 }
 
diff --git a/community/nemiver/nemiver.install b/community/nemiver/nemiver.install
index f6a1886e7..aabb4b360 100644
--- a/community/nemiver/nemiver.install
+++ b/community/nemiver/nemiver.install
@@ -1,15 +1,14 @@
-post_upgrade() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  #update-desktop-database -q
-  #gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
-post_install() {
-  post_upgrade
+post_upgrade() {
+  post_install
 }
 
 post_remove() {
-  post_upgrade
+  post_install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/nemo-fileroller/PKGBUILD b/community/nemo-fileroller/PKGBUILD
new file mode 100644
index 000000000..bb60a9a42
--- /dev/null
+++ b/community/nemo-fileroller/PKGBUILD
@@ -0,0 +1,41 @@
+
+# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
+# Contributor: twa022 <twa022 at gmail dot com>
+
+pkgname=nemo-fileroller
+pkgver=1.7.1
+pkgrel=1
+pkgdesc="Nemo fileroller extension"
+arch=('i686' 'x86_64' 'mips64el')
+url="https://github.com/linuxmint/nemo-extensions"
+license=('GPL')
+source=("configure.in_fix.patch"
+        "$pkgname-$pkgver.tar.gz::http://github.com/linuxmint/nemo-extensions/archive/master.tar.gz")
+
+depends=('nemo' 'file-roller')
+options=('!libtool' '!emptydirs')
+
+sha256sums=('3381a3421b2fd69746b610cfa3dfeb83d4795076ec692fcf28bcccf69bfe36d0'
+            'b15f7cd536f595acd070cdff5b9c5c59df44bbc7bf91a1fd560702875b0f3669')
+
+
+build() {
+
+  
+  cd nemo-extensions-master/${pkgname}
+
+  ## I think they started with the nemo-dropbox source, so there
+  ## are some unnecessary python dependencies
+  patch -uNp2 -r- -i ${srcdir}/configure.in_fix.patch
+  autoreconf -fi
+  
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd nemo-extensions-master/${pkgname}
+  make DESTDIR="${pkgdir}" install
+}
+
+
diff --git a/community/nemo-fileroller/configure.in_fix.patch b/community/nemo-fileroller/configure.in_fix.patch
new file mode 100644
index 000000000..898c0abce
--- /dev/null
+++ b/community/nemo-fileroller/configure.in_fix.patch
@@ -0,0 +1,39 @@
+diff -Naur nemo-fileroller.orig/configure.in nemo-fileroller/configure.in
+--- ./nemo-fileroller.orig/configure.in	2012-10-28 16:48:29.000000000 +0100
++++ ./nemo-fileroller/configure.in	2013-02-19 09:03:34.009486606 +0100
+@@ -6,7 +6,7 @@
+ 
+ AC_PREFIX_DEFAULT(/usr)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ # not ready for i18n yet
+ #AC_PROG_INTLTOOL([0.29])
+@@ -29,10 +29,10 @@
+ PKG_CHECK_MODULES(NEMO, libnemo-extension >= $NEMO_REQUIRED)
+ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+ 
+-AC_PATH_PROG([PYTHON], [python])
++#AC_PATH_PROG([PYTHON], [python])
+ 
+-AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
+-AC_SUBST(RST2MAN)
++#AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
++#AC_SUBST(RST2MAN)
+ 
+ # define module checking macro
+ AC_DEFUN([PYTHON_CHECK_MODULE], [
+@@ -55,9 +55,9 @@
+ fi
+ ])
+ 
+-PYTHON_CHECK_MODULE(pygtk, gtk)
+-PYTHON_CHECK_MODULE(gobject, gobject)
+-PYTHON_CHECK_MODULE(docutils, docutils)
++#PYTHON_CHECK_MODULE(pygtk, gtk)
++#PYTHON_CHECK_MODULE(gobject, gobject)
++#PYTHON_CHECK_MODULE(docutils, docutils)
+ 
+ # Make dependency CFLAGS and LIBS available
+ AC_SUBST(NEMO_CFLAGS)
diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD
new file mode 100644
index 000000000..804efe07b
--- /dev/null
+++ b/community/nemo/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 89860 2013-05-03 19:19:27Z faidoc $
+# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
+# Contributor: Ner0
+
+pkgname=nemo
+pkgver=1.7.6
+pkgrel=1
+pkgdesc="Cinnamon file manager (Nautilus fork)"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxmint/nemo"
+license=('GPL')
+depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
+         'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql')
+makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common')
+optdepends=('gksu: Open as Root')
+options=('!emptydirs' '!libtool')
+install=nemo.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
+        "tracker-0.16.patch"
+        "remove-desktop-background.patch")
+sha256sums=('670faa09fff6b2919231bbe6c580363c4cd0a7c87fc5324570083ed8955db9c8'
+            '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626'
+            '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5')
+
+build() {
+  cd linuxmint-nemo-*
+
+  # Python2 fix
+  sed -i 's/bin\/python/bin\/python2/g' files/usr/share/nemo/actions/myaction.py
+
+  # https://github.com/linuxmint/nemo/pull/258
+  patch -Np1 -i ../tracker-0.16.patch
+
+  # https://github.com/linuxmint/nemo/pull/263
+  patch -Np1 -i ../remove-desktop-background.patch
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --libexecdir=/usr/lib/nemo \
+      --disable-update-mimedb \
+      --disable-packagekit \
+      --disable-gtk-doc-html \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd linuxmint-nemo-*
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/nemo/nemo.install b/community/nemo/nemo.install
new file mode 100644
index 000000000..da632ed5c
--- /dev/null
+++ b/community/nemo/nemo.install
@@ -0,0 +1,14 @@
+post_install() {
+  glib-compile-schemas --allow-any-name usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+  update-mime-database usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+post_remove() {
+  post_install "$1"
+}
diff --git a/community/nemo/remove-desktop-background.patch b/community/nemo/remove-desktop-background.patch
new file mode 100644
index 000000000..0301cc820
--- /dev/null
+++ b/community/nemo/remove-desktop-background.patch
@@ -0,0 +1,1050 @@
+From 5f82ebba474f6c1068a21f51ded2b0e26869ecaf Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 15 Apr 2013 18:44:35 -0400
+Subject: [PATCH 1/6] Don't render the background.  Need to fix selected icon
+ style
+
+---
+ src/nemo-desktop-icon-view.c | 18 +++---------------
+ src/nemo-desktop-window.c    | 15 ++++++++++++++-
+ 2 files changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/src/nemo-desktop-icon-view.c b/src/nemo-desktop-icon-view.c
+index b903c5b..37cd8cb 100644
+--- a/src/nemo-desktop-icon-view.c
++++ b/src/nemo-desktop-icon-view.c
+@@ -243,16 +243,6 @@ struct NemoDesktopIconViewDetails
+ static void
+ real_begin_loading (NemoView *object)
+ {
+-	NemoIconContainer *icon_container;
+-	NemoDesktopIconView *view;
+-
+-	view = NEMO_DESKTOP_ICON_VIEW (object);
+-
+-	icon_container = get_icon_container (view);
+-	if (view->details->background == NULL) {
+-		view->details->background = nemo_desktop_background_new (icon_container);
+-	}
+-
+ 	NEMO_VIEW_CLASS (nemo_desktop_icon_view_parent_class)->begin_loading (object);
+ }
+ 
+@@ -298,11 +288,6 @@ struct NemoDesktopIconViewDetails
+ 					      nemo_view_update_menus,
+ 					      icon_view);
+ 
+-	if (icon_view->details->background != NULL) {
+-		g_object_unref (icon_view->details->background);
+-		icon_view->details->background = NULL;
+-	}
+-
+ 	G_OBJECT_CLASS (nemo_desktop_icon_view_parent_class)->dispose (object);
+ }
+ 
+@@ -652,6 +637,9 @@ struct NemoDesktopIconViewDetails
+ 				  G_CALLBACK (nemo_view_update_menus),
+ 				  desktop_icon_view);
+ 
++    GdkRGBA transparent = { 0, 0, 0, 0 };
++    gtk_widget_override_background_color (GTK_WIDGET (icon_container), GTK_STATE_FLAG_NORMAL, &transparent);
++
+     have_cinnamon_settings = g_find_program_in_path ("cinnamon-settings") != NULL;
+ }
+ 
+diff --git a/src/nemo-desktop-window.c b/src/nemo-desktop-window.c
+index 9c80c62..2d5c4e8 100644
+--- a/src/nemo-desktop-window.c
++++ b/src/nemo-desktop-window.c
+@@ -97,6 +97,7 @@ struct NemoDesktopWindowDetails {
+ 	g_signal_connect_swapped (nemo_preferences, "changed::" NEMO_PREFERENCES_DESKTOP_IS_HOME_DIR,
+ 				  G_CALLBACK (nemo_desktop_window_update_directory),
+ 				  window);
++
+ }
+ 
+ static void
+@@ -189,6 +190,12 @@ struct NemoDesktopWindowDetails {
+ 	/* Chain up to realize our children */
+ 	GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)->map (widget);
+ 	gdk_window_lower (gtk_widget_get_window (widget));
++
++    GdkWindow *window;
++    GdkRGBA transparent = { 0, 0, 0, 0 };
++
++    window = gtk_widget_get_window (widget);
++    gdk_window_set_background_rgba (window, &transparent);
+ }
+ 
+ static void
+@@ -254,6 +261,7 @@ struct NemoDesktopWindowDetails {
+ {
+ 	NemoDesktopWindow *window;
+ 	NemoDesktopWindowDetails *details;
++    GdkVisual *visual;
+ 
+ 	window = NEMO_DESKTOP_WINDOW (widget);
+ 	details = window->details;
+@@ -261,7 +269,12 @@ struct NemoDesktopWindowDetails {
+ 	/* Make sure we get keyboard events */
+ 	gtk_widget_set_events (widget, gtk_widget_get_events (widget) 
+ 			      | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
+-			      
++
++    visual = gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget));
++    if (visual) {
++        gtk_widget_set_visual (widget, visual);
++    }
++
+ 	/* Do the work of realizing. */
+ 	GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)->realize (widget);
+ 
+-- 
+1.8.1.6
+
+
+From 6b013acb8f0ad855d042d0e8d51350c539a37c21 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 15 Apr 2013 20:03:03 -0400
+Subject: [PATCH 2/6] Remove nemo-desktop-background, the desktop window makes
+ a transparent background and just uses the existing rendered background from
+ muffin/g-s-d
+
+---
+ libnemo-private/Makefile.am               |   2 -
+ libnemo-private/nemo-desktop-background.c | 578 ------------------------------
+ libnemo-private/nemo-desktop-background.h |  65 ----
+ src/nemo-desktop-icon-view.c              |  26 +-
+ 4 files changed, 13 insertions(+), 658 deletions(-)
+ delete mode 100644 libnemo-private/nemo-desktop-background.c
+ delete mode 100644 libnemo-private/nemo-desktop-background.h
+
+diff --git a/libnemo-private/Makefile.am b/libnemo-private/Makefile.am
+index 3b46318..5fd797c 100644
+--- a/libnemo-private/Makefile.am
++++ b/libnemo-private/Makefile.am
+@@ -81,8 +81,6 @@ libnemo_private_la_SOURCES = \
+ 	nemo-debug.h \
+ 	nemo-default-file-icon.c \
+ 	nemo-default-file-icon.h \
+-	nemo-desktop-background.c \
+-	nemo-desktop-background.h \
+ 	nemo-desktop-directory-file.c \
+ 	nemo-desktop-directory-file.h \
+ 	nemo-desktop-directory.c \
+diff --git a/libnemo-private/nemo-desktop-background.c b/libnemo-private/nemo-desktop-background.c
+deleted file mode 100644
+index f8dc979..0000000
+--- a/libnemo-private/nemo-desktop-background.c
++++ /dev/null
+@@ -1,578 +0,0 @@
+-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+-
+-/*
+- * nemo-desktop-background.c: Helper object to handle desktop background
+- *                                changes.
+- *
+- * Copyright (C) 2000 Eazel, Inc.
+- * Copyright (C) 2010 Cosimo Cecchi <cosimoc@gnome.org>
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License as
+- * published by the Free Software Foundation; either version 2 of the
+- * License, or (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public
+- * License along with this program; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
+- * Boston, MA 02110-1335, USA.
+- *
+- * Authors: Darin Adler <darin@bentspoon.com>
+- *          Cosimo Cecchi <cosimoc@gnome.org>
+- */
+-
+-#include <config.h>
+-
+-#include "nemo-desktop-background.h"
+-
+-#include <eel/eel-gdk-extensions.h>
+-#include <eel/eel-gtk-extensions.h>
+-
+-#include "nemo-global-preferences.h"
+-
+-#define GNOME_DESKTOP_USE_UNSTABLE_API
+-#include <libgnome-desktop/gnome-bg.h>
+-#include <gdesktop-enums.h>
+-
+-#include <gtk/gtk.h>
+-#include <string.h>
+-
+-static void init_fade (NemoDesktopBackground *self);
+-static void free_fade (NemoDesktopBackground *self);
+-static void queue_background_change (NemoDesktopBackground *self);
+-
+-static NemoDesktopBackground *singleton = NULL;
+-
+-G_DEFINE_TYPE (NemoDesktopBackground, nemo_desktop_background, G_TYPE_OBJECT);
+-
+-enum {
+-        PROP_WIDGET = 1,
+-        NUM_PROPERTIES,
+-};
+-
+-struct NemoDesktopBackgroundDetails {
+-
+-	GtkWidget *widget;
+-        GnomeBG *bg;
+-
+-	/* Realized data: */
+-	cairo_surface_t *background_surface;
+-	GnomeBGCrossfade *fade;
+-	int background_entire_width;
+-	int background_entire_height;
+-	GdkColor default_color;
+-
+-	/* Desktop screen size watcher */
+-	gulong screen_size_handler;
+-	/* Desktop monitors configuration watcher */
+-	gulong screen_monitors_handler;
+-	guint change_idle_id;
+-};
+-
+-
+-static gboolean
+-background_settings_change_event_cb (GSettings *settings,
+-                                     gpointer   keys,
+-                                     gint       n_keys,
+-                                     gpointer   user_data);
+-
+-
+-static void
+-free_fade (NemoDesktopBackground *self)
+-{
+-	if (self->details->fade != NULL) {
+-		g_object_unref (self->details->fade);
+-		self->details->fade = NULL;
+-	}
+-}
+-
+-static void
+-free_background_surface (NemoDesktopBackground *self)
+-{
+-	cairo_surface_t *surface;
+-
+-	surface = self->details->background_surface;
+-	if (surface != NULL) {
+-		cairo_surface_destroy (surface);
+-		self->details->background_surface = NULL;
+-	}
+-}
+-
+-static void
+-nemo_desktop_background_finalize (GObject *object)
+-{
+-	NemoDesktopBackground *self;
+-
+-	self = NEMO_DESKTOP_BACKGROUND (object);
+-
+-	g_signal_handlers_disconnect_by_func (gnome_background_preferences,
+-					      background_settings_change_event_cb,
+-					      self);
+-
+-	free_background_surface (self);
+-	free_fade (self);
+-
+-	g_clear_object (&self->details->bg);
+-
+-	G_OBJECT_CLASS (nemo_desktop_background_parent_class)->finalize (object);
+-}
+-
+-static void
+-nemo_desktop_background_unrealize (NemoDesktopBackground *self)
+-{
+-	free_background_surface (self);
+-
+-	self->details->background_entire_width = 0;
+-	self->details->background_entire_height = 0;
+-	self->details->default_color.red = 0xffff;
+-	self->details->default_color.green = 0xffff;
+-	self->details->default_color.blue = 0xffff;
+-}
+-
+-static void
+-nemo_desktop_background_set_image_uri (NemoDesktopBackground *self,
+-                                           const char *image_uri)
+-{
+-	char *filename;
+-
+-	if (image_uri != NULL) {
+-		filename = g_filename_from_uri (image_uri, NULL, NULL);
+-	}
+-	else {
+-		filename = NULL;
+-	}
+-
+-	gnome_bg_set_filename (self->details->bg, filename);
+-
+-	g_free (filename);
+-}
+-
+-static void
+-init_fade (NemoDesktopBackground *self)
+-{
+-	GtkWidget *widget;
+-	gboolean do_fade;
+-
+-	widget = self->details->widget;
+-
+-	if (widget == NULL || !gtk_widget_get_realized (widget))
+-		return;
+-
+-	do_fade = g_settings_get_boolean (nemo_desktop_preferences,
+-					  NEMO_PREFERENCES_DESKTOP_BACKGROUND_FADE);
+-
+-	if (!do_fade) {
+-		return;
+-	}
+-
+-	if (self->details->fade == NULL) {
+-		GdkWindow *window;
+-		GdkScreen *screen;
+-		int old_width, old_height, width, height;
+-
+-		/* If this was the result of a screen size change,
+-		 * we don't want to crossfade
+-		 */
+-		window = gtk_widget_get_window (widget);
+-		old_width = gdk_window_get_width (window);
+-		old_height = gdk_window_get_height (window);
+-
+-		screen = gtk_widget_get_screen (widget);
+-		width = gdk_screen_get_width (screen);
+-		height = gdk_screen_get_height (screen);
+-
+-		if (old_width == width && old_height == height) {
+-			self->details->fade = gnome_bg_crossfade_new (width, height);
+-			g_signal_connect_swapped (self->details->fade,
+-                                                  "finished",
+-                                                  G_CALLBACK (free_fade),
+-                                                  self);
+-		}
+-	}
+-
+-	if (self->details->fade != NULL && !gnome_bg_crossfade_is_started (self->details->fade)) {
+-		cairo_surface_t *start_surface;
+-
+-		if (self->details->background_surface == NULL) {
+-			start_surface = gnome_bg_get_surface_from_root (gtk_widget_get_screen (widget));
+-		} else {
+-			start_surface = cairo_surface_reference (self->details->background_surface);
+-		}
+-		gnome_bg_crossfade_set_start_surface (self->details->fade,
+-						      start_surface);
+-                cairo_surface_destroy (start_surface);
+-	}
+-}
+-
+-static void
+-screen_size_changed (GdkScreen *screen,
+-                     NemoDesktopBackground *self)
+-{
+-	queue_background_change (self);
+-}
+-
+-static gboolean
+-nemo_desktop_background_ensure_realized (NemoDesktopBackground *self)
+-{
+-	int entire_width;
+-	int entire_height;
+-	GdkScreen *screen;
+-	GdkWindow *window;
+-
+-	screen = gtk_widget_get_screen (self->details->widget);
+-	entire_height = gdk_screen_get_height (screen);
+-	entire_width = gdk_screen_get_width (screen);
+-
+-	/* If the window size is the same as last time, don't update */
+-	if (entire_width == self->details->background_entire_width &&
+-	    entire_height == self->details->background_entire_height) {
+-		return FALSE;
+-	}
+-
+-	free_background_surface (self);
+-
+-	window = gtk_widget_get_window (self->details->widget);
+-	self->details->background_surface = gnome_bg_create_surface (self->details->bg,
+-                                                                     window,
+-                                                                     entire_width, entire_height,
+-                                                                     TRUE);
+-
+-	/* We got the surface and everything, so we don't care about a change
+-	   that is pending (unless things actually change after this time) */
+-	g_object_set_data (G_OBJECT (self),
+-			   "ignore-pending-change", GINT_TO_POINTER (TRUE));
+-
+-	self->details->background_entire_width = entire_width;
+-	self->details->background_entire_height = entire_height;
+-
+-	return TRUE;
+-}
+-
+-static void
+-on_fade_finished (GnomeBGCrossfade *fade,
+-		  GdkWindow *window,
+-		  gpointer user_data)
+-{
+-        NemoDesktopBackground *self = user_data;
+-
+-	nemo_desktop_background_ensure_realized (self);
+-	gnome_bg_set_surface_as_root (gdk_window_get_screen (window),
+-                                      self->details->background_surface);
+-}
+-
+-static gboolean
+-fade_to_surface (NemoDesktopBackground *self,
+-		 GdkWindow     *window,
+-		 cairo_surface_t *surface)
+-{
+-	if (self->details->fade == NULL) {
+-		return FALSE;
+-	}
+-
+-	if (!gnome_bg_crossfade_set_end_surface (self->details->fade,
+-				                 surface)) {
+-		return FALSE;
+-	}
+-
+-	if (!gnome_bg_crossfade_is_started (self->details->fade)) {
+-		gnome_bg_crossfade_start (self->details->fade, window);
+-		g_signal_connect (self->details->fade,
+-				  "finished",
+-				  G_CALLBACK (on_fade_finished), self);
+-	}
+-
+-	return gnome_bg_crossfade_is_started (self->details->fade);
+-}
+-
+-static void
+-nemo_desktop_background_set_up_widget (NemoDesktopBackground *self)
+-{
+-	GdkWindow *window;
+-	gboolean in_fade = FALSE;
+-        GtkWidget *widget;
+-
+-        widget = self->details->widget;
+-
+-	if (!gtk_widget_get_realized (widget)) {
+-		return;
+-	}
+-
+-	nemo_desktop_background_ensure_realized (self);
+-        window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
+-
+-	in_fade = fade_to_surface (self, window,
+-				   self->details->background_surface);
+-
+-	if (!in_fade) {
+-		cairo_pattern_t *pattern;
+-
+-		pattern = cairo_pattern_create_for_surface (self->details->background_surface);
+-		gdk_window_set_background_pattern (window, pattern);
+-		cairo_pattern_destroy (pattern);
+-
+-                gnome_bg_set_surface_as_root (gtk_widget_get_screen (widget),
+-                                              self->details->background_surface);
+-	}
+-}
+-
+-static gboolean
+-background_changed_cb (NemoDesktopBackground *self)
+-{
+-	self->details->change_idle_id = 0;
+-
+-	nemo_desktop_background_unrealize (self);
+-	nemo_desktop_background_set_up_widget (self);
+-
+-	gtk_widget_queue_draw (self->details->widget);
+-
+-	return FALSE;
+-}
+-
+-static void
+-queue_background_change (NemoDesktopBackground *self)
+-{
+-	if (self->details->change_idle_id != 0) {
+-                g_source_remove (self->details->change_idle_id);
+-	}
+-
+-	self->details->change_idle_id =
+-                g_idle_add ((GSourceFunc) background_changed_cb, self);
+-}
+-
+-static void
+-nemo_desktop_background_changed (GnomeBG *bg,
+-                                     gpointer user_data)
+-{
+-        NemoDesktopBackground *self;
+-
+-        self = user_data;
+-	init_fade (self);
+-	queue_background_change (self);
+-}
+-
+-static void
+-nemo_desktop_background_transitioned (GnomeBG *bg,
+-                                          gpointer user_data)
+-{
+-        NemoDesktopBackground *self;
+-
+-        self = user_data;
+-	free_fade (self);
+-	queue_background_change (self);
+-}
+-
+-static void
+-widget_realize_cb (GtkWidget *widget,
+-                   gpointer user_data)
+-{
+-	GdkScreen *screen;
+-        NemoDesktopBackground *self = user_data;
+-
+-	screen = gtk_widget_get_screen (widget);
+-
+-	if (self->details->screen_size_handler > 0) {
+-		g_signal_handler_disconnect (screen,
+-					     self->details->screen_size_handler);
+-	}
+-	self->details->screen_size_handler = 
+-		g_signal_connect (screen, "size_changed",
+-				  G_CALLBACK (screen_size_changed), self);
+-
+-	if (self->details->screen_monitors_handler > 0) {
+-		g_signal_handler_disconnect (screen,
+-					     self->details->screen_monitors_handler);
+-	}
+-	self->details->screen_monitors_handler =
+-		g_signal_connect (screen, "monitors-changed",
+-				  G_CALLBACK (screen_size_changed), self);
+-	nemo_desktop_background_set_up_widget (self);
+-}
+-
+-static void
+-widget_unrealize_cb (GtkWidget *widget,
+-                     gpointer user_data)
+-{
+-        NemoDesktopBackground *self = user_data;
+-
+-	if (self->details->screen_size_handler > 0) {
+-		        g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (widget)),
+-				                     self->details->screen_size_handler);
+-			self->details->screen_size_handler = 0;
+-	}
+-	if (self->details->screen_monitors_handler > 0) {
+-		        g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (widget)),
+-				                     self->details->screen_monitors_handler);
+-			self->details->screen_monitors_handler = 0;
+-	}
+-}
+-
+-static void
+-on_widget_destroyed (GtkWidget *widget,
+-                     gpointer user_data)
+-{
+-        NemoDesktopBackground *self = user_data;
+-
+-	if (self->details->change_idle_id != 0) {
+-		g_source_remove (self->details->change_idle_id);
+-		self->details->change_idle_id = 0;
+-	}
+-
+-	free_fade (self);
+-	self->details->widget = NULL;
+-}
+-
+-static gboolean
+-background_change_event_idle_cb (NemoDesktopBackground *self)
+-{
+-	gnome_bg_load_from_preferences (self->details->bg,
+-					gnome_background_preferences);
+-
+-	g_object_unref (self);
+-
+-	return FALSE;
+-}
+-
+-static gboolean
+-background_settings_change_event_cb (GSettings *settings,
+-                                     gpointer   keys,
+-                                     gint       n_keys,
+-                                     gpointer   user_data)
+-{
+-	NemoDesktopBackground *self = user_data;
+-
+-	/* Need to defer signal processing otherwise
+-	 * we would make the dconf backend deadlock.
+-	 */
+-	g_idle_add ((GSourceFunc) background_change_event_idle_cb,
+-		    g_object_ref (self));
+-
+-	return FALSE;
+-}
+-
+-static void
+-nemo_desktop_background_constructed (GObject *obj)
+-{
+-        NemoDesktopBackground *self;
+-        GtkWidget *widget;
+-
+-        self = NEMO_DESKTOP_BACKGROUND (obj);
+-
+-        if (G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructed != NULL) {
+-                G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructed (obj);
+-        }
+-
+-        widget = self->details->widget;
+-
+-        g_assert (widget != NULL);
+-
+- 	g_signal_connect_object (widget, "destroy",
+-                                 G_CALLBACK (on_widget_destroyed), self, 0);
+-	g_signal_connect_object (widget, "realize",
+-				 G_CALLBACK (widget_realize_cb), self, 0);
+-	g_signal_connect_object (widget, "unrealize",
+-				 G_CALLBACK (widget_unrealize_cb), self, 0);
+-
+-        gnome_bg_load_from_preferences (self->details->bg,
+-                                        gnome_background_preferences);
+-
+-        /* Let's receive batch change events instead of every single one */
+-        g_signal_connect (gnome_background_preferences,
+-                          "change-event",
+-                          G_CALLBACK (background_settings_change_event_cb),
+-                          self);
+-
+-	queue_background_change (self);
+-}
+-
+-static void
+-nemo_desktop_background_set_property (GObject *object,
+-                                          guint property_id,
+-                                          const GValue *value,
+-                                          GParamSpec *pspec)
+-{
+-        NemoDesktopBackground *self;
+-
+-        self = NEMO_DESKTOP_BACKGROUND (object);
+-
+-        switch (property_id) {
+-        case PROP_WIDGET:
+-                self->details->widget = g_value_get_object (value);
+-                break;
+-        default:
+-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+-                break;
+-        }
+-}
+-
+-static GObject *
+-nemo_desktop_background_constructor (GType type,
+-                                         guint n_construct_params,
+-                                         GObjectConstructParam *construct_params)
+-{
+-        GObject *retval;
+-
+-        if (singleton != NULL) {
+-                return g_object_ref (singleton);
+-        }
+-
+-        retval = G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructor
+-                (type, n_construct_params, construct_params);
+-
+-        singleton = NEMO_DESKTOP_BACKGROUND (retval);
+-        g_object_add_weak_pointer (retval, (gpointer) &singleton);
+-
+-        return retval;
+-}
+-
+-static void
+-nemo_desktop_background_class_init (NemoDesktopBackgroundClass *klass)
+-{
+-	GObjectClass *object_class;
+-        GParamSpec *pspec;
+-
+-	object_class = G_OBJECT_CLASS (klass);
+-	object_class->finalize = nemo_desktop_background_finalize;
+-        object_class->set_property = nemo_desktop_background_set_property;
+-        object_class->constructor = nemo_desktop_background_constructor;
+-        object_class->constructed = nemo_desktop_background_constructed;
+-
+-        pspec = g_param_spec_object ("widget", "The widget for this background",
+-                                     "The widget that gets its background set",
+-                                     NEMO_TYPE_ICON_CONTAINER,
+-                                     G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+-        g_object_class_install_property (object_class, PROP_WIDGET, pspec);
+-
+-	g_type_class_add_private (klass, sizeof (NemoDesktopBackgroundDetails));
+-}
+-
+-static void
+-nemo_desktop_background_init (NemoDesktopBackground *self)
+-{
+-	self->details =
+-		G_TYPE_INSTANCE_GET_PRIVATE (self,
+-					     NEMO_TYPE_DESKTOP_BACKGROUND,
+-					     NemoDesktopBackgroundDetails);
+-
+-        self->details->bg = gnome_bg_new ();
+-	self->details->default_color.red = 0xffff;
+-	self->details->default_color.green = 0xffff;
+-	self->details->default_color.blue = 0xffff;
+-
+-	g_signal_connect (self->details->bg, "changed",
+-			  G_CALLBACK (nemo_desktop_background_changed), self);
+-	g_signal_connect (self->details->bg, "transitioned",
+-			  G_CALLBACK (nemo_desktop_background_transitioned), self);
+-}
+-
+-NemoDesktopBackground *
+-nemo_desktop_background_new (NemoIconContainer *container)
+-{
+-        return g_object_new (NEMO_TYPE_DESKTOP_BACKGROUND,
+-                             "widget", container,
+-                             NULL);
+-}
+diff --git a/libnemo-private/nemo-desktop-background.h b/libnemo-private/nemo-desktop-background.h
+deleted file mode 100644
+index 8755cb1..0000000
+--- a/libnemo-private/nemo-desktop-background.h
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+-
+-/*
+- * nemo-desktop-background.c: Helper object to handle desktop background
+- *                                changes.
+- *
+- * Copyright (C) 2000 Eazel, Inc.
+- * Copyright (C) 2010 Cosimo Cecchi <cosimoc@gnome.org>
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License as
+- * published by the Free Software Foundation; either version 2 of the
+- * License, or (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public
+- * License along with this program; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
+- * Boston, MA 02110-1335, USA.
+- *
+- * Authors: Darin Adler <darin@bentspoon.com>
+- *          Cosimo Cecchi <cosimoc@gnome.org>
+- */
+-
+-#ifndef __NAUTILIUS_DESKTOP_BACKGROUND_H__
+-#define __NAUTILIUS_DESKTOP_BACKGROUND_H__
+-
+-#include <gtk/gtk.h>
+-
+-#include "nemo-icon-container.h"
+-
+-typedef struct NemoDesktopBackground NemoDesktopBackground;
+-typedef struct NemoDesktopBackgroundClass NemoDesktopBackgroundClass;
+-
+-#define NEMO_TYPE_DESKTOP_BACKGROUND nemo_desktop_background_get_type()
+-#define NEMO_DESKTOP_BACKGROUND(obj) \
+-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackground))
+-#define NEMO_DESKTOP_BACKGROUND_CLASS(klass) \
+-  (G_TYPE_CHECK_CLASS_CAST ((klass), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackgroundClass))
+-#define NEMO_IS_DESKTOP_BACKGROUND(obj) \
+-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NEMO_TYPE_DESKTOP_BACKGROUND))
+-#define NEMO_IS_DESKTOP_BACKGROUND_CLASS(klass) \
+-  (G_TYPE_CHECK_CLASS_TYPE ((klass), NEMO_TYPE_DESKTOP_BACKGROUND))
+-#define NEMO_DESKTOP_BACKGROUND_GET_CLASS(obj) \
+-  (G_TYPE_INSTANCE_GET_CLASS ((obj), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackgroundClass))
+-
+-GType nemo_desktop_background_get_type (void);
+-NemoDesktopBackground * nemo_desktop_background_new (NemoIconContainer *container);
+-
+-typedef struct NemoDesktopBackgroundDetails NemoDesktopBackgroundDetails;
+-
+-struct NemoDesktopBackground {
+-	GObject parent;
+-	NemoDesktopBackgroundDetails *details;
+-};
+-
+-struct NemoDesktopBackgroundClass {
+-	GObjectClass parent_class;
+-};
+-
+-#endif /* __NAUTILIUS_DESKTOP_BACKGROUND_H__ */
+diff --git a/src/nemo-desktop-icon-view.c b/src/nemo-desktop-icon-view.c
+index 37cd8cb..5dec8b5 100644
+--- a/src/nemo-desktop-icon-view.c
++++ b/src/nemo-desktop-icon-view.c
+@@ -41,7 +41,6 @@
+ #include <fcntl.h>
+ #include <gdk/gdkx.h>
+ #include <glib/gi18n.h>
+-#include <libnemo-private/nemo-desktop-background.h>
+ #include <libnemo-private/nemo-desktop-icon-file.h>
+ #include <libnemo-private/nemo-directory-notify.h>
+ #include <libnemo-private/nemo-file-changes-queue.h>
+@@ -76,8 +75,6 @@ struct NemoDesktopIconViewDetails
+ 	gulong delayed_init_signal;
+ 	guint reload_desktop_timeout;
+ 	gboolean pending_rescan;
+-
+-	NemoDesktopBackground *background;
+ };
+ 
+ static void     default_zoom_level_changed                        (gpointer                user_data);
+@@ -240,12 +237,6 @@ struct NemoDesktopIconViewDetails
+ 	return GDK_FILTER_CONTINUE;
+ }
+ 
+-static void
+-real_begin_loading (NemoView *object)
+-{
+-	NEMO_VIEW_CLASS (nemo_desktop_icon_view_parent_class)->begin_loading (object);
+-}
+-
+ static const char *
+ real_get_id (NemoView *view)
+ {
+@@ -300,7 +291,6 @@ struct NemoDesktopIconViewDetails
+ 
+ 	G_OBJECT_CLASS (class)->dispose = nemo_desktop_icon_view_dispose;
+ 
+-	vclass->begin_loading = real_begin_loading;
+ 	vclass->merge_menus = real_merge_menus;
+ 	vclass->update_menus = real_update_menus;
+ 	vclass->get_view_id = real_get_id;
+@@ -428,6 +418,17 @@ struct NemoDesktopIconViewDetails
+ 			       desktop_icon_view);
+ }
+ 
++static void
++desktop_icon_container_realize (GtkWidget *widget,
++                                NemoDesktopIconView *desktop_icon_view)
++{
++    GdkWindow *bin_window;
++    GdkRGBA transparent = { 0, 0, 0, 0 };
++
++    bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
++    gdk_window_set_background_rgba (bin_window, &transparent);
++}
++
+ static NemoZoomLevel
+ get_default_zoom_level (void)
+ {
+@@ -614,6 +615,8 @@ struct NemoDesktopIconViewDetails
+ 
+ 	g_signal_connect_object (icon_container, "middle_click",
+ 				 G_CALLBACK (nemo_desktop_icon_view_handle_middle_click), desktop_icon_view, 0);
++    g_signal_connect_object (icon_container, "realize",
++                 G_CALLBACK (desktop_icon_container_realize), desktop_icon_view, 0);
+ 	g_signal_connect_object (desktop_icon_view, "realize",
+ 				 G_CALLBACK (realized_callback), desktop_icon_view, 0);
+ 	g_signal_connect_object (desktop_icon_view, "unrealize",
+@@ -637,9 +640,6 @@ struct NemoDesktopIconViewDetails
+ 				  G_CALLBACK (nemo_view_update_menus),
+ 				  desktop_icon_view);
+ 
+-    GdkRGBA transparent = { 0, 0, 0, 0 };
+-    gtk_widget_override_background_color (GTK_WIDGET (icon_container), GTK_STATE_FLAG_NORMAL, &transparent);
+-
+     have_cinnamon_settings = g_find_program_in_path ("cinnamon-settings") != NULL;
+ }
+ 
+-- 
+1.8.1.6
+
+
+From b40990397b6fff55878481a806a1b5574e43951f Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 15 Apr 2013 20:14:40 -0400
+Subject: [PATCH 3/6] Forgot an include
+
+---
+ libnemo-private/nemo-icon-dnd.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libnemo-private/nemo-icon-dnd.c b/libnemo-private/nemo-icon-dnd.c
+index 017c6a7..2ed073c 100644
+--- a/libnemo-private/nemo-icon-dnd.c
++++ b/libnemo-private/nemo-icon-dnd.c
+@@ -52,7 +52,6 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ 
+-#include <libnemo-private/nemo-desktop-background.h>
+ #include <libnemo-private/nemo-file-utilities.h>
+ #include <libnemo-private/nemo-file-changes-queue.h>
+ #include <stdio.h>
+-- 
+1.8.1.6
+
+
+From 020d4dc15fa9c0e1303cef7795e45e688ede7726 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Tue, 16 Apr 2013 18:00:01 -0400
+Subject: [PATCH 4/6] Change to use cinnamon background keys
+
+---
+ libnemo-private/nemo-global-preferences.c | 2 +-
+ libnemo-private/nemo-global-preferences.h | 2 +-
+ src/nemo-places-sidebar.c                 | 2 +-
+ src/nemo-view.c                           | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c
+index d3ad20a..336afc3 100644
+--- a/libnemo-private/nemo-global-preferences.c
++++ b/libnemo-private/nemo-global-preferences.c
+@@ -76,7 +76,7 @@
+ 	nemo_desktop_preferences = g_settings_new("org.nemo.desktop");
+ 	nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree");
+ 	gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown");
+-	gnome_background_preferences = g_settings_new("org.gnome.desktop.background");
++	cinnamon_background_preferences = g_settings_new("org.cinnamon.background");
+ 	gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
+ 	gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal");
+ }
+diff --git a/libnemo-private/nemo-global-preferences.h b/libnemo-private/nemo-global-preferences.h
+index 2b9c56a..c1ec61a 100644
+--- a/libnemo-private/nemo-global-preferences.h
++++ b/libnemo-private/nemo-global-preferences.h
+@@ -226,7 +226,7 @@ enum
+ GSettings *nemo_tree_sidebar_preferences;
+ GSettings *nemo_window_state;
+ GSettings *gnome_lockdown_preferences;
+-GSettings *gnome_background_preferences;
++GSettings *cinnamon_background_preferences;
+ GSettings *gnome_media_handling_preferences;
+ GSettings *gnome_terminal_preferences;
+ 
+diff --git a/src/nemo-places-sidebar.c b/src/nemo-places-sidebar.c
+index a0bc4d4..ca32193 100644
+--- a/src/nemo-places-sidebar.c
++++ b/src/nemo-places-sidebar.c
+@@ -3825,7 +3825,7 @@ static void expand_or_collapse_category (NemoPlacesSidebar *sidebar,
+ 					      bookmarks_popup_menu_detach_cb,
+ 					      sidebar);
+ 
+-	g_signal_handlers_disconnect_by_func (gnome_background_preferences,
++	g_signal_handlers_disconnect_by_func (cinnamon_background_preferences,
+ 					      desktop_setting_changed_callback,
+ 					      sidebar);
+ 
+diff --git a/src/nemo-view.c b/src/nemo-view.c
+index ab03b44..3ece32a 100644
+--- a/src/nemo-view.c
++++ b/src/nemo-view.c
+@@ -6945,7 +6945,7 @@ static void slot_changed_pane (NemoWindowSlot *slot,
+ 
+     uri = nemo_file_info_get_uri (file);
+ 
+-    g_settings_set_string (gnome_background_preferences,
++    g_settings_set_string (cinnamon_background_preferences,
+                                     "picture-uri", uri);
+     g_free (uri);
+ }
+-- 
+1.8.1.6
+
+
+From f487954ebce3f564744e9c83b5dd40fa8f8fad6d Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 22 Apr 2013 08:33:41 -0400
+Subject: [PATCH 5/6] Fall back to org.gnome.desktop.background schema when
+ cinnamon is not installed
+
+---
+ libnemo-private/nemo-global-preferences.c | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c
+index 336afc3..7eb04ef 100644
+--- a/libnemo-private/nemo-global-preferences.c
++++ b/libnemo-private/nemo-global-preferences.c
+@@ -76,7 +76,25 @@
+ 	nemo_desktop_preferences = g_settings_new("org.nemo.desktop");
+ 	nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree");
+ 	gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown");
+-	cinnamon_background_preferences = g_settings_new("org.cinnamon.background");
+ 	gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
+ 	gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal");
++
++    const gchar * const *schema_list = g_settings_list_schemas ();
++    int i = 0;
++    gboolean has_cinnamon = FALSE;
++    if (schema_list != NULL) {
++        while (schema_list[i] != NULL) {
++            if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) {
++                has_cinnamon = TRUE;
++                break;
++            }
++            i++;
++        }
++    }
++
++    if (has_cinnamon) {
++        cinnamon_background_preferences = g_settings_new ("org.cinnamon.background");
++    } else {
++        cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background");
++    }
+ }
+-- 
+1.8.1.6
+
+
+From 9739a1b30603868ea6b8b12cf7aeb167be5aea22 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 22 Apr 2013 09:31:49 -0400
+Subject: [PATCH 6/6] simplify schema check
+
+---
+ libnemo-private/nemo-global-preferences.c | 17 +++--------------
+ 1 file changed, 3 insertions(+), 14 deletions(-)
+
+diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c
+index 7eb04ef..0470595 100644
+--- a/libnemo-private/nemo-global-preferences.c
++++ b/libnemo-private/nemo-global-preferences.c
+@@ -79,20 +79,9 @@
+ 	gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
+ 	gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal");
+ 
+-    const gchar * const *schema_list = g_settings_list_schemas ();
+-    int i = 0;
+-    gboolean has_cinnamon = FALSE;
+-    if (schema_list != NULL) {
+-        while (schema_list[i] != NULL) {
+-            if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) {
+-                has_cinnamon = TRUE;
+-                break;
+-            }
+-            i++;
+-        }
+-    }
+-
+-    if (has_cinnamon) {
++    GSettingsSchemaSource *schema_source;
++    schema_source = g_settings_schema_source_get_default();
++    if (g_settings_schema_source_lookup (schema_source, "org.cinnamon.background", FALSE)) {
+         cinnamon_background_preferences = g_settings_new ("org.cinnamon.background");
+     } else {
+         cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background");
+-- 
+1.8.1.6
+
diff --git a/community/nemo/tracker-0.16.patch b/community/nemo/tracker-0.16.patch
new file mode 100644
index 000000000..49964678d
--- /dev/null
+++ b/community/nemo/tracker-0.16.patch
@@ -0,0 +1,33 @@
+From 88459a57ac2fcf06400ade5c6d0189bf1aa2334d Mon Sep 17 00:00:00 2001
+From: Nick Black <nick.black@sprezzatech.com>
+Date: Fri, 12 Apr 2013 17:10:46 -0400
+Subject: [PATCH] build with tracker 0.16
+
+---
+ configure.in | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index ec72f73..21afbe4 100644
+--- a/configure.in
++++ b/configure.in
+@@ -249,11 +249,13 @@ AC_ARG_ENABLE(tracker,
+ 
+ build_tracker=no
+ if test "x$enable_tracker" != "xno"; then
+-  PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14,
++  PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.16,
+                     [build_tracker=yes],
+-                    [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12,
++  		    [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14,
++                    	[build_tracker=yes],
++                    	[PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12,
+ 		                       [build_tracker=yes],
+-                                       [build_tracker=no])])
++                                       [build_tracker=no])])])
+   if test "x$build_tracker" = "xyes"; then
+     AC_DEFINE(ENABLE_TRACKER, 1, [Define to enable Tracker support])
+   fi
+-- 
+1.8.1.5
+
diff --git a/community/nestopia/nestopia b/community/nestopia/nestopia
deleted file mode 100644
index 52bd2b2b3..000000000
--- a/community/nestopia/nestopia
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ ! -e $HOME/.nestopia ]; then
-  echo "Running NEStopia for the first time..."
-  echo "Copying required files to ~/.nestopia..."
-  mkdir $HOME/.nestopia
-  cp /usr/share/nestopia/{nstcontrols,NstDatabase.xml} $HOME/.nestopia/
-fi
-
-nestopia-bin "$@"
diff --git a/community/nestopia/nestopia_bogus_error_on_save_settings.patch b/community/nestopia/nestopia_bogus_error_on_save_settings.patch
deleted file mode 100644
index 63f33bc72..000000000
--- a/community/nestopia/nestopia_bogus_error_on_save_settings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/linux/settings.cpp.old	2008-10-23 05:45:58.000000000 +0200
-+++ source/linux/settings.cpp	2008-12-04 23:17:59.000000000 +0100
-@@ -16,7 +16,7 @@
- using namespace LinuxNst;
- 
- #define READ_SETTING(x) fread(&x, sizeof(x), 1, f)
--#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != sizeof(x)) std::cout << "Error writing setting!\n"
-+#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != 1) std::cout << "Error writing setting!\n"
- 
- static int rates[4] = { 11025, 22050, 44100, 48000 };
- 
diff --git a/community/net6/PKGBUILD b/community/net6/PKGBUILD
index 06dd81737..efdd4dbaf 100644
--- a/community/net6/PKGBUILD
+++ b/community/net6/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 66249 2012-02-23 05:21:03Z spupykin $
+# $Id: PKGBUILD 89936 2013-05-05 21:30:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=net6
-pkgver=1.3.12
-pkgrel=3.1
+pkgver=1.3.14
+pkgrel=1
 pkgdesc="A library that provides a TCP protocol abstraction for C++"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gobby.0x539.de/"
 license=('LGPL')
 depends=('gnutls' 'libsigc++2.0')
 options=('!libtool')
-source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz
-	build-fix.patch)
-md5sums=('506776416d8aea2b9ea13a81f9145383'
-         'a200e6f132839782e3e5cfdf438e79d3')
+source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('be6db739f71c5c08421bf6181e77f3b2')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
-  patch -p1 <$srcdir/build-fix.patch
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/net6/build-fix.patch b/community/net6/build-fix.patch
deleted file mode 100644
index cfe79afeb..000000000
--- a/community/net6/build-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -wbBur net6-1.3.12/inc/encrypt.hpp net6-1.3.12.my/inc/encrypt.hpp
---- net6-1.3.12/inc/encrypt.hpp	2009-11-15 16:02:46.000000000 +0300
-+++ net6-1.3.12.my/inc/encrypt.hpp	2011-11-21 16:39:32.000000000 +0400
-@@ -34,7 +34,7 @@
- typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t;
- typedef gnutls_transport_ptr gnutls_transport_ptr_t;
- typedef gnutls_dh_params gnutls_dh_params_t;
--typedef gnutls_connection_end gnutls_connection_end_t;
-+//typedef gnutls_connection_end gnutls_connection_end_t;
- 
- class dh_params: private net6::non_copyable
- {
-diff -wbBur net6-1.3.12/src/encrypt.cpp net6-1.3.12.my/src/encrypt.cpp
---- net6-1.3.12/src/encrypt.cpp	2009-11-15 16:02:46.000000000 +0300
-+++ net6-1.3.12.my/src/encrypt.cpp	2011-11-21 16:39:49.000000000 +0400
-@@ -25,7 +25,7 @@
- {
- 	const unsigned int DH_BITS = 1024;
- 
--	net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end)
-+	net6::gnutls_session_t create_session(gnutls_connection_end_t end)
- 	{
- 		net6::gnutls_session_t session;
- 		gnutls_init(&session, end);
-@@ -201,8 +201,6 @@
- 		net6_unix_send_func
- 	);
- #endif
--
--	gnutls_transport_set_lowat(session, 0);
- }
- 
- net6::tcp_encrypted_socket_base::~tcp_encrypted_socket_base()
diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD
index eea127bfd..4bc67a275 100644
--- a/community/netcf/PKGBUILD
+++ b/community/netcf/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 77847 2012-10-15 09:41:41Z spupykin $
+# $Id: PKGBUILD 88327 2013-04-16 13:30:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com>
 
 pkgname=netcf
-pkgver=0.2.2
+pkgver=0.2.3
 pkgrel=1
 pkgdesc="A library for configuring network interfaces"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="https://fedorahosted.org/netcf/"
-depends=('augeas>=0.7.4' 'netcfg' 'libxslt' 'libxml2' 'libnl')
+depends=('augeas>=0.7.4' 'netctl' 'libxslt' 'libxml2' 'libnl')
 makedepends=('gcc')
 options=(!libtool)
 source=("https://fedorahosted.org/released/netcf/$pkgname-$pkgver.tar.gz")
-md5sums=('fbcd47101797b8fcd9519e22002cd200')
+md5sums=('bee292470b06201b59af0fad473a1b65')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/netperf/PKGBUILD b/community/netperf/PKGBUILD
deleted file mode 100644
index 9ff232229..000000000
--- a/community/netperf/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 73456 2012-07-08 00:07:29Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Contributor: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: Tilman Blumenbach <tilman (at) ax86 (dot) net>
-
-pkgname=netperf
-pkgver=2.6.0
-pkgrel=1
-pkgdesc='Benchmarking tool for many different types of networking'
-url='http://www.netperf.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('glibc' 'libsmbios' 'lksctp-tools')
-install=$pkgname.install
-source=(
-  "ftp://ftp.netperf.org/netperf/$pkgname-$pkgver.tar.bz2"
-  "$pkgname.rc"
-  "$pkgname.conf"
-  "$pkgname.service")
-md5sums=('9654ffdfd4c4f2c93ce3733cd9ed9236'
-         '4f11bf24fcd7a44c17bbe27cdc7dae01'
-         '14836578ba49bbfa9e928feeca8346f1'
-         '9a8b47101fb2b0bf8fb9bbfb73ba6486')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --enable-demo \
-    --enable-unixdomain \
-    --enable-dccp \
-    --enable-sctp
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  # install license
-  install -D -m 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-  # install initscripts & systemd files
-  install -D -m 755 ../$pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
-  install -D -m 644 ../$pkgname.conf "$pkgdir/etc/conf.d/$pkgname"
-  install -D -m 644 ../$pkgname.service \
-    "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/netperf/netperf.conf b/community/netperf/netperf.conf
deleted file mode 100644
index b8e36c203..000000000
--- a/community/netperf/netperf.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh noet:
-
-#DAEMON_OPTS='-d'
diff --git a/community/netperf/netperf.rc b/community/netperf/netperf.rc
deleted file mode 100644
index f2a2de582..000000000
--- a/community/netperf/netperf.rc
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-DAEMON=/usr/bin/netserver
-PID=$(pidof -o %PPID $DAEMON)
-
-case "$1" in
-  start)
-    stat_busy "Starting ${0##*/} daemon"
-    [[ ! $PID ]] &&
-      </dev/null &>/dev/null $DAEMON $DAEMON_OPTS &&
-      add_daemon ${0##*/} &&
-      stat_done &&
-      exit 0
-    stat_fail
-  ;;
-  stop)
-    stat_busy "Stopping ${0##*/} daemon"
-    [[ $PID ]] &&
-      kill $PID &> /dev/null &&
-      rm_daemon ${0##*/} &&
-      stat_done &&
-      exit 0
-    stat_fail
-  ;;
-  restart)
-    $0 stop
-    $0 start
-    exit 0
-  ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|restart}" >&2
-  ;;
-esac
-
-exit 1
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/netperf/netperf.service b/community/netperf/netperf.service
deleted file mode 100644
index ce3c9cab8..000000000
--- a/community/netperf/netperf.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Netperf Benchmark Server
-
-[Service]
-ExecStart=/usr/bin/netserver -D
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/netsurf-buildsystem/PKGBUILD b/community/netsurf-buildsystem/PKGBUILD
new file mode 100644
index 000000000..3787946b4
--- /dev/null
+++ b/community/netsurf-buildsystem/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 89110 2013-04-26 20:53:25Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+
+pkgname=netsurf-buildsystem
+pkgver=1.0
+pkgrel=1
+pkgdesc='The Netsurf buildsystem'
+arch=('x86_64' 'i686')
+url='http://www.netsurf-browser.org/'
+license=('MIT')
+source=("http://download.netsurf-browser.org/libs/releases/buildsystem-$pkgver.tar.gz")
+sha256sums=('4495e8e12faf0ace668ab80401064ce7f65a195efe63c924c066a109649ff146')
+
+build() {
+  cd "$srcdir/buildsystem-$pkgver"
+
+  sed -i 's:-Werror::' Makefile
+  make PREFIX=/usr COMPONENT_TYPE='lib-shared'
+  make PREFIX=/usr COMPONENT_TYPE='lib-static'
+}
+
+package() {
+  cd "$srcdir/buildsystem-$pkgver"
+
+  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE='lib-shared'   
+  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE='lib-static'
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD
index 0874ee86f..2f71a17cd 100644
--- a/community/netsurf/PKGBUILD
+++ b/community/netsurf/PKGBUILD
@@ -1,45 +1,49 @@
-# $Id: PKGBUILD 81235 2012-12-13 22:54:07Z arodseth $
+# $Id: PKGBUILD 89138 2013-04-27 07:58:18Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Georgij Kondratjev <smpuj@bk.ru>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=netsurf
-pkgver=2.9
-pkgrel=5
+pkgver=3.0
+pkgrel=1
 pkgdesc='Lightweight and fast web browser'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/'
 license=('GPL')
-depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'libcss>=0.1.2' 'hubbub>=0.1.2' 'libwebp>=0.2.0' 'gstreamer0.10')
-makedepends=('re2c' 'lcms' 'gendesk>=0.4.2')
-provides=('netsurf')
-conflicts=('netsurf')
-install=netsurf.install
+depends=('gtk2' 'libmng' 'curl' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'libcss' 'libwebp' 'libdom') # 'libharu' 'gstreamer0.10'
+makedepends=('js' 're2c' 'lcms' 'gendesk' 'netsurf-buildsystem' 'libglade')
+install="$pkgname.install"
 source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png"
         "http://download.$pkgname-browser.org/$pkgname/releases/source/$pkgname-$pkgver-src.tar.gz")
 sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00'
-            'f74767161fd7f3186e483b438a183f2ea3cae160020ad5dd63c75a4d78f5c797')
+            '7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6')
+
 _exec=('netsurf %U')
 _genericname=('Web Browser')
 _comment=('Lightweight web browser')
 _mimetype=('text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo')
 
-build() {
+prepare() {
   cd "$srcdir"
 
   gendesk
-  cd "$pkgname"
+}
+
+build() {
+  cd "$pkgname-$pkgver"
 
   make \
     PREFIX=/usr \
     TARGET=gtk \
     NETSURF_USE_WEBP=YES \
-    NETSURF_USE_VIDEO=YES
+    NETSURF_USE_VIDEO=NO \
+    NETSURF_USE_MOZILLA_JS=YES \
+    NETSURF_USE_HARU_PDF=NO
 }
 
 package() {
-  cd "$srcdir/$pkgname"
+  cd "$srcdir/$pkgname-$pkgver"
 
   make install PREFIX=/usr DESTDIR="$pkgdir"
   install -Dm644 "../$pkgname.png" \
diff --git a/community/newsbeuter/PKGBUILD b/community/newsbeuter/PKGBUILD
index fa0e14dca..e19c7f97e 100644
--- a/community/newsbeuter/PKGBUILD
+++ b/community/newsbeuter/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD 66351 2012-02-23 20:58:14Z jlichtblau $
+# $Id: PKGBUILD 87233 2013-03-28 21:20:42Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Sven Pfleiderer <pfleidi@roothausen.de>
 
 pkgname=newsbeuter
-pkgver=2.5
+pkgver=2.6
 pkgrel=1
 pkgdesc="A RSS feed reader for the text console with special Podcast support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.newsbeuter.org/"
 license=('custom: MIT')
-depends=('curl' 'json-c' 'libxml2' 'sqlite3' 'stfl')
+depends=('curl' 'json-c' 'libxml2' 'sqlite' 'stfl')
 makedepends=('swig' 'gettext')
 optdepends=('ruby')
 options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://www.newsbeuter.org/downloads/$pkgname-$pkgver.tar.gz
-	newsbeuter-2.5-gcc47.patch)
-sha256sums=('abc54b7bee3e062cd166787edf35aadbeb0ae1f5fcc8d955b77143aaca096825'
-	    'c48029c63cfc45d5df3bdbc4c9fd345463a61ad97f6eac797db62d63c49c6af8')
+source=(http://www.newsbeuter.org/downloads/$pkgname-$pkgver.tar.gz)
+sha256sums=('3189fdd3c65b3207f9ffb3a10f6fda4e92ea927776cb49a79c1e4c0344f9dcc3')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
-  patch -Np1 -i ${srcdir}/newsbeuter-2.5-gcc47.patch
+
   make prefix=/usr
 }
 
diff --git a/community/newsbeuter/newsbeuter.changelog b/community/newsbeuter/newsbeuter.changelog
index f2a048aa1..d8fb146ff 100644
--- a/community/newsbeuter/newsbeuter.changelog
+++ b/community/newsbeuter/newsbeuter.changelog
@@ -1,3 +1,9 @@
+2013-03-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* newsbeuter 2.6-1
+
+2013-03-07 Andrea Scarpino <andrea@archlinux.org>
+	* ruby 2.0 rebuild
+
 2012-02-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* newsbeuter 2.5-1
 
diff --git a/community/nfacct/PKGBUILD b/community/nfacct/PKGBUILD
new file mode 100644
index 000000000..bcf2cc63e
--- /dev/null
+++ b/community/nfacct/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 85684 2013-03-04 23:04:09Z seblu $
+# Maintainer: Sébastien Luttringer
+# Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
+
+pkgname=nfacct
+pkgver=1.0.1
+pkgrel=1
+pkgdesc='Command line tool to create/retrieve/delete accounting objects'
+arch=('i686' 'x86_64' 'mips64el')
+url='http://www.netfilter.org/projects/nfacct/'
+license=('GPL2')
+depends=('libnetfilter_acct')
+options=(!libtool)
+source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
+md5sums=('992e863409d144350dbc8f0554a0f478')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make -k check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index cd886d655..ec2e6b079 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83352 2013-01-30 09:08:04Z bpiotrowski $
+# $Id: PKGBUILD 88940 2013-04-25 04:37:43Z bpiotrowski $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
@@ -7,7 +7,7 @@ _cfgdir=/etc/nginx
 _tmpdir=/var/lib/nginx
 
 pkgname=nginx
-pkgver=1.2.6
+pkgver=1.4.0
 pkgrel=2
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64' 'mips64el')
@@ -27,13 +27,11 @@ backup=(${_cfgdir:1}/fastcgi.conf
 		${_cfgdir:1}/win-utf
 		etc/logrotate.d/nginx)
 source=(http://nginx.org/download/nginx-$pkgver.tar.gz
-		rc.d
 		service
-		nginx.logrotate)
-md5sums=('1350d26eb9b66364d9143fb3c4366ab6'
-         'f62c7c9b5a53471d4666a4c49ad363fb'
-         '62d494d23aef31d0b867161f9fffa6eb'
-         'b38744739022876554a0444d92e6603b')
+		logrotate)
+sha256sums=('84aeb7a131fccff036dc80283dd98c989d2844eb84359cfe7c4863475de923a9'
+            '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a'
+            '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16')
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
@@ -57,8 +55,10 @@ build() {
         --with-file-aio \
         --with-http_dav_module \
         --with-http_geoip_module \
+        --with-http_gunzip_module \
         --with-http_gzip_static_module \
         --with-http_realip_module \
+        --with-http_spdy_module \
         --with-http_ssl_module \
         --with-http_stub_status_module \
         --add-module=/usr/lib/passenger/ext/nginx \
@@ -80,9 +80,6 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install
 
-	install -d "$pkgdir"/etc/logrotate.d
-	install -m644 "$srcdir"/nginx.logrotate "$pkgdir"/etc/logrotate.d/nginx
-
 	sed -e 's|\<user\s\+\w\+;|user html;|g' \
 		-e '44s|html|/usr/share/nginx/html|' \
 		-e '54s|html|/usr/share/nginx/html|' \
@@ -92,11 +89,14 @@ package() {
 	install -d "$pkgdir"/$_tmpdir
 	install -dm700 "$pkgdir"/$_tmpdir/proxy
 
+	chmod 750 "$pkgdir"/var/log/nginx
+	chown http:log "$pkgdir"/var/log/nginx
+
 	install -d "$pkgdir"/usr/share/nginx
 	mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx
 
-	install -D -m755 "$srcdir"/rc.d "$pkgdir"/etc/rc.d/nginx
+	install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx
 	install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service
-	install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE
+	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE
 	rm -rf "$pkgdir"/var/run
 }
diff --git a/community/nginx/nginx.logrotate b/community/nginx/logrotate
index d490d5d9b..3d082bcf8 100644
--- a/community/nginx/nginx.logrotate
+++ b/community/nginx/logrotate
@@ -1,5 +1,6 @@
-/var/log/nginx/*.log {
+/var/log/nginx/*log {
 	missingok
+	create 640 http log
 	sharedscripts
 	compress
 	postrotate
diff --git a/community/nginx/nginx b/community/nginx/nginx
deleted file mode 100644
index 9de10e99a..000000000
--- a/community/nginx/nginx
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-# general config
-
-NGINX_CONFIG="/etc/nginx/conf/nginx.conf"
-
-. /etc/conf.d/nginx
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-function check_config {
-  stat_busy "Checking configuration"
-  /usr/sbin/nginx -t -q -c "$NGINX_CONFIG"
-  if [ $? -ne 0 ]; then
-    stat_die
-  else
-    stat_done
-  fi
-}
-
-case "$1" in
-  start)
-    check_config
-    $0 careless_start
-    ;;
-  careless_start)
-    stat_busy "Starting Nginx"
-    if [ -s /var/run/nginx.pid ]; then
-      stat_fail
-      # probably ;)
-      stat_busy "Nginx is already running"
-      stat_die
-     fi
-    /usr/sbin/nginx -c "$NGINX_CONFIG" &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      add_daemon nginx
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Nginx"
-    NGINX_PID=`cat /var/run/nginx.pid 2>/dev/null`
-    kill -QUIT $NGINX_PID &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      for i in `seq 1 10`; do
-        [ -d /proc/$NGINX_PID ] || { stat_done; rm_daemon nginx; exit 0; }
-        sleep 1
-      done
-      stat_fail
-    fi
-    ;;
-  restart)
-    check_config
-    $0 stop
-    sleep 1
-    $0 careless_start
-    ;;
-  reload)
-    check_config
-    if [ -s /var/run/nginx.pid ]; then
-      status "Reloading Nginx Configuration" kill -HUP `cat /var/run/nginx.pid`
-    fi
-    ;;
-  check)
-    check_config
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload|check|careless_start}"
-esac
diff --git a/community/nginx/nginx.install b/community/nginx/nginx.install
index b31ee41d7..0daccc639 100644
--- a/community/nginx/nginx.install
+++ b/community/nginx/nginx.install
@@ -1,4 +1,8 @@
 post_upgrade() {
+    if [[ $(vercmp $2 1.2.7-4) -le 0 ]]; then
+        chmod 750 var/log/nginx
+        chown http:log var/log/nginx
+    fi
     if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then
         echo " >>> Since 1.2.1-2 several changes has been made in package:"
         echo "      - *.conf files have been moved to /etc/nginx"
diff --git a/community/nginx/rc.d b/community/nginx/rc.d
deleted file mode 100644
index eb9031e81..000000000
--- a/community/nginx/rc.d
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-function check_config {
-  stat_busy "Checking nginx configuration"
-  /usr/sbin/nginx -t -q -c /etc/nginx/nginx.conf
-  if [ $? -ne 0 ]; then
-    stat_die
-  else
-    stat_done
-  fi
-}
-
-case "$1" in
-  start)
-    check_config
-    $0 careless_start
-    ;;
-  careless_start)
-    stat_busy "Starting nginx"
-    if [ -s /var/run/nginx.pid ]; then
-      stat_fail
-      # probably ;)
-      stat_busy "Nginx is already running"
-      stat_die
-     fi
-    /usr/sbin/nginx -c /etc/nginx/nginx.conf &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      add_daemon nginx
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping nginx"
-    PID=$(cat /var/run/nginx.pid)
-    kill -QUIT $PID &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      for i in {1..10}; do
-        [ -d /proc/$PID ] || { stat_done; rm_daemon nginx; exit 0; }
-        sleep 1
-      done
-      stat_fail
-    fi
-    ;;
-  restart)
-    check_config
-    $0 stop
-    sleep 1
-    $0 careless_start
-    ;;
-  reload)
-    check_config
-    if [ -s /var/run/nginx.pid ]; then
-      status "Reloading nginx configuration" kill -HUP $(cat /var/run/nginx.pid)
-    fi
-    ;;
-  check)
-    check_config
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload|check|careless_start}"
-esac
diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD
index 68b402fa9..36a37689f 100644
--- a/community/ngircd/PKGBUILD
+++ b/community/ngircd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81560 2012-12-24 04:07:48Z kkeen $
+# $Id: PKGBUILD 84301 2013-02-15 22:17:20Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ngircd
-pkgver=20
+pkgver=20.2
 pkgrel=1
 pkgdesc="Next Generation IRC Daemon"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('openssl' 'libident')
 source=("http://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.gz"
         ngircd.sh
         ngircd.service)
-sha256sums=('948b6ee9217bf0833958390513ba1ca2b2e8ddef809c226b889e7591f680c3d8'
+sha256sums=('306c0ef0d2ceac0836a84ecf871a6bc4dd16c25683aa87c0f172b6e68b93357d'
             'f8c28546090af8ce67471b9b4d577f6926007615356dd11afd2bc16f61d698d5'
             '13ffad9647ef42d1a9c8f01f6208bef9dfe9e0f86dce9a01f72711d813d720a0')
 
diff --git a/community/ngrep/PKGBUILD b/community/ngrep/PKGBUILD
index 0ea7df42a..16cd1ab75 100644
--- a/community/ngrep/PKGBUILD
+++ b/community/ngrep/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=ngrep
 pkgver=1.45
-pkgrel=9
+pkgrel=9.1
 pkgdesc='A grep-like utility that allows you to search for network packets on an interface.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://ngrep.sourceforge.net/'
diff --git a/community/ngspice/PKGBUILD b/community/ngspice/PKGBUILD
index 4832e84b2..eb18ee629 100644
--- a/community/ngspice/PKGBUILD
+++ b/community/ngspice/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 64619 2012-02-17 10:58:48Z kkeen $
+# $Id: PKGBUILD 88376 2013-04-16 21:34:14Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
+# Contributor: Luis Henrique <lmello.009@gmail.com>
 
 pkgname=ngspice
-pkgver=24
+pkgver=25
 pkgrel=2
 pkgdesc='Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Ciber1b1, and Xspice.'
 url='http://ngspice.sourceforge.net'
 license=('BSD')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libxaw' 'libedit' 'gcc-libs')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgver/ngspice-$pkgver.tar.gz")
-sha1sums=('a6bb0e65c1c07d48f1d3e4df44fc17f6262952eb')
+source=("http://downloads.sourceforge.net/project/$pkgname/ng-spice-rework/$pkgver/$pkgname-$pkgver.tar.gz"
+        "http://downloads.sourceforge.net/project/$pkgname/ng-spice-rework/$pkgver/$pkgname-doc-$pkgver.tar.gz")
+sha1sums=('745c3c32385b7d5c808836e393fe7699f8568860'
+          'db7a1de7553b4e0d454e6c99b4371677eaf130aa')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
               --infodir=/usr/share/info \
+              --with-readline=yes \
               --enable-xspice \
-              --with-editline=yes \
+              --enable-cider \
               --enable-openmp
   make
 }
@@ -29,4 +33,5 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="$pkgdir" install
   install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -D -m644  "$srcdir/$pkgname-doc-$pkgver/manual.pdf" "$pkgdir/usr/share/doc/$pkgname/manual.pdf"
 }
diff --git a/community/nicotine/PKGBUILD b/community/nicotine/PKGBUILD
deleted file mode 100644
index bd3c6e999..000000000
--- a/community/nicotine/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 83656 2013-02-04 10:04:46Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-# Contributor: Andrew Wright <andreww@photism.org>
-
-pkgname=nicotine
-pkgver=1.2.16
-pkgrel=5
-pkgdesc='Soulseek music-sharing client, written in python'
-arch=('x86_64' 'i686')
-url='http://sourceforge.net/projects/nicotine-plus/'
-license=('GPL')
-depends=('pygtk' 'mutagen') #'python-sexy') TODO: Move python-sexy from AUR
-makedepends=('setconf')
-optdepends=('python2-geoip: to enable Geographical blocker')
-source=("http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2")
-sha256sums=('71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d')
-
-build() {
-  cd "$srcdir/${pkgname}+-$pkgver"
-
-  # Fix for FS#22476
-  setconf files/nicotine.desktop Icon nicotine-plus-32px
-
-  # Python fix
-  sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \
-    -e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py
-
-  cd trayicon
-  python2 autogen.py
-  make 
-}
-
-package() {
-  cd "$srcdir/${pkgname}+-$pkgver"
-
-  python2 setup.py install --root="$pkgdir"
-  cd trayicon
-  make DESTDIR="$pkgdir" install 
-  ln -s nicotine.py "$pkgdir/usr/bin/nicotine"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/nload/PKGBUILD b/community/nload/PKGBUILD
index 23524c6b0..e40319451 100644
--- a/community/nload/PKGBUILD
+++ b/community/nload/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=nload
 pkgver=0.7.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc='Monitors network traffic and bandwidth usage'
 url='http://www.roland-riegel.de/nload'
 license=('GPL2')
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 4617b7895..25c23becd 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83980 2013-02-07 20:46:58Z bpiotrowski $
+# $Id: PKGBUILD 88884 2013-04-24 15:09:27Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,17 +8,17 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.8.19
+pkgver=0.10.5
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://nodejs.org/'
 license=('MIT')
 depends=('openssl' 'python2')
-checkdepends=('curl') # curl used for check()
+checkdepends=('curl')
 options=('!emptydirs')
 source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz)
-sha256sums=('703207d7b394bd3d4035dc3c94b417ee441fd3ea66aa90cd3d7c9bb28e5f9df4')
+sha256sums=('1c22bd15cb13b1109610ee256699300ec6999b335f3bc85dc3c0312ec9312cfd')
 
 build() {
   cd node-v${pkgver}
@@ -47,15 +47,15 @@ check() {
 package() {
   cd node-v${pkgver}
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install
 
   # install docs as per user request
-  install -d $pkgdir/usr/share/doc/nodejs
+  install -d "$pkgdir"/usr/share/doc/nodejs
   cp -r doc/api/*.html \
-    $pkgdir/usr/share/doc/nodejs
+    "$pkgdir"/usr/share/doc/nodejs
 
   install -D -m644 LICENSE \
-    $pkgdir/usr/share/licenses/nodejs/LICENSE
+    "$pkgdir"/usr/share/licenses/nodejs/LICENSE
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/normalize/PKGBUILD b/community/normalize/PKGBUILD
index 62f0a5766..17af4046b 100644
--- a/community/normalize/PKGBUILD
+++ b/community/normalize/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=normalize
 pkgver=0.7.7
-pkgrel=6
+pkgrel=6.1
 pkgdesc="A tool for adjusting the volume of WAV files to a standard level"
 arch=('i686' 'x86_64')
 url="http://normalize.nongnu.org"
diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD
index 7baeaa3d5..a94cee35b 100644
--- a/community/notion/PKGBUILD
+++ b/community/notion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81125 2012-12-12 00:49:36Z eric $
+# $Id: PKGBUILD 88793 2013-04-22 10:31:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com
 # Contributor: aunoor
 
 pkgname=notion
-pkgver=20121114
+pkgver=20130422
 pkgrel=1
 pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
 url="http://sourceforge.net/projects/notion/"
@@ -16,51 +16,41 @@ makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr'
 	     'rubber' 'latex2html' 'texlive-htmlxml' 'texlive-latexextra')
 provides=('libtu' 'libextl')
 changelog=ChangleLog
-_gitroots=("git://notion.git.sourceforge.net/gitroot/notion/notion"
-	   "git://notion.git.sourceforge.net/gitroot/notion/libtu"
-	   "git://notion.git.sourceforge.net/gitroot/notion/libextl"
-	   "git://notion.git.sourceforge.net/gitroot/notion/notion-doc"
-	   "git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama"
-	   "git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents"
-	   "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr"
-	   "git://notion.git.sourceforge.net/gitroot/notion/mod_notionflux"
-	   "git://notion.git.sourceforge.net/gitroot/notion/contrib")
-md5sums=()
-md5sums=()
+source=("git://notion.git.sourceforge.net/gitroot/notion/notion"
+	"git://notion.git.sourceforge.net/gitroot/notion/libtu"
+	"git://notion.git.sourceforge.net/gitroot/notion/libextl"
+	"git://notion.git.sourceforge.net/gitroot/notion/notion-doc"
+	"git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama"
+	"git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents"
+	"git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr"
+	"git://notion.git.sourceforge.net/gitroot/notion/mod_notionflux"
+	"git://notion.git.sourceforge.net/gitroot/notion/contrib")
+md5sums=('SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP')
 
 build() {
   cd ${srcdir}
 
-  # git clone
-  for _gitroot in ${_gitroots[@]}; do
-    msg "Connecting to the git repository..."
-    _gitname=`basename ${_gitroot}`
-    if [ -d ${srcdir}/${_gitname} ]; then
-        pushd ${srcdir}/${_gitname}
-        git pull origin
-        popd
-    else
-        git clone --depth 1 ${_gitroot}
-    fi
-    msg "GIT checkout done or server timeout"
-  done
-
-  # copy to notion-build
-  rm -rf ${srcdir}/notion-build
-  cp -r  ${srcdir}/notion ${srcdir}/notion-build
   for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr mod_notionflux notion-doc; do
-    cp -r  ${srcdir}/$i ${srcdir}/notion-build/
+    cp -r  ${srcdir}/$i ${srcdir}/notion/
   done
 
   # build notion
-  cd ${srcdir}/notion-build
+  cd ${srcdir}/notion
   msg "Starting make..."
   sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \
 	-e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \
 	-e 's/^\(LUA_DIR=\).*$/\1\/usr/' \
 	-e 's/^\(X11_PREFIX=\).*/\1\/usr/' \
 	-i system-autodetect.mk
-  make INCLUDES=-I${srcdir}/notion-build
+  make INCLUDES=-I${srcdir}/notion
 
   # build doc and modules
   for i in mod_xinerama mod_xkbevents mod_xrandr; do
@@ -71,7 +61,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/notion-build
+  cd ${srcdir}/notion
 
   # notion
   make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install
diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD
index 4a240b159..e89d3ffe7 100644
--- a/community/notmuch/PKGBUILD
+++ b/community/notmuch/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 82559 2013-01-20 23:36:23Z dwallace $
+# $Id: PKGBUILD 86877 2013-03-23 23:10:36Z td123 $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: fauno <fauno at kiwwwi.com.ar>
 # Contributor: Olivier Ramonat <olivier at ramonat dot fr>
@@ -6,7 +6,7 @@
 
 pkgbase=notmuch
 pkgname=('notmuch' 'notmuch-mutt' 'notmuch-runtime')
-pkgver=0.15
+pkgver=0.15.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://notmuchmail.org/"
@@ -14,12 +14,13 @@ license=('GPL3')
 makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime' 'talloc')
 options=(!distcc !makeflags)
 source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a79454042e508c8a1d7aaf1a617526f0')
+md5sums=('e86968dfcd7ffaf162b7b87de56b7f18')
 
 build() {
     cd "$srcdir/${pkgname}-$pkgver"
 
-    ./configure --prefix=/usr --sysconfdir=/etc
+    ./configure --prefix=/usr --sysconfdir=/etc \
+		--includedir=/usr/include
     make 
     (cd "${srcdir}/$pkgname-${pkgver}/contrib/${pkgname}-mutt"
     make ${pkgname}-mutt.1)
@@ -33,14 +34,14 @@ build() {
     cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2}
 
     cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
-    env LD_LIBRARY_PATH="." python setup.py build
+    #env LD_LIBRARY_PATH="." python setup.py build
+    find "." -name '*.py' -exec sed -i -e '1s,python$,python3,' {} +
+	python setup.py build
 
     cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
-    find "." -name '*.py' -print0 |xargs -0 \
-        sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \
-        -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
-    env LD_LIBRARY_PATH="." python2 setup.py build
-
+    find "." -name '*.py' -exec sed -i -e '1s,python$,python2,' {} +
+    #env LD_LIBRARY_PATH="." python2 setup.py build
+	python2 setup.py build
 }
 
 package_notmuch-runtime(){
@@ -73,15 +74,17 @@ package_notmuch(){
 
     # Install python bindings
     cd "$srcdir/${pkgname}-${pkgver}/bindings/python2"
-    env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root="$pkgdir"
+    #env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root="$pkgdir"
+	python2 setup.py install --prefix=/usr --root="$pkgdir"
 
     cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
-    env LD_LIBRARY_PATH="." python setup.py install --prefix=/usr --root="$pkgdir"
+    #env LD_LIBRARY_PATH="." python setup.py install --prefix=/usr --root="$pkgdir"
+	python setup.py install --prefix=/usr --root="$pkgdir"
 
     # Install ruby bindings
     cd "$srcdir/${pkgname}-${pkgver}/bindings/ruby"
     sed -i -e 's,/site_ruby,,g' Makefile
-    make prefix="${pkgdir}/usr" install
+    make DESTDIR="$pkgdir" includedir=/usr/include install
 
 }
 
diff --git a/community/nss-pam-ldapd/PKGBUILD b/community/nss-pam-ldapd/PKGBUILD
new file mode 100644
index 000000000..19cacfa2f
--- /dev/null
+++ b/community/nss-pam-ldapd/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id
+# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
+
+pkgname=nss-pam-ldapd
+pkgver=0.8.12
+pkgrel=3
+pkgdesc='LDAP module for NSS and PAM'
+arch=('i686' 'x86_64' 'mips64el')
+url="http://arthurdejong.org/$pkgname/"
+license=('LGPL2.1')
+depends=('krb5')
+replaces=('pam_ldap' 'nss_ldap')
+conflicts=('nss-pam-ldapd-git')
+provides=('nss-pam-ldapd')
+install=nss-pam-ldapd.install
+backup=('etc/nslcd.conf')
+source=("http://arthurdejong.org/$pkgname/$pkgname-$pkgver.tar.gz"
+        "nslcd.service")
+sha1sums=('9c320172df0cdd4eca6cd97ad4c2438e6552ffe0'
+          '40afa421f05c2128a5219504fea45b2e76830973')
+          
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --with-pam-seclib-dir=/usr/lib/security;
+ 
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  install -Dm644 "$srcdir/nslcd.service" "$pkgdir/usr/lib/systemd/system/nslcd.service"
+  install -Dm644 "$srcdir/$pkgname-$pkgver/nslcd.conf" "$pkgdir/etc/nslcd.conf"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/nss-pam-ldapd/nslcd.service b/community/nss-pam-ldapd/nslcd.service
new file mode 100644
index 000000000..41fcb8966
--- /dev/null
+++ b/community/nss-pam-ldapd/nslcd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Naming services LDAP client daemon.
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/nslcd/nslcd.pid
+ExecStart=/usr/sbin/nslcd
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/community/nss-pam-ldapd/nss-pam-ldapd.install b/community/nss-pam-ldapd/nss-pam-ldapd.install
new file mode 100644
index 000000000..a8b93f218
--- /dev/null
+++ b/community/nss-pam-ldapd/nss-pam-ldapd.install
@@ -0,0 +1,12 @@
+post_install() {
+    getent passwd nslcd >> /dev/null || useradd -r -M -d /var/run/nslcd -s /bin/false nslcd
+}
+
+post_upgrade() {
+    getent passwd nslcd >> /dev/null || useradd -r -M -s /bin/false nslcd
+}
+
+pre_remove() {
+    userdel nslcd >/dev/null 2>&1 || true
+}
+
diff --git a/community/nvclock/PKGBUILD b/community/nvclock/PKGBUILD
deleted file mode 100644
index ce2f5bbfc..000000000
--- a/community/nvclock/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 63680 2012-02-05 12:06:13Z ibiru $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Markus Meissner <markus@meissna.de>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=nvclock
-pkgver=0.8b4
-pkgrel=3
-pkgdesc='A small utility which allows users to overclock NVIDIA based video cards.'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.linuxhardware.org/nvclock/'
-license=('GPL')
-depends=('gtk2')
-optdepends=('gksu: to start nvclock via the desktop menu entry')
-install='nvclock.install'
-options=('!makeflags')
-source=("http://www.linuxhardware.org/${pkgname}/${pkgname}${pkgver}.tar.gz"
-        'nvclock-0.8b4-buildfix.patch'
-        'nvclock-0.8b4-linkfix.patch'
-        'nvclock.desktop-use-gksu.patch')
-md5sums=('23f1b3ebf40f35d76d5fdac50f66ab11'
-         '1da24b50dd6a8c4704fa550a3e1a8b53'
-         'b812646787ea44e693fd2288612f25ad'
-         '98fc1995721d0b0e8ff6d448869eee6d')
-
-build(){
-  cd "${srcdir}/${pkgname}${pkgver}"
-
-  # build and link fixes from Fedora
-  patch -Np1 -i "${srcdir}/nvclock-0.8b4-buildfix.patch"
-  patch -Np1 -i "${srcdir}/nvclock-0.8b4-linkfix.patch"
-
-  # Make ".desktop" file use gksu(1).
-  patch -Np0 -i "${srcdir}/nvclock.desktop-use-gksu.patch"
-
-  sed -i 's:${prefix}/man:${prefix}\/share\/man:' "${srcdir}/${pkgname}${pkgver}/Makefile.in"
-
-  ./configure --prefix=/usr --bindir=/usr/bin
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/nvclock/nvclock-0.8b4-buildfix.patch b/community/nvclock/nvclock-0.8b4-buildfix.patch
deleted file mode 100644
index cdc9f5c88..000000000
--- a/community/nvclock/nvclock-0.8b4-buildfix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -upNr nvclock0.8b4.orign/src/Makefile.in nvclock0.8b4/src/Makefile.in
---- nvclock0.8b4.orign/src/Makefile.in	2009-01-03 18:02:54.000000000 +0100
-+++ nvclock0.8b4/src/Makefile.in	2009-01-07 11:37:39.000000000 +0100
-@@ -50,8 +50,8 @@ distclean: distclean-recursive clean-app
- install: install-recursive install-app
- install-app:
- 	mkdir -p $(bindir)
--	$(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock
--	$(INSTALL) -c smartdimmer $(DESTDIR)$(bindir)/smartdimmer
-+	$(INSTALL) -c nvclock $(bindir)/nvclock
-+	$(INSTALL) -c smartdimmer $(bindir)/smartdimmer
- 
- 
- uninstall: uninstall-recursive uninstall-app
-
-
diff --git a/community/nvclock/nvclock-0.8b4-linkfix.patch b/community/nvclock/nvclock-0.8b4-linkfix.patch
deleted file mode 100644
index 0029d1c74..000000000
--- a/community/nvclock/nvclock-0.8b4-linkfix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -upNr nvclock0.8b4.orign/src/gtk/Makefile.in nvclock0.8b4/src/gtk/Makefile.in
---- nvclock0.8b4.orign/src/gtk/Makefile.in	2008-05-11 12:25:46.000000000 +0200
-+++ nvclock0.8b4/src/gtk/Makefile.in	2010-02-13 19:56:24.204078277 +0100
-@@ -20,12 +20,12 @@ endif
- ifeq ($(HAVE_NVCONTROL), yes)
-     DEPS=$(libbackend) $(libnvcontrol)
-     INCLUDES=@X11_CFLAGS@ -I./backend -I./nvcontrol -I.. -I../..
--    LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol
-+    LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol -lX11 -lXext -ldl
-     OBJECTS=banner.o gl.o hw.o main.o settings.o
- else
-     DEPS=$(libbackend)
-     INCLUDES=-I./backend -I./nvcontrol -I.. -I../..
--    LIBS=@GTK_LIBS@ -L../backend -lbackend
-+    LIBS=@GTK_LIBS@ -L../backend -lbackend -lX11 -lXext -ldl
-     OBJECTS=banner.o hw.o main.o settings.o
- endif
- 
diff --git a/community/nvclock/nvclock.desktop-use-gksu.patch b/community/nvclock/nvclock.desktop-use-gksu.patch
deleted file mode 100644
index a372f5de8..000000000
--- a/community/nvclock/nvclock.desktop-use-gksu.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nvclock.desktop.orig	2011-01-16 15:15:55.764977836 +0100
-+++ nvclock.desktop	2011-01-16 15:16:07.827408839 +0100
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- Name=NVCLOCK
- Comment=Overclock and Monitor NVIDIA cards
--Exec=nvclock_gtk
-+Exec=gksu nvclock_gtk
- Icon=nvclock.png
- Terminal=false
- Type=Application
diff --git a/community/nvidia-cg-toolkit/PKGBUILD b/community/nvidia-cg-toolkit/PKGBUILD
deleted file mode 100644
index ed07e852e..000000000
--- a/community/nvidia-cg-toolkit/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 74692 2012-08-02 07:39:38Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Adam Griffiths 
-# Contributor: Nick B <Shirakawasuna at gmail _dot_ com>
-pkgname=nvidia-cg-toolkit 
-pkgver=3.1
-_date="April2012"
-pkgrel=2
-pkgdesc="NVIDIA Cg libraries" 
-arch=('i686' 'x86_64')
-url="http://developer.nvidia.com/object/cg_toolkit.html" 
-license=('custom')
-depends=('glibc' 'mesa') 
-source=(http://developer.download.nvidia.com/cg/Cg_${pkgver}/Cg-${pkgver}_${_date}_${CARCH/i686/x86}.tgz)
-[ "$CARCH" = "i686" ] &&
-  md5sums=('9a9fc5108154808f3b10eafa54df1c74')
-[ "$CARCH" = "x86_64" ] && 
-md5sums=('88ba727cdbe0261fac465c4d84f44762')
-
-build() {
-  return 0
-}
-
-package() { 
-  install -Dm755 ${srcdir}/usr/bin/cgc ${pkgdir}/usr/bin/cgc
-  install -dm755 ${pkgdir}/usr/include/Cg
-  install -m644 ${srcdir}/usr/include/Cg/* ${pkgdir}/usr/include/Cg
-  install -dm755 ${pkgdir}/usr/lib
-  [ "$CARCH" = "i686" ] && install -m644 ${srcdir}/usr/lib/* ${pkgdir}/usr/lib
-  [ "$CARCH" = "x86_64" ] && install -m644 ${srcdir}/usr/lib64/* ${pkgdir}/usr/lib
-  install -Dm644 ${srcdir}/usr//local/Cg/docs/license.txt ${pkgdir}/usr/share/licenses/nvidia-cg-toolkit/license.txt
-  cp -r ${srcdir}/usr/local/Cg ${pkgdir}/usr/share/
-  find $pkgdir/usr/share/ -type d -exec chmod -R 755 '{}' ';'
-  find $pkgdir/usr/share/ -type f -exec chmod -R 644 '{}' ';'
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD
index 7d29f4002..e1df72a0e 100644
--- a/community/nzbget/PKGBUILD
+++ b/community/nzbget/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 83419 2013-01-31 20:33:20Z jlichtblau $
+# $Id: PKGBUILD 88583 2013-04-20 15:33:34Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=nzbget
-pkgver=9.1
+pkgver=10.2
 pkgrel=1
 pkgdesc="Download from Usenet using .nzb files"
 arch=('x86_64' 'i686' 'mips64el')
@@ -13,7 +13,7 @@ depends=('gnutls' 'libpar2' 'libxml2' 'libsigc++' 'libgcrypt')
 makedepends=('autoconf' 'automake')
 changelog=$pkgname.changelog
 source=(http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.gz)
-sha256sums=('0cd20e1c78359c720862c19c5fd908dc10d6b54658441b86f9caaa71f66e5633')
+sha256sums=('c9b878744c162e7721ffc8b048a2e4550a8ed8da6e706ee4cbd026ed2d612ec2')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/nzbget/nzbget.changelog b/community/nzbget/nzbget.changelog
index 7a021fd20..e0ea55273 100644
--- a/community/nzbget/nzbget.changelog
+++ b/community/nzbget/nzbget.changelog
@@ -1,3 +1,6 @@
+2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* nzbget 10.2-1
+
 2013-01-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* nzbget 9.1-1
 
diff --git a/community/obconf/PKGBUILD b/community/obconf/PKGBUILD
index c67f0a999..0ab8e2207 100644
--- a/community/obconf/PKGBUILD
+++ b/community/obconf/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=obconf
 pkgver=2.0.3.git20100309
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A GTK2 based configuration tool for the Openbox windowmanager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openbox.org/wiki/ObConf:About"
diff --git a/community/ogmrip/PKGBUILD b/community/ogmrip/PKGBUILD
deleted file mode 100644
index 16f63a541..000000000
--- a/community/ogmrip/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 72064 2012-06-07 19:51:29Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Daenyth
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Vrob (Markus Heuser) mheuser@mi.fu-berlin.de
-
-pkgname=ogmrip
-pkgver=0.13.8
-pkgrel=1
-pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://ogmrip.sourceforge.net/"
-license=('GPL')
-depends=('libdvdread>=4.1.3' 'mplayer' 'mencoder' 'enca' 'pkg-config' 'gconf' 'libglade' 'libnotify' 'enchant')
-makedepends=('patch' 'intltool' 'perl-xml-parser' 'faac' 'lame' 'mkvtoolnix' 'libtheora' 'ogmtools' 'gpac' 'vorbis-tools' 'tesseract')
-optdepends=('faac: support for the AAC audio codec'
-            'lame: support for the MP3 audio codec'
-            'mkvtoolnix: create, alter, and inspect Matroska files'
-            'libtheora: decode and encode Ogg Theora files'
-            'ogmtools: support for the Ogg Media container'
-            'gpac: support for the MP4 container'
-            'vorbis-tools: support for the Ogg Vorbis audio codec'
-            'gocr: support for the SRT subtitle format'
-            'ocrad: support for the SRT subtitle format'
-            'tesseract: support for the SRT subtitle format')
-options=('!libtool' '!makeflags')
-changelog=$pkgname.changelog
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('ea6a75e6cc4fe7df1ed65648af208c87748959a6b372847b1005c3b92cc5a423')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/usr/share
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/ogmrip/ogmrip.changelog b/community/ogmrip/ogmrip.changelog
deleted file mode 100644
index da70a7631..000000000
--- a/community/ogmrip/ogmrip.changelog
+++ /dev/null
@@ -1,24 +0,0 @@
-2012-06-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* ogmrip O.13.8-1
-
-2012-01-26  Eric Belanger  <eric@archlinux.org>
-	* Rebuild against libpng 1.5 and libtiff 4.0
-	* Add .install file
-
-2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* ogmrip O.13.7-1
-
-2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* ogmrip O.13.6-1
-
-2010-06-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release O.13.5
-
-2010-04-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release O.13.4
-
-2010-01-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* FS#17517 fixed in minor release O.13.3-2
-
-2010-01-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release O.13.3
diff --git a/community/ogre/PKGBUILD b/community/ogre/PKGBUILD
deleted file mode 100644
index 78d169da2..000000000
--- a/community/ogre/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 77653 2012-10-13 11:44:20Z allan $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-pkgbase=ogre
-pkgname=('ogre' 'ogre-docs')
-pkgver=1.8.1
-pkgrel=2
-pkgdesc="A scene-oriented, flexible 3D engine written in C++"
-arch=('i686' 'x86_64')
-url='http://www.ogre3d.org'
-license=('custom:MIT')
-depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr' 
-         'nvidia-cg-toolkit' 'zziplib' 'ois' 'glu')
-makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa')
-optdepends=('cppunit: unit testing'
-            'intel-tbb: better threading support'
-            'poco: portability'
-            'boost: for developing using ogre')
-install=ogre.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_src_v${pkgver//./-}.tar.bz2")
-md5sums=('b85e3dcf370a46b3a8624d4fdd722d39')
-
-build() {
-  cd ${srcdir}/${pkgname}_src_v${pkgver//./-}
-
-  # get a clean build dir
-  [[ -d build ]] && rm -rf build
-	mkdir build && cd build
-
-  # generate CMake Makefile
-  cmake .. \
- 	  -DCMAKE_INSTALL_PREFIX=/usr \
-	  -DOGRE_INSTALL_PLUGINS_HEADERS=TRUE \
-	  -DOGRE_INSTALL_SAMPLES=TRUE \
-	  -DOGRE_INSTALL_DOCS=TRUE \
-    -DOGRE_INSTALL_MEDIA=TRUE \
-	  -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \
-    -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
-
-  # compile
-  make
-
-  # generate docs
-  if [[ $(which dot) && $(which doxygen) ]]; then
-    make doc
-  fi
-}
-
-package_ogre() {
-  optdepends=('ogre-docs: documentation')
-
-  cd ${srcdir}/${pkgname}_src_v${pkgver//./-}/build
-
-  # install the bugger
-  make DESTDIR=${pkgdir} install
-
-  # fix up samples
-  install -dm775 -o root -g users ${pkgdir}/opt/OGRE/samples/
-  mv ${pkgdir}/usr/share/OGRE/*.cfg ${pkgdir}/opt/OGRE/samples/
-  mv ${pkgdir}/usr/bin/SampleBrowser ${pkgdir}/opt/OGRE/samples/
-
-  # make sample launcher
-  echo "#!/bin/bash" > ${pkgdir}/usr/bin/OgreSampleBrowser
-  echo "cd /opt/OGRE/samples && ./SampleBrowser" >> ${pkgdir}/usr/bin/OgreSampleBrowser
-  chmod +x ${pkgdir}/usr/bin/OgreSampleBrowser
-  
-  # install license
-  install -Dm644 ../Docs/License.html ${pkgdir}/usr/share/licenses/${pkgname}/license.html
-
-  # move docs out of this package
-  mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs
-}
-
-package_ogre-docs() {
-  pkgdesc="Documentation for ogre"
-  depends=()
-
-  cd ${srcdir}/${pkgbase}_src_v${pkgver//./-}/build
-
-  # move docs into this package
-  install -dm755 ${pkgdir}/usr/share/doc
-  mv ${srcdir}/docs ${pkgdir}/usr/share/doc/OGRE/
-
-  # symlink for docs
-  install -dm755 ${pkgdir}/usr/share/OGRE/
-  cd ${pkgdir}/usr/share
-  ln -s doc/OGRE/ OGRE/docs
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/ogre/ogre.install b/community/ogre/ogre.install
deleted file mode 100644
index 5db668d9e..000000000
--- a/community/ogre/ogre.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-    echo "To view the OGRE samples just run OgreSampleBrowser or launch"
-    echo "it directly in /opt/OGRE/samples/"
-}
diff --git a/community/oidentd/oidentd.default b/community/oidentd/oidentd.default
deleted file mode 100644
index 5eefa80e2..000000000
--- a/community/oidentd/oidentd.default
+++ /dev/null
@@ -1,5 +0,0 @@
-USER=nobody
-GROUP=nobody
-OPTS=""
-# You will need this, when you want oidentd listen both on IPv4 and IPv6
-# OPTS="-a ::"
diff --git a/community/oidentd/oidentd.rc b/community/oidentd/oidentd.rc
deleted file mode 100644
index 8b3c04c45..000000000
--- a/community/oidentd/oidentd.rc
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/oidentd
-
-# no daemon check needed for oidentd, and no pid nesecary.
-case "$1" in
-  start)
-    stat_busy "Starting oidentd Daemon..."
-    # oidentd is smart enough to only run one copy of
-    # itsself, no check nesecary, and no pidfile
-    /usr/sbin/oidentd -u ${USER} -g ${GROUP} ${OPTS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon oidentd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping oidentd Daemon..."
-    # kill the process by it's full name, or the init script
-    # will terminate as well, wreaking havok.
-    killall /usr/sbin/oidentd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon oidentd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/onboard/1012_1011.diff b/community/onboard/1012_1011.diff
deleted file mode 100644
index 233478ac9..000000000
--- a/community/onboard/1012_1011.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-=== modified file 'setup.py'
---- setup.py	2012-08-09 13:21:31 +0000
-+++ setup.py	2012-10-18 17:17:38 +0000
-@@ -11,12 +11,6 @@
- from distutils.core import Extension, Command
- from distutils      import version
- 
--# Work around encoding error in python3-distutils-extra
--# when building in pbuilder with LANG=C (LP# 1017468).
--if sys.version_info.major == 3:
--    import locale
--    locale.getpreferredencoding = lambda: 'UTF-8'
--
- try:
-     import DistUtilsExtra.auto
- except ImportError:
-
diff --git a/community/onboard/1013_1012.diff b/community/onboard/1013_1012.diff
deleted file mode 100644
index a00b4ecf9..000000000
--- a/community/onboard/1013_1012.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-=== modified file 'Onboard/Config.py'
---- Onboard/Config.py	2012-10-18 16:17:12 +0000
-+++ Onboard/Config.py	2012-10-18 17:19:00 +0000
-@@ -73,7 +73,7 @@
- DEFAULT_RESIZE_HANDLES     = list(Handle.RESIZERS)
- 
- SCHEMA_VERSION_0_97         = Version(1, 0)   # Onboard 0.97
--SCHEMA_VERSION_0_98       = Version(2, 0)   # Onboard 0.97.1
-+SCHEMA_VERSION_0_98         = Version(2, 0)   # Onboard 0.97.1
- SCHEMA_VERSION              = SCHEMA_VERSION_0_98
- 
- 
-@@ -145,7 +145,7 @@
-         Singleton magic.
-         """
-         if not hasattr(cls, "self"):
--            cls.self = object.__new__(cls, args, kwargs)
-+            cls.self = object.__new__(cls, *args, **kwargs)
-             cls.self.construct()
-         return cls.self
- 
-
diff --git a/community/onboard/PKGBUILD b/community/onboard/PKGBUILD
index a9ec80086..fd70bc2db 100644
--- a/community/onboard/PKGBUILD
+++ b/community/onboard/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79142 2012-10-31 02:45:48Z bgyorgy $
+# $Id: PKGBUILD 84150 2013-02-12 01:00:22Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=onboard
@@ -20,5 +20,11 @@ md5sums=('7b44ab2873ca7b76ff1d9ab0b3398487')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  python3 setup.py build
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   python3 setup.py install --root=$pkgdir/ --optimize=1
 }
diff --git a/community/openbsd-netcat/PKGBUILD b/community/openbsd-netcat/PKGBUILD
index ff18b9fa1..d3c2524c5 100644
--- a/community/openbsd-netcat/PKGBUILD
+++ b/community/openbsd-netcat/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 80338 2012-11-20 10:54:30Z spupykin $
+# $Id: PKGBUILD 86494 2013-03-18 11:55:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
 
 pkgname="openbsd-netcat"
-pkgver=1.105
-pkgrel=5
-_patch=7
+pkgver=1.105_7
+pkgrel=6
 pkgdesc="TCP/IP swiss army knife. OpenBSD variant."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/sid/netcat-openbsd"
@@ -14,13 +13,13 @@ depends=('libbsd')
 makedepends=('gcc' 'make')
 provides=('netcat')
 conflicts=('gnu-netcat')
-source=("http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}.orig.tar.gz"
-	"http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}-${_patch}.debian.tar.gz")
+source=("http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver%_*}.orig.tar.gz"
+	"http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver/_/-}.debian.tar.gz")
 md5sums=('7e67b22f1ad41a1b7effbb59ff28fca1'
          'e914f8eb7eda5c75c679dd77787ac76b')
 
 build() {
-  cd $srcdir/netcat-openbsd-${pkgver}
+  cd $srcdir/netcat-openbsd-${pkgver%_*}
   for i in `cat ../debian/patches/series`; do
 	echo "** patch $i" 1>&2
 	cat "../debian/patches/$i"
@@ -31,7 +30,7 @@ build() {
 }
 
 package() {
-  cd $srcdir/netcat-openbsd-${pkgver}
+  cd $srcdir/netcat-openbsd-${pkgver%_*}
   install -Dm0755 nc $pkgdir/usr/bin/nc
   ln -s nc $pkgdir/usr/bin/netcat
   install -Dm0644 nc.1 $pkgdir/usr/share/man/man1/nc.1
diff --git a/community/opencc/PKGBUILD b/community/opencc/PKGBUILD
index 6f5214c50..ff1cf4e6a 100644
--- a/community/opencc/PKGBUILD
+++ b/community/opencc/PKGBUILD
@@ -1,25 +1,41 @@
-# $Id: PKGBUILD 79884 2012-11-14 13:43:08Z fyan $
+# $Id: PKGBUILD 88293 2013-04-16 02:22:14Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
-pkgname=opencc
-pkgver=0.3.0
-pkgrel=1
-pkgdesc="Library for Open Chinese Convert"
-arch=('i686' 'x86_64' 'mips64el')
+pkgbase=opencc
+pkgname=(opencc opencc-doc)
+pkgver=0.4.2
+pkgrel=2
 url="http://code.google.com/p/opencc/"
+arch=('i686' 'x86_64' 'mips64el')
 license=('Apache')
-depends=('glibc')
-makedepends=('cmake')
-source=("http://opencc.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
+makedepends=('cmake' 'doxygen')
+source=("http://opencc.googlecode.com/files/${pkgbase}-${pkgver}.tar.gz")
 
 build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
+  cd "$srcdir/${pkgbase}-${pkgver}"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCUMENTATION:BOOL=ON
   make
 }
 
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
+package_opencc() {
+  pkgdesc="Library for Open Chinese Convert"
+  depends=('glibc')
+
+  cd "$srcdir/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+  
+  # Remove docs - install in splitted package
+  rm -r "$pkgdir/usr/share/opencc/doc"
 }
-md5sums=('84462870e5d491da24bb33a5fb494911')
+
+package_opencc-doc() {
+  pkgdesc="Documentation for Library for Open Chinese Convert"
+
+  cd "$srcdir/${pkgbase}-${pkgver}/doc"
+  make DESTDIR="${pkgdir}" install
+
+  # Remove manpages - already installed in main package
+  rm -r "$pkgdir/usr/share/man"
+}
+
+md5sums=('d5c001098e824dae0e3debb1b864304b')
diff --git a/community/opencollada/PKGBUILD b/community/opencollada/PKGBUILD
deleted file mode 100644
index cf2af3acb..000000000
--- a/community/opencollada/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 83397 2013-01-31 10:18:08Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-pkgname=opencollada
-pkgver=20130130
-pkgrel=1
-pkgdesc="Stream based reader and writer library for COLLADA files"
-arch=(i686 x86_64)
-url="https://github.com/KhronosGroup/OpenCOLLADA"
-license=('GPL')
-depends=('libxml2' 'pcre')
-makedepends=('git' 'cmake')
-
-_gitroot=git://github.com/KhronosGroup/OpenCOLLADA.git
-_gitname=opencollada
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [[ -d "$_gitname" ]]; then
-    cd "$_gitname" && git pull origin
-    msg "The local files are updated."
-  else
-    git clone "$_gitroot" "$_gitname"
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
-
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
-  cmake .. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DUSE_SHARED=ON
-  make
-}
-
-package() {
-  cd "$srcdir/$_gitname-build/build"
-
-  make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/opencolorio/PKGBUILD b/community/opencolorio/PKGBUILD
index 80b9323e2..03af2a79f 100644
--- a/community/opencolorio/PKGBUILD
+++ b/community/opencolorio/PKGBUILD
@@ -2,23 +2,25 @@
 # Contributor: Dumitru Ursu <dima@ceata.org>
 
 pkgname=opencolorio
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="A color management framework for visual effects and animation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://opencolorio.org"
 license=('BSD')
-depends=('python')
+depends=('python' 'lcms2' 'tinyxml')
 makedepends=('cmake')
 source=(http://github.com/imageworks/OpenColorIO/tarball/v$pkgver)
-sha1sums=('01befa5c4198254b8848946ba3c85cce9a0f38d4')
+sha1sums=('9b9bac9ed85c84f53775686eb72f3d612b148fef')
 
 build() 
 {
-  mv imageworks-OpenColorIO-b3cb224 $pkgname-$pkgver
+  mv imageworks-OpenColorIO-* $pkgname-$pkgver
   cd $pkgname-$pkgver
-   
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .
+
+  [ "$CARCH" = "mips64el" ] && extra=-DOCIO_USE_SSE=OFF
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_EXTERNAL_LCMS=ON -DUSE_EXTERNAL_TINYXML=ON -DPYTHON=/usr/bin/python2 $extra .
   make 
 }
 
diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD
index edd1ed051..a6ddb975d 100644
--- a/community/opendkim/PKGBUILD
+++ b/community/opendkim/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82828 2013-01-24 15:21:21Z spupykin $
+# $Id: PKGBUILD 87200 2013-03-28 14:27:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Thomas Jost <schnouki@schnouki.net>
 
 pkgname=opendkim
-pkgver=2.7.4
+pkgver=2.8.2
 pkgrel=1
 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter."
 arch=(i686 x86_64)
@@ -18,7 +18,7 @@ source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.g
 	opendkim.conf
 	opendkim.rc
 	opendkim.service)
-md5sums=('310063cabe530eb0b5c16103334b3bb0'
+md5sums=('62d7b22f3b15049e3692caa28bcc801e'
          '3e2bb1058ac0662f01e675aa6ac7ee8f'
          '093f5c098a45cc68753f97e45a5b374c'
          'bc1b73856bc1941faaa4842e00437cb5')
diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD
index 79422ba20..2505880c7 100644
--- a/community/openimageio/PKGBUILD
+++ b/community/openimageio/PKGBUILD
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD 83263 2013-01-28 16:49:50Z stephane $
+# $Id: PKGBUILD 89826 2013-05-02 16:18:15Z svenstaro $
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=openimageio
-pkgver=1.1.2
-pkgrel=2
-pkgdesc="A library for reading and writing images, including classes, utilities, and applications."
+pkgver=1.1.10
+pkgrel=1
+pkgdesc="A library for reading and writing images, including classes, utilities, and applications"
 arch=(i686 x86_64)
 url="http://www.openimageio.org/"
 license=('custom')
-depends=('openexr' 'boost-libs' 'jasper' 'glew')
-makedepends=('cmake' 'qt' 'python2' 'boost' 'mesa')
-optdepends=('qt: iv image viewer'
+depends=('openexr' 'boost-libs' 'jasper' 'glew' 'libtiff' 'opencolorio' 'intel-tbb')
+makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa')
+optdepends=('qt4: iv image viewer'
             'python2: bindings support')
-source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver
-        fix32bit-fail.patch)
-md5sums=('8a5fd88f87fbf1826a4782041cf9e7d0'
-         '64403604d0b74bd6c50fe8638207116a')
+source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver)
+md5sums=('e5c5cd77238f74c3a6a3610c211430f2')
 
 build() {
   cd "$srcdir"/$_pkgname*
 
-  patch -Np1 < $srcdir/fix32bit-fail.patch
-
   cd src
 
   [[ -d build ]] && rm -r build
   mkdir build && cd build
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages ..
+  cmake \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \
+      -DUSE_EXTERNAL_TBB=ON \
+      ..
   make
 }
 
diff --git a/community/openocd/PKGBUILD b/community/openocd/PKGBUILD
index 807f3888d..e8e28114f 100644
--- a/community/openocd/PKGBUILD
+++ b/community/openocd/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 80930 2012-12-07 05:30:32Z bpiotrowski $
+# $Id: PKGBUILD 89932 2013-05-05 20:07:45Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Matthias Bauch <matthias.bauch@gmail.com>
 # Contributor: Laszlo Papp <djszapi2 at gmail com>
 # Contributor: Samuel Tardieu <sam@rfc1149.net>
 
 pkgname=openocd
-pkgver=0.6.1
-pkgrel=2
+pkgver=0.7.0
+pkgrel=1
 pkgdesc='Debugging, in-system programming and boundary-scan testing for embedded target devices'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://openocd.berlios.de'
@@ -15,17 +15,17 @@ depends=('libftdi')
 options=(!strip !libtool)
 install=openocd.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('946421efc2414ff89bdaf3f588b230f8')
+sha256sums=('52237b786530c8460b221556c26fa4779f668b7dcb83ff14b8c5eb2050f38e63')
 
-_features=(amtjtagaccel arm-jtag-ew buspirate ep93xxat91rm9200gw16012 ft2232_libftdi ftdi jlink oocd_trace parport presto_libftdi rlink stlink ulink usbprog vsllink)
+_features=(amtjtagaccel arm-jtag-ew at91rm9200 buspirate ep93xx ft2232_libftdi ftdi gw16012 jlink oocd_trace opendous osbdm parport presto_libftdi remote-bitbang rlink stlink ti-icdi ulink usbprog vsllink)
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr ${_features[@]/#/--enable-} --disable-werror
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD
index 2cc27e414..8feb63055 100644
--- a/community/openscenegraph/PKGBUILD
+++ b/community/openscenegraph/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75758 2012-08-30 21:03:09Z spupykin $
+# $Id: PKGBUILD 85379 2013-03-01 10:36:28Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Hans Janssen <janserv@gmail.com>
 # Contributor: my64 <packages@obordes.com>
@@ -6,14 +6,14 @@
 
 pkgname=openscenegraph
 pkgver=3.0.1
-pkgrel=7
+pkgrel=9
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')
 url="http://www.openscenegraph.org"
 depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth')
-makedepends=('cmake' 'libvncserver' 'qt' 'ffmpeg-compat')
-optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt')
+makedepends=('cmake' 'libvncserver' 'qt4' 'ffmpeg-compat' 'mesa')
+optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt4')
 conflicts=('openthreads')
 provides=('openthreads')
 source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip
diff --git a/community/openshadinglanguage/PKGBUILD b/community/openshadinglanguage/PKGBUILD
index 92df51c92..1ff9bef08 100644
--- a/community/openshadinglanguage/PKGBUILD
+++ b/community/openshadinglanguage/PKGBUILD
@@ -1,27 +1,29 @@
+# $Id: PKGBUILD 88615 2013-04-20 16:45:08Z heftig $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=openshadinglanguage
-pkgver=1.2.1
-pkgrel=1
+pkgver=1.3.0
+pkgrel=4
 pkgdesc="Advanced shading language for production GI renderers"
 arch=(i686 x86_64)
 url="http://code.google.com/p/openshadinglanguage/"
 license=('custom')
 depends=('boost-libs' 'openimageio' 'openexr' 'llvm' 'intel-tbb' 'freetype2' 'libpng' 'libtiff')
 makedepends=('boost' 'cmake' 'clang')
-source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz
-        llvm32.patch)
-md5sums=('5635d0c3005d839b9590b49c20e8b821'
-         '3147f26453b28a971688ab6e54933449')
+source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz)
+md5sums=('1e8c47475cb092cec0aada843b2893ed')
 
 build() {
   cd OpenShadingLanguage-Release-$pkgver/src
 
-  patch -Np2 < $srcdir/llvm32.patch
-
   [[ -d build ]] && rm -r build
   mkdir build && cd build
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+  # TODO: Remove LLVM_STATIC with llvm 3.3 when we'll have shared libs
+  # Check blender for crash with llvm pipe (run LIBGL_ALWAYS_SOFTWARE=1 blender)
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLLVM_STATIC=ON \
+    ..
   make
 }
 
@@ -30,14 +32,12 @@ package() {
 
   make DESTDIR="$pkgdir/" install
 
-  mkdir -p $pkgdir/usr/share/OSL/
-  mkdir -p $pkgdir/usr/share/licenses/$pkgname
-  ls $pkgdir/usr/LICENSE
-  ls $pkgdir/usr/share/licenses/$pkgname
-  mv $pkgdir/usr/LICENSE $pkgdir/usr/share/licenses/$pkgname
-  mv $pkgdir/usr/{CHANGES,README,INSTALL} $pkgdir/usr/share/OSL/
-  mv $pkgdir/usr/doc $pkgdir/usr/share/OSL/doc
-  mv $pkgdir/usr/shaders $pkgdir/usr/share/OSL/shaders
+  mkdir -p "$pkgdir"/usr/share/OSL/
+  mkdir -p "$pkgdir"/usr/share/licenses/$pkgname
+  mv "$pkgdir"/usr/LICENSE "$pkgdir"/usr/share/licenses/$pkgname # TODO: Tell upstream about this shit
+  mv "$pkgdir"/usr/{CHANGES,README.md,INSTALL} "$pkgdir"/usr/share/OSL/
+  mv "$pkgdir"/usr/doc "$pkgdir"/usr/share/OSL/doc
+  mv "$pkgdir"/usr/shaders "$pkgdir"/usr/share/OSL/shaders
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD
index 2f066b791..adcd0fd97 100644
--- a/community/opensips/PKGBUILD
+++ b/community/opensips/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 78612 2012-10-22 09:08:59Z spupykin $
+# $Id: PKGBUILD 88548 2013-04-19 16:08:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=opensips
-pkgver=1.8.1
-pkgrel=3
+pkgver=1.9.0
+pkgrel=1
 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..."
 url="http://www.opensips.org"
 depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2')
-makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmysqlclient'
+makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmariadbclient'
 	     'lynx' 'libxslt')
 optdepends=('postgresql-libs'
 	    'unixodbc'
 	    'libldap'
-	    'libmysqlclient'
+	    'libmariadbclient'
 	    'libsasl'
 	    'python2'
 	    'pcre')
@@ -26,9 +26,9 @@ options=('!emptydirs' 'zipman' '!makeflags' 'docs')
 source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz
 	opensips.init
 	opensips.service)
-md5sums=('4a7cc708a5fba6ab3d1a3aa0aaa85d77'
+md5sums=('2d989e49c9f5f6bd6d0910937fd49802'
          '685fbe00826df1285b410d4610dcbb0c'
-         '0d80ef75b5c10324e6db790b7741c2eb')
+         '7b786d758fe3174af34e2ced44b549e7')
 
 build()
 {
@@ -42,6 +42,14 @@ build()
 
   make \
 	include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \
+	TLS=1 LIBDIR=lib
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver-tls/
+
+  make \
+	include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \
 	TLS=1 DESTDIR=$pkgdir/usr LIBDIR=lib install
 
   # Conforms to the arch packaging standards (http://wiki.archlinux.org/index.php/Arch_Packaging_Standards)
diff --git a/community/opensips/opensips.service b/community/opensips/opensips.service
index 042ff7c9a..81f6fd93e 100644
--- a/community/opensips/opensips.service
+++ b/community/opensips/opensips.service
@@ -5,7 +5,7 @@ After=network.target remote-fs.target nss-lookup.target
 [Service]
 Type=forking
 PIDFile=/var/run/opensips.pid
-ExecStart=/usr/bin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /var/run/opensips.pid
+ExecStart=/usr/sbin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /var/run/opensips.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/opensmtpd/PKGBUILD b/community/opensmtpd/PKGBUILD
new file mode 100644
index 000000000..50d75be6e
--- /dev/null
+++ b/community/opensmtpd/PKGBUILD
@@ -0,0 +1,69 @@
+# $Id: PKGBUILD 88532 2013-04-19 11:57:55Z seblu $
+# Maintainer: Sébastien Luttringer
+
+pkgname=opensmtpd
+pkgver=5.3.1p1
+pkgrel=2
+pkgdesc='Free implementation of the server-side SMTP protocol'
+arch=('i686' 'x86_64')
+url='http://www.opensmtpd.org/'
+license=('custom')
+depends=('libevent')
+provides=('smtp-server' 'smtp-forwarder')
+conflicts=('smtp-server' 'smtp-forwarder')
+backup=('etc/smtpd.conf' 'etc/aliases' 'etc/virtual' 'etc/secrets')
+install=opensmtpd.install
+source=("http://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz"
+        'smtpd.service'
+        'smtpd.socket')
+md5sums=('0ee036a473f19fe27012cda0068cd287'
+         'a278f272d97a9fe5a8aac784a7c98d67'
+         'c2c01e9ca78df3f65efe40a7c0e17ee0')
+
+build() {
+  cd $pkgname-$pkgver
+  ./bootstrap
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --sbindir=/usr/bin \
+    --libexecdir=/usr/bin \
+    --with-maildir=/var/spool/mail \
+    --with-privsep-path=/var/empty \
+    --with-sock-dir=/run \
+    --with-privsep-user=mail \
+    --with-filter-user=mail \
+    --with-queue-user=mail \
+    --with-pam
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir/" install
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  cd "$pkgdir"
+  # working directory
+  install -dm711 var/spool/smtpd
+  # license
+  install -Dm644 "$srcdir/smtpd.service" usr/lib/systemd/system/smtpd.service
+  install -Dm644 "$srcdir/smtpd.socket" usr/lib/systemd/system/smtpd.socket
+  # remove duplicate hardlink into a subfolder
+  rm -r usr/bin/opensmtpd
+  # empty aliases file
+  install -Dm644 /dev/null "$pkgdir/etc/aliases"
+  install -Dm644 /dev/null "$pkgdir/etc/virtual"
+  install -Dm640 /dev/null "$pkgdir/etc/secrets"
+  # fake sendmail binary (used to be smtp-forwarder)
+  # use hardlink as upstream does...
+  cd "$pkgdir/usr/bin"
+  ln smtpctl "$pkgdir/usr/bin/sendmail"
+  # symlink binary from usr/bin to usr/sbin (waiting /usr merge)
+  install -dm755 "$pkgdir/usr/sbin"
+  for _p in *; do
+    ln -s "../bin/$_p" "$pkgdir/usr/sbin/$_p"
+  done
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/opensmtpd/opensmtpd.install b/community/opensmtpd/opensmtpd.install
new file mode 100644
index 000000000..0e3d8c0e1
--- /dev/null
+++ b/community/opensmtpd/opensmtpd.install
@@ -0,0 +1,14 @@
+# arg 1:  the new package version
+# arg 2:  the old package version
+
+# arg 1:  the new package version
+post_install() {
+  makemap -t aliases /etc/aliases
+}
+
+# arg 1:  the old package version
+post_remove() {
+ rm -f /etc/aliases.db
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/pdnsd/pdnsd.service b/community/opensmtpd/smtpd.service
index 5821dbcb2..0ad21825c 100644
--- a/community/pdnsd/pdnsd.service
+++ b/community/opensmtpd/smtpd.service
@@ -1,9 +1,10 @@
 [Unit]
-Description=proxy name server
+Description=OpenSMTPD
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/pdnsd
+Type=forking
+ExecStart=/usr/bin/smtpd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/opensmtpd/smtpd.socket b/community/opensmtpd/smtpd.socket
new file mode 100644
index 000000000..5d1d105cb
--- /dev/null
+++ b/community/opensmtpd/smtpd.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=OpenSMTPD Socket
+
+[Socket]
+ListenStream=/run/smtpd.sock
+
+[Install]
+WantedBy=sockets.target
diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD
index 99851f24f..09bb1b52b 100644
--- a/community/openssh-askpass/PKGBUILD
+++ b/community/openssh-askpass/PKGBUILD
@@ -3,13 +3,13 @@
 # Contributor: Massimiliano Torromeo <Massimiliano.Torromeo AT gmail DOT com>
 
 pkgname=openssh-askpass
-pkgver=1.3.6
+pkgver=2.0.0
 pkgrel=1
 pkgdesc='A plasma-like passphrase dialog for ssh'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.phenix.bnl.gov/WWW/publish/hpereira/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=1'
 license=('GPL')
-depends=('openssh' 'qt')
+depends=('openssh' 'qt4')
 makedepends=('cmake')
 provides=('x11-ssh-askpass')
 conflicts=('x11-ssh-askpass')
@@ -25,11 +25,12 @@ build() {
   cmake -DCMAKE_INSTALL_PREFIX="/usr" ..
   make
 }
+
 package() {
   cd "$srcdir/$pkgname-$pkgver/build"
   make DESTDIR="$pkgdir" install
   install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh"
 }
 
-md5sums=('795519396f070038857cd35710e2ff85'
+md5sums=('99b31e5bc2c12f91cc88869661ad92be'
          '961738244318f3723ba99cdcaac91a21')
diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD
index b1dda7907..f6bd2ec85 100644
--- a/community/openttd/PKGBUILD
+++ b/community/openttd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 83874 2013-02-05 23:22:09Z lcarlier $
+# $Id: PKGBUILD 87676 2013-04-05 09:01:28Z lcarlier $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=openttd
-pkgver=1.2.3
-pkgrel=4
+pkgver=1.3.0
+pkgrel=1
 pkgdesc='An engine for running Transport Tycoon Deluxe.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.openttd.org'
@@ -13,7 +13,7 @@ install=openttd.install
 optdepends=('openttd-opengfx: free graphics' 
             'openttd-opensfx: free soundset')
 source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")
-sha256sums=('d228798f7d4804b7ead186ec19082f0e6c83cfc2dbf625ddab1d22048117fd08')
+sha256sums=('1a3525186f4486de8193992426690a1fd8c7e4d376a328056b0464a1a5d32080')
 
 package() {
   cd ${pkgname}-${pkgver} 
diff --git a/community/opera/PKGBUILD b/community/opera/PKGBUILD
deleted file mode 100644
index cc9bb472c..000000000
--- a/community/opera/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 81340 2012-12-18 09:39:07Z idevolder $
-# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
-# Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com >
-# Contributor: Mateusz Herych <heniekk@gmail.com>
-# Contributor: ruario <ruario AT opera DOT com>
-# Contributor: Daniel Isenmann <daniel AT archlinux DOT org>
-# Contributor: dorphell <dorphell AT archlinux DOT org>
-# Contributor: Sigitas Mazaliauskas <sigis AT gmail DOT com>
-
-pkgname=opera
-_ver=12.12
-_build=1707
-pkgver=$_ver.$_build
-pkgrel=1
-pkgdesc='Fast and secure web browser and Internet suite'
-arch=('i686' 'x86_64')
-url='http://www.opera.com/browser/'
-license=('custom:opera')
-depends=('gcc-libs' 'libxt' 'freetype2' 'libxext' 'glib2'
-         'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils')
-optdepends=('gstreamer0.10-base-plugins: HTML5 Video support'
-            'gstreamer0.10-good: HTML5 Video support')
-install=$pkgname.install
-options=(!strip !zipman)
-
-if [[ $CARCH == i686 ]]; then
-  _arch=i386
-  source=(http://ftp.opera.com/pub/opera/linux/${_ver/./}/opera-${_ver}-${_build}.${_arch}.linux.tar.xz)
-  sha256sums=('7f766faa08d62be616ea43cf4bb026c8b6afb5a51fa8eae1227f16d5658779ca')
-elif [[ $CARCH == x86_64 ]]; then
-  _arch=$CARCH
-  source=(http://ftp.opera.com/pub/opera/linux/${_ver/./}/opera-${_ver}-${_build}.${_arch}.linux.tar.xz)
-  sha256sums=('1ba428bd5acf4f17a8ef0f970fb9e1334477468abbf21612dd8c2eec5fff9129')
-fi
-
-package() {
-  opera-${_ver}-${_build}.${_arch}.linux/install --prefix /usr --repackage $pkgdir/usr
-  install -Dm 644 $pkgdir/usr/share/$pkgname/defaults/license.txt $pkgdir/usr/share/licenses/$pkgname/license.txt
-}
diff --git a/community/opera/opera.install b/community/opera/opera.install
deleted file mode 100644
index 1190e6fd6..000000000
--- a/community/opera/opera.install
+++ /dev/null
@@ -1,20 +0,0 @@
-available() {
-    which "$1" >/dev/null 2>&1
-}
-
-post_install() {
-	update-mime-database /usr/share/mime >/dev/null
-	update-desktop-database -q /usr/share/applications
-
-	if available gtk-update-icon-cache; then
-			gtk-update-icon-cache -q /usr/share/icons/hicolor
-	fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/community/oprofile/PKGBUILD b/community/oprofile/PKGBUILD
index 941c438b1..18e1b3f0f 100644
--- a/community/oprofile/PKGBUILD
+++ b/community/oprofile/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 83066 2013-01-27 09:59:19Z andrea $
+# $Id: PKGBUILD 85381 2013-03-01 10:36:45Z andrea $
 # Maintainer : Aaron Griffin <aaron@archlinux.org>
 
 pkgname=oprofile
 pkgver=0.9.8
-pkgrel=1
-pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead"
-arch=('i686' 'x86_64')
+pkgrel=2
+pkgdesc='System-wide profiler for Linux systems'
+arch=('i686' 'x86_64' 'mips64el')
 url="http://oprofile.sourceforge.net"
 license=('GPL')
 depends=('popt' 'gcc-libs' 'zlib' 'sh')
-makedepends=('qt')
-optdepends=('qt: for oprof_start gui')
+makedepends=('qt4')
+optdepends=('qt4: for oprof_start gui')
 options=('!libtool')
 install=oprofile.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
 sha1sums=('28416b853641f913e5f90954f2e3837efd96f6cd')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --with-kernel-support --with-x --enable-gui=qt4
   make
diff --git a/community/opus-tools/PKGBUILD b/community/opus-tools/PKGBUILD
index b711af87f..f32d5af1f 100644
--- a/community/opus-tools/PKGBUILD
+++ b/community/opus-tools/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=opus-tools
 pkgver=0.1.6
 pkgrel=1
 pkgdesc='Collection of tools for Opus audio codec'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://wiki.xiph.org/Opus-tools'
 license=('BSD')
 depends=('opus' 'libogg')
diff --git a/community/opusfile/PKGBUILD b/community/opusfile/PKGBUILD
index d7a625073..9dcdffb38 100644
--- a/community/opusfile/PKGBUILD
+++ b/community/opusfile/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=opusfile
 pkgver=0.2
 pkgrel=2
 pkgdesc='Library for opening, seeking, and decoding .opus files'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.opus-codec.org/'
 license=('custom')
 depends=('libogg' 'openssl' 'opus')
diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD
index d799639c8..a6a55f677 100644
--- a/community/oss/PKGBUILD
+++ b/community/oss/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 76238 2012-09-14 22:52:02Z kkeen $
+# $Id: PKGBUILD 86302 2013-03-14 21:30:53Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Florian Pritz <bluewind@xinu.at>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
@@ -8,7 +8,7 @@ pkgbase=oss
 pkgname=oss
 true && pkgname=(oss libflashsupport-oss)
 pkgver=4.2_2007
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.opensound.com/"
 license=('GPL2')
@@ -18,6 +18,7 @@ source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_
 	"rc-script"
 	"soundon.patch"
 	"remove-hal.patch"
+        "linux-3.8.patch"
 	"oss.service"
 	)
 md5sums=('26b9d6951f3eb2eac39a0f42f0dbdae7'
@@ -25,6 +26,7 @@ md5sums=('26b9d6951f3eb2eac39a0f42f0dbdae7'
          'cbcbce5c03b127df5eafa8faa091492c'
          '65f07fe241bfbf912f76d8b6d8f276b5'
          'cd7f1dc6166bba8c94d96f3a28e948a5'
+         'effecefb774f1d08ef9f0af0ad205c34'
          '8db0255b380dc6672993e627d1cd8ca6')
 _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl
 
@@ -56,6 +58,10 @@ build() {
 	sed -i 's|/lib/modules|/usr&|' \
 			os_cmd/Linux/ossvermagic/ossvermagic.c
 
+        pushd "$srcdir/$_dir"
+	patch -p0 -i "${srcdir}/linux-3.8.patch"
+        popd
+
 	msg "Building OSS."
 	make build
 
diff --git a/community/oss/linux-3.8.patch b/community/oss/linux-3.8.patch
new file mode 100644
index 000000000..46200e01a
--- /dev/null
+++ b/community/oss/linux-3.8.patch
@@ -0,0 +1,40 @@
+--- setup/Linux/oss/build/pci_wrapper.inc	2009-08-27 05:19:07.000000000 +0300
++++ setup/Linux/oss/build/pci_wrapper.inc	2013-02-08 13:56:10.519794975 +0200
+@@ -17,7 +17,11 @@
+ static dev_map_t dev_map[MAX_INSTANCE];
+ static int n_devmap = 0;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
+ static int __devinit
++#else
++static int
++#endif
+ osspci_probe (struct pci_dev *pcidev, const struct pci_device_id *pciid)
+ {
+   oss_device_t *osdev;
+@@ -65,7 +69,11 @@
+   return 0;
+ }
+ 
+-static void __devexit
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
++static int __devexit
++#else
++static int
++#endif
+ osspci_remove (struct pci_dev *pcidev)
+ {
+   int i;
+@@ -80,10 +88,11 @@
+ 	pci_disable_device (dev_map[i].pcidev);
+ 	osdev_delete (osdev);
+ 
+-	return;
++	return 0;
+       }
+ 
+   printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n");
++  return -EIO;
+ }
+ 
+ void
diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD
index e84aada0f..39bafce1c 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 75406 2012-08-22 08:09:42Z jconder $
+# $Id: PKGBUILD 87881 2013-04-08 12:41:31Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 pkgbase='packagekit'
-pkgname=('packagekit' 'packagekit-qt2' 'packagekit-python')
+pkgname=('packagekit' 'packagekit-qt2' 'python2-packagekit')
 pkgver=0.7.6
-pkgrel=2
+pkgrel=9
 pkgdesc="A system designed to make installation and updates of packages easier."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.packagekit.org"
 license=('GPL')
 makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool'
-             'networkmanager' 'pacman'  'pm-utils' 'polkit' 'python2' 'qt'
+             'networkmanager' 'pacman'  'pm-utils' 'polkit' 'python2' 'qt4'
              'shared-mime-info' 'sqlite' 'udev')
 options=('!libtool')
 source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz"
-        'adopt.patch')
+        'adopt.patch'
+	'alpm.patch'
+	'libarchive.patch')
 sha256sums=('82c0a553075d49add3c4f58e6e93f7f3613938809a4b8e36f46476e86981b45d'
-            'd0ee8580202a878571dddd470017731299c63e5c5120afe881bb41b9544322b8')
+            'd0ee8580202a878571dddd470017731299c63e5c5120afe881bb41b9544322b8'
+	    'd27c77d3c0e2932fff2916fedcae011bd283904ef7c329dd0dc05163b58d7415'
+	    '0d3798c8992afdc0930aa271b3e44deb55c046ab4adee25b4ec4c33bcdd950e2')
 
 build() {
   cd "$srcdir/PackageKit-$pkgver"
@@ -25,9 +29,11 @@ build() {
   sed -i 's@bin/python@bin/python2@' 'lib/python/packagekit/'*.py
 
   patch -Np1 -i "$srcdir/adopt.patch"
+  patch -Np1 -i "$srcdir/alpm.patch"
+  patch -Np1 -i "$srcdir/libarchive.patch"
 
   export PYTHON=/usr/bin/python2
-  ./configure --prefix=/usr \
+  ./autogen.sh --prefix=/usr \
               --sysconfdir=/etc \
               --localstatedir=/var \
               --libexecdir=/usr/lib/PackageKit \
@@ -46,14 +52,14 @@ build() {
               --disable-dummy \
               --enable-alpm \
               --with-default-backend=alpm
-  make -s CFLAGS='-D_FILE_OFFSET_BITS=64'
+  make -s CFLAGS='-D_FILE_OFFSET_BITS=64 -O2 -Wno-unused-local-typedefs'
 }
 
 package_packagekit() {
   backup=('var/lib/PackageKit/transactions.db'
           'etc/PackageKit/alpm.d/pacman.conf'
           'etc/PackageKit/alpm.d/repos.list')
-  depends=('dbus-glib' 'pacman>=4.0.0' 'pacman<4.1.0' 'polkit'
+  depends=('dbus-glib' 'pacman>=4.1.0' 'pacman<4.2.0' 'polkit'
            'shared-mime-info' 'sqlite' 'udev')
   optdepends=('networkmanager')
   install='packagekit.install'
@@ -78,7 +84,7 @@ package_packagekit() {
 }
 
 package_packagekit-qt2() {
-  depends=('packagekit' 'qt')
+  depends=('packagekit' 'qt4')
   pkgdesc=('Qt bindings for PackageKit')
 
   cd "$srcdir/PackageKit-$pkgver/lib/packagekit-qt2"
@@ -86,9 +92,11 @@ package_packagekit-qt2() {
   make DESTDIR="$pkgdir" install
 }
 
-package_packagekit-python() {
+package_python2-packagekit() {
   depends=('packagekit' 'python2')
   pkgdesc=('Python bindings for PackageKit')
+  conflicts=('packagekit-python')
+  replaces=('packagekit-python')
 
   cd "$srcdir/PackageKit-$pkgver/lib/python"
 
diff --git a/community/packagekit/alpm.patch b/community/packagekit/alpm.patch
new file mode 100644
index 000000000..8b972b291
--- /dev/null
+++ b/community/packagekit/alpm.patch
@@ -0,0 +1,1613 @@
+diff --git a/backends/alpm/Makefile.am b/backends/alpm/Makefile.am
+index d8c3dfc..8e14790 100644
+--- a/backends/alpm/Makefile.am
++++ b/backends/alpm/Makefile.am
+@@ -23,6 +23,7 @@ DEFS = -DPK_BACKEND_CONFIG_FILE=\"$(PK_BACKEND_CONFIG_FILE)\" \
+        -DPK_BACKEND_DEFAULT_LOGFILE=\"$(PK_BACKEND_DEFAULT_LOGFILE)\" \
+        -DALPM_CACHE_PATH=\"$(ALPM_CACHE_PATH)\" \
+        -DALPM_PACKAGE_URL=\"$(ALPM_PACKAGE_URL)\" \
++       -DPK_LOG_PREFIX=\"PACKAGEKIT\" \
+        -DG_LOG_DOMAIN=\"PackageKit-alpm\"
+ 
+ confdir = $(PK_CONF_DIR)/alpm.d
+@@ -47,10 +48,11 @@ libpk_backend_alpm_la_SOURCES = pk-backend-alpm.c \
+ 				pk-backend-transaction.c \
+ 				pk-backend-update.c
+ libpk_backend_alpm_la_LIBADD = $(PK_PLUGIN_LIBS) \
+-			       -lalpm
++			       $(ALPM_LIBS)
+ libpk_backend_alpm_la_LDFLAGS = -module \
+ 				-avoid-version
+ libpk_backend_alpm_la_CFLAGS = $(PK_PLUGIN_CFLAGS) \
++			       $(ALPM_CFLAGS) \
+ 			       $(WARNINGFLAGS_C)
+ 
+ EXTRA_DIST = $(conf_DATA) $(libpk_backend_alpm_la_SOURCES:.c=.h)
+diff --git a/backends/alpm/pk-backend-alpm.c b/backends/alpm/pk-backend-alpm.c
+index 5c6b629..a4cd197 100644
+--- a/backends/alpm/pk-backend-alpm.c
++++ b/backends/alpm/pk-backend-alpm.c
+@@ -284,9 +284,9 @@ pk_backend_initialize_alpm (PkBackend *self, GError **error)
+ 	backend = self;
+ 	alpm_option_set_logcb (alpm, pk_backend_logcb);
+ 
+-	localdb = alpm_option_get_localdb (alpm);
++	localdb = alpm_get_localdb (alpm);
+ 	if (localdb == NULL) {
+-		enum _alpm_errno_t errno = alpm_errno (alpm);
++		alpm_errno_t errno = alpm_errno (alpm);
+ 		g_set_error (error, ALPM_ERROR, errno, "[%s]: %s", "local",
+ 			     alpm_strerror (errno));
+ 	}
+diff --git a/backends/alpm/pk-backend-config.c b/backends/alpm/pk-backend-config.c
+index c8fd13b..03adb47 100644
+--- a/backends/alpm/pk-backend-config.c
++++ b/backends/alpm/pk-backend-config.c
+@@ -33,35 +33,32 @@
+ 
+ typedef struct
+ {
+-	 gboolean	 checkspace, ilovecandy, totaldl, usedelta, usesyslog,
+-			 verbosepkglists;
++	 gboolean		 checkspace, color, ilovecandy, totaldl,
++				 usesyslog, verbosepkglists;
++	 gdouble		 deltaratio;
+ 
+-	 gchar		*arch, *cleanmethod, *dbpath, *gpgdir, *logfile, *root,
+-			*xfercmd;
++	 gchar			*arch, *cleanmethod, *dbpath, *gpgdir, *logfile,
++				*root, *xfercmd;
+ 
+-	 alpm_list_t	*cachedirs, *holdpkgs, *ignoregroups, *ignorepkgs,
+-			*noextracts, *noupgrades, *syncfirsts;
++	 alpm_list_t		*cachedirs, *holdpkgs, *ignoregroups,
++				*ignorepkgs, *localfilesiglevels, *noextracts,
++				*noupgrades, *remotefilesiglevels;
+ 
+-	 alpm_list_t	*repos;
+-	 GHashTable	*servers;
+-	 GHashTable	*levels;
+-	 GRegex		*xrepo, *xarch;
++	 alpm_list_t		*sections;
++	 GRegex			*xrepo, *xarch;
+ } PkBackendConfig;
+ 
++typedef struct
++{
++	 gchar		*name;
++	 alpm_list_t	*servers, *siglevels;
++} PkBackendConfigSection;
++
+ static PkBackendConfig *
+ pk_backend_config_new (void)
+ {
+ 	PkBackendConfig *config = g_new0 (PkBackendConfig, 1);
+-	alpm_siglevel_t *level = g_new0 (alpm_siglevel_t, 1);
+-
+-	config->servers = g_hash_table_new_full (g_str_hash, g_str_equal,
+-						 g_free, NULL);
+-	config->levels = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+-						g_free);
+-
+-	*level |= ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL;
+-	*level |= ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL;
+-	g_hash_table_insert (config->levels, g_strdup ("options"), level);
++	config->deltaratio = 0.0;
+ 
+ 	config->xrepo = g_regex_new ("\\$repo", 0, 0, NULL);
+ 	config->xarch = g_regex_new ("\\$arch", 0, 0, NULL);
+@@ -70,17 +67,17 @@ pk_backend_config_new (void)
+ }
+ 
+ static void
+-pk_backend_config_list_free (alpm_list_t *list)
++pk_backend_config_section_free (gpointer data)
+ {
+-	alpm_list_free_inner (list, g_free);
+-	alpm_list_free (list);
+-}
++	PkBackendConfigSection *section = data;
+ 
+-static gboolean
+-pk_backend_config_servers_free (gpointer repo, gpointer list, gpointer data)
+-{
+-	pk_backend_config_list_free ((alpm_list_t *) list);
+-	return TRUE;
++	if (section != NULL) {
++		g_free (section->name);
++		alpm_list_free_inner (section->servers, g_free);
++		alpm_list_free (section->servers);
++		FREELIST (section->siglevels);
++		g_free (section);
++	}
+ }
+ 
+ static void
+@@ -100,15 +97,13 @@ pk_backend_config_free (PkBackendConfig *config)
+ 	FREELIST (config->holdpkgs);
+ 	FREELIST (config->ignoregroups);
+ 	FREELIST (config->ignorepkgs);
++	FREELIST (config->localfilesiglevels);
+ 	FREELIST (config->noextracts);
+ 	FREELIST (config->noupgrades);
+-	FREELIST (config->syncfirsts);
++	FREELIST (config->remotefilesiglevels);
+ 
+-	pk_backend_config_list_free (config->repos);
+-	g_hash_table_foreach_remove (config->servers,
+-				     pk_backend_config_servers_free, NULL);
+-	g_hash_table_unref (config->servers);
+-	g_hash_table_unref (config->levels);
++	alpm_list_free_inner (config->sections, pk_backend_config_section_free);
++	alpm_list_free (config->sections);
+ 
+ 	g_regex_unref (config->xrepo);
+ 	g_regex_unref (config->xarch);
+@@ -123,6 +118,14 @@ pk_backend_config_set_checkspace (PkBackendConfig *config)
+ }
+ 
+ static void
++pk_backend_config_set_color (PkBackendConfig *config)
++{
++	g_return_if_fail (config != NULL);
++
++	config->color = TRUE;
++}
++
++static void
+ pk_backend_config_set_ilovecandy (PkBackendConfig *config)
+ {
+ 	g_return_if_fail (config != NULL);
+@@ -143,7 +146,7 @@ pk_backend_config_set_usedelta (PkBackendConfig *config)
+ {
+ 	g_return_if_fail (config != NULL);
+ 
+-	config->usedelta = TRUE;
++	config->deltaratio = 0.7;
+ }
+ 
+ static void
+@@ -171,6 +174,7 @@ typedef struct
+ /* keep this in alphabetical order */
+ static const PkBackendConfigBoolean pk_backend_config_boolean_options[] = {
+ 	{ "CheckSpace", pk_backend_config_set_checkspace },
++	{ "Color", pk_backend_config_set_color },
+ 	{ "ILoveCandy", pk_backend_config_set_ilovecandy },
+ 	{ "TotalDownload", pk_backend_config_set_totaldl },
+ 	{ "UseDelta", pk_backend_config_set_usedelta },
+@@ -284,6 +288,22 @@ pk_backend_config_set_root (PkBackendConfig *config, const gchar *path)
+ }
+ 
+ static void
++pk_backend_config_set_deltaratio (PkBackendConfig *config, const gchar *number)
++{
++	gdouble ratio;
++	gchar *endptr;
++
++	g_return_if_fail (config != NULL);
++	g_return_if_fail (number != NULL);
++
++	ratio = g_ascii_strtod (number, &endptr);
++	/* this ignores invalid values whereas pacman reports an error */
++	if (*endptr == '\0' && 0.0 <= ratio && ratio <= 2.0) {
++		config->deltaratio = ratio;
++	}
++}
++
++static void
+ pk_backend_config_set_xfercmd (PkBackendConfig *config, const gchar *command)
+ {
+ 	g_return_if_fail (config != NULL);
+@@ -308,6 +328,7 @@ static const PkBackendConfigString pk_backend_config_string_options[] = {
+ 	{ "GPGDir", pk_backend_config_set_gpgdir },
+ 	{ "LogFile", pk_backend_config_set_logfile },
+ 	{ "RootDir", pk_backend_config_set_root },
++	{ "UseDelta", pk_backend_config_set_deltaratio },
+ 	{ "XferCommand", pk_backend_config_set_xfercmd },
+ 	{ NULL, NULL }
+ };
+@@ -335,102 +356,51 @@ pk_backend_config_set_string (PkBackendConfig *config, const gchar *option,
+ 	}
+ }
+ 
+-static void
+-pk_backend_config_add_holdpkg (PkBackendConfig *config, gchar *package)
+-{
+-	g_return_if_fail (config != NULL);
+-	g_return_if_fail (package != NULL);
+-
+-	config->holdpkgs = alpm_list_add (config->holdpkgs, package);
+-}
+-
+-static void
+-pk_backend_config_add_ignoregroup (PkBackendConfig *config, gchar *group)
+-{
+-	g_return_if_fail (config != NULL);
+-	g_return_if_fail (group != NULL);
+-
+-	config->ignoregroups = alpm_list_add (config->ignoregroups, group);
+-}
+-
+-static void
+-pk_backend_config_add_ignorepkg (PkBackendConfig *config, gchar *package)
+-{
+-	g_return_if_fail (config != NULL);
+-	g_return_if_fail (package != NULL);
+-
+-	config->ignorepkgs = alpm_list_add (config->ignorepkgs, package);
+-}
+-
+-static void
+-pk_backend_config_add_noextract (PkBackendConfig *config, gchar *filename)
+-{
+-	g_return_if_fail (config != NULL);
+-	g_return_if_fail (filename != NULL);
+-
+-	config->noextracts = alpm_list_add (config->noextracts, filename);
+-}
+-
+-static void
+-pk_backend_config_add_noupgrade (PkBackendConfig *config, gchar *filename)
+-{
+-	g_return_if_fail (config != NULL);
+-	g_return_if_fail (filename != NULL);
+-
+-	config->noupgrades = alpm_list_add (config->noupgrades, filename);
+-}
+-
+-static void
+-pk_backend_config_add_syncfirst (PkBackendConfig *config, gchar *package)
+-{
+-	g_return_if_fail (config != NULL);
+-	g_return_if_fail (package != NULL);
+-
+-	config->syncfirsts = alpm_list_add (config->syncfirsts, package);
+-}
+-
+ typedef struct
+ {
+ 	const gchar	*name;
+-	void		(*func) (PkBackendConfig *config, gchar *value);
++	glong		 offset;
+ } PkBackendConfigList;
+ 
+ /* keep this in alphabetical order */
+ static const PkBackendConfigList pk_backend_config_list_options[] = {
+-	{ "HoldPkg", pk_backend_config_add_holdpkg },
+-	{ "IgnoreGroup", pk_backend_config_add_ignoregroup },
+-	{ "IgnorePkg", pk_backend_config_add_ignorepkg },
+-	{ "NoExtract", pk_backend_config_add_noextract },
+-	{ "NoUpgrade", pk_backend_config_add_noupgrade },
+-	{ "SyncFirst", pk_backend_config_add_syncfirst },
+-	{ NULL, NULL }
++	{ "HoldPkg", G_STRUCT_OFFSET (PkBackendConfig, holdpkgs) },
++	{ "IgnoreGroup", G_STRUCT_OFFSET (PkBackendConfig, ignoregroups) },
++	{ "IgnorePkg", G_STRUCT_OFFSET (PkBackendConfig, ignorepkgs) },
++	{ "LocalFileSigLevel", G_STRUCT_OFFSET (PkBackendConfig,
++						localfilesiglevels) },
++	{ "NoExtract", G_STRUCT_OFFSET (PkBackendConfig, noextracts) },
++	{ "NoUpgrade", G_STRUCT_OFFSET (PkBackendConfig, noupgrades) },
++	{ "RemoteFileSigLevel", G_STRUCT_OFFSET (PkBackendConfig,
++						 remotefilesiglevels) },
++	{ NULL, 0 }
+ };
+ 
+-static void
+-pk_backend_config_list_add (PkBackendConfig *config, gsize option,
+-			    const gchar *list)
++static alpm_list_t *
++alpm_list_add_words (alpm_list_t *list, const gchar *words)
+ {
+ 	gchar *str;
+ 
+-	for (str = strchr (list, ' '); str != NULL; str = strchr (list, ' ')) {
++	while ((str = strchr (words, ' ')) != NULL) {
+ 		/* allocate normally */
+-		gchar *value = malloc ((++str - list) * sizeof (gchar));
+-		g_strlcpy (value, list, str - list);
+-		pk_backend_config_list_options[option].func (config, value);
+-		list = str;
++		gchar *word = malloc ((++str - words) * sizeof (gchar));
++		g_strlcpy (word, words, str - words);
++		list = alpm_list_add (list, word);
++		words = str;
+ 	}
+-	pk_backend_config_list_options[option].func (config, strdup (list));
++
++	return alpm_list_add (list, strdup (words));
+ }
+ 
+ static gboolean
+ pk_backend_config_set_list (PkBackendConfig *config, const gchar *option,
+-			    const gchar *list)
++			    const gchar *words)
+ {
+ 	gsize i;
+ 
+ 	g_return_val_if_fail (config != NULL, FALSE);
+ 	g_return_val_if_fail (option != NULL, FALSE);
+-	g_return_val_if_fail (list != NULL, FALSE);
++	g_return_val_if_fail (words != NULL, FALSE);
+ 
+ 	for (i = 0;; ++i) {
+ 		const gchar *name = pk_backend_config_list_options[i].name;
+@@ -439,37 +409,57 @@ pk_backend_config_set_list (PkBackendConfig *config, const gchar *option,
+ 		if (name == NULL || cmp < 0) {
+ 			return FALSE;
+ 		} else if (cmp == 0) {
+-			pk_backend_config_list_add (config, i, list);
++			glong offset = pk_backend_config_list_options[i].offset;
++			alpm_list_t **list = G_STRUCT_MEMBER_P (config, offset);
++			*list = alpm_list_add_words (*list, words);
+ 			return TRUE;
+ 		}
+ 	}
+ }
+ 
+-static void
+-pk_backend_config_add_repo (PkBackendConfig *config, const gchar *repo)
++static gint
++pk_backend_config_section_match (gconstpointer element, gconstpointer name)
+ {
+-	g_return_if_fail (config != NULL);
+-	g_return_if_fail (repo != NULL);
++	const PkBackendConfigSection *section = element;
++
++	g_return_val_if_fail (section != NULL, -1);
++
++	return g_strcmp0 (section->name, name);
++}
+ 
+-	if (alpm_list_find_str (config->repos, repo) == NULL) {
+-		config->repos = alpm_list_add (config->repos, g_strdup (repo));
++static PkBackendConfigSection *
++pk_backend_config_enter_section (PkBackendConfig *config, const gchar *name)
++{
++	PkBackendConfigSection *section;
++
++	g_return_val_if_fail (config != NULL, NULL);
++	g_return_val_if_fail (name != NULL, NULL);
++
++	section = alpm_list_find (config->sections, name,
++				  pk_backend_config_section_match);
++	if (section != NULL) {
++		return section;
+ 	}
++
++	section = g_new0 (PkBackendConfigSection, 1);
++	section->name = g_strdup (name);
++	config->sections = alpm_list_add (config->sections, section);
++	return section;
+ }
+ 
+ static gboolean
+-pk_backend_config_repo_add_server (PkBackendConfig *config, const gchar *repo,
+-				   const gchar *value, GError **e)
++pk_backend_config_add_server (PkBackendConfig *config,
++			      PkBackendConfigSection *section,
++			      const gchar *address, GError **e)
+ {
+-	alpm_list_t *list;
+ 	gchar *url;
+ 
+ 	g_return_val_if_fail (config != NULL, FALSE);
+-	g_return_val_if_fail (repo != NULL, FALSE);
+-	g_return_val_if_fail (alpm_list_find_str (config->repos, repo) != NULL,
+-			      FALSE);
+-	g_return_val_if_fail (value != NULL, FALSE);
++	g_return_val_if_fail (section != NULL, FALSE);
++	g_return_val_if_fail (address != NULL, FALSE);
+ 
+-	url = g_regex_replace_literal (config->xrepo, value, -1, 0, repo, 0, e);
++	url = g_regex_replace_literal (config->xrepo, address, -1, 0,
++				       section->name, 0, e);
+ 	if (url == NULL) {
+ 		return FALSE;
+ 	}
+@@ -488,105 +478,26 @@ pk_backend_config_repo_add_server (PkBackendConfig *config, const gchar *repo,
+ 			     "url contained $arch, which is not set");
+ 	}
+ 
+-	list = (alpm_list_t *) g_hash_table_lookup (config->servers, repo);
+-	list = alpm_list_add (list, url);
+-	g_hash_table_insert (config->servers, g_strdup (repo), list);
++	section->servers = alpm_list_add (section->servers, url);
+ 
+ 	return TRUE;
+ }
+ 
+-static gboolean
+-pk_backend_config_set_siglevel (PkBackendConfig *config, const gchar *section,
+-				const gchar *list, GError **error)
++static void
++pk_backend_config_add_siglevel (PkBackendConfig *config,
++				PkBackendConfigSection *section,
++				const gchar *words)
+ {
+-	alpm_siglevel_t *level;
+-
+-	g_return_val_if_fail (config != NULL, FALSE);
+-	g_return_val_if_fail (section != NULL, FALSE);
+-	g_return_val_if_fail (list != NULL, FALSE);
+-
+-	level = g_hash_table_lookup (config->levels, section);
+-	if (level == NULL) {
+-		level = g_hash_table_lookup (config->levels, "options");
+-		level = g_memdup (level, sizeof (alpm_siglevel_t));
+-		g_hash_table_insert (config->levels, g_strdup (section), level);
+-	}
+-
+-	while (TRUE) {
+-		gboolean package = TRUE, database = TRUE;
+-
+-		if (g_str_has_prefix (list, "Package")) {
+-			database = FALSE;
+-			list += 7;
+-		} else if (g_str_has_prefix (list, "Database")) {
+-			package = FALSE;
+-			list += 8;
+-		}
+-
+-		/* this also allows e.g. NeverEver, so put prefixes last */
+-		if (g_str_has_prefix (list, "Never")) {
+-			if (package) {
+-				*level &= ~ALPM_SIG_PACKAGE;
+-			}
+-			if (database) {
+-				*level &= ~ALPM_SIG_DATABASE;
+-			}
+-		} else if (g_str_has_prefix (list, "Optional")) {
+-			if (package) {
+-				*level |= ALPM_SIG_PACKAGE;
+-				*level |= ALPM_SIG_PACKAGE_OPTIONAL;
+-			}
+-			if (database) {
+-				*level |= ALPM_SIG_DATABASE;
+-				*level |= ALPM_SIG_DATABASE_OPTIONAL;
+-			}
+-		} else if (g_str_has_prefix (list, "Required")) {
+-			if (package) {
+-				*level |= ALPM_SIG_PACKAGE;
+-				*level &= ~ALPM_SIG_PACKAGE_OPTIONAL;
+-			}
+-			if (database) {
+-				*level |= ALPM_SIG_DATABASE;
+-				*level &= ~ALPM_SIG_DATABASE_OPTIONAL;
+-			}
+-		} else if (g_str_has_prefix (list, "TrustedOnly")) {
+-			if (package) {
+-				*level &= ~ALPM_SIG_PACKAGE_MARGINAL_OK;
+-				*level &= ~ALPM_SIG_PACKAGE_UNKNOWN_OK;
+-			}
+-			if (database) {
+-				*level &= ~ALPM_SIG_DATABASE_MARGINAL_OK;
+-				*level &= ~ALPM_SIG_DATABASE_UNKNOWN_OK;
+-			}
+-		} else if (g_str_has_prefix (list, "TrustAll")) {
+-			if (package) {
+-				*level |= ALPM_SIG_PACKAGE_MARGINAL_OK;
+-				*level |= ALPM_SIG_PACKAGE_UNKNOWN_OK;
+-			}
+-			if (database) {
+-				*level |= ALPM_SIG_DATABASE_MARGINAL_OK;
+-				*level |= ALPM_SIG_DATABASE_UNKNOWN_OK;
+-			}
+-		} else {
+-			g_set_error (error, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID,
+-				     "invalid SigLevel value: %s", list);
+-			return FALSE;
+-		}
+-
+-		list = strchr (list, ' ');
+-		if (list == NULL) {
+-			break;
+-		} else {
+-			++list;
+-		}
+-	}
++	g_return_if_fail (config != NULL);
++	g_return_if_fail (section != NULL);
++	g_return_if_fail (words != NULL);
+ 
+-	return TRUE;
++	section->siglevels = alpm_list_add_words (section->siglevels, words);
+ }
+ 
+ static gboolean
+ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
+-			 gchar *section, GError **error)
++			 PkBackendConfigSection *section, GError **error)
+ {
+ 	GFile *file;
+ 	GFileInputStream *is;
+@@ -610,7 +521,6 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
+ 	}
+ 
+ 	input = g_data_input_stream_new (G_INPUT_STREAM (is));
+-	section = g_strdup (section);
+ 
+ 	for (;; g_free (line), ++num) {
+ 		line = g_data_input_stream_read_line (input, NULL, NULL, &e);
+@@ -642,13 +552,7 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
+ 				break;
+ 			}
+ 
+-			g_free (section);
+-			section = g_strdup (str);
+-
+-			if (g_strcmp0 (section, "options") != 0) {
+-				pk_backend_config_add_repo (config, section);
+-			}
+-
++			section = pk_backend_config_enter_section (config, str);
+ 			continue;
+ 		}
+ 
+@@ -668,7 +572,8 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
+ 
+ 		if (str == NULL) {
+ 			/* set a boolean directive */
+-			if (g_strcmp0 (section, "options") == 0 &&
++			if (pk_backend_config_section_match (section,
++							     "options") == 0 &&
+ 			    pk_backend_config_set_boolean (config, key)) {
+ 				continue;
+ 			}
+@@ -697,7 +602,8 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
+ 			} else {
+ 				continue;
+ 			}
+-		} else if (g_strcmp0 (section, "options") == 0) {
++		} else if (pk_backend_config_section_match (section,
++							    "options") == 0) {
+ 			/* set a string or list directive */
+ 			if (pk_backend_config_set_string (config, key, str) ||
+ 			    pk_backend_config_set_list (config, key, str)) {
+@@ -705,8 +611,8 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
+ 			}
+ 			/* report error below */
+ 		} else if (g_strcmp0 (key, "Server") == 0) {
+-			if (!pk_backend_config_repo_add_server (config, section,
+-								str, &e)) {
++			if (!pk_backend_config_add_server (config, section,
++							   str, &e)) {
+ 				break;
+ 			} else {
+ 				continue;
+@@ -714,12 +620,8 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
+ 		}
+ 	
+ 		if (g_strcmp0 (key, "SigLevel") == 0 && str != NULL) {
+-			if (!pk_backend_config_set_siglevel (config, section,
+-							     str, &e)) {
+-				break;
+-			} else {
+-				continue;
+-			}
++			pk_backend_config_add_siglevel (config, section, str);
++			continue;
+ 		}
+ 
+ 		/* report errors from above */
+@@ -728,8 +630,6 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename,
+ 		break;
+ 	}
+ 
+-	g_free (section);
+-
+ 	g_object_unref (input);
+ 	g_object_unref (is);
+ 	g_object_unref (file);
+@@ -746,7 +646,7 @@ static alpm_handle_t *
+ pk_backend_config_initialize_alpm (PkBackendConfig *config, GError **error)
+ {
+ 	alpm_handle_t *handle;
+-	enum _alpm_errno_t errno;
++	alpm_errno_t errno;
+ 	gsize dir = 1;
+ 
+ 	g_return_val_if_fail (config != NULL, FALSE);
+@@ -817,11 +717,160 @@ pk_backend_config_initialize_alpm (PkBackendConfig *config, GError **error)
+ 	return handle;
+ }
+ 
++static alpm_siglevel_t
++alpm_siglevel_parse (alpm_siglevel_t base, const alpm_list_t *list,
++		     GError **error)
++{
++	for (; list != NULL; list = list->next) {
++		gboolean package = TRUE, database = TRUE;
++		const gchar *level = (const gchar *) list->data;
++
++		if (g_str_has_prefix (level, "Package")) {
++			database = FALSE;
++			level += 7;
++		} else if (g_str_has_prefix (level, "Database")) {
++			package = FALSE;
++			level += 8;
++		}
++
++		if (g_strcmp0 (level, "Never") == 0) {
++			if (package) {
++				base &= ~ALPM_SIG_PACKAGE;
++				base |= ALPM_SIG_PACKAGE_SET;
++			}
++			if (database) {
++				base &= ~ALPM_SIG_DATABASE;
++			}
++		} else if (g_strcmp0 (level, "Optional") == 0) {
++			if (package) {
++				base |= ALPM_SIG_PACKAGE;
++				base |= ALPM_SIG_PACKAGE_OPTIONAL;
++				base |= ALPM_SIG_PACKAGE_SET;
++			}
++			if (database) {
++				base |= ALPM_SIG_DATABASE;
++				base |= ALPM_SIG_DATABASE_OPTIONAL;
++			}
++		} else if (g_strcmp0 (level, "Required") == 0) {
++			if (package) {
++				base |= ALPM_SIG_PACKAGE;
++				base &= ~ALPM_SIG_PACKAGE_OPTIONAL;
++				base |= ALPM_SIG_PACKAGE_SET;
++			}
++			if (database) {
++				base |= ALPM_SIG_DATABASE;
++				base &= ~ALPM_SIG_DATABASE_OPTIONAL;
++			}
++		} else if (g_strcmp0 (level, "TrustedOnly") == 0) {
++			if (package) {
++				base &= ~ALPM_SIG_PACKAGE_MARGINAL_OK;
++				base &= ~ALPM_SIG_PACKAGE_UNKNOWN_OK;
++				base |= ALPM_SIG_PACKAGE_TRUST_SET;
++			}
++			if (database) {
++				base &= ~ALPM_SIG_DATABASE_MARGINAL_OK;
++				base &= ~ALPM_SIG_DATABASE_UNKNOWN_OK;
++			}
++		} else if (g_strcmp0 (level, "TrustAll") == 0) {
++			if (package) {
++				base |= ALPM_SIG_PACKAGE_MARGINAL_OK;
++				base |= ALPM_SIG_PACKAGE_UNKNOWN_OK;
++				base |= ALPM_SIG_PACKAGE_TRUST_SET;
++			}
++			if (database) {
++				base |= ALPM_SIG_DATABASE_MARGINAL_OK;
++				base |= ALPM_SIG_DATABASE_UNKNOWN_OK;
++			}
++		} else {
++			g_set_error (error, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID,
++				     "invalid SigLevel value: %s", level);
++			return ALPM_SIG_USE_DEFAULT;
++		}
++	}
++
++	return base;
++}
++
++static alpm_siglevel_t
++alpm_siglevel_cross (alpm_siglevel_t base, const alpm_list_t *list,
++		     GError **error)
++{
++	alpm_siglevel_t level;
++
++	if (list == NULL) {
++		return base;
++	}
++
++	level = alpm_siglevel_parse (0, list, error);
++	if (level == ALPM_SIG_USE_DEFAULT) {
++		return level;
++	}
++
++	/* based on unexplained code in pacman */
++	if ((level & ALPM_SIG_PACKAGE_SET) == 0) {
++		level |= base & (ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL);
++	}
++	if ((level & ALPM_SIG_PACKAGE_TRUST_SET) == 0) {
++		level |= base & (ALPM_SIG_PACKAGE_MARGINAL_OK |
++				 ALPM_SIG_PACKAGE_UNKNOWN_OK);
++	}
++
++	return level;
++}
++
++static gboolean
++pk_backend_config_configure_repos (PkBackendConfig *config,
++				   alpm_handle_t *handle, GError **error)
++{
++	alpm_siglevel_t base, local, remote;
++	const alpm_list_t *i;
++	PkBackendConfigSection *options;
++
++	g_return_val_if_fail (config != NULL, FALSE);
++
++	base = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL |
++	       ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL;
++
++	i = config->sections;
++	options = i->data;
++
++	base = alpm_siglevel_parse (base, options->siglevels, error);
++	if (base == ALPM_SIG_USE_DEFAULT) {
++		return FALSE;
++	}
++
++	local = alpm_siglevel_cross (base, config->localfilesiglevels, error);
++	if (local == ALPM_SIG_USE_DEFAULT) {
++		return FALSE;
++	}
++
++	remote = alpm_siglevel_cross (base, config->remotefilesiglevels, error);
++	if (remote == ALPM_SIG_USE_DEFAULT) {
++		return FALSE;
++	}
++
++	alpm_option_set_default_siglevel (handle, base);
++	alpm_option_set_local_file_siglevel (handle, local);
++	alpm_option_set_remote_file_siglevel (handle, remote);
++
++	while ((i = i->next) != NULL) {
++		PkBackendConfigSection *repo = i->data;
++		alpm_siglevel_t level;
++
++		level = alpm_siglevel_parse (base, repo->siglevels, error);
++		if (level == ALPM_SIG_USE_DEFAULT) {
++			return FALSE;
++		}
++		pk_backend_add_database (repo->name, repo->servers, level);
++	}
++
++	return TRUE;
++}
++
+ static alpm_handle_t *
+ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
+ {
+ 	alpm_handle_t *handle;
+-	alpm_siglevel_t *level;
+ 
+ 	g_return_val_if_fail (config != NULL, FALSE);
+ 
+@@ -831,12 +880,9 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
+ 	}
+ 
+ 	alpm_option_set_checkspace (handle, config->checkspace);
+-	alpm_option_set_usedelta (handle, config->usedelta);
+ 	alpm_option_set_usesyslog (handle, config->usesyslog);
+ 	alpm_option_set_arch (handle, config->arch);
+-
+-	level = g_hash_table_lookup (config->levels, "options");
+-	alpm_option_set_default_siglevel (handle, *level);
++	alpm_option_set_deltaratio (handle, config->deltaratio);
+ 
+ 	/* backend takes ownership */
+ 	g_free (xfercmd);
+@@ -854,11 +900,6 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
+ 	holdpkgs = config->holdpkgs;
+ 	config->holdpkgs = NULL;
+ 
+-	/* backend takes ownership */
+-	FREELIST (syncfirsts);
+-	syncfirsts = config->syncfirsts;
+-	config->syncfirsts = NULL;
+-
+ 	/* alpm takes ownership */
+ 	alpm_option_set_ignoregroups (handle, config->ignoregroups);
+ 	config->ignoregroups = NULL;
+@@ -875,8 +916,7 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error)
+ 	alpm_option_set_noupgrades (handle, config->noupgrades);
+ 	config->noupgrades = NULL;
+ 
+-	pk_backend_configure_repos (config->repos, config->servers,
+-				    config->levels);
++	pk_backend_config_configure_repos (config, handle, error);
+ 
+ 	return handle;
+ }
+@@ -892,6 +932,7 @@ pk_backend_configure (const gchar *filename, GError **error)
+ 
+ 	g_debug ("reading config from %s", filename);
+ 	config = pk_backend_config_new ();
++	pk_backend_config_enter_section (config, "options");
+ 
+ 	if (pk_backend_config_parse (config, filename, NULL, &e)) {
+ 		handle = pk_backend_config_configure_alpm (config, &e);
+diff --git a/backends/alpm/pk-backend-databases.c b/backends/alpm/pk-backend-databases.c
+index a123297..09d5a73 100644
+--- a/backends/alpm/pk-backend-databases.c
++++ b/backends/alpm/pk-backend-databases.c
+@@ -140,8 +140,8 @@ disabled_repos_configure (GHashTable *table, gboolean only_trusted,
+ 	g_return_val_if_fail (table != NULL, FALSE);
+ 	g_return_val_if_fail (alpm != NULL, FALSE);
+ 
+-	if (alpm_db_unregister_all (alpm) < 0) {
+-		enum _alpm_errno_t errno = alpm_errno (alpm);
++	if (alpm_unregister_all_syncdbs (alpm) < 0) {
++		alpm_errno_t errno = alpm_errno (alpm);
+ 		g_set_error_literal (error, ALPM_ERROR, errno,
+ 				     alpm_strerror (errno));
+ 		return FALSE;
+@@ -161,9 +161,9 @@ disabled_repos_configure (GHashTable *table, gboolean only_trusted,
+ 			level &= ~ALPM_SIG_USE_DEFAULT;
+ 		}
+ 
+-		db = alpm_db_register_sync (alpm, repo->name, level);
++		db = alpm_register_syncdb (alpm, repo->name, level);
+ 		if (db == NULL) {
+-			enum _alpm_errno_t errno = alpm_errno (alpm);
++			alpm_errno_t errno = alpm_errno (alpm);
+ 			g_set_error (error, ALPM_ERROR, errno, "[%s]: %s",
+ 				     repo->name, alpm_strerror (errno));
+ 			return FALSE;
+@@ -176,29 +176,18 @@ disabled_repos_configure (GHashTable *table, gboolean only_trusted,
+ }
+ 
+ void
+-pk_backend_configure_repos (alpm_list_t *repos, GHashTable *servers,
+-			    GHashTable *levels)
++pk_backend_add_database (const gchar *name, alpm_list_t *servers,
++			 alpm_siglevel_t level)
+ {
+-	alpm_list_t *i;
+-
+-	g_return_if_fail (servers != NULL);
+-
+-	for (i = repos; i != NULL; i = i->next) {
+-		PkBackendRepo *repo = g_new (PkBackendRepo, 1);
+-		gpointer value = g_hash_table_lookup (servers, i->data);
++	PkBackendRepo *repo = g_new (PkBackendRepo, 1);
+ 
+-		repo->name = g_strdup ((const gchar *) i->data);
+-		repo->servers = alpm_list_strdup ((alpm_list_t *) value);
++	g_return_if_fail (name != NULL);
+ 
+-		value = g_hash_table_lookup (levels, i->data);
+-		if (value != NULL) {
+-			repo->level = *(alpm_siglevel_t *) value;
+-		} else {
+-			repo->level = ALPM_SIG_USE_DEFAULT;
+-		}
++	repo->name = g_strdup (name);
++	repo->servers = alpm_list_strdup (servers);
++	repo->level = level;
+ 
+-		configured = alpm_list_add (configured, repo);
+-	}
++	configured = alpm_list_add (configured, repo);
+ }
+ 
+ gboolean
+@@ -282,7 +271,7 @@ pk_backend_get_repo_list_thread (PkBackend *self)
+ 	g_return_val_if_fail (disabled != NULL, FALSE);
+ 
+ 	/* emit enabled repos */
+-	for (i = alpm_option_get_syncdbs (alpm); i != NULL; i = i->next) {
++	for (i = alpm_get_syncdbs (alpm); i != NULL; i = i->next) {
+ 		alpm_db_t *db = (alpm_db_t *) i->data;
+ 		const gchar *repo = alpm_db_get_name (db);
+ 
+@@ -368,13 +357,13 @@ pk_backend_repo_disable_thread (PkBackend *self)
+ 
+ 	g_return_val_if_fail (repo != NULL, FALSE);
+ 
+-	for (i = alpm_option_get_syncdbs (alpm); i != NULL; i = i->next) {
++	for (i = alpm_get_syncdbs (alpm); i != NULL; i = i->next) {
+ 		alpm_db_t *db = (alpm_db_t *) i->data;
+ 		const gchar *name = alpm_db_get_name (db);
+ 
+ 		if (g_strcmp0 (repo, name) == 0) {
+ 			if (alpm_db_unregister (db) < 0) {
+-				enum _alpm_errno_t errno = alpm_errno (alpm);
++				alpm_errno_t errno = alpm_errno (alpm);
+ 				g_set_error (&error, ALPM_ERROR, errno,
+ 					     "[%s]: %s", repo,
+ 					     alpm_strerror (errno));
+diff --git a/backends/alpm/pk-backend-databases.h b/backends/alpm/pk-backend-databases.h
+index d9b9e78..d0dbb7c 100644
+--- a/backends/alpm/pk-backend-databases.h
++++ b/backends/alpm/pk-backend-databases.h
+@@ -24,9 +24,9 @@
+ #include <alpm.h>
+ #include <pk-backend.h>
+ 
+-void		 pk_backend_configure_repos		(alpm_list_t *repos,
+-							 GHashTable *servers,
+-							 GHashTable *levels);
++void		 pk_backend_add_database		(const gchar *name,
++							 alpm_list_t *servers,
++							 alpm_siglevel_t level);
+ 
+ gboolean	 pk_backend_disable_signatures		(PkBackend *self,
+ 							 GError **error);
+diff --git a/backends/alpm/pk-backend-depends.c b/backends/alpm/pk-backend-depends.c
+index 7c7b45a..c3d82a0 100644
+--- a/backends/alpm/pk-backend-depends.c
++++ b/backends/alpm/pk-backend-depends.c
+@@ -85,7 +85,7 @@ pk_backend_find_provider (PkBackend *self, alpm_list_t *pkgs,
+ 	}
+ 
+ 	/* look for remote dependencies */
+-	syncdbs = alpm_option_get_syncdbs (alpm);
++	syncdbs = alpm_get_syncdbs (alpm);
+ 	provider = alpm_find_dbs_satisfier (alpm, syncdbs, depend);
+ 
+ 	if (provider != NULL) {
+@@ -184,7 +184,7 @@ pk_backend_get_depends_thread (PkBackend *self)
+ 			depend = alpm_dep_compute_string (depends->data);
+ 			pkgs = pk_backend_find_provider (self, pkgs, depend,
+ 							 &error);
+-			g_free (depend);
++			free (depend);
+ 		}
+ 	}
+ 
+diff --git a/backends/alpm/pk-backend-install.c b/backends/alpm/pk-backend-install.c
+index d0cbca2..0b036f3 100644
+--- a/backends/alpm/pk-backend-install.c
++++ b/backends/alpm/pk-backend-install.c
+@@ -39,7 +39,7 @@ alpm_add_file (const gchar *filename)
+ 	g_return_val_if_fail (filename != NULL, -1);
+ 	g_return_val_if_fail (alpm != NULL, -1);
+ 
+-	level = alpm_option_get_default_siglevel (alpm);
++	level = alpm_option_get_local_file_siglevel (alpm);
+ 
+ 	if (alpm_pkg_load (alpm, filename, 1, level, &pkg) < 0) {
+ 		return -1;
+@@ -66,7 +66,7 @@ pk_backend_transaction_add_targets (PkBackend *self, GError **error)
+ 
+ 	for (; *paths != NULL; ++paths) {
+ 		if (alpm_add_file (*paths) < 0) {
+-			enum _alpm_errno_t errno = alpm_errno (alpm);
++			alpm_errno_t errno = alpm_errno (alpm);
+ 			g_set_error (error, ALPM_ERROR, errno, "%s: %s",
+ 				     *paths, alpm_strerror (errno));
+ 			return FALSE;
+diff --git a/backends/alpm/pk-backend-packages.c b/backends/alpm/pk-backend-packages.c
+index c90cd7d..86b1ef7 100644
+--- a/backends/alpm/pk-backend-packages.c
++++ b/backends/alpm/pk-backend-packages.c
+@@ -42,7 +42,7 @@ alpm_pkg_build_id (alpm_pkg_t *pkg)
+ 	}
+ 
+ 	/* TODO: check correctness */
+-	if (alpm_pkg_get_origin (pkg) == PKG_FROM_SYNCDB) {
++	if (alpm_pkg_get_origin (pkg) == ALPM_PKG_FROM_SYNCDB) {
+ 		repo = alpm_db_get_name (alpm_pkg_get_db (pkg));
+ 	} else {
+ 		repo = "installed";
+@@ -84,7 +84,7 @@ pk_backend_find_pkg (PkBackend *self, const gchar *package_id, GError **error)
+ 	if (g_strcmp0 (repo_id, "installed") == 0) {
+ 		db = localdb;
+ 	} else {
+-		const alpm_list_t *i = alpm_option_get_syncdbs (alpm);
++		const alpm_list_t *i = alpm_get_syncdbs (alpm);
+ 		for (; i != NULL; i = i->next) {
+ 			const gchar *repo = alpm_db_get_name (i->data);
+ 
+@@ -140,7 +140,7 @@ pk_backend_resolve_package (PkBackend *self, const gchar *package,
+ 					  PK_FILTER_ENUM_NOT_INSTALLED);
+ 	skip_remote = pk_bitfield_contain (filters, PK_FILTER_ENUM_INSTALLED);
+ 
+-	if (alpm_pkg_get_origin (pkg) == PKG_FROM_LOCALDB) {
++	if (alpm_pkg_get_origin (pkg) == ALPM_PKG_FROM_LOCALDB) {
+ 		if (!skip_local) {
+ 			pk_backend_pkg (self, pkg, PK_INFO_ENUM_INSTALLED);
+ 		}
+@@ -179,7 +179,7 @@ pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error)
+ 			return TRUE;
+ 		}
+ 	} else if (!skip_remote) {
+-		const alpm_list_t *i = alpm_option_get_syncdbs (alpm);
++		const alpm_list_t *i = alpm_get_syncdbs (alpm);
+ 		for (; i != NULL; i = i->next) {
+ 			pkg = alpm_db_get_pkg (i->data, name);
+ 			if (pkg != NULL) {
+@@ -287,7 +287,7 @@ pk_backend_get_details_thread (PkBackend *self)
+ 		desc = alpm_pkg_get_desc (pkg);
+ 		url = alpm_pkg_get_url (pkg);
+ 
+-		if (alpm_pkg_get_origin (pkg) == PKG_FROM_LOCALDB) {
++		if (alpm_pkg_get_origin (pkg) == ALPM_PKG_FROM_LOCALDB) {
+ 			size = alpm_pkg_get_isize (pkg);
+ 		} else {
+ 			size = alpm_pkg_download_size (pkg);
+diff --git a/backends/alpm/pk-backend-remove.c b/backends/alpm/pk-backend-remove.c
+index 1993061..331684f 100644
+--- a/backends/alpm/pk-backend-remove.c
++++ b/backends/alpm/pk-backend-remove.c
+@@ -48,7 +48,7 @@ pk_backend_transaction_remove_targets (PkBackend *self, GError **error)
+ 
+ 		alpm_pkg_t *pkg = alpm_db_get_pkg (localdb, name);
+ 		if (pkg == NULL || alpm_remove_pkg (alpm, pkg) < 0) {
+-			enum _alpm_errno_t errno = alpm_errno (alpm);
++			alpm_errno_t errno = alpm_errno (alpm);
+ 			g_set_error (error, ALPM_ERROR, errno, "%s: %s", name,
+ 				     alpm_strerror (errno));
+ 			g_strfreev (package);
+diff --git a/backends/alpm/pk-backend-search.c b/backends/alpm/pk-backend-search.c
+index c4e80ae..4cfeeb2 100644
+--- a/backends/alpm/pk-backend-search.c
++++ b/backends/alpm/pk-backend-search.c
+@@ -374,7 +374,7 @@ pk_backend_search_thread (PkBackend *self)
+ 		goto out;
+ 	}
+ 
+-	for (i = alpm_option_get_syncdbs (alpm); i != NULL; i = i->next) {
++	for (i = alpm_get_syncdbs (alpm); i != NULL; i = i->next) {
+ 		if (pk_backend_cancelled (self)) {
+ 			break;
+ 		}
+diff --git a/backends/alpm/pk-backend-sync.c b/backends/alpm/pk-backend-sync.c
+index d2f363b..80d5ae0 100644
+--- a/backends/alpm/pk-backend-sync.c
++++ b/backends/alpm/pk-backend-sync.c
+@@ -48,7 +48,7 @@ pk_backend_transaction_sync_targets (PkBackend *self, GError **error)
+ 		gchar *repo = package[PK_PACKAGE_ID_DATA];
+ 		gchar *name = package[PK_PACKAGE_ID_NAME];
+ 
+-		const alpm_list_t *i = alpm_option_get_syncdbs (alpm);
++		const alpm_list_t *i = alpm_get_syncdbs (alpm);
+ 		alpm_pkg_t *pkg;
+ 
+ 		for (; i != NULL; i = i->next) {
+@@ -58,7 +58,7 @@ pk_backend_transaction_sync_targets (PkBackend *self, GError **error)
+ 		}
+ 
+ 		if (i == NULL) {
+-			enum _alpm_errno_t errno = ALPM_ERR_DB_NOT_FOUND;
++			alpm_errno_t errno = ALPM_ERR_DB_NOT_FOUND;
+ 			g_set_error (error, ALPM_ERROR, errno, "%s/%s: %s",
+ 				     repo, name, alpm_strerror (errno));
+ 			g_strfreev (package);
+@@ -67,7 +67,7 @@ pk_backend_transaction_sync_targets (PkBackend *self, GError **error)
+ 
+ 		pkg = alpm_db_get_pkg (i->data, name);
+ 		if (pkg == NULL || alpm_add_pkg (alpm, pkg) < 0) {
+-			enum _alpm_errno_t errno = alpm_errno (alpm);
++			alpm_errno_t errno = alpm_errno (alpm);
+ 			g_set_error (error, ALPM_ERROR, errno, "%s/%s: %s",
+ 				     repo, name, alpm_strerror (errno));
+ 			g_strfreev (package);
+@@ -274,7 +274,7 @@ pk_backend_update_packages_thread (PkBackend *self)
+ 	for (i = asdeps; i != NULL; i = i->next) {
+ 		const gchar *name = (const gchar *) i->data;
+ 		alpm_pkg_t *pkg = alpm_db_get_pkg (localdb, name);
+-		alpm_db_set_pkgreason (alpm, pkg, ALPM_PKG_REASON_DEPEND);
++		alpm_pkg_set_reason (pkg, ALPM_PKG_REASON_DEPEND);
+ 	}
+ 
+ out:
+diff --git a/backends/alpm/pk-backend-transaction.c b/backends/alpm/pk-backend-transaction.c
+index 76402f0..5e32151 100644
+--- a/backends/alpm/pk-backend-transaction.c
++++ b/backends/alpm/pk-backend-transaction.c
+@@ -63,7 +63,7 @@ alpm_pkg_has_basename (alpm_pkg_t *pkg, const gchar *basename)
+ 		return TRUE;
+ 	}
+ 
+-	if (alpm_option_get_usedelta (alpm) == 0) {
++	if (alpm_option_get_deltaratio (alpm) == 0.0) {
+ 		return FALSE;
+ 	}
+ 
+@@ -210,16 +210,18 @@ pk_backend_transaction_progress_cb (alpm_progress_t type, const gchar *target,
+ 	static gint recent = 101;
+ 	gsize overall = percent + (current - 1) * 100;
+ 
+-	/* TODO: revert when fixed upstream */
++	/* TODO: remove block if/when this is made consistent upstream */
+ 	if (type == ALPM_PROGRESS_CONFLICTS_START ||
+ 	    type == ALPM_PROGRESS_DISKSPACE_START ||
+ 	    type == ALPM_PROGRESS_INTEGRITY_START ||
+-	    type == ALPM_PROGRESS_LOAD_START) {
++	    type == ALPM_PROGRESS_LOAD_START ||
++	    type == ALPM_PROGRESS_KEYRING_START) {
+ 		if (current < targets) {
+-			overall = percent + current++ * 100;
++			++current;
++			overall += 100;
+ 		}
+ 	}
+-	
++
+ 	if (current < 1 || targets < current) {
+ 		g_warning ("TODO: CURRENT/TARGETS FAILED for %d", type);
+ 	}
+@@ -233,11 +235,14 @@ pk_backend_transaction_progress_cb (alpm_progress_t type, const gchar *target,
+ 	switch (type) {
+ 		case ALPM_PROGRESS_ADD_START:
+ 		case ALPM_PROGRESS_UPGRADE_START:
++		case ALPM_PROGRESS_DOWNGRADE_START:
++		case ALPM_PROGRESS_REINSTALL_START:
+ 		case ALPM_PROGRESS_REMOVE_START:
+ 		case ALPM_PROGRESS_CONFLICTS_START:
+ 		case ALPM_PROGRESS_DISKSPACE_START:
+ 		case ALPM_PROGRESS_INTEGRITY_START:
+ 		case ALPM_PROGRESS_LOAD_START:
++		case ALPM_PROGRESS_KEYRING_START:
+ 			if (percent == recent) {
+ 				break;
+ 			}
+@@ -388,6 +393,17 @@ pk_backend_output (PkBackend *self, const gchar *output)
+ }
+ 
+ static void
++pk_backend_output_once (PkBackend *self, alpm_pkg_t *pkg, const gchar *output)
++{
++	g_return_if_fail (self != NULL);
++	g_return_if_fail (pkg != NULL);
++	g_return_if_fail (output != NULL);
++
++	pk_backend_message (self, PK_MESSAGE_ENUM_UNKNOWN, "<b>%s</b>\n%s",
++			    alpm_pkg_get_name (pkg), output);
++}
++
++static void
+ pk_backend_transaction_dep_resolve (PkBackend *self)
+ {
+ 	g_return_if_fail (self != NULL);
+@@ -427,7 +443,8 @@ pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg)
+ 	name = alpm_pkg_get_name (pkg);
+ 	version = alpm_pkg_get_version (pkg);
+ 
+-	alpm_logaction (alpm, "installed %s (%s)\n", name, version);
++	alpm_logaction (alpm, PK_LOG_PREFIX, "installed %s (%s)\n", name,
++			version);
+ 	pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED);
+ 
+ 	optdepends = alpm_pkg_get_optdepends (pkg);
+@@ -435,8 +452,10 @@ pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg)
+ 		pk_backend_output (self, "Optional dependencies:\n");
+ 
+ 		for (i = optdepends; i != NULL; i = i->next) {
+-			const gchar *depend = i->data;
++			gchar *depend = alpm_dep_compute_string (i->data);
+ 			gchar *output = g_strdup_printf ("%s\n", depend);
++			free (depend);
++
+ 			pk_backend_output (self, output);
+ 			g_free (output);
+ 		}
+@@ -467,7 +486,8 @@ pk_backend_transaction_remove_done (PkBackend *self, alpm_pkg_t *pkg)
+ 	name = alpm_pkg_get_name (pkg);
+ 	version = alpm_pkg_get_version (pkg);
+ 
+-	alpm_logaction (alpm, "removed %s (%s)\n", name, version);
++	alpm_logaction (alpm, PK_LOG_PREFIX, "removed %s (%s)\n", name,
++			version);
+ 	pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED);
+ 	pk_backend_output_end (self);
+ }
+@@ -498,45 +518,106 @@ pk_backend_transaction_upgrade_start (PkBackend *self, alpm_pkg_t *pkg,
+ 	pk_backend_output_start (self, pkg);
+ }
+ 
++static gint
++alpm_depend_compare (gconstpointer a, gconstpointer b)
++{
++	const alpm_depend_t *first = a;
++	const alpm_depend_t *second = b;
++	gint result;
++
++	g_return_val_if_fail (first != NULL, 0);
++	g_return_val_if_fail (second != NULL, 0);
++
++	result = g_strcmp0 (first->name, second->name);
++	if (result == 0) {
++		result = first->mod - second->mod;
++		if (result == 0) {
++			result = g_strcmp0 (first->version, second->version);
++			if (result == 0) {
++				result = g_strcmp0 (first->desc, second->desc);
++			}
++		}
++	}
++
++	return result;
++}
++
+ static void
+-pk_backend_transaction_upgrade_done (PkBackend *self, alpm_pkg_t *pkg,
+-				     alpm_pkg_t *old)
++pk_backend_transaction_process_new_optdepends (PkBackend *self, alpm_pkg_t *pkg,
++					       alpm_pkg_t *old)
+ {
+-	const gchar *name, *pre, *post;
+-	const alpm_list_t *i;
+ 	alpm_list_t *optdepends;
++	const alpm_list_t *i;
+ 
+ 	g_return_if_fail (self != NULL);
+ 	g_return_if_fail (pkg != NULL);
+ 	g_return_if_fail (old != NULL);
++
++	optdepends = alpm_list_diff (alpm_pkg_get_optdepends (pkg),
++				     alpm_pkg_get_optdepends (old),
++				     alpm_depend_compare);
++	if (optdepends == NULL) {
++		return;
++	}
++
++	pk_backend_output (self, "New optional dependencies:\n");
++
++	for (i = optdepends; i != NULL; i = i->next) {
++		gchar *depend = alpm_dep_compute_string (i->data);
++		gchar *output = g_strdup_printf ("%s\n", depend);
++		free (depend);
++
++		pk_backend_output (self, output);
++		g_free (output);
++	}
++
++	alpm_list_free (optdepends);
++}
++
++static void
++pk_backend_transaction_upgrade_done (PkBackend *self, alpm_pkg_t *pkg,
++				     alpm_pkg_t *old, gint direction)
++{
++	const gchar *name, *pre, *post;
++
++	g_return_if_fail (self != NULL);
++	g_return_if_fail (pkg != NULL);
++	g_return_if_fail (old != NULL || direction == 0);
+ 	g_return_if_fail (alpm != NULL);
+ 
+ 	name = alpm_pkg_get_name (pkg);
+-	pre = alpm_pkg_get_version (old);
++	if (direction != 0) {
++		pre = alpm_pkg_get_version (old);
++	}
+ 	post = alpm_pkg_get_version (pkg);
+ 
+-	alpm_logaction (alpm, "upgraded %s (%s -> %s)\n", name, pre, post);
++	if (direction > 0) {
++		alpm_logaction (alpm, PK_LOG_PREFIX, "upgraded %s (%s -> %s)\n",
++				name, pre, post);
++	} else if (direction < 0) {
++		alpm_logaction (alpm, PK_LOG_PREFIX,
++				"downgraded %s (%s -> %s)\n", name, pre, post);
++	} else {
++		alpm_logaction (alpm, PK_LOG_PREFIX, "reinstalled %s (%s)\n",
++				name, post);
++	}
+ 	pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED);
+ 
+-	optdepends = alpm_list_diff (alpm_pkg_get_optdepends (pkg),
+-				     alpm_pkg_get_optdepends (old),
+-				     (alpm_list_fn_cmp) g_strcmp0);
+-	if (optdepends != NULL) {
+-		pk_backend_output (self, "New optional dependencies:\n");
+-
+-		for (i = optdepends; i != NULL; i = i->next) {
+-			const gchar *depend = i->data;
+-			gchar *output = g_strdup_printf ("%s\n", depend);
+-			pk_backend_output (self, output);
+-			g_free (output);
+-		}
+-
+-		alpm_list_free (optdepends);
++	if (direction != 0) {
++		pk_backend_transaction_process_new_optdepends (self, pkg, old);
+ 	}
+ 	pk_backend_output_end (self);
+ }
+ 
+ static void
++pk_backend_transaction_sig_check (PkBackend *self)
++{
++	g_return_if_fail (self != NULL);
++
++	pk_backend_set_status (self, PK_STATUS_ENUM_SIG_CHECK);
++}
++
++static void
+ pk_backend_transaction_setup (PkBackend *self)
+ {
+ 	g_return_if_fail (self != NULL);
+@@ -545,12 +626,46 @@ pk_backend_transaction_setup (PkBackend *self)
+ }
+ 
+ static void
++pk_backend_transaction_repackaging (PkBackend *self)
++{
++	g_return_if_fail (self != NULL);
++
++	pk_backend_set_status (self, PK_STATUS_ENUM_REPACKAGING);
++}
++
++static void
++pk_backend_transaction_download (PkBackend *self)
++{
++	g_return_if_fail (self != NULL);
++
++	pk_backend_set_status (self, PK_STATUS_ENUM_DOWNLOAD);
++}
++
++static void
++pk_backend_transaction_optdepend_required (PkBackend *self, alpm_pkg_t *pkg,
++					   alpm_depend_t *optdepend)
++{
++	gchar *depend, *output;
++
++	g_return_if_fail (self != NULL);
++	g_return_if_fail (pkg != NULL);
++	g_return_if_fail (optdepend != NULL);
++
++	depend = alpm_dep_compute_string (optdepend);
++	output = g_strdup_printf ("optionally requires %s\n", depend);
++	free (depend);
++
++	pk_backend_output_once (self, pkg, output);
++	g_free (output);
++}
++
++static void
+ pk_backend_transaction_event_cb (alpm_event_t event, gpointer data,
+ 				 gpointer old)
+ {
+ 	g_return_if_fail (backend != NULL);
+ 
+-	/* figure out the backend status and package info */
++	/* figure out backend status and process package changes */
+ 	switch (event) {
+ 		case ALPM_EVENT_CHECKDEPS_START:
+ 		case ALPM_EVENT_RESOLVEDEPS_START:
+@@ -559,7 +674,6 @@ pk_backend_transaction_event_cb (alpm_event_t event, gpointer data,
+ 
+ 		case ALPM_EVENT_FILECONFLICTS_START:
+ 		case ALPM_EVENT_INTERCONFLICTS_START:
+-		case ALPM_EVENT_INTEGRITY_START:
+ 		case ALPM_EVENT_DELTA_INTEGRITY_START:
+ 		case ALPM_EVENT_DISKSPACE_START:
+ 			pk_backend_transaction_test_commit (backend);
+@@ -582,23 +696,73 @@ pk_backend_transaction_event_cb (alpm_event_t event, gpointer data,
+ 			break;
+ 
+ 		case ALPM_EVENT_UPGRADE_START:
++		case ALPM_EVENT_DOWNGRADE_START:
++		case ALPM_EVENT_REINSTALL_START:
+ 			pk_backend_transaction_upgrade_start (backend, data,
+ 							      old);
+ 			break;
+ 
+ 		case ALPM_EVENT_UPGRADE_DONE:
+ 			pk_backend_transaction_upgrade_done (backend, data,
+-							     old);
++							     old, 1);
++			break;
++
++		case ALPM_EVENT_DOWNGRADE_DONE:
++			pk_backend_transaction_upgrade_done (backend, data,
++							     old, -1);
++			break;
++
++		case ALPM_EVENT_REINSTALL_DONE:
++			pk_backend_transaction_upgrade_done (backend, data,
++							     old, 0);
++			break;
++
++		case ALPM_EVENT_INTEGRITY_START:
++		case ALPM_EVENT_KEYRING_START:
++			pk_backend_transaction_sig_check (backend);
+ 			break;
+ 
+ 		case ALPM_EVENT_LOAD_START:
+ 			pk_backend_transaction_setup (backend);
+ 			break;
+ 
++		case ALPM_EVENT_DELTA_PATCHES_START:
++		case ALPM_EVENT_DELTA_PATCH_START:
++			pk_backend_transaction_repackaging (backend);
++			break;
++
+ 		case ALPM_EVENT_SCRIPTLET_INFO:
+ 			pk_backend_output (backend, data);
+ 			break;
+ 
++		case ALPM_EVENT_RETRIEVE_START:
++			pk_backend_transaction_download (backend);
++			break;
++
++		case ALPM_EVENT_OPTDEP_REQUIRED:
++			/* TODO: remove if this results in notification spam */
++			pk_backend_transaction_optdepend_required (backend,
++								   data, old);
++			break;
++
++		case ALPM_EVENT_CHECKDEPS_DONE:
++		case ALPM_EVENT_FILECONFLICTS_DONE:
++		case ALPM_EVENT_RESOLVEDEPS_DONE:
++		case ALPM_EVENT_INTERCONFLICTS_DONE:
++		case ALPM_EVENT_INTEGRITY_DONE:
++		case ALPM_EVENT_LOAD_DONE:
++		case ALPM_EVENT_DELTA_INTEGRITY_DONE:
++		case ALPM_EVENT_DELTA_PATCHES_DONE:
++		case ALPM_EVENT_DELTA_PATCH_DONE:
++		case ALPM_EVENT_DELTA_PATCH_FAILED:
++		case ALPM_EVENT_DISKSPACE_DONE:
++		case ALPM_EVENT_DATABASE_MISSING:
++		case ALPM_EVENT_KEYRING_DONE:
++		case ALPM_EVENT_KEY_DOWNLOAD_START:
++		case ALPM_EVENT_KEY_DOWNLOAD_DONE:
++			/* ignored */
++			break;
++
+ 		default:
+ 			g_debug ("unhandled event %d", event);
+ 			break;
+@@ -623,7 +787,7 @@ pk_backend_transaction_initialize (PkBackend *self, alpm_transflag_t flags,
+ 	g_return_val_if_fail (cancellable != NULL, FALSE);
+ 
+ 	if (alpm_trans_init (alpm, flags) < 0) {
+-		enum _alpm_errno_t errno = alpm_errno (alpm);
++		alpm_errno_t errno = alpm_errno (alpm);
+ 		g_set_error_literal (error, ALPM_ERROR, errno,
+ 				     alpm_strerror (errno));
+ 		return FALSE;
+@@ -692,6 +856,7 @@ alpm_depend_free (alpm_depend_t *depend)
+ {
+ 	free (depend->name);
+ 	free (depend->version);
++	free (depend->desc);
+ 	free (depend);
+ }
+ 
+@@ -731,7 +896,7 @@ alpm_conflict_build_list (const alpm_list_t *i)
+ 			g_string_append_printf (list, "%s <-> %s (%s), ",
+ 						conflict->package1,
+ 						conflict->package2, reason);
+-			g_free (reason);
++			free (reason);
+ 		}
+ 	}
+ 
+@@ -837,12 +1002,12 @@ pk_backend_transaction_simulate (PkBackend *self, GError **error)
+ 	}
+ 
+ 	if (prefix != NULL) {
+-		enum _alpm_errno_t errno = alpm_errno (alpm);
++		alpm_errno_t errno = alpm_errno (alpm);
+ 		g_set_error (error, ALPM_ERROR, errno, "%s: %s", prefix,
+ 			     alpm_strerror (errno));
+ 		g_free (prefix);
+ 	} else {
+-		enum _alpm_errno_t errno = alpm_errno (alpm);
++		alpm_errno_t errno = alpm_errno (alpm);
+ 		g_set_error_literal (error, ALPM_ERROR, errno,
+ 				     alpm_strerror (errno));
+ 	}
+@@ -959,12 +1124,12 @@ pk_backend_transaction_commit (PkBackend *self, GError **error)
+ 	}
+ 
+ 	if (prefix != NULL) {
+-		enum _alpm_errno_t errno = alpm_errno (alpm);
++		alpm_errno_t errno = alpm_errno (alpm);
+ 		g_set_error (error, ALPM_ERROR, errno, "%s: %s", prefix,
+ 			     alpm_strerror (errno));
+ 		g_free (prefix);
+ 	} else {
+-		enum _alpm_errno_t errno = alpm_errno (alpm);
++		alpm_errno_t errno = alpm_errno (alpm);
+ 		g_set_error_literal (error, ALPM_ERROR, errno,
+ 				     alpm_strerror (errno));
+ 	}
+@@ -993,7 +1158,7 @@ pk_backend_transaction_end (PkBackend *self, GError **error)
+ 	}
+ 
+ 	if (alpm_trans_release (alpm) < 0) {
+-		enum _alpm_errno_t errno = alpm_errno (alpm);
++		alpm_errno_t errno = alpm_errno (alpm);
+ 		g_set_error_literal (error, ALPM_ERROR, errno,
+ 				     alpm_strerror (errno));
+ 		return FALSE;
+diff --git a/backends/alpm/pk-backend-update.c b/backends/alpm/pk-backend-update.c
+index 37ade1e..ff83b5e 100644
+--- a/backends/alpm/pk-backend-update.c
++++ b/backends/alpm/pk-backend-update.c
+@@ -130,6 +130,20 @@ alpm_pkg_same_pkgver (alpm_pkg_t *a, alpm_pkg_t *b)
+ 	}
+ }
+ 
++static gchar *
++alpm_time_to_iso8601 (alpm_time_t time)
++{
++	GDateTime *date = g_date_time_new_from_unix_utc (time);
++
++	if (date != NULL) {
++		gchar *result = g_date_time_format (date, "%FT%TZ");
++		g_date_time_unref (date);
++		return result;
++	} else {
++		return NULL;
++	}
++}
++
+ static gboolean
+ pk_backend_get_update_detail_thread (PkBackend *self)
+ {
+@@ -154,7 +168,7 @@ pk_backend_get_update_detail_thread (PkBackend *self)
+ 		PkRestartEnum restart;
+ 		PkUpdateStateEnum state;
+ 
+-		GTimeVal built = { 0 }, installed = { 0 };
++		alpm_time_t built, installed;
+ 		gchar *issued, *updated;
+ 
+ 		if (pk_backend_cancelled (self)) {
+@@ -195,17 +209,17 @@ pk_backend_get_update_detail_thread (PkBackend *self)
+ 			state = PK_UPDATE_STATE_ENUM_STABLE;
+ 		}
+ 
+-		built.tv_sec = alpm_pkg_get_builddate (pkg);
+-		if (built.tv_sec > 0) {
+-			issued = g_time_val_to_iso8601 (&built);
++		built = alpm_pkg_get_builddate (pkg);
++		if (built > 0) {
++			issued = alpm_time_to_iso8601 (built);
+ 		} else {
+ 			issued = NULL;
+ 		}
+ 
+ 		if (upgrades != NULL) {
+-			installed.tv_sec = alpm_pkg_get_installdate (old);
+-			if (installed.tv_sec > 0) {
+-				updated = g_time_val_to_iso8601 (&installed);
++			installed = alpm_pkg_get_installdate (old);
++			if (installed > 0) {
++				updated = alpm_time_to_iso8601 (installed);
+ 			} else {
+ 				updated = NULL;
+ 			}
+@@ -251,13 +265,14 @@ pk_backend_update_databases (PkBackend *self, gint force, GError **error) {
+ 		return FALSE;
+ 	}
+ 
+-	alpm_logaction (alpm, "synchronizing package lists\n");
++	alpm_logaction (alpm, PK_LOG_PREFIX, "synchronizing package lists\n");
++	pk_backend_set_status (self, PK_STATUS_ENUM_DOWNLOAD_PACKAGELIST);
+ 
+ 	dlcb = alpm_option_get_dlcb (alpm);
+ 	totaldlcb = alpm_option_get_totaldlcb (alpm);
+ 
+ 	/* set total size to minus the number of databases */
+-	i = alpm_option_get_syncdbs (alpm);
++	i = alpm_get_syncdbs (alpm);
+ 	totaldlcb (-alpm_list_count (i));
+ 
+ 	for (; i != NULL; i = i->next) {
+@@ -275,7 +290,7 @@ pk_backend_update_databases (PkBackend *self, gint force, GError **error) {
+ 			/* fake the download when already up to date */
+ 			dlcb ("", 1, 1);
+ 		} else if (result < 0) {
+-			enum _alpm_errno_t errno = alpm_errno (alpm);
++			alpm_errno_t errno = alpm_errno (alpm);
+ 			g_set_error (error, ALPM_ERROR, errno, "[%s]: %s",
+ 				     alpm_db_get_name (i->data),
+ 				     alpm_strerror (errno));
+@@ -398,7 +413,7 @@ pk_backend_get_updates_thread (PkBackend *self)
+ 	}
+ 
+ 	/* find outdated and replacement packages */
+-	syncdbs = alpm_option_get_syncdbs (alpm);
++	syncdbs = alpm_get_syncdbs (alpm);
+ 	for (i = alpm_db_get_pkgcache (localdb); i != NULL; i = i->next) {
+ 		alpm_pkg_t *upgrade = alpm_pkg_find_update (i->data, syncdbs);
+ 
+diff --git a/configure.ac b/configure.ac
+index 37e8a64..2e85f6f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -707,9 +707,7 @@ if test x$enable_opkg = xyes; then
+ fi
+ 
+ if test x$enable_alpm = xyes; then
+-	AC_CHECK_HEADER([alpm.h],
+-			[],
+-			[AC_MSG_ERROR([No ALPM headers found])])
++	PKG_CHECK_MODULES(ALPM, libalpm >= 4.1.0)
+ fi
+ 
+ if test x$enable_poldek = xyes; then
diff --git a/community/packagekit/libarchive.patch b/community/packagekit/libarchive.patch
new file mode 100644
index 000000000..083a9433a
--- /dev/null
+++ b/community/packagekit/libarchive.patch
@@ -0,0 +1,39 @@
+diff -Nru a/lib/packagekit-glib2/pk-service-pack.c b/lib/packagekit-glib2/pk-service-pack.c
+--- a/lib/packagekit-glib2/pk-service-pack.c	2012-08-17 00:36:38.000000000 +1200
++++ b/lib/packagekit-glib2/pk-service-pack.c	2013-03-01 19:00:08.773738469 +1300
+@@ -207,7 +207,7 @@
+ 	archive_read_support_format_tar (arch);
+ 
+ 	/* open the tar file */
+-	r = archive_read_open_file (arch, filename, 10240);
++	r = archive_read_open_filename (arch, filename, 10240);
+ 	if (r) {
+ 		g_set_error (error, PK_SERVICE_PACK_ERROR, PK_SERVICE_PACK_ERROR_FAILED_EXTRACTION,
+ 				      "cannot open: %s", archive_error_string (arch));
+@@ -246,7 +246,7 @@
+ 	/* close the archive */
+ 	if (arch != NULL) {
+ 		archive_read_close (arch);
+-		archive_read_finish (arch);
++		archive_read_free (arch);
+ 	}
+ 
+ 	/* switch back to PWD */
+@@ -572,7 +572,7 @@
+ 
+ 	/* we can only write tar achives */
+ 	arch = archive_write_new ();
+-	archive_write_set_compression_none (arch);
++	archive_write_add_filter_none (arch);
+ 	archive_write_set_format_ustar (arch);
+ 	archive_write_open_filename (arch, state->filename);
+ 
+@@ -596,7 +596,7 @@
+ 	/* close the archive */
+ 	if (arch != NULL) {
+ 		archive_write_close (arch);
+-		archive_write_finish (arch);
++		archive_write_free (arch);
+ 	}
+ 	return ret;
+ }
diff --git a/community/paintown/PKGBUILD b/community/paintown/PKGBUILD
deleted file mode 100644
index 8fe359267..000000000
--- a/community/paintown/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 75859 2012-09-03 17:14:58Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jschares <jacob.schares@gmail.com>
-# Contributor: celmir <scibecelmir@tuxfamily.org>
-# Contributor: Feufochmar <guill.delacourt@gmail.com>
-
-pkgname=paintown
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Open source fighting game in the same genre as Streets of Rage and Teenage Mutant Ninja Turtles"
-arch=('i686' 'x86_64')
-url="http://paintown.sourceforge.net/"
-license=('GPL')
-depends=('python2' 'freetype2' 'sdl' 'libpng' 'mpg123' 'libogg' 'libvorbis')
-makedepends=('cmake' 'gendesk')
-#install=paintown.install
-source=(http://downloads.sourceforge.net/sourceforge/paintown/$pkgname-$pkgver.tar.bz2
-        paintown.png)
-md5sums=('5c1160bee51fe2011a1141c490a5d368'
-         'ed547f1377212ea079cf9b0a1ad2d587')
-
-build() {
-  cd "$srcdir"
-  gendesk
-
-  cd "$pkgname-$pkgver"
-
-  # fix python2 header
-  for file in $(find . -name '*.py' -print); do
-     sed -i "s#/usr/bin/python#/usr/bin/env python2#" $file
-  done
-
-  #sed -i "1 i #include <zlib.h>" src/util/sdl/image/IMG_png.c
-  #sed -i "1 i #include <zlib.h>" src/util/sdl/image/IMG_savepng.c
-
-  mkdir -p build && cd build
-  cmake ..
-  make
-  cp bin/paintown ..
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mkdir -p $pkgdir/usr/{bin,share/{paintown,pixmaps,applications,licenses/paintown}}
-  sh install.sh -d $pkgdir/usr/share/paintown -b $pkgdir/usr/bin
-  # correct the gnerated file to remove the wrong path (because $pkgdir/usr/bin is written in the file)
-  sed -i "s#$pkgdir##g" $pkgdir/usr/bin/paintown
-  install -m644 $srcdir/paintown.desktop $pkgdir/usr/share/applications/paintown.desktop
-  install -m644 $srcdir/paintown.png $pkgdir/usr/share/pixmaps/paintown.png
-  install -m644 LICENSE $pkgdir/usr/share/licenses/paintown/LICENSE
-  install -m644 LEGAL $pkgdir/usr/share/licenses/paintown/LEGAL
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/paintown/libpng15.patch b/community/paintown/libpng15.patch
deleted file mode 100644
index 516c3ec01..000000000
--- a/community/paintown/libpng15.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-------------------------------------------------------------------------
-r7015 | kazzmir | 2012-02-18 22:19:01 +0100 (Sa, 18 Feb 2012) | 1 line
-
-patch for sdl image to work with libpng1.4+
-
-Index: src/util/sdl/image/IMG_png.c
-===================================================================
---- src/util/sdl/image/IMG_png.c	(revision 7014)
-+++ src/util/sdl/image/IMG_png.c	(revision 7015)
-@@ -71,6 +71,10 @@
- #endif
- #include <png.h>
- 
-+/* Check for the older version of libpng */
-+#if (PNG_LIBPNG_VER_MAJOR == 1) && (PNG_LIBPNG_VER_MINOR < 4)
-+#define LIBPNG_VERSION_12
-+#endif
- 
- static struct {
- 	int loaded;
-@@ -80,6 +84,8 @@
- 	void (*png_destroy_read_struct) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr);
- 	png_uint_32 (*png_get_IHDR) (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method);
- 	png_voidp (*png_get_io_ptr) (png_structp png_ptr);
-+	png_byte (*png_get_channels) (png_structp png_ptr, png_infop info_ptr);
-+	png_uint_32 (*png_get_PLTE) (png_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette);
- 	png_uint_32 (*png_get_tRNS) (png_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values);
- 	png_uint_32 (*png_get_valid) (png_structp png_ptr, png_infop info_ptr, png_uint_32 flag);
- 	void (*png_read_image) (png_structp png_ptr, png_bytepp image);
-@@ -91,6 +97,9 @@
- 	void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn);
- 	void (*png_set_strip_16) (png_structp png_ptr);
- 	int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check);
-+#ifndef LIBPNG_VERSION_12
-+	jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t);
-+#endif
- } lib;
- 
- #ifdef LOAD_PNG_DYNAMIC
-@@ -129,6 +138,13 @@
- 			SDL_UnloadObject(lib.handle);
- 			return -1;
- 		}
-+		lib.png_get_channels =
-+			(png_byte (*) (png_structp, png_infop))
-+			SDL_LoadFunction(lib.handle, "png_get_channels");
-+		if ( lib.png_get_channels == NULL ) {
-+			SDL_UnloadObject(lib.handle);
-+			return -1;
-+		}
- 		lib.png_get_io_ptr =
- 			(png_voidp (*) (png_structp))
- 			SDL_LoadFunction(lib.handle, "png_get_io_ptr");
-@@ -136,6 +152,13 @@
- 			SDL_UnloadObject(lib.handle);
- 			return -1;
- 		}
-+		lib.png_get_PLTE =
-+			(png_uint_32 (*) (png_structp, png_infop, png_colorp *, int *))
-+			SDL_LoadFunction(lib.handle, "png_get_PLTE");
-+		if ( lib.png_get_PLTE == NULL ) {
-+			SDL_UnloadObject(lib.handle);
-+			return -1;
-+		}
- 		lib.png_get_tRNS =
- 			(png_uint_32 (*) (png_structp, png_infop, png_bytep *, int *, png_color_16p *))
- 			SDL_LoadFunction(lib.handle, "png_get_tRNS");
-@@ -213,6 +236,15 @@
- 			SDL_UnloadObject(lib.handle);
- 			return -1;
- 		}
-+#ifndef LIBPNG_VERSION_12
-+		lib.png_set_longjmp_fn =
-+			(jmp_buf * (*) (png_structp, png_longjmp_ptr, size_t))
-+			SDL_LoadFunction(lib.handle, "png_set_longjmp_fn");
-+		if ( lib.png_set_longjmp_fn == NULL ) {
-+			SDL_UnloadObject(lib.handle);
-+			return -1;
-+		}
-+#endif
- 	}
- 	++lib.loaded;
- 
-@@ -236,7 +268,9 @@
- 		lib.png_create_read_struct = png_create_read_struct;
- 		lib.png_destroy_read_struct = png_destroy_read_struct;
- 		lib.png_get_IHDR = png_get_IHDR;
-+		lib.png_get_channels = png_get_channels;
- 		lib.png_get_io_ptr = png_get_io_ptr;
-+		lib.png_get_PLTE = png_get_PLTE;
- 		lib.png_get_tRNS = png_get_tRNS;
- 		lib.png_get_valid = png_get_valid;
- 		lib.png_read_image = png_read_image;
-@@ -248,6 +282,9 @@
- 		lib.png_set_read_fn = png_set_read_fn;
- 		lib.png_set_strip_16 = png_set_strip_16;
- 		lib.png_sig_cmp = png_sig_cmp;
-+#ifndef LIBPNG_VERSION_12
-+		lib.png_set_longjmp_fn = png_set_longjmp_fn;
-+#endif
- 	}
- 	++lib.loaded;
- 
-@@ -347,7 +384,12 @@
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in png_create_read_struct() earlier.
- 	 */
--	if ( setjmp(png_ptr->jmpbuf) ) {
-+#ifndef LIBPNG_VERSION_12
-+	if ( setjmp(*lib.png_set_longjmp_fn(png_ptr, longjmp, sizeof (jmp_buf))) )
-+#else
-+	if ( setjmp(png_ptr->jmpbuf) )
-+#endif
-+	{
- 		error = "Error reading the PNG file.";
- 		goto done;
- 	}
-@@ -416,9 +458,9 @@
- 			Rmask = 0x000000FF;
- 			Gmask = 0x0000FF00;
- 			Bmask = 0x00FF0000;
--			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+			Amask = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
- 		} else {
--		        int s = (info_ptr->channels == 4) ? 0 : 8;
-+		        int s = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
- 			Rmask = 0xFF000000 >> s;
- 			Gmask = 0x00FF0000 >> s;
- 			Bmask = 0x0000FF00 >> s;
-@@ -426,7 +468,7 @@
- 		}
- 	}
- 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
--			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
-+			bit_depth*lib.png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
- 	if ( surface == NULL ) {
- 		error = "Out of memory";
- 		goto done;
-@@ -444,7 +486,7 @@
- 
- 	/* Create the array of pointers to image data */
- 	row_pointers = (png_bytep*) malloc(sizeof(png_bytep)*height);
--	if ( (row_pointers == NULL) ) {
-+	if (row_pointers == NULL) {
- 		error = "Out of memory";
- 		goto done;
- 	}
-@@ -467,6 +509,9 @@
- 	/* Load the palette, if any */
- 	palette = surface->format->palette;
- 	if ( palette ) {
-+	    int png_num_palette;
-+	    png_colorp png_palette;
-+	    lib.png_get_PLTE(png_ptr, info_ptr, &png_palette, &png_num_palette);
- 	    if(color_type == PNG_COLOR_TYPE_GRAY) {
- 		palette->ncolors = 256;
- 		for(i = 0; i < 256; i++) {
-@@ -474,12 +519,12 @@
- 		    palette->colors[i].g = i;
- 		    palette->colors[i].b = i;
- 		}
--	    } else if (info_ptr->num_palette > 0 ) {
--		palette->ncolors = info_ptr->num_palette; 
--		for( i=0; i<info_ptr->num_palette; ++i ) {
--		    palette->colors[i].b = info_ptr->palette[i].blue;
--		    palette->colors[i].g = info_ptr->palette[i].green;
--		    palette->colors[i].r = info_ptr->palette[i].red;
-+	    } else if (png_num_palette > 0 ) {
-+		palette->ncolors = png_num_palette; 
-+		for( i=0; i<png_num_palette; ++i ) {
-+		    palette->colors[i].b = png_palette[i].blue;
-+		    palette->colors[i].g = png_palette[i].green;
-+		    palette->colors[i].r = png_palette[i].red;
- 		}
- 	    }
- 	}
-Index: src/util/sdl/image/sdl-image-1.2.10-libpng15.patch
-===================================================================
---- src/util/sdl/image/sdl-image-1.2.10-libpng15.patch	(revision 0)
-+++ src/util/sdl/image/sdl-image-1.2.10-libpng15.patch	(revision 7015)
-@@ -0,0 +1,160 @@
-+--- IMG_png.c
-++++ IMG_png.c
-+@@ -71,6 +71,10 @@
-+ #endif
-+ #include <png.h>
-+ 
-++/* Check for the older version of libpng */
-++#if (PNG_LIBPNG_VER_MAJOR == 1) && (PNG_LIBPNG_VER_MINOR < 4)
-++#define LIBPNG_VERSION_12
-++#endif
-+ 
-+ static struct {
-+ 	int loaded;
-+@@ -80,6 +84,8 @@
-+ 	void (*png_destroy_read_struct) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr);
-+ 	png_uint_32 (*png_get_IHDR) (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method);
-+ 	png_voidp (*png_get_io_ptr) (png_structp png_ptr);
-++	png_byte (*png_get_channels) (png_structp png_ptr, png_infop info_ptr);
-++	png_uint_32 (*png_get_PLTE) (png_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette);
-+ 	png_uint_32 (*png_get_tRNS) (png_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values);
-+ 	png_uint_32 (*png_get_valid) (png_structp png_ptr, png_infop info_ptr, png_uint_32 flag);
-+ 	void (*png_read_image) (png_structp png_ptr, png_bytepp image);
-+@@ -91,6 +97,9 @@
-+ 	void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn);
-+ 	void (*png_set_strip_16) (png_structp png_ptr);
-+ 	int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check);
-++#ifndef LIBPNG_VERSION_12
-++	jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t);
-++#endif
-+ } lib;
-+ 
-+ #ifdef LOAD_PNG_DYNAMIC
-+@@ -129,6 +138,13 @@
-+ 			SDL_UnloadObject(lib.handle);
-+ 			return -1;
-+ 		}
-++		lib.png_get_channels =
-++			(png_byte (*) (png_structp, png_infop))
-++			SDL_LoadFunction(lib.handle, "png_get_channels");
-++		if ( lib.png_get_channels == NULL ) {
-++			SDL_UnloadObject(lib.handle);
-++			return -1;
-++		}
-+ 		lib.png_get_io_ptr =
-+ 			(png_voidp (*) (png_structp))
-+ 			SDL_LoadFunction(lib.handle, "png_get_io_ptr");
-+@@ -136,6 +152,13 @@
-+ 			SDL_UnloadObject(lib.handle);
-+ 			return -1;
-+ 		}
-++		lib.png_get_PLTE =
-++			(png_uint_32 (*) (png_structp, png_infop, png_colorp *, int *))
-++			SDL_LoadFunction(lib.handle, "png_get_PLTE");
-++		if ( lib.png_get_PLTE == NULL ) {
-++			SDL_UnloadObject(lib.handle);
-++			return -1;
-++		}
-+ 		lib.png_get_tRNS =
-+ 			(png_uint_32 (*) (png_structp, png_infop, png_bytep *, int *, png_color_16p *))
-+ 			SDL_LoadFunction(lib.handle, "png_get_tRNS");
-+@@ -213,6 +236,15 @@
-+ 			SDL_UnloadObject(lib.handle);
-+ 			return -1;
-+ 		}
-++#ifndef LIBPNG_VERSION_12
-++		lib.png_set_longjmp_fn =
-++			(jmp_buf * (*) (png_structp, png_longjmp_ptr, size_t))
-++			SDL_LoadFunction(lib.handle, "png_set_longjmp_fn");
-++		if ( lib.png_set_longjmp_fn == NULL ) {
-++			SDL_UnloadObject(lib.handle);
-++			return -1;
-++		}
-++#endif
-+ 	}
-+ 	++lib.loaded;
-+ 
-+@@ -236,7 +268,9 @@
-+ 		lib.png_create_read_struct = png_create_read_struct;
-+ 		lib.png_destroy_read_struct = png_destroy_read_struct;
-+ 		lib.png_get_IHDR = png_get_IHDR;
-++		lib.png_get_channels = png_get_channels;
-+ 		lib.png_get_io_ptr = png_get_io_ptr;
-++		lib.png_get_PLTE = png_get_PLTE;
-+ 		lib.png_get_tRNS = png_get_tRNS;
-+ 		lib.png_get_valid = png_get_valid;
-+ 		lib.png_read_image = png_read_image;
-+@@ -248,6 +282,9 @@
-+ 		lib.png_set_read_fn = png_set_read_fn;
-+ 		lib.png_set_strip_16 = png_set_strip_16;
-+ 		lib.png_sig_cmp = png_sig_cmp;
-++#ifndef LIBPNG_VERSION_12
-++		lib.png_set_longjmp_fn = png_set_longjmp_fn;
-++#endif
-+ 	}
-+ 	++lib.loaded;
-+ 
-+@@ -347,7 +384,12 @@
-+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
-+ 	 * set up your own error handlers in png_create_read_struct() earlier.
-+ 	 */
-+-	if ( setjmp(png_ptr->jmpbuf) ) {
-++#ifndef LIBPNG_VERSION_12
-++	if ( setjmp(*lib.png_set_longjmp_fn(png_ptr, longjmp, sizeof (jmp_buf))) )
-++#else
-++	if ( setjmp(png_ptr->jmpbuf) )
-++#endif
-++	{
-+ 		error = "Error reading the PNG file.";
-+ 		goto done;
-+ 	}
-+@@ -416,9 +458,9 @@
-+ 			Rmask = 0x000000FF;
-+ 			Gmask = 0x0000FF00;
-+ 			Bmask = 0x00FF0000;
-+-			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-++			Amask = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
-+ 		} else {
-+-		        int s = (info_ptr->channels == 4) ? 0 : 8;
-++		        int s = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
-+ 			Rmask = 0xFF000000 >> s;
-+ 			Gmask = 0x00FF0000 >> s;
-+ 			Bmask = 0x0000FF00 >> s;
-+@@ -426,7 +468,7 @@
-+ 		}
-+ 	}
-+ 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
-+-			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
-++			bit_depth*lib.png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
-+ 	if ( surface == NULL ) {
-+ 		error = "Out of memory";
-+ 		goto done;
-+@@ -467,6 +509,9 @@
-+ 	/* Load the palette, if any */
-+ 	palette = surface->format->palette;
-+ 	if ( palette ) {
-++	    int png_num_palette;
-++	    png_colorp png_palette;
-++	    lib.png_get_PLTE(png_ptr, info_ptr, &png_palette, &png_num_palette);
-+ 	    if(color_type == PNG_COLOR_TYPE_GRAY) {
-+ 		palette->ncolors = 256;
-+ 		for(i = 0; i < 256; i++) {
-+@@ -474,12 +519,12 @@
-+ 		    palette->colors[i].g = i;
-+ 		    palette->colors[i].b = i;
-+ 		}
-+-	    } else if (info_ptr->num_palette > 0 ) {
-+-		palette->ncolors = info_ptr->num_palette; 
-+-		for( i=0; i<info_ptr->num_palette; ++i ) {
-+-		    palette->colors[i].b = info_ptr->palette[i].blue;
-+-		    palette->colors[i].g = info_ptr->palette[i].green;
-+-		    palette->colors[i].r = info_ptr->palette[i].red;
-++	    } else if (png_num_palette > 0 ) {
-++		palette->ncolors = png_num_palette; 
-++		for( i=0; i<png_num_palette; ++i ) {
-++		    palette->colors[i].b = png_palette[i].blue;
-++		    palette->colors[i].g = png_palette[i].green;
-++		    palette->colors[i].r = png_palette[i].red;
-+ 		}
-+ 	    }
-+ 	}
-
-------------------------------------------------------------------------
diff --git a/community/paintown/paintown.png b/community/paintown/paintown.png
deleted file mode 100644
index c7e4830e4..000000000
--- a/community/paintown/paintown.png
+++ /dev/null
diff --git a/community/pam-krb5/PKGBUILD b/community/pam-krb5/PKGBUILD
deleted file mode 100644
index c0e35c92b..000000000
--- a/community/pam-krb5/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 78535 2012-10-20 10:30:17Z ebelanger $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: Ryan Corder <ryanc@greengrey.org>
-
-pkgname=pam-krb5
-pkgver=4.6
-pkgrel=1
-pkgdesc='A PAM module providing Kerberos v5 support.'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.eyrie.org/~eagle/software/pam-krb5/'
-license=('custom')
-options=('!libtool')
-depends=('krb5' 'pam')
-source=(http://archives.eyrie.org/software/kerberos/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('296e9c8281419ce1fc41d537d18f74b8'
-         'c68a521345d79d54fb129a3f4ca2767b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --enable-reduced-depends \
-    --libdir=/usr/lib
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=$pkgdir install
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/community/pam_mysql/PKGBUILD b/community/pam_mysql/PKGBUILD
index 372b14ca2..10da943ae 100644
--- a/community/pam_mysql/PKGBUILD
+++ b/community/pam_mysql/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 70353 2012-05-04 23:55:09Z allan $
+# $Id: PKGBUILD 87013 2013-03-25 19:16:54Z bpiotrowski $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arjan Timmerman<arjan@archlinux.org>
 # Contributor: Manolis Tzanidakis
 pkgname=pam_mysql
 pkgver=0.7RC1
-pkgrel=6
+pkgrel=7
 pkgdesc="A PAM module to authenticate users against mysql."
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://pam-mysql.sourceforge.net"
-depends=('pam' 'mysql' 'openssl')
+depends=('pam' 'mariadb' 'openssl')
 source=(http://sourceforge.net/projects/pam-mysql/files/pam-mysql/${pkgver}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('6177183d7e98dc12f2e444c9fbd4f13c')
 options=(!libtool)
diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD
index 31e5c98d8..f25e04076 100644
--- a/community/parole/PKGBUILD
+++ b/community/parole/PKGBUILD
@@ -1,33 +1,34 @@
-# $Id: PKGBUILD 82109 2013-01-08 18:48:48Z spupykin $
+# $Id: PKGBUILD 87041 2013-03-26 11:08:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: TDY <tdy@gmx.com>
 
 pkgname=parole
-pkgver=0.4.0
-pkgrel=1
+pkgver=0.5.0
+pkgrel=3
 pkgdesc="A modern media player based on the GStreamer framework"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/applications/parole/"
 license=('GPL')
-depends=('gstreamer0.10-base>=0.10.11' 'hicolor-icon-theme' 'libnotify>=0.4.1'
+depends=('gstreamer' 'gst-plugins-base-libs' 'hicolor-icon-theme' 'libnotify>=0.4.1'
          'libxfce4ui>=4.7.0' 'taglib>=1.4' 'desktop-file-utils')
 makedepends=('pkgconfig>=0.9.0' 'xfce4-dev-tools')
-optdepends=('xulrunner>=1.9.1: browser plugin')
+optdepends=('xulrunner: browser plugin'
+	    'gst-libav'
+	    'gst-plugins-bad'
+	    'gst-plugins-base'
+	    'gst-plugins-good'
+	    'gst-plugins-ugly')
 conflicts=('parole-media-player-git')
 options=('!libtool')
 install=parole.install
-#source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
 source=(http://git.xfce.org/apps/parole/snapshot/parole-$pkgver.tar.bz2)
-md5sums=('df05ff037c6063c905e5bb40a50b6e0f')
+md5sums=('03eb2df373adaae56959a548553ef72e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
   sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g' configure.ac.in
-
-  [ -x configure ] || ./autogen.sh
-
-  ./configure --prefix=/usr --libexecdir=/usr/lib --enable-taglib --enable-libnotify
+  ./autogen.sh --prefix=/usr --libexecdir=/usr/lib \
+    --enable-taglib --enable-libnotify --with-gstreamer=1.0
   make
 }
 
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index 4b50cfef1..a3caad52b 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 82738 2013-01-23 16:27:21Z spupykin $
+# $Id: PKGBUILD 88524 2013-04-19 10:31:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
 
 pkgname=parrot
-pkgver=5.0.0
-_rel=stable
-#_rel=devel
-pkgrel=2
+pkgver=5.3.0
+#_rel=stable
+_rel=devel
+pkgrel=1
 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://www.parrotcode.org/"
@@ -16,13 +16,15 @@ makedepends=('perl-json')
 optdepends=('freeglut')
 options=('!makeflags')
 source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('4f16127f539e019a30d21b4d1ea7196f')
+md5sums=('4f9fd4994bffd7664901dcace9ab6c16')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   perl Configure.pl --prefix=/usr \
     --parrot_is_shared \
-    --disable-rpath
+    --disable-rpath \
+	--mandir=/usr/share/man \
+    --optimize
   export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(pwd)/blib/lib"
   make all parrot_utils docs html
 }
diff --git a/community/partclone/PKGBUILD b/community/partclone/PKGBUILD
index bb1ded3f7..4415534ff 100644
--- a/community/partclone/PKGBUILD
+++ b/community/partclone/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83480 2013-02-01 21:35:48Z eric $
+# $Id: PKGBUILD 87807 2013-04-06 20:01:09Z jsteel $
 # Maintainer: Jonathan Steel <mail at jsteel dot org>
 # Contrinutor: Dan Serban
 # Contributor: Franz Burgmann
@@ -6,15 +6,15 @@
 # Contributor: Ivan Sichmann Freitas
 
 pkgname=partclone
-pkgver=0.2.48
-pkgrel=5
-pkgdesc="Back up and restore used-blocks of a partition"
+pkgver=0.2.58
+pkgrel=1
+pkgdesc="Utilities to save and restore used blocks on a partition"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://partclone.org"
 license=('GPL')
 depends=('progsreiserfs' 'ntfs-3g')
-source=(https://downloads.sourceforge.net/project/$pkgname/stable/$pkgver/${pkgname}_$pkgver.tar.gz)
-md5sums=('c873588f26185d6ce8db7b4c5470aa00')
+source=(https://downloads.sourceforge.net/project/$pkgname/stable/$pkgver/${pkgname}_$pkgver.orig.tar.gz)
+md5sums=('8d8edeab8a0ce430d2e00efcc25f4ce7')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
@@ -28,5 +28,5 @@ build() {
 package() {
   cd "$srcdir"/$pkgname-$pkgver
 
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir"/ install
 }
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index e4f424fdc..3c4679f2e 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 83664 2013-02-04 10:17:56Z spupykin $
+# $Id: PKGBUILD 88487 2013-04-18 14:09:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=passenger
-pkgver=3.0.19
-pkgrel=1
-_pkgdlnr=76675
+pkgver=4.0.0.rc6
+pkgrel=2
 pkgdesc="mod_rails passenger"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.modrails.com"
@@ -14,21 +13,24 @@ depends=('ruby' 'ruby-rack' 'curl')
 makedepends=('apache')
 install=passenger.install
 options=('!emptydirs')
-source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz)
-#https://github.com/FooBarWidget/passenger/archive/release-3.0.19.tar.gz
-md5sums=('5df27d7908d55f164853fc2043ee069f')
+source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz)
+md5sums=('2cc01a611431f4f980b65b87dbbd9e5a')
 
 build(){
-  cd $srcdir/passenger-$pkgver
+  cd $srcdir/passenger-release-$pkgver
 
   sed -i 's/env python/env python2/' lib/phusion_passenger/wsgi/request_handler.py
 
   ./bin/passenger-install-apache2-module -a
   rake nginx
+}
+
+package() {
+  cd $srcdir/passenger-release-$pkgver
 
   mkdir -p $pkgdir/usr/lib/passenger/
   cp -R * $pkgdir/usr/lib/passenger/
 
   mkdir -p $pkgdir/usr/lib/httpd/modules
-  ln -sf /usr/lib/passenger/ext/apache2/mod_passenger.so $pkgdir/usr/lib/httpd/modules/mod_passenger.so
+  ln -sf /usr/lib/passenger/libout/apache2/mod_passenger.so $pkgdir/usr/lib/httpd/modules/mod_passenger.so
 }
diff --git a/community/passenger/build-fix-git-2012-05-17.diff b/community/passenger/build-fix-git-2012-05-17.diff
deleted file mode 100644
index b9aa6b538..000000000
--- a/community/passenger/build-fix-git-2012-05-17.diff
+++ /dev/null
@@ -1,547 +0,0 @@
-diff -wbBur passenger-3.0.12/bin/passenger-install-nginx-module passenger.git/bin/passenger-install-nginx-module
---- passenger-3.0.12/bin/passenger-install-nginx-module	2012-04-13 12:09:57.000000000 +0400
-+++ passenger.git/bin/passenger-install-nginx-module	2012-05-17 19:35:01.000000000 +0400
-@@ -162,7 +162,7 @@
- 		new_screen
- 		color_puts "<banner>PCRE (required by Nginx) not installed, downloading it...</banner>"
- 		
--		url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz"
-+		url = "http://downloads.sourceforge.net/project/pcre/pcre/#{PREFERRED_PCRE_VERSION}/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz"
- 		dirname = "pcre-#{PREFERRED_PCRE_VERSION}"
- 		tarball = "#{@working_dir}/pcre.tar.gz"
- 		
-diff -wbBur passenger-3.0.12/build/basics.rb passenger.git/build/basics.rb
---- passenger-3.0.12/build/basics.rb	2012-04-13 12:09:57.000000000 +0400
-+++ passenger.git/build/basics.rb	2012-05-17 19:35:01.000000000 +0400
-@@ -33,7 +33,6 @@
- require 'phusion_passenger/platform_info/curl'
- require 'phusion_passenger/platform_info/zlib'
- require 'phusion_passenger/platform_info/compiler'
--require 'phusion_passenger/platform_info/documentation_tools'
- 
- include PhusionPassenger
- include PhusionPassenger::PlatformInfo
-diff -wbBur passenger-3.0.12/build/documentation.rb passenger.git/build/documentation.rb
---- passenger-3.0.12/build/documentation.rb	2012-02-04 02:25:41.000000000 +0400
-+++ passenger.git/build/documentation.rb	2012-05-17 19:35:01.000000000 +0400
-@@ -1,5 +1,5 @@
- #  Phusion Passenger - http://www.modrails.com/
--#  Copyright (c) 2010 Phusion
-+#  Copyright (c) 2010, 2011, 2012 Phusion
- #
- #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
- #
-@@ -21,25 +21,34 @@
- #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- #  THE SOFTWARE.
- 
--ASCIIDOC_FLAGS = "-b html5 -a toc -a theme=flask -a numbered -a toclevels=3 -a icons"
--
- desc "Generate all documentation"
- task :doc => Packaging::ASCII_DOCS
- 
- Packaging::ASCII_DOCS.each do |target|
- 	source = target.sub(/\.html$/, '.txt')
- 	file target => [source] + Dir["doc/users_guide_snippets/**/*"] do
--		if PlatformInfo.asciidoc
-+		if PlatformInfo.find_command('mizuho')
- 			if target =~ /apache/i
--				type = "-a apache"
-+				type = "apache"
-+				juvia_site_key = "5jpmkyjqlml8rktsfldfpbwth8ig7w9"
- 			elsif target =~ /nginx/i
--				type = "-a nginx"
-+				type = "nginx"
-+				juvia_site_key = "q0ptarhn8o9xanwomq8zkgewbtwffyz"
-+			elsif target =~ /standalone/i
-+				type = nil
-+				juvia_site_key = "amggdy0k65hb4hbjg3dh7pnb9zd8dwy"
- 			else
- 				type = nil
-+				juvia_site_key = nil
-+			end
-+			command = "mizuho '#{source}'"
-+			command << " -a #{type}" if type
-+			if juvia_site_key
-+				command << " -c juvia --juvia-url http://juvia.phusion.nl --juvia-site-key #{juvia_site_key}"
- 			end
--	  		sh "#{PlatformInfo.asciidoc} #{ASCIIDOC_FLAGS} #{type} '#{source}'"
-+			sh(command)
- 		else
--			sh "echo 'asciidoc required to build docs' > '#{target}'"
-+			sh "echo 'Mizuho required to build docs' > '#{target}'"
- 		end
- 	end
- 	
-diff -wbBur passenger-3.0.12/build/packaging.rb passenger.git/build/packaging.rb
---- passenger-3.0.12/build/packaging.rb	2012-02-04 02:25:41.000000000 +0400
-+++ passenger.git/build/packaging.rb	2012-05-17 19:35:01.000000000 +0400
-@@ -1,5 +1,5 @@
- #  Phusion Passenger - http://www.modrails.com/
--#  Copyright (c) 2010 Phusion
-+#  Copyright (c) 2010, 2011, 2012 Phusion
- #
- #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
- #
-@@ -42,7 +42,7 @@
- 	s.require_paths = ["lib"]
- 	s.add_dependency 'rake', '>= 0.8.1'
- 	s.add_dependency 'fastthread', '>= 1.0.1'
--	s.add_dependency 'daemon_controller', '>= 0.2.5'
-+	s.add_dependency 'daemon_controller', '>= 1.0.0'
- 	s.add_dependency 'rack'
- 	s.files = FileList[*Packaging::GLOB] - FileList[*Packaging::EXCLUDE_GLOB]
- 	s.executables = Packaging::USER_EXECUTABLES + Packaging::SUPER_USER_EXECUTABLES
-diff -wbBur passenger-3.0.12/DEVELOPERS.TXT passenger.git/DEVELOPERS.TXT
---- passenger-3.0.12/DEVELOPERS.TXT	2012-04-13 12:09:57.000000000 +0400
-+++ passenger.git/DEVELOPERS.TXT	2012-05-17 19:35:01.000000000 +0400
-@@ -13,6 +13,7 @@
- * rspec >= 1.1.2
- * mime-types >= 1.15
- * sqlite3-ruby
-+* daemon_controller >= 1.0.0
- 
- The following software is optional:
- 
-diff -wbBur passenger-3.0.12/doc/Users guide Apache.txt passenger.git/doc/Users guide Apache.txt
---- passenger-3.0.12/doc/Users guide Apache.txt	2012-02-04 02:25:41.000000000 +0400
-+++ passenger.git/doc/Users guide Apache.txt	2012-05-17 19:35:01.000000000 +0400
-@@ -203,15 +203,7 @@
- 
- ==== Installing via a native Linux package ====
- 
--John Leach from Brightbox has kindly provided an Ubuntu Hardy package for Phusion Passenger. The package is available from the link:http://apt.brightbox.net[Brightbox repository].
--
--Please install the native Linux package, e.g.:
--------------------------------------------------------
--sudo sh -c 'echo "deb http://apt.brightbox.net hardy main" > /etc/apt/sources.list.d/brightbox.list'
--sudo sh -c 'wget -q -O - http://apt.brightbox.net/release.asc | apt-key add -'
--sudo apt-get update
--sudo apt-get install libapache2-mod-passenger
--------------------------------------------------------
-+John Leach from Brightbox has kindly provided a Ubuntu packages for Phusion Passenger. The package is available from the link:http://wiki.brightbox.co.uk/docs:phusion-passenger[Brightbox repository].
- 
- ==== What does the installer do? ====
- 
-@@ -635,7 +627,7 @@
-         Allow from all
-     </Directory>
- 
--    RackBaseURI /rails                    # <-- These lines have
-+    RackBaseURI /rack                     # <-- These lines have
-     <Directory /websites/phusion/rails>   # <-- been added.
-         Options -MultiViews               # <--
-     </Directory>                          # <--
-diff -wbBur passenger-3.0.12/ext/boost/config/stdlib/libstdcpp3.hpp passenger.git/ext/boost/config/stdlib/libstdcpp3.hpp
---- passenger-3.0.12/ext/boost/config/stdlib/libstdcpp3.hpp	2012-02-04 02:25:42.000000000 +0400
-+++ passenger.git/ext/boost/config/stdlib/libstdcpp3.hpp	2012-05-17 19:35:01.000000000 +0400
-@@ -31,7 +31,8 @@
- 
- #ifdef __GLIBCXX__ // gcc 3.4 and greater:
- #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
--        || defined(_GLIBCXX__PTHREADS)
-+        || defined(_GLIBCXX__PTHREADS) \
-+        || defined(_GLIBCXX_HAS_GTHREADS)
-       //
-       // If the std lib has thread support turned on, then turn it on in Boost
-       // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT
-diff -wbBur passenger-3.0.12/ext/boost/exception/detail/error_info_impl.hpp passenger.git/ext/boost/exception/detail/error_info_impl.hpp
---- passenger-3.0.12/ext/boost/exception/detail/error_info_impl.hpp	2012-02-04 02:25:42.000000000 +0400
-+++ passenger.git/ext/boost/exception/detail/error_info_impl.hpp	2012-05-17 19:35:01.000000000 +0400
-@@ -30,7 +30,7 @@
- 
-             protected:
- 
--            ~error_info_base() throw()
-+            virtual ~error_info_base() throw()
-                 {
-                 }
-             };
-diff -wbBur passenger-3.0.12/ext/common/StaticString.h passenger.git/ext/common/StaticString.h
---- passenger-3.0.12/ext/common/StaticString.h	2012-04-13 12:09:57.000000000 +0400
-+++ passenger.git/ext/common/StaticString.h	2012-05-17 19:35:01.000000000 +0400
-@@ -25,6 +25,7 @@
- #ifndef _PASSENGER_STATIC_STRING_H_
- #define _PASSENGER_STATIC_STRING_H_
- 
-+#include <sys/types.h>
- #include <string>
- #include <cstring>
- #include <cstddef>
-diff -wbBur passenger-3.0.12/ext/common/Watchdog.cpp passenger.git/ext/common/Watchdog.cpp
---- passenger-3.0.12/ext/common/Watchdog.cpp	2012-04-13 12:09:57.000000000 +0400
-+++ passenger.git/ext/common/Watchdog.cpp	2012-05-17 19:35:01.000000000 +0400
-@@ -975,7 +975,7 @@
- 	} else if (pid == -1) {
- 		// Error
- 		e = errno;
--		throw SystemException("fork() failed", errno);
-+		throw SystemException("fork() failed", e);
- 		
- 	} else {
- 		// Parent
-diff -wbBur passenger-3.0.12/ext/nginx/Configuration.c passenger.git/ext/nginx/Configuration.c
---- passenger-3.0.12/ext/nginx/Configuration.c	2012-04-13 12:09:58.000000000 +0400
-+++ passenger.git/ext/nginx/Configuration.c	2012-05-17 19:35:01.000000000 +0400
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) Igor Sysoev
-  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
-- * Copyright (C) 2010 Phusion
-+ * Copyright (C) 2010, 2011, 2012 Phusion
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions
-@@ -335,6 +335,14 @@
-     conf->upstream_config.pass_request_headers = NGX_CONF_UNSET;
-     conf->upstream_config.pass_request_body = NGX_CONF_UNSET;
- 
-+#if (NGX_HTTP_CACHE)
-+    conf->upstream_config.cache = NGX_CONF_UNSET_PTR;
-+    conf->upstream_config.cache_min_uses = NGX_CONF_UNSET_UINT;
-+    conf->upstream_config.cache_bypass = NGX_CONF_UNSET_PTR;
-+    conf->upstream_config.no_cache = NGX_CONF_UNSET_PTR;
-+    conf->upstream_config.cache_valid = NGX_CONF_UNSET_PTR;
-+#endif
-+
-     conf->upstream_config.intercept_errors = NGX_CONF_UNSET;
- 
-     conf->upstream_config.cyclic_temp_file = 0;
-@@ -511,8 +519,8 @@
- 
-     if (conf->upstream_config.busy_buffers_size < size) {
-         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
--             "\"passenger_busy_buffers_size\" must be equal or bigger than "
--             "maximum of the value of \"passenger_buffer_size\" and "
-+             "\"passenger_busy_buffers_size\" must be equal to or greater "
-+             "than the maximum of the value of \"passenger_buffer_size\" and "
-              "one of the \"passenger_buffers\"");
- 
-         return NGX_CONF_ERROR;
-@@ -542,8 +550,8 @@
- 
-     if (conf->upstream_config.temp_file_write_size < size) {
-         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
--             "\"passenger_temp_file_write_size\" must be equal or bigger than "
--             "maximum of the value of \"passenger_buffer_size\" and "
-+             "\"passenger_temp_file_write_size\" must be equal to or greater than "
-+             "the maximum of the value of \"passenger_buffer_size\" and "
-              "one of the \"passenger_buffers\"");
- 
-         return NGX_CONF_ERROR;
-@@ -566,8 +574,8 @@
-     {
-         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-              "\"passenger_max_temp_file_size\" must be equal to zero to disable "
--             "the temporary files usage or must be equal or bigger than "
--             "maximum of the value of \"passenger_buffer_size\" and "
-+             "temporary files usage or must be equal to or greater than "
-+             "the maximum of the value of \"passenger_buffer_size\" and "
-              "one of the \"passenger_buffers\"");
- 
-         return NGX_CONF_ERROR;
-@@ -639,6 +647,14 @@
-         conf->cache_key = prev->cache_key;
-     }
- 
-+    #if NGINX_VERSION_NUM >= 1002000
-+    ngx_conf_merge_value(conf->upstream_config.cache_lock,
-+                         prev->upstream_config.cache_lock, 0);
-+
-+    ngx_conf_merge_msec_value(conf->upstream_config.cache_lock_timeout,
-+                              prev->upstream_config.cache_lock_timeout, 5000);
-+    #endif
-+
- #endif
- 
-     ngx_conf_merge_value(conf->upstream_config.pass_request_headers,
-@@ -1273,7 +1289,7 @@
-       NULL },
- 
-     { ngx_string("passenger_pass_header"),
--      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
-+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-       ngx_conf_set_str_array_slot,
-       NGX_HTTP_LOC_CONF_OFFSET,
-       offsetof(passenger_loc_conf_t, upstream_config.pass_headers),
-diff -wbBur passenger-3.0.12/ext/nginx/ContentHandler.c passenger.git/ext/nginx/ContentHandler.c
---- passenger-3.0.12/ext/nginx/ContentHandler.c	2012-04-13 12:09:58.000000000 +0400
-+++ passenger.git/ext/nginx/ContentHandler.c	2012-05-17 19:35:01.000000000 +0400
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) Igor Sysoev
-  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
-- * Copyright (C) 2010 Phusion
-+ * Copyright (C) 2010, 2011, 2012 Phusion
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions
-@@ -387,8 +387,8 @@
-         app_type_string_len = sizeof("wsgi");
-         break;
-     default:
--        app_type_string = (const u_char *) "rails";
--        app_type_string_len = sizeof("rails");
-+        app_type_string = (const u_char *) "rack";
-+        app_type_string_len = sizeof("rack");
-         break;
-     }
-     
-@@ -931,7 +931,7 @@
-     context = ngx_http_get_module_ctx(r, ngx_http_passenger_module);
- 
-     if (context == NULL) {
--        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-+        return NGX_ERROR;
-     }
- 
-     rc = parse_status_line(r, context);
-@@ -952,7 +952,6 @@
-         }
- #endif
- 
--        r->http_version = NGX_HTTP_VERSION_9;
-         u->headers_in.status_n = NGX_HTTP_OK;
-         u->state->status = NGX_HTTP_OK;
- 
-@@ -966,7 +965,7 @@
-     u->headers_in.status_line.data = ngx_palloc(r->pool,
-                                                 u->headers_in.status_line.len);
-     if (u->headers_in.status_line.data == NULL) {
--        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-+        return NGX_ERROR;
-     }
- 
-     ngx_memcpy(u->headers_in.status_line.data, context->status_start,
-diff -wbBur passenger-3.0.12/lib/phusion_passenger/dependencies.rb passenger.git/lib/phusion_passenger/dependencies.rb
---- passenger-3.0.12/lib/phusion_passenger/dependencies.rb	2012-04-13 12:09:58.000000000 +0400
-+++ passenger.git/lib/phusion_passenger/dependencies.rb	2012-05-17 19:35:01.000000000 +0400
-@@ -1,5 +1,5 @@
- #  Phusion Passenger - http://www.modrails.com/
--#  Copyright (c) 2010 Phusion
-+#  Copyright (c) 2010, 2011, 2012 Phusion
- #
- #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
- #
-@@ -29,7 +29,6 @@
- require 'phusion_passenger/platform_info/ruby'
- require 'phusion_passenger/platform_info/linux'
- require 'phusion_passenger/platform_info/curl'
--require 'phusion_passenger/platform_info/documentation_tools'
- 
- module PhusionPassenger
- 
-@@ -110,9 +109,9 @@
- 		return (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") && RUBY_VERSION < "1.8.7"
- 	end
- 	
--	# Returns whether asciidoc is required in order to be able to package all files
-+	# Returns whether Mizuho is required in order to be able to package all files
- 	# in the packaging list.
--	def self.asciidoc_required?
-+	def self.mizuho_required?
- 		return Packaging::ASCII_DOCS.any? do |fn|
- 			!File.exist?("#{SOURCE_ROOT}/#{fn}")
- 		end
-@@ -579,7 +578,7 @@
- 	end
- 	
- 	Daemon_Controller = Dependency.new do |dep|
--		dep.name = "daemon_controller >= 0.2.5"
-+		dep.name = "daemon_controller >= 1.0.0"
- 		dep.install_instructions = "Please install RubyGems first, then run " <<
- 			"<b>#{PlatformInfo.gem_command || "gem"} install daemon_controller</b>"
- 		dep.define_checker do |result|
-@@ -591,7 +590,7 @@
- 				require 'daemon_controller'
- 				begin
- 					require 'daemon_controller/version'
--					too_old = DaemonController::VERSION_STRING < '0.2.5'
-+					too_old = DaemonController::VERSION_STRING < '1.0.0'
- 				rescue LoadError
- 					too_old = true
- 				end
-@@ -610,23 +609,18 @@
- 		end
- 	end
- 	
--	AsciiDoc = Dependency.new do |dep|
--		dep.name = "Asciidoc"
-+	Mizuho = Dependency.new do |dep|
-+		dep.name = "Mizuho"
- 		dep.define_checker do |result|
--			if PlatformInfo.asciidoc.nil?
-+			mizuho = PlatformInfo.find_command('mizuho')
-+			if mizuho.nil?
- 				result.not_found
- 			else
--				result.found(PlatformInfo.asciidoc)
-+				result.found(mizuho)
- 			end
- 		end
--		if RUBY_PLATFORM =~ /darwin/
--			# Installing asciidoc with source-highlight is too much of a pain on OS X,
--			# so recommend Mizuho instead.
- 			dep.website = "http://github.com/FooBarWidget/mizuho"
- 			dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo.gem_command || "gem"} install mizuho</b>"
--		else
--			dep.website = "http://www.methods.co.nz/asciidoc/"
--		end
- 	end
- end
- 
-diff -wbBur passenger-3.0.12/lib/phusion_passenger/standalone/command.rb passenger.git/lib/phusion_passenger/standalone/command.rb
---- passenger-3.0.12/lib/phusion_passenger/standalone/command.rb	2012-04-13 12:09:58.000000000 +0400
-+++ passenger.git/lib/phusion_passenger/standalone/command.rb	2012-05-17 19:35:01.000000000 +0400
-@@ -1,5 +1,5 @@
- #  Phusion Passenger - http://www.modrails.com/
--#  Copyright (c) 2010 Phusion
-+#  Copyright (c) 2010, 2011, 2012 Phusion
- #
- #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
- #
-@@ -61,13 +61,13 @@
- 				require 'daemon_controller'
- 				begin
- 					require 'daemon_controller/version'
--					too_old = DaemonController::VERSION_STRING < '0.2.5'
-+					too_old = DaemonController::VERSION_STRING < '1.0.0'
- 				rescue LoadError
- 					too_old = true
- 				end
- 				if too_old
- 					error "Your version of daemon_controller is too old. " <<
--					      "You must install 0.2.5 or later. Please upgrade:\n\n" <<
-+					      "You must install 1.0.0 or later. Please upgrade:\n\n" <<
- 					      
- 					      " sudo gem uninstall FooBarWidget-daemon_controller\n" <<
- 					      " sudo gem install daemon_controller"
-@@ -210,24 +210,21 @@
- 		end
- 	end
- 	
--	def ping_nginx
--		require 'socket' unless defined?(UNIXSocket)
--		if @options[:socket_file]
--			UNIXSocket.new(@options[:socket_file])
--		else
--			TCPSocket.new(@options[:address], nginx_ping_port)
--		end
--	end
--	
- 	def create_nginx_controller(extra_options = {})
- 		require_daemon_controller
-+		require 'socket' unless defined?(UNIXSocket)
- 		@temp_dir        = "/tmp/passenger-standalone.#{$$}"
- 		@config_filename = "#{@temp_dir}/config"
-+		if @options[:socket_file]
-+			ping_spec = [:unix, @options[:socket_file]]
-+		else
-+			ping_spec = [:tcp, @options[:address], nginx_ping_port]
-+		end
- 		opts = {
- 			:identifier    => 'Nginx',
- 			:before_start  => method(:write_nginx_config_file),
- 			:start_command => method(:determine_nginx_start_command),
--			:ping_command  => method(:ping_nginx),
-+			:ping_command  => ping_spec,
- 			:pid_file      => @options[:pid_file],
- 			:log_file      => @options[:log_file],
- 			:timeout       => 25
-diff -wbBur passenger-3.0.12/lib/phusion_passenger/standalone/runtime_installer.rb passenger.git/lib/phusion_passenger/standalone/runtime_installer.rb
---- passenger-3.0.12/lib/phusion_passenger/standalone/runtime_installer.rb	2012-04-13 12:09:58.000000000 +0400
-+++ passenger.git/lib/phusion_passenger/standalone/runtime_installer.rb	2012-05-17 19:35:01.000000000 +0400
-@@ -91,8 +91,8 @@
- 		if Dependencies.fastthread_required?
- 			result << Dependencies::FastThread
- 		end
--		if Dependencies.asciidoc_required?
--			result << Dependencies::AsciiDoc
-+		if Dependencies.mizuho_required?
-+			result << Dependencies::Mizuho
- 		end
- 		return result
- 	end
-diff -wbBur passenger-3.0.12/lib/phusion_passenger/standalone/start_command.rb passenger.git/lib/phusion_passenger/standalone/start_command.rb
---- passenger-3.0.12/lib/phusion_passenger/standalone/start_command.rb	2012-04-13 12:09:58.000000000 +0400
-+++ passenger.git/lib/phusion_passenger/standalone/start_command.rb	2012-05-17 19:35:01.000000000 +0400
-@@ -243,15 +243,32 @@
- 		end
- 	end
- 	
--	def check_port_availability
--		if !@options[:socket_file]
-+	def check_port(address, port)
-+		begin
-+			socket = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0)
-+			sockaddr = Socket.pack_sockaddr_in(port, address)
-+			begin
-+				socket.connect_nonblock(sockaddr)
-+			rescue Errno::ENOENT, Errno::EINPROGRESS, Errno::EAGAIN, Errno::EWOULDBLOCK
-+				if select(nil, [socket], nil, 0.1)
- 			begin
--				TCPSocket.new(@options[:address], @options[:port]).close
--				port_taken = true
--			rescue SystemCallError
--				port_taken = false
-+						socket.connect_nonblock(sockaddr)
-+					rescue Errno::EISCONN
-+					end
-+				else
-+					raise Errno::ECONNREFUSED
-+				end
- 			end
--			if port_taken
-+			return true
-+		rescue Errno::ECONNREFUSED
-+			return false
-+		ensure
-+			socket.close if socket
-+		end
-+	end
-+	
-+	def check_port_availability
-+		if !@options[:socket_file] && check_port(@options[:address], @options[:port])
- 				error "The address #{@options[:address]}:#{@options[:port]} is already " <<
- 				      "in use by another process, perhaps another Phusion Passenger " <<
- 				      "Standalone instance.\n\n" <<
-@@ -261,7 +278,6 @@
- 				exit 1
- 			end
- 		end
--	end
- 	
- 	def should_watch_logs?
- 		return !@options[:daemonize] && @options[:log_file] != "/dev/null"
-diff -wbBur passenger-3.0.12/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb passenger.git/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb
---- passenger-3.0.12/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb	2012-04-13 12:09:58.000000000 +0400
-+++ passenger.git/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb	2012-05-17 19:35:01.000000000 +0400
-@@ -1,7 +1,7 @@
- <red>WARNING:</red> <yellow>Apache doesn't seem to be compiled with the 'prefork', 'worker' or 'event' MPM</yellow>
- 
- Phusion Passenger has only been tested on Apache with the 'prefork', the
--'worker' and the 'worker' MPM. Your Apache installation is compiled with
-+'worker' and the 'event' MPM. Your Apache installation is compiled with
- the '<%= @current_mpm %>' MPM. We recommend you to abort this installer and to recompile
- Apache with either the 'prefork', the 'worker' or the 'event' MPM.
- 
-diff -wbBur passenger-3.0.12/lib/phusion_passenger/templates/standalone/config.erb passenger.git/lib/phusion_passenger/templates/standalone/config.erb
---- passenger-3.0.12/lib/phusion_passenger/templates/standalone/config.erb	2012-04-13 12:09:58.000000000 +0400
-+++ passenger.git/lib/phusion_passenger/templates/standalone/config.erb	2012-05-17 19:35:01.000000000 +0400
-@@ -27,7 +27,7 @@
- master_process on;
- worker_processes 1;
- daemon on;
--error_log '<%= @options[:log_file] %>';
-+error_log '<%= @options[:log_file] %>' info;
- pid '<%= @options[:pid_file] %>';
- <% if @options[:user] %>user <%= @options[:user] %> <%= default_group_for(@options[:user]) %>;<% end %>
- 
-@@ -36,6 +36,7 @@
- }
- 
- http {
-+    log_format debug '[$time_local] $msec  "$request" $status conn=$connection sent=$bytes_sent body_sent=$body_bytes_sent';
-     include '<%= PhusionPassenger::RESOURCES_DIR %>/mime.types';
-     passenger_ruby <%= PlatformInfo.ruby_command %>;
-     passenger_root '<%= passenger_root %>';
diff --git a/community/passenger/build-fix.patch b/community/passenger/build-fix.patch
deleted file mode 100644
index cdbb78e68..000000000
--- a/community/passenger/build-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wbBur passenger-3.0.15/ext/boost/thread/xtime.hpp passenger-3.0.15.my/ext/boost/thread/xtime.hpp
---- passenger-3.0.15/ext/boost/thread/xtime.hpp	2012-04-16 11:43:52.000000000 +0400
-+++ passenger-3.0.15.my/ext/boost/thread/xtime.hpp	2012-08-29 11:06:02.000000000 +0400
-@@ -18,6 +18,8 @@
- 
- namespace boost {
- 
-+#undef TIME_UTC
-+
- enum xtime_clock_types
- {
-     TIME_UTC=1
diff --git a/community/passenger/passenger-install-apache2-module.patch b/community/passenger/passenger-install-apache2-module.patch
deleted file mode 100644
index ee6080c1a..000000000
--- a/community/passenger/passenger-install-apache2-module.patch
+++ /dev/null
@@ -1,5 +0,0 @@
-105d104
-< 		wait
-179,180d177
-< 			else
-< 				wait
diff --git a/community/pax-utils/PKGBUILD b/community/pax-utils/PKGBUILD
index c8755a098..5b1e447da 100644
--- a/community/pax-utils/PKGBUILD
+++ b/community/pax-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79825 2012-11-13 13:54:15Z tredaelli $
+# $Id: PKGBUILD 88483 2013-04-18 13:24:39Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: sh0 <mee@sh0.org>
 # Contributor: Maxwel <msg.maxwel@gmail.com>
 
 pkgname=pax-utils
-pkgver=0.5
+pkgver=0.7
 pkgrel=1
 pkgdesc='ELF related utils for ELF 32/64 binaries that can check files for security relevant properties'
 url='http://hardened.gentoo.org/pax-utils.xml'
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('bash' 'libcap')
 checkdepends=('python')
 source=("http://distfiles.gentoo.org/distfiles/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('1ba4f5e8680449c18841db2397aca320527fb06628b4ad9212e42f5e01de833b')
+sha256sums=('1ac4cee9a9ca97a723505eb29a25e50adeccffba3f0f0ef4f035cf082caf3b84')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/pcsc-perl/PKGBUILD b/community/pcsc-perl/PKGBUILD
index d0489a5ba..f3562ada8 100644
--- a/community/pcsc-perl/PKGBUILD
+++ b/community/pcsc-perl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 71749 2012-06-02 10:29:26Z bluewind $
+# $Id: PKGBUILD 87531 2013-04-02 15:53:32Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com>
 # Contributor: marc0s <marc0s@fsfe.org>
 
 pkgname=pcsc-perl
-pkgver=1.4.12
-pkgrel=3
+pkgver=1.4.13
+pkgrel=1
 pkgdesc="A Perl Module for PC/SC SmartCard access"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"
@@ -14,7 +14,7 @@ depends=('pcsclite' 'perl')
 makedepends=('pkgconfig')
 options=('!emptydirs')
 source=("http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('f34c5ab748815bf0b2e571362b4f8121')
+md5sums=('758ca469b79667fa8c41422df86a088b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/pcsclite/pcscd b/community/pcsclite/pcscd
deleted file mode 100644
index 1dc5e0166..000000000
--- a/community/pcsclite/pcscd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON=/usr/sbin/pcscd
-NAME=pcscd
-DESC="PC/SC smart card daemon"
-PID_FILE=/run/pcscd/pcscd.pid
-PCSCD_OPTIONS=
-
-case "$1" in
-    start)
-        stat_busy "Starting $DESC"
-        $DAEMON $PCSCD_OPTIONS
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon $NAME
-            stat_done
-        fi
-        ;;
-
-    stop)
-        stat_busy "Stopping $DESC"
-        [ -f $PID_FILE ] && kill `cat $PID_FILE` &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon $NAME
-            stat_done
-        fi
-        ;;
-
-    restart)
-        $0 stop
-        sleep 3
-        $0 start
-        ;;
-
-    status)
-        stat_busy "Checking $NAME status";
-        ck_status $NAME
-        ;;
-
-    *)
-        echo "usage: $0 {start|stop|restart|status}"
-	;;
-
-esac
-
-exit 0
-
diff --git a/community/pcsxr/PKGBUILD b/community/pcsxr/PKGBUILD
deleted file mode 100644
index 8533aab0f..000000000
--- a/community/pcsxr/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 66302 2012-02-23 13:44:59Z allan $
-## Maintainer: schuay <jakob.gruber@gmail.com>
-## Contributor: quantax -- contact via Arch Linux forum or AUR
-## Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=pcsxr
-pkgver=1.9.92
-pkgrel=4
-pkgdesc='A Sony PlayStation (PSX) emulator based on the PCSX-df project'
-arch=('i686' 'x86_64')
-url='http://pcsxr.codeplex.com/'
-license=('GPL')
-depends=('libcdio' 'libgl' 'libglade' 'libxtst' 'libxv' 'sdl' 'mesa')
-conflicts=('pcsx-df')
-_pkgurl="http://download.codeplex.com/Project/Download/FileDownload.aspx?ProjectName=$pkgname&DownloadId=140521&FileTime=129254829621800000&Build=$(wget -qO - http://www.codeplex.com/ | sed -nr 's/^[[:space:]]*Version [[:digit:]]{4}\.([[:digit:]]{1,2}\.){2}([[:digit:]]+)[[:space:]]*$/\2/p' | tail -n 1)"
-source=($pkgname-$pkgver.tar.bz2::$_pkgurl)
-md5sums=('28411aed0b4424f97227d94bdefaec83')
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    ./configure --prefix=/usr --enable-libcdio --enable-opengl
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
-
diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD
index c7fad70bb..26f1ff262 100644
--- a/community/pdf2djvu/PKGBUILD
+++ b/community/pdf2djvu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82217 2013-01-12 08:15:31Z andrea $
+# $Id: PKGBUILD 88656 2013-04-21 08:48:16Z jelle $
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
 
 pkgname=pdf2djvu
 pkgver=0.7.16
-pkgrel=1
+pkgrel=4
 pkgdesc="Creates DjVu files from PDF files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pdf2djvu.googlecode.com"
diff --git a/community/pdf2djvu/poppler-0.20.patch b/community/pdf2djvu/poppler-0.20.patch
deleted file mode 100644
index 36d23f73a..000000000
--- a/community/pdf2djvu/poppler-0.20.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -wbBur pdf2djvu-0.7.12/configure pdf2djvu-0.7.12.my/configure
---- pdf2djvu-0.7.12/configure	2012-01-22 03:17:01.000000000 +0400
-+++ pdf2djvu-0.7.12.my/configure	2012-05-17 20:44:06.000000000 +0400
-@@ -6653,7 +6653,7 @@
- 
- if test "$GXX" = yes
- then
--  CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual"
-+  CXXFLAGS="$CXXFLAGS "
- fi
- 
- # Output files
-diff -wbBur pdf2djvu-0.7.12/configure.ac pdf2djvu-0.7.12.my/configure.ac
---- pdf2djvu-0.7.12/configure.ac	2012-01-22 03:16:50.000000000 +0400
-+++ pdf2djvu-0.7.12.my/configure.ac	2012-05-17 20:43:37.000000000 +0400
-@@ -225,7 +225,7 @@
- AX_CXXFLAGS_WARN_ALL(CXXFLAGS)
- if test "$GXX" = yes
- then
--  CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual"
-+  CXXFLAGS="$CXXFLAGS "
- fi
- 
- # Output files
-diff -wbBur pdf2djvu-0.7.12/pdf-backend.cc pdf2djvu-0.7.12.my/pdf-backend.cc
---- pdf2djvu-0.7.12/pdf-backend.cc	2012-01-22 03:16:50.000000000 +0400
-+++ pdf2djvu-0.7.12.my/pdf-backend.cc	2012-05-17 20:47:24.000000000 +0400
-@@ -32,10 +32,10 @@
-  * ======================
-  */
- 
--static void poppler_error_handler(int pos, char *message, va_list args)
-+static void poppler_error_handler(void *data, ErrorCategory ec, int pos, char *message)
- {
-   std::string format;
--  std::string expanded_message = string_vprintf(message, args);
-+  std::string expanded_message = message;
-   const char *c_message = expanded_message.c_str();
-   if (pos >= 0)
-   {
-@@ -61,7 +61,7 @@
-   Cwd cwd(argv0_dir_name);
- #endif
-   globalParams = new GlobalParams();
--  setErrorFunction(poppler_error_handler);
-+  setErrorCallback(poppler_error_handler, 0);
- }
- 
- void pdf::Environment::set_antialias(bool value)
-diff -wbBur pdf2djvu-0.7.12/pdf2djvu.cc pdf2djvu-0.7.12.my/pdf2djvu.cc
---- pdf2djvu-0.7.12/pdf2djvu.cc	2012-01-22 03:16:50.000000000 +0400
-+++ pdf2djvu-0.7.12.my/pdf2djvu.cc	2012-05-17 20:55:07.000000000 +0400
-@@ -1387,13 +1387,13 @@
-         debug(0)++;
-       }
-       out1.reset(new pdf::Renderer(paper_color, config.monochrome));
--      out1->startDoc(doc->getXRef());
-+      out1->startDoc((PDFDoc*)doc->getXRef());
-       outm.reset(new MutedRenderer(paper_color, config.monochrome, *page_files));
--      outm->startDoc(doc->getXRef());
-+      outm->startDoc((PDFDoc*)doc->getXRef());
-       if (!config.monochrome)
-       {
-         outs.reset(new MutedRenderer(paper_color, config.monochrome, *page_files));
--        outs->startDoc(doc->getXRef());
-+        outs->startDoc((PDFDoc*)doc->getXRef());
-       }
-     }
-     assert(doc.get() != NULL);
diff --git a/community/pdf2svg/PKGBUILD b/community/pdf2svg/PKGBUILD
index 3461074cd..535913d6a 100644
--- a/community/pdf2svg/PKGBUILD
+++ b/community/pdf2svg/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=pdf2svg
 pkgver=0.2.1
-pkgrel=7
+pkgrel=7.1
 pkgdesc="A pdf to svg converter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cityinthesky.co.uk/pdf2svg.html"
diff --git a/community/pdfedit/PKGBUILD b/community/pdfedit/PKGBUILD
index 4da652f91..b46eff23f 100644
--- a/community/pdfedit/PKGBUILD
+++ b/community/pdfedit/PKGBUILD
@@ -19,15 +19,11 @@ md5sums=('80502ee7f08cdfb867ffdaa92d160a23'
          'c0572c2dd54065322321718aa49ed6b8')
 
 build() {
-  . /etc/profile.d/qt3.sh
-  export PATH="$QTDIR/bin:$PATH"
-  export QMAKESPEC="$QTDIR/mkspecs/linux-g++"
-
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' src/xpdf/xpdf/GlobalParams.cc
-  ./configure --prefix=/usr --with-qmake=/opt/qt/bin/qmake
-  make
+  QTDIR=/usr ./configure --prefix=/usr
+  make CXXFLAGS+="-I/usr/include/qt3" MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 QTDIR=/usr
 }
 
 package() {
diff --git a/community/pdns-recursor/PKGBUILD b/community/pdns-recursor/PKGBUILD
index 2e7c4248c..f5a42a386 100644
--- a/community/pdns-recursor/PKGBUILD
+++ b/community/pdns-recursor/PKGBUILD
@@ -1,39 +1,36 @@
-# $Id: PKGBUILD 81192 2012-12-12 22:04:27Z arodseth $
+# $Id: PKGBUILD 89549 2013-04-29 23:06:17Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Jan Steffens <heftig@archlinux.org>
 
 pkgname=pdns-recursor
-pkgver=3.3
-pkgrel=6
+pkgver=3.5
+pkgrel=1
 pkgdesc='PowerDNS recursor'
-url='http://www.powerdns.com'
+url='https://www.powerdns.com/'
 license=('GPL')
 arch=('x86_64' 'i686' 'mips64el')
-depends=('gcc-libs') # 'lua')
+depends=('gcc-libs' 'lua51')
 makedepends=('boost')
 backup=('etc/powerdns/recursor.conf')
 source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.bz2"
-        'pdns-recursor.rc'
-	'pdns-recursor.service')
-sha256sums=('7b62d97f2bb02bb0ba366dabb5e504338b949a572b9062ec2198012fc3b525bc'
-            '7ff45a2da128e82da409f123f8346cc085b57337d6d44a9fd76d17024898b1ca'
+        'pdns-recursor.service')
+sha256sums=('02ea398aa0e95ef4c9caf478eb3836598eabcd5c99ccb7e2e7c265d716089549'
             'c5849127cb42b578ff4c38ee6ad39e109bb749ce8b0147ac3619af90803b6875')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Disabled Lua while waiting for upstream support for lua 5.2
-  #LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua make
-  LUA=0 make
+  make LUA=1 \
+    LUA_CPPFLAGS_CONFIG="$(pkg-config --cflags lua5.1)" \
+    LUA_LIBS_CONFIG="$(pkg-config --libs lua5.1)"
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
-  install -d -m755 "$pkgdir/etc/rc.d"
   mv "$pkgdir/etc/powerdns/recursor.conf-dist" "$pkgdir/etc/powerdns/recursor.conf"
-  install -m755 "$srcdir/pdns-recursor.rc" "$pkgdir/etc/rc.d/pdns-recursor"
   rm -r "$pkgdir/etc/init.d"
   install -Dm644 "$srcdir/pdns-recursor.service" \
     "$pkgdir/usr/lib/systemd/system/pdns-recursor.service"
diff --git a/community/pdns-recursor/pdns-recursor.rc b/community/pdns-recursor/pdns-recursor.rc
deleted file mode 100644
index 992f0b086..000000000
--- a/community/pdns-recursor/pdns-recursor.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting PowerDNS recursor"
-    ! /usr/sbin/rec_control ping > /dev/null 2>&1 && /usr/sbin/pdns_recursor --daemon
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pdns-recursor
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PowerDNS recursor"
-    rec_control quit > /dev/null 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pdns-recursor
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/pdns/2.9.18-default-mysql-options.patch b/community/pdns/2.9.18-default-mysql-options.patch
deleted file mode 100755
index a9048e13e..000000000
--- a/community/pdns/2.9.18-default-mysql-options.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc pdns-2.9.18/modules/gmysqlbackend/smysql.cc
---- pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc	2005-04-23 23:40:15.000000000 +0200
-+++ pdns-2.9.18/modules/gmysqlbackend/smysql.cc	2005-07-17 10:38:35.363597586 +0200
-@@ -15,6 +15,9 @@
- 	       const string &password)
- {
-   mysql_init(&d_db);
-+#if MYSQL_VERSION_ID > 32349
-+  mysql_options(&d_db, MYSQL_READ_DEFAULT_GROUP, "client");
-+#endif
-   if (!mysql_real_connect(&d_db, host.empty() ? 0 : host.c_str(), 
- 			  user.empty() ? 0 : user.c_str(), 
- 			  password.empty() ? 0 : password.c_str(),
diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD
index 7e7519472..d42718ede 100644
--- a/community/pdns/PKGBUILD
+++ b/community/pdns/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 83427 2013-01-31 22:12:34Z arodseth $
+# $Id: PKGBUILD 87427 2013-03-31 19:18:34Z stephane $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
 
 pkgname=pdns
 pkgver=3.2
-pkgrel=3
+pkgrel=5
 pkgdesc='Modern, advanced and high performance authoritative-only nameserver'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.powerdns.com/'
 license=('GPL')
-depends=('gcc-libs' 'zlib' 'postgresql-libs' 'libmysqlclient' 'sqlite' 'libldap' 'lua51' 'boost-libs')
+depends=('boost-libs' 'gcc-libs' 'postgresql-libs' 'libmariadbclient' 'sqlite' 'libldap' 'lua51')
 makedepends=('boost')
 provides=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
 replaces=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
 conflicts=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
-install=pdns.install
+install="$pkgname.install"
 options=('!makeflags' '!libtool')
 backup=('etc/powerdns/pdns.conf')
 source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.gz"
@@ -31,7 +31,8 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   touch AUTHORS NEWS
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc/powerdns \
     --libexecdir=/usr/lib \
     --libdir=/usr/lib/powerdns \
@@ -48,11 +49,11 @@ package() {
 
   make DESTDIR="$pkgdir" install
   install -m755 -d "$pkgdir/etc/rc.d"
-  rm "$pkgdir/etc/powerdns/pdns.conf-dist"
   install -m644 "$srcdir/pdns.conf" "$pkgdir/etc/powerdns/"
   install -m755 "$srcdir/pdns.rc" "$pkgdir/etc/rc.d/pdns"
   install -Dm644 "$srcdir/pdns.service" \
     "$pkgdir/usr/lib/systemd/system/pdns.service"
+  rm "$pkgdir/etc/powerdns/pdns.conf-dist"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/pdns/pdns-2.9.22-gcc44.patch b/community/pdns/pdns-2.9.22-gcc44.patch
deleted file mode 100644
index 35c1c7777..000000000
--- a/community/pdns/pdns-2.9.22-gcc44.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur pdns-2.9.22.orig/pdns/dnsparser.cc pdns-2.9.22/pdns/dnsparser.cc
---- pdns-2.9.22.orig/pdns/dnsparser.cc	2008-11-15 22:32:46.000000000 +0200
-+++ pdns-2.9.22/pdns/dnsparser.cc	2009-07-06 22:09:02.000000000 +0300
-@@ -16,6 +16,7 @@
-     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
- 
-+#include <stdio.h>
- #include "dnsparser.hh"
- #include "dnswriter.hh"
- #include <boost/lexical_cast.hpp>
-diff -ur pdns-2.9.22.orig/pdns/rcpgenerator.cc pdns-2.9.22/pdns/rcpgenerator.cc
---- pdns-2.9.22.orig/pdns/rcpgenerator.cc	2008-11-15 23:20:27.000000000 +0200
-+++ pdns-2.9.22/pdns/rcpgenerator.cc	2009-07-06 22:07:26.000000000 +0300
-@@ -16,6 +16,7 @@
-     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
- 
-+#include <stdio.h>
- #include "rcpgenerator.hh"
- #include "dnsparser.hh"
- #include "misc.hh"
diff --git a/community/pdnsd/pdnsd b/community/pdnsd/pdnsd
deleted file mode 100755
index 34a541d18..000000000
--- a/community/pdnsd/pdnsd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/pdnsd`
-case "$1" in
-  start)
-    stat_busy "Starting pdnsd Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/pdnsd -d
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pdnsd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping pdnsd Daemon"
-    [ ! -z "$PID" ]  && kill -TERM $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pdnsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community/pekwm/PKGBUILD b/community/pekwm/PKGBUILD
index 751bd58af..fbb861513 100644
--- a/community/pekwm/PKGBUILD
+++ b/community/pekwm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 81762 2012-12-28 23:22:15Z arodseth $
+# $Id: PKGBUILD 89805 2013-05-02 12:32:13Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Eddie Lozon <almostlucky@attbi.com>
 
 pkgname=pekwm
 pkgver=0.1.16
-pkgrel=2
+pkgrel=4
 pkgdesc='Small, fast, functional, and flexible window manager'
 arch=('x86_64' 'i686' 'mips64el')
 license=('GPL')
@@ -27,16 +27,20 @@ backup=(etc/pekwm/autoproperties
         etc/pekwm/mouse_system
         etc/pekwm/start
         etc/pekwm/vars)
-source=("http://www.pekwm.org/projects/pekwm/files/${pkgname}-${pkgver}.tar.bz2"
+source=("http://www.pekwm.org/projects/pekwm/files/$pkgname-$pkgver.tar.bz2"
         "${pkgname}_kdm.desktop")
 sha256sums=('899eef35d5d1f472dd65a08c180b9719935cb1f42eda7fada6f9b8b551c79c96'
             '4c1817d328dad84407c9ba7219015eb3be0345be9e98fc03fa693b6b443a8dc6')
 
-build() {
+prepare() {
   cd "$srcdir"
+
   gendesk
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
 
-  cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
diff --git a/community/pekwm/pekwm.desktop b/community/pekwm/pekwm.desktop
deleted file mode 100644
index 2f59528bd..000000000
--- a/community/pekwm/pekwm.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Pekwm
-Comment=The pekwm window manager
-Exec=pekwm
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index bcb102d29..3c8fe9edd 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 82764 2013-01-24 08:41:17Z mtorromeo $
+# $Id: PKGBUILD 88094 2013-04-11 13:45:38Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=percona-server
-pkgver=5.5.29_rel29.4
+pkgver=5.5.30_rel30.2
 pkgrel=1
 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation"
 arch=('i686' 'x86_64' 'mips64el')
 
-depends=('mysql-clients' 'libaio')
+depends=('mariadb-clients' 'libaio' 'systemd-tools')
 conflicts=('mysql')
-provides=('mysql')
+provides=("mysql=${pkgver/_rel*}" "mariadb=${pkgver/_rel*}")
 optdepends=('perl-dbi' 'perl-dbd-mysql')
 makedepends=('cmake' 'openssl' 'zlib')
 
@@ -19,8 +19,6 @@ options=('!libtool' 'emptydirs')
 backup=('etc/mysql/my.cnf')
 install=percona.install
 source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/source/Percona-Server-${pkgver/_/-}.tar.gz"
-        'mysqld.rc'
-        'my.cnf'
         'mysqld-post.sh'
         'mysqld.service'
         'mysqld-tmpfile.conf')
@@ -79,8 +77,7 @@ package() {
 	cd "${srcdir}"/build
 	make DESTDIR=${pkgdir} install
 
-	install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf
-	install -Dm755 "${srcdir}"/mysqld.rc "${pkgdir}"/etc/rc.d/mysqld
+	install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf
 	install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post
 	install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf
 	install -Dm644 "${srcdir}"/mysqld.service "${pkgdir}"/usr/lib/systemd/system/mysqld.service
@@ -98,13 +95,9 @@ package() {
 	# not needed
 	rm -r ${pkgdir}/usr/{data,mysql-test,sql-bench}
 	rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
-
-	install -dm700 "${pkgdir}"/var/lib/mysql
 }
 
-sha256sums=('b29dfa3634450e405c697e145dc63cf939c3c803bdeccecc01289188b40819a9'
-            'e875fac56f69634b4f1720aec3b952fc63903414e9345af630e5fd74b5373eb4'
-            'dd5dc155de468d4ab26971109861ae19b53574f28785bac5ff7b717fb65c0760'
-            '4894d39605950d86841ad982e619daa6c8d5d60ca30928d7dbb582e8cb3ade32'
-            'ca10dec3cc162baede651980e675fd8094e55cb2403edffaa3d0865a6184553f'
+sha256sums=('d30876033cd5590f8e1d68aff6a2eaad677dbe59168d4610c580c4e4e2e923a7'
+            '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48'
+            '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869'
             'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60')
diff --git a/community/percona-server/mysqld b/community/percona-server/mysqld
deleted file mode 100644
index 07f6b7e4c..000000000
--- a/community/percona-server/mysqld
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-getPID() {
-   echo $(pgrep -u mysql mysqld 2>/dev/null);
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting Percona Server"
-    [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
-    if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        timeo=30
-        while [ $timeo -gt 0 ]; do
-          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-          echo "$response" | grep -q "mysqld is alive" && break
-          sleep 1
-          let timeo=${timeo}-1
-        done
-        if [ $timeo -eq 0 ]; then
-          stat_fail
-          exit 1
-        else
-          echo $(getPID) > /var/run/mysqld/mysqld.pid
-          add_daemon mysqld
-          stat_done
-        fi
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Percona Server"
-    if [ ! -z "$(getPID)" ]; then
-      timeo=30
-      kill $(getPID) &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      fi
-      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
-        sleep 1
-        let timeo=${timeo}-1
-      done
-      if [ -z "$(getPID)" ]; then
-        rm -f /var/run/mysqld/mysqld.pid &>/dev/null
-        rm_daemon mysqld
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/percona-server/mysqld-post b/community/percona-server/mysqld-post
deleted file mode 100644
index 8c404f4c4..000000000
--- a/community/percona-server/mysqld-post
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-while true; do
-	response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-	echo "$response" | grep -q "mysqld is alive" && break
-	sleep 1
-done
diff --git a/community/percona-server/mysqld-post.sh b/community/percona-server/mysqld-post.sh
index 8c404f4c4..516aeb85e 100644
--- a/community/percona-server/mysqld-post.sh
+++ b/community/percona-server/mysqld-post.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
+
 while true; do
-	response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
+	response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
 	echo "$response" | grep -q "mysqld is alive" && break
+	echo "$response" | grep -q "Access denied for user" && break
 	sleep 1
 done
diff --git a/community/percona-server/mysqld.rc b/community/percona-server/mysqld.rc
deleted file mode 100644
index 07f6b7e4c..000000000
--- a/community/percona-server/mysqld.rc
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-getPID() {
-   echo $(pgrep -u mysql mysqld 2>/dev/null);
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting Percona Server"
-    [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
-    if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        timeo=30
-        while [ $timeo -gt 0 ]; do
-          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-          echo "$response" | grep -q "mysqld is alive" && break
-          sleep 1
-          let timeo=${timeo}-1
-        done
-        if [ $timeo -eq 0 ]; then
-          stat_fail
-          exit 1
-        else
-          echo $(getPID) > /var/run/mysqld/mysqld.pid
-          add_daemon mysqld
-          stat_done
-        fi
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Percona Server"
-    if [ ! -z "$(getPID)" ]; then
-      timeo=30
-      kill $(getPID) &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      fi
-      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
-        sleep 1
-        let timeo=${timeo}-1
-      done
-      if [ -z "$(getPID)" ]; then
-        rm -f /var/run/mysqld/mysqld.pid &>/dev/null
-        rm_daemon mysqld
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/percona-server/mysqld.service b/community/percona-server/mysqld.service
index 15802b226..3d2af276c 100644
--- a/community/percona-server/mysqld.service
+++ b/community/percona-server/mysqld.service
@@ -6,15 +6,10 @@ After=syslog.target network.target
 User=mysql
 Group=mysql
 
-ExecStart=/usr/bin/mysqld --pid-file=/var/run/mysqld/mysqld.pid
-ExecStop=/bin/kill -15 $MAINPID
-PIDFile=/var/run/mysqld/mysqld.pid
-WorkingDirectory=/usr
+ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid
+ExecStartPost=/usr/bin/mysqld-post
 
-# We rely on systemd, not mysqld_safe, to restart mysqld if it dies
 Restart=always
-
-# Place temp files in a secure directory, not /tmp
 PrivateTmp=true
 
 [Install]
diff --git a/community/percona-server/percona.install b/community/percona-server/percona.install
index 55f7cacee..c3b337ae1 100644
--- a/community/percona-server/percona.install
+++ b/community/percona-server/percona.install
@@ -1,15 +1,24 @@
+if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then
+  datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p")
+fi
+[[ -z $datadir ]] && datadir=/var/lib/mysql
+
 post_install(){
   groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-  usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-  chown -R mysql:mysql var/lib/mysql &>/dev/null
+  useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
+  
+  if [[ ! -e $datadir ]]; then
+    install -dm700 $datadir
+    usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir
+    chown -R mysql:mysql $datadir &>/dev/null
+  fi
 
   usr/bin/systemd-tmpfiles --create mysqld.conf
 }
 
 post_upgrade(){
   getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
-  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
+  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
 
   if [ "$(vercmp $2 5.5)" -lt 0 ]; then
     echo " >> "
diff --git a/community/percona-server/tmpfiles.conf b/community/percona-server/tmpfiles.conf
deleted file mode 100644
index d621cd9df..000000000
--- a/community/percona-server/tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/mysqld 0755 mysql mysql -
\ No newline at end of file
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index 3f8ff030e..cff8c664e 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 83265 2013-01-28 16:49:52Z stephane $
+# $Id: PKGBUILD 87428 2013-03-31 19:18:35Z stephane $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=performous
 pkgver=0.7.0
-pkgrel=3
+pkgrel=5
 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://performous.org/"
 license=('GPL')
 depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'librsvg' 'ffmpeg') # opencv
-makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.50' 'mesa')
+makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa')
 optdepends=('performous-freesongs: free songs for performous')
-source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2)
-md5sums=('60f3f72b51a630a4aa996484aedb9526')
+source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2
+        performous-0.7.0-cmake.patch)
+md5sums=('60f3f72b51a630a4aa996484aedb9526'
+         '7da8aef3f4dd28e19f95957ae9ac2bb1')
 
 build() {
-  cd ${srcdir}/performous-${pkgver}
+  cd performous-${pkgver}
+
+  patch -Np0 -i ../performous-0.7.0-cmake.patch
 
   mkdir -p build
   cd build
@@ -28,7 +32,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/performous-${pkgver}/build
+  cd performous-${pkgver}/build
 
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/performous/boost-filesystem-v3.patch b/community/performous/boost-filesystem-v3.patch
deleted file mode 100644
index 22dd07213..000000000
--- a/community/performous/boost-filesystem-v3.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff --git a/game/backgrounds.cc b/game/backgrounds.cc
-index 7fd3cd0..cdedefb 100644
---- a/game/backgrounds.cc
-+++ b/game/backgrounds.cc
-@@ -55,8 +55,13 @@ void Backgrounds::reload_internal(fs::path const& parent) {
- 		for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) {
- 			fs::path p = dirIt->path();
- 			if (fs::is_directory(p)) { reload_internal(p); continue; }
-+#if BOOST_FILESYSTEM_VERSION < 3
- 			std::string name = p.leaf(); // File basename
- 			std::string path = p.directory_string(); // Path without filename
-+#else
-+			std::string name = p.filename().string(); // File basename
-+			std::string path = p.string(); // Path without filename
-+#endif
- 			path.erase(path.size() - name.size());
- 			if (!regex_match(name.c_str(), match, expression)) continue;
- 			{
-diff --git a/game/cache.cc b/game/cache.cc
-index 69974e2..0f1edd0 100644
---- a/game/cache.cc
-+++ b/game/cache.cc
-@@ -9,7 +9,11 @@ namespace cache {
- 	fs::path constructSVGCacheFileName(fs::path const& svgfilename, double factor){
- 		fs::path cache_filename;
- 		std::string const lod = (boost::format("%.2f") % factor).str();
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string const cache_basename = svgfilename.filename() + ".cache_" + lod + ".png";
-+#else
-+		std::string const cache_basename = svgfilename.filename().string() + ".cache_" + lod + ".png";
-+#endif
- 
- 		if (isThemeResource(svgfilename)) {
- 			std::string const theme_name = (config["game/theme"].s().empty() ? "default" : config["game/theme"].s());
-diff --git a/game/filemagic.hh b/game/filemagic.hh
-index bf87ded..29e81fe 100644
---- a/game/filemagic.hh
-+++ b/game/filemagic.hh
-@@ -71,7 +71,11 @@ namespace filemagic {
- 		// For now, just check the extension an assume it's not lying.
- 
- 		// Get file extension in lower case
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string ext = filename.extension();
-+#else
-+		std::string ext = filename.extension().string();
-+#endif
- 		// somehow this does not convert the extension to lower case:
- 		//std::for_each(ext.begin(), ext.end(), static_cast<int(*)(int)>(std::tolower));
- 		std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower );
-diff --git a/game/fs.cc b/game/fs.cc
-index e34a784..767a7ab 100644
---- a/game/fs.cc
-+++ b/game/fs.cc
-@@ -128,7 +128,11 @@ std::string getThemePath(std::string const& filename) {
- 
- bool isThemeResource(fs::path filename){
- 	try {
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string themefile = getThemePath(filename.filename());
-+#else
-+		std::string themefile = getThemePath(filename.filename().string());
-+#endif
- 		return themefile == filename;
- 	} catch (...) { return false; }
- }
-diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc
-index 38e163b..db15d79 100644
---- a/game/songparser-ini.cc
-+++ b/game/songparser-ini.cc
-@@ -104,7 +104,11 @@ void SongParser::iniParseHeader() {
- 	// Search the dir for the music files
- 	for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) {
- 		boost::filesystem::path p = dirIt->path();
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string name = p.leaf(); // File basename (notes.txt)
-+#else
-+		std::string name = p.filename().string(); // File basename (notes.txt)
-+#endif
- 		if (regex_match(name.c_str(), match, midifile)) {
- 			 s.midifilename = name;
- 		} else if (regex_match(name.c_str(), match, audiofile_background)) {
-diff --git a/game/songparser.cc b/game/songparser.cc
-index 2b7b9b4..ac9f3f6 100644
---- a/game/songparser.cc
-+++ b/game/songparser.cc
-@@ -100,7 +100,11 @@ SongParser::SongParser(Song& s):
- 
- 		for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) {
- 			boost::filesystem::path p = dirIt->path();
-+#if BOOST_FILESYSTEM_VERSION < 3
- 			std::string name = p.leaf(); // File basename
-+#else
-+			std::string name = p.filename().string(); // File basename
-+#endif
- 			if (m_song.cover.empty() && regex_match(name.c_str(), match, coverfile)) {
- 				m_song.cover = name;
- 			} else if (m_song.background.empty() && regex_match(name.c_str(), match, backgroundfile)) {
-diff --git a/game/songs.cc b/game/songs.cc
-index 62ab26d..afab383 100644
---- a/game/songs.cc
-+++ b/game/songs.cc
-@@ -67,8 +67,13 @@ void Songs::reload_internal(fs::path const& parent) {
- 		for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) {
- 			fs::path p = dirIt->path();
- 			if (fs::is_directory(p)) { reload_internal(p); continue; }
-+#if BOOST_FILESYSTEM_VERSION < 3
- 			std::string name = p.leaf(); // File basename (notes.txt)
- 			std::string path = p.directory_string(); // Path without filename
-+#else
-+			std::string name = p.filename().string(); // File basename (notes.txt)
-+			std::string path = p.string(); // Path without filename
-+#endif
- 			path.erase(path.size() - name.size());
- 			if (!regex_match(name.c_str(), match, expression)) continue;
- 			try {
-diff --git a/tools/ss_helpers.hh b/tools/ss_helpers.hh
-index 58e19dc..8895d94 100644
---- a/tools/ss_helpers.hh
-+++ b/tools/ss_helpers.hh
-@@ -10,7 +10,11 @@ extern "C" void xmlLogger(void* logger, char const* msg, ...) { if (logger) *(st
- void enableXMLLogger(std::ostream& os = std::cerr) { xmlSetGenericErrorFunc(&os, xmlLogger); }
- void disableXMLLogger() { xmlSetGenericErrorFunc(NULL, xmlLogger); }
- 
-+#if BOOST_FILESYSTEM_VERSION < 3
- std::string filename(boost::filesystem::path const& p) { return *--p.end(); }
-+#else
-+std::string filename(boost::filesystem::path const& p) { return p.filename().string(); }
-+#endif
- 
- /** Fix Singstar's b0rked XML **/
- std::string xmlFix(std::vector<char> const& data) {
--- 
-1.7.4.1
-
diff --git a/community/performous/ffmpeg-0.11.patch b/community/performous/ffmpeg-0.11.patch
deleted file mode 100644
index 2962123ed..000000000
--- a/community/performous/ffmpeg-0.11.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ru Performous-0.6.1-Source/game/ffmpeg.cc Performous-0.6.1a-Source/game/ffmpeg.cc
---- Performous-0.6.1-Source/game/ffmpeg.cc	2010-10-31 16:05:43.000000000 +0000
-+++ Performous-0.6.1a-Source/game/ffmpeg.cc	2012-06-08 21:40:10.876636789 +0000
-@@ -47,11 +47,17 @@
- 	return d >= 0.0 ? d : getInf();
- }
- 
-+// FFMPEG has fluctuating API
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(64<<8)+0)
-+#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
-+#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
-+#endif
-+
- void FFmpeg::open() {
- 	boost::mutex::scoped_lock l(s_avcodec_mutex);
- 	av_register_all();
- 	av_log_set_level(AV_LOG_ERROR);
--	if (av_open_input_file(&pFormatCtx, m_filename.c_str(), NULL, 0, NULL)) throw std::runtime_error("Cannot open input file");
-+	if (avformat_open_input(&pFormatCtx, m_filename.c_str(), NULL, NULL)) throw std::runtime_error("Cannot open input file");
- 	if (av_find_stream_info(pFormatCtx) < 0) throw std::runtime_error("Cannot find stream information");
- 	pFormatCtx->flags |= AVFMT_FLAG_GENPTS;
- 	videoStream = -1;
-@@ -60,8 +66,8 @@
- 	for (unsigned int i=0; i<pFormatCtx->nb_streams; i++) {
- 		AVCodecContext* cc = pFormatCtx->streams[i]->codec;
- 		cc->workaround_bugs = FF_BUG_AUTODETECT;
--		if (videoStream == -1 && cc->codec_type==CODEC_TYPE_VIDEO) videoStream = i;
--		if (audioStream == -1 && cc->codec_type==CODEC_TYPE_AUDIO) audioStream = i;
-+		if (videoStream == -1 && cc->codec_type==AVMEDIA_TYPE_VIDEO) videoStream = i;
-+		if (audioStream == -1 && cc->codec_type==AVMEDIA_TYPE_AUDIO) audioStream = i;
- 	}
- 	if (videoStream == -1 && decodeVideo) throw std::runtime_error("No video stream found");
- 	if (audioStream == -1 && decodeAudio) throw std::runtime_error("No audio stream found");
-@@ -92,7 +98,7 @@
- 		pAudioCodecCtx = cc;
- #if LIBAVCODEC_VERSION_INT > ((52<<16)+(12<<8)+0)
- 		pResampleCtx = av_audio_resample_init(AUDIO_CHANNELS, cc->channels, m_rate, cc->sample_rate,
--			SAMPLE_FMT_S16, SAMPLE_FMT_S16, 16, 10, 0, 0.8);
-+			AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16, 16, 10, 0, 0.8);
- #else
- 		pResampleCtx = audio_resample_init(AUDIO_CHANNELS, cc->channels, m_rate, cc->sample_rate);
- #endif
diff --git a/community/performous/fix-boost-1.50-xtime.patch b/community/performous/fix-boost-1.50-xtime.patch
deleted file mode 100644
index d13b18c26..000000000
--- a/community/performous/fix-boost-1.50-xtime.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a4be6f47bcdd64e7c77db0a04415973d4c322ae8 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Alvaro=20Fernando=20Garc=C3=ADa?= <alvarofernandogarcia@gmail.com>
-Date: Sat, 7 Jul 2012 18:53:56 -0300
-Subject: [PATCH] Fixed boost xtime.hpp usage (for 1.50 version)
-
----
- game/xtime.hh |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/game/xtime.hh b/game/xtime.hh
-index 41303cb..8f5463d 100644
---- a/game/xtime.hh
-+++ b/game/xtime.hh
-@@ -1,5 +1,6 @@
- #pragma once
- 
-+#include <boost/version.hpp>
- #include <boost/thread/xtime.hpp>
- #include <cmath>
- 
-@@ -20,7 +21,11 @@ namespace {
- 	}
- 	boost::xtime now() {
- 		boost::xtime time;
-+#if (BOOST_VERSION / 100 % 1000 >= 50)
-+		boost::xtime_get(&time, boost::TIME_UTC_);
-+#else
- 		boost::xtime_get(&time, boost::TIME_UTC);
-+#endif
- 		return time;
- 	}
- 	double seconds(boost::xtime const& time) {
--- 
-1.7.4.1
-
diff --git a/community/performous/performous-0.7.0-cmake.patch b/community/performous/performous-0.7.0-cmake.patch
new file mode 100644
index 000000000..4c6f47b63
--- /dev/null
+++ b/community/performous/performous-0.7.0-cmake.patch
@@ -0,0 +1,155 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Jan 24 13:13:50 UTC 2013
+Subject: build system
+
+	- fix opencv module to prefer pkg-config results
+	- fix some module and macro names and try to use
+	system modules as much as possible (ALSA Boost Gettext Jpeg Png Tiff Z)
+
+--- cmake/Modules/FindOpenCV.cmake
++++ cmake/Modules/FindOpenCV.cmake
+@@ -57,13 +57,21 @@
+     include(FindPkgConfig)
+     if(PKG_CONFIG_FOUND)
+       pkg_check_modules(OPENCV_PKGCONF opencv)
+-      set(OpenCV_DIR ${OPENCV_PKGCONF_PREFIX})
+-      if(EXISTS "${OpenCV_DIR}")
+-	set(OpenCV_configScript_DIR "${OpenCV_DIR}/share/opencv")
+-	if(EXISTS "${OpenCV_configScript_DIR}")
+-	  set(OpenCV_configScript "${OpenCV_configScript_DIR}/OpenCVConfig.cmake")
+-	endif(EXISTS "${OpenCV_configScript_DIR}")
+-      endif(EXISTS "${OpenCV_DIR}")
++      # prefer pkg-config values
++      if(OPENCV_PKGCONF_FOUND)
++        set(OpenCV_LIBS ${OPENCV_PKGCONF_LDFLAGS})
++	set(OpenCV_FOUND true)
++	set(OpenCV_INCLUDE_DIR ${OPENCV_PKGCONF_INCLUDE_DIRS})
++	set(OpenCV_VERSION ${OPENCV_PKGCONF_VERSION})
++      else(OPENCV_PKGCONF_FOUND)
++        set(OpenCV_DIR ${OPENCV_PKGCONF_PREFIX})
++        if(EXISTS "${OpenCV_DIR}")
++  	  set(OpenCV_configScript_DIR "${OpenCV_DIR}/share/opencv")
++	  if(EXISTS "${OpenCV_configScript_DIR}")
++	    set(OpenCV_configScript "${OpenCV_configScript_DIR}/OpenCVConfig.cmake")
++	  endif(EXISTS "${OpenCV_configScript_DIR}")
++        endif(EXISTS "${OpenCV_DIR}")
++      endif(OPENCV_PKGCONF_FOUND)
+     endif(PKG_CONFIG_FOUND)
+   endif(NOT WIN32)
+ endif(NOT EXISTS "${OpenCV_DIR}")
+@@ -72,7 +80,7 @@
+ ##====================================================
+ ## Find OpenCV libraries
+ ##----------------------------------------------------
+-if(EXISTS "${OpenCV_DIR}")
++if(EXISTS "${OpenCV_DIR}" AND NOT OpenCV_FOUND)
+ 
+   #When its possible to use the Config script use it.
+   if(EXISTS "${OpenCV_configScript}")
+@@ -257,9 +265,9 @@
+   endif(${OpenCV_VERSION} VERSION_GREATER 2.1.0)
+ 
+ 
+-else(EXISTS "${OpenCV_DIR}")
++else(EXISTS "${OpenCV_DIR}" AND NOT OpenCV_FOUND)
+   set(ERR_MSG "Please specify OpenCV directory using OpenCV_DIR env. variable")
+-endif(EXISTS "${OpenCV_DIR}")
++endif(EXISTS "${OpenCV_DIR}" AND NOT OpenCV_FOUND)
+ ##====================================================
+ 
+ ##====================================================
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -33,7 +33,7 @@
+ 
+ #need to put here do setting LOCALE_DIR variable
+ find_package(Gettext)
+-if(Gettext_FOUND)
++if(GETTEXT_FOUND)
+ 	if(NOT LOCALE_DIR)
+ 		if(WIN32)
+ 			SET(LOCALE_DIR "bin/locale")
+@@ -55,7 +55,7 @@
+ 			message(STATUS "Cannot find msgfmt to convert language file. Translation won't be enabled")
+ 		endif()
+ 	endif(NOT LOCALE_DIR)
+-endif(Gettext_FOUND)
++endif(GETTEXT_FOUND)
+ add_subdirectory(themes)
+ add_subdirectory(data)
+ add_subdirectory(game)
+--- game/CMakeLists.txt
++++ game/CMakeLists.txt
+@@ -71,7 +71,7 @@
+ list(APPEND LIBS ${Boost_LIBRARIES})
+ 
+ # Find all the libs that don't require extra parameters
+-foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ GLEW AVFormat SWScale OpenGL Z Jpeg Png PortAudio)
++foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ GLEW AVFormat SWScale OpenGL ZLIB JPEG PNG PortAudio)
+ 	find_package(${lib} REQUIRED)
+ 	include_directories(${${lib}_INCLUDE_DIRS})
+ 	list(APPEND LIBS ${${lib}_LIBRARIES})
+@@ -79,7 +79,7 @@
+ endforeach(lib)
+ 
+ find_package(Gettext)
+-if(Gettext_FOUND)
++if(GETTEXT_FOUND)
+ 	include_directories(${Gettext_INCLUDE_DIRS})
+ 	list(APPEND LIBS ${Gettext_LIBRARIES})
+ 	add_definitions("-DUSE_GETTEXT")
+--- tools/CMakeLists.txt
++++ tools/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ include_directories(${Boost_INCLUDE_DIRS})
+ 
+ # Find all the libs that don't require extra parameters
+-foreach(lib LibXML++ Magick++ Z Jpeg Tiff Png Freetype Z)
++foreach(lib LibXML++ Magick++ ZLIB JPEG TIFF PNG Freetype ZLIB)
+ 	find_package(${lib})
+ 	if (${lib}_FOUND)
+ 		include_directories(${${lib}_INCLUDE_DIRS})
+@@ -24,13 +24,13 @@
+ if (LibXML++_FOUND)
+ 	if (Boost_FOUND)
+ 		if (Magick++_FOUND)
+-			if (Z_FOUND)
++			if (ZLIB_FOUND)
+ 				add_executable(ss_extract ss_extract.cpp pak.cpp ipu_conv.cpp ss_cover.cpp)
+-				target_link_libraries(ss_extract ${LibXML++_LIBRARIES} ${Boost_LIBRARIES} ${Magick++_LIBRARIES} ${Z_LIBRARIES} ${Jpeg_LIBRARIES} ${Tiff_LIBRARIES} ${Png_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES})
++				target_link_libraries(ss_extract ${LibXML++_LIBRARIES} ${Boost_LIBRARIES} ${Magick++_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES})
+ 				set(targets ${targets} ss_extract)
+-			else (Z_FOUND)
++			else (ZLIB_FOUND)
+ 				message("No zlib found, not building ss_extract")
+-			endif (Z_FOUND)
++			endif (ZLIB_FOUND)
+ 		else (Magick++_FOUND)
+ 			message("No Magick++ found, not building ss_extract")
+ 		endif (Magick++_FOUND)
+@@ -40,7 +40,7 @@
+ 
+ 	if (Magick++_FOUND)
+ 		add_executable(ss_cover_conv cover_conv.cpp pak.cpp ss_cover.cpp)
+-		target_link_libraries(ss_cover_conv ${Magick++_LIBRARIES} ${LibXML++_LIBRARIES} ${Z_LIBRARIES} ${Jpeg_LIBRARIES} ${Tiff_LIBRARIES} ${Png_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES})
++		target_link_libraries(ss_cover_conv ${Magick++_LIBRARIES} ${LibXML++_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES})
+ 		set(targets ${targets} ss_cover_conv)
+ 	else (Magick++_FOUND)
+ 		message("No Magick++ found, not building ss_cover_conv")
+@@ -58,13 +58,13 @@
+ 	target_link_libraries(ss_archive_extract ${Boost_LIBRARIES})
+ 	set(targets ${targets} ss_archive_extract)
+ 
+-	if (Z_FOUND)
++	if (ZLIB_FOUND)
+ 		add_executable(itg_pck itg_pck.cc)
+-		target_link_libraries(itg_pck ${Boost_LIBRARIES} ${Z_LIBRARIES})
++		target_link_libraries(itg_pck ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
+ 		set(targets ${targets} itg_pck)
+ 
+ 		add_executable(ss_chc_decode ss_chc_decode.cpp)
+-		target_link_libraries(ss_chc_decode ${Boost_LIBRARIES} ${Z_LIBRARIES})
++		target_link_libraries(ss_chc_decode ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
+ 		set(targets ${targets} ss_chc_decode)
+ 	endif()
+ endif (Boost_FOUND)
diff --git a/community/performous/png15.patch b/community/performous/png15.patch
deleted file mode 100644
index b6fb8fb14..000000000
--- a/community/performous/png15.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur Performous-0.6.1-Source/cmake/Modules/FindPng.cmake Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake
---- Performous-0.6.1-Source/cmake/Modules/FindPng.cmake	2010-10-31 17:05:44.000000000 +0100
-+++ Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake	2012-01-29 01:07:56.339648832 +0100
-@@ -10,7 +10,7 @@
- 
- include(LibFindMacros)
- 
--libfind_pkg_check_modules(Png_PKGCONF Png)
-+libfind_pkg_check_modules(Png_PKGCONF libpng)
- 
- find_path(Png_INCLUDE_DIR
-   NAMES pngconf.h
-@@ -18,7 +18,7 @@
- )
- 
- find_library(Png_LIBRARY
--  NAMES png png12 png14
-+  NAMES png png12 png14 png15
-   PATHS ${Png_PKGCONF_LIBRARY_DIRS}
- )
- 
-diff -ur Performous-0.6.1-Source/game/image.hh Performous-0.6.1a-Source/game/image.hh
---- Performous-0.6.1-Source/game/image.hh	2010-10-31 17:05:43.000000000 +0100
-+++ Performous-0.6.1a-Source/game/image.hh	2012-01-29 01:44:16.050575186 +0100
-@@ -26,7 +26,7 @@
- 	}
- 	void loadPNG_internal(png_structp pngPtr, png_infop infoPtr, std::ifstream& file, std::vector<unsigned char>& image, std::vector<png_bytep>& rows, unsigned& w, unsigned& h) {
- 		if (setjmp(png_jmpbuf(pngPtr))) throw std::runtime_error("Reading PNG failed");
--		png_set_read_fn(pngPtr,(voidp)&file, readPngHelper);
-+		png_set_read_fn(pngPtr, &file, readPngHelper);
- 		png_read_info(pngPtr, infoPtr);
- 		png_set_expand(pngPtr);  // Expand everything to RGB(A)
- 		png_set_strip_16(pngPtr);  // Strip everything down to 8 bit/component
diff --git a/community/perl-clone/PKGBUILD b/community/perl-clone/PKGBUILD
index 463484cb4..f07ed1629 100644
--- a/community/perl-clone/PKGBUILD
+++ b/community/perl-clone/PKGBUILD
@@ -3,30 +3,26 @@
 # Contributor: Alex Dioso <adioso->gmail*com>
 
 pkgname=perl-clone
-pkgver=0.31
-pkgrel=5
+pkgver=0.34
+pkgrel=1
 pkgdesc='Recursive copy of nested objects.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://search.cpan.org/~RDF/Clone'
 license=('GPL' 'PerlArtistic')
 depends=('perl>=5.10.0')
 options=('!emptydirs')
-source=("http://www.cpan.org/authors/id/R/RD/RDF/Clone-${pkgver}.tar.gz")
-md5sums=('65f34e7280d7b7dfb72ab6224e5767f5')
+source=("http://search.cpan.org/CPAN/authors/id/G/GA/GARU/Clone-$pkgver.tar.gz")
+md5sums=('6475432d91b1820eff1ae877ea5c8e3b')
 
 build() {
   cd  Clone-${pkgver}
-
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-
   make
 }
 
 package() {
   cd  Clone-${pkgver}
-
   make DESTDIR=${pkgdir} install
-
   find ${pkgdir} -name '.packlist' -delete
   find ${pkgdir} -name '*.pod' -delete
 }
diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD
index a259cc7d1..7fa2c4cb8 100644
--- a/community/perl-datetime/PKGBUILD
+++ b/community/perl-datetime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 76996 2012-10-03 07:10:45Z spupykin $
+# $Id: PKGBUILD 85696 2013-03-05 09:22:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-datetime
-pkgver=0.77
+pkgver=0.78
 pkgrel=1
 pkgdesc="A complete, easy to use date and time object"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ LC_NUMERIC=C
 provides=("perl-datetime=`printf %.4f $pkgver`")
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz)
-md5sums=('1c35bb64f0a261cd3ab4cc161726290a')
+md5sums=('9d71a13933e3afc55c2c54202d40ae13')
 
 build() {
   cd  $srcdir/DateTime-$pkgver
diff --git a/community/perl-dbd-odbc/PKGBUILD b/community/perl-dbd-odbc/PKGBUILD
index dfedd37cb..49097474e 100644
--- a/community/perl-dbd-odbc/PKGBUILD
+++ b/community/perl-dbd-odbc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82878 2013-01-25 09:55:32Z spupykin $
+# $Id: PKGBUILD 88252 2013-04-15 10:48:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-dbd-odbc
-pkgver=1.41
+pkgver=1.43
 pkgrel=1
 pkgdesc="ODBC Driver for DBI"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic')
 depends=('perl-dbi' 'perl' 'unixodbc')
 options=('!emptydirs')
 source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz")
-md5sums=('94bce7246d69df1ea5b2f8a702f35554')
+md5sums=('35e37488170b5111f826226c4d466961')
 
 build() {
   cd  DBD-ODBC-${pkgver}
diff --git a/community/perl-dbd-sqlite2/PKGBUILD b/community/perl-dbd-sqlite2/PKGBUILD
index 3bd4df7bc..67ca8b084 100644
--- a/community/perl-dbd-sqlite2/PKGBUILD
+++ b/community/perl-dbd-sqlite2/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 71771 2012-06-02 10:30:10Z bluewind $
+# $Id: PKGBUILD 88254 2013-04-15 10:48:22Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 
 pkgname=perl-dbd-sqlite2
-pkgver=0.33
-pkgrel=9
+pkgver=0.36
+pkgrel=1
 pkgdesc="Perl/CPAN Module DBD::SQLite2"
 arch=("i686" "x86_64" 'mips64el')
 url="http://search.cpan.org/dist/DBD-SQLite2"
 license=("GPL" "PerlArtistic")
 depends=("perl-dbi")
-source=("http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite2-${pkgver}.tar.gz")
-md5sums=('babd83fd5eb9ba7560ad4bab4c76c0eb')
+source=("http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/DBD-SQLite2-$pkgver.tar.gz")
+md5sums=('221b30e630c72613d1fb5663db048a71')
 
 build() {
   cd DBD-SQLite2-${pkgver}
diff --git a/community/perl-dbd-sybase/PKGBUILD b/community/perl-dbd-sybase/PKGBUILD
index d85c095d3..5c5482b10 100644
--- a/community/perl-dbd-sybase/PKGBUILD
+++ b/community/perl-dbd-sybase/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71773 2012-06-02 10:30:14Z bluewind $
+# $Id: PKGBUILD 88257 2013-04-15 10:48:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=perl-dbd-sybase
-pkgver=1.14
-pkgrel=2
+pkgver=1.15
+pkgrel=1
 pkgdesc="Sybase Driver for DBI"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DBD-Sybase/"
@@ -11,7 +11,7 @@ license=('GPL' 'PerlArtistic')
 depends=('perl-dbi>=1.52' 'perl>=5.10.0' 'freetds')
 options=('!emptydirs')
 source=("http://search.cpan.org/CPAN/authors/id/M/ME/MEWP/DBD-Sybase-${pkgver}.tar.gz")
-md5sums=('db6662d710b3adffe37bd8aec8060eda')
+md5sums=('d76f09f9a25896fd879ef89a98748708')
 
 build() {
   cd  $srcdir/DBD-Sybase-${pkgver}
diff --git a/community/perl-gd/PKGBUILD b/community/perl-gd/PKGBUILD
index 826760ba9..edb1da252 100644
--- a/community/perl-gd/PKGBUILD
+++ b/community/perl-gd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71781 2012-06-02 10:30:30Z bluewind $
+# $Id: PKGBUILD 86698 2013-03-21 10:52:41Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+aur@gmail.com>
 
 pkgname=perl-gd
-pkgver=2.46
-pkgrel=3
+pkgver=2.49
+pkgrel=1
 pkgdesc="Interface to Gd Graphics Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/GD"
@@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic')
 depends=('gd')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/L/LD/LDS/GD-$pkgver.tar.gz)
-md5sums=('ea86a94eb45330eae27ecbfd5c2f43bb')
+md5sums=('c58b6556bddbe147c41f4e17a0de9bea')
 
 build() {
   cd  $srcdir/GD-$pkgver
diff --git a/community/perl-gnome2-wnck/PKGBUILD b/community/perl-gnome2-wnck/PKGBUILD
index ca6fe4ce1..56b07a88d 100644
--- a/community/perl-gnome2-wnck/PKGBUILD
+++ b/community/perl-gnome2-wnck/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 71783 2012-06-02 10:30:34Z bluewind $
+# $Id: PKGBUILD 87815 2013-04-07 02:33:26Z bgyorgy $
 # Maintainer Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=perl-gnome2-wnck
 pkgver=0.16
-pkgrel=6
+pkgrel=7
 pkgdesc="Perl interface to the Window Navigator Construction Kit"
 arch=('i686' 'x86_64' 'mips64el')
 license=("GPL" "PerlArtistic")
 url="http://search.cpan.org/dist/Gnome2-Wnck"
-depends=('perl' 'perl-extutils-depends' 'perl-extutils-pkgconfig' 'gnome-perl' 'libwnck')
+depends=('gtk2-perl' 'libwnck')
+makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
 options=('!emptydirs')
 source=("http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gnome2-Wnck-${pkgver}.tar.gz")
 md5sums=('439f4569ffd7af96ef1d3feaab23760e')
@@ -23,6 +24,4 @@ build() {
 package() {
   cd Gnome2-Wnck-${pkgver}
   make install DESTDIR=${pkgdir}
-  find ${pkgdir} -name '.packlist' -delete
-  find ${pkgdir} -name '*.pod' -delete
 }
diff --git a/community/perl-gstreamer/PKGBUILD b/community/perl-gstreamer/PKGBUILD
index ce3a83bab..d5baa978c 100644
--- a/community/perl-gstreamer/PKGBUILD
+++ b/community/perl-gstreamer/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71787 2012-06-02 10:30:42Z bluewind $
+# $Id: PKGBUILD 86700 2013-03-21 10:53:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=perl-gstreamer
-pkgver=0.17
+pkgver=0.18
 pkgrel=1
 pkgdesc="Interface to the GStreamer library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic')
 depends=('glib-perl>=1.180' 'gstreamer0.10' 'perl-extutils-pkgconfig>=1.07' 'perl-extutils-depends>=0.205')
 options=('!emptydirs')
 source=(http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/GStreamer-$pkgver.tar.gz)
-md5sums=('8fe097daf0e2534452a3f69af05ec9fd')
+md5sums=('7ac748677f00d1fd966b09e10448cff6')
 
 build() {
   cd  GStreamer-${pkgver}
diff --git a/community/perl-lchown/PKGBUILD b/community/perl-lchown/PKGBUILD
index 319a30bd1..1984b2eb9 100644
--- a/community/perl-lchown/PKGBUILD
+++ b/community/perl-lchown/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=perl-lchown
 pkgver=1.01
 pkgrel=1
 pkgdesc="use the lchown(2) system call from Perl"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=(PerlArtistic GPL)
 options=(!emptydirs)
 depends=('perl')
diff --git a/community/perl-linux-pid/PKGBUILD b/community/perl-linux-pid/PKGBUILD
index 76714a174..44c6e2894 100644
--- a/community/perl-linux-pid/PKGBUILD
+++ b/community/perl-linux-pid/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 71809 2012-06-02 10:31:26Z bluewind $
+# $Id: PKGBUILD 86747 2013-03-21 21:01:12Z eric $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Generator  : CPANPLUS::Dist::Arch 1.12
@@ -12,33 +12,31 @@ license=('PerlArtistic' 'GPL')
 options=('!emptydirs')
 depends=('perl')
 url='http://search.cpan.org/dist/Linux-Pid'
-source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-0.04.tar.gz')
+source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-$pkgver.tar.gz')
 md5sums=('130c4d299f827abf1f2285fddf03fccb')
-_distdir="${srcdir}/Linux-Pid-0.04"
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
       PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+      PERL_MM_OPT="INSTALLDIRS=vendor"     \
+      PERL_MB_OPT="--installdirs vendor" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd Linux-Pid-$pkgver
     /usr/bin/perl Makefile.PL
     make
   )
 }
 
 check() {
-  cd "$_distdir"
+  cd Linux-Pid-$pkgver
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
     make test
   )
 }
 
 package() {
-  cd "$_distdir"
-  make install
-  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
+  cd Linux-Pid-$pkgver
+  make DESTDIR="$pkgdir" install
 }
 
diff --git a/community/perl-package-stash-xs/PKGBUILD b/community/perl-package-stash-xs/PKGBUILD
index 34f8633a1..43c93b42c 100644
--- a/community/perl-package-stash-xs/PKGBUILD
+++ b/community/perl-package-stash-xs/PKGBUILD
@@ -1,30 +1,28 @@
 # Maintainer: Justin Davis <jrcd83@gmail.com>
-# $Id: PKGBUILD 71819 2012-06-02 10:31:46Z bluewind $
+# $Id: PKGBUILD 86634 2013-03-20 19:09:56Z eric $
 
 pkgname=perl-package-stash-xs
-pkgver=0.25
-pkgrel=2
-pkgdesc="faster and more correct implementation of the Package::Stash API"
-arch=(i686 x86_64 'mips64el')
+pkgver=0.26
+pkgrel=1
+pkgdesc="Faster and more correct implementation of the Package::Stash API"
+arch=(i686 x86_64 mips64el)
 license=(PerlArtistic GPL)
 options=(!emptydirs)
-depends=('perl>=5.8.1')
-makedepends=('perl-extutils-makemaker>=6.30')
-checkdepends=('perl-test-fatal' 'perl-test-simple')
-url=https://metacpan.org/release/Package-Stash-XS
+depends=('perl')
+makedepends=('perl-extutils-makemaker')
+checkdepends=('perl-test-fatal' 'perl-test-simple' 'perl-test-requires')
+url="http://search.cpan.org/dist/Package-Stash-XS"
 source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-${pkgver}.tar.gz")
-md5sums=(52ece18842c46da8fb7a4a14dea910ab)
-sha512sums=(2b539d9ba1a68c5ba681e9eabbcde4b396f66dc8dbd3b1e333286ea7ce39b93b97ec4bd97c31681720a925553b128371ce2c48f11254806aebd5de868a22b528)
-_distdir="${srcdir}/Package-Stash-XS-${pkgver}"
+md5sums=('33b07af6344d4a16ecd4e9ae3fa48984')
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
       PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+      PERL_MM_OPT="INSTALLDIRS=vendor"     \
+      PERL_MB_OPT="--installdirs vendor" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd Package-Stash-XS-${pkgver}
     /usr/bin/perl Makefile.PL
     make
   )
@@ -32,15 +30,14 @@ build() {
 
 check() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
-    cd "$_distdir"
+    cd Package-Stash-XS-${pkgver}
     make test
   )
 }
 
 package() {
-    cd "$_distdir"
+    cd Package-Stash-XS-${pkgver}
     make DESTDIR="$pkgdir" install
-    find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
 # Local Variables:
diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD
index 065fff58a..040e569df 100644
--- a/community/perl-xml-libxml/PKGBUILD
+++ b/community/perl-xml-libxml/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 71839 2012-06-02 10:32:30Z bluewind $
-# Maintainer: Justin "juster" Davis <jrcd83@gmail.com>
+# $Id: PKGBUILD 89886 2013-05-04 19:42:51Z jsteel $
+# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
+# Contributor: Justin "juster" Davis <jrcd83@gmail.com>
 # Contributor: François Charette <francois.archlinux.org>
 
 pkgname=perl-xml-libxml
-pkgver=1.98
+pkgver=2.0016
 pkgrel=1
 pkgdesc="Interface to the libxml library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,22 +14,23 @@ depends=('libxml2' 'perl-xml-sax>=0.11' 'perl-xml-namespacesupport>=1.07')
 provides=('perl-libxml' 'perl-xml-libxml-common')
 replaces=('perl-libxml' 'perl-xml-libxml-common')
 conflicts=('perl-libxml' 'perl-xml-libxml-common')
+options=('!emptydirs')
 install=perl-xml-libxml.install
-source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz) 
-md5sums=('78c2e293d02e92ca99b07e9a768380ca')
+source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz)
+md5sums=('d3bbc3437f6b39eca5825e9d0b0c187a')
 
 build() {
-  cd $srcdir/XML-LibXML-$pkgver
+  cd XML-LibXML-$pkgver
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
 check() {
-  cd $srcdir/XML-LibXML-$pkgver
+  cd XML-LibXML-$pkgver
   make test
 }
 
 package() {
-  cd $srcdir/XML-LibXML-$pkgver
-  make pure_install doc_install DESTDIR=$pkgdir
+  cd XML-LibXML-$pkgver
+  make pure_install doc_install DESTDIR="$pkgdir"
 }
diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD
index 454ae378f..09a6ce057 100644
--- a/community/perl-xml-libxslt/PKGBUILD
+++ b/community/perl-xml-libxslt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71841 2012-06-02 10:32:34Z bluewind $
+# $Id: PKGBUILD 86669 2013-03-21 01:03:52Z eric $
 # Maintainer: Justin "juster" Davis <jrcd83@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-xml-libxslt
-pkgver=1.77
+pkgver=1.80
 pkgrel=1
 pkgdesc="Interface to the gnome libxslt library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('perl-xml-libxml' 'libxslt')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-$pkgver.tar.gz)
-md5sums=('a9cf4adb3637a0a42eb69a2998fa488e')
+md5sums=('bd8d0eaeee311a6dc148963a3f7753c6')
 
 build() {
   cd "$srcdir/XML-LibXSLT-$pkgver"
diff --git a/community/php-geoip/PKGBUILD b/community/php-geoip/PKGBUILD
index f3f193205..3d3d6f17c 100644
--- a/community/php-geoip/PKGBUILD
+++ b/community/php-geoip/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=php-geoip
 pkgver=1.0.8
-pkgrel=2
+pkgrel=2.1
 pkgdesc="GeoIP module for PHP"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pecl.php.net/package/geoip"
diff --git a/community/php-memcache/PKGBUILD b/community/php-memcache/PKGBUILD
index 7327f30bc..5e5d3dd39 100644
--- a/community/php-memcache/PKGBUILD
+++ b/community/php-memcache/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 76558 2012-09-23 05:22:53Z foutrelis $
+# $Id: PKGBUILD 87836 2013-04-08 08:42:56Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=php-memcache
-pkgver=3.0.7
+pkgver=3.0.8
 pkgrel=1
 pkgdesc="Memcache module for PHP"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('php')
 backup=('etc/php/conf.d/memcache.ini')
 install=php-memcache.install
 source=(http://pecl.php.net/get/memcache-$pkgver.tgz)
-sha256sums=('f34e2ef42dd8f1f7e6a2cfbb9417a9e58e3bfd7f5db7227ca5afab686cefdd1f')
+sha256sums=('2cae5b423ffbfd33a259829849f6000d4db018debe3e29ecf3056f06642e8311')
 
 build() {
   cd "$srcdir/memcache-$pkgver"
diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD
index 5f413e5d8..8e5035ba6 100644
--- a/community/picard/PKGBUILD
+++ b/community/picard/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 75870 2012-09-04 08:06:47Z bisson $
+# $Id: PKGBUILD 87401 2013-03-31 13:44:28Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: sysrq
 
 pkgname=picard
-pkgver=1.1
+pkgver=1.2
 pkgrel=1
 pkgdesc='Official MusicBrainz tagger'
 url='http://musicbrainz.org/doc/MusicBrainz_Picard'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg')
+depends=('python2-pyqt' 'mutagen')
 optdepends=('libdiscid: CD lookup'
             'chromaprint: fingerprinting')
 source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('8f4a65a2a2df2f371b907fdea7958c5bd0de6bd7')
+sha1sums=('323e22adef321a8fb80d617eb86a880f7d546fca')
 
 install=install
 
diff --git a/community/pidgin-kwallet/PKGBUILD b/community/pidgin-kwallet/PKGBUILD
index 85692069a..0f504f145 100644
--- a/community/pidgin-kwallet/PKGBUILD
+++ b/community/pidgin-kwallet/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pidgin-kwallet
 pkgver=1.1.0
 pkgrel=2
 pkgdesc="KWallet plugin for Pidgin"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kde-apps.org/content/show.php/Pidgin+KWallet+Plugin?content=127136"
 license=('GPL')
 depends=('pidgin' 'kdelibs')
diff --git a/community/pidgin-libnotify/PKGBUILD b/community/pidgin-libnotify/PKGBUILD
index c56be9118..8041fd6fe 100644
--- a/community/pidgin-libnotify/PKGBUILD
+++ b/community/pidgin-libnotify/PKGBUILD
@@ -4,14 +4,14 @@
 
 pkgname=pidgin-libnotify
 pkgver=0.14
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="pidgin plugin that enables popups when someone logs in or messages you."
 url="http://gaim-libnotify.sourceforge.net/"
 license=('GPL')
-depends=('pidgin' 'libnotify' 'perlxml' 'gettext' 'notification-daemon')
-makedepends=('libtool' 'intltool')
-replaces=('gaim-libnotify')
+depends=('pidgin' 'libnotify')
+makedepends=('intltool')
+optdepends=('notification-daemon')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/sourceforge/gaim-libnotify/$pkgname-$pkgver.tar.gz language_fixes.patch
         pidgin-libnotify-0.14-libnotify-0.7.patch pidgin-libnotify-showbutton.patch)
diff --git a/community/pidgin-lwqq/0.1a_fix.patch b/community/pidgin-lwqq/0.1a_fix.patch
deleted file mode 100644
index 63f2adfd0..000000000
--- a/community/pidgin-lwqq/0.1a_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/liblwqq/http.c
-+++ b/src/liblwqq/http.c
-@@ -515,7 +515,9 @@ static int multi_timer_cb(CURLM *multi, long timeout_ms, void *userp)
-     }
-     if(g->still_running){
-         lwqq_log(LOG_NOTICE,"still running:%d,timeout:%ld\n",g->still_running,timeout_ms);
-+	#if USE_DEBUG
-         if(g->still_running>1)lwqq_gdb_whats_running();
-+	#endif
-     }
-     //close time clock
-     //this should always return 0 this is curl!!
diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD
index 6ff3c1952..18ea7a351 100644
--- a/community/pidgin-lwqq/PKGBUILD
+++ b/community/pidgin-lwqq/PKGBUILD
@@ -1,35 +1,35 @@
-# $Id: PKGBUILD 82530 2013-01-20 07:27:44Z fyan $
+# $Id: PKGBUILD 88512 2013-04-19 08:19:36Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=pidgin-lwqq
-pkgver=0.1b
-_pkgver=0.1-b
-pkgrel=1
+pkgver=0.1d
+_pkgver=0.1-d
+pkgrel=3
 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/xiehuc/pidgin-lwqq"
 license=('GPL3')
 depends=('libpurple' 'curl' 'libev' 'hicolor-icon-theme' 'gtk-update-icon-cache')
-optdepends=('telepathy-haze: Empathy plugin support')
+optdepends=('pidgin: Multi-protocol instant messaging client'
+	    'telepathy-haze: Empathy plugin support')
 makedepends=('git' 'cmake')
 install=$pkgname.install
-source=("https://github.com/xiehuc/$pkgname/archive/${_pkgver}.tar.gz")
+source=("https://github.com/xiehuc/$pkgname/archive/${_pkgver}.tar.gz"
+	https://github.com/xiehuc/pidgin-lwqq/commit/afdefd3fb8ecce36f6387c5895339671f5833b4e.patch)
 
 build()
 {
   cd "${srcdir}/$pkgname-${_pkgver}"
-  
-  rm -rf build
-  mkdir build
-  cd build
+  patch -Np1 -i ../afdefd3fb8ecce36f6387c5895339671f5833b4e.patch
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_LIBEV=On ..
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
   make
 }
 
 package()
 {
-  cd "$srcdir/$pkgname-${_pkgver}/build"
+  cd "$srcdir/$pkgname-${_pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('c7dc9de7d951f99e878f3036f79f7d6f')
+md5sums=('5ec83a5a3328dac2ded431bcd7c5c034'
+         '88eebc19df95001cbb4a00e4d0205b7f')
diff --git a/community/pidgin-musictracker/PKGBUILD b/community/pidgin-musictracker/PKGBUILD
deleted file mode 100644
index 5194f814b..000000000
--- a/community/pidgin-musictracker/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 64347 2012-02-11 23:23:00Z allan $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Ionut Biru <ionut@archlinux.ro>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=pidgin-musictracker
-pkgver=0.4.22
-pkgrel=3
-pkgdesc="A plugin for Pidgin which displays the music track currently playing."
-url='http://code.google.com/p/pidgin-musictracker'
-license=('GPL2')
-depends=('pidgin' 'gtk2' 'dbus-glib')
-makedepends=('xmms2')
-arch=('i686' 'x86_64' 'mips64el')
-source=("http://pidgin-musictracker.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
-options=('!libtool')
-md5sums=('8d7225c705484db86b864cab5a536423')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make 
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/pigz/PKGBUILD b/community/pigz/PKGBUILD
index da52e82c9..2dfd3c71b 100644
--- a/community/pigz/PKGBUILD
+++ b/community/pigz/PKGBUILD
@@ -1,38 +1,41 @@
-# $Id: PKGBUILD 74606 2012-07-31 12:59:28Z bpiotrowski $
+# $Id: PKGBUILD 86235 2013-03-13 19:48:34Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski
 # Contributor: Laszlo Papp <djszapi2@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=pigz
-pkgver=2.2.5
+pkgver=2.3
 pkgrel=1
-pkgdesc="Parallel implementation of the gzip file compressor"
+pkgdesc='Parallel implementation of the gzip file compressor'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.zlib.net/pigz/"
+url='http://www.zlib.net/pigz/'
 license=('custom')
 depends=('zlib')
-source=(http://www.zlib.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('188f769ccedc403893d03049ad31e969')
+source=(http://www.zlib.net/$pkgname/$pkgname-$pkgver.tar.gz
+        pigz-2.3-make.patch)
+md5sums=('042e3322534f2c3d761736350cac303f'
+         'f6291ee36e36e098d7fbf0655a89b183')
 
 build() {
-  cd "${srcdir}/$pkgname-$pkgver"
+  cd "$srcdir"/$pkgname-$pkgver
+  patch -Np1 -i "$srcdir"/pigz-2.3-make.patch
   make
 }
 
 package() {
-  cd "${srcdir}/$pkgname-$pkgver"
+  cd "$srcdir"/$pkgname-$pkgver
 
-  install -Dm755 "${srcdir}"/${pkgname}-$pkgver/${pkgname} \
-    "${pkgdir}"/usr/bin/${pkgname} 
+  install -Dm755 "$srcdir"/$pkgname-$pkgver/$pkgname \
+    "$pkgdir"/usr/bin/$pkgname 
 
-  pushd "${pkgdir}"/usr/bin
+  pushd "$pkgdir"/usr/bin
     ln -s pigz unpigz 
   popd
 
-  install -Dm644 "${srcdir}"/${pkgname}-$pkgver/${pkgname}.1 \
-    "${pkgdir}"/usr/share/man/man1/${pkgname}.1
-  install -Dm644 "${srcdir}"/${pkgname}-$pkgver/${pkgname}.pdf \
-    "${pkgdir}"/usr/share/doc/${pkgname}/${pkgname}.pdf
-  install -Dm644 "${srcdir}"/${pkgname}-$pkgver/README \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/README
+  install -Dm644 "$srcdir"/$pkgname-$pkgver/$pkgname.1 \
+    "$pkgdir"/usr/share/man/man1/$pkgname.1
+  install -Dm644 "$srcdir"/$pkgname-$pkgver/$pkgname.pdf \
+    "$pkgdir"/usr/share/doc/$pkgname/$pkgname.pdf
+  install -Dm644 "$srcdir"/$pkgname-$pkgver/README \
+    "$pkgdir"/usr/share/licenses/$pkgname/README
 }
diff --git a/community/pigz/pigz-2.3-make.patch b/community/pigz/pigz-2.3-make.patch
new file mode 100644
index 000000000..f014c7b02
--- /dev/null
+++ b/community/pigz/pigz-2.3-make.patch
@@ -0,0 +1,25 @@
+From 545a9350f8026f6c9826dd4fa7ab6000d8826d78 Mon Sep 17 00:00:00 2001
+From: Tim Harder <radhermit@gmail.com>
+Date: Wed, 6 Mar 2013 15:51:27 -0800
+Subject: [PATCH] Respect LDFLAGS and explicitly link to math library
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 3cc231d..48d1f26 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,7 @@ CFLAGS=-O3 -Wall -Wextra
+ 
+ 
+ pigz: pigz.o yarn.o zopfli/deflate.o zopfli/blocksplitter.o zopfli/tree.o zopfli/lz77.o zopfli/cache.o zopfli/hash.o zopfli/util.o zopfli/squeeze.o zopfli/katajainen.o
+-	$(CC) -o pigz $^ -lpthread -lz
++	$(CC) $(LDFLAGS) -o pigz $^ -lpthread -lz -lm
+ 	ln -f pigz unpigz
+ 
+ pigz.o: pigz.c yarn.h zopfli/deflate.h zopfli/util.h
+-- 
+1.8.1.5
+
diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD
index a5ba78bbd..2977922a5 100644
--- a/community/pingus/PKGBUILD
+++ b/community/pingus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 83266 2013-01-28 16:49:53Z stephane $
+# $Id: PKGBUILD 87429 2013-03-31 19:18:38Z stephane $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=pingus
 pkgver=0.7.6
-pkgrel=6
+pkgrel=7
 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pingus.seul.org"
diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD
index 1391462d6..13633cbc0 100644
--- a/community/pinot/PKGBUILD
+++ b/community/pinot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83267 2013-01-28 16:49:57Z stephane $
+# $Id: PKGBUILD 87430 2013-03-31 19:18:40Z stephane $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=pinot
 pkgver=1.03
-pkgrel=1
+pkgrel=2
 pkgdesc='Personal search and metasearch tool'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/pinot-search/'
diff --git a/community/pion-net/PKGBUILD b/community/pion-net/PKGBUILD
deleted file mode 100644
index c34b2b733..000000000
--- a/community/pion-net/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 80245 2012-11-18 10:31:18Z andrea $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: David Watzke <david@watzke.cz>
-pkgname=pion-net
-pkgver=4.0.12
-pkgrel=4
-pkgdesc="A C++ development library for implementing lightweight HTTP interfaces"
-url="http://www.pion.org/projects/pion-network-library"
-arch=('i686' 'x86_64')
-license=('custom:Boost')
-depends=('boost-libs' 'openssl' 'log4cpp')
-makedepends=('boost')
-source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2" \
-        gcc_4.7_fix.diff boost_1.50_support.diff)
-md5sums=('baf0b6a006660dc4051c824e4660cb9d'
-         'd6c5314678709184e983b301cea11566'
-         'fcd2a7520b818354308315dc1e8053d4')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # override configure bug (forces debug even when nobody asked for it)
-  sed -i "s/ -ggdb//g" configure
-  # override Makefile bug
-  sed -i "/docs:/ s/doxygen-doc//" Makefile.in
-  # fix compilation with new versions of gcc
-  patch -Np1 < "$srcdir"/gcc_4.7_fix.diff || true
-  # fix build with boost 1.50 - port to filesystem v3
-  patch -Np1 < "$srcdir"/boost_1.50_support.diff || true
-
-  ./configure --prefix=/usr --disable-doxygen-doc
-
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # install license
-  install -D -m0755 COPYING "$pkgdir/usr/share/licenses/$pkgname/Boost"
-}
diff --git a/community/pion-net/boost_1.50_support.diff b/community/pion-net/boost_1.50_support.diff
deleted file mode 100644
index 7b82f34b9..000000000
--- a/community/pion-net/boost_1.50_support.diff
+++ /dev/null
@@ -1,223 +0,0 @@
-diff -rup pion-net-4.0.12/common/src/PionPlugin.cpp pion-net-4.0.12-new/common/src/PionPlugin.cpp
---- pion-net-4.0.12/common/src/PionPlugin.cpp	2011-03-22 04:35:12.000000000 +0100
-+++ pion-net-4.0.12-new/common/src/PionPlugin.cpp	2012-07-07 20:42:22.084660696 +0200
-@@ -58,7 +58,7 @@ void PionPlugin::addPluginDirectory(cons
- 	if (! boost::filesystem::exists(plugin_path) )
- 		throw DirectoryNotFoundException(dir);
- 	boost::mutex::scoped_lock plugin_lock(m_plugin_mutex);
--	m_plugin_dirs.push_back(plugin_path.directory_string());
-+	m_plugin_dirs.push_back(plugin_path.string());
- }
- 
- void PionPlugin::resetPluginDirectories(void)
-@@ -204,7 +204,7 @@ bool PionPlugin::checkForFile(std::strin
- 	try {
- 		// is_regular may throw if directory is not readable
- 		if (boost::filesystem::is_regular(test_path)) {
--			final_path = test_path.file_string();
-+			final_path = test_path.string();
- 			return true;
- 		}
- 	} catch (...) {}
-@@ -225,7 +225,7 @@ bool PionPlugin::checkForFile(std::strin
- 	try {
- 		// is_regular may throw if directory is not readable
- 		if (boost::filesystem::is_regular(test_path)) {
--			final_path = test_path.file_string();
-+			final_path = test_path.string();
- 			return true;
- 		}
- 	} catch (...) {}
-@@ -291,7 +291,7 @@ void PionPlugin::getAllPluginNames(std::
- 		for (boost::filesystem::directory_iterator it2(*it); it2 != end; ++it2) {
- 			if (boost::filesystem::is_regular(*it2)) {
- 				if (boost::filesystem::extension(it2->path()) == PionPlugin::PION_PLUGIN_EXTENSION) {
--					plugin_names.push_back(PionPlugin::getPluginName(it2->path().leaf()));
-+					plugin_names.push_back(PionPlugin::getPluginName(it2->path().filename().string()));
- 				}
- 			}
- 		}
-@@ -309,11 +309,11 @@ void *PionPlugin::loadDynamicLibrary(con
- #else
- 	// convert into a full/absolute/complete path since dlopen()
- 	// does not always search the CWD on some operating systems
--	const boost::filesystem::path full_path = boost::filesystem::complete(plugin_file);
-+	const boost::filesystem::path full_path = boost::filesystem::absolute(plugin_file);
- 	// NOTE: you must load shared libraries using RTLD_GLOBAL on Unix platforms
- 	// due to a bug in GCC (or Boost::any, depending on which crowd you want to believe).
- 	// see: http://svn.boost.org/trac/boost/ticket/754
--	return dlopen(full_path.file_string().c_str(), RTLD_LAZY | RTLD_GLOBAL);
-+	return dlopen(full_path.string().c_str(), RTLD_LAZY | RTLD_GLOBAL);
- #endif
- }
- 
-diff -rup pion-net-4.0.12/common/src/PionScheduler.cpp pion-net-4.0.12-new/common/src/PionScheduler.cpp
---- pion-net-4.0.12/common/src/PionScheduler.cpp	2008-11-08 00:41:17.000000000 +0100
-+++ pion-net-4.0.12-new/common/src/PionScheduler.cpp	2012-07-07 20:42:22.084660696 +0200
-@@ -102,7 +102,7 @@ boost::xtime PionScheduler::getWakeupTim
- 										  boost::uint32_t sleep_nsec)
- {
- 	boost::xtime wakeup_time;
--	boost::xtime_get(&wakeup_time, boost::TIME_UTC);
-+	boost::xtime_get(&wakeup_time, boost::TIME_UTC_);
- 	wakeup_time.sec += sleep_sec;
- 	wakeup_time.nsec += sleep_nsec;
- 	if (static_cast<boost::uint32_t>(wakeup_time.nsec) >= NSEC_IN_SECOND) {
-diff -rup pion-net-4.0.12/common/tests/PionPluginPtrTests.cpp pion-net-4.0.12-new/common/tests/PionPluginPtrTests.cpp
---- pion-net-4.0.12/common/tests/PionPluginPtrTests.cpp	2009-10-13 18:20:43.000000000 +0200
-+++ pion-net-4.0.12-new/common/tests/PionPluginPtrTests.cpp	2012-07-07 20:42:22.084660696 +0200
-@@ -230,7 +230,7 @@ BOOST_AUTO_TEST_SUITE_END()
- class Sandbox_F {
- public:
- 	Sandbox_F() {
--		m_cwd = boost::filesystem::current_path().directory_string();
-+		m_cwd = boost::filesystem::current_path().string();
- 		boost::filesystem::remove_all("sandbox");
- 		BOOST_REQUIRE(boost::filesystem::create_directory("sandbox"));
- 		BOOST_REQUIRE(boost::filesystem::create_directory("sandbox/dir1"));
-diff -rup pion-net-4.0.12/configure pion-net-4.0.12-new/configure
---- pion-net-4.0.12/configure	2012-03-24 08:00:10.000000000 +0100
-+++ pion-net-4.0.12-new/configure	2012-07-07 20:42:22.094660551 +0200
-@@ -22091,7 +22091,7 @@ fi
- 
- 
- # AC_MSG_NOTICE(Boost home directory: $BOOST_HOME_DIR)
--CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS -DBOOST_FILESYSTEM_VERSION=2"
-+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS -DBOOST_FILESYSTEM_VERSION=3"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- 
- # Check for Boost library extension
-@@ -22197,7 +22197,7 @@ LIBS="$LIBS_SAVED"
- BOOST_TRY_LIB=thread
- BOOST_TRY_LINK="boost_${BOOST_TRY_LIB}${BOOST_LIB_EXTENSION}"
- LIBS_SAVED="$LIBS"
--LIBS="$LIBS_SAVED -l${BOOST_TRY_LINK} ${BOOST_DATE_TIME_LIB}"
-+LIBS="$LIBS_SAVED -lboost_system -l${BOOST_TRY_LINK} ${BOOST_DATE_TIME_LIB}"
- echo "$as_me:$LINENO: checking for boost::${BOOST_TRY_LIB} library" >&5
- echo $ECHO_N "checking for boost::${BOOST_TRY_LIB} library... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
-diff -rup pion-net-4.0.12/net/include/pion/net/TCPConnection.hpp pion-net-4.0.12-new/net/include/pion/net/TCPConnection.hpp
---- pion-net-4.0.12/net/include/pion/net/TCPConnection.hpp	2012-01-12 17:30:03.000000000 +0100
-+++ pion-net-4.0.12-new/net/include/pion/net/TCPConnection.hpp	2012-07-07 20:43:34.530273709 +0200
-@@ -26,6 +26,7 @@
- #include <boost/array.hpp>
- #include <boost/function.hpp>
- #include <boost/function/function1.hpp>
-+#include <boost/system/system_error.hpp>
- #include <pion/PionConfig.hpp>
- #include <string>
- 
-diff -rup pion-net-4.0.12/net/services/FileService.cpp pion-net-4.0.12-new/net/services/FileService.cpp
---- pion-net-4.0.12/net/services/FileService.cpp	2009-08-06 20:58:13.000000000 +0200
-+++ pion-net-4.0.12-new/net/services/FileService.cpp	2012-07-07 20:42:22.097993836 +0200
-@@ -137,8 +137,8 @@ void FileService::operator()(HTTPRequest
- 
- 	// make sure that the requested file is within the configured directory
- 	file_path.normalize();
--	std::string file_string = file_path.file_string();
--	if (file_string.find(m_directory.directory_string()) != 0) {
-+	std::string file_string = file_path.string();
-+	if (file_string.find(m_directory.string()) != 0) {
- 		PION_LOG_WARN(m_logger, "Request for file outside of directory ("
- 					  << getResource() << "): " << relative_path);
- 		static const std::string FORBIDDEN_HTML_START =
-@@ -319,7 +319,7 @@ void FileService::operator()(HTTPRequest
- 						   << getResource() << "): " << relative_path);
- 
- 			// determine the MIME type
--			response_file.setMimeType(findMIMEType( response_file.getFilePath().leaf() ));
-+			response_file.setMimeType(findMIMEType( response_file.getFilePath().filename().string() ));
- 
- 			// get the file_size and last_modified timestamp
- 			response_file.update();
-@@ -597,7 +597,7 @@ void FileService::stop(void)
- void FileService::scanDirectory(const boost::filesystem::path& dir_path)
- {
- 	PION_LOG_DEBUG(m_logger, "Scanning directory (" << getResource() << "): "
--				   << dir_path.directory_string());
-+				   << dir_path.string());
- 
- 	// iterate through items in the directory
- 	boost::filesystem::directory_iterator end_itr;
-@@ -614,8 +614,8 @@ void FileService::scanDirectory(const bo
- 			// item is a regular file
- 
- 			// figure out relative path to the file
--			std::string file_path_string( itr->path().file_string() );
--			std::string relative_path( file_path_string.substr(m_directory.directory_string().size() + 1) );
-+			std::string file_path_string( itr->path().string() );
-+			std::string relative_path( file_path_string.substr(m_directory.string().size() + 1) );
- 
- 			// add item to cache (use placeholder if scan == 1)
- 			addCacheEntry(relative_path, *itr, m_scan_setting == 1);
-@@ -628,7 +628,7 @@ FileService::addCacheEntry(const std::st
- 						   const boost::filesystem::path& file_path,
- 						   const bool placeholder)
- {
--	DiskFile cache_entry(file_path, NULL, 0, 0, findMIMEType(file_path.leaf()));
-+	DiskFile cache_entry(file_path, NULL, 0, 0, findMIMEType(file_path.filename().string()));
- 	if (! placeholder) {
- 		cache_entry.update();
- 		// only read the file if its size is <= max_cache_size
-@@ -636,7 +636,7 @@ FileService::addCacheEntry(const std::st
- 			try { cache_entry.read(); }
- 			catch (std::exception&) {
- 				PION_LOG_ERROR(m_logger, "Unable to add file to cache: "
--							   << file_path.file_string());
-+							   << file_path.string());
- 				return std::make_pair(m_cache_map.end(), false);
- 			}
- 		}
-@@ -647,10 +647,10 @@ FileService::addCacheEntry(const std::st
- 
- 	if (add_entry_result.second) {
- 		PION_LOG_DEBUG(m_logger, "Added file to cache: "
--					   << file_path.file_string());
-+					   << file_path.string());
- 	} else {
- 		PION_LOG_ERROR(m_logger, "Unable to insert cache entry for file: "
--					   << file_path.file_string());
-+					   << file_path.string());
- 	}
- 
- 	return add_entry_result;
-@@ -713,7 +713,7 @@ void DiskFile::read(void)
- 
- 	// read the file into memory
- 	if (!file_stream.is_open() || !file_stream.read(m_file_content.get(), m_file_size))
--		throw FileService::FileReadException(m_file_path.file_string());
-+		throw FileService::FileReadException(m_file_path.string());
- }
- 
- bool DiskFile::checkUpdated(void)
-@@ -751,7 +751,7 @@ DiskFileSender::DiskFileSender(DiskFile&
- {
- 	PION_LOG_DEBUG(m_logger, "Preparing to send file"
- 				   << (m_disk_file.hasFileContent() ? " (cached): " : ": ")
--				   << m_disk_file.getFilePath().file_string());
-+				   << m_disk_file.getFilePath().string());
- 
- 		// set the Content-Type HTTP header using the file's MIME type
- 	m_writer->getResponse().setContentType(m_disk_file.getMimeType());
-@@ -795,7 +795,7 @@ void DiskFileSender::send(void)
- 			m_file_stream.open(m_disk_file.getFilePath(), std::ios::in | std::ios::binary);
- 			if (! m_file_stream.is_open()) {
- 				PION_LOG_ERROR(m_logger, "Unable to open file: "
--							   << m_disk_file.getFilePath().file_string());
-+							   << m_disk_file.getFilePath().string());
- 				return;
- 			}
- 		}
-@@ -811,10 +811,10 @@ void DiskFileSender::send(void)
- 		if (! m_file_stream.read(m_content_buf.get(), m_file_bytes_to_send)) {
- 			if (m_file_stream.gcount() > 0) {
- 				PION_LOG_ERROR(m_logger, "File size inconsistency: "
--							   << m_disk_file.getFilePath().file_string());
-+							   << m_disk_file.getFilePath().string());
- 			} else {
- 				PION_LOG_ERROR(m_logger, "Unable to read file: "
--							   << m_disk_file.getFilePath().file_string());
-+							   << m_disk_file.getFilePath().string());
- 			}
- 			return;
- 		}
diff --git a/community/pion-net/gcc_4.7_fix.diff b/community/pion-net/gcc_4.7_fix.diff
deleted file mode 100644
index 5c2ed3cfe..000000000
--- a/community/pion-net/gcc_4.7_fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup pion-net-4.0.12/common/include/pion/PluginManager.hpp pion-net-4.0.12-new/common/include/pion/PluginManager.hpp
---- pion-net-4.0.12/common/include/pion/PluginManager.hpp	2011-02-12 01:46:50.000000000 +0100
-+++ pion-net-4.0.12-new/common/include/pion/PluginManager.hpp	2012-07-07 16:54:22.470284487 +0200
-@@ -420,7 +420,7 @@ inline void PluginManager<PLUGIN_TYPE>::
- 				delete i->second.first;
- 			}
- 		}
--		erase(std::map<std::string, std::pair<PLUGIN_TYPE *, PionPluginPtr<PLUGIN_TYPE> > >::begin(),
-+		this->erase(std::map<std::string, std::pair<PLUGIN_TYPE *, PionPluginPtr<PLUGIN_TYPE> > >::begin(),
- 			  std::map<std::string, std::pair<PLUGIN_TYPE *, PionPluginPtr<PLUGIN_TYPE> > >::end());
- 	}
- }
diff --git a/community/pion/PKGBUILD b/community/pion/PKGBUILD
index 0bd721f69..1750cff5e 100644
--- a/community/pion/PKGBUILD
+++ b/community/pion/PKGBUILD
@@ -1,12 +1,10 @@
-# $Id: PKGBUILD 83268 2013-01-28 16:49:58Z stephane $
+# $Id: PKGBUILD 89527 2013-04-29 18:57:40Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=pion
-pkgver=4.0.13.1
-# use the git snapshot until a new version is out
-_pkgver=dddce5e02d8a60f958e466e690d38eee924475b0
-pkgrel=2
+pkgver=5.0.1
+pkgrel=1
 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces"
-url="http://www.cloudmeter.com/pion/support/"
+url="https://github.com/cloudmeter/pion"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:Boost')
 depends=('boost-libs' 'openssl' 'log4cpp')
@@ -14,11 +12,11 @@ makedepends=('boost')
 provides=('pion-net')
 conflicts=('pion-net')
 replaces=('pion-net')
-source=(https://github.com/cloudmeter/pion/archive/${_pkgver}.zip)
-md5sums=('87b710deb5e526a2c7f045d25eba2bee')
+source=(https://github.com/cloudmeter/pion/archive/$pkgver.zip)
+md5sums=('9f8af4f3e600a5b0573fb66132a86528')
 
 build() {
-  cd "$srcdir/$pkgname-$_pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   sh autogen.sh
 
@@ -33,12 +31,12 @@ build() {
 }
 
 check() {
-  cd "$srcdir/$pkgname-$_pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   make -k check
 }
 
 package() {
-  cd "$srcdir/$pkgname-$_pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
   # install license
diff --git a/community/pkgfile/0001-update-fix-use-after-free.patch b/community/pkgfile/0001-update-fix-use-after-free.patch
deleted file mode 100644
index 4494224c5..000000000
--- a/community/pkgfile/0001-update-fix-use-after-free.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 60559a15e170ad49b388ee442eb2ccbe483bc9aa Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Mon, 19 Nov 2012 19:50:47 -0500
-Subject: [PATCH] update: fix use after free
-
-mark the address space as unread so that we don't attempt a double free
-on a repo download failure during the final cleanup.
----
- src/update.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/update.c b/src/update.c
-index c2e76e5..0b4fb8a 100644
---- a/src/update.c
-+++ b/src/update.c
-@@ -552,7 +552,7 @@ static int add_repo_download(CURLM *multi, struct repo_t *repo)
- 	} else {
- 		curl_multi_remove_handle(multi, repo->curl);
- 		FREE(repo->url);
--		free(repo->data);
-+		FREE(repo->data);
- 		repo->buflen = 0;
- 		repo->server_idx++;
- 	}
--- 
-1.8.0
-
diff --git a/community/pkgfile/PKGBUILD b/community/pkgfile/PKGBUILD
deleted file mode 100644
index 73be9ebf8..000000000
--- a/community/pkgfile/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 80498 2012-11-23 00:24:41Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=pkgfile
-pkgver=7
-pkgrel=2
-pkgdesc="a pacman .files metadata explorer"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://github.com/falconindy/pkgfile"
-license=('MIT')
-depends=('libarchive' 'curl' 'pcre' 'pacman')
-conflicts=('pkgtools<24-2')
-makedepends=('perl')
-source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
-        '0001-update-fix-use-after-free.patch')
-install=pkgfile.install
-md5sums=('f1dc0052b1c21597ea2fa0f0ce05608c'
-         '28599a9b6e56860a9cba1c95ec797551'
-         'a4f505d080795fd0c10fd1d93b4520f6')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 <"$srcdir/0001-update-fix-use-after-free.patch"
-
-  ./configure
-  make
-
-  # generate a license file
-  sed '/\*\//q' src/pkgfile.c >LICENSE
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim: ft=sh syn=sh
diff --git a/community/pkgfile/pkgfile.install b/community/pkgfile/pkgfile.install
deleted file mode 100644
index 5545a3d39..000000000
--- a/community/pkgfile/pkgfile.install
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-post_install() {
-  printf "==> Run 'pkgfile --update' to initialize the database\n"
-}
-
-post_remove() {
-  # the cache dir might not be removed, notify the user
-  if [ -d var/cache/pkgfile ]; then
-    printf "==> /var/cache/pkgfile has not been removed\n"
-  fi
-}
-
-post_upgrade() {
-  if [ "$(vercmp 5 "$2")" -eq 1 ]; then
-    printf "==> DB format has changed. Please run pkgfile -uu\n"
-  fi
-}
diff --git a/community/pkgtools/PKGBUILD b/community/pkgtools/PKGBUILD
deleted file mode 100644
index 483c97d51..000000000
--- a/community/pkgtools/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
-# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com>
-pkgname=pkgtools
-pkgver=24
-pkgrel=1
-pkgdesc="A collection of scripts for Arch Linux packages"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://bbs.archlinux.org/viewtopic.php?pid=384196"
-license=('GPL')
-source=(v$pkgver::http://github.com/Daenyth/pkgtools/tarball/v$pkgver)
-backup=('etc/pkgtools/newpkg.conf' 'etc/pkgtools/pkgfile.conf' 'etc/pkgtools/spec2arch.conf')
-install=pkgtools.install
-provides=(newpkg pkgfile)
-depends=('bash>=4' 'pcre' 'libarchive' 'python')
-optdepends=('cron: For pkgfile --update entry'
-            'abs: Provides proto packaging files for newpkg'
-            'python-yaml: for gem2arch'
-            'python2: for pkgconflict')
-md5sums=('f139c3940e1038cac4e29e985089e8a8')
-
-build() {
-  cd "$srcdir/Daenyth-$pkgname"-*
-
-  make
-}
-
-package() {
-  cd "$srcdir/Daenyth-$pkgname"-*
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/pkgtools/pkgtools.install b/community/pkgtools/pkgtools.install
deleted file mode 100644
index bcbf2f85c..000000000
--- a/community/pkgtools/pkgtools.install
+++ /dev/null
@@ -1,66 +0,0 @@
-_MSG_UPDATE=" - Make sure to run pkgfile --update before use"
-_MSG_CRON=" - An entry has been placed in /etc/cron.daily to run pkgfile --update
-   If you do not want this functionality, set UPDATE_CRON=0 in /etc/pkgtools/pkgfile.conf"
-_MSG_HOOK=" - pkgfile includes a \"command not found\" hook for both zsh and bash.
-   This will automatically run pkgfile whenever you run
-   a command which the shell cannot find. If you want
-   this functionality, set CMD_SEARCH_ENABLED to 1 in
-   /etc/pkgtools/pkgfile.conf (or per-user by copying
-   that file to \${XDG_CONFIG_HOME}/pkgtools/pkgfile.conf), then
-   in your current shell run:
-     source /etc/profile"
-
-is_update_from() {
-  res="`vercmp $1 $2`"
-  case $res in
-    '-1'|'0') return 0;;
-    '1') return 1;;
-  esac
-}
-
-## arg 1:  the new package version
-post_install() {
-  echo "$_MSG_UPDATE"
-  echo "$_MSG_HOOK"
-  echo "$_MSG_CRON"
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  if is_update_from $2 11-1; then
-    echo " - All bugs related to pkgfile -b should be fixed in this update."
-  fi
-  if is_update_from $2 12-1; then
-    echo " - NOTE: pkgtools' \"command not found\" hook configuration has changed."
-    echo "   Please remove any old symlinks relating to it."
-    echo "$_MSG_HOOK"
-  fi
-  if is_update_from $2 15-1; then
-    echo " - pkgtools now uses \$XDG_CONFIG_HOME for all user-specific configuration."
-    echo "   run «mv ~/.pkgtools \"\$XDG_CONFIG_HOME/pkgtools\"»"
-  fi
-  if is_update_from $2 18-1; then
-    echo " - newpkg has been rewritten to be completely modular. See here for more info: http://github.com/Daenyth/pkgtools/commit/2d37197"
-  fi
-  if is_update_from $2 19-1; then
-    echo " ! This version contains an important bugfix for pkgfile. Previously, package updates would cause the pkgfile --update cron job to"
-    echo "   regain +x mode, causing updates to run even when manually disabled. This version disables the cronjob by setting UPDATE_CRON=0"
-    echo "   in /etc/pkgtools/pkgfile.conf"
-    echo " - This version of pkgtools contains a new tool called 'maintpkg'"
-    echo "   It sets the Maintainer in a PKGBUILD to your PACKAGER while preserving old Contributors"
-  fi
-  if is_update_from $2 22-1; then
-    echo " - This is the largest release in a long time. This updates all python scripts to py3k."
-    echo " - This version of pkgtools includes a new tool called gem2arch, for automating ruby gem packaging"
-  fi
-}
-
-## arg 1:  the old package version
-post_remove() {
-  cat << _EOM
- - You may want to clean /var/cache/pkgtools/lists
-_EOM
-}
-
-# vim:set ts=2 sw=2 et filetype=sh:
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index f06ad27b3..eddc8f90e 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,72 +1,68 @@
-# $Id: PKGBUILD 79309 2012-11-02 16:29:05Z spupykin $
+# $Id: PKGBUILD 88636 2013-04-20 19:00:12Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: phrakture <aaronmgriffin--gmail--com>
 # Contributor: Fazlul Shahriar
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 
 pkgname=plan9port
-pkgver=20121022
-pkgrel=2
-pkgdesc="A port of many programs from Plan 9 to Unix-like operating systems"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://swtch.com/plan9port/"
+pkgver=20130320
+pkgrel=1
+pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://swtch.com/plan9port/'
 license=('custom')
-depends=(xorg-server libxt libxext sh fuse)
+depends=('xorg-server' 'libxt' 'libxext' 'sh' 'fuse')
 optdepends=('python2: for the codereview script')
 provides=('plan9')
-install=plan9.install
-options=(!zipman)
-source=(http://swtch.com/$pkgname/$pkgname-$pkgver.tgz plan9.sh)
-sha256sums=('1293b5d2e46d0d6f7be2adbdb285ce278a25c77e88b5cd7c230e16a47d0f8638'
+install='plan9.install'
+options=('!zipman')
+source=("http://swtch.com/$pkgname/$pkgname-$pkgver.tgz"
+        'plan9.sh')
+sha256sums=('49a5e6c97c76f0846c45791bda10d6b3ba5c4453855e401980e8e04f92e830fa'
             '0247c4446497359d305aaec069b07180fbf79ce4fa5191464cd9ebb8c7f0228d')
 
-build() {
-  cd "$srcdir/plan9"
-
-  ./INSTALL -b
-}
-
 package() {
   cd "$srcdir/plan9"
 
-  install -Dm755 ../plan9.sh $pkgdir/etc/profile.d/plan9.sh
-
-  mkdir -p "$pkgdir/opt"
-  cp -r $srcdir/plan9 $pkgdir/opt/
-
-  mkdir -p $pkgdir/usr/share/doc/$pkgname
+  # Package
+  ./INSTALL -b
+  install -Dm755 ../plan9.sh "$pkgdir/etc/profile.d/plan9.sh"
+  mkdir -p "$pkgdir/opt" "$pkgdir/usr/share/doc/$pkgname"
+  cp -r "$srcdir/plan9" "$pkgdir/opt/"
   cd "$pkgdir/opt/plan9"
   ./INSTALL -c -r "$pkgdir/opt/plan9"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-
-  # Don't need these under /opt/plan9.
+  # Clean up
   rm -rf .hg/
   rm -f .hgignore .hgtags
   find . -name '.cvsignore' -print0 |xargs -0 rm -f
   rm -f config install.log install.sum install.txt configure Makefile INSTALL \
     LICENSE
 
-  msg2 "Fixing hardcoded paths..."
+  # Fix hardcoded paths
   for f in `grep -H -r "$pkgdir/opt/plan9" | cut -d: -f1`; do
     echo -n "\t$f"
     [ -e "$f" ] && sed -i "s:$pkgdir/opt/plan9:/opt/plan9:" "$f" || true
   done
 
+  # Fix python scripts
   find "$pkgdir" -name '*.py' -print0 |xargs -0 \
     sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/python2,' \
     -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
 
+  # Package text files
   for i in CHANGES CONTRIBUTORS README TODO; do
     install -m644 $i "$pkgdir/usr/share/doc/$pkgname"
     rm -f $i
   done
 
-  echo "==> Decompressing plan9 man pages"
+  # Decompress the plan9 man pages
   for i in `find /opt/plan9/man -type f`; do
     if [ ${i##*.} = "gz" ]; then
-#      echo "    ${i%%.*}..."
-      gunzip $i
+      gunzip "$i"
     fi
   done
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/podofo/PKGBUILD b/community/podofo/PKGBUILD
index 69e0cc946..0892e0bff 100644
--- a/community/podofo/PKGBUILD
+++ b/community/podofo/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 63712 2012-02-05 12:08:41Z ibiru $
+# $Id: PKGBUILD 84752 2013-02-24 05:43:40Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
 # Contributor: Preecha Patumchareonpol <yumyai at gmail.com> 
 
 pkgname=podofo
-pkgver=0.9.1
-pkgrel=3
+pkgver=0.9.2
+pkgrel=1
 pkgdesc="A C++ library to work with the PDF file format"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://podofo.sourceforge.net"
 license=('GPL')
-depends=( 'gcc-libs' 'fontconfig' 'libpng' 'libtiff')
+depends=('openssl' 'libidn' 'lua51' 'fontconfig' 'libpng' 'libtiff')
 makedepends=('cmake')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('cec586ab69f92bc88d38b5d4b8eee5a0')
+md5sums=('41966c57fa4266ac5cef80bfade0c8e7')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD
index eb93e0d1d..34ec6c021 100644
--- a/community/poedit/PKGBUILD
+++ b/community/poedit/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 82111 2013-01-08 18:49:13Z spupykin $
+# $Id: PKGBUILD 87572 2013-04-03 10:14:55Z spupykin $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=poedit
-pkgver=1.5.4
+pkgver=1.5.5
 pkgrel=1
 pkgdesc="Cross-platform gettext catalogs (.po files) editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.poedit.net/"
 license=('custom')
-depends=('wxgtk>=2.8.11' 'gtkspell' 'db>=5.1' 'hicolor-icon-theme' 'gettext')
+depends=('wxgtk2.9' 'gtkspell' 'db>=5.1' 'hicolor-icon-theme' 'gettext')
 makedepends=('pkgconfig' 'boost')
 install=poedit.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('708991f73368f2ea7a24134058d2caf2')
+md5sums=('da86cb73cee9d006a42f9574811d13ab')
 
 build() {
     cd ${srcdir}/${pkgname}-${pkgver}
+    export WX_CONFIG_PATH=/usr/bin/wx-config-2.9
     ./configure --prefix=/usr
     make
 }
diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD
index 6fed5a7a7..62d4463ef 100644
--- a/community/pokerth/PKGBUILD
+++ b/community/pokerth/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 83269 2013-01-28 16:49:59Z stephane $
-# Maintainer:  Mateusz Herych <heniekk@gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
+# $Id: PKGBUILD 88844 2013-04-23 22:37:15Z svenstaro $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
+# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Vasco Costa <vasco.costa@meiodigital.com>
+# Contributor: Federico Cinelli <cinelli@aur.archlinux.org>
 
 pkgname=pokerth
 _realname=PokerTH
-pkgver=1.0
-pkgrel=2
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="Poker game written in C++/QT4"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pokerth.net/"
 license=('GPL' 'custom')
 depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'protobuf'
-         'qt' 'sdl_mixer' 'libircclient' 'tinyxml')
+         'qt4' 'sdl_mixer' 'libircclient' 'tinyxml')
 makedepends=('boost')
-source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2)
-md5sums=('1d8686b8968475cfc76e873a17a53efc')
+source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2")
+md5sums=('c6dcf0ed68ab50af91371348ffad5d00')
 
 build() {
   cd "$srcdir/$_realname-$pkgver-src"
-
-  sed -i '31 i #include <libircclient/libirc_rfcnumeric.h>' src/net/common/ircthread.cpp
-
-  qmake $pkgname.pro
+  
+  qmake-qt4 "$pkgname.pro"
   make
 }
 
@@ -31,6 +31,6 @@ package() {
 
   make INSTALL_ROOT="$pkgdir" install
 
-  install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1"
-  install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt"
+  install -Dm644 "docs/pokerth.1" "$pkgdir/usr/share/man/man1/pokerth.1"
+  install -Dm644 "data/data-copyright.txt" "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt"
 }
diff --git a/community/polipo/polipo.cron b/community/polipo/polipo.cron
deleted file mode 100644
index 8270d0a05..000000000
--- a/community/polipo/polipo.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-/etc/rc.d/polipo purge >/dev/null 2>&1
diff --git a/community/portaudio/PKGBUILD b/community/portaudio/PKGBUILD
index c0042c42b..dcda13503 100644
--- a/community/portaudio/PKGBUILD
+++ b/community/portaudio/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=portaudio
 pkgver=19_20111121
-pkgrel=1
+pkgrel=1.1
 pkgdesc='A free, cross-platform, open source, audio I/O library.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.portaudio.com/'
diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD
index ffa67316e..a73a0b4d7 100644
--- a/community/pound/PKGBUILD
+++ b/community/pound/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=pound
 pkgver=2.6
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A reverse proxy, load balancer, and SSL wrapper"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.apsis.ch/pound/index_html"
diff --git a/community/povray/LICENSE b/community/povray/LICENSE
deleted file mode 100644
index 8a22b9e7e..000000000
--- a/community/povray/LICENSE
+++ /dev/null
@@ -1,237 +0,0 @@
-                           POV-Ray Licence Agreement
-                           GENERAL LICENSE AGREEMENT
-                               FOR PERSONAL USE
-                  Persistence of Vision Ray Tracer (POV-Ray)
-               Version 3.6 License and Terms & Conditions of Use
-                          version of 1 February 2005
-                         (also known as POVLEGAL.DOC)
-
-Please read through the terms and conditions of this license carefully. This 
-license is a binding legal agreement between you, the 'User' (an individual
-or single entity) and Persistence of Vision Raytracer Pty. Ltd. ACN 105 891
-870 (herein also referred to as the "Company"), a company incorporated in the
-state of Victoria, Australia, for the product known as the "Persistence of 
-Vision Ray Tracer", also referred to herein as 'POV-Ray'.
-
-YOUR ATTENTION IS PARTICULARLY DRAWN TO THE DISCLAIMER OF WARRANTY AND NO 
-LIABILITY AND INDEMNITY PROVISIONS. TO USE THE PERSISTENCE OF VISION RAY 
-TRACER ("POV-RAY") YOU MUST AGREE TO BE BOUND BY THE TERMS AND CONDITIONS SET
-OUT IN THIS DOCUMENT. IF YOU DO NOT AGREE TO ALL THE TERMS AND CONDITIONS OF 
-USE OF POV-RAY SET OUT IN THIS LICENSE AGREEMENT, OR IF SUCH TERMS AND 
-CONDITIONS ARE NOT BINDING ON YOU IN YOUR JURISDICTION, THEN YOU MAY NOT USE 
-POV-RAY IN ANY MANNER. THIS GENERAL LICENSE AGREEMENT MUST ACCOMPANY ALL 
-POV-RAY FILES WHETHER IN THEIR OFFICIAL OR CUSTOM VERSION FORM. IT MAY NOT BE
-REMOVED OR MODIFIED. THIS GENERAL LICENSE AGREEMENT GOVERNS THE USE OF
-POV-RAY WORLDWIDE. THIS DOCUMENT SUPERSEDES AND REPLACES ALL PREVIOUS GENERAL
-LICENSES.
-
-INTRODUCTION
-
-This document pertains to the use of the Persistence of Vision Ray Tracer 
-(also known as POV-Ray). It applies to all POV-Ray program source files, 
-executable (binary) files, scene files, documentation files, help files, 
-bitmaps and other POV-Ray files contained in official Company archives, 
-whether in full or any part thereof, and are herein referred to as the 
-"Software". The Company reserves the right to revise these rules in future 
-versions and to make additional rules to address new circumstances at any 
-time. Such rules, when made, will be posted in a revised license file, the 
-latest version of which is available from the Company website at 
-http://www.povray.org/povlegal.html.
-
-USAGE PROVISIONS
-
-Subject to the terms and conditions of this agreement, permission is granted 
-to the User to use the Software and its associated files to create and render
-images. The creator of a scene file retains all rights to any scene files
-they create, and any images generated by the Software from them. Subject to
-the other terms of this license, the User is permitted to use the Software in
-a profit-making enterprise, provided such profit arises primarily from use of
-the Software and not from distribution of the Software or a work including
-the Software in whole or part.
-
-Please refer to http://www.povray.org/povlegal.html for licenses covering
-distribution of the Software and works including the Software.
-
-The User is also granted the right to use the scene files, fonts, bitmaps,
-and include files distributed in the INCLUDE and SCENES\INCDEMO sub-
-directories of the Software in their own scenes. Such permission does not
-extend to any other files in the SCENES directory or its sub-directories. The
-SCENES files are for the User's enjoyment and education but may not be the
-basis of any derivative works unless the file in question explicitly grants
-permission to do such.
-
-This licence does not grant any right of re-distribution or use in any manner
-other than the above. The Company has separate license documents that apply
-to other uses (such as re-distribution via the internet or on CD) ; please
-visit http://www.povray.org/povlegal.html for links to these. In particular
-you are advised that the sale, lease, or rental of the Software in any form
-without written authority from the Company is explicitly prohibited.
-
-Notwithstanding anything in the the balance of this licence agreement,
-nothing in this licence agreement permits the installation or use of the
-Software in conjunction with any product (including software) produced
-or distributed by any party who is, or has been, in violation of this
-licence agreement or of the distribution licence
-  (http://www.povray.org/distribution-license.html)
-(or any earlier or later versions of those documents) unless:
-
-   a. the Company has explicitly released that party in writing from the
-      consequences of their non compliance; or
-   b. both of the following are true:
-         i. the installation or use of the Software is without the User
-            being aware of the abovementioned violation; and
-        ii. the installation or use of the Software is not a result (whether
-            direct or indirect) of any request or action of the abovementioned
-            party (or any of its products), any agent of that party (or any of
-            their products), or any person(s) involved in supplying any such
-            product to the User.
-
-COPYRIGHT
-
-Copyright � 1991-2003, Persistence of Vision Team.
-Copyright � 2003-2004, Persistence of Vision Raytracer Pty. Ltd.
-Windows version Copyright � 1996-2003, Christopher Cason.
-
-Copyright subsists in this Software which is protected by Australian and 
-international copyright laws. The Software is NOT PUBLIC DOMAIN.
-
-Nothing in this agreement shall give you any rights in respect of the 
-intellectual property of the Company and you acknowledge that you do not 
-acquire any rights in respect of such intellectual property rights. You 
-acknowledge that the Software is the valuable intellectual property of the 
-Company and that if you use, modify or distribute the Software for 
-unauthorized purposes or in an unauthorized manner (or cause or allow the 
-forgoing to occur), you will be liable to the Company for any damages it may 
-suffer (and which you acknowledge it may suffer) as well as statutory damages
-to the maximum extent permitted by law and also that you may be liable to 
-criminal prosecution. You indemnify the Company and the authors of the 
-Software for every single consequence flowing from the aforementioned events.
-
-DISCLAIMER OF WARRANTY
-
-This Software is provided on an "AS IS" basis, without warranty of any kind, 
-express or implied, including without limitation, any implied warranties of 
-merchantability, fitness for a particular purpose and non-infringement of 
-intellectual property of any third party. This Software has inherent 
-limitations including design faults and programming bugs. The entire risk as 
-to the quality and performance of the Software is borne by you, and it is
-your responsibility to ensure that it does what you require it to do prior to
-using it for any purpose (other than testing it), and prior to distributing
-it in any fashion. Should the Software prove defective, you agree that you
-alone assume the entire cost resulting in any way from such defect.
-
-This disclaimer of warranty constitutes an essential and material term of
-this agreement. If you do not or cannot accept this, or if it is
-unenforceable in your jurisdiction, then you may not use the Software in any
-manner.
-
-NO LIABILITY
-
-When you use the Software you acknowledge and accept that you do so at your 
-sole risk. You agree that under no circumstances shall you have any claim 
-against the Company or anyone associated directly or indirectly with the 
-Company whether as employee, subcontractor, agent, representative,
-consultant, licensee or otherwise ("Company Associates") for any loss,
-damages, harm, injury, expense, work stoppage, loss of business information,
-business interruption, computer failure or malfunction which may be suffered
-by you or by any third party from any cause whatsoever, howsoever arising, in
-connection with your use or distribution of the Software even where the
-Company were aware, or ought to have been aware, of the potential of such
-loss. Damages referred to above shall include direct, indirect, general,
-special, incidental, punitive and/or consequential.
-
-This disclaimer of liability constitutes an essential and material term of 
-this agreement. If you do not or cannot accept this, or if it is
-unenforceable in your jurisdiction, then you may not use the Software.
-
-INDEMNITY
-
-You indemnify the Company and Company Associates and hold them harmless 
-against any claims which may arise from any loss, damages, harm, injury, 
-expense, work stoppage, loss of business information, business interruption, 
-computer failure or malfunction, which may be suffered by you or any other 
-party whatsoever as a consequence of any act or omission of the Company
-and/or Company Associates, whether negligent or not, arising out of your use
-and/or distribution of the Software, or from any other cause whatsoever,
-howsoever arising, in connection with the Software. These provisions are
-binding on your estate, heirs, executors, legal successors, administrators,
-parents and/or guardians.
-
-This indemnification constitutes an essential and material term of this 
-agreement. If you do not or cannot accept this, or if it is unenforceable in 
-your jurisdiction, then you may not use the Software.
-
-HIGH RISK ACTIVITIES
-
-This Software and the output produced by this Software is not fault-tolerant 
-and is not designed, manufactured or intended for use as on-line control 
-equipment in hazardous environments requiring fail-safe performance, in which
-the failure of the Software could lead or directly or indirectly to death, 
-personal injury, or severe physical or environmental damage ("High Risk 
-Activities"). The Company specifically disclaims any express or implied 
-warranty of fitness for High Risk Activities and explicitly prohibits the use
-of the Software for such purposes.
-
-CRYPTOGRAPHIC SIGNING OF DOCUMENTS
-
-Changes to this Agreement and documents issued under its authority may be
-cryptographically signed by the POV-Ray Team Co-ordinator's private PGP key.
-In the absence of evidence to the contrary, such documents shall be considered,
-under the terms of this Agreement, to be authentic provided the signature is
-valid. The master copy of this Agreement at http://www.povray.org/povlegal.html
-will also be signed by the current version of the team-coordinator's key.
-
-The public key for the POV-Ray Team-coordinator can be retrieved from the
-location https://secure.povray.org/keys/. The current fingerprint for it is
-B4DD 932A C080 C3A3 6EA2 9952 DB04 4A74 9901 4518.
-
-MISCELLANEOUS
-
-This Agreement constitutes the complete agreement concerning this license.
-Any changes to this agreement must be in writing and may take the form of 
-notifications by the Company to you, or through posting notifications on the 
-Company website. THE USE OF THIS SOFTWARE BY ANY PERSON OR ENTITY IS
-EXPRESSLY MADE CONDITIONAL ON THEIR ACCEPTANCE OF THE TERMS SET FORTH HEREIN.
-
-Except where explicitly stated otherwise herein, if any provision of this 
-Agreement is found to be invalid or unenforceable, the invalidity or 
-unenforceability of such provision shall not affect the other provisions of 
-this agreement, and all provisions not affected by such invalidity or 
-unenforceability shall remain in full force and effect. In such cases you 
-agree to attempt to substitute for each invalid or unenforceable provision a 
-valid or enforceable provision which achieves to the greatest extent
-possible, the objectives and intention of the invalid or unenforceable
-provision. The validity and interpretation of this agreement will be governed
-by the laws of Australia in the state of Victoria (except for conflict of law
-provisions).
-
-CONTACT INFORMATION
-
-License inquiries can be made via email; please use the following address 
-(but see below prior to emailing) :
-
-  team-coord-[three-letter month]-[four-digit year]@povray.org
-
-for example, team-coord-jun-2004@povray.org should be used if at the time you
-send the email it is the month of June 2004. The changing email addresses are
-necessary to combat spam and email viruses. Old email addresses may be deleted
-at our discretion.
-
-Note that the above address may change for reasons other than that given above;
-please check the version of this document at http://www.povray.org/povlegal.html
-for the current address. Note that your inability or failure to contact us
-for any reason is not an excuse for violating this licence.
-
-Do NOT send any attachments of any sort other than by prior arrangement.
-EMAIL MESSAGES INCLUDING ATTACHMENTS WILL BE DELETED UNREAD.
-
-The following postal address is only for official license business. Please
-note that it is preferred that initial queries about licensing be made via
-email ; postal mail should only be used when email is not possible, or when
-written documents are being exchanged by prior arrangement.
-
- Persistence of Vision Raytracer Pty. Ltd.
- PO Box 407
- Williamstown,
- Victoria 3016
- Australia
diff --git a/community/povray/PKGBUILD b/community/povray/PKGBUILD
deleted file mode 100644
index 34f7a22cb..000000000
--- a/community/povray/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 74007 2012-07-18 01:08:29Z ibiru $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: red_over_blue
-# Contributor: neri
-
-pkgname=povray
-pkgver=3.7.0.RC6
-pkgrel=4
-pkgdesc="Script based raytracer for creating 3D graphics"
-arch=('x86_64' 'i686')
-license=('custom')
-url="http://povray.org/"
-depends=('libtiff' 'libpng' 'boost-libs')
-makedepends=('boost')
-backup=("etc/povray/${pkgver%.*.*}/povray.conf"
-        "etc/povray/${pkgver%.*.*}/povray.ini")
-source=("http://www.povray.org/redirect/www.povray.org/beta/source/$pkgname-$pkgver.tar.gz"
-        'povray3.7.0_rc3-user-conf.patch'
-        'distribution-license.txt'
-        'LICENSE'
-        'source-license.txt')
-sha256sums=('374957bdb90fb7be5f36f839b3f04ab0a4340f6e8cf369f658d6592a342803e3'
-            '95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0'
-            'bcf6893c741568bbff6839bb7310b0c43af8cb54bae792da21123e1026f91ae9'
-            '9162060797de4f7f91ccf5e1fac5ec3378a0b0fed382393797ba3f4f27896402'
-            '7d80992314f7947f5f672a4ad8b1d072a6179f01fb0228a88e4224a8bd45de96')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  sed -i 's:=no:=yes:' unix/config/ax_boost_thread.m4
-  sed -i 's:AC_MSG_FAILURE(\[c:AC_MSG_RESULT(\[:' configure.ac
-  sed -i 's:TIME_UTC:TIME_UTC_:' \
-    source/backend/scene/view.cpp \
-    vfe/vfepovms.cpp \
-    vfe/vfesession.cpp
-  ./bootstrap
-  patch -p1 < ../povray3.7.0_rc3-user-conf.patch
-  COMPILED_BY="Arch Linux" ./configure --prefix=/usr --sysconfdir=/etc
-  #  --disable-optimiz #--with-boost-thread=boost_thread-gcc-mt
-  make CXXFLAGS+="-lboost_system"
-  gzip povray.1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  mkdir -p "$pkgdir/usr/share/$pkgname-3.7"
-  cp -r icons include ini scenes scripts "$pkgdir/usr/share/$pkgname-3.7"
-  mkdir -p "$pkgdir/usr/share/doc/$pkgname-3.7"
-  cp -r doc "$pkgdir/usr/share/doc/$pkgname-3.7"
-  install -Dm755 unix/povray "$pkgdir/usr/bin/povray"
-  install -Dm644 povray.conf "$pkgdir/etc/povray/3.7/povray.conf"
-  install -Dm644 povray.ini "$pkgdir/etc/povray/3.7/povray.ini"
-  install -Dm644 povray.1.gz "$pkgdir/usr/share/man/man1/povray.1.gz"
-  install -Dm644 ../LICENSE \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -Dm644 ../distribution-license.txt \
-    "$pkgdir/usr/share/licenses/$pkgname/distribution-license.txt"
-  install -Dm644 ../source-license.txt \
-    "$pkgdir/usr/share/licenses/$pkgname/source-license.txt"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/povray/distribution-license.txt b/community/povray/distribution-license.txt
deleted file mode 100644
index 16615f148..000000000
--- a/community/povray/distribution-license.txt
+++ /dev/null
@@ -1,532 +0,0 @@
-                     POV-Ray License Agreement
-                    DISTRIBUTOR'S LICENCE AGREEMENT
-           Persistence of Vision Raytracer(tm) (POV-Ray(tm))
-                            13 August 2004
-
-Licensed Versions: Versions 3.5 and 3.6
-
-Please read through the terms and conditions of this license carefully. 
-
-This is a binding legal agreement between you, the "Distributor" and 
-Persistence of Vision Raytracer Pty. Ltd. ACN 105 891 870 ("POV"), a 
-company incorporated in the state of Victoria, Australia, for the 
-product known as the "Persistence of Vision Raytracer(tm)", also 
-referred to herein as "POV-Ray(tm)". 
-
-The terms of this agreement are set out at http://www.povray.org/distribution-license.html
-("Official Terms").  The Official Terms take precedence over this document to the extent
-of any inconsistency.
-
-1. INTRODUCTION
-
-1.1. In this agreement, except to the extent the context requires 
-     otherwise, the following capitalised terms have the following 
-     meanings:
-
-  (a) Distribution means:
-
-    (i) a single item of a distribution medium, including a CD Rom or 
-        DVD Rom, containing software programs and/or data; 
-
-    (ii) a set of such items; 
-
-    (iii) a data file in a generally accepted data format from which 
-          such an item can be created using generally available standard 
-          tools; 
-
-    (iv) a number of such data files from which a set of such items can 
-         be created; or
-
-    (v) a data file in a generally accepted data storage format which is 
-        an archive of software programs and/or data;
-
-  (b) Derived Code means all software which is derived from or is an 
-      adaptation of any part of the Software other than a scene file;  
-
-  (c) Intellectual Rights means:
-
-    (i) all copyright, patent, trade mark, trade secret, design, and 
-        circuit layout rights; 
-
-    (ii) all rights to the registration of such rights; and 
-
-    (iii) all rights of a similar nature 
-
-  which exist anywhere in the world; 
-
-  (d) Licensed Version means the version set out at the top of this 
-      agreement against the heading "Licensed Version" and all minor 
-      releases of this version (ie releases of the form x.y.z);
-
-  (e) POV Associate means any person associated directly or indirectly 
-      with POV whether as a director, officer, employee, subcontractor, 
-      agent, representative, consultant, licensee or otherwise;
-
-  (f) Modification Terms means the most recent version from time to time 
-      of the document of that name made available from the Site 
-
-  (g) Revocation List means the list of that name linked to from the 
-      Official Terms; 
-
-  (h) Site means www.povray.org;
-
-  (i) Software means the Licensed Version of the Persistence of Vision 
-      Raytracer(tm) (also known as POV-Ray(tm)) (including all POV-Ray 
-      program source files, executable (binary) files, scene files, 
-      documentation files, help files, bitmaps and other POV-Ray files 
-      associated with the Licensed Version) in a form made available by 
-      POV on the Site; 
-
-  (j) User Licence means the most recent version from time to time of 
-      the document of that name made available from the Site. 
-
-2. OPEN SOURCE DISTRIBUTIONS
-
-2.1. In return for the Distributor agreeing to be bound by the terms of 
-     this agreement, POV grants the Distributor permission to make a 
-     copy of the Software by including the Software in a generally 
-     recognised Distribution of a recognised operating system where the 
-     kernel of that operating system is made available under licensing 
-     terms:
-
-      (a) which are approved by the Open Source Initiative 
-          (www.opensource.org) as complying with the "Open Source
-          Definition" put forward by the Open Source Initiative; or 
-
-      (b) which comply with the "free software definition" of the Free 
-          Software Foundation (www.fsf.org).  
-
-2.2. As at June 2004, and without limiting the generality of the term, 
-     each of the following is a "generally recognised Distribution" for 
-     the purposes of clause 2.1: Debian, Red Hat (Enterprise and 
-     Fedora), SuSE, Mandrake, Xandros, Gentoo and Knoppix Linux 
-     distributions, and officially authorized distributions of the 
-     FreeBSD, OpenBSD, and NetBSD projects. 
-
-2.3. Clause 2.1 also applies to the Software being included in the above 
-     distributions 'package' and 'ports' systems, where such exist;
-
-2.4. Where the Distributor reproduces the Software in accordance with 
-     clause 2.1:
-
-      (a) the Distributor may rename, reorganise or repackage (without 
-          omission) the files comprising the Software where such 
-          renaming, reorganisation or repackaging is necessary to 
-          conform to the naming or organisation scheme of the target 
-          operating environment of the Distribution or of an established 
-          package management system of the target operating environment 
-          of the Distribution; and 
-
-      (b) the Distributor must not otherwise rename, reorganise or 
-          repackage the Software. 
-
-3. DISTRIBUTION LICENCE
-
-3.1. Subject to the terms and conditions of this agreement, and in 
-     return for Distributor agreeing to be bound by the terms of this 
-     agreement, POV grants the Distributor permission to make a copy of 
-     the Software in any of the following circumstances: 
-
-      (a) in the course of providing a mirror of the POV-Ray Site (or 
-          part of it), which is made available generally over the 
-          internet to each person without requiring that person to 
-          identify themselves and without any other restriction other 
-          than restrictions designed to manage traffic flows;
-
-      (b) by placing it on a local area network accessible only by 
-          persons authorized by the Distributor whilst on the 
-          Distributor's premises;
-
-      (c) where that copy is provided to a staff member or student 
-          enrolled at a recognised educational institution;
-
-      (d) by including the Software as part of a Distribution where:
-
-            (i) neither the primary nor a substantial purpose of the 
-                distribution of the Distribution is the distribution of 
-                the Software.  That is, the distribution of the Software 
-                is merely incidental to the distribution of the 
-                Distribution; and
-
-            (ii) if the Software was not included in the Distribution, 
-                 the remaining software and data included within the 
-                 Distribution would continue to function effectively and 
-                 according to its advertised or intended purpose; 
-
-      (e) by including the Software as part of a Distribution where:
-
-            (i) there is no data, program or other files apart from the 
-                Software on the Distribution; 
-
-            (ii) the Distribution is distributed by a person to another 
-                 person known to that person; or
-
-            (iii) the Distributor has obtained explicit written 
-                  authority from POV to perform the distribution, citing 
-                  this clause number, prior to the reproduction being 
-                  made.
-
-3.2. In each case where the Distributor makes a copy of the Software in 
-     accordance with clause 3.1, the Distributor must, unless no payment 
-     or other consideration of any type is received by Distributor in 
-     relation to the Distribution:
-
-      (a) ensure that each person who receives a copy of the Software 
-          from the Distributor is aware prior to acquiring that copy:
-
-          (i) of the full name and contact details of the Distributor, 
-              including the Distributor's web site, street address, mail 
-              address, and working email address;
-
-          (ii) that the Software is available without charge from the 
-               Site;
-
-          (iii) that no charge is being made for the granting of a 
-                licence over the Software.
-
-      (b) include a copy of the User Licence and this Distribution 
-          License with the copy of the Software.  These licences must be 
-          stored in the same subdirectory on the distribution medium as 
-          the Software and named in such a way as to prominently 
-          identify their purpose;
-
-3.3. The Distributor must not rename, reorganise or repackage any of the 
-     files comprising the Software without the prior written authority 
-     of POV. 
-
-3.4. Except as explicitly set out in this agreement, nothing in this 
-     agreement permits Distributor to make any modification to any part 
-     of the Software.  
-
-4. RESTRICTIONS ON DISTRIBUTION
-
-4.1. Nothing in this agreement gives the Distributor:
-
-      (a) any ability to grant any licence in respect of the use of the 
-          Software or any part of it to any person;
-
-      (b) any rights or permissions in respect of, including rights or 
-          permissions to distribute or permit the use of, any Derived 
-          Code;
-
-      (c) any right to bundle a copy of the Software (or part thereof), 
-          whether or not as part of a Distribution, with any other 
-          items, including books and magazines.  POV may, in response to 
-          a request, by notice in writing and in its absolute 
-          discretion, permit such bundling on a case by case basis.  
-          This clause 4.1(c) does not apply to Distributions permitted 
-          under clause 2; 
-
-      (d) any right, permission or authorisation to infringe any 
-          Intellectual Right held by any third party. 
-
-4.2. Distributor may charge a fee for the making or the provision of a 
-     copy of the Software.  
-
-4.3. Where the making, or the provision, of a copy of the Software is 
-     authorised under the terms of clause 3 but not under those of 
-     clause 2 of this agreement, the total of all fees charged in 
-     relation to such making or provision and including all fees 
-     (including shipping and handling fees) which are charged in respect 
-     of any software, hardware or other material provided in conjunction 
-     with or in any manner which is reasonably connected with the 
-     making, or the provision, of a copy of the Software must not exceed 
-     the reasonable costs incurred by the Distributor in making the 
-     reproduction, or in the provision, of that copy for which the fee 
-     is charged. 
-
-4.4. Notwithstanding anything else in this agreement, nothing in this 
-     agreement permits the reproduction of any part of the Software by, 
-     or on behalf of:
-
-      (a) Any person currently listed on the Revocation List from time 
-          to time;
-
-      (b) Any related body corporate (as that term is defined in section 
-          50 of the Corporations Law 2001 (Cth)) of any person referred 
-          to in clause 4.4(a); 
-
-      (c) Any person in the course of preparing any publication in any 
-          format (including books, magazines, CD Roms or on the 
-          internet) for any of the persons identified in paragraph (a); 
-
-      (d) Any person who is, or has been, in breach of this Agreement 
-          and that breach has not been waived in writing signed by POV; 
-          or
-
-      (e) Any person to whom POV has sent a notice in writing or by 
-          email stating that that person may not distribute the 
-          Software. 
-
-4.5. From the day two years after a version of the Software more recent 
-     than the Licensed Version is made available by POV on the Site 
-     clause 3 only permits reproduction of the Software where the 
-     Distributor ensures that each recipient of such a reproduction is 
-     aware, prior to obtaining that reproduction, that that reproduction 
-     of the Software is an old version of the Software and that a more 
-     recent version of the Software is available from the Site. 
-
-5. COPYRIGHT AND NO LITIGATION
-
-5.1. Copyright subsists in the Software and is protected by Australian 
-     and international copyright laws. 
-
-5.2. Nothing in this agreement gives Distributor any rights in respect 
-     of any Intellectual Rights in respect of the Software or which are 
-     held by or on behalf of POV.  Distributor acknowledges that it does 
-     not acquire any rights in respect of such Intellectual Rights.  
-
-5.3. Distributor acknowledges that if it performs out any act in respect 
-     of the Software without the permission of POV it will be liable to 
-     POV for all damages POV may suffer (and which Distributor 
-     acknowledges it may suffer) as well as statutory damages to the 
-     maximum extent permitted by law and that it may also be liable to 
-     criminal prosecution. 
-
-5.4.  Distributor must not commence any action against any person alleging
-      that the Software or the use or distribution of the Software infringes
-      any rights, including Intellectual Rights of the Distributor or of any
-      other person.  If Distributor provides one or more copies of the
-      Software to any other person in accordance with the agreement,
-      Distributor waives all rights it has, or may have in the future, to
-      bring any action, directly or indirectly, against any person to the
-      extent that such an action relates to an infringement of any rights,
-      including Intellectual Rights of any person in any way arising from, or
-      in relation to, the use, or distribution, (including through the
-      authorisation of such use or distribution) of: 
-        (a)  the Software;
-        (b)  any earlier or later version of the Software; or 
-        (c)  any other software to the extent it incorporates elements of the
-             software referred to in paragraphs (a) or (b) of this clause
-             5.4. 
-
-6. DISCLAIMER OF WARRANTY
-
-6.1. To the extent permitted by law, all implied terms and conditions 
-     are excluded from this agreement.  Where a term or condition is 
-     implied into this agreement and that term cannot be legally 
-     excluded, that term has effect as a term or condition of this 
-     agreement.  However, to the extent permitted by law, the liability 
-     of POV for a breach of such an implied term or condition is limited 
-     to the fullest extent permitted by law.  
-
-6.2. To the extent permitted by law, this Software is provided on an "AS 
-     IS" basis, without warranty of any kind, express or implied, 
-     including without limitation, any implied warranties of 
-     merchantability, fitness for a particular purpose and 
-     non-infringement of intellectual property of any third party.  The 
-     Software has inherent limitations including design faults and 
-     programming bugs.  
-
-6.3. The entire risk as to the quality and performance of the Software 
-     is borne by Distributor, and it is Distributor's responsibility to 
-     ensure that the Software fulfils Distributor's requirements prior 
-     to using it in any manner (other than testing it for the purposes 
-     of this paragraph in a non-critical and non-production 
-     environment), and prior to distributing it in any fashion.  
-
-6.4. This clause 6 is an essential and material term of, and cannot be 
-     severed from, this agreement.  If Distributor does not or cannot 
-     agree to be bound by this clause, or if it is unenforceable, then 
-     Distributor must not, at any time, make any reproductions of the 
-     Software under this agreement and this agreement gives the 
-     Distributor no rights to make any reproductions of any part of the 
-     Software. 
-
-7. NO LIABILITY
-
-7.1. When you distribute or use the Software you acknowledge and accept 
-     that you do so at your sole risk.  Distributor agrees that under no 
-     circumstances will it have any claim against POV or any POV 
-     Associate for any loss, damages, harm, injury, expense, work 
-     stoppage, loss of business information, business interruption, 
-     computer failure or malfunction which may be suffered by you or by 
-     any third party from any cause whatsoever, howsoever arising, in 
-     connection with your use or distribution of the Software even where 
-     POV was aware, or ought to have been aware, of the potential of 
-     such loss.  
-
-7.2. Neither POV nor any POV Associate has any liability to Distributor 
-     for any indirect, general, special, incidental, punitive and/or 
-     consequential damages arising as a result of a breach of this 
-     agreement by POV or which arises in any way related to the Software 
-     or the exercise of a licence granted to Distributor under this 
-     agreement. 
-
-7.3. POV's total aggregate liability to the Distributor for all loss or 
-     damage arising in any way related to this agreement is limited to 
-     the lesser of: (a) AU$100, and (b) the amount received by POV from 
-     Distributor as payment for the grant of a licence under this 
-     agreement. 
-
-7.4. Distributor must bring any action against POV in any way related to 
-     this agreement or the Software within 3 months of the cause of 
-     action first arising.  Distributor waives any right it has to bring 
-     any action against POV and releases POV from all liability in 
-     respect of a cause of action if initiating process in relation to 
-     that action is not served on POV within 3 months of the cause of 
-     action arising.  Where a particular set of facts give rise to more 
-     than one cause of action this clause 7.4 applies as if all such 
-     causes of action arise at the time the first such cause of action 
-     arises. 
-
-7.5. This clause 7 is an essential and material term of, and cannot be 
-     severed from, this agreement.  If Distributor does not or cannot 
-     agree to be bound by this clause, or if it is unenforceable, then 
-     Distributor must not, at any time, make any reproductions of the 
-     Software under this agreement and this agreement gives the 
-     Distributor no rights to make any reproductions of any part of the 
-     Software.
-
-8. INDEMNITY
-
-8.1. Distributor indemnifies POV and each POV Associate and holds each 
-     of them harmless against all claims which arise from any loss, 
-     damages, harm, injury, expense, work stoppage, loss of business 
-     information, business interruption, computer failure or 
-     malfunction, which may be suffered by Distributor or any other 
-     party whatsoever as a consequence of: 
-
-      (a) any act or omission of POV and/or any POV Associate, whether 
-          negligent or not; 
-
-      (b) Distributor's use and/or distribution of the Software; or 
-
-      (c) any other cause whatsoever, howsoever arising, in connection 
-          with the Software.  
-
-     This clause 8 is binding on Distributor's estate, heirs, executors, 
-     legal successors, administrators, parents and/or guardians. 
-
-8.2. Distributor indemnifies POV, each POV Associate and each of the 
-     authors of any part of the Software against all loss and damage and 
-     for every other consequence flowing from any breach by Distributor 
-     of any Intellectual Right held by POV. 
-     
-8.3. This clause 8 constitutes an essential and material term of, and 
-     cannot be severed from, this agreement. If Distributor does not or 
-     cannot agree to be bound by this clause, or if it is unenforceable, 
-     then Distributor must not, at any time, make any reproductions of 
-     the Software under this agreement and this agreement gives the 
-     Distributor no rights to make any reproductions of any part of the 
-     Software.
-
-9. HIGH RISK ACTIVITIES
-
-9.1. This Software and the output produced by this Software is not 
-     fault-tolerant and is not designed, manufactured or intended for 
-     use as on-line control equipment in hazardous environments 
-     requiring fail-safe performance, in which the failure of the 
-     Software could lead or directly or indirectly to death, personal 
-     injury, or severe physical or environmental damage ("High Risk 
-     Activities").  POV specifically disclaims all express or implied 
-     warranty of fitness for High Risk Activities and, notwithstanding 
-     any other term of this agreement, explicitly prohibits the use or 
-     distribution of the Software for such purposes. 
-
-10. ENDORSEMENT PROHIBITION
-
-10.1. Distributor must not, without explicit written permission from 
-      POV, claim or imply in any way that:
-
-        (a) POV or any POV Associate officially endorses or supports the 
-            Distributor or any product (such as CD, book, or magazine) 
-            associated with the Distributor or any reproduction of the 
-            Software made in accordance with this agreement; or
-
-        (b) POV derives any benefit from any reproduction made in 
-            accordance with this agreement. 
-
-11. TRADEMARKS
-
-11.1. "POV-Ray(tm)", "Persistence of Vision Raytracer(tm)"  and 
-      "POV-Team(tm)" are trademarks of Persistence of Vision Raytracer 
-      Pty. Ltd. Any other trademarks referred to in this agreement are 
-      the property of their respective holders. Distributor must not 
-      use, apply for, or register anywhere in the world, any word, name 
-      (including domain names), trade mark or device which is 
-      substantially identical or deceptively or confusingly similar to 
-      any of Persistence of Vision Raytracer Pty. Ltd's trade marks. 
-
-12. MISCELLANEOUS
-
-12.1. The Official Terms, including those documents incorporated by 
-      reference into the Official Terms, and the Modification Terms 
-      constitute the entire agreement between the parties relating to 
-      the distribution of the Software and, except where stated to the 
-      contrary in writing signed by POV, supersedes all previous 
-      negotiations and correspondence in relation to it. 
-
-12.2. POV may modify this agreement at any time by making a revised 
-      licence available from the Site at http://www.povray.org/distribution-license.html.
-      This agreement is modified by replacing the terms in this 
-      agreement with those of the revised licence from the time that the 
-      revised licence is so made available. It is your responsibility to 
-      ensure that you have read and agreed to the current version of 
-      this agreement prior to distributing the Software.
-
-12.3. Except where explicitly stated otherwise herein, if any provision 
-      of this Agreement is found to be invalid or unenforceable, the 
-      invalidity or unenforceability of such provision shall not affect 
-      the other provisions of this agreement, and all provisions not 
-      affected by such invalidity or unenforceability shall remain in 
-      full force and effect.  In such cases Distributor agrees to 
-      attempt to substitute for each invalid or unenforceable provision 
-      a valid or enforceable provision which achieves to the greatest 
-      extent possible, the objectives and intention of the invalid or 
-      unenforceable provision. 
-
-12.4. A waiver of a right under this agreement is not effective unless 
-      given in writing signed by the party granting that waiver.  Unless 
-      otherwise stipulated in the waiver, a waiver is only effective in 
-      respect of the circumstances in which it is given and is not a 
-      waiver in respect of any other rights or a waiver in respect of 
-      future rights or actions. 
-
-12.5. The validity and interpretation of this agreement is governed by 
-      the laws in force in the State of Victoria, Australia.  
-      Distributor submits to the exclusive jurisdiction of the courts of 
-      that State and courts located within that State exercising federal 
-      jurisdiction. 
-
-12.6. References in this agreement to "written" and "writing" mean on 
-      paper or by fax and expressly exclude email and other forms of 
-      electronic communication. 
-
-13. CONTACT INFORMATION
-
-13.1. This clause 13 does not form part of the agreement.  License 
-      inquiries can be made via email; please use the following address 
-      (but see 13.2 below prior to emailing) : 
-
-        team-coord-[three-letter month]-[four-digit year]@povray org. 
-
-      for example, team-coord-jun-2004@povray.org should be used if at 
-      the time you send the email it is the month of June 2004. The 
-      changing email addresses are necessary to combat spam. Old email 
-      addresses may be deleted at POV's discretion.
-
-13.2. Note that the address referred to in 13.1 may change for reasons 
-      other than those referred to in that clause; please check the 
-      current version of this document at http://www.povray.org/distribution-license.html.
-      for the current address.  Your inability or failure to contact us 
-      is no excuse for violating the licence. 
-
-13.3. Do NOT send any email attachments of any sort other than by prior 
-      arrangement. Do not send email in HTML format. EMAIL MESSAGES 
-      INCLUDING ATTACHMENTS WILL BE DELETED UNREAD. 
-
-13.4. The following postal address is only for official license 
-      business. Please note that it is preferred that initial queries 
-      about licensing be made via email; postal mail should only be used 
-      when email is not possible, or when written documents are being 
-      exchanged by prior arrangement. While it is unlikely this address 
-      will change in the short term it would be advisable to check 
-      http://www.povray.org/distribution-license.html for the current
-      one prior to sending postal mail.
-
-        Persistence of Vision Raytracer Pty. Ltd.
-        PO Box 407
-        Williamstown,
-        Victoria 3016
-        Australia 
diff --git a/community/povray/povray3.7.0_rc3-user-conf.patch b/community/povray/povray3.7.0_rc3-user-conf.patch
deleted file mode 100644
index f20d9b506..000000000
--- a/community/povray/povray3.7.0_rc3-user-conf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
- Makefile.am |   13 -------------
- 1 files changed, 0 insertions(+), 13 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 76b394c..9822c52 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -107,19 +107,6 @@ install-data-local:
- 	for f in $$filelist ; do \
- 	  $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \
- 	done
--	@echo "Creating user directories..."; \
--	for p in $(povuser) $(povconfuser) ; do \
--	  $(mkdir_p) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \
--	done
--	@echo "Copying user configuration and INI files..."; \
--	for f in povray.conf povray.ini ; do \
--	  if test -f $(povconfuser)/$$f; then \
--	    echo "Creating backup of $(povconfuser)/$$f"; \
--	    mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \
--	  fi; \
--	done; \
--	$(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf  && echo "$(povconfuser)/povray.conf" >> $(povinstall); \
--	$(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini  && echo "$(povconfuser)/povray.ini" >> $(povinstall)
- 
- # Remove data, config, and empty folders for 'make uninstall'.
- # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts).
diff --git a/community/povray/source-license.txt b/community/povray/source-license.txt
deleted file mode 100644
index aaf3dbaa1..000000000
--- a/community/povray/source-license.txt
+++ /dev/null
@@ -1,360 +0,0 @@
-                          POV-Ray Licence Agreement
-                             MODIFICATION TERMS
-              Persistence of Vision Raytracer(tm) (POV-Ray(tm))
-                                 5 July 2004
-
-Licensed Version: Version 3.6
-
-Please read through the terms and conditions of this agreement carefully.
-
-This is a binding legal agreement between you and Persistence of Vision 
-Raytracer Pty. Ltd. ACN 105 891 870 ("POV"), a company incorporated in the 
-state of Victoria, Australia, for the product known as the "Persistence of 
-Vision Raytracer(tm)", also referred to herein as "POV-Ray(tm)". In these 
-terms "Licensed Version" means the version of POV-Ray identified at the start 
-of these terms and all minor releases (ie releases of the form x.y.z) of that 
-version.
-
-The terms of this agreement are set out at:
-  http://www.povray.org/source-license.html
-("Official Terms").  The Official Terms take precedence over this document to 
-the extent of any inconsistency.  Except where POV has agreed with you in 
-writing to the contrary, the Official Terms are a complete statement of your 
-ability to modify the source code of the Licensed Version, to use any 
-modifications of the Licensed Version, and to distribute any modifications of 
-the Licensed Version.  You may accept these terms by making any modification 
-to the Licensed Version, or by distributing any modification to the Licensed 
-Version.  If you do not agree to be bound by these terms you must not make any 
-modifications to the source code of the Licensed Version and must not 
-distribute any modifications of the Licensed Version.
-
-  1.   PERMITTED MODIFICATION AND USE
-
-  1.1. The source code of  POV-Ray is provided to: promote the porting of 
-       POV-Ray to hardware and operating systems which POV does not support; 
-       promote experimentation and development of new features to the core 
-       code which might eventually be incorporated into the official version; 
-       and provide insight into the inner workings of the program for 
-       educational purposes.
-
-  1.2. Except as expressly set out in this agreement, or permitted by another 
-       agreement between you and POV, any use or modification of any POV-Ray 
-       source code is expressly prohibited.
-
-  1.3. Subject to this clause 1.3 and the balance of this clause 1, you are 
-       granted the privilege to modify and compile the source code of the 
-       Licensed Version for your own personal use if such modification 
-       fulfils one or more purposes set out in clause 1.1.  Each output of 
-       such a modification or compilation is called a "Modified Version" in 
-       these terms and conditions. Nothing in these terms and conditions 
-       gives you any rights or permissions to use, reproduce or modify any 
-       part of the source code for any version of POV-Ray other than in a 
-       modified version of POV-Ray. In particular, no portion of the source 
-       code for the Licensed Version may, under any circumstances, be 
-       incorporated into any other program (or separated out to form an 
-       independent program) and all Modified Versions that you create must, 
-       in substance, be modifications of the Licensed Version. 
-
-  1.4. You may use any Modified Version that you alone have created only under 
-       the conditions granted in the standard POV end-user license for the 
-       Licensed Version from which the Modified Version was created. As at 
-       July 2004, this licence may be found at:
-         http://www.povray.org/povlegal.doc.
-       Nothing in these terms permits any other person to use any Modified Version.
-
-  1.5. Neither the Licensed Version nor any Modified Version may be linked 
-       into any other software package either at compile-time using (for 
-       example) an object code linker nor at run-time as (for example) a DLL, 
-       ActiveX control, OLE server, COM/DCOM server, or other remoting system 
-       including, without limitation, any linkage that could blur the 
-       end-user's perception of which program provides which functions.
-
-  1.6. To allow POV-Ray to communicate with outside programs, the official 
-       versions of POV-Ray may include internal communication "hooks", often 
-       called an Application Programming Interface, or API. Modification to 
-       these APIs or other officially supported communication mechanisms (or 
-       the addition of any new code or feature) for the purpose of avoidance 
-       (or to assist others to avoid) the intent of this or any other POV 
-       license is expressly prohibited.
-  
-  2. CUSTOM VERSIONS
-
-  2.1. Strict conditions and restrictions are imposed if you wish to 
-       distribute a modified version of POV-Ray, its documentation or other 
-       parts of the package, including any translation of the documentation 
-       into other languages or file formats.
-
-  2.2. For the purposes of these terms and conditions, a "Custom Version" 
-       means a Modified Version which has all of the following characteristics:
-
-       (a). it must have all of the functions of the Licensed Version with all 
-            existing features, copyright notices, author attributions, all 
-            Licence Agreements, etc., intact;
-
-       (b). any reference to the software being an "Official Version" in any 
-            files included in the Modified Version must be altered to clearly 
-            state that it is not an official but an unofficial version;
-
-       (c). when used by a user it must be clear to that user:
-
-            (i).   that the Modified Version is a version of POV-Ray that has 
-                   been modified, and does not appear to be another program 
-                   that happens to have POV-Ray or POV-Ray functionality 
-                   built-in;
-
-            (ii).  that the Modified Version is an unofficial version of 
-                   POV-Ray;
-
-            (iii). who is the creator of the Modified Version;
-
-       (d). the Modified Version must include accurate information in the 
-            DISTRIBUTION_MESSAGE macros in the source file OPTOUT.H and must 
-            prominently display this information. This information must at 
-            least correctly identify who made the custom version.
-
-       (e). It must display each copyright notice and credit screen which is 
-            displayed by the Licensed Version and do so in a similar manner to
-            that of the Licensed Version. When each such notice or screen is 
-            displayed, the Modified Version must indicate that the version is 
-            a modified and unofficial version. In particular, if it is a 
-            version of POV-Ray that contains splash screens or about boxes 
-            (e.g. Windows, Macintosh) each splash screen and about box in the 
-            Licensed Version must be present in the Modified Version and must 
-            be rendered and presented in a similar manner;
-
-       (f). if the Modified Version contains any feature that would cause a 
-            POV-Ray scene source file that works on the Modified Version to 
-            fail or otherwise work incorrectly on either the current official 
-            version of POV-Ray, or on the Licensed Version, then the Modified 
-            Version must check that the scene source file has a #version 
-            directive that includes the 'unofficial' token, and must only 
-            activate any variations from the Licensed Version (including, but 
-            not limited to, new keywords) if that #version directive is 
-            present. If that directive is not present, the Modified Version 
-            must work in the same way as the Licensed Version. An example of a 
-            correct 'unofficial' #version declaration is '#version unofficial 
-            megapov 0.7 ;'.
-
-  2.3. It is the intent of POV to permit modifications to the Licensed Version 
-       which are Custom Versions within the meaning of clause 2.2 and which 
-       incorporate a means of being controlled by other software where that 
-       other software has as its express primary purpose the ability to 
-       control or co-ordinate POV-Ray (or other programs in general) remotely 
-       for parallel or network rendering purposes.
-
-  3. CONDITIONS FOR DISTRIBUTION OF CUSTOM VERSIONS
-
-  3.1. You must not distribute any Modified Version to any person if that 
-       Modified Version is not a Custom Version as defined by section 2.2.
-
-  3.2. You may distribute a Custom Version on the terms of the Distributor's 
-       Licence Agreement for the Licensed Version as modified by this clause 3 
-       and with:
-
-       (a). references to the Licensed Version read as references to the 
-            Custom Version; and
-
-       (b). references to the Software read as references to the Custom 
-            Version;
-
-  3.3. The distribution licence is available from:
-         http://www.povray.org/.
-       As at July 2004, this licence is available at:
-         http://www.povray.org/distribution-license.html.
-
-  3.4. You must ensure that each user of the Custom Version is aware that it 
-       is an unofficial build of POV-Ray which is not supported by POV and 
-       that the POV-Ray developers are not in any way responsible for it;
-
-  3.5. You must either:
-
-       (a). accompany each object code version of the Custom Version which is 
-            distributed with the full source code for that Custom Version and 
-            full documentation describing all modifications that you have made 
-            to the Licensed Version; or
-
-       (b). for a period of at least 3 years following the first distribution 
-            of an object code version of the Custom Version make available for 
-            download over the internet to each person who receives an object 
-            code version of the Custom Version the full source code for the 
-            Custom Version and full documentation describing all modifications 
-            that you have made to the Licensed Version and you must make each 
-            person who receives an object code version of the Custom Version 
-            aware that the source code and documentation is available for 
-            download, and the location from which it can be downloaded;
-
-       and, in either case,
-       
-       (c). that source code must be licensed to each person who receives it 
-            under the same terms as these Modification Terms.
-
-  3.6. You may, at your option: 
-
-       (a). waive clause 4.5 of the standard distribution licence with respect 
-            to distribution of the Custom Version; and
-
-       (b). include as additional clauses, and without affecting any of the 
-            existing provisions of the licence, limitation of liability 
-            provisions in favour of yourself in the same terms as clauses 6 
-            and 7 of the standard distribution licence.
-
-  3.7. Where a Custom Version is distributed in accordance with the terms of 
-       this agreement:
-
-       (a). You must license each recipient of that Custom Version to use 
-            those portions of the Custom Version in respect of which you hold 
-            copyright on the terms of the standard POV end-user license for 
-            the Licensed Version from which the Modified Version was created; 
-
-       (b). POV agrees to licence each recipient of that Custom Version to use 
-            those portions of the Custom Version in respect of which POV holds 
-            copyright on the terms of the standard POV end-user license for 
-            the Licensed Version from which the Modified Version was created.
-
-  4. CONTRIBUTING BUG FIXES AND ENHANCEMENTS
-
-  4.1. POV is not obliged to accept enhancements and bug fixes that you submit 
-       to it. However, if it does so, it does so in accordance with the then 
-       current Contribution Terms. POV may require you to complete and send 
-       documentation to POV prior to accepting a bug fix and, in particular, 
-       will require a copyright assignment of each contribution.
-
-  5. COPYRIGHT AND INTELLECTUAL PROPERTY
-
-  5.1. Copyright subsists in the Licensed Version and it is protected by 
-       Australian and international copyright laws.
-
-  5.2. Nothing in this agreement gives you any rights in respect of any 
-       Intellectual Rights in respect of the Licensed Version or which are 
-       held by or on behalf of POV. You acknowledge that you do not acquire 
-       any rights in respect of such Intellectual Rights. 
-
-  5.3. You acknowledge that if you perform any act in respect of the Software 
-       without the permission of POV you will be liable to POV for all damages 
-       POV may suffer (and which you acknowledge POV may suffer) as well as 
-       statutory damages to the maximum extent permitted by law and that you 
-       may also be liable to criminal prosecution.
-
-  5.4. For the purposes of this clause 5 Intellectual Rights means:
-
-       (a). all copyright, patent, trade mark, trade secret, design, and 
-            circuit layout rights;
-
-       (b). all rights to the registration of such rights; and
-
-       (c). all rights of a similar nature
-
-       which exist anywhere in the world;
-
-  6. DISCLAIMER OF WARRANTY
-
-  6.1. To the extent permitted by law, all implied terms and conditions are 
-       excluded from this agreement. Where a term or condition is implied into 
-       this agreement and that term cannot be legally excluded, that term has 
-       effect as a term or condition of this agreement. However, to the extent 
-       permitted by law, the liability of POV for a breach of such an implied 
-       term or condition is limited to the fullest extent permitted by law. 
-
-  6.2. To the extent permitted by law, the Licensed Version is provided on an 
-       "AS IS" basis, without warranty of any kind, express or implied, 
-       including without limitation, any implied warranties of merchantability,
-       fitness for a particular purpose and non-infringement of intellectual 
-       property of any third party. The Licensed Program has inherent 
-       limitations including design faults and programming bugs. 
-
-  6.3. The entire risk as to the quality and performance of the Licensed 
-       Software, and of any Custom Version is borne by you, and it is your 
-       responsibility to ensure that it fulfils your requirements prior to 
-       using it in any manner. 
-
-  6.4. This clause 6 is an essential and material term of, and cannot be 
-       severed from, this agreement. If you do not or cannot agree to be 
-       bound by this clause, or if it is unenforceable, then you must not, at 
-       any time, make any use or reproductions of the Licensed Version under 
-       this agreement and this agreement gives you no rights to deal in any 
-       way with any part of the Licensed Version.
-
-  7. NO LIABILITY
-
-  7.1. When you use or modify the Licensed Version you acknowledge and accept 
-       that you do so at your sole risk. You agree that under no circumstances
-       will you have any claim against POV or any POV Associate for any loss,
-       damages, harm, injury, expense, work stoppage, loss of business
-       information, business interruption, computer failure or malfunction
-       which may be suffered by you or by any third party from any cause what-
-       soever, howsoever arising, in connection with your use, modification or
-       distribution of the Software even where POV was aware, or ought to have
-       been aware, of the potential of such loss. 
-
-  7.2. Neither POV nor any POV Associate has any liability to you for any 
-       indirect, general, special, incidental, punitive and/or consequential 
-       damages arising as a result of a breach of this agreement by POV or 
-       which arises in any way related to the Licensed Version or the exercise 
-       of a licence granted to you under this agreement.
-
-  7.3. POV's total aggregate liability to you for all loss or damage arising 
-       in any way related to this agreement is limited to the lesser of: (a) 
-       AU$100, and (b) the amount received by POV from you as payment for the 
-       grant of a licence under this agreement.
-
-  7.4. You must bring any action against POV in any way related to this 
-       agreement or the Licensed Version within 3 months of the cause of 
-       action first arising. You waive any right you have to bring any action 
-       against POV and release POV from all liability in respect of a cause 
-       of action if initiating process in relation to that action is not 
-       served on POV within 3 months of the cause of action arising. Where a 
-       particular set of facts give rise to more than one cause of action this 
-       clause 7.4 applies as if all such causes of action arise at the time 
-       the first such cause of action arises.
-
-  7.5. This clause 7 is an essential and material term of, and cannot be 
-       severed from, this agreement. If you does not or cannot agree to be 
-       bound by this clause, or if it is unenforceable, then you must not, at 
-       any time, make any use or reproductions of the Licensed Version under 
-       this agreement and this agreement gives you no rights to deal in any 
-       way with any part of the Licensed Version.
-
-  8. MISCELLANEOUS
-
-  8.1. POV may modify this agreement at any time by making a revised licence 
-       available from:
-         http://www.povray.org/source-license.html.
-       This agreement is modified by replacing the terms in this agreement 
-       with those of the revised licence from the time that the revised 
-       licence is so made available. It is your responsibility to ensure that 
-       you have read and agreed to the current version of this agreement prior 
-       to making any modification to the Licensed Version.
-
-  8.2. Except where explicitly stated otherwise herein, if any provision of 
-       this agreement is found to be invalid or unenforceable, the invalidity 
-       or unenforceability of such provision shall not affect the other 
-       provisions of this agreement, and all provisions not affected by such 
-       invalidity or unenforceability shall remain in full force and effect. 
-       In such cases you agree to attempt to substitute for each invalid or 
-       unenforceable provision a valid or enforceable provision which achieves 
-       to the greatest extent possible, the objectives and intention of the 
-       invalid or unenforceable provision.
-
-  8.3. A waiver of a right under this agreement is not effective unless given 
-       in writing signed by the party granting that waiver. Unless otherwise 
-       stipulated in the waiver, a waiver is only effective in respect of the 
-       circumstances in which it is given and is not a waiver in respect of 
-       any other rights or a waiver in respect of future rights or actions.
-
-  8.4. The validity and interpretation of this agreement is governed by the 
-       laws in force in the State of Victoria, Australia. You submit to the 
-       exclusive jurisdiction of the courts of that State and courts located 
-       within that State exercising federal jurisdiction.
-
-  8.5. References in this agreement to "written" and "writing" mean on paper 
-       or by fax and expressly exclude email and other forms of electronic 
-       communication.
-
-  8.6. "POV Associate" means any person associated directly or indirectly with 
-       POV whether as a director, officer, employee, subcontractor, agent, 
-       representative, consultant, licensee or otherwise.
-
-  8.7. "Distributor's Licence Agreement" in respect of a Licensed Version, 
-       means the agreement of that name for that Licensed Version made 
-       available from:
-         http://www.povray.org/.
diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD
index 8990ce749..9fbafcc11 100644
--- a/community/powertop/PKGBUILD
+++ b/community/powertop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81993 2013-01-05 11:39:29Z jlichtblau $
+# $Id: PKGBUILD 86900 2013-03-24 05:37:37Z foutrelis $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Xilon <xilonmu@gmail.com>
 
 pkgname=powertop
-pkgver=2.2
+pkgver=2.3
 pkgrel=1
 pkgdesc='A tool to diagnose issues with power consumption and power management'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,20 +12,18 @@ url='https://01.org/powertop/'
 license=('GPL2')
 depends=('gcc-libs' 'libnl' 'ncurses' 'pciutils')
 changelog=$pkgname.changelog
-source=($pkgname-$pkgver.tar.gz::https://github.com/fenrus75/powertop/tarball/v2.1.1)
-#https://01.org/powertop/sites/default/files/downloads/$pkgname-$pkgver.tar.gz)
-sha256sums=('e925230cc9006dbc226aec4dea389b97a0f906a7997b33aca40a1d6bc7568dc4')
+source=(https://01.org/powertop/sites/default/files/downloads/$pkgname-$pkgver.tar.gz)
+sha256sums=('b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744')
 
 build() {
-  cd ${srcdir}/*-$pkgname-*
+  cd "$srcdir/$pkgname-$pkgver"
 
-  ./autogen.sh
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/*-$pkgname-*
+  cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/powertop/powertop.changelog b/community/powertop/powertop.changelog
index d543c3517..1abb36737 100644
--- a/community/powertop/powertop.changelog
+++ b/community/powertop/powertop.changelog
@@ -1,3 +1,6 @@
+2013-03-23 Evangelos Foutras <evangelos@foutrelis.com>
+	* powertop 2.3-1
+
 2013-01-05 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
 	* powertop 2.2-1
 
diff --git a/community/preload/rc.preload b/community/preload/rc.preload
deleted file mode 100644
index a3cb01ba0..000000000
--- a/community/preload/rc.preload
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-#
-#	/etc/rc.d/init.d/preload
-#
-# Starts the preload daemon
-#
-# Heavily modified for Arch Linux by Leslie P. Polzer <polzer@gnu.org>.
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/preload`
-
-if [ -f /etc/conf.d/preload ]; then
-        . /etc/conf.d/preload
-fi
-
-MIN_MEMORY=${MIN_MEMORY:-256}
-# Check for > MIN_MEMORY MB
-free -m | awk '/Mem:/ {exit ($2 >= ('"$MIN_MEMORY"'))?0:1}' || exit 0
-
-RETVAL=0
-
-#
-# See how we were called.
-#
-
-start() {
-        if [ -z "$PID" ]; then
-                stat_busy "Starting preload daemon: "
-                /usr/sbin/preload $PRELOAD_OPTS
-                RETVAL=$?
-                if [ $RETVAL -eq 0 ]; then
-			if [ -n $IONICE_OPTS ]; then
-				/usr/bin/ionice $IONICE_OPTS -p "`pidof -o %PPID /usr/sbin/preload`"
-			fi
-                        add_daemon preload
-                        stat_done
-                else
-                        stat_fail
-                fi
-        fi
-        return $RETVAL
-}
-
-stop() {
-        stat_busy "Stopping preload daemon: "
-        kill $PID &>/dev/null
-        RETVAL=$?
-        if [ $RETVAL -eq 0 ]; then
-                rm_daemon preload
-                stat_done
-		PID=""
-        else
-                stat_fail
-        fi
-        return $RETVAL
-}
-
-
-restart() {
-        $0 stop
-	sleep 1
-        $0 start
-}	
-
-reload() {
-        trap "" SIGHUP
-        kill -HUP $PID
-}	
-
-case "$1" in
-        start)
-        start
-        ;;
-        stop)
-        stop
-        ;;
-        reload)
-        reload
-        ;;
-        restart)
-        restart
-        ;;
-        condrestart)
-        if [ ! -z $PID ]; then
-                restart
-        else
-                stat_fail
-        fi
-        ;;
-        *)
-        echo "Usage: $0 {start|stop|restart|condrestart|reload}"
-        exit 1
-esac
-
-exit $RETVAL
diff --git a/community/primus/PKGBUILD b/community/primus/PKGBUILD
new file mode 100644
index 000000000..8abcacf90
--- /dev/null
+++ b/community/primus/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Alexander Monakov <amonakov@gmail.com>
+
+pkgname=primus
+pkgver=20130425
+pkgrel=1
+pkgdesc="Faster OpenGL offloading for Bumblebee"
+arch=('i686' 'x86_64')
+url="https://github.com/amonakov/primus"
+license=('custom:ISC')
+depends=('bumblebee')
+makedepends=('git')
+source=("git://github.com/amonakov/primus.git#commit=31ca47e644")
+sha1sums=('SKIP')
+
+build() {
+  cd primus
+
+  make
+}
+
+package() {
+  cd primus
+
+  install -D "lib/libGL.so.1" "$pkgdir/usr/lib/primus/libGL.so.1"
+  sed -e "s#^PRIMUS_libGL=.*#PRIMUS_libGL='/usr/\$LIB/primus'#" primusrun > primusrun.dist
+  install -D "primusrun.dist" "$pkgdir/usr/bin/primusrun"
+
+  install -D "primus.bash-completion" "$pkgdir/etc/bash_completion.d/primusrun"
+
+  gzip -9 "primusrun.1"
+  install -D "primusrun.1.gz" "$pkgdir/usr/share/man/man1/primusrun.1.gz"
+
+  install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/print-manager/PKGBUILD b/community/print-manager/PKGBUILD
deleted file mode 100644
index bbce85f35..000000000
--- a/community/print-manager/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: vicky91 <vickypaiers@gmail.com>
-
-pkgname=print-manager
-pkgver=0.2.0
-pkgrel=1
-pkgdesc="A KDE tool for managing print jobs and printers"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://projects.kde.org/projects/playground/base/print-manager"
-license=('GPL')
-depends=('kdebase-workspace' 'libcups')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('183c22e91021b0357c2a27146c931de0')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCUPS_1_6=ON
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD
index 940517a8a..e4a8509ca 100644
--- a/community/processing/PKGBUILD
+++ b/community/processing/PKGBUILD
@@ -1,44 +1,46 @@
-# $Id: PKGBUILD 82915 2013-01-25 17:38:23Z arodseth $
+# $Id: PKGBUILD 85228 2013-02-27 19:59:51Z andrea $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=processing
-pkgver=2.0b7
-pkgrel=3
-pkgdesc='Programming language and environment for creating images, animations and interactions'
+pkgver=2.0b8
+pkgrel=1
 arch=('x86_64' 'i686')
+pkgdesc='Programming language and environment for creating images, animations and interactions'
 url='http://www.processing.org/'
 license=('GPL' 'LGPL')
 depends=('libgl' 'sh' 'libxxf86vm')
 makedepends=('gendesk')
 options=(!strip)
 
-_bits=64
-sha256sums=('844b4280b242176107f6c40fef47fa420695111cdb2b80294570297f63b1186f')
-if [[ "$CARCH" != "x86_64" ]]; then
-  _bits=32
-  sha256sums=('55db8370672f9e2658443a7fe577e23f06ca1ab2435719c865a059a0e65cdc83')
+if [ "$CARCH" == "x86_64" ]; then
+  source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux64.tgz"
+          "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
+  sha256sums=('5eab47cd67f3160a71ff694b45e74f8a17f0b0ca31cd3ae545104fb70babb58e'
+            '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
+else
+  source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux32.tgz"
+          "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
+  sha256sums=('ba113199c5ca3c0d9a274088a62eacd6c3872dea9151e34ed1f312d78bad6f17'
+            '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
 fi
-source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux$_bits.tgz")
-
-source+=("$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
-sha256sums+=('019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
 
 build() {
-    cd "$srcdir"
-    gendesk
+  cd "$srcdir"
+
+  gendesk
 }
 
 package() {
-    cd "$srcdir/$pkgname-$pkgver"
-
-    install -d "$pkgdir/usr/share/$pkgname/" "$pkgdir/usr/bin/"
-    cp -r ./* "$pkgdir/usr/share/$pkgname/"
-    ln -s "/usr/share/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
-    ln -s "/usr/share/$pkgname/$pkgname-java" "$pkgdir/usr/bin/$pkgname-java"
-    install -Dm644 "$srcdir/$pkgname.png" \
-      "$pkgdir/usr/share/pixmaps/$pkgname.png"
-    install -Dm644 "$srcdir/$pkgname.desktop" \
-      "$pkgdir/usr/share/applications/$pkgname.desktop"
+  cd "$srcdir/$pkgname-$pkgver"
+  
+  install -d "$pkgdir/usr/share/$pkgname/" "$pkgdir/usr/bin/"
+  cp -r * "$pkgdir/usr/share/$pkgname/"
+  ln -s "/usr/share/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
+  ln -s "/usr/share/$pkgname/$pkgname-java" "$pkgdir/usr/bin/$pkgname-java"
+  install -Dm644 "$srcdir/$pkgname.png" \
+    "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 "$srcdir/$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/procstatd/PKGBUILD b/community/procstatd/PKGBUILD
index 6f782dd90..35a4f35a7 100644
--- a/community/procstatd/PKGBUILD
+++ b/community/procstatd/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=procstatd
 pkgver=1.4.2
-pkgrel=6
+pkgrel=6.1
 pkgdesc="A daemon that can be run either from userspace or inetd that can be queried via a simple API to parse various files in /proc"
 arch=('i686 x86_64' 'mips64el')
 license=('GPL')
diff --git a/community/proftpd/PKGBUILD b/community/proftpd/PKGBUILD
index a37843c18..1b86c9638 100644
--- a/community/proftpd/PKGBUILD
+++ b/community/proftpd/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 83174 2013-01-27 16:24:33Z pierre $
+# $Id: PKGBUILD 87017 2013-03-25 19:16:59Z bpiotrowski $
 # Maintainer:
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=proftpd
-pkgver=1.3.4b
-pkgrel=3
+pkgver=1.3.4c
+pkgrel=2
 epoch=1
 pkgdesc="A high-performance, scalable FTP server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.proftpd.org/"
 license=('GPL')
-depends=('libmysqlclient' 'postgresql-libs')
+depends=('libmariadbclient' 'postgresql-libs')
 backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
 install=${pkgname}.install
 source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc}
         'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service'
         'proftpd.tmpfiles')
-md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2'
-         'e5b9bd78029a15f82994efcb7ed2e9fb'
+md5sums=('65f61e953bea249f8377e681594143a5'
+         '7f00fb7bf757b4bd795afdf0a3f5e556'
          'c439a0a1dbc21b604d8382da87aa021b'
          'ddb09eb13131becdf0e081eef413116b'
          '71d5932b0461c318ed68c2c0c2660736'
diff --git a/community/proj/PKGBUILD b/community/proj/PKGBUILD
index a64fb6298..3e1a63225 100644
--- a/community/proj/PKGBUILD
+++ b/community/proj/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70420 2012-05-05 19:41:43Z jlichtblau $
+# $Id: PKGBUILD 84824 2013-02-24 20:23:27Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
@@ -6,7 +6,7 @@
 
 pkgname=proj
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Cartographic Projections library.'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://trac.osgeo.org/proj/"
@@ -15,7 +15,7 @@ options=('!libtool')
 changelog=$pkgname.changelog
 source=("http://download.osgeo.org/proj/$pkgname-$pkgver.tar.gz"
         "http://download.osgeo.org/proj/$pkgname-datumgrid-1.5.zip"
-        "chenyx06a.zip::http://www.swisstopo.admin.ch/internet/swisstopo/en/home/topics/survey/lv03-lv95/chenyx06/distortion_grids.parsys.65772.downloadList.94632.DownloadFile.tmp/chenyx06antv2.zip")
+        "chenyx06a.zip::http://www.swisstopo.admin.ch/internet/swisstopo/en/home/products/software/software.parsys.7090.downloadList.55545.DownloadFile.tmp/chenyx06ntv2.zip")
 sha256sums=('2db2dbf0fece8d9880679154e0d6d1ce7c694dd8e08b4d091028093d87a9d1b5'
             '723c4017d95d7a8abdf3bda4e18d3c15d79b00f9326d453da5fdf13f96c287db'
             'f61290a32815622bfe182af475c76b0b4c282de66121fdddce2f6201e8bca2e0')
diff --git a/community/proj/proj.changelog b/community/proj/proj.changelog
index 7d3e4bd22..24041ea60 100644
--- a/community/proj/proj.changelog
+++ b/community/proj/proj.changelog
@@ -1,3 +1,6 @@
+2013-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* proj 4.8.0-2 chenyx06a.zip file location fix
+
 2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* proj 4.8.0-1
 
diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD
index d6226ccf0..9573f4b85 100644
--- a/community/projectm/PKGBUILD
+++ b/community/projectm/PKGBUILD
@@ -1,41 +1,84 @@
-# $Id: PKGBUILD 78939 2012-10-27 23:45:21Z ebelanger $
+# $Id: PKGBUILD 86488 2013-03-18 11:20:57Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
+# Contributor: Denis A. Altoe Falqueto <denisfalqueto@gmail.com>
 
 pkgbase=projectm
-pkgname=('projectm' 'libvisual-projectm')
+pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-qt' 'projectm-test')
 pkgver=2.1.0
-pkgrel=2
+pkgrel=5
 arch=('i686' 'x86_64' 'mips64el')
 url='http://projectm.sourceforge.net/'
 license=('LGPL')
-makedepends=('cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext')
-source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz")
-sha256sums=('513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee')
+makedepends=('mesa-libgl' 'qt4' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio')
+source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz"
+        'projectm-test-opengl.patch'
+        'projectm-install-vera-ttf.patch')
+sha256sums=('513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee'
+            'c577d8356be011a3b3ee9f9b389db55f47804d100f690d8ea12f2920cdd432d1'
+            '7d67aad0b210edf25a527274504c9efdf3e9d5b737235b938fec361ac5a8b110')
+_projectmdir="projectM-complete-$pkgver-Source"
 
 build() {
-  cd $srcdir/projectM-complete-$pkgver-Source/src
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DINCLUDE-PROJECTM-QT=OFF \
-    -DINCLUDE-PROJECTM-PULSEAUDIO=OFF -DINCLUDE-PROJECTM-TEST=OFF
+  cd "$srcdir/projectM-complete-$pkgver-Source"
+  patch -p1 -i "$srcdir/projectm-test-opengl.patch"
+  patch -p1 -i "$srcdir/projectm-install-vera-ttf.patch"
+
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  cmake \
+    -Wno-dev \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    "../projectM-complete-$pkgver-Source"
   make
 }
 
 package_projectm() {
   pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering'
-  depends=('ftgl' 'glew' 'gtkglext')
+  depends=('ftgl' 'glew' 'libgl')
+
+  cd "$srcdir/build"
+  
+  for dirs in src/{NativePresets,libprojectM}; do
+    make -C "$dirs" DESTDIR="$pkgdir" install
+  done
+}
 
-  cd $srcdir/projectM-complete-$pkgver-Source/src/libprojectM
-  make DESTDIR=$pkgdir install
-  install -m644 fonts/Vera.ttf $pkgdir/usr/share/projectM/fonts/Vera.ttf
+package_projectm-libvisual() {
+  pkgdesc='ProjectM plugin for XMMS'
+  depends=('projectm' 'libvisual' 'gcc-libs')
+  replaces=('libvisual-projectm')
+  provides=('libvisual-projectm')
+  
+  cd "$srcdir/build/src/projectM-libvisual"
+  make DESTDIR="$pkgdir" install
 }
 
-package_libvisual-projectm() {
-  pkgdesc='ProjectM XMMS plugin'
-  depends=("projectm>=$pkgver" 'libvisual' 'sdl')
+package_projectm-pulseaudio() {
+  pkgdesc='ProjectM support for Pulseaudio'
+  depends=('projectm-qt' 'pulseaudio')
+  
+  cd "$srcdir/build/src/projectM-pulseaudio"
+  make DESTDIR="$pkgdir" install
+}
+
+package_projectm-qt() {
+  pkgdesc='Qt bindings for ProjectM'
+  depends=('projectm' 'qt4' 'libgl')
+  
+  cd "$srcdir/build/src/projectM-qt"
+  make DESTDIR="$pkgdir" install
+}
 
-  cd $srcdir/projectM-complete-$pkgver-Source/src/projectM-libvisual
-  make DESTDIR=$pkgdir install
+package_projectm-test() {
+  pkgdesc='ProjectM test applications'
+  depends=('projectm' 'sdl' 'libgl')
+  
+  cd "$srcdir/build/src/projectM-test"
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/projectm/libprojectM-2.0.1-fix-linking.patch b/community/projectm/libprojectM-2.0.1-fix-linking.patch
deleted file mode 100644
index 23d8a7b9a..000000000
--- a/community/projectm/libprojectM-2.0.1-fix-linking.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/CMakeLists.txt	2009-12-06 02:42:51.000000000 +0100
-+++ b/CMakeLists.txt	2012-02-23 04:30:51.000000000 +0100
-@@ -177,10 +177,10 @@
- LINK_DIRECTORIES(${FTGL_LINK_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR})
- 
- if(BUILD_PROJECTM_STATIC)
--		TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
-+		TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES})
- else(BUILD_PROJECTM_STATIC)
- 
--TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES}  ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
-+TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES} )
- 
- endif(BUILD_PROJECTM_STATIC)
- 
---- a/Renderer/CMakeLists.txt	2009-12-06 02:42:51.000000000 +0100
-+++ b/Renderer/CMakeLists.txt	2012-02-23 04:31:58.000000000 +0100
-@@ -13,4 +13,4 @@
- INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR})
- ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES})
- SET_TARGET_PROPERTIES(Renderer PROPERTIES VERSION 2.00 SOVERSION 2)
--TARGET_LINK_LIBRARIES(Renderer m)
-+TARGET_LINK_LIBRARIES(Renderer m ${OPENGL_LIBRARIES} ${FREETYPE2_LIBRARIES})
diff --git a/community/projectm/libprojectM-2.0.1-pkg-config.patch b/community/projectm/libprojectM-2.0.1-pkg-config.patch
deleted file mode 100644
index b5e38205a..000000000
--- a/community/projectm/libprojectM-2.0.1-pkg-config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libprojectM.pc.in	2009-12-06 02:42:51.000000000 +0100
-+++ b/libprojectM.pc.in	2012-02-21 16:48:36.000000000 +0100
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_INSTALL_DIR@
-+libdir=@CMAKE_INSTALL_PREFIX@/lib
- includedir=@CMAKE_INSTALL_PREFIX@/include
- pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
- sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
diff --git a/community/projectm/projectm-install-vera-ttf.patch b/community/projectm/projectm-install-vera-ttf.patch
new file mode 100644
index 000000000..ee7a5e943
--- /dev/null
+++ b/community/projectm/projectm-install-vera-ttf.patch
@@ -0,0 +1,12 @@
+diff -rupN projectM-complete-2.1.0-Source.old/src/libprojectM/CMakeLists.txt projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
+--- projectM-complete-2.1.0-Source.old/src/libprojectM/CMakeLists.txt	2012-06-30 02:21:45.134586637 -0300
++++ projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt	2012-06-30 02:24:58.476872545 -0300
+@@ -224,7 +224,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_D
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_BINARY_DIR}/config.inp" @ONLY)
+ 
+ IF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf")
+-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fonts/VeraMono.ttf DESTINATION ${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts)
++	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fonts/Vera.ttf DESTINATION ${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts)
+ ENDIF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf")
+ 
+ IF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf")
diff --git a/community/projectm/projectm-test-opengl.patch b/community/projectm/projectm-test-opengl.patch
new file mode 100644
index 000000000..b9211ea0c
--- /dev/null
+++ b/community/projectm/projectm-test-opengl.patch
@@ -0,0 +1,19 @@
+diff -rupN projectM-complete-2.1.0-Source.old/src/projectM-test/CMakeLists.txt projectM-complete-2.1.0-Source/src/projectM-test/CMakeLists.txt
+--- projectM-complete-2.1.0-Source.old/src/projectM-test/CMakeLists.txt	2012-05-20 00:43:26.000000000 -0300
++++ projectM-complete-2.1.0-Source/src/projectM-test/CMakeLists.txt	2012-06-30 01:01:55.947058502 -0300
+@@ -35,11 +35,11 @@ elseif (${CMAKE_PROJECT_NAME} MATCHES ${
+    set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS})
+ endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete")
+ 
+-INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR})
++INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+ LINK_DIRECTORIES(${PROJECTM_LINK})
+ 
+-TARGET_LINK_LIBRARIES(projectM-test projectM  ${SDL_LIBRARY})
+-TARGET_LINK_LIBRARIES(projectM-test-memleak projectM  ${SDL_LIBRARY} )
+-TARGET_LINK_LIBRARIES(projectM-test-texture projectM  ${SDL_LIBRARY} )
++TARGET_LINK_LIBRARIES(projectM-test projectM  ${SDL_LIBRARY} ${OPENGL_gl_LIBRARY} )
++TARGET_LINK_LIBRARIES(projectM-test-memleak projectM  ${SDL_LIBRARY} ${OPENGL_gl_LIBRARY} )
++TARGET_LINK_LIBRARIES(projectM-test-texture projectM  ${SDL_LIBRARY} ${OPENGL_gl_LIBRARY} )
+ 
+ INSTALL(TARGETS projectM-test projectM-test-texture DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
diff --git a/community/protobuf/PKGBUILD b/community/protobuf/PKGBUILD
index 663cbe885..3baff71f1 100644
--- a/community/protobuf/PKGBUILD
+++ b/community/protobuf/PKGBUILD
@@ -1,11 +1,12 @@
-# Maintainer: Thomas S Hatch <thatch45@gmail.com>
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgbase=protobuf
-pkgname=('protobuf' 'protobuf-python')
-pkgver=2.4.1
-pkgrel=2
+pkgname=('protobuf' 'python2-protobuf')
+pkgver=2.5.0
+pkgrel=3
 pkgdesc="A way of encoding structured data in an efficient yet extensible format"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/protobuf/"
@@ -14,7 +15,7 @@ depends=('gcc-libs' 'zlib')
 makedepends=('python2' 'setuptools')
 options=(!libtool)
 source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('ed436802019c9e1f40cc750eaf78f318')
+md5sums=('a72001a9067a4c2c4e0e836d0f92ece4')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
@@ -27,10 +28,12 @@ package_protobuf() {
 	make DESTDIR=$pkgdir install
 }
 
-package_protobuf-python() {
+package_python2-protobuf() {
 	pkgdesc="protobuf python API"
-#	arch=('any')
 	depends=("python2" "protobuf=${pkgver}")
+    provides=("protobuf-python")
+    conflicts=("protobuf-python")
+    replaces=("protobuf-python")
 
 	cd $srcdir/protobuf-$pkgver/python
 	python2 setup.py install --prefix=/usr --root $pkgdir
diff --git a/community/psimedia/PKGBUILD b/community/psimedia/PKGBUILD
index 07e567b83..df7698516 100644
--- a/community/psimedia/PKGBUILD
+++ b/community/psimedia/PKGBUILD
@@ -1,36 +1,36 @@
-# $Id: PKGBUILD 66171 2012-02-23 02:29:02Z spupykin $
+# $Id: PKGBUILD 85385 2013-03-01 10:37:22Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Vladimir Kutyavin <vlkut-at-bk-dot-ru>
 
 pkgname=psimedia
 pkgver=1.0.3
-pkgrel=8
+pkgrel=9
 pkgdesc="Voice and video chat plugin for Psi-like IM clients.  The implementation is based on GStreamer."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://delta.affinix.com/psimedia/"
-depends=('psi' 'speex' 'gstreamer0.10-base' 'qt' 'gstreamer0.10-good-plugins'
+depends=('psi' 'speex' 'gstreamer0.10-base' 'qt4' 'gstreamer0.10-good-plugins'
 	 'liboil')
-makedepends=('pkgconfig')
-source=(http://delta.affinix.com/download/psimedia/$pkgname-$pkgver.tar.bz2
-	videodev.h
-	psimedia-svn20110621.diff.gz
-	psimedia-1.0.3-glib.patch)
-md5sums=('1be71c37d71c655ffc2c53cf86c77a7a'
-         '427e5832466726a86e5b55b1329d2e9e'
-         'b571639d854c90c758f40a44054c6e06'
-	 'c9fd9764e470a1cb0a7371bf21f8f437')
+makedepends=('pkgconfig' 'gdb')
+source=($pkgname-$pkgver.tar.gz::https://github.com/psi-im/psimedia/archive/master.tar.gz)
+md5sums=('d12fdf60fd71ffba597dd22f5c8481cf')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/psimedia-svn20110621.diff
-  patch -Np1 -i ${srcdir}/psimedia-1.0.3-glib.patch
-  sed -i 's|# include <linux/videodev.h>|# include "../../../videodev.h"|' gstprovider/deviceenum/deviceenum_unix.cpp
-  ./configure
+  cd $srcdir/$pkgname-master
+
+  cat >>gstprovider/gstconf.pri <<EOF
+	INCLUDEPATH += \
+		/usr/include/gstreamer-0.10 \
+		/usr/include/glib-2.0 \
+		/usr/lib/glib-2.0/include \
+		/usr/include/libxml2
+EOF
+
+  qmake
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -D -m644 ${srcdir}/$pkgname-$pkgver/gstprovider/libgstprovider.so ${pkgdir}/usr/lib/psi/plugins/libgstprovider.so
+  cd $srcdir/$pkgname-master
+  install -D -m644 ${srcdir}/$pkgname-master/gstprovider/libgstprovider.so ${pkgdir}/usr/lib/psi/plugins/libgstprovider.so
 }
diff --git a/community/psimedia/psimedia-svn20110621.diff.gz b/community/psimedia/psimedia-svn20110621.diff.gz
deleted file mode 100644
index aeb969794..000000000
--- a/community/psimedia/psimedia-svn20110621.diff.gz
+++ /dev/null
diff --git a/community/psimedia/videodev.h b/community/psimedia/videodev.h
deleted file mode 100644
index c51a5f9cb..000000000
--- a/community/psimedia/videodev.h
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- *	Video for Linux version 1 - OBSOLETE
- *
- *	Header file for v4l1 drivers and applications, for
- *	Linux kernels 2.2.x or 2.4.x.
- *
- *	Provides header for legacy drivers and applications
- *
- *	See http://linuxtv.org for more info
- *
- */
-#ifndef __LINUX_VIDEODEV_H
-#define __LINUX_VIDEODEV_H
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-#include <linux/videodev2.h>
-
-
-#define VID_TYPE_CAPTURE	1	/* Can capture */
-#define VID_TYPE_TUNER		2	/* Can tune */
-#define VID_TYPE_TELETEXT	4	/* Does teletext */
-#define VID_TYPE_OVERLAY	8	/* Overlay onto frame buffer */
-#define VID_TYPE_CHROMAKEY	16	/* Overlay by chromakey */
-#define VID_TYPE_CLIPPING	32	/* Can clip */
-#define VID_TYPE_FRAMERAM	64	/* Uses the frame buffer memory */
-#define VID_TYPE_SCALES		128	/* Scalable */
-#define VID_TYPE_MONOCHROME	256	/* Monochrome only */
-#define VID_TYPE_SUBCAPTURE	512	/* Can capture subareas of the image */
-#define VID_TYPE_MPEG_DECODER	1024	/* Can decode MPEG streams */
-#define VID_TYPE_MPEG_ENCODER	2048	/* Can encode MPEG streams */
-#define VID_TYPE_MJPEG_DECODER	4096	/* Can decode MJPEG streams */
-#define VID_TYPE_MJPEG_ENCODER	8192	/* Can encode MJPEG streams */
-
-struct video_capability
-{
-	char name[32];
-	int type;
-	int channels;	/* Num channels */
-	int audios;	/* Num audio devices */
-	int maxwidth;	/* Supported width */
-	int maxheight;	/* And height */
-	int minwidth;	/* Supported width */
-	int minheight;	/* And height */
-};
-
-
-struct video_channel
-{
-	int channel;
-	char name[32];
-	int tuners;
-	__u32  flags;
-#define VIDEO_VC_TUNER		1	/* Channel has a tuner */
-#define VIDEO_VC_AUDIO		2	/* Channel has audio */
-	__u16  type;
-#define VIDEO_TYPE_TV		1
-#define VIDEO_TYPE_CAMERA	2
-	__u16 norm;			/* Norm set by channel */
-};
-
-struct video_tuner
-{
-	int tuner;
-	char name[32];
-	unsigned long rangelow, rangehigh;	/* Tuner range */
-	__u32 flags;
-#define VIDEO_TUNER_PAL		1
-#define VIDEO_TUNER_NTSC	2
-#define VIDEO_TUNER_SECAM	4
-#define VIDEO_TUNER_LOW		8	/* Uses KHz not MHz */
-#define VIDEO_TUNER_NORM	16	/* Tuner can set norm */
-#define VIDEO_TUNER_STEREO_ON	128	/* Tuner is seeing stereo */
-#define VIDEO_TUNER_RDS_ON      256     /* Tuner is seeing an RDS datastream */
-#define VIDEO_TUNER_MBS_ON      512     /* Tuner is seeing an MBS datastream */
-	__u16 mode;			/* PAL/NTSC/SECAM/OTHER */
-#define VIDEO_MODE_PAL		0
-#define VIDEO_MODE_NTSC		1
-#define VIDEO_MODE_SECAM	2
-#define VIDEO_MODE_AUTO		3
-	__u16 signal;			/* Signal strength 16bit scale */
-};
-
-struct video_picture
-{
-	__u16	brightness;
-	__u16	hue;
-	__u16	colour;
-	__u16	contrast;
-	__u16	whiteness;	/* Black and white only */
-	__u16	depth;		/* Capture depth */
-	__u16   palette;	/* Palette in use */
-#define VIDEO_PALETTE_GREY	1	/* Linear greyscale */
-#define VIDEO_PALETTE_HI240	2	/* High 240 cube (BT848) */
-#define VIDEO_PALETTE_RGB565	3	/* 565 16 bit RGB */
-#define VIDEO_PALETTE_RGB24	4	/* 24bit RGB */
-#define VIDEO_PALETTE_RGB32	5	/* 32bit RGB */
-#define VIDEO_PALETTE_RGB555	6	/* 555 15bit RGB */
-#define VIDEO_PALETTE_YUV422	7	/* YUV422 capture */
-#define VIDEO_PALETTE_YUYV	8
-#define VIDEO_PALETTE_UYVY	9	/* The great thing about standards is ... */
-#define VIDEO_PALETTE_YUV420	10
-#define VIDEO_PALETTE_YUV411	11	/* YUV411 capture */
-#define VIDEO_PALETTE_RAW	12	/* RAW capture (BT848) */
-#define VIDEO_PALETTE_YUV422P	13	/* YUV 4:2:2 Planar */
-#define VIDEO_PALETTE_YUV411P	14	/* YUV 4:1:1 Planar */
-#define VIDEO_PALETTE_YUV420P	15	/* YUV 4:2:0 Planar */
-#define VIDEO_PALETTE_YUV410P	16	/* YUV 4:1:0 Planar */
-#define VIDEO_PALETTE_PLANAR	13	/* start of planar entries */
-#define VIDEO_PALETTE_COMPONENT 7	/* start of component entries */
-};
-
-struct video_audio
-{
-	int	audio;		/* Audio channel */
-	__u16	volume;		/* If settable */
-	__u16	bass, treble;
-	__u32	flags;
-#define VIDEO_AUDIO_MUTE	1
-#define VIDEO_AUDIO_MUTABLE	2
-#define VIDEO_AUDIO_VOLUME	4
-#define VIDEO_AUDIO_BASS	8
-#define VIDEO_AUDIO_TREBLE	16
-#define VIDEO_AUDIO_BALANCE	32
-	char    name[16];
-#define VIDEO_SOUND_MONO	1
-#define VIDEO_SOUND_STEREO	2
-#define VIDEO_SOUND_LANG1	4
-#define VIDEO_SOUND_LANG2	8
-	__u16   mode;
-	__u16	balance;	/* Stereo balance */
-	__u16	step;		/* Step actual volume uses */
-};
-
-struct video_clip
-{
-	__s32	x,y;
-	__s32	width, height;
-	struct	video_clip *next;	/* For user use/driver use only */
-};
-
-struct video_window
-{
-	__u32	x,y;			/* Position of window */
-	__u32	width,height;		/* Its size */
-	__u32	chromakey;
-	__u32	flags;
-	struct	video_clip *clips;	/* Set only */
-	int	clipcount;
-#define VIDEO_WINDOW_INTERLACE	1
-#define VIDEO_WINDOW_CHROMAKEY	16	/* Overlay by chromakey */
-#define VIDEO_CLIP_BITMAP	-1
-/* bitmap is 1024x625, a '1' bit represents a clipped pixel */
-#define VIDEO_CLIPMAP_SIZE	(128 * 625)
-};
-
-struct video_capture
-{
-	__u32 	x,y;			/* Offsets into image */
-	__u32	width, height;		/* Area to capture */
-	__u16	decimation;		/* Decimation divider */
-	__u16	flags;			/* Flags for capture */
-#define VIDEO_CAPTURE_ODD		0	/* Temporal */
-#define VIDEO_CAPTURE_EVEN		1
-};
-
-struct video_buffer
-{
-	void	*base;
-	int	height,width;
-	int	depth;
-	int	bytesperline;
-};
-
-struct video_mmap
-{
-	unsigned	int frame;		/* Frame (0 - n) for double buffer */
-	int		height,width;
-	unsigned	int format;		/* should be VIDEO_PALETTE_* */
-};
-
-struct video_key
-{
-	__u8	key[8];
-	__u32	flags;
-};
-
-struct video_mbuf
-{
-	int	size;		/* Total memory to map */
-	int	frames;		/* Frames */
-	int	offsets[VIDEO_MAX_FRAME];
-};
-
-#define 	VIDEO_NO_UNIT	(-1)
-
-struct video_unit
-{
-	int 	video;		/* Video minor */
-	int	vbi;		/* VBI minor */
-	int	radio;		/* Radio minor */
-	int	audio;		/* Audio minor */
-	int	teletext;	/* Teletext minor */
-};
-
-struct vbi_format {
-	__u32	sampling_rate;	/* in Hz */
-	__u32	samples_per_line;
-	__u32	sample_format;	/* VIDEO_PALETTE_RAW only (1 byte) */
-	__s32	start[2];	/* starting line for each frame */
-	__u32	count[2];	/* count of lines for each frame */
-	__u32	flags;
-#define	VBI_UNSYNC	1	/* can distingues between top/bottom field */
-#define	VBI_INTERLACED	2	/* lines are interlaced */
-};
-
-/* video_info is biased towards hardware mpeg encode/decode */
-/* but it could apply generically to any hardware compressor/decompressor */
-struct video_info
-{
-	__u32	frame_count;	/* frames output since decode/encode began */
-	__u32	h_size;		/* current unscaled horizontal size */
-	__u32	v_size;		/* current unscaled veritcal size */
-	__u32	smpte_timecode;	/* current SMPTE timecode (for current GOP) */
-	__u32	picture_type;	/* current picture type */
-	__u32	temporal_reference;	/* current temporal reference */
-	__u8	user_data[256];	/* user data last found in compressed stream */
-	/* user_data[0] contains user data flags, user_data[1] has count */
-};
-
-/* generic structure for setting playback modes */
-struct video_play_mode
-{
-	int	mode;
-	int	p1;
-	int	p2;
-};
-
-/* for loading microcode / fpga programming */
-struct video_code
-{
-	char	loadwhat[16];	/* name or tag of file being passed */
-	int	datasize;
-	__u8	*data;
-};
-
-#define VIDIOCGCAP		_IOR('v',1,struct video_capability)	/* Get capabilities */
-#define VIDIOCGCHAN		_IOWR('v',2,struct video_channel)	/* Get channel info (sources) */
-#define VIDIOCSCHAN		_IOW('v',3,struct video_channel)	/* Set channel 	*/
-#define VIDIOCGTUNER		_IOWR('v',4,struct video_tuner)		/* Get tuner abilities */
-#define VIDIOCSTUNER		_IOW('v',5,struct video_tuner)		/* Tune the tuner for the current channel */
-#define VIDIOCGPICT		_IOR('v',6,struct video_picture)	/* Get picture properties */
-#define VIDIOCSPICT		_IOW('v',7,struct video_picture)	/* Set picture properties */
-#define VIDIOCCAPTURE		_IOW('v',8,int)				/* Start, end capture */
-#define VIDIOCGWIN		_IOR('v',9, struct video_window)	/* Get the video overlay window */
-#define VIDIOCSWIN		_IOW('v',10, struct video_window)	/* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */
-#define VIDIOCGFBUF		_IOR('v',11, struct video_buffer)	/* Get frame buffer */
-#define VIDIOCSFBUF		_IOW('v',12, struct video_buffer)	/* Set frame buffer - root only */
-#define VIDIOCKEY		_IOR('v',13, struct video_key)		/* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */
-#define VIDIOCGFREQ		_IOR('v',14, unsigned long)		/* Set tuner */
-#define VIDIOCSFREQ		_IOW('v',15, unsigned long)		/* Set tuner */
-#define VIDIOCGAUDIO		_IOR('v',16, struct video_audio)	/* Get audio info */
-#define VIDIOCSAUDIO		_IOW('v',17, struct video_audio)	/* Audio source, mute etc */
-#define VIDIOCSYNC		_IOW('v',18, int)			/* Sync with mmap grabbing */
-#define VIDIOCMCAPTURE		_IOW('v',19, struct video_mmap)		/* Grab frames */
-#define VIDIOCGMBUF		_IOR('v',20, struct video_mbuf)		/* Memory map buffer info */
-#define VIDIOCGUNIT		_IOR('v',21, struct video_unit)		/* Get attached units */
-#define VIDIOCGCAPTURE		_IOR('v',22, struct video_capture)	/* Get subcapture */
-#define VIDIOCSCAPTURE		_IOW('v',23, struct video_capture)	/* Set subcapture */
-#define VIDIOCSPLAYMODE		_IOW('v',24, struct video_play_mode)	/* Set output video mode/feature */
-#define VIDIOCSWRITEMODE	_IOW('v',25, int)			/* Set write mode */
-#define VIDIOCGPLAYINFO		_IOR('v',26, struct video_info)		/* Get current playback info from hardware */
-#define VIDIOCSMICROCODE	_IOW('v',27, struct video_code)		/* Load microcode into hardware */
-#define	VIDIOCGVBIFMT		_IOR('v',28, struct vbi_format)		/* Get VBI information */
-#define	VIDIOCSVBIFMT		_IOW('v',29, struct vbi_format)		/* Set VBI information */
-
-
-#define BASE_VIDIOCPRIVATE	192		/* 192-255 are private */
-
-/* VIDIOCSWRITEMODE */
-#define VID_WRITE_MPEG_AUD		0
-#define VID_WRITE_MPEG_VID		1
-#define VID_WRITE_OSD			2
-#define VID_WRITE_TTX			3
-#define VID_WRITE_CC			4
-#define VID_WRITE_MJPEG			5
-
-/* VIDIOCSPLAYMODE */
-#define VID_PLAY_VID_OUT_MODE		0
-	/* p1: = VIDEO_MODE_PAL, VIDEO_MODE_NTSC, etc ... */
-#define VID_PLAY_GENLOCK		1
-	/* p1: 0 = OFF, 1 = ON */
-	/* p2: GENLOCK FINE DELAY value */
-#define VID_PLAY_NORMAL			2
-#define VID_PLAY_PAUSE			3
-#define VID_PLAY_SINGLE_FRAME		4
-#define VID_PLAY_FAST_FORWARD		5
-#define VID_PLAY_SLOW_MOTION		6
-#define VID_PLAY_IMMEDIATE_NORMAL	7
-#define VID_PLAY_SWITCH_CHANNELS	8
-#define VID_PLAY_FREEZE_FRAME		9
-#define VID_PLAY_STILL_MODE		10
-#define VID_PLAY_MASTER_MODE		11
-	/* p1: see below */
-#define		VID_PLAY_MASTER_NONE	1
-#define		VID_PLAY_MASTER_VIDEO	2
-#define		VID_PLAY_MASTER_AUDIO	3
-#define VID_PLAY_ACTIVE_SCANLINES	12
-	/* p1 = first active; p2 = last active */
-#define VID_PLAY_RESET			13
-#define VID_PLAY_END_MARK		14
-
-
-#endif /* __LINUX_VIDEODEV_H */
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
diff --git a/community/psqlodbc/fix-function-declarations.patch b/community/psqlodbc/fix-function-declarations.patch
deleted file mode 100644
index 4504661b0..000000000
--- a/community/psqlodbc/fix-function-declarations.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -upr psqlodbc-08.04.0100.orig/odbcapi30.c psqlodbc-08.04.0100/odbcapi30.c
---- psqlodbc-08.04.0100.orig/odbcapi30.c	2008-10-07 00:46:09.000000000 +0300
-+++ psqlodbc-08.04.0100/odbcapi30.c	2009-09-19 20:13:57.000000000 +0300
-@@ -118,13 +118,7 @@ SQLColAttribute(SQLHSTMT StatementHandle
- 			SQLPOINTER CharacterAttribute,
- 			SQLSMALLINT BufferLength,
- 			SQLSMALLINT *StringLength,
--#if defined(_WIN64)
- 			SQLLEN *NumericAttribute
--#elif defined(WITH_UNIXODBC) || defined(WIN32)
--			SQLPOINTER NumericAttribute
--#else
--			SQLLEN *NumericAttribute
--#endif
- 			)
- {
- 	CSTR	func = "SQLColAttribute";
-diff -upr psqlodbc-08.04.0100.orig/odbcapi30w.c psqlodbc-08.04.0100/odbcapi30w.c
---- psqlodbc-08.04.0100.orig/odbcapi30w.c	2009-03-22 16:17:10.000000000 +0200
-+++ psqlodbc-08.04.0100/odbcapi30w.c	2009-09-19 20:22:17.000000000 +0300
-@@ -262,11 +262,7 @@ SQLRETURN SQL_API SQLColAttributeW(
- 	SQLPOINTER	pCharAttr,
- 	SQLSMALLINT	cbCharAttrMax,	
- 	SQLSMALLINT	*pcbCharAttr,
--#if defined(WITH_UNIXODBC) || (defined(WIN32) && ! defined(_WIN64))
--	SQLPOINTER	pNumAttr
--#else
- 	SQLLEN		*pNumAttr
--#endif
- 	)
- {
- 	CSTR func = "SQLColAttributeW";
-diff -upr psqlodbc-08.04.0100.orig/odbcapi.c psqlodbc-08.04.0100/odbcapi.c
---- psqlodbc-08.04.0100.orig/odbcapi.c	2008-11-23 03:00:53.000000000 +0200
-+++ psqlodbc-08.04.0100/odbcapi.c	2009-09-19 20:13:56.000000000 +0300
-@@ -1111,11 +1111,7 @@ SQLExtendedFetch(
- 				 HSTMT hstmt,
- 				 SQLUSMALLINT fFetchType,
- 				 SQLLEN irow,
--#ifdef WITH_UNIXODBC
--				 SQLROWSETSIZE *pcrow,
--#else
- 				 SQLULEN *pcrow,
--#endif /* WITH_UNIXODBC */
- 				 SQLUSMALLINT *rgfRowStatus)
- {
- 	RETCODE	ret;
diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD
index 7a7e9896e..4a5bfa66d 100644
--- a/community/puzzles/PKGBUILD
+++ b/community/puzzles/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: schuay <jakob.gruber@gmail.com>
 
 pkgname=puzzles
-pkgver=9694
+pkgver=9835
 pkgrel=1
 pkgdesc="Simon Tatham's Portable Puzzle Collection"
 arch=('i686' 'x86_64' 'mips64el')
@@ -38,4 +38,4 @@ package() {
 	mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox
 }
 
-md5sums=('f5e7b7b2a1bab3c939bb03e4ff8201c1')
+md5sums=('0db6e36f2ac04490f38ace15aabab555')
diff --git a/community/puzzles/puzzles-lm.diff b/community/puzzles/puzzles-lm.diff
deleted file mode 100644
index 06493cc0d..000000000
--- a/community/puzzles/puzzles-lm.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/mkfiles.pl b/mkfiles.pl
-index 5bb0d39..cdd8260 100755
---- a/mkfiles.pl
-+++ b/mkfiles.pl
-@@ -1118,8 +1118,8 @@ if (defined $makefiles{'gtk'}) {
-     &splitline("CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g " .
- 	       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
- 	       " `\$(GTK_CONFIG) --cflags` \$(CFLAGS)")."\n".
--    "XLIBS = `\$(GTK_CONFIG) --libs`\n".
--    "ULIBS =#\n".
-+    "XLIBS = `\$(GTK_CONFIG) --libs` -lm\n".
-+    "ULIBS = -lm#\n".
-     "INSTALL=install\n",
-     "INSTALL_PROGRAM=\$(INSTALL)\n",
-     "INSTALL_DATA=\$(INSTALL)\n",
diff --git a/community/pv/PKGBUILD b/community/pv/PKGBUILD
index 83b573890..525dc8f3e 100644
--- a/community/pv/PKGBUILD
+++ b/community/pv/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 80922 2012-12-06 22:11:43Z lfleischer $
+# $Id: PKGBUILD 84287 2013-02-15 14:40:03Z lfleischer $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=pv
-pkgver=1.4.0
+pkgver=1.4.6
 pkgrel=1
 pkgdesc='A terminal-based tool for monitoring the progress of data through a pipeline.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url='http://www.ivarch.com/programs/pv.shtml'
 license=('custom:Artistic 2.0')
 depends=('glibc')
 source=("http://www.ivarch.com/programs/sources/$pkgname-$pkgver.tar.bz2")
-md5sums=('2403d1bc130b0f481344bd2b2470b17d')
+md5sums=('d55ff76f5caa83efc23aa527dbb0b191')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/pypanel/PKGBUILD b/community/pypanel/PKGBUILD
index 49f1839a7..9ede2ca27 100644
--- a/community/pypanel/PKGBUILD
+++ b/community/pypanel/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57834 2011-11-03 10:22:57Z lfleischer $
+# $Id: PKGBUILD 86770 2013-03-22 00:26:29Z eric $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Jeff Mickey <j@codemac.net>
 # Contributor: Mr Green
@@ -15,7 +15,7 @@ depends=('python2' 'x-server' 'python-xlib' 'imlib2' 'libxft')
 source=("http://downloads.sourceforge.net/sourceforge/pypanel/PyPanel-${pkgver}.tar.gz")
 md5sums=('f1f9a2ed80be72ab36e748833618daba')
 
-build() {
+package() {
   cd "${srcdir}/PyPanel-${pkgver}"
   python2 setup.py install --root="${pkgdir}"
 } 
diff --git a/community/pypy/LICENSE b/community/pypy/LICENSE
deleted file mode 100644
index 7fc6952b0..000000000
--- a/community/pypy/LICENSE
+++ /dev/null
@@ -1,154 +0,0 @@
-License for files in the pypy/ directory 
-==================================================
-
-Except when otherwise stated (look for LICENSE files in directories or
-information at the beginning of each file) all software and
-documentation in the 'pypy' directories is licensed as follows: 
-
-    The MIT License
-
-    Permission is hereby granted, free of charge, to any person 
-    obtaining a copy of this software and associated documentation 
-    files (the "Software"), to deal in the Software without 
-    restriction, including without limitation the rights to use, 
-    copy, modify, merge, publish, distribute, sublicense, and/or 
-    sell copies of the Software, and to permit persons to whom the 
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included 
-    in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
-    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
-    DEALINGS IN THE SOFTWARE.
-
-
-PyPy Copyright holders 2003-2010
------------------------------------ 
-
-Except when otherwise stated (look for LICENSE files or information at
-the beginning of each file) the files in the 'pypy' directory are each
-copyrighted by one or more of the following people and organizations:    
-
-    Armin Rigo
-    Maciej Fijalkowski
-    Carl Friedrich Bolz
-    Samuele Pedroni
-    Antonio Cuni
-    Michael Hudson
-    Christian Tismer
-    Holger Krekel
-    Eric van Riet Paap
-    Richard Emslie
-    Anders Chrigstrom
-    Amaury Forgeot d Arc
-    Aurelien Campeas
-    Anders Lehmann
-    Niklaus Haldimann
-    Seo Sanghyeon
-    Leonardo Santagada
-    Lawrence Oluyede
-    Jakub Gustak
-    Guido Wesdorp
-    Benjamin Peterson
-    Alexander Schremmer
-    Niko Matsakis
-    Ludovic Aubry
-    Alex Martelli
-    Toon Verwaest
-    Stephan Diehl
-    Adrien Di Mascio
-    Stefan Schwarzer
-    Tomek Meka
-    Patrick Maupin
-    Jacob Hallen
-    Laura Creighton
-    Bob Ippolito
-    Camillo Bruni
-    Simon Burton
-    Bruno Gola
-    Alexandre Fayolle
-    Marius Gedminas
-    Guido van Rossum
-    Valentino Volonghi
-    Adrian Kuhn
-    Paul deGrandis
-    Gerald Klix
-    Wanja Saatkamp
-    Anders Hammarquist
-    Oscar Nierstrasz
-    Eugene Oden
-    Lukas Renggli
-    Guenter Jantzen
-    Dinu Gherman
-    Bartosz Skowron
-    Georg Brandl
-    Ben Young
-    Jean-Paul Calderone
-    Nicolas Chauvat
-    Rocco Moretti
-    Michael Twomey
-    boria
-    Jared Grubb
-    Olivier Dormond
-    Stuart Williams
-    Jens-Uwe Mager
-    Justas Sadzevicius
-    Mikael Schönenberg
-    Brian Dorsey
-    Jonathan David Riehl
-    Beatrice During
-    Elmo Mäntynen
-    Andreas Friedge
-    Alex Gaynor
-    Anders Qvist
-    Alan McIntyre
-    Bert Freudenberg
-
-    Heinrich-Heine University, Germany 
-    Open End AB (formerly AB Strakt), Sweden
-    merlinux GmbH, Germany 
-    tismerysoft GmbH, Germany 
-    Logilab Paris, France 
-    DFKI GmbH, Germany 
-    Impara, Germany
-    Change Maker, Sweden 
-
- 
-License for 'lib-python/2.5.2' and 'lib-python/2.5.2-modified'
-============================================================== 
-
-Except when otherwise stated (look for LICENSE files or
-copyright/license information at the beginning of each file) the files
-in the 'lib-python/2.5.2' and 'lib-python/2.5.2-modified' directories
-are all copyrighted by the Python Software Foundation and licensed under
-the Python Software License of which you can find a copy here:
-http://www.python.org/doc/Copyright.html 
-
-License for 'pypy/translator/jvm/src/jna.jar'
-=============================================
-
-The file 'pypy/translator/jvm/src/jna.jar' is licensed under the GNU
-Lesser General Public License of which you can find a copy here:
-http://www.gnu.org/licenses/lgpl.html
-
-License for 'pypy/translator/jvm/src/jasmin.jar'
-================================================
-
-The file 'pypy/translator/jvm/src/jasmin.jar' is copyright (c) 1996-2004 Jon Meyer
-and distributed with permission.  The use of Jasmin by PyPy does not imply
-that PyPy is endorsed by Jon Meyer nor any of Jasmin's contributors.  Furthermore,
-the following disclaimer applies to Jasmin:
-
-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/community/pypy/PKGBUILD b/community/pypy/PKGBUILD
deleted file mode 100644
index 63663c276..000000000
--- a/community/pypy/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 80543 2012-11-24 13:43:13Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-pkgname=pypy
-pkgver=2.0beta1
-pkgrel=1
-pkgdesc="A Python implementation written in Python, JIT enabled"
-url="http://codespeak.net/pypy/"
-arch=('i686' 'x86_64')
-depends=('libffi')
-provides=('python2')
-makedepends=('python2')
-optdepends=('openssl: openssl module'
-            'expat: pyexpat module'
-            'ncurses: ncurses module'
-            'zlib: zlib module'
-            'bzip2: bz2 module')
-license=('custom:MIT')
-source=(https://bitbucket.org/pypy/pypy/get/release-2.0-beta1.tar.bz2)
-md5sums=('a7e3e15c51e8f42af9f0c168b6c2750e')
-
-build() {
-  cd ${srcdir}/pypy-pypy-*/pypy/translator/goal
-
-  python2 translate.py -Ojit
-}
-
-package() {
-  cd ${srcdir}/pypy-pypy-*/pypy/translator/goal
-
-  install -Dm755 pypy-c ${pkgdir}/opt/pypy/pypy-c
-  mkdir -p ${pkgdir}/opt/pypy/{lib-python,pypy}
-
-  cd ${srcdir}/pypy-pypy-* 
-  cp -r lib-python/2.7 ${pkgdir}/opt/pypy/lib-python/
-  cp -r lib_pypy ${pkgdir}/opt/pypy/
-  cp -r include ${pkgdir}/opt/pypy/
-
-  mkdir -p ${pkgdir}/usr/bin
-  ln -s /opt/pypy/pypy-c ${pkgdir}/usr/bin/pypy
-
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/pypy/LICENSE
-}
-# vim: ts=2 sw=2 et:
diff --git a/community/pyqt3/PKGBUILD b/community/pyqt3/PKGBUILD
index 7ac1e01d5..0806187e9 100644
--- a/community/pyqt3/PKGBUILD
+++ b/community/pyqt3/PKGBUILD
@@ -1,30 +1,27 @@
-# $Id: PKGBUILD 77656 2012-10-13 11:44:31Z allan $
+# $Id: PKGBUILD 85290 2013-02-28 14:49:01Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgname=pyqt3
 pkgver=3.18.1
-pkgrel=11
+pkgrel=12
 pkgdesc="A set of Python bindings for the Qt3 toolkit"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.com/software/pyqt/intro"
 depends=('python2-sip' 'qscintilla-qt3')
 makedepends=('glu')
 license=('GPL')
-source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz"
-	"PyQt-x11-gpl-3.18.1-configure.patch")
-md5sums=('f1d120495d1aaf393819e988c0a7bb7e'
-	 'd0e3e6b5bd20ace9e567a5ebaeed83e1')
+source=("http://downloads.sourceforge.net/project/pyqt/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz")
+md5sums=('f1d120495d1aaf393819e988c0a7bb7e')
 
 build() {
   cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  patch -Np1 -i ${srcdir}/PyQt-x11-gpl-3.18.1-configure.patch
   . /etc/profile.d/qt3.sh
   echo yes | python2 configure.py -b /usr/bin \
     -d /usr/lib/python2.7/site-packages \
     -v /usr/share/sip
-  make
+  make CXX="g++ -DANY=void"
 }
 
 package() {
diff --git a/community/pyqt3/PyQt-x11-gpl-3.18.1-configure.patch b/community/pyqt3/PyQt-x11-gpl-3.18.1-configure.patch
deleted file mode 100644
index 66150ba72..000000000
--- a/community/pyqt3/PyQt-x11-gpl-3.18.1-configure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- PyQt-x11-gpl-3.18.1.orig/configure.py	2009-06-16 03:47:29.000000000 -0500
-+++ PyQt-x11-gpl-3.18.1/configure.py	2012-12-27 08:45:18.859375913 -0500
-@@ -258,27 +258,27 @@
-         }
- 
-     def code(self, extra_include_dirs, extra_lib_dir, extra_libs):
--        generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs)
-+        generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs, extra_cxxflags="-DANY=void")
- 
-         if "qtext" in pyqt_modules:
--            generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags)
-+            generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags, extra_cxxflags="-DANY=void")
- 
-         if "qtgl" in pyqt_modules:
--            generate_code("qtgl", opengl=1)
-+            generate_code("qtgl", opengl=1, extra_cxxflags="-DANY=void")
- 
-         if "qtpe" in pyqt_modules:
--            generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags)
-+            generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags, extra_cxxflags="-DANY=void")
- 
-         if "qtui" in pyqt_modules:
--            generate_code("qtui", extra_libs=["qui"])
-+            generate_code("qtui", extra_libs=["qui"], extra_cxxflags="-DANY=void")
- 
-         if "qtaxcontainer" in pyqt_modules:
--            generate_code("qtaxcontainer", extra_libs=["qaxcontainer"])
-+            generate_code("qtaxcontainer", extra_libs=["qaxcontainer"], extra_cxxflags="-DANY=void")
- 
-         # The rest don't need special handling.
-         for m in ("qtcanvas", "qtnetwork", "qtsql", "qttable", "qtxml"):
-             if m in pyqt_modules:
--                generate_code(m)
-+                generate_code(m, extra_cxxflags="-DANY=void")
- 
-     def tools(self):
-         tool_dirs = []
diff --git a/community/python-basemap/PKGBUILD b/community/python-basemap/PKGBUILD
new file mode 100644
index 000000000..f9345de0e
--- /dev/null
+++ b/community/python-basemap/PKGBUILD
@@ -0,0 +1,83 @@
+# $Id: PKGBUILD 87032 2013-03-26 01:43:08Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Matthias Ellmer <ellmer.matthias@gmail.com>
+# Contributor: Julien Morin <jmorin@cp.dias.ie>
+
+pkgbase=python-basemap
+pkgname=('python-basemap' 'python2-basemap' 'python-basemap-common')
+pkgver=1.0.6
+pkgrel=2
+arch=('i686' 'x86_64' 'mips64el')
+url="http://matplotlib.org/basemap/"
+license=('custom')
+makedepends=('python2-numpy' 'python-numpy' 'geos' 'shapelib')
+source=("http://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-${pkgver}/basemap-${pkgver}.tar.gz")
+sha1sums=('76191964c580b3af33c169cb050bb171328298f9')
+
+_py2basever=2.7
+_py3basever=3.3
+
+build() {
+   pushd "${srcdir}"/basemap-${pkgver}
+   # Remove the bundled libraries and common data
+   rm -r geos-*
+   sed -i "s/lib64/lib/g" setup.py
+   popd
+
+   cp -a "${srcdir}"/basemap-${pkgver}{,-python2}
+
+   # Python3 Version
+   cd "${srcdir}"/basemap-${pkgver}
+   python setup.py config
+   python setup.py build
+
+   # Python2 Version
+   cd "${srcdir}"/basemap-${pkgver}-python2
+   python2 setup.py config
+   python2 setup.py build
+}
+
+package_python-basemap() {
+   pkgdesc="Toolkit for plotting data on map projections"
+   depends=('python-basemap-common' 'python-matplotlib' 'geos' 'shapelib' 'python-numpy' 'python-httplib2')
+   optdepends=('python-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.')
+
+   cd "${srcdir}"/basemap-${pkgver}
+
+   python setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
+
+   # Conflict with files from python-matplotlib
+   rm "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/__init__.py
+   rm "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/__pycache__/__init__.cpython-33.{pyc,pyo}
+
+   rm -fr "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/basemap/data
+   ln -sf /usr/share/basemap/data "${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/basemap/data
+}
+
+package_python2-basemap() {
+   pkgdesc="Toolkit for plotting data on map projections"
+   depends=('python-basemap-common' 'python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2')
+   optdepends=('python2-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.')
+
+   cd "${srcdir}"/basemap-${pkgver}-python2
+
+   python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
+
+   # Conflict with files from python2-matplotlib
+   rm "${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/__init__.{py,pyc,pyo}
+
+   rm -fr "${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/basemap/data
+   ln -sf /usr/share/basemap/data "${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/basemap/data
+}
+
+package_python-basemap-common() {
+   pkgdesc="Data files for python-basemap"
+
+   cd "${srcdir}"/basemap-${pkgver}
+
+   install -dm755 "${pkgdir}"/usr/share/basemap
+   cp -a lib/mpl_toolkits/basemap/data/ "${pkgdir}"/usr/share/basemap/
+
+   install -dm755 "${pkgdir}"/usr/share/licenses/${pkgbase}
+   install -m644 LICENSE_{data,pyshp,proj4} README "${pkgdir}"/usr/share/licenses/${pkgbase}/
+}
diff --git a/community/python-cx_freeze/PKGBUILD b/community/python-cx_freeze/PKGBUILD
new file mode 100644
index 000000000..74986cdc6
--- /dev/null
+++ b/community/python-cx_freeze/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 84904 2013-02-25 23:57:50Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Ray Rashif <schiv@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: Roberto Alsina <ralsina@kde.org>
+
+pkgbase=python-cx_freeze
+pkgname=('python-cx_freeze' 'python2-cx_freeze')
+pkgver=4.3.1
+pkgrel=1
+pkgdesc='Set of utilities for freezing Python scripts into executables'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://cx-freeze.sourceforge.net/'
+license=('PSF')
+makedepends=('python' 'python2')
+source=("http://prdownloads.sourceforge.net/cx-freeze/cx_Freeze-$pkgver.tar.gz")
+sha256sums=('11f8818ab4e1754c81c1226ce3430f29e6ba231a22a153ce3794a5cc464fa11b')
+
+package_python-cx_freeze() {
+  depends=('python')
+  conflicts=('cx_freeze' 'python2-cx_freeze')
+
+  cd "$srcdir/cx_Freeze-$pkgver"
+  python setup.py install --root "$pkgdir" --optimize 1
+}
+
+package_python2-cx_freeze() {
+  depends=('python2')
+  conflicts=('cx_freeze' 'python-cx_freeze')
+  replaces=('cx_freeze')
+
+  cd "$srcdir/cx_Freeze-$pkgver"
+  python2 setup.py install --root "$pkgdir" --optimize 1
+  # Python 2 shebang fix
+  find "$pkgdir" -name qotd.py -exec sed -i '0,/on/s//on2/' {} \;
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD
index 4762d80cc..79723cf2c 100644
--- a/community/python-matplotlib/PKGBUILD
+++ b/community/python-matplotlib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81606 2012-12-25 00:34:11Z foutrelis $
+# $Id: PKGBUILD 87092 2013-03-27 01:38:02Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
@@ -6,8 +6,8 @@
 
 pkgbase=python-matplotlib
 pkgname=('python2-matplotlib' 'python-matplotlib')
-pkgver=1.2.0
-pkgrel=8
+pkgver=1.2.1
+pkgrel=1
 pkgdesc="A python plotting library, making publication quality plots"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://matplotlib.org'
@@ -20,16 +20,12 @@ optdepends=('pygtk: for use with the GTK or GTKAgg backend'
             'tk: used by the TkAgg backend'
             'ghostscript: usetex dependencies' 
             'texlive-bin: usetex dependencies')
-source=("https://github.com/downloads/matplotlib/matplotlib/matplotlib-${pkgver}.tar.gz"
-         python-matplotlib-tk.patch)
-sha1sums=('1d0c319b2bc545f1a7002f56768e5730fe573518'
-          '6f27ff74a7752700758d081d3235a61a89b8ea95')
+source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz")
+sha1sums=('82fc44d0047a713c1b0b1b4ea2503e6a41c57f98')
 
 build() {
    cd "${srcdir}"/matplotlib-${pkgver}
 
-   patch -Np1 -i ../python-matplotlib-tk.patch
-
    # use system python-six
    rm lib/six.py
 
@@ -37,10 +33,6 @@ build() {
    rm -r lib/matplotlib/pyparsing_py{2,3}.py
    sed -i -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' lib/matplotlib/{mathtext,fontconfig_pattern}.py
 
-   # For numpy 1.7
-   sed -i '/include/s/numpy\/arrayobject.h/numpy\/oldnumeric.h/g' \
-      src/*.{c,cpp,h} lib/matplotlib/delaunay/*.{cpp,h} lib/matplotlib/tri/*.h
-
    cd ..
    cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py3
 
diff --git a/community/python-matplotlib/python-matplotlib-tk.patch b/community/python-matplotlib/python-matplotlib-tk.patch
deleted file mode 100644
index 10480195a..000000000
--- a/community/python-matplotlib/python-matplotlib-tk.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py
---- matplotlib-1.2.0/setupext.py.orig	2012-11-23 14:50:48.954715965 -0200
-+++ matplotlib-1.2.0/setupext.py	2012-11-23 14:55:53.731727636 -0200
-@@ -898,12 +898,12 @@ def parse_tcl_config(tcl_lib_dir, tk_lib
- 
-     tcl_poss = [tcl_lib_dir,
-                 os.path.normpath(os.path.join(tcl_lib_dir, '..')),
--                "/usr/lib/tcl"+str(Tkinter.TclVersion),
--                "/usr/lib"]
-+                "@@libdir@@/tcl"+str(Tkinter.TclVersion),
-+                "@@lib@@"]
-     tk_poss = [tk_lib_dir,
-                 os.path.normpath(os.path.join(tk_lib_dir, '..')),
--               "/usr/lib/tk"+str(Tkinter.TkVersion),
--               "/usr/lib"]
-+               "@@libdir@@/tk"+str(Tkinter.TkVersion),
-+               "@@libdir@@"]
-     for ptcl, ptk in zip(tcl_poss, tk_poss):
-         tcl_config = os.path.join(ptcl, "tclConfig.sh")
-         tk_config = os.path.join(ptk, "tkConfig.sh")
-@@ -974,10 +974,10 @@ def guess_tcl_config(tcl_lib_dir, tk_lib
-     return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver
- 
- def hardcoded_tcl_config():
--    tcl_inc = "/usr/local/include"
--    tk_inc = "/usr/local/include"
--    tcl_lib = "/usr/local/lib"
--    tk_lib = "/usr/local/lib"
-+    tcl_inc = "/usr/include"
-+    tk_inc = "/usr/include"
-+    tcl_lib = "@@libdir@@"
-+    tk_lib = "@@libdir@@"
-     return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk'
- 
- def add_tk_flags(module):
diff --git a/community/python-matplotlib/setup.cfg b/community/python-matplotlib/setup.cfg
deleted file mode 100644
index bed844776..000000000
--- a/community/python-matplotlib/setup.cfg
+++ /dev/null
@@ -1,83 +0,0 @@
-# Rename this file to setup.cfg to modify matplotlib's
-# build options.
-
-[egg_info]
-tag_svn_revision = 1
-
-[directories]
-# Uncomment to override the default basedir in setupext.py.
-# This can be a single directory or a space-delimited list of directories.
-#basedirlist = /usr
-
-[status]
-# To suppress display of the dependencies and their versions
-# at the top of the build log, uncomment the following line:
-#suppress = True
-#
-# Uncomment to insert lots of diagnostic prints in extension code
-#verbose = True
-
-[provide_packages]
-# By default, matplotlib checks for a few dependencies and
-# installs them if missing. This feature can be turned off
-# by uncommenting the following lines. Acceptible values are:
-#     True: install, overwrite an existing installation
-#     False: do not install
-#     auto: install only if the package is unavailable. This
-#           is the default behavior
-#
-## Date/timezone support:
-#pytz = False
-dateutil = False
-
-[gui_support]
-# Matplotlib supports multiple GUI toolkits, including Cocoa,
-# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of
-# these toolkits requires AGG, the Anti-Grain Geometry library,
-# which is provided by matplotlib and built by default.
-#
-# Some backends are written in pure Python, and others require
-# extension code to be compiled. By default, matplotlib checks
-# for these GUI toolkits during installation and, if present,
-# compiles the required extensions to support the toolkit. GTK
-# support requires the GTK runtime environment and PyGTK. Wx
-# support requires wxWidgets and wxPython. Tk support requires
-# Tk and Tkinter. The other GUI toolkits do not require any
-# extension code, and can be used as long as the libraries are
-# installed on your system.
-#
-# You can uncomment any the following lines if you know you do
-# not want to use the GUI toolkit. Acceptible values are:
-#     True: build the extension. Exits with a warning if the
-#           required dependencies are not available
-#     False: do not build the extension
-#     auto: build if the required dependencies are available,
-#           otherwise skip silently. This is the default
-#           behavior
-#
-gtk = False
-gtkagg = False
-tkagg = False
-wxagg = False
-macosx = False
-
-[rc_options]
-# User-configurable options
-#
-# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo,
-# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
-#
-# The Agg, Ps, Pdf and SVG backends do not require external
-# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, TkAgg or WXAgg
-# if you have disabled the relevent extension modules.  Agg will be used
-# by default.
-#
-backend = Qt4Agg
-#
-# The numerix module was historically used to provide
-# compatibility between the Numeric, numarray, and NumPy array
-# packages. Now that NumPy has emerge as the universal array
-# package for python, numerix is not really necessary and is
-# maintained to provide backward compatibility. Do not change
-# this unless you have a compelling reason to do so.
-numerix = numpy
diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD
index bd8641c1e..df1a0ab2f 100644
--- a/community/python-psutil/PKGBUILD
+++ b/community/python-psutil/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 78236 2012-10-17 10:26:22Z allan $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 88178 2013-04-13 10:41:30Z seblu $
+# Maintainer: Sébastien Luttringer
 
 pkgbase=python-psutil
 pkgname=('python-psutil' 'python2-psutil')
-pkgver=0.6.1
-pkgrel=2
+pkgver=0.7.0
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/psutil/'
 license=('custom: BSD')
 makedepends=('python' 'python-distribute' 'python2' 'python2-distribute')
 source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz") 
-sha1sums=('f7a76e201601d8e06a1fdf434422f884888aac86')
+sha1sums=('e19bd1c050786616dd81a3b200c61b8147eb9985')
 
 build() {
   cd psutil-$pkgver
@@ -40,4 +40,4 @@ package_python2-psutil() {
   install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD
index 45d87f49e..f2a5b88f0 100644
--- a/community/python-psycopg2/PKGBUILD
+++ b/community/python-psycopg2/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 82158 2013-01-09 17:03:59Z spupykin $
+# $Id: PKGBUILD 87852 2013-04-08 09:24:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=python-psycopg2
 pkgname=('python-psycopg2' 'python2-psycopg2')
-pkgver=2.4.6
+pkgver=2.5
 pkgrel=1
 pkgdesc="A PostgreSQL database adapter for the Python programming language."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://initd.org/psycopg/"
 license=('LGPL3')
 makedepends=('python2' 'python' 'postgresql-libs>=8.4.1')
-source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-$pkgver.tar.gz)
-md5sums=('79d7f05e67bf70a0ecc6e9103ccece5f')
+source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-$pkgver.tar.gz)
+md5sums=('facd82faa067e99b80146a0ee2f842f6')
 
 build() {
   cd "$srcdir/psycopg2-$pkgver"
diff --git a/community/python-pycuda/PKGBUILD b/community/python-pycuda/PKGBUILD
deleted file mode 100644
index e1f2c2c5a..000000000
--- a/community/python-pycuda/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 83271 2013-01-28 16:50:02Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-pkgbase=python-pycuda
-pkgname=('python-pycuda' 'python2-pycuda' 'pycuda-headers')
-pkgver=2012.1
-pkgrel=2
-pkgdesc="Python wrapper for Nvidia CUDA"
-arch=('i686' 'x86_64')
-url="http://mathema.tician.de/software/pycuda"
-license=('MIT')
-source=(http://pypi.python.org/packages/source/p/pycuda/pycuda-${pkgver}.tar.gz)
-makedepends=('ctags' 'python2-distribute' 'python-distribute' 'python2-numpy' 'python-numpy' 'mesa' 'cuda' 'boost>=1.52.0' 'nvidia-utils')
-sha1sums=('dd52ee697ae9f6256efac3bca682be9c6e7c9649')
-
-build() {
-   cd "${srcdir}"
-  
-   _arch=''
-   [ "$CARCH" = "x86_64" ] && _arch='64'
-
-   cp -a pycuda-${pkgver}{,-python2}
-  
-   cd "${srcdir}"/pycuda-${pkgver}
-   python3 ./configure.py \
-                  --cuda-root=/opt/cuda \
-                  --cuda-inc-dir=/opt/cuda/include \
-                  --cudadrv-lib-dir=/opt/cuda/lib${_arch} \
-                  --cudart-lib-dir=/opt/cuda/lib${_arch} \
-                  --no-use-shipped-boost \
-                  --boost-python-libname=boost_python3
-   make
-
-   cd "${srcdir}"/pycuda-${pkgver}-python2
-   python2 ./configure.py \
-                  --cuda-root=/opt/cuda \
-                  --cuda-inc-dir=/opt/cuda/include \
-                  --cudadrv-lib-dir=/opt/cuda/lib${_arch} \
-                  --cudart-lib-dir=/opt/cuda/lib${_arch} \
-                  --no-use-shipped-boost
-   make
-}
-
-package_python-pycuda() {
-   depends=('cuda' 'nvidia-utils' 'python-numpy' 'python-pytools' 'python' 'boost-libs' 'pycuda-headers')
-   cd "${srcdir}"/pycuda-${pkgver}
-   python3 setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1
-
-   rm -fr "${pkgdir}"/usr/include   
-}
-
-package_python2-pycuda() {
-   depends=('cuda' 'nvidia-utils' 'python2-numpy' 'python2-pytools' 'python2' 'boost-libs' 'pycuda-headers')
-   cd "${srcdir}"/pycuda-${pkgver}-python2
-   python2 setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1
-
-   rm -fr "${pkgdir}"/usr/include   
-}
-
-package_pycuda-headers() {
-   cd "${srcdir}"/pycuda-${pkgver}
-   install -dm755 "${pkgdir}"/usr/include/pycuda
-
-   for file in $(ls -1 src/cuda/*.hpp); do
-      install -m644 ${file} "${pkgdir}"/usr/include/pycuda
-   done
-}
diff --git a/community/python-pygit2/PKGBUILD b/community/python-pygit2/PKGBUILD
index fa3dcbb15..43170f0e4 100644
--- a/community/python-pygit2/PKGBUILD
+++ b/community/python-pygit2/PKGBUILD
@@ -1,17 +1,18 @@
+# $Id: PKGBUILD 88510 2013-04-19 08:16:34Z thestinger $
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 
 pkgbase=python-pygit2
 pkgname=(python-pygit2 python2-pygit2)
-pkgver=0.17.3
-pkgrel=2
+pkgver=0.18.0
+pkgrel=1
 pkgdesc='Python bindings for libgit2'
 url="https://github.com/libgit2/pygit2"
 depends=(libgit2)
 makedepends=(python python2)
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=('GPL2')
 source=(https://github.com/libgit2/pygit2/archive/v${pkgver}.tar.gz)
-md5sums=('d7a03ddd2d3b0dee1c7ee89998dd3022')
+md5sums=('25dedbcf38d690dc8b3716389f2702de')
 
 package_python-pygit2() {
   cd "$srcdir/pygit2-$pkgver"
diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD
index 7f62f72e5..3f56285fe 100644
--- a/community/python-pymongo/PKGBUILD
+++ b/community/python-pymongo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82839 2013-01-24 23:13:20Z arodseth $
+# $Id: PKGBUILD 86969 2013-03-25 14:30:39Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Jelle van der Waa <jelle@vdwaa.nl>
 
 pkgbase=python-pymongo
 pkgname=('python-pymongo' 'python2-pymongo')
-pkgver=2.4.2
+pkgver=2.5
 pkgrel=1
 pkgdesc='Python driver for MongoDB'
 arch=('x86_64' 'i686' 'mips64el')
@@ -13,23 +13,26 @@ license=('APACHE')
 url='http://pypi.python.org/pypi/pymongo/'
 makedepends=('python-distribute' 'python2-distribute')
 source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz")
-sha256sums=('6862c85844f1766c261a39022ec7a6b631988cb5528a31f8d20e78181398aa5f')
+sha256sums=('79aff1c77ec6be6158a4d1a11002400ee0eb8f74dc6f4f67527f59bfac78c222')
 
 build() {
-  cd $srcdir
-  cp -a pymongo-$pkgver pymongo2-$pkgver
+  cd "$srcdir"
+
+  cp -a "pymongo-$pkgver" "pymongo2-$pkgver"
 }
 
 package_python2-pymongo() {
   depends=('python2')
-  cd $srcdir/pymongo2-$pkgver
-  python2 setup.py install --root=$pkgdir --optimize=1
+
+  cd "$srcdir/pymongo2-$pkgver"
+  python2 setup.py install --root="$pkgdir" --optimize=1
 }
 
 package_python-pymongo() {
   depends=('python')
-  cd $srcdir/pymongo-$pkgver
-  python setup.py install --root=$pkgdir --optimize=1
+
+  cd "$srcdir/pymongo-$pkgver"
+  python setup.py install --root="$pkgdir" --optimize=1
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/python-pyopencl/PKGBUILD b/community/python-pyopencl/PKGBUILD
index 156e96187..8e9407c26 100644
--- a/community/python-pyopencl/PKGBUILD
+++ b/community/python-pyopencl/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 83272 2013-01-28 16:50:04Z stephane $
+# $Id: PKGBUILD 87434 2013-03-31 19:18:48Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgbase=python-pyopencl
 pkgname=('python2-pyopencl' 'python-pyopencl' 'pyopencl-headers')
 pkgver=2012.1
-pkgrel=7
+pkgrel=8
 pkgdesc="A complete, object-oriented language binding of OpenCL to Python"
 arch=('i686' 'x86_64')
 url="http://mathema.tician.de/software/pyopencl"
 license=('custom')
-makedepends=('ctags' 'python2-distribute' 'python-distribute' 'libcl' 'opencl-headers' 'mesa' 'boost>=1.52.0' 'python2-mako' 'python-mako' 'python-numpy' 'python2-numpy')
+makedepends=('ctags' 'python2-distribute' 'python-distribute' 'libcl' 'opencl-headers' 'mesa' 'boost>=1.53.0' 'python2-mako' 'python-mako' 'python-numpy' 'python2-numpy')
 source=("http://pypi.python.org/packages/source/p/pyopencl/pyopencl-${pkgver}.tar.gz"
         'LICENSE.txt')
 sha1sums=('ef2460d5e9b883d8afe0ec47863a243b6f8ac7ff'
diff --git a/community/python-pyproj/PKGBUILD b/community/python-pyproj/PKGBUILD
index a166db2e1..83bdaefff 100644
--- a/community/python-pyproj/PKGBUILD
+++ b/community/python-pyproj/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 78245 2012-10-17 10:26:49Z allan $
+# $Id: PKGBUILD 87227 2013-03-28 19:33:14Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgbase=python-pyproj
 pkgname=('python-pyproj' 'python2-pyproj')
-pkgver=1.9.2
+pkgver=1.9.3
 pkgrel=1
 pkgdesc="Python interfaces to PROJ.4 library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="http://code.google.com/p/pyproj"
 license=('custom')
 source=(http://pyproj.googlecode.com/files/pyproj-${pkgver}.tar.gz)
 makedepends=('python' 'python2')
-sha1sums=('a7a4bf95f3492e45704bccd4aeafe3bbe32fb023')
+sha1sums=('3f290241e113ea63d0487a48e7e054cc1c3e19f8')
 
 build() {
    cd "${srcdir}"
diff --git a/community/python-pyro/ChangeLog b/community/python-pyro/ChangeLog
deleted file mode 100644
index aa691dd88..000000000
--- a/community/python-pyro/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-2011-10-07  Angel Velasquez <angvp@archlinux.org>
-	* updated to 4.9
-		* Adding support for python 3
-		* Splitted PKGBUILD
-
-2010-01-12  Andrea Scarpino <andrea@archlinux.org>
-
-	* update package: 3.10
-
-2009-08-24  Biru Ionut <ionut@archlinux.ro>
-
-	* update package: 3.9.1
-
-2008-12-14  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 3.8.1
-
-2008-06-03  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Updated and added to community - 3.8beta
-
diff --git a/community/python-pyro/PKGBUILD b/community/python-pyro/PKGBUILD
deleted file mode 100755
index 72d738f24..000000000
--- a/community/python-pyro/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.br>
-pkgbase=python-pyro
-pkgname=('python-pyro' 'python2-pyro')
-pkgver=4.9
-pkgrel=1
-pkgdesc="Python Remote Objects"
-url="http://irmen.home.xs4all.nl/pyro/"
-arch=('i686' 'x86_64' 'mips64el')
-license=('MIT')
-depends=('python' 'python2')
-source=(http://pypi.python.org/packages/source/P/Pyro4/Pyro4-${pkgver}.tar.gz)
-md5sums=('00bf604303898ee920975a8ddd76bae1')
-
-package_python-pyro() {
-    depends=('python')
-    cd $srcdir/Pyro4-${pkgver}
-    python setup.py install --root=$pkgdir
-    install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_python2-pyro() {
-    depends=('python2')
-    cd $srcdir/Pyro4-${pkgver}
-    python2 setup.py install --root=$pkgdir
-    install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community/python-pyxmpp/PKGBUILD b/community/python-pyxmpp/PKGBUILD
deleted file mode 100644
index d8e1d6018..000000000
--- a/community/python-pyxmpp/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 72079 2012-06-08 09:35:38Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=python-pyxmpp
-pkgver=1.1.2
-pkgrel=2
-pkgdesc="A Python XMPP and Jabber implementation based on libxml2"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pyxmpp.jajcus.net/"
-license=('LGPL')
-depends=('python2-dnspython' 'libxml2' 'python-m2crypto')
-source=(http://pyxmpp.jajcus.net/downloads/pyxmpp-$pkgver.tar.gz)
-md5sums=('a38abf032aca0408b6055cd94296eb75')
-
-build() {
-  cd $srcdir/pyxmpp-$pkgver
-  python2 setup.py build
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD
index 0f7d53214..aab80797f 100644
--- a/community/python-pyzmq/PKGBUILD
+++ b/community/python-pyzmq/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 80562 2012-11-25 15:29:31Z kkeen $
+# $Id: PKGBUILD 89207 2013-04-28 02:59:53Z kkeen $
 # Maintainer: Kyle Keen <keenerd at gmail dot com>
 pkgbase=python-pyzmq
 pkgname=(python2-pyzmq python-pyzmq)
-pkgver=2.2.0.1
-pkgrel=3
-pkgdesc="Python3 bindings for zeromq, written in Cython"
+pkgver=13.0.2
+pkgrel=1
+pkgdesc="Python bindings for zeromq, written in Cython"
 arch=(i686 x86_64 mips64el)
 url="http://www.zeromq.org/bindings:python"
 license=('LGPL')
 depends=(zeromq python)
 makedepends=(python python2 zeromq)
-source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz)
-md5sums=('f2f80709e84c8ac72d6671eee645d804')
+#source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz)
+source=(https://pypi.python.org/packages/source/p/pyzmq/pyzmq-$pkgver.tar.gz)
+md5sums=('49b1a8b858693522730225e3dc2a0910')
 
 build() {
   cd "$srcdir"
@@ -25,12 +26,14 @@ build() {
 }
 
 package_python2-pyzmq() {
+  pkgdesc="Python2 bindings for zeromq, written in Cython"
   depends=(zeromq python2)
   cd "$srcdir/py2zmq-$pkgver"
   python2 setup.py install --root="$pkgdir" --optimize=0
 }
 
 package_python-pyzmq() {
+  pkgdesc="Python3 bindings for zeromq, written in Cython"
   depends=(zeromq python)
   cd "$srcdir/pyzmq-$pkgver"
   python3 setup.py install --root="$pkgdir" --optimize=0
diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD
index a0426cee3..e850f3867 100644
--- a/community/python-scipy/PKGBUILD
+++ b/community/python-scipy/PKGBUILD
@@ -6,15 +6,16 @@
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 
 pkgname=('python-scipy' 'python2-scipy')
-pkgver=0.11.0
-pkgrel=4
+pkgver=0.12.0
+pkgrel=1
 pkgdesc="SciPy is open-source software for mathematics, science, and engineering."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.scipy.org/"
 license=('BSD')
 makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy')
 checkdepends=('python-nose' 'python2-nose')
-source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz" "http://pkgbuild.com/~jelle/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch.xz")
+source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz" )
+# "http://pkgbuild.com/~jelle/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch.xz")
 
 build() {
   unset LDFLAGS
@@ -29,7 +30,7 @@ build() {
 
   # build for python3
   cd scipy-${pkgver}
-  patch -Np1   -i $srcdir/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch
+#patch -Np1   -i $srcdir/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch
   python3 setup.py config_fc --fcompiler=gnu95 build
 
   # build for python2
@@ -80,5 +81,4 @@ package_python2-scipy() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('842c81d35fd63579c41a8ca21a2419b9'
-         '20d41a597ebfb260d777597e431a7a20')
+md5sums=('8fb4da324649f655e8557ea92b998786')
diff --git a/community/python-simplejson/PKGBUILD b/community/python-simplejson/PKGBUILD
index 6fab1f149..deb9419a3 100644
--- a/community/python-simplejson/PKGBUILD
+++ b/community/python-simplejson/PKGBUILD
@@ -1,39 +1,37 @@
-# $Id: PKGBUILD 82843 2013-01-25 00:09:28Z arodseth $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# $Id: PKGBUILD 89809 2013-05-02 13:39:19Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: David Moore <davidm@sjsoft.com>
 
 pkgbase=python-simplejson
-pkgname=(python-simplejson python2-simplejson)
-pkgver=3.0.7
-pkgrel=2
-pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python"
+pkgname=("$pkgbase" 'python2-simplejson')
+pkgver=3.2.0
+pkgrel=1
+pkgdesc='Simple, fast, extensible JSON encoder/decoder for Python'
 license=('MIT')
-arch=('i686' 'x86_64')
-url="http://undefined.org/python/#simplejson"
+arch=('i686' 'x86_64' 'mips64el')
+url='http://undefined.org/python/#simplejson'
 makedepends=('python' 'python2-distribute')
-changelog=python-simplejson.changelog
-source=($pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver})
-md5sums=('fc9013eab6330514196a7f19c2cff386')
-
-build() {
-  true
-}
+source=("$pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver}")
+sha256sums=('507036d10039ccf437625437b2521c0f691c20c3911b2b7183d5a66c98d36432')
 
 package_python-simplejson() {
   depends=('python')
 
-  cd ${srcdir}/simplejson-simplejson-*
-  python setup.py install --root=${pkgdir}
-  install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \
-    ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+  cd "$srcdir/simplejson-simplejson-"*
+  python setup.py install --root="$pkgdir"
+  install -Dm644 "$srcdir/simplejson-simplejson"-*/LICENSE.txt \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_python2-simplejson() {
   depends=('python2')
 
-  cd ${srcdir}/simplejson-simplejson-*
-  python2 setup.py install --root=${pkgdir}
-  install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \
-    ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+  cd "$srcdir/simplejson-simplejson-"*
+  python2 setup.py install --root="$pkgdir"
+  install -Dm644 "$srcdir/simplejson-simplejson"-*/LICENSE.txt \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD
index 5c743bda0..6efe35668 100644
--- a/community/python-sqlalchemy/PKGBUILD
+++ b/community/python-sqlalchemy/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 78255 2012-10-17 10:27:16Z allan $ 
+# $Id: PKGBUILD 89654 2013-05-01 16:07:24Z jelle $ 
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=python-sqlalchemy
 pkgname=('python-sqlalchemy' 'python2-sqlalchemy')
-pkgver=0.7.9
+pkgver=0.8.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el') # python2 package contain .so
 url="http://www.sqlalchemy.org/"
 license=('custom: MIT')
 makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'python-nose' 'python2-nose')
-source=("http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz")
-md5sums=('c4852d586d95a59fbc9358f4467875d5')
+source=(http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz)
+md5sums=('8e27886edc49e69921af77c2274caa41')
 
 build() {
   cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver
@@ -21,6 +21,13 @@ build() {
   python2 setup.py build
 }
 
+check() {
+  cd SQLAlchemy-${pkgver}
+  python setup.py check
+  python2 setup.py check
+
+}
+
 package_python-sqlalchemy() {
   pkgdesc='Python SQL toolkit and Object Relational Mapper'
   depends=('python')
diff --git a/community/python2-basemap/PKGBUILD b/community/python2-basemap/PKGBUILD
deleted file mode 100644
index 8e65c2f86..000000000
--- a/community/python2-basemap/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 74860 2012-08-07 15:09:34Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Julien Morin <jmorin@cp.dias.ie>
-
-pkgname=python2-basemap
-pkgver=1.0.5
-pkgrel=1
-pkgdesc="Toolkit for plotting data on map projections"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://matplotlib.sourceforge.net/basemap/doc/html/"
-license=('custom')
-depends=('python2-matplotlib' 'geos' 'shapelib' 'python2-numpy' 'python2-httplib2')
-optdepends=('python-imaging: Python Imaging Library is only needed for bluemarble and warpimage methods.')
-source=("http://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-${pkgver}/basemap-${pkgver}.tar.gz")
-sha1sums=('14b6f5f645febbc73b23e8aea8fdb9e4b4b9adb4')
-
-build() {
-   cd "${srcdir}/basemap-${pkgver}"
-
-   # Remove the bundled librarie
-   rm -r geos-*
-
-   sed -i "s/lib64/lib/g" setup.py
-
-   python2 setup.py config
-   python2 setup.py build
-}
-
-package() {
-   cd "${srcdir}/basemap-${pkgver}"
-
-   _pybasever=2.7
-
-   python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
-
-   # Conflict with files from python2-matplotlib
-   rm "${pkgdir}"/usr/lib/python${_pybasever}/site-packages/mpl_toolkits/__init__.{py,pyc,pyo}
-
-   # License
-   install -Dm644 LICENSE_data  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-   install -Dm644 LICENSE_pyshp "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-   install -Dm644 LICENSE_proj4 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-   install -Dm644 README        "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community/python2-cheetah/PKGBUILD b/community/python2-cheetah/PKGBUILD
index 1a9fb9000..2d7bfa92a 100644
--- a/community/python2-cheetah/PKGBUILD
+++ b/community/python2-cheetah/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python2-cheetah
 pkgver=2.4.4
 pkgrel=5
 pkgdesc="A Python-powered template engine and code generator"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.cheetahtemplate.org"
 license=(custom)
 depends=(python2 python2-markdown)
diff --git a/community/python2-netifaces/PKGBUILD b/community/python2-netifaces/PKGBUILD
index daad6408f..fa8d1cf78 100644
--- a/community/python2-netifaces/PKGBUILD
+++ b/community/python2-netifaces/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=python2-netifaces
 pkgver=0.8
 pkgrel=2
 pkgdesc="Portable module to access network interface information in Python"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://alastairs-place.net/netifaces/"
 license=('MIT')
 depends=('python2')
diff --git a/community/python2-pycdio/PKGBUILD b/community/python2-pycdio/PKGBUILD
new file mode 100644
index 000000000..5911091ac
--- /dev/null
+++ b/community/python2-pycdio/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 86447 2013-03-17 10:57:47Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Alessandro Pezzoni <donbex at nerdshack dot com>
+
+pkgname=python2-pycdio
+pkgver=0.19
+pkgrel=2
+pkgdesc="Python OO interface to libcdio (CD Input and Control library)"
+arch=("i686" "x86_64" "mips64el")
+url="http://pypi.python.org/pypi/pycdio/"
+license=('GPL')
+depends=('python2' 'libcdio')
+makedepends=('python2-distribute' 'pkg-config' 'swig')
+options=(!emptydirs)
+source=("http://pypi.python.org/packages/source/p/${pkgname#python2-}/${pkgname#python2-}-${pkgver}.tar.gz")
+md5sums=('a6b00666ce8d77ab80a4084a8ff1136b')
+
+package() {
+  cd "$srcdir/${pkgname#python2-}-$pkgver"
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/python2-pycuda/PKGBUILD b/community/python2-pycuda/PKGBUILD
deleted file mode 100644
index 37049dea1..000000000
--- a/community/python2-pycuda/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 62828 2012-01-27 14:09:50Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-pkgname=python2-pycuda
-pkgver=2011.2.2
-pkgrel=1
-pkgdesc="Python wrapper for Nvidia CUDA"
-arch=('i686' 'x86_64')
-url="http://mathema.tician.de/software/pycuda"
-license=('MIT/X Consortium')
-source=(http://pypi.python.org/packages/source/p/pycuda/pycuda-${pkgver}.tar.gz)
-depends=('cuda-toolkit' 'python2-numpy' 'python2-pytools' 'python2')
-optdepends=('python2-pytest')
-makedepends=('ctags' 'python2-distribute' 'mesa')
-provides=('pycuda')
-replaces=('pycuda')
-conflicts=('pycuda')
-sha1sums=('026ca33f66d35c82a087a5ef3f8e0f213575059b')
-
-build() {
-   cd "${srcdir}/pycuda-${pkgver}"
-   python2 ./configure.py \
-                  --cuda-root=/opt/cuda-toolkit \
-                  --boost-compiler=gcc \
-                  --cuda-enable-gl \
-                  --cuda-inc-dir=/opt/cuda-toolkit/include \
-                  --cudadrv-lib-dir=/opt/cuda-toolkit/lib \
-                  --cudart-lib-dir=/opt/cuda-toolkit/lib
-
-   make
-}
-
-package() {
-   cd "${srcdir}/pycuda-${pkgver}"
-   python2 setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1
-}
diff --git a/community/python2-simplejson/PKGBUILD b/community/python2-simplejson/PKGBUILD
deleted file mode 100644
index 8908b6b9d..000000000
--- a/community/python2-simplejson/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 74926 2012-08-09 22:02:03Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: David Moore <davidm@sjsoft.com>
-
-pkgname=python2-simplejson
-pkgver=2.6.2
-pkgrel=1
-pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python"
-license=('MIT')
-arch=('i686' 'x86_64' 'mips64el')
-url="http://undefined.org/python/#simplejson"
-depends=('python2')
-makedepends=('python2-distribute')
-provides=("python-simplejson=$pkgver")
-conflicts=('python-simplejson')
-replaces=('python-simplejson')
-changelog=$pkgname.changelog
-source=($pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver})
-sha256sums=('484b4cf0a545fc59a19ea8eed3a957919a89be116804b53712ec63466d7c3a31')
-sha256sums=('c57ecbcbaf7013df2d555436838acd78c9bb05c3e34ebe3d4de4d8102a0ac2a5')
-sha256sums=('c57ecbcbaf7013df2d555436838acd78c9bb05c3e34ebe3d4de4d8102a0ac2a5')
-sha256sums=('c57ecbcbaf7013df2d555436838acd78c9bb05c3e34ebe3d4de4d8102a0ac2a5')
-
-build() {
-  cd ${srcdir}/simplejson-simplejson-*
-
-  python2 setup.py install --root=${pkgdir}
-
-  # License
-  install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \
-    ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/community/python2-simplejson/python2-simplejson.changelog b/community/python2-simplejson/python2-simplejson.changelog
deleted file mode 100644
index c1e227d24..000000000
--- a/community/python2-simplejson/python2-simplejson.changelog
+++ /dev/null
@@ -1,20 +0,0 @@
-2012-07-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.6.1-1
-
-2012-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.5.2-1
-
-2012-03-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.3.3-1
-
-2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.2.1-1
-
-2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.1.3-1
-
-2010-05-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 2.1.1
-
-2010-03-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 2.1.0
diff --git a/community/python2-tagpy/PKGBUILD b/community/python2-tagpy/PKGBUILD
index d113ff99f..c122c14af 100644
--- a/community/python2-tagpy/PKGBUILD
+++ b/community/python2-tagpy/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 83273 2013-01-28 16:50:06Z stephane $
+# $Id: PKGBUILD 87435 2013-03-31 19:18:49Z stephane $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Callan Barrett <wizzomafizzo@gmail.com>
 # Contributor: Scott Horowitz <stonecrest@gmail.com>
 
 pkgname=python2-tagpy
 pkgver=0.94.8
-pkgrel=2
-pkgdesc="Python bindings for TagLib"
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/tagpy"
+pkgrel=3
+pkgdesc='Python bindings for TagLib'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://pypi.python.org/pypi/tagpy'
 license=('MIT')
 depends=('python2' 'taglib' 'boost-libs')
 makedepends=('python2-distribute' 'boost')
@@ -16,32 +17,37 @@ replaces=('tagpy')
 conflicts=('tagpy')
 source=("http://pypi.python.org/packages/source/t/tagpy/tagpy-$pkgver.tar.gz"
         'taglib1.7.patch')
-md5sums=('6baff63318cf90b9bc5a2497a0597802'
-         '5b47cefe5fad98a093232256779da345')
+sha256sums=('56eab8dd81510f8af18e19375a0ffd5cd25c8e555104be46a92c3dc08634a0dc'
+            'f6cc34f8d4d1186270943cd7e1ad3c9478ae7064ab9b2cddf7760d493295cd26')
 
 build() {
-  cd tagpy-${pkgver}
+  cd "tagpy-$pkgver"
 
-  patch -p1 -i "${srcdir}"/taglib1.7.patch
+  patch -p1 -i "$srcdir/taglib1.7.patch"
 
   sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     $(find . -name '*.py') 
  
-  ./configure.py --taglib-lib-dir=/usr/lib/ \
-  	--taglib-inc-dir=/usr/include/taglib/ \
-	--boost-inc-dir=/usr/include/boost/ \
-	--boost-lib-dir=/usr/lib/ \
-	--boost-python-libname=boost_python
+  ./configure.py \
+    --taglib-lib-dir=/usr/lib/ \
+    --taglib-inc-dir=/usr/include/taglib/ \
+    --boost-inc-dir=/usr/include/boost/ \
+    --boost-lib-dir=/usr/lib/ \
+    --boost-python-libname=boost_python
   python2 setup.py build
 }
 
-package(){
-  cd tagpy-${pkgver}
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
-}
-
 check(){
-  cd tagpy-${pkgver}
+  cd "tagpy-$pkgver"
+
   python2 setup.py test
 }
+
+package(){
+  cd "tagpy-$pkgver"
+
+  python2 setup.py install --root="$pkgdir" --optimize=1
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/python2-traits/PKGBUILD b/community/python2-traits/PKGBUILD
index 842eb0e8d..1ae9671e7 100644
--- a/community/python2-traits/PKGBUILD
+++ b/community/python2-traits/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 75625 2012-08-27 16:55:19Z aginiewicz $
+# $Id: PKGBUILD 88228 2013-04-14 19:37:35Z aginiewicz $
 # Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
 
 pkgname=python2-traits
-pkgver=4.2.0
-_githubtag=0afc79d
-pkgrel=2
+pkgver=4.3.0
+pkgrel=1
 pkgdesc="Explicitly typed attributes for Python"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://code.enthought.com/projects/traits/"
+url="https://github.com/enthought/traits"
 license=('BSD')
 depends=('python2-numpy')
 makedepends=('python2-distribute')
 options=(!emptydirs)
 
-source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/traits/tarball/${pkgver}")
-md5sums=('835c83c320ed1109ca05fa4ae4556828')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/traits/archive/${pkgver}.tar.gz")
+md5sums=('f78c15c44e0f965cc2ab799806a80388')
 
 build() {
-  cd "$srcdir"/enthought-traits-${_githubtag}
+  cd "$srcdir"/traits-$pkgver
 
   python2 setup.py build
 }
 
 package() {
-  cd "$srcdir"/enthought-traits-${_githubtag}
+  cd "$srcdir"/traits-$pkgver
 
   python2 setup.py install --root="$pkgdir"/ --optimize=1
 
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index 453b8ee2d..21712eeef 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77657 2012-10-13 11:44:42Z allan $
+# $Id: PKGBUILD 88003 2013-04-09 21:45:04Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Giovanni Scafora <linuxmania@gmail.com>
@@ -19,17 +19,14 @@ source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community
         QCad.desktop
         qcad-intptr.patch
         qcad.patch)
-       # http://ghost1227.com/files/misc/qm.tar.gz)
 md5sums=('96b6a56027782aec953c9c4e64c5998c'
          'da32fec0d2fb85d96126bf28bb0ab9ff'
          'b4d1eb6724b4b41f191f1ab6fd859c39'
          '92f900fe1fd3a8f841232b587b49c7da'
          '7e6779b1e3b10da1eb4daf36d93f8479')
+# http://ghost1227.com/files/misc/qm.tar.gz)
 
 build() {
-  export PATH="/opt/qt/bin:$PATH"
-  export QTDIR=/opt/qt
-
   cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src
 
   [ "$CARCH" = "x86_64" ] && {
@@ -40,7 +37,11 @@ build() {
   sed -i "s:"-pedantic"::g" mkspecs/defs.pro
 
   cd scripts
-  ./build_qcad.sh notrans
+  sed -i "s|INCLUDEPATH += ../include|INCLUDEPATH += ../include /usr/include/qt3|" ../*/src/*.pro
+  sed -i "s|../../qcadlib/include|../../qcadlib/include /usr/include/qt3|" ../qcad/src/qcad.pro
+  sed -i "s/qmake/qmake-qt3/" build_qcad.sh
+  sed -i 's|eval $MAKE|sed -i "s/-lqt/-lqt-mt/" ../qcad/src/Makefile;eval $MAKE|'  build_qcad.sh
+  QTDIR=/usr/lib/qt3 ./build_qcad.sh notrans
 }
 
 package() {
diff --git a/community/qconf/PKGBUILD b/community/qconf/PKGBUILD
index 967c18dd4..27388dbf7 100644
--- a/community/qconf/PKGBUILD
+++ b/community/qconf/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 55030 2011-08-31 16:23:53Z spupykin $
+# $Id: PKGBUILD 85387 2013-03-01 10:37:35Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: DsTr <kostindima@gmail.com>
 
 pkgname=qconf
 pkgver=1.4
-pkgrel=2
+pkgrel=3
 pkgdesc="QConf allows you to have a nice configure script for your qmake-based project."
 arch=(i686 x86_64 mips64el)
 url="http://delta.affinix.com/qconf/"
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 makedepends=()
 source=(http://delta.affinix.com/download/qconf-$pkgver.tar.bz2)
 md5sums=(e0080044f88c31e032008d5a5682a112)
@@ -18,5 +18,9 @@ build() {
   cd $srcdir/qconf-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/qconf-$pkgver
   make INSTALL_ROOT="$pkgdir" install
 }
diff --git a/community/qgit/PKGBUILD b/community/qgit/PKGBUILD
index 73af75518..84f9a7da4 100644
--- a/community/qgit/PKGBUILD
+++ b/community/qgit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 49264 2011-06-13 14:58:16Z schuay $
+# $Id: PKGBUILD 85388 2013-03-01 10:37:43Z andrea $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -6,12 +6,12 @@
 
 pkgname=qgit
 pkgver=2.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A GIT GUI viewer built on Qt/C++"
 url="http://digilander.libero.it/mcostalba/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('qt' 'git')
+depends=('qt4' 'git')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'qgit.desktop' 'qgit.png'
 		'0001-Cause-qgit-to-use-git-config-everywhere.patch')
diff --git a/community/qgo/PKGBUILD b/community/qgo/PKGBUILD
index d015bc085..c66c167b3 100644
--- a/community/qgo/PKGBUILD
+++ b/community/qgo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64872 2012-02-18 19:23:28Z arodseth $
+# $Id: PKGBUILD 88006 2013-04-09 21:47:09Z eric $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
@@ -20,10 +20,9 @@ sha256sums=('ddfb66ada7027b844838895061f266bda03b327e8dfec2ee2782e14748bac104'
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  . /etc/profile.d/qt3.sh
   patch -Np1 -i "$srcdir/gcc43.patch"
   patch -Np1 -i "$srcdir/gcc45.patch"
-  ./configure --prefix=/usr --build=$CHOST
+  ./configure --prefix=/usr --build=$CHOST --with-qt-includes=/usr/include/qt3
   make
 }
 
diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD
index 363ba142d..055dd9bee 100644
--- a/community/qlandkartegt/PKGBUILD
+++ b/community/qlandkartegt/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 80871 2012-12-04 21:32:40Z jlichtblau $
+# $Id: PKGBUILD 87229 2013-03-28 20:43:22Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Matthias Maennich <arch@maennich.net>
 # Contributor: <boenki@gmx.de>
 
 pkgname=qlandkartegt
-pkgver=1.6.0
+pkgver=1.7.0
 pkgrel=1
 pkgdesc="Use your GPS with Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.qlandkarte.org/"
 license=('GPL')
-depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'glu' 'postgresql-libs'
-         'qt' 'shared-mime-info' 'qtwebkit')
+depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmariadbclient' 'glu' 'postgresql-libs'
+         'shared-mime-info' 'qtwebkit')
 makedepends=('cmake' 'garmindev' 'mesa')
 optdepends=('garmindev: to connect garmin devices')
 install=$pkgname.install
@@ -40,3 +40,5 @@ package(){
   install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \
     "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml"
 }
+sha256sums=('4dbab9ed00824647a9afd315619e7974e176a3b47e50f3754441e69f1dbee72d'
+            'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0')
diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog
index f481e3e0d..308d122a2 100644
--- a/community/qlandkartegt/qlandkartegt.changelog
+++ b/community/qlandkartegt/qlandkartegt.changelog
@@ -1,3 +1,6 @@
+2013-03-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.7.0-1
+
 2012-12-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* qlandkartegt 1.6.0-1
 
diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD
index a68a65a17..5ef8b84af 100644
--- a/community/qmmp/PKGBUILD
+++ b/community/qmmp/PKGBUILD
@@ -1,20 +1,20 @@
-#$Id: PKGBUILD 82337 2013-01-15 11:35:09Z allan $
+#$Id: PKGBUILD 88593 2013-04-20 16:06:40Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=qmmp
-pkgver=0.6.6
-pkgrel=2
+pkgver=0.7.0
+pkgrel=1
 pkgdesc="Qt4 based audio-player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qmmp.ylsoftware.com/"
 license=('GPL')
-depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg'  'qt' 'taglib' 'xdg-utils')
+depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg'  'qt4' 'taglib' 'xdg-utils')
 makedepends=('cmake' 'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio-paranoia' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack' 'projectm' 'mesa')
 optdepends=('flac: native FLAC support'
             'jack: JACK sound output'
             'libmpcdec: Musepack support'
             'pulseaudio: PulseAudio output'
-            'libcdio: Compact Disc input and control support'
+            'libcdio-paranoia: Compact Disc input and control support'
             'libcddb: CDDB server support'
             'libmms: MMS stream protocol support'
             'libmodplug: MOD playing library'
@@ -22,22 +22,23 @@ optdepends=('flac: native FLAC support'
             'projectm: visual efects'
             'ffmpeg' 'libsamplerate' 'wavpack')
 install=$pkgname.install
-source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2
-        cdio-includes.patch)
-sha256sums=('dfa973cca80c020a85a11bb66701a3804f9fde326440abb179559c98bf3b5b99'
-            '7b3ff46dd30070cd79c5ca2dd6dfa1b9872bc09041f4bd985edf20a4333db07c')
+changelog=$pkgname.changelog
+source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2)
+sha256sums=('2f9a67821a711f925e27d7254eb3039d31019fe1a2aaa7a901be0d2f9066183d')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 
-  patch -Np1 -i ${srcdir}/cdio-includes.patch
-
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
+          -DCMAKE_INSTALL_LIBDIR=/usr/lib
   make
 }
 
 package() {
   cd ${srcdir}/$pkgname-$pkgver
-
   make DESTDIR=${pkgdir} install
+
+  if [[ $CARCH == 'x86_64' ]]; then
+    mv $pkgdir/usr/lib64 $pkgdir/usr/lib
+  fi
 }
diff --git a/community/qmmp/cdio-includes.patch b/community/qmmp/cdio-includes.patch
deleted file mode 100644
index 4c471291f..000000000
--- a/community/qmmp/cdio-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr qmmp-0.6.5.orig/src/plugins/Input/cdaudio/decoder_cdaudio.cpp qmmp-0.6.5/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
---- qmmp-0.6.5.orig/src/plugins/Input/cdaudio/decoder_cdaudio.cpp	2013-01-10 21:55:55.000000000 +0200
-+++ qmmp-0.6.5/src/plugins/Input/cdaudio/decoder_cdaudio.cpp	2013-01-10 21:56:26.000000000 +0200
-@@ -25,7 +25,7 @@
- #include <QFileInfo>
- #include <QDir>
- #include <cdio/cdio.h>
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #include <cdio/audio.h>
- #include <cdio/cd_types.h>
- #include <cdio/logging.h>
diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog
index 83a1d07a0..57758c02f 100644
--- a/community/qmmp/qmmp.changelog
+++ b/community/qmmp/qmmp.changelog
@@ -1,3 +1,9 @@
+2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qmmp 0.7.0-1
+
+2013-03-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qmmp 0.6.7-1
+
 2013-01-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* qmmp 0.6.6-2 libcdio/libcdio-paranoia rebuild
 
diff --git a/community/qmpdclient/PKGBUILD b/community/qmpdclient/PKGBUILD
index b98775d66..4cbf5dfd4 100644
--- a/community/qmpdclient/PKGBUILD
+++ b/community/qmpdclient/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 58444 2011-11-12 18:54:25Z andrea $
+# $Id: PKGBUILD 85391 2013-03-01 10:38:10Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Vinay S Shastry <vinayshastry@gmail.com>
 
 pkgname=qmpdclient
 pkgver=1.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A Qt4 client for MPD"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://bitcheese.net/wiki/QMPDClient"
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake')
 install=$pkgname.install
 changelog=$pkgname.changelog
@@ -18,7 +18,7 @@ source=(http://dump.bitcheese.net/files/$pkgname-$pkgver.tar.bz2)
 sha256sums=('ed65705eaae8fb10fdce34ce20e010757a87423c2874479e1466e4368a866289')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname} \
@@ -28,6 +28,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/qps/PKGBUILD b/community/qps/PKGBUILD
index d1ec3d9b7..d6da32d5b 100644
--- a/community/qps/PKGBUILD
+++ b/community/qps/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 60157 2011-12-06 09:22:03Z spupykin $
+# $Id: PKGBUILD 85392 2013-03-01 10:38:18Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Rosenstrauch <darose@darose.net>
 
 pkgname=qps
 pkgver=1.10.16
 _dlpkgver=5963
-pkgrel=1
+pkgrel=2
 pkgdesc="a visual process manager, an X11 version of 'top' or 'ps'."
 url="http://qps.kldp.net/projects/qps"
-depends=('qt')
+depends=('qt4')
 arch=('i686' 'x86_64' 'mips64el')
 license="GPL"
 source=(http://kldp.net/frs/download.php/${_dlpkgver}/qps-$pkgver.tar.bz2)
diff --git a/community/qpxtool/PKGBUILD b/community/qpxtool/PKGBUILD
index 00451f775..f48de07f5 100644
--- a/community/qpxtool/PKGBUILD
+++ b/community/qpxtool/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 81901 2013-01-03 10:05:25Z spupykin $
+# $Id: PKGBUILD 85393 2013-03-01 10:38:26Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Stasiorowski <krzysiekst@gmail.com>
 
 pkgname=qpxtool
 pkgver=0.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qpxtool.sourceforge.net/"
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
 	libpng15.patch)
 md5sums=('b1235e74b8ef4fe087a6b64f5cfca14a'
@@ -23,6 +23,10 @@ build() {
   patch -p1 <$srcdir/libpng15.patch
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   mkdir -p $pkgdir/usr/bin
   make DESTDIR=$pkgdir install
 }
diff --git a/community/qscintilla-qt3/PKGBUILD b/community/qscintilla-qt3/PKGBUILD
index 8de84ddb2..403a4d100 100644
--- a/community/qscintilla-qt3/PKGBUILD
+++ b/community/qscintilla-qt3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55531 2011-09-14 07:43:04Z andrea $
+# $Id: PKGBUILD 88009 2013-04-09 21:48:46Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: red_over_blue,Ben <ben@benmazer.net>,Kritoke <kritoke@gamebox.net>
@@ -11,27 +11,22 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro/"
 license=('GPL2')
 depends=('qt3')
-source=("http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla1/QScintilla-1.71-gpl-$pkgver.tar.gz")
+source=("http://downloads.sourceforge.net/pyqt/QScintilla-1.71-gpl-$pkgver.tar.gz")
 md5sums=('dfa047b45d4f09ae8d4a8a431ba88a5a')
 
 build() {
-  . /etc/profile.d/qt3.sh
   cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver
   cd qt
-  sed -i "s%DESTDIR.*%DESTDIR=$pkgdir/opt/qt/lib%g" qscintilla.pro
-  /opt/qt/bin/qmake qscintilla.pro
-  make
+  sed -i "s%DESTDIR.*%DESTDIR=$pkgdir/usr/lib%g" qscintilla.pro
+  qmake-qt3 qscintilla.pro
+  sed -i 's|$(QTDIR)/include|/usr/include/qt3|' Makefile
+  make MOC=/usr/bin/moc-qt3
 }
 
 package() {
   cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver/qt
   # installind includes
   for i in qextscintilla*.h; do
-    install -m 644 -D $i "${pkgdir}"/opt/qt/include/$i
+    install -m 644 -D $i "${pkgdir}"/usr/include/qt3/$i
   done
-
-  #for i in qscintilla*.qm
-  #do
-  #install -m 644 -D $i "${pkgdir}"/opt/qt/translations/$i
-  #done
 }
diff --git a/community/qstardict/PKGBUILD b/community/qstardict/PKGBUILD
index 462e749c7..c6eaa15a2 100644
--- a/community/qstardict/PKGBUILD
+++ b/community/qstardict/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 66440 2012-02-24 22:59:57Z jlichtblau $
+# $Id: PKGBUILD 85395 2013-03-01 10:38:40Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 
 pkgname=qstardict
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt4 clone of StarDict with full support of StarDict dictionaries"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qstardict.ylsoftware.com/index.php"
 license=('GPL2')
-depends=('qt')
+depends=('qt4')
 provides=('stardict')
 changelog=$pkgname.changelog
 source=(http://qstardict.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2
@@ -18,14 +18,15 @@ sha256sums=('b778ace65a22e5b9724d687ad90c77ec98feb2671774f73cd51725ec7b59e62f'
 	    '30878282698dc90bf615ca383f4c01357ce49dfcdddd12c2e0b113ee51822c57')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
-  patch -Np1 -i ${srcdir}/qstardict-1.0.1-glib.patch
+  cd "${srcdir}/$pkgname-$pkgver"
+  sed -i -e 's|glib/gmem.h|glib.h|' -e 's|glib/gstrfuncs.h|glib.h|' plugins/stardict/stardict.cpp
+
   qmake ENABLED_PLUGINS="stardict web swac"
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}/$pkgname-$pkgver"
 
-  make INSTALL_ROOT=${pkgdir} install
+  make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/community/qsvn/PKGBUILD b/community/qsvn/PKGBUILD
index fdd5b1da9..b9afa3fac 100644
--- a/community/qsvn/PKGBUILD
+++ b/community/qsvn/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 67770 2012-03-14 11:19:01Z giovanni $
+# $Id: PKGBUILD 85396 2013-03-01 10:38:47Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
 
 pkgname=qsvn
 pkgver=0.8.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Qt4 GUI for Subversion."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.anrichter.net/projects/qsvn/"
 license=('GPL')
-depends=('qt' 'subversion')
-makedepends=('cmake')
-#options=('!makeflags')
-source=("http://www.anrichter.net/projects/qsvn/chrome/site/$pkgname-$pkgver-src.tar.gz"
-        'lib64-fix.patch')
-md5sums=('cfdc9dab7c5f1cbf20b249901e10c04e'
-         'f2833303f01331538d1f6f2150b58e4f')
+depends=('qt4' 'subversion')
+makedepends=('cmake' 'patch')
+changelog=$pkgname.changelog
+source=(http://www.anrichter.net/projects/qsvn/chrome/site/$pkgname-$pkgver-src.tar.gz
+        lib64-fix.patch)
+sha256sums=('8396f667dc7f09de2eead056608e90febb089fc26529b7fcebe157797c320f73'
+            '6a2787b5852825aaccd50ad7b20983af859378d86b86aaf550bf4e1bfcc96c3e')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver/src
+  cd "${srcdir}/$pkgname-$pkgver/src"
 
   patch -Np2 -i "${srcdir}/lib64-fix.patch"
 
@@ -27,11 +27,11 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver/src
+  cd "${srcdir}/$pkgname-$pkgver/src"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 
   #desktop file
-  install -D -m644 ${srcdir}/$pkgname-$pkgver/src/$pkgname.desktop \
-    ${pkgdir}/usr/share/applications/$pkgname.desktop
+  install -D -m644 "${srcdir}/$pkgname-$pkgver/src/$pkgname.desktop" \
+    "${pkgdir}/usr/share/applications/$pkgname.desktop"
 }
diff --git a/community/qsvn/qsvn.changelog b/community/qsvn/qsvn.changelog
new file mode 100644
index 000000000..21fac1c11
--- /dev/null
+++ b/community/qsvn/qsvn.changelog
@@ -0,0 +1,32 @@
+2009-05-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.8.2
+	* Release info:
+	http://www.anrichter.net/projects/qsvn/wiki/Releases/ReleaseNotes-0.8.2
+
+2008-12-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.8.1
+	* Release info:
+	http://www.anrichter.net/projects/qsvn/wiki/ReleaseNotes-0.8.1
+
+2008-12-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.8.0
+	* Release info:
+	http://www.anrichter.net/projects/qsvn/wiki/ReleaseNotes-0.8.0
+
+2008-10-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.7.1
+
+2008-08-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.7.0
+	* Release info:
+	http://www.anrichter.net/projects/qsvn/wiki/ReleaseNotes-0.7.0
+
+2008-07-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Fixed bug FS#10914
+
+2008-03-27 JJDaNiMoTh <jjdanimoth@gmail.com>
+	* Replaced qt4 with qt as depend
+
+2007-12-19 Georg Grabler (STiAT) <ggrabler@gmail.com>
+	* Updated to major release 0.6.0
+
diff --git a/community/qsynergy/PKGBUILD b/community/qsynergy/PKGBUILD
index e8a5fb71b..1e6262bb0 100644
--- a/community/qsynergy/PKGBUILD
+++ b/community/qsynergy/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 60949 2011-12-19 19:01:11Z tredaelli $
+# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: mutlu_inek <mutlu_inek@yahoo.de>
 
 pkgname=qsynergy
 pkgver=0.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt gui for Synergy which lets you remotely control other computers."
 url="http://www.volker-lanz.de/en/software/qsynergy/"
 license=(GPL)
 arch=('i686' 'x86_64' 'mips64el')
-depends=('qt' 'synergy')
+depends=('qt4' 'synergy')
 source=("http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz")
 md5sums=('17d8989668016185b859332aacf9e7df')
 
 build() {
    cd "$srcdir/$pkgname-$pkgver"
-   qmake
+   qmake-qt4
    make
 }
 
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 4e24a084b..4ec09ea8e 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83450 2013-02-01 10:16:55Z svenstaro $
+# $Id: PKGBUILD 86795 2013-03-22 10:46:14Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -6,44 +6,48 @@
 # Contributor: thotypous <matiasΘarchlinux-br·org>
 # Contributor: delor <bartekpiech gmail com>
 
-pkgname="qtcreator"
-pkgver=2.6.2
-_pkgver=2.6.2
+pkgname=qtcreator
+pkgver=2.7.0
+_pkgver=2.7.0
 pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url='http://qt-project.org'
 license=('LGPL')
-depends=('qt')
-makedepends=('qt-private-headers' 'git')
+depends=('qt5-quick1' 'qt5-tools')
+makedepends=('git')
 options=('docs')
-optdepends=('qt-doc: for the integrated Qt documentation'
+optdepends=('qt5-doc: for the integrated Qt documentation'
             'gdb: for the debugger'
-            'cmake: for cmake project suppport'
+            'cmake: for cmake project support'
             'openssh-askpass: for ssh support'
             'git: for git support'
             'mercurial: for mercurial support'
             'bzr: for bazaar support'
             'valgrind: for analyze support')
 install=qtcreator.install
-source=("http://origin.releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz"
-        'qtcreator.desktop')
-md5sums=('4700deb89e8cf92239015d7d70f0dcdd'
-         '82888d4be900e7833d768050a135cd37')
+source=("http://releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz"
+        'qtcreator.desktop'
+        'fix-build.patch')
+md5sums=('7bf25d211ff8babea47c2034f1b93d08'
+         '82888d4be900e7833d768050a135cd37'
+         '4087c00d853addf97ca329d304e9a0a5')
 
 build() {
-  cd ${srcdir}
+  cd qt-creator-${_pkgver}-src
+  patch -p1 -i "${srcdir}"/fix-build.patch
+  cd ../
 
   [[ -d build ]] && rm -r build
   mkdir build && cd build
 
-  qmake ${srcdir}/qt-creator-${_pkgver}-src/qtcreator.pro
+  qmake ../qt-creator-${_pkgver}-src/qtcreator.pro
   make
   make docs -j1
 }
 
 package() {
-  cd ${srcdir}/build
+  cd build
 
   make INSTALL_ROOT="${pkgdir}/usr/" install
   make INSTALL_ROOT="${pkgdir}/usr/" install_docs
diff --git a/community/qtcreator/fix-build.patch b/community/qtcreator/fix-build.patch
new file mode 100644
index 000000000..5cf2a503b
--- /dev/null
+++ b/community/qtcreator/fix-build.patch
@@ -0,0 +1,10 @@
+--- qt-creator-2.6.2-src/qtcreator.pri~	2013-02-27 13:55:23.818990553 +0000
++++ qt-creator-2.6.2-src/qtcreator.pri	2013-02-27 13:55:52.335454428 +0000
+@@ -147,6 +147,7 @@
+ }
+ 
+ INCLUDEPATH += \
++    /usr/include \
+     $$IDE_BUILD_TREE/src \ # for <app/app_version.h>
+     $$IDE_SOURCE_TREE/src/libs \
+     $$IDE_SOURCE_TREE/tools \
diff --git a/community/qtcreator/fix-glsl-shit.patch b/community/qtcreator/fix-glsl-shit.patch
deleted file mode 100644
index 4b5e504e1..000000000
--- a/community/qtcreator/fix-glsl-shit.patch
+++ /dev/null
@@ -1,2376 +0,0 @@
-From e91045469d59c35607faa344bcfba2b2c566da51 Mon Sep 17 00:00:00 2001
-From: Christian Kamm <christian.d.kamm@nokia.com>
-Date: Mon, 6 Aug 2012 11:29:55 +0200
-Subject: [PATCH] GLSL: Fix recovery token order to avoid infinite loop.
-
-The case 'a = b ? ;' recovered with T_NUMBER, T_COMMA, T_NUMBER, ...
-
-Task-number: QTCREATORBUG-7517
-Change-Id: I3546266b21d11ce08e4af1331be94a78d3b24c19
-Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
----
- src/libs/glsl/glsl.g         |    4 +-
- src/libs/glsl/glslparser.cpp |  638 +++++++++++++++++++++---------------------
- src/libs/glsl/glslparser.h   |    2 +-
- 3 files changed, 322 insertions(+), 322 deletions(-)
-
-diff --git a/src/libs/glsl/glsl.g b/src/libs/glsl/glsl.g
-index 67f564c..3c6ae7c 100644
---- a/src/libs/glsl/glsl.g
-+++ b/src/libs/glsl/glsl.g
-@@ -456,7 +456,7 @@ private:
- #include <iostream>
- #include <cstdio>
- #include <cassert>
--#include <QtCore/QDebug>
-+#include <QDebug>
- 
- using namespace GLSL;
- 
-@@ -591,7 +591,7 @@ AST *Parser::parse(int startToken)
- 
-                 static int tks[] = {
-                     T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET,
--                    T_SEMICOLON, T_COMMA, T_COLON,
-+                    T_SEMICOLON, T_COLON, T_COMMA,
-                     T_NUMBER, T_TYPE_NAME, T_IDENTIFIER,
-                     T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET,
-                     T_WHILE,
-diff --git a/src/libs/glsl/glslparser.cpp b/src/libs/glsl/glslparser.cpp
-index cf4bbe4..d82096b 100644
---- a/src/libs/glsl/glslparser.cpp
-+++ b/src/libs/glsl/glslparser.cpp
-@@ -1,5 +1,5 @@
- 
--#line 427 "./glsl.g"
-+#line 423 "./glsl.g"
- 
- /**************************************************************************
- **
-@@ -171,7 +171,7 @@ AST *Parser::parse(int startToken)
- 
-                 static int tks[] = {
-                     T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET,
--                    T_SEMICOLON, T_COMMA, T_COLON,
-+                    T_SEMICOLON, T_COLON, T_COMMA,
-                     T_NUMBER, T_TYPE_NAME, T_IDENTIFIER,
-                     T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET,
-                     T_WHILE,
-@@ -215,137 +215,137 @@ AST *Parser::parse(int startToken)
-     return 0;
- }
- 
--#line 647 "./glsl.g"
-+#line 641 "./glsl.g"
- 
- void Parser::reduce(int ruleno)
- {
- switch(ruleno) {
- 
--#line 656 "./glsl.g"
-+#line 650 "./glsl.g"
- 
- case 0: {
-     ast(1) = makeAstNode<IdentifierExpressionAST>(string(1));
- }   break;
- 
--#line 663 "./glsl.g"
-+#line 657 "./glsl.g"
- 
- case 1: {
-     ast(1) = makeAstNode<LiteralExpressionAST>(string(1));
- }   break;
- 
--#line 670 "./glsl.g"
-+#line 664 "./glsl.g"
- 
- case 2: {
-     ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("true", 4));
- }   break;
- 
--#line 677 "./glsl.g"
-+#line 671 "./glsl.g"
- 
- case 3: {
-     ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("false", 5));
- }   break;
- 
--#line 684 "./glsl.g"
-+#line 678 "./glsl.g"
- 
- case 4: {
-     // nothing to do.
- }   break;
- 
--#line 691 "./glsl.g"
-+#line 685 "./glsl.g"
- 
- case 5: {
-     ast(1) = ast(2);
- }   break;
- 
--#line 698 "./glsl.g"
-+#line 692 "./glsl.g"
- 
- case 6: {
-     // nothing to do.
- }   break;
- 
--#line 705 "./glsl.g"
-+#line 699 "./glsl.g"
- 
- case 7: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ArrayAccess, expression(1), expression(3));
- }   break;
- 
--#line 712 "./glsl.g"
-+#line 706 "./glsl.g"
- 
- case 8: {
-     // nothing to do.
- }   break;
- 
--#line 719 "./glsl.g"
-+#line 713 "./glsl.g"
- 
- case 9: {
-     ast(1) = makeAstNode<MemberAccessExpressionAST>(expression(1), string(3));
- }   break;
- 
--#line 726 "./glsl.g"
-+#line 720 "./glsl.g"
- 
- case 10: {
-     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostIncrement, expression(1));
- }   break;
- 
--#line 733 "./glsl.g"
-+#line 727 "./glsl.g"
- 
- case 11: {
-     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostDecrement, expression(1));
- }   break;
- 
--#line 740 "./glsl.g"
-+#line 734 "./glsl.g"
- 
- case 12: {
-     // nothing to do.
- }   break;
- 
--#line 747 "./glsl.g"
-+#line 741 "./glsl.g"
- 
- case 13: {
-     // nothing to do.
- }   break;
- 
--#line 754 "./glsl.g"
-+#line 748 "./glsl.g"
- 
- case 14: {
-     ast(1) = makeAstNode<FunctionCallExpressionAST>
-         (sym(1).function.id, sym(1).function.arguments);
- }   break;
- 
--#line 762 "./glsl.g"
-+#line 756 "./glsl.g"
- 
- case 15: {
-     ast(1) = makeAstNode<FunctionCallExpressionAST>
-         (expression(1), sym(3).function.id, sym(3).function.arguments);
- }   break;
- 
--#line 770 "./glsl.g"
-+#line 764 "./glsl.g"
- 
- case 16: {
-     // nothing to do.
- }   break;
- 
--#line 777 "./glsl.g"
-+#line 771 "./glsl.g"
- 
- case 17: {
-     // nothing to do.
- }   break;
- 
--#line 784 "./glsl.g"
-+#line 778 "./glsl.g"
- 
- case 18: {
-     sym(1).function.id = sym(1).function_identifier;
-     sym(1).function.arguments = 0;
- }   break;
- 
--#line 792 "./glsl.g"
-+#line 786 "./glsl.g"
- 
- case 19: {
-     sym(1).function.id = sym(1).function_identifier;
-     sym(1).function.arguments = 0;
- }   break;
- 
--#line 800 "./glsl.g"
-+#line 794 "./glsl.g"
- 
- case 20: {
-     sym(1).function.id = sym(1).function_identifier;
-@@ -353,7 +353,7 @@ case 20: {
-         makeAstNode< List<ExpressionAST *> >(expression(2));
- }   break;
- 
--#line 809 "./glsl.g"
-+#line 803 "./glsl.g"
- 
- case 21: {
-     sym(1).function.arguments =
-@@ -361,379 +361,379 @@ case 21: {
-             (sym(1).function.arguments, expression(3));
- }   break;
- 
--#line 818 "./glsl.g"
-+#line 812 "./glsl.g"
- 
- case 22: {
-     // nothing to do.
- }   break;
- 
--#line 825 "./glsl.g"
-+#line 819 "./glsl.g"
- 
- case 23: {
-     ast(1) = makeAstNode<FunctionIdentifierAST>(type(1));
- }   break;
- 
--#line 832 "./glsl.g"
-+#line 826 "./glsl.g"
- 
- case 24: {
-     ast(1) = makeAstNode<FunctionIdentifierAST>(string(1));
- }   break;
- 
--#line 839 "./glsl.g"
-+#line 833 "./glsl.g"
- 
- case 25: {
-     // nothing to do.
- }   break;
- 
--#line 846 "./glsl.g"
-+#line 840 "./glsl.g"
- 
- case 26: {
-     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreIncrement, expression(2));
- }   break;
- 
--#line 853 "./glsl.g"
-+#line 847 "./glsl.g"
- 
- case 27: {
-     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreDecrement, expression(2));
- }   break;
- 
--#line 860 "./glsl.g"
-+#line 854 "./glsl.g"
- 
- case 28: {
-     ast(1) = makeAstNode<UnaryExpressionAST>(sym(1).kind, expression(2));
- }   break;
- 
--#line 867 "./glsl.g"
-+#line 861 "./glsl.g"
- 
- case 29: {
-     sym(1).kind = AST::Kind_UnaryPlus;
- }   break;
- 
--#line 874 "./glsl.g"
-+#line 868 "./glsl.g"
- 
- case 30: {
-     sym(1).kind = AST::Kind_UnaryMinus;
- }   break;
- 
--#line 881 "./glsl.g"
-+#line 875 "./glsl.g"
- 
- case 31: {
-     sym(1).kind = AST::Kind_LogicalNot;
- }   break;
- 
--#line 888 "./glsl.g"
-+#line 882 "./glsl.g"
- 
- case 32: {
-     sym(1).kind = AST::Kind_BitwiseNot;
- }   break;
- 
--#line 895 "./glsl.g"
-+#line 889 "./glsl.g"
- 
- case 33: {
-     // nothing to do.
- }   break;
- 
--#line 902 "./glsl.g"
-+#line 896 "./glsl.g"
- 
- case 34: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Multiply, expression(1), expression(3));
- }   break;
- 
--#line 909 "./glsl.g"
-+#line 903 "./glsl.g"
- 
- case 35: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Divide, expression(1), expression(3));
- }   break;
- 
--#line 916 "./glsl.g"
-+#line 910 "./glsl.g"
- 
- case 36: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Modulus, expression(1), expression(3));
- }   break;
- 
--#line 923 "./glsl.g"
-+#line 917 "./glsl.g"
- 
- case 37: {
-     // nothing to do.
- }   break;
- 
--#line 930 "./glsl.g"
-+#line 924 "./glsl.g"
- 
- case 38: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Plus, expression(1), expression(3));
- }   break;
- 
--#line 937 "./glsl.g"
-+#line 931 "./glsl.g"
- 
- case 39: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Minus, expression(1), expression(3));
- }   break;
- 
--#line 944 "./glsl.g"
-+#line 938 "./glsl.g"
- 
- case 40: {
-     // nothing to do.
- }   break;
- 
--#line 951 "./glsl.g"
-+#line 945 "./glsl.g"
- 
- case 41: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftLeft, expression(1), expression(3));
- }   break;
- 
--#line 958 "./glsl.g"
-+#line 952 "./glsl.g"
- 
- case 42: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftRight, expression(1), expression(3));
- }   break;
- 
--#line 965 "./glsl.g"
-+#line 959 "./glsl.g"
- 
- case 43: {
-     // nothing to do.
- }   break;
- 
--#line 972 "./glsl.g"
-+#line 966 "./glsl.g"
- 
- case 44: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessThan, expression(1), expression(3));
- }   break;
- 
--#line 979 "./glsl.g"
-+#line 973 "./glsl.g"
- 
- case 45: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterThan, expression(1), expression(3));
- }   break;
- 
--#line 986 "./glsl.g"
-+#line 980 "./glsl.g"
- 
- case 46: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessEqual, expression(1), expression(3));
- }   break;
- 
--#line 993 "./glsl.g"
-+#line 987 "./glsl.g"
- 
- case 47: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterEqual, expression(1), expression(3));
- }   break;
- 
--#line 1000 "./glsl.g"
-+#line 994 "./glsl.g"
- 
- case 48: {
-     // nothing to do.
- }   break;
- 
--#line 1007 "./glsl.g"
-+#line 1001 "./glsl.g"
- 
- case 49: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Equal, expression(1), expression(3));
- }   break;
- 
--#line 1014 "./glsl.g"
-+#line 1008 "./glsl.g"
- 
- case 50: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_NotEqual, expression(1), expression(3));
- }   break;
- 
--#line 1021 "./glsl.g"
-+#line 1015 "./glsl.g"
- 
- case 51: {
-     // nothing to do.
- }   break;
- 
--#line 1028 "./glsl.g"
-+#line 1022 "./glsl.g"
- 
- case 52: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseAnd, expression(1), expression(3));
- }   break;
- 
--#line 1035 "./glsl.g"
-+#line 1029 "./glsl.g"
- 
- case 53: {
-     // nothing to do.
- }   break;
- 
--#line 1042 "./glsl.g"
-+#line 1036 "./glsl.g"
- 
- case 54: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseXor, expression(1), expression(3));
- }   break;
- 
--#line 1049 "./glsl.g"
-+#line 1043 "./glsl.g"
- 
- case 55: {
-     // nothing to do.
- }   break;
- 
--#line 1056 "./glsl.g"
-+#line 1050 "./glsl.g"
- 
- case 56: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseOr, expression(1), expression(3));
- }   break;
- 
--#line 1063 "./glsl.g"
-+#line 1057 "./glsl.g"
- 
- case 57: {
-     // nothing to do.
- }   break;
- 
--#line 1070 "./glsl.g"
-+#line 1064 "./glsl.g"
- 
- case 58: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalAnd, expression(1), expression(3));
- }   break;
- 
--#line 1077 "./glsl.g"
-+#line 1071 "./glsl.g"
- 
- case 59: {
-     // nothing to do.
- }   break;
- 
--#line 1084 "./glsl.g"
-+#line 1078 "./glsl.g"
- 
- case 60: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalXor, expression(1), expression(3));
- }   break;
- 
--#line 1091 "./glsl.g"
-+#line 1085 "./glsl.g"
- 
- case 61: {
-     // nothing to do.
- }   break;
- 
--#line 1098 "./glsl.g"
-+#line 1092 "./glsl.g"
- 
- case 62: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalOr, expression(1), expression(3));
- }   break;
- 
--#line 1105 "./glsl.g"
-+#line 1099 "./glsl.g"
- 
- case 63: {
-     // nothing to do.
- }   break;
- 
--#line 1112 "./glsl.g"
-+#line 1106 "./glsl.g"
- 
- case 64: {
-     ast(1) = makeAstNode<TernaryExpressionAST>(AST::Kind_Conditional, expression(1), expression(3), expression(5));
- }   break;
- 
--#line 1119 "./glsl.g"
-+#line 1113 "./glsl.g"
- 
- case 65: {
-     // nothing to do.
- }   break;
- 
--#line 1126 "./glsl.g"
-+#line 1120 "./glsl.g"
- 
- case 66: {
-     ast(1) = makeAstNode<AssignmentExpressionAST>(sym(2).kind, expression(1), expression(3));
- }   break;
- 
--#line 1133 "./glsl.g"
-+#line 1127 "./glsl.g"
- 
- case 67: {
-     sym(1).kind = AST::Kind_Assign;
- }   break;
- 
--#line 1140 "./glsl.g"
-+#line 1134 "./glsl.g"
- 
- case 68: {
-     sym(1).kind = AST::Kind_AssignMultiply;
- }   break;
- 
--#line 1147 "./glsl.g"
-+#line 1141 "./glsl.g"
- 
- case 69: {
-     sym(1).kind = AST::Kind_AssignDivide;
- }   break;
- 
--#line 1154 "./glsl.g"
-+#line 1148 "./glsl.g"
- 
- case 70: {
-     sym(1).kind = AST::Kind_AssignModulus;
- }   break;
- 
--#line 1161 "./glsl.g"
-+#line 1155 "./glsl.g"
- 
- case 71: {
-     sym(1).kind = AST::Kind_AssignPlus;
- }   break;
- 
--#line 1168 "./glsl.g"
-+#line 1162 "./glsl.g"
- 
- case 72: {
-     sym(1).kind = AST::Kind_AssignMinus;
- }   break;
- 
--#line 1175 "./glsl.g"
-+#line 1169 "./glsl.g"
- 
- case 73: {
-     sym(1).kind = AST::Kind_AssignShiftLeft;
- }   break;
- 
--#line 1182 "./glsl.g"
-+#line 1176 "./glsl.g"
- 
- case 74: {
-     sym(1).kind = AST::Kind_AssignShiftRight;
- }   break;
- 
--#line 1189 "./glsl.g"
-+#line 1183 "./glsl.g"
- 
- case 75: {
-     sym(1).kind = AST::Kind_AssignAnd;
- }   break;
- 
--#line 1196 "./glsl.g"
-+#line 1190 "./glsl.g"
- 
- case 76: {
-     sym(1).kind = AST::Kind_AssignXor;
- }   break;
- 
--#line 1203 "./glsl.g"
-+#line 1197 "./glsl.g"
- 
- case 77: {
-     sym(1).kind = AST::Kind_AssignOr;
- }   break;
- 
--#line 1210 "./glsl.g"
-+#line 1204 "./glsl.g"
- 
- case 78: {
-     // nothing to do.
- }   break;
- 
--#line 1217 "./glsl.g"
-+#line 1211 "./glsl.g"
- 
- case 79: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Comma, expression(1), expression(3));
- }   break;
- 
--#line 1224 "./glsl.g"
-+#line 1218 "./glsl.g"
- 
- case 80: {
-     // nothing to do.
- }   break;
- 
--#line 1231 "./glsl.g"
-+#line 1225 "./glsl.g"
- 
- case 81: {
-     // nothing to do.
- }   break;
- 
--#line 1238 "./glsl.g"
-+#line 1232 "./glsl.g"
- 
- case 82: {
-     ast(1) = makeAstNode<InitDeclarationAST>(sym(1).declaration_list);
- }   break;
- 
--#line 1245 "./glsl.g"
-+#line 1239 "./glsl.g"
- 
- case 83: {
-     ast(1) = makeAstNode<PrecisionDeclarationAST>(sym(2).precision, type(3));
- }   break;
- 
--#line 1252 "./glsl.g"
-+#line 1246 "./glsl.g"
- 
- case 84: {
-     if (sym(1).type_qualifier.qualifier != QualifiedTypeAST::Struct) {
-@@ -743,7 +743,7 @@ case 84: {
-     ast(1) = makeAstNode<TypeDeclarationAST>(type);
- }   break;
- 
--#line 1263 "./glsl.g"
-+#line 1257 "./glsl.g"
- 
- case 85: {
-     if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) {
-@@ -761,7 +761,7 @@ case 85: {
-          makeAstNode<VariableDeclarationAST>(qualtype, string(6)));
- }   break;
- 
--#line 1282 "./glsl.g"
-+#line 1276 "./glsl.g"
- 
- case 86: {
-     if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) {
-@@ -780,7 +780,7 @@ case 86: {
-             (makeAstNode<ArrayTypeAST>(qualtype), string(6)));
- }   break;
- 
--#line 1302 "./glsl.g"
-+#line 1296 "./glsl.g"
- 
- case 87: {
-     if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) {
-@@ -799,7 +799,7 @@ case 87: {
-             (makeAstNode<ArrayTypeAST>(qualtype, expression(8)), string(6)));
- }   break;
- 
--#line 1322 "./glsl.g"
-+#line 1316 "./glsl.g"
- 
- case 88: {
-     TypeAST *type = makeAstNode<QualifiedTypeAST>
-@@ -808,59 +808,59 @@ case 88: {
-     ast(1) = makeAstNode<TypeDeclarationAST>(type);
- }   break;
- 
--#line 1332 "./glsl.g"
-+#line 1326 "./glsl.g"
- 
- case 89: {
-     function(1)->finishParams();
- }   break;
- 
--#line 1339 "./glsl.g"
-+#line 1333 "./glsl.g"
- 
- case 90: {
-     // nothing to do.
- }   break;
- 
--#line 1346 "./glsl.g"
-+#line 1340 "./glsl.g"
- 
- case 91: {
-     // nothing to do.
- }   break;
- 
--#line 1353 "./glsl.g"
-+#line 1347 "./glsl.g"
- 
- case 92: {
-     function(1)->params = makeAstNode< List<ParameterDeclarationAST *> >
-         (sym(2).param_declaration);
- }   break;
- 
--#line 1361 "./glsl.g"
-+#line 1355 "./glsl.g"
- 
- case 93: {
-     function(1)->params = makeAstNode< List<ParameterDeclarationAST *> >
-         (function(1)->params, sym(3).param_declaration);
- }   break;
- 
--#line 1369 "./glsl.g"
-+#line 1363 "./glsl.g"
- 
- case 94: {
-     function(1) = makeAstNode<FunctionDeclarationAST>(type(1), string(2));
- }   break;
- 
--#line 1376 "./glsl.g"
-+#line 1370 "./glsl.g"
- 
- case 95: {
-     sym(1).param_declarator.type = type(1);
-     sym(1).param_declarator.name = string(2);
- }   break;
- 
--#line 1384 "./glsl.g"
-+#line 1378 "./glsl.g"
- 
- case 96: {
-     sym(1).param_declarator.type = makeAstNode<ArrayTypeAST>(type(1), expression(4));
-     sym(1).param_declarator.name = string(2);
- }   break;
- 
--#line 1392 "./glsl.g"
-+#line 1386 "./glsl.g"
- 
- case 97: {
-     ast(1) = makeAstNode<ParameterDeclarationAST>
-@@ -871,7 +871,7 @@ case 97: {
-          sym(3).param_declarator.name);
- }   break;
- 
--#line 1404 "./glsl.g"
-+#line 1398 "./glsl.g"
- 
- case 98: {
-     ast(1) = makeAstNode<ParameterDeclarationAST>
-@@ -880,7 +880,7 @@ case 98: {
-          sym(2).param_declarator.name);
- }   break;
- 
--#line 1414 "./glsl.g"
-+#line 1408 "./glsl.g"
- 
- case 99: {
-     ast(1) = makeAstNode<ParameterDeclarationAST>
-@@ -890,7 +890,7 @@ case 99: {
-          (const QString *)0);
- }   break;
- 
--#line 1425 "./glsl.g"
-+#line 1419 "./glsl.g"
- 
- case 100: {
-     ast(1) = makeAstNode<ParameterDeclarationAST>
-@@ -898,44 +898,44 @@ case 100: {
-          (const QString *)0);
- }   break;
- 
--#line 1434 "./glsl.g"
-+#line 1428 "./glsl.g"
- 
- case 101: {
-     sym(1).qualifier = ParameterDeclarationAST::In;
- }   break;
- 
--#line 1441 "./glsl.g"
-+#line 1435 "./glsl.g"
- 
- case 102: {
-     sym(1).qualifier = ParameterDeclarationAST::In;
- }   break;
- 
--#line 1448 "./glsl.g"
-+#line 1442 "./glsl.g"
- 
- case 103: {
-     sym(1).qualifier = ParameterDeclarationAST::Out;
- }   break;
- 
--#line 1455 "./glsl.g"
-+#line 1449 "./glsl.g"
- 
- case 104: {
-     sym(1).qualifier = ParameterDeclarationAST::InOut;
- }   break;
- 
--#line 1462 "./glsl.g"
-+#line 1456 "./glsl.g"
- 
- case 105: {
-     // nothing to do.
- }   break;
- 
--#line 1469 "./glsl.g"
-+#line 1463 "./glsl.g"
- 
- case 106: {
-     sym(1).declaration_list = makeAstNode< List<DeclarationAST *> >
-         (sym(1).declaration);
- }   break;
- 
--#line 1477 "./glsl.g"
-+#line 1471 "./glsl.g"
- 
- case 107: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -944,7 +944,7 @@ case 107: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1487 "./glsl.g"
-+#line 1481 "./glsl.g"
- 
- case 108: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -954,7 +954,7 @@ case 108: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1498 "./glsl.g"
-+#line 1492 "./glsl.g"
- 
- case 109: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -964,7 +964,7 @@ case 109: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1509 "./glsl.g"
-+#line 1503 "./glsl.g"
- 
- case 110: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -975,7 +975,7 @@ case 110: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1521 "./glsl.g"
-+#line 1515 "./glsl.g"
- 
- case 111: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -986,7 +986,7 @@ case 111: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1533 "./glsl.g"
-+#line 1527 "./glsl.g"
- 
- case 112: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -996,40 +996,40 @@ case 112: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1544 "./glsl.g"
-+#line 1538 "./glsl.g"
- 
- case 113: {
-     ast(1) = makeAstNode<TypeDeclarationAST>(type(1));
- }   break;
- 
--#line 1551 "./glsl.g"
-+#line 1545 "./glsl.g"
- 
- case 114: {
-     ast(1) = makeAstNode<VariableDeclarationAST>(type(1), string(2));
- }   break;
- 
--#line 1558 "./glsl.g"
-+#line 1552 "./glsl.g"
- 
- case 115: {
-     ast(1) = makeAstNode<VariableDeclarationAST>
-         (makeAstNode<ArrayTypeAST>(type(1)), string(2));
- }   break;
- 
--#line 1566 "./glsl.g"
-+#line 1560 "./glsl.g"
- 
- case 116: {
-     ast(1) = makeAstNode<VariableDeclarationAST>
-         (makeAstNode<ArrayTypeAST>(type(1), expression(4)), string(2));
- }   break;
- 
--#line 1574 "./glsl.g"
-+#line 1568 "./glsl.g"
- 
- case 117: {
-     ast(1) = makeAstNode<VariableDeclarationAST>
-         (makeAstNode<ArrayTypeAST>(type(1)), string(2), expression(6));
- }   break;
- 
--#line 1582 "./glsl.g"
-+#line 1576 "./glsl.g"
- 
- case 118: {
-     ast(1) = makeAstNode<VariableDeclarationAST>
-@@ -1037,26 +1037,26 @@ case 118: {
-          string(2), expression(7));
- }   break;
- 
--#line 1591 "./glsl.g"
-+#line 1585 "./glsl.g"
- 
- case 119: {
-     ast(1) = makeAstNode<VariableDeclarationAST>
-         (type(1), string(2), expression(4));
- }   break;
- 
--#line 1599 "./glsl.g"
-+#line 1593 "./glsl.g"
- 
- case 120: {
-     ast(1) = makeAstNode<InvariantDeclarationAST>(string(2));
- }   break;
- 
--#line 1606 "./glsl.g"
-+#line 1600 "./glsl.g"
- 
- case 121: {
-     ast(1) = makeAstNode<QualifiedTypeAST>(0, type(1), (List<LayoutQualifierAST *> *)0);
- }   break;
- 
--#line 1613 "./glsl.g"
-+#line 1607 "./glsl.g"
- 
- case 122: {
-     ast(1) = makeAstNode<QualifiedTypeAST>
-@@ -1064,207 +1064,207 @@ case 122: {
-          sym(1).type_qualifier.layout_list);
- }   break;
- 
--#line 1622 "./glsl.g"
-+#line 1616 "./glsl.g"
- 
- case 123: {
-     sym(1).qualifier = QualifiedTypeAST::Invariant;
- }   break;
- 
--#line 1629 "./glsl.g"
-+#line 1623 "./glsl.g"
- 
- case 124: {
-     sym(1).qualifier = QualifiedTypeAST::Smooth;
- }   break;
- 
--#line 1636 "./glsl.g"
-+#line 1630 "./glsl.g"
- 
- case 125: {
-     sym(1).qualifier = QualifiedTypeAST::Flat;
- }   break;
- 
--#line 1643 "./glsl.g"
-+#line 1637 "./glsl.g"
- 
- case 126: {
-     sym(1).qualifier = QualifiedTypeAST::NoPerspective;
- }   break;
- 
--#line 1650 "./glsl.g"
-+#line 1644 "./glsl.g"
- 
- case 127: {
-     sym(1) = sym(3);
- }   break;
- 
--#line 1657 "./glsl.g"
-+#line 1651 "./glsl.g"
- 
- case 128: {
-     sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout);
- }   break;
- 
--#line 1664 "./glsl.g"
-+#line 1658 "./glsl.g"
- 
- case 129: {
-     sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout_list, sym(3).layout);
- }   break;
- 
--#line 1671 "./glsl.g"
-+#line 1665 "./glsl.g"
- 
- case 130: {
-     sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), (const QString *)0);
- }   break;
- 
--#line 1678 "./glsl.g"
-+#line 1672 "./glsl.g"
- 
- case 131: {
-     sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), string(3));
- }   break;
- 
--#line 1685 "./glsl.g"
-+#line 1679 "./glsl.g"
- 
- case 132: {
-     sym(1).qualifier = QualifiedTypeAST::Const;
- }   break;
- 
--#line 1692 "./glsl.g"
-+#line 1686 "./glsl.g"
- 
- case 133: {
-     sym(1).type_qualifier.qualifier = sym(1).qualifier;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1700 "./glsl.g"
-+#line 1694 "./glsl.g"
- 
- case 134: {
-     sym(1).type_qualifier.layout_list = sym(1).layout_list;
-     sym(1).type_qualifier.qualifier = 0;
- }   break;
- 
--#line 1708 "./glsl.g"
-+#line 1702 "./glsl.g"
- 
- case 135: {
-     sym(1).type_qualifier.layout_list = sym(1).layout_list;
-     sym(1).type_qualifier.qualifier = sym(2).qualifier;
- }   break;
- 
--#line 1716 "./glsl.g"
-+#line 1710 "./glsl.g"
- 
- case 136: {
-     sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1724 "./glsl.g"
-+#line 1718 "./glsl.g"
- 
- case 137: {
-     sym(1).type_qualifier.qualifier = sym(1).qualifier;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1732 "./glsl.g"
-+#line 1726 "./glsl.g"
- 
- case 138: {
-     sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1740 "./glsl.g"
-+#line 1734 "./glsl.g"
- 
- case 139: {
-     sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier | sym(3).qualifier;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1748 "./glsl.g"
-+#line 1742 "./glsl.g"
- 
- case 140: {
-     sym(1).type_qualifier.qualifier = QualifiedTypeAST::Invariant;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1756 "./glsl.g"
-+#line 1750 "./glsl.g"
- 
- case 141: {
-     sym(1).qualifier = QualifiedTypeAST::Const;
- }   break;
- 
--#line 1763 "./glsl.g"
-+#line 1757 "./glsl.g"
- 
- case 142: {
-     sym(1).qualifier = QualifiedTypeAST::Attribute;
- }   break;
- 
--#line 1770 "./glsl.g"
-+#line 1764 "./glsl.g"
- 
- case 143: {
-     sym(1).qualifier = QualifiedTypeAST::Varying;
- }   break;
- 
--#line 1777 "./glsl.g"
-+#line 1771 "./glsl.g"
- 
- case 144: {
-     sym(1).qualifier = QualifiedTypeAST::CentroidVarying;
- }   break;
- 
--#line 1784 "./glsl.g"
-+#line 1778 "./glsl.g"
- 
- case 145: {
-     sym(1).qualifier = QualifiedTypeAST::In;
- }   break;
- 
--#line 1791 "./glsl.g"
-+#line 1785 "./glsl.g"
- 
- case 146: {
-     sym(1).qualifier = QualifiedTypeAST::Out;
- }   break;
- 
--#line 1798 "./glsl.g"
-+#line 1792 "./glsl.g"
- 
- case 147: {
-     sym(1).qualifier = QualifiedTypeAST::CentroidIn;
- }   break;
- 
--#line 1805 "./glsl.g"
-+#line 1799 "./glsl.g"
- 
- case 148: {
-     sym(1).qualifier = QualifiedTypeAST::CentroidOut;
- }   break;
- 
--#line 1812 "./glsl.g"
-+#line 1806 "./glsl.g"
- 
- case 149: {
-     sym(1).qualifier = QualifiedTypeAST::PatchIn;
- }   break;
- 
--#line 1819 "./glsl.g"
-+#line 1813 "./glsl.g"
- 
- case 150: {
-     sym(1).qualifier = QualifiedTypeAST::PatchOut;
- }   break;
- 
--#line 1826 "./glsl.g"
-+#line 1820 "./glsl.g"
- 
- case 151: {
-     sym(1).qualifier = QualifiedTypeAST::SampleIn;
- }   break;
- 
--#line 1833 "./glsl.g"
-+#line 1827 "./glsl.g"
- 
- case 152: {
-     sym(1).qualifier = QualifiedTypeAST::SampleOut;
- }   break;
- 
--#line 1840 "./glsl.g"
-+#line 1834 "./glsl.g"
- 
- case 153: {
-     sym(1).qualifier = QualifiedTypeAST::Uniform;
- }   break;
- 
--#line 1847 "./glsl.g"
-+#line 1841 "./glsl.g"
- 
- case 154: {
-     // nothing to do.
- }   break;
- 
--#line 1854 "./glsl.g"
-+#line 1848 "./glsl.g"
- 
- case 155: {
-     if (!type(2)->setPrecision(sym(1).precision)) {
-@@ -1273,595 +1273,595 @@ case 155: {
-     ast(1) = type(2);
- }   break;
- 
--#line 1864 "./glsl.g"
-+#line 1858 "./glsl.g"
- 
- case 156: {
-     // nothing to do.
- }   break;
- 
--#line 1871 "./glsl.g"
-+#line 1865 "./glsl.g"
- 
- case 157: {
-     ast(1) = makeAstNode<ArrayTypeAST>(type(1));
- }   break;
- 
--#line 1878 "./glsl.g"
-+#line 1872 "./glsl.g"
- 
- case 158: {
-     ast(1) = makeAstNode<ArrayTypeAST>(type(1), expression(3));
- }   break;
- 
--#line 1885 "./glsl.g"
-+#line 1879 "./glsl.g"
- 
- case 159: {
-     ast(1) = makeBasicType(T_VOID);
- }   break;
- 
--#line 1892 "./glsl.g"
-+#line 1886 "./glsl.g"
- 
- case 160: {
-     ast(1) = makeBasicType(T_FLOAT);
- }   break;
- 
--#line 1899 "./glsl.g"
-+#line 1893 "./glsl.g"
- 
- case 161: {
-     ast(1) = makeBasicType(T_DOUBLE);
- }   break;
- 
--#line 1906 "./glsl.g"
-+#line 1900 "./glsl.g"
- 
- case 162: {
-     ast(1) = makeBasicType(T_INT);
- }   break;
- 
--#line 1913 "./glsl.g"
-+#line 1907 "./glsl.g"
- 
- case 163: {
-     ast(1) = makeBasicType(T_UINT);
- }   break;
- 
--#line 1920 "./glsl.g"
-+#line 1914 "./glsl.g"
- 
- case 164: {
-     ast(1) = makeBasicType(T_BOOL);
- }   break;
- 
--#line 1927 "./glsl.g"
-+#line 1921 "./glsl.g"
- 
- case 165: {
-     ast(1) = makeBasicType(T_VEC2);
- }   break;
- 
--#line 1934 "./glsl.g"
-+#line 1928 "./glsl.g"
- 
- case 166: {
-     ast(1) = makeBasicType(T_VEC3);
- }   break;
- 
--#line 1941 "./glsl.g"
-+#line 1935 "./glsl.g"
- 
- case 167: {
-     ast(1) = makeBasicType(T_VEC4);
- }   break;
- 
--#line 1948 "./glsl.g"
-+#line 1942 "./glsl.g"
- 
- case 168: {
-     ast(1) = makeBasicType(T_DVEC2);
- }   break;
- 
--#line 1955 "./glsl.g"
-+#line 1949 "./glsl.g"
- 
- case 169: {
-     ast(1) = makeBasicType(T_DVEC3);
- }   break;
- 
--#line 1962 "./glsl.g"
-+#line 1956 "./glsl.g"
- 
- case 170: {
-     ast(1) = makeBasicType(T_DVEC4);
- }   break;
- 
--#line 1969 "./glsl.g"
-+#line 1963 "./glsl.g"
- 
- case 171: {
-     ast(1) = makeBasicType(T_BVEC2);
- }   break;
- 
--#line 1976 "./glsl.g"
-+#line 1970 "./glsl.g"
- 
- case 172: {
-     ast(1) = makeBasicType(T_BVEC3);
- }   break;
- 
--#line 1983 "./glsl.g"
-+#line 1977 "./glsl.g"
- 
- case 173: {
-     ast(1) = makeBasicType(T_BVEC4);
- }   break;
- 
--#line 1990 "./glsl.g"
-+#line 1984 "./glsl.g"
- 
- case 174: {
-     ast(1) = makeBasicType(T_IVEC2);
- }   break;
- 
--#line 1997 "./glsl.g"
-+#line 1991 "./glsl.g"
- 
- case 175: {
-     ast(1) = makeBasicType(T_IVEC3);
- }   break;
- 
--#line 2004 "./glsl.g"
-+#line 1998 "./glsl.g"
- 
- case 176: {
-     ast(1) = makeBasicType(T_IVEC4);
- }   break;
- 
--#line 2011 "./glsl.g"
-+#line 2005 "./glsl.g"
- 
- case 177: {
-     ast(1) = makeBasicType(T_UVEC2);
- }   break;
- 
--#line 2018 "./glsl.g"
-+#line 2012 "./glsl.g"
- 
- case 178: {
-     ast(1) = makeBasicType(T_UVEC3);
- }   break;
- 
--#line 2025 "./glsl.g"
-+#line 2019 "./glsl.g"
- 
- case 179: {
-     ast(1) = makeBasicType(T_UVEC4);
- }   break;
- 
--#line 2032 "./glsl.g"
-+#line 2026 "./glsl.g"
- 
- case 180: {
-     ast(1) = makeBasicType(T_MAT2);
- }   break;
- 
--#line 2039 "./glsl.g"
-+#line 2033 "./glsl.g"
- 
- case 181: {
-     ast(1) = makeBasicType(T_MAT3);
- }   break;
- 
--#line 2046 "./glsl.g"
-+#line 2040 "./glsl.g"
- 
- case 182: {
-     ast(1) = makeBasicType(T_MAT4);
- }   break;
- 
--#line 2053 "./glsl.g"
-+#line 2047 "./glsl.g"
- 
- case 183: {
-     ast(1) = makeBasicType(T_MAT2);
- }   break;
- 
--#line 2060 "./glsl.g"
-+#line 2054 "./glsl.g"
- 
- case 184: {
-     ast(1) = makeBasicType(T_MAT2X3);
- }   break;
- 
--#line 2067 "./glsl.g"
-+#line 2061 "./glsl.g"
- 
- case 185: {
-     ast(1) = makeBasicType(T_MAT2X4);
- }   break;
- 
--#line 2074 "./glsl.g"
-+#line 2068 "./glsl.g"
- 
- case 186: {
-     ast(1) = makeBasicType(T_MAT3X2);
- }   break;
- 
--#line 2081 "./glsl.g"
-+#line 2075 "./glsl.g"
- 
- case 187: {
-     ast(1) = makeBasicType(T_MAT3);
- }   break;
- 
--#line 2088 "./glsl.g"
-+#line 2082 "./glsl.g"
- 
- case 188: {
-     ast(1) = makeBasicType(T_MAT3X4);
- }   break;
- 
--#line 2095 "./glsl.g"
-+#line 2089 "./glsl.g"
- 
- case 189: {
-     ast(1) = makeBasicType(T_MAT4X2);
- }   break;
- 
--#line 2102 "./glsl.g"
-+#line 2096 "./glsl.g"
- 
- case 190: {
-     ast(1) = makeBasicType(T_MAT4X3);
- }   break;
- 
--#line 2109 "./glsl.g"
-+#line 2103 "./glsl.g"
- 
- case 191: {
-     ast(1) = makeBasicType(T_MAT4);
- }   break;
- 
--#line 2116 "./glsl.g"
-+#line 2110 "./glsl.g"
- 
- case 192: {
-     ast(1) = makeBasicType(T_DMAT2);
- }   break;
- 
--#line 2123 "./glsl.g"
-+#line 2117 "./glsl.g"
- 
- case 193: {
-     ast(1) = makeBasicType(T_DMAT3);
- }   break;
- 
--#line 2130 "./glsl.g"
-+#line 2124 "./glsl.g"
- 
- case 194: {
-     ast(1) = makeBasicType(T_DMAT4);
- }   break;
- 
--#line 2137 "./glsl.g"
-+#line 2131 "./glsl.g"
- 
- case 195: {
-     ast(1) = makeBasicType(T_DMAT2);
- }   break;
- 
--#line 2144 "./glsl.g"
-+#line 2138 "./glsl.g"
- 
- case 196: {
-     ast(1) = makeBasicType(T_DMAT2X3);
- }   break;
- 
--#line 2151 "./glsl.g"
-+#line 2145 "./glsl.g"
- 
- case 197: {
-     ast(1) = makeBasicType(T_DMAT2X4);
- }   break;
- 
--#line 2158 "./glsl.g"
-+#line 2152 "./glsl.g"
- 
- case 198: {
-     ast(1) = makeBasicType(T_DMAT3X2);
- }   break;
- 
--#line 2165 "./glsl.g"
-+#line 2159 "./glsl.g"
- 
- case 199: {
-     ast(1) = makeBasicType(T_DMAT3);
- }   break;
- 
--#line 2172 "./glsl.g"
-+#line 2166 "./glsl.g"
- 
- case 200: {
-     ast(1) = makeBasicType(T_DMAT3X4);
- }   break;
- 
--#line 2179 "./glsl.g"
-+#line 2173 "./glsl.g"
- 
- case 201: {
-     ast(1) = makeBasicType(T_DMAT4X2);
- }   break;
- 
--#line 2186 "./glsl.g"
-+#line 2180 "./glsl.g"
- 
- case 202: {
-     ast(1) = makeBasicType(T_DMAT4X3);
- }   break;
- 
--#line 2193 "./glsl.g"
-+#line 2187 "./glsl.g"
- 
- case 203: {
-     ast(1) = makeBasicType(T_DMAT4);
- }   break;
- 
--#line 2200 "./glsl.g"
-+#line 2194 "./glsl.g"
- 
- case 204: {
-     ast(1) = makeBasicType(T_SAMPLER1D);
- }   break;
- 
--#line 2207 "./glsl.g"
-+#line 2201 "./glsl.g"
- 
- case 205: {
-     ast(1) = makeBasicType(T_SAMPLER2D);
- }   break;
- 
--#line 2214 "./glsl.g"
-+#line 2208 "./glsl.g"
- 
- case 206: {
-     ast(1) = makeBasicType(T_SAMPLER3D);
- }   break;
- 
--#line 2221 "./glsl.g"
-+#line 2215 "./glsl.g"
- 
- case 207: {
-     ast(1) = makeBasicType(T_SAMPLERCUBE);
- }   break;
- 
--#line 2228 "./glsl.g"
-+#line 2222 "./glsl.g"
- 
- case 208: {
-     ast(1) = makeBasicType(T_SAMPLER1DSHADOW);
- }   break;
- 
--#line 2235 "./glsl.g"
-+#line 2229 "./glsl.g"
- 
- case 209: {
-     ast(1) = makeBasicType(T_SAMPLER2DSHADOW);
- }   break;
- 
--#line 2242 "./glsl.g"
-+#line 2236 "./glsl.g"
- 
- case 210: {
-     ast(1) = makeBasicType(T_SAMPLERCUBESHADOW);
- }   break;
- 
--#line 2249 "./glsl.g"
-+#line 2243 "./glsl.g"
- 
- case 211: {
-     ast(1) = makeBasicType(T_SAMPLER1DARRAY);
- }   break;
- 
--#line 2256 "./glsl.g"
-+#line 2250 "./glsl.g"
- 
- case 212: {
-     ast(1) = makeBasicType(T_SAMPLER2DARRAY);
- }   break;
- 
--#line 2263 "./glsl.g"
-+#line 2257 "./glsl.g"
- 
- case 213: {
-     ast(1) = makeBasicType(T_SAMPLER1DARRAYSHADOW);
- }   break;
- 
--#line 2270 "./glsl.g"
-+#line 2264 "./glsl.g"
- 
- case 214: {
-     ast(1) = makeBasicType(T_SAMPLER2DARRAYSHADOW);
- }   break;
- 
--#line 2277 "./glsl.g"
-+#line 2271 "./glsl.g"
- 
- case 215: {
-     ast(1) = makeBasicType(T_SAMPLERCUBEARRAY);
- }   break;
- 
--#line 2284 "./glsl.g"
-+#line 2278 "./glsl.g"
- 
- case 216: {
-     ast(1) = makeBasicType(T_SAMPLERCUBEARRAYSHADOW);
- }   break;
- 
--#line 2291 "./glsl.g"
-+#line 2285 "./glsl.g"
- 
- case 217: {
-     ast(1) = makeBasicType(T_ISAMPLER1D);
- }   break;
- 
--#line 2298 "./glsl.g"
-+#line 2292 "./glsl.g"
- 
- case 218: {
-     ast(1) = makeBasicType(T_ISAMPLER2D);
- }   break;
- 
--#line 2305 "./glsl.g"
-+#line 2299 "./glsl.g"
- 
- case 219: {
-     ast(1) = makeBasicType(T_ISAMPLER3D);
- }   break;
- 
--#line 2312 "./glsl.g"
-+#line 2306 "./glsl.g"
- 
- case 220: {
-     ast(1) = makeBasicType(T_ISAMPLERCUBE);
- }   break;
- 
--#line 2319 "./glsl.g"
-+#line 2313 "./glsl.g"
- 
- case 221: {
-     ast(1) = makeBasicType(T_ISAMPLER1DARRAY);
- }   break;
- 
--#line 2326 "./glsl.g"
-+#line 2320 "./glsl.g"
- 
- case 222: {
-     ast(1) = makeBasicType(T_ISAMPLER2DARRAY);
- }   break;
- 
--#line 2333 "./glsl.g"
-+#line 2327 "./glsl.g"
- 
- case 223: {
-     ast(1) = makeBasicType(T_ISAMPLERCUBEARRAY);
- }   break;
- 
--#line 2340 "./glsl.g"
-+#line 2334 "./glsl.g"
- 
- case 224: {
-     ast(1) = makeBasicType(T_USAMPLER1D);
- }   break;
- 
--#line 2347 "./glsl.g"
-+#line 2341 "./glsl.g"
- 
- case 225: {
-     ast(1) = makeBasicType(T_USAMPLER2D);
- }   break;
- 
--#line 2354 "./glsl.g"
-+#line 2348 "./glsl.g"
- 
- case 226: {
-     ast(1) = makeBasicType(T_USAMPLER3D);
- }   break;
- 
--#line 2361 "./glsl.g"
-+#line 2355 "./glsl.g"
- 
- case 227: {
-     ast(1) = makeBasicType(T_USAMPLERCUBE);
- }   break;
- 
--#line 2368 "./glsl.g"
-+#line 2362 "./glsl.g"
- 
- case 228: {
-     ast(1) = makeBasicType(T_USAMPLER1DARRAY);
- }   break;
- 
--#line 2375 "./glsl.g"
-+#line 2369 "./glsl.g"
- 
- case 229: {
-     ast(1) = makeBasicType(T_USAMPLER2DARRAY);
- }   break;
- 
--#line 2382 "./glsl.g"
-+#line 2376 "./glsl.g"
- 
- case 230: {
-     ast(1) = makeBasicType(T_USAMPLERCUBEARRAY);
- }   break;
- 
--#line 2389 "./glsl.g"
-+#line 2383 "./glsl.g"
- 
- case 231: {
-     ast(1) = makeBasicType(T_SAMPLER2DRECT);
- }   break;
- 
--#line 2396 "./glsl.g"
-+#line 2390 "./glsl.g"
- 
- case 232: {
-     ast(1) = makeBasicType(T_SAMPLER2DRECTSHADOW);
- }   break;
- 
--#line 2403 "./glsl.g"
-+#line 2397 "./glsl.g"
- 
- case 233: {
-     ast(1) = makeBasicType(T_ISAMPLER2DRECT);
- }   break;
- 
--#line 2410 "./glsl.g"
-+#line 2404 "./glsl.g"
- 
- case 234: {
-     ast(1) = makeBasicType(T_USAMPLER2DRECT);
- }   break;
- 
--#line 2417 "./glsl.g"
-+#line 2411 "./glsl.g"
- 
- case 235: {
-     ast(1) = makeBasicType(T_SAMPLERBUFFER);
- }   break;
- 
--#line 2424 "./glsl.g"
-+#line 2418 "./glsl.g"
- 
- case 236: {
-     ast(1) = makeBasicType(T_ISAMPLERBUFFER);
- }   break;
- 
--#line 2431 "./glsl.g"
-+#line 2425 "./glsl.g"
- 
- case 237: {
-     ast(1) = makeBasicType(T_USAMPLERBUFFER);
- }   break;
- 
--#line 2438 "./glsl.g"
-+#line 2432 "./glsl.g"
- 
- case 238: {
-     ast(1) = makeBasicType(T_SAMPLER2DMS);
- }   break;
- 
--#line 2445 "./glsl.g"
-+#line 2439 "./glsl.g"
- 
- case 239: {
-     ast(1) = makeBasicType(T_ISAMPLER2DMS);
- }   break;
- 
--#line 2452 "./glsl.g"
-+#line 2446 "./glsl.g"
- 
- case 240: {
-     ast(1) = makeBasicType(T_USAMPLER2DMS);
- }   break;
- 
--#line 2459 "./glsl.g"
-+#line 2453 "./glsl.g"
- 
- case 241: {
-     ast(1) = makeBasicType(T_SAMPLER2DMSARRAY);
- }   break;
- 
--#line 2466 "./glsl.g"
-+#line 2460 "./glsl.g"
- 
- case 242: {
-     ast(1) = makeBasicType(T_ISAMPLER2DMSARRAY);
- }   break;
- 
--#line 2473 "./glsl.g"
-+#line 2467 "./glsl.g"
- 
- case 243: {
-     ast(1) = makeBasicType(T_USAMPLER2DMSARRAY);
- }   break;
- 
--#line 2480 "./glsl.g"
-+#line 2474 "./glsl.g"
- 
- case 244: {
-     // nothing to do.
- }   break;
- 
--#line 2487 "./glsl.g"
-+#line 2481 "./glsl.g"
- 
- case 245: {
-     ast(1) = makeAstNode<NamedTypeAST>(string(1));
- }   break;
- 
--#line 2494 "./glsl.g"
-+#line 2488 "./glsl.g"
- 
- case 246: {
-     sym(1).precision = TypeAST::Highp;
- }   break;
- 
--#line 2501 "./glsl.g"
-+#line 2495 "./glsl.g"
- 
- case 247: {
-     sym(1).precision = TypeAST::Mediump;
- }   break;
- 
--#line 2508 "./glsl.g"
-+#line 2502 "./glsl.g"
- 
- case 248: {
-     sym(1).precision = TypeAST::Lowp;
- }   break;
- 
--#line 2515 "./glsl.g"
-+#line 2509 "./glsl.g"
- 
- case 249: {
-     ast(1) = makeAstNode<StructTypeAST>(string(2), sym(4).field_list);
- }   break;
- 
--#line 2522 "./glsl.g"
-+#line 2516 "./glsl.g"
- 
- case 250: {
-     ast(1) = makeAstNode<StructTypeAST>(sym(3).field_list);
- }   break;
- 
--#line 2529 "./glsl.g"
-+#line 2523 "./glsl.g"
- 
- case 251: {
-     // nothing to do.
- }   break;
- 
--#line 2536 "./glsl.g"
-+#line 2530 "./glsl.g"
- 
- case 252: {
-     sym(1).field_list = appendLists(sym(1).field_list, sym(2).field_list);
- }   break;
- 
--#line 2543 "./glsl.g"
-+#line 2537 "./glsl.g"
- 
- case 253: {
-     sym(1).field_list = StructTypeAST::fixInnerTypes(type(1), sym(2).field_list);
- }   break;
- 
--#line 2550 "./glsl.g"
-+#line 2544 "./glsl.g"
- 
- case 254: {
-     sym(1).field_list = StructTypeAST::fixInnerTypes
-@@ -1870,106 +1870,106 @@ case 254: {
-              sym(1).type_qualifier.layout_list), sym(3).field_list);
- }   break;
- 
--#line 2560 "./glsl.g"
-+#line 2554 "./glsl.g"
- 
- case 255: {
-     // nothing to do.
-     sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field);
- }   break;
- 
--#line 2568 "./glsl.g"
-+#line 2562 "./glsl.g"
- 
- case 256: {
-     sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field_list, sym(3).field);
- }   break;
- 
--#line 2575 "./glsl.g"
-+#line 2569 "./glsl.g"
- 
- case 257: {
-     sym(1).field = makeAstNode<StructTypeAST::Field>(string(1));
- }   break;
- 
--#line 2582 "./glsl.g"
-+#line 2576 "./glsl.g"
- 
- case 258: {
-     sym(1).field = makeAstNode<StructTypeAST::Field>
-         (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0));
- }   break;
- 
--#line 2590 "./glsl.g"
-+#line 2584 "./glsl.g"
- 
- case 259: {
-     sym(1).field = makeAstNode<StructTypeAST::Field>
-         (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0, expression(3)));
- }   break;
- 
--#line 2598 "./glsl.g"
-+#line 2592 "./glsl.g"
- 
- case 260: {
-     // nothing to do.
- }   break;
- 
--#line 2605 "./glsl.g"
-+#line 2599 "./glsl.g"
- 
- case 261: {
-     ast(1) = makeAstNode<DeclarationStatementAST>(sym(1).declaration);
- }   break;
- 
--#line 2612 "./glsl.g"
-+#line 2606 "./glsl.g"
- 
- case 262: {
-     // nothing to do.
- }   break;
- 
--#line 2619 "./glsl.g"
-+#line 2613 "./glsl.g"
- 
- case 263: {
-     // nothing to do.
- }   break;
- 
--#line 2626 "./glsl.g"
-+#line 2620 "./glsl.g"
- 
- case 264: {
-     // nothing to do.
- }   break;
- 
--#line 2633 "./glsl.g"
-+#line 2627 "./glsl.g"
- 
- case 265: {
-     // nothing to do.
- }   break;
- 
--#line 2640 "./glsl.g"
-+#line 2634 "./glsl.g"
- 
- case 266: {
-     // nothing to do.
- }   break;
- 
--#line 2647 "./glsl.g"
-+#line 2641 "./glsl.g"
- 
- case 267: {
-     // nothing to do.
- }   break;
- 
--#line 2654 "./glsl.g"
-+#line 2648 "./glsl.g"
- 
- case 268: {
-     // nothing to do.
- }   break;
- 
--#line 2661 "./glsl.g"
-+#line 2655 "./glsl.g"
- 
- case 269: {
-     // nothing to do.
- }   break;
- 
--#line 2668 "./glsl.g"
-+#line 2662 "./glsl.g"
- 
- case 270: {
-     // nothing to do.
- }   break;
- 
--#line 2675 "./glsl.g"
-+#line 2669 "./glsl.g"
- 
- case 271: {
-     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>();
-@@ -1978,7 +1978,7 @@ case 271: {
-     ast(1) = stmt;
- }   break;
- 
--#line 2685 "./glsl.g"
-+#line 2679 "./glsl.g"
- 
- case 272: {
-     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list);
-@@ -1987,19 +1987,19 @@ case 272: {
-     ast(1) = stmt;
- }   break;
- 
--#line 2695 "./glsl.g"
-+#line 2689 "./glsl.g"
- 
- case 273: {
-     // nothing to do.
- }   break;
- 
--#line 2702 "./glsl.g"
-+#line 2696 "./glsl.g"
- 
- case 274: {
-     // nothing to do.
- }   break;
- 
--#line 2709 "./glsl.g"
-+#line 2703 "./glsl.g"
- 
- case 275: {
-     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>();
-@@ -2008,7 +2008,7 @@ case 275: {
-     ast(1) = stmt;
- }   break;
- 
--#line 2719 "./glsl.g"
-+#line 2713 "./glsl.g"
- 
- case 276: {
-     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list);
-@@ -2017,186 +2017,186 @@ case 276: {
-     ast(1) = stmt;
- }   break;
- 
--#line 2729 "./glsl.g"
-+#line 2723 "./glsl.g"
- 
- case 277: {
-     sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement);
- }   break;
- 
--#line 2736 "./glsl.g"
-+#line 2730 "./glsl.g"
- 
- case 278: {
-     sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement_list, sym(2).statement);
- }   break;
- 
--#line 2743 "./glsl.g"
-+#line 2737 "./glsl.g"
- 
- case 279: {
-     ast(1) = makeAstNode<CompoundStatementAST>();  // Empty statement
- }   break;
- 
--#line 2750 "./glsl.g"
-+#line 2744 "./glsl.g"
- 
- case 280: {
-     ast(1) = makeAstNode<ExpressionStatementAST>(expression(1));
- }   break;
- 
--#line 2757 "./glsl.g"
-+#line 2751 "./glsl.g"
- 
- case 281: {
-     ast(1) = makeAstNode<IfStatementAST>(expression(3), sym(5).ifstmt.thenClause, sym(5).ifstmt.elseClause);
- }   break;
- 
--#line 2764 "./glsl.g"
-+#line 2758 "./glsl.g"
- 
- case 282: {
-     sym(1).ifstmt.thenClause = statement(1);
-     sym(1).ifstmt.elseClause = statement(3);
- }   break;
- 
--#line 2772 "./glsl.g"
-+#line 2766 "./glsl.g"
- 
- case 283: {
-     sym(1).ifstmt.thenClause = statement(1);
-     sym(1).ifstmt.elseClause = 0;
- }   break;
- 
--#line 2780 "./glsl.g"
-+#line 2774 "./glsl.g"
- 
- case 284: {
-     // nothing to do.
- }   break;
- 
--#line 2787 "./glsl.g"
-+#line 2781 "./glsl.g"
- 
- case 285: {
-     ast(1) = makeAstNode<DeclarationExpressionAST>
-         (type(1), string(2), expression(4));
- }   break;
- 
--#line 2795 "./glsl.g"
-+#line 2789 "./glsl.g"
- 
- case 286: {
-     ast(1) = makeAstNode<SwitchStatementAST>(expression(3), statement(6));
- }   break;
- 
--#line 2802 "./glsl.g"
-+#line 2796 "./glsl.g"
- 
- case 287: {
-     ast(1) = makeAstNode<CompoundStatementAST>();
- }   break;
- 
--#line 2809 "./glsl.g"
-+#line 2803 "./glsl.g"
- 
- case 288: {
-     ast(1) = makeAstNode<CompoundStatementAST>(sym(1).statement_list);
- }   break;
- 
--#line 2816 "./glsl.g"
-+#line 2810 "./glsl.g"
- 
- case 289: {
-     ast(1) = makeAstNode<CaseLabelStatementAST>(expression(2));
- }   break;
- 
--#line 2823 "./glsl.g"
-+#line 2817 "./glsl.g"
- 
- case 290: {
-     ast(1) = makeAstNode<CaseLabelStatementAST>();
- }   break;
- 
--#line 2830 "./glsl.g"
-+#line 2824 "./glsl.g"
- 
- case 291: {
-     ast(1) = makeAstNode<WhileStatementAST>(expression(3), statement(5));
- }   break;
- 
--#line 2837 "./glsl.g"
-+#line 2831 "./glsl.g"
- 
- case 292: {
-     ast(1) = makeAstNode<DoStatementAST>(statement(2), expression(5));
- }   break;
- 
--#line 2844 "./glsl.g"
-+#line 2838 "./glsl.g"
- 
- case 293: {
-     ast(1) = makeAstNode<ForStatementAST>(statement(3), sym(4).forstmt.condition, sym(4).forstmt.increment, statement(6));
- }   break;
- 
--#line 2851 "./glsl.g"
-+#line 2845 "./glsl.g"
- 
- case 294: {
-     // nothing to do.
- }   break;
- 
--#line 2858 "./glsl.g"
-+#line 2852 "./glsl.g"
- 
- case 295: {
-     // nothing to do.
- }   break;
- 
--#line 2865 "./glsl.g"
-+#line 2859 "./glsl.g"
- 
- case 296: {
-     // nothing to do.
- }   break;
- 
--#line 2872 "./glsl.g"
-+#line 2866 "./glsl.g"
- 
- case 297: {
-     // nothing to do.
- }   break;
- 
--#line 2879 "./glsl.g"
-+#line 2873 "./glsl.g"
- 
- case 298: {
-     sym(1).forstmt.condition = expression(1);
-     sym(1).forstmt.increment = 0;
- }   break;
- 
--#line 2887 "./glsl.g"
-+#line 2881 "./glsl.g"
- 
- case 299: {
-     sym(1).forstmt.condition = expression(1);
-     sym(1).forstmt.increment = expression(3);
- }   break;
- 
--#line 2895 "./glsl.g"
-+#line 2889 "./glsl.g"
- 
- case 300: {
-     ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Continue);
- }   break;
- 
--#line 2902 "./glsl.g"
-+#line 2896 "./glsl.g"
- 
- case 301: {
-     ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Break);
- }   break;
- 
--#line 2909 "./glsl.g"
-+#line 2903 "./glsl.g"
- 
- case 302: {
-     ast(1) = makeAstNode<ReturnStatementAST>();
- }   break;
- 
--#line 2916 "./glsl.g"
-+#line 2910 "./glsl.g"
- 
- case 303: {
-     ast(1) = makeAstNode<ReturnStatementAST>(expression(2));
- }   break;
- 
--#line 2923 "./glsl.g"
-+#line 2917 "./glsl.g"
- 
- case 304: {
-     ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Discard);
- }   break;
- 
--#line 2930 "./glsl.g"
-+#line 2924 "./glsl.g"
- 
- case 305: {
-     ast(1) = makeAstNode<TranslationUnitAST>(sym(1).declaration_list);
- }   break;
- 
--#line 2937 "./glsl.g"
-+#line 2931 "./glsl.g"
- 
- case 306: {
-     if (sym(1).declaration) {
-@@ -2207,7 +2207,7 @@ case 306: {
-     }
- }   break;
- 
--#line 2949 "./glsl.g"
-+#line 2943 "./glsl.g"
- 
- case 307: {
-     if (sym(1).declaration_list && sym(2).declaration) {
-@@ -2223,49 +2223,49 @@ case 307: {
-     }
- }   break;
- 
--#line 2966 "./glsl.g"
-+#line 2960 "./glsl.g"
- 
- case 308: {
-     // nothing to do.
- }   break;
- 
--#line 2973 "./glsl.g"
-+#line 2967 "./glsl.g"
- 
- case 309: {
-     // nothing to do.
- }   break;
- 
--#line 2980 "./glsl.g"
-+#line 2974 "./glsl.g"
- 
- case 310: {
-     ast(1) = 0;
- }   break;
- 
--#line 2987 "./glsl.g"
-+#line 2981 "./glsl.g"
- 
- case 311: {
-     function(1)->body = statement(2);
- }   break;
- 
--#line 2994 "./glsl.g"
-+#line 2988 "./glsl.g"
- 
- case 312: {
-     ast(1) = 0;
- }   break;
- 
--#line 3002 "./glsl.g"
-+#line 2996 "./glsl.g"
- 
- case 313: {
-     ast(1) = ast(2);
- }   break;
- 
--#line 3009 "./glsl.g"
-+#line 3003 "./glsl.g"
- 
- case 314: {
-     ast(1) = ast(2);
- }   break;
- 
--#line 3015 "./glsl.g"
-+#line 3009 "./glsl.g"
- 
- } // end switch
- } // end Parser::reduce()
-diff --git a/src/libs/glsl/glslparser.h b/src/libs/glsl/glslparser.h
-index 7bf70e2..bab2616 100644
---- a/src/libs/glsl/glslparser.h
-+++ b/src/libs/glsl/glslparser.h
-@@ -1,5 +1,5 @@
- 
--#line 217 "./glsl.g"
-+#line 215 "./glsl.g"
- 
- /**************************************************************************
- **
--- 
-1.7.10
-
diff --git a/community/qtcurve-gtk2/cairo_flush_fix.patch b/community/qtcurve-gtk2/cairo_flush_fix.patch
deleted file mode 100644
index 12ed2d291..000000000
--- a/community/qtcurve-gtk2/cairo_flush_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urB QtCurve-Gtk2-1.8.15.orig/style/shadowhelper.c QtCurve-Gtk2-1.8.15/style/shadowhelper.c
---- QtCurve-Gtk2-1.8.15.orig/style/shadowhelper.c	2012-04-24 17:19:54.000000000 -0400
-+++ QtCurve-Gtk2-1.8.15/style/shadowhelper.c	2012-09-14 08:29:55.828897057 -0400
-@@ -58,6 +58,7 @@
-         cairo_rectangle(cr, 0, 0, shadowSize, shadowSize);
-         cairo_fill(cr);
-         cairo_destroy(cr);
-+        cairo_surface_destroy(dest);
-         g_object_unref(pixbuf);
-         return pixmap;
-     }
diff --git a/community/qtemu/PKGBUILD b/community/qtemu/PKGBUILD
index 44c3a0281..4c6d6e44f 100644
--- a/community/qtemu/PKGBUILD
+++ b/community/qtemu/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 83889 2013-02-06 11:40:15Z spupykin $
+# $Id: PKGBUILD 85402 2013-03-01 10:39:15Z andrea $
 # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Previous Contributor: Urs Wolfer <uwolfer @ fwo.ch>
 
 pkgname=qtemu
 pkgver=1.0.5
-pkgrel=7
+pkgrel=8
 pkgdesc="Graphical user interface for QEMU written in Qt4"
 url="http://qtemu.org"
 license=("GPL")
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('cmake')
-depends=('qemu' 'qt>=4.1')
+depends=('qemu' 'qt4')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
 	http://qtemu.svn.sourceforge.net/viewvc/qtemu/trunk/qtemu/misc/qtemu.desktop)
 md5sums=('3b93e209dc62e52a1d94c8eb24d0b149'
diff --git a/community/qtfm/PKGBUILD b/community/qtfm/PKGBUILD
index 5bb363462..009fa737d 100644
--- a/community/qtfm/PKGBUILD
+++ b/community/qtfm/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 72625 2012-06-17 19:58:45Z jlichtblau $
+# $Id: PKGBUILD 85404 2013-03-01 10:39:23Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Wittfella <wittfella@wittfella.com>
 
 pkgname=qtfm
 pkgver=5.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A lightweight file manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.qtfm.org/"
 license=('GPL')
-depends=('qt')
+depends=('file' 'qt4')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://www.qtfm.org/$pkgname-$pkgver.tar.gz)
 sha256sums=('845fc43800d12483fa1993c56a8c965ff8dc917b97f03d9ce2e24318806fb211')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}/$pkgname-$pkgver"
 
   qmake
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}/$pkgname-$pkgver"
 
-  make INSTALL_ROOT=${pkgdir} install
+  make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD
index 10df6d28e..33e9a1539 100644
--- a/community/qtractor/PKGBUILD
+++ b/community/qtractor/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 83551 2013-02-02 19:12:45Z schiv $
+# $Id: PKGBUILD 87090 2013-03-26 23:07:30Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
 
 pkgname=qtractor
-pkgver=0.5.7
+pkgver=0.5.8
 pkgrel=1
 pkgdesc="Audio/MIDI multitrack sequencer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qtractor.sourceforge.net/"
 license=('GPL')
-depends=('qt' 'jack' 'suil' 'lilv' 'libmad'
-         'libsamplerate' 'rubberband' 'liblo')
+depends=('qt4' 'suil' 'lilv' 'libmad' 'liblo'
+         'rubberband' 'shared-mime-info')
 makedepends=('ladspa' 'dssi')
 [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support')
+install=qtractor.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('a3f42dc1125d6ec0bd88286fe7738f04')
+md5sums=('22abf4de4d5736f794e174ef06fe3a3c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/assaultcube/assaultcube.install b/community/qtractor/qtractor.install
index 724bfce00..3b3aff7d9 100644
--- a/community/assaultcube/assaultcube.install
+++ b/community/qtractor/qtractor.install
@@ -1,7 +1,7 @@
 post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-mime-database usr/share/mime &> /dev/null
+  update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/community/qtspim/PKGBUILD b/community/qtspim/PKGBUILD
index 1769c6e41..1dc5e82a1 100644
--- a/community/qtspim/PKGBUILD
+++ b/community/qtspim/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 69610 2012-04-20 10:56:45Z lfleischer $
+# $Id: PKGBUILD 85407 2013-03-01 10:39:40Z andrea $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=qtspim
 pkgver=9.1.7
-pkgrel=1
+pkgrel=2
 pkgdesc="New user interface for spim, a MIPS simulator."
 arch=('i686' 'x86_64')
 url="http://spimsimulator.sourceforge.net/"
 license=('BSD')
-depends=('qt')
+depends=('qt4')
 makedepends=('subversion')
 
 __svntrunk="https://spimsimulator.svn.sourceforge.net/svnroot/spimsimulator"
diff --git a/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch b/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch
deleted file mode 100644
index dda3c48c4..000000000
--- a/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a47c5838e9f445ab887ad927706b11ccbb181364 Mon Sep 17 00:00:00 2001
-From: David Lamparter <equinox@opensourcerouting.org>
-Date: Thu, 21 Jun 2012 09:55:38 +0200
-Subject: [PATCH] isisd: fix typo in topology generator (BZ#731)
-
-There was a "lsp->" missing before "level" in line 2416.
-(introduced by git commit e38e0df)
-
-Reported-by: Seblu <seblu@seblu.net>
-Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
----
- isisd/isis_lsp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
-index 5c1e993..082e9dc 100644
---- a/isisd/isis_lsp.c
-+++ b/isisd/isis_lsp.c
-@@ -2413,7 +2413,7 @@ top_lsp_refresh (struct thread *thread)
-   isis_dynhn_insert (lsp->lsp_header->lsp_id, lsp->tlv_data.hostname,
- 		     IS_LEVEL_1);
- 
--  lsp->lsp_header->lsp_bits = lsp_bits_generate (level,
-+  lsp->lsp_header->lsp_bits = lsp_bits_generate (lsp->level,
-                                                  lsp->area->overload_bit);
-   rem_lifetime = lsp_rem_lifetime (lsp->area, IS_LEVEL_1);
-   lsp->lsp_header->rem_lifetime = htons (rem_lifetime);
--- 
-1.7.11
-
diff --git a/community/quagga/0002-CVE-2012-1820.patch b/community/quagga/0002-CVE-2012-1820.patch
deleted file mode 100644
index aae2d7b18..000000000
--- a/community/quagga/0002-CVE-2012-1820.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-@@ -, +, @@ 
-    bgpd: CVE-2012-1820, DoS in bgp_capability_orf()
-    
-    An ORF (code 3) capability TLV is defined to contain exactly one
-    AFI/SAFI block. Function bgp_capability_orf(), which parses ORF
-    capability TLV, uses do-while cycle to call its helper function
-    bgp_capability_orf_entry(), which actually processes the AFI/SAFI data
-    block. The call is made at least once and repeated as long as the input
-    buffer has enough data for the next call.
-    
-    The helper function, bgp_capability_orf_entry(), uses "Number of ORFs"
-    field of the provided AFI/SAFI block to verify, if it fits the input
-    buffer. However, the check is made based on the total length of the ORF
-    TLV regardless of the data already consumed by the previous helper
-    function call(s). This way, the check condition is only valid for the
-    first AFI/SAFI block inside an ORF capability TLV.
-    
-    For the subsequent calls of the helper function, if any are made, the
-    check condition may erroneously tell, that the current "Number of ORFs"
-    field fits the buffer boundary, where in fact it does not. This makes it
-    possible to trigger an assertion by feeding an OPEN message with a
-    specially-crafted malformed ORF capability TLV.
-    
-    This commit fixes the vulnerability by making the implementation follow
-    the spec.
---- a/bgpd/bgp_open.c	
-+++ a/bgpd/bgp_open.c	
-@@ -231,7 +231,7 @@ bgp_capability_orf_entry (struct peer *peer, struct capability_header *hdr)
-     }
-   
-   /* validate number field */
--  if (sizeof (struct capability_orf_entry) + (entry.num * 2) > hdr->length)
-+  if (sizeof (struct capability_orf_entry) + (entry.num * 2) != hdr->length)
-     {
-       zlog_info ("%s ORF Capability entry length error,"
-                  " Cap length %u, num %u",
-@@ -335,28 +335,6 @@ bgp_capability_orf_entry (struct peer *peer, struct capability_header *hdr)
- }
- 
- static int
--bgp_capability_orf (struct peer *peer, struct capability_header *hdr)
--{
--  struct stream *s = BGP_INPUT (peer);
--  size_t end = stream_get_getp (s) + hdr->length;
--  
--  assert (stream_get_getp(s) + sizeof(struct capability_orf_entry) <= end);
--  
--  /* We must have at least one ORF entry, as the caller has already done
--   * minimum length validation for the capability code - for ORF there must
--   * at least one ORF entry (header and unknown number of pairs of bytes).
--   */
--  do
--    {
--      if (bgp_capability_orf_entry (peer, hdr) == -1)
--        return -1;
--    } 
--  while (stream_get_getp(s) + sizeof(struct capability_orf_entry) < end);
--  
--  return 0;
--}
--
--static int
- bgp_capability_restart (struct peer *peer, struct capability_header *caphdr)
- {
-   struct stream *s = BGP_INPUT (peer);
-@@ -573,7 +551,7 @@ bgp_capability_parse (struct peer *peer, size_t length, int *mp_capability,
-             break;
-           case CAPABILITY_CODE_ORF:
-           case CAPABILITY_CODE_ORF_OLD:
--            if (bgp_capability_orf (peer, &caphdr))
-+            if (bgp_capability_orf_entry (peer, &caphdr))
-               return -1;
-             break;
-           case CAPABILITY_CODE_RESTART:
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD
index 84f921a81..3ad639a35 100644
--- a/community/quagga/PKGBUILD
+++ b/community/quagga/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 83621 2013-02-04 00:43:11Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# $Id: PKGBUILD 88141 2013-04-12 12:11:57Z seblu $
+# Maintainer: Sébastien Luttringer
 
 pkgname=quagga
-pkgver=0.99.21
-pkgrel=3
+pkgver=0.99.22.1
+pkgrel=1
 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.quagga.net'
 license=('GPL2')
-depends=('libcap' 'net-snmp' 'readline' 'ncurses')
+depends=('libcap' 'libnl' 'net-snmp' 'readline' 'ncurses')
 options=('!libtool' '!buildflags')
 install=quagga.install
 source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
@@ -19,28 +19,28 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar
         'ospfd.service'
         'ripd.service'
         'ripngd.service'
-        'zebra.service'
-        '0001-isisd-fix-typo-in-topology-generator-BZ-731.patch'
-        '0002-CVE-2012-1820.patch')
-md5sums=('99840adbe57047c90dfba6b6ed9aec7f'
-         '45d8bf56a426b0e7ebe429547be8a27a'
-         'ab31ed8dafd7a92137f4f00ad0937b4f'
-         '4c05d0105cd0db23a2583bd75a1bde4d'
-         'd087dce5eeba78ac64541157c7e04dfd'
-         'c5f8a729685cebf8fc5b1a1552d37b6d'
-         'e721b334bb0b31983642b307033c63d0'
-         'effeb26ff78ffcafe7808596ddc5d3fc'
-         'f0c0b99346b2c373a74158e45f04cf91'
-         'c80174f7bdd32cd84550d52451e8f495'
-         '44f39016d81f3b13b2744f7dcd93289d')
+        'zebra.service')
+md5sums=('d9ab848661720d6da2551c7a4a19c731'
+         '87bf4ae8aca3b3cf70e3986bc669aa78'
+         '9b14110bed4982baa801808db6ac9135'
+         'b685b5c12637cb963e1fb78ecd926e14'
+         '1fee8cdf03f87b9bb129948058246c88'
+         '4d95a4af1ddb4ae21b867bebbedc77d5'
+         '7e33c2a2e1c12309ba28d75a34294ed0'
+         '6c682c0cd06c109bc10d29c1d9af3e38'
+         '18964536b7ed012aa5b22f2fa9fb3e87')
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
   shopt -s nullglob
   for _p in "$srcdir"/*.patch; do
     msg2 "Applying ${_p##*/}"
     patch -p 1 -i "$_p"
   done
+}
+
+build() {
+  cd $pkgname-$pkgver
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc/quagga \
@@ -78,7 +78,6 @@ package() {
   done
   install -D -m 644 /dev/null "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
   echo "d /run/$pkgname 0750 $pkgname $pkgname" > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/quagga/babeld.service b/community/quagga/babeld.service
index 5b2848042..aa107afca 100644
--- a/community/quagga/babeld.service
+++ b/community/quagga/babeld.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=Babel routing daemon
+Documentation=man:zebra(8)
 BindTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/babeld.conf
 
 [Service]
-ExecStart=/usr/sbin/babeld
+Type=forking
+PIDFile=/run/quagga/babeld.pid
+ExecStart=/usr/sbin/babeld -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/community/quagga/bgpd.service b/community/quagga/bgpd.service
index 21ac18c8a..aae58be2c 100644
--- a/community/quagga/bgpd.service
+++ b/community/quagga/bgpd.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=BGP routing daemon
+Documentation=man:bgpd(8) man:zebra(8)
 BindTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/bgpd.conf
 
 [Service]
-ExecStart=/usr/sbin/bgpd
+Type=forking
+PIDFile=/run/quagga/bgpd.pid
+ExecStart=/usr/sbin/bgpd -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/community/quagga/isisd.service b/community/quagga/isisd.service
index 298946998..fa5a716e8 100644
--- a/community/quagga/isisd.service
+++ b/community/quagga/isisd.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=IS-IS routing daemon
+Documentation=man:isis(8) man:zebra(8)
 BindTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/isisd.conf
 
 [Service]
-ExecStart=/usr/sbin/isisd
+Type=forking
+PIDFile=/run/quagga/isisd.pid
+ExecStart=/usr/sbin/isisd -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/community/quagga/ospf6d.service b/community/quagga/ospf6d.service
index 31194fc6e..eacb89159 100644
--- a/community/quagga/ospf6d.service
+++ b/community/quagga/ospf6d.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=OSPF routing daemon for IPv6
+Documentation=man:ospfd(8) man:zebra(8)
 BindTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/ospf6d.conf
 
 [Service]
-ExecStart=/usr/sbin/ospf6d
+Type=forking
+PIDFile=/run/quagga/ospf6d.pid
+ExecStart=/usr/sbin/ospf6d -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/community/quagga/ospfd.service b/community/quagga/ospfd.service
index f864aa258..57a946f8e 100644
--- a/community/quagga/ospfd.service
+++ b/community/quagga/ospfd.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=OSPF routing daemon
+Documentation=man:ospfd(8) man:zebra(8)
 BindTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/ospfd.conf
 
 [Service]
-ExecStart=/usr/sbin/ospfd
+Type=forking
+PIDFile=/run/quagga/ospfd.pid
+ExecStart=/usr/sbin/ospfd -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/community/quagga/quagga.conf b/community/quagga/quagga.conf
deleted file mode 100644
index 26f24daa8..000000000
--- a/community/quagga/quagga.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh noet:
-
-DAEMON_OPTS="-d -u quagga -g quagga -A 127.0.0.1"
diff --git a/community/quagga/quagga.rc b/community/quagga/quagga.rc
deleted file mode 100644
index ad6614b14..000000000
--- a/community/quagga/quagga.rc
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-DAEMON=/usr/sbin/${0##*/}
-PID=$(pidof -o %PPID $DAEMON)
-
-case "$1" in
-	start)
-		stat_busy "Starting ${0##*/} daemon"
-		[[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0
-		stat_fail
-	;;
-  stop)
-		stat_busy "Stopping ${0##*/} daemon"
-		[[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
-		stat_fail
-	;;
-  restart)
-		$0 stop
-		$0 start
-		exit 0
-	;;
-  *)
-		echo "usage: ${0##*/} {start|stop|restart}" >&2
-	;;
-esac
-
-exit 1
-
-# vim:set ts=2 sw=2 ft=sh noet:
diff --git a/community/quagga/ripd.service b/community/quagga/ripd.service
index 22716e2c9..bf7c5ac6f 100644
--- a/community/quagga/ripd.service
+++ b/community/quagga/ripd.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=RIP routing daemon
+Documentation=man:ripd(8) man:zebra(8)
 BindTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/ripd.conf
 
 [Service]
-ExecStart=/usr/sbin/ripd
+Type=forking
+PIDFile=/run/quagga/ripd.pid
+ExecStart=/usr/sbin/ripd -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/community/quagga/ripngd.service b/community/quagga/ripngd.service
index 9ac51bd1c..465263ba3 100644
--- a/community/quagga/ripngd.service
+++ b/community/quagga/ripngd.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=RIP routing daemon for IPv6
+Documentation=man:ripngd(8) man:zebra(8)
 BindTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/ripngd.conf
 
 [Service]
-ExecStart=/usr/sbin/ripngd
+Type=forking
+PIDFile=/run/quagga/ripngd.pid
+ExecStart=/usr/sbin/ripngd -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/community/quagga/zebra.service b/community/quagga/zebra.service
index 0bba03972..c8707083e 100644
--- a/community/quagga/zebra.service
+++ b/community/quagga/zebra.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=GNU Zebra routing manager
+Documentation=man:zebra(8)
 After=network.target
 ConditionPathExists=/etc/quagga/zebra.conf
 
 [Service]
-ExecStartPre=/usr/sbin/ip route flush proto zebra
-ExecStart=/usr/sbin/zebra
+Type=forking
+PIDFile=/run/quagga/zebra.pid
+ExecStartPre=/sbin/ip route flush proto zebra
+ExecStart=/usr/sbin/zebra -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/community/qucs/PKGBUILD b/community/qucs/PKGBUILD
index 9ab19a4c7..d6b4d0285 100644
--- a/community/qucs/PKGBUILD
+++ b/community/qucs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65495 2012-02-21 06:38:19Z spupykin $
+# $Id: PKGBUILD 88012 2013-04-09 21:50:26Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Víctor Martínez Romanos <vmromanos@gmail.com>
 
@@ -21,11 +21,14 @@ md5sums=('c916502171d422ab168fe5fc681b29d8'
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  . /etc/profile.d/qt3.sh
   export PATH=$QTDIR/bin:$PATH
 
   [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/qucs-gcc-4.5.1.patch
   [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/qupzilla/PKGBUILD b/community/qupzilla/PKGBUILD
index cadca634e..5d14c5fa8 100644
--- a/community/qupzilla/PKGBUILD
+++ b/community/qupzilla/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 83299 2013-01-29 01:36:39Z speps $
+# $Id: PKGBUILD 89115 2013-04-26 22:11:32Z speps $
 # Maintainer: speps <speps at aur dot archlinux dot org>
 
 _name=QupZilla
-_commit=fbfcc70
 pkgname=qupzilla
-pkgver=1.3.5_git20130128
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="Cross-platform QtWebKit browser"
 arch=(i686 x86_64 mips64el)
 url="http://www.qupzilla.com/"
 license=('GPL3')
-depends=('qtwebkit')
+depends=('qtwebkit' 'hunspell')
+optdepends=('bash-completion: bash completion support')
 install="$pkgname.install"
-source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/$_commit")
-md5sums=('ff8bd77f785335a8157aceb3cd54507a')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/v$pkgver")
+md5sums=('e1989427fea976312ca4c0ec84ce41b2')
 
 build() {
   cd "$srcdir/$_name-$pkgname-"*
@@ -21,13 +21,17 @@ build() {
   # enable webgl support
   export USE_WEBGL=true
 
-  qmake QUPZILLA_PREFIX=/usr/
+  qmake-qt4 QUPZILLA_PREFIX=/usr/
   make
 }
 
 package() {
   cd "$srcdir/$_name-$pkgname-"*
   make INSTALL_ROOT="$pkgdir/" install
+
+  # zsh completion
+  install -Dm644 linux/completion/zsh_completion.sh \
+    "$pkgdir/usr/share/zsh/site-functions/_$pkgname"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/r8168/PKGBUILD b/community/r8168/PKGBUILD
deleted file mode 100644
index b583690e0..000000000
--- a/community/r8168/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 80376 2012-11-21 09:11:48Z mtorromeo $
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-# Contributor: Bob Fanger < bfanger(at)gmail >
-# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail >
-
-pkgname=r8168
-pkgver=8.034.00
-pkgrel=1
-pkgdesc="A kernel module for Realtek 8168 network cards"
-url="http://www.realtek.com.tw"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('glibc' 'linux')
-makedepends=('linux-headers')
-source=(http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-install=$pkgname.install
-
-build() {
-	_kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
-	KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)
-
-	cd "$pkgname-$pkgver"
-
-	# avoid using the Makefile directly -- it doesn't understand
-	# any kernel but the current.
-	make -C /usr/lib/modules/$KERNEL_RELEASE/build \
-			SUBDIRS="$srcdir/$pkgname-$pkgver/src" \
-			EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
-			modules
-}
-
-package() {
-	_kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
-	depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)")
-	KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)
-	msg "Kernel = $KERNEL_VERSION"
-
-	cd "$pkgname-$pkgver"
-	install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko"
-	find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-
-	sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install"
-}
-
-sha256sums=('97f3f342f9f24a3c3346641babde82f52f87b6ef5976c8f4481515f247116206')
diff --git a/community/r8168/r8168.install b/community/r8168/r8168.install
deleted file mode 100644
index ab5f9f5c8..000000000
--- a/community/r8168/r8168.install
+++ /dev/null
@@ -1,17 +0,0 @@
-rebuild_module_dependencies() {
-	EXTRAMODULES='extramodules-3.6-ARCH'
-	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-  rebuild_module_dependencies
-	echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:'
-	echo '>>>  `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`'
-}
-post_upgrade() {
-	rebuild_module_dependencies
-}
-
-post_remove() {
-	rebuild_module_dependencies
-}
diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD
index d406f0846..8c93df3e5 100644
--- a/community/radvd/PKGBUILD
+++ b/community/radvd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83582 2013-02-03 13:24:28Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# $Id: PKGBUILD 88368 2013-04-16 19:57:49Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
 
 pkgname=radvd
-pkgver=1.9.2
-pkgrel=2
+pkgver=1.9.3
+pkgrel=1
 pkgdesc='IPv6 Router Advertisement Daemon'
 url='http://www.litech.org/radvd/'
 license=('custom')
@@ -14,8 +14,8 @@ arch=('i686' 'x86_64' 'mips64el')
 backup=('etc/radvd.conf')
 source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz"
         "$pkgname.service")
-sha1sums=('5bc39b7bec0d73ffa443634c340e75b54867766c'
-          '9cb6b2eaaf445fe8d17dfc50fde15709d4de7d1d')
+sha1sums=('14b025bdcec77ea7278cd8ee2a32af3f81d26f4d'
+          'f1e97885117b5ee2a533916624fa4297ce66e418')
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --with-pidfile=/run/radvd.pid \
diff --git a/community/radvd/radvd.conf b/community/radvd/radvd.conf
deleted file mode 100644
index 47811d6cc..000000000
--- a/community/radvd/radvd.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh noet:
-
-# daemon pid file
-#PIDFILE='/run/radvd.pid'
-
-# daemon options. treated as an array.
-DAEMON_OPTS=('--logmethod=syslog')
diff --git a/community/radvd/radvd.rc b/community/radvd/radvd.rc
deleted file mode 100644
index 3cac104e7..000000000
--- a/community/radvd/radvd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-DAEMON=/usr/sbin/radvd
-PIDFILE=${PIDFILE:-/run/${0##*/}.pid}
-DAEMON_OPTS+=("--pidfile=$PIDFILE")
-
-# check pid file
-[[ -r "$PIDFILE" ]] &&
-  read PID < "$PIDFILE" && [[ -n $PID ]] && kill -0 $PID || unset PID
-
-case "$1" in
-  start)
-    stat_busy "Starting ${0##*/} daemon"
-    [[ ! $PID ]] && $DAEMON "${DAEMON_OPTS[@]}" &&
-      add_daemon ${0##*/} && stat_done && exit 0
-    stat_fail
-  ;;
-  stop)
-    stat_busy "Stopping ${0##*/} daemon"
-    [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
-    stat_fail
-  ;;
-  restart)
-    $0 stop
-    $0 start
-    exit 0
-  ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|restart}" >&2
-  ;;
-esac
-
-exit 1
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/radvd/radvd.service b/community/radvd/radvd.service
index f6f5ad67e..92685d73b 100644
--- a/community/radvd/radvd.service
+++ b/community/radvd/radvd.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=IPv6 Router Advertisement Daemon
+After=network.target
 
 [Service]
 ExecStart=/usr/sbin/radvd --nodaemon --logmethod=stderr
diff --git a/community/ragel/PKGBUILD b/community/ragel/PKGBUILD
index 5f3a72978..12bfb4ef3 100644
--- a/community/ragel/PKGBUILD
+++ b/community/ragel/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 60639 2011-12-16 00:03:11Z tredaelli $
+# $Id: PKGBUILD 87968 2013-04-09 16:09:00Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Michael P <ptchinster@archlinux.us>
 # Contributor: Roberto Alsina <ralsina@kde.org>
@@ -7,21 +7,18 @@
 # Contributor: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgname=ragel
-pkgver=6.7
+pkgver=6.8
 pkgrel=1
 pkgdesc="Compiles finite state machines from regular languages into executable C, C++, Objective-C, or D code."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.complang.org/ragel/"
 license=('GPL')
 depends=('gcc-libs')
-source=("http://www.complang.org/$pkgname/$pkgname-$pkgver.tar.gz"
-	"ragel-6.7-gcc-4.7.patch")
-md5sums=('f4423e0d8a6538dd4e61498fcfad3cec'
-	 'bcbc047873e09eef04900142fefa75f1')
+source=("http://www.complang.org/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('1bb39745ac23da449019f9f2cb4b0d01')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i ${srcdir}/ragel-6.7-gcc-4.7.patch
   ./configure --prefix=/usr
   make
 }
@@ -31,4 +28,3 @@ package() {
 
   make DESTDIR="$pkgdir/" install
 }
-
diff --git a/community/ratpoison/PKGBUILD b/community/ratpoison/PKGBUILD
index b14b1b78e..b98d4f66f 100644
--- a/community/ratpoison/PKGBUILD
+++ b/community/ratpoison/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 83180 2013-01-27 16:26:22Z pierre $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# $Id: PKGBUILD 88374 2013-04-16 20:26:08Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: juergen <juergen@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=ratpoison
-pkgver=1.4.5
-pkgrel=5
+pkgver=1.4.6
+pkgrel=1
 pkgdesc="A simple keystroke-driven window manager"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,7 +15,7 @@ url="http://www.nongnu.org/ratpoison/"
 install="${pkgname}.install"
 source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         "${pkgname}.desktop")
-md5sums=('330a08dbed6be88cab54f6947e9f0b60'
+md5sums=('5fbaab737cf7fcc8e5eb2d619aaa0eab'
          '29c3cb9be59758e39d8471391231a74a')
 
 build() {
@@ -29,20 +30,20 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   # fix permissions
-  chmod a+x ${pkgdir}/usr/share/ratpoison/{allwindows.sh,clickframe.pl,rpshowall.sh,rpws,split.sh}
+  chmod a+x "${pkgdir}/usr/share/ratpoison/"{allwindows.sh,clickframe.pl,rpshowall.sh,rpws,split.sh}
 
   # Not useful outside the source tree. Kill it
-  rm ${pkgdir}/usr/share/ratpoison/genrpbindings
+  rm "${pkgdir}/usr/share/ratpoison/genrpbindings"
 
   cd contrib
   ./genrpbindings
-  install -dm755 ${pkgdir}/usr/share/ratpoison/bindings
+  install -dm755 "${pkgdir}/usr/share/ratpoison/bindings"
   install -m644 {Ratpoison.pm,ratpoison-cmd.el,ratpoison.rb,ratpoison.lisp,ratpoison.py} \
-    ${pkgdir}/usr/share/ratpoison/bindings/
+    "${pkgdir}/usr/share/ratpoison/bindings/"
 
-  install -Dm644 ${srcdir}/${pkgname}.desktop \
-    ${pkgdir}/etc/X11/sessions/${pkgname}.desktop
+  install -Dm644 "${srcdir}/${pkgname}.desktop" \
+    "${pkgdir}/etc/X11/sessions/${pkgname}.desktop"
 
-  install -Dm644 ${pkgdir}/usr/share/ratpoison/ratpoison.el \
-    ${pkgdir}/usr/share/emacs/site-lisp/ratpoison.el
+  install -Dm644 "${pkgdir}/usr/share/ratpoison/ratpoison.el" \
+    "${pkgdir}/usr/share/emacs/site-lisp/ratpoison.el"
 }
diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index 86cd0c464..4b7bbd45f 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -1,33 +1,34 @@
-# $Id: PKGBUILD 77564 2012-10-12 13:28:53Z stativ $
+# $Id: PKGBUILD 89596 2013-04-30 09:32:32Z bpiotrowski $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
 # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
 # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
 # Contributor: Archie <mymaud@gmail.com>
 
 pkgname=rawtherapee
-pkgver=4.0.8
-pkgrel=1
+pkgver=4.0.10
+pkgrel=3
 epoch=1
 pkgdesc="RAW photo editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rawtherapee.com/"
 license=('GPL3')
-depends=('gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('mercurial' 'cmake')
+depends=('fftw' 'gtkmm' 'libcanberra' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('cmake')
 install=rawtherapee.install
 source=("http://rawtherapee.googlecode.com/files/rawtherapee-$pkgver.tar.xz")
-md5sums=('27b988200c5ff3f2863e1d83200657b2')
+md5sums=('cf18a503a978a29af6275e17f7aa67ba')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  mkdir "$srcdir/$pkgname-build"
+  cd "$srcdir/$pkgname-build"
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-     .
+    "$srcdir/$pkgname-$pkgver"
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-build"
   make DESTDIR="$pkgdir/" install
 }
diff --git a/community/rawtherapee/rawtherapee.install b/community/rawtherapee/rawtherapee.install
index 385eec8f4..6a18adf6e 100644
--- a/community/rawtherapee/rawtherapee.install
+++ b/community/rawtherapee/rawtherapee.install
@@ -7,11 +7,6 @@ post_install() {
 
 post_upgrade() {
   post_install $1
-
-  if [ ${2%%_*} == "3.0a1" ]; then
-    echo "There were lots of changes to the behavior of the majority of tools."
-    echo "This may cause your files to look differently than before."
-  fi
 }
 
 post_remove() {
diff --git a/community/rbutil/PKGBUILD b/community/rbutil/PKGBUILD
new file mode 100755
index 000000000..7f7670d4c
--- /dev/null
+++ b/community/rbutil/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 85455 2013-03-01 19:10:50Z andrea $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: said <atvordhosbn@gmail.com>
+# Contributor: clinx <clinx.hacker@googlemail.com>
+
+pkgname=rbutil
+pkgver=1.3.1
+pkgrel=3
+pkgdesc="Rockbox Utility"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility"
+license=("GPL")
+depends=('qt4' 'libusb')
+optdepends=('speex: voice files support')
+source=("http://download.rockbox.org/${pkgname}/source/RockboxUtility-v${pkgver}-src.tar.bz2" "${pkgname}.desktop")
+sha256sums=('6c04b5c7eaad1762577908dedb9e40f5b0cee675150ae5ba844ea2c9bea294ca'
+            '539285237af16fbc60a7501963e8c2f584e58a31f2613481e6b42d21337b7a25')
+
+build() {
+  cd "${srcdir}"/RockboxUtility-v${pkgver}/${pkgname}/rbutilqt
+
+# Build
+  lrelease-qt4 rbutilqt.pro
+  qmake-qt4
+  make
+}
+
+package(){
+  cd "${srcdir}"/RockboxUtility-v${pkgver}/${pkgname}/rbutilqt
+
+# Install
+  install -dm 755 "${pkgdir}"/usr/{bin,share/pixmaps}
+  install -m 644 icons/rockbox-64.png "${pkgdir}"/usr/share/pixmaps/rbutil.png
+  install -m 755 RockboxUtility "${pkgdir}"/usr/bin/rbutil
+
+# Desktop file
+  install -dm 755 "${pkgdir}"/usr/share/applications
+  install -m 644 "${srcdir}"/rbutil.desktop "${pkgdir}"/usr/share/applications/rbutil.desktop
+}
+
+#vim: ts=2 sw=2 et:
diff --git a/community/rbutil/rbutil.desktop b/community/rbutil/rbutil.desktop
new file mode 100755
index 000000000..920b6a452
--- /dev/null
+++ b/community/rbutil/rbutil.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Rockbox Utility
+GenericName=Rockbox Utility
+Comment=Configure Rockbox
+Encoding=UTF-8
+Exec=rbutil
+Icon=rbutil.png
+Categories=Application;Qt;AudioVideo;Audio;
+StartupNotify=false
+Terminal=false
+Type=Application
diff --git a/community/rdiff-backup/PKGBUILD b/community/rdiff-backup/PKGBUILD
index e4f34995e..03b1ed6f8 100644
--- a/community/rdiff-backup/PKGBUILD
+++ b/community/rdiff-backup/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57837 2011-11-03 10:27:32Z lfleischer $
+# $Id: PKGBUILD 86773 2013-03-22 00:29:53Z eric $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 # Contributor: Erwin Van de Velde <erwin.vandevelde@gmail.com>
@@ -17,7 +17,7 @@ source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar
 md5sums=('1a94dc537fcf74d6a3a80bd27808e77b'
          '3b88b18eb43ac85bc70b8dce92e958ba')
 
-build() {
+package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   python2 setup.py install --root="${pkgdir}" -O1
diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD
index 36053c16b..9025408c6 100644
--- a/community/recoll/PKGBUILD
+++ b/community/recoll/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79504 2012-11-06 11:20:41Z spupykin $
+# $Id: PKGBUILD 88329 2013-04-16 13:30:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,13 +6,13 @@
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 
 pkgname=recoll
-pkgver=1.18.1
+pkgver=1.18.2
 pkgrel=1
 pkgdesc="Full text search tool based on Xapian backend"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lesbonscomptes.com/recoll/"
 license=('GPL')
-depends=('xapian-core>=1.0.15-1' 'qt' 'openssl' 'hicolor-icon-theme' 'qtwebkit')
+depends=('xapian-core>=1.0.15-1' 'qt4' 'openssl' 'hicolor-icon-theme' 'qtwebkit')
 makedepends=('python2')
 optdepends=('libxslt: for XML based formats (fb2,etc)'
 	    'unzip: for the OpenOffice.org documents'
@@ -31,7 +31,7 @@ optdepends=('libxslt: for XML based formats (fb2,etc)'
 	    'aspell-en: English stemming support')
 install=recoll.install
 source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('f0e4ba8fc988d67a92e15f6283a485a4')
+md5sums=('fee17c0edbe9199ae7662f6ec46eda07')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -47,7 +47,7 @@ build() {
 
   sed -i '1,1i#include <unistd.h>' utils/rclionice.cpp
 
-  ./configure \
+  QMAKE=qmake-qt4 ./configure \
     --prefix=/usr \
     --mandir=/usr/share/man
   make
diff --git a/community/recorditnow/PKGBUILD b/community/recorditnow/PKGBUILD
index c50ff5d41..450d3018d 100644
--- a/community/recorditnow/PKGBUILD
+++ b/community/recorditnow/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=recorditnow
 pkgver=0.8.1
 pkgrel=4
 pkgdesc="A plugin based desktop recorder for KDE SC 4"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kde-apps.org/content/show.php/RecordItNow?content=114610"
 license=('GPL')
 depends=('kdebase-runtime' 'recordmydesktop' 'ffmpeg' 'xdg-utils')
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 62ce5cd58..e1a879ac5 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83339 2013-01-29 20:01:01Z spupykin $
+# $Id: PKGBUILD 89919 2013-05-05 14:50:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=2.6.9
+pkgver=2.6.13
 pkgrel=1
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.d"
 	"redis.service"
 	"redis.logrotate")
-md5sums=('5093fb7c5f763e828c857daf260665bc'
+md5sums=('c4be422013905c64af18b1ef140de21f'
          '8d843919d9f165e9a47e56cadb4ac2ed'
          '5ab9fdb200e15c13b450fda77fa030b6'
          '9e2d75b7a9dc421122d673fe520ef17f')
diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD
index 222f4d4da..6bd4b41b9 100644
--- a/community/rekonq/PKGBUILD
+++ b/community/rekonq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83068 2013-01-27 10:02:41Z andrea $
+# $Id: PKGBUILD 89389 2013-04-29 06:54:51Z andrea $
 # Maintainer: Peter Lewis <plewis@aur.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net>
 
 pkgname=rekonq
-pkgver=2.1
+pkgver=2.3.0
 pkgrel=1
 pkgdesc='A WebKit based web browser for KDE'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('qca-ossl: to use the sync handler')
 install=${pkgname}.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha256sums=('92640c80b19e88934d5ed618b4a61c767ee7a27e4792e43bd3ccf51a7b5ce664')
+sha256sums=('f84fe975e79cbdcd218eb73d5371ee5ca0e11a2aea0d1d890ba9f24a505cf65c')
 
 build(){
   mkdir build
diff --git a/community/rekonq/fix-google-sync.patch b/community/rekonq/fix-google-sync.patch
deleted file mode 100644
index aa2aecc13..000000000
--- a/community/rekonq/fix-google-sync.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From: Andrea Diamantini <adjam7@gmail.com>
-Date: Tue, 08 Jan 2013 16:09:03 +0000
-Subject: Workaround to fix Google Bookmarks sync + minor speed improvement
-X-Git-Url: http://quickgit.kde.org/?p=rekonq.git&a=commitdiff&h=58bd0c195b60c3cf597a8d9296e5725dc4be7c9b
----
-Workaround to fix Google Bookmarks sync + minor speed improvement
-
-Courtesy patch by "Francesco". Thanks :)
-
-BUG: 312824
----
-
-
---- a/src/sync/googlesynchandler.cpp
-+++ b/src/sync/googlesynchandler.cpp
-@@ -3,7 +3,7 @@
- * This file is a part of the rekonq project
- *
- * Copyright (C) 2012 by Siteshwar Vashisht <siteshwar at gmail dot com>
--* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
-+* Copyright (C) 2011-2013 by Andrea Diamantini <adjam7 at gmail dot com>
- *
- *
- * This program is free software; you can redistribute it and/or
-@@ -172,24 +172,24 @@
- 
-     QString path = _webPage.mainFrame()->url().path();
- 
--    if (path == "/ServiceLogin" && _doLogin == true)
-+    if ( (path == QL1S("/ServiceLogin") || path == QL1S("/Login")) && _doLogin == true)
-     {
-         // Let's login to our Google account
-         QWebFrame *frame = _webPage.mainFrame();
- 
--        QWebElement email = frame->findFirstElement("#Email");
--        QWebElement passwd = frame->findFirstElement("#Passwd");
--        QWebElement form = frame->findFirstElement("#gaia_loginform");
--
--        email.setAttribute("value", ReKonfig::syncUser());
--        passwd.setAttribute("value", ReKonfig::syncPass());
--        form.evaluateJavaScript("this.submit();");
-+        QWebElement email = frame->findFirstElement( QL1S("#Email") );
-+        QWebElement passwd = frame->findFirstElement( QL1S("#Passwd") );
-+        QWebElement form = frame->findFirstElement( QL1S("#gaia_loginform") );
-+
-+        email.setAttribute( QL1S("value"), ReKonfig::syncUser());
-+        passwd.setAttribute( QL1S("value"), ReKonfig::syncPass());
-+        form.evaluateJavaScript( QL1S("this.submit();") );
-         emit syncStatus(Rekonq::Bookmarks, true, i18n("Signing in..."));
- 
-         // Login only once
-         _doLogin = false;
-     }
--    else if (path == "/bookmarks/")
-+    else if (path == QL1S("/bookmarks/") )
-     {
-         // We get to this page after successful login, let's fetch the bookmark list in Xml format.
-         QNetworkAccessManager *qnam = _webPage.networkAccessManager();
-@@ -199,16 +199,16 @@
-         emit syncStatus(Rekonq::Bookmarks, true, i18n("Fetching bookmarks from server..."));
-         connect(_reply, SIGNAL(finished()), this, SLOT(fetchingBookmarksFinished()));
-     }
--    else if (path == "/ServiceLoginAuth")
-+    else if (path == QL1S("/ServiceLoginAuth") )
-     {
-         emit syncStatus(Rekonq::Bookmarks, false, i18n("Login failed!"));
-         _isSyncing = false;
-     }
--    else if (path == "/bookmarks/mark")
-+    else if (path == QL1S("/bookmarks/mark") )
-     {
-         QWebFrame *frame = _webPage.mainFrame();
- 
--        QString sigKey = frame->findFirstElement("input[name=sig]").attribute("value");
-+        QString sigKey = frame->findFirstElement( QL1S("input[name=sig]") ).attribute( QL1S("value") );
-         kDebug() << "Signature Key is : " << sigKey;
- 
-         QNetworkAccessManager *qnam = _webPage.networkAccessManager();
-@@ -219,7 +219,7 @@
-             for (QSet<QString>::const_iterator iter = _bookmarksToDelete.constBegin(); iter != _bookmarksToDelete.end(); ++iter)
-             {
-                 QNetworkRequest request;
--                request.setUrl(QUrl("https://www.google.com/bookmarks/mark?dlq=" + *iter + "&sig=" + sigKey));
-+                request.setUrl(QUrl( QL1S("https://www.google.com/bookmarks/mark?dlq=") + *iter + QL1S("&sig=") + sigKey));
- 
-                 kDebug() << "Delete url is : " << request.url();
-                 QNetworkReply *r = qnam->get(request);
-@@ -243,7 +243,7 @@
-                 postData.append("&sig=" + sigKey.toUtf8());
- 
-                 QNetworkRequest request;
--                request.setUrl(QUrl("https://www.google.com/bookmarks/mark?sig=" + sigKey + "&btnA"));
-+                request.setUrl(QUrl("https://www.google.com/bookmarks/mark?sig=" + sigKey + QL1S("&btnA") ));
-                 request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-                 kDebug() << "Url: " << request.url();
-                 kDebug() << "Post data is :" << postData;
-@@ -257,7 +257,7 @@
-         _bookmarksToAdd.clear();
- 
-     }
--    else if (path == "/Logout")
-+    else if (path == QL1S("/Logout") )
-     {
-         //Session finished
-         emit syncStatus(Rekonq::Bookmarks, true, i18n("Done!"));
-@@ -277,10 +277,10 @@
- {
-     QString data = _reply->readAll();
- 
--    QDomDocument doc("bookmarks");
-+    QDomDocument doc( QL1S("bookmarks") );
-     doc.setContent(data);
- 
--    QDomNodeList bookmarksOnServer = doc.elementsByTagName("bookmark");
-+    QDomNodeList bookmarksOnServer = doc.elementsByTagName( QL1S("bookmark") );
-     emit syncStatus(Rekonq::Bookmarks, true, i18n("Reading bookmarks..."));
- 
-     BookmarkManager *manager = BookmarkManager::self();
-@@ -291,8 +291,8 @@
- 
-         for (int i = 0; i < bookmarksOnServer.size(); ++i)
-         {
--            QString title = getChildElement(bookmarksOnServer.at(i), "title");
--            QString url = getChildElement(bookmarksOnServer.at(i), "url");
-+            QString title = getChildElement(bookmarksOnServer.at(i), QL1S("title") );
-+            QString url = getChildElement(bookmarksOnServer.at(i), QL1S("url") );
- 
-             KBookmark bookmark = manager->bookmarkForUrl(KUrl(url));
-             if (bookmark.isNull())
-@@ -377,7 +377,7 @@
-                 found = true;
-                 break;
-             }
--            else if (current.url().url() == getChildElement(bookmarksOnServer.at(i), "url"))
-+            else if (current.url().url() == getChildElement(bookmarksOnServer.at(i), QL1S("url")) )
-             {
-                 found = true;
-             }
-@@ -398,13 +398,13 @@
- 
-     for (int i = 0; i < bookmarksOnServer.count(); ++i)
-     {
--        QString url = getChildElement(bookmarksOnServer.at(i), "url");
-+        QString url = getChildElement(bookmarksOnServer.at(i), QL1S("url") );
- 
-         KBookmark result = manager->bookmarkForUrl(KUrl(url));
-         if (result.isNull())
-         {
-             kDebug() <<  "Deleting from Google Bookmarks: " << url;
--            _bookmarksToDelete.insert(getChildElement(bookmarksOnServer.at(i), "id"));
-+            _bookmarksToDelete.insert(getChildElement(bookmarksOnServer.at(i), QL1S("id") ));
-         }
-     }
- 
-
diff --git a/community/remind/PKGBUILD b/community/remind/PKGBUILD
index ccc4a8411..54ee3ba5d 100644
--- a/community/remind/PKGBUILD
+++ b/community/remind/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=remind
-pkgver=3.01.12
+pkgver=3.01.13
 pkgrel=1
 pkgdesc='A sophisticated calendar and alarm program.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ license=('GPL')
 depends=('tk' 'tcllib')
 source=("http://www.roaringpenguin.com/files/download/${pkgname}-0${pkgver}.tar.gz"{,.sig})
 options=('!emptydirs')
-md5sums=('de16cbfc3ee94defcb1abdf78b2ebcd1'
-         '4be6e58ad5117fe2299489b01db45d48')
+md5sums=('9b746d257eccd5961d61c649cf48305c'
+         'SKIP')
 
 build() {
   cd "${pkgname}-0${pkgver}"
diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD
index 2fde80bb8..adc4084a8 100644
--- a/community/remmina/PKGBUILD
+++ b/community/remmina/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=remmina
 pkgver=1.0.0
-pkgrel=9
+pkgrel=9.1
 pkgdesc="remote desktop client written in GTK+"
 arch=(i686 x86_64 mips64el)
 url="http://remmina.sourceforge.net/"
diff --git a/community/rlwrap/PKGBUILD b/community/rlwrap/PKGBUILD
index 6ca506ac5..a9318c5b3 100644
--- a/community/rlwrap/PKGBUILD
+++ b/community/rlwrap/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=rlwrap
 pkgver=0.37
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A 'readline wrapper'"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://utopia.knoware.nl/~hlub/uck/rlwrap/"
diff --git a/community/rox/PKGBUILD b/community/rox/PKGBUILD
index 2c30f6257..84ec1c785 100644
--- a/community/rox/PKGBUILD
+++ b/community/rox/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=rox
 pkgver=2.11
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A small and fast file manager which can optionally manage the desktop background and panels"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://roscidus.com/desktop/"
 depends=('sh' 'libsm' 'gtk2')
diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD
index 29f85909d..aa558a490 100644
--- a/community/roxterm/PKGBUILD
+++ b/community/roxterm/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 72814 2012-06-22 18:59:49Z ttopper $
+# $Id: PKGBUILD 88305 2013-04-16 12:29:33Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=roxterm
-pkgver=2.6.5
+pkgver=2.7.1
 pkgrel=1
-pkgdesc="Tabbed, VTE-based terminal emulator"
+pkgdesc='Tabbed, VTE-based terminal emulator'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://roxterm.sourceforge.net/"
+url='http://roxterm.sourceforge.net/'
 license=('GPL3')
-depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm')
+depends=('dbus-glib' 'vte3' 'hicolor-icon-theme')
 makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg')
 install=roxterm.install
 source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2")
-sha1sums=('1c0062abe7c133cf606f2f12013bad5a991b33a8')
-md5sums=('c95d9a74f342573bce71a19b50d46832')
+md5sums=('97b33c75fbded13d99ecdc1452ec6d0b')
+sha1sums=('3fb4012d5b5283cb740962cd295cdfd5c6c0044d')
 
 
 build() {
   cd "${srcdir}/roxterm-${pkgver}"
 
-  python2 mscript.py configure --prefix="/usr"
+  python2 mscript.py configure --prefix='/usr'
   python2 mscript.py build
 }
 
diff --git a/community/rsnapshot/PKGBUILD b/community/rsnapshot/PKGBUILD
deleted file mode 100644
index 428c44b09..000000000
--- a/community/rsnapshot/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 58364 2011-11-12 11:47:00Z andrea $
-# Maintainer:
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: Thorsten Tasch <tht@thorstentasch.de>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=rsnapshot
-pkgver=1.3.1
-pkgrel=3
-pkgdesc="A remote filesystem snapshot utility"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.rsnapshot.org"
-license=('GPL')
-depends=('perl' 'rsync' 'openssh')
-backup=('etc/rsnapshot.conf')
-source=("http://www.rsnapshot.org/downloads/${pkgname}-${pkgver}.tar.gz"
-        'rsnapshot')
-md5sums=('588f92995dcf60a6ea6df8d94a017e7e'
-         '4cd16eaa51d58a652cffde945985e91c')
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man
-	sed -i 's:/usr/bin/pod2man:/usr/bin/core_perl/pod2man:' Makefile
-	make
-}
-
-package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	make DESTDIR=${pkgdir} install
-	mv ${pkgdir}/etc/rsnapshot.conf.default ${pkgdir}/etc/rsnapshot.conf
-	install -Dm644 ${srcdir}/rsnapshot ${pkgdir}/etc/logrotate.d/rsnapshot
-}
diff --git a/community/rsnapshot/rsnapshot b/community/rsnapshot/rsnapshot
deleted file mode 100644
index 190b1f512..000000000
--- a/community/rsnapshot/rsnapshot
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/log/rsnapshot {
-   copytruncate
-   missingok
-}
diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD
index 0be1d9dd8..879207733 100644
--- a/community/rss-glx/PKGBUILD
+++ b/community/rss-glx/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82695 2013-01-23 00:16:05Z eric $
+# $Id: PKGBUILD 86576 2013-03-20 02:34:21Z eric $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
 # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au>
 
 pkgname=rss-glx
 pkgver=0.9.1
-pkgrel=13
+pkgrel=14
 pkgdesc="The Really Slick Screensavers port to GLX"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://rss-glx.sourceforge.net/"
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index c074a400d..9d8e173b6 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 81219 2012-12-13 11:58:39Z spupykin $
+# $Id: PKGBUILD 88526 2013-04-19 10:32:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=rsyslog
-pkgver=7.2.4
+pkgver=7.2.7
 pkgrel=1
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 depends=('zlib' 'libestr' 'libee' 'json-c')
-makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls')
+makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls')
 optdepends=('postgresql-libs: PostgreSQL Database Support'
-	    'libmysqlclient: MySQL Database Support'
+	    'libmariadbclient: MySQL Database Support'
 	    'net-snmp'
 	    'gnutls')
 backup=('etc/rsyslog.conf'
@@ -21,11 +21,13 @@ options=('strip' 'zipman' '!libtool')
 source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
 	'rsyslog'
 	'rsyslog.logrotate'
-	'rsyslog.conf.d')
-md5sums=('7fb607313ec534a4352da7aa2e0084ec'
+	'rsyslog.conf.d'
+	'rsyslog.conf')
+md5sums=('4a61d182acb5b5487e7b99dea8974857'
          'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
          '8065db4bef3061a4f000ba58779f6829'
-         '18565f38a4445136446a31a3c95ffc3e')
+         '18565f38a4445136446a31a3c95ffc3e'
+         'd61dd424e660eb16401121eed20d98bc')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -46,7 +48,8 @@ package() {
   make install DESTDIR=${pkgdir}
   # Install Daemons and Configuration Files
   install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d
-  install -D -m644 ${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf
+  install -D -m644 doc/${pkgname}-example.conf ${pkgdir}/usr/share/doc/$pkgname/${pkgname}.conf.example
+  install -D -m644 $srcdir/${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf
   install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname}
   install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
 
diff --git a/community/rsyslog/rsyslog.conf b/community/rsyslog/rsyslog.conf
new file mode 100644
index 000000000..4416c26d5
--- /dev/null
+++ b/community/rsyslog/rsyslog.conf
@@ -0,0 +1,44 @@
+# Minimal config
+
+$ModLoad imuxsock # provides support for local system logging
+$ModLoad imklog   # provides kernel logging support
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+$FileOwner root
+$FileGroup root
+$FileCreateMode 0640
+$DirCreateMode 0755
+$Umask 0022
+$WorkDirectory /var/spool/rsyslog
+$IncludeConfig /etc/rsyslog.d/*.conf
+
+auth,authpriv.*			/var/log/auth.log
+*.*;auth,authpriv.none		-/var/log/syslog
+#cron.*				/var/log/cron.log
+daemon.*			-/var/log/daemon.log
+kern.*				-/var/log/kern.log
+lpr.*				-/var/log/lpr.log
+mail.*				-/var/log/mail.log
+user.*				-/var/log/user.log
+
+mail.info			-/var/log/mail.info
+mail.warn			-/var/log/mail.warn
+mail.err			/var/log/mail.err
+
+news.crit			/var/log/news/news.crit
+news.err			/var/log/news/news.err
+news.notice			-/var/log/news/news.notice
+
+*.=debug;\
+	auth,authpriv.none;\
+	news.none;mail.none	-/var/log/debug
+*.=info;*.=notice;*.=warn;\
+	auth,authpriv.none;\
+	cron,daemon.none;\
+	mail,news.none		-/var/log/messages
+
+*.emerg				:omusrmsg:*
+
+daemon.*;mail.*;\
+	news.err;\
+	*.=debug;*.=info;\
+	*.=notice;*.=warn	|/dev/xconsole
diff --git a/community/rt3562sta/PKGBUILD b/community/rt3562sta/PKGBUILD
deleted file mode 100644
index 7ef335c9e..000000000
--- a/community/rt3562sta/PKGBUILD
+++ /dev/null
@@ -1,85 +0,0 @@
-# $Id: PKGBUILD 79180 2012-10-31 07:25:39Z tpowa $
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-# Based on SUSE spec https://build.opensuse.org/package/files?package=rt3562sta&project=driver%3Awireless
-
-pkgname=rt3562sta
-pkgver=2.4.1.1
-pkgrel=20
-pkgdesc="Ralink RT3562 PCI WLAN adaptors kernel module"
-arch=(i686 x86_64)
-url="http://www.mediatek.com/en/Products/support.php?sn=501"
-license=('GPL')
-depends=('linux')
-makedepends=('linux-headers')
-install=$pkgname.install
-source=(
-	http://dl.dropbox.com/u/362439/DPO_RT3562_3592_3062_LinuxSTA_V${pkgver}_20101217.tgz
-	$pkgname-$pkgver-config.patch
-	$pkgname-$pkgver-gcc-warnings-x86_64.patch
-	$pkgname-$pkgver-WPA-mixed.patch
-	$pkgname-$pkgver-convert-devicename-to-wlanX.patch
-	$pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch
-	$pkgname-$pkgver-return_nonvoid.patch
-	$pkgname-$pkgver-reduce_debug_output.patch
-	$pkgname-$pkgver-remove_date_time.patch
-)
-
-build() {
-	_kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
-	KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)
-
-	cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217"
-	patch -p0 -i "$srcdir/$pkgname-$pkgver-config.patch"
-	[ "$CARCH" == "x86_64" ] && patch -p0 -i "$srcdir/$pkgname-$pkgver-gcc-warnings-x86_64.patch"
-	patch -p0 -i "$srcdir/$pkgname-$pkgver-WPA-mixed.patch"
-	patch -p0 -i "$srcdir/$pkgname-$pkgver-convert-devicename-to-wlanX.patch"
-	patch -p0 -i "$srcdir/$pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch"
-	patch -p0 -i "$srcdir/$pkgname-$pkgver-return_nonvoid.patch"
-	patch -p0 -i "$srcdir/$pkgname-$pkgver-reduce_debug_output.patch"
-	patch -p0 -i "$srcdir/$pkgname-$pkgver-remove_date_time.patch"
-
-	# clean up this mess of mixing RT2860STA with RT3562STA
-	# in documentation files
-	mv RT2860STA.dat RT3562STA.dat
-	mv RT2860STACard.dat RT3562STACard.dat
-	sed -i 's/2860/3562/g' *STA* iwpriv_usage.txt
-
-	# as we change the default name of the interface from raX to wlanX, change respective references in documentation, too
-	sed -i 's|ra0|wlan0|g' *.txt README* *.dat
-	sed -i 's|ra1|wlan1|g' *.txt README* *.dat
-	sed -i 's|ra2|wlan2|g' *.txt README* *.dat
-
-	export EXTRA_CFLAGS="-DVERSION=$pkgver"
-
-	# this Makefile is far too strict...
-	echo "LINUX_SRC = /usr/lib/modules/$KERNEL_RELEASE/build" >> Makefile
-
-	make
-}
-
-package() {
-	_kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
-	depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)")
-	KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)
-	msg "Kernel = $KERNEL_VERSION"
-
-	cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217"
-
-	install -Dm 0640 RT3562STA.dat "$pkgdir/etc/Wireless/RT3562STA/RT3562STA.dat"
-	install -Dm 0644 os/linux/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko"
-	install -dm 0755 "$pkgdir/usr/share/doc/$pkgname"
-	install -m 0644 iwpriv_usage.txt README* RT3562STA* sta_ate_iwpriv_usage.txt "$pkgdir/usr/share/doc/$pkgname"
-
-	find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
-	sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install"
-}
-
-sha256sums=('71cd27784009894198f03470ec88e77f2cd176bf5f8d93b4dd984d3a3e543d5a'
-            'b1465fceaac99f26cc0e7db0562d2bf103b57656f0b7b57e404f59efb3373b27'
-            'd013ed5981a02be27b4aaf1e03670d68dbb16f40d9eb84930e58a96fc38ef947'
-            'c962d014ea6e84a8c3398ff13e4709cc309c29134cac0b5c702eab1026799887'
-            'e966d96026baee0447d6ad26742bcc40baa3f94530573d58f4eca842e107f809'
-            '7d2a83edfe6664a8e923dcda636c871220efc7ff4a82ab76a62fc97a11f2fcaa'
-            'd672b58cdb278e3ecaeb46f3e5e477e1da7d2fd5dbf896521a4d0993743b9ab9'
-            '4d1d5eb5c22d356af62f4f55d12b04eb8a557ea9c664edfbc79c9e0454ccca4e'
-            'a888d045b142127070c2c23ed1a84306d5202896265c828cf7e125ec2dd52389')
diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch b/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch
deleted file mode 100644
index caf2b1c6a..000000000
--- a/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/cmm_wpa.c.orig	2010-11-26 04:18:41.000000000 +0100
-+++ common/cmm_wpa.c	2010-12-01 15:09:22.000000000 +0100
-@@ -2410,7 +2410,7 @@
- 	UCHAR		PrimaryRsnie;			
- 	BOOLEAN		bMixCipher = FALSE;	// indicate the pairwise and group cipher are different
- 	UCHAR		p_offset;		
--	WPA_MIX_PAIR_CIPHER		FlexibleCipher = MIX_CIPHER_NOTUSE;	// it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode
-+	WPA_MIX_PAIR_CIPHER		FlexibleCipher = WPA_TKIPAES_WPA2_TKIPAES;	// it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode
- 		
- 	rsnielen_cur_p = NULL;
- 	rsnielen_ex_cur_p = NULL;
diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-config.patch b/community/rt3562sta/rt3562sta-2.4.1.1-config.patch
deleted file mode 100644
index dc245e38e..000000000
--- a/community/rt3562sta/rt3562sta-2.4.1.1-config.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- os/linux/config.mk.orig	2010-12-17 12:44:47.000000000 +0100
-+++ os/linux/config.mk	2010-12-17 19:53:36.000000000 +0100
-@@ -9,10 +9,10 @@
- 
- 
- # Support Wpa_Supplicant
--HAS_WPA_SUPPLICANT=n
-+HAS_WPA_SUPPLICANT=y
- 
- # Support Native WpaSupplicant for Network Maganger
--HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n
-+HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y
- 
- #Support Net interface block while Tx-Sw queue full
- HAS_BLOCK_NET_IF=n
-@@ -283,7 +283,7 @@
- endif
- 
- ifeq ($(CHIPSET),3562)
--WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT
-+WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT -DDOT11N_SS3_SUPPORT -DNEW_RATE_ADAPT_SUPPORT -DRT3593
- ifeq ($(HAS_DFS_SUPPORT),y)
- WFLAGS += -DDFS_HARDWARE_SUPPORT  -DDFS_DEBUG 
- endif
---- Makefile.orig	2010-12-17 12:44:47.000000000 +0100
-+++ Makefile	2010-12-17 19:51:39.000000000 +0100
-@@ -284,26 +284,26 @@
- endif
- 
- ifeq ($(RT28xx_MODE),AP)
--	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot
- ifeq ($(OSABL),YES)
--	cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot
--	cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot
- endif
- ifeq ($(PLATFORM),INF_AMAZON_SE)
--	cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net
-+#	cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net
- endif
- else	
- ifeq ($(RT28xx_MODE),APSTA)
--	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot
- ifeq ($(OSABL),YES)
--	cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot
--	cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot
- endif
- else
--	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
- ifeq ($(OSABL),YES)
--	cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot
--	cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot
- endif
- endif	
- endif	
-@@ -331,25 +331,25 @@
- endif
- 
- ifeq ($(RT28xx_MODE),AP)
--	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot
- ifeq ($(OSABL),YES)
--	cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot
--	cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot
- endif
- 	rm -f os/linux/rt$(CHIPSET)ap.ko.lzma
- 	/root/bin/lzma e os/linux/rt$(CHIPSET)ap.ko os/linux/rt$(CHIPSET)ap.ko.lzma
- else	
- ifeq ($(RT28xx_MODE),APSTA)
--	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot
- ifeq ($(OSABL),YES)
--	cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot
--	cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot
- endif
- else
--	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
- ifeq ($(OSABL),YES)
--	cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot
--	cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot
-+#	cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot
- endif
- endif
- endif
diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch b/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch
deleted file mode 100644
index 5ec4d5028..000000000
--- a/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/rtmp_def.h.orig	2010-11-26 04:18:41.000000000 +0100
-+++ include/rtmp_def.h	2010-12-01 14:57:05.000000000 +0100
-@@ -1451,8 +1451,8 @@
- #define SET_ENTRY_CLIWDS(_x)	CLIENT_STATUS_SET_FLAG((_x), fCLIENT_STATUS_CLI_WDS)
- #endif // CLIENT_WDS //
- 
--#define INF_MAIN_DEV_NAME		"ra"
--#define INF_MBSSID_DEV_NAME		"ra"
-+#define INF_MAIN_DEV_NAME		"wlan"
-+#define INF_MBSSID_DEV_NAME		"wlan"
- #define INF_WDS_DEV_NAME		"wds"
- #define INF_APCLI_DEV_NAME		"apcli"
- #define INF_MESH_DEV_NAME		"mesh"
diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch b/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch
deleted file mode 100644
index a53dbde86..000000000
--- a/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- os/linux/rt_linux.c.orig	2010-11-26 04:18:41.000000000 +0100
-+++ os/linux/rt_linux.c	2010-12-01 14:57:53.000000000 +0100
-@@ -479,9 +479,9 @@
- 		MEM_DBG_PKT_ALLOC_INC(pAd);
- 
- 		skb_reserve(skb, 2);				
--		NdisMoveMemory(skb->tail, pHeader802_3, HdrLen);
-+		NdisMoveMemory(skb_tail_pointer(skb), pHeader802_3, HdrLen); //
- 		skb_put(skb, HdrLen);
--		NdisMoveMemory(skb->tail, pData, DataSize);
-+		NdisMoveMemory(skb_tail_pointer(skb), pData, DataSize); //
- 		skb_put(skb, DataSize);
- 		skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID);
- 		pPacket = OSPKT_TO_RTPKT(skb);
diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch b/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch
deleted file mode 100644
index 6754f214d..000000000
--- a/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/os/rt_linux.h.orig	2011-01-07 11:20:02.000000000 +0100
-+++ include/os/rt_linux.h	2011-01-07 11:21:30.000000000 +0100
-@@ -611,10 +611,10 @@
- 
- #define DBGPRINT_RAW(Level, Fmt)    \
- do{                                   \
--    if (Level <= RTDebugLevel)      \
-+/*    if (Level <= RTDebugLevel)      \
-     {                               \
-         printk Fmt;               \
--    }                               \
-+    }*/                               \
- }while(0)
- 
- #define DBGPRINT(Level, Fmt)    DBGPRINT_RAW(Level, Fmt)
diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch b/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch
deleted file mode 100644
index a0d00d6e3..000000000
--- a/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- include/os/rt_linux.h.orig	2010-11-26 04:18:41.000000000 +0100
-+++ include/os/rt_linux.h	2010-12-01 14:58:46.000000000 +0100
-@@ -111,10 +111,10 @@
- 
- #ifdef CONFIG_STA_SUPPORT
- #ifdef RTMP_MAC_PCI
--#define STA_PROFILE_PATH			"/etc/Wireless/RT2860STA/RT2860STA.dat"
-+#define STA_PROFILE_PATH			"/etc/Wireless/RT3562STA/RT3562STA.dat"
- #define STA_DRIVER_VERSION			"2.4.1.1"
- #ifdef MULTIPLE_CARD_SUPPORT
--#define CARD_INFO_PATH			"/etc/Wireless/RT2860STA/RT2860STACard.dat"
-+#define CARD_INFO_PATH			"/etc/Wireless/RT3562STA/RT3562STACard.dat"
- #endif // MULTIPLE_CARD_SUPPORT //
- #endif // RTMP_MAC_PCI //
- 
---- os/linux/pci_main_dev.c.orig	2010-12-17 19:59:25.000000000 +0100
-+++ os/linux/pci_main_dev.c	2010-12-17 20:00:12.000000000 +0100
-@@ -90,14 +90,15 @@
- MODULE_VERSION(STA_DRIVER_VERSION);
- #endif
- #endif // CONFIG_STA_SUPPORT //
--
-+MODULE_DESCRIPTION("RT3562 Wireless Lan Linux Driver");
-+MODULE_LICENSE("GPL");
- 
- //
- // Our PCI driver structure
- //
- static struct pci_driver rt2860_driver =
- {
--    name:       "rt2860",
-+    name:       "rt3562",
-     id_table:   rt2860_pci_tbl,
-     probe:      rt2860_probe,
- #if LINUX_VERSION_CODE >= 0x20412
-@@ -317,9 +318,9 @@
- 	}
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
--	print_name = pci_dev ? pci_name(pci_dev) : "rt2860";
-+	print_name = pci_dev ? pci_name(pci_dev) : "rt3562";
- #else
--	print_name = pci_dev ? pci_dev->slot_name : "rt2860";
-+	print_name = pci_dev ? pci_dev->slot_name : "rt3562";
- #endif // LINUX_VERSION_CODE //
- 
- 	if ((rv = pci_request_regions(pci_dev, print_name)) != 0)
diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch b/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch
deleted file mode 100644
index b17ba5a12..000000000
--- a/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- os/linux/sta_ioctl.c.orig	2010-12-17 12:44:47.000000000 +0100
-+++ os/linux/sta_ioctl.c	2011-08-02 14:52:37.000000000 +0200
-@@ -1812,7 +1812,7 @@
-             wrq->length = strlen(extra) + 1; // 1: size of '\0'
-             break;
-         case SHOW_DRVIER_VERION:
--            sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, __DATE__, __TIME__ );
-+            sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, NULL, NULL );
-             wrq->length = strlen(extra) + 1; // 1: size of '\0'
-             break;
- #ifdef DOT11_N_SUPPORT
diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch b/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch
deleted file mode 100644
index 7416a31f9..000000000
--- a/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- os/linux/rt_main_dev.c.orig	2010-12-17 12:44:47.000000000 +0100
-+++ os/linux/rt_main_dev.c	2010-12-17 19:42:23.000000000 +0100
-@@ -1247,7 +1247,7 @@
- 	RTMP_OS_TASK *pTask;
- 
- 	if (pAd->bWriteDat == FALSE)
--		return;
-+		return 0;
- 
- 	DBGPRINT(RT_DEBUG_TRACE, ("-->WriteDatThreadInit()\n"));
- 
diff --git a/community/rt3562sta/rt3562sta.install b/community/rt3562sta/rt3562sta.install
deleted file mode 100644
index c3b988aa6..000000000
--- a/community/rt3562sta/rt3562sta.install
+++ /dev/null
@@ -1,16 +0,0 @@
-rebuild_module_dependencies() {
-	EXTRAMODULES='extramodules-3.6-ARCH'
-	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-	rebuild_module_dependencies
-}
-
-post_upgrade() {
-	rebuild_module_dependencies
-}
-
-post_remove() {
-	rebuild_module_dependencies
-}
diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD
index 583df259d..5678a24b6 100644
--- a/community/ruby-cairo/PKGBUILD
+++ b/community/ruby-cairo/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 72819 2012-06-22 21:24:20Z arodseth $
+# $Id: PKGBUILD 87182 2013-03-28 13:42:37Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
+# Contributor: Jeremy <reebydobalina@yahoo.ca>
 
 pkgname=ruby-cairo
 pkgver=1.12.2
-pkgrel=1
-pkgdesc="Ruby bindings for cairo"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://cairographics.org/rcairo/"
+pkgrel=7
+pkgdesc='Ruby bindings for cairo'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://cairographics.org/rcairo/'
 license=('GPL')
-depends=('ruby' 'cairo>=1.2.0')
+depends=('ruby' 'cairo')
 makedepends=('ruby-pkgconfig')
 source=("http://cairographics.org/releases/rcairo-$pkgver.tar.gz")
 sha256sums=('f071d6ccb12cb6dc1fc91eb086d6150ce779930fe5af38a6987e378c809362c5')
@@ -25,6 +26,8 @@ package() {
   cd "$srcdir/rcairo-$pkgver"
 
   make DESTDIR="$pkgdir" install
+  install -Dm644 ext/cairo/cairo.so \
+    "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$CARCH-linux/cairo.so"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD
index b927efd96..7f0b6f99e 100644
--- a/community/ruby-gtk2/PKGBUILD
+++ b/community/ruby-gtk2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83903 2013-02-06 13:56:53Z arodseth $
+# $Id: PKGBUILD 88649 2013-04-21 07:40:40Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
@@ -8,22 +8,34 @@
 pkgbase=ruby-gtk2
 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2'
          'ruby-pango')
-pkgver=1.2.1
-pkgrel=2
+pkgver=1.2.6
+pkgrel=1
 arch=('x86_64' 'i686' 'mips64el')
 url='http://ruby-gnome2.sourceforge.jp/'
 license=('LGPL')
-makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2')
+makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2')
 source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz")
-sha256sums=('cb6e329f64042c8d24248204e11bb4652f9b2984ac2965d82dab49634deb1125')
+sha256sums=('1b685d47b04f0a670a22db2af126cd145300bc664c38ee530f459c251ce7481f')
 
-build() {
+prepare() {
   cd "$srcdir/ruby-gtk2-$pkgver"
+
   LANG="en_US.UTF-8" \
     ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --vendor
-  #mkdir -p \
-  #  "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/site_ruby/1.9.1/i686-linux"
-  make -j1
+  mkdir -p \
+    "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \
+    "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \
+    "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \
+    "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \
+    "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \
+    "$pkgdir/ruby-pango/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" \
+    "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux"
+}
+
+build() {
+  cd "$srcdir/ruby-gtk2-$pkgver"
+
+  make
 }
 
 package_ruby-atk() {
@@ -31,7 +43,7 @@ package_ruby-atk() {
   depends=("ruby-glib2=$pkgver" 'atk')
 
   cd "$srcdir/ruby-gtk2-$pkgver/atk"
-  make DESTDIR="$pkgdir/" install
+  make includedir="/usr/include" DESTDIR="$pkgdir" install
 }
 
 package_ruby-gdkpixbuf2() {
@@ -39,7 +51,7 @@ package_ruby-gdkpixbuf2() {
   depends=("ruby-glib2=$pkgver" 'gdk-pixbuf2')
 
   cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2"
-  make DESTDIR="$pkgdir/" install
+  make includedir="/usr/include" DESTDIR="$pkgdir" install
 }
 
 package_ruby-gio2() {
@@ -47,7 +59,7 @@ package_ruby-gio2() {
   depends=("ruby-glib2=$pkgver")
 
   cd "$srcdir/ruby-gtk2-$pkgver/gio2"
-  make DESTDIR="$pkgdir/" install
+  make includedir="/usr/include" DESTDIR="$pkgdir/" install
 }
 
 package_ruby-glib2() {
@@ -55,7 +67,7 @@ package_ruby-glib2() {
   depends=('glib2' 'ruby')
 
   cd "$srcdir/ruby-gtk2-$pkgver/glib2"
-  make DESTDIR="$pkgdir/" install
+  make includedir="/usr/include" DESTDIR="$pkgdir/" install
 }
 
 package_ruby-gtk2() {
@@ -64,7 +76,7 @@ package_ruby-gtk2() {
            "ruby-gdkpixbuf2=$pkgver")
 
   cd "$srcdir/ruby-gtk2-$pkgver/gtk2"
-  make DESTDIR="$pkgdir/" install
+  make includedir="/usr/include" DESTDIR="$pkgdir/" install
 }
 
 package_ruby-pango() {
@@ -72,7 +84,7 @@ package_ruby-pango() {
   depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango')
 
   cd "$srcdir/ruby-gtk2-$pkgver/pango"
-  make DESTDIR="$pkgdir/" install
+  make includedir="/usr/include" DESTDIR="$pkgdir/" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD
index 243a6c626..fc150f002 100644
--- a/community/ruby-gtk3/PKGBUILD
+++ b/community/ruby-gtk3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83911 2013-02-06 14:10:47Z arodseth $
+# $Id: PKGBUILD 88651 2013-04-21 08:01:04Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Eric Bélanger
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
@@ -8,27 +8,34 @@
 pkgbase=ruby-gtk3
 pkgname=('ruby-gtk3' 'ruby-gdk3')
 depends=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-glib2' 'ruby-pango')
-pkgver=1.2.1
-pkgrel=2
-arch=('x86_64' 'i686')
+pkgver=1.2.6
+pkgrel=1
+arch=('x86_64' 'i686' 'mips64el')
 url='http://ruby-gnome2.sourceforge.jp/'
 license=('LGPL')
 makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk3')
 source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz")
-sha256sums=('78c7dbfaebabefe0f5a3d96c779cc08ea949a354e3f7cd1ff797d850ded4168a')
+sha256sums=('105395100bcbcfe8fa3fd5a2963ded64092303da64f31400887dbcd6a84d1e1a')
 
-build() {
+prepare() {
 	cd "$srcdir/ruby-gtk3-$pkgver"
+
 	LANG="en_US.UTF-8" ruby extconf.rb gtk3 gdk3 --vendor
+}
+
+build() {
+	cd "$srcdir/ruby-gtk3-$pkgver"
+
 	make
 }
 
 package_ruby-gtk3() {
   pkgdesc='Ruby bindings for gtk3'
   depends=('gtk3' "ruby-glib2=$pkgver" "ruby-pango=$pkgver" "ruby-atk=$pkgver"
-           "ruby-gdkpixbuf2=$pkgver")
+           "ruby-gdkpixbuf2=$pkgver" "ruby-gdk3=$pkgver")
 
 	cd "$srcdir/ruby-gtk3-$pkgver/gtk3"
+  mkdir -p "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$CARCH-linux"
 	make DESTDIR="$pkgdir/" install
 }
 
@@ -37,6 +44,7 @@ package_ruby-gdk3() {
   depends=('ruby' 'gtk3')
 
 	cd "$srcdir/ruby-gtk3-$pkgver/gdk3"
+  mkdir -p "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$CARCH-linux"
 	make DESTDIR="$pkgdir/" install
 }
 
diff --git a/community/ruby-iconv/PKGBUILD b/community/ruby-iconv/PKGBUILD
new file mode 100755
index 000000000..d2b60d9ac
--- /dev/null
+++ b/community/ruby-iconv/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 89242 2013-04-28 10:01:07Z alucryd $
+# Maintainer: Alucryd <alucryd at gmail dot com>
+
+pkgname=ruby-iconv
+pkgver=1.0.3
+pkgrel=2
+pkgdesc="Wrapper library for iconv"
+arch=('i686' 'x86_64')
+url="https://github.com/nurse/iconv"
+license=('GPL3')
+depends=('ruby')
+makedepends=('rubygems')
+options=('!emptydirs')
+source=("https://rubygems.org/downloads/${pkgname#*-}-${pkgver}.gem")
+sha256sums=('94a9b62a56c96226b62b787cd45fdc48c03f4517f1e36e64db113b010fb012da')
+
+package() {
+  cd "${srcdir}"
+
+  local _gemdir="$(ruby -rubygems -e 'puts Gem.default_dir')"
+  gem install --no-user-install --ignore-dependencies -i "${pkgdir}"${_gemdir} ${pkgname#*-}-${pkgver}.gem
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/ruby-ncurses/PKGBUILD b/community/ruby-ncurses/PKGBUILD
index bd3664892..3888c251c 100644
--- a/community/ruby-ncurses/PKGBUILD
+++ b/community/ruby-ncurses/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 64613 2012-02-17 02:56:44Z tdziedzic $
+# $Id: PKGBUILD 86883 2013-03-23 23:10:46Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Jeff Mickey <j@codemac.net>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
+
 pkgname=ruby-ncurses
 pkgver=1.3.1
-pkgrel=3
-pkgdesc="Module for interactive text console applications (ncurses)"
+pkgrel=4
+pkgdesc='Module for interactive text console applications (ncurses)'
 arch=('x86_64' 'i686' 'mips64el')
-url="http://ncurses-ruby.berlios.de/"
+url='http://ncurses-ruby.berlios.de/'
 license=('GPL')
-depends=('ruby')
+depends=('ruby' 'ncurses')
 source=("http://download.berlios.de/ncurses-ruby/ncurses-ruby-$pkgver.tar.bz2")
-md5sums=('63fd3d09a51cdd745e1ed37f85621ea2')
+sha256sums=('dca8ce452e989ce1399cb683184919850f2baf79e6af9d16a7eed6a9ab776ec5')
 
 build()  {
   cd "$srcdir/ncurses-ruby-$pkgver"
@@ -23,7 +24,8 @@ build()  {
 
 package() {
   cd "$srcdir/ncurses-ruby-$pkgver"
-  make DESTDIR="$pkgdir" install
+
+  make includedir="/usr/include" DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/rust/PKGBUILD b/community/rust/PKGBUILD
new file mode 100644
index 000000000..11a5af15f
--- /dev/null
+++ b/community/rust/PKGBUILD
@@ -0,0 +1,63 @@
+# $Id: PKGBUILD 87747 2013-04-05 23:21:32Z thestinger $
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+pkgname=rust
+pkgver=0.6
+pkgrel=3
+arch=('i686' 'x86_64')
+pkgdesc='A safe, concurrent, practical language'
+url='http://www.rust-lang.org/'
+license=('MIT' 'Apache')
+depends=(gcc-libs shared-mime-info)
+makedepends=(libffi perl python2 curl chrpath emacs)
+optdepends=('haskell-pandoc: documentation generator (rustdoc)')
+source=("http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz")
+sha256sums=('e11cb529a1e20f27d99033181a9e0e131817136b46d2742f0fa1afa1210053e5')
+install=rust.install
+
+build() {
+  cd rust-$pkgver
+
+  ./configure --prefix=/usr --disable-docs
+
+  # avoid python makedepend (force fallback to python2)
+  sed -i 's/^PYTHONVERSION.*/PYTHONVERSION := 3/' src/llvm/Makefile.rules
+
+  make
+}
+
+check() {
+  cd rust-$pkgver
+  make check
+}
+
+package() {
+  cd rust-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  mkdir -p "$pkgdir/usr/share/vim" "$pkgdir/usr/share/licenses/rust"
+
+  cp -a src/etc/vim "$pkgdir/usr/share/vim/vimfiles"
+  find "$pkgdir/usr/share/vim" -type f -exec chmod 644 {} +
+  find "$pkgdir/usr/share/vim" -type d -exec chmod 755 {} +
+
+  install -Dm644 src/etc/kate/rust.xml "$pkgdir/usr/share/apps/katepart/syntax/rust.xml"
+  install -Dm644 src/etc/gedit/share/mime/packages/rust.xml \
+    "$pkgdir/usr/share/mime/packages/rust.xml"
+  install -Dm644 src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang \
+    "$pkgdir/usr/share/gtksourceview-3.0/language-specs/rust.lang"
+
+  install -m644 LICENSE-APACHE "$pkgdir/usr/share/licenses/rust"
+  install -m644 LICENSE-MIT "$pkgdir/usr/share/licenses/rust"
+
+  cd src/etc/emacs
+  make
+  mkdir -p "$pkgdir/usr/share/emacs/site-lisp/"
+  install -Dm644 cm-mode.el{,c} rust-mode.el{,c} "$pkgdir/usr/share/emacs/site-lisp/"
+
+  cd "$pkgdir/usr"
+
+  # https://github.com/mozilla/rust/issues/5219
+  chrpath -d bin/* lib/*.so lib/rustc/*/lib/*.so
+
+  cp lib/rustc/*/lib/{librustdoc-*-0.6.so,librustpkg-*-0.6.so} lib/
+}
diff --git a/community/mplayer-vaapi/mplayer-vaapi.install b/community/rust/rust.install
index a44f19aef..80b6673ec 100644
--- a/community/mplayer-vaapi/mplayer-vaapi.install
+++ b/community/rust/rust.install
@@ -1,11 +1,11 @@
 post_install() {
-  update-desktop-database -q
+  update-mime-database usr/share/mime >/dev/null
 }
+
 post_upgrade() {
   post_install
 }
+
 post_remove() {
   post_install
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/rusxmms/PKGBUILD b/community/rusxmms/PKGBUILD
index 96b89ac1c..d1926630c 100644
--- a/community/rusxmms/PKGBUILD
+++ b/community/rusxmms/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 54066 2011-08-13 05:45:42Z ebelanger $
+# $Id: PKGBUILD 85265 2013-02-28 10:39:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
@@ -23,36 +23,29 @@ md5sums=('f3e6dbaf0b3f571a532ab575656be506'
 
 build() {
   cd "${srcdir}"/xmms-${_xmmsver}
+  sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/g' configure.in libxmms/configure.in
 
-if true; then
   ln -s "$srcdir"/RusXMMS2 "$srcdir"/xmms-${_xmmsver}/RusXMMS2
   (cd "$srcdir"/xmms-${_xmmsver}/RusXMMS2 && ./apply.sh)
 
   mv "$srcdir"/RusXMMS2/source/* "$srcdir"/xmms-${_xmmsver}/libxmms/
-#  sed -i 's#charset.c charset.h#charset.c charset.h rcc.h rcc.c rcc_lang.h#g' "$srcdir"/xmms-${_xmmsver}/libxmms/Makefile.am && \
-
-# I already remove esound from repo and it has some autotools errors that I can't seem to figure out. So let's use a hack to get the esound removal rebuild done.
-#  aclocal
-# automake
-autoconf
+  autoconf
   sed -i 's/unicode.c//g' Input/mpg123/Makefile.in
   sed -i 's/unicode.lo//g' Input/mpg123/Makefile.in
 
-
   (cd libxmms && aclocal && automake && autoconf)
 
   case $CARCH in
     x86_64)
-        ./configure --prefix=/usr --disable-mikmod --disable-simd
+	./configure --prefix=/usr --disable-mikmod --disable-simd
 	;;
     i686)
-        ./configure --prefix=/usr --disable-mikmod --enable-simd --disable-vorbis --disable-vorbistest
+	./configure --prefix=/usr --disable-mikmod --enable-simd --disable-vorbis --disable-vorbistest
 	;;
     *)
 	return 1
 	;;
   esac
-fi
 
   make
 }
diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD
index cdcd4c69c..eef80ac3c 100644
--- a/community/rxvt-unicode/PKGBUILD
+++ b/community/rxvt-unicode/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 81737 2012-12-28 00:16:43Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 87749 2013-04-06 00:49:20Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=rxvt-unicode
-pkgver=9.16
-pkgrel=1
+pkgver=9.18
+pkgrel=2
 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://software.schmorp.de/pkg/rxvt-unicode.html'
@@ -19,10 +19,10 @@ source=(
   'urxvtc.desktop'
   'urxvt-tabbed.desktop'
 )
-md5sums=('2e2942e8367624affebc0568e3671b66'
-         '88d8786d74b819450adf722180db09fd'
-         'bebf5b6b399b74b557fcedbdb47cc387'
-         '2604896bb107fbb5511bfd6f46d65894')
+md5sums=('963ccc748fe5bca925e7b92c0404d68b'
+         'fec94dc986fa37ec380079d81de3e0b2'
+         'fac55f0a8404c86dad3e702146762332'
+         '8a5599197568c63720e282b9722a7990')
 
 build() {
   cd $pkgname-$pkgver
@@ -73,4 +73,4 @@ package() {
   done
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/rxvt-unicode/urxvt-tabbed.desktop b/community/rxvt-unicode/urxvt-tabbed.desktop
index f3efdc9b9..172006b4a 100644
--- a/community/rxvt-unicode/urxvt-tabbed.desktop
+++ b/community/rxvt-unicode/urxvt-tabbed.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=urxvt (tabbed)
 Comment=An unicode capable and tabbed rxvt clone
 Exec=urxvt-tabbed
-Icon=terminal
+Icon=utilities-terminal
 Terminal=false
 Type=Application
-Categories=Application;System;TerminalEmulator;
+Categories=System;TerminalEmulator;
diff --git a/community/rxvt-unicode/urxvt.desktop b/community/rxvt-unicode/urxvt.desktop
index 0a9baf7df..762291870 100644
--- a/community/rxvt-unicode/urxvt.desktop
+++ b/community/rxvt-unicode/urxvt.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=urxvt
 Comment=An unicode capable rxvt clone
 Exec=urxvt
-Icon=terminal
+Icon=utilities-terminal
 Terminal=false
 Type=Application
-Categories=Application;System;TerminalEmulator;
+Categories=System;TerminalEmulator;
diff --git a/community/rxvt-unicode/urxvtc.desktop b/community/rxvt-unicode/urxvtc.desktop
index e39a418f6..3a2df410f 100644
--- a/community/rxvt-unicode/urxvtc.desktop
+++ b/community/rxvt-unicode/urxvtc.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=urxvt (client)
 Comment=An unicode capable rxvt clone client for urxvtd
 Exec=urxvtc
-Icon=terminal
+Icon=utilities-terminal
 Terminal=false
 Type=Application
-Categories=Application;System;TerminalEmulator;
+Categories=System;TerminalEmulator;
diff --git a/community/rygel/PKGBUILD b/community/rygel/PKGBUILD
deleted file mode 100644
index 40be1228e..000000000
--- a/community/rygel/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 81715 2012-12-27 20:10:52Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=rygel
-pkgver=0.16.4
-pkgrel=1
-pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://live.gnome.org/Rygel"
-license=('LGPL')
-depends=('gupnp-av' 'gupnp-dlna' 'libgee' 'gtk3' 'libunistring' 'libtracker-sparql' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('vala' 'intltool')
-optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
-            'gstreamer0.10-bad-plugins: Extra media codecs'            
-            'gstreamer0.10-ugly-plugins: Extra media codecs'
-            'gstreamer0.10-ffmpeg: Extra media codecs'
-            'tracker: Share indexed media files')
-backup=('etc/rygel.conf')
-options=('!libtool')
-install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3cf338c120751ea068c90f65bfb2a63c436cdf59b02ce159b6376a349717ed7a')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --enable-mediathek-plugin --enable-gst-launch-plugin
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index f48ccb516..27c573cb0 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83604 2013-02-03 20:48:03Z dwallace $
+# $Id: PKGBUILD 87136 2013-03-27 19:52:53Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Antonio Rojas < nqn1976 @ gmail.com >
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
 # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=5.6
+pkgver=5.8
 pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
@@ -24,7 +24,7 @@ options=('!makeflags')
 install="${pkgname}.install"
 source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
         'SAGE-notebook.desktop')
-md5sums=('ce50c9e0c0ed1dca3038891c5c929509'
+md5sums=('fc5b401174ee1efa7aea163e804c2b42'
          'b82f94383829eee26648feb977e2d89b')
 
 build() {
@@ -98,3 +98,5 @@ package() {
 }
 
 # vim :set ts=2 sw=2 et:
+md5sums=('b91d6c20798f396a9c875527c78b3587'
+         'b82f94383829eee26648feb977e2d89b')
diff --git a/community/sarg/PKGBUILD b/community/sarg/PKGBUILD
index 63f0fe90f..5801e137a 100644
--- a/community/sarg/PKGBUILD
+++ b/community/sarg/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83444 2013-02-01 09:35:37Z spupykin $
+# $Id: PKGBUILD 89921 2013-05-05 14:50:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: JJDaNiMoTh <jjdanimoth.aur@gmail.com>
 # Contributor: Tino Reichardt <milky-archlinux@mcmilk.de>
 
 pkgname=sarg
-pkgver=2.3.5
+pkgver=2.3.6
 pkgrel=1
 pkgdesc="Squid Analysis Report Generator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ backup=('etc/sarg/css.tpl'
 	'etc/sarg/sarg.conf'
 	'etc/sarg/user_limit_block')
 source=(http://downloads.sourceforge.net/sourceforge/sarg/$pkgname-$pkgver.tar.gz)
-md5sums=('a10545aa0571f73789d81dcfca5bfb3c')
+md5sums=('399809d00671ae564468bf363c12fd7f')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/sauerbraten/PKGBUILD b/community/sauerbraten/PKGBUILD
deleted file mode 100644
index ed3520ba6..000000000
--- a/community/sauerbraten/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 75284 2012-08-17 21:27:10Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: Christoph Siegenthaler <csi@gmx.ch>
-# Contributor: Jesse Young <jesse@eon.jlyo.org>
-
-pkgname=sauerbraten
-pkgver=2010_07_28_justice_edition
-pkgrel=5
-pkgdesc="FPS that uses an improved version of the Cube engine"
-arch=('i686' 'x86_64')
-url="http://www.sauerbraten.org/"
-license=('ZLIB')
-makedepends=('sdl_mixer' 'sdl_image' 'libgl' 'mesa' 'gendesk')
-install=sauerbraten.install
-backup=('etc/conf.d/sauerbraten')
-source=(http://downloads.sourceforge.net/$pkgname/${pkgname}_${pkgver}_linux.tar.bz2
-	sauerbraten-client
-	sauerbraten-server
-	sauerbraten.confd
-	sauerbraten.rcd
-	sauerbraten.png
-	sauerbraten.install
-	sauerbraten.service
-	license.txt
-	fix-indirect-linking.diff)
-md5sums=('0947cb37b628873063270be1fcce27f6'
-         'ac66ef9e80d6fc1b4b047df1c36c07c0'
-         '4a42c314d01ccdc4c76fad38d18c7434'
-         '8e26aeba1ef178c24e22723d3c48d7e1'
-         'e0a2e0679c34b39623964ee68e6fae1e'
-         '3e602f421f7342cf8c3ed16314523d6f'
-         '2f7b423f49491359ff776a91414db4d8'
-         '3c964cdd0906461c0404641b1eb52d96'
-         'cf46cd0148f03b7477f7c54aec865abe'
-         'a9a9b658affd933ad354be45da998354')
-_exec=('sauerbraten-client %u')
-
-build() {
-  cd "$srcdir"
-  gendesk
-  
-  cd "$pkgname/src"
-
-  patch -Np1 -i ../../fix-indirect-linking.diff
-
-  make
-
-  # remove cvs directories
-  find ${srcdir}/$pkgname -type d -name CVS -exec rm -rf '{}' \; 2> /dev/null
-}
-
-package() {
-  depends=('sdl_mixer' 'sdl_image' 'libgl' 'sauerbraten-data')
-
-  cd ${srcdir}/$pkgname/src
-
-  make DESTDIR="${pkgdir}" install
-
-  cd ..
-  install -D bin_unix/native_client ${pkgdir}/opt/sauerbraten/bin/linux_client
-  install -D bin_unix/native_server ${pkgdir}/opt/sauerbraten/bin/linux_server
-
-  install -Dm755 ${srcdir}/sauerbraten-client ${pkgdir}/usr/bin/sauerbraten-client
-  install -Dm755 ${srcdir}/sauerbraten-server ${pkgdir}/usr/sbin/sauerbraten-server
-  install -Dm644 ${srcdir}/sauerbraten.confd ${pkgdir}/etc/conf.d/sauerbraten
-  install -Dm755 ${srcdir}/sauerbraten.rcd ${pkgdir}/etc/rc.d/sauerbraten
-  install -Dm644 ${srcdir}/sauerbraten.service ${pkgdir}/usr/lib/systemd/system/sauerbraten.service
-  install -Dm644 ${srcdir}/sauerbraten.desktop ${pkgdir}/usr/share/applications/sauerbraten.desktop
-  install -Dm644 ${srcdir}/sauerbraten.png ${pkgdir}/usr/share/pixmaps/sauerbraten.png
-  install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/sauerbraten/license.txt
-}
diff --git a/community/sauerbraten/fix-indirect-linking.diff b/community/sauerbraten/fix-indirect-linking.diff
deleted file mode 100644
index 56ed8825b..000000000
--- a/community/sauerbraten/fix-indirect-linking.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: sauerbraten/Makefile
-===================================================================
---- sauerbraten.orig/Makefile	2010-07-29 21:24:21.000000000 -0400
-+++ sauerbraten/Makefile	2010-07-29 21:26:15.717746486 -0400
-@@ -21,11 +21,14 @@
- CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
- else	
- CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
--CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
-+CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11
- endif
- ifeq ($(PLATFORM),Linux)
- CLIENT_LIBS+= -lrt
- endif
-+ifeq ($(PLATFORM),GNU/kFreeBSD)
-+CLIENT_LIBS+= -lrt
-+endif
- CLIENT_OBJS= \
- 	shared/crypto.o \
- 	shared/geom.o \
diff --git a/community/sauerbraten/license.txt b/community/sauerbraten/license.txt
deleted file mode 100644
index f38792c76..000000000
--- a/community/sauerbraten/license.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-LICENSE
-=======
-
-Sauerbraten game engine source code, any release.
-
-Copyright (C) 2001-2006 Wouter van Oortmerssen.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-
-
-LICENSE NOTES
-=============
-The license covers the source code found in the "src" directory of this
-archive, the included enet network library which sauerbraten uses is covered by
-an MIT-style license, which is however compatible with the above license for all 
-practical purposes.
-
-Game media included in the game (maps, textures, sounds, models etc.)
-are NOT covered by this license, and may have individual copyrights and
-distribution restrictions (see individual readmes).
diff --git a/community/sauerbraten/sauerbraten-client b/community/sauerbraten/sauerbraten-client
deleted file mode 100755
index 8a9b354f3..000000000
--- a/community/sauerbraten/sauerbraten-client
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-WIDTH=1024
-HEIGHT=768
-[ -f /etc/conf.d/sauerbraten ] && . /etc/conf.d/sauerbraten
-
-cd /opt/sauerbraten
-if [ -f /usr/bin/aoss ]; then
-	aoss bin/linux_client -w$WIDTH -h$HEIGHT -q${HOME}/.config/sauerbraten -r
-else
-	bin/linux_client -w$WIDTH -h$HEIGHT -q${HOME}/.config/sauerbraten -r
-fi
-
-
diff --git a/community/sauerbraten/sauerbraten-server b/community/sauerbraten/sauerbraten-server
deleted file mode 100755
index b4c79cb7f..000000000
--- a/community/sauerbraten/sauerbraten-server
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-SAUER_USER=nobody
-LOGDIR=/var/log/sauerbraten
-[ -f /etc/conf.d/sauerbraten ] && . /etc/conf.d/sauerbraten
-
-cd /opt/sauerbraten
-
-if [ "$(id -u)" == "0" ]; then
-    if [ ! -d "$LOGDIR" ]; then
-        mkdir -p "$LOGDIR"
-        chown "$SAUER_USER:log" "$LOGDIR"
-    fi
-
-    sudo -Hu "$SAUER_USER" \
-    nohup /opt/sauerbraten/bin/linux_server \
-            >>  "$LOGDIR/main.log" \
-            2>> "$LOGDIR/error.log" \
-            <   /dev/null  &
-else
-    bin/linux_server
-fi
diff --git a/community/sauerbraten/sauerbraten.confd b/community/sauerbraten/sauerbraten.confd
deleted file mode 100644
index 93cd32de7..000000000
--- a/community/sauerbraten/sauerbraten.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# Client options
-WIDTH=1024
-HEIGHT=768
-
-# Server options
-SAUER_USER=sauerbraten
-LOGDIR=/var/log/sauerbraten
diff --git a/community/sauerbraten/sauerbraten.install b/community/sauerbraten/sauerbraten.install
deleted file mode 100644
index 2ee7689ab..000000000
--- a/community/sauerbraten/sauerbraten.install
+++ /dev/null
@@ -1,22 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  getent group sauerbraten >/dev/null 2>&1 || groupadd -r sauerbraten 
-  if getent passwd sauerbraten > /dev/null 2>&1; then
-    usr/sbin/usermod -d /var/spool/sauerbraten -c 'Sauerbraten' -s /sbin/nologin sauerbraten > /dev/null 2>&1
-  else
-    usr/sbin/useradd -c 'Sauerbraten' -r -g sauerbraten -d /opt/sauerbraten -s /sbin/nologin sauerbraten 
-  fi
-  passwd -l sauerbraten > /dev/null
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  getent passwd sauerbraten >/dev/null 2>&1 && userdel sauerbraten
-}
-
diff --git a/community/sauerbraten/sauerbraten.png b/community/sauerbraten/sauerbraten.png
deleted file mode 100644
index 5ec7606bc..000000000
--- a/community/sauerbraten/sauerbraten.png
+++ /dev/null
diff --git a/community/sauerbraten/sauerbraten.rcd b/community/sauerbraten/sauerbraten.rcd
deleted file mode 100644
index fb95aae16..000000000
--- a/community/sauerbraten/sauerbraten.rcd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting sauerbraten-server"
-    [ ! -f /var/run/daemons/sauerbraten ] && /usr/sbin/sauerbraten-server
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      pgrep -of "/opt/sauerbraten/bin/linux_server" > /var/run/sauerbraten.pid
-      add_daemon sauerbraten
-      stat_done
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping sauerbraten-server"
-    [ -f /var/run/sauerbraten.pid ] && kill `cat /var/run/sauerbraten.pid`
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon sauerbraten
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/sauerbraten/sauerbraten.service b/community/sauerbraten/sauerbraten.service
deleted file mode 100644
index a3982a50c..000000000
--- a/community/sauerbraten/sauerbraten.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Sauerbraten dedicated server
-After=network.target
-
-[Service]
-User=nobody
-ExecStart=/opt/sauerbraten/bin/linux_server
-Restart=on-abort
-StandardOutput=syslog
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/community/scantailor/PKGBUILD b/community/scantailor/PKGBUILD
index 5c09b8711..dcd7b0bee 100644
--- a/community/scantailor/PKGBUILD
+++ b/community/scantailor/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 66775 2012-02-28 14:29:17Z spupykin $
+# $Id: PKGBUILD 85409 2013-03-01 10:39:57Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Denis Terskov aka neurosurgeon <terskov.den@gmail.com>
 
 pkgname=scantailor
 pkgver=0.9.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive post-processing tool for scanned pages"
 arch=(i686 x86_64 'mips64el')
 url="http://scantailor.sourceforge.net"
 license="GPL"
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake' 'boost')
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
@@ -17,7 +17,6 @@ md5sums=('6cdca1b6d1dafd022ea94b4800dad340')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  cmake  .
   cmake \
 	-DCMAKE_CXX_FLAGS="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \
 	-DCMAKE_CXX_FLAGS_DEBUG="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \
@@ -25,5 +24,9 @@ build() {
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DCMAKE_BUILD_TYPE=Release .
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD
index 4e5af849e..caeabc279 100644
--- a/community/schroot/PKGBUILD
+++ b/community/schroot/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83274 2013-01-28 16:50:07Z stephane $
+# $Id: PKGBUILD 87436 2013-03-31 19:18:51Z stephane $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
 
 pkgname=schroot
 pkgver=1.6.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)."
 url="http://packages.qa.debian.org/s/schroot.html"
 license=('GPL3')
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index aae795021..0d1e79138 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83608 2013-02-03 22:48:31Z arodseth $
+# $Id: PKGBUILD 88149 2013-04-12 13:59:38Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scite
-pkgver=3.2.4
+pkgver=3.3.1
 pkgrel=1
 pkgdesc='Editor with facilities for building and running programs'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,13 +15,11 @@ license=('custom:scite')
 depends=('desktop-file-utils' 'gtk2')
 makedepends=('setconf')
 backup=('usr/share/scite/SciTEGlobal.properties')
-install=$pkgname.install
+install="$pkgname.install"
 source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz")
-sha256sums=('bd20b97513aee8e4584253d6ca31ec658bd4f098ceefb354889eb8a498cb5c08')
-
-build() {
-  cd "$srcdir"
+sha256sums=('96f1b74f728375e405a39f210b34dfabbbd2654b9c30ba886d8c3b4acbafc717')
 
+prepare() {
   if [ $?CXXBASEFLAGS == 1 ]; then 
     sed '0,/CXXTFLAGS=/s//nop=/' -i scite/gtk/makefile
     setconf scite/gtk/makefile CXXTFLAGS "-DNDEBUG ${CXXFLAGS} $(CXXBASEFLAGS)"
@@ -31,10 +29,11 @@ build() {
     "-DNDEBUG ${CXXFLAGS} \$(CXXBASEFLAGS) \$(THREADFLAGS)"
   setconf scintilla/gtk/makefile CXXBASEFLAGS \
     "-Wno-missing-braces -Wno-char-subscripts ${CXXFLAGS} -DGTK -DSCI_LEXER \$(INCLUDEDIRS)"
-  cd "$srcdir/scintilla/gtk"
-  make
-  cd "$srcdir/$pkgname/gtk"
-  make
+}
+
+build() {
+  make -C "$srcdir/scintilla/gtk"
+  make -C "$srcdir/$pkgname/gtk"
 }
 
 package() {
diff --git a/community/scorched3d/scorched3d.desktop b/community/scorched3d/scorched3d.desktop
deleted file mode 100644
index b18d86581..000000000
--- a/community/scorched3d/scorched3d.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Exec=/usr/bin/scorched3d
-Icon=scorched3d.png
-Terminal=false
-Name=Scorched 3D
-Name[lt_LT]=Scorched 3D
-Comment=3D artillery game similar to Scorched Earth
-Comment[de_DE]=3D Reimplementation des Klassikers Scorched Earth
-Comment[fr_FR]=un jeu d'artillerie en 3 proche de Scorched Earth
-Comment[lt_LT]=Nuotaikingas 3D taktinis-artilerinis žaidimas, panašus į Scorched Earth
-Comment[pl_PL]=Artyleryjska gra 3D podobna do Scorched Earth
-Comment[ro_RO]=Un joc 3D cu artilerie similar cu Scorched Earth
-Categories=Game;ArcadeGame;
-StartupNotify=true
diff --git a/community/scorched3d/scorched3d.png.uu b/community/scorched3d/scorched3d.png.uu
deleted file mode 100644
index 4fb7e50db..000000000
--- a/community/scorched3d/scorched3d.png.uu
+++ /dev/null
@@ -1,105 +0,0 @@
-begin 600 scorched3d.png
-MB5!.1PT*&@H````-24A$4@```#`````P"`8```!7`OF'````!F)+1T0`_P#_
-M`/^@O:>3````"7!(67,```L2```+$@'2W7[\````!W1)344'TP@#%`([XJF@
-M!```$5Q)1$%4>-IEFNER9$>.I3_`W>\2$0PFF5*VI.HJ]58]2\\\W#S/O,*\
-M35LO9FU5U:62E,H4DUM$W+B+.S`__`:3.4.S(!D+G0XX<`"<X_)__O?_<EQ0
-M4R0(D@1M%$3`'35##,1!J:^[.#D;RY)9<@9`4*(H3=.0VH;4)&+3(!IPE-F4
-M;)E<9G(I+'EAR3.S%<P<UO4C2D!0P''<"U@!G\$S:@"*J**J1$0``:T_G/H0
-M'-:W$%Z^1`1$J#\$%<'7CSK@[OBZ(=SK<]8W5U/QZA"0S\NO[SOU\[;^_OE+
-M$;3N;=T#"!%M>%E1``7#7O:LNKY\>5L4$46BH0[!A&(%6RVW[)A:?6`0%2YK
-M7'SLCI9"S`JF%#.*.RZ0<<H7&[_\922@J`*BB`10):I62U0_>]P13.J.RNI>
-M\6JT**@(JG7!((&\+"S%,*_^*Z6P+`N(5+\%K2'AH":H"V%UD;O@)K@[1C7"
-M^"(H$`25@$A`D.K`]1'U$D$JH`(")EJ/4JH7Q1T10500$8(J(20\@,7"HHHL
-MF:64NA$WBF6D*$D4UNW6DW2T1@2H4$Q1##=>@L;7]X-`6/TOJA#J&<H:4((0
-M]8L8D^IAA>*">3U[4\>I[H\2""$14T,0Q=V)*:'SC,PSMAHAHC6DS!&QEVA0
-M<50+N.%:(PRM)VSV*G"L[D/EQ=;Z_!*/4LV-U>2:C+IZ^7)\944<=P=WS)6"
-MDET)*(1(%%!=CQ1A67)%%2`$)28(T590DW630K:P[BJO8`"F@E\,74,UB"`H
-M&@4)6G,7J>'FA8A51`EK=M>-U.R-"*;4V#;'33&4[$*T&L<2`DD5<4$<8A!L
-M=65J'8V@T8G!<0/+PE*$>0DLLR+FB!;4'!.P=3,:(8BNP5?#0M?C,*=^\T*\
-MQ!0&8H*8HC'4.%^-<;P:DF6%6'U!'05B4+2)A`@Q&*(9C87-KE`,<E'ZKCK<
-M#4S@>!2>'H7C(>$.^`(X&@5-]0A4:CU`P"ZG9]6A9H8!<<V=NHB!NN!>$R2(
-M$+7B+\Z*$(*+$E5I4Z!-2A.@:2$V`0V1)<.\*,L26):`E8CDZD$-H(W2=L[U
-MC='VQN%9.1TCF*&QADN%O!6:J;7,N(3R)=F%6%[5*<$1JT>-"BI*#"M<ND(`
-MUYK,0964E*81^@9V^T*W=7*.'`=E6HSC,^1%P0(3B@9!D]/T@=@4NDVFVP%)
-M*2HL4\5J"6L=7C=?S"E2/7XICK:&5OPB]0U$5YA#<6+%6JEP^)(CHDB,A*BT
-MC;#?9YJM8QIX>@Z<#LXX&%(*458(6=N0;$X^*8R*)*7=&+M]H=_!XWU@FI1<
-M!#"L&%B%<A-J&*.X644Z@YA\K7JE(H6JD41H@M)$I0G5@(H4*PY+P`BDY/1]
-M(23C/,!Q"`P'9YX-*]587YL"P0`A6,5`%\6+D*>.%`N;WI$;Y7A23L,*!%JP
-M4M"2U[XH5_A]`14G-E*K8#$C3\Z2'9%(U(@$1UP@:(6PM38Z%5YC*K3=0B[.
-MTX/R\""8%\!>"IJ9X6XKEE=@4%5<:IW)4T..1I.<JRO#$9:L+%EP@Z!>6P>L
-MPO":!W5]B*W68C2;\O[^Q"]/$[NK*Z[W6V[V6][>7K'?);8Q$3#<*RHU<:9I
-M,N[&W9UP.!CC7"MP[2"]'OUZW*I"4"&J$&)$".`!`XX'9YJ,K]_---%IDF(%
-MT$+0@FFI38)'4'`K&`7#B#5?!(F1?=<P+@:>F8:!3WGA<!I(*9%BI$F!)B7Z
-M+G)S#;$7/"GG'%B\QJE?DLXR!J@&0)A+1LQ0@5`J]H-2J+`8)J-I9V)RND8H
-MDZ(.B&.J2-0:B*:89\K:[;XT<R$J7]\HNVW+,&:F;$QYXNE\9ER,;$+3-/1]
-MS_6^PV/"FT@S1QX&R/.E1=;:2VE$-!";%@V1:3Q32J:8,2\%]Z6BC%2T"=$(
-MSX7]WNA:F#0B5F<)%<5"((IBQ2C4&B%`),::H!K8]BU7JB_]M@.+%<[CPG#.
-M#%-A*E#*PFB9/[V?>7A<.#XE^G[+?K^A2Y&NV=!WB7[;TVXVI)0HR\PTCIR'
-M,X?G`]-T)N<9UT((D%R8BX,**0EHPB0"L9Z`2VWL&JM-GH!BQ*YI$8$8(Q)J
-M@K$F]6*&B-'UB7Z[XYONBBRU"]W?9H[#3&H6NL98EL+3X<Q_?+RCY$R*@=W5
-MCNUN0]]W-*&V&FZ.F3-.QFD8&<Y';FYZWGV]HW@M5AZ@2*`00`*N^C*;!(6H
-MBJMB"'';M?4$0FVNBCMYSLQ+8<R9C-%N-ER]N>7FJ^\(38L$H]^>&2?C]@8>
-M[T=^?O\K?_CC#_SSO_X'#P_/F#G]IF.WW;#;;=AO.KJVI>LZ=KLM<\X<CD?N
-M/]WS=_(5[][=@$1$"Q(<-.$2L,M4L#:A(=0V0Z2B86S;ME8_58IY+1X8(DK3
-M=%R_N66SOZ'=7)$-IF%"-=,T`^)*TH:^ZYCGS*]W#WRZ>^+A\8EY69B73(R)
-MON^XOM[1Q$@,@;9-A)1`A.D\<7.S9YH:;F[?L-TY_::PW22PPCS/Y)()XH10
-M>R\3(XH3)!!I4^TWO-8#1`A-H&EZ9@+/H_/+TZ^<AI\XG4=4A>TF\NUWT'4=
-ML"7/&VZNKOAOO_];MEW'X],3A].)^\<#3\\GSN/,D@OC.%.6"K.I;>C[CDW7
-M`PFC(<:.%`,BA7DVAK,Q34Z,@IHCJ>9+$"?%.IM$"^O@D2&;D;,S%6?RP'')
-M_/CA$S_]_)$/'SYQGB:ZKN7F9LOW'UO>OMVQV>[QY0U-ZOB;WW[';[[]FF$<
-M:W@\///^PR<^WCTPG$>.AX'#X<0PG"C+@K>)_7[+]9LW['8W;+:WI#;@S#P?
-M'_CT,#%/$U>;!%V=RV-R0@()0A`EEIPKG!D,T\3=_9%_^_,=[^^>^7C_Q(>/
-M=QP.)Y:<Z=J6INOH?TG\_![>WD:VFX['QQU]=\6;-UNNMCW;7<]NN^'W?_<[
-M_LO??\^2"Z?AS/W]$[]^NN?CW0/G822&P&^__VO^Z;__(__T/_XGUV^_I6V=
-MP^%7'I_>\_[GCYS/`U]]=<N;ZXZ=)'I;$#=B,E0A+N?I90X=AH%?'Q[Y]S_^
-MP(>[9TZG,\=A8)XSYHZ&B$\S9H5E<8H)U_LSQ^/`I\<G?OJEI>NJ4=MMSWZW
-MH>M:FB;1Q$A*@6_^ZBN^_NH6`5*,7%WMN;W>$.5$TA^Y^S#PGW_ZP,/])Z9I
-M).?,\^&XSI4]NNG0:&A9R,M$'`]CG2_%.9T&'IX.O/]PQ]/S@`!=DP@Q4@Q"
-M#&BHY78<A6%PNKX0NY'#_<C#IPJ#(0@I**E)M&W#MN^X?;/G]LV>FYL]-]=7
-M;'<;NK:MU;:<.#[_F9AF_O*G1_[M7QXX'L]`(47E/$W(40DA$%,/ZDQS85YF
-MXO/3<VU&W7@^C8SGJ<96C!6V5`GF9*O]#-0FS0W&T3B=X/9MY&H'TRB<S[(2
-M4,*2"Z6,G,\3]T\'XH^_$&.@:Q)-T]+W+5^_W?&/_[#'PXY?'S?<?RJH))QQ
-MG4F$B)*7S.%P1*/R^&3,XYEE?B(^'0XU!XHQC#-YFHCJJ$#.1EXR2UF+&J_H
-M%73-'2%%IVV$OWJG/#XIX]E9%BB7YFBE$30(JL()Z+K`DB,I/?*'/[=\^-0Q
-MCALVW1NNMGMN;ZY9ELPT+XQSQLV9Y\S=W0,/#\\<#@?>W2;BTVFH\V1VQCE#
-MSEQU$2N%\Y0Y#3/C-'.><QWY@A""$C0PC<HX"%C@W3ME?ZVXURE[,*&XKD8(
-M(01"K".EN-$T1MLNY#+PPX_.\03G4\/O_OHW_/[O$^_>WM!WPC@OR'DB+POS
-M-//IXSU_^<M[#H<#5]TWQ-D,'$JNA.*V;_FOO_V*XL8P+?SQIWO^\Y<'GHY#
-M'3M+S2>7.GHJPFF(W#TH^^O`M]\$=E>![29@IDRSDK.2&EM[+MANG1AK-1U'
-MY7!0#@<P,W[X\0/'X\`_?/\=W__N.[YY=TLV>'X^\O/[C_ST\Z_<W3\B7LCC
-M3-1X804*%".XT,?*S*4F\NU7UPQSYCQGAO-<*_7:WQM0W+$Y,Q?A/"TL<Z!K
-M`TU2N@YP!8^D%'$32A&F43@599Z$G(5I$J:YLGXY9^9YP;)QGA:^GQ?^]F]^
-MP]PFBM7^:9XS;81ESL38=+4"ATQ>,B67VG"Y(P%NWNSX=BG,Q;B[/S%-"VY.
-M4&$Q8RX%S"C%&$[.<#2:F.EZX?K:2#'4ZJJ)4I1Y%MR5\ZA,XTJ=K+FANB;_
-MLO##./-\''@^#ESO-PSCS-/SB6G)B$`*0LZ%V&S:RJ0MB@D4@&R44LA6F>#;
-MZRTI!6ZN=QQ/(^-8Q\AA'!G.4^5ZO!+!>5DP<X;!&0;08*@:*C/%:F*+*#$$
-M8HBDF.C:1*.ALH%4DM<\\_C\Q/D/`Z?SB7DN/#T-Y#FSZ1*[7A"\AI!8_:/@
-MCKD`I?:`7CG*E!+;+4A0=IN6>2[D8LS+PC3/S'.IW>N<.9U&2JD$^9*-I13*
-M4GOXRE`Z3J$$)ZLQ+IEIF9F;R*9OB1>F3VMOEJ>9GW[^6!$Q&UT3V/21W2Y"
-M$*(2,'5$`R$X'E^Q7^Z4XH@Z(00V?4O7-!1SW&SUE#&."^<Q<SK//+>)G(UB
-MQI07AO/,.&52N-#ISIP+[E8I^>Q,,TQS1,3INY96$U$J+6_NG,\CI3@A*&VC
-M;#?*9I-`A;B"T$42X44L62EWC8JZ(U[YF(Q3IUTJ>Q8"_2[0]<Y^W_'UVQTY
-M&U/.#,/$\7CF-,RX5*1;E@SC1"DK*@4A%Z<8/)TFIL78M(5MW]$VL0HL"DF$
-MO@F\O>G8;!*ZTMIQ\4J'9RN4]6%8A<D+'Q650*!(C>E@QDH\X.*KW%1;B)`@
-MF1-SI$V13=^PS+ERI-E8EH5AG%B6\D*YG*?,>39$E9@:NKYCLVE0$8H9082^
-MB[RYZMCU+3&N6AU2#<"=[%:%":P.VJN'-2A10%01C^B*.!5\:JBLN@SF==!&
-MI`I^*;+9M)7/S%"*D4MF7!:6N9"7VL^<QIEA*D!DN^VXWK7LNE!/<BJH*M=7
-M#;?7'6U*5.G!7Y&[%_5!0A4X*E6-F%<!8I6!"I=-&-E6AMB,[%`L5RIEG7O=
-M#,OE)1Z5VL-'E&Z3UC7!<F$I1BZ5J&I2H&N4)@AF3C80=YHHI*B5`O)5Z`-B
-M2DT=XD4H6A!3I!AJ!<>1U0!<JEY0?%W8<;>7WW.)%,_5J%)'TZPU67&'^#F_
-M*O$LE6>W"X-WD5J=L(9E")!6-2JL%&NEBFJ3!T+LNPYW(^=:&'(NF&3<9>7;
-M/U/OH+A66348+SQE-J.40+:`6<:+48JS6*@<Y\J_OBQS>;*"1JC'ACI5HBJE
-MDF(X0==18'T`*R>T)O%^+633HLS+PJ(+12^48)W4[.6?VPM-:PJR2DEZT6*+
-M5_980(*!*69RV?]GA*L#R.?7W/%2_^>*"%32I"JD]H5:#*]-BGV;,#/$"V(%
-M<2&[D!%RJ8N;5;$NNU&\4H>.UUCTSYLP').:U'43CE"5%7^M=2,O^@54`UT"
-ME`H"KK7*5CG%7B1L6?6!U^Z(30R8"::*ARH!N=22CJ_)N,;Y;)EL3G%J;%?M
-MLDY5Z^+FSJNMO4C5_D74^"L1>\6/VK54[<'7JP9NM2NX2/W.NL%7!JRD5Q7C
-MRN<XN\1/A<I"MK*BSF>-BE>W%'3UV/^SM?__KL(7*2#82W)X#9MU"E,#\:I\
-M:CW;SU</UIQQA^A>U@0J-6FH@&$B>!!LI?N*5W2HWO*UT-466%]YV\)%<UL_
-MJZOZN?96_OI.A=L7]R1>3E16+<U7]5JK(7[)!G<PIY@3W3)NAE@AK)ML%`C5
-M=J$FEB`448HXQ5=5'WFY3E"/=I6"ULVY7&*\>KIVK:MH9Q7WY8M(NNC5*P^Z
-M$KK$]?4+CEDMNFI&).=U54/<JI>3U.9.A$:5%)0EE/4^Q.OCKWY7>Y7,:^R:
-MKW<GW&N..36??*TCE_!YC3#VZCZ&U@L*0:HX&%;9%;<J<'AM>?XO+.\[U&WH
-.P#``````245.1*Y"8((`
-`
-end
diff --git a/community/scrot/PKGBUILD b/community/scrot/PKGBUILD
index 7282f7869..4938b3729 100644
--- a/community/scrot/PKGBUILD
+++ b/community/scrot/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=scrot
 pkgver=0.8
 pkgrel=6
 pkgdesc="A simple command-line screenshot utility for X"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://scrot.sourcearchive.com/"
 license=('MIT')
 depends=('giblib')
diff --git a/community/scrypt/PKGBUILD b/community/scrypt/PKGBUILD
index ebec0b4f3..64ffb6495 100644
--- a/community/scrypt/PKGBUILD
+++ b/community/scrypt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=scrypt
 pkgver=1.1.6
 pkgrel=3
 pkgdesc="key derivation function and encryption utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(openssl)
 url="http://www.tarsnap.com/scrypt/"
 license=('BSD')
diff --git a/community/scummvm/PKGBUILD b/community/scummvm/PKGBUILD
index 7ac13cb3a..ddcc11a27 100644
--- a/community/scummvm/PKGBUILD
+++ b/community/scummvm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=scummvm
 pkgver=1.5.0
 pkgrel=1
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.scummvm.org/"
 depends=('libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad')
diff --git a/community/sdlmame/PKGBUILD b/community/sdlmame/PKGBUILD
deleted file mode 100644
index 33fcdb0f3..000000000
--- a/community/sdlmame/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# $Id: PKGBUILD 81410 2012-12-20 12:14:49Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: robb_force <robb_force@holybuffalo.net>
-# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com>
-
-_patchlevel=4
-_basever=0.147
-
-pkgname=sdlmame
-if [ ${_patchlevel} -ne 0 ]; then
-  pkgver=${_basever}.u${_patchlevel}
-else
-  pkgver=${_basever}
-fi
-pkgrel=1
-pkgdesc="A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support."
-url="http://mamedev.org/"
-license=('custom:MAME License')
-arch=('i686' 'x86_64')
-depends=('sdl>=1.2.11' 'libxinerama' 'gconf' 'sdl_ttf' 'gtk2')
-makedepends=('unzip' 'nasm' 'mesa' 'glu' 'wget' 'python2')
-DLAGENTS=('http::/usr/bin/wget -U "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.2) Gecko/20090804 Shiretoko/3.5.2" -c -t 3 --waitretry=3 -O %o %u')
-install=sdlmame.install
-
-for i in `seq 1 ${_patchlevel}`; do
-	_patches="${_patches} sdlmame-${_basever/./}u${i}_diff.zip::http://mamedev.org/updates/${_basever/./}u${i}_diff.zip"
-done
-
-source=("mame${_basever/./}s.zip::http://mamedev.org/downloader.php?file=releases/mame${_basever/./}s.zip"
-	"sdlmame.sh"
-	"extras.tar.gz"
-	${_patches})
-md5sums=('b5fc953ee0351f5145b9d704603f2ee3'
-         'e11a7d26704a9e2cff223b9b867d6a05'
-         '420b61240bf5ae11615ba7c6100ee00d'
-         '7f2dbea383138a6ae2bbaac3b32376d6'
-         'c0306cbf583309d23549529f441e97f2'
-         '8851533ae3f692e436bc399b773c4fcb'
-         '3d5fc211f98454f857e58f9100d09e19')
-
-build() {
-  cd $srcdir/
-  if [ $NOEXTRACT -eq 0 ]; then
-    unzip mame.zip
-    find . -type f -not -name \*.png | xargs perl -pi -e 's/\r\n?/\n/g'
-    for i in `seq 1 ${_patchlevel}`; do
-      msg "Patch#$i"
-      patch -p0 -E <${_basever/./}u$i.diff || true # FIXME:
-    done
-  fi
-  make NOWERROR=1 OPTIMIZE=2 PYTHON=python2
-  make tools NOWERROR=1 OPTIMIZE=2 PYTHON=python2
-}
-
-package() {
-  cd $srcdir/
-  # Install the sdlmame script
-  install -Dm755 $srcdir/${pkgname}.sh $pkgdir/usr/bin/${pkgname}
-
-  # Install the applications and the UI font in /usr/share
-  install -Dm755 mame $pkgdir/usr/share/${pkgname}/${pkgname} || \
-  install -Dm755 mame64 $pkgdir/usr/share/${pkgname}/${pkgname}
-
-  install -m755 chdman $pkgdir/usr/share/${pkgname}/chdman
-  install -m755 jedutil $pkgdir/usr/share/${pkgname}/jedutil
-  install -m755 regrep $pkgdir/usr/share/${pkgname}/regrep
-  install -m755 romcmp $pkgdir/usr/share/${pkgname}/romcmp
-  install -m755 testkeys $pkgdir/usr/share/${pkgname}/testkeys
-  install -m755 src2html $pkgdir/usr/share/${pkgname}/src2html
-  install -m755 srcclean $pkgdir/usr/share/${pkgname}/srcclean
-  install -m755 ldverify $pkgdir/usr/share/${pkgname}/ldverify
-  install -m755 ldresample $pkgdir/usr/share/${pkgname}/ldresample
-
-  # Install the extra bits
-  install -d $pkgdir/usr/share/${pkgname}/{artwork,ctrlr,keymaps,shader}
-  install -d $pkgdir/usr/share/man/man1
-  install -d $pkgdir/usr/share/man/man6
-  install -m644 src/osd/sdl/shader/glsl*.*h $pkgdir/usr/share/${pkgname}/shader/
-  install -m644 src/osd/sdl/man/*.1* $pkgdir/usr/share/man/man1/
-  install -m644 src/osd/sdl/man/*.6* $pkgdir/usr/share/man/man6/
-
-  install -m644 $srcdir/artwork/* $pkgdir/usr/share/${pkgname}/artwork/
-  install -m644 $srcdir/ctrlr/* $pkgdir/usr/share/${pkgname}/ctrlr/
-  install -m644 src/osd/sdl/keymaps/* $pkgdir/usr/share/${pkgname}/keymaps/
-
-  # Include the license
-  install -Dm644 docs/license.txt $pkgdir/usr/share/licenses/${pkgname}/license.txt
-
-  # FS#28203
-  sed -i 's|KEYCODE_2_PAD|KEYCODE_2PAD|' $pkgdir/usr/share/sdlmame/ctrlr/*.cfg
-  sed -i 's|KEYCODE_4_PAD|KEYCODE_4PAD|' $pkgdir/usr/share/sdlmame/ctrlr/*.cfg
-  sed -i 's|KEYCODE_6_PAD|KEYCODE_6PAD|' $pkgdir/usr/share/sdlmame/ctrlr/*.cfg
-  sed -i 's|KEYCODE_8_PAD|KEYCODE_8PAD|' $pkgdir/usr/share/sdlmame/ctrlr/*.cfg
-
-  find $pkgdir -type f -exec strip {} \;
-}
diff --git a/community/sdlmame/extras.tar.gz b/community/sdlmame/extras.tar.gz
deleted file mode 100644
index ae0bc2a39..000000000
--- a/community/sdlmame/extras.tar.gz
+++ /dev/null
diff --git a/community/sdlmame/sdlmame.install b/community/sdlmame/sdlmame.install
deleted file mode 100644
index 0d3fab800..000000000
--- a/community/sdlmame/sdlmame.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install()
-{
-  echo " SDLMAME and the additional MAME utilities have been installed"
-  echo " in /usr/share/sdlmame However, SDLMAME can be run by"
-  echo " typing sdlmame and it's options. Try running SDLMAME with"
-  echo " these options:"
-  echo " sdlmame <rom> -nowindow -noswitchres"
-}
diff --git a/community/sdlmame/sdlmame.sh b/community/sdlmame/sdlmame.sh
deleted file mode 100644
index 336f71690..000000000
--- a/community/sdlmame/sdlmame.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# Create a variable equal to $HOME that will be used later in the ini creation
-home=('$HOME')
-
-if [ "$1" != "" ] && [ "$1" = "--newini" ]; then
-  echo "Rebuilding the ini file at $HOME/.mame/mame.ini"
-  echo "Modify this file for permanent changes to your SDLMAME"
-  echo "options and paths before running SDLMAME again."
-  cd $HOME/.mame
-  if [ -e mame.ini ]; then
-    echo "Your old ini file has been renamed to mameini.bak"
-    mv mame.ini mameini.bak
-  fi
-  /usr/share/sdlmame/sdlmame \
-    -artpath "$home/.mame/artwork;artwork" \
-    -ctrlrpath "$home/.mame/ctrlr;ctrlr" \
-    -inipath $home/.mame/ini \
-    -rompath $home/.mame/roms \
-    -samplepath $home/.mame/samples \
-    -cfg_directory $home/.mame/cfg \
-    -comment_directory $home/.mame/comments \
-    -diff_directory $home/.mame/diff \
-    -input_directory $home/.mame/inp \
-    -memcard_directory $home/.mame/memcard \
-    -nvram_directory $home/.mame/nvram \
-    -snapshot_directory $home/.mame/snap \
-    -state_directory $home/.mame/sta \
-    -video opengl \
-    -createconfig
-elif [ ! -e $HOME/.mame ]; then
-  echo "Running SDLMAME for the first time..."
-  echo "Creating an ini file for SDLMAME at $HOME/.mame/mame.ini"
-  echo "Modify this file for permanent changes to your SDLMAME"
-  echo "options and paths before running SDLMAME again."
-  mkdir $HOME/.mame
-  mkdir $HOME/.mame/{artwork,cfg,comments,ctrlr,diff,ini,inp,memcard,nvram,samples,snap,sta}
-  cd $HOME/.mame
-  /usr/share/sdlmame/sdlmame \
-    -artpath "$home/.mame/artwork;artwork" \
-    -ctrlrpath "$home/.mame/ctrlr;ctrlr" \
-    -inipath $home/.mame/ini \
-    -rompath $home/.mame/roms \
-    -samplepath $home/.mame/samples \
-    -cfg_directory $home/.mame/cfg \
-    -comment_directory $home/.mame/comments \
-    -diff_directory $home/.mame/diff \
-    -input_directory $home/.mame/inp \
-    -memcard_directory $home/.mame/memcard \
-    -nvram_directory $home/.mame/nvram \
-    -snapshot_directory $home/.mame/snap \
-    -state_directory $home/.mame/sta \
-    -video opengl \
-    -createconfig
-else
-  cd /usr/share/sdlmame
-  ./sdlmame "$@"
-fi
diff --git a/community/seahorse-nautilus/PKGBUILD b/community/seahorse-nautilus/PKGBUILD
index c6dd1e858..6f6fc16c1 100644
--- a/community/seahorse-nautilus/PKGBUILD
+++ b/community/seahorse-nautilus/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 79156 2012-10-31 05:28:08Z bgyorgy $
+# $Id: PKGBUILD 89362 2013-04-28 20:39:50Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=seahorse-nautilus
-pkgver=3.6.1
-pkgrel=1
+pkgver=3.8.0
+pkgrel=2
 pkgdesc="PGP encryption and signing for nautilus"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://git.gnome.org/browse/seahorse-nautilus/"
 license=('GPL')
 depends=('libcryptui' 'gcr' 'nautilus')
 makedepends=('intltool')
-replaces=('seahorse-plugins')
 options=('!libtool')
 install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('912d9c1e84ad1e24af6308b84d622a72d9e1bdae71284ddbd6277fdb459c31d2')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        glib236.patch)
+sha256sums=('8173ef08a700ff254fb5637a7f2138ba7625b19ed2102a82fd69f1ecb8072863'
+            '0cefa14a45784c82871815e9bdcebbb96dea50a8e43316475e6a36d5dc47ade5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Fix compatibility with glib 2.36
+  patch -Np1 -i "$srcdir/glib236.patch"
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static --disable-schemas-compile
   make
diff --git a/community/seahorse-nautilus/fix-schema.patch b/community/seahorse-nautilus/fix-schema.patch
deleted file mode 100644
index cd68e7a7f..000000000
--- a/community/seahorse-nautilus/fix-schema.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 8f48809c0fb6633bb45eac2144c1125f79933053 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Mon, 01 Oct 2012 08:15:13 +0000
-Subject: Fix the schema identifier for GSettings window settings
-
-https://bugzilla.gnome.org/show_bug.cgi?id=685124
----
-diff --git a/data/org.gnome.seahorse.nautilus.window.gschema.xml b/data/org.gnome.seahorse.nautilus.window.gschema.xml
-index 9263a25..89f49f1 100644
---- a/data/org.gnome.seahorse.nautilus.window.gschema.xml
-+++ b/data/org.gnome.seahorse.nautilus.window.gschema.xml
-@@ -1,5 +1,5 @@
- <schemalist>
--	<schema id="org.gnome.seahorse.window">
-+	<schema id="org.gnome.seahorse.nautilus.window">
- 		<key name="width" type="i">
- 			<default>-1</default>
- 			<summary>Width of the window</summary>
---
-cgit v0.9.0.2
diff --git a/community/seahorse-nautilus/glib236.patch b/community/seahorse-nautilus/glib236.patch
new file mode 100644
index 000000000..d0ab03046
--- /dev/null
+++ b/community/seahorse-nautilus/glib236.patch
@@ -0,0 +1,12 @@
+diff -Naur seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c
+--- seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c	2011-10-24 09:25:37.000000000 +0200
++++ seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c	2013-04-28 22:26:54.483276592 +0200
+@@ -226,8 +226,6 @@
+         progress_fd = -1;
+         return;
+     }
+-
+-    g_child_watch_add (progress_pid, progress_cancel, NULL);
+ }
+ 
+ void
diff --git a/community/seamonkey/PKGBUILD b/community/seamonkey/PKGBUILD
deleted file mode 100644
index 2fbb4de62..000000000
--- a/community/seamonkey/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 80730 2012-12-01 17:20:47Z kkeen $
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-pkgname=seamonkey
-pkgver=2.14.1
-pkgrel=1
-pkgdesc="SeaMonkey internet suite"
-arch=('i686' 'x86_64')
-license=('MPL')
-depends=('alsa-lib'  'dbus-glib'  'desktop-file-utils'  'gtk2' 'hunspell'  'libevent'  'libnotify'  'libvpx'  'libxt' 'mime-types'  'mozilla-common'  'nss'  'sqlite'  'startup-notification')
-makedepends=('unzip' 'zip' 'pkg-config'  'python2' 'yasm' 'wireless_tools' 'mesa' 'autoconf2.13' 'imake')
-install=$pkgname.install
-url="http://www.seamonkey-project.org/"
-source=(ftp://releases.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.bz2
-        mozconfig
-        seamonkey.desktop
-        seamonkey-2.0-lang.patch)
-md5sums=('19463b718446552d04130d01d25d7330'
-         'dabc8f517fbff67b8599064bedd32606'
-         '6119a2254716752c9d08e366f8d4c048'
-         '25b6fe16ac24cd5c852213e5c1adb272')
-
-build() {
-  cd comm-release
-  cp ../mozconfig .mozconfig
-  patch -Np1 -i ../seamonkey-2.0-lang.patch
-
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/seamonkey-$pkgver"
-  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
-  unset MAKEFLAGS
-
-  # Don't exit with error when some libs are missing which we have in
-  # system.
-  sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-      -i suite/installer/Makefile.in
-
-  make -j1 -f client.mk build
-}
-
-package() {
-  cd comm-release
-
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir"/usr/lib/seamonkey-$pkgver/{dictionaries,hyphenation}
-  ln -s /usr/share/hunspell "$pkgdir/usr/lib/seamonkey-$pkgver/dictionaries"
-  ln -s /usr/share/hyphen "$pkgdir/usr/lib/seamonkey-$pkgver/hyphenation"
-
-  install -m755 -d "$pkgdir/usr/share/applications"
-  install -m755 -d "$pkgdir/usr/share/pixmaps"
-  install -m644 suite/branding/nightly/icons/gtk/seamonkey.png \
-                "$pkgdir/usr/share/pixmaps/"
-  install -m644 "$srcdir/seamonkey.desktop" "$pkgdir/usr/share/applications/"
-
-  rm -f "$pkgdir/usr/lib/pkgconfig/"seamonkey-ns{s,pr}.pc
-  rm -r "$pkgdir"/usr/{include,lib/seamonkey-devel-$pkgver,share/idl}
-}
diff --git a/community/seamonkey/mozconfig b/community/seamonkey/mozconfig
deleted file mode 100644
index 2131e894f..000000000
--- a/community/seamonkey/mozconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-ac_add_options --enable-application=suite
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-installer
-
-export MOZILLA_OFFICIAL=1
diff --git a/community/seamonkey/seamonkey-2.0-lang.patch b/community/seamonkey/seamonkey-2.0-lang.patch
deleted file mode 100644
index b9f4a5cde..000000000
--- a/community/seamonkey/seamonkey-2.0-lang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-10-11 02:12:44.000000000 +0200
-+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-09-16 02:56:45.000000000 +0200
-@@ -890,7 +890,7 @@
- pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
- pref("intl.charset.default",                "chrome://global-platform/locale/intl.properties");
- pref("intl.ellipsis",                       "chrome://global-platform/locale/intl.properties");
--pref("intl.locale.matchOS",                 false);
-+pref("intl.locale.matchOS",                 true);
- // fallback charset list for Unicode conversion (converting from Unicode)
- // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
- // for ISO-8859-1
diff --git a/community/seamonkey/seamonkey.desktop b/community/seamonkey/seamonkey.desktop
deleted file mode 100644
index dd92a2432..000000000
--- a/community/seamonkey/seamonkey.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=seamonkey %u
-Icon=seamonkey
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=SeaMonkey internet suite
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;message/rfc822;x-scheme-handler/mailto;
-StartupNotify=false
-Categories=Application;Network;
diff --git a/community/seamonkey/seamonkey.install b/community/seamonkey/seamonkey.install
deleted file mode 100644
index 709ad81f2..000000000
--- a/community/seamonkey/seamonkey.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community/sensors-applet/PKGBUILD b/community/sensors-applet/PKGBUILD
index 1a19269ab..dd99e1c0d 100644
--- a/community/sensors-applet/PKGBUILD
+++ b/community/sensors-applet/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 68359 2012-03-23 01:09:57Z bgyorgy $
+# $Id: PKGBUILD 89360 2013-04-28 20:21:26Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=sensors-applet
 pkgver=3.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Applet for GNOME Panel to display readings from hardware sensors, including CPU temperature, fan speeds and voltage readings"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sensors-applet.sourceforge.net/"
@@ -14,12 +14,20 @@ optdepends=('hddtemp: get HDD temperatures'
             'udisks: get HDD temperatures')
 options=('!libtool')
 install=$pkgname.install
-source=(http://downloads.sourceforge.net/sensors-applet/$pkgname-$pkgver.tar.gz)
-md5sums=('425078fc1ff5a98af1547e039002a73f')
+source=(http://downloads.sourceforge.net/sensors-applet/$pkgname-$pkgver.tar.gz
+        gtk38.patch)
+md5sums=('425078fc1ff5a98af1547e039002a73f'
+         '7289cb0acd5c05daf824df6a90967240')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Enable reprecations
+  sed -i '/CFLAGS+=/d' configure{,.ac}
+
+  # Fix compatibility with GTK+ 3.8
+  patch -Np1 -i "$srcdir/gtk38.patch"
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
               --disable-static --disable-scrollkeeper --with-nvidia=no
   make
diff --git a/community/sensors-applet/gtk38.patch b/community/sensors-applet/gtk38.patch
new file mode 100644
index 000000000..530d756a3
--- /dev/null
+++ b/community/sensors-applet/gtk38.patch
@@ -0,0 +1,127 @@
+diff -Naur sensors-applet-3.0.0.orig/sensors-applet/sensors-applet.c sensors-applet-3.0.0/sensors-applet/sensors-applet.c
+--- sensors-applet-3.0.0.orig/sensors-applet/sensors-applet.c	2011-11-03 12:33:36.000000000 +0100
++++ sensors-applet-3.0.0/sensors-applet/sensors-applet.c	2013-04-28 20:08:31.002620583 +0200
+@@ -641,122 +641,8 @@
+         /* get the first active sensor */
+         first_sensor = (ActiveSensor *)sensors_applet->active_sensors->data;
+ 
+-        switch (display_mode) {
+-        case DISPLAY_VALUE:
+-                gtk_widget_size_request(GTK_WIDGET(first_sensor->value),
+-                                        &req);
+-                value_width = req.width + COLUMN_SPACING;
+-                value_height = req.height + ROW_SPACING;
++        num_sensors_per_group = 1;
+ 
+-                /* make sure all widths and heights are non zero,
+-                 * otherwise will get a divide by zero exception below
+-                 * - is a non critical error since can happen when
+-                 * elements first added to list, so simply return - is
+-                 * not a programming error */
+-                if (value_width == 0 && value_height == 0) {
+-                        return;
+-                }
+-
+-                num_sensors_per_group = (sensors_applet->size / 
+-                                         (horizontal ? value_height : 
+-                                          value_width));
+-                break;
+-
+-        case DISPLAY_LABEL_WITH_VALUE:
+-                /* even though we end up packing the event boxes into the
+-                 * panel, these dont give back request sizes, so need to ask
+-                 * widgets directly */
+-                gtk_widget_size_request(GTK_WIDGET(first_sensor->value),
+-                                        &req);
+-                value_width = req.width + COLUMN_SPACING;
+-                value_height = req.height + ROW_SPACING;
+-
+-                gtk_widget_size_request(GTK_WIDGET(first_sensor->label),
+-                                        &req);
+-                label_width = req.width + COLUMN_SPACING;
+-                label_height = req.height + ROW_SPACING;
+-        
+-                /* make sure all widths and heights are non zero, otherwise
+-                 * will get a divide by zero exception below 
+-                 * - is a non critical error since can happen when
+-                 * elements first added to list, so simply return - is
+-                 * not a programming error */
+-                if (!(label_width && label_height &&
+-                      value_width && value_height)) {
+-                        return;
+-                }
+-
+-                switch (layout_mode) {
+-                case VALUE_BESIDE_LABEL:
+-                        num_sensors_per_group = (sensors_applet->size / 
+-                                                 (horizontal ? MAX(label_height, value_height) : 
+-                                                  (label_width + value_width)));
+-                        break;
+-                case VALUE_BELOW_LABEL:
+-                        num_sensors_per_group = (sensors_applet->size / 
+-                                                 (horizontal ? (label_height + value_height) : 
+-                                                  MAX(label_width, value_width)));
+-
+-
+-                        break;
+-                }
+-                break;
+-
+-        case DISPLAY_ICON_WITH_VALUE:
+-                gtk_widget_size_request(GTK_WIDGET(first_sensor->value),
+-                                        &req);
+-                value_width = req.width + COLUMN_SPACING;
+-                value_height = req.height + ROW_SPACING;
+-
+-                gtk_widget_size_request(GTK_WIDGET(first_sensor->icon),
+-                                        &req);
+-                icon_width = req.width + COLUMN_SPACING;
+-                icon_height = req.height + ROW_SPACING;
+-                
+-                //watch out if num_sensors_per_group is correctly computed
+-		//while icon_height is 0
+-                if (!(icon_width &&
+-                      value_width && value_height)) {
+-                        return;
+-                }
+-
+-                
+-                switch (layout_mode) {
+-                case VALUE_BESIDE_LABEL:
+-                        num_sensors_per_group = (sensors_applet->size / 
+-                                                 (horizontal ? MAX(icon_height, value_height) : 
+-                                                  (icon_width + value_width)));
+-                        break;
+-                case VALUE_BELOW_LABEL:
+-                        num_sensors_per_group = (sensors_applet->size / 
+-                                                 (horizontal ? (icon_height + value_height) : 
+-                                                  MAX(icon_width, value_width)));
+-
+-
+-                        break;
+-                }
+-                break;
+-
+-        case DISPLAY_ICON:
+-                gtk_widget_size_request(GTK_WIDGET(first_sensor->icon),
+-                                        &req);
+-                icon_width = req.width + COLUMN_SPACING;
+-                icon_height = req.height + ROW_SPACING;
+-                if (!(icon_width && icon_height)) {
+-                        return;
+-                }
+-
+-                num_sensors_per_group = (sensors_applet->size / 
+-                                         (horizontal ? icon_height : 
+-                                          icon_width));
+-                break;
+-
+-        case DISPLAY_GRAPH:
+-                /* only show graphs in a line like System Monitor
+-                 * applet */
+-                num_sensors_per_group = 1;
+-                break;
+-        }
+         /* ensure always atleast 1 sensor per group */
+         if (num_sensors_per_group < 1) {
+                 /* force a better layout */
diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD
index ea12e6cd3..d95a12fc8 100644
--- a/community/setconf/PKGBUILD
+++ b/community/setconf/PKGBUILD
@@ -1,31 +1,38 @@
-# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $
+# $Id: PKGBUILD 89870 2013-05-03 20:55:10Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=setconf
-pkgver=0.4
-pkgrel=1
-pkgdesc="Utility to easily change settings in Makefiles and configuration files"
+pkgver=0.5.3
+pkgrel=3
+pkgdesc='Utility to easily change settings in configuration files or Makefiles'
 arch=('x86_64' 'i686' 'mips64el')
-url="http://setconf.roboticoverlords.org/"
-license=('GPL')
+url='http://setconf.roboticoverlords.org/'
+license=('GPL2')
 depends=('pcre' 'gc')
-makedepends=('shedskin')
-source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2")
-sha256sums=('dca9d6e829f3247da8cb78434dd18d96f3439fc83a32626ff83d4a5c16099d31')
+if [ "$CARCH" == 'x86_64' ] || [ "$CARCH" == 'i686' ]; then
+  makedepends=('shedskin')
+fi
+source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tar.xz")
+sha256sums=('f063b308bcebefe139418587527262ffce776584b1952224ec9a41d0562d55b6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  shedskin "$pkgname.py"
-  make CPPFLAGS="$CFLAGS"
+  if [ "$CARCH" == 'x86_64' ] || [ "$CARCH" == 'i686' ]; then
+    shedskin "$pkgname.py" && make
+  fi
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
+  if [ -e "$pkgname" ]; then
+    install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
+  else
+    depends=('python')
+    install -Dm755 "$pkgname.py" "$pkgdir/usr/bin/$pkgname"
+  fi
   install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz"
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/sfk/PKGBUILD b/community/sfk/PKGBUILD
index cc1e707b5..a1c4443fc 100644
--- a/community/sfk/PKGBUILD
+++ b/community/sfk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 77369 2012-10-09 06:40:23Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 88535 2013-04-19 12:59:02Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: Baumi <baumi@gmx.com>
 
 pkgname=sfk
-pkgver=1.6.6
+pkgver=1.6.7
 pkgrel=1
 pkgdesc='Swiss File Knife - A Command Line Tools Collection'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url='http://stahlforce.com/dev/?tool=sfk'
 license=('custom: BSD')
 depends=('gcc-libs')
 source=("http://downloads.sourceforge.net/swissfileknife/${pkgname}${pkgver//./}.zip")
-md5sums=('d32f487d783356eb15e23f5e26bf7ac7')
+md5sums=('cd900b0c2f6fb362d5d3ef5190b96767')
 
 build() {
   cd ${pkgname}${pkgver//./}
@@ -24,4 +24,4 @@ package() {
   install -D -m444 bsd-license.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD
index 7e0e90621..08bd35335 100644
--- a/community/sfml/PKGBUILD
+++ b/community/sfml/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78941 2012-10-27 23:45:33Z ebelanger $
+# $Id: PKGBUILD 88118 2013-04-12 07:50:02Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Ondrej Martinak <omartinak@gmail.com>
 
 pkgname=sfml
-pkgver=2.0rc1
-pkgrel=3
+pkgver=2.0
+pkgrel=1
 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.sfml-dev.org/'
@@ -12,22 +12,23 @@ license=('zlib')
 depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2')
 makedepends=('mesa' 'cmake' 'doxygen')
 install=sfml.install
-source=("2.0-rc.tar.gz::https://github.com/LaurentGomila/SFML/tarball/2.0-rc")
-md5sums=('03c8e6817f4525092b94a3d44e8eada8')
+source=("https://github.com/LaurentGomila/SFML/archive/2.0.tar.gz")
+md5sums=('294fd8563a319e06f68bbca0eedc905e')
 
 build() {
-  cd "$srcdir"/Laurent*
+  cd "$srcdir"/SFML-${pkgver}
 
   mkdir build && cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
-        -DBUILD_DOC=true \
-        -DBUILD_EXAMPLES=true
+  cmake .. \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DSFML_BUILD_EXAMPLES=true \
+      -DSFML_BUILD_DOC=true
   make
   make doc
 }
 
 package() {
-  cd "$srcdir"/Laurent*/build
+  cd "$srcdir"/SFML-${pkgver}/build
 
   make DESTDIR="$pkgdir/" install
 
diff --git a/community/shapelib/PKGBUILD b/community/shapelib/PKGBUILD
index 849cb918d..76a74eca6 100644
--- a/community/shapelib/PKGBUILD
+++ b/community/shapelib/PKGBUILD
@@ -1,32 +1,34 @@
-# $Id: PKGBUILD 67779 2012-03-14 11:48:39Z giovanni $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# $Id: PKGBUILD 85552 2013-03-03 03:16:05Z cinelli $
+# Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Bob Finch <w9ya@arrl.net>
 
 pkgname=shapelib
-pkgver=1.2.10
-pkgrel=5
+pkgver=1.3.0
+pkgrel=1.1
 pkgdesc='simple C API for reading and writing ESRI Shapefiles'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://shapelib.maptools.org/'
 license=('LGPL' 'MIT')
 options=('!libtool')
-source=("http://dl.maptools.org/dl/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'LICENSE')
-md5sums=('4d96bd926167193d27bf14d56e2d484e'
-         '431dfe7afb1d2c082682ecfcc9ee7a34')
+source=("http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz"
+        "LICENSE")
+sha256sums=('23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f'
+            '67e45b04045e27a9d6f64f92b295831b8739b32668ce497d3fa02999e349a789')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd "$pkgname-$pkgver"
+
+  sed -ri "s:^(CFLAGS\s*=\s*):\1 ${CFLAGS} :" Makefile
   
-  sed -i -e s:'-O2':"${CFLAGS}": Makefile
   make lib
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd "$pkgname-$pkgver"
 
-  sed -i -e s:/usr/local:${pkgdir}/usr: Makefile
-  #sed -i -e s:/usr/bin/install:/bin/install: Makefile
-  make lib_install
-  install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  # The Makefile won't install it correctly, this is easier.
+  install -D -m644 libshp.a "$pkgdir/usr/lib/libshp.a"
+  install -D -m644 shapefil.h "$pkgdir/usr/include/libshp/shapefil.h"
+  install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/community/shotwell/0001-Port-to-GStreamer-1.0.patch b/community/shotwell/0001-Port-to-GStreamer-1.0.patch
deleted file mode 100644
index 7d7ac742d..000000000
--- a/community/shotwell/0001-Port-to-GStreamer-1.0.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 9cb0726dd0873e3664f3589aabadea8bb7c8ff37 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
-Date: Tue, 25 Sep 2012 18:15:02 -0400
-Subject: [PATCH] Port to GStreamer 1.0
-
----
- Makefile                                    | 21 +++++++++++----------
- src/VideoSupport.vala                       |  8 ++++----
- src/libshotwell.deps                        |  5 +++--
- thumbnailer/shotwell-video-thumbnailer.vala | 18 ++++++++----------
- 4 files changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 1bd09e0..06059e3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -37,7 +37,7 @@ EXTRAS_SUPPORTED_LANGUAGES=fr de it es pl et sv sk lv pt bg bn nl da zh_CN el ru
- LOCAL_LANG_DIR=locale-langpack
- SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale
- 
--VALAFLAGS := -g --enable-checking --thread --fatal-warnings --enable-deprecated $(USER_VALAFLAGS)
-+VALAFLAGS := -g --enable-checking --thread --enable-deprecated $(USER_VALAFLAGS)
- ifdef UNITY_SUPPORT
- VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT
- endif
-@@ -293,9 +293,9 @@ EXT_PKGS = \
- 	gio-unix-2.0 \
- 	glib-2.0 \
- 	gmodule-2.0 \
--	gstreamer-0.10 \
--	gstreamer-base-0.10 \
--	gstreamer-pbutils-0.10 \
-+	gstreamer-1.0 \
-+	gstreamer-base-1.0 \
-+	gstreamer-pbutils-1.0 \
- 	gtk+-3.0 \
- 	gudev-1.0 \
- 	libexif \
-@@ -314,8 +314,9 @@ endif
- THUMBNAILER_PKGS = \
-     gtk+-3.0 \
-     gee-1.0 \
--    gstreamer-0.10 \
--    gstreamer-base-0.10
-+    gstreamer-1.0 \
-+    gstreamer-base-1.0 \
-+    gstreamer-app-1.0 \
- 
- DIRECT_LIBS =
- 
-@@ -325,10 +326,10 @@ EXT_PKG_VERSIONS = \
- 	gio-unix-2.0 >= 2.20 \
- 	glib-2.0 >= $(MIN_GLIB_VERSION) \
- 	gmodule-2.0 >= 2.24.0 \
--	gstreamer-0.10 >= 0.10.28 \
--	gstreamer-base-0.10 >= 0.10.28 \
--	gstreamer-plugins-base-0.10 >= 0.10.32 \
--	gstreamer-pbutils-0.10 >= 0.10.32 \
-+	gstreamer-1.0 >= 1.0.0 \
-+	gstreamer-base-1.0 >= 1.0.0 \
-+	gstreamer-plugins-base-1.0 >= 1.0.0 \
-+	gstreamer-pbutils-1.0 >= 1.0.0 \
- 	gtk+-3.0 >= 3.0.11 \
- 	gudev-1.0 >= 145 \
- 	libexif >= 0.6.16 \
-diff --git a/src/VideoSupport.vala b/src/VideoSupport.vala
-index deb45e2..f679bd0 100644
---- a/src/VideoSupport.vala
-+++ b/src/VideoSupport.vala
-@@ -163,8 +163,8 @@ public class VideoReader {
-                 file.get_path()));
-         
-         try {
--            Gst.Discoverer d = new Gst.Discoverer((Gst.ClockTime) (Gst.SECOND * 5));
--            Gst.DiscovererInfo info = d.discover_uri(file.get_uri());
-+            Gst.PbUtils.Discoverer d = new Gst.PbUtils.Discoverer((Gst.ClockTime) (Gst.SECOND * 5));
-+            Gst.PbUtils.DiscovererInfo info = d.discover_uri(file.get_uri());
-             
-             clip_duration = ((double) info.get_duration()) / 1000000000.0;
-             
-@@ -172,7 +172,7 @@ public class VideoReader {
-             // TODO: Note that TAG_DATE can be changed to TAG_DATE_TIME in the future
-             // (and the corresponding output struct) in order to implement #2836.
-             Date? video_date = null;
--            if (info.get_tags() != null && info.get_tags().get_date(Gst.TAG_DATE, out video_date)) {
-+            if (info.get_tags() != null && info.get_tags().get_date(Gst.Tags.DATE, out video_date)) {
-                 timestamp = new DateTime.local(video_date.get_year(), video_date.get_month(), 
-                     video_date.get_day(), 0, 0, 0);
-             }
-@@ -323,7 +323,7 @@ public class Video : VideoSource, Flaggable, Monitorable, Dateable {
-         Gst.init(ref fake_unowned_args);
-         
-         int saved_state = Config.Facade.get_instance().get_video_interpreter_state_cookie();
--        current_state = (int) Gst.Registry.get_default().get_feature_list_cookie();
-+        current_state = (int) Gst.Registry.get().get_feature_list_cookie();
-         if (saved_state == Config.Facade.NO_VIDEO_INTERPRETER_STATE) {
-             message("interpreter state cookie not found; assuming all video thumbnails are out of date");
-             interpreter_state_changed = true;
-diff --git a/thumbnailer/shotwell-video-thumbnailer.vala b/thumbnailer/shotwell-video-thumbnailer.vala
-index a4d7dc2..c12784e 100644
---- a/thumbnailer/shotwell-video-thumbnailer.vala
-+++ b/thumbnailer/shotwell-video-thumbnailer.vala
-@@ -10,11 +10,7 @@
- // Shotwell Thumbnailer takes in a video file and returns a thumbnail to stdout.  This is
- // a replacement for totem-video-thumbnailer
- class ShotwellThumbnailer {
--    const string caps_string = """video/x-raw-rgb,bpp = (int) 32, depth = (int) 32,
--                                      endianness = (int) BIG_ENDIAN,
--                                      red_mask = (int)   0xFF000000,
--                                      green_mask = (int) 0x00FF0000,
--                                      blue_mask = (int)  0x0000FF00,
-+    const string caps_string = """video/x-raw, format=RGBA,
-                                       width = (int) [ 1, max ],
-                                       height = (int) [ 1, max ],
-                                       framerate = (fraction) [ 0, max ]""";
-@@ -36,7 +32,7 @@ class ShotwellThumbnailer {
-             return 1;
-         }
-         
--        descr = "filesrc location=\"%s\" ! decodebin2 ! ffmpegcolorspace ! ".printf(args[1]) + 
-+        descr = "filesrc location=\"%s\" ! decodebin ! videoconvert ! ".printf(args[1]) + 
-             "appsink name=sink caps=\"%s\"".printf(caps_string);
-         
-         try {
-@@ -69,7 +65,7 @@ class ShotwellThumbnailer {
-             // by seeking to somewhere else we have a bigger chance of getting something
-             // more interesting. An optimization would be to detect black images and then
-             // seek a little more.
--            position = (int64) (Gst.Format.PERCENT_MAX * 0.05);
-+            position = (int64) (Gst.FORMAT_PERCENT_MAX * 0.05);
-             pipeline.seek_simple(Gst.Format.PERCENT, Gst.SeekFlags.KEY_UNIT | Gst.SeekFlags.FLUSH , position);
-             
-             // Get the preroll buffer from appsink, this block untils appsink really
-@@ -86,7 +82,7 @@ class ShotwellThumbnailer {
-                 // that it can only be an rgb buffer. The only thing we have not specified
-                 // on the caps is the height, which is dependant on the pixel-aspect-ratio
-                 // of the source material.
--                caps = buffer.get_caps();
-+                caps = (sink as Gst.App.Sink).caps;
-                 if (caps == null) {
-                     stderr.printf("could not get snapshot format\n");
-                     return 5;
-@@ -104,9 +100,11 @@ class ShotwellThumbnailer {
-                 
-                 // Create pixmap from buffer and save, gstreamer video buffers have a stride
-                 // that is rounded up to the nearest multiple of 4.
--                pixbuf = new Gdk.Pixbuf.from_data(buffer.data, Gdk.Colorspace.RGB, true, 8, 
-+		Gst.MapInfo info;
-+		buffer.map(out info, Gst.MapFlags.READ);
-+                pixbuf = new Gdk.Pixbuf.from_data(info.data, Gdk.Colorspace.RGB, true, 8, 
-                     width, height, width * 4, null);
--                
-+                buffer.unmap(info);
-                 // Save the pixbuf.
-                 pixbuf.save("/dev/stdout", "png");
-             } else {
--- 
-1.7.11.4
-
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index e83633dc6..cd11f3b12 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,35 +1,30 @@
-# $Id: PKGBUILD 81068 2012-12-11 14:37:24Z allan $
+# $Id: PKGBUILD 88680 2013-04-21 22:16:49Z heftig $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=shotwell
-pkgver=0.13.1
-pkgrel=5
+pkgver=0.14.1
+pkgrel=3
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://yorba.org/shotwell/"
 license=('LGPL2.1')
-depends=('libgee' 'libwebkit3' 'libgexiv2' 'libraw' 'rest'
+depends=('libgee06' 'libwebkit3' 'libgexiv2' 'libraw' 'rest'
 	 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib'
 	 'gst-plugins-base' 'libgphoto2')
 makedepends=('intltool' 'vala>=0.17.2' 'libunique3')
 install=shotwell.install
-source=("http://yorba.org/download/shotwell/0.13/shotwell-${pkgver}.tar.xz"
-	"no-libexec.patch"
-        "0001-Port-to-GStreamer-1.0.patch")
-md5sums=('71eb1346093705ca2b37c12a21994d14'
-         'b4124e022c98b4382530e6fbcef965e2'
-         '86e47eade2b5a49bd6503294751d95f0')
+source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz"
+	"no-libexec.patch")
+md5sums=('bb5783f9265e1ce2d4c9f354987c3ab1'
+         'b4124e022c98b4382530e6fbcef965e2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -p1 <$srcdir/no-libexec.patch
 
-  # http://redmine.yorba.org/issues/5548
-  patch -p1 <$srcdir/0001-Port-to-GStreamer-1.0.patch
-
   ./configure --prefix=/usr \
 	--disable-schemas-compile \
 	--disable-desktop-update \
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index 510e514dd..7107202c1 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 83275 2013-01-28 16:50:10Z stephane $
+# $Id: PKGBUILD 88284 2013-04-15 17:29:41Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
 
 pkgname=sigil
-pkgver=0.6.2
-pkgrel=2
+pkgver=0.7.2
+pkgrel=1
 pkgdesc="WYSIWYG ebook editor"
-arch=('i686' 'x86_64' 'mips64el') 
+arch=('i686' 'x86_64') 
 url="http://code.google.com/p/sigil/"
 license=('GPL3')
-depends=('qtwebkit' 'boost-libs')
-makedepends=('cmake' 'gendesk' 'boost')
+depends=('qt5-webkit' 'boost-libs')
+makedepends=('qt5-tools' 'qt5-svg' 'cmake' 'gendesk' 'boost')
 install=sigil.install
 source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip")
-md5sums=('78615dc007c12cc34271243d82783a36')
+md5sums=('540745983db57a2150cc2f4057455b19')
 
 build() {
   cd "${srcdir}"
@@ -21,6 +21,7 @@ build() {
 
   mkdir build
   cd build
+
   cmake -G "Unix Makefiles" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
diff --git a/community/sigil/sigil.desktop b/community/sigil/sigil.desktop
deleted file mode 100755
index 4f3a14d20..000000000
--- a/community/sigil/sigil.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Sigil
-Comment=E-book reader and WYSIWYG editor
-TryExec=sigil
-Exec=sigil
-Icon=sigil
-Categories=Office;
-Terminal=false
-StartupNotify=false
diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD
index 4e95f1cb2..72fba4f35 100644
--- a/community/signon-plugin-oauth2/PKGBUILD
+++ b/community/signon-plugin-oauth2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 81732 2012-12-27 21:40:51Z bgyorgy $
+# $Id: PKGBUILD 84333 2013-02-16 20:09:04Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=signon-plugin-oauth2
 _pkgname=signon-oauth2
-pkgver=0.14
+pkgver=0.15
 pkgrel=1
 pkgdesc="OAuth 2 plugin for signon"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('signon-ui' 'qjson')
 makedepends=('signon')
 source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2)
-sha1sums=('348c59af181c28ab3ac7b5fc76cd6758fc6b63e6')
+sha1sums=('31f63f73eca2c8341ab41ec0d63650c9a0b4820a')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
diff --git a/community/signon-ui/PKGBUILD b/community/signon-ui/PKGBUILD
index 5a21188df..0434d84a8 100644
--- a/community/signon-ui/PKGBUILD
+++ b/community/signon-ui/PKGBUILD
@@ -1,30 +1,31 @@
-# $Id: PKGBUILD 80673 2012-11-29 00:36:04Z bgyorgy $
+# $Id: PKGBUILD 87395 2013-03-30 17:58:57Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=signon-ui
-pkgver=0.12
+pkgver=0.14
+_pkgver=0.14+bzr85
 pkgrel=1
 pkgdesc="UI component that responsible for handling the user interactions which can happen during the login process of an online account"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/online-accounts-signon-ui"
 license=('GPL')
-depends=('libaccounts-qt' 'qtwebkit' 'libproxy')
-makedepends=('signon' 'libnotify')
-source=(https://launchpad.net/online-accounts-signon-ui/13.04/$pkgver/+download/$pkgname-$pkgver.tar.bz2
+depends=('libaccounts-qt' 'qtwebkit' 'signon' 'libnotify')
+source=(https://launchpad.net/online-accounts-signon-ui/13.04/$_pkgver/+download/$pkgname-$_pkgver.tar.bz2
         Makefile)
-md5sums=('dca78c25d2d5303a1479403fec334e27'
+md5sums=('5857a1b9ed957a5de72863c3868049da'
          'c73ecd27c76a9060862512b7678ae4f1')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # Do not install tests
-  echo 'INSTALLS =' >>tests/unit/unit.pro
+  echo 'INSTALLS =' >>tests/unit/tst_inactivity_timer.pro
+  echo 'INSTALLS =' >>tests/unit/tst_signon_ui.pro
 
   # Fix build
   cp "$srcdir/Makefile" po/Makefile
 
-  qmake PREFIX=/usr LIBDIR=/usr/lib
+  qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
   make
 }
 
diff --git a/community/signon/PKGBUILD b/community/signon/PKGBUILD
index 8c19d96e1..9e8762906 100644
--- a/community/signon/PKGBUILD
+++ b/community/signon/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 83013 2013-01-26 15:03:10Z bgyorgy $
+# $Id: PKGBUILD 87393 2013-03-30 17:15:21Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgbase=signon
 pkgname=('signon' 'signon-doc')
-pkgver=8.46
+pkgver=8.49
 pkgrel=1
 pkgdesc="Framework to provide credential storage and authentication service"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/accounts-sso/"
 license=('LGPL')
-depends=('qt' 'libproxy')
+depends=('qt4' 'libproxy')
 makedepends=('doxygen' 'graphviz' 'ttf-dejavu')
 backup=(etc/signond.conf)
 install=$pkgname.install
 source=(http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2
         use_keyring.patch)
-sha1sums=('3524fe1427de397c7b355e86e50a901b55298976'
+sha1sums=('349d700eed718977463020f252269786883bc4c6'
           'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1')
 
 build() {
@@ -24,7 +24,10 @@ build() {
   # Use gnome-keyring secrets storage if signon-keyring-extension is available
   patch -Np1 -i "$srcdir/use_keyring.patch"
 
-  qmake PREFIX=/usr LIBDIR=/usr/lib
+  # qt4 fix
+  sed -i 's/qdbusxml2cpp/qdbusxml2cpp-qt4/' src/signond/signond.pro
+
+  qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
   make
 }
 
diff --git a/community/signon/cryptsetup-optional.patch b/community/signon/cryptsetup-optional.patch
deleted file mode 100644
index d6293e598..000000000
--- a/community/signon/cryptsetup-optional.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur signon-8.43.orig/src/extensions/extensions.pro signon-8.43/src/extensions/extensions.pro
---- signon-8.43.orig/src/extensions/extensions.pro	2012-09-18 14:59:58.000000000 +0200
-+++ signon-8.43/src/extensions/extensions.pro	2012-10-17 20:02:52.846790974 +0200
-@@ -1,7 +1,7 @@
- TEMPLATE = subdirs
- SUBDIRS =
- 
--system(pkg-config --exists libcryptsetup) {
-+CONFIG(cryptsetup) {
-     SUBDIRS += cryptsetup
- }
- 
diff --git a/community/simavr/PKGBUILD b/community/simavr/PKGBUILD
index fd6d4357b..aa2e8370f 100644
--- a/community/simavr/PKGBUILD
+++ b/community/simavr/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=simavr
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A lean, mean and hackable AVR simulator'
 arch=('i686' 'x86_64')
 url="https://github.com/buserror-uk/simavr"
@@ -25,7 +25,7 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/usr" install
+  make PREFIX="/usr" DESTDIR="$pkgdir/usr" install
 }
 
 md5sums=('82c9704a4e8569548f01931e32ebfe0c')
diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD
index c20bdf932..1e2c8dfc2 100644
--- a/community/simgear/PKGBUILD
+++ b/community/simgear/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 75603 2012-08-27 13:35:08Z spupykin $
+# $Id: PKGBUILD 84416 2013-02-18 20:14:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 # Contributor: Hans Janssen <hans@janserv.xs4all.nl>
 
 pkgname=simgear
-pkgver=2.8.0
+pkgver=2.10.0
 pkgrel=1
 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications."
 arch=(i686 x86_64)
 depends=('glut' 'freealut' 'plib' 'openscenegraph')
-makedepends=('boost' 'cmake')
+makedepends=('boost' 'cmake' 'mesa')
 license=("GPL")
 #url="http://www.simgear.org"
 url="https://gitorious.org/fg"
 options=('!makeflags')
 #source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver")
 source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2")
-md5sums=('0a8c77439ba7879b354a8fbcb7901ce3')
+md5sums=('0ec974d3778f777d5c99c89db671fcc7')
 
 build() {
   cd $srcdir/simgear-$pkgver
diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD
index 01e7a7557..93233537f 100644
--- a/community/simple-scan/PKGBUILD
+++ b/community/simple-scan/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=simple-scan
-pkgver=3.6.0
+pkgver=3.8.0
 pkgrel=1
 pkgdesc='Simple scanning utility'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,8 @@ license=('GPL3')
 depends=('sane' 'dconf' 'gtk3' 'colord' 'hicolor-icon-theme')
 makedepends=('yelp-tools' 'intltool')
 install=simple-scan.install
-source=(https://launchpad.net/$pkgname/${pkgver:0:3}/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-sha256sums=('d00684d4697de6753b6633d7c87b9c067fdbf99b732da9007ea2bb6cbdad1cde')
+source=(https://launchpad.net/$pkgname/${pkgver:0:3}/$pkgver/+download/$pkgname-$pkgver.tar.xz)
+sha256sums=('8df71e5f9e5db5c53217cb56b0e23b58dfe65bc174e873ad3ee576fbeccadc22')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD
index 170e94aab..9a2d46733 100644
--- a/community/skrooge/PKGBUILD
+++ b/community/skrooge/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83379 2013-01-30 20:36:03Z jlichtblau $
+# $Id: PKGBUILD 85723 2013-03-05 18:54:32Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com>
 
 pkgname=skrooge
-pkgver=1.5.1
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="A personal finances manager for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ optdepends=('kdepim-libkdepim: for KDE PIM integration')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://skrooge.org/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('9d8332d80faf4c89b02582894588829b3004d6abf79528c4b6e35a791a8adebc')
+sha256sums=('7237400f0ae9af317ec9ac45d8d35144f827146b8cb4e37fa092412fec5f0b0e')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/skrooge/skrooge.changelog b/community/skrooge/skrooge.changelog
index 229dda2a4..81cf3a3d2 100644
--- a/community/skrooge/skrooge.changelog
+++ b/community/skrooge/skrooge.changelog
@@ -1,3 +1,6 @@
+2013-03-50 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* skrooge 1.6.0-1
+
 2013-01-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* skrooge 1.5.1-1
 
diff --git a/community/skype-call-recorder/PKGBUILD b/community/skype-call-recorder/PKGBUILD
deleted file mode 100644
index 8dcbcb072..000000000
--- a/community/skype-call-recorder/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 55494 2011-09-13 05:27:31Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Tarinaky <tarinaky@hunity.co.uk>
-
-pkgname=skype-call-recorder
-pkgver=0.8
-pkgrel=2
-pkgdesc="Open source tool that allows you to record your Skype calls on Linux"
-arch=('i686' 'x86_64')
-url="http://atdot.ch/scr/"
-license=('GPL')
-depends=('qt' 'libvorbis' 'lame' 'id3lib' 'hicolor-icon-theme')
-makedepends=('cmake')
-install=skype-call-recorder.install
-source=(http://atdot.ch/scr/files/$pkgver/$pkgname-$pkgver.tar.gz)
-sha1sums=('b8faade2d893628fd7a5deac5056d6dfaf7082c4')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/skype-call-recorder/skype-call-recorder.install b/community/skype-call-recorder/skype-call-recorder.install
deleted file mode 100644
index e4f8fd06c..000000000
--- a/community/skype-call-recorder/skype-call-recorder.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/sleuthkit/PKGBUILD b/community/sleuthkit/PKGBUILD
index a2fcec295..a90220805 100644
--- a/community/sleuthkit/PKGBUILD
+++ b/community/sleuthkit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82022 2013-01-05 17:48:30Z jlichtblau $
+# $Id: PKGBUILD 86192 2013-03-12 21:51:33Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=sleuthkit
-pkgver=4.0.1
+pkgver=4.0.2
 pkgrel=1
 pkgdesc='File system and media management forensic analysis tools'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('perl')
 options=('!libtool')
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('719d9a702f74c30302840301fe573c5bb5af5b88471b48657114eba6b0d76f12')
+sha256sums=('112f80fbc6a868c18c7a924f756b35c79eed9d0cc8923a4f973646f00e546e62')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/sleuthkit/sleuthkit.changelog b/community/sleuthkit/sleuthkit.changelog
index 5b68610bb..6ab1ba102 100644
--- a/community/sleuthkit/sleuthkit.changelog
+++ b/community/sleuthkit/sleuthkit.changelog
@@ -1,3 +1,6 @@
+2013-03-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* sleuthkit 4.0.2-1
+
 2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* sleuthkit 4.0.1-1
 
diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD
index d6f876680..9473d4a0b 100644
--- a/community/smalltalk/PKGBUILD
+++ b/community/smalltalk/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 81609 2012-12-25 00:34:14Z foutrelis $
+# $Id: PKGBUILD 88644 2013-04-20 23:03:17Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: mrshpot <mrshpot at gmail dot com>
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
 
 pkgname=smalltalk
-pkgver=3.2.4
-pkgrel=8
+pkgver=3.2.5
+pkgrel=1
 pkgdesc='Implementation of Smalltalk-80'
 url='http://smalltalk.gnu.org/'
 license=('GPL' 'LGPL')
@@ -14,9 +14,9 @@ arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool' '!emptydirs')
 depends=('gmp' 'libffi' 'libsigsegv' 'readline' 'libltdl')
 makedepends=('gdbm' 'gtk2' 'sqlite' 'tk>=8.6' 'zip')
-install=smalltalk.install
+install="$pkgname.install"
 source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
-sha256sums=('901cc7090a1fa44bc60900a970d207de4aa3bdfdce72bea55114e243bc1eb1b3')
+sha256sums=('06e574e818ec49f0555d948ae53b1453d8c1df59ef597dad911a4fd1ffba1cce')
 optdepends=('tk: for gst-blox'
             'sqlite: database in a file'
             'sed: for examples'
@@ -51,7 +51,8 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
-  # fix manpage symlink
+
+  # Fix manpage symlink
   rm -f "$pkgdir/usr/share/man/man1/gst-reload.1"
   ln -s gst-load.1 "$pkgdir/usr/share/man/man1/gst-reload.1"
 }
diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD
index f650fd03e..c14281c8e 100644
--- a/community/smc/PKGBUILD
+++ b/community/smc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83276 2013-01-28 16:50:11Z stephane $
-# Maintainer:
+# $Id: PKGBUILD 87438 2013-03-31 19:18:55Z stephane $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
 pkgname=smc
 pkgver=1.9
-pkgrel=18
+pkgrel=20
 pkgdesc="Secret Maryo Chronicles"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.secretmaryo.org/"
diff --git a/community/smem/PKGBUILD b/community/smem/PKGBUILD
index eebe70656..aa03be4fc 100644
--- a/community/smem/PKGBUILD
+++ b/community/smem/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 81012 2012-12-10 02:49:14Z dreisner $
-# Maintainer: Dave Reisner <d@falconindy.com>
+# $Id: PKGBUILD 88078 2013-04-11 05:47:45Z cinelli $
+# Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
+# Contributor: Dave Reisner <d@falconindy.com>
 # Contributor: Isaac Dupree <id@isaac.cedarswampstudios.org>
 # Contributor: Sebastien Duquette <ekse.0x@gmail.com>
 
 pkgname=smem
-pkgver=1.2
+pkgver=1.3
 pkgrel=1
 pkgdesc="Generate reports on memory usage."
 url="http://www.selenic.com/smem/"
@@ -12,21 +13,21 @@ license=("GPL")
 depends=('python2')
 optdepends=('python2-matplotlib: for chart generation')
 arch=('i686' 'x86_64' 'mips64el')
-source=("http://www.selenic.com/smem/download/${pkgname}-${pkgver}.tar.gz")
-md5sums=('b8975840a08172ba8a1abbe7cb202dfe')
+source=("http://www.selenic.com/smem/download/$pkgname-$pkgver.tar.gz")
+md5sums=('dd849102610aadb9f64379db09e73d41')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
   sed -i '1s/python$/python2/' smem
   make smemcap
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
-  install -Dm755 smem $pkgdir/usr/bin/smem
-  install -Dm755 smemcap $pkgdir/usr/bin/smemcap
-  install -Dm644 smem.8 "$pkgdir"/usr/share/man/man8/smem.8
+  install -Dm755 smem "$pkgdir/usr/bin/smem"
+  install -Dm755 smemcap "$pkgdir/usr/bin/smemcap"
+  install -Dm644 smem.8 "$pkgdir/usr/share/man/man8/smem.8"
 }
 
diff --git a/community/snes9x/PKGBUILD b/community/snes9x/PKGBUILD
deleted file mode 100644
index d7d424871..000000000
--- a/community/snes9x/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 78959 2012-10-28 04:11:03Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=snes9x
-pkgname=('snes9x' 'snes9x-gtk')
-pkgver=1.53
-pkgrel=5
-arch=('i686' 'x86_64')
-url="https://code.google.com/p/snes9x-gtk/"
-license=('custom')
-makedepends=('intltool' 'nasm' 'mesa' 'libpulse'  'libpng' 'sdl' 'gtk2' 'libxv' \
-             'desktop-file-utils' 'gnome-icon-theme')
-source=(http://snes9x-gtk.googlecode.com/files/${pkgbase}-${pkgver}-src.tar.bz2
-        snes9x-gtk2.24.diff.gz)
-sha1sums=('57be6480369f66b9aaaeb722789ce114f58ed1e2'
-          '680dbe0a70f1821bc7931539e72f5a1a95e3938c')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}-src"
-  patch -p1 -i "${srcdir}/snes9x-gtk2.24.diff"
-  cd unix
-  ./configure --prefix=/usr --with-sdd1-decomp --enable-netplay
-  make
-
-  cd "${srcdir}/${pkgbase}-${pkgver}-src/gtk"
-  ./configure --prefix=/usr --with-sdd1-decomp --with-netplay --with-opengl
-  make
-}
-
-package_snes9x() {
-  pkgdesc="A portable Emulator for the Super Nintendo Entertainment System"
-  depends=('gcc-libs' 'libpng' 'libxext' 'libsm')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}-src/unix"
-  install -D -m755 snes9x "${pkgdir}/usr/bin/snes9x"
-  install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \
-    "${pkgdir}/usr/share/doc/${pkgname}/"
-  install -D -m644 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_snes9x-gtk() {
-  pkgdesc="A portable Emulator for the Super Nintendo Entertainment System - GTK version"
-  license=('custom' 'LGPL')
-  depends=('sdl' 'libgl' 'libpulse' 'gtk2' 'libxv' 'desktop-file-utils' 'gnome-icon-theme')
-  install=snes9x-gtk.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}-src/gtk"
-  make DESTDIR="${pkgdir}" install
-  install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \
-    "${pkgdir}/usr/share/doc/${pkgname}/"
-  install -D -m644 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community/snes9x/snes9x-gtk.install b/community/snes9x/snes9x-gtk.install
deleted file mode 100644
index 2c88492dd..000000000
--- a/community/snes9x/snes9x-gtk.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove () {
-  post_install $1
-}
diff --git a/community/snes9x/snes9x-gtk2.24.diff.gz b/community/snes9x/snes9x-gtk2.24.diff.gz
deleted file mode 100644
index f8e86d7f2..000000000
--- a/community/snes9x/snes9x-gtk2.24.diff.gz
+++ /dev/null
diff --git a/community/soundkonverter/PKGBUILD b/community/soundkonverter/PKGBUILD
deleted file mode 100644
index d815835f8..000000000
--- a/community/soundkonverter/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 80754 2012-12-03 09:48:01Z stativ $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Darwin Bautista <djclue917@gmail.com>
-
-pkgname=soundkonverter
-pkgver=1.6.4
-pkgrel=1
-pkgdesc="Front-end to various audio converters"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.kde-apps.org/content/show.php?content=29024"
-license=('GPL')
-depends=('kdebase-runtime' 'libkcddb' 'cdparanoia' 'taglib')
-makedepends=('automoc4' 'cmake')
-optdepends=('cdrkit: cdda2wav backend'
-            'faac: faac backend'
-            'faad2: faad backend'
-            'ffmpeg: ffmpeg backend'
-            'flac: flac backend'
-            'fluidsynth: flouidsynth backend'
-            'lame: lame backend'
-            'mac: mac backend'
-            'mplayer: mplayer backend'
-            'mp3gain: mp3gain backend'
-            'speex: speexenc, speexdec backends'
-            'timidity++: midi backend'
-            'twolame: twolame backend'
-            'vorbisgain: vorbisgain backend'
-            'vorbis-tools: vorbis tools backend'
-            'wavpack: wavpack backend')
-install=$pkgname.install
-source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz")
-md5sums=('be01689be4c7e1811c57436ec45d7326')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  cmake . \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
-}
diff --git a/community/soundkonverter/soundkonverter.install b/community/soundkonverter/soundkonverter.install
deleted file mode 100644
index 0e8feb79c..000000000
--- a/community/soundkonverter/soundkonverter.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD
index 215d5dd68..50a3db338 100644
--- a/community/spacefm/PKGBUILD
+++ b/community/spacefm/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 82671 2013-01-22 20:02:54Z bpiotrowski $
+# $Id: PKGBUILD 86533 2013-03-18 17:58:18Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
 # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com>
 
 pkgname=spacefm
-pkgver=0.8.5
+pkgver=0.8.7
 pkgrel=1
 pkgdesc='Multi-panel tabbed file manager'
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url='http://ignorantguru.github.com/spacefm/'
 license=('GPL3')
 install=$pkgname.install
@@ -21,7 +21,7 @@ optdepends=('lsof: device processes'
             'udisks: mount as non-root user'
             'udisks2: mount as non-root user')
 source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('dd04444ba45196a1bc710ff5e73e91f3aaff7661db56e6c86389579c2a1da54e')
+sha256sums=('3e48f276df4505b69d24fbeb4b5a869cf316503e2395bef467a29a5207b23947')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index 85a5c786e..9e93a8fb1 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 83277 2013-01-28 16:50:13Z stephane $
+# $Id: PKGBUILD 87439 2013-03-31 19:18:57Z stephane $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=spring
-pkgver=0.91.0
-_pkgver=91.0
-pkgrel=4
+pkgver=0.94.1
+_pkgver=94.1
+pkgrel=2
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://springrts.com/"
@@ -18,18 +18,17 @@ optdepends=('python2: python-based bots'
             'java-runtime: java-based bots')
 install=spring.install
 source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
-md5sums=('8849ace38f2ae20dc100b9d0a8d743e9')
+md5sums=('bafc1e889bed31666553efc387a13b49')
 
 build() {
   bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
   
   cd spring_${_pkgver}
 
-  sed "s/TIME_UTC/TIME_UTC_/g" -i AI/Skirmish/E323AI/CScopedTimer.h
- 
   cmake	. \
     -DCMAKE_INSTALL_PREFIX=/usr \
-	-DDATADIR=share/spring -DCMAKE_SKIP_RPATH:BOOL=YES
+	-DDATADIR=share/spring \
+    -DCMAKE_SKIP_RPATH=YES
   make
 }
 
diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD
index 01cabafc7..f5d7593a6 100644
--- a/community/springlobby/PKGBUILD
+++ b/community/springlobby/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83278 2013-01-28 16:50:15Z stephane $
+# $Id: PKGBUILD 87440 2013-03-31 19:18:58Z stephane $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: DuGi <dugi@irc.pl>
 
 pkgname=springlobby
-pkgver=0.159
-pkgrel=2
+pkgver=0.169
+pkgrel=1
 pkgdesc="A free cross-platform lobby client for the Spring RTS project."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://springlobby.info/"
@@ -14,7 +14,7 @@ optdepends=('sdl' 'sdl_sound' 'sdl_mixer')
 makedepends=('boost' 'asio' 'cmake')
 install=springlobby.install
 source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9a8e89c32dd49a51332e446e47dc1be1')
+md5sums=('1eb265268ac39d9b7e8fec90df92ff3d')
 
 build() {
   cd $srcdir/${pkgname}-$pkgver
diff --git a/community/sqlheavy/PKGBUILD b/community/sqlheavy/PKGBUILD
new file mode 100755
index 000000000..43f08fc60
--- /dev/null
+++ b/community/sqlheavy/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 89815 2013-05-02 15:11:19Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
+# Contributor : sebikul <sebikul@gmail.com>
+
+pkgname=sqlheavy
+pkgver=0.1.1
+pkgrel=6
+pkgdesc="GObject SQLite wrapper"
+arch=('i686' 'x86_64')
+url="https://code.google.com/p/sqlheavy/"
+license=('LGPL')
+conflicts=('sqlheavy-git')
+depends=('gtk2' 'sqlite3')
+makedepends=('gobject-introspection' 'vala')
+options=('!libtool')
+source=("https://sqlheavy.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('e8689f5fd4e0baf98eada2b3811262bb99877c2e8586fd21ad2a7ad3acc59031')
+
+prepare() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  sed -i 's/libvala-0.16/libvala-0.20/' configure
+  sed -i '/examples/d
+          /utils/d'  Makefile.in
+}
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/sqlitebrowser/PKGBUILD b/community/sqlitebrowser/PKGBUILD
index 8ebbadf1d..aaaa0ba11 100644
--- a/community/sqlitebrowser/PKGBUILD
+++ b/community/sqlitebrowser/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65487 2012-02-21 06:06:09Z spupykin $
+# $Id: PKGBUILD 85413 2013-03-01 10:40:34Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
@@ -6,12 +6,12 @@
 pkgname=sqlitebrowser
 pkgver=2.0b1
 _pkgrealver=200_b1
-pkgrel=2
+pkgrel=3
 pkgdesc="SQLite Database browser is a light GUI editor for SQLite databases, built on top of QT"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sqlitebrowser.sf.net"
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}_${_pkgrealver}_src.tar.gz)
 md5sums=('5ca3d41cca454235b93ce72cd585dfe3')
 
diff --git a/community/squeak-vm/PKGBUILD b/community/squeak-vm/PKGBUILD
index 58fba3e21..2ff380d0c 100644
--- a/community/squeak-vm/PKGBUILD
+++ b/community/squeak-vm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 76322 2012-09-15 22:08:09Z jsteel $
+# $Id: PKGBUILD 85994 2013-03-10 21:24:51Z jsteel $
 # Maintainer: Jonathan Steel <mail at jsteel dot org>
 # Contributor: Piero Sartini <piero@sartini.de>
 # Contributor: Cilyan Olowen <gaknar@gmail.com>
@@ -6,10 +6,9 @@
 # Contributor: kxmd
 
 pkgname=squeak-vm
-pkgver=4.10.2.2602
+pkgver=4.10.2.2614
 pkgrel=1
-pkgdesc="A full-featured implementation of the Smalltalk programming language 
-    and environment"
+pkgdesc="Full-featured implementation of the Smalltalk programming language and environment"
 arch=('i686' 'x86_64')
 url="http://squeakvm.org"
 license=('custom:MIT' 'APACHE')
@@ -21,7 +20,7 @@ optdepends=('speex: for ogg plugin' 'gstreamer0.10: for gstreamer plugin'
     'libpulse: for pulse plugin' 'squeak-image: for the full Squeak 
     environment')
 source=(http://squeakvm.org/unix/release/Squeak-$pkgver-src.tar.gz)
-md5sums=('23b48480581c5a1c1bccf12e93611faf')
+md5sums=('8a5cb1d6899d55df56154fab8716e034')
 
 build() {
   cd "$srcdir"/Squeak-$pkgver-src/
@@ -35,7 +34,7 @@ build() {
 package() {
   cd "$srcdir"/Squeak-$pkgver-src  
 
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir"/ install
 
   install -Dm644 "$srcdir"/Squeak-$pkgver-src/unix/doc/LICENSE \
     "$pkgdir"/usr/share/licenses/squeak-vm/LICENSE
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index 83264628a..9e63cf082 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 83891 2013-02-06 11:40:54Z spupykin $
+# $Id: PKGBUILD 88474 2013-04-18 12:16:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Coolen <mark.coolen@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=squid
-pkgver=3.2.7
-pkgrel=2
+pkgver=3.3.3
+pkgrel=1
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.squid-cache.org'
@@ -18,13 +18,13 @@ backup=('etc/squid/squid.conf'
         'etc/squid/mime.conf'
         'etc/conf.d/squid')
 install=$pkgname.install
-source=("http://www.squid-cache.org/Versions/v3/3.2/$pkgname-$pkgver.tar.bz2"
+source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2"
         'squid'
         'squid.conf.d'
         'squid.pam'
         'squid.cron'
         'squid.service')
-md5sums=('3e4d21b24c39d5066791017919866a64'
+md5sums=('20f63ab34eae93b36969c9c7519f6462'
          'e90895ce22c0b618c89a46a9a181fe6c'
          '2383772ef94efddc7b920628bc7ac5b0'
          '270977cdd9b47ef44c0c427ab9034777'
@@ -76,7 +76,8 @@ build() {
     --enable-arp-acl \
     --with-default-user=proxy \
     --enable-async-io \
-    --enable-truncate
+    --enable-truncate \
+    --enable-icap-client
   make
 }
 
@@ -90,7 +91,7 @@ package() {
   install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid"
   install -Dm644 "$srcdir/squid.service" \
     "$pkgdir/usr/lib/systemd/system/squid.service"
-  rm -rf $pkgdir/run $pkgdir/var/run
+  rm -rf "$pkgdir/run" "$pkgdir/var/run"
 }
 
 # vim: ts=2 sw=2 et ft=sh
diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD
index 83cc5ca65..e786ec243 100644
--- a/community/sshguard/PKGBUILD
+++ b/community/sshguard/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80462 2012-11-22 08:40:25Z mtorromeo $
+# $Id: PKGBUILD 84143 2013-02-11 15:20:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=sshguard
 pkgver=1.5
-pkgrel=9
+pkgrel=10
 pkgdesc="Brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables"
 arch=('i686' 'x86_64' 'mips64el')
 #url="http://sourceforge.net/projects/sshguard/"
@@ -26,6 +26,7 @@ sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19'
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's|^DAYNO.*|DAYNO       [0-9]?[1-9]|' src/parser/attack_scanner.l
   ./configure --prefix=/usr --with-firewall=iptables
   make
 }
diff --git a/community/sslh/sslh.conf b/community/sslh/sslh.conf
deleted file mode 100644
index d3a46d053..000000000
--- a/community/sslh/sslh.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh noet:
-
-DAEMON_OPTS='-F /etc/sslh.conf'
diff --git a/community/sslh/sslh.rc b/community/sslh/sslh.rc
deleted file mode 100644
index 456e122f4..000000000
--- a/community/sslh/sslh.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-DAEMON=/usr/bin/sslh
-PID=$(pidof -o %PPID $DAEMON)
-DAEMON_OPTS="--background $DAEMON_OPTS"
-
-case "$1" in
-  start)
-    stat_busy "Starting ${0##*/} daemon"
-    [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0
-    stat_fail
-  ;;
-  stop)
-    stat_busy "Stopping ${0##*/} daemon"
-    [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
-    stat_fail
-  ;;
-  restart)
-    $0 stop
-    $0 start
-    exit 0
-  ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|restart}" >&2
-  ;;
-esac
-
-exit 1
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/stardict/PKGBUILD b/community/stardict/PKGBUILD
index 542675e54..5b58f5a77 100644
--- a/community/stardict/PKGBUILD
+++ b/community/stardict/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 82064 2013-01-07 06:51:59Z fyan $
+# $Id: PKGBUILD 87021 2013-03-25 19:17:03Z bpiotrowski $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
@@ -8,11 +8,11 @@
 pkgbase=stardict
 pkgname=(stardict stardict-lite)
 pkgver=3.0.4
-pkgrel=2
-arch=('i686' 'x86_64')
+pkgrel=3
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.stardict.org/'
 license=('GPL')
-makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmysqlclient' 'enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome')
+makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmariadbclient' 'enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome')
 options=('!libtool' '!emptydirs')
 source=("http://stardict-3.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2"
         'gcc46.patch'
diff --git a/community/stk/cxxflags.patch b/community/stk/cxxflags.patch
deleted file mode 100644
index bb86e929a..000000000
--- a/community/stk/cxxflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- stk-4.4.2/configure.ac	2010-02-04 15:52:39.000000000 -0500
-+++ configure.ac	2010-03-11 23:55:44.000000000 -0500
-@@ -51,7 +51,7 @@
- AC_ARG_ENABLE(debug,
-   [  --enable-debug = enable various debug output],
-   [AC_SUBST( cppflag, ["-D_STK_DEBUG_ -D__RTAUDIO_DEBUG__ -D__RTMIDI_DEBUG__"] ) AC_SUBST( cxxflag, ["-g"] ) AC_SUBST( object_path, [Debug] ) AC_MSG_RESULT(yes)],
--  [AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [-O3] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
-+  [AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
- 
- # Checks for functions
- if test $realtime = yes; then
-@@ -63,12 +63,7 @@
- CPPFLAGS="$CPPFLAGS $cppflag"
- 
- # For debugging and optimization ... overwrite default because it has both -g and -O2
--CXXFLAGS="$cxxflag"
--
--# Check compiler and use -Wall if gnu.
--if [test $GXX = "yes" ;] then
--  AC_SUBST( cxxflag, [-Wall] )
--fi
-+CXXFLAGS="$cxxflag $CXXFLAGS"
- 
- CXXFLAGS="$CXXFLAGS $cxxflag"
- 
diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD
index 1d150765a..09c883e80 100644
--- a/community/stone-soup/PKGBUILD
+++ b/community/stone-soup/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Jakob Gruber <jakob.gruber@gmail.com>
 
 pkgname=stone-soup
-pkgver=0.11.2
-pkgrel=1
+pkgver=0.12.0
+pkgrel=2
 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://crawl.develz.org/'
-depends=('lua51' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'glu' 'freetype2' 'ttf-dejavu')
+depends=('lua51' 'ncurses' 'sdl_image' 'sqlite' 'glu' 'freetype2' 'ttf-dejavu')
 makedepends=('bison' 'flex' 'gendesk' 'mesa')
 conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git')
 license=('custom')
@@ -64,5 +64,4 @@ package() {
         "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
 }
-
-md5sums=('84b5939d242fbaec4d9d8c64fa02156c')
+md5sums=('38ed5bae81f6513cc898aa12efda2c38')
diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD
index b8fa00173..e218d11a8 100644
--- a/community/stunnel/PKGBUILD
+++ b/community/stunnel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82635 2013-01-22 07:12:03Z fyan $
+# $Id: PKGBUILD 87349 2013-03-30 09:40:31Z lfleischer $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=stunnel
-pkgver=4.54
+pkgver=4.56
 pkgrel=1
 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,8 +18,8 @@ source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc}
         'stunnel.rc.d'
         'stunnel.tmpfiles.conf')
 
-md5sums=('c2b1db99e3ed547214568959a8ed18ac'
-         'b7cd936bae7b56dae6fe1f06d90c4db1'
+md5sums=('ac4c4a30bd7a55b6687cbd62d864054c'
+         'd68c7dd65d515c678cdde15bbf0ce344'
          'f15398497e10e080c2406d2fc541660c'
          '4c7e3634a9d4dc040102f5d4160fb123'
          '2e065a39998e57727ee79887bbd1751e')
diff --git a/community/stuntrally/PKGBUILD b/community/stuntrally/PKGBUILD
new file mode 100644
index 000000000..168bbc623
--- /dev/null
+++ b/community/stuntrally/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
+# Contributor: Jason Melton <jason.melton@gmail.com>
+
+pkgname=stuntrally
+pkgver=1.9
+pkgrel=3
+pkgdesc='Stunt Rally game with track editor, based on VDrift'
+arch=('x86_64' 'i686')
+license=('GPL3')
+url='http://code.google.com/p/vdrift-ogre'
+depends=('libvorbis' 'mygui' 'sdl' 'enet' 'hicolor-icon-theme' 'libxcursor' 'stuntrally-data')
+makedepends=('cmake' 'boost')
+install=stuntrally.install
+source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/$pkgname/$pkgname/tar.gz/$pkgver")
+sha256sums=('651d10aa00cf73b275198f08b0360a34ff98e6b520013041863854babeb20da7')
+
+build() {
+  cd "$srcdir/stuntrally-$pkgver/"
+
+  rm -rf build
+  mkdir build && cd build
+  cmake -DCMAKE_INSTALL_PREFIX="/usr" -DSHARE_INSTALL="share/stuntrally" ..
+  make
+}
+
+package() {
+  cd "$srcdir/stuntrally-$pkgver/build/"
+
+  make DESTDIR="$pkgdir" install
+  rm -rf "$pkgdir/usr/share/stuntrally/"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/nvclock/nvclock.install b/community/stuntrally/stuntrally.install
index d59dca6e8..3a13ff305 100644
--- a/community/nvclock/nvclock.install
+++ b/community/stuntrally/stuntrally.install
@@ -3,9 +3,11 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  post_install $1
+ post_install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD
index 3fb185aa1..cc9e5f317 100644
--- a/community/subtle/PKGBUILD
+++ b/community/subtle/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72816 2012-06-22 21:15:04Z arodseth $
+# $Id: PKGBUILD 86887 2013-03-23 23:10:50Z td123 $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: unexist <unexist@dorfelite.net>
@@ -8,15 +8,15 @@
 
 pkgname=subtle
 pkgver=0.11.3224
-pkgrel=1
-pkgdesc="Grid-based manual tiling window manager"
-arch=("i686" "x86_64" "mips64el")
-url="http://subtle.subforge.org"
-license=("GPL")
-depends=("ruby" "libxft" "libxpm" "libxrandr" "libxft" "libxpm" "libxinerama"
-         "libxtst")
-makedepends=("pkg-config" "libxinerama" "libxrandr" "libxft" "libxpm")
-backup=("etc/xdg/subtle/subtle.rb")
+pkgrel=2
+pkgdesc='Grid-based manual tiling window manager'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://subtle.subforge.org/'
+license=('GPL')
+depends=('ruby' 'libxft' 'libxpm' 'libxrandr' 'libxft' 'libxpm' 'libxinerama'
+         'libxtst')
+makedepends=('pkg-config' 'libxinerama' 'libxrandr' 'libxft' 'libxpm')
+backup=('etc/xdg/subtle/subtle.rb')
 install=subtle.install
 source=("http://subforge.org/attachments/download/81/$pkgname-$pkgver-xi.tbz2")
 sha256sums=('a22ee94a70c1105a018e1c0a754597b4e3a87d1b915301a0b22888920fa0f8a2')
@@ -24,7 +24,10 @@ sha256sums=('a22ee94a70c1105a018e1c0a754597b4e3a87d1b915301a0b22888920fa0f8a2')
 build() {
   cd "$srcdir/$pkgname-$pkgver-xi"
 
-  # use vendor_ruby instead of site_ruby
+  # Disable the check for Ruby 1.9
+  sed -i 's/ 1 != / 7 == /' Rakefile
+  sed -i 's/ 9 != / 7 == /' Rakefile
+  # Use vendor_ruby instead of site_ruby
   sed -e \
     's/RbConfig::CONFIG\["sitelibdir"\]/RbConfig::CONFIG\["vendorlibdir"\]/' \
     -i Rakefile
@@ -33,7 +36,7 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver-xi"
 
-  rake destdir=$pkgdir install 
+  rake destdir=$pkgdir install  --trace
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD
index c62eeca72..1a66faf0f 100644
--- a/community/supercollider/PKGBUILD
+++ b/community/supercollider/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82202 2013-01-11 18:53:55Z speps $
+# $Id: PKGBUILD 88666 2013-04-21 13:40:47Z speps $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 # Contributor:  <farid at archlinux-br.org>
 
 _name=SuperCollider
 pkgname=supercollider
-pkgver=3.6.2
+pkgver=3.6.4
 pkgrel=1
 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition"
 arch=('i686' 'x86_64')
@@ -18,14 +18,14 @@ optdepends=('emacs: emacs interface'
             'ruby: vim support')
 install="$pkgname.install"
 source=("http://download.sourceforge.net/project/$pkgname/Source/${pkgver%.*}/$_name-$pkgver-Source-linux.tar.bz2")
-md5sums=('b160930f01c2b00df303f8112bbe2f3f')
+md5sums=('a6f0c1183f311ffcfbc143dce2332d74')
 
 build() {
   cd "$srcdir/$_name-Source"
-
   [ -d bld ] || mkdir bld && cd bld
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-           -DCMAKE_BUILD_TYPE=Release
+           -DCMAKE_BUILD_TYPE=Release \
+           -DLIBSCSYNTH=ON
   make
 }
 
diff --git a/community/supertux/compile.patch b/community/supertux/compile.patch
deleted file mode 100644
index 05376fe91..000000000
--- a/community/supertux/compile.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp
---- supertux-0.3.1.orig/src/console.hpp	2008-01-03 21:59:27.000000000 +0100
-+++ supertux-0.3.1/src/console.hpp	2008-08-23 11:57:47.000000000 +0200
-@@ -27,6 +27,8 @@
- #include <sstream>
- #include <iostream>
- #include <squirrel.h>
-+#include <memory>
-+#include <cstdlib>
- 
- class Console;
- class ConsoleStreamBuffer;
-diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp
---- supertux-0.3.1.orig/src/lisp/lexer.cpp	2008-01-03 21:59:26.000000000 +0100
-+++ supertux-0.3.1/src/lisp/lexer.cpp	2008-08-23 13:45:58.000000000 +0200
-@@ -21,6 +21,7 @@
- #include <sstream>
- #include <stdexcept>
- #include <iostream>
-+#include <cstring>
- 
- #include "lexer.hpp"
- 
-diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp
---- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp	2008-01-03 21:59:26.000000000 +0100
-+++ supertux-0.3.1/src/sprite/sprite_manager.hpp	2008-08-23 13:29:34.000000000 +0200
-@@ -21,6 +21,7 @@
- #define SUPERTUX_SPRITE_MANAGER_H
- 
- #include <map>
-+#include <string>
- 
- class SpriteData;
- class Sprite;
-diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp
---- supertux-0.3.1.orig/src/textscroller.hpp	2008-01-03 21:59:27.000000000 +0100
-+++ supertux-0.3.1/src/textscroller.hpp	2008-08-23 13:34:35.000000000 +0200
-@@ -24,6 +24,7 @@
- #include <vector>
- #include <string>
- #include <map>
-+#include <memory>
- 
- #include "screen.hpp"
- #include "math/vector.hpp"
-diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp
---- supertux-0.3.1.orig/src/title.cpp	2008-01-03 21:59:28.000000000 +0100
-+++ supertux-0.3.1/src/title.cpp	2008-08-23 12:05:19.000000000 +0200
-@@ -32,6 +32,7 @@
- #include <SDL.h>
- #include <SDL_image.h>
- #include <physfs.h>
-+#include <algorithm>
- 
- #include "title.hpp"
- #include "mainloop.hpp"
-diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp
---- supertux-0.3.1.orig/src/video/sdl_texture.hpp	2008-01-03 21:59:22.000000000 +0100
-+++ supertux-0.3.1/src/video/sdl_texture.hpp	2008-08-23 13:37:14.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <config.h>
- 
- #include <SDL.h>
-+#include <algorithm>
- 
- #include "texture.hpp"
- #include "color.hpp"
diff --git a/community/supertux/gcc44.patch b/community/supertux/gcc44.patch
deleted file mode 100644
index b58d9c29d..000000000
--- a/community/supertux/gcc44.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp
---- supertux-0.3.1.orig/src/console.hpp	2008-01-03 20:59:27.000000000 +0000
-+++ supertux-0.3.1/src/console.hpp	2009-05-17 19:43:26.914307646 +0000
-@@ -27,6 +27,8 @@
- #include <sstream>
- #include <iostream>
- #include <squirrel.h>
-+#include <memory>
-+#include <cstdlib>
- 
- class Console;
- class ConsoleStreamBuffer;
-diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp
---- supertux-0.3.1.orig/src/lisp/lexer.cpp	2008-01-03 20:59:26.000000000 +0000
-+++ supertux-0.3.1/src/lisp/lexer.cpp	2009-05-17 19:43:27.037705317 +0000
-@@ -21,6 +21,7 @@
- #include <sstream>
- #include <stdexcept>
- #include <iostream>
-+#include <cstring>
- 
- #include "lexer.hpp"
- 
-diff -ruN supertux-0.3.1.orig/src/lisp/lisp.cpp supertux-0.3.1/src/lisp/lisp.cpp
---- supertux-0.3.1.orig/src/lisp/lisp.cpp	2008-01-03 20:59:26.000000000 +0000
-+++ supertux-0.3.1/src/lisp/lisp.cpp	2009-05-17 19:44:29.305165638 +0000
-@@ -18,7 +18,7 @@
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- #include <config.h>
--
-+#include <cstdio>
- #include "lisp.hpp"
- 
- namespace lisp
-diff -ruN supertux-0.3.1.orig/src/random_generator.cpp supertux-0.3.1/src/random_generator.cpp
---- supertux-0.3.1.orig/src/random_generator.cpp	2008-01-03 20:59:27.000000000 +0000
-+++ supertux-0.3.1/src/random_generator.cpp	2009-05-17 19:44:05.851002254 +0000
-@@ -39,6 +39,7 @@
- #include <stdexcept>
- #include <time.h>
- #include <cassert>
-+#include <cstdio>
- #include "random_generator.hpp"
- 
- RandomGenerator systemRandom;               // global random number generator
-diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp
---- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp	2008-01-03 20:59:26.000000000 +0000
-+++ supertux-0.3.1/src/sprite/sprite_manager.hpp	2009-05-17 19:43:27.037705317 +0000
-@@ -21,6 +21,7 @@
- #define SUPERTUX_SPRITE_MANAGER_H
- 
- #include <map>
-+#include <string>
- 
- class SpriteData;
- class Sprite;
-diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp
---- supertux-0.3.1.orig/src/textscroller.hpp	2008-01-03 20:59:27.000000000 +0000
-+++ supertux-0.3.1/src/textscroller.hpp	2009-05-17 19:43:27.037705317 +0000
-@@ -24,6 +24,7 @@
- #include <vector>
- #include <string>
- #include <map>
-+#include <memory>
- 
- #include "screen.hpp"
- #include "math/vector.hpp"
-diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp
---- supertux-0.3.1.orig/src/title.cpp	2008-01-03 20:59:28.000000000 +0000
-+++ supertux-0.3.1/src/title.cpp	2009-05-17 19:43:27.041000359 +0000
-@@ -32,6 +32,7 @@
- #include <SDL.h>
- #include <SDL_image.h>
- #include <physfs.h>
-+#include <algorithm>
- 
- #include "title.hpp"
- #include "mainloop.hpp"
-diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp
---- supertux-0.3.1.orig/src/video/sdl_texture.hpp	2008-01-03 20:59:22.000000000 +0000
-+++ supertux-0.3.1/src/video/sdl_texture.hpp	2009-05-17 19:43:27.041000359 +0000
-@@ -23,6 +23,7 @@
- #include <config.h>
- 
- #include <SDL.h>
-+#include <algorithm>
- 
- #include "texture.hpp"
- #include "color.hpp"
diff --git a/community/surf/PKGBUILD b/community/surf/PKGBUILD
index 49087f052..4607ece1c 100644
--- a/community/surf/PKGBUILD
+++ b/community/surf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74178 2012-07-22 18:33:06Z lfleischer $
+# $Id: PKGBUILD 84289 2013-02-15 14:50:43Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Pierre Chapuis <catwell at archlinux dot us>
 # Contributor: Ray Kohler <ataraxia937 at gmail dot com>
@@ -6,7 +6,7 @@
 # Contributor: Raphael Proust <raphlalou at gmail dot com>
 
 pkgname=surf
-pkgver=0.5
+pkgver=0.6
 pkgrel=1
 pkgdesc='A simple web browser based on WebKit/GTK+.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,8 +21,8 @@ makedepends=('pkgconfig')
 install='surf.install'
 source=("http://dl.suckless.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'config.h')
-md5sums=('dc735a380d01203861b987b5f4c3c59c'
-         'd11435f6a67af46a0d19d18a95a1620b')
+md5sums=('aeeed723b562a30cc6a2b3ea18f6d99a'
+         '15c2c911658e2e6085e4c4fa7a7b01c1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/surf/config.h b/community/surf/config.h
index 8f8561a71..a221c86e3 100644
--- a/community/surf/config.h
+++ b/community/surf/config.h
@@ -1,49 +1,95 @@
 /* modifier 0 means no modifier */
-static char *useragent      = "Surf/"VERSION" (X11; U; Unix; en-US) AppleWebKit/531.2+ Compatible (Safari)";
-static char *progress       = "#0066FF";
-static char *progress_untrust = "#FF6600";
+static char *useragent      = "Mozilla/5.0 (X11; U; Unix; en-US) "
+	"AppleWebKit/537.15 (KHTML, like Gecko) Chrome/24.0.1295.0 "
+	"Safari/537.15 Surf/"VERSION;
+static char *progress       = "#0000FF";
+static char *progress_untrust = "#FF0000";
 static char *progress_trust = "#00FF00";
-static char *stylefile      = ".surf/style.css";
-static char *scriptfile     = ".surf/script.js";
-static char *cookiefile     = ".surf/cookies.txt";
+static char *progress_proxy = "#FFFF00";
+static char *progress_proxy_trust = "#66FF00";
+static char *progress_proxy_untrust = "#FF6600";
+static char *stylefile      = "~/.surf/style.css";
+static char *scriptfile     = "~/.surf/script.js";
+static char *cookiefile     = "~/.surf/cookies.txt";
 static time_t sessiontime   = 3600;
 static char *cafile         = "/etc/ssl/certs/ca-certificates.crt";
 static char *strictssl      = FALSE; /* Refuse untrusted SSL connections */
-#define HIDE_BACKGROUND FALSE
-#define SPATIAL_BROWSING TRUE
-
-#define SETPROP(p, q)     { .v = (char *[]){ "/bin/sh", "-c", \
-	"prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
-	"xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
-	p, q, winid, NULL } }
-#define DOWNLOAD(d) {			  \
+static int   indicator_thickness = 2;
+
+/* Webkit default features */
+static Bool enablespatialbrowsing = TRUE;
+static Bool enableplugins = TRUE;
+static Bool enablescripts = TRUE;
+static Bool enableinspector = TRUE;
+static Bool loadimages = TRUE;
+static Bool hidebackground  = FALSE;
+
+#define SETPROP(p, q) { \
+	.v = (char *[]){ "/bin/sh", "-c", \
+		"prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
+		"xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
+		p, q, winid, NULL \
+	} \
+}
+
+/* DOWNLOAD(URI, referer) */
+#define DOWNLOAD(d, r) { \
 	.v = (char *[]){ "/bin/sh", "-c", \
-	"xterm -e \"wget '$0' \
---load-cookies ~/.surf/cookies.txt \
---user-agent '$1' ; sleep 5\"", d, useragent, NULL } }
+		"st -e /bin/sh -c \"curl -J -O --user-agent '$1'" \
+		" --referer '$2'" \
+		" -b ~/.surf/cookies.txt -c ~/.surf/cookies.txt '$0';" \
+		" sleep 5;\"", \
+		d, useragent, r, NULL \
+	} \
+}
+
 #define MODKEY GDK_CONTROL_MASK
+
+/* hotkeys */
+/*
+ * If you use anything else but MODKEY and GDK_SHIFT_MASK, don't forget to
+ * edit the CLEANMASK() macro.
+ */
 static Key keys[] = {
     /* modifier	            keyval      function    arg             Focus */
     { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE } },
     { MODKEY,               GDK_r,      reload,     { .b = FALSE } },
     { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 } },
+
     { MODKEY,               GDK_p,      clipboard,  { .b = TRUE } },
     { MODKEY,               GDK_y,      clipboard,  { .b = FALSE } },
+
     { MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 } },
     { MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_i,      zoom,       { .i = 0  } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_q,      zoom,       { .i = 0  } },
+    { MODKEY,               GDK_minus,  zoom,       { .i = -1 } },
+    { MODKEY,               GDK_plus,   zoom,       { .i = +1 } },
+
     { MODKEY,               GDK_l,      navigate,   { .i = +1 } },
     { MODKEY,               GDK_h,      navigate,   { .i = -1 } },
+
     { MODKEY,               GDK_j,           scroll_v,   { .i = +1 } },
     { MODKEY,               GDK_k,           scroll_v,   { .i = -1 } },
     { MODKEY,               GDK_b,           scroll_v,   { .i = -10000 } },
     { MODKEY,               GDK_space,       scroll_v,   { .i = +10000 } },
     { MODKEY,               GDK_i,           scroll_h,   { .i = +1 } },
     { MODKEY,               GDK_u,           scroll_h,   { .i = -1 } },
+
+    { 0,                    GDK_F11,    fullscreen, { 0 } },
     { 0,                    GDK_Escape, stop,       { 0 } },
     { MODKEY,               GDK_o,      source,     { 0 } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_o,      inspector,  { 0 } },
+
     { MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
     { MODKEY,               GDK_f,      spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
+    { MODKEY,               GDK_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
+
     { MODKEY,               GDK_n,      find,       { .b = TRUE } },
     { MODKEY|GDK_SHIFT_MASK,GDK_n,      find,       { .b = FALSE } },
+
+    { MODKEY|GDK_SHIFT_MASK,GDK_c,      toggle,     { .v = "enable-caret-browsing" } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_i,      toggle,     { .v = "auto-load-images" } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_s,      toggle,     { .v = "enable-scripts" } },
+    { MODKEY|GDK_SHIFT_MASK,GDK_v,      toggle,     { .v = "enable-plugins" } },
 };
+
diff --git a/community/surf/surf-0.4.1-link-xlib.patch b/community/surf/surf-0.4.1-link-xlib.patch
deleted file mode 100644
index 25949d744..000000000
--- a/community/surf/surf-0.4.1-link-xlib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-
-diff -r 71388899ac09 -r 2ea243e2ca82 config.mk
---- a/config.mk	Tue Jun 08 09:06:10 2010 +0200
-+++ b/config.mk	Sun Nov 20 16:06:38 2011 +0100
-@@ -7,13 +7,15 @@
- PREFIX = /usr/local
- MANPREFIX = ${PREFIX}/share/man
- 
--GTKINC=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0)
--GTKLIB=$(shell pkg-config --libs gtk+-2.0 webkit-1.0)
-+X11INC = /usr/X11R6/include
-+X11LIB = /usr/X11R6/lib
- 
-+GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0`
-+GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0`
- 
- # includes and libs
--INCS = -I. -I/usr/include ${GTKINC}
--LIBS = -L/usr/lib -lc ${GTKLIB} -lgthread-2.0
-+INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
-+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0
- 
- # flags
- CPPFLAGS = -DVERSION=\"${VERSION}\"
-
-
-
-
diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD
index de24295bb..26d0d5691 100644
--- a/community/sxiv/PKGBUILD
+++ b/community/sxiv/PKGBUILD
@@ -1,34 +1,35 @@
+# $Id: PKGBUILD 87533 2013-04-02 17:43:50Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=sxiv
-pkgver=1.0
-pkgrel=3
-pkgdesc='simple x image viewer'
+pkgver=1.1
+pkgrel=2
+pkgdesc='Simple X Image Viewer'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 install=sxiv.install
 url='https://github.com/muennich/sxiv'
-depends=('libx11' 'xproto' 'imlib2' 'giflib' 'libexif' 'desktop-file-utils')
-source=("https://github.com/downloads/muennich/sxiv/sxiv-${pkgver}.tar.gz"
-        'sxiv.desktop'
-	    'config.h')
-md5sums=('c887e0af1e4d5a101b285a46d288c419'
-         '1dda85ff6bed4de337f8fb303075ed11'
-         'c3e6c4b86da6b17687699dbd32c7717b')
-build() {
-  	cd "sxiv-${pkgver}"
+depends=('libx11' 'xproto' 'imlib2' 'giflib' 'desktop-file-utils')
+source=(https://github.com/muennich/sxiv/archive/$pkgver.tar.gz
+        sxiv.desktop
+        config.h)
+sha256sums=('7d22b060d264be25ee0e95afff9df535299dbdd48067c9fc795133e583e2583f'
+            'bd14b9b6bc6d78f18cdff8535b4d1c13b3c76e35091dd6bc675011d42a01bb47'
+            '61515a87692849c942bfc3cce8b4c0f19139b4a1e9b6375a994cc541c64aab5c')
 
-	cp "$srcdir/config.h" .
-	make
+build() {
+  cd sxiv-$pkgver
+  cp "$srcdir"/config.h .
+  make
 }
 
 package() {
-  	cd "sxiv-${pkgver}"
+  cd sxiv-$pkgver
 
-  	make PREFIX="${pkgdir}/usr" install
-	install -D -m644 ${srcdir}/sxiv.desktop \
-    		${pkgdir}/usr/share/applications/sxiv.desktop
+  make PREFIX="$pkgdir"/usr install
+  install -D -m644 "$srcdir"/sxiv.desktop \
+                   "$pkgdir"/usr/share/applications/sxiv.desktop
 }
diff --git a/community/sxiv/config.h b/community/sxiv/config.h
index cc95fd46a..cd89b5fac 100644
--- a/community/sxiv/config.h
+++ b/community/sxiv/config.h
@@ -1,15 +1,3 @@
-#ifdef _FEATURE_CONFIG
-
-/* auto-orientate jpeg files according to their exif tags?
- * (requires libexif [-lexif] to be installed)
- */
-#define EXIF_SUPPORT 1
-/* load all frames from gif files and support gif animations?
- * (requires giflib [-lgif] to be installed)
- */
-#define GIF_SUPPORT  1
-
-#endif
 #ifdef _WINDOW_CONFIG
 
 /* default window dimensions (overwritten via -g option): */
@@ -18,11 +6,19 @@ enum {
 	WIN_HEIGHT = 600
 };
 
-/* default color for window background: */
-static const char * const BG_COLOR  = "#777777";
-/* default color for thumbnail selection: */
-static const char * const SEL_COLOR = "#DDDDDD";
-/* (see X(7) section "COLOR NAMES" for valid values) */
+/* bar font:
+ * (see X(7) section "FONT NAMES" for valid values)
+ */
+static const char * const BAR_FONT = "-*-fixed-medium-r-*-*-13-*-*-*-*-60-*-*";
+
+/* colors:
+ * (see X(7) section "COLOR NAMES" for valid values)
+ */
+static const char * const WIN_BG_COLOR = "#777777";
+static const char * const WIN_FS_COLOR = "#000000";
+static const char * const SEL_COLOR    = "#DDDDDD";
+static const char * const BAR_BG_COLOR = "#222222";
+static const char * const BAR_FG_COLOR = "#EEEEEE";
 
 #endif
 #ifdef _IMAGE_CONFIG
@@ -43,9 +39,6 @@ static const float zoom_levels[] = {
 	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) */
@@ -68,8 +61,10 @@ static const keymap_t keys[] = {
 	{ 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_b,             it_toggle_bar,        (arg_t) None },
 
 	{ false,  XK_r,             it_reload_image,      (arg_t) None },
+	{ false,  XK_R,             t_reload_all,         (arg_t) None },
 	{ false,  XK_D,             it_remove_image,      (arg_t) None },
 
 	{ false,  XK_n,             i_navigate,           (arg_t) +1 },
@@ -78,6 +73,7 @@ static const keymap_t keys[] = {
 	{ false,  XK_BackSpace,     i_navigate,           (arg_t) -1 },
 	{ false,  XK_bracketright,  i_navigate,           (arg_t) +10 },
 	{ false,  XK_bracketleft,   i_navigate,           (arg_t) -10 },
+	{ true,   XK_6,             i_alternate,          (arg_t) None },
 	{ false,  XK_g,             it_first,             (arg_t) None },
 	{ false,  XK_G,             it_n_or_last,         (arg_t) None },
 
@@ -113,16 +109,16 @@ static const keymap_t keys[] = {
 	{ 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_win,         (arg_t) SCALE_FIT },
+	{ false,  XK_e,             i_fit_to_win,         (arg_t) SCALE_WIDTH },
+	{ false,  XK_E,             i_fit_to_win,         (arg_t) SCALE_HEIGHT },
 	{ 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_backslash,     i_flip,               (arg_t) FLIP_HORIZONTAL },
+	{ false,  XK_bar,           i_flip,               (arg_t) FLIP_VERTICAL },
 
 	{ false,  XK_a,             i_toggle_antialias,   (arg_t) None },
 	{ false,  XK_A,             it_toggle_alpha,      (arg_t) None },
diff --git a/community/sxiv/sxiv.install b/community/sxiv/sxiv.install
index f09c533f4..1e3ec7774 100644
--- a/community/sxiv/sxiv.install
+++ b/community/sxiv/sxiv.install
@@ -1,12 +1,12 @@
 post_install () {
-    update-desktop-database -q
+  update-desktop-database -q
 
-    echo "* Edit config.h in sxiv's PKGBUILD directory (generally /var/abs/community/sxiv/)"
-    echo "  and rebuild package if you want to change settings."
-	echo "* Create the directory ~/.sxiv/ to enable thumbnail caching."
-  	echo "  See sxiv(1) for more information."
+  echo "* Edit config.h in sxiv's PKGBUILD directory (generally /var/abs/community/sxiv/)"
+  echo "  and rebuild package if you want to change settings."
+  echo "* Create the directory ~/.sxiv/cache to enable thumbnail caching."
+  echo "  See sxiv(1) for more information."
 }
 
 post_upgrade () {
-  	post_install ${1}
+  update-desktop-database -q
 }
diff --git a/community/synapse/PKGBUILD b/community/synapse/PKGBUILD
index 6d4b26753..4829400a7 100644
--- a/community/synapse/PKGBUILD
+++ b/community/synapse/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 81698 2012-12-27 01:23:31Z fyan $
+# $Id: PKGBUILD 88681 2013-04-21 22:16:50Z heftig $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Alessio Sergi <asergi at archlinux dot us>
 
 pkgname=synapse
 pkgver=0.2.10
-pkgrel=3
+pkgrel=5
 pkgdesc="A semantic file launcher"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/synapse-project"
 license=('GPL3')
-depends=('gtkhotkey' 'hicolor-icon-theme' 'json-glib' 'libgee' 'libnotify' \
+depends=('gtkhotkey' 'hicolor-icon-theme' 'json-glib' 'libgee06' 'libnotify' \
          'libunique' 'libzeitgeist' 'rest' 'xdg-utils')
 makedepends=('intltool' 'vala')
 optdepends=('banshee: banshee plugin'
             'bc: calculator plugin'
             'devhelp: documentation plugin'
             'gnome-screensaver: screensaver plugin'
-            'gnome-utils: dictionary plugin'
+            'gnome-dictionary: dictionary plugin'
             'openssh: ssh plugin'
             'pastebinit: pastebin plugin'
             'rhythmbox: rhythmbox plugin'
diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD
index 379268477..1c1817a07 100644
--- a/community/synergy/PKGBUILD
+++ b/community/synergy/PKGBUILD
@@ -1,48 +1,57 @@
-# Maintainer: Jelle van der Waa <jelle vdwaa nl>
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Jelle van der Waa <jelle vdwaa nl>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=synergy
 pkgver=1.4.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Share a single mouse and keyboard between multiple computers"
 url="http://synergy-foss.org"
 arch=('i686' 'x86_64' 'mips64el')
-depends=('gcc-libs' 'libxtst' 'libxinerama' )
+depends=('gcc-libs' 'libxtst' 'libxinerama')
+makedepends=('libxt' 'cmake' 'qt4')
+optdepends=('qt4: gui support')
 license=('GPL2')
-makedepends=('libxt' 'cmake')       # used by configure to test for libx11...
-backup=('etc/synergy.conf')
-source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" "${pkgname}s.rc" "synergys.socket" "synergys.service")
-
+source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz"
+        "synergys.socket"
+        "synergys.service"
+        "synergy.png"
+        "synergy.desktop")
+md5sums=('18aee04a7e232e4d821f46ff24da3364'
+         '58f48336836d6faf3d5eecbe4155b77e'
+         'b95e4b83d8a19c0bd81a15280078fcd5'
+         '11fdb13390908e02c6e2f19c4c09eded'
+         '1e8d574c19994d13e6f342ed08e531bb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source"
 
-  cmake  -D CMAKE_INSTALL_PREFIX=/usr . 
+  cmake -D CMAKE_INSTALL_PREFIX=/usr . 
+  make
+
+  cd src/gui
+  qmake-qt4
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source/bin"
 
-  #make DESTDIR="$pkgdir" install # doesn't work atm
-
   # install binary
-  install -d "$pkgdir/usr/bin/"
-  install -Dm755 synergyc $pkgdir/usr/bin/
-  install -Dm755 synergys $pkgdir/usr/bin/
+  install -Dm755 synergy "$pkgdir/usr/bin/synergy"
+  install -Dm755 synergyc "$pkgdir/usr/bin/synergyc"
+  install -Dm755 synergys "$pkgdir/usr/bin/synergys"
 
-  # install rc.d script  and config
-  install -d "${pkgdir}/etc/rc.d"
-  install -Dm644 $srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example "${pkgdir}/etc" 
-  install -Dm755 $srcdir/${pkgname}s.rc "${pkgdir}/etc/rc.d/${pkgname}s" 
+  # install config
+  install -Dm644 "$srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example" 
 
-  # Install systemd service and socket
+  # install systemd service and socket
   install -d "$pkgdir/usr/lib/systemd/system"
   install -Dm644 "$srcdir/synergys.service" "$pkgdir/usr/lib/systemd/system/"
   install -Dm644 "$srcdir/synergys.socket" "$pkgdir/usr/lib/systemd/system/"
+
+  # install desktop/icon stuff
+  install -Dm644 "$srcdir/synergy.png" "$pkgdir/usr/share/pixmaps/synergy.png"
+  install -Dm644 "$srcdir/synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop"
 }
-md5sums=('18aee04a7e232e4d821f46ff24da3364'
-         '8f8c01add9bf6e3ae9f37a36ca6345b6'
-         '58f48336836d6faf3d5eecbe4155b77e'
-         'b95e4b83d8a19c0bd81a15280078fcd5')
diff --git a/community/synergy/synergy.desktop b/community/synergy/synergy.desktop
new file mode 100644
index 000000000..e7bf87b9e
--- /dev/null
+++ b/community/synergy/synergy.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Synergy
+Comment=The Synergy GUI is based on QSynergy by Volker Lanz.
+Exec=synergy
+Icon=synergy
+Terminal=false
+Type=Application
+Categories=Utility;DesktopUtility;Qt
diff --git a/community/synergy/synergy.png b/community/synergy/synergy.png
new file mode 100644
index 000000000..5534f0fdf
--- /dev/null
+++ b/community/synergy/synergy.png
diff --git a/community/synergy/synergys.rc b/community/synergy/synergys.rc
deleted file mode 100644
index 8f19dc5f7..000000000
--- a/community/synergy/synergys.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-daemon_name=synergys
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/synergys`
-case "$1" in
-  start)
-    stat_busy "Starting Synergy Server"
-    [ -z "$PID" ] && /usr/bin/synergys --config /etc/synergy.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Synergy Server"
-    [ ! -z "$PID" ] && kill -9 $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD
index e4bce6f69..4a1e94626 100644
--- a/community/sysstat/PKGBUILD
+++ b/community/sysstat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 81587 2012-12-24 15:03:05Z spupykin $
+# $Id: PKGBUILD 87478 2013-04-01 10:36:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Martin Devera <devik@cdi.cz>
 
 pkgname=sysstat
-pkgver=10.1.3
+pkgver=10.1.5
 pkgrel=1
 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ backup=('etc/conf.d/sysstat'
 source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz
 	sysstat
 	sysstat.service)
-md5sums=('e08b5665956930ad12b10ed6e0a08b10'
+md5sums=('cdf66d6acd5c8cab709e07980b77ea6b'
          '3ce41ebf7330aba01e70b38658afed1f'
          '12ba479c606620193e8b7c6e982d5088')
 
diff --git a/community/t1utils/PKGBUILD b/community/t1utils/PKGBUILD
index 2dd3f9a20..3426c0c6e 100644
--- a/community/t1utils/PKGBUILD
+++ b/community/t1utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65395 2012-02-21 03:23:56Z spupykin $
+# $Id: PKGBUILD 88333 2013-04-16 13:31:22Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Simo Leone <neotuli@gmail.com>
 
 pkgname=t1utils
-pkgver=1.36
-pkgrel=2
+pkgver=1.37
+pkgrel=1
 pkgdesc="A collection of simple Type 1 font manipulation programs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lcdf.org/~eddietwo/type/#t1utils"
@@ -12,13 +12,17 @@ license=("custom")
 depends=('glibc')
 source=("http://www.lcdf.org/~eddietwo/type/$pkgname-$pkgver.tar.gz"
 	LICENSE)
-md5sums=('f580e78a38807bce0242b63b5da3a572'
+md5sums=('dcff07df0b334c06d1808530956a634e'
          '5a1334c824d21f0314c831f9fd19a587')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
   install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/community/taglib-rcc/PKGBUILD b/community/taglib-rcc/PKGBUILD
index e34ef6d7a..4ee5f489b 100644
--- a/community/taglib-rcc/PKGBUILD
+++ b/community/taglib-rcc/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=taglib-rcc
 pkgver=1.7
-pkgrel=1
+pkgrel=1.1
 pkgdesc="taglib with librcc patch"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.kde.org/~wheeler/taglib.html"
diff --git a/community/tagpy/PKGBUILD b/community/tagpy/PKGBUILD
deleted file mode 100644
index 1aa4990ef..000000000
--- a/community/tagpy/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 74013 2012-07-18 01:09:17Z ibiru $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
-# Contributor: Scott Horowitz <stonecrest@gmail.com>
-
-pkgname=tagpy
-pkgver=0.94.8
-pkgrel=8
-pkgdesc="Python bindings for TagLib"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pypi.python.org/pypi/tagpy"
-license=('MIT')
-depends=('python2' 'taglib' 'boost-libs')
-makedepends=('python2-distribute' 'boost')
-source=("http://pypi.python.org/packages/source/t/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('6baff63318cf90b9bc5a2497a0597802')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find . -name '*.py') 
- 
-  ./configure.py --taglib-lib-dir=/usr/lib/ \
-  	--taglib-inc-dir=/usr/include/taglib/ \
-	--boost-inc-dir=/usr/include/boost/ \
-	--boost-lib-dir=/usr/lib/ \
-	--boost-python-libname=boost_python
-  python2 setup.py build
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community/tarsnap/PKGBUILD b/community/tarsnap/PKGBUILD
deleted file mode 100644
index a5186baa7..000000000
--- a/community/tarsnap/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 75035 2012-08-12 08:25:53Z jelle $
-# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
-
-pkgname=tarsnap
-pkgver=1.0.33
-pkgrel=1
-pkgdesc='An online encrypted snapshotted backup service'
-arch=('i686' 'x86_64')
-url='http://www.tarsnap.com/'
-license=('custom')
-depends=('bzip2' 'openssl' 'xz>=5.0.0')
-makedepends=('e2fsprogs')
-source=("https://www.tarsnap.com/download/$pkgname-autoconf-$pkgver.tgz")
-md5sums=('a6267972d834198716b9fe09680e47e2')
-sha256sums=('0c0d825a8c9695fc8d44c5d8c3cd17299c248377c9c7b91fdb49d73e54ae0b7d')
-
-build() {
-  cd "$srcdir/$pkgname-autoconf-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir="/etc/$pkgname"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-autoconf-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD
index 859f47777..ab6b31024 100644
--- a/community/task/PKGBUILD
+++ b/community/task/PKGBUILD
@@ -5,17 +5,17 @@
 # Contributor: coolkehon <coolkehon@gmail.com>
 
 pkgname=task
-pkgver=2.1.2
-pkgrel=3
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="A command-line todo list manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://taskwarrior.org/projects/show/taskwarrior/"
 license=('MIT')
-depends=('lua' 'util-linux')
-makedepends=('cmake' 'lua')
-optdepends=('bash-completion: for bash completion' 'python: for python export addon' 'ruby: for ruby export addon' 'perl: for perl export addon')
+depends=('util-linux')
+makedepends=('cmake')
+optdepends=('bash-completion: for bash completion' 'python: for python export addon' 'ruby: for ruby export addon' 'perl: for perl export addon' 'perl-json: for perl export addon')
 source=(http://www.taskwarrior.org/download/$pkgname-$pkgver.tar.gz)
-sha256sums=('cf5171b54b6d2d2dcd9c559f437cf8a2cb3836c7631edf96a16efbf8b4383e36')
+sha256sums=('39e25dd285e6bc8474337a5868cb2ec55675978fa1f08c802e6da58b4181ee14')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/tcc/PKGBUILD b/community/tcc/PKGBUILD
index c5cc9d845..ebb5f21b3 100644
--- a/community/tcc/PKGBUILD
+++ b/community/tcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59917 2002-02-02 03:01:25Z spupykin $
+# $Id: PKGBUILD 86525 2013-03-18 16:24:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Gergely Imreh <imrehgATgmailDOTcom>
 # Contributor : dschauer <dschauerATgmailDOTcom>
@@ -6,8 +6,8 @@
 # Contributor : Jeremy Cowgar <jeremy@cowgar.com>
 
 pkgname=tcc
-pkgver=0.9.25
-pkgrel=2
+pkgver=0.9.26
+pkgrel=1
 pkgdesc="Tiny C Compiler"
 arch=('i686' 'x86_64')
 url="http://bellard.org/tcc/"
@@ -15,7 +15,7 @@ license=('LGPL')
 makedepends=('gcc')
 options=('docs')
 source=(http://download.savannah.nongnu.org/releases/tinycc/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('991c2a1986cce15f03ca6ddc86ea5f43')
+md5sums=('5fb28e4abc830c46a7f54c1f637fb25d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -33,6 +33,10 @@ build() {
 
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make tccdir=${pkgdir}/usr/lib/tcc libdir=${pkgdir}/usr/lib \
     mandir=${pkgdir}/usr/share/man bindir=${pkgdir}/usr/bin \
     includedir=${pkgdir}/usr/include \
diff --git a/community/tcpreplay/PKGBUILD b/community/tcpreplay/PKGBUILD
index e23d33089..d9bd7742e 100644
--- a/community/tcpreplay/PKGBUILD
+++ b/community/tcpreplay/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Dawid Wrobel <cromo@klej.net>
 pkgname=tcpreplay
 pkgver=3.4.4
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Gives the ability to replay previously captured traffic in a libpcap format"
 url="http://tcpreplay.synfin.net"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index 0dae4570c..f96428d06 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83883 2013-02-06 10:40:30Z spupykin $
+# $Id: PKGBUILD 87037 2013-03-26 11:01:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,23 +6,23 @@
 # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu>
 
 pkgname=tea
-pkgver=34.0.1
+pkgver=35.0.0
 pkgrel=1
 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tea-editor.sourceforge.net/"
 license=('GPL')
-depends=('qt' 'aspell' 'hunspell')
+depends=('qt4' 'aspell' 'hunspell')
 install=tea.install
 source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2
         tea.desktop)
-md5sums=('4fcc661b7898d01f58b8734395f5bdda'
+md5sums=('aabbbac2b5251e7c3eeb36d8f188d08a'
          '377ace3363124f4c086de0babb820761')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i 's|i + j|(int)(i + j)|' textproc.cpp
-  qmake PREFIX=/usr/bin
+  qmake-qt4 PREFIX=/usr/bin
   make
 }
 
diff --git a/community/teeworlds/PKGBUILD b/community/teeworlds/PKGBUILD
index 5fc8bcb74..b965c6975 100644
--- a/community/teeworlds/PKGBUILD
+++ b/community/teeworlds/PKGBUILD
@@ -5,19 +5,19 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=teeworlds
-pkgver=0.6.1
-pkgrel=3
+pkgver=0.6.2
+pkgrel=1
 pkgdesc="A multiplayer 2D shooter"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://teeworlds.com"
+url="https://www.teeworlds.com"
 license=('custom')
 depends=('alsa-lib' 'glu' 'sdl' 'freetype2')
-makedepends=('python2' 'bam' 'mesa')
+makedepends=('python' 'bam' 'mesa')
 replaces=('teewars')
-source=(http://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz
+source=(https://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz
         teeworlds.desktop
 		teeworlds.png)
-md5sums=('00de7195ecd1f23596dc3237341af512'
+md5sums=('649f6c05a7b117096b238c07062edc39'
          '3944aaf7a8c19a83510b2b39c4cddf5f'
          '44f39e398409232a0e0a431ed46d8cc8')
 
@@ -25,9 +25,6 @@ build() {
 	# Build teeworlds
 	cd ${srcdir}/${pkgname}-*-source
 
-	# Use Python 2
-	sed -i 's/python /python2 /' bam.lua
-
 	bam server_release client_release
 }
 
diff --git a/community/terminator/PKGBUILD b/community/terminator/PKGBUILD
deleted file mode 100644
index 817bf2368..000000000
--- a/community/terminator/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 55930 2011-09-25 18:21:36Z guillaume $
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: fancris3 <fancris3 at gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=terminator
-pkgver=0.96
-pkgrel=1
-pkgdesc='an application that provides lots of terminals in a single window'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.tenshu.net/terminator/'
-license=('GPL2')
-depends=('vte' 'pygtk' 'xdg-utils')
-makedepends=('desktop-file-utils' 'gettext' 'intltool')
-install=terminator.install
-source=("https://launchpad.net/terminator/trunk/${pkgver}/+download/${pkgname}_${pkgver}.tar.gz")
-md5sums=('070e3878336b341c9e18339d89ba64fe')
-
-build() {
-    cd ${pkgname}-${pkgver}
-
-    # python2 fix
-    for file in terminatorlib/{,plugins/}*.py; do
-        sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
-        sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
-    done
-
-    python2 setup.py build
-}
-
-package() {
-    cd ${pkgname}-${pkgver}
-
-    python2 setup.py install --skip-build --root=${pkgdir}
-
-    rm -f ${pkgdir}/usr/share/applications/${pkgname}.desktop
-    rm -f ${pkgdir}/usr/share/icons/hicolor/icon-theme.cache
-    install -D -m644 ${srcdir}/${pkgname}-${pkgver}/data/${pkgname}.desktop.in ${pkgdir}/usr/share/applications/${pkgname}.desktop
-    sed -i 's|_||' ${pkgdir}/usr/share/applications/${pkgname}.desktop
-}
diff --git a/community/terminator/terminator.install b/community/terminator/terminator.install
deleted file mode 100644
index b4ee8556f..000000000
--- a/community/terminator/terminator.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD
new file mode 100644
index 000000000..8ba258d91
--- /dev/null
+++ b/community/texmaker/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 89278 2013-04-28 12:14:49Z cinelli $
+#Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
+
+pkgname=texmaker
+pkgver=4.0.1
+pkgrel=1
+pkgdesc='Free cross-platform LaTeX editor'
+arch=('i686' 'x86_64')
+url="http://www.xm1math.net/texmaker/index.html"
+license=('GPL')
+depends=('poppler-qt' 'qtwebkit')
+optdepends=('ghostscript: LaTeX to HTML conversion command'
+	    'ibus-qt: accented characters support'bu  
+	    'poppler: PDF rendering support')
+install="$pkgname.install"
+source=("http://www.xm1math.net/$pkgname/$pkgname-$pkgver.tar.bz2")
+md5sums=('62f87f7b44e92ca68817663d3d5aeca4')
+
+build() {  
+  cd "$pkgname-$pkgver"
+  qmake-qt4 PREFIX=/usr texmaker.pro
+  make
+}
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  install -dm755 "$pkgdir/usr/share"
+  make INSTALL_PATH="$pkgdir" INSTALL_ROOT="$pkgdir" PREFIX="/usr" install
+}
diff --git a/community/isomaster/isomaster.install b/community/texmaker/texmaker.install
index 5e5cfef4d..9591f6c5d 100644
--- a/community/isomaster/isomaster.install
+++ b/community/texmaker/texmaker.install
@@ -2,10 +2,6 @@ post_install() {
   update-desktop-database -q
 }
 
-post_upgrade() {
-  post_install $1
-}
-
 post_remove() {
   update-desktop-database -q
 }
diff --git a/community/texvc/PKGBUILD b/community/texvc/PKGBUILD
index 456221513..acea4610e 100644
--- a/community/texvc/PKGBUILD
+++ b/community/texvc/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 73896 2012-07-16 14:22:08Z spupykin $
+# $Id: PKGBUILD 85705 2013-03-05 09:48:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=texvc
-pkgver=1.19.1
-_svnrev=110614
+pkgver=1.20
 pkgrel=1
 pkgdesc="tex to HTML/MathML/png converter used by mediawiki"
 arch=(i686 x86_64 'mips64el')
@@ -12,12 +11,16 @@ url="http://www.mediawiki.org/wiki/Extension:Math"
 license=("GPL")
 depends=('imagemagick' 'ghostscript' 'texlive-core' 'texlive-latexextra')
 makedepends=('ocaml')
-source=(http://upload.wikimedia.org/ext-dist/Math-MW1.19-${_svnrev}.tar.gz)
-md5sums=('d5217e19c26bc08201f9fe6bec8722ff')
+source=(mediawiki-math-1.20.tar.gz::https://nodeload.github.com/wikimedia/mediawiki-extensions-Math/legacy.tar.gz/REL${pkgver/./_})
+md5sums=('ee8fceb0a86f2972409104767406591c')
 
 build() {
-  cd $srcdir/Math/math
-  make
+  cd $srcdir/wikimedia-mediawiki-extensions-Math-*/math
+  make -j1 texvc.bc
+}
+
+package() {
+  cd $srcdir/wikimedia-mediawiki-extensions-Math-*/math
   install -d -m 0755 $pkgdir/usr/bin
-  install -m 0755 texvc $pkgdir/usr/bin
+  install -m 0755 texvc.bc $pkgdir/usr/bin
 }
diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD
index df57c5d07..917246621 100644
--- a/community/the_silver_searcher/PKGBUILD
+++ b/community/the_silver_searcher/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 82290 2013-01-14 11:59:53Z arodseth $
+# $Id: PKGBUILD 85733 2013-03-05 21:38:07Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jeff Horelick <jdhore1@gmail.com>
 # Contributor: skydrome <skydrome@i2pmail.org>
 
 pkgname=the_silver_searcher
-pkgver=0.13.1
+pkgver=0.14
 pkgrel=1
 pkgdesc='Code searching tool similar to Ack, but faster'
-url='http://github.com/ggreer/the_silver_searcher'
+url='https://github.com/ggreer/the_silver_searcher'
 license=('Apache')
-depends=('pcre')
-arch=('x86_64' 'i686')
-source=("https://github.com/downloads/ggreer/$pkgname/$pkgname-$pkgver.tar.gz")
-sha256sums=('140ded2207259f670e4b866a68cc2577495b63844c7dae101f89078c6b37b6fc')
+depends=('pcre' 'zlib')
+arch=('x86_64' 'i686' 'mips64el')
+source=("https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz")
+sha256sums=('9334d6f41685963c41790502fcfd83ed0ac664d94626d9fee44ae5c33c616bb3')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD
index 5719e84e8..b13278c40 100644
--- a/community/tigervnc/PKGBUILD
+++ b/community/tigervnc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82711 2013-01-23 10:24:39Z spupykin $
+# $Id: PKGBUILD 86603 2013-03-20 15:10:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com>
 
 pkgname=tigervnc
 pkgver=1.2.0
-pkgrel=10
-_xorgver=1.13.1
+pkgrel=12
+_xorgver=1.14.0
 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC."
 arch=('i686' 'x86_64')
 url="http://www.tigervnc.org"
@@ -16,27 +16,33 @@ depends=('pam' 'gnutls' 'libjpeg-turbo' 'libxft' 'libxinerama' 'libxcursor'
 makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto'
 	     'compositeproto' 'damageproto' 'randrproto' 'resourceproto'
 	     'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto'
-	     'xtrans' 'mesa' 'glproto' 'dri2proto')
+	     'xtrans' 'mesa' 'glproto' 'dri2proto' 'imagemagick' 'librsvg')
 options=(!libtool)
 conflicts=('tightvnc')
 source=(http://downloads.sourceforge.net/tigervnc/${pkgname}-${pkgver}.tar.gz
 	ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2
 	vncserver.service
+	vncviewer.desktop
 	xorg111.patch
 	xorg112.patch
 	xorg113.patch
+	xorg114.patch
 	xserver113.patch
+	xserver114.patch
 	glx.patch
 	gnutls.patch
 	gethomedir.patch
 	cmakelists.patch)
 md5sums=('3a5755b4ed600a81c3a17976c6f8420d'
-         'a13d8876e3e804189392119638a07a1f'
+         '86110278b784e279381b7f6f2295c508'
          '0903d5a0dfa38e0b04964505b644585c'
+         '15c0405f920c3dac250692e8922578d1'
          'b680b55f7f9f569cd26ac0b330012a8b'
          'f73e055153889ae7b5aac8e697f7a841'
          'ef4078ba31a583dc3134e9090fbd30d0'
+         '72518a7a1e7d3721ebe7404dcd8b3d01'
          'fabbe561d4ac845317ffdbf1bb2eeb02'
+         '928faf837ba5b1b34283f9f018df2f5e'
          '4b86c015c78a0360205fdcf511ea1c39'
          '1a5fe8867ab3e49e20aafc70c415494f'
          'fa059baabe72308bf82622bca73cb3e0'
@@ -52,13 +58,15 @@ build() {
   patch -Np1 -i ${srcdir}/xorg111.patch
   patch -Np1 -i ${srcdir}/xorg112.patch
   patch -Np1 -i ${srcdir}/xorg113.patch
+  patch -Np1 -i ${srcdir}/xorg114.patch
   patch -Np1 -i ${srcdir}/glx.patch
 
   cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DUSE_INCLUDED_FLTK=yes
   make
+  make -C media
 
   cd unix/xserver
-  patch -Np3 -i ${srcdir}/xserver113.patch
+  patch -Np1 -i ${srcdir}/xserver114.patch
   autoreconf -fiv
   ./configure --prefix=/usr \
 	--disable-static --disable-xinerama --without-dtrace \
@@ -77,4 +85,7 @@ package() {
   make DESTDIR=${pkgdir} install
   sed -i 's/iconic/nowin/' ${pkgdir}/usr/bin/vncserver
   install -Dm0644 $srcdir/vncserver.service $pkgdir/usr/lib/systemd/system/vncserver.service
+  install -dm0755 $pkgdir/usr/share/icons
+  install -m0644 ${srcdir}/${pkgname}-${pkgver}/media/icons/* $pkgdir/usr/share/icons/
+  install -Dm0644 $srcdir/vncviewer.desktop $pkgdir/usr/share/applications/vncviewer.desktop
 }
diff --git a/community/tigervnc/vncviewer.desktop b/community/tigervnc/vncviewer.desktop
new file mode 100644
index 000000000..b14e4fe2a
--- /dev/null
+++ b/community/tigervnc/vncviewer.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=TigerVNC viewer
+Comment=TigerVNC viewer
+Exec=/usr/bin/vncviewer
+Icon=tigervnc_32.png
+Terminal=false
+StartupNotify=false
+Categories=Application; Network;
diff --git a/community/tigervnc/xorg114.patch b/community/tigervnc/xorg114.patch
new file mode 100644
index 000000000..702706d34
--- /dev/null
+++ b/community/tigervnc/xorg114.patch
@@ -0,0 +1,28 @@
+diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h
+--- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h	2013-03-19 16:22:42.240358422 +0100
++++ tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h	2013-03-19 16:23:33.846355724 +0100
+@@ -42,8 +42,10 @@
+ #define XORG 112
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000))
+ #define XORG 113
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000))
++#define XORG 114
+ #else
+-#error "X.Org newer than 1.13 is not supported"
++#error "X.Org newer than 1.14 is not supported"
+ #endif
+ 
+ #endif
+diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc
+--- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc	2013-03-19 16:22:51.327357948 +0100
++++ tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc	2013-03-19 16:23:33.847355727 +0100
+@@ -54,7 +54,9 @@
+ #include "servermd.h"
+ #include "fb.h"
+ #include "mi.h"
++#if XORG < 114
+ #include "mibstore.h"
++#endif
+ #include "colormapst.h"
+ #include "gcstruct.h"
+ #include "input.h"
diff --git a/community/tigervnc/xserver114.patch b/community/tigervnc/xserver114.patch
new file mode 100644
index 000000000..80dd6a225
--- /dev/null
+++ b/community/tigervnc/xserver114.patch
@@ -0,0 +1,84 @@
+diff -up xorg-server-20130109/configure.ac.vnc xorg-server-20130109/configure.ac
+--- xorg-server-20130109/configure.ac.vnc	2013-01-24 13:01:31.013267503 +0100
++++ xorg-server-20130109/configure.ac	2013-01-24 13:08:43.283941751 +0100
+@@ -72,6 +72,7 @@ dnl forcing an entire recompile.x
+ AC_CONFIG_HEADERS(include/version-config.h)
+ 
+ AM_PROG_AS
++AC_PROG_CXX
+ AC_PROG_LN_S
+ AC_LIBTOOL_WIN32_DLL
+ AC_DISABLE_STATIC
+@@ -1573,6 +1574,10 @@ if test "x$XVFB" = xyes; then
+ 	AC_SUBST([XVFB_SYS_LIBS])
+ fi
+ 
++dnl Xvnc DDX
++AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
++AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
+ 
+ dnl Xnest DDX
+ 
+@@ -1608,6 +1613,8 @@ if test "x$XORG" = xauto; then
+ fi
+ AC_MSG_RESULT([$XORG])
+ 
++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
++
+ if test "x$XORG" = xyes; then
+ 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
+ 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
+@@ -1826,7 +1833,6 @@ if test "x$XORG" = xyes; then
+ 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
+ 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
+ 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
+-	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+ 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
+ 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
+ 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
+@@ -2291,6 +2297,7 @@ hw/dmx/Makefile
+ hw/dmx/man/Makefile
+ hw/vfb/Makefile
+ hw/vfb/man/Makefile
++hw/vnc/Makefile
+ hw/xnest/Makefile
+ hw/xnest/man/Makefile
+ hw/xwin/Makefile
+diff -up xorg-server-20130109/hw/Makefile.am.vnc xorg-server-20130109/hw/Makefile.am
+--- xorg-server-20130109/hw/Makefile.am.vnc	2013-01-10 06:06:16.000000000 +0100
++++ xorg-server-20130109/hw/Makefile.am	2013-01-24 13:08:43.283941751 +0100
+@@ -33,7 +33,8 @@ SUBDIRS =			\
+ 	$(XNEST_SUBDIRS)	\
+ 	$(DMX_SUBDIRS)		\
+ 	$(KDRIVE_SUBDIRS)	\
+-	$(XQUARTZ_SUBDIRS)
++	$(XQUARTZ_SUBDIRS)	\
++	vnc
+ 
+ DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
+ 
+diff -up xorg-server-20130109/mi/miinitext.c.vnc xorg-server-20130109/mi/miinitext.c
+--- xorg-server-20130109/mi/miinitext.c.vnc	2013-01-10 06:06:16.000000000 +0100
++++ xorg-server-20130109/mi/miinitext.c	2013-01-24 13:08:43.283941751 +0100
+@@ -112,6 +112,10 @@ SOFTWARE.
+ #include "micmap.h"
+ #include "globals.h"
+ 
++#ifdef TIGERVNC
++extern void vncExtensionInit(INITARGS);
++#endif
++
+ /* The following is only a small first step towards run-time
+  * configurable extensions.
+  */
+@@ -302,6 +306,9 @@ static ExtensionModule staticExtensions[
+ #ifdef XSELINUX
+     {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension},
+ #endif
++#ifdef TIGERVNC
++    {vncExtensionInit, "VNC-EXTENSION", NULL},
++#endif
+ };
+ 
+ static ExtensionModule *ExtensionModuleList = NULL;
diff --git a/community/tiled-qt/PKGBUILD b/community/tiled-qt/PKGBUILD
index 44ffe4486..c26c18726 100644
--- a/community/tiled-qt/PKGBUILD
+++ b/community/tiled-qt/PKGBUILD
@@ -2,13 +2,13 @@
 # Collaborator: Jonathan Fine (were.Vire AT gmail DOT com)
 pkgname=tiled-qt
 pkgver=0.9.0
-pkgrel=1
+pkgrel=6
 pkgdesc='A general purpose tile map editor, built to be flexible and easy to use'
 arch=('i686' 'x86_64')
 url='http://mapeditor.org'
 license=('GPL')
-depends=('qt' 'libgl' 'gtk-update-icon-cache')
-makedepends=('mesa')
+depends=('qt5-base' 'libgl' 'gtk-update-icon-cache')
+makedepends=('mesa' 'qt5-tools')
 install=${pkgname}.install
 source=(http://sourceforge.net/projects/tiled/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('e2e21a54ff17e34b49b8a330cc8b657e')
diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD
index be91eae05..d0454b011 100644
--- a/community/tinc/PKGBUILD
+++ b/community/tinc/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 76061 2012-09-10 11:46:16Z tredaelli $
+# $Id: PKGBUILD 88838 2013-04-23 16:26:01Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: helios
 # Contributor: Lothar Gesslein
 # Contributor: Dominik George <nik@naturalnet.de>
 
 pkgname=tinc
-pkgver=1.0.19
-pkgrel=2
+pkgver=1.0.21
+pkgrel=1
 pkgdesc="VPN (Virtual Private Network) daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tinc-vpn.org/"
@@ -16,8 +16,8 @@ backup=(etc/conf.d/tincd.conf)
 install=tinc.install
 source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}
         tincd.rc tincd.conf tincd@.service)
-md5sums=('5d97ee0f1ccf8fea5b492f6b54d5ac32'
-         'af4a88d89a17c216e38b93630389181a'
+md5sums=('d7bc9ca38672c9da08d74ff2a3e8e36d'
+         'SKIP'
          '64bb53748d9051255f243003f0d511f5'
          '7c0276d4812cc5d3cc18142562a3aa82'
          '035b0e549b08da55d19a8df5b8306e4d')
diff --git a/community/tinyxml/PKGBUILD b/community/tinyxml/PKGBUILD
index 2c357ef0d..fb3924309 100644
--- a/community/tinyxml/PKGBUILD
+++ b/community/tinyxml/PKGBUILD
@@ -1,51 +1,62 @@
-# $Id: PKGBUILD 74688 2012-08-02 07:33:41Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
+# $Id: PKGBUILD 88660 2013-04-21 13:06:07Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Larry Hajali <larryhaja[at]gmail[dot]com>
 # Contributor: Hubert Grzeskowiak <arch at nemesis13 dot de>
 
 pkgname=tinyxml
 pkgver=2.6.2
-pkgrel=2
-pkgdesc="A simple, small, C++ XML parser that can be easily integrated into other programs."
-url='http://www.grinninglizard.com/tinyxml/'
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=3
+pkgdesc='Simple, small, C++ XML parser that can be easily integrated into other programs'
+url="http://www.grinninglizard.com/tinyxml/"
+arch=('x86_64' 'i686' 'mips64el')
 license=('zlib')
 depends=('gcc-libs')
+makedepends=('setconf')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_${pkgver//./_}.tar.gz"
         'entity.patch'
-        'tinyxml-2.5.3-stl.patch')
-md5sums=('c1b864c96804a10526540c664ade67f0'
-         'b6cc2d9330707373d920f760793c6311'
-         '6db8334398e0cdad7e3c6406206ff42a')
+        "$pkgname-2.5.3-stl.patch"
+        "$pkgname.pc")
+sha256sums=('15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593'
+            'ef493209b0a51160171fd834a7ecdddd02679463b85fb89a2ea254213e47f99b'
+            '3baf2c4dbc2c8f54a151dac8860113d2f549174f83ed85d552b094dfaebb52af'
+            '0e37a568eaebb8f0644f148a3d3efa921ac518217e1c0de46c2859d26516bcc4')
 
-build() {
-  cd "$srcdir"/$pkgname
+prepare() {
+  cd "$srcdir/$pkgname"
 
   # Fix entity encoding.
-  patch -p0 < "$srcdir"/entity.patch
+  patch -p0 -i "$srcdir"/entity.patch
 
   # Make TINYXML_USE_STL permanently defined in tinyxml.h
-  patch -p1 < "$srcdir"/$pkgname-2.5.3-stl.patch
+  patch -p1 -i "$srcdir"/$pkgname-2.5.3-stl.patch
 
   # Fix Makefile
-  sed -i \
-    -e '/^TINYXML_USE_STL/ s|=.*|=YES|' \
-    -e "s|^RELEASE_CFLAGS.*|& ${CXXFLAGS} -fPIC|" Makefile
+  setconf Makefile TINYXML_USE_STL YES
+  setconf Makefile RELEASE_CFLAGS "$CXXFLAGS -fPIC"
+}
+
+build() {
+  cd "$srcdir/$pkgname"
 
   make
-  g++ -fPIC ${CXXFLAGS} -shared -o lib${pkgname}.so.0.$pkgver \
-      -Wl,-soname,lib${pkgname}.so.0 $(ls *.o | grep -v xmltest)
+  g++ -fPIC "$CXXFLAGS" -shared -o "lib${pkgname}.so.0.$pkgver" \
+      -Wl,-soname,"lib${pkgname}.so.0" $(ls *.o | grep -v xmltest)
 }
 
 package() {
-  cd "$srcdir"/$pkgname
+  cd "$srcdir/$pkgname"
 
   install -d -m 0755 "$pkgdir"/usr/{lib,include}
-  install -m 0755 lib${pkgname}.so.0.$pkgver "$pkgdir"/usr/lib/
-  install -m 0644 $pkgname.h tinystr.h "$pkgdir"/usr/include
-
-  (cd "$pkgdir"/usr/lib
-    ln -s lib${pkgname}.so.0.$pkgver lib${pkgname}.so.0
-    ln -s lib${pkgname}.so.0.$pkgver lib${pkgname}.so
+  install -m 0755 "lib${pkgname}.so.0.$pkgver" "$pkgdir"/usr/lib/
+  install -m 0644 "$pkgname.h" tinystr.h "$pkgdir"/usr/include
+  install -Dm644 readme.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc"
+
+  (cd "$pkgdir/usr/lib"
+    ln -s "lib${pkgname}.so.0.$pkgver" "lib${pkgname}.so.0"
+    ln -s "lib${pkgname}.so.0.$pkgver" "lib${pkgname}.so"
   )
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/tinyxml/tinyxml.pc b/community/tinyxml/tinyxml.pc
new file mode 100644
index 000000000..684b090cd
--- /dev/null
+++ b/community/tinyxml/tinyxml.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: TinyXml
+Description: simple, small, C++ XML parser
+Version: 2.6.2
+Libs: -L${libdir} -ltinyxml
+Cflags: -I${includedir}
diff --git a/community/tipp10/PKGBUILD b/community/tipp10/PKGBUILD
index b8f17a823..827296a07 100644
--- a/community/tipp10/PKGBUILD
+++ b/community/tipp10/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 64679 2012-02-17 18:29:36Z bluewind $
+# $Id: PKGBUILD 85418 2013-03-01 10:41:22Z andrea $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: toliman <altergan@hs-albsig.de>
 
 pkgname=tipp10
 pkgver=2.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="intelligent typing tutor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tipp10.com/"
 license=('GPL2')
-depends=('qt>=4.2.2')
+depends=('qt4')
 source=(defines.h.patch gcc-4.5.patch \
   "http://www.tipp10.com/de/download/tipp10_source_v"${pkgver//./-}".zip")
 md5sums=('73a987123ca842026b7bde5e89370b86'
diff --git a/community/tmux/PKGBUILD b/community/tmux/PKGBUILD
index 69792e433..bb4f4e368 100644
--- a/community/tmux/PKGBUILD
+++ b/community/tmux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77704 2012-10-13 15:48:59Z bpiotrowski $
+# $Id: PKGBUILD 87109 2013-03-27 11:16:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  TDY <tdy@gmx.com>
 # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
 
 pkgname=tmux
-pkgver=1.7
+pkgver=1.8
 pkgrel=1
 pkgdesc='A terminal multiplexer'
 url='http://tmux.sourceforge.net/'
@@ -13,7 +13,7 @@ license=('BSD')
 depends=('ncurses' 'libevent')
 source=(http://downloads.sourceforge.net/tmux/tmux-$pkgver.tar.gz
 		LICENSE)
-md5sums=('2c48fb9beb22eedba7a5de3b78dd0c03'
+md5sums=('b9477de2fe660244cbc6e6d7e668ea0e'
          '71601bc37fa44e4395580b321963018e')
 
 build() {
diff --git a/community/tmw/PKGBUILD b/community/tmw/PKGBUILD
index 191048044..a37f7dbc4 100644
--- a/community/tmw/PKGBUILD
+++ b/community/tmw/PKGBUILD
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://themanaworld.org"
 license=('GPL')
 depends=('curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs'
-	 'sdl_mixer' 'sdl_net' 'sdl_gfx' 'sdl_ttf')
+	 'sdl_mixer' 'sdl_net' 'sdl_gfx' 'sdl_ttf' 'glu')
 makedepends=('cmake' 'mesa')
 #source=(http://downloads.sourceforge.net/sourceforge/themanaworld/$pkgname-$pkgver.tar.bz2)
 source=($pkgname-$pkgver.tar.gz::https://github.com/mana/mana/tarball/v$pkgver)
diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD
index e5e46d471..3e1d64afd 100644
--- a/community/tomoyo-tools/PKGBUILD
+++ b/community/tomoyo-tools/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 74852 2012-08-07 13:20:49Z spupykin $
+# $Id: PKGBUILD 87706 2013-04-05 10:24:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
 
 pkgname=tomoyo-tools
 _basever=2.5.0
-_timestamp=20120805
+_timestamp=20130214
 _file=53357
 pkgver=${_basever}.${_timestamp}
-pkgrel=1
+pkgrel=2
 pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://tomoyo.sourceforge.jp'
 #url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818'
 license=('GPL')
-depends=('ncurses')
+depends=('ncurses' 'linux>=3.2')
 conflicts=('ccs-tools')
 install=tomoyo-tools.install
 source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz")
-md5sums=('cccc7cb7f9492dc53063065f7ccf7b21')
+md5sums=('ffff6b531ed9ac32b01722a9cd749a2f')
 
 build() {
   cd "${srcdir}/${pkgname}"
diff --git a/community/tomoyo-tools/tomoyo-tools.install b/community/tomoyo-tools/tomoyo-tools.install
index 695a53f19..8f769d0db 100644
--- a/community/tomoyo-tools/tomoyo-tools.install
+++ b/community/tomoyo-tools/tomoyo-tools.install
@@ -1,6 +1,6 @@
 post_install () {
   echo
-  echo " * To enable TOMOYO Linux, append 'security=tomoyo' to the kernel"
+  echo " * To enable TOMOYO Linux, append 'security=tomoyo TOMOYO_trigger=/sbin/init' to the kernel"
   echo "   boot options and initialize policy with this command:"
   echo "     /usr/lib/tomoyo/init_policy"
   echo
diff --git a/community/toolame/PKGBUILD b/community/toolame/PKGBUILD
index a9545a94c..01c9c6e9b 100644
--- a/community/toolame/PKGBUILD
+++ b/community/toolame/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=toolame
 pkgver=02l
-pkgrel=9
+pkgrel=9.1
 pkgdesc="An optimized mpeg 1/2 layer 2 audio encoder"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/toolame"
diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD
index 6792915b6..8c5975a32 100644
--- a/community/tor/PKGBUILD
+++ b/community/tor/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=tor
 pkgver=0.2.3.25
-pkgrel=1
+pkgrel=1.1
 pkgdesc='Anonymizing overlay network.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.torproject.org/'
diff --git a/community/torcs/torcs-gcc.patch b/community/torcs/torcs-gcc.patch
deleted file mode 100644
index fcc5604e7..000000000
--- a/community/torcs/torcs-gcc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -aur src.old/drivers/olethros/Trajectory.cpp src/drivers/olethros/Trajectory.cpp
---- src.old/drivers/olethros/Trajectory.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/drivers/olethros/Trajectory.cpp	2008-04-06 22:28:52.000000000 +0200
-@@ -10,8 +10,10 @@
-  ***************************************************************************/
- #include <cstdio>
- #include <cstdlib>
-+#include <cstring>
- #include <cmath>
- #include <cassert>
-+#include <ctime>
- #include <list>
- #include <vector>
- #include "Trajectory.h"
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2008-04-06 22:22:57.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Transform.h"
- 
- #include <algorithm>
--#include <new.h>
-+#include <new>
- 
- class BBoxCompAxis {
- public:
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2008-04-06 22:23:11.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Transform.h"
- #include "BBoxTree.h"
- 
--#include <new.h>
-+#include <new>
- 
- BBoxInternal *free_node;
- 
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2008-04-06 22:22:29.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Object.h"
- #include "Encounter.h"
- 
--#include <new.h>
-+#include <new>
- 
- void addPair(ObjectPtr object1, ObjectPtr object2);
- void removePair(ObjectPtr object1, ObjectPtr object2);
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2008-04-06 22:22:40.000000000 +0200
-@@ -33,7 +33,7 @@
- #include "Convex.h" 
- #include "Complex.h" 
- 
--#include <new.h>
-+#include <new>
- 
- Object::Object(DtObjectRef obj, ShapePtr shape) : 
-   ref(obj), 
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp	2008-04-06 22:22:12.000000000 +0200
-@@ -37,7 +37,7 @@
- }
- 
- #include <vector>
--#include <new.h>  
-+#include <new>  
- 
- typedef vector<unsigned int> IndexBuf;
- 
diff --git a/community/torsocks/PKGBUILD b/community/torsocks/PKGBUILD
new file mode 100644
index 000000000..30aa15133
--- /dev/null
+++ b/community/torsocks/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Nicolas Pouillard <nicolas.pouillard@gmail.com>
+# Contributor: Rorschach <r0rschach@lavabit.com>
+
+pkgname=torsocks
+pkgver=1.3
+pkgrel=3
+pkgdesc='Wrapper to safely torify applications'
+arch=('i686' 'x86_64' 'mips64el')
+url='http://code.google.com/p/torsocks'
+license=('GPL2')
+depends=('tor')
+makedepends=('git')
+options=(!libtool)
+backup=("etc/${pkgname}.conf")
+
+__gitroot=https://git.torproject.org/torsocks
+__gitname=torsocks
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to GIT server...."
+
+  if [[ -d "$__gitname" ]]; then
+    cd "$__gitname" && git pull origin
+    msg "The local files are updated."
+  else
+    git clone "$__gitroot" "$__gitname"
+  fi
+
+  msg "GIT checkout done or server timeout"
+  msg "Starting build..."
+
+  rm -rf "$srcdir/$__gitname-build"
+  git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build"
+  cd "$srcdir/$__gitname-build"
+
+  git checkout $pkgver
+
+  ./autogen.sh
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd "$srcdir/$__gitname-build"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/tp_smapi-lts/PKGBUILD b/community/tp_smapi-lts/PKGBUILD
deleted file mode 100644
index 1d74c5df3..000000000
--- a/community/tp_smapi-lts/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: xduugu
-# Contributor: nh2
-# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com>
-# Contributor: Nick B <Shirakawasuna ð gmail đ com>
-# Contributor: Christof Musik <christof ð senfdax đ de>
-# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
-# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
-
-pkgname=tp_smapi-lts
-_pkgname=tp_smapi
-_extramodules=/usr/lib/modules/extramodules-3.0-lts
-pkgver=0.41
-pkgrel=9
-pkgdesc="linux-lts modules for ThinkPad's SMAPI functionality"
-arch=('i686' 'x86_64')
-url='https://github.com/evgeni/tp_smapi'
-license=('GPL')
-depends=('linux-lts>=3.0' 'linux-lts<3.1')
-makedepends=('linux-lts-headers>=3.0' 'linux-lts-headers<3.1')
-install="${pkgname}.install"
-source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
-md5sums=('63c683415c764568f6bf17c7eabe4752')
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  _kernver=$(< "${_extramodules}/version")
-
-  sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \
-	  -e "s#^(KBASE\s*:=).*\$#\1 ${_extramodules%/*}/${_kernver}#" Makefile
-
-  make HDAPS=1
-}
-
-package() {
-  _kernver=$(< "${_extramodules}/version")
-
-  make -C "${_extramodules%/*}/${_kernver}/build" \
-    INSTALL_MOD_PATH="${pkgdir}/${_extramodules%%/lib/*}" \
-    M="${srcdir}/${_pkgname}-${pkgver}" modules_install
-
-  cd "${pkgdir}/${_extramodules%/*}"
-  mv "${_kernver}/extra" "${_extramodules##*/}"
-  rmdir "${_kernver}"
-
-  # compress kernel modules
-  find "${pkgdir}" -name "*.ko" -exec gzip -9 {} +
-
-  # load module on startup
-  echo tp_smapi > "${srcdir}/${pkgname}.conf"
-  install -Dm644 "${srcdir}/${pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf"
-
-  # update kernel version in install file
-  sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/${pkgname}.install"
-}
diff --git a/community/tp_smapi-lts/tp_smapi-lts.install b/community/tp_smapi-lts/tp_smapi-lts.install
deleted file mode 100644
index 4d671007d..000000000
--- a/community/tp_smapi-lts/tp_smapi-lts.install
+++ /dev/null
@@ -1,13 +0,0 @@
-extramodules=/usr/lib/modules/extramodules-3.0-lts
-
-post_install() {
-  depmod -v $(< "$extramodules/version") &>/dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/community/tre/PKGBUILD b/community/tre/PKGBUILD
index 0e7ab68e5..c12f89522 100644
--- a/community/tre/PKGBUILD
+++ b/community/tre/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=tre
 pkgver=0.8.0
-pkgrel=2
+pkgrel=2.1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="POSIX compliant regexp matching library. Includes agrep for aproximate grepping."
 url="http://laurikari.net/tre"
diff --git a/community/tremulous/PKGBUILD b/community/tremulous/PKGBUILD
index 81f0e46a4..454f5f257 100644
--- a/community/tremulous/PKGBUILD
+++ b/community/tremulous/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 86782 2013-03-22 00:57:25Z eric $
 #Contributor: Daenyth <Daenyth+arch [AT] gmail [dot] com>
 
 pkgname=tremulous
@@ -42,31 +43,35 @@ md5sums=('e0e1b6e03e7596da00a77fe638560402'
 build() {
   local _arch=${CARCH/i686/x86}
 
-  # Build and install the server
-  mkdir -p $srcdir/tremded
-  bsdtar -x -C $srcdir/tremded -f $srcdir/mg_tremded_source_1.01.tar.gz
-  cd $srcdir/tremded
-  make || return 1
-  install -D -m755 build/release-linux-$_arch/tremded.$_arch $pkgdir/opt/tremulous/tremded.$_arch
-  install -D -m644 $srcdir/tremdedrc                         $pkgdir/etc/tremdedrc
-  install -D -m644 $srcdir/game.qvm                          $pkgdir/opt/tremulous/game.qvm
-  install -D -m755 $srcdir/tremded.sh                        $pkgdir/usr/bin/tremded
+  # Build the server
+  mkdir -p "$srcdir/tremded"
+  bsdtar -x -C "$srcdir/tremded" -f "$srcdir/mg_tremded_source_1.01.tar.gz"
+  cd "$srcdir/tremded"
+  make
+# Build the client
+  cd "$srcdir/Release_1.011"
+  patch -Np1 -i "$srcdir/fix_fs26749.patch"
+  make
+}
+
+package() {
+  cd "$srcdir/tremded"
+  install -D -m755 build/release-linux-$_arch/tremded.$_arch "$pkgdir/opt/tremulous/tremded.$_arch"
+  install -D -m644 "$srcdir/tremdedrc"                         "$pkgdir/etc/tremdedrc"
+  install -D -m644 "$srcdir/game.qvm"                          "$pkgdir/opt/tremulous/game.qvm"
+  install -D -m755 "$srcdir/tremded.sh"                        "$pkgdir/usr/bin/tremded"
 
-  # Build and install the client
-  cd $srcdir/Release_1.011
-  patch -Np1 -i $srcdir/fix_fs26749.patch || return 1
-  make || return 1
-  install -Dm755 build/release-linux-$_arch/tremulous.$_arch $pkgdir/opt/tremulous/tremulous.$_arch
-  install -D -m755 $srcdir/tremulous.sh                      $pkgdir/usr/bin/tremulous
+  cd "$srcdir/Release_1.011"
+  install -Dm755 build/release-linux-$_arch/tremulous.$_arch "$pkgdir/opt/tremulous/tremulous.$_arch"
+  install -D -m755 "$srcdir/tremulous.sh"                      "$pkgdir/usr/bin/tremulous"
 
   # Install the documentation
-  install -Dm644 $srcdir/mg-client-manual.txt $pkgdir/usr/share/tremulous/mg-client-manual.txt
-  install -Dm644 $srcdir/lakitu7_qvm.txt      $pkgdir/usr/share/tremulous/lakitu7_qvm.txt
+  install -Dm644 "$srcdir/mg-client-manual.txt" "$pkgdir/usr/share/tremulous/mg-client-manual.txt"
+  install -Dm644 "$srcdir/lakitu7_qvm.txt"      "$pkgdir/usr/share/tremulous/lakitu7_qvm.txt"
 
   # Install the .desktop and icon files
-  install -D -m644 $srcdir/tremulous.xpm     $pkgdir/usr/share/pixmaps/tremulous.xpm
-  install -D -m644 $srcdir/tremulous.desktop $pkgdir/usr/share/applications/tremulous.desktop
-
+  install -D -m644 "$srcdir/tremulous.xpm"     "$pkgdir/usr/share/pixmaps/tremulous.xpm"
+  install -D -m644 "$srcdir/tremulous.desktop" "$pkgdir/usr/share/applications/tremulous.desktop"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/turbojpeg/PKGBUILD b/community/turbojpeg/PKGBUILD
new file mode 100644
index 000000000..d6f7dba16
--- /dev/null
+++ b/community/turbojpeg/PKGBUILD
@@ -0,0 +1,45 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
+
+pkgname=turbojpeg
+pkgver=1.2.1
+pkgrel=1
+pkgdesc="turbojpeg library from libjpeg-turbo"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.libjpeg-turbo.org/About/TurboJPEG"
+license=('GPL' 'custom')
+depends=('glibc' 'libjpeg')
+makedepends=('nasm')
+options=('!libtool')
+source=(http://sourceforge.net/projects/libjpeg-turbo/files/$pkgver/libjpeg-turbo-$pkgver.tar.gz)
+sha1sums=('a4992e102c6d88146709e8e6ce5896d5d0b5a361')
+ 
+build() {
+  cd "$srcdir/libjpeg-turbo-$pkgver"
+ 
+  ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
+  make
+}
+ 
+check() {
+  cd "$srcdir/libjpeg-turbo-$pkgver"
+ 
+  make test
+}
+ 
+package() {
+  cd "$srcdir/libjpeg-turbo-$pkgver"
+ 
+  make DESTDIR="$pkgdir/" install
+ 
+  # only distribute libturbojpeg
+  rm -rf "$pkgdir"/usr/share
+  rm "$pkgdir"/usr/include/j*.h
+  rm "$pkgdir"/usr/lib/libj*
+  rm "$pkgdir"/usr/bin/{djpeg,rdjpgcom,wrjpgcom,jpegtran,cjpeg}
+ 
+  install -Dm644 README "$pkgdir/usr/share/licenses/$pkgname/README"
+  install -Dm644 README-turbo.txt "$pkgdir/usr/share/licenses/$pkgname/README-turbo.txt"
+}
+
diff --git a/community/tuxcards/PKGBUILD b/community/tuxcards/PKGBUILD
index cda6b5b17..4c2e4928f 100644
--- a/community/tuxcards/PKGBUILD
+++ b/community/tuxcards/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 67712 2012-03-14 07:57:27Z ebelanger $
+# $Id: PKGBUILD 85419 2013-03-01 10:41:30Z andrea $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=tuxcards
 pkgver=2.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A hierarchical notebook to enter and manage notes and ideas in a structured manner"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tuxcards.de"
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 source=(http://www.tuxcards.de/src/tuxcards-${pkgver}/${pkgname}-${pkgver}.tar.gz tuxcards.desktop)
 sha1sums=('c0410f28b51d58b4f372ffae0ce0d2a7329f2c45'
           '565419ac6b24d61fc038462a783cb80d44b4fe7e')
diff --git a/community/tuxguitar/PKGBUILD b/community/tuxguitar/PKGBUILD
index a1fae110c..580811307 100644
--- a/community/tuxguitar/PKGBUILD
+++ b/community/tuxguitar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65417 2012-02-21 03:31:38Z spupykin $
+# $Id: PKGBUILD 84141 2013-02-11 15:15:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: |AhIoRoS| < ahioros@gmail.com >
 
 pkgname=tuxguitar
 pkgver=1.2
-pkgrel=5
+pkgrel=6
 _jdk=java-7-openjdk
 pkgdesc="multitrack guitar tablature editor and player"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,13 +19,11 @@ source=(tuxguitar-src-$pkgver.tar.gz::http://sourceforge.net/projects/tuxguitar/
 	tuxguitar.desktop
 	tuxguitar.xml)
 md5sums=('f41ed20e77c6c3d8968991a29c71b912'
-         'eea5247daa70ce6fc15e95b1080af486'
+         '0afa7f3248b9317d73ad8ccdc5e5aaf0'
          '59ce4eb8dcc0d0dde81e6cf2820aa9b0')
 
 build() {
   cd $srcdir/tuxguitar-src-$pkgver
-  mkdir -p $pkgdir/usr/share/tuxguitar
-  mkdir -p $pkgdir/usr/bin
 
   export CLASSPATH=/usr/share/java/swt.jar:$CLASSPATH
 
@@ -48,20 +46,12 @@ build() {
   (cd TuxGuitar-gervill/ && ant)
   (cd TuxGuitar-jsa/ && ant)
 
-  cp -r TuxGuitar/share $pkgdir/usr/share/tuxguitar/
-  find -name \*.jar -exec sh -c 'cp {} '$pkgdir'/usr/share/tuxguitar/share/plugins/`basename {}`' \;
-  mv $pkgdir/usr/share/tuxguitar/share/plugins/tuxguitar.jar $pkgdir/usr/share/tuxguitar/
-  cp TuxGuitar/tuxguitar $pkgdir/usr/share/tuxguitar/
-
   # alsa
   pushd TuxGuitar-alsa/jni
   gcc -I/usr/lib/jvm/${_jdk}/include -I/usr/lib/jvm/${_jdk}/include/linux -fPIC \
 	-c -o org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o \
 	org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.c
   gcc  -shared -o libtuxguitar-alsa-jni.so org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o -L/usr/lib -lasound
-  install -D -m0755 libtuxguitar-alsa-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-alsa-jni.so
-  mkdir -p $pkgdir/usr/share/tuxguitar/lib
-  ln -s /usr/lib/tuxguitar/libtuxguitar-alsa-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-alsa-jni.so
   popd
 
   # oss
@@ -70,9 +60,6 @@ build() {
 	-c -o org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o \
 	org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.c
   gcc  -shared -o libtuxguitar-oss-jni.so org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o -L/usr/lib
-  install -D -m0755 libtuxguitar-oss-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-oss-jni.so
-  mkdir -p $pkgdir/usr/share/tuxguitar/lib
-  ln -s /usr/lib/tuxguitar/libtuxguitar-oss-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-oss-jni.so
   popd
 
   # jack
@@ -81,9 +68,6 @@ build() {
 	-c -o org_herac_tuxguitar_jack_JackClient.o \
 	org_herac_tuxguitar_jack_JackClient.c
   gcc  -shared -o libtuxguitar-jack-jni.so org_herac_tuxguitar_jack_JackClient.o -L/usr/lib -ljack
-  install -D -m0755 libtuxguitar-jack-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-jack-jni.so
-  mkdir -p $pkgdir/usr/share/tuxguitar/lib
-  ln -s /usr/lib/tuxguitar/libtuxguitar-jack-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-jack-jni.so
   popd
 
   # fluidsynth
@@ -92,6 +76,43 @@ build() {
 	-c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o \
 	org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
   gcc  -shared -o libtuxguitar-fluidsynth-jni.so org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o -L/usr/lib -lfluidsynth
+  popd
+}
+
+package() {
+  cd $srcdir/tuxguitar-src-$pkgver
+
+  mkdir -p $pkgdir/usr/share/tuxguitar
+  mkdir -p $pkgdir/usr/bin
+
+  cp -r TuxGuitar/share $pkgdir/usr/share/tuxguitar/
+  find -name \*.jar -exec sh -c 'cp {} '$pkgdir'/usr/share/tuxguitar/share/plugins/`basename {}`' \;
+  mv $pkgdir/usr/share/tuxguitar/share/plugins/tuxguitar.jar $pkgdir/usr/share/tuxguitar/
+  cp TuxGuitar/tuxguitar $pkgdir/usr/share/tuxguitar/
+
+  # alsa
+  pushd TuxGuitar-alsa/jni
+  install -D -m0755 libtuxguitar-alsa-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-alsa-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-alsa-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-alsa-jni.so
+  popd
+
+  # oss
+  pushd TuxGuitar-oss/jni
+  install -D -m0755 libtuxguitar-oss-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-oss-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-oss-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-oss-jni.so
+  popd
+
+  # jack
+  pushd TuxGuitar-jack/jni
+  install -D -m0755 libtuxguitar-jack-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-jack-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-jack-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-jack-jni.so
+  popd
+
+  # fluidsynth
+  pushd TuxGuitar-fluidsynth/jni
   install -D -m0755 libtuxguitar-fluidsynth-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so
   mkdir -p $pkgdir/usr/share/tuxguitar/lib
   ln -s /usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-fluidsynth-jni.so
diff --git a/community/tuxguitar/tuxguitar.desktop b/community/tuxguitar/tuxguitar.desktop
index 77b8280d7..a733cff88 100644
--- a/community/tuxguitar/tuxguitar.desktop
+++ b/community/tuxguitar/tuxguitar.desktop
@@ -8,6 +8,6 @@ Icon=/usr/share/tuxguitar/share/skins/Lavender/icon-96x96.png
 Terminal=false
 Type=Application
 Categories=Application;AudioVideo;Audio;
-Exec=tuxguitar %F
+Exec=tuxguitar %F -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false
 MimeType=audio/x-tuxguitar;audio/x-gtp;audio/x-ptb;
 #eof "$Id: tuxguitar.desktop,v 1.2 2008/09/15 07:54:28 sergej Exp $"
diff --git a/community/tuxpaint-config/PKGBUILD b/community/tuxpaint-config/PKGBUILD
index 26c9ae9c8..d3830b958 100644
--- a/community/tuxpaint-config/PKGBUILD
+++ b/community/tuxpaint-config/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tuxpaint-config
 pkgver=0.0.12
 pkgrel=2
 pkgdesc='Tux Paint configuration tool'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.tuxpaint.org'
 license='GPL'
 depends=('tuxpaint' 'fltk' 'libxft' 'libxext')
diff --git a/community/twolame/PKGBUILD b/community/twolame/PKGBUILD
index fc4253da1..33ceeedd7 100644
--- a/community/twolame/PKGBUILD
+++ b/community/twolame/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=twolame
 pkgver=0.3.13
-pkgrel=6.1
+pkgrel=6.2
 pkgdesc="An optimized MPEG Audio Layer 2 (MP2) encoder"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.twolame.org/"
diff --git a/community/ubuntuone-client-gnome/PKGBUILD b/community/ubuntuone-client-gnome/PKGBUILD
index 51e54fff1..c1c9c1c7b 100644
--- a/community/ubuntuone-client-gnome/PKGBUILD
+++ b/community/ubuntuone-client-gnome/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 77831 2012-10-15 01:46:26Z bgyorgy $
+# $Id: PKGBUILD 88682 2013-04-21 22:16:52Z heftig $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=ubuntuone-client-gnome
-pkgver=4.0.0
-pkgrel=1
+pkgver=4.2.0
+pkgrel=2
 pkgdesc="Some plug-ins, extensions, and data for integrating Ubuntu One features in some core parts of GNOME"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/ubuntuone-client-gnome"
 license=('GPL')
 depends=('nautilus' 'gconf' 'ubuntuone-client')
 makedepends=('intltool' 'gnome-settings-daemon')
-optdepends=('gnome-settings-daemon: shows a warning when Ubuntu One runs out of space')
 options=('!libtool')
 install=$pkgname.install
-source=(http://launchpad.net/ubuntuone-client-gnome/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('26e9e391cabe1047eeb203d99ee2d9c6')
+source=(https://launchpad.net/ubuntuone-client-gnome/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        disable-gsd-plugin.patch)
+md5sums=('e2f5e4ef6f4eca6ffcf838b3aa46c3ef'
+         'e2b1b677844c3b61530f3653808b6644')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Disable gsd plugin, as it's not compatible with gnome-settings-daemon 3.8
+  patch -Np1 -i "$srcdir/disable-gsd-plugin.patch"
+
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static --disable-schemas-compile
   make
diff --git a/community/ubuntuone-client-gnome/disable-gsd-plugin.patch b/community/ubuntuone-client-gnome/disable-gsd-plugin.patch
new file mode 100644
index 000000000..2199536e2
--- /dev/null
+++ b/community/ubuntuone-client-gnome/disable-gsd-plugin.patch
@@ -0,0 +1,21 @@
+diff -Naur ubuntuone-client-gnome-4.2.0.orig/configure.ac ubuntuone-client-gnome-4.2.0/configure.ac
+--- ubuntuone-client-gnome-4.2.0.orig/configure.ac	2013-03-26 20:48:40.000000000 +0100
++++ ubuntuone-client-gnome-4.2.0/configure.ac	2013-04-09 22:26:38.135983473 +0200
+@@ -5,7 +5,7 @@
+ AC_CONFIG_SRCDIR([config.h.in])
+ 
+ AM_INIT_AUTOMAKE([1.10 foreign])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+ 
+diff -Naur ubuntuone-client-gnome-4.2.0.orig/Makefile.am ubuntuone-client-gnome-4.2.0/Makefile.am
+--- ubuntuone-client-gnome-4.2.0.orig/Makefile.am	2013-03-21 18:13:58.000000000 +0100
++++ ubuntuone-client-gnome-4.2.0/Makefile.am	2013-04-09 22:22:05.109626589 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = gsd nautilus po
++SUBDIRS = nautilus po
+ 
+ # Shut libtoolize up
+ ACLOCAL_AMFLAGS = -I m4
diff --git a/community/ubuntuone-client-gnome/fix-build.patch b/community/ubuntuone-client-gnome/fix-build.patch
deleted file mode 100644
index 237ba323e..000000000
--- a/community/ubuntuone-client-gnome/fix-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur ubuntuone-client-gnome-3.0.0.orig/nautilus/utils.c ubuntuone-client-gnome-3.0.0/nautilus/utils.c
---- ubuntuone-client-gnome-3.0.0.orig/nautilus/utils.c	2012-02-22 16:40:56.000000000 +0100
-+++ ubuntuone-client-gnome-3.0.0/nautilus/utils.c	2012-05-13 22:26:35.267409857 +0200
-@@ -26,8 +26,7 @@
- #include <limits.h>
- #include <stdlib.h>
- #include <glib/gi18n.h>
--#include <glib/gutils.h>
--#include <glib/gfileutils.h>
-+#include <glib.h>
- #include <libnautilus-extension/nautilus-file-info.h>
- #include <libsyncdaemon/libsyncdaemon.h>
- #include "ubuntuone-nautilus.h"
diff --git a/community/ubuntuone-client/1339_1338.diff b/community/ubuntuone-client/1339_1338.diff
deleted file mode 100644
index cbd966a70..000000000
--- a/community/ubuntuone-client/1339_1338.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-=== modified file 'tests/platform/sync_menu/test_linux.py'
---- tests/platform/sync_menu/test_linux.py	2012-10-10 14:54:49 +0000
-+++ tests/platform/sync_menu/test_linux.py	2012-10-11 12:01:27 +0000
-@@ -124,6 +124,7 @@
-         """Check that the dummy has the proper methods required by the API."""
-         dummy = linux.DummySyncMenu('random', 'args')
-         self.assertIsInstance(dummy.update_transfers, Callable)
-+        self.assertIsInstance(dummy.sync_status_changed, Callable)
- 
- 
- class SyncMenuTestCase(TestCase):
-
-=== modified file 'ubuntuone/platform/sync_menu/linux.py'
---- ubuntuone/platform/sync_menu/linux.py	2012-10-10 17:06:14 +0000
-+++ ubuntuone/platform/sync_menu/linux.py	2012-10-11 13:00:10 +0000
-@@ -183,7 +183,7 @@
-             self.timer.addCallback(self._timeout)
- 
- 
--class TransfersMenu(Dbusmenu.Menuitem):
-+class TransfersMenu(Dbusmenu.Menuitem if use_syncmenu else object):
-     """Menu that handles the recent and current transfers."""
- 
-     def __init__(self, status_frontend):
-@@ -227,7 +227,7 @@
-         items_added = 0
-         remove = []
-         for item in self._uploading_items:
--            if item in uploading_data:
-+            if item in uploading_data.keys():
-                 size, written = uploading_data[item]
-                 percentage = written * 100 / size
-                 upload_item = self._uploading_items[item]
-@@ -243,7 +243,7 @@
-         for item in remove:
-             self._uploading_items.pop(item)
-         if items_added < 5:
--            for item in uploading_data:
-+            for item in uploading_data.keys():
-                 if item not in self._uploading_items and items_added < 5:
-                     size, written = uploading_data[item]
-                     percentage = written * 100 / size
-@@ -270,4 +270,12 @@
-     def update_transfers(self):
-         """Do nothing."""
- 
--UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux if use_syncmenu else DummySyncMenu
-+    def sync_status_changed(self):
-+        """Do nothing."""
-+
-+
-+if use_syncmenu:
-+    UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux
-+else:
-+    UbuntuOneSyncMenu = DummySyncMenu
-+    TransfersMenu = None
-
diff --git a/community/ubuntuone-client/PKGBUILD b/community/ubuntuone-client/PKGBUILD
index 798331ad9..3129e37f6 100644
--- a/community/ubuntuone-client/PKGBUILD
+++ b/community/ubuntuone-client/PKGBUILD
@@ -1,41 +1,34 @@
-# $Id: PKGBUILD 82715 2013-01-23 12:42:21Z bgyorgy $
+# $Id: PKGBUILD 87512 2013-04-02 00:39:00Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=ubuntuone-client
-pkgver=4.0.0
-pkgrel=4
+pkgver=4.2.0
+pkgrel=1
 pkgdesc="Ubuntu One helps you store, sync and share files between your computers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/ubuntuone-client"
-license=('GPL')
-depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'python2-gobject' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python2-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool' 'imake')
+license=('GPL' 'CCPL:cc-by-sa')
+depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'python2-gobject' 'libnotify' 'python2-pyinotify' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('intltool' 'imake' 'python2-distutils-extra')
 options=('!libtool')
 install=$pkgname.install
-source=(http://launchpad.net/ubuntuone-client/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz
-        1339_1338.diff
-        fix-notify-hint.patch
-        lp1093111.patch)
-md5sums=('738039703d4dcf54518a725f8ffbc4de'
-         'e82e80c229de06692988c1f938a34fb9'
-         '54dfeb2be011f0a12ea7cfa0f0c19bec'
-         'ca79cb558231639e28be7276017ae91c')
+source=(https://launchpad.net/ubuntuone-client/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        https://launchpad.net/ubuntuone-client-data/stable-4-2/$pkgver/+download/$pkgname-data-$pkgver.tar.gz
+        fix-notify-hint.patch)
+md5sums=('37d2de5c6e795e75f447682ee1c3bacc'
+         'd3c445a9957a80471a84f323f24e8f84'
+         'c38cb043e3241f12610ed6eb9ae0f087')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
 
-  # Improve TransfersMenu declaration to avoid problems
-  patch -Np0 -i "$srcdir/1339_1338.diff"
+  # Python2 fix
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
 
   # Workaround for crash in notification-daemon
   # https://bugzilla.gnome.org/show_bug.cgi?id=665166
   patch -Np1 -i "$srcdir/fix-notify-hint.patch"
 
-  # Fix compatibility with glibc 2.17
-  # https://bugs.launchpad.net/ubuntuone-client/+bug/1093111
-  patch -Np1 -i "$srcdir/lp1093111.patch"
-
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
               --disable-static \
               PYTHON=python2
@@ -47,6 +40,10 @@ package() {
 
   make DESTDIR="$pkgdir/" install
 
+  # Install data
+  cd "$srcdir/$pkgname-data-$pkgver"
+  python2 setup.py install --root=$pkgdir/ --optimize=1
+
   # We don't have Apport in Arch Linux
   rm -r "$pkgdir"/{etc/apport,usr/share/apport}
 }
diff --git a/community/ubuntuone-client/fix-notify-hint.patch b/community/ubuntuone-client/fix-notify-hint.patch
index f32280de9..58a0888ef 100644
--- a/community/ubuntuone-client/fix-notify-hint.patch
+++ b/community/ubuntuone-client/fix-notify-hint.patch
@@ -1,20 +1,19 @@
-diff -Naur ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py
---- ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py	2012-06-19 15:51:01.000000000 +0200
-+++ ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py	2012-10-15 01:14:01.019476818 +0200
-@@ -40,7 +40,7 @@
+diff -Naur ubuntuone-client-4.2.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.2.0/ubuntuone/platform/notification/linux.py
+--- ubuntuone-client-4.2.0.orig/ubuntuone/platform/notification/linux.py	2013-04-01 16:37:48.530956424 +0000
++++ ubuntuone-client-4.2.0/ubuntuone/platform/notification/linux.py	2013-04-01 16:38:32.333945773 +0000
+@@ -32,7 +32,7 @@
+ USE_NOTIFY = False
  
- if 'gi' in sys.modules and sys.modules['gi'] is not None:
-     try:
--        from gi.repository import Notify
-+        from gi.repository import GLib, Notify
-         Notify  # pyflakes
-         NOTIFY_MODULE = 'gi'
-     except ImportError:
-@@ -85,5 +85,6 @@
+ try:
+-    from gi.repository import Notify
++    from gi.repository import GLib, Notify
+     USE_NOTIFY = True
+ except ImportError:
+     pass
+@@ -67,5 +67,5 @@
          if append:
              self.notification.set_hint_string('x-canonical-append', '')
  
 -        self.notification.set_hint_int32('transient', int(True))
-+        if NOTIFY_MODULE == 'gi':
-+            self.notification.set_hint('transient', GLib.Variant.new_boolean(1))
++        self.notification.set_hint('transient', GLib.Variant.new_boolean(1))
          self.notification.show()
diff --git a/community/ubuntuone-client/lp1093111.patch b/community/ubuntuone-client/lp1093111.patch
deleted file mode 100644
index 8663915d3..000000000
--- a/community/ubuntuone-client/lp1093111.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ubuntuone/syncdaemon/tritcask.py	2013-01-18 18:27:41.809017000 +0200
-+++ b/ubuntuone/syncdaemon/tritcask.py	2013-01-22 15:08:15.015987671 +0200
-@@ -300,6 +300,7 @@
-             self.fd.seek(0, os.SEEK_END)
-         self.fd.write(crc32 + header)
-         self.fd.write(key)
-+        self.fd.flush()
-         value_pos = self.fd.tell()
-         self.fd.write(value)
-         self.fd.flush()
diff --git a/community/ucarp/ucarp.conf b/community/ucarp/ucarp.conf
deleted file mode 100644
index 1fb8eae07..000000000
--- a/community/ucarp/ucarp.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh noet:
-
-DAEMON_OPTS='--interface=eth0 --srcip=10.1.1.1 --vhid=1 --pass=mypassword --addr=10.1.1.252 --upscript=/usr/local/sbin/vip-up.sh --downscript=/usr/local/sbin/vip-down.sh'
diff --git a/community/ucarp/ucarp.rc b/community/ucarp/ucarp.rc
deleted file mode 100644
index f8c9d54f3..000000000
--- a/community/ucarp/ucarp.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-NAME=ucarp
-DAEMON=/usr/sbin/ucarp
-PID=$(pidof -o %PPID $DAEMON)
-DAEMON_OPTS="--daemonize $DAEMON_OPTS"
-
-case "$1" in
-	start)
-		stat_busy "Starting $NAME daemon"
-		[[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
-  stop)
-		stat_busy "Stopping $NAME daemon"
-		[[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
-  restart)
-		$0 stop
-		$0 start
-		exit 0
-	;;
-  *) 
-		echo "usage: ${0##*/} {start|stop|restart}" >&2
-	;;
-esac
-
-exit 1
-
-# vim:set ts=2 sw=2 ft=sh noet:
diff --git a/community/udevil/PKGBUILD b/community/udevil/PKGBUILD
index 70de4c9c7..cc61a4970 100644
--- a/community/udevil/PKGBUILD
+++ b/community/udevil/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 81359 2012-12-18 17:43:40Z bpiotrowski $
+# $Id: PKGBUILD 86567 2013-03-19 17:52:24Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
 
 pkgname=udevil
-pkgver=0.3.6
+pkgver=0.4.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Mount and unmount without password'
@@ -11,7 +11,8 @@ url='http://ignorantguru.github.com/udevil/'
 license=('GPL3')
 makedepends=('intltool' 'gettext')
 depends=('udev' 'glib2')
-optdepends=('nfs-utils:  mount nfs shares'
+optdepends=('davfs2:     mount WebDAV shares'
+            'nfs-utils:  mount nfs shares'
             'sshfs:      mount sftp shares'
             'curlftpfs:  mount ftp shares'
             'cifs-utils: mount samba shares'
@@ -23,7 +24,7 @@ provides=('devmon')
 backup=('etc/udevil/udevil.conf')
 install=$pkgname.install
 source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz)
-md5sums=('522a06a2af81d36f2b9d6a8bd31fa88d')
+sha256sums=('fa4a3d85361d17bb69dd7dabdcfeecd2b0f5fff95698113975d8fbd504af6c2e')
 
 build() {
     cd $srcdir/$pkgname-$pkgver
diff --git a/community/udunits/PKGBUILD b/community/udunits/PKGBUILD
deleted file mode 100644
index edf46032f..000000000
--- a/community/udunits/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 66543 2012-02-26 00:22:29Z lfleischer $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-
-pkgname=udunits
-pkgver=2.1.24
-pkgrel=1
-pkgdesc='A tool for calculations of physical quantities'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.unidata.ucar.edu/software/udunits/'
-license=('custom')
-options=('!libtool')
-depends=('glibc' 'expat')
-provides=('udunits2')
-install=udunits.install
-source=("ftp://ftp.unidata.ucar.edu/pub/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('6986545721747a51285c765644dcd9d8')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # stupid workaround for broken make install
-  install -dm755 "$pkgdir/usr/share/doc/$pkgname"
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  for x in so so.0 so.0.1.0; do
-    ln -s "libudunits2.$x" "$pkgdir/usr/lib/libudunits.$x"
-  done
-
-  install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community/udunits/udunits.install b/community/udunits/udunits.install
deleted file mode 100644
index 1a2fbfd7b..000000000
--- a/community/udunits/udunits.install
+++ /dev/null
@@ -1,26 +0,0 @@
-INFO_DIR=/usr/share/info
-
-INFO_FILES=(udunits2.info udunits2lib.info udunits2prog.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${INFO_FILES[@]}; do install-info \
-    $INFO_DIR/$file.gz $INFO_DIR/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${INFO_FILES[@]}; do
-    install-info --delete \
-    $INFO_DIR/$file.gz $INFO_DIR/dir 2> /dev/null
-  done
-}
-
-op=$1
-shift
-$op $*
diff --git a/community/ufoai/PKGBUILD b/community/ufoai/PKGBUILD
deleted file mode 100644
index 670deb600..000000000
--- a/community/ufoai/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 70141 2012-04-30 15:53:06Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-pkgname=ufoai
-pkgver=2.4
-pkgrel=2
-pkgdesc="In UFO: Alien Invasion you fight aliens trying to capture Earth"
-arch=('i686' 'x86_64')
-url="http://ufoai.ninex.info/"
-license=('GPL')
-depends=('libjpeg' 'libgl' 'libpng' 'curl' 'sdl_image' 'sdl_mixer' 'sdl_ttf' 'xvidcore' 'ufoai-data')
-makedepends=('mesa')
-source=(http://downloads.sourceforge.net/project/ufoai/UFO_AI%202.x/$pkgver/ufoai-$pkgver-source.tar.bz2)
-md5sums=('d7e88aee0ea94149c8b9d90eb6c21ba9')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver-source
-
-  ./configure --prefix=/usr --datadir=/usr/share/ufoai --enable-release --localedir=/usr/share/ufoai/base/i18n/
-  make
-  make lang
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver-source
-
-  install -Dm755 ufo "$pkgdir"/usr/bin/ufo
-  install -Dm755 ufoded "$pkgdir"/usr/bin/ufoded
-  install -Dm755 ufo2map "$pkgdir"/usr/bin/ufo2map
-  install -Dm755 ufomodel "$pkgdir"/usr/bin/ufomodel
-
-  mkdir -p "$pkgdir"/usr/share/ufoai
-  cp -r base "$pkgdir"/usr/share/ufoai/
-
-  install -Dm644 debian/ufoai.desktop "$pkgdir"/usr/share/applications/ufoai.desktop
-  install -Dm644 debian/ufoai-safe.desktop "$pkgdir"/usr/share/applications/ufoai-safe.desktop
-  install -Dm644 debian/ufoded.desktop "$pkgdir"/usr/share/applications/ufoded.desktop
-
-  sed -i 's|/usr/games/||' "$pkgdir"/usr/share/applications/*
-
-  install -Dm644 debian/ufoai.xpm "$pkgdir"/usr/share/pixmaps/ufoai.xpm
-  install -Dm644 debian/ufoded.xpm "$pkgdir"/usr/share/pixmaps/ufoded.xpm
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community/ufoai/ufo-ai-2.3.1-libpng15.patch b/community/ufoai/ufo-ai-2.3.1-libpng15.patch
deleted file mode 100644
index 2099f7ab7..000000000
--- a/community/ufoai/ufo-ai-2.3.1-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/shared/images.c.old	2011-04-02 19:31:52.000000000 +0200
-+++ src/shared/images.c	2011-04-02 19:32:13.000000000 +0200
-@@ -32,6 +32,7 @@
- 
- #include <jpeglib.h>
- #include <png.h>
-+#include <zlib.h>
- 
- /** image formats, tried in this order */
- static char *IMAGE_TYPES[] = { "tga", "png", "jpg", NULL };
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index 3f7f0fe68..7aaf3345d 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 83573 2013-02-03 13:19:13Z seblu $
+# $Id: PKGBUILD 87022 2013-03-25 19:17:05Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Maintainer: Sébastien Luttringer
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Sergej Pupykin <ps@lx-ltd.ru>
 
 pkgname=ulogd
-pkgver=2.0.1
-pkgrel=4
+pkgver=2.0.2
+pkgrel=1
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/ulogd/index.html'
 license=('GPL2')
 depends=('libmnl' 'libnfnetlink')
 backup=('etc/ulogd.conf')
-makedepends=('libmysqlclient'
+makedepends=('libmariadbclient'
              'libnetfilter_acct'
              'libnetfilter_conntrack'
              'libnetfilter_log'
@@ -27,7 +27,7 @@ source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
 	      "$pkgname.logrotate"
 	      "$pkgname.conf"
 	      "$pkgname.service")
-md5sums=('2f4b1a58955fcad4ebf22f0d00885fc9'
+md5sums=('660516de4b5b1e110c12dae414619e0f'
          'dd32eeee0949adff4188544419acd17e'
          'c21531312f95e790ed19aa267a17d35a'
          '42fc2c0568ff89ec00c2f0797280f296')
diff --git a/community/ulogd/logrotate b/community/ulogd/logrotate
deleted file mode 100644
index 312c71acb..000000000
--- a/community/ulogd/logrotate
+++ /dev/null
@@ -1,10 +0,0 @@
-/var/log/ulogd.log /var/log/ulogd.syslogemu {
-  missingok
-  notifempty
-  sharedscripts
-  create 0640 root root
-
-  postrotate
-    [ -e /var/run/ulogd.pid ] && /etc/rc.d/ulogd restart > /dev/null
-  endscript
-}
diff --git a/community/ulogd/mac-addr.patch b/community/ulogd/mac-addr.patch
deleted file mode 100644
index 87a76a22b..000000000
--- a/community/ulogd/mac-addr.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ulogd_BASE.c-save	2007-08-06 11:23:53.000000000 +0200
-+++ ulogd_BASE.c	2007-08-06 11:28:47.000000000 +0200
-@@ -63,7 +63,7 @@ static ulog_iret_t *_interp_raw(ulog_int
- {
- 	unsigned char *p;
- 	int i;
--	char *buf, *oldbuf = NULL;
-+	char *buf = NULL;
- 	ulog_iret_t *ret = ip->result;
- 
- 	if (pkt->mac_len) {
-@@ -75,9 +75,8 @@ static ulog_iret_t *_interp_raw(ulog_int
- 		*buf = '\0';
- 
- 		p = pkt->mac;
--		oldbuf = buf;
- 		for (i = 0; i < pkt->mac_len; i++, p++)
--			sprintf(buf, "%s%02x%c", oldbuf, *p, i==pkt->mac_len-1 ? ' ':':');
-+			sprintf(buf + (i*3), "%02x%c", *p, i==pkt->mac_len-1 ? ' ':':');
- 		ret[0].value.ptr = buf;
- 		ret[0].flags |= ULOGD_RETF_VALID;
- 	}
diff --git a/community/ulogd/rc b/community/ulogd/rc
deleted file mode 100644
index 83f0550cc..000000000
--- a/community/ulogd/rc
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof /usr/sbin/ulogd
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting ulogd daemon"
-
-    [ -f /var/run/ulog.pid ] && rm -f /var/run/ulog.pid
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-       /usr/sbin/ulogd -d &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo `get_pid` > /var/run/ulogd.pid
-        add_daemon ulogd
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping ulog daemon"
-    PID=`get_pid`
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/ulogd.pid &> /dev/null
-      rm_daemon ulogd
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/ulogd/ulogd.conf.min b/community/ulogd/ulogd.conf.min
deleted file mode 100644
index 822575613..000000000
--- a/community/ulogd/ulogd.conf.min
+++ /dev/null
@@ -1,20 +0,0 @@
-[global]
-nlgroup=1
-logfile="/var/log/ulogd.log"
-loglevel=5
-rmem=131071
-bufsize=150000
-
-plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so"
-plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so"
-plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so"
-plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so"
-plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so"
-
-stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
-
-[ulog1]
-nlgroup=1
-
-[emu1]
-file=/var/log/ulogd.syslogemu
diff --git a/community/ulogd/ulogd.rc b/community/ulogd/ulogd.rc
deleted file mode 100644
index 83f0550cc..000000000
--- a/community/ulogd/ulogd.rc
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof /usr/sbin/ulogd
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting ulogd daemon"
-
-    [ -f /var/run/ulog.pid ] && rm -f /var/run/ulog.pid
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-       /usr/sbin/ulogd -d &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo `get_pid` > /var/run/ulogd.pid
-        add_daemon ulogd
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping ulog daemon"
-    PID=`get_pid`
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/ulogd.pid &> /dev/null
-      rm_daemon ulogd
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/unace/01-makefiles.dpatch b/community/unace/01-makefiles.dpatch
deleted file mode 100644
index 798c226e0..000000000
--- a/community/unace/01-makefiles.dpatch
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-makefiles.dpatch by Fabian Greffrath <fabian@debian-unofficial.org>
-##
-## DP: Fix upstream makefiles
-
-@DPATCH@
-
-diff -Nru unace-nonfree-2.5.orig/base.mk unace-nonfree-2.5/base.mk
---- unace-nonfree-2.5.orig/base.mk	2003-11-27 20:16:20.000000000 +0100
-+++ unace-nonfree-2.5/base.mk	2006-01-31 09:33:04.000000000 +0100
-@@ -427,9 +427,7 @@
- ##############################################################################
- 
- ifndef ISWMAKE

--include $(MAKE_DIR)baseace.mk

- include $(MAKE_DIR)baseuace.mk

- else

--!include $(MAKE_DIR)baseace.mk

- !include $(MAKE_DIR)baseuace.mk

- endif

-diff -Nru unace-nonfree-2.5.orig/makefile unace-nonfree-2.5/makefile
---- unace-nonfree-2.5.orig/makefile	2003-11-24 00:24:24.000000000 +0100
-+++ unace-nonfree-2.5/makefile	2006-01-31 09:40:17.000000000 +0100
-@@ -18,6 +18,6 @@
- INCLDIR 	= //usr/include

- 

--DEFINES		= -D__LINUX__ -D__unix__ -D__GCC__ -D__HAS_IO_H__

-+DEFINES		= -D__LINUX__ -D__unix__ -D__GCC__ -U__HAS_IO_H__

- 

- ifdef DEBUG

- LSWITCHES	=

-@@ -47,7 +47,7 @@
-   $(APPS_UNACEEXE_CFILES)

- 

- unace: $(UNACEEXELIN_CFILES)

--	gcc $(LSWITCHES) -Wl,-lncurses -static -I$(INCLDIR) -I$(INCLSYSDIR) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -ggdb -o$(EXECS_DIR)unace
-+	gcc $(LSWITCHES) -Wl,-lncurses -I$(INCLDIR) -idirafter $(INCLSYSDIR) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -ggdb -o$(EXECS_DIR)unace
- ifndef DEBUG

- 	tar cfvz linunace25.tgz unace file_id.diz licence
- 	#sh linpack.sh

-diff -Nru unace-nonfree-2.5.orig/unace.mk unace-nonfree-2.5/unace.mk
---- unace-nonfree-2.5.orig/unace.mk	2003-11-27 20:17:46.000000000 +0100
-+++ unace-nonfree-2.5/unace.mk	2006-01-31 09:33:21.000000000 +0100
-@@ -27,8 +27,6 @@
- 

- ifndef ISWMAKE

- include $(MAKE_DIR)unaceexe.mk

--include $(MAKE_DIR)unacedll.mk

- else

- !include $(MAKE_DIR)unaceexe.mk

--!include $(MAKE_DIR)unacedll.mk

- endif

diff --git a/community/unace/04-64bit.dpatch b/community/unace/04-64bit.dpatch
deleted file mode 100644
index 7aad590be..000000000
--- a/community/unace/04-64bit.dpatch
+++ /dev/null
@@ -1,119 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04-64bit.dpatch by Michael Karcher
-## <debian@mkarcher.dialup.fu-berlin.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Replace declare.h by a generic stdint based version.
-
-@DPATCH@
-diff -urNad unace-nonfree-2.5~/source/base/all/declare.h unace-nonfree-2.5/source/base/all/declare.h
---- unace-nonfree-2.5~/source/base/all/declare.h	2007-11-06 00:11:47.000000000 +0100
-+++ unace-nonfree-2.5/source/base/all/declare.h	2007-11-06 00:13:18.498574104 +0100
-@@ -7,76 +7,47 @@
- #ifndef _DECLARE_H_INCLUDED

- #define _DECLARE_H_INCLUDED

- 

--#if !defined(__OS2__) && !defined(_WINDOWS_)

--  typedef int             BOOL;

--

--  typedef char               CHAR;

--  typedef unsigned char      UCHAR;

--  typedef UCHAR             *PUCHAR;

--  typedef char              *PSZ;

--

--  typedef short              SHORT;

--  typedef unsigned short     USHORT;

--  typedef USHORT            *PUSHORT;

--

--  typedef long               LONG;

--  typedef unsigned long      ULONG;

--

--  typedef ULONG             *PULONG;

--

--  typedef int                INT;

--  typedef unsigned int       UINT;

--  typedef unsigned int      *PUINT;

-+#include <stdint.h>

- 

--  typedef CHAR              *LPSTR;

--#endif

-+typedef int             BOOL;

-+typedef BOOL           *PBOOL;

- 

--#if __WATCOMC__==1060

--  typedef long               __int64[2];

--  typedef __int64            LONGLONG;

--  typedef LONGLONG          *PLONGLONG;

--  typedef __int64            ULONGLONG;

--  typedef ULONGLONG          DWORDLONG;

--#else

--  #if !defined(_WINDOWS_)

--    #if !defined(__WATCOMC__) && !defined(__int64)

--      #define __int64  long long

--    #endif

-+typedef char               CHAR;

-+typedef CHAR              *PCHAR;

-+typedef unsigned char      UCHAR;

-+typedef UCHAR             *PUCHAR;

-+typedef signed char        SCHAR;

-+typedef CHAR              *PSZ;

-+typedef CHAR              *LPSTR;

- 

--    typedef __int64            LONGLONG;

--    typedef LONGLONG          *PLONGLONG;

--    typedef unsigned __int64   ULONGLONG;

--    typedef ULONGLONG          DWORDLONG;

--  #endif

--#endif

-+typedef int                INT;

-+typedef INT               *PINT;

-+typedef unsigned int       UINT;

-+typedef unsigned int      *PUINT;

- 

-+typedef int16_t            SHORT;

-+typedef SHORT             *PSHORT;

-+typedef uint16_t           USHORT;

-+typedef USHORT            *PUSHORT;

- 

--#if !defined(_WINDOWS_)

--  typedef BOOL           *PBOOL;

--  typedef INT            *PINT;

--#endif

-+typedef int32_t            LONG;

-+typedef LONG              *PLONG;

-+typedef uint32_t           ULONG;

-+typedef ULONG             *PULONG;

- 

--#if !defined(__wtypes_h__)

--  typedef void           *PVOID;

--  typedef CHAR           *PCHAR;

--  typedef SHORT          *PSHORT;

--  typedef LONG           *PLONG;

--  typedef ULONGLONG      *PULONGLONG;

--#endif

-+typedef int64_t            LONGLONG;

-+typedef LONGLONG          *PLONGLONG;

-+typedef uint64_t           ULONGLONG;

-+typedef ULONGLONG         *PULONGLONG;

- 

--#if defined(_GNU_H_WINDOWS32_BASE)

--  typedef LONGLONG  	  ULONGLONG;

--  typedef ULONGLONG      *PULONGLONG;

--#endif

-+typedef void              *PVOID;

- 

--typedef signed char     SCHAR;

-+/* Dear ACE team, please clean your code to remove the following types */

-+typedef LONGLONG           __int64;

-+typedef ULONGLONG          DWORDLONG;

- 

- #ifndef NULL

-- #if defined(__SMALL__) || defined(__MEDIUM__) || defined(__386__) || defined(__AXP__) || defined(__PPC__)

--  #define NULL   0

-- #else

--  #define NULL   0L

-- #endif

-+#include <stdlib.h>

- #endif

- 

- 

diff --git a/community/unace/ChangeLog b/community/unace/ChangeLog
deleted file mode 100644
index 41533eb7b..000000000
--- a/community/unace/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2008-04-04  Eric Belanger  <eric@archlinux.org>
-
-	* unace-2.5-5.1
-	* fixed seg faults on x86_64
-
-2007-05-28 Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-	* unace-2.5-5
-	moved in [community]
-	now it's built from source (from debian)
diff --git a/community/unace/PKGBUILD b/community/unace/PKGBUILD
deleted file mode 100644
index 8a5c338f3..000000000
--- a/community/unace/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 67507 2012-03-12 21:46:37Z lcarlier $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: lowercase
-
-pkgname=unace
-pkgver=2.5
-pkgrel=7
-pkgdesc="An extraction tool for the proprietary ace archive format"
-arch=('i686' 'x86_64')
-url="http://www.winace.com/"
-license=("custom")
-depends=(ncurses)
-install=unace.install
-source=(http://ftp.debian.org/debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5.orig.tar.gz \
-        01-makefiles.dpatch 04-64bit.dpatch)
-md5sums=('59013e74e5ac2ee15c1e92026ec1e3cc' '6a1498f24d6430723acf556e0d1cc72b'\
-         'c46de484cf5dc0e04c342062139a8aaf')
-sha1sums=('f658f03aa6f663c1a90af85e3e8c6e7ef12adb42'
-          '83b2b84223072b6f456d7255c80bec4e01572be0'
-          'cccd98f1b99218ec69f27425b56b44d23c75eb1e')
-
-build() {
-  cd ${srcdir}/unace-$pkgver
-
-  patch -p1 < ../01-makefiles.dpatch
-  [ "$CARCH" = "x86_64" ] && (patch -p1 < ../04-64bit.dpatch)
-  make
-}
-
-package() {
-  cd ${srcdir}/unace-$pkgver
-
-  install -D -m755 unace ${pkgdir}/usr/bin/unace
-  install -D -m644 licence ${pkgdir}/usr/share/licenses/unace/license
-}
diff --git a/community/unace/unace.install b/community/unace/unace.install
deleted file mode 100644
index 68408ad40..000000000
--- a/community/unace/unace.install
+++ /dev/null
@@ -1,14 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-
-cat << EOM
-
-==> unace post-install message:
-==> to use this software, you have to accept the Public UnAce Licence,
-==> ( it's in /usr/share/licenses/unace/license )
-==> otherwise, remove this package!
-
-EOM
-
-}
-
diff --git a/community/unarj/LICENSE b/community/unarj/LICENSE
deleted file mode 100644
index 944334a7a..000000000
--- a/community/unarj/LICENSE
+++ /dev/null
@@ -1,86 +0,0 @@
- * Copyright (c) 1991-2000 by ARJ Software, Inc.  All rights reserved.
- *
- *   This code may be freely used in programs that are NOT ARJ archivers
- *   (both compress and extract ARJ archives).
- *
- *   If you wish to distribute a modified version of this program, you
- *   MUST indicate that it is a modified version both in the program and
- *   source code.
- *
- *   We are holding the copyright on the source code, so please do not
- *   delete our name from the program files or from the documentation.
- *
- *   We wish to give credit to Haruhiko Okumura for providing the
- *   basic ideas for ARJ and UNARJ in his program AR.  Please note
- *   that UNARJ is significantly different from AR from an archive
- *   structural point of view.
- *
-
-
-
-     UNARJ LICENSE POLICY FOR ALL USERS:
-
-     The UNARJ program, source code, and the associated documentation
-     are copyright (c) 1990-2000 ARJ Software, Inc. all rights reserved.
-
-     If you distribute this software to others, you are required to
-     distribute the ENTIRE package consisting of the following files:
-
-     README.DOC
-     UNARJ.EXE
-     UNARJ.DOC
-     UNARJ.C
-     DECODE.C
-     ENVIRON.C
-     UNARJ.H
-     UNARJ.DEF
-     TCCUNARJ.MAK
-     BCCUNARJ.MAK
-     BCC32.MAK
-     QCLUNARJ.MAK
-     OS2UNARJ.MAK
-     TECHNOTE.DOC
-
-     We strongly prefer that the files be distributed in the format
-     originally released:  UNARJ243.EXE with the ARJ-SECURITY envelope as
-     created by the author.  If you must distribute the UNARJ archive in
-     another archive format, please archive the UNARJ243.EXE as one file
-     inside the other archive.  Re-archival of the software as separate
-     files means losing the ARJ security envelope.
-
-     You may freely use the UNARJ C source code.  If you wish to 
-     distribute a modified version of UNARJ.EXE, you MUST indicate that it 
-     is a modified version both in the program and source code.
-
-     We are holding the copyright on the source code, so please do not
-     delete our name from the program files or the documentation.
-
-     The UNARJ.EXE program is built from this source using Borland C++ 3.1.
-
-     You may freely use, copy, and distribute UNARJ.EXE, provided that no
-     fee is charged for such use, copying or distribution.
-
-     You may use UNARJ.EXE in a commercial software package provided that
-     no additional fee is charged for using UNARJ.EXE and provided that
-     the user fully understands that NO warranty or support is provided
-     for UNARJ.EXE by ARJ Software.  Moreover, the user must fully
-     understand that UNARJ does not have the long usage history that ARJ
-     does.
-
-     This source code is intended to promote the building of utilities to
-     support the use of ARJ and ARJ archives.
-
-     DISCLAIMER:
-
-     This software UNARJ is provided on an "as is" basis without warranty
-     of any kind, expressed or implied, including but not limited to the
-     implied warranties of merchantability and fitness for a particular
-     purpose.  The person using the software bears all risk as to the
-     quality and performance of the software. Should the software prove
-     defective, the user assumes the entire cost of all necessary repair,
-     servicing, or correction.  ARJ Software, Inc. will not be liable
-     for any special, incidental, consequential, indirect or similar
-     damages due to loss of data or any other reason, even if ARJ
-     Software, Inc. or its agents have been advised of the possibility
-     of such damages.
-
diff --git a/community/unarj/PKGBUILD b/community/unarj/PKGBUILD
deleted file mode 100644
index e0baa00e3..000000000
--- a/community/unarj/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 55533 2011-09-14 07:44:04Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.co>
-# Contributor: dale <dale@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=unarj
-pkgver=2.63a
-pkgrel=3
-pkgdesc="An utility to extract, test and  view the contents of archives created with the ARJ archiver"
-arch=('i686' 'x86_64')
-url="http://www.ibiblio.org/pub/Linux/utils/compress/"
-license=('custom')
-depends=('glibc')
-source=("http://ibiblio.org/pub/Linux/utils/compress/$pkgname-$pkgver.tar.gz"
-        'LICENSE')
-md5sums=('a83d139c245f911f22cb1b611ec9768f'
-         'c2467ee8c1cb61d843bc2c16cc5e2a2d')
-
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  install -D -m755 unarj $pkgdir/usr/bin/unarj
-  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index 1242a98aa..c9e0357c4 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81233 2012-12-13 22:22:41Z bisson $
+# $Id: PKGBUILD 87924 2013-04-08 17:07:36Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgname=unbound
-pkgver=1.4.19
+pkgver=1.4.20
 pkgrel=1
 pkgdesc='Validating, recursive, and caching DNS resolver'
 url='http://unbound.net/'
@@ -19,8 +19,8 @@ source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
         'unbound.service'
         'unbound.conf'
         'rc.d')
-sha1sums=('ccf0d465fc0045d59ceca11ecde688edebd28ec1'
-          '5bc313cd978e4d6efe8c13600e838c70629be477'
+sha1sums=('1752976533be2a4f0c9cdbab9d2cbb67d4f27c43'
+          'a2493cb105ff6aa23d756514badb13b02d37f319'
           '5d473ec2943fd85367cdb653fcd58e186f07383f'
           'dc96e772f467b32555df21d16fdb15e98194c228')
 
diff --git a/community/unbound/unbound.service b/community/unbound/unbound.service
index 8b3c9576b..8e59e5a6a 100644
--- a/community/unbound/unbound.service
+++ b/community/unbound/unbound.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Unbound DNS Resolver
+After=network.target
 
 [Service]
 PIDFile=/run/unbound.pid
diff --git a/community/unetbootin/PKGBUILD b/community/unetbootin/PKGBUILD
deleted file mode 100644
index 6f068c62d..000000000
--- a/community/unetbootin/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 75751 2012-08-30 19:02:00Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Det <nimetonmaili at gmail a-dot com>
-# Contributor: Godane aka Christopher Rogers <slaxemulator@gmail.com>
-
-pkgname=unetbootin
-pkgver=581
-pkgrel=1
-arch=('x86_64' 'i686')
-license=('GPL')
-pkgdesc="Create bootable Live USB drives"
-url="http://unetbootin.sourceforge.net/"
-depends=('syslinux' 'p7zip' 'qt' 'mtools' 'xorg-xmessage' 'desktop-file-utils' 'gtk-update-icon-cache')
-optdepends=('gksu: GUI authentication'
-            'kdebase-runtime: GUI authentication')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/project/$pkgname/UNetbootin/$pkgver/$pkgname-source-$pkgver.tar.gz"
-        "$pkgname.sh")
-sha256sums=('b8bf5972653c023c159358f0e4c743dfaf1c6c27f28fd15cd97739d08c751509'
-            'c35329011559288b964cc4c927c969fe35cb8cb3f88020583affe359fc72de10')
-
-build() {
-  cd "$srcdir"
-
-  lupdate "$pkgname.pro"
-  lrelease "$pkgname.pro"
-  qmake
-  make
-}
-
-package() {
-  cd "$srcdir"
-
-  install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
-  install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname.elf"
-  mkdir -p "$pkgdir/usr/share/$pkgname"
-  install -m644 "$pkgname"_*.qm "$pkgdir/usr/share/$pkgname/"
-  install -Dm644 "$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-  for i in 16 22 24 32 48 256; do
-    install -D "${pkgname}_${i}.png" \
-      "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/unetbootin/unetbootin.install b/community/unetbootin/unetbootin.install
deleted file mode 100644
index f95667aa4..000000000
--- a/community/unetbootin/unetbootin.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/unetbootin/unetbootin.sh b/community/unetbootin/unetbootin.sh
deleted file mode 100644
index a6c8969b6..000000000
--- a/community/unetbootin/unetbootin.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# wrapper script for starting unetbootin with root permissions
-ELF=/usr/bin/unetbootin.elf
-if [ -e /usr/bin/pkexec ]; then
-  pkexec $ELF && exit 0
-fi
-if [ -z "$KDE_FULL_SESSION" ]; then
-  if [ -e /usr/bin/gksudo ]; then
-      gksudo $ELF && exit 0
-  fi
-  if [ -e /usr/bin/gksu ]; then
-      gksu $ELF && exit 0
-  fi
-  echo "Could not use pkexec, gksudo or gksu"
-  $ELF && exit 0 || exit 1
-fi  
-if [ -e /usr/bin/kdesudo ]; then
-  kdesudo $ELF && exit 0
-fi
-if [ -e /usr/bin/kdesu ]; then
-  kdesu $ELF && exit 0
-fi
-echo "Could not use kdesudo or kdesu"
-$ELF && exit 0 || exit 1
diff --git a/community/unifdef/PKGBUILD b/community/unifdef/PKGBUILD
index a2b1bf057..f5b6c0477 100644
--- a/community/unifdef/PKGBUILD
+++ b/community/unifdef/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 83684 2013-02-04 11:06:31Z spupykin $
+# $Id: PKGBUILD 88335 2013-04-16 13:31:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=unifdef
-pkgver=2.6
-pkgrel=3
+pkgver=2.7
+pkgrel=1
 pkgdesc="Remove #ifdef'ed lines"
 arch=(i686 x86_64 'mips64el')
 url="http://dotat.at/prog/unifdef/"
 license=('GPL')
 depends=()
 source=("http://dotat.at/prog/unifdef/unifdef-$pkgver.tar.gz")
-md5sums=('18b832baea2c7b6b00bd7d4f3db38f62')
+md5sums=('72357e9faa877fe21f5d621d2024a242')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   make clean
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1
   install -m 0755 unifdef $pkgdir/usr/bin/
   install -m 0644 unifdef.1 $pkgdir/usr/share/man/man1/
diff --git a/community/unionfs-fuse/PKGBUILD b/community/unionfs-fuse/PKGBUILD
index e75504ae0..bcb7c52d2 100644
--- a/community/unionfs-fuse/PKGBUILD
+++ b/community/unionfs-fuse/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=unionfs-fuse
 pkgver=0.26
 pkgrel=1
 pkgdesc="A user space unionfs implementation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://podgorny.cz/moin/UnionFsFuse"
 license=('BSD')
 depends=('fuse')
diff --git a/community/units/PKGBUILD b/community/units/PKGBUILD
index 7f95ba95a..cf6b7fc64 100644
--- a/community/units/PKGBUILD
+++ b/community/units/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73248 2012-07-04 09:22:47Z spupykin $
+# $Id: PKGBUILD 86729 2013-03-21 15:11:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Steve Sansom <snsansom@gmail.com>
 
 pkgname=units
-pkgver=2.00
+pkgver=2.01
 pkgrel=2
 pkgdesc="converts between different units"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,15 +13,17 @@ depends=('readline')
 license=("GPL")
 options=('!makeflags')
 install=units.install
-source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz
-	build-fix.patch)
-md5sums=('6d0518d493f9bab5aa318a3c7d0801b2'
-         'dbb20e628ce0879fe82393f585e9dab6')
+source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz)
+md5sums=('81bf85937c56fbbd04b16f2f3f9d8526')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/build-fix.patch
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' units_cur
   ./configure --prefix=/usr --datadir=/usr/share
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/units/build-fix.patch b/community/units/build-fix.patch
deleted file mode 100644
index 7361a9e91..000000000
--- a/community/units/build-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -wbBur units-2.00.org/Makefile.in units-2.00/Makefile.in
---- units-2.00.org/Makefile.in	2012-05-03 00:37:55.000000000 +0400
-+++ units-2.00/Makefile.in	2012-07-04 12:54:20.000000000 +0400
-@@ -84,10 +84,10 @@
- 	sed -e "s:outfile = 'currency.units':outfile='@UDAT@currency.units':" units_cur > units_cur_inst
- 
- install-support: definitions.units currency.units units_cur_inst
--	$(srcdir)/mkinstalldirs @UDAT@  $(DESTDIR)$(bindir) 
--	$(INSTALL_DATA) $(srcdir)/definitions.units @UDAT@definitions.units
--	$(INSTALL_DATA) $(srcdir)/currency.units @UDAT@currency.units
--	$(INSTALL_DATA) $(srcdir)/locale.map @UDAT@locale.map
-+	$(srcdir)/mkinstalldirs $(DESTDIR)/@UDAT@  $(DESTDIR)$(bindir) 
-+	$(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)/@UDAT@definitions.units
-+	$(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)/@UDAT@currency.units
-+	$(INSTALL_DATA) $(srcdir)/locale.map $(DESTDIR)/@UDAT@locale.map
- 	$(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
- 
- install: units@EXEEXT@ install-doc install-support
-diff -wbBur units-2.00.org/units_cur units-2.00/units_cur
---- units-2.00.org/units_cur	2012-05-01 04:51:35.000000000 +0400
-+++ units-2.00/units_cur	2012-07-04 12:53:47.000000000 +0400
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- 
- import urllib
- import datetime
diff --git a/community/unrtf/PKGBUILD b/community/unrtf/PKGBUILD
index bce1f2817..2265187f8 100644
--- a/community/unrtf/PKGBUILD
+++ b/community/unrtf/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60272 2011-12-08 20:04:08Z jlichtblau $
+# $Id: PKGBUILD 88595 2013-04-20 16:12:02Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: froggie <sullivanva@gmail.com>
 
 pkgname=unrtf
-pkgver=0.21.2
+pkgver=0.21.3
 pkgrel=1
 pkgdesc="Command-line program which converts RTF documents to other formats"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,14 +13,11 @@ license=('GPL3')
 depends=('glibc')
 changelog=$pkgname.changelog
 source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('acb1b093dd2c7485fc43b128ccaf665d6188f568752cec96d54b693374caddb0')
+sha256sums=('8aec68a5583fea8ac575cdb6bbd111ecc6700054127ab12023ac94729da77536')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 
-# bugfix FS#14043
-  sed -e 's|/usr/local|/usr|' -i src/{main.h,path.h}
-
   ./configure --prefix=/usr
   make
 }
diff --git a/community/unrtf/unrtf.changelog b/community/unrtf/unrtf.changelog
index 04b898b16..fc7f75065 100644
--- a/community/unrtf/unrtf.changelog
+++ b/community/unrtf/unrtf.changelog
@@ -1,3 +1,6 @@
+2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* unrtf 0.21.3-1
+
 2011-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* unrtf 0.21.2
 
diff --git a/community/uptimed/uptimed b/community/uptimed/uptimed
deleted file mode 100755
index 6fe9ec3e3..000000000
--- a/community/uptimed/uptimed
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/uptimed`
-case "$1" in
-  start)
-    stat_busy "Starting Uptimed Daemon"
-    [ -z "$PID" ] && /usr/sbin/uptimed -b    # create the boot record
-    if [ $? -gt 0 ] ; then
-      stat_fail
-    else
-      add_daemon uptimed                     # create the 'state' dir
-      /usr/sbin/uptimed                      # fire up the daemon
-	if [ $? -gt 0 ]; then
-	  stat_fail
-	fi
-      stat_done 
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Uptimed Daemon"
-    [ "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon uptimed                      # remove the 'state' dir
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/upx/PKGBUILD b/community/upx/PKGBUILD
index e50838122..18f9a7a65 100644
--- a/community/upx/PKGBUILD
+++ b/community/upx/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=upx
-pkgver=3.08
+pkgver=3.09
 pkgrel=1
 pkgdesc='Ultimate executable compressor.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('zlib')
 makedepends=('ucl')
 source=("http://upx.sourceforge.net/download/${pkgname}-${pkgver}-src.tar.bz2"
         'http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2')
-md5sums=('54c76fa52cad578ff23ef98aee91e3f5'
+md5sums=('1253da46eac54a217eb73e2d44818e53'
          '29d5ffd03a5a3e51aef6a74e9eafb759')
 
 build() {
diff --git a/community/urbanterror/PKGBUILD b/community/urbanterror/PKGBUILD
deleted file mode 100644
index 598a1b5ba..000000000
--- a/community/urbanterror/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 81627 2012-12-25 03:43:56Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: grimi <grimi at poczta dot fm>
-
-pkgname=urbanterror
-pkgver=4.2.009
-pkgrel=1
-epoch=2
-pkgdesc="A team-based tactical shooter based on the Quake 3 Engine"
-arch=('i686' 'x86_64')
-url="http://www.urbanterror.net"
-license=('GPL2')
-depends=('sdl' 'openal' 'curl' 'urbanterror-data')
-makedepends=('mesa')
-source=("http://download.urbanterror.info/urt/42/zips/UrbanTerror42_full_009.zip"
-        "urbanterror.sh"
-        "urbanterror-server.sh"
-        "urbanterror.desktop"
-        "urbanterror.png")
-md5sums=('434d4b10713d8efa09d8c36a2b254929'
-         '7812ece92ab71986ef038b3291adc412'
-         'fbd3059497cf68769c0cbf02545c6bec'
-         '08a99f4d7ad63024bc886e118ddcbc0f'
-         'f9a57d898df73f43c6a85c8d8cc455ba')
-
-package() {
-  install -d $pkgdir/opt/urbanterror
-
-  cd $pkgdir/opt/urbanterror
-
-  # Copy binaries.
-  [[ $CARCH == "i686" ]] && install -m755 $srcdir/UrbanTerror42/Quake3-UrT.i386 urbanterror
-  [[ $CARCH == "i686" ]] && install -m755 $srcdir/UrbanTerror42/Quake3-UrT-Ded.i386 urbanterror-ded
-  [[ $CARCH == "x86_64" ]] && install -m755 $srcdir/UrbanTerror42/Quake3-UrT.x86_64 urbanterror
-  [[ $CARCH == "x86_64" ]] && install -m755 $srcdir/UrbanTerror42/Quake3-UrT-Ded.x86_64 urbanterror-ded
-
-  # Copy desktop launcher.
-  install -Dm644 $srcdir/urbanterror.desktop $pkgdir/usr/share/applications/urbanterror.desktop
-  install -Dm644 $srcdir/urbanterror.png $pkgdir/usr/share/pixmaps/urbanterror.png
-
-  # Copy launch scripts.
-  install -Dm755 $srcdir/urbanterror.sh $pkgdir/usr/bin/urbanterror
-  install -Dm755 $srcdir/urbanterror-server.sh $pkgdir/usr/bin/urbanterror-server
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community/urbanterror/urbanterror-server.sh b/community/urbanterror/urbanterror-server.sh
deleted file mode 100644
index 8d3f14959..000000000
--- a/community/urbanterror/urbanterror-server.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd /opt/urbanterror/
-exec ./urbanterror-ded "$@"
diff --git a/community/urbanterror/urbanterror.desktop b/community/urbanterror/urbanterror.desktop
deleted file mode 100644
index f4d359dfa..000000000
--- a/community/urbanterror/urbanterror.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Urban Terror
-Type=Application
-Categories=Game;
-Terminal=false
-Exec=urbanterror
-Icon=urbanterror
diff --git a/community/urbanterror/urbanterror.png b/community/urbanterror/urbanterror.png
deleted file mode 100644
index df596c29b..000000000
--- a/community/urbanterror/urbanterror.png
+++ /dev/null
diff --git a/community/urbanterror/urbanterror.sh b/community/urbanterror/urbanterror.sh
deleted file mode 100644
index 65c222b4a..000000000
--- a/community/urbanterror/urbanterror.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd /opt/urbanterror/
-exec ./urbanterror "$@"
diff --git a/community/uriparser/PKGBUILD b/community/uriparser/PKGBUILD
index a1433e81b..d482a3e4b 100644
--- a/community/uriparser/PKGBUILD
+++ b/community/uriparser/PKGBUILD
@@ -1,25 +1,28 @@
-# $Id: PKGBUILD 65355 2012-02-21 02:18:49Z spupykin $
+# $Id: PKGBUILD 88337 2013-04-16 13:32:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar>
 
 pkgname=uriparser
-pkgver=0.7.5
-pkgrel=2
+pkgver=0.7.7
+pkgrel=1
 pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode"
 url="http://sourceforge.net/projects/uriparser/"
-depends=(glibc)
-makedepends=(doxygen)
+depends=()
+makedepends=(doxygen graphviz)
 arch=('i686' 'x86_64' 'mips64el')
 license=("custom")
 source=(http://downloads.sourceforge.net/sourceforge/uriparser/$pkgname-$pkgver.tar.bz2)
-md5sums=('4f4349085fe5de33bcae8d0f26649593')
+md5sums=('2da950ef006be5a842dcc383cbbeaa78')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
   [ -f Makefile ] || ./configure --prefix=/usr --disable-test
-  ln -s ${srcdir}/$pkgname-$pkgver/doc/Doxyfile.in ${srcdir}/$pkgname-$pkgver/doc/Doxyfile
   sed -i 's|{css,gif,html,png}|{css,html,png}|' doc/Makefile
   make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
   install -D -m644 "${srcdir}/$pkgname-$pkgver/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/community/uucp/PKGBUILD b/community/uucp/PKGBUILD
index 85ad36a75..b4b7ee31d 100644
--- a/community/uucp/PKGBUILD
+++ b/community/uucp/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=uucp
 pkgver=1.07
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Taylor UUCP is a free implementation of UUCP and is the standard UUCP used on the GNU system"
 arch=(i686 x86_64 'mips64el')
 url="http://www.gnu.org/software/uucp/uucp.html"
diff --git a/community/v8/PKGBUILD b/community/v8/PKGBUILD
index c7c394aa5..c3100085b 100644
--- a/community/v8/PKGBUILD
+++ b/community/v8/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 82550 2013-01-20 16:42:36Z bpiotrowski $
+# $Id: PKGBUILD 84803 2013-02-24 19:02:59Z bpiotrowski $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: tocer <tocer.deng@gmail.com>
 
 pkgname=v8
 pkgver=3.16.4.1
-pkgrel=1
-pkgdesc='A fast and modern javascript engine'
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=3
+pkgdesc='Fast and modern Javascript engine'
+arch=('i686' 'x86_64')
 url='http://code.google.com/p/v8'
 license=('BSD')
 depends=('gcc-libs' 'readline')
@@ -33,12 +33,16 @@ build() {
   sed -i 's/python /python2 /' Makefile
 
   make $ARCH.release library=shared console=readline
+
+  cd $srcdir && cp -r $pkgname-$pkgver d8-static-$pkgver
+  cd d8-static-$pkgver
+  make $ARCH.release library=static console=readline
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
 
-  install -Dm755 out/$ARCH.release/d8 $pkgdir/usr/bin/d8
+  install -Dm755 $srcdir/d8-static-$pkgver/out/$ARCH.release/d8 $pkgdir/usr/bin/d8
   install -Dm755 out/$ARCH.release/lib.target/libv8.so $pkgdir/usr/lib/libv8.so
 
   install -d $pkgdir/usr/include
diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD
index e721b176c..35ac2775e 100644
--- a/community/vdrift/PKGBUILD
+++ b/community/vdrift/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 78946 2012-10-27 23:46:16Z ebelanger $
+# $Id: PKGBUILD 85589 2013-03-03 17:28:55Z dreisner $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Anton Bazhenov <anton.bazhenov at gmail>
 # Contributor: Lone_Wolf lonewolf@xs4all.nl
 
 pkgname=vdrift
 pkgver=2012.07.22
-pkgrel=3
+pkgrel=4
 pkgdesc="Open source driving simulation made with drift racing in mind"
 arch=('i686' 'x86_64')
 url="http://vdrift.net/"
@@ -22,19 +22,11 @@ md5sums=('fcfd6b65724d32dfe383df216d7afb74'
 build() {
   cd VDrift
 
-  # select arch
-  if [ `uname -m` = "x86_64" ]; then
-    _sconsarch="a64"
-  else
-    _sconsarch="686"
-  fi
-
   patch -Np0 < "$srcdir"/vdrift-2012-07-22c_bullet281_patch.diff
 
   # build and install
   scons $MAKEFLAGS \
     "destdir"="$pkgdir" \
-    "arch"=$_sconsarch \
     "release"=1 \
     "force_feedback"=1 \
     "prefix"=/usr \
diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD
index 2b0daa4a9..5689cd102 100644
--- a/community/vidalia/PKGBUILD
+++ b/community/vidalia/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 80885 2012-12-05 14:14:00Z tredaelli $
+# $Id: PKGBUILD 85421 2013-03-01 10:41:47Z andrea $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Rorschach <r0rschach@lavabit.com>
 
 pkgname=vidalia
 pkgver=0.2.21
-pkgrel=1
+pkgrel=2
 pkgdesc="Controller GUI for Tor"
 url="https://www.torproject.org/vidalia"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('geoip' 'qt' 'tor')
+depends=('geoip' 'qt4' 'tor')
 makedepends=('cmake')
 install=vidalia.install
 source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc})
@@ -17,8 +17,6 @@ md5sums=('8d3079a66d79c79ccfefb929b820f9ac'
          'c735521ae9d231e974c753a5206c2c0f')
 
 build() {
-  [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh
-
   cd "$srcdir"
   mkdir build
   cd build
diff --git a/community/vidalia/bug6178.patch b/community/vidalia/bug6178.patch
deleted file mode 100644
index 5da41ef55..000000000
--- a/community/vidalia/bug6178.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Tomás Touceda <chiiph@torproject.org>
-Date: Thu, 28 Jun 2012 23:55:24 +0000 (-0300)
-Subject: Do not add relative root to datadirectory if it is empty
-X-Git-Url: https://gitweb.torproject.org
-
-Do not add relative root to datadirectory if it is empty
----
-
-diff --git a/changes/bug6178 b/changes/bug6178
-new file mode 100644
-index 0000000..e727ed9
---- /dev/null
-+++ b/changes/bug6178
-@@ -0,0 +1 @@
-+  o Do not add relative root to DataDirectory if it is empty. Fixes bug 6178.
-diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
-index a8dce5a..a7a4a09 100644
---- a/src/vidalia/MainWindow.cpp
-+++ b/src/vidalia/MainWindow.cpp
-@@ -1104,7 +1104,7 @@ MainWindow::start()
-   QString dataDirectory = settings.getDataDirectory();
-   QFileInfo dataDirectoryInfo(dataDirectory);
- 
--  if(QDir(dataDirectory).isRelative()) {
-+  if(not dataDirectory.isEmpty() and QDir(dataDirectory).isRelative()) {
-     dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory;
- 
-     QFileInfo newDataDirectoryInfo(dataDirectory);
diff --git a/community/vidalia/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch b/community/vidalia/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch
deleted file mode 100644
index d61f3e86e..000000000
--- a/community/vidalia/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
-index 85bc62e..b13f80b 100644
---- a/src/vidalia/MainWindow.cpp
-+++ b/src/vidalia/MainWindow.cpp
-@@ -626,9 +626,6 @@ MainWindow::launchBrowserFromDirectory()
- 
-   /** Directory for the browser */
-   QString browserDirectory = settings.getBrowserDirectory();
--  if(QDir(browserDirectory).isRelative())
--    browserDirectory = QDir(QDir::toNativeSeparators(QCoreApplication::applicationDirPath()
--                                                     + "/" + browserDirectory)).canonicalPath();
- 
-   /** Relative path to the browser executable from the browserDirectory */
-   QString browserExecutable = QDir::toNativeSeparators(browserDirectory + "/" + settings.getBrowserExecutable());
-@@ -1068,20 +1065,6 @@ MainWindow::start()
-   QString torrc = settings.getTorrc();
-   QFileInfo torrcInfo(torrc);
- 
--  if(QDir(torrcInfo.filePath()).isRelative()) {
--    torrc = QCoreApplication::applicationDirPath() + "/" + torrc;
--
--    QFileInfo newTorrcInfo(torrc);
--    if(!newTorrcInfo.exists() and torrcInfo.exists()) {
--      torrc = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(torrcInfo.absoluteFilePath());
--      vWarn("Automigrating configuration for Torrc:\nOld path: %1\nNew path: %2")
--        .arg(newTorrcInfo.filePath())
--        .arg(torrc);
--      settings.setTorrc(torrc);
--      torrc = QCoreApplication::applicationDirPath() + "/" + torrc;
--    }
--  }
--
-   if(settings.bootstrap()) {
-     QString boottorrc = settings.bootstrapFrom();
-     vNotice(tr("Bootstrapping torrc from %1 to %2")
-@@ -1104,20 +1087,6 @@ MainWindow::start()
-   QString dataDirectory = settings.getDataDirectory();
-   QFileInfo dataDirectoryInfo(dataDirectory);
- 
--  if(QDir(dataDirectory).isRelative()) {
--    dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory;
--
--    QFileInfo newDataDirectoryInfo(dataDirectory);
--    if(!newDataDirectoryInfo.exists() and dataDirectoryInfo.exists()) {
--      dataDirectory = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(dataDirectoryInfo.absoluteFilePath());
--      vWarn("Automigrating configuration for DataDirectory:\nOld path: %1\nNew path: %2")
--        .arg(newDataDirectoryInfo.absoluteFilePath())
--        .arg(dataDirectory);
--      settings.setDataDirectory(dataDirectory);
--      dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory;
--    }
--  }
--
-   QString expDataDirectory = QDir(expand_filename(dataDirectory)).canonicalPath();
-   if (!dataDirectory.isEmpty())
-     args << "DataDirectory" << expDataDirectory;
-@@ -1175,20 +1144,6 @@ MainWindow::start()
-   QString torExecutable = settings.getExecutable();
-   QFileInfo torExecutableInfo(torExecutable);
- 
--  if(QDir(torExecutableInfo.filePath()).isRelative()) {
--    torExecutable = QCoreApplication::applicationDirPath() + "/" + torExecutable;
--
--    QFileInfo newTorExecutableInfo(torExecutable);
--    if(!newTorExecutableInfo.exists() and torExecutableInfo.exists()) {
--      torExecutable = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(torExecutableInfo.absoluteFilePath());
--      vWarn("Automigrating configuration for TorExecutable:\nOld path: %1\nNew path: %2")
--        .arg(newTorExecutableInfo.filePath())
--        .arg(torExecutable);
--      settings.setExecutable(torExecutable);
--      torExecutable = QCoreApplication::applicationDirPath() + "/" + torExecutable;
--    }
--  }
--
-   _torControl->start(torExecutable, args);
- }
- 
-@@ -1251,8 +1206,6 @@ MainWindow::started()
-   /* Try to connect to Tor's control port */
-   if(settings.autoControlPort()) {
-     QString dataDirectory = settings.getDataDirectory();
--    if(QDir(dataDirectory).isRelative())
--      dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory;
- 
-     QFile file(QString("%1/port.conf").arg(QDir(expand_filename(dataDirectory)).canonicalPath()));
-     int tries = 0, maxtries = 5;
diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD
index e497c2e6b..528d5fcc2 100644
--- a/community/viking/PKGBUILD
+++ b/community/viking/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 76965 2012-10-02 17:50:42Z jlichtblau $
+# $Id: PKGBUILD 84763 2013-02-24 12:35:22Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Nick Østergaard <oe.nick@gmail.com>
 # Contributor: Jonny Gerold <jonny@fsk141.com>
 
 pkgname=viking
-pkgver=1.3.2.1
+pkgver=1.4
 pkgrel=1
 pkgdesc="GTK+2 application to manage GPS data"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,16 +12,16 @@ url="http://viking.sourceforge.net/"
 license=('GPL2')
 depends=('curl' 'gpsd' 'gtk2' 'hicolor-icon-theme' 'libexif' 'gpsbabel')
 makedepends=('intltool' 'gnome-doc-utils')
-options=('!emptydirs')
+options=('!emptydirs' '!makeflags')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('ebd6f134a340a1b2ba582ea77bd97ddd9db16b476be7090a12649f6069fa1565')
+sha256sums=('80aa4c7bf3be75441a435f6681831b8aeb08f7eb6f7a5a86872eec16cda67799')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 
-  ./configure --prefix=/usr --enable-geocaches --enable-expedia 
+  ./configure --prefix=/usr --enable-expedia #--enable-geocaches gives error
   make
 }
 
diff --git a/community/viking/viking.changelog b/community/viking/viking.changelog
index 3fc494db1..c8005b19e 100644
--- a/community/viking/viking.changelog
+++ b/community/viking/viking.changelog
@@ -1,3 +1,6 @@
+2013-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* viking 1.4-1
+
 2012-10-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* viking 1.3.2.1-1
 
diff --git a/community/vile/PKGBUILD b/community/vile/PKGBUILD
index 189f1d3b8..d3af5c033 100644
--- a/community/vile/PKGBUILD
+++ b/community/vile/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=vile
 pkgver=9.8_i
 _basever=9.8
-pkgrel=1
+pkgrel=1.1
 pkgdesc="vi like emacs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://invisible-island.net/vile/vile.html"
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index b75cd8b0e..4dba9fb7f 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 82760 2013-01-23 21:19:41Z bpiotrowski $
+# $Id: PKGBUILD 88762 2013-04-22 09:40:39Z tpowa $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Contributor: Sébastien Luttringer
 
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
-pkgver=4.2.6
-pkgrel=5
+pkgver=4.2.12
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/virtualbox-modules-lts/build.sh b/community/virtualbox-modules-lts/build.sh
index 961a6afab..744f18330 100755
--- a/community/virtualbox-modules-lts/build.sh
+++ b/community/virtualbox-modules-lts/build.sh
@@ -1,18 +1,25 @@
 #!/bin/bash
 
+set -e
+
 if (( $# != 1 )); then
   echo "usage: $0 extra"
   echo "       $0 testing"
   exit 1
 fi
 
-linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
+here=$PWD
+cd /var/empty
+linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
+cd "$here"
+linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686
 
-makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -r /var/lib/archbuild/$1-x86_64
+cd /var/empty
+makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
+cd "$here"
+makechrootpkg -n -r /var/lib/archbuild/$1-x86_64
 
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 27c5621a4..08ca3d9d2 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83373 2013-01-30 17:47:34Z tpowa $
+# $Id: PKGBUILD 89225 2013-04-28 06:44:11Z tpowa $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.2.6
-pkgrel=5
+pkgver=4.2.12
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/virtualbox-modules/build.sh b/community/virtualbox-modules/build.sh
index 476449541..744f18330 100755
--- a/community/virtualbox-modules/build.sh
+++ b/community/virtualbox-modules/build.sh
@@ -1,18 +1,25 @@
 #!/bin/bash
 
+set -e
+
 if (( $# != 1 )); then
   echo "usage: $0 extra"
   echo "       $0 testing"
   exit 1
 fi
 
-linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
+here=$PWD
+cd /var/empty
+linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
+cd "$here"
+linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686
 
-makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -r /var/lib/archbuild/$1-x86_64
+cd /var/empty
+makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
+cd "$here"
+makechrootpkg -n -r /var/lib/archbuild/$1-x86_64
 
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install
index 110042ad7..3e61f3447 100644
--- a/community/virtualbox-modules/virtualbox-guest-modules.install
+++ b/community/virtualbox-modules/virtualbox-guest-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install
index b32e5c46e..378dab975 100644
--- a/community/virtualbox-modules/virtualbox-host-modules.install
+++ b/community/virtualbox-modules/virtualbox-host-modules.install
@@ -3,17 +3,17 @@ cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    EXTRAMODULES='extramodules-3.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/community/virtualbox/001-vboxdrv-reference.patch b/community/virtualbox/001-vboxdrv-reference.patch
deleted file mode 100644
index 00faa35cb..000000000
--- a/community/virtualbox/001-vboxdrv-reference.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:22:13.636083176 +0000
-+++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:48:58.915541368 +0000
-@@ -75,10 +75,9 @@
-   "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
-   "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
-   "module by executing<br/><br/>"
--  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
--  "as root. If it is available in your distribution, you should install the "
--  "DKMS package first. This package keeps track of Linux kernel changes and "
--  "recompiles the vboxdrv kernel module if necessary."
-+  "  <font color=blue>'pacman -S virtualbox-host-modules'</font><br/><br/>"
-+  "as root. If you don't use our stock kernel, install virtualbox-host-source and "
-+  "execute dkms autoinstall ."
-   );
- 
- QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
-@@ -90,11 +89,8 @@
- 
- QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
-   "The VirtualBox kernel modules do not match this version of "
--  "VirtualBox. The installation of VirtualBox was apparently not "
--  "successful. Executing<br/><br/>"
--  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
--  "may correct this. Make sure that you do not mix the "
--  "OSE version and the PUEL version of VirtualBox."
-+  "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
-+  "  <font color=blue>'dkms autoinstall'</font><br/><br/>"
-   );
- 
- QString g_QStrHintOtherNoDriver = QApplication::tr(
-diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh
---- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:22:13.549415814 +0000
-+++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:56:50.735874087 +0000
-@@ -32,17 +32,18 @@
-     cat << EOF
- WARNING: The vboxdrv kernel module is not loaded. Either there is no module
-          available for the current kernel (`uname -r`) or it failed to
--         load. Please recompile the kernel module and install it by
-+         load. Please reinstall the kernel module virtualbox-host-modules or
-+         if you don't use our stock kernel compile the modules with
- 
--           sudo /etc/init.d/vboxdrv setup
-+           sudo dkms autoinstall
- 
-          You will not be able to start VMs until this problem is fixed.
- EOF
- elif [ ! -c /dev/vboxdrv ]; then
-     cat << EOF
--WARNING: The character device /dev/vboxdrv does not exist. Try
-+WARNING: The character device /dev/vboxdrv does not exist. Try to load the module
- 
--           sudo /etc/init.d/vboxdrv restart
-+           sudo modprobe vboxdrv
- 
-          and if that is not successful, try to re-install the package.
- 
diff --git a/community/virtualbox/002-change_default_driver_dir.patch b/community/virtualbox/002-change_default_driver_dir.patch
deleted file mode 100644
index d8531499d..000000000
--- a/community/virtualbox/002-change_default_driver_dir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-07-19 15:11:37.903456612 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-07-19 15:12:41.024021274 +0000
-@@ -36,13 +36,8 @@
- //#define DEBUG_DRI_CALLS
- 
- //@todo this could be different...
--#ifdef RT_ARCH_AMD64
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
- # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--#else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--#endif
- 
- #ifdef DEBUG_DRI_CALLS
-  #define SWDRI_SHOWNAME(pext, func) \
diff --git a/community/virtualbox/10-vboxdrv.rules b/community/virtualbox/10-vboxdrv.rules
deleted file mode 100644
index 37403ae2f..000000000
--- a/community/virtualbox/10-vboxdrv.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1"
-SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/community/virtualbox/60-vboxguest.rules b/community/virtualbox/60-vboxguest.rules
deleted file mode 100644
index 6285f7249..000000000
--- a/community/virtualbox/60-vboxguest.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
-ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
diff --git a/community/virtualbox/LocalConfig.kmk b/community/virtualbox/LocalConfig.kmk
deleted file mode 100644
index 6eca06d9b..000000000
--- a/community/virtualbox/LocalConfig.kmk
+++ /dev/null
@@ -1,20 +0,0 @@
-VBOX_WITH_ADDITION_DRIVERS =
-VBOX_WITH_INSTALLER = 1
-VBOX_WITH_LINUX_ADDITIONS = 1
-VBOX_WITH_X11_ADDITIONS = 1
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
-VBOX_WITH_ORIGIN :=
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
-VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS := /usr/share/virtualbox
-VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
-VBOX_WITH_REGISTRATION_REQUEST =
-VBOX_WITH_UPDATE_REQUEST =
-VBOX_WITH_VNC := 1
-VBOX_BLD_PYTHON = python2
-VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
-VBOX_GCC_WERR =
-VBOX_GCC_WARN =
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
deleted file mode 100644
index bba389c0c..000000000
--- a/community/virtualbox/PKGBUILD
+++ /dev/null
@@ -1,305 +0,0 @@
-# $Id: PKGBUILD 81600 2012-12-24 17:28:55Z seblu $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-
-pkgbase=virtualbox
-pkgname=('virtualbox'
-         'virtualbox-host-dkms'
-         'virtualbox-guest-dkms'
-         'virtualbox-sdk'
-         'virtualbox-guest-utils'
-         'virtualbox-ext-vnc')
-pkgver=4.2.6
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL' 'custom')
-makedepends=('alsa-lib'
-             'bin86'
-             'cdrkit'
-             'curl'
-             'dev86'
-             'gsoap'
-             'iasl'
-             'jdk7-openjdk'
-             'libidl2'
-             'libpulse'
-             'libstdc++5'
-             'libvncserver'
-             'libxcursor'
-             'libxinerama'
-             'libxml2'
-             'libxmu'
-             'libxrandr'
-             'libxslt'
-             'libxtst'
-             'linux-headers'
-             'mesa'
-             'glu'
-             'python2'
-             'qt'
-             'sdl'
-             'sdl_ttf'
-             'vde2'
-             'xalan-c')
-[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
-source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"
-        "UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/$pkgver/UserManual.pdf"
-        '10-vboxdrv.rules'
-        '60-vboxguest.rules'
-        'LocalConfig.kmk'
-        'vboxservice.conf'
-        'vboxservice.rc'
-        'vboxservice.service'
-        'vboxweb.conf'
-        'vboxweb.rc'
-        'vboxweb.service'
-        '001-vboxdrv-reference.patch'
-        '002-change_default_driver_dir.patch')
-md5sums=('d680aeb3b4379b8281527aeb012b2df5'
-         '5cdffabb7ffacfd49dcc93d747ede762'
-         '5f85710e0b8606de967716ded7b2d351'
-         'ed1341881437455d9735875ddf455fbe'
-         '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
-         '3c08ad30b89add47d3f45121200a5360'
-         '7d9823507206de9b8528a72af2f18d74'
-         '07c5f6d86c4b7839d719c8ee0c53653b'
-         '7e9483b1069a54f181546083ac7e5469'
-         'c159d683ba1947290fc2ad2c64194150'
-         'bc9efed88e0469cd7fc460d5a5cd7b4b'
-         '6dbd16b9d1530fc42ff6904cd80be91d'
-         '97e193f050574dd272a38e5ee5ebe62b')
-
-build() {
-    cd "VirtualBox-$pkgver"
-
-    # Apply patches
-    for _p in "$srcdir"/*.patch; do
-        [[ -e $_p ]] || continue
-        msg2 "Appy patch ${_p##*/}"
-        patch -Np1 -i "$_p"
-    done
-
-    cp "$srcdir/LocalConfig.kmk" .
-
-    # fake makeself binary to compile without nofatal
-    ln -s /bin/echo makeself
-    export PATH="$CWD:$PATH"
-
-    ./configure --disable-docs \
-        --enable-webservice \
-        --enable-vde \
-        --enable-vnc \
-        --disable-kmods
-    source ./env.sh
-    kmk all
-
-    # fix python2
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
-
-    # build rdesktop-vrdp (broken from LocalConfig.kmk)
-    pushd src/VBox/RDP/client
-    cp "$srcdir/LocalConfig.kmk" .
-    # fix keymap path FS#32548
-    sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk
-    kmk all
-    popd
-
-    # build VNC pack
-    pushd src/VBox/ExtPacks/VNC
-    kmk packing
-    popd
-}
-
-package_virtualbox() {
-    pkgdesc='Powerful x86 virtualization for enterprise as well as home use'
-    depends=('curl'
-             'libpng'
-             'libxcursor'
-             'libxinerama'
-             'libxml2'
-             'libxmu'
-             'sdl'
-             'shared-mime-info'
-             'virtualbox-host-modules')
-    optdepends=('qt: VirtualBox GUI support'
-                'vde2: Virtual Distributed Ethernet support'
-                'virtualbox-sdk: Developer kit'
-                'virtualbox-host-dkms: Host kernel source modules for non-stock kernels'
-                'net-tools: Host-only or bridged networking support')
-    backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb')
-    replaces=('virtualbox-ose')
-    conflicts=('virtualbox-ose')
-    install=virtualbox.install
-
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-    install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls,share/virtualbox/rdesktop-vrdp-keymaps}
-
-    #doc
-    install -m 0644 "$srcdir/UserManual-$pkgver.pdf" "$pkgdir/usr/share/virtualbox/UserManual.pdf"
-
-    #Binaries and Wrapper with Launchers
-    install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
-
-    for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv VBoxBalloonCtrl; do
-        ln -sf VBox "$pkgdir/usr/bin/$i"
-        ln -sf VBox "$pkgdir/usr/bin/${i,,}"
-    done
-    install -m 0755 VBoxTunctl "$pkgdir/usr/bin"
-    install -m 0755 rdesktop-vrdp "$pkgdir/usr/bin"
-
-    #components
-    install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
-
-    #lib
-    install -m 0755 *.so "$pkgdir/usr/lib/virtualbox"
-    install -m 0644 *.gc *.r0  VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
-
-    #setuid root binaries
-    install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox"
-    #other binaries
-    install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
-
-    #language
-    install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
-
-    #rdesktop keymaps
-    install -m 0644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
-
-    #useless scripts
-    install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
-
-    #icons
-    install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
-
-    pushd icons
-    for i in *; do
-        install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
-        cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
-    done
-    popd
-
-    #desktop
-    install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop"
-    install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml"
-
-    #install configuration
-    mkdir -p "$pkgdir/etc/vbox"
-    echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
-
-    #udev and licence
-    install -D -m 0644 "$srcdir/VirtualBox-${pkgver}/COPYING" \
-        "$pkgdir/usr/share/licenses/virtualbox/LICENSE"
-    install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
-        "$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules"
-
-    # install rc.d script
-    install -D -m755 "$srcdir/vboxweb.rc" "$pkgdir/etc/rc.d/vboxweb"
-    # install systemd service
-    install -D -m644 "$srcdir/vboxweb.service" \
-        "$pkgdir/usr/lib/systemd/system/vboxweb.service"
-    # install sample config
-    install -D -m644 "$srcdir/vboxweb.conf" "$pkgdir/etc/conf.d/vboxweb"
-
-}
-
-package_virtualbox-sdk() {
-    pkgdesc='VirtualBox Software Developer Kit (SDK)'
-    depends=('python2')
-
-    install -dm755 "$pkgdir/usr/lib/virtualbox"
-
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-
-    install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
-    #python sdk
-    pushd sdk/installer
-    VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "$pkgdir"
-    popd
-    rm -rf sdk/installer
-    mv sdk "$pkgdir/usr/lib/virtualbox"
-}
-
-package_virtualbox-host-dkms() {
-    pkgdesc='VirtualBox Host kernel modules sources'
-    depends=('dkms' 'gcc' 'make')
-    provides=('virtualbox-host-modules')
-    replaces=('virtualbox-source' 'virtualbox-host-source')
-    conflicts=('virtualbox-source' 'virtualbox-host-source')
-    optdepends=('linux-headers'
-                'linux-lts-headers')
-    install=virtualbox-host-dkms.install
-
-    install -dm755 "$pkgdir/usr/src"
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-    cp -r src "$pkgdir/usr/src/vboxhost-$pkgver"
-}
-
-package_virtualbox-guest-dkms() {
-    pkgdesc='VirtualBox Guest kernel modules sources'
-    depends=('dkms' 'gcc' 'make')
-    provides=('virtualbox-guest-modules')
-    replaces=('virtualbox-archlinux-source' 'virtualbox-guest-source')
-    conflicts=('virtualbox-archlinux-source' 'virtualbox-guest-source')
-    optdepends=('linux-headers'
-                'linux-lts-headers')
-    install=virtualbox-guest-dkms.install
-
-    install -dm755 "$pkgdir/usr/src"
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-    cp -r src "$pkgdir/usr/src/vboxguest-$pkgver"
-}
-
-package_virtualbox-guest-utils() {
-    pkgdesc='VirtualBox Guest userspace utilities'
-    depends=('virtualbox-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
-    optdepends=('virtualbox-guest-dkms: Guest kernel source modules for non-stock kernels')
-    replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
-    conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
-    backup=('etc/conf.d/vboxservice')
-    install=virtualbox-guest-utils.install
-
-    source "VirtualBox-$pkgver/env.sh"
-    pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-    install -d "$pkgdir"/{usr/bin,sbin}
-    install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin"
-    install -m755 mount.vboxsf "$pkgdir/sbin"
-    install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
-        "$pkgdir"/usr/bin/VBoxClient-all
-    install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
-        "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
-    install -D vboxvideo_drv_113.so \
-        "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
-    install -d "$pkgdir/usr/lib/xorg/modules/dri"
-    install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
-    ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
-    install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
-    popd
-    # install udev rules
-    install -D -m 0644 60-vboxguest.rules \
-        "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
-    # install rc.d script
-    install -D -m755 vboxservice.rc "$pkgdir/etc/rc.d/vboxservice"
-    # install sample config
-    install -D -m644 vboxservice.conf "$pkgdir/etc/conf.d/vboxservice"
-    # install systemd service file
-    install -D -m644 vboxservice.service \
-        "$pkgdir/usr/lib/systemd/system/vboxservice.service"
-}
-
-package_virtualbox-ext-vnc() {
-    pkgdesc='VirtualBox VNC extension pack'
-    depends=('virtualbox' 'libvncserver')
-    optdepends=('vncviewver: vnc client')
-    install=virtualbox-ext-vnc.install
-
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages"
-    install -Dm644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack"
-}
-
-# vim:set ts=4 sw=4 et:
diff --git a/community/virtualbox/vboxservice.conf b/community/virtualbox/vboxservice.conf
deleted file mode 100644
index 9d4ec629f..000000000
--- a/community/virtualbox/vboxservice.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# VBoxService -h
-VBOX_SERVICE_OPTION=""
diff --git a/community/virtualbox/vboxservice.rc b/community/virtualbox/vboxservice.rc
deleted file mode 100644
index 5a62d69a3..000000000
--- a/community/virtualbox/vboxservice.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-name=VBoxService
-PID=$(pidof -o %PPID $name)
-
-case "$1" in
-  start)
-    stat_busy 'Starting VirtualBox Guest Service'
-    [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
-    && { add_daemon ${0##*/}; stat_done; } \
-    || { stat_fail; exit 1; }
-    ;;
-  stop)
-    stat_busy 'Stopping VirtualBox Guest Service'
-    [[ -n "$PID" ]] && kill $PID &>/dev/null \
-    && { rm_daemon ${0##*/}; stat_done; } \
-    || { stat_fail; exit 1; }
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  status)
-    stat_busy 'Checking VirtualBox Guest Service status'
-    ck_status ${0##*/}
-    ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|restart|status}" >&2
-    exit 1
-esac
-
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/virtualbox/vboxservice.service b/community/virtualbox/vboxservice.service
deleted file mode 100644
index bbd61617d..000000000
--- a/community/virtualbox/vboxservice.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=VirtualBox Guest Service
-ConditionVirtualization=oracle
-
-[Service]
-ExecStart=/usr/bin/VBoxService -f
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/virtualbox/vboxweb.conf b/community/virtualbox/vboxweb.conf
deleted file mode 100644
index c36f6a143..000000000
--- a/community/virtualbox/vboxweb.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# WebService Mandatory Variables
-#VBOXWEB_USER=
-
-# WebService Variables
-#VBOXWEB_LOGFILE=
-#VBOXWEB_HOST=
-#VBOXWEB_PORT=
-#VBOXWEB_TIMEOUT=
-#VBOXWEB_CHECK_INTERVAL=
-#VBOXWEB_THREADS=
-#VBOXWEB_KEEPALIVE=
diff --git a/community/virtualbox/vboxweb.rc b/community/virtualbox/vboxweb.rc
deleted file mode 100644
index 97273e3c7..000000000
--- a/community/virtualbox/vboxweb.rc
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/vbox/vbox.cfg
-. /etc/conf.d/vboxweb
-
-BINARY="$INSTALL_DIR/vboxwebsrv"
-
-start() {
-  stat_busy "Starting VirtualBox Web Service";
-  if ! pidof -o %PPID $BINARY >/dev/null; then
-      [[ "$VBOXWEB_USER" ]] || stat_die
-      lsmod | grep -q "vboxdrv[^_-]" || stat_die
-      PARAMS="--background"
-      [[ "$VBOXWEB_HOST" ]]           && PARAMS+=" -H $VBOXWEB_HOST"
-      [[ "$VBOXWEB_PORT" ]]           && PARAMS+=" -p $VBOXWEB_PORT"
-      [[ "$VBOXWEB_TIMEOUT" ]]        && PARAMS+=" -t $VBOXWEB_TIMEOUT"
-      [[ "$VBOXWEB_CHECK_INTERVAL" ]] && PARAMS+=" -i $VBOXWEB_CHECK_INTERVAL"
-      [[ "$VBOXWEB_THREADS" ]]        && PARAMS+=" -T $VBOXWEB_THREADS"
-      [[ "$VBOXWEB_KEEPALIVE" ]]      && PARAMS+=" -k $VBOXWEB_KEEPALIVE"
-      [[ "$VBOXWEB_LOGFILE" ]]        && PARAMS+=" -F $VBOXWEB_LOGFILE"
-      # prevent inheriting this setting to VBoxSVC
-      unset VBOX_RELEASE_LOG_DEST
-      su - $VBOXWEB_USER -c "$BINARY $PARAMS" &>/dev/null
-      # ugly: wait until the final process has forked
-      sleep .2
-      if pidof -o %PPID $BINARY >/dev/null; then
-          add_daemon vboxweb
-          stat_done
-      else
-          stat_die
-      fi
-  else
-    stat_die
-  fi
-}
-
-stop() {
-  stat_busy "Stopping VirtualBox Web Service"
-  PID=$(pidof -o %PPID $BINARY)
-  [[ $PID ]] && kill $PID &>/dev/null
-  if ! pidof -o %PPID $BINARY >/dev/null; then
-    rm_daemon vboxweb
-    stat_done
-  else
-    stat_die
-  fi
-}
-
-restart() {
-  stop && start
-}
-
-status() {
-  stat_busy "Checking for VirtualBox Web Service"
-  if pidof -o %PPID $BINARY >/dev/null; then
-      stat_done
-  else
-      stat_fail
-      false
-  fi
-}
-
-case "$1" in
-start)
-    start
-    ;;
-stop)
-    stop
-    ;;
-restart)
-    restart
-    ;;
-force-reload)
-    restart
-    ;;
-status)
-    status
-    ;;
-*)
-    echo "Usage: $0 {start|stop|restart|status}"
-    exit 1
-esac
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/virtualbox/vboxweb.service b/community/virtualbox/vboxweb.service
deleted file mode 100644
index 303381597..000000000
--- a/community/virtualbox/vboxweb.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=VirtualBox Web Service
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/vboxweb.pid
-ExecStart=/usr/bin/vboxwebsrv --pidfile /run/vboxweb.pid  --background
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/virtualbox/virtualbox-ext-vnc.install b/community/virtualbox/virtualbox-ext-vnc.install
deleted file mode 100644
index 828a16a1d..000000000
--- a/community/virtualbox/virtualbox-ext-vnc.install
+++ /dev/null
@@ -1,25 +0,0 @@
-#/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  VBoxManage extpack install "/usr/share/virtualbox/extensions/VNC-${1%%-*}.vbox-extpack" >/dev/null
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  pre_remove "$2"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  VBoxManage extpack uninstall 'VNC' >/dev/null
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/virtualbox/virtualbox-guest-dkms.install b/community/virtualbox/virtualbox-guest-dkms.install
deleted file mode 100644
index 2d62eae43..000000000
--- a/community/virtualbox/virtualbox-guest-dkms.install
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  dkms add vboxguest/${1%-*}
-  cat << EOF
-==> To build and install your modules run dkms install vboxguest/${1%-*}
-==> To do this automatically at startup you can add dkms in your DAEMONS
-EOF
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  pre_remove "$2"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  # Remove modules using dkms
-  [ -n "${1%-*}" ] && dkms remove vboxguest/${1%-*} --all >/dev/null || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/virtualbox/virtualbox-guest-utils.install b/community/virtualbox/virtualbox-guest-utils.install
deleted file mode 100644
index 38bbe807d..000000000
--- a/community/virtualbox/virtualbox-guest-utils.install
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  getent group vboxsf > /dev/null || groupadd -g 109 vboxsf
-  true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-  # rename /etc/rc.d/vboxservice
-  if [ "`vercmp $2 4.1.18-3`" -lt 0 ]; then
-    cat << EOF
-==> rc.d vbox-service script was renamed to vboxservice.
-EOF
-  fi
-  # fix gid of vboxsf
-  if [ "`vercmp $2 4.1.18-4`" -lt 0 ]; then
-    groupmod -g 109 vboxsf
-  fi
-  true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  groupdel vboxsf >/dev/null 2>&1 || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/virtualbox/virtualbox-host-dkms.install b/community/virtualbox/virtualbox-host-dkms.install
deleted file mode 100644
index 8028cb7e0..000000000
--- a/community/virtualbox/virtualbox-host-dkms.install
+++ /dev/null
@@ -1,30 +0,0 @@
-#/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  dkms add vboxhost/${1%-*}
-  cat << EOF
-==> To build and install your modules run dkms install vboxhost/${1%-*}
-==> To do this automatically at startup you can add dkms in your DAEMONS
-EOF
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  pre_remove "$2"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  # Remove modules using dkms
-  [ -n "${1%-*}" ] && dkms remove vboxhost/${1%-*} --all >/dev/null || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/virtualbox/virtualbox.install b/community/virtualbox/virtualbox.install
deleted file mode 100644
index 6913fe2ed..000000000
--- a/community/virtualbox/virtualbox.install
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-utils() {
-  if [ -x usr/bin/update-mime-database ]; then
-    update-mime-database usr/share/mime > /dev/null 2>&1
-  fi
-
-  if [ -x usr/bin/xdg-icon-resource ]; then
-    xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1
-  fi
-
-  if [ -x usr/bin/update-desktop-database ]; then
-    usr/bin/update-desktop-database -q
-  fi
-
-  if [ -x usr/bin/udevadm ]; then
-    usr/bin/udevadm control --reload
-  fi
-}
-
-# arg 1:  the new package version
-post_install() {
-  getent group vboxusers >/dev/null || usr/sbin/groupadd -g 108 vboxusers
-  utils
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-  if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
-    cat << EOF
-===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules.
-===> Use virtualbox-source package if you don't use our stock linux package.
-EOF
-    fi
-}
-
-# arg 1:  the old package version
-post_remove() {
-  groupdel vboxusers >/dev/null 2>&1 || true
-  utils
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/virtualgl/PKGBUILD b/community/virtualgl/PKGBUILD
new file mode 100644
index 000000000..8bf79dcd3
--- /dev/null
+++ b/community/virtualgl/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: FigoDaPaura <ffigoDaPaura>
+# Contributor: Andres Jimenez
+
+pkgname=virtualgl
+pkgver=2.3.2
+pkgrel=3
+pkgdesc="Redirects 3D commands from an OpenGL application onto a server-side 3D graphics card"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://virtualgl.org"
+license=('LGPL')
+depends=('libxv' 'glu' 'turbojpeg')
+makedepends=('cmake' 'mesa')
+source=("http://downloads.sourceforge.net/project/virtualgl/VirtualGL/$pkgver/VirtualGL-$pkgver.tar.gz")
+sha1sums=('f042862c21ceaba57c6e1f0ec72adb4f838725e9')
+ 
+build() {
+  cd "$srcdir/VirtualGL-$pkgver"
+ 
+  mkdir -p build && cd build
+ 
+  cmake .. \
+      -DCMAKE_INSTALL_PREFIX=/usr/share \
+      -DTJPEG_INCLUDE_DIR=/usr/include \
+      -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so \
+      -DVGL_LIBDIR=/usr/lib \
+      -DVGL_BINDIR=/usr/bin \
+      -DVGL_DOCDIR=/usr/share/doc/${pkgname}
+  make
+}
+ 
+package() {
+  cd "$srcdir/VirtualGL-$pkgver/build"
+  make install DESTDIR="$pkgdir"
+ 
+  mv "$pkgdir"/usr/bin/glxinfo "$pkgdir"/usr/bin/vglxinfo
+}
diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD
index 50acdd99b..f02066c16 100644
--- a/community/virtviewer/PKGBUILD
+++ b/community/virtviewer/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 76592 2012-09-24 09:59:33Z spupykin $
+# $Id: PKGBUILD 88339 2013-04-16 13:32:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=virtviewer
-pkgver=0.5.4
+pkgver=0.5.5
 pkgrel=1
 pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS."
 depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt')
@@ -12,11 +12,15 @@ url="http://virt-manager.et.redhat.com"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz")
-md5sums=('43c269da571e65b12421b6fc9f871e98')
+md5sums=('a5516d33a29df5d135611c4667c03f77')
 
 build() {
   cd $srcdir/virt-viewer-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/virt-viewer-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/visitors/PKGBUILD b/community/visitors/PKGBUILD
index af4790b6e..8cd4ef970 100644
--- a/community/visitors/PKGBUILD
+++ b/community/visitors/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=visitors
 pkgver=0.7
-pkgrel=3
+pkgrel=3.1
 pkgdesc='A very fast web log analyzer'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.hping.org/visitors/"
diff --git a/community/visualboyadvance/1.7.2-deprecatedsigc++.patch b/community/visualboyadvance/1.7.2-deprecatedsigc++.patch
deleted file mode 100644
index 4bb1787cb..000000000
--- a/community/visualboyadvance/1.7.2-deprecatedsigc++.patch
+++ /dev/null
@@ -1,692 +0,0 @@
---- src/gtk/sigccompat.h.old	2008-05-02 10:46:45.000000000 +0200
-+++ src/gtk/sigccompat.h	2008-05-02 10:47:08.000000000 +0200
-@@ -20,7 +20,7 @@
- #ifndef __VBA_SIGCCOMPAT_H__
- #define __VBA_SIGCCOMPAT_H__
- 
--#undef LIBSIGC_DISABLE_DEPRECATED
-+#define LIBSIGC_DISABLE_DEPRECATED
- #include <sigc++/bind.h>
- #include <sigc++/connection.h>
- 
-@@ -28,9 +28,679 @@
- #include <sigc++/object.h>
- #include <sigc++/functors/mem_fun.h>
- 
--namespace SigC
-+
-+// From sigc++/bind.h
-+namespace SigC {
-+
-+template <class T_bound1, class T_functor>
-+inline ::sigc::bind_functor<-1, T_functor,
-+                            typename ::sigc::unwrap_reference<T_bound1>::type>
-+bind(const T_functor& _A_functor, T_bound1 _A_b1)
-+{ return ::sigc::bind_functor<-1, T_functor,
-+                              typename ::sigc::unwrap_reference<T_bound1>::type>
-+                              (_A_functor, _A_b1);
-+}
-+
-+template <class T_bound1, class T_bound2, class T_functor>
-+inline ::sigc::bind_functor<-1, T_functor,
-+                            typename ::sigc::unwrap_reference<T_bound1>::type,
-+                            typename ::sigc::unwrap_reference<T_bound2>::type>
-+bind(const T_functor& _A_functor, T_bound1 _A_b1, T_bound2 _A_b2)
-+{ return ::sigc::bind_functor<-1, T_functor,
-+                              typename ::sigc::unwrap_reference<T_bound1>::type,
-+                              typename ::sigc::unwrap_reference<T_bound2>::type>
-+                              (_A_functor, _A_b1, _A_b2); 
-+}
-+
-+template <class T_bound1, class T_bound2, class T_bound3, class T_functor>
-+inline ::sigc::bind_functor<-1, T_functor,
-+                            typename ::sigc::unwrap_reference<T_bound1>::type,
-+                            typename ::sigc::unwrap_reference<T_bound2>::type,
-+                            typename ::sigc::unwrap_reference<T_bound3>::type>
-+bind(const T_functor& _A_functor, T_bound1 _A_b1, T_bound2 _A_b2,T_bound3 _A_b3)
-+{ return ::sigc::bind_functor<-1, T_functor,
-+                              typename ::sigc::unwrap_reference<T_bound1>::type,
-+                              typename ::sigc::unwrap_reference<T_bound2>::type,
-+                              typename ::sigc::unwrap_reference<T_bound3>::type>
-+                              (_A_functor, _A_b1, _A_b2, _A_b3);
-+}
-+
-+}
-+
-+// From sigc++/connection.h
-+namespace SigC {
-+
-+/** Convinience class for safe disconnection.
-+ * Iterators must not be used beyond the lifetime of the list
-+ * they work on. A connection object can be created from a
-+ * slot list iterator and may safely be used to disconnect
-+ * the referred slot at any time (disconnect()). If the slot
-+ * has already been destroyed, disconnect() does nothing. empty() or
-+ * operator bool() can be used to test whether the connection is
-+ * still active. The connection can be blocked (block(), unblock()).
-+ *
-+ * This is possible because the connection object gets notified
-+ * when the referred slot dies (notify()).
-+ *
-+ * @deprecated Use sigc::connection instead.
-+ * @ingroup compat
-+ */
-+typedef ::sigc::connection Connection;
-+
-+}
-+
-+// From sigc++/slot.h
-+namespace SigC {
-+
-+// SlotN
-+/** Converts an arbitrary functor to a unified type which is opaque.
-+ * Slot0 itself is a functor or to be more precise a closure. It contains
-+ * a single, arbitrary functor (or closure) that is executed in operator()().
-+ *
-+ * The template arguments determine the function signature of operator()():
-+ * - @e T_return The return type of operator()().
-+ *
-+ * To use simply assign the slot to the desired functor. If the functor
-+ * is not compatible with the parameter list defined with the template
-+ * arguments compiler errors are triggered. When called the slot
-+ * will invoke the functor with minimal copies.
-+ * block() and unblock() can be used to block the functor's invocation
-+ * from operator()() temporarily.
-+ *
-+ * @par Example:
-+ *   @code
-+ *   #include <sigc++/slot.h>
-+ *   void foo(int) {}
-+ *   SigC::Slot1<void, long> s = SigC::slot(&foo);
-+ *   s(19);
-+ *   @endcode
-+ *
-+ * @deprecated Use the unnumbered template sigc::slot instead.
-+ * @ingroup compat
-+ */
-+template <class T_return>
-+class Slot0
-+  : public ::sigc::slot<T_return>
-+{
-+public:
-+  typedef ::sigc::slot<T_return> parent_type;
-+
-+  /// Constructs an empty slot.
-+  Slot0() {}
-+
-+  /** Constructs a slot from an arbitrary functor.
-+   * @param _A_func The desired functor the new slot should be assigned to.
-+   */
-+  template <class T_functor>
-+  Slot0(const T_functor& _A_func)
-+    : ::sigc::slot<T_return>(_A_func) {}
-+
-+  /** Constructs a slot, copying an existing one.
-+   * @param src The existing slot to copy.
-+   */
-+  Slot0(const parent_type& src)
-+    : parent_type(src) {}
-+
-+  /** Overrides this slot making a copy from another slot.
-+   * @param src The slot from which to make a copy.
-+   * @return @p this.
-+   */
-+  Slot0& operator=(const parent_type& src)
-+    { parent_type::operator=(src); return *this; }
-+};
-+
-+/** Converts an arbitrary functor to a unified type which is opaque.
-+ * Slot1 itself is a functor or to be more precise a closure. It contains
-+ * a single, arbitrary functor (or closure) that is executed in operator()().
-+ *
-+ * The template arguments determine the function signature of operator()():
-+ * - @e T_return The return type of operator()().
-+ * - @e T_arg1 Argument type used in the definition of operator()().
-+ *
-+ * To use simply assign the slot to the desired functor. If the functor
-+ * is not compatible with the parameter list defined with the template
-+ * arguments compiler errors are triggered. When called the slot
-+ * will invoke the functor with minimal copies.
-+ * block() and unblock() can be used to block the functor's invocation
-+ * from operator()() temporarily.
-+ *
-+ * @par Example:
-+ *   @code
-+ *   #include <sigc++/slot.h>
-+ *   void foo(int) {}
-+ *   SigC::Slot1<void, long> s = SigC::slot(&foo);
-+ *   s(19);
-+ *   @endcode
-+ *
-+ * @deprecated Use the unnumbered template sigc::slot instead.
-+ * @ingroup compat
-+ */
-+template <class T_return, class T_arg1>
-+class Slot1
-+  : public ::sigc::slot<T_return, T_arg1>
-+{
-+public:
-+  typedef ::sigc::slot<T_return, T_arg1> parent_type;
-+
-+  /// Constructs an empty slot.
-+  Slot1() {}
-+
-+  /** Constructs a slot from an arbitrary functor.
-+   * @param _A_func The desired functor the new slot should be assigned to.
-+   */
-+  template <class T_functor>
-+  Slot1(const T_functor& _A_func)
-+    : ::sigc::slot<T_return, T_arg1>(_A_func) {}
-+
-+  /** Constructs a slot, copying an existing one.
-+   * @param src The existing slot to copy.
-+   */
-+  Slot1(const parent_type& src)
-+    : parent_type(src) {}
-+
-+  /** Overrides this slot making a copy from another slot.
-+   * @param src The slot from which to make a copy.
-+   * @return @p this.
-+   */
-+  Slot1& operator=(const parent_type& src)
-+    { parent_type::operator=(src); return *this; }
-+};
-+
-+/** Converts an arbitrary functor to a unified type which is opaque.
-+ * Slot2 itself is a functor or to be more precise a closure. It contains
-+ * a single, arbitrary functor (or closure) that is executed in operator()().
-+ *
-+ * The template arguments determine the function signature of operator()():
-+ * - @e T_return The return type of operator()().
-+ * - @e T_arg1 Argument type used in the definition of operator()().
-+ * - @e T_arg2 Argument type used in the definition of operator()().
-+ *
-+ * To use simply assign the slot to the desired functor. If the functor
-+ * is not compatible with the parameter list defined with the template
-+ * arguments compiler errors are triggered. When called the slot
-+ * will invoke the functor with minimal copies.
-+ * block() and unblock() can be used to block the functor's invocation
-+ * from operator()() temporarily.
-+ *
-+ * @par Example:
-+ *   @code
-+ *   #include <sigc++/slot.h>
-+ *   void foo(int) {}
-+ *   SigC::Slot1<void, long> s = SigC::slot(&foo);
-+ *   s(19);
-+ *   @endcode
-+ *
-+ * @deprecated Use the unnumbered template sigc::slot instead.
-+ * @ingroup compat
-+ */
-+template <class T_return, class T_arg1,class T_arg2>
-+class Slot2
-+  : public ::sigc::slot<T_return, T_arg1,T_arg2>
-+{
-+public:
-+  typedef ::sigc::slot<T_return, T_arg1,T_arg2> parent_type;
-+
-+  /// Constructs an empty slot.
-+  Slot2() {}
-+
-+  /** Constructs a slot from an arbitrary functor.
-+   * @param _A_func The desired functor the new slot should be assigned to.
-+   */
-+  template <class T_functor>
-+  Slot2(const T_functor& _A_func)
-+    : ::sigc::slot<T_return, T_arg1,T_arg2>(_A_func) {}
-+
-+  /** Constructs a slot, copying an existing one.
-+   * @param src The existing slot to copy.
-+   */
-+  Slot2(const parent_type& src)
-+    : parent_type(src) {}
-+
-+  /** Overrides this slot making a copy from another slot.
-+   * @param src The slot from which to make a copy.
-+   * @return @p this.
-+   */
-+  Slot2& operator=(const parent_type& src)
-+    { parent_type::operator=(src); return *this; }
-+};
-+
-+/** Converts an arbitrary functor to a unified type which is opaque.
-+ * Slot3 itself is a functor or to be more precise a closure. It contains
-+ * a single, arbitrary functor (or closure) that is executed in operator()().
-+ *
-+ * The template arguments determine the function signature of operator()():
-+ * - @e T_return The return type of operator()().
-+ * - @e T_arg1 Argument type used in the definition of operator()().
-+ * - @e T_arg2 Argument type used in the definition of operator()().
-+ * - @e T_arg3 Argument type used in the definition of operator()().
-+ *
-+ * To use simply assign the slot to the desired functor. If the functor
-+ * is not compatible with the parameter list defined with the template
-+ * arguments compiler errors are triggered. When called the slot
-+ * will invoke the functor with minimal copies.
-+ * block() and unblock() can be used to block the functor's invocation
-+ * from operator()() temporarily.
-+ *
-+ * @par Example:
-+ *   @code
-+ *   #include <sigc++/slot.h>
-+ *   void foo(int) {}
-+ *   SigC::Slot1<void, long> s = SigC::slot(&foo);
-+ *   s(19);
-+ *   @endcode
-+ *
-+ * @deprecated Use the unnumbered template sigc::slot instead.
-+ * @ingroup compat
-+ */
-+template <class T_return, class T_arg1,class T_arg2,class T_arg3>
-+class Slot3
-+  : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3>
-+{
-+public:
-+  typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3> parent_type;
-+
-+  /// Constructs an empty slot.
-+  Slot3() {}
-+
-+  /** Constructs a slot from an arbitrary functor.
-+   * @param _A_func The desired functor the new slot should be assigned to.
-+   */
-+  template <class T_functor>
-+  Slot3(const T_functor& _A_func)
-+    : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3>(_A_func) {}
-+
-+  /** Constructs a slot, copying an existing one.
-+   * @param src The existing slot to copy.
-+   */
-+  Slot3(const parent_type& src)
-+    : parent_type(src) {}
-+
-+  /** Overrides this slot making a copy from another slot.
-+   * @param src The slot from which to make a copy.
-+   * @return @p this.
-+   */
-+  Slot3& operator=(const parent_type& src)
-+    { parent_type::operator=(src); return *this; }
-+};
-+
-+/** Converts an arbitrary functor to a unified type which is opaque.
-+ * Slot4 itself is a functor or to be more precise a closure. It contains
-+ * a single, arbitrary functor (or closure) that is executed in operator()().
-+ *
-+ * The template arguments determine the function signature of operator()():
-+ * - @e T_return The return type of operator()().
-+ * - @e T_arg1 Argument type used in the definition of operator()().
-+ * - @e T_arg2 Argument type used in the definition of operator()().
-+ * - @e T_arg3 Argument type used in the definition of operator()().
-+ * - @e T_arg4 Argument type used in the definition of operator()().
-+ *
-+ * To use simply assign the slot to the desired functor. If the functor
-+ * is not compatible with the parameter list defined with the template
-+ * arguments compiler errors are triggered. When called the slot
-+ * will invoke the functor with minimal copies.
-+ * block() and unblock() can be used to block the functor's invocation
-+ * from operator()() temporarily.
-+ *
-+ * @par Example:
-+ *   @code
-+ *   #include <sigc++/slot.h>
-+ *   void foo(int) {}
-+ *   SigC::Slot1<void, long> s = SigC::slot(&foo);
-+ *   s(19);
-+ *   @endcode
-+ *
-+ * @deprecated Use the unnumbered template sigc::slot instead.
-+ * @ingroup compat
-+ */
-+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4>
-+class Slot4
-+  : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4>
-+{
-+public:
-+  typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4> parent_type;
-+
-+  /// Constructs an empty slot.
-+  Slot4() {}
-+
-+  /** Constructs a slot from an arbitrary functor.
-+   * @param _A_func The desired functor the new slot should be assigned to.
-+   */
-+  template <class T_functor>
-+  Slot4(const T_functor& _A_func)
-+    : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4>(_A_func) {}
-+
-+  /** Constructs a slot, copying an existing one.
-+   * @param src The existing slot to copy.
-+   */
-+  Slot4(const parent_type& src)
-+    : parent_type(src) {}
-+
-+  /** Overrides this slot making a copy from another slot.
-+   * @param src The slot from which to make a copy.
-+   * @return @p this.
-+   */
-+  Slot4& operator=(const parent_type& src)
-+    { parent_type::operator=(src); return *this; }
-+};
-+
-+/** Converts an arbitrary functor to a unified type which is opaque.
-+ * Slot5 itself is a functor or to be more precise a closure. It contains
-+ * a single, arbitrary functor (or closure) that is executed in operator()().
-+ *
-+ * The template arguments determine the function signature of operator()():
-+ * - @e T_return The return type of operator()().
-+ * - @e T_arg1 Argument type used in the definition of operator()().
-+ * - @e T_arg2 Argument type used in the definition of operator()().
-+ * - @e T_arg3 Argument type used in the definition of operator()().
-+ * - @e T_arg4 Argument type used in the definition of operator()().
-+ * - @e T_arg5 Argument type used in the definition of operator()().
-+ *
-+ * To use simply assign the slot to the desired functor. If the functor
-+ * is not compatible with the parameter list defined with the template
-+ * arguments compiler errors are triggered. When called the slot
-+ * will invoke the functor with minimal copies.
-+ * block() and unblock() can be used to block the functor's invocation
-+ * from operator()() temporarily.
-+ *
-+ * @par Example:
-+ *   @code
-+ *   #include <sigc++/slot.h>
-+ *   void foo(int) {}
-+ *   SigC::Slot1<void, long> s = SigC::slot(&foo);
-+ *   s(19);
-+ *   @endcode
-+ *
-+ * @deprecated Use the unnumbered template sigc::slot instead.
-+ * @ingroup compat
-+ */
-+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5>
-+class Slot5
-+  : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5>
-+{
-+public:
-+  typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> parent_type;
-+
-+  /// Constructs an empty slot.
-+  Slot5() {}
-+
-+  /** Constructs a slot from an arbitrary functor.
-+   * @param _A_func The desired functor the new slot should be assigned to.
-+   */
-+  template <class T_functor>
-+  Slot5(const T_functor& _A_func)
-+    : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5>(_A_func) {}
-+
-+  /** Constructs a slot, copying an existing one.
-+   * @param src The existing slot to copy.
-+   */
-+  Slot5(const parent_type& src)
-+    : parent_type(src) {}
-+
-+  /** Overrides this slot making a copy from another slot.
-+   * @param src The slot from which to make a copy.
-+   * @return @p this.
-+   */
-+  Slot5& operator=(const parent_type& src)
-+    { parent_type::operator=(src); return *this; }
-+};
-+
-+/** Converts an arbitrary functor to a unified type which is opaque.
-+ * Slot6 itself is a functor or to be more precise a closure. It contains
-+ * a single, arbitrary functor (or closure) that is executed in operator()().
-+ *
-+ * The template arguments determine the function signature of operator()():
-+ * - @e T_return The return type of operator()().
-+ * - @e T_arg1 Argument type used in the definition of operator()().
-+ * - @e T_arg2 Argument type used in the definition of operator()().
-+ * - @e T_arg3 Argument type used in the definition of operator()().
-+ * - @e T_arg4 Argument type used in the definition of operator()().
-+ * - @e T_arg5 Argument type used in the definition of operator()().
-+ * - @e T_arg6 Argument type used in the definition of operator()().
-+ *
-+ * To use simply assign the slot to the desired functor. If the functor
-+ * is not compatible with the parameter list defined with the template
-+ * arguments compiler errors are triggered. When called the slot
-+ * will invoke the functor with minimal copies.
-+ * block() and unblock() can be used to block the functor's invocation
-+ * from operator()() temporarily.
-+ *
-+ * @par Example:
-+ *   @code
-+ *   #include <sigc++/slot.h>
-+ *   void foo(int) {}
-+ *   SigC::Slot1<void, long> s = SigC::slot(&foo);
-+ *   s(19);
-+ *   @endcode
-+ *
-+ * @deprecated Use the unnumbered template sigc::slot instead.
-+ * @ingroup compat
-+ */
-+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6>
-+class Slot6
-+  : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6>
-+{
-+public:
-+  typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> parent_type;
-+
-+  /// Constructs an empty slot.
-+  Slot6() {}
-+
-+  /** Constructs a slot from an arbitrary functor.
-+   * @param _A_func The desired functor the new slot should be assigned to.
-+   */
-+  template <class T_functor>
-+  Slot6(const T_functor& _A_func)
-+    : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6>(_A_func) {}
-+
-+  /** Constructs a slot, copying an existing one.
-+   * @param src The existing slot to copy.
-+   */
-+  Slot6(const parent_type& src)
-+    : parent_type(src) {}
-+
-+  /** Overrides this slot making a copy from another slot.
-+   * @param src The slot from which to make a copy.
-+   * @return @p this.
-+   */
-+  Slot6& operator=(const parent_type& src)
-+    { parent_type::operator=(src); return *this; }
-+};
-+
-+/** Converts an arbitrary functor to a unified type which is opaque.
-+ * Slot7 itself is a functor or to be more precise a closure. It contains
-+ * a single, arbitrary functor (or closure) that is executed in operator()().
-+ *
-+ * The template arguments determine the function signature of operator()():
-+ * - @e T_return The return type of operator()().
-+ * - @e T_arg1 Argument type used in the definition of operator()().
-+ * - @e T_arg2 Argument type used in the definition of operator()().
-+ * - @e T_arg3 Argument type used in the definition of operator()().
-+ * - @e T_arg4 Argument type used in the definition of operator()().
-+ * - @e T_arg5 Argument type used in the definition of operator()().
-+ * - @e T_arg6 Argument type used in the definition of operator()().
-+ * - @e T_arg7 Argument type used in the definition of operator()().
-+ *
-+ * To use simply assign the slot to the desired functor. If the functor
-+ * is not compatible with the parameter list defined with the template
-+ * arguments compiler errors are triggered. When called the slot
-+ * will invoke the functor with minimal copies.
-+ * block() and unblock() can be used to block the functor's invocation
-+ * from operator()() temporarily.
-+ *
-+ * @par Example:
-+ *   @code
-+ *   #include <sigc++/slot.h>
-+ *   void foo(int) {}
-+ *   SigC::Slot1<void, long> s = SigC::slot(&foo);
-+ *   s(19);
-+ *   @endcode
-+ *
-+ * @deprecated Use the unnumbered template sigc::slot instead.
-+ * @ingroup compat
-+ */
-+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7>
-+class Slot7
-+  : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7>
- {
-+public:
-+  typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> parent_type;
-+
-+  /// Constructs an empty slot.
-+  Slot7() {}
-+
-+  /** Constructs a slot from an arbitrary functor.
-+   * @param _A_func The desired functor the new slot should be assigned to.
-+   */
-+  template <class T_functor>
-+  Slot7(const T_functor& _A_func)
-+    : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7>(_A_func) {}
-+
-+  /** Constructs a slot, copying an existing one.
-+   * @param src The existing slot to copy.
-+   */
-+  Slot7(const parent_type& src)
-+    : parent_type(src) {}
-+
-+  /** Overrides this slot making a copy from another slot.
-+   * @param src The slot from which to make a copy.
-+   * @return @p this.
-+   */
-+  Slot7& operator=(const parent_type& src)
-+    { parent_type::operator=(src); return *this; }
-+};
-+
-+
-+
-+#ifndef DOXYGEN_SHOULD_SKIP_THIS
-+/* gcc 3.2 reports a strange conflict between SigC::slot() and sigc::slot<>
-+ * when "using namespace SigC" and later using a slot(obj,func) overload
-+ * without the prefix "SigC::". Probably a compiler bug. I will investigate.
-+ *
-+ * This ugly hack avoids the error:
-+ */
-+// #define slot(...) make_slot(__VA_ARGS__) /* only works for gcc */
-+#endif
- 
-+
-+// slot()
-+/** Creates a functor of type SigC::Slot0 that wraps an existing non-member function.
-+ *
-+ * @param _A_func Pointer to function that should be wrapped.
-+ * @return Functor that executes _A_func on invokation.
-+ *
-+ * @deprecated Use sigc::ptr_fun() instead.
-+ * @ingroup compat
-+ */
-+template <class T_return>
-+inline Slot0<T_return>
-+slot(T_return (*_A_func)())
-+{ return Slot0<T_return>(_A_func); }
-+
-+/** Creates a functor of type SigC::Slot1 that wraps an existing non-member function.
-+ *
-+ * @param _A_func Pointer to function that should be wrapped.
-+ * @return Functor that executes _A_func on invokation.
-+ *
-+ * @deprecated Use sigc::ptr_fun() instead.
-+ * @ingroup compat
-+ */
-+template <class T_return, class T_arg1>
-+inline Slot1<T_return, T_arg1>
-+slot(T_return (*_A_func)(T_arg1))
-+{ return Slot1<T_return, T_arg1>(_A_func); }
-+
-+/** Creates a functor of type SigC::Slot2 that wraps an existing non-member function.
-+ *
-+ * @param _A_func Pointer to function that should be wrapped.
-+ * @return Functor that executes _A_func on invokation.
-+ *
-+ * @deprecated Use sigc::ptr_fun() instead.
-+ * @ingroup compat
-+ */
-+template <class T_return, class T_arg1,class T_arg2>
-+inline Slot2<T_return, T_arg1,T_arg2>
-+slot(T_return (*_A_func)(T_arg1,T_arg2))
-+{ return Slot2<T_return, T_arg1,T_arg2>(_A_func); }
-+
-+/** Creates a functor of type SigC::Slot3 that wraps an existing non-member function.
-+ *
-+ * @param _A_func Pointer to function that should be wrapped.
-+ * @return Functor that executes _A_func on invokation.
-+ *
-+ * @deprecated Use sigc::ptr_fun() instead.
-+ * @ingroup compat
-+ */
-+template <class T_return, class T_arg1,class T_arg2,class T_arg3>
-+inline Slot3<T_return, T_arg1,T_arg2,T_arg3>
-+slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3))
-+{ return Slot3<T_return, T_arg1,T_arg2,T_arg3>(_A_func); }
-+
-+/** Creates a functor of type SigC::Slot4 that wraps an existing non-member function.
-+ *
-+ * @param _A_func Pointer to function that should be wrapped.
-+ * @return Functor that executes _A_func on invokation.
-+ *
-+ * @deprecated Use sigc::ptr_fun() instead.
-+ * @ingroup compat
-+ */
-+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4>
-+inline Slot4<T_return, T_arg1,T_arg2,T_arg3,T_arg4>
-+slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4))
-+{ return Slot4<T_return, T_arg1,T_arg2,T_arg3,T_arg4>(_A_func); }
-+
-+/** Creates a functor of type SigC::Slot5 that wraps an existing non-member function.
-+ *
-+ * @param _A_func Pointer to function that should be wrapped.
-+ * @return Functor that executes _A_func on invokation.
-+ *
-+ * @deprecated Use sigc::ptr_fun() instead.
-+ * @ingroup compat
-+ */
-+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5>
-+inline Slot5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5>
-+slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4,T_arg5))
-+{ return Slot5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5>(_A_func); }
-+
-+/** Creates a functor of type SigC::Slot6 that wraps an existing non-member function.
-+ *
-+ * @param _A_func Pointer to function that should be wrapped.
-+ * @return Functor that executes _A_func on invokation.
-+ *
-+ * @deprecated Use sigc::ptr_fun() instead.
-+ * @ingroup compat
-+ */
-+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6>
-+inline Slot6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6>
-+slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6))
-+{ return Slot6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6>(_A_func); }
-+
-+/** Creates a functor of type SigC::Slot7 that wraps an existing non-member function.
-+ *
-+ * @param _A_func Pointer to function that should be wrapped.
-+ * @return Functor that executes _A_func on invokation.
-+ *
-+ * @deprecated Use sigc::ptr_fun() instead.
-+ * @ingroup compat
-+ */
-+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7>
-+inline Slot7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7>
-+slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7))
-+{ return Slot7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7>(_A_func); }
-+
-+
-+
-+}
-+
-+// From sigc++/object.h
-+namespace SigC {
-+
-+// Object
-+typedef ::sigc::trackable Object;
-+
-+}
-+
-+namespace SigC
-+{
- template <class T_return, class T_obj1, class T_obj2>
- inline Slot0<T_return>
- slot( T_obj1& _A_obj, T_return (T_obj2::*_A_func)() )
diff --git a/community/visualboyadvance/1.7.2-gcc34.patch b/community/visualboyadvance/1.7.2-gcc34.patch
deleted file mode 100644
index 8fa4fbf8d..000000000
--- a/community/visualboyadvance/1.7.2-gcc34.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ur src/gtk/joypadconfig.h src/gtk/joypadconfig.h
---- src/gtk/joypadconfig.h	2004-05-10 16:43:21.000000000 +0200
-+++ src/gtk/joypadconfig.h	2004-08-12 22:30:20.838039064 +0200
-@@ -22,8 +22,8 @@
- 
- #include <vector>
- 
--#include <libglademm.h>
- #include <gtkmm.h>
-+#include <libglademm.h>
- 
- #ifndef GTKMM20
- # include "sigccompat.h"
-diff -ur src/gtk/main.cpp src/gtk/main.cpp
---- src/gtk/main.cpp	2004-05-21 18:02:35.000000000 +0200
-+++ src/gtk/main.cpp	2004-08-12 22:39:08.633801912 +0200
-@@ -22,10 +22,10 @@
- 
- #include <list>
- 
--#include <libglademm.h>
- #include <gtkmm/main.h>
- #include <gtkmm/window.h>
- #include <gtkmm/messagedialog.h>
-+#include <libglademm.h>
- 
- #include "images/vba-wm-pixbufs.h"
- 
-diff -ur src/gtk/window.h src/gtk/window.h
---- src/gtk/window.h	2004-05-21 15:25:41.000000000 +0200
-+++ src/gtk/window.h	2004-08-12 22:30:58.650290728 +0200
-@@ -23,8 +23,8 @@
- #include <sys/types.h>
- #include <stdarg.h>
- 
--#include <libglademm.h>
- #include <gtkmm.h>
-+#include <libglademm.h>
- 
- #ifndef GTKMM20
- # include "sigccompat.h"
diff --git a/community/visualboyadvance/1.7.2-gcc41.patch b/community/visualboyadvance/1.7.2-gcc41.patch
deleted file mode 100644
index cacf8e251..000000000
--- a/community/visualboyadvance/1.7.2-gcc41.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru src/prof/prof.cpp src/prof/prof.cpp
---- src/prof/prof.cpp	2004-05-14 00:31:58.000000000 +1000
-+++ src/prof/prof.cpp	2006-06-03 13:49:41.000000000 +1000
-@@ -266,7 +266,7 @@
-     for (toindex=froms[fromindex]; toindex!=0; toindex=tos[toindex].link) {
-       if(profWrite8(fd, GMON_TAG_CG_ARC) ||
-          profWrite32(fd, (u32)frompc) ||
--         profWrite32(fd, (u32)tos[toindex].selfpc) ||
-+         profWrite32(fd, (u32)(intptr_t)tos[toindex].selfpc) ||
-          profWrite32(fd, tos[toindex].count)) {
-         systemMessage(0, "mcount: arc");
-         fclose(fd);
-diff -ru src/sdl/debugger.cpp src/sdl/debugger.cpp
---- src/sdl/debugger.cpp	2004-05-14 00:13:14.000000000 +1000
-+++ src/sdl/debugger.cpp	2006-06-03 13:49:57.000000000 +1000
-@@ -950,9 +950,9 @@
- {
-   u32 address = 0;
-   if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff])
--    address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]);
-+    address = 0x2000000 + ((u32)(intptr_t)mem - (u32)(intptr_t)&workRAM[0]);
-   else
--    address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]);
-+    address = 0x3000000 + ((u32)(intptr_t)mem - (u32)(intptr_t)&internalRAM[0]);
- 
-   if(size == 2)
-     printf("Breakpoint (on write) address %08x old:%08x new:%08x\n", 
diff --git a/community/visualboyadvance/1.7.2-glibc.patch b/community/visualboyadvance/1.7.2-glibc.patch
deleted file mode 100644
index 5211b3623..000000000
--- a/community/visualboyadvance/1.7.2-glibc.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- src/GBA.cpp
-+++ src/GBA.cpp
-@@ -1130,7 +1130,7 @@
- bool CPUIsZipFile(const char * file)
- {
-   if(strlen(file) > 4) {
--    char * p = strrchr(file,'.');
-+    const char * p = strrchr(file,'.');
- 
-     if(p != NULL) {
-       if(_stricmp(p, ".zip") == 0)
-@@ -1145,7 +1145,7 @@
- {
-   cpuIsMultiBoot = false;
-   if(strlen(file) > 4) {
--    char * p = strrchr(file,'.');
-+    const char * p = strrchr(file,'.');
- 
-     if(p != NULL) {
-       if(_stricmp(p, ".gba") == 0)
-@@ -1169,7 +1169,7 @@
- bool CPUIsGBABios(const char * file)
- {
-   if(strlen(file) > 4) {
--    char * p = strrchr(file,'.');
-+    const char * p = strrchr(file,'.');
- 
-     if(p != NULL) {
-       if(_stricmp(p, ".gba") == 0)
-@@ -1189,7 +1189,7 @@
- bool CPUIsELF(const char *file)
- {
-   if(strlen(file) > 4) {
--    char * p = strrchr(file,'.');
-+    const char * p = strrchr(file,'.');
-     
-     if(p != NULL) {
-       if(_stricmp(p, ".elf") == 0)
---- src/Util.cpp
-+++ src/Util.cpp
-@@ -478,7 +478,7 @@
- {
-   cpuIsMultiBoot = false;
-   if(strlen(file) > 4) {
--    char * p = strrchr(file,'.');
-+    const char * p = strrchr(file,'.');
- 
-     if(p != NULL) {
-       if(_stricmp(p, ".gba") == 0)
-@@ -502,7 +502,7 @@
- bool utilIsGBImage(const char * file)
- {
-   if(strlen(file) > 4) {
--    char * p = strrchr(file,'.');
-+    const char * p = strrchr(file,'.');
- 
-     if(p != NULL) {
-       if(_stricmp(p, ".gb") == 0)
-@@ -522,7 +522,7 @@
- bool utilIsZipFile(const char *file)
- {
-   if(strlen(file) > 4) {
--    char * p = strrchr(file,'.');
-+    const char * p = strrchr(file,'.');
- 
-     if(p != NULL) {
-       if(_stricmp(p, ".zip") == 0)
-@@ -552,7 +552,7 @@
- bool utilIsGzipFile(const char *file)
- {
-   if(strlen(file) > 3) {
--    char * p = strrchr(file,'.');
-+    const char * p = strrchr(file,'.');
- 
-     if(p != NULL) {
-       if(_stricmp(p, ".gz") == 0)
diff --git a/community/visualboyadvance/1.7.2-homedir.patch b/community/visualboyadvance/1.7.2-homedir.patch
deleted file mode 100644
index e93d32cf5..000000000
--- a/community/visualboyadvance/1.7.2-homedir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sdl/SDL.cpp.orig	2004-08-15 02:43:28.232750688 -0400
-+++ src/sdl/SDL.cpp	2004-08-15 02:44:01.557684528 -0400
-@@ -887,7 +887,7 @@
- 
-   if(home != NULL) {
-     fprintf(stderr, "Searching home directory: %s\n", home);
--    sprintf(path, "%s%c%s", home, FILE_SEP, name);
-+    sprintf(path, "%s%c.%s%c%s", home, FILE_SEP, EXE_NAME, FILE_SEP, name);
-     f = fopen(path, "r");
-     if(f != NULL)
-       return f;
diff --git a/community/visualboyadvance/1.7.2-uninit.patch b/community/visualboyadvance/1.7.2-uninit.patch
deleted file mode 100644
index b54c2e8ab..000000000
--- a/community/visualboyadvance/1.7.2-uninit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru src/gtk/window.cpp src/gtk/window.cpp
---- src/gtk/window.cpp	2004-05-14 00:31:58.000000000 +1000
-+++ src/gtk/window.cpp	2007-03-17 14:57:22.000000000 -0500
-@@ -91,7 +91,8 @@
-   m_iFilterIBMin    (FirstFilterIB),
-   m_iFilterIBMax    (LastFilterIB),
-   m_iJoypadMin      (1),
--  m_iJoypadMax      (4)
-+  m_iJoypadMax      (4),
-+  m_poKeymap        (NULL)
- {
-   m_poXml            = _poXml;
-   m_poFileOpenDialog = NULL;
diff --git a/community/visualboyadvance/PKGBUILD b/community/visualboyadvance/PKGBUILD
deleted file mode 100644
index 4ae2014b7..000000000
--- a/community/visualboyadvance/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 63767 2012-02-05 12:13:21Z ibiru $
-# Maintainer: Daenyth
-# Contributor: Eric Belanger <belanger@astro.umontreal.ca>
-# Contributor: Shahar Weiss <sweiss4@gmx.net>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-pkgname=visualboyadvance
-pkgver=1.7.2
-pkgrel=9
-pkgdesc="Emulator for Gameboy and Gameboy Advance systems"
-arch=('x86_64' 'i686')
-url="http://vba.ngemu.com/"
-license=("GPL")
-depends=('libglademm' 'sdl')
-makedepends=('nasm')
-backup=('etc/VisualBoyAdvance.cfg')
-source=("http://downloads.sourceforge.net/sourceforge/vba/VisualBoyAdvance-src-$pkgver.tar.gz"
-        '1.7.2-deprecatedsigc++.patch' '1.7.2-gcc34.patch' '1.7.2-gcc41.patch'
-	      '1.7.2-glibc.patch' '1.7.2-homedir.patch' '1.7.2-uninit.patch')
-md5sums=('cc02339e3fd8efd9f23121b0a2f81fd8'
-         '95596fbe499c23b8154142b5789cd630'
-         'e7c816ac1adf832c8bd3f6b899d6b935'
-         '22c90f2d75856c8407f70b19038105a4'
-         'e7a5188b483e2c4d2fee2a5efb088908'
-         'ef02d9be59ab74afa9a8f12e17e359d4'
-         '004c269a9cdbfa0f4b7fd51978f78705')
-
-build() {
-  cd "$srcdir/VisualBoyAdvance-$pkgver"
-
-  sed -i 's:setjmp(png_ptr->jmpbuf):1+1==3:' src/Util.cpp
-
-  patch -Np0 < "$srcdir/$pkgver-homedir.patch"
-  patch -Np0 < "$srcdir/$pkgver-gcc34.patch"
-  patch -Np0 < "$srcdir/$pkgver-gcc41.patch"
-  patch -Np0 < "$srcdir/$pkgver-deprecatedsigc++.patch"
-  patch -Np0 < "$srcdir/$pkgver-uninit.patch"
-  patch -Np0 < "$srcdir/$pkgver-glibc.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-gtk=2.4
-  make
-}
-
-package() {
-  cd "$srcdir/VisualBoyAdvance-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/vlock/ChangeLog b/community/vlock/ChangeLog
deleted file mode 100644
index 61e8e1dd3..000000000
--- a/community/vlock/ChangeLog
+++ /dev/null
@@ -1,18 +0,0 @@
-2008-08-30  Corrado Primier  <bardo@aur.archlinux.org>
-
-	* Version bump: 2.2.2
-
-	* PKGBUILD: fixed license (GPL -> GPL2), removed sed line in favour of
-	configure
-
-	* vlock.install: added, it creates the vlock group
-
-
-2007-09-10  Corrado Primier  <bardo@aur.archlinux.org>
-
-	* Version bump: 2.1
-
-
-2007-06-28  tardo  <tardo@nagi-fanboi.net>
-
-	* Built for x86_64
diff --git a/community/vlock/PKGBUILD b/community/vlock/PKGBUILD
deleted file mode 100644
index 7beb1f60e..000000000
--- a/community/vlock/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 58034 2011-11-05 17:24:10Z ttopper $
-# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=vlock
-pkgver=2.2.3
-pkgrel=1
-pkgdesc="A small console locking program"
-url="http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
-depends=('pam')
-install=vlock.install
-source=("http://cthulhu.c3d2.de/~toidinamai/vlock/archive/$pkgname-$pkgver.tar.bz2")
-md5sums=('2dd5677c97f2707db62532ae24f58433')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # vlock gid is 129
-  make DESTDIR="$pkgdir" VLOCK_GROUP=129 install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/vlock/vlock.install b/community/vlock/vlock.install
deleted file mode 100644
index 4cf592b35..000000000
--- a/community/vlock/vlock.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  echo -n 'Adding vlock group... '
-  groupadd -g 129 vlock && echo 'done.'
-}
-
-post_upgrade() {
-  cut -d: -f1 /etc/group | grep ^vlock$ >/dev/null
-  if [ $? == 1 ] ; then
-    post_install
-  fi
-}
-
-post_remove() {
-  echo -n 'Removing vlock group... '
-  groupdel vlock && echo 'done.'
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/vmpk/PKGBUILD b/community/vmpk/PKGBUILD
new file mode 100644
index 000000000..42c6a0df8
--- /dev/null
+++ b/community/vmpk/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer : speps <speps at aur dot archlinux dot org>
+
+pkgname=vmpk
+pkgver=0.5.1
+pkgrel=1
+pkgdesc="Virtual MIDI Piano Keyboard"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://vmpk.sourceforge.net/"
+license=('GPL3')
+depends=('qt4' 'jack')
+makedepends=('cmake')
+install="$pkgname.install"
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2")
+md5sums=('07e376936c38c7c244374ff9ddca6a72')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  [ -d bld ] || mkdir bld && cd bld
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
+           -DCMAKE_BUILD_TYPE=release
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver/bld"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/epdfview/epdfview.install b/community/vmpk/vmpk.install
index c317fbaca..293ff852a 100644
--- a/community/epdfview/epdfview.install
+++ b/community/vmpk/vmpk.install
@@ -1,6 +1,6 @@
 post_install() {
-  update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 
 post_upgrade() {
@@ -8,5 +8,5 @@ post_upgrade() {
 }
 
 post_remove() {
-  post_install
+  post_install 
 }
diff --git a/community/volumeicon/PKGBUILD b/community/volumeicon/PKGBUILD
index 24abc2b05..eb536308d 100644
--- a/community/volumeicon/PKGBUILD
+++ b/community/volumeicon/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 70695 2012-05-15 07:22:05Z arodseth $
+# $Id: PKGBUILD 85519 2013-03-02 15:17:37Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Maato <maato softwarebakery com>
 
 pkgname=volumeicon
-pkgver=0.4.6
-pkgrel=4
-pkgdesc="Volume control for your system tray"
+pkgver=0.5.0
+pkgrel=1
+pkgdesc='Volume control for your system tray'
 arch=('x86_64' 'i686' 'mips64el')
-url="http://softwarebakery.com/maato/volumeicon.html"
+url='http://softwarebakery.com/maato/volumeicon.html'
 license=('GPL3')
-depends=('gtk2>=2.16.0' 'alsa-lib' 'libnotify')
-source=("http://softwarebakery.com/maato/files/volumeicon/$pkgname-$pkgver.tar.gz"
-        "glib.patch")
-sha256sums=('32f94adc5f346404ae564405dd483ae4bd04212df08e46f18d369b4ba2cb6590'
-            'f2ab8b01cd9f554b170a773fa2a88c2874d97eb3fe106d4692595728201abeb0')
+depends=('gtk3' 'alsa-lib' 'libnotify')
+makedepends=('intltool')
+source=("http://softwarebakery.com/maato/files/volumeicon/$pkgname-$pkgver.tar.gz")
+sha256sums=('e5f1179f9ec5ab25e3740e4f6bbe0baa75368f0ae87d370197b3fbefb61bd782')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -p1 < ../glib.patch
+  sed -i 's/0.23/0.50.2/' configure.ac
+  autoconf
   ./configure \
     --prefix=/usr \
     --enable-notify
diff --git a/community/volumeicon/glib.patch b/community/volumeicon/glib.patch
deleted file mode 100644
index 93e47d2c4..000000000
--- a/community/volumeicon/glib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- volumeicon-0.4.6/src/alsa_backend.backup	2012-05-15 09:12:13.469335762 +0200
-+++ volumeicon-0.4.6/src/alsa_backend.c	2012-05-15 09:12:31.862905251 +0200
-@@ -22,10 +22,7 @@
- //##############################################################################
- 
- #include <alsa/asoundlib.h>
--#include <glib/gstring.h>
--#include <glib/gstdio.h>
--#include <glib/glist.h>
--#include <glib/giochannel.h>
-+#include <glib.h>
- 
- #include "alsa_backend.h"
- 
diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD
index d107e8eda..592a5ecee 100644
--- a/community/vtk/PKGBUILD
+++ b/community/vtk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83521 2013-02-02 12:57:08Z aginiewicz $
+# $Id: PKGBUILD 87540 2013-04-02 19:06:45Z aginiewicz $
 # Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
@@ -8,15 +8,17 @@
 # Contributor: Fabian Moser
 # Contributor: djscholl
 
+# Qt5 support status: http://vtk.org/Bug/view.php?id=12945
+
 pkgname=vtk
 pkgver=5.10.1
-pkgrel=3
+pkgrel=7
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org/'
 license=('BSD')
-depends=('libjpeg-turbo' 'boost' 'ffmpeg' 'qt' 'qtwebkit' 'lesstif' 'mysql' 'hdf5')
-makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk')
+depends=('libjpeg-turbo' 'boost' 'ffmpeg' 'qt4' 'lesstif' 'mariadb' 'hdf5' 'libgl')
+makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa-libgl' 'python2' 'tk')
 optdepends=('python2: python bindings'
             'java-runtime: java bindings'
             'tk: tcl bindings'
@@ -65,6 +67,7 @@ build() {
     -DDOCUMENTATION_HTML_HELP:BOOL=ON \
     -DDOCUMENTATION_HTML_TARZ:BOOL=ON \
     -DBUILD_EXAMPLES:BOOL=ON \
+    -DVTK_USE_CHEMISTRY:BOOL=ON \
     -DVTK_USE_HYBRID:BOOL=ON \
     -DVTK_USE_PARALLEL:BOOL=ON \
     -DVTK_USE_PATENTED:BOOL=ON \
@@ -78,7 +81,7 @@ build() {
     -DVTK_WRAP_PYTHON:BOOL=ON \
     -DVTK_WRAP_TCL:BOOL=ON \
     -DVTK_USE_QT:BOOL=ON \
-    -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \
+    -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt4/plugins" \
     -DVTK_USE_GUISUPPORT:BOOL=ON \
     -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
     ${cmake_system_flags} \
@@ -111,4 +114,3 @@ package() {
   sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     $(find "${pkgdir}" -name '*.py')
 }
-
diff --git a/community/vym/PKGBUILD b/community/vym/PKGBUILD
index 69f76eafe..9106ca202 100644
--- a/community/vym/PKGBUILD
+++ b/community/vym/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 75733 2012-08-29 20:40:57Z jlichtblau $
+# $Id: PKGBUILD 85424 2013-03-01 10:42:25Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> 
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: S�ren Holm <sgh@sgh.dk> 
 
 pkgname=vym
 pkgver=2.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A mindmapping tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.insilmaril.de/vym/"
 license=('GPL')
-depends=('qt' 'unzip' 'zip')
+depends=('qt4' 'unzip' 'zip')
 options=('!emptydirs')
 changelog=$pkgname.changelog
 install=$pkgname.install
@@ -20,26 +20,26 @@ sha256sums=('fa6d088327feae80c4c6760454fba64fe253a7de6e7e46f45a4c7f7db9b998f4'
             'e299c69c213e7aac3f5b5d0ab088132b4ec7cb63a391f272e75ed64f049d541b')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
 
   qmake PREFIX=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
 
 # install files
-  make INSTALL_ROOT=${pkgdir} install
+  make INSTALL_ROOT="${pkgdir}" install
 
 # correct doc location
-  install -d ${pkgdir}/usr/share/doc/$pkgname
-  install -m644 doc/* ${pkgdir}/usr/share/doc/$pkgname
-  rm -rf ${pkgdir}/usr/share/doc/packages
+  install -d "${pkgdir}"/usr/share/doc/$pkgname
+  install -m644 doc/* "${pkgdir}"/usr/share/doc/$pkgname
+  rm -rf "${pkgdir}"/usr/share/doc/packages
 
 # .desktop and icon file
-  install -D -m644 ${srcdir}/$pkgname.desktop \
-    ${pkgdir}/usr/share/applications/$pkgname.desktop
-  install -D -m644 ${pkgdir}/usr/share/vym/icons/$pkgname.png \
-    ${pkgdir}/usr/share/pixmaps/$pkgname.png
+  install -D -m644 "${srcdir}"/$pkgname.desktop \
+    "${pkgdir}"/usr/share/applications/$pkgname.desktop
+  install -D -m644 "${pkgdir}"/usr/share/vym/icons/$pkgname.png \
+    "${pkgdir}"/usr/share/pixmaps/$pkgname.png
 }
diff --git a/community/vyqchat/PKGBUILD b/community/vyqchat/PKGBUILD
index fc504490d..1f353b46c 100644
--- a/community/vyqchat/PKGBUILD
+++ b/community/vyqchat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65377 2012-02-21 02:28:00Z spupykin $
+# $Id: PKGBUILD 88015 2013-04-09 21:51:55Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
@@ -12,10 +12,10 @@ license=('GPL')
 depends=('qt3' 'libao' 'libxi')
 source=(http://www.uic.unn.ru/~soed/programs/chat/$pkgname-$pkgver.tar.gz
 	build-fix.patch)
-md5sums=('67974bc5df1ed0d63785d04325444d4f' 'de3af70da3743c27929f04f72c837412')
+md5sums=('67974bc5df1ed0d63785d04325444d4f'
+         'de3af70da3743c27929f04f72c837412')
 
 build() {
-  . /etc/profile.d/qt3.sh
   cd $srcdir/$pkgname-${pkgver}
   patch -Np1 <../build-fix.patch
   # Use _LDADD to properly compile with --as-needed
@@ -23,7 +23,11 @@ build() {
   # Correct acinclude.m4 to avoid empty else block
   sed -i 's:# Leave bnv_qt_lib_dir defined:/bin/true:' acinclude.m4
   autoreconf -v
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --with-Qt-bin-dir=/usr/lib/qt3/bin --with-Qt-include-dir=/usr/include/qt3 --with-Qt-lib-dir=/usr/lib
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-${pkgver}
   make DESTDIR=$pkgdir install
 }
diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD
index 100243ad7..0eaddd8e8 100644
--- a/community/warzone2100/PKGBUILD
+++ b/community/warzone2100/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 82377 2013-01-16 10:35:35Z lcarlier $
+# $Id: PKGBUILD 85425 2013-03-01 10:42:35Z andrea $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
 
 pkgname=warzone2100
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="3D realtime strategy game on a future Earth"
 url="http://wz2100.net/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('sdl' 'glew' 'fribidi' 'openal' 'libvorbis' 'libtheora' 'physfs' 'ttf-dejavu' 'qt')
+depends=('sdl' 'glew' 'fribidi' 'openal' 'libvorbis' 'libtheora' 'physfs' 'ttf-dejavu' 'qt4')
 makedepends=('gawk' 'flex' 'zip' 'unzip' 'asciidoc' 'mesa')
 source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.xz")
 md5sums=('7f061f3e5a2a6a83c146508ccefabd86')
diff --git a/community/wdm/PKGBUILD b/community/wdm/PKGBUILD
index d1f70cf68..99f741fd0 100644
--- a/community/wdm/PKGBUILD
+++ b/community/wdm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65381 2012-02-21 02:29:21Z spupykin $
+# $Id: PKGBUILD 88268 2013-04-15 11:14:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: eric <eric@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
@@ -20,6 +20,10 @@ build() {
 	--sysconfdir=/etc/wdm --with-wdmdir=/etc/wdm --mandir=/usr/share/man \
 	--with-fakehome=/var/empty
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
   # used /etc/pam.d/xscreensaver as an example
   #
diff --git a/community/webfs/webfsd.launcher b/community/webfs/webfsd.launcher
deleted file mode 100644
index fe2170617..000000000
--- a/community/webfs/webfsd.launcher
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/bash
-
-# wrapper script for systemd service
-
-[ -f /etc/conf.d/webfsd ] && . /etc/conf.d/webfsd
-
-# -F for simple target
-exec /usr/bin/webfsd -F ${WEBFSD_ARGS}
-
diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD
index 3607e4e36..2a89d9d27 100644
--- a/community/wesnoth/PKGBUILD
+++ b/community/wesnoth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83279 2013-01-28 16:50:16Z stephane $
+# $Id: PKGBUILD 87442 2013-03-31 19:19:03Z stephane $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=wesnoth
-pkgver=1.10.5
+pkgver=1.10.6
 pkgrel=2
 pkgdesc="A turn-based strategy game on a fantasy world"
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t
         wesnothd.tmpfiles.conf
         wesnothd.rc.d
         wesnothd.service)
-md5sums=('03d9683cd83d17c6536bdf5c4940bbc8'
+md5sums=('547e3489bbfa778912b11dbee612c380'
          '2d2fea6b3d86dfd589f5ad35a3be1f97'
          '85659b47d22dfdf4e4d046556973fc3e'
          'd1b6bf1d3dc05086ee6a370adff0ae4a')
diff --git a/community/wesnoth/boost_foreach.patch b/community/wesnoth/boost_foreach.patch
deleted file mode 100644
index 95b98828e..000000000
--- a/community/wesnoth/boost_foreach.patch
+++ /dev/null
@@ -1,11890 +0,0 @@
-------------------------------------------------------------------------
-r54625 | loonycyborg | 2012-07-08 16:26:21 +0200 (So, 08 Jul 2012) | 5 lines
-
-Backport r54604: Use BOOST_FOREACH directly instead of #define foreach BOOST_FOREACH
-
-The define is extremely unreliable, will break compile with boost >=
-1.50 and upstream can't fix issues with it, see
-https://svn.boost.org/trac/boost/ticket/6131
-
-Index: src/foreach.hpp (deleted)
-===================================================================
-Index: src/scripting/lua.cpp
-===================================================================
---- src/scripting/lua.cpp	(revision 54624)
-+++ src/scripting/lua.cpp	(revision 54625)
-@@ -39,7 +39,6 @@
- #include "ai/manager.hpp"
- #include "attack_prediction.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
- #include "gamestatus.hpp"
-@@ -77,6 +76,8 @@
- #include "scripting/debug_lua.hpp"
- #endif
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_scripting_lua("scripting/lua");
- #define LOG_LUA LOG_STREAM(info, log_scripting_lua)
- #define ERR_LUA LOG_STREAM(err, log_scripting_lua)
-@@ -87,7 +88,7 @@
- void extract_preload_scripts(config const &game_config)
- {
- 	preload_scripts.clear();
--	foreach (config const &cfg, game_config.child_range("lua")) {
-+	BOOST_FOREACH(config const &cfg, game_config.child_range("lua")) {
- 		preload_scripts.push_back(cfg);
- 	}
- 	preload_config = game_config.child("game_config");
-@@ -254,7 +255,7 @@
- 		return;
- 
- 	int k = 1;
--	foreach (const config::any_child &ch, cfg.all_children_range())
-+	BOOST_FOREACH(const config::any_child &ch, cfg.all_children_range())
- 	{
- 		lua_createtable(L, 2, 0);
- 		lua_pushstring(L, ch.key.c_str());
-@@ -264,7 +265,7 @@
- 		lua_rawseti(L, -2, 2);
- 		lua_rawseti(L, -2, k++);
- 	}
--	foreach (const config::attribute &attr, cfg.attribute_range())
-+	BOOST_FOREACH(const config::attribute &attr, cfg.attribute_range())
- 	{
- 		luaW_pushscalar(L, attr.second);
- 		lua_setfield(L, -2, attr.first.c_str());
-@@ -534,7 +535,7 @@
- {
- 	if (ptr) return ptr;
- 	if (side) {
--		foreach (unit &u, (*resources::teams)[side - 1].recall_list()) {
-+		BOOST_FOREACH(unit &u, (*resources::teams)[side - 1].recall_list()) {
- 			if (u.underlying_id() == uid) return &u;
- 		}
- 		return NULL;
-@@ -710,7 +711,7 @@
- 	if (shallow_literal || strcmp(m, "__shallow_parsed") == 0)
- 	{
- 		lua_newtable(L);
--		foreach (const config::attribute &a, v->get_config().attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &a, v->get_config().attribute_range()) {
- 			if (shallow_literal)
- 				luaW_pushscalar(L, a.second);
- 			else
-@@ -813,7 +814,7 @@
- 		const std::vector<std::string>& vector = accessor; \
- 		lua_createtable(L, vector.size(), 0); \
- 		int i = 1; \
--		foreach (const std::string& s, vector) { \
-+		BOOST_FOREACH(const std::string& s, vector) { \
- 			lua_pushstring(L, s.c_str()); \
- 			lua_rawseti(L, -2, i); \
- 			++i; \
-@@ -1292,9 +1293,9 @@
- 	lua_rawget(L, LUA_REGISTRYINDEX);
- 	lua_newtable(L);
- 	int i = 1, s = 1;
--	foreach (team &t, *resources::teams)
-+	BOOST_FOREACH(team &t, *resources::teams)
- 	{
--		foreach (unit &u, t.recall_list())
-+		BOOST_FOREACH(unit &u, t.recall_list())
- 		{
- 			if (!filter.null()) {
- 				scoped_recall_unit auto_store("this_unit",
-@@ -1560,7 +1561,7 @@
- 		std::set<std::string> const &recruits = t.recruits();
- 		lua_createtable(L, recruits.size(), 0);
- 		int i = 1;
--		foreach (std::string const &r, t.recruits()) {
-+		BOOST_FOREACH(std::string const &r, t.recruits()) {
- 			lua_pushstring(L, r.c_str());
- 			lua_rawseti(L, -2, i++);
- 		}
-@@ -3130,7 +3131,7 @@
- 
- 	lua_createtable(L, res.size(), 0);
- 	int i = 1;
--	foreach (map_location const &loc, res)
-+	BOOST_FOREACH(map_location const &loc, res)
- 	{
- 		lua_createtable(L, 2, 0);
- 		lua_pushinteger(L, loc.x + 1);
-@@ -3227,7 +3228,7 @@
- 	lua_rawget(L, LUA_REGISTRYINDEX);
- 	lua_createtable(L, sides.size(), 0);
- 	unsigned index = 1;
--	foreach(int side, sides) {
-+	BOOST_FOREACH(int side, sides) {
- 		// Create a full userdata containing a pointer to the team.
- 		team** t = static_cast<team**>(lua_newuserdata(L, sizeof(team*)));
- 		*t = &((*resources::teams)[side - 1]);
-@@ -3247,7 +3248,7 @@
- static int intf_get_traits(lua_State* L)
- {
- 	lua_newtable(L);
--	foreach(const config& trait, unit_types.traits()) {
-+	BOOST_FOREACH(const config& trait, unit_types.traits()) {
- 		const std::string& id = trait["id"];
- 		//It seems the engine does nowhere check the id field for emptyness or duplicates
- 		//(also not later on).
-@@ -3767,7 +3768,7 @@
- 			, static_cast<void *>(const_cast<char *>(&gettypeKey)));
- 	lua_rawget(L, LUA_REGISTRYINDEX);
- 	lua_newtable(L);
--	foreach (const unit_type_data::unit_type_map::value_type &ut, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &ut, unit_types.types())
- 	{
- 		lua_createtable(L, 0, 1);
- 		lua_pushstring(L, ut.first.c_str());
-@@ -3786,7 +3787,7 @@
- 	lua_rawget(L, LUA_REGISTRYINDEX);
- 	const race_map& races = unit_types.races();
- 	lua_createtable(L, 0, races.size());
--	foreach(const race_map::value_type &race, races)
-+	BOOST_FOREACH(const race_map::value_type &race, races)
- 	{
- 		lua_createtable(L, 0, 1);
- 		char const* id = race.first.c_str();
-@@ -3801,10 +3802,10 @@
- 
- 	// Execute the preload scripts.
- 	game_config::load_config(preload_config);
--	foreach (const config &cfg, preload_scripts) {
-+	BOOST_FOREACH(const config &cfg, preload_scripts) {
- 		execute(cfg["code"].str().c_str(), 0, 0);
- 	}
--	foreach (const config &cfg, level_.child_range("lua")) {
-+	BOOST_FOREACH(const config &cfg, level_.child_range("lua")) {
- 		execute(cfg["code"].str().c_str(), 0, 0);
- 	}
- 
-@@ -3822,7 +3823,7 @@
- 
- static bool is_handled_file_tag(const std::string &s)
- {
--	foreach (char const *t, handled_file_tags) {
-+	BOOST_FOREACH(char const *t, handled_file_tags) {
- 		if (s == t) return true;
- 	}
- 	return false;
-@@ -3841,7 +3842,7 @@
- 
- 	lua_newtable(L);
- 	int k = 1;
--	foreach (const config::any_child &v, level_.all_children_range())
-+	BOOST_FOREACH(const config::any_child &v, level_.all_children_range())
- 	{
- 		if (is_handled_file_tag(v.key)) continue;
- 		lua_createtable(L, 2, 0);
-@@ -3861,7 +3862,7 @@
-  */
- void LuaKernel::save_game(config &cfg)
- {
--	foreach (const config &v, level_.child_range("lua")) {
-+	BOOST_FOREACH(const config &v, level_.child_range("lua")) {
- 		cfg.add_child("lua", v);
- 	}
- 
-Index: src/dialogs.cpp
-===================================================================
---- src/dialogs.cpp	(revision 54624)
-+++ src/dialogs.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- 
- #include "actions.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_events.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
-@@ -49,6 +48,7 @@
- #include "gui/dialogs/game_save.hpp"
- #include "gui/dialogs/transient_message.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- //#ifdef _WIN32
- //#include "locale.h"
-@@ -95,7 +95,7 @@
- 	}
- 
- 	bool always_display = false;
--	foreach (const config &mod, u->get_modification_advances())
-+	BOOST_FOREACH(const config &mod, u->get_modification_advances())
- 	{
- 		if (mod["always_display"].to_bool()) always_display = true;
- 		sample_units.push_back(::get_advanced_unit(*u, u->type_id()));
-@@ -1009,7 +1009,7 @@
- 	}
- 
- 	//FIXME: This probably must be move into a unit_type function
--	foreach (const config &tr, t->possible_traits())
-+	BOOST_FOREACH(const config &tr, t->possible_traits())
- 	{
- 		if (tr["availability"] != "musthave") continue;
- 		std::string gender_string = (!t->genders().empty() && t->genders().front()== unit_race::FEMALE) ? "female_name" : "male_name";
-@@ -1038,7 +1038,7 @@
- 	// Check if AMLA color is needed
- 	// FIXME: not sure if it's fully accurate (but not very important for unit_type)
- 	// xp_color also need a simpler function for doing this
--	foreach (const config &adv, t->modification_advancements())
-+	BOOST_FOREACH(const config &adv, t->modification_advancements())
- 	{
- 		if (!adv["strict_amla"].to_bool() || !t->can_advance()) {
- 			det.xp_color = "<170,0,255>"; // from unit::xp_color()
-Index: src/menu_events.cpp
-===================================================================
---- src/menu_events.cpp	(revision 54624)
-+++ src/menu_events.cpp	(revision 54625)
-@@ -27,7 +27,6 @@
- #include "dialogs.hpp"
- #include "formatter.hpp"
- #include "filechooser.hpp"
--#include "foreach.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_events.hpp"
- #include "game_preferences.hpp"
-@@ -66,6 +65,7 @@
- #include "widgets/combo.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
-@@ -863,7 +863,7 @@
- 
- 
- 	DBG_WB <<"menu_handler::recall: Contents of wb-modified recall list:\n";
--	foreach(const unit* unit, recall_list_team)
-+	BOOST_FOREACH(const unit* unit, recall_list_team)
- 	{
- 		DBG_WB << unit->name() << " [" << unit->id() <<"]\n";
- 	}
-@@ -896,7 +896,7 @@
- 	options.push_back(heading.str());
- 	options_to_filter.push_back(options.back());
- 
--	foreach (const unit* u, recall_list_team)
-+	BOOST_FOREACH(const unit* u, recall_list_team)
- 	{
- 		std::stringstream option, option_to_filter;
- 		std::string name = u->name();
-@@ -933,7 +933,7 @@
- 		option_to_filter << u->type_name() << " " << name << " " << u->level();
- 
- 		option << COLUMN_SEPARATOR;
--		foreach (const t_string& trait, u->trait_names()) {
-+		BOOST_FOREACH(const t_string& trait, u->trait_names()) {
- 			option << trait << '\n';
- 			option_to_filter << " " << trait;
- 		}
-@@ -1540,7 +1540,7 @@
- 								_("Type");
- 	options.push_back(heading);
- 
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		std::stringstream row;
- 
-@@ -2047,7 +2047,7 @@
- 		std::vector<std::string> get_commands_list() const
- 		{
- 			std::vector<std::string> res;
--			foreach(typename command_map::value_type i, command_map_) {
-+			BOOST_FOREACH(typename command_map::value_type i, command_map_) {
- 				res.push_back(i.first);
- 			}
- 			return res;
-@@ -2638,7 +2638,7 @@
- 
- 			if (const config &alias_list = preferences::get_alias())
- 			{
--				foreach (const config::attribute &a, alias_list.attribute_range()) {
-+				BOOST_FOREACH(const config::attribute &a, alias_list.attribute_range()) {
- 					register_alias(a.second, a.first);
- 				}
- 			}
-@@ -3241,7 +3241,7 @@
- 	tile->rebuild_cache(tod_id, &tile_logs);
- 
- 	int order = 1;
--	foreach(const terrain_builder::tile::log_details det, tile_logs) {
-+	BOOST_FOREACH(const terrain_builder::tile::log_details det, tile_logs) {
- 		const terrain_builder::tile::rule_image_rand& ri = *det.first;
- 		const terrain_builder::rule_image_variant& variant = *det.second;
- 
-@@ -3356,7 +3356,7 @@
- void console_handler::do_choose_level() {
- 	std::vector<std::string> options;
- 	int next = 0, nb = 0;
--	foreach (const config &sc, menu_handler_.game_config_.child_range("scenario"))
-+	BOOST_FOREACH(const config &sc, menu_handler_.game_config_.child_range("scenario"))
- 	{
- 		const std::string &id = sc["id"];
- 		options.push_back(id);
-@@ -3367,7 +3367,7 @@
- 	// find scenarios of multiplayer campaigns
- 	// (assumes that scenarios are ordered properly in the game_config)
- 	std::string& scenario = menu_handler_.gamestate_.mp_settings().mp_scenario;
--	foreach (const config &mp, menu_handler_.game_config_.child_range("multiplayer"))
-+	BOOST_FOREACH(const config &mp, menu_handler_.game_config_.child_range("multiplayer"))
- 	{
- 		if (mp["id"] == scenario)
- 		{
-@@ -3596,7 +3596,7 @@
- 	}
- }*/
- void console_handler::do_discover() {
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types()) {
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types()) {
- 		preferences::encountered_units().insert(i.second.id());
- 	}
- }
-Index: src/multiplayer_wait.cpp
-===================================================================
---- src/multiplayer_wait.cpp	(revision 54624)
-+++ src/multiplayer_wait.cpp	(revision 54625)
-@@ -16,7 +16,6 @@
- #include "global.hpp"
- 
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "game_preferences.hpp"
- #include "gui/dialogs/transient_message.hpp"
-@@ -30,6 +29,8 @@
- #include "wml_separators.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_network("network");
- #define DBG_NW LOG_STREAM(debug, log_network)
- #define LOG_NW LOG_STREAM(info, log_network)
-@@ -222,7 +223,7 @@
- 		//available side.
- 		const config *side_choice = NULL;
- 		int side_num = -1, nb_sides = 0;
--		foreach (const config &sd, level_.child_range("side"))
-+		BOOST_FOREACH(const config &sd, level_.child_range("side"))
- 		{
- 			if (sd["controller"] == "reserved" && sd["current_player"] == preferences::login())
- 			{
-@@ -275,7 +276,7 @@
- 				color = game_config::color_info(color_str).index() - 1;
- 
- 			std::vector<const config *> leader_sides;
--			foreach (const config &side, possible_sides) {
-+			BOOST_FOREACH(const config &side, possible_sides) {
- 				leader_sides.push_back(&side);
- 			}
- 
-@@ -287,7 +288,7 @@
- 			}
- 
- 			std::vector<std::string> choices;
--			foreach (const config *s, leader_sides)
-+			BOOST_FOREACH(const config *s, leader_sides)
- 			{
- 				const config &side = *s;
- 				const std::string &name = side["name"];
-@@ -442,7 +443,7 @@
- 	std::vector<std::string> details;
- 	std::vector<std::string> playerlist;
- 
--	foreach (const config &sd, level_.child_range("side"))
-+	BOOST_FOREACH(const config &sd, level_.child_range("side"))
- 	{
- 		if (!sd["allow_player"].to_bool(true)) {
- 			continue;
-@@ -458,7 +459,7 @@
- 		// Hack: if there is a unit which can recruit, use it as a
- 		// leader. Necessary to display leader information when loading
- 		// saves.
--		foreach (const config &side_unit, sd.child_range("unit"))
-+		BOOST_FOREACH(const config &side_unit, sd.child_range("unit"))
- 		{
- 			if (side_unit["canrecruit"].to_bool()) {
- 				leader_type = side_unit["type"].str();
-Index: src/serialization/schema_validator.cpp
-===================================================================
---- src/serialization/schema_validator.cpp	(revision 54624)
-+++ src/serialization/schema_validator.cpp	(revision 54625)
-@@ -17,12 +17,13 @@
- 
- 
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
- #include "serialization/preprocessor.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace schema_validation{
- 
- static lg::log_domain log_validation("validation");
-@@ -143,14 +144,14 @@
- 	} catch(config::error&) {
- 		return false;
- 	}
--	foreach (const config &g, cfg.child_range("wml_schema")) {
--		foreach (const config &schema, g.child_range("tag")) {
-+	BOOST_FOREACH(const config &g, cfg.child_range("wml_schema")) {
-+		BOOST_FOREACH(const config &schema, g.child_range("tag")) {
- 			if (schema["name"].str() == "root"){
- 				//@NOTE Don't know, maybe merging of roots needed.
- 				root_ = class_tag (schema);
- 			}
- 		}
--		foreach (const config &type, g.child_range("type")) {
-+		BOOST_FOREACH(const config &type, g.child_range("type")) {
- 			try{
- 				types_[type["name"].str()] = boost::regex( type["value"].str());
- 			}
-Index: src/serialization/preprocessor.cpp
-===================================================================
---- src/serialization/preprocessor.cpp	(revision 54624)
-+++ src/serialization/preprocessor.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- 
- #include "config.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "log.hpp"
- #include "wesconfig.h"
-@@ -34,6 +33,8 @@
- #include "util.hpp"
- #include "version.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <stdexcept>
- 
- static lg::log_domain log_config("config");
-@@ -64,7 +65,7 @@
- 	int n = 0;
- 	s >> std::hex >> n;
- 
--	foreach(const t_file_number_map::value_type& p, file_number_map){
-+	BOOST_FOREACH(const t_file_number_map::value_type& p, file_number_map){
- 		if(p.second == n)
- 			return p.first;
- 	}
-@@ -142,7 +143,7 @@
- 	writer.write_key_val("linenum", lexical_cast<std::string>(linenum));
- 	writer.write_key_val("location", get_location(location));
- 
--	foreach (const std::string &arg, arguments)
-+	BOOST_FOREACH(const std::string &arg, arguments)
- 		write_argument(writer, arg);
- 
- 	writer.close_child(key);
-@@ -160,7 +161,7 @@
- 	linenum = cfg["linenum"];
- 	location = cfg["location"].str();
- 
--	foreach (const config &arg, cfg.child_range("argument"))
-+	BOOST_FOREACH(const config &arg, cfg.child_range("argument"))
- 		read_argument(arg);
- }
- 
-@@ -1157,14 +1158,14 @@
- 		get_files_in_dir(res_name, &files, &dirs, ENTIRE_FILE_PATH, SKIP_MEDIA_DIR, DO_REORDER);
- 
- 		// subdirectories
--		foreach(const std::string& dir, dirs)
-+		BOOST_FOREACH(const std::string& dir, dirs)
- 		{
- 			LOG_PREPROC<<"processing sub-dir: "<<dir<<'\n';
- 			preprocess_resource(dir,defines_map,write_cfg,write_plain_cfg,target_directory);
- 		}
- 
- 		// files in current directory
--		foreach(const std::string& file, files)
-+		BOOST_FOREACH(const std::string& file, files)
- 		{
- 			preprocess_resource(file,defines_map,write_cfg,write_plain_cfg,target_directory);
- 		}
-Index: src/serialization/parser.cpp
-===================================================================
---- src/serialization/parser.cpp	(revision 54624)
-+++ src/serialization/parser.cpp	(revision 54625)
-@@ -32,7 +32,6 @@
- #include "serialization/tokenizer.hpp"
- #include "serialization/string_utils.hpp"
- #include "serialization/validator.hpp"
--#include "foreach.hpp"
- 
- #include <stack>
- 
-@@ -40,6 +39,7 @@
- #include <boost/iostreams/filter/gzip.hpp>
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/variant.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_config("config");
- #define ERR_CF LOG_STREAM(err, log_config)
-@@ -343,7 +343,7 @@
- {
- 	i18n_symbols["pos"] = ::lineno_string(lineno);
- 	std::string result = _(error_string);
--	foreach(utils::string_map::value_type& var, i18n_symbols)
-+	BOOST_FOREACH(utils::string_map::value_type& var, i18n_symbols)
- 		boost::algorithm::replace_all(result, std::string("$") + var.first, std::string(var.second));
- 	return result;
- }
-@@ -503,11 +503,11 @@
- 	if (tab > max_recursion_levels)
- 		throw config::error("Too many recursion levels in config write");
- 
--	foreach (const config::attribute &i, cfg.attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &i, cfg.attribute_range()) {
- 		write_key_val(out, i.first, i.second, tab, textdomain);
- 	}
- 
--	foreach (const config::any_child &item, cfg.all_children_range())
-+	BOOST_FOREACH(const config::any_child &item, cfg.all_children_range())
- 	{
- 		write_open_child(out, item.key, tab);
- 		write_internal(item.cfg, out, textdomain, tab + 1);
-Index: src/game_controller_abstract.cpp
-===================================================================
---- src/game_controller_abstract.cpp	(revision 54624)
-+++ src/game_controller_abstract.cpp	(revision 54625)
-@@ -15,7 +15,6 @@
- 
- #include "game_controller_abstract.hpp"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "gettext.hpp"
- #include "hotkeys.hpp"
-@@ -24,6 +23,8 @@
- 
- #include "preferences.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iostream>
- 
- game_controller_abstract::game_controller_abstract(const commandline_options &cmdline_opts) :
-@@ -80,7 +81,7 @@
- 	language_def locale;
- 	if(cmdline_opts_.language) {
- 		std::vector<language_def> langs = get_languages();
--		foreach(const language_def & def, langs) {
-+		BOOST_FOREACH(const language_def & def, langs) {
- 			if(def.localename == *cmdline_opts_.language) {
- 				locale = def;
- 				break;
-Index: src/terrain.cpp
-===================================================================
---- src/terrain.cpp	(revision 54624)
-+++ src/terrain.cpp	(revision 54625)
-@@ -15,13 +15,14 @@
- 
- #include "global.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
- #include "serialization/string_utils.hpp"
- #include "terrain.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <set>
- 
- static lg::log_domain log_config("config");
-@@ -284,7 +285,7 @@
-                          t_translation::t_list& terrain_list,
-                          std::map<t_translation::t_terrain, terrain_type>& letter_to_terrain)
- {
--	foreach (const config &t, cfgs)
-+	BOOST_FOREACH(const config &t, cfgs)
- 	{
- 		terrain_type terrain(t);
- 		DBG_G << "create_terrain_maps: " << terrain.number() << " "
-@@ -301,9 +302,9 @@
- 				std::vector<std::string> eg2 = utils::split(terrain.editor_group());
- 				std::set<std::string> egs;
- 				bool clean_merge = true;
--				foreach(std::string& t, eg1)
-+				BOOST_FOREACH(std::string& t, eg1)
- 					clean_merge &= egs.insert(t).second;
--				foreach(std::string& t, eg2)
-+				BOOST_FOREACH(std::string& t, eg2)
- 					clean_merge &= egs.insert(t).second;
- 
- 				std::string joined = utils::join(egs);
-Index: src/config.cpp
-===================================================================
---- src/config.cpp	(revision 54624)
-+++ src/config.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- #include "global.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "serialization/string_utils.hpp"
- #include "util.hpp"
-@@ -31,6 +30,7 @@
- #include <cstring>
- #include <deque>
- #include <boost/variant.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_config("config");
- #define ERR_CF LOG_STREAM(err, log_config)
-@@ -255,7 +255,7 @@
- {
- 	check_valid(cfg);
- 
--	foreach (const any_child &value, cfg.all_children_range()) {
-+	BOOST_FOREACH(const any_child &value, cfg.all_children_range()) {
- 		add_child(value.key, value.cfg);
- 	}
- }
-@@ -263,7 +263,7 @@
- void config::append(const config &cfg)
- {
- 	append_children(cfg);
--	foreach (const attribute &v, cfg.values) {
-+	BOOST_FOREACH(const attribute &v, cfg.values) {
- 		values[v.first] = v.second;
- 	}
- }
-@@ -275,7 +275,7 @@
- 	if (child_count(key) < 2) return;
- 
- 	config merged_children;
--	foreach (const config &cfg, child_range(key)) {
-+	BOOST_FOREACH(const config &cfg, child_range(key)) {
- 		merged_children.append(cfg);
- 	}
- 
-@@ -291,7 +291,7 @@
- 
- 	typedef std::map<std::string, config> config_map;
- 	config_map merged_children_map;
--	foreach (const config &cfg, child_range(key)) {
-+	BOOST_FOREACH(const config &cfg, child_range(key)) {
- 		const std::string &value = cfg[attribute];
- 		config_map::iterator m = merged_children_map.find(value);
- 		if ( m!=merged_children_map.end() ) {
-@@ -302,7 +302,7 @@
- 	}
- 
- 	clear_children(key);
--	foreach (const config_map::value_type &i, merged_children_map) {
-+	BOOST_FOREACH(const config_map::value_type &i, merged_children_map) {
- 		add_child(key,i.second);
- 	}
- }
-@@ -459,7 +459,7 @@
- 	ordered_children.erase(std::remove_if(ordered_children.begin(),
- 		ordered_children.end(), remove_ordered(i)), ordered_children.end());
- 
--	foreach (config *c, i->second) {
-+	BOOST_FOREACH(config *c, i->second) {
- 		delete c;
- 	}
- 
-@@ -495,7 +495,7 @@
- 
- 	values.erase(key);
- 
--	foreach (const any_child &value, all_children_range()) {
-+	BOOST_FOREACH(const any_child &value, all_children_range()) {
- 		const_cast<config *>(&value.cfg)->recursive_clear_value(key);
- 	}
- }
-@@ -506,7 +506,7 @@
- 	/* Find the position with the correct index and decrement all the
- 	   indices in the ordering that are above this index. */
- 	unsigned found = 0;
--	foreach (child_pos &p, ordered_children)
-+	BOOST_FOREACH(child_pos &p, ordered_children)
- 	{
- 		if (p.pos != pos) continue;
- 		if (p.index == index)
-@@ -590,7 +590,7 @@
- 	check_valid(cfg);
- 
- 	assert(this != &cfg);
--	foreach (const attribute &v, cfg.values) {
-+	BOOST_FOREACH(const attribute &v, cfg.values) {
- 		values[v.first] = v.second;
- 	}
- }
-@@ -860,21 +860,21 @@
- 	if (track) values[diff_track_attribute] = "modified";
- 
- 	if (const config &inserts = diff.child("insert")) {
--		foreach (const attribute &v, inserts.attribute_range()) {
-+		BOOST_FOREACH(const attribute &v, inserts.attribute_range()) {
- 			values[v.first] = v.second;
- 		}
- 	}
- 
- 	if (const config &deletes = diff.child("delete")) {
--		foreach (const attribute &v, deletes.attribute_range()) {
-+		BOOST_FOREACH(const attribute &v, deletes.attribute_range()) {
- 			values.erase(v.first);
- 		}
- 	}
- 
--	foreach (const config &i, diff.child_range("change_child"))
-+	BOOST_FOREACH(const config &i, diff.child_range("change_child"))
- 	{
- 		const size_t index = lexical_cast<size_t>(i["index"].str());
--		foreach (const any_child &item, i.all_children_range())
-+		BOOST_FOREACH(const any_child &item, i.all_children_range())
- 		{
- 			if (item.key.empty()) {
- 				continue;
-@@ -889,19 +889,19 @@
- 		}
- 	}
- 
--	foreach (const config &i, diff.child_range("insert_child"))
-+	BOOST_FOREACH(const config &i, diff.child_range("insert_child"))
- 	{
- 		const size_t index = lexical_cast<size_t>(i["index"].str());
--		foreach (const any_child &item, i.all_children_range()) {
-+		BOOST_FOREACH(const any_child &item, i.all_children_range()) {
- 			config& inserted = add_child_at(item.key, item.cfg, index);
- 			if (track) inserted[diff_track_attribute] = "new";
- 		}
- 	}
- 
--	foreach (const config &i, diff.child_range("delete_child"))
-+	BOOST_FOREACH(const config &i, diff.child_range("delete_child"))
- 	{
- 		const size_t index = lexical_cast<size_t>(i["index"].str());
--		foreach (const any_child &item, i.all_children_range()) {
-+		BOOST_FOREACH(const any_child &item, i.all_children_range()) {
- 			if (!track) {
- 				remove_child(item.key, index);
- 			} else {
-@@ -918,18 +918,18 @@
- void config::clear_diff_track(const config& diff)
- {
- 	remove_attribute(diff_track_attribute);
--	foreach (const config &i, diff.child_range("delete_child"))
-+	BOOST_FOREACH(const config &i, diff.child_range("delete_child"))
- 	{
- 		const size_t index = lexical_cast<size_t>(i["index"].str());
--		foreach (const any_child &item, i.all_children_range()) {
-+		BOOST_FOREACH(const any_child &item, i.all_children_range()) {
- 			remove_child(item.key, index);
- 		}
- 	}
- 
--	foreach (const config &i, diff.child_range("change_child"))
-+	BOOST_FOREACH(const config &i, diff.child_range("change_child"))
- 	{
- 		const size_t index = lexical_cast<size_t>(i["index"].str());
--		foreach (const any_child &item, i.all_children_range())
-+		BOOST_FOREACH(const any_child &item, i.all_children_range())
- 		{
- 			if (item.key.empty()) {
- 				continue;
-@@ -943,7 +943,7 @@
- 			itor->second[index]->clear_diff_track(item.cfg);
- 		}
- 	}
--	foreach (const any_child &value, all_children_range()) {
-+	BOOST_FOREACH(const any_child &value, all_children_range()) {
- 		const_cast<config *>(&value.cfg)->remove_attribute(diff_track_attribute);
- 	}
- }
-@@ -984,20 +984,20 @@
- {
- 	check_valid(filter);
- 
--	foreach (const attribute &i, filter.attribute_range())
-+	BOOST_FOREACH(const attribute &i, filter.attribute_range())
- 	{
- 		const attribute_value *v = get(i.first);
- 		if (!v || *v != i.second) return false;
- 	}
- 
--	foreach (const any_child &i, filter.all_children_range())
-+	BOOST_FOREACH(const any_child &i, filter.all_children_range())
- 	{
- 		if (i.key == "not") {
- 			if (matches(i.cfg)) return false;
- 			continue;
- 		}
- 		bool found = false;
--		foreach (const config &j, child_range(i.key)) {
-+		BOOST_FOREACH(const config &j, child_range(i.key)) {
- 			if (j.matches(i.cfg)) {
- 				found = true;
- 				break;
-@@ -1021,11 +1021,11 @@
- {
- 	static int i = 0;
- 	i++;
--	foreach (const config::attribute &val, cfg.attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &val, cfg.attribute_range()) {
- 		for (int j = 0; j < i-1; j++){ outstream << char(9); }
- 		outstream << val.first << " = " << val.second << '\n';
- 	}
--	foreach (const config::any_child &child, cfg.all_children_range())
-+	BOOST_FOREACH(const config::any_child &child, cfg.all_children_range())
- 	{
- 		for (int j = 0; j < i - 1; ++j) outstream << char(9);
- 		outstream << "[" << child.key << "]\n";
-@@ -1054,7 +1054,7 @@
- 	hash_str[hash_length] = 0;
- 
- 	i = 0;
--	foreach (const attribute &val, values)
-+	BOOST_FOREACH(const attribute &val, values)
- 	{
- 		for (c = val.first.begin(); c != val.first.end(); ++c) {
- 			hash_str[i] ^= *c;
-@@ -1067,10 +1067,10 @@
- 		}
- 	}
- 
--	foreach (const any_child &ch, all_children_range())
-+	BOOST_FOREACH(const any_child &ch, all_children_range())
- 	{
- 		std::string child_hash = ch.cfg.hash();
--		foreach (char c, child_hash) {
-+		BOOST_FOREACH(char c, child_hash) {
- 			hash_str[i] ^= c;
- 			++i;
- 			if(i == hash_length) {
-Index: src/soundsource.cpp
-===================================================================
---- src/soundsource.cpp	(revision 54624)
-+++ src/soundsource.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- 
- #include "display.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "serialization/string_utils.hpp"
- #include "sound.hpp"
-Index: src/sound.cpp
-===================================================================
---- src/sound.cpp	(revision 54624)
-+++ src/sound.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "config.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "log.hpp"
- #include "serialization/string_utils.hpp"
-@@ -27,6 +26,8 @@
- 
- #include "SDL_mixer.h"
- 
-+#include <boost/foreach.hpp>
-+
- #include <list>
- 
- static lg::log_domain log_audio("audio");
-@@ -596,7 +597,7 @@
- 		return;
- 
- 	// If current track no longer on playlist, change it.
--	foreach (const music_track &m, current_track_list) {
-+	BOOST_FOREACH(const music_track &m, current_track_list) {
- 		if (current_track == m)
- 			return;
- 	}
-@@ -614,7 +615,7 @@
- {
- 	// First entry clears playlist, others append to it.
- 	bool append = false;
--	foreach (music_track &m, current_track_list) {
-+	BOOST_FOREACH(music_track &m, current_track_list) {
- 		m.write(snapshot, append);
- 		append = true;
- 	}
-Index: src/game_preferences.cpp
-===================================================================
---- src/game_preferences.cpp	(revision 54624)
-+++ src/game_preferences.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #define GETTEXT_DOMAIN "wesnoth-lib"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
- #include "gamestatus.hpp"
-@@ -31,6 +30,8 @@
- #include "unit_map.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_CFG LOG_STREAM(err , log_config)
- 
-@@ -112,9 +113,9 @@
- 				message = foobar
- 			[/line]
- */
--		foreach (const config::any_child &h, history.all_children_range())
-+		BOOST_FOREACH(const config::any_child &h, history.all_children_range())
- 		{
--			foreach (const config &l, h.cfg.child_range("line")) {
-+			BOOST_FOREACH(const config &l, h.cfg.child_range("line")) {
- 				history_map[h.key].push_back(l["message"]);
- 			}
- 		}
-@@ -142,10 +143,10 @@
- */
- 	config history;
- 	typedef std::pair<std::string, std::vector<std::string> > hack;
--	foreach(const hack& history_id, history_map) {
-+	BOOST_FOREACH(const hack& history_id, history_map) {
- 
- 		config history_id_cfg; // [history_id]
--		foreach(const std::string& line, history_id.second) {
-+		BOOST_FOREACH(const std::string& line, history_id.second) {
- 			config cfg; // [line]
- 
- 			cfg["message"] = line;
-@@ -314,7 +315,7 @@
- 		std::vector<game_config::server_info> &game_servers = game_config::server_list;
- 		VALIDATE(!game_servers.empty(), _("No server has been defined."));
- 		pref_servers.insert(pref_servers.begin(), game_servers.begin(), game_servers.end());
--		foreach (const config &server, get_prefs()->child_range("server")) {
-+		BOOST_FOREACH(const config &server, get_prefs()->child_range("server")) {
- 			game_config::server_info sinf;
- 			sinf.name = server["name"].str();
- 			sinf.address = server["address"].str();
-@@ -945,8 +946,8 @@
- }
- 
- void encounter_recallable_units(std::vector<team>& teams){
--	foreach(const team& t, teams) {
--		foreach(const unit& u, t.recall_list()) {
-+	BOOST_FOREACH(const team& t, teams) {
-+		BOOST_FOREACH(const unit& u, t.recall_list()) {
- 			encountered_units_set.insert(u.type_id());
- 		}
- 	}
-Index: src/map_label.cpp
-===================================================================
---- src/map_label.cpp	(revision 54624)
-+++ src/map_label.cpp	(revision 54625)
-@@ -16,12 +16,13 @@
- #include "global.hpp"
- 
- #include "display.hpp"
--#include "foreach.hpp"
- #include "gamestatus.hpp"
- #include "map_label.hpp"
- #include "resources.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- //our definition of map labels being obscured is if the tile is obscured,
- //or the tile below is obscured. This is because in the case where the tile
- //itself is visible, but the tile below is obscured, the bottom half of the
-@@ -59,7 +60,7 @@
- {
- 	clear_all();
- 
--	foreach (const config &i, cfg.child_range("label"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("label"))
- 	{
- 		const map_location loc(i, resources::state_of_game);
- 		terrain_label *label = new terrain_label(*this, i);
-@@ -222,7 +223,7 @@
- 
- void map_labels::clear_all()
- {
--	foreach (team_label_map::value_type &m, labels_)
-+	BOOST_FOREACH(team_label_map::value_type &m, labels_)
- 	{
- 		clear_map(m.second, true);
- 	}
-@@ -231,9 +232,9 @@
- 
- void map_labels::recalculate_labels()
- {
--	foreach (team_label_map::value_type &m, labels_)
-+	BOOST_FOREACH(team_label_map::value_type &m, labels_)
- 	{
--		foreach (label_map::value_type &l, m.second)
-+		BOOST_FOREACH(label_map::value_type &l, m.second)
- 		{
- 			l.second->recalculate();
- 		}
-@@ -249,9 +250,9 @@
- 
- void map_labels::recalculate_shroud()
- {
--	foreach (team_label_map::value_type &m, labels_)
-+	BOOST_FOREACH(team_label_map::value_type &m, labels_)
- 	{
--		foreach (label_map::value_type &l, m.second)
-+		BOOST_FOREACH(label_map::value_type &l, m.second)
- 		{
- 			l.second->calculate_shroud();
- 		}
-Index: src/actions.cpp
-===================================================================
---- src/actions.cpp	(revision 54624)
-+++ src/actions.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "actions.hpp"
- 
- #include "attack_prediction.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_events.hpp"
- #include "game_preferences.hpp"
-@@ -40,6 +39,7 @@
- #include "whiteboard/manager.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
-@@ -206,7 +206,7 @@
- 	placements.push_back("map");
- 	placements.push_back("recall");
- 
--	foreach(std::string place, placements) {
-+	BOOST_FOREACH(std::string place, placements) {
- 		map_location loc;
- 		bool pass((place == "leader_passable") || (place == "map_passable"));
- 
-@@ -417,7 +417,7 @@
- 				leader_in_place= true;
- 			else continue;
- 
--			foreach (const unit& recall_unit, recall_list)
-+			BOOST_FOREACH(const unit& recall_unit, recall_list)
- 			{
- 				//Only units which match the leaders recall filter are valid.
- 				scoped_recall_unit this_unit("this_unit", t.save_id(), &recall_unit - &recall_list[0]);
-@@ -435,7 +435,7 @@
- 	}
- 
- 	if (!(recall_loc_is_castle && leader_in_place)) {
--		foreach (const unit &recall, recall_list)
-+		BOOST_FOREACH(const unit &recall, recall_list)
- 		{
- 			result.push_back(&recall);
- 		}
-@@ -546,7 +546,7 @@
- 
- 		bool can_recruit_unit = is_on_team_list;
- 		if (!can_recruit_unit) {
--			foreach (const std::string &recruitable, leader->recruits()) {
-+			BOOST_FOREACH(const std::string &recruitable, leader->recruits()) {
- 				if (recruitable == unit_type) {
- 					can_recruit_unit = true;
- 					break;
-@@ -1925,7 +1925,7 @@
- // Simple algorithm: no maximum number of patients per healer.
- void reset_resting(unit_map& units, int side)
- {
--	foreach (unit &u, units) {
-+	BOOST_FOREACH(unit &u, units) {
- 		if (u.side() == side)
- 			u.set_resting(true);
- 	}
-@@ -1946,7 +1946,7 @@
- 	std::list<unit_healing_struct> l;
- 
- 	// We look for all allied units, then we see if our healer is near them.
--	foreach (unit &u, units) {
-+	BOOST_FOREACH(unit &u, units) {
- 
- 		if (u.get_state("unhealable") || u.incapacitated())
- 			continue;
-@@ -2307,7 +2307,7 @@
- 		}
- 
- 		pathfind::paths p(*resources::game_map, *resources::units, loc, *resources::teams, true, false, tm, 0, false, true);
--		foreach (const pathfind::paths::step &dest, p.destinations) {
-+		BOOST_FOREACH(const pathfind::paths::step &dest, p.destinations) {
- 			clear_shroud_loc(tm, dest.curr, &cleared_locations);
- 		}
- 
-@@ -2350,7 +2350,7 @@
- 
- 	tm.refog();
- 
--	foreach (unit &u, *resources::units)
-+	BOOST_FOREACH(unit &u, *resources::units)
- 	{
- 		if (u.side() == side) {
- 			const unit_movement_resetter move_resetter(u);
-@@ -2372,7 +2372,7 @@
- 
- 	bool result = false;
- 
--	foreach (unit &u, *resources::units)
-+	BOOST_FOREACH(unit &u, *resources::units)
- 	{
- 		if (u.side() == side) {
- 			const unit_movement_resetter move_resetter(u);
-@@ -2435,7 +2435,7 @@
- 
- 	std::set<map_location> known_units;
- 	if(check_shroud) {
--		foreach (const unit &u, units) {
-+		BOOST_FOREACH(const unit &u, units) {
- 			if (!tm->fogged(u.get_location())) {
- 				known_units.insert(u.get_location());
- 				tm->see(u.side() - 1);
-@@ -2860,7 +2860,7 @@
- 	*/
- 
- 	std::set<map_location> known_units;
--	foreach (const unit &u, units) {
-+	BOOST_FOREACH(const unit &u, units) {
- 		if (!tm.fogged(u.get_location())) {
- 			known_units.insert(u.get_location());
- 		}
-Index: src/font.cpp
-===================================================================
---- src/font.cpp	(revision 54624)
-+++ src/font.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "config.hpp"
- #include "filesystem.hpp"
- #include "font.hpp"
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "log.hpp"
- #include "marked-up_text.hpp"
-@@ -32,6 +31,8 @@
- #include "serialization/preprocessor.hpp"
- #include "serialization/string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <list>
- #include <set>
- #include <stack>
-@@ -355,10 +356,10 @@
- #endif
- 
- #if CAIRO_HAS_WIN32_FONT
--	foreach(const std::string& path, get_binary_paths("fonts")) {
-+	BOOST_FOREACH(const std::string& path, get_binary_paths("fonts")) {
- 		std::vector<std::string> files;
- 		get_files_in_dir(path, &files, NULL, ENTIRE_FILE_PATH);
--		foreach(const std::string& file, files)
-+		BOOST_FOREACH(const std::string& file, files)
- 			if(file.substr(file.length() - 4) == ".ttf" || file.substr(file.length() - 4) == ".ttc")
- 				AddFontResource(file.c_str());
- 	}
-@@ -372,10 +373,10 @@
- #endif
- 
- #if CAIRO_HAS_WIN32_FONT
--	foreach(const std::string& path, get_binary_paths("fonts")) {
-+	BOOST_FOREACH(const std::string& path, get_binary_paths("fonts")) {
- 		std::vector<std::string> files;
- 		get_files_in_dir(path, &files, NULL, ENTIRE_FILE_PATH);
--		foreach(const std::string& file, files)
-+		BOOST_FOREACH(const std::string& file, files)
- 			if(file.substr(file.length() - 4) == ".ttf" || file.substr(file.length() - 4) == ".ttc")
- 				RemoveFontResource(file.c_str());
- 	}
-@@ -425,7 +426,7 @@
- 		const subset_id subset = font_names.size();
- 		font_names.push_back(itor->name);
- 
--		foreach (const subset_descriptor::range &cp_range, itor->present_codepoints) {
-+		BOOST_FOREACH(const subset_descriptor::range &cp_range, itor->present_codepoints) {
- 			char_blocks.insert(cp_range.first, cp_range.second, subset);
- 		}
- 	}
-@@ -582,7 +583,7 @@
- 	w_ = 0;
- 	h_ = 0;
- 
--	foreach (text_chunk const &chunk, chunks_)
-+	BOOST_FOREACH(text_chunk const &chunk, chunks_)
- 	{
- 		TTF_Font* ttfont = get_font(font_id(chunk.subset, font_size_));
- 		if(ttfont == NULL)
-@@ -628,7 +629,7 @@
- 	if(width() > max_text_line_width)
- 		return surfs_;
- 
--	foreach (text_chunk const &chunk, chunks_)
-+	BOOST_FOREACH(text_chunk const &chunk, chunks_)
- 	{
- 		TTF_Font* ttfont = get_font(font_id(chunk.subset, font_size_));
- 		if (ttfont == NULL)
-@@ -1261,7 +1262,7 @@
- 		return false;
- 
- 	std::set<std::string> known_fonts;
--	foreach (const config &font, fonts_config.child_range("font")) {
-+	BOOST_FOREACH(const config &font, fonts_config.child_range("font")) {
- 		known_fonts.insert(font["name"]);
- 	}
- 
-Index: src/unit_animation.cpp
-===================================================================
---- src/unit_animation.cpp	(revision 54624)
-+++ src/unit_animation.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "unit_animation.hpp"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "halo.hpp"
- #include "map.hpp"
-@@ -26,6 +25,8 @@
- #include "resources.hpp"
- #include "play_controller.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <algorithm>
- 
- struct tag_name_manager {
-@@ -78,7 +79,7 @@
- 	config merge() const
- 	{
- 		config result = attributes;
--		foreach (const config::all_children_iterator &i, children)
-+		BOOST_FOREACH(const config::all_children_iterator &i, children)
- 			result.add_child(i->key, i->cfg);
- 		return result;
- 	}
-@@ -99,7 +100,7 @@
- 	animation_cursor(const config &cfg, animation_cursor *p):
- 		itors(cfg.all_children_range()), branches(p->branches), parent(p)
- 	{
--		foreach (animation_branch &ab, branches)
-+		BOOST_FOREACH(animation_branch &ab, branches)
- 			ab.attributes.merge_attributes(cfg);
- 	}
- };
-@@ -122,7 +123,7 @@
- 		if (ac.itors.first->key != "if")
- 		{
- 			// Append current config object to all the branches in scope.
--			foreach (animation_branch &ab, ac.branches) {
-+			BOOST_FOREACH(animation_branch &ab, ac.branches) {
- 				ab.children.push_back(ac.itors.first);
- 			}
- 			++ac.itors.first;
-@@ -154,7 +155,7 @@
- static animation_branches prepare_animation(const config &cfg, const std::string &animation_tag)
- {
- 	animation_branches expanded_animations;
--	foreach (const config &anim, cfg.child_range(animation_tag)) {
-+	BOOST_FOREACH(const config &anim, cfg.child_range(animation_tag)) {
- 		prepare_single_animation(anim, expanded_animations);
- 	}
- 	return expanded_animations;
-@@ -207,7 +208,7 @@
- 	overlaped_hex_()
- {
- //	if(!cfg["debug"].empty()) printf("DEBUG WML: FINAL\n%s\n\n",cfg.debug().c_str());
--	foreach (const config::any_child &fr, cfg.all_children_range())
-+	BOOST_FOREACH(const config::any_child &fr, cfg.all_children_range())
- 	{
- 		if (fr.key == frame_string) continue;
- 		if (fr.key.find("_frame", fr.key.size() - 6) == std::string::npos) continue;
-@@ -221,11 +222,11 @@
- 		const map_location::DIRECTION d = map_location::parse_direction(*i);
- 		directions_.push_back(d);
- 	}
--	foreach (const config &filter, cfg.child_range("filter")) {
-+	BOOST_FOREACH(const config &filter, cfg.child_range("filter")) {
- 		unit_filter_.push_back(filter);
- 	}
- 
--	foreach (const config &filter, cfg.child_range("filter_second")) {
-+	BOOST_FOREACH(const config &filter, cfg.child_range("filter_second")) {
- 		secondary_unit_filter_.push_back(filter);
- 	}
- 
-@@ -253,10 +254,10 @@
- 	for(value2=value2_str.begin() ; value2 != value2_str.end() ; ++value2) {
- 		value2_.push_back(atoi(value2->c_str()));
- 	}
--	foreach (const config &filter, cfg.child_range("filter_attack")) {
-+	BOOST_FOREACH(const config &filter, cfg.child_range("filter_attack")) {
- 		primary_attack_filter_.push_back(filter);
- 	}
--	foreach (const config &filter, cfg.child_range("filter_second_attack")) {
-+	BOOST_FOREACH(const config &filter, cfg.child_range("filter_second_attack")) {
- 		secondary_attack_filter_.push_back(filter);
- 	}
- 	play_offscreen_ = cfg["offscreen"].to_bool(true);
-@@ -487,7 +488,7 @@
- 	display::tdrawing_layer layer = display::LAYER_UNIT_DEFAULT,
- 	bool offscreen = true)
- {
--	foreach (const animation_branch &ab, prepare_animation(cfg, tag_name))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, tag_name))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = apply_to;
-@@ -503,7 +504,7 @@
- 
- void unit_animation::add_anims( std::vector<unit_animation> & animations, const config & cfg)
- {
--	foreach (const animation_branch &ab, prepare_animation(cfg, "animation")) {
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "animation")) {
- 		animations.push_back(unit_animation(ab.merge()));
- 	}
- 
-@@ -519,7 +520,7 @@
- 	add_simple_anim(animations, cfg, "levelin_anim", "levelin");
- 	add_simple_anim(animations, cfg, "levelout_anim", "levelout");
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "standing_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "standing_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "default";
-@@ -528,7 +529,7 @@
- 		if (anim["offscreen"].empty()) anim["offscreen"] = false;
- 		animations.push_back(unit_animation(anim));
- 	}
--	foreach (const animation_branch &ab, prepare_animation(cfg, "standing_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "standing_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "standing";
-@@ -537,7 +538,7 @@
- 		if (anim["offscreen"].empty()) anim["offscreen"] = false;
- 		animations.push_back(unit_animation(anim));
- 	}
--	foreach (const animation_branch &ab, prepare_animation(cfg, "healing_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "healing_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "healing";
-@@ -546,7 +547,7 @@
- 		animations.push_back(unit_animation(anim));
- 	}
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "healed_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "healed_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "healed";
-@@ -558,7 +559,7 @@
- 		animations.back().sub_anims_["_healed_sound"].add_frame(1,frame_builder().sound("heal.wav"),true);
- 	}
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "poison_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "poison_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] ="poisoned";
-@@ -572,7 +573,7 @@
- 
- 	add_simple_anim(animations, cfg, "pre_movement_anim", "pre_movement", display::LAYER_UNIT_MOVE_DEFAULT);
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "movement_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "movement_anim"))
- 	{
- 		config anim = ab.merge();
- 		if (anim["offset"].empty()) {
-@@ -585,7 +586,7 @@
- 
- 	add_simple_anim(animations, cfg, "post_movement_anim", "post_movement", display::LAYER_UNIT_MOVE_DEFAULT);
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "defend"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "defend"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "defend";
-@@ -607,7 +608,7 @@
- 		else
- 		{
- 			std::vector<std::string> v = utils::split(anim["hits"]);
--			foreach (const std::string &hit_type, v)
-+			BOOST_FOREACH(const std::string &hit_type, v)
- 			{
- 				config tmp = anim;
- 				tmp["hits"] = hit_type;
-@@ -625,7 +626,7 @@
- 	add_simple_anim(animations, cfg, "draw_weapon_anim", "draw_wepaon", display::LAYER_UNIT_MOVE_DEFAULT);
- 	add_simple_anim(animations, cfg, "sheath_weapon_anim", "sheath_wepaon", display::LAYER_UNIT_MOVE_DEFAULT);
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "attack_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "attack_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "attack";
-@@ -646,7 +647,7 @@
- 		animations.push_back(unit_animation(anim));
- 	}
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "death"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "death"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "death";
-@@ -663,7 +664,7 @@
- 
- 	add_simple_anim(animations, cfg, "victory_anim", "victory");
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "extra_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "extra_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = anim["flag"];
-@@ -671,7 +672,7 @@
- 		animations.push_back(unit_animation(anim));
- 	}
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "teleport_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "teleport_anim"))
- 	{
- 		config anim = ab.merge();
- 		if (anim["layer"].empty()) anim["layer"] = default_layer;
-@@ -742,14 +743,14 @@
- 	config::const_child_itors range = cfg.child_range(frame_string+"frame");
- 	starting_frame_time_=INT_MAX;
- 	if(cfg[frame_string+"start_time"].empty() &&range.first != range.second) {
--		foreach (const config &frame, range) {
-+		BOOST_FOREACH(const config &frame, range) {
- 			starting_frame_time_ = std::min(starting_frame_time_, frame["begin"].to_int());
- 		}
- 	} else {
- 		starting_frame_time_ = cfg[frame_string+"start_time"];
- 	}
- 
--	foreach (const config &frame, range)
-+	BOOST_FOREACH(const config &frame, range)
- 	{
- 		unit_frame tmp_frame(frame);
- 		add_frame(tmp_frame.duration(),tmp_frame,!tmp_frame.does_not_change());
-Index: src/storyscreen/render.cpp
-===================================================================
---- src/storyscreen/render.cpp	(revision 54624)
-+++ src/storyscreen/render.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- 
- #include "global.hpp"
- #include "asserts.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "storyscreen/part.hpp"
- #include "storyscreen/render.hpp"
-@@ -34,6 +33,8 @@
- #include "text.hpp"
- #include "video.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG  LOG_STREAM(err,  log_engine)
- #define WARN_NG LOG_STREAM(warn, log_engine)
-@@ -167,7 +168,7 @@
- void part_ui::prepare_floating_images()
- {
- 	// Build floating image surfaces
--	foreach(const floating_image& fi, p_.get_floating_images()) {
-+	BOOST_FOREACH(const floating_image& fi, p_.get_floating_images()) {
- 		imgs_.push_back( fi.get_render_input(scale_factor_, base_rect_) );
- 	}
- }
-@@ -190,7 +191,7 @@
- 	last_key_ = true;
- 
- 	size_t fi_n = 0;
--	foreach(floating_image::render_input& ri, imgs_) {
-+	BOOST_FOREACH(floating_image::render_input& ri, imgs_) {
- 		const floating_image& fi = p_.get_floating_images()[fi_n];
- 
- 		if(!ri.image.null()) {
-Index: src/storyscreen/interface.cpp
-===================================================================
---- src/storyscreen/interface.cpp	(revision 54624)
-+++ src/storyscreen/interface.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
-  */
- 
- #include "global.hpp"
--#include "foreach.hpp"
- #include "variable.hpp"
- 
- #include "storyscreen/interface.hpp"
-Index: src/storyscreen/controller.cpp
-===================================================================
---- src/storyscreen/controller.cpp	(revision 54624)
-+++ src/storyscreen/controller.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "storyscreen/render.hpp"
- 
- #include "asserts.hpp"
--#include "foreach.hpp"
- #include "variable.hpp"
- 
- #include "display.hpp"
-@@ -37,6 +36,8 @@
- #include "resources.hpp"
- #include "widgets/button.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- #define LOG_NG LOG_STREAM(info, log_engine)
-@@ -138,7 +139,7 @@
- 	// caching the scaled backgrounds can take over a decent amount of memory.
- #ifndef LOW_MEM
- 	std::vector< render_pointer_type > uis_;
--	foreach(part_pointer_type p, parts_) {
-+	BOOST_FOREACH(part_pointer_type p, parts_) {
- 		ASSERT_LOG( p != NULL, "Ouch: hit NULL storyscreen part in collection" );
- 		render_pointer_type const rpt(new part_ui(*p, disp_, next_button, back_button, play_button));
- 		uis_.push_back(rpt);
-Index: src/storyscreen/part.cpp
-===================================================================
---- src/storyscreen/part.cpp	(revision 54624)
-+++ src/storyscreen/part.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- 
- #include "global.hpp"
- #include "asserts.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "resources.hpp"
- #include "storyscreen/part.hpp"
-Index: src/game.cpp
-===================================================================
---- src/game.cpp	(revision 54624)
-+++ src/game.cpp	(revision 54625)
-@@ -40,6 +40,7 @@
- #include <fstream>
- #include <libintl.h>
- 
-+#include <boost/foreach.hpp>
- #include <boost/iostreams/copy.hpp>
- #include <boost/iostreams/filter/gzip.hpp>
- 
-@@ -218,7 +219,7 @@
- 			int read = 0;
- 
- 			// use static preproc_define::read_pair(config) to make a object
--			foreach ( const config::any_child &value, cfg.all_children_range() ) {
-+			BOOST_FOREACH( const config::any_child &value, cfg.all_children_range() ) {
- 				const preproc_map::value_type def = preproc_define::read_pair( value.cfg );
- 				input_macros[def.first] = def.second;
- 				++read;
-@@ -245,7 +246,7 @@
- 		if ( cmdline_opts.preprocess_defines ) {
- 
- 			// add the specified defines
--			foreach ( const std::string &define, *cmdline_opts.preprocess_defines ) {
-+			BOOST_FOREACH( const std::string &define, *cmdline_opts.preprocess_defines ) {
- 				if (define.empty()){
- 					std::cerr << "empty define supplied\n";
- 					continue;
-@@ -452,7 +453,7 @@
- 			const config &cfg = game->game_config().child("titlescreen_music");
- 			if (cfg) {
- 	            sound::play_music_repeatedly(game_config::title_music);
--				foreach (const config &i, cfg.child_range("music")) {
-+				BOOST_FOREACH(const config &i, cfg.child_range("music")) {
- 					sound::play_music_config(i);
- 				}
- 				sound::commit_music_changes();
-Index: src/playsingle_controller.cpp
-===================================================================
---- src/playsingle_controller.cpp	(revision 54624)
-+++ src/playsingle_controller.cpp	(revision 54625)
-@@ -27,7 +27,6 @@
- #include "ai/game_info.hpp"
- #include "ai/testing.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_events.hpp"
- #include "game_preferences.hpp"
-@@ -48,6 +47,8 @@
- #include "whiteboard/manager.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- #define LOG_NG LOG_STREAM(info, log_engine)
-@@ -324,7 +325,7 @@
- 	LOG_NG << "in playsingle_controller::play_scenario()...\n";
- 
- 	// Start music.
--	foreach (const config &m, level_.child_range("music")) {
-+	BOOST_FOREACH(const config &m, level_.child_range("music")) {
- 		sound::play_music_config(m);
- 	}
- 	sound::commit_music_changes();
-@@ -336,7 +337,7 @@
- 
- 	// Read sound sources
- 	assert(soundsources_manager_ != NULL);
--	foreach (const config &s, level_.child_range("sound_source")) {
-+	BOOST_FOREACH(const config &s, level_.child_range("sound_source")) {
- 		soundsource::sourcespec spec(s);
- 		soundsources_manager_->add(spec);
- 	}
-@@ -906,14 +907,14 @@
- 			new_side["previous_recruits"] = can_recruit_str;
- 			LOG_NG << "stored side in snapshot:\n" << new_side["save_id"] << std::endl;
- 			//add the units of the recall list
--			foreach(const unit& u, i->recall_list()) {
-+			BOOST_FOREACH(const unit& u, i->recall_list()) {
- 				config& new_unit = new_side.add_child("unit");
- 				u.write(new_unit);
- 			}
- 		}
- 	}
- 	//add any players from starting_pos that do not have a team in the current scenario
--	foreach (const config &player_cfg, gamestate_.starting_pos.child_range("player")) {
-+	BOOST_FOREACH(const config &player_cfg, gamestate_.starting_pos.child_range("player")) {
- 		if (side_ids.count(player_cfg["save_id"]) == 0) {
- 			LOG_NG << "stored inactive side in snapshot:\n" << player_cfg["save_id"] << std::endl;
- 			gamestate_.snapshot.add_child("side", player_cfg);
-@@ -938,7 +939,7 @@
- 	}
- 
- 	int persistent_teams = 0;
--	foreach (const team &t, teams_) {
-+	BOOST_FOREACH(const team &t, teams_) {
- 		if (t.persistent()) ++persistent_teams;
- 	}
- 
-@@ -953,7 +954,7 @@
- 		int turns_left = std::max<int>(0, tod_manager_.number_of_turns() - turn());
- 		int finishing_bonus = (end_level.gold_bonus && turns_left > -1) ?
- 			finishing_bonus_per_turn * turns_left : 0;
--		foreach (const team &t, teams_)
-+		BOOST_FOREACH(const team &t, teams_)
- 		{
- 			if (!t.persistent()) continue;
- 			int carryover_gold = div100rounded((t.gold() + finishing_bonus) * end_level.carryover_percentage);
-Index: src/controller_base.cpp
-===================================================================
---- src/controller_base.cpp	(revision 54624)
-+++ src/controller_base.cpp	(revision 54625)
-@@ -18,11 +18,12 @@
- 
- #include "dialogs.hpp"
- #include "display.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "log.hpp"
- #include "mouse_handler_base.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_display("display");
- #define ERR_DP LOG_STREAM(err, log_display)
- 
-@@ -144,7 +145,7 @@
- 	int dx = 0, dy = 0;
- 	int scroll_threshold = (preferences::mouse_scroll_enabled())
- 		? preferences::mouse_scroll_threshold() : 0;
--	foreach (const theme::menu& m, get_display().get_theme().menus()) {
-+	BOOST_FOREACH(const theme::menu& m, get_display().get_theme().menus()) {
- 		if (point_in_rect(mousex, mousey, m.get_location())) {
- 			scroll_threshold = 0;
- 		}
-Index: src/gamestatus.cpp
-===================================================================
---- src/gamestatus.cpp	(revision 54624)
-+++ src/gamestatus.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- #include "gamestatus.hpp"
- 
- #include "actions.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
- #include "game_preferences.hpp"
-@@ -42,6 +41,7 @@
- #include "whiteboard/side_actions.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #ifndef _MSC_VER
- #include <sys/time.h>
-@@ -178,9 +178,9 @@
- 		tags.push_back("side");
- 		tags.push_back("player"); //merge [player] tags for backwards compatibility of saves
- 
--		foreach (const std::string& side_tag, tags)
-+		BOOST_FOREACH(const std::string& side_tag, tags)
- 		{
--			foreach (config &carryover_side, source->child_range(side_tag))
-+			BOOST_FOREACH(config &carryover_side, source->child_range(side_tag))
- 			{
- 				config *scenario_side = NULL;
- 
-@@ -226,13 +226,13 @@
- 				(*scenario_side)["color"] = carryover_side["color"];
- 
- 				//add recallable units
--				foreach (const config &u, carryover_side.child_range("unit")) {
-+				BOOST_FOREACH(const config &u, carryover_side.child_range("unit")) {
- 					scenario_side->add_child("unit", u);
- 				}
- 			}
- 		}
- 	} else {
--		foreach(const config &snapshot_side, source->child_range("side")) {
-+		BOOST_FOREACH(const config &snapshot_side, source->child_range("side")) {
- 			//take all side tags and add them as players (assuming they only contain carryover information)
- 			cfg.add_child("player", snapshot_side);
- 		}
-@@ -306,7 +306,7 @@
- 		//See also playcampaign::play_game, where after finishing the scenario the replay
- 		//will be saved.
- 		if(!starting_pos.empty()) {
--			foreach (const config &p, cfg.child_range("player")) {
-+			BOOST_FOREACH(const config &p, cfg.child_range("player")) {
- 				config& cfg_player = starting_pos.add_child("player");
- 				cfg_player.merge_with(p);
- 			}
-@@ -400,7 +400,7 @@
- 	std::string leader;
- 	std::string leader_image;
- 
--	//foreach (const config &p, cfg_save.child_range("player"))
-+	//BOOST_FOREACH(const config &p, cfg_save.child_range("player"))
- 	//{
- 	//	if (utils::string_bool(p["canrecruit"], false)) {
- 	//		leader = p["save_id"];
-@@ -413,7 +413,7 @@
- 	//{
- 		if (const config &snapshot = *(has_snapshot ? &cfg_snapshot : &cfg_replay_start))
- 		{
--			foreach (const config &side, snapshot.child_range("side"))
-+			BOOST_FOREACH(const config &side, snapshot.child_range("side"))
- 			{
- 				if (side["controller"] != "human") {
- 					continue;
-@@ -430,7 +430,7 @@
- 						break;
- 				}
- 
--				foreach (const config &u, side.child_range("unit"))
-+				BOOST_FOREACH(const config &u, side.child_range("unit"))
- 				{
- 					if (u["canrecruit"].to_bool()) {
- 						leader = u["id"].str();
-@@ -794,7 +794,7 @@
- 		// can be recruited for the player, add them.
- 		if (!player_cfg_) return;
- 		if (const config::attribute_value *v = player_cfg_->get("previous_recruits")) {
--			foreach (const std::string &rec, utils::split(*v)) {
-+			BOOST_FOREACH(const std::string &rec, utils::split(*v)) {
- 				DBG_NG_TC << "adding previous recruit: " << rec << '\n';
- 				t_->add_recruit(rec);
- 			}
-@@ -857,7 +857,7 @@
- 		if (!side_cfg_["no_leader"].to_bool() && side_cfg_["controller"] != "null") {
- 			handle_leader(side_cfg_);
- 		}
--		foreach (const config &l, side_cfg_.child_range("leader")) {
-+		BOOST_FOREACH(const config &l, side_cfg_.child_range("leader")) {
- 			handle_leader(l);
- 		}
- 	}
-@@ -871,13 +871,13 @@
- 			//only relevant in start-of-scenario saves, that's why !shapshot
- 			//units that are in '[scenario][side]' are 'first'
- 			//for create-or-recall semantics to work: for each unit with non-empty id, unconditionally put OTHER, later, units with same id directly to recall list, not including them in unit_configs_
--			foreach(const config &u, (*player_cfg_).child_range("unit")) {
-+			BOOST_FOREACH(const config &u, (*player_cfg_).child_range("unit")) {
- 				handle_unit(u,"player_cfg");
- 			}
- 
- 		} else {
- 			//units in [side]
--			foreach (const config &su, side_cfg_.child_range("unit")) {
-+			BOOST_FOREACH(const config &su, side_cfg_.child_range("unit")) {
- 				handle_unit(su, "side_cfg");
- 			}
- 		}
-@@ -902,7 +902,7 @@
- 			"allow_changes", "faction_name", "user_description", "faction" };
- 
- 		log_step("place units");
--		foreach (const config *u, unit_configs_) {
-+		BOOST_FOREACH(const config *u, unit_configs_) {
- 			unit_creator uc(*t_,map_.starting_position(side_));
- 			uc
- 				.allow_add_to_recall(true)
-@@ -913,7 +913,7 @@
- 				.allow_show(false);
- 
- 			config cfg = *u;
--			foreach (const char *attr, side_attrs) {
-+			BOOST_FOREACH(const char *attr, side_attrs) {
- 				cfg.remove_attribute(attr);
- 			}
- 			uc.add_unit(cfg);
-@@ -953,7 +953,7 @@
- void game_state::set_menu_items(const config::const_child_itors &menu_items)
- {
- 	clear_wmi(wml_menu_items);
--	foreach (const config &item, menu_items)
-+	BOOST_FOREACH(const config &item, menu_items)
- 	{
- 		std::string id = item["id"];
- 		wml_menu_item*& mref = wml_menu_items[id];
-Index: src/log.cpp
-===================================================================
---- src/log.cpp	(revision 54624)
-+++ src/log.cpp	(revision 54625)
-@@ -25,8 +25,9 @@
- #include "SDL.h"
- 
- #include "log.hpp"
--#include "foreach.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <map>
- #include <sstream>
- #include <ctime>
-@@ -88,11 +89,11 @@
- {
- 	std::string::size_type s = name.size();
- 	if (name == "all") {
--		foreach (logd &l, *domains) {
-+		BOOST_FOREACH(logd &l, *domains) {
- 			l.second = severity;
- 		}
- 	} else if (s > 2 && name.compare(s - 2, 2, "/*") == 0) {
--		foreach (logd &l, *domains) {
-+		BOOST_FOREACH(logd &l, *domains) {
- 			if (l.first.compare(0, s - 1, name, 0, s - 1) == 0)
- 				l.second = severity;
- 		}
-@@ -108,7 +109,7 @@
- std::string list_logdomains(const std::string& filter)
- {
- 	std::ostringstream res;
--	foreach (logd &l, *domains) {
-+	BOOST_FOREACH(logd &l, *domains) {
- 		if(l.first.find(filter) != std::string::npos)
- 			res << l.first << "\n";
- 	}
-Index: src/replay_controller.cpp
-===================================================================
---- src/replay_controller.cpp	(revision 54624)
-+++ src/replay_controller.cpp	(revision 54625)
-@@ -16,7 +16,6 @@
- 
- #include "global.hpp"
- 
--#include "foreach.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_events.hpp"
- #include "gettext.hpp"
-@@ -27,6 +26,8 @@
- #include "resources.hpp"
- #include "savegame.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
- 
-@@ -417,7 +418,7 @@
- 			finish_side_turn();
- 
- 			// This is necessary for replays in order to show possible movements.
--			foreach (unit &u, units_) {
-+			BOOST_FOREACH(unit &u, units_) {
- 				if (u.side() != player_number_) {
- 					u.new_turn();
- 				}
-Index: src/multiplayer_ui.cpp
-===================================================================
---- src/multiplayer_ui.cpp	(revision 54624)
-+++ src/multiplayer_ui.cpp	(revision 54625)
-@@ -16,7 +16,6 @@
- #include "global.hpp"
- 
- #include "construct_dialog.hpp"
--#include "foreach.hpp"
- #include "gamestatus.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
-@@ -33,6 +32,8 @@
- #include "wml_separators.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
- #define ERR_NG LOG_STREAM(err, log_engine)
-@@ -163,9 +164,9 @@
- 			state.starting_pos.child_range("side");
- 		config::const_child_itors level_sides = level.child_range("side");
- 
--		foreach (config &side, saved_sides)
-+		BOOST_FOREACH(config &side, saved_sides)
- 		{
--			foreach (const config &lside, level_sides)
-+			BOOST_FOREACH(const config &lside, level_sides)
- 			{
- 				if (side["side"] == lside["side"] &&
- 						(side["current_player"] != lside["current_player"] ||
-@@ -599,7 +600,7 @@
- 		if (const config &ms = c.child("members")) {
- 			std::stringstream ss;
- 			ss << "Room " << c["room"].str() << " members: ";
--			foreach (const config& m, ms.child_range("member")) {
-+			BOOST_FOREACH(const config& m, ms.child_range("member")) {
- 				ss << m["name"] << " ";
- 			}
- 			chat_.add_message(time(NULL), "server", ss.str());
-@@ -608,7 +609,7 @@
- 		if (const config &rs = c.child("rooms")) {
- 			std::stringstream ss;
- 			ss << "Rooms: ";
--			foreach (const config& r, rs.child_range("room")) {
-+			BOOST_FOREACH(const config& r, rs.child_range("room")) {
- 				ss << r["name"].str() << "(" << r["size"].str() << ") ";
- 			}
- 			chat_.add_message(time(NULL), "server", ss.str());
-@@ -706,7 +707,7 @@
- {
- 	std::list<user_info> u_list;
- 
--	foreach (const config &user, gamelist_.child_range("user"))
-+	BOOST_FOREACH(const config &user, gamelist_.child_range("user"))
- 	{
- 		user_info u_elem;
- 		u_elem.name = user["name"].str();
-@@ -848,12 +849,12 @@
- 	}
- 
- 	int res = -1, index = 0, best_score = 0;
--	foreach (const config *faction, fl)
-+	BOOST_FOREACH(const config *faction, fl)
- 	{
- 		int faction_score = 0;
- 		std::vector<std::string> recruit = utils::split((*faction)[search_field]);
--		foreach (const std::string &search, find) {
--			foreach (const std::string &r, recruit) {
-+		BOOST_FOREACH(const std::string &search, find) {
-+			BOOST_FOREACH(const std::string &r, recruit) {
- 				if (r == search) {
- 					++faction_score;
- 					break;
-Index: src/display.cpp
-===================================================================
---- src/display.cpp	(revision 54624)
-+++ src/display.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "builder.hpp"
- #include "cursor.hpp"
- #include "display.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
- #include "halo.hpp"
-@@ -41,6 +40,8 @@
- 
- #include "SDL_image.h"
- 
-+#include <boost/foreach.hpp>
-+
- #ifdef __SUNPRO_CC
- // GCC doesn't have hypot in cmath so include it for Sun Studio
- #include <math.h>
-@@ -629,7 +630,7 @@
- 	// now get the surfaces
- 	std::vector<surface> res;
- 
--	foreach(std::string& name, names) {
-+	BOOST_FOREACH(std::string& name, names) {
- 		const surface surf(image::get_image(name, image_type));
- 		if (surf)
- 			res.push_back(surf);
-@@ -828,8 +829,8 @@
- 	 * layergroup > location > layer > 'tblit' > surface
- 	 */
- 
--	foreach(const tblit &blit, drawing_buffer_) {
--		foreach(const surface& surf, blit.surf()) {
-+	BOOST_FOREACH(const tblit &blit, drawing_buffer_) {
-+		BOOST_FOREACH(const surface& surf, blit.surf()) {
- 			// Note that dstrect can be changed by sdl_blit
- 			// and so a new instance should be initialized
- 			// to pass to each call to sdl_blit.
-@@ -1903,7 +1904,7 @@
- 	int ticks3 = SDL_GetTicks();
- 	LOG_DP << "invalidate and draw: " << (ticks3 - ticks2) << " and " << (ticks2 - ticks1) << "\n";
- 
--	foreach (boost::function<void(display&)> f, redraw_observers_) {
-+	BOOST_FOREACH(boost::function<void(display&)> f, redraw_observers_) {
- 		f(*this);
- 	}
- 
-@@ -1992,7 +1993,7 @@
- 	SDL_Rect clip_rect = get_clip_rect();
- 	surface screen = get_screen_surface();
- 	clip_rect_setter set_clip_rect(screen, &clip_rect);
--	foreach (const map_location& loc, invalidated_) {
-+	BOOST_FOREACH(const map_location& loc, invalidated_) {
- 		int xpos = get_location_x(loc);
- 		int ypos = get_location_y(loc);
- 
-@@ -2058,7 +2059,7 @@
- 	// Paint arrows
- 	arrows_map_t::const_iterator arrows_in_hex = arrows_map_.find(loc);
- 	if(arrows_in_hex != arrows_map_.end()) {
--		foreach(arrow* const a, arrows_in_hex->second) {
-+		BOOST_FOREACH(arrow* const a, arrows_in_hex->second) {
- 			a->draw_hex(loc);
- 		}
- 	}
-@@ -2388,7 +2389,7 @@
- 	if(invalidateAll_)
- 		return false;
- 	bool ret = false;
--	foreach (const map_location& loc, locs) {
-+	BOOST_FOREACH(const map_location& loc, locs) {
- #ifdef _OPENMP
- #pragma omp critical(invalidated_)
- #endif //_OPENMP
-@@ -2438,7 +2439,7 @@
- 		return false;
- 
- 	bool result = false;
--	foreach (const map_location &loc, hexes_under_rect(rect)) {
-+	BOOST_FOREACH(const map_location &loc, hexes_under_rect(rect)) {
- 		result |= invalidate(loc);
- 	}
- 	return result;
-@@ -2450,7 +2451,7 @@
- 	animate_map_ = preferences::animate_map();
- 	if (!animate_map_) return;
- 
--	foreach (const map_location &loc, get_visible_hexes())
-+	BOOST_FOREACH(const map_location &loc, get_visible_hexes())
- 	{
- 		if (shrouded(loc)) continue;
- 		if (builder_->update_animation(loc)) {
-@@ -2464,7 +2465,7 @@
- void display::add_arrow(arrow& arrow)
- {
- 	const arrow_path_t & arrow_path = arrow.get_path();
--	foreach (const map_location& loc, arrow_path)
-+	BOOST_FOREACH(const map_location& loc, arrow_path)
- 	{
- 		arrows_map_[loc].push_back(&arrow);
- 	}
-@@ -2473,7 +2474,7 @@
- void display::remove_arrow(arrow& arrow)
- {
- 	const arrow_path_t & arrow_path = arrow.get_path();
--	foreach (const map_location& loc, arrow_path)
-+	BOOST_FOREACH(const map_location& loc, arrow_path)
- 	{
- 		arrows_map_[loc].remove(&arrow);
- 	}
-@@ -2482,12 +2483,12 @@
- void display::update_arrow(arrow & arrow)
- {
- 	const arrow_path_t & previous_path = arrow.get_previous_path();
--	foreach (const map_location& loc, previous_path)
-+	BOOST_FOREACH(const map_location& loc, previous_path)
- 	{
- 		arrows_map_[loc].remove(&arrow);
- 	}
- 	const arrow_path_t & arrow_path = arrow.get_path();
--	foreach (const map_location& loc, arrow_path)
-+	BOOST_FOREACH(const map_location& loc, arrow_path)
- 	{
- 		arrows_map_[loc].push_back(&arrow);
- 	}
-Index: src/about.cpp
-===================================================================
---- src/about.cpp	(revision 54624)
-+++ src/about.cpp	(revision 54625)
-@@ -22,10 +22,11 @@
- 
- #include "construct_dialog.hpp"
- #include "display.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "marked-up_text.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- /**
-  * @namespace about
-  * Display credits %about all contributors.
-@@ -52,7 +53,7 @@
- 	}
- 
- 	std::vector<std::string> lines = utils::split(c["text"], '\n');
--	foreach (std::string &line, lines)
-+	BOOST_FOREACH(std::string &line, lines)
- 	{
- 		if (line.size() > 1 && line[0] == '+')
- 			line = "+  " + line.substr(1);
-@@ -67,7 +68,7 @@
- 		}
- 	}
- 
--	foreach (const config &entry, c.child_range("entry")) {
-+	BOOST_FOREACH(const config &entry, c.child_range("entry")) {
- 		res.push_back("-  "+ entry["name"].str());
- 	}
- }
-@@ -80,7 +81,7 @@
- 	config::child_itors about_entries = about_list.child_range("about");
- 
- 	if (!campaign.empty()) {
--		foreach (const config &about, about_entries) {
-+		BOOST_FOREACH(const config &about, about_entries) {
- 			// just finished a particular campaign
- 			if (campaign == about["id"]) {
- 				add_lines(res, about);
-@@ -88,7 +89,7 @@
- 		}
- 	}
- 
--	foreach (const config &about, about_entries) {
-+	BOOST_FOREACH(const config &about, about_entries) {
- 		add_lines(res, about);
- 	}
- 
-@@ -101,7 +102,7 @@
- 	images.clear();
- 	images_default = "";
- 
--	foreach (const config &about, cfg.child_range("about"))
-+	BOOST_FOREACH(const config &about, cfg.child_range("about"))
- 	{
- 		about_list.add_child("about", about);
- 		const std::string &im = about["images"];
-@@ -114,7 +115,7 @@
- 		}
- 	}
- 
--	foreach (const config &campaign, cfg.child_range("campaign"))
-+	BOOST_FOREACH(const config &campaign, cfg.child_range("campaign"))
- 	{
- 		config::const_child_itors abouts = campaign.child_range("about");
- 		if (abouts.first == abouts.second) continue;
-@@ -126,7 +127,7 @@
- 		temp["id"] = id;
- 		std::string campaign_images;
- 
--		foreach (const config &about, abouts)
-+		BOOST_FOREACH(const config &about, abouts)
- 		{
- 			const std::string &subtitle = about["title"];
- 			if (!subtitle.empty())
-@@ -139,12 +140,12 @@
- 				text << '\n';
- 			}
- 
--			foreach (const std::string &line, utils::split(about["text"], '\n'))
-+			BOOST_FOREACH(const std::string &line, utils::split(about["text"], '\n'))
- 			{
- 				text << "    " << line << '\n';
- 			}
- 
--			foreach (const config &entry, about.child_range("entry"))
-+			BOOST_FOREACH(const config &entry, about.child_range("entry"))
- 			{
- 				text << "    " << entry["name"] << '\n';
- 			}
-Index: src/arrow.cpp
-===================================================================
---- src/arrow.cpp	(revision 54624)
-+++ src/arrow.cpp	(revision 54625)
-@@ -20,11 +20,12 @@
- 
- #include "arrow.hpp"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "log.hpp"
- #include "resources.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_arrows("arrows");
- #define ERR_ARR LOG_STREAM(err, log_arrows)
- #define WRN_ARR LOG_STREAM(warn, log_arrows)
-@@ -293,7 +294,7 @@
- {
- 	if(!SCREEN) return;
- 
--	foreach(map_location const& loc, path)
-+	BOOST_FOREACH(map_location const& loc, path)
- 	{
- 		SCREEN->invalidate(loc);
- 	}
-Index: src/game_display.cpp
-===================================================================
---- src/game_display.cpp	(revision 54624)
-+++ src/game_display.cpp	(revision 54625)
-@@ -34,7 +34,6 @@
- Growl_Delegate growl_obj;
- #endif
- 
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "halo.hpp"
- #include "log.hpp"
-@@ -47,6 +46,8 @@
- #include "sound.hpp"
- #include "whiteboard/manager.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_display("display");
- #define ERR_DP LOG_STREAM(err, log_display)
- #define LOG_DP LOG_STREAM(info, log_display)
-@@ -297,7 +298,7 @@
- 	halo::unrender(invalidated_);
- 	display::draw_invalidated();
- 
--	foreach(unit* temp_unit, fake_units_) {
-+	BOOST_FOREACH(unit* temp_unit, fake_units_) {
- 		const map_location& loc = temp_unit->get_location();
- 		exclusive_unit_draw_requests_t::iterator request = exclusive_unit_draw_requests_.find(loc);
- 		if (invalidated_.find(loc) != invalidated_.end()
-@@ -305,7 +306,7 @@
- 			temp_unit->redraw_unit();
- 	}
- 
--	foreach (const map_location& loc, invalidated_) {
-+	BOOST_FOREACH(const map_location& loc, invalidated_) {
- 		unit_map::iterator u_it = units_.find(loc);
- 		exclusive_unit_draw_requests_t::iterator request = exclusive_unit_draw_requests_.find(loc);
- 		if (u_it != units_.end()
-@@ -451,7 +452,7 @@
- 
- 		// We display the unit the mouse is over if it is over a unit,
- 		// otherwise we display the unit that is selected.
--		foreach (const std::string &name, reports::report_list()) {
-+		BOOST_FOREACH(const std::string &name, reports::report_list()) {
- 			draw_report(name);
- 		}
- 		invalidateGameStatus_ = false;
-@@ -744,7 +745,7 @@
- void game_display::highlight_another_reach(const pathfind::paths &paths_list)
- {
- 	// Fold endpoints of routes into reachability map.
--	foreach (const pathfind::paths::step &dest, paths_list.destinations) {
-+	BOOST_FOREACH(const pathfind::paths::step &dest, paths_list.destinations) {
- 		reach_map_[dest.curr]++;
- 	}
- 	reach_map_changed_ = true;
-@@ -897,17 +898,17 @@
- void game_display::invalidate_animations()
- {
- 	display::invalidate_animations();
--	foreach (unit& u, units_) {
-+	BOOST_FOREACH(unit& u, units_) {
- 		u.refresh();
- 	}
--	foreach(unit* temp_unit, fake_units_) {
-+	BOOST_FOREACH(unit* temp_unit, fake_units_) {
- 		temp_unit->refresh();
- 	}
- 	std::vector<unit*> unit_list;
--	foreach (unit &u, units_) {
-+	BOOST_FOREACH(unit &u, units_) {
- 		unit_list.push_back(&u);
- 	}
--	foreach (unit *u, fake_units_) {
-+	BOOST_FOREACH(unit *u, fake_units_) {
- 		unit_list.push_back(u);
- 	}
- 	bool new_inval;
-@@ -1079,7 +1080,7 @@
- {
- 	const team& curr_team = teams_[playing_team()];
- 	const team& prev_team = teams_[playing_team()-1 < teams_.size() ? playing_team()-1 : teams_.size()-1];
--	foreach (const game_display::overlay_map::value_type i, overlays_) {
-+	BOOST_FOREACH(const game_display::overlay_map::value_type i, overlays_) {
- 		const overlay& ov = i.second;
- 		if (!ov.team_name.empty() &&
- 			((ov.team_name.find(curr_team.team_name()) + 1) != 0) !=
-@@ -1485,7 +1486,7 @@
- 		}
- 	}
- 
--	foreach (const chat_message &cm, chat_messages_) {
-+	BOOST_FOREACH(const chat_message &cm, chat_messages_) {
- 		font::move_floating_label(cm.speaker_handle, 0, - movement);
- 		font::move_floating_label(cm.handle, 0, - movement);
- 	}
-Index: src/formula_function.cpp
-===================================================================
---- src/formula_function.cpp	(revision 54624)
-+++ src/formula_function.cpp	(revision 54625)
-@@ -16,14 +16,14 @@
- #include "global.hpp"
- 
- 
--//#include "foreach.hpp"
- #include "callable_objects.hpp"
--#include "foreach.hpp"
- #include "formula_debugger.hpp"
- #include "formula_function.hpp"
- #include "game_display.hpp"
- #include "log.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #ifdef HAVE_VISUAL_LEAK_DETECTOR
- #include "vld.h"
- #endif
-@@ -46,7 +46,7 @@
- 	s << get_name();
- 	s << '(';
- 	bool first_arg = true;
--	foreach(expression_ptr a , args()) {
-+	BOOST_FOREACH(expression_ptr a , args()) {
- 		if (!first_arg) {
- 			s << ',';
- 		} else {
-@@ -451,7 +451,7 @@
- 
- 				std::string result;
- 
--				foreach(expression_ptr arg, args()) {
-+				BOOST_FOREACH(expression_ptr arg, args()) {
- 						result += arg->evaluate(variables, fdb).string_cast();
- 				}
- 
-Index: src/unit_map.cpp
-===================================================================
---- src/unit_map.cpp	(revision 54624)
-+++ src/unit_map.cpp	(revision 54625)
-@@ -17,13 +17,14 @@
- /** @file */
- 
- #include "unit_id.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "unit.hpp"
- 
- #include <functional>
- #include "unit_map.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- #define WRN_NG LOG_STREAM(warn, log_engine)
-@@ -444,7 +445,7 @@
- {
- 	assert(u);
- 
--	foreach(const unit_pod& item, ilist_) {
-+	BOOST_FOREACH(const unit_pod& item, ilist_) {
- 		if(item.unit == u) {
- 			return true;
- 		}
-Index: src/pathfind/teleport.cpp
-===================================================================
---- src/pathfind/teleport.cpp	(revision 54624)
-+++ src/pathfind/teleport.cpp	(revision 54625)
-@@ -19,7 +19,7 @@
- #include "log.hpp"
- #include "resources.hpp"
- 
--#include "foreach.hpp"
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define ERR_PF LOG_STREAM(err, log_engine)
-@@ -108,16 +108,16 @@
- 	, targets_()
- {
- 
--	foreach(const teleport_group& group, groups) {
-+	BOOST_FOREACH(const teleport_group& group, groups) {
- 
- 		teleport_pair locations;
- 		group.get_teleport_pair(locations, u, ignore_units);
- 		if (!see_all && !group.always_visible() && viewing_team.is_enemy(u.side())) {
- 			teleport_pair filter_locs;
--			foreach(const map_location &loc, locations.first)
-+			BOOST_FOREACH(const map_location &loc, locations.first)
- 				if(!viewing_team.fogged(loc))
- 					filter_locs.first.insert(loc);
--			foreach(const map_location &loc, locations.second)
-+			BOOST_FOREACH(const map_location &loc, locations.second)
- 				if(!viewing_team.fogged(loc))
- 					filter_locs.second.insert(loc);
- 			locations.first.swap(filter_locs.first);
-Index: src/pathfind/astarsearch.cpp
-===================================================================
---- src/pathfind/astarsearch.cpp	(revision 54624)
-+++ src/pathfind/astarsearch.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- #include "map.hpp"
- #include "pathfind/pathfind.hpp"
- #include "pathfind/teleport.hpp"
--#include "foreach.hpp"
- 
- #include <queue>
- #include <map>
-Index: src/pathfind/pathfind.cpp
-===================================================================
---- src/pathfind/pathfind.cpp	(revision 54624)
-+++ src/pathfind/pathfind.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- #include "pathfind/pathfind.hpp"
- #include "pathfind/teleport.hpp"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
-@@ -35,6 +34,8 @@
- #include "unit_map.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iostream>
- #include <vector>
- #include <algorithm>
-@@ -59,7 +60,7 @@
- 		std::set<map_location> tiles_checking;
- 		tiles_checking.swap(pending_tiles_to_check);
- 		//Iterate over all the hexes we need to check
--		foreach (const map_location &loc, tiles_checking)
-+		BOOST_FOREACH(const map_location &loc, tiles_checking)
- 		{
- 			//If this area is not a castle but should, skip it.
- 			if (vacancy == pathfind::VACANT_CASTLE && !map.is_castle(loc)) continue;
-@@ -76,7 +77,7 @@
- 			if (units.find(loc) == units.end() && !pass_check_and_unreachable) return loc;
- 			map_location adjs[6];
- 			get_adjacent_tiles(loc,adjs);
--			foreach (const map_location &loc, adjs)
-+			BOOST_FOREACH(const map_location &loc, adjs)
- 			{
- 				if (!map.on_board(loc)) continue;
- 				// Add the tile to be checked if it hasn't already been and
-Index: src/time_of_day.cpp
-===================================================================
---- src/time_of_day.cpp	(revision 54624)
-+++ src/time_of_day.cpp	(revision 54625)
-@@ -16,9 +16,9 @@
- /** @file */
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "time_of_day.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- std::ostream &operator<<(std::ostream &s, const tod_color& c){
- 	s << c.r << "," << c.g << "," << c.b;
-@@ -62,7 +62,7 @@
- 
- void time_of_day::parse_times(const config& cfg, std::vector<time_of_day>& normal_times)
- {
--	foreach (const config &t, cfg.child_range("time")) {
-+	BOOST_FOREACH(const config &t, cfg.child_range("time")) {
- 		normal_times.push_back(time_of_day(t));
- 	}
- 
-Index: src/persist_manager.cpp
-===================================================================
---- src/persist_manager.cpp	(revision 54624)
-+++ src/persist_manager.cpp	(revision 54625)
-@@ -16,7 +16,7 @@
- #include "persist_context.hpp"
- #include "persist_manager.hpp"
- 
--#include "foreach.hpp"
-+#include <boost/foreach.hpp>
- 
- persist_context &persist_manager::get_context(const std::string &ns)
- {
-@@ -36,7 +36,7 @@
- bool persist_manager::start_transaction() {
- 	if (in_transaction_) return false;
- 	bool result = true;
--	foreach (context_map::reference ctx, contexts_){
-+	BOOST_FOREACH(context_map::reference ctx, contexts_){
- 		result &= ctx.second->start_transaction();
- 	}
- 	in_transaction_ = true;
-@@ -46,7 +46,7 @@
- bool persist_manager::end_transaction() {
- 	if (!in_transaction_) return false;
- 	bool result = true;
--	foreach (context_map::reference ctx, contexts_){
-+	BOOST_FOREACH(context_map::reference ctx, contexts_){
- 		result &= ctx.second->end_transaction();
- 	}
- 	in_transaction_ = !result;
-@@ -56,7 +56,7 @@
- bool persist_manager::cancel_transaction() {
- 	if (!in_transaction_) return false;
- 	bool result = true;
--	foreach (context_map::reference ctx, contexts_){
-+	BOOST_FOREACH(context_map::reference ctx, contexts_){
- 		result &= ctx.second->cancel_transaction();
- 	}
- 	in_transaction_ = false;
-Index: src/side_filter.cpp
-===================================================================
---- src/side_filter.cpp	(revision 54624)
-+++ src/side_filter.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "global.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "resources.hpp"
- #include "side_filter.hpp"
-@@ -26,6 +25,8 @@
- #include "team.hpp"
- #include "serialization/string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine_sf("engine/side_filter");
- #define ERR_NG LOG_STREAM(err, log_engine_sf)
- 
-@@ -61,7 +62,7 @@
- {
- 	//@todo: replace with better implementation
- 	std::vector<int> result;
--	foreach (const team &t, *resources::teams) {
-+	BOOST_FOREACH(const team &t, *resources::teams) {
- 		if (match(t)) {
- 			result.push_back(t.side());
- 		}
-@@ -109,7 +110,7 @@
- 		else {
- 			const std::vector<std::string>& these_team_names = utils::split(this_team_name);
- 			bool search_futile = true;
--			foreach(const std::string& this_single_team_name, these_team_names) {
-+			BOOST_FOREACH(const std::string& this_single_team_name, these_team_names) {
- 				if(this_single_team_name == that_team_name) {
- 					search_futile = false;
- 					break;
-@@ -123,7 +124,7 @@
- 	if(cfg_.has_child("has_unit")) {
- 		const vconfig& unit_filter = cfg_.child("has_unit");
- 		bool found = false;
--		foreach (unit &u, *resources::units) {
-+		BOOST_FOREACH(unit &u, *resources::units) {
- 			if (u.side() != t.side()) {
- 				continue;
- 			}
-@@ -134,7 +135,7 @@
- 		}
- 		if(!found && unit_filter["search_recall_list"].to_bool(false)) {
- 			const std::vector<unit>& recall_list = t.recall_list();
--			foreach(const unit& u, recall_list) {
-+			BOOST_FOREACH(const unit& u, recall_list) {
- 				scoped_recall_unit this_unit("this_unit", t.save_id(), &u - &recall_list[0]);
- 				if(u.matches_filter(unit_filter, u.get_location(), flat_)) {
- 					found = true;
-@@ -152,7 +153,7 @@
- 		side_filter s_filter(enemy_of);
- 		const std::vector<int>& teams = s_filter.get_teams();
- 		if(teams.empty()) return false;
--		foreach(const int side, teams) {
-+		BOOST_FOREACH(const int side, teams) {
- 			if(!(*resources::teams)[side - 1].is_enemy(t.side()))
- 				return false;
- 		}
-@@ -163,7 +164,7 @@
- 		side_filter s_filter(allied_with);
- 		const std::vector<int>& teams = s_filter.get_teams();
- 		if(teams.empty()) return false;
--		foreach(const int side, teams) {
-+		BOOST_FOREACH(const int side, teams) {
- 			if((*resources::teams)[side - 1].is_enemy(t.side()))
- 				return false;
- 		}
-Index: src/theme.cpp
-===================================================================
---- src/theme.cpp	(revision 54624)
-+++ src/theme.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "global.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "hotkeys.hpp"
- #include "log.hpp"
-@@ -26,6 +25,7 @@
- #include "theme.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_display("display");
- #define DBG_DP LOG_STREAM(debug, log_display)
-@@ -162,7 +162,7 @@
- {
- 	std::vector<config> res_cfgs_;
- 	// resolve all the partialresolutions
--	foreach (const config &part, top_cfg.child_range("partialresolution"))
-+	BOOST_FOREACH(const config &part, top_cfg.child_range("partialresolution"))
- 	{
- 		// follow the inheritance hierarchy and push all the nodes on the stack
- 		std::vector<const config*> parent_stack(1, &part);
-@@ -182,11 +182,11 @@
- 		while (!parent_stack.empty()) {
- 			//override attributes
- 			res_cfgs_.back().merge_attributes(*parent_stack.back());
--			foreach (const config &rm, parent_stack.back()->child_range("remove")) {
-+			BOOST_FOREACH(const config &rm, parent_stack.back()->child_range("remove")) {
- 				find_ref(rm["id"], res_cfgs_.back(), true);
- 			}
- 
--			foreach (const config &chg, parent_stack.back()->child_range("change"))
-+			BOOST_FOREACH(const config &chg, parent_stack.back()->child_range("change"))
- 			{
- 				config &target = find_ref(chg["id"], res_cfgs_.back());
- 				target.merge_attributes(chg);
-@@ -195,7 +195,7 @@
- 			// cannot add [status] sub-elements, but who cares
- 			if (const config &c = parent_stack.back()->child("add"))
- 			{
--				foreach (const config::any_child &j, c.all_children_range()) {
-+				BOOST_FOREACH(const config::any_child &j, c.all_children_range()) {
- 					res_cfgs_.back().add_child(j.key, j.cfg);
- 				}
- 			}
-@@ -204,7 +204,7 @@
- 		}
- 	}
- 	// Add all the resolutions
--	foreach (const config &res, top_cfg.child_range("resolution")) {
-+	BOOST_FOREACH(const config &res, top_cfg.child_range("resolution")) {
- 		dst_cfg.add_child("resolution", res);
- 	}
- 	// Add all the resolved resolutions
-@@ -217,7 +217,7 @@
- static void do_resolve_rects(const config& cfg, config& resolved_config, config* resol_cfg = NULL) {
- 
- 		// recursively resolve children
--		foreach (const config::any_child &value, cfg.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &value, cfg.all_children_range()) {
- 			config &childcfg = resolved_config.add_child(value.key);
- 			do_resolve_rects(value.cfg, childcfg,
- 				value.key == "resolution" ? &childcfg : resol_cfg);
-@@ -549,7 +549,7 @@
- 
- 	int current_rating = 1000000;
- 	const config *current = NULL;
--	foreach (const config &i, cfg_.child_range("resolution"))
-+	BOOST_FOREACH(const config &i, cfg_.child_range("resolution"))
- 	{
- 		int width = i["width"];
- 		int height = i["height"];
-@@ -611,7 +611,7 @@
- 
- 	if (const config &status_cfg = cfg.child("status"))
- 	{
--		foreach (const config::any_child &i, status_cfg.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &i, status_cfg.all_children_range()) {
- 			status_.insert(std::pair<std::string, status_item>(i.key, status_item(i.cfg)));
- 		}
- 		if (const config &unit_image_cfg = status_cfg.child("unit_image")) {
-@@ -621,19 +621,19 @@
- 		}
- 	}
- 
--	foreach (const config &p, cfg.child_range("panel")) {
-+	BOOST_FOREACH(const config &p, cfg.child_range("panel")) {
- 		panel new_panel(p);
- 		set_object_location(new_panel, p["rect"], p["ref"]);
- 		panels_.push_back(new_panel);
- 	}
- 
--	foreach (const config &lb, cfg.child_range("label")) {
-+	BOOST_FOREACH(const config &lb, cfg.child_range("label")) {
- 		label new_label(lb);
- 		set_object_location(new_label, lb["rect"], lb["ref"]);
- 		labels_.push_back(new_label);
- 	}
- 
--	foreach (const config &m, cfg.child_range("menu"))
-+	BOOST_FOREACH(const config &m, cfg.child_range("menu"))
- 	{
- 		menu new_menu(m);
- 		DBG_DP << "adding menu: " << (new_menu.is_context() ? "is context" : "not context") << "\n";
-@@ -699,7 +699,7 @@
- 	}
- 
- 	// Change existing theme objects.
--	foreach (const config &c, cfg.child_range("change"))
-+	BOOST_FOREACH(const config &c, cfg.child_range("change"))
- 	{
- 		std::string id = c["id"];
- 		std::string ref_id = c["ref"];
-@@ -709,12 +709,12 @@
- 	}
- 
- 	// Add new theme objects.
--	foreach (const config &c, cfg.child_range("add")) {
-+	BOOST_FOREACH(const config &c, cfg.child_range("add")) {
- 		add_object(c);
- 	}
- 
- 	// Remove existent theme objects.
--	foreach (const config &c, cfg.child_range("remove")) {
-+	BOOST_FOREACH(const config &c, cfg.child_range("remove")) {
- 		remove_object(c["id"]);
- 	}
- 
-@@ -758,7 +758,7 @@
- 	if (!cfg)
- 		return;
- 
--	foreach (const config &thm, cfg->child_range("theme"))
-+	BOOST_FOREACH(const config &thm, cfg->child_range("theme"))
- 	{
- 		std::string thm_name = thm["name"];
- 		if (!thm["hidden"].to_bool(false))
-@@ -778,7 +778,7 @@
- 
- const theme::menu *theme::get_menu_item(const std::string &key) const
- {
--	foreach (const theme::menu &m, menus_) {
-+	BOOST_FOREACH(const theme::menu &m, menus_) {
- 		if (m.get_id() == key) return &m;
- 	}
- 	return NULL;
-Index: src/addon/manager.cpp
-===================================================================
---- src/addon/manager.cpp	(revision 54624)
-+++ src/addon/manager.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
- #include "addon/manager.hpp"
- #include "dialogs.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "formatter.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
-@@ -41,6 +40,8 @@
- #include "wml_separators.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_CFG LOG_STREAM(err , log_config)
- #define LOG_CFG LOG_STREAM(info, log_config)
-@@ -321,11 +322,11 @@
- 
- 	make_directory(dir);
- 
--	foreach (const config &d, cfg.child_range("dir")) {
-+	BOOST_FOREACH(const config &d, cfg.child_range("dir")) {
- 		unarchive_dir(dir, d);
- 	}
- 
--	foreach (const config &f, cfg.child_range("file")) {
-+	BOOST_FOREACH(const config &f, cfg.child_range("file")) {
- 		unarchive_file(dir, f);
- 	}
- }
-@@ -701,7 +702,7 @@
- 		std::string missing = "";
- 		size_t count_missing = 0;
- 
--		foreach(const std::string& i, dependencies) {
-+		BOOST_FOREACH(const std::string& i, dependencies) {
- 			if (std::find(installed.begin(), installed.end(), i) == installed.end()) {
- 				missing += "\n" + i;
- 				++count_missing;
-@@ -717,7 +718,7 @@
- 			std::vector< std::string > unsafe_matches;
- 			std::ostringstream unsafe_list;
- 			std::map<std::string, version_info> remote_version_map;
--			foreach (const config &remote_addon, remote_addons_list)
-+			BOOST_FOREACH(const config &remote_addon, remote_addons_list)
- 			{
- 				const std::string& name = remote_addon["name"];
- 				if (std::find(dependencies.begin(), dependencies.end(), name) != dependencies.end()) {
-@@ -837,7 +838,7 @@
- 				if(!result) {
- 					assert(failed_titles.empty() == false);
- 					std::string failed_titles_list_fmt;
--					foreach(const std::string& entry, failed_titles) {
-+					BOOST_FOREACH(const std::string& entry, failed_titles) {
- 						failed_titles_list_fmt += '\n';
- 						failed_titles_list_fmt += entry;
- 					}
-@@ -870,7 +871,7 @@
- 		std::vector<version_info> safe_local_versions;
- 		std::vector<version_info> unsafe_local_versions;
- 		std::map<std::string, version_info> remote_version_map;
--		foreach (const config &remote_addon, remote_addons_list)
-+		BOOST_FOREACH(const config &remote_addon, remote_addons_list)
- 		{
- 			const std::string& name = remote_addon["name"];
- 			const std::string& version = remote_addon["version"];
-@@ -1065,7 +1066,7 @@
- 		if(!result) {
- 			assert(failed_titles.empty() == false);
- 			std::string failed_titles_list_fmt;
--			foreach(const std::string& entry, failed_titles) {
-+			BOOST_FOREACH(const std::string& entry, failed_titles) {
- 				failed_titles_list_fmt += '\n';
- 				failed_titles_list_fmt += entry;
- 			}
-@@ -1090,7 +1091,7 @@
- 		const std::string& addon,
- 		const std::vector<std::string>& own_addons)
- 	{
--		foreach(const std::string& current_own_addon, own_addons) {
-+		BOOST_FOREACH(const std::string& current_own_addon, own_addons) {
- 			if(current_own_addon == addon) {
- 				utils::string_map symbols;
- 				symbols["addon"] = addon;
-@@ -1171,7 +1172,7 @@
- 
- 			std::vector< addon_info > infos;
- 
--			foreach(const config &c, addon_cfgs)
-+			BOOST_FOREACH(const config &c, addon_cfgs)
- 			{
- 				const std::string& name = c["name"];
- 				const std::string& downloads = c["downloads"].str();
-@@ -1254,13 +1255,13 @@
- 				infos.push_back(inf);
- 			}
- 
--			foreach(const std::string& pub, publish_options) {
-+			BOOST_FOREACH(const std::string& pub, publish_options) {
- 				static const std::string publish_icon = "icons/icon-addon-publish.png";
- 				const std::string text = _("Publish add-on: ") + get_addon_name(pub);
- 				options.push_back(IMAGE_PREFIX + publish_icon + COLUMN_SEPARATOR + font::GOOD_TEXT + text);
- 				options_to_filter.push_back(text);
- 			}
--			foreach(const std::string& del, delete_options) {
-+			BOOST_FOREACH(const std::string& del, delete_options) {
- 				static const std::string delete_icon = "icons/icon-addon-delete.png";
- 				const std::string text = _("Delete add-on: ") + get_addon_name(del);
- 				options.push_back(IMAGE_PREFIX + delete_icon + COLUMN_SEPARATOR + font::BAD_TEXT + text);
-@@ -1408,7 +1409,7 @@
- 
- 			remove_names.clear();
- 
--			foreach(const std::string& id, remove_ids) {
-+			BOOST_FOREACH(const std::string& id, remove_ids) {
- 				remove_names.push_back(get_addon_name(id));
- 			}
- 
-@@ -1425,7 +1426,7 @@
- 
- 		std::vector<std::string> failed_names, skipped_names, succeeded_names;
- 
--		foreach(const std::string& id, remove_ids) {
-+		BOOST_FOREACH(const std::string& id, remove_ids) {
- 			const std::string& name = get_addon_name(id);
- 
- 			if(have_addon_pbl_info(id) || have_addon_in_vcs_tree(id)) {
-@@ -1531,12 +1532,12 @@
- 	}
- 	static const std::string parentd = get_addon_campaigns_dir();
- 	std::vector<std::string> addon_info_files;
--	foreach(std::string const& dir, addons)
-+	BOOST_FOREACH(std::string const& dir, addons)
- 		addon_info_files.push_back(parentd+"/"+dir+"/_info.cfg");
- 
- 	size_t i = 0;
- 
--	foreach(std::string const& info_file, addon_info_files) {
-+	BOOST_FOREACH(std::string const& info_file, addon_info_files) {
- 		assert(i < addons.size());
- 
- 		std::string const& addon = addons[i];
-Index: src/addon/validation.cpp
-===================================================================
---- src/addon/validation.cpp	(revision 54624)
-+++ src/addon/validation.cpp	(revision 54625)
-@@ -17,8 +17,9 @@
- #include "global.hpp"
- #include "addon/validation.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <cstring>
- 
- const unsigned short default_campaignd_port = 15002;
-@@ -44,10 +45,10 @@
- 
- bool check_names_legal(const config& dir)
- {
--	foreach (const config &path, dir.child_range("file")) {
-+	BOOST_FOREACH(const config &path, dir.child_range("file")) {
- 		if (!addon_name_legal(path["name"])) return false;
- 	}
--	foreach (const config &path, dir.child_range("dir")) {
-+	BOOST_FOREACH(const config &path, dir.child_range("dir")) {
- 		if (!addon_name_legal(path["name"])) return false;
- 		if (!check_names_legal(path)) return false;
- 	}
-Index: src/mapgen.cpp
-===================================================================
---- src/mapgen.cpp	(revision 54624)
-+++ src/mapgen.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- 
- #include "global.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "language.hpp"
- #include "log.hpp"
-@@ -34,6 +33,7 @@
- #include "formula_string_utils.hpp"
- #include "SDL.h"
- 
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
-@@ -777,7 +777,7 @@
- 
- 	std::vector<terrain_height_mapper> height_conversion;
- 
--	foreach (const config &h, cfg.child_range("height")) {
-+	BOOST_FOREACH(const config &h, cfg.child_range("height")) {
- 		height_conversion.push_back(terrain_height_mapper(h));
- 	}
- 
-@@ -912,7 +912,7 @@
- 	LOG_NG << (SDL_GetTicks() - ticks) << "\n"; ticks = SDL_GetTicks();
- 
- 	std::vector<terrain_converter> converters;
--	foreach (const config &cv, cfg.child_range("convert")) {
-+	BOOST_FOREACH(const config &cv, cfg.child_range("convert")) {
- 		converters.push_back(terrain_converter(cv));
- 	}
- 
-Index: src/cavegen.cpp
-===================================================================
---- src/cavegen.cpp	(revision 54624)
-+++ src/cavegen.cpp	(revision 54625)
-@@ -21,13 +21,14 @@
- #include "global.hpp"
- 
- #include "cavegen.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "map.hpp"
- #include "pathfind/pathfind.hpp"
- #include "serialization/string_utils.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
- 
-@@ -147,7 +148,7 @@
- 
- void cave_map_generator::generate_chambers()
- {
--	foreach (const config &ch, cfg_.child_range("chamber"))
-+	BOOST_FOREACH(const config &ch, cfg_.child_range("chamber"))
- 	{
- 		// If there is only a chance of the chamber appearing, deal with that here.
- 		if (ch.has_attribute("chance") && (rand() % 100) < ch["chance"].to_int()) {
-@@ -195,7 +196,7 @@
- 
- 		chambers_.push_back(new_chamber);
- 
--		foreach (const config &p, ch.child_range("passage"))
-+		BOOST_FOREACH(const config &p, ch.child_range("passage"))
- 		{
- 			const std::string &dst = p["destination"];
- 
-@@ -220,7 +221,7 @@
- 	if (c.items == NULL || c.locs.empty()) return;
- 
- 	size_t index = 0;
--	foreach (const config::any_child &it, c.items->all_children_range())
-+	BOOST_FOREACH(const config::any_child &it, c.items->all_children_range())
- 	{
- 		config cfg = it.cfg;
- 		config &filter = cfg.child("filter");
-Index: src/ai/lua/core.cpp
-===================================================================
---- src/ai/lua/core.cpp	(revision 54624)
-+++ src/ai/lua/core.cpp	(revision 54625)
-@@ -34,7 +34,6 @@
- #include "../../actions.hpp"
- #include "../../attack_prediction.hpp"
- #include "../../filesystem.hpp"
--#include "../../foreach.hpp"
- #include "../../game_display.hpp"
- #include "../../gamestatus.hpp"
- #include "../../log.hpp"
-Index: src/ai/default/attack.cpp
-===================================================================
---- src/ai/default/attack.cpp	(revision 54624)
-+++ src/ai/default/attack.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "../manager.hpp"
- 
- #include "../../attack_prediction.hpp"
--#include "foreach.hpp"
- #include "../../game_config.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
-Index: src/ai/default/contexts.cpp
-===================================================================
---- src/ai/default/contexts.cpp	(revision 54624)
-+++ src/ai/default/contexts.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- #include "contexts.hpp"
- 
- #include "../../actions.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../resources.hpp"
-Index: src/ai/default/ai.cpp
-===================================================================
---- src/ai/default/ai.cpp	(revision 54624)
-+++ src/ai/default/ai.cpp	(revision 54625)
-@@ -26,7 +26,6 @@
- 
- #include "../../array.hpp"
- #include "../../dialogs.hpp"
--#include "../../foreach.hpp"
- #include "../../game_end_exceptions.hpp"
- #include "../../game_events.hpp"
- #include "../../game_preferences.hpp"
-@@ -41,6 +40,8 @@
- 
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iterator>
- #include <algorithm>
- #include <fstream>
-@@ -144,7 +145,7 @@
- 
- void ai_default_recruitment_stage::on_create() {
- 	stage::on_create();
--	foreach (const config &c, cfg_.child_range("limit")) {
-+	BOOST_FOREACH(const config &c, cfg_.child_range("limit")) {
- 		if (c.has_attribute("type") && c.has_attribute("max") ) {
- 			maximum_counts_.insert(std::make_pair(c["type"],lexical_cast_default<int>(c["max"],0)));
- 		}
-@@ -193,7 +194,7 @@
- 	bool found = false;
- 	// Find an available unit that can be recruited,
- 	// matches the desired usage type, and comes in under budget.
--	foreach (const std::string &name, current_team().recruits())
-+	BOOST_FOREACH(const std::string &name, current_team().recruits())
- 	{
- 		const unit_type *ut = unit_types.find(name);
- 		if (!ut) continue;
-@@ -435,7 +436,7 @@
- 
- 			team &enemy_team = (*resources::teams)[j->side() - 1];
- 			const std::set<std::string> &recruits = enemy_team.recruits();
--			foreach (const std::string &rec, recruits) {
-+			BOOST_FOREACH(const std::string &rec, recruits) {
- 				get_combat_score_vs(ut,rec,score,weighting,0,0);
- 			}
- 			continue;
-@@ -677,7 +678,7 @@
- 		        double best_combat_score_of_advancement = 0;
- 			bool best_combat_score_of_advancement_found = false;
- 			int best_cost = recall_cost;
--			foreach (const std::string &i, u.advances_to()) {
-+			BOOST_FOREACH(const std::string &i, u.advances_to()) {
- 				const unit_type *ut = unit_types.find(i);
- 				if (!ut) {
- 					continue;
-Index: src/ai/configuration.cpp
-===================================================================
---- src/ai/configuration.cpp	(revision 54624)
-+++ src/ai/configuration.cpp	(revision 54625)
-@@ -22,12 +22,13 @@
- #include "configuration.hpp"
- 
- #include "../filesystem.hpp"
--#include "../foreach.hpp"
- #include "../log.hpp"
- #include "../serialization/parser.hpp"
- #include "../serialization/preprocessor.hpp"
- #include "../team.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <vector>
- 
- namespace ai {
-@@ -93,7 +94,7 @@
- 	}
- 
- 
--	foreach (const config &ai_configuration, ais.child_range("ai")) {
-+	BOOST_FOREACH(const config &ai_configuration, ais.child_range("ai")) {
- 		const std::string &id = ai_configuration["id"];
- 		if (id.empty()){
- 
-@@ -118,7 +119,7 @@
- void configuration::add_era_ai_from_config(const config &era)
- {
- 	era_ai_configurations_.clear();
--	foreach (const config &ai_configuration, era.child_range("ai")) {
-+	BOOST_FOREACH(const config &ai_configuration, era.child_range("ai")) {
- 		const std::string &id = ai_configuration["id"];
- 		if (id.empty()){
- 
-@@ -196,7 +197,7 @@
- 	config aspect_config;
- 	aspect_config["id"] = id;
- 
--	foreach (const config &aiparam, cfg.child_range("ai")) {
-+	BOOST_FOREACH(const config &aiparam, cfg.child_range("ai")) {
- 		const config &_aspect = aiparam.find_child("aspect","id",id);
- 		if (_aspect) {
- 			aspect_config.append(_aspect);
-@@ -216,7 +217,7 @@
- 		if (aspect_was_attribute) {
- 			facet_config["value"] = aiparam[id];
- 		} else {
--			foreach (const config &value, aiparam.child_range(id)) {
-+			BOOST_FOREACH(const config &value, aiparam.child_range(id)) {
- 				facet_config.add_child("value",value);
- 			}
- 		}
-@@ -242,7 +243,7 @@
- 
- 	//leave only the [ai] children
- 	cfg = config();
--	foreach (const config &aiparam, original_cfg.child_range("ai")) {
-+	BOOST_FOREACH(const config &aiparam, original_cfg.child_range("ai")) {
- 		cfg.add_child("ai",aiparam);
- 	}
- 
-@@ -264,7 +265,7 @@
- 
- 	//find version
- 	int version = 10600;
--	foreach (const config &aiparam, cfg.child_range("ai")) {
-+	BOOST_FOREACH(const config &aiparam, cfg.child_range("ai")) {
- 		if (const config::attribute_value *a = aiparam.get("version")){
- 			int v = a->to_int(version);
- 			if (version<v) {
-@@ -290,7 +291,7 @@
- 	config parsed_cfg = config();
- 
- 	LOG_AI_CONFIGURATION << "side "<< side <<": merging AI configurations"<< std::endl;
--	foreach (const config &aiparam, cfg.child_range("ai")) {
-+	BOOST_FOREACH(const config &aiparam, cfg.child_range("ai")) {
- 		parsed_cfg.append(aiparam);
- 	}
- 
-@@ -302,7 +303,7 @@
- 	parsed_cfg.merge_children_by_attribute("aspect","id");
- 
- 	LOG_AI_CONFIGURATION << "side "<< side <<": removing duplicate [default] tags from aspects"<< std::endl;
--	foreach (config &aspect_cfg, parsed_cfg.child_range("aspect")) {
-+	BOOST_FOREACH(config &aspect_cfg, parsed_cfg.child_range("aspect")) {
- 		if (!aspect_cfg.child("default")) {
- 			WRN_AI_CONFIGURATION << "side "<< side <<": aspect with id=["<<aspect_cfg["id"]<<"] lacks default config facet!" <<std::endl;
- 			continue;
-@@ -341,7 +342,7 @@
- 	if (cfg["ai_algorithm"]=="idle_ai") {
- 		is_idle_ai = true;
- 	} else {
--		foreach (config &aiparam, cfg.child_range("ai")) {
-+		BOOST_FOREACH(config &aiparam, cfg.child_range("ai")) {
- 			if (aiparam["ai_algorithm"]=="idle_ai") {
- 				is_idle_ai = true;
- 				break;
-@@ -360,8 +361,8 @@
- 
- 	config fallback_stage_cfg_ai;
- 
--	foreach (config &aiparam, cfg.child_range("ai")) {
--		foreach (const well_known_aspect &wka, well_known_aspects) {
-+	BOOST_FOREACH(config &aiparam, cfg.child_range("ai")) {
-+		BOOST_FOREACH(const well_known_aspect &wka, well_known_aspects) {
- 			if (wka.was_an_attribute_) {
- 				aiparam.remove_attribute(wka.name_);
- 			} else {
-@@ -370,7 +371,7 @@
- 		}
- 
- 
--		foreach (const config &aitarget, aiparam.child_range("target")) {
-+		BOOST_FOREACH(const config &aitarget, aiparam.child_range("target")) {
- 			config aigoal;
- 			transfer_turns_and_time_of_day_data(aiparam,aigoal);
- 
-@@ -388,14 +389,14 @@
- 		aiparam.clear_children("target");
- 
- 
--		foreach (config &ai_protect_unit, aiparam.child_range("protect_unit")) {
-+		BOOST_FOREACH(config &ai_protect_unit, aiparam.child_range("protect_unit")) {
- 			transfer_turns_and_time_of_day_data(aiparam,ai_protect_unit);
- 			upgrade_protect_goal_config_from_1_07_02_to_1_07_03(side,ai_protect_unit,parsed_cfg,true);
- 		}
- 		aiparam.clear_children("protect_unit");
- 
- 
--		foreach (config &ai_protect_location, aiparam.child_range("protect_location")) {
-+		BOOST_FOREACH(config &ai_protect_location, aiparam.child_range("protect_location")) {
- 			transfer_turns_and_time_of_day_data(aiparam,ai_protect_location);
- 			upgrade_protect_goal_config_from_1_07_02_to_1_07_03(side,ai_protect_location,parsed_cfg,false);
- 		}
-@@ -423,19 +424,19 @@
- 	fallback_stage_cfg_ai.clear_children("aspect");
- 
- 	//move [stage]s to root of the config
--	foreach (const config &aistage, fallback_stage_cfg_ai.child_range("stage")) {
-+	BOOST_FOREACH(const config &aistage, fallback_stage_cfg_ai.child_range("stage")) {
- 		parsed_cfg.add_child("stage",aistage);
- 	}
- 	fallback_stage_cfg_ai.clear_children("stage");
- 
- 	//move [goal]s to root of the config
--	foreach (const config &aigoal, fallback_stage_cfg_ai.child_range("goal")) {
-+	BOOST_FOREACH(const config &aigoal, fallback_stage_cfg_ai.child_range("goal")) {
- 		parsed_cfg.add_child("goal",aigoal);
- 	}
- 	fallback_stage_cfg_ai.clear_children("goal");
- 
- 	//move [modify_ai]'s to root of the config
--	foreach (const config &aimodifyai, fallback_stage_cfg_ai.child_range("modify_ai")) {
-+	BOOST_FOREACH(const config &aimodifyai, fallback_stage_cfg_ai.child_range("modify_ai")) {
- 		parsed_cfg.add_child("modify_ai",aimodifyai);
- 	}
- 	fallback_stage_cfg_ai.clear_children("modify_ai");
-@@ -452,12 +453,12 @@
- {
- 	config cfg;
- 
--	foreach (const config &aiparam, ai_parameters) {
-+	BOOST_FOREACH(const config &aiparam, ai_parameters) {
- 		cfg.add_child("ai",aiparam);
- 	}
- 
- 	DBG_AI_CONFIGURATION << "side "<< side <<": upgrading aspects from syntax of 1.7.2 to 1.7.3, old-style config is:" << std::endl << cfg << std::endl;
--	foreach (const well_known_aspect &wka, well_known_aspects) {
-+	BOOST_FOREACH(const well_known_aspect &wka, well_known_aspects) {
- 		upgrade_aspect_config_from_1_07_02_to_1_07_03(side, cfg,parsed_cfg,wka.name_,wka.was_an_attribute_);
- 	}
- }
-Index: src/ai/contexts.cpp
-===================================================================
---- src/ai/contexts.cpp	(revision 54624)
-+++ src/ai/contexts.cpp	(revision 54625)
-@@ -47,6 +47,8 @@
- #include "../tod_manager.hpp"
- #include "../unit_display.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_ai("ai/general");
- #define DBG_AI LOG_STREAM(debug, log_ai)
- #define LOG_AI LOG_STREAM(info, log_ai)
-@@ -223,19 +225,19 @@
- 
- void readonly_context_impl::on_readonly_context_create() {
- 	//init the composite ai engines
--	foreach(const config &cfg_element, cfg_.child_range("engine")){
-+	BOOST_FOREACH(const config &cfg_element, cfg_.child_range("engine")){
- 		engine::parse_engine_from_config(*this,cfg_element,std::back_inserter(engines_));
- 	}
- 
- 	// init the composite ai aspects
--	foreach(const config &cfg_element, cfg_.child_range("aspect")){
-+	BOOST_FOREACH(const config &cfg_element, cfg_.child_range("aspect")){
- 		std::vector<aspect_ptr> aspects;
- 		engine::parse_aspect_from_config(*this,cfg_element,cfg_element["id"],std::back_inserter(aspects));
- 		add_aspects(aspects);
- 	}
- 
- 	// init the composite ai goals
--	foreach(const config &cfg_element, cfg_.child_range("goal")){
-+	BOOST_FOREACH(const config &cfg_element, cfg_.child_range("goal")){
- 		engine::parse_goal_from_config(*this,cfg_element,std::back_inserter(get_goals()));
- 	}
- }
-@@ -255,13 +257,13 @@
- config readonly_context_impl::to_readonly_context_config() const
- {
- 	config cfg;
--	foreach(const engine_ptr e, engines_) {
-+	BOOST_FOREACH(const engine_ptr e, engines_) {
- 		cfg.add_child("engine",e->to_config());
- 	}
--	foreach(const aspect_map::value_type a, aspects_) {
-+	BOOST_FOREACH(const aspect_map::value_type a, aspects_) {
- 		cfg.add_child("aspect",a.second->to_config());
- 	}
--	foreach(const goal_ptr g, goals_) {
-+	BOOST_FOREACH(const goal_ptr g, goals_) {
- 		cfg.add_child("goal",g->to_config());
- 	}
- 	return cfg;
-@@ -366,7 +368,7 @@
- 	}
- 
- 	for(std::map<map_location,pathfind::paths>::iterator m = res.begin(); m != res.end(); ++m) {
--		foreach (const pathfind::paths::step &dest, m->second.destinations)
-+		BOOST_FOREACH(const pathfind::paths::step &dest, m->second.destinations)
- 		{
- 			const map_location& src = m->first;
- 			const map_location& dst = dest.curr;
-@@ -406,7 +408,7 @@
- 
- void readonly_context_impl::add_aspects(std::vector< aspect_ptr > &aspects )
- {
--	foreach (aspect_ptr a, aspects) {
-+	BOOST_FOREACH(aspect_ptr a, aspects) {
- 		const std::string id = a->get_id();
- 		known_aspect_map::iterator i = known_aspects_.find(id);
- 		if (i != known_aspects_.end()) {
-@@ -1024,7 +1026,7 @@
- 			// The 0.5 power avoids underestimating too much the damage of a wounded unit.
- 			int hp = int(sqrt(double(un.hitpoints()) / un.max_hitpoints()) * 1000);
- 			int most_damage = 0;
--			foreach (const attack_type &att, un.attacks())
-+			BOOST_FOREACH(const attack_type &att, un.attacks())
- 			{
- 				int damage = att.damage() * att.num_attacks() * (100 + tod_modifier);
- 				if (damage > most_damage) {
-@@ -1112,7 +1114,7 @@
- 	map_location const* best_occupied_keep = &map_location::null_location;
- 	double move_left_at_best_occupied_keep = 0.0;
- 
--	foreach (const pathfind::paths::step &dest, leader_paths.destinations)
-+	BOOST_FOREACH(const pathfind::paths::step &dest, leader_paths.destinations)
- 	{
- 		const map_location &loc = dest.curr;
- 		if (keeps().find(loc)!=keeps().end()){
-Index: src/ai/manager.cpp
-===================================================================
---- src/ai/manager.cpp	(revision 54624)
-+++ src/ai/manager.cpp	(revision 54625)
-@@ -27,13 +27,14 @@
- #include "registry.hpp"
- #include "../game_events.hpp"
- #include "../game_preferences.hpp"
--#include "../foreach.hpp"
- #include "../log.hpp"
- #include "../replay.hpp"
- #include "../serialization/string_utils.hpp"
- #include "../statistics.hpp"
- #include "composite/component.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <map>
- #include <stack>
- #include <vector>
-@@ -89,7 +90,7 @@
- 
- 	if (this->ai_) {
- 		ai_->on_create();
--		foreach (config &mod_ai, cfg_.child_range("modify_ai")) {
-+		BOOST_FOREACH(config &mod_ai, cfg_.child_range("modify_ai")) {
- 			if (!mod_ai.has_attribute("side")) {
- 				mod_ai["side"] = side;
- 			}
-@@ -149,8 +150,8 @@
- 		cfg_.merge_children_by_attribute("aspect","id");
- 	} else {
- 		// else run 'add_facet' command on each [aspect][facet]
--		foreach (const config &cfg_a, cfg.child_range("aspect")) {
--			foreach (const config &cfg_f, cfg_a.child_range("facet")) {
-+		BOOST_FOREACH(const config &cfg_a, cfg.child_range("aspect")) {
-+			BOOST_FOREACH(const config &cfg_f, cfg_a.child_range("facet")) {
- 				readonly_context_->add_facet(cfg_a["id"],cfg_f);
- 			}
- 		}
-Index: src/ai/composite/component.cpp
-===================================================================
---- src/ai/composite/component.cpp	(revision 54624)
-+++ src/ai/composite/component.cpp	(revision 54625)
-@@ -23,12 +23,12 @@
- #include "property_handler.hpp"
- #include "../../config.hpp"
- #include "../../log.hpp"
--#include "../../foreach.hpp"
- 
- #include "../formula/ai.hpp"
- 
- #include <boost/lexical_cast.hpp>
- #include <boost/regex.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace pathfind {
- 
-@@ -125,7 +125,7 @@
- std::vector<std::string> component::get_children_types()
- {
- 	std::vector<std::string> types;
--	foreach (property_handler_map::value_type &ph, property_handlers_) {
-+	BOOST_FOREACH(property_handler_map::value_type &ph, property_handlers_) {
- 		types.push_back(ph.first);
- 	}
- 	return types;
-@@ -241,9 +241,9 @@
- 
- 	s << offset_str << type<<"["<<root->get_id() <<"] "<<root->get_engine()<<" "<<root->get_name()<< std::endl;
- 
--	foreach (std::string t, t_list) {
-+	BOOST_FOREACH(std::string t, t_list) {
- 		std::vector<component*> c_list = root->get_children(t);
--		foreach (component *c, c_list) {
-+		BOOST_FOREACH(component *c, c_list) {
- 			print_component(c,t,s,offset+1);
- 		}
- 	}
-Index: src/ai/composite/stage.cpp
-===================================================================
---- src/ai/composite/stage.cpp	(revision 54624)
-+++ src/ai/composite/stage.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- #include "engine.hpp"
- #include "stage.hpp"
- #include "../contexts.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../resources.hpp"
- #include "../../tod_manager.hpp"
-Index: src/ai/composite/engine.cpp
-===================================================================
---- src/ai/composite/engine.cpp	(revision 54624)
-+++ src/ai/composite/engine.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "engine.hpp"
- #include "contexts.hpp"
- 
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- namespace ai {
-Index: src/ai/composite/engine_default.cpp
-===================================================================
---- src/ai/composite/engine_default.cpp	(revision 54624)
-+++ src/ai/composite/engine_default.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- #include "engine_default.hpp"
- #include "rca.hpp"
- #include "stage.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- namespace ai {
-Index: src/ai/composite/goal.cpp
-===================================================================
---- src/ai/composite/goal.cpp	(revision 54624)
-+++ src/ai/composite/goal.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- #include "../../log.hpp"
- #include "../lua/lua_object.hpp"
- #include "../../gamestatus.hpp"
--#include "../../foreach.hpp"
- #include "../../resources.hpp"
- #include "../../scripting/lua.hpp"
- #include "../../terrain_filter.hpp"
-@@ -34,6 +33,7 @@
- #include "../../variable.hpp"
- 
- #include <boost/lexical_cast.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace ai {
- 
-@@ -128,7 +128,7 @@
- 	if (!criteria) return;
- 
- 	//find the enemy leaders and explicit targets
--	foreach (const unit &u, *resources::units) {
-+	BOOST_FOREACH(const unit &u, *resources::units) {
- 		if (u.matches_filter(vconfig(criteria), u.get_location())) {
- 			LOG_AI_GOAL << "found explicit target unit at ... " << u.get_location() << " with value: " << value() << "\n";
- 			*target_list = target(u.get_location(), value(), target::EXPLICIT);
-@@ -173,7 +173,7 @@
- 
- 	std::set<map_location> items;
- 	filter_ptr_->get_locations(items);
--	foreach (const map_location &loc, items)
-+	BOOST_FOREACH(const map_location &loc, items)
- 	{
- 		LOG_AI_GOAL << "found explicit target location ... " << loc << " with value: " << value() << std::endl;
- 		*target_list = target(loc, value(), target::EXPLICIT);
-@@ -252,7 +252,7 @@
- 
- 	std::set<map_location> items;
- 	if (protect_unit_) {
--		foreach (const unit &u, units)
-+		BOOST_FOREACH(const unit &u, units)
- 		{
- 			if (protect_only_own_unit_ && u.side() != get_side()) {
- 				continue;
-@@ -268,9 +268,9 @@
- 	}
- 	DBG_AI_GOAL << "side " << get_side() << ": seaching for threats in "+goal_type+" goal" << std::endl;
- 	// Look for directions to protect a specific location or specific unit.
--	foreach (const map_location &loc, items)
-+	BOOST_FOREACH(const map_location &loc, items)
- 	{
--		foreach (const unit &u, units)
-+		BOOST_FOREACH(const unit &u, units)
- 		{
- 			int distance = distance_between(u.get_location(), loc);
- 			if (current_team().is_enemy(u.side()) && distance < radius_ &&
-@@ -325,7 +325,7 @@
- 	handler_->handle(c, true, l_obj);
- 	std::vector < target > targets = *(l_obj->get());
- 
-- 	foreach (target tg, targets)
-+ 	BOOST_FOREACH(target tg, targets)
-  	{
-  		*target_list = tg;
-  	}
-Index: src/ai/composite/engine_fai.cpp
-===================================================================
---- src/ai/composite/engine_fai.cpp	(revision 54624)
-+++ src/ai/composite/engine_fai.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "../formula/candidates.hpp"
- #include "../formula/stage_side_formulas.hpp"
- #include "../formula/stage_unit_formulas.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- namespace ai {
-Index: src/ai/composite/aspect.hpp
-===================================================================
---- src/ai/composite/aspect.hpp	(revision 54624)
-+++ src/ai/composite/aspect.hpp	(revision 54625)
-@@ -265,7 +265,7 @@
- 		, facets_()
- 		, default_()
- 	{
--		foreach (const config &cfg_element, this->cfg_.child_range("facet") ){
-+		BOOST_FOREACH(const config &cfg_element, this->cfg_.child_range("facet") ){
- 			add_facet(-1,cfg_element);
- 		}
- 
-@@ -291,7 +291,7 @@
-         {
- 		std::vector<aspect_ptr> facets_base;
- 		engine::parse_aspect_from_config(*this,cfg,this->get_id(),std::back_inserter(facets_base));
--		foreach (aspect_ptr a, facets_base ){
-+		BOOST_FOREACH(aspect_ptr a, facets_base ){
- 			typename aspect_type<T>::typesafe_ptr b = boost::dynamic_pointer_cast< typesafe_aspect<T> > (a);
- 			facets.push_back(b);
- 		}
-@@ -301,7 +301,7 @@
- 	virtual void recalculate() const
- 	{
- 		///@todo 1.9 optimize in case of an aspect which returns variant
--		foreach (const typename aspect_type<T>::typesafe_ptr &f, make_pair(facets_.rbegin(),facets_.rend())) {
-+		BOOST_FOREACH(const typename aspect_type<T>::typesafe_ptr &f, make_pair(facets_.rbegin(),facets_.rend())) {
- 			if (f->active()) {
- 				this->value_ = boost::shared_ptr<T>(f->get_ptr());
- 				this->valid_ = true;
-@@ -316,7 +316,7 @@
- 	virtual config to_config() const
- 	{
- 		config cfg = aspect::to_config();
--		foreach (const typename aspect_type<T>::typesafe_ptr f, facets_) {
-+		BOOST_FOREACH(const typename aspect_type<T>::typesafe_ptr f, facets_) {
- 			cfg.add_child("facet",f->to_config());
- 		}
- 		if (default_) {
-@@ -334,7 +334,7 @@
- 		std::vector< aspect_ptr > facets;
- 		engine::parse_aspect_from_config(*this,cfg,this->get_id(),std::back_inserter(facets));
- 		int j=0;
--		foreach (aspect_ptr a, facets ){
-+		BOOST_FOREACH(aspect_ptr a, facets ){
- 			typename aspect_type<T>::typesafe_ptr b = boost::dynamic_pointer_cast< typesafe_aspect<T> > (a);
- 			facets_.insert(facets_.begin()+pos+j,b);
- 			j++;
-Index: src/ai/composite/property_handler.hpp
-===================================================================
---- src/ai/composite/property_handler.hpp	(revision 54624)
-+++ src/ai/composite/property_handler.hpp	(revision 54625)
-@@ -23,9 +23,9 @@
- #define AI_COMPOSITE_PROPERTY_HANDLER_HPP_INCLUDED
- 
- #include <boost/function.hpp>
-+#include <boost/foreach.hpp>
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "ai/composite/component.hpp"
- 
- namespace ai{
-@@ -134,7 +134,7 @@
- 	std::vector<component*> handle_get_children()
- 	{
- 		std::vector<component*> children;
--		foreach (t_ptr v, values_) {
-+		BOOST_FOREACH(t_ptr v, values_) {
- 			children.push_back(&*v);
- 		}
- 		return children;
-@@ -149,7 +149,7 @@
- 		t_ptr_vector values;
- 		factory_(values,cfg);
- 		int j=0;
--		foreach (t_ptr b, values ){
-+		BOOST_FOREACH(t_ptr b, values ){
- 			values_.insert(values_.begin()+pos+j,b);
- 			j++;
- 		}
-@@ -200,7 +200,7 @@
- 		//* is a special case - 'delete all facets'
- 		if (child.id == "*") {
- 			bool b = false;
--				foreach(typename aspect_map::value_type a, aspects_) {
-+				BOOST_FOREACH(typename aspect_map::value_type a, aspects_) {
- 				       	b |= a.second->delete_all_facets();
- 				}
- 			return b;
-@@ -212,7 +212,7 @@
- 	std::vector<component*> handle_get_children()
- 	{
- 		std::vector<component*> children;
--		foreach(typename aspect_map::value_type a, aspects_) {
-+		BOOST_FOREACH(typename aspect_map::value_type a, aspects_) {
- 			children.push_back(&*a.second);
- 		}
- 		return children;
-Index: src/ai/composite/ai.cpp
-===================================================================
---- src/ai/composite/ai.cpp	(revision 54624)
-+++ src/ai/composite/ai.cpp	(revision 54625)
-@@ -27,11 +27,11 @@
- #include "stage.hpp"
- #include "../manager.hpp"
- #include "../../actions.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- #include <boost/bind.hpp>
- #include <boost/function.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace ai {
- 
-@@ -60,7 +60,7 @@
- 		cfg_["id"]<<"]"<<std::endl;
- 
- 	// init the composite ai stages
--	foreach(const config &cfg_element, cfg_.child_range("stage")){
-+	BOOST_FOREACH(const config &cfg_element, cfg_.child_range("stage")){
- 		add_stage(cfg_element);
- 	}
- 
-@@ -115,7 +115,7 @@
- 	std::vector< stage_ptr > stages;
- 	create_stage(stages,cfg);
- 	int j=0;
--	foreach (stage_ptr b, stages ){
-+	BOOST_FOREACH(stage_ptr b, stages ){
- 		stages_.push_back(b);
- 		j++;
- 	}
-@@ -128,7 +128,7 @@
- 	std::vector< goal_ptr > goals;
- 	create_goal(goals,cfg);
- 	int j=0;
--	foreach (goal_ptr b, goals ){
-+	BOOST_FOREACH(goal_ptr b, goals ){
- 		get_goals().push_back(b);
- 		j++;
- 	}
-@@ -137,7 +137,7 @@
- 
- 
- void ai_composite::play_turn(){
--	foreach(stage_ptr &s, stages_){
-+	BOOST_FOREACH(stage_ptr &s, stages_){
- 		s->play_stage();
- 	}
- }
-@@ -206,7 +206,7 @@
- 	config cfg;
- 
- 	//serialize the composite ai stages
--	foreach(const stage_ptr &s, stages_){
-+	BOOST_FOREACH(const stage_ptr &s, stages_){
- 		cfg.add_child("stage",s->to_config());
- 	}
- 
-Index: src/ai/formula/candidates.cpp
-===================================================================
---- src/ai/formula/candidates.cpp	(revision 54624)
-+++ src/ai/formula/candidates.cpp	(revision 54625)
-@@ -19,10 +19,11 @@
- 
- #include "ai.hpp"
- #include "candidates.hpp"
--#include "foreach.hpp"
- #include "../../log.hpp"
- #include "../../resources.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_formula_ai("ai/engine/fai");
- #define ERR_AI LOG_STREAM(err, log_formula_ai)
- 
-@@ -32,7 +33,7 @@
- void candidate_action_manager::load_config(const config& cfg, ai::formula_ai* ai, function_symbol_table* function_table)
- {
- 	// register candidate actions
--	foreach (const config &rc_action, cfg.child_range("register_candidate_action"))
-+	BOOST_FOREACH(const config &rc_action, cfg.child_range("register_candidate_action"))
- 	{
- 		candidate_action_ptr new_ca = load_candidate_action_from_config(rc_action,ai,function_table);
- 
-@@ -67,7 +68,7 @@
- {
- 	evaluated_candidate_actions_.clear();
- 
--	foreach(candidate_action_ptr cm, candidate_actions_)
-+	BOOST_FOREACH(candidate_action_ptr cm, candidate_actions_)
- 	{
- 		cm->evaluate(ai, units);
- 		evaluated_candidate_actions_.insert(cm);
-@@ -116,7 +117,7 @@
- 	const config & filter_params = cfg.child("filter");
- 
- 	if( filter_params ) {
--		foreach( const config::attribute filter_param, filter_params.attribute_range() )
-+		BOOST_FOREACH( const config::attribute filter_param, filter_params.attribute_range() )
- 		{
- 			game_logic::const_formula_ptr filter_formula(
- 					new game_logic::formula(filter_param.second, function_table));
-Index: src/ai/formula/stage_side_formulas.cpp
-===================================================================
---- src/ai/formula/stage_side_formulas.cpp	(revision 54624)
-+++ src/ai/formula/stage_side_formulas.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- #include "stage_side_formulas.hpp"
- #include "ai.hpp"
- 
--#include "../../foreach.hpp"
- #include "../../formula.hpp"
- #include "../../formula_function.hpp"
- #include "../../log.hpp"
-Index: src/ai/formula/ai.cpp
-===================================================================
---- src/ai/formula/ai.cpp	(revision 54624)
-+++ src/ai/formula/ai.cpp	(revision 54625)
-@@ -32,7 +32,6 @@
- 
- #include "../../callable_objects.hpp"
- #include "../../game_display.hpp"
--#include "../../foreach.hpp"
- #include "../../formula_debugger.hpp"
- #include "../../log.hpp"
- #include "../../menu_events.hpp"
-@@ -42,6 +41,8 @@
- #include "../../tod_manager.hpp"
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_formula_ai("ai/engine/fai");
- #define DBG_AI LOG_STREAM(debug, log_formula_ai)
- #define LOG_AI LOG_STREAM(info, log_formula_ai)
-@@ -548,7 +549,7 @@
- variant villages_from_set(const Container& villages,
- 				          const std::set<map_location>* exclude=NULL) {
- 	std::vector<variant> vars;
--	foreach(const map_location& loc, villages) {
-+	BOOST_FOREACH(const map_location& loc, villages) {
- 		if(exclude && exclude->count(loc)) {
- 			continue;
- 		}
-@@ -617,7 +618,7 @@
- 	{
- 		const std::vector<std::string> &rp = get_recruitment_pattern();
- 		std::vector<variant> vars;
--		foreach (const std::string &i, rp) {
-+		BOOST_FOREACH(const std::string &i, rp) {
- 			vars.push_back(variant(i));
- 		}
- 		return variant(&vars);
-@@ -751,7 +752,7 @@
- 			std::vector<variant> v;
- 			tmp.push_back( v );
- 		}
--		foreach (const unit &u, units) {
-+		BOOST_FOREACH(const unit &u, units) {
- 			tmp[u.side() - 1].push_back(variant(new unit_callable(u)));
- 		}
- 		for( size_t i = 0; i<tmp.size(); ++i)
-@@ -924,7 +925,7 @@
- 	//make sure we don't run out of refcount
- 	vars_.add_ref();
- 
--	foreach (const config &func, cfg_.child_range("function"))
-+	BOOST_FOREACH(const config &func, cfg_.child_range("function"))
- 	{
- 		const t_string &name = func["name"];
- 		const t_string &inputs = func["inputs"];
-@@ -947,7 +948,7 @@
- 	if (const config &ai_vars = cfg_.child("vars"))
- 	{
- 		variant var;
--		foreach (const config::attribute &i, ai_vars.attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &i, ai_vars.attribute_range()) {
- 			var.serialize_from_string(i.second);
- 			vars_.add(i.first, var);
- 		}
-Index: src/ai/formula/function_table.cpp
-===================================================================
---- src/ai/formula/function_table.cpp	(revision 54624)
-+++ src/ai/formula/function_table.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- 
- #include "../../attack_prediction.hpp"
- #include "../../filesystem.hpp"
--#include "../../foreach.hpp"
- #include "../../game_display.hpp"
- #include "../../log.hpp"
- #include "../../map_label.hpp"
-@@ -36,6 +35,7 @@
- #include "../../unit.hpp"
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_formula_ai("ai/engine/fai");
- #define LOG_AI LOG_STREAM(info, log_formula_ai)
-@@ -355,7 +355,7 @@
- 				if( scores[current_side][i] > 98 )
- 					continue;
- 
--				foreach( int side , enemies) {
-+				BOOST_FOREACH( int side , enemies) {
- 					int diff = scores[current_side][i] - scores[side][i];
- 					if ( diff > enemy_tollerancy) {
- 						valid = false;
-@@ -365,7 +365,7 @@
- 				}
- 
- 				if( valid ) {
--					foreach( int side , allies) {
-+					BOOST_FOREACH( int side , allies) {
- 						if ( scores[current_side][i] - scores[side][i] > ally_tollerancy ) {
- 							valid = false;
- 							break;
-@@ -563,7 +563,7 @@
-                     visited_locs.erase(starting_loc);
- 
-                 std::vector<variant> res;
--                foreach( const map_location& ml, visited_locs) {
-+                BOOST_FOREACH( const map_location& ml, visited_locs) {
-                     res.push_back( variant(new location_callable( ml ) ) );
-                 }
- 
-@@ -841,7 +841,7 @@
- 		ai::attack_analysis* analysis = convert_variant<ai::attack_analysis>(attack);
- 		//unit_map units_with_moves(*resources::units);
- 		//typedef std::pair<map_location, map_location> mv;
--		//foreach (const mv &m, analysis->movements) {
-+		//BOOST_FOREACH(const mv &m, analysis->movements) {
- 		//	units_with_moves.move(m.first, m.second);
- 		//}
- 
-@@ -1629,7 +1629,7 @@
- 
- 		std::vector<attack_type> attacks = attacker.attacks();
- 
--		foreach(const attack_type &attack, attacks) {
-+		BOOST_FOREACH(const attack_type &attack, attacks) {
- 			const int dmg = round_damage(attack.damage(), defender.damage_from(attack), 100) * attack.num_attacks();
- 			if (attack.range() == "melee") {
- 				highest_melee_damage = std::max(highest_melee_damage, dmg);
-Index: src/ai/testing/ca_testing_move_to_targets.cpp
-===================================================================
---- src/ai/testing/ca_testing_move_to_targets.cpp	(revision 54624)
-+++ src/ai/testing/ca_testing_move_to_targets.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- 
- #include "../composite/ai.hpp"
- #include "../actions.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../resources.hpp"
-Index: src/ai/testing/ca_testing_recruitment.cpp
-===================================================================
---- src/ai/testing/ca_testing_recruitment.cpp	(revision 54624)
-+++ src/ai/testing/ca_testing_recruitment.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "../composite/rca.hpp"
- #include "../composite/stage.hpp"
- #include "../../gamestatus.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../resources.hpp"
-@@ -33,6 +32,7 @@
- #include "../../wml_exception.hpp"
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- #include <numeric>
- #include <string>
-@@ -206,7 +206,7 @@
-       int get_current_qty(const std::string &name) const
-       {
-          int counter = 0;
--         foreach(unit &un, *resources::units){
-+         BOOST_FOREACH(unit &un, *resources::units){
-             if(un.side() == side() && un.type_id() == name) // @todo: is type_id good?
-             {
-                counter++;
-@@ -345,7 +345,7 @@
-    const int hitpoints_const = 100;
-    double score = 0;
-    double total_weight = 0;
--   foreach(const unit &enemy_unit, *resources::units)
-+   BOOST_FOREACH(const unit &enemy_unit, *resources::units)
-    {
-       if(enemy_unit.can_recruit() || !t.is_enemy(enemy_unit.side()))
-       {
-@@ -358,13 +358,13 @@
- 
-       score += compare_unit_types(info, *enemy_info) * weight;
-    }
--   foreach(fake_team &enemy_team, fake_teams)
-+   BOOST_FOREACH(fake_team &enemy_team, fake_teams)
-    {
-       if(!t.is_enemy(enemy_team.side()))
-       {
-          continue;
-       }
--      foreach(const potential_recruit &enemy_unit,  enemy_team.extra_units())
-+      BOOST_FOREACH(const potential_recruit &enemy_unit,  enemy_team.extra_units())
-       {
-          const unit_type *enemy_info = enemy_unit.type();
-          VALIDATE(enemy_info, "Unknown unit type : " + enemy_unit.id() + " while updating recruit quality.");
-@@ -386,7 +386,7 @@
- 
- /*static void update_recruit_qualities(fake_team &t, std::vector<fake_team> &fake_teams)
- {
--   foreach ( potential_recruit &recruit, t.recruit_list() )
-+   BOOST_FOREACH( potential_recruit &recruit, t.recruit_list() )
-    {
-       double score = get_unit_quality(*recruit.type(),t,fake_teams);
-       recruit.set_quality(score);
-@@ -425,11 +425,11 @@
- 	}
- 
-    std::map<std::string, int> current_units;
--   foreach (const potential_recruit &i, t.extra_units())
-+   BOOST_FOREACH(const potential_recruit &i, t.extra_units())
-    {
-       current_units[(i.id())]++;
-    }
--   foreach (const unit &i, *resources::units)
-+   BOOST_FOREACH(const unit &i, *resources::units)
-    {
- 	if (i.side()==t.side())
- 	{
-@@ -440,7 +440,7 @@
-    double max_quality = recruit_list[0].quality();
-    int max_cost = recruit_list[0].cost();
-    std::vector<const potential_recruit*> sorted = std::vector<const potential_recruit*>();
--   foreach(const potential_recruit &i, recruit_list)
-+   BOOST_FOREACH(const potential_recruit &i, recruit_list)
-    {
-       if(i.cost() > max_cost)
-       {
-@@ -457,7 +457,7 @@
-    potential_recruit_sorter sorter(max_cost, max_quality, quality_factor);
-    std::sort(sorted.begin(), sorted.end(), sorter);
-    int recruited = 0;
--   foreach(const potential_recruit *i, sorted)
-+   BOOST_FOREACH(const potential_recruit *i, sorted)
-    {
-       if(recruited < max_units_to_recruit)
-       {
-@@ -488,7 +488,7 @@
- static void ai_choose_recruits(fake_team &t, int max_units_to_recruit, double quality_factor, bool counter_recruit)
- {
- 	std::vector<potential_recruit> recruits = ai_choose_best_recruits(t, max_units_to_recruit, quality_factor, counter_recruit);
--   foreach(potential_recruit &i, recruits) {
-+   BOOST_FOREACH(potential_recruit &i, recruits) {
-       t.fake_recruit(i);
-    }
- 
-@@ -554,7 +554,7 @@
-    //DBG_AI << "start of get_recruit_qualities" << std::endl;
-    typedef std::map<const unit_type*, std::vector<double> > unit_map;
-    unit_map enemies;
--   foreach(unit &un, *resources::units){
-+   BOOST_FOREACH(unit &un, *resources::units){
- 	   if(t.is_enemy(un.side()) && !un.can_recruit()){
- 		   enemies[un.type()].push_back(
- 			  static_cast<double>(un.hitpoints())
-@@ -562,10 +562,10 @@
- 	   }
-    }
-    DBG_AI << "before extra_units of fake_teams: enemies.size() = " << enemies.size() << std::endl;
--   foreach(fake_team &tmp_t, fake_teams)
-+   BOOST_FOREACH(fake_team &tmp_t, fake_teams)
-    {
- 	   if (t.is_enemy(tmp_t.side())) {
--		   foreach(potential_recruit &rec, tmp_t.extra_units())
-+		   BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units())
- 		   {
- 			   enemies[rec.type()].push_back(1.0);
- 		   }
-@@ -573,10 +573,10 @@
-    }
-    DBG_AI << "after extra_units of fake_teams: enemies.size() = " << enemies.size() << std::endl;
- 
--   foreach(potential_recruit &rec, recruit_list) {
-+   BOOST_FOREACH(potential_recruit &rec, recruit_list) {
- 	   double score = 0;
- 	   double weighting = 0;
--	   foreach(unit_map::value_type &enemy, enemies) {
-+	   BOOST_FOREACH(unit_map::value_type &enemy, enemies) {
- 		   double hitpoints_sum = std::accumulate(enemy.second.begin(),enemy.second.end(),0);
- 		   score += compare_unit_types(*rec.type(), *enemy.first) * hitpoints_sum;
- 		   weighting += hitpoints_sum;
-@@ -621,14 +621,14 @@
- {
-    std::vector<defender_pair_type*> defenders;
-    std::vector<enemy_pair_type*> enemies;
--   foreach(unit &un, *resources::units)
-+   BOOST_FOREACH(unit &un, *resources::units)
-    {
-       if(t.is_enemy(un.side()))
-       {
- //         const unit_type &enemy_type = *un.type();
-          //enemy_pair_type *pair = new enemy_pair_type(new unit_data(un.id(), un.type()));
-          enemy_pair_type *pair = new enemy_pair_type(un.type());
--         foreach(unit &defender, *resources::units)
-+         BOOST_FOREACH(unit &defender, *resources::units)
-          {
-             if(!t.is_enemy(defender.side())){
-                //int score = compare_unit_types(*defender.type(), enemy_type);
-@@ -639,9 +639,9 @@
-                //}
-             }
-          }
--         foreach(fake_team &tmp_t, fake_teams){
-+         BOOST_FOREACH(fake_team &tmp_t, fake_teams){
-             if(!t.is_enemy(tmp_t.side())){
--               foreach(potential_recruit &rec, tmp_t.extra_units()){
-+               BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units()){
-          //         int score = compare_unit_types(*rec.type(), enemy_type);
-          //         if(score >= 0){
-                      //pair->add_defender(new unit_data(rec.id(), rec.type()));
-@@ -657,7 +657,7 @@
-          //const unit_type &defender_type = *un.type();
-          //defender_pair_type *pair = new defender_pair_type(new unit_data(un.id(), un.type()));
-          defender_pair_type *pair = new defender_pair_type(un.type());
--         foreach(unit &enemy, *resources::units)
-+         BOOST_FOREACH(unit &enemy, *resources::units)
-          {
-             //int score = compare_unit_types(defender_type, *enemy.type());
-             //if(score >= 0)
-@@ -666,9 +666,9 @@
-             pair->add_enemy(enemy.type());
-             //}
-          }
--         foreach(fake_team &tmp_t, fake_teams){
-+         BOOST_FOREACH(fake_team &tmp_t, fake_teams){
-             if(t.is_enemy(tmp_t.side())){
--               foreach(potential_recruit &rec, tmp_t.extra_units()){
-+               BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units()){
-                   //int score = compare_unit_types(defender_type, *rec.type());
-                   //if(score >= 0){
-                      //pair->add_enemy(new unit_data(rec.id(), rec.type()));
-@@ -680,14 +680,14 @@
-          defenders.push_back(pair);
-       }
-    }
--   foreach(fake_team &tmp_t, fake_teams)
-+   BOOST_FOREACH(fake_team &tmp_t, fake_teams)
-    {
--      foreach(potential_recruit &rec, tmp_t.extra_units()){
-+      BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units()){
-          if(t.is_enemy(tmp_t.side())){
-             //const unit_type &enemy_type = *rec.type();
-             //enemy_pair_type *pair = new enemy_pair_type(new unit_data(rec.id(), rec.type()));
-             enemy_pair_type *pair = new enemy_pair_type(rec.type());
--            foreach(unit &defender, *resources::units){
-+            BOOST_FOREACH(unit &defender, *resources::units){
-                if(t.is_enemy(defender.side())){
-                   continue;
-                }
-@@ -698,11 +698,11 @@
-                //}
-             }
-             //HIER
--            foreach(fake_team &sub_t, fake_teams){
-+            BOOST_FOREACH(fake_team &sub_t, fake_teams){
-                if(t.is_enemy(sub_t.side())){
-                   continue;
-                }
--               foreach(potential_recruit &sub_rec, sub_t.extra_units()){
-+               BOOST_FOREACH(potential_recruit &sub_rec, sub_t.extra_units()){
-                   //int score = compare_unit_types(*sub_rec.type(), enemy_type);
-                   //if(score >= 0){
-                      //pair->add_defender(new unit_data(sub_rec.id(), sub_rec.type()));
-@@ -715,7 +715,7 @@
-             //const unit_type &defender_type = *rec.type();
-             //defender_pair_type *pair = new defender_pair_type(new unit_data(rec.id(), rec.type()));
-             defender_pair_type *pair = new defender_pair_type(rec.type());
--            foreach(unit &enemy, *resources::units)
-+            BOOST_FOREACH(unit &enemy, *resources::units)
-             {
-                if(!t.is_enemy(enemy.side())){
-                   continue;
-@@ -726,11 +726,11 @@
-                pair->add_enemy(rec.type());
-             //   }
-             }
--            foreach(fake_team &sub_t, fake_teams){
-+            BOOST_FOREACH(fake_team &sub_t, fake_teams){
-                if(!t.is_enemy(sub_t.side())){
-                   continue;
-                }
--               foreach(potential_recruit &sub_rec, sub_t.extra_units()){
-+               BOOST_FOREACH(potential_recruit &sub_rec, sub_t.extra_units()){
-                //   int score = compare_unit_types(defender_type, *sub_rec.type());
-                //   if(score >= 0){
-                      //pair->add_enemy(new unit_data(sub_rec.id(), sub_rec.type()));
-@@ -744,17 +744,17 @@
-    }
-    double min_score = 0;
-    double max_score = 0;
--   foreach(enemy_pair_type *pair, enemies)
-+   BOOST_FOREACH(enemy_pair_type *pair, enemies)
-    {
- //      if(pair->defenders.size() == 0)
- //      {
- //         pair->score = -10000;
- //      }else{
--         //foreach(unit_data *defender, pair->defenders)
--         foreach(unit_type *defender, pair->defenders)
-+         //BOOST_FOREACH(unit_data *defender, pair->defenders)
-+         BOOST_FOREACH(unit_type *defender, pair->defenders)
-          {
-             unsigned int defender_enemies = 0;
--            foreach(defender_pair_type *defender_p, defenders)
-+            BOOST_FOREACH(defender_pair_type *defender_p, defenders)
-             {
-                //if(defender->id == defender_p->defender->id){
-                if(defender->type_name()() == defender_p->defender->type_name()){
-@@ -778,7 +778,7 @@
-    }
-    double score = 0;
-    score -= max_score - min_score;
--   foreach(enemy_pair_type *pair, enemies)
-+   BOOST_FOREACH(enemy_pair_type *pair, enemies)
-    {
-       score += pair->score;
-    }
-@@ -798,16 +798,16 @@
-    typedef std::map<const unit_type*, std::vector<double> > unit_map;
-    unit_map enemies;
-    unit_map defenders;
--   foreach(unit &un, *resources::units){
-+   BOOST_FOREACH(unit &un, *resources::units){
-       if(t.is_enemy(un.side())){
-          enemies[un.type()].push_back((double)un.hitpoints() / (double)un.max_hitpoints());
-       }else{
-          defenders[un.type()].push_back(un.hitpoints() / un.max_hitpoints());
-       }
-    }
--   foreach(fake_team &tmp_t, fake_teams)
-+   BOOST_FOREACH(fake_team &tmp_t, fake_teams)
-    {
--      foreach(potential_recruit &rec, tmp_t.extra_units())
-+      BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units())
-       {
-          if(t.is_enemy(tmp_t.side())){
-             enemies[rec.type()].push_back(1.0);
-@@ -817,13 +817,13 @@
-       }
-    }
-    double result = 0;
--   foreach(unit_map::value_type &defender, defenders)
-+   BOOST_FOREACH(unit_map::value_type &defender, defenders)
-    {
-       double defenders_score = 0;
--      foreach(unit_map::value_type &enemy, enemies)
-+      BOOST_FOREACH(unit_map::value_type &enemy, enemies)
-       {
-          double hitpoints_sum = 0;
--         foreach(double i, enemy.second)
-+         BOOST_FOREACH(double i, enemy.second)
-          {
-             hitpoints_sum += i;
-          }
-@@ -831,7 +831,7 @@
- 
-       }
-       double hitpoints_sum = 0;
--      foreach(double i, defender.second)
-+      BOOST_FOREACH(double i, defender.second)
-       {
-          hitpoints_sum += i;
-       }
-@@ -842,7 +842,7 @@
-    return result;
- //   vector<defender_pair> defenders;
- //   vector<enemy_pair> enemies;
--//   //foreach(unit &un, *resources::units)
-+//   //BOOST_FOREACH(unit &un, *resources::units)
- //   //{
- //   //   if(t.is_enemy(un.side()))
- //   //   {
-@@ -851,14 +851,14 @@
- //   //      defenders.push_back(un.id());
- //   //   }
- //   //}
--//   foreach(unit &un, *resources::units)
-+//   BOOST_FOREACH(unit &un, *resources::units)
- //   {
- //      if(t.is_enemy(un.side()))
- //      {
- //         const unit_type &enemy_type = un.type();
- //         enemy_pair pair;
- //         pair.enemy = new unit_data(un.id(), enemy_type);
--//         foreach(unit &defender, *resources::units)
-+//         BOOST_FOREACH(unit &defender, *resources::units)
- //         {
- //            int score = compare_unit_types(defender.type(), enemy_type);
- //            if(score >= 0)
-@@ -873,7 +873,7 @@
- //         const unit_type &defender_type = un.type();
- //         defender_pair pair;
- //         pair.defender = new unit_data(defender.id(), defender_type);
--//         foreach(unit &enemy, *resources::units)
-+//         BOOST_FOREACH(unit &enemy, *resources::units)
- //         {
- //            int score = compare_unit_types(defender_type, enemy.type());
- //            if(score >= 0)
-@@ -885,10 +885,10 @@
- //         enemies.push_back(pair);
- //      }
- //   }
--//   foreach(fake_team &tmp_t, fake_teams)
-+//   BOOST_FOREACH(fake_team &tmp_t, fake_teams)
- //   {
- //      if(t.is_enemy(tmp_t.side())){
--//         foreach(potential_recruit &rec, tmp_t.extra_units())
-+//         BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units())
- //         {
- //
- //         }
-@@ -898,7 +898,7 @@
- //
- //   }
- //   //std::vector<unit> no_defense_enemies;
--//   foreach(enemy_pair &pair, enemies)
-+//   BOOST_FOREACH(enemy_pair &pair, enemies)
- //   {
- //      if(pair.defenders.size() == 0)
- //      {
-@@ -906,11 +906,11 @@
- //
- //         pair.score = 0;
- //      }else{
--//         foreach(unit_data &defender, pair.defenders)
-+//         BOOST_FOREACH(unit_data &defender, pair.defenders)
- //         {
- //            //unit_type &defender = defender_data.type;
- //            unsigned int defender_enemies = 0;
--//            foreach(defender_pair &defender_p, defenders)
-+//            BOOST_FOREACH(defender_pair &defender_p, defenders)
- //            {
- //               if(defender.id == defender_p.defender.id){
- //                  defender_enemies = defender_p.enemies.size();
-@@ -924,7 +924,7 @@
- //   }
- //   //enemy_pair *worst_pair = &enemies[0];
- //   double total_score = 0;
--//   foreach(enemy_pair &pair, enemies)
-+//   BOOST_FOREACH(enemy_pair &pair, enemies)
- //   {
- //      total_score += pair.score;
- //   }
-@@ -936,7 +936,7 @@
- //   //unit &worst_def_unit;
- //   vector<defender_pair> defenders;
- //   vector<enemy_pair> enemies;
--//   /*foreach(unit &un, *resources::units)
-+//   /*BOOST_FOREACH(unit &un, *resources::units)
- //   {
- //      if(t.is_enemy(un.side()))
- //      {
-@@ -945,14 +945,14 @@
- //         defenders.push_back(un.id());
- //      }
- //   }*/
--//   foreach(unit &un, *resources::units)
-+//   BOOST_FOREACH(unit &un, *resources::units)
- //   {
- //      if(t.is_enemy(un.side()))
- //      {
- //         const unit_type &enemy_type = un.type();
- //         enemy_pair pair;
- //         pair.enemy = un;
--//         foreach(unit &defender, *resources::units)
-+//         BOOST_FOREACH(unit &defender, *resources::units)
- //         {
- //            int score = compare_unit_types(defender.type(), enemy_type);
- //            if(score >= 0)
-@@ -967,7 +967,7 @@
- //         const unit_type &defender_type = un.type();
- //         defender_pair pair;
- //         pair.defender = un;
--//         foreach(unit &enemy, *resources::units)
-+//         BOOST_FOREACH(unit &enemy, *resources::units)
- //         {
- //            int score = compare_unit_types(defender_type, enemy.type());
- //            if(score >= 0)
-@@ -980,7 +980,7 @@
- //      }
- //   }
- //   //std::vector<unit> no_defense_enemies;
--//   foreach(enemy_pair &pair, enemies)
-+//   BOOST_FOREACH(enemy_pair &pair, enemies)
- //   {
- //      if(pair.defenders.size() == 0)
- //      {
-@@ -988,10 +988,10 @@
- //         return pair.enemy;
- //         //pair.score = 0;
- //      }else{
--//         foreach(unit &defender, pair.defenders)
-+//         BOOST_FOREACH(unit &defender, pair.defenders)
- //         {
- //            unsigned int defender_enemies = 0;
--//            foreach(defender_pair &defender_p, defenders)
-+//            BOOST_FOREACH(defender_pair &defender_p, defenders)
- //            {
- //               if(defender.id() == defender_p.defender.id()){
- //                  defender_enemies = defender_p.enemies.size();
-@@ -1004,7 +1004,7 @@
- //      }
- //   }
- //   enemy_pair *worst_pair = &enemies[0];
--//   foreach(enemy_pair &pair, enemies)
-+//   BOOST_FOREACH(enemy_pair &pair, enemies)
- //   {
- //      if(pair.score < worst_pair.score)
- //      {
-@@ -1039,16 +1039,16 @@
-    for(int recruited_amount = 0; recruited_amount < max_units_to_recruit; recruited_amount++)
-    {
- 
--      foreach(fake_team &t, fake_teams)
-+      BOOST_FOREACH(fake_team &t, fake_teams)
-       {
-          t.reset();
-       }
- 
-       std::vector<potential_recruit> ai_recruit_list = ai_t->recruit_list();
- 
--      foreach(potential_recruit &recruit_type, ai_recruit_list)
-+      BOOST_FOREACH(potential_recruit &recruit_type, ai_recruit_list)
-       {
--         foreach(fake_team &t, fake_teams)
-+         BOOST_FOREACH(fake_team &t, fake_teams)
-          {
-             t.reset();
-          }
-@@ -1063,7 +1063,7 @@
-          }
-          LOG_AI << "Pretend that we recruited: " << recruit_type.id() << std::endl;
-          ai_t->fake_recruit(recruit_type);
--         foreach(fake_team &t, fake_teams)
-+         BOOST_FOREACH(fake_team &t, fake_teams)
-          {
-             if(ai_t->side() == t.side())
-             {
-Index: src/ai/testing/ca_global_fallback.cpp
-===================================================================
---- src/ai/testing/ca_global_fallback.cpp	(revision 54624)
-+++ src/ai/testing/ca_global_fallback.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "../actions.hpp"
- 
- #include "../../game_display.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../map_label.hpp"
-@@ -36,6 +35,7 @@
- #include "../../terrain_filter.hpp"
- #include "../../tod_manager.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- namespace ai {
- 
-@@ -89,7 +89,7 @@
- 	LOG_AI << "start" << std::endl;
- 	const int ticks = SDL_GetTicks();
- 	double res_sum = 0;
--	foreach( unit &u, *resources::units)
-+	BOOST_FOREACH( unit &u, *resources::units)
- 	{
- 		if (u.side()!=get_side())
- 		{
-Index: src/ai/testing/stage_fallback.cpp
-===================================================================
---- src/ai/testing/stage_fallback.cpp	(revision 54624)
-+++ src/ai/testing/stage_fallback.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- #include "../configuration.hpp"
- #include "../manager.hpp"
- #include "../composite/ai.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- namespace ai {
-Index: src/ai/testing/ca.cpp
-===================================================================
---- src/ai/testing/ca.cpp	(revision 54624)
-+++ src/ai/testing/ca.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "../composite/rca.hpp"
- #include "../composite/stage.hpp"
- #include "../../gamestatus.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../resources.hpp"
-@@ -33,6 +32,7 @@
- #include "../../wml_exception.hpp"
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- #include <numeric>
- 
-@@ -306,7 +306,7 @@
- 	bool found = false;
- 	// Find an available unit that can be recruited,
- 	// matches the desired usage type, and comes in under budget.
--	foreach (const std::string &name, current_team().recruits())
-+	BOOST_FOREACH(const std::string &name, current_team().recruits())
- 	{
- 		const unit_type *ut = unit_types.find(name);
- 		if (!ut) continue;
-@@ -686,7 +686,7 @@
- 	possible_moves.insert(std::pair<map_location,pathfind::paths>(leader->get_location(), leader_paths));
- 
- 	map_location loc;
--	foreach (const map_location &l, route.steps)
-+	BOOST_FOREACH(const map_location &l, route.steps)
- 	{
- 		if (leader_paths.destinations.contains(l) &&
- 		    power_projection(l, get_enemy_dstsrc()) < leader->hitpoints() * max_risk)
-@@ -779,7 +779,7 @@
- 		// The leader can't move to his keep, try to move to the closest location
- 		// to the keep where there are no enemies in range.
- 		int current_distance = distance_between(leader->get_location(), keep);
--		foreach (const pathfind::paths::step &dest, leader_paths.destinations)
-+		BOOST_FOREACH(const pathfind::paths::step &dest, leader_paths.destinations)
- 		{
- 			if (!units_.find(dest.curr).valid()){
- 				const int new_distance = distance_between(dest.curr,keep);
-@@ -1728,12 +1728,12 @@
- 	}*/
- 	//int leader_adj_count = 0;
- 	std::vector<map_location> leaders_adj_v;
--	foreach(unit_map::const_iterator leader, leaders){
-+	BOOST_FOREACH(unit_map::const_iterator leader, leaders){
- 		map_location tmp_leader_adj[6];
- 		get_adjacent_tiles(leader->get_location(), tmp_leader_adj);
--		foreach(map_location &loc, tmp_leader_adj){
-+		BOOST_FOREACH(map_location &loc, tmp_leader_adj){
- 			bool found = false;
--			foreach(map_location &new_loc, leaders_adj_v){
-+			BOOST_FOREACH(map_location &new_loc, leaders_adj_v){
- 				if(new_loc == loc){
- 					found = true;
- 					break;
-@@ -1974,7 +1974,7 @@
- 	}
- 	std::vector<unit_map::unit_iterator> ai_leaders = resources::units->find_leaders(get_side());
- 	bool allied_leaders_available = false;
--	foreach(team &tmp_team, *resources::teams){
-+	BOOST_FOREACH(team &tmp_team, *resources::teams){
- 		if(!current_team().is_enemy(tmp_team.side())){
- 			std::vector<unit_map::unit_iterator> allied_leaders = resources::units->find_leaders(get_side());
- 			if (!allied_leaders.empty()){
-@@ -2001,7 +2001,7 @@
- 	calculate_moves(*resources::units, possible_moves, friends_srcdst, friends_dstsrc, false, true);
- 
- 	//check for each ai leader if he should move away from his keep
--	foreach(unit_map::unit_iterator &ai_leader, ai_leaders){
-+	BOOST_FOREACH(unit_map::unit_iterator &ai_leader, ai_leaders){
- 		//only if leader is on a keep
- 		if (!resources::game_map->is_keep(ai_leader->get_location())) {
- 			continue;
-@@ -2059,7 +2059,7 @@
- 		}
- 		ai_leader->remove_movement_ai();
- 	}
--	foreach(unit_map::unit_iterator &leader, ai_leaders){
-+	BOOST_FOREACH(unit_map::unit_iterator &leader, ai_leaders){
- 		leader->remove_movement_ai();
- 	}
- 	//ERR_AI_TESTING_AI_DEFAULT << get_name() << ": evaluate - not yet implemented" << std::endl;
-Index: src/ai/testing/stage_rca.cpp
-===================================================================
---- src/ai/testing/stage_rca.cpp	(revision 54624)
-+++ src/ai/testing/stage_rca.cpp	(revision 54625)
-@@ -25,10 +25,10 @@
- #include "../composite/engine.hpp"
- #include "../composite/property_handler.hpp"
- #include "../gamestate_observer.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace ai {
- 
-@@ -49,7 +49,7 @@
- void candidate_action_evaluation_loop::on_create()
- {
- 	//init the candidate actions
--	foreach(const config &cfg_element, cfg_.child_range("candidate_action")){
-+	BOOST_FOREACH(const config &cfg_element, cfg_.child_range("candidate_action")){
- 		engine::parse_candidate_action_from_config(*this,cfg_element,back_inserter(candidate_actions_));
- 	}
- 
-@@ -69,7 +69,7 @@
- config candidate_action_evaluation_loop::to_config() const
- {
- 	config cfg = stage::to_config();
--	foreach(candidate_action_ptr ca, candidate_actions_){
-+	BOOST_FOREACH(candidate_action_ptr ca, candidate_actions_){
- 		cfg.add_child("candidate_action",ca->to_config());
- 	}
- 	return cfg;
-@@ -88,7 +88,7 @@
- {
- 	LOG_AI_TESTING_RCA_DEFAULT << "Starting candidate action evaluation loop for side "<< get_side() << std::endl;
- 
--	foreach(candidate_action_ptr ca, candidate_actions_){
-+	BOOST_FOREACH(candidate_action_ptr ca, candidate_actions_){
- 		ca->enable();
- 	}
- 
-@@ -103,7 +103,7 @@
- 		candidate_action_ptr best_ptr;
- 
- 		//Evaluation
--		foreach(candidate_action_ptr ca_ptr, candidate_actions_){
-+		BOOST_FOREACH(candidate_action_ptr ca_ptr, candidate_actions_){
- 			if (!ca_ptr->is_enabled()){
- 				DBG_AI_TESTING_RCA_DEFAULT << "Skipping disabled candidate action: "<< *ca_ptr << std::endl;
- 				continue;
-Index: src/ai/testing/aspect_attacks.cpp
-===================================================================
---- src/ai/testing/aspect_attacks.cpp	(revision 54624)
-+++ src/ai/testing/aspect_attacks.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- 
- #include "../manager.hpp"
- #include "../../actions.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../team.hpp"
-@@ -31,6 +30,8 @@
- #include "../../unit.hpp"
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace ai {
- 
- namespace testing_ai_default {
-@@ -468,7 +469,7 @@
- 			// The 0.5 power avoids underestimating too much the damage of a wounded unit.
- 			int hp = int(sqrt(double(un.hitpoints()) / un.max_hitpoints()) * 1000);
- 			int most_damage = 0;
--			foreach (const attack_type &att, un.attacks())
-+			BOOST_FOREACH(const attack_type &att, un.attacks())
- 			{
- 				int damage = att.damage() * att.num_attacks() * (100 + tod_modifier);
- 				if (damage > most_damage) {
-@@ -572,7 +573,7 @@
- 			// The 0.5 power avoids underestimating too much the damage of a wounded unit.
- 			int hp = int(sqrt(double(un.hitpoints()) / un.max_hitpoints()) * 1000);
- 			int most_damage = 0;
--			foreach (const attack_type &att, un.attacks())
-+			BOOST_FOREACH(const attack_type &att, un.attacks())
- 			{
- 				int damage = att.damage() * att.num_attacks() * (100 + tod_modifier);
- 				if (damage > most_damage) {
-Index: src/play_controller.cpp
-===================================================================
---- src/play_controller.cpp	(revision 54624)
-+++ src/play_controller.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- 
- #include "play_controller.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_events.hpp"
- #include "gettext.hpp"
- #include "halo.hpp"
-@@ -46,6 +45,8 @@
- #include "whiteboard/manager.hpp"
- #include "scripting/lua.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
- #define DBG_NG LOG_STREAM(debug, log_engine)
-@@ -173,7 +174,7 @@
- 		place_sides_in_preferred_locations();
- 	}
- 
--	foreach (const config &t, level_.child_range("time_area")) {
-+	BOOST_FOREACH(const config &t, level_.child_range("time_area")) {
- 		tod_manager_.add_time_area(t);
- 	}
- 
-@@ -192,7 +193,7 @@
- 	std::vector<team_builder_ptr> team_builders;
- 
- 	int team_num = 0;
--	foreach (const config &side, level_.child_range("side"))
-+	BOOST_FOREACH(const config &side, level_.child_range("side"))
- 	{
- 		std::string save_id = get_unique_saveid(side, seen_save_ids);
- 		seen_save_ids.insert(save_id);
-@@ -212,7 +213,7 @@
- 		team_builders.push_back(tb_ptr);
- 	}
- 
--	foreach (team_builder_ptr tb_ptr, team_builders)
-+	BOOST_FOREACH(team_builder_ptr tb_ptr, team_builders)
- 	{
- 		gamestate_.build_team_stage_two(tb_ptr);
- 	}
-@@ -337,7 +338,7 @@
- 	int num_pos = map_.num_valid_starting_positions();
- 
- 	int side_num = 1;
--	foreach (const config &side, level_.child_range("side"))
-+	BOOST_FOREACH(const config &side, level_.child_range("side"))
- 	{
- 		for(int p = 1; p <= num_pos; ++p) {
- 			const map_location& pos = map_.starting_position(p);
-@@ -703,7 +704,7 @@
- 	}
- 
- 	// Write terrain_graphics data in snapshot, too
--	foreach (const config &tg, level_.child_range("terrain_graphics")) {
-+	BOOST_FOREACH(const config &tg, level_.child_range("terrain_graphics")) {
- 		cfg.add_child("terrain_graphics", tg);
- 	}
- 
-@@ -914,7 +915,7 @@
- 	switch(mode) {
- 	case gui::TEXTBOX_SEARCH:
- 	{
--		foreach (const unit &u, units_){
-+		BOOST_FOREACH(const unit &u, units_){
- 			const map_location& loc = u.get_location();
- 			if(!gui_->fogged(loc) &&
- 					!(teams_[gui_->viewing_team()].is_enemy(u.side()) && u.invisible(loc)))
-@@ -931,13 +932,13 @@
- 	}
- 	case gui::TEXTBOX_MESSAGE:
- 	{
--		foreach(const team& t, teams_) {
-+		BOOST_FOREACH(const team& t, teams_) {
- 			if(!t.is_empty())
- 				dictionary.insert(t.current_player());
- 		}
- 
- 		// Add observers
--		foreach(const std::string& o, gui_->observers()){
-+		BOOST_FOREACH(const std::string& o, gui_->observers()){
- 			dictionary.insert(o);
- 		}
- 		//Exclude own nick from tab-completion.
-@@ -1341,7 +1342,7 @@
- 
- 	if (non_interactive()) {
- 		std::cout << "winner: ";
--		foreach (unsigned l, seen_leaders) {
-+		BOOST_FOREACH(unsigned l, seen_leaders) {
- 			std::string ai = ai::manager::get_active_ai_identifier_for_side(l);
- 			if (ai.empty()) ai = "default ai";
- 			std::cout << l << " (using " << ai << ") ";
-Index: src/unit_abilities.cpp
-===================================================================
---- src/unit_abilities.cpp	(revision 54624)
-+++ src/unit_abilities.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
-  *  Manage unit-abilities, like heal, cure, and weapon_specials.
-  */
- 
--#include "foreach.hpp"
- #include "gamestatus.hpp"
- #include "log.hpp"
- #include "resources.hpp"
-@@ -27,6 +26,8 @@
- #include "team.hpp"
- #include "unit_abilities.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- 
-@@ -124,7 +125,7 @@
- {
- 	if (const config &abilities = cfg_.child("abilities"))
- 	{
--		foreach (const config &i, abilities.child_range(ability)) {
-+		BOOST_FOREACH(const config &i, abilities.child_range(ability)) {
- 			if (ability_active(ability, i, loc) &&
- 			    ability_affects_self(ability, i, loc))
- 				return true;
-@@ -141,7 +142,7 @@
- 		const config &adj_abilities = it->cfg_.child("abilities");
- 		if (!adj_abilities)
- 			continue;
--		foreach (const config &j, adj_abilities.child_range(ability)) {
-+		BOOST_FOREACH(const config &j, adj_abilities.child_range(ability)) {
- 			if (unit_abilities::affects_side(j, teams_manager::get_teams(), side(), it->side()) &&
- 			    it->ability_active(ability, j, adjacent[i]) &&
- 			    ability_affects_adjacent(ability,  j, i, loc))
-@@ -158,7 +159,7 @@
- 
- 	if (const config &abilities = cfg_.child("abilities"))
- 	{
--		foreach (const config &i, abilities.child_range(ability)) {
-+		BOOST_FOREACH(const config &i, abilities.child_range(ability)) {
- 			if (ability_active(ability, i, loc) &&
- 			    ability_affects_self(ability, i, loc))
- 				res.cfgs.push_back(std::pair<const config *, map_location>(&i, loc));
-@@ -175,7 +176,7 @@
- 		const config &adj_abilities = it->cfg_.child("abilities");
- 		if (!adj_abilities)
- 			continue;
--		foreach (const config &j, adj_abilities.child_range(ability)) {
-+		BOOST_FOREACH(const config &j, adj_abilities.child_range(ability)) {
- 			if (unit_abilities::affects_side(j, teams_manager::get_teams(), side(), it->side()) &&
- 			    it->ability_active(ability, j, adjacent[i]) &&
- 			    ability_affects_adjacent(ability, j, i, loc))
-@@ -193,7 +194,7 @@
- 
- 	const config &abilities = cfg_.child("abilities");
- 	if (!abilities) return res;
--	foreach (const config::any_child &ab, abilities.all_children_range()) {
-+	BOOST_FOREACH(const config::any_child &ab, abilities.all_children_range()) {
- 		std::string const &id = ab.cfg["id"];
- 		if (!id.empty())
- 			res.push_back(id);
-@@ -208,7 +209,7 @@
- 	const config &abilities = cfg_.child("abilities");
- 	if (!abilities) return res;
- 
--	foreach (const config::any_child &ab, abilities.all_children_range())
-+	BOOST_FOREACH(const config::any_child &ab, abilities.all_children_range())
- 	{
- 		if (force_active || ability_active(ab.key, ab.cfg, loc_))
- 		{
-@@ -265,9 +266,9 @@
- 	get_adjacent_tiles(loc,adjacent);
- 	const unit_map& units = *resources::units;
- 
--	foreach (const config &i, cfg.child_range("filter_adjacent"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent"))
- 	{
--		foreach (const std::string &j, utils::split(i["adjacent"]))
-+		BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"]))
- 		{
- 			map_location::DIRECTION index =
- 				map_location::parse_direction(j);
-@@ -282,9 +283,9 @@
- 		}
- 	}
- 
--	foreach (const config &i, cfg.child_range("filter_adjacent_location"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent_location"))
- 	{
--		foreach (const std::string &j, utils::split(i["adjacent"]))
-+		BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"]))
- 		{
- 			map_location::DIRECTION index = map_location::parse_direction(j);
- 			if (index == map_location::NDIRECTIONS) {
-@@ -310,7 +311,7 @@
- 
- 	assert(dir >=0 && dir <= 5);
- 	static const std::string adjacent_names[6] = {"n","ne","se","s","sw","nw"};
--	foreach (const config &i, cfg.child_range("affect_adjacent"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("affect_adjacent"))
- 	{
- 		std::vector<std::string> dirs = utils::split(i["adjacent"]);
- 		if(std::find(dirs.begin(),dirs.end(),adjacent_names[dir]) != dirs.end()) {
-@@ -366,7 +367,7 @@
- 	int flat = 0;
- 	int stack = 0;
- 	typedef std::pair<const config *, map_location> pt;
--	foreach (pt const &p, cfgs)
-+	BOOST_FOREACH(pt const &p, cfgs)
- 	{
- 		int value = (*p.first)[key].to_int(def);
- 		if ((*p.first)["cumulative"].to_bool()) {
-@@ -398,7 +399,7 @@
- 	int flat = 0;
- 	int stack = 0;
- 	typedef std::pair<const config *, map_location> pt;
--	foreach (pt const &p, cfgs)
-+	BOOST_FOREACH(pt const &p, cfgs)
- 	{
- 		int value = (*p.first)[key].to_int(def);
- 		if ((*p.first)["cumulative"].to_bool()) {
-@@ -448,7 +449,7 @@
- namespace {
- 	bool get_special_children(std::vector<const config*>& result, const config& parent,
- 	                           const std::string& id, bool just_peeking=false) {
--		foreach (const config::any_child &sp, parent.all_children_range())
-+		BOOST_FOREACH(const config::any_child &sp, parent.all_children_range())
- 		{
- 			if (sp.key == id || sp.cfg["id"] == id) {
- 				if(just_peeking) {
-@@ -495,7 +496,7 @@
- 	unit_ability_list res;
- 	if (const config &specials = cfg_.child("specials"))
- 	{
--		foreach (const config &i, specials.child_range(special)) {
-+		BOOST_FOREACH(const config &i, specials.child_range(special)) {
- 			if (special_active(i, true))
- 				res.cfgs.push_back(std::pair<const config *, map_location>
- 					(&i, attacker_ ? aloc_ : dloc_));
-@@ -504,7 +505,7 @@
- 	if (!other_attack_) return res;
- 	if (const config &specials = other_attack_->cfg_.child("specials"))
- 	{
--		foreach (const config &i, specials.child_range(special)) {
-+		BOOST_FOREACH(const config &i, specials.child_range(special)) {
- 			if (other_attack_->special_active(i, false))
- 				res.cfgs.push_back(std::pair<const config *, map_location>
- 					(&i, attacker_ ? dloc_ : aloc_));
-@@ -519,7 +520,7 @@
- 	const config &specials = cfg_.child("specials");
- 	if (!specials) return res;
- 
--	foreach (const config::any_child &sp, specials.all_children_range())
-+	BOOST_FOREACH(const config::any_child &sp, specials.all_children_range())
- 	{
- 		if (force || special_active(sp.cfg, true)) {
- 			const t_string &name = sp.cfg["name"];
-@@ -544,7 +545,7 @@
- 	const config &specials = cfg_.child("specials");
- 	if (!specials) return res;
- 
--	foreach (const config::any_child &sp, specials.all_children_range())
-+	BOOST_FOREACH(const config::any_child &sp, specials.all_children_range())
- 	{
- 		char const *s = force || special_active(sp.cfg, true) ?
- 			"name" : "name_inactive";
-@@ -679,9 +680,9 @@
- 		get_adjacent_tiles(dloc_,adjacent);
- 	}
- 
--	foreach (const config &i, cfg.child_range("filter_adjacent"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent"))
- 	{
--		foreach (const std::string &j, utils::split(i["adjacent"]))
-+		BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"]))
- 		{
- 			map_location::DIRECTION index =
- 				map_location::parse_direction(j);
-@@ -694,9 +695,9 @@
- 		}
- 	}
- 
--	foreach (const config &i, cfg.child_range("filter_adjacent_location"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent_location"))
- 	{
--		foreach (const std::string &j, utils::split(i["adjacent"]))
-+		BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"]))
- 		{
- 			map_location::DIRECTION index =
- 				map_location::parse_direction(j);
-Index: src/video.cpp
-===================================================================
---- src/video.cpp	(revision 54624)
-+++ src/video.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "global.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "image.hpp"
- #include "log.hpp"
- #include "preferences.hpp"
-@@ -29,6 +28,8 @@
- #include "sdl_utils.hpp"
- #include "video.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <vector>
- #include <map>
- #include <algorithm>
-@@ -105,7 +106,7 @@
- {
- 	events.clear();
- 
--	foreach (SDL_Rect const &rect, update_rects) {
-+	BOOST_FOREACH(SDL_Rect const &rect, update_rects) {
- 		events.push_back(event(rect, true));
- 		events.push_back(event(rect, false));
- 	}
-@@ -354,7 +355,7 @@
- int CVideo::bppForMode( int x, int y, int flags)
- {
- 	int test_values[3] = {getBpp(), 32, 16};
--	foreach(int &bpp, test_values) {
-+	BOOST_FOREACH(int &bpp, test_values) {
- 		if(modePossible(x, y, bpp, flags) > 0) {
- 			return bpp;
- 		}
-Index: src/tools/schema/tag.cpp
-===================================================================
---- src/tools/schema/tag.cpp	(revision 54624)
-+++ src/tools/schema/tag.cpp	(revision 54625)
-@@ -21,7 +21,9 @@
- #include "tools/schema/tag.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
-+
-+#include <boost/foreach.hpp>
-+
- namespace schema_validation{
- 
- /*WIKI
-@@ -81,15 +83,15 @@
- 		if (cfg.has_attribute("super")){
- 			super_ = cfg["super"].str();
- 		}
--		foreach (const config &child, cfg.child_range("tag")) {
-+		BOOST_FOREACH(const config &child, cfg.child_range("tag")) {
- 			class_tag child_tag (child);
- 			add_tag(child_tag);
- 		}
--		foreach (const config &child, cfg.child_range("key")) {
-+		BOOST_FOREACH(const config &child, cfg.child_range("key")) {
- 			class_key child_key (child);
- 			add_key(child_key);
- 		}
--		foreach (const config &link, cfg.child_range("link")) {
-+		BOOST_FOREACH(const config &link, cfg.child_range("link")) {
- 			std::string link_name = link["name"].str();
- 			add_link(link_name);
- 		}
-Index: src/tools/exploder_cutter.cpp
-===================================================================
---- src/tools/exploder_cutter.cpp	(revision 54624)
-+++ src/tools/exploder_cutter.cpp	(revision 54625)
-@@ -15,12 +15,13 @@
- 
- #include "exploder_cutter.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "serialization/parser.hpp"
- #include "serialization/preprocessor.hpp"
- #include "serialization/string_utils.hpp"
- #include "SDL_image.h"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iostream>
- 
- cutter::cutter()
-@@ -48,7 +49,7 @@
- 
- void cutter::load_masks(const config& conf)
- {
--	foreach (const config &m, conf.child_range("mask"))
-+	BOOST_FOREACH(const config &m, conf.child_range("mask"))
- 	{
- 		const std::string name = m["name"];
- 		const std::string image = get_mask_dir() + "/" + std::string(m["image"]);
-@@ -94,7 +95,7 @@
- {
- 	surface_map res;
- 
--	foreach (const config &part, conf.child_range("part")) {
-+	BOOST_FOREACH(const config &part, conf.child_range("part")) {
- 		add_sub_image(surf, res, &part);
- 	}
- 
-Index: src/builder.cpp
-===================================================================
---- src/builder.cpp	(revision 54624)
-+++ src/builder.cpp	(revision 54625)
-@@ -20,13 +20,14 @@
- 
- #include "builder.hpp"
- 
--#include "foreach.hpp"
- #include "loadscreen.hpp"
- #include "log.hpp"
- #include "map.hpp"
- #include "serialization/string_utils.hpp"
- #include "image.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- #define WRN_NG LOG_STREAM(warn, log_engine)
-@@ -65,12 +66,12 @@
- 		sorted_images = true;
- 	}
- 
--	foreach(const rule_image_rand& ri, images){
-+	BOOST_FOREACH(const rule_image_rand& ri, images){
- 		bool is_background = ri->is_background();
- 
- 		imagelist& img_list = is_background ? images_background : images_foreground;
- 
--		foreach(const rule_image_variant& variant, ri->variants){
-+		BOOST_FOREACH(const rule_image_variant& variant, ri->variants){
- 			if(!variant.tods.empty() && variant.tods.find(tod) == variant.tods.end())
- 				continue;
- 
-@@ -250,12 +251,12 @@
- 
- 	tile& btile = tile_map_[loc];
- 
--	foreach(animated<image::locator>& a, btile.images_background) {
-+	BOOST_FOREACH(animated<image::locator>& a, btile.images_background) {
- 		if(a.need_update())
- 			changed = true;
- 		a.update_last_draw_time();
- 	}
--	foreach(animated<image::locator>& a, btile.images_foreground) {
-+	BOOST_FOREACH(animated<image::locator>& a, btile.images_foreground) {
- 		if(a.need_update())
- 			changed = true;
- 		a.update_last_draw_time();
-@@ -326,7 +327,7 @@
- 	}
- 	std::vector<std::string> vars = utils::split(variations, ';', 0);
- 
--	foreach(const std::string& v, vars){
-+	BOOST_FOREACH(const std::string& v, vars){
- 		res.push_back(base);
- 		std::string::size_type pos = 0;
- 		while ((pos = res.back().find("@V", pos)) != std::string::npos) {
-@@ -345,21 +346,21 @@
- 
- 	// Parse images and animations data
- 	// If one is not valid, return false.
--	foreach(terrain_constraint &constraint, rule.constraints)
-+	BOOST_FOREACH(terrain_constraint &constraint, rule.constraints)
- 	{
--		foreach(rule_image& ri, constraint.images)
-+		BOOST_FOREACH(rule_image& ri, constraint.images)
- 		{
--			foreach(rule_image_variant& variant, ri.variants)
-+			BOOST_FOREACH(rule_image_variant& variant, ri.variants)
- 			{
- 
- 				std::vector<std::string> var_strings = get_variations(variant.image_string, variant.variations);
--				foreach(const std::string& var, var_strings)
-+				BOOST_FOREACH(const std::string& var, var_strings)
- 				{
- 					/** @todo improve this, 99% of terrains are not animated. */
- 					std::vector<std::string> frames = utils::parenthetical_split(var,',');
- 					animated<image::locator> res;
- 
--					foreach(const std::string& frame, frames)
-+					BOOST_FOREACH(const std::string& frame, frames)
- 					{
- 						const std::vector<std::string> items = utils::split(frame, ':');
- 						const std::string& str = items.front();
-@@ -499,7 +500,7 @@
- void terrain_builder::replace_rotate_tokens(rule_image &image, int angle,
- 	const std::vector<std::string> &replacement)
- {
--	foreach(rule_image_variant& variant, image.variants) {
-+	BOOST_FOREACH(rule_image_variant& variant, image.variants) {
- 		replace_rotate_tokens(variant, angle, replacement);
- 	}
- }
-@@ -507,7 +508,7 @@
- void terrain_builder::replace_rotate_tokens(rule_imagelist &list, int angle,
- 	const std::vector<std::string> &replacement)
- {
--	foreach (rule_image &img, list) {
-+	BOOST_FOREACH(rule_image &img, list) {
- 		replace_rotate_tokens(img, angle, replacement);
- 	}
- }
-@@ -515,16 +516,16 @@
- void terrain_builder::replace_rotate_tokens(building_rule &rule, int angle,
- 	const std::vector<std::string> &replacement)
- {
--	foreach (terrain_constraint &cons, rule.constraints)
-+	BOOST_FOREACH(terrain_constraint &cons, rule.constraints)
- 	{
- 		// Transforms attributes
--		foreach (std::string &flag, cons.set_flag) {
-+		BOOST_FOREACH(std::string &flag, cons.set_flag) {
- 			replace_rotate_tokens(flag, angle, replacement);
- 		}
--		foreach (std::string &flag, cons.no_flag) {
-+		BOOST_FOREACH(std::string &flag, cons.no_flag) {
- 			replace_rotate_tokens(flag, angle, replacement);
- 		}
--		foreach (std::string &flag, cons.has_flag) {
-+		BOOST_FOREACH(std::string &flag, cons.has_flag) {
- 			replace_rotate_tokens(flag, angle, replacement);
- 		}
- 		replace_rotate_tokens(cons.images, angle, replacement);
-@@ -541,7 +542,7 @@
- 		return;
- 	}
- 
--	foreach (terrain_constraint &cons, ret.constraints) {
-+	BOOST_FOREACH(terrain_constraint &cons, ret.constraints) {
- 		rotate(cons, angle);
- 	}
- 
-@@ -549,7 +550,7 @@
- 	int minx = INT_MAX;
- 	int miny = INT_MAX;
- 
--	foreach (const terrain_constraint &cons, ret.constraints) {
-+	BOOST_FOREACH(const terrain_constraint &cons, ret.constraints) {
- 		minx = std::min<int>(cons.loc.x, minx);
- 		miny = std::min<int>(2 * cons.loc.y + (cons.loc.x & 1), miny);
- 	}
-@@ -559,7 +560,7 @@
- 	if(!(miny & 1) && (minx & 1) && (minx > 0))
- 		miny -= 2;
- 
--	foreach (terrain_constraint &cons, ret.constraints) {
-+	BOOST_FOREACH(terrain_constraint &cons, ret.constraints) {
- 		cons.loc.legacy_sum_assign(map_location(-minx, -((miny - 1) / 2)));
- 	}
- 
-@@ -581,7 +582,7 @@
- 
- void terrain_builder::add_images_from_config(rule_imagelist& images, const config &cfg, bool global, int dx, int dy)
- {
--	foreach (const config &img, cfg.child_range("image"))
-+	BOOST_FOREACH(const config &img, cfg.child_range("image"))
- 	{
- 		int layer = img["layer"];
- 
-@@ -606,7 +607,7 @@
- 		images.push_back(rule_image(layer, basex - dx, basey - dy, global, center_x, center_y));
- 
- 		// Adds the other variants of the image
--		foreach (const config &variant, img.child_range("variant"))
-+		BOOST_FOREACH(const config &variant, img.child_range("variant"))
- 		{
- 			const std::string &name = variant["name"];
- 			const std::string &variations = img["variations"];
-@@ -631,7 +632,7 @@
- 		const t_translation::t_match& type, const config& global_images)
- {
- 	terrain_constraint *cons = NULL;
--	foreach (terrain_constraint &c, constraints) {
-+	BOOST_FOREACH(terrain_constraint &c, constraints) {
- 		if (c.loc == loc) {
- 			cons = &c;
- 			break;
-@@ -769,7 +770,7 @@
- 	log_scope("terrain_builder::parse_config");
- 
- 	// Parses the list of building rules (BRs)
--	foreach (const config &br, cfg.child_range("terrain_graphics"))
-+	BOOST_FOREACH(const config &br, cfg.child_range("terrain_graphics"))
- 	{
- 		building_rule pbr; // Parsed Building rule
- 		pbr.local = local;
-@@ -788,7 +789,7 @@
- 		parse_mapstring(br["map"], pbr, anchors, br);
- 
- 		// Parses the terrain constraints (TCs)
--		foreach (const config &tc, br.child_range("tile"))
-+		BOOST_FOREACH(const config &tc, br.child_range("tile"))
- 		{
- 			// Adds the terrain constraint to the current built terrain's list
- 			// of terrain constraints, if it does not exist.
-@@ -831,7 +832,7 @@
- 		const std::vector<std::string> global_has_flag = utils::split(br["has_flag"]);
- 		const std::vector<std::string> global_set_no_flag = utils::split(br["set_no_flag"]);
- 
--		foreach (terrain_constraint &constraint, pbr.constraints)
-+		BOOST_FOREACH(terrain_constraint &constraint, pbr.constraints)
- 		{
- 			constraint.set_flag.insert(constraint.set_flag.end(),
- 				global_set_flag.begin(), global_set_flag.end());
-@@ -925,7 +926,7 @@
- 		}
- 	}
- 
--	foreach (const terrain_constraint &cons, rule.constraints)
-+	BOOST_FOREACH(const terrain_constraint &cons, rule.constraints)
- 	{
- 		// Translated location
- 		const map_location tloc = loc.legacy_sum(cons.loc);
-@@ -943,13 +944,13 @@
- 
- 		const std::set<std::string> &flags = tile_map_[tloc].flags;
- 
--		foreach (const std::string &s, cons.no_flag) {
-+		BOOST_FOREACH(const std::string &s, cons.no_flag) {
- 			// If a flag listed in "no_flag" is present, the rule does not match
- 			if (flags.find(s) != flags.end()) {
- 				return false;
- 			}
- 		}
--		foreach (const std::string &s, cons.has_flag) {
-+		BOOST_FOREACH(const std::string &s, cons.has_flag) {
- 			// If a flag listed in "has_flag" is not present, this rule does not match
- 			if (flags.find(s) == flags.end()) {
- 				return false;
-@@ -964,7 +965,7 @@
- {
- 	unsigned int rand_seed = get_noise(loc, rule.get_hash());
- 
--	foreach (const terrain_constraint &constraint, rule.constraints)
-+	BOOST_FOREACH(const terrain_constraint &constraint, rule.constraints)
- 	{
- 		const map_location tloc = loc.legacy_sum(constraint.loc);
- 		if(!tile_map_.on_map(tloc)) {
-@@ -973,12 +974,12 @@
- 
- 		tile& btile = tile_map_[tloc];
- 
--		foreach (const rule_image &img, constraint.images) {
-+		BOOST_FOREACH(const rule_image &img, constraint.images) {
- 			btile.images.push_back(tile::rule_image_rand(&img, rand_seed));
- 		}
- 
- 		// Sets flags
--		foreach (const std::string &flag, constraint.set_flag) {
-+		BOOST_FOREACH(const std::string &flag, constraint.set_flag) {
- 			btile.flags.insert(flag);
- 		}
- 
-@@ -1001,9 +1002,9 @@
- 	if(hash_ != DUMMY_HASH)
- 		return hash_;
- 
--	foreach(const terrain_constraint &constraint, constraints) {
--		foreach(const rule_image& ri, constraint.images) {
--			foreach(const rule_image_variant& variant, ri.variants) {
-+	BOOST_FOREACH(const terrain_constraint &constraint, constraints) {
-+		BOOST_FOREACH(const rule_image& ri, constraint.images) {
-+			BOOST_FOREACH(const rule_image_variant& variant, ri.variants) {
- 				// we will often hash the same string, but that seems fast enough
- 				hash_ += hash_str(variant.image_string);
- 			}
-@@ -1031,7 +1032,7 @@
- 		}
- 	}
- 
--	foreach (const building_rule &rule, building_rules_)
-+	BOOST_FOREACH(const building_rule &rule, building_rules_)
- 	{
- 		// Find the constraint that contains the less terrain of all terrain rules.
- 		// We will keep a track of the matching terrains of this constraint
-@@ -1040,7 +1041,7 @@
- 		t_translation::t_list min_types;
- 		const terrain_constraint *min_constraint = NULL;
- 
--		foreach (const terrain_constraint &constraint, rule.constraints)
-+		BOOST_FOREACH(const terrain_constraint &constraint, rule.constraints)
- 		{
- 			const t_translation::t_match& match = constraint.terrain_types_match;
- 			t_translation::t_list matching_types;
-Index: src/game_config.cpp
-===================================================================
---- src/game_config.cpp	(revision 54624)
-+++ src/game_config.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- 
- #include "color_range.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
- #include "util.hpp"
-@@ -29,6 +28,8 @@
- #include "revision.hpp"
- #endif /* HAVE_REVISION */
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
- #define ERR_NG LOG_STREAM(err, log_engine)
-@@ -259,7 +260,7 @@
- 		}
- 
- 		server_list.clear();
--		foreach (const config &server, v.child_range("server"))
-+		BOOST_FOREACH(const config &server, v.child_range("server"))
- 		{
- 			server_info sinf;
- 			sinf.name = server["name"].str();
-@@ -270,7 +271,7 @@
- 
- 	void add_color_info(const config &v)
- 	{
--		foreach (const config &teamC, v.child_range("color_range"))
-+		BOOST_FOREACH(const config &teamC, v.child_range("color_range"))
- 		{
- 			const config::attribute_value *a1 = teamC.get("id"),
- 				*a2 = teamC.get("rgb");
-@@ -304,9 +305,9 @@
- 			DBG_NG << str.str() << '\n';
- 		}
- 
--		foreach (const config &cp, v.child_range("color_palette"))
-+		BOOST_FOREACH(const config &cp, v.child_range("color_palette"))
- 		{
--			foreach (const config::attribute &rgb, cp.attribute_range())
-+			BOOST_FOREACH(const config::attribute &rgb, cp.attribute_range())
- 			{
- 				std::vector<Uint32> temp;
- 				if(!string2rgb(rgb.second, temp)) {
-Index: src/whiteboard/recall.cpp
-===================================================================
---- src/whiteboard/recall.cpp	(revision 54624)
-+++ src/whiteboard/recall.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- #include "utility.hpp"
- #include "visitor.hpp"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "menu_events.hpp"
- #include "play_controller.hpp"
-@@ -32,6 +31,8 @@
- #include "team.hpp"
- #include "unit.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb
- {
- 
-@@ -71,7 +72,7 @@
- {
- 	// Construct and validate temp_unit_
- 	size_t underlying_id = cfg["temp_unit_"];
--	foreach(unit const& recall_unit, resources::teams->at(team_index()).recall_list())
-+	BOOST_FOREACH(unit const& recall_unit, resources::teams->at(team_index()).recall_list())
- 	{
- 		if(recall_unit.underlying_id()==underlying_id)
- 		{
-Index: src/whiteboard/utility.cpp
-===================================================================
---- src/whiteboard/utility.cpp	(revision 54624)
-+++ src/whiteboard/utility.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- #include "manager.hpp"
- 
- #include "actions.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "map.hpp"
- #include "play_controller.hpp"
-@@ -30,6 +29,8 @@
- #include "team.hpp"
- #include "unit.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb {
- 
- size_t viewer_team()
-@@ -60,7 +61,7 @@
- {
- 	assert(leader.can_recruit());
- 	assert(resources::game_map->is_keep(leader.get_location()));
--	foreach(unit const& unit, *resources::units)
-+	BOOST_FOREACH(unit const& unit, *resources::units)
- 	{
- 		if (unit.can_recruit() &&
- 				resources::game_map->is_keep(unit.get_location()) &&
-@@ -83,7 +84,7 @@
- 	if(!map.is_castle(hex))
- 		return NULL;
- 
--	foreach(unit& u, *resources::units)
-+	BOOST_FOREACH(unit& u, *resources::units)
- 		if(u.can_recruit()
- 				&& u.side() == static_cast<int>(team_index+1)
- 				&& can_recruit_on(map,u.get_location(),hex))
-@@ -124,7 +125,7 @@
- 
- 	int result = 0;
- 	gamemap const& map = *resources::game_map;
--	foreach(map_location const& loc, std::make_pair(path.begin()+1,path.end()))
-+	BOOST_FOREACH(map_location const& loc, std::make_pair(path.begin()+1,path.end()))
- 		result += u.movement_cost(map[loc]);
- 	return result;
- }
-@@ -149,7 +150,7 @@
- 
- bool has_actions()
- {
--	foreach(team& t, *resources::teams)
-+	BOOST_FOREACH(team& t, *resources::teams)
- 		if (!t.get_side_actions()->empty())
- 			return true;
- 
-Index: src/whiteboard/visitor.hpp
-===================================================================
---- src/whiteboard/visitor.hpp	(revision 54624)
-+++ src/whiteboard/visitor.hpp	(revision 54625)
-@@ -33,11 +33,11 @@
- #include "action.hpp"
- #include "side_actions.hpp"
- 
--#include "foreach.hpp"
- #include "play_controller.hpp"
- #include "resources.hpp"
- 
- #include <boost/noncopyable.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace wb
- {
-@@ -81,7 +81,7 @@
- 
- 		//Determine how many turns' worth of plans there are
- 		size_t max_turns = 0;
--		foreach(team& t, *resources::teams)
-+		BOOST_FOREACH(team& t, *resources::teams)
- 			max_turns = std::max(max_turns,t.get_side_actions()->num_turns());
- 
- 		size_t const current_team = resources::controller->current_side() - 1;
-Index: src/whiteboard/side_actions.cpp
-===================================================================
---- src/whiteboard/side_actions.cpp	(revision 54624)
-+++ src/whiteboard/side_actions.cpp	(revision 54625)
-@@ -31,12 +31,13 @@
- #include "validate_visitor.hpp"
- 
- #include "actions.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_end_exceptions.hpp"
- #include "map.hpp"
- #include "resources.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <set>
- #include <sstream>
- 
-@@ -48,13 +49,13 @@
- {
- 	s << "Content of side_actions:";
- 	int turn = 1;
--	foreach(action_queue const& turn_queue, side_actions.actions())
-+	BOOST_FOREACH(action_queue const& turn_queue, side_actions.actions())
- 	{
- 		s << "\n  Turn " << turn;
- 		++turn;
- 
- 		int count = 1;
--		foreach(action_ptr const& action, turn_queue)
-+		BOOST_FOREACH(action_ptr const& action, turn_queue)
- 		{
- 			s << "\n    (" << count << ") " << action;
- 			++count;
-@@ -114,7 +115,7 @@
- 					main_number = index;
- 				}
- 
--				foreach(weak_action_ptr action, highlighter->get_secondary_highlights())
-+				BOOST_FOREACH(weak_action_ptr action, highlighter->get_secondary_highlights())
- 				{
- 					if (action.lock() == *it)
- 					{
-@@ -199,7 +200,7 @@
- size_t side_actions::size() const
- {
- 	size_t result = 0;
--	foreach(action_queue const& queue, actions_)
-+	BOOST_FOREACH(action_queue const& queue, actions_)
- 		result += queue.size();
- 	return result;
- }
-@@ -234,7 +235,7 @@
- 		return;
- 	}
- 
--	foreach(action_ptr act, *this)
-+	BOOST_FOREACH(action_ptr act, *this)
- 		act->hide();
- }
- void side_actions::show()
-@@ -244,7 +245,7 @@
- 
- 	hidden_ = false;
- 
--	foreach(action_ptr act, *this)
-+	BOOST_FOREACH(action_ptr act, *this)
- 		act->show();
- }
- 
-@@ -507,7 +508,7 @@
- size_t side_actions::count_actions_of(unit const* unit)
- {
- 	size_t count = 0;
--	foreach(action_ptr action, *this)
-+	BOOST_FOREACH(action_ptr action, *this)
- 	{
- 		if (action->get_unit() == unit)
- 		{
-@@ -783,7 +784,7 @@
- 	else if(type=="refresh")
- 	{
- 		safe_clear();
--		foreach(net_cmd const& sub_cmd, cmd.child_range("net_cmd"))
-+		BOOST_FOREACH(net_cmd const& sub_cmd, cmd.child_range("net_cmd"))
- 			execute_net_cmd(sub_cmd);
- 	}
- 	else
-@@ -890,7 +891,7 @@
- 
- 	//find units who still have plans for turn 0 (i.e. were too lazy to finish their jobs)
- 	std::set<unit const*> lazy_units;
--	foreach(action_ptr const& act, iter_turn(0))
-+	BOOST_FOREACH(action_ptr const& act, iter_turn(0))
- 	{
- 		unit const* u = act->get_unit();
- 		if(u)
-@@ -913,7 +914,7 @@
- 	}
- 
- 	//push any remaining first-turn plans into the second turn
--	foreach(action_ptr act, actions_.front())
-+	BOOST_FOREACH(action_ptr act, actions_.front())
- 		actions_[1].push_front(act);
- 	actions_.front().clear();
- 
-Index: src/whiteboard/move.cpp
-===================================================================
---- src/whiteboard/move.cpp	(revision 54624)
-+++ src/whiteboard/move.cpp	(revision 54625)
-@@ -26,7 +26,6 @@
- 
- #include "arrow.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- #include "game_end_exceptions.hpp"
- #include "mouse_events.hpp"
- #include "play_controller.hpp"
-@@ -37,6 +36,8 @@
- #include "unit_display.hpp"
- #include "unit_map.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb {
- 
- std::ostream& operator<<(std::ostream &s, move_ptr move)
-@@ -108,10 +109,10 @@
- 	if(!route_cfg)
- 		throw action::ctor_err("move: Invalid route_");
- 	route_->move_cost = route_cfg["move_cost"];
--	foreach(config const& loc_cfg, route_cfg.child_range("step")) {
-+	BOOST_FOREACH(config const& loc_cfg, route_cfg.child_range("step")) {
- 		route_->steps.push_back(map_location(loc_cfg["x"],loc_cfg["y"]));
- 	}
--	foreach(config const& mark_cfg, route_cfg.child_range("mark")) {
-+	BOOST_FOREACH(config const& mark_cfg, route_cfg.child_range("mark")) {
- 		route_->marks[map_location(mark_cfg["x"],mark_cfg["y"])]
- 				= pathfind::marked_route::mark(mark_cfg["turns"],mark_cfg["zoc"],mark_cfg["capture"],mark_cfg["invisible"]);
- 	}
-@@ -470,7 +471,7 @@
- 	//Serialize route_
- 	config route_cfg;
- 	route_cfg["move_cost"]=route_->move_cost;
--	foreach(map_location const& loc, route_->steps)
-+	BOOST_FOREACH(map_location const& loc, route_->steps)
- 	{
- 		config loc_cfg;
- 		loc_cfg["x"]=loc.x;
-@@ -478,7 +479,7 @@
- 		route_cfg.add_child("step",loc_cfg);
- 	}
- 	typedef std::pair<map_location,pathfind::marked_route::mark> pair_loc_mark;
--	foreach(pair_loc_mark const& item, route_->marks)
-+	BOOST_FOREACH(pair_loc_mark const& item, route_->marks)
- 	{
- 		config mark_cfg;
- 		mark_cfg["x"]=item.first.x;
-Index: src/whiteboard/validate_visitor.cpp
-===================================================================
---- src/whiteboard/validate_visitor.cpp	(revision 54624)
-+++ src/whiteboard/validate_visitor.cpp	(revision 54625)
-@@ -28,12 +28,13 @@
- #include "utility.hpp"
- 
- #include "arrow.hpp"
--#include "foreach.hpp"
- #include "pathfind/pathfind.hpp"
- #include "play_controller.hpp"
- #include "resources.hpp"
- #include "team.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb
- {
- 
-@@ -60,7 +61,7 @@
- 	{
- 		int side_actions_size_before = viewer_actions_.size();
- 		LOG_WB << "Erasing " << actions_to_erase_.size() << " invalid actions.\n";
--		foreach(action_ptr action, actions_to_erase_)
-+		BOOST_FOREACH(action_ptr action, actions_to_erase_)
- 		{
- 			viewer_actions_.remove_action(viewer_actions_.get_position_of(action), false);
- 		}
-Index: src/whiteboard/manager.cpp
-===================================================================
---- src/whiteboard/manager.cpp	(revision 54624)
-+++ src/whiteboard/manager.cpp	(revision 54625)
-@@ -32,7 +32,6 @@
- #include "actions.hpp"
- #include "arrow.hpp"
- #include "chat_events.hpp"
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
-@@ -47,6 +46,8 @@
- #include "unit_display.hpp"
- 
- #include <boost/lexical_cast.hpp>
-+#include <boost/foreach.hpp>
-+
- #include <sstream>
- 
- namespace wb {
-@@ -268,7 +269,7 @@
- 	}
- 
- 	//Look for planned recruits that depend on this leader
--	foreach(action_const_ptr action, *viewer_actions())
-+	BOOST_FOREACH(action_const_ptr action, *viewer_actions())
- 	{
- 		recruit_const_ptr recruit = boost::dynamic_pointer_cast<class recruit const>(action);
- 		recall_const_ptr recall = boost::dynamic_pointer_cast<class recall const>(action);
-@@ -332,7 +333,7 @@
- 
- static void hide_all_plans()
- {
--	foreach(team& t, *resources::teams)
-+	BOOST_FOREACH(team& t, *resources::teams)
- 		t.get_side_actions()->hide();
- }
- 
-@@ -344,7 +345,7 @@
- 		hide_all_plans();
- 	else //< normal circumstance
- 	{
--		foreach(team& t, *resources::teams)
-+		BOOST_FOREACH(team& t, *resources::teams)
- 		{
- 			//make sure only appropriate teams are hidden
- 			if(!t.is_network_human())
-@@ -498,7 +499,7 @@
- 	if (can_modify_game_state() && has_actions())
- 	{
- 		units_owning_moves_ = move_owners_finder().get_units_owning_moves();
--		foreach(size_t unit_id, units_owning_moves_)
-+		BOOST_FOREACH(size_t unit_id, units_owning_moves_)
- 		{
- 			unit_map::iterator unit_iter = resources::units->find(unit_id);
- 			assert(unit_iter.valid());
-@@ -509,7 +510,7 @@
- 
- void manager::post_draw()
- {
--	foreach(size_t unit_id, units_owning_moves_)
-+	BOOST_FOREACH(size_t unit_id, units_owning_moves_)
- 	{
- 		unit_map::iterator unit_iter = resources::units->find(unit_id);
- 		if (unit_iter.valid()) { 
-@@ -558,7 +559,7 @@
- 
- 		//Info about the action numbers to be displayed on screen.
- 		side_actions::numbers_t numbers;
--		foreach(team& t, *resources::teams)
-+		BOOST_FOREACH(team& t, *resources::teams)
- 		{
- 			side_actions& sa = *t.get_side_actions();
- 			if(!sa.hidden())
-@@ -571,7 +572,7 @@
- 
- void manager::on_mouseover_change(const map_location& hex)
- {
--	foreach(map_location const& hex, hidden_unit_hexes_)
-+	BOOST_FOREACH(map_location const& hex, hidden_unit_hexes_)
- 		resources::screen->remove_exclusive_draw(hex);
- 	hidden_unit_hexes_.clear();
- 
-@@ -636,7 +637,7 @@
- 		LOG_WB << "Received wb data (" << count << ").\n";
- 
- 		team& team_from = resources::teams->at(wb_cfg["side"]-1);
--		foreach(side_actions::net_cmd const& cmd, wb_cfg.child_range("net_cmd"))
-+		BOOST_FOREACH(side_actions::net_cmd const& cmd, wb_cfg.child_range("net_cmd"))
- 			team_from.get_side_actions()->execute_net_cmd(cmd);
- 	}
- }
-@@ -1138,7 +1139,7 @@
- 	options.push_back(_("HIDE ALL allies’ plans"));
- 
- 	//populate list of networked allies
--	foreach(team &t, *resources::teams)
-+	BOOST_FOREACH(team &t, *resources::teams)
- 	{
- 		//Exclude enemies, AIs, and local players
- 		if(t.is_enemy(v_side) || !t.is_network())
-@@ -1164,11 +1165,11 @@
- 	switch(selection)
- 	{
- 	case 0:
--		foreach(team* t, allies)
-+		BOOST_FOREACH(team* t, allies)
- 			team_plans_hidden_[t->side()-1]=false;
- 		break;
- 	case 1:
--		foreach(team* t, allies)
-+		BOOST_FOREACH(team* t, allies)
- 			team_plans_hidden_[t->side()-1]=true;
- 		break;
- 	default:
-Index: src/whiteboard/suppose_dead.cpp
-===================================================================
---- src/whiteboard/suppose_dead.cpp	(revision 54624)
-+++ src/whiteboard/suppose_dead.cpp	(revision 54625)
-@@ -26,7 +26,6 @@
- 
- #include "arrow.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_end_exceptions.hpp"
- #include "mouse_events.hpp"
-Index: src/whiteboard/mapbuilder.cpp
-===================================================================
---- src/whiteboard/mapbuilder.cpp	(revision 54624)
-+++ src/whiteboard/mapbuilder.cpp	(revision 54625)
-@@ -24,12 +24,13 @@
- #include "side_actions.hpp"
- #include "utility.hpp"
- 
--#include "foreach.hpp"
- #include "play_controller.hpp"
- #include "resources.hpp"
- #include "unit.hpp"
- #include "unit_map.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb
- {
- 
-@@ -51,14 +52,14 @@
- 
- void mapbuilder::pre_build()
- {
--	foreach(team& t, *resources::teams)
-+	BOOST_FOREACH(team& t, *resources::teams)
- 	{
- 		//Reset spent gold to zero, it'll be recalculated during the map building
- 		t.get_side_actions()->reset_gold_spent();
- 	}
- 
- 	int current_side = resources::controller->current_side();
--	foreach(unit& u, *resources::units)
-+	BOOST_FOREACH(unit& u, *resources::units)
- 	{
- 		bool on_current_side = (u.side() == current_side);
- 
-Index: src/whiteboard/highlight_visitor.cpp
-===================================================================
---- src/whiteboard/highlight_visitor.cpp	(revision 54624)
-+++ src/whiteboard/highlight_visitor.cpp	(revision 54625)
-@@ -29,11 +29,12 @@
- #include "suppose_dead.hpp"
- 
- #include "arrow.hpp"
--#include "foreach.hpp"
- #include "play_controller.hpp"
- #include "resources.hpp"
- #include "unit_map.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb
- {
- 
-@@ -147,7 +148,7 @@
- 		{
- 			//Highlight secondary highlights
- 			mode_ = HIGHLIGHT_SECONDARY;
--			foreach(weak_action_ptr weak, secondary_highlights_)
-+			BOOST_FOREACH(weak_action_ptr weak, secondary_highlights_)
- 			{
- 				if (action_ptr action = weak.lock())
- 				{
-@@ -169,7 +170,7 @@
- 
- 	//unhighlight secondary highlights
- 	mode_ = UNHIGHLIGHT_SECONDARY;
--	foreach(weak_action_ptr weak, secondary_highlights_)
-+	BOOST_FOREACH(weak_action_ptr weak, secondary_highlights_)
- 	{
- 		if (action_ptr action = weak.lock())
- 		{
-@@ -178,7 +179,7 @@
- 	}
- 
- 	//unhide other units if needed
--	foreach(map_location hex, exclusive_display_hexes_)
-+	BOOST_FOREACH(map_location hex, exclusive_display_hexes_)
- 	{
- 		resources::screen->remove_exclusive_draw(hex);
- 	}
-Index: src/language.cpp
-===================================================================
---- src/language.cpp	(revision 54624)
-+++ src/language.cpp	(revision 54625)
-@@ -16,7 +16,6 @@
- #include "global.hpp"
- 
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "language.hpp"
- #include "log.hpp"
-@@ -27,6 +26,7 @@
- #include <stdexcept>
- #include <clocale>
- #include <boost/scoped_array.hpp>
-+#include <boost/foreach.hpp>
- 
- #ifdef _WIN32
- #include <windows.h>
-@@ -101,7 +101,7 @@
- 	known_languages.push_back(
- 		language_def("", t_string(N_("System default language"), "wesnoth"), "ltr", "", "A"));
- 
--	foreach (const config &lang, cfg.child_range("locale"))
-+	BOOST_FOREACH(const config &lang, cfg.child_range("locale"))
- 	{
- 		known_languages.push_back(
- 			language_def(lang["locale"], lang["name"], lang["dir"],
-@@ -226,9 +226,9 @@
- 		std::cerr << "No [language] block found\n";
- 		return false;
- 	}
--	foreach (const config &lang, languages_) {
-+	BOOST_FOREACH(const config &lang, languages_) {
- 		DBG_G << "[language]\n";
--		foreach (const config::attribute &j, lang.attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &j, lang.attribute_range()) {
- 			DBG_G << j.first << "=\"" << j.second << "\"\n";
- 			strings_[j.first] = j.second;
- 		}
-@@ -283,7 +283,7 @@
- 
- void init_textdomains(const config& cfg)
- {
--	foreach (const config &t, cfg.child_range("textdomain"))
-+	BOOST_FOREACH(const config &t, cfg.child_range("textdomain"))
- 	{
- 		const std::string &name = t["name"];
- 		const std::string &path = t["path"];
-@@ -307,7 +307,7 @@
- bool init_strings(const config& cfg)
- {
- 	languages_.clear();
--	foreach(const config &l, cfg.child_range("language")) {
-+	BOOST_FOREACH(const config &l, cfg.child_range("language")) {
- 		languages_.push_back(l);
- 	}
- 	return load_strings(true);
-Index: src/multiplayer_lobby.cpp
-===================================================================
---- src/multiplayer_lobby.cpp	(revision 54624)
-+++ src/multiplayer_lobby.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- #include "global.hpp"
- 
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "lobby_preferences.hpp"
- #include "map_exception.hpp"
-@@ -34,6 +33,8 @@
- #include "wml_exception.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_CF LOG_STREAM(err, log_config)
- 
-@@ -424,7 +425,7 @@
- 
- 	games_.clear();
- 
--	foreach (const config &game, cfg.child("gamelist").child_range("game"))
-+	BOOST_FOREACH(const config &game, cfg.child("gamelist").child_range("game"))
- 	{
- 		bool verified = true;
- 		games_.push_back(game_item());
-@@ -502,7 +503,7 @@
- 				if (map_hashes_ && !games_.back().reloaded) {
- 					std::string hash = game["hash"];
- 					bool hash_found = false;
--					foreach (const config::attribute &i, map_hashes_.attribute_range()) {
-+					BOOST_FOREACH(const config::attribute &i, map_hashes_.attribute_range()) {
- 						if (i.first == game["mp_scenario"] && i.second == hash) {
- 							hash_found = true;
- 							break;
-@@ -639,7 +640,7 @@
- 
-     if(preferences::fi_friends_in_game()) {
-         bool found_friend = false;
--        foreach(const config &user, cfg.child_range("user")) {
-+        BOOST_FOREACH(const config &user, cfg.child_range("user")) {
-             if(preferences::is_friend(user["name"]) && user["game_id"] == i.id) {
-                 found_friend = true;
-                 break;
-@@ -650,7 +651,7 @@
- 
-     if(!preferences::fi_text().empty()) {
-         bool found_match = true;
--        foreach(const std::string& search_string, utils::split(preferences::fi_text(), ' ', utils::STRIP_SPACES)) {
-+        BOOST_FOREACH(const std::string& search_string, utils::split(preferences::fi_text(), ' ', utils::STRIP_SPACES)) {
-             if(std::search(i.map_info.begin(), i.map_info.end(), search_string.begin(), search_string.end(), chars_equal_insensitive) == i.map_info.end() &&
-                     std::search(i.name.begin(), i.name.end(), search_string.begin(), search_string.end(), chars_equal_insensitive) == i.name.end()) {
-                 found_match = false;
-Index: src/reports.cpp
-===================================================================
---- src/reports.cpp	(revision 54624)
-+++ src/reports.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- #include "editor/editor_controller.hpp"
- #include "editor/editor_palettes.hpp"
- #include "font.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
-@@ -36,6 +35,7 @@
- #include "unit.hpp"
- #include "whiteboard/manager.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- #include <cassert>
- #include <ctime>
-@@ -260,7 +260,7 @@
- 	if (!u) return report();
- 	config res;
- 	typedef std::pair<std::string, std::string> pair_string;
--	foreach(const pair_string &ps, u->amla_icons()) {
-+	BOOST_FOREACH(const pair_string &ps, u->amla_icons()) {
- 		add_image(res, ps.first, ps.second);
- 	}
- 	return res;
-@@ -395,7 +395,7 @@
- 
- 	bool att_def_diff = false;
- 	map_location displayed_unit_hex = resources::screen->displayed_unit_hex();
--	foreach (const utils::string_map::value_type &resist, u->get_base_resistances())
-+	BOOST_FOREACH(const utils::string_map::value_type &resist, u->get_base_resistances())
- 	{
- 		std::ostringstream line;
- 		line << gettext(resist.first.c_str()) << ": ";
-@@ -415,7 +415,7 @@
- 	if (att_def_diff)
- 		tooltip << _("(Att / Def)");
- 	tooltip << '\n';
--	foreach (const std::string &line, resistances_table) {
-+	BOOST_FOREACH(const std::string &line, resistances_table) {
- 		tooltip << line;
- 	}
- 	return text_report(str.str(), tooltip.str());
-@@ -458,7 +458,7 @@
- 	if (!u) return report();
- 	config res;
- 	typedef std::pair<std::string, std::string> pair_string;
--	foreach (const pair_string &ps, u->advancement_icons()) {
-+	BOOST_FOREACH(const pair_string &ps, u->advancement_icons()) {
- 		add_image(res, ps.first, ps.second);
- 	}
- 	return res;
-@@ -497,7 +497,7 @@
- 	bool revert = false;
- 	if (underlyings.size() != 1 || underlyings.front() != terrain)
- 	{
--		foreach (const t_translation::t_terrain &t, underlyings)
-+		BOOST_FOREACH(const t_translation::t_terrain &t, underlyings)
- 		{
- 			if (t == t_translation::MINUS) {
- 				revert = true;
-@@ -641,7 +641,7 @@
- 	std::set<std::string> seen_types;
- 	const team &unit_team = (*resources::teams)[u->side() - 1];
- 	const team &viewing_team = (*resources::teams)[resources::screen->viewing_team()];
--	foreach(const unit &enemy, *resources::units)
-+	BOOST_FOREACH(const unit &enemy, *resources::units)
- 	{
- 		if (!unit_team.is_enemy(enemy.side()))
- 			continue;
-@@ -662,7 +662,7 @@
- 	damage_multiplier += tod_bonus;
- 
- 	typedef std::pair<int, std::set<std::string> > resist_units;
--	foreach (const resist_units &resist, resistances) {
-+	BOOST_FOREACH(const resist_units &resist, resistances) {
- 		int damage = round_damage(base_damage, damage_multiplier * resist.first, damage_divisor);
- 		tooltip << "<b>" << damage << "</b>  "
- 			<< "<i>(" << utils::signed_percent(resist.first-100) << ")</i> : "
-@@ -755,7 +755,7 @@
- 		}
- 	}
- 
--	foreach(const battle_context& weapon, weapons) {
-+	BOOST_FOREACH(const battle_context& weapon, weapons) {
- 
- 		// Predict the battle outcome.
- 		combatant attacker_combatant(weapon.get_attacker_stats());
-@@ -869,7 +869,7 @@
- 	map_location displayed_unit_hex = resources::screen->displayed_unit_hex();
- 	config res;
- 
--	foreach (const attack_type &at, u->attacks())
-+	BOOST_FOREACH(const attack_type &at, u->attacks())
- 	{
- 		attack_info(at, res, u, displayed_unit_hex);
- 	}
-@@ -1023,7 +1023,7 @@
- 	str << td.villages << '/';
- 	if (viewing_team.uses_shroud()) {
- 		int unshrouded_villages = 0;
--		foreach (const map_location &loc, resources::game_map->villages()) {
-+		BOOST_FOREACH(const map_location &loc, resources::game_map->villages()) {
- 			if (!viewing_team.shrouded(loc))
- 				++unshrouded_villages;
- 		}
-@@ -1178,7 +1178,7 @@
- 
- 	std::ostringstream str;
- 	str << _("Observers:") << '\n';
--	foreach (const std::string &obs, observers) {
-+	BOOST_FOREACH(const std::string &obs, observers) {
- 		str << obs << '\n';
- 	}
- 	return image_report(game_config::images::observer, str.str());
-@@ -1250,7 +1250,7 @@
- 
- void reports::reset_generators()
- {
--	foreach (dynamic_report_generators::value_type &rg, dynamic_generators) {
-+	BOOST_FOREACH(dynamic_report_generators::value_type &rg, dynamic_generators) {
- 		delete rg.second;
- 	}
- 	dynamic_generators.clear();
-@@ -1283,10 +1283,10 @@
- const std::set<std::string> &reports::report_list()
- {
- 	if (!all_reports.empty()) return all_reports;
--	foreach (const static_report_generators::value_type &v, static_generators) {
-+	BOOST_FOREACH(const static_report_generators::value_type &v, static_generators) {
- 		all_reports.insert(v.first);
- 	}
--	foreach (const dynamic_report_generators::value_type &v, dynamic_generators) {
-+	BOOST_FOREACH(const dynamic_report_generators::value_type &v, dynamic_generators) {
- 		all_reports.insert(v.first);
- 	}
- 	return all_reports;
-Index: src/playmp_controller.cpp
-===================================================================
---- src/playmp_controller.cpp	(revision 54624)
-+++ src/playmp_controller.cpp	(revision 54625)
-@@ -17,7 +17,7 @@
- #include "playmp_controller.hpp"
- 
- #include "dialogs.hpp"
--#include "foreach.hpp"
-+
- #include "game_end_exceptions.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
-@@ -29,6 +29,8 @@
- #include "formula_string_utils.hpp"
- #include "whiteboard/manager.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
- 
-@@ -326,7 +328,7 @@
- 	// stay stuck in linger state when the *next* scenario is over.
- 	gamestate_.classification().completion = "running";
- 	// End all unit moves
--	foreach (unit &u, units_) {
-+	BOOST_FOREACH(unit &u, units_) {
- 		u.set_user_end_turn(true);
- 	}
- 	//current_team().set_countdown_time(0);
-Index: src/tests/gui/test_gui2.cpp
-===================================================================
---- src/tests/gui/test_gui2.cpp	(revision 54624)
-+++ src/tests/gui/test_gui2.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- 
- #include "config_cache.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "formula_debugger.hpp"
- #include "gettext.hpp"
- #include "game_config.hpp"
-@@ -66,6 +65,7 @@
- #include "wml_exception.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <memory>
- 
-@@ -139,7 +139,7 @@
- 	template<class T>
- 	void test_resolutions(const tresolution_list& resolutions)
- 	{
--		foreach(const tresolution& resolution, resolutions) {
-+		BOOST_FOREACH(const tresolution& resolution, resolutions) {
- 			video().make_test_fake(resolution.first, resolution.second);
- 
- 			boost::scoped_ptr<gui2::tdialog> dlg(twrapper<T>::create());
-@@ -178,7 +178,7 @@
- 	{
- 		bool interact = false;
- 		for(int i = 0; i < 2; ++i) {
--			foreach(const tresolution& resolution, resolutions) {
-+			BOOST_FOREACH(const tresolution& resolution, resolutions) {
- 				video().make_test_fake(resolution.first, resolution.second);
- 
- 				boost::scoped_ptr<gui2::tpopup> dlg(twrapper<T>::create());
-@@ -225,7 +225,7 @@
- 	void test_tip_resolutions(const tresolution_list& resolutions
- 			, const std::string& id)
- 	{
--		foreach(const tresolution& resolution, resolutions) {
-+		BOOST_FOREACH(const tresolution& resolution, resolutions) {
- 			video().make_test_fake(resolution.first, resolution.second);
- 
- 			std::vector<std::string>& list =
-@@ -416,7 +416,7 @@
- 
- 	// Test size() instead of empty() to get the number of offenders
- 	BOOST_CHECK_EQUAL(list.size(), 0);
--	foreach(const std::string& id, list) {
-+	BOOST_FOREACH(const std::string& id, list) {
- 		std::cerr << "Window '" << id << "' registered but not tested.\n";
- 	}
- }
-@@ -638,7 +638,7 @@
- 		BOOST_REQUIRE_MESSAGE(result, "Failed to create a dialog.");
- 
- 		std::vector<map_generator*> map_generators;
--		foreach (const config &i, main_config.child_range("multiplayer")) {
-+		BOOST_FOREACH(const config &i, main_config.child_range("multiplayer")) {
- 			if(i["map_generation"] == "default") {
- 				const config &generator_cfg = i.child("generator");
- 				if (generator_cfg) {
-@@ -694,7 +694,7 @@
- 		BOOST_REQUIRE_MESSAGE(cfg, "No editor time-of-day defined");
- 
- 		std::vector<time_of_day> tods;
--		foreach (const config &i, cfg.child_range("time")) {
-+		BOOST_FOREACH(const config &i, cfg.child_range("time")) {
- 			tods.push_back(time_of_day(i));
- 		}
- 		return new gui2::teditor_settings(NULL, tods);
-Index: src/filesystem.cpp
-===================================================================
---- src/filesystem.cpp	(revision 54624)
-+++ src/filesystem.cpp	(revision 54625)
-@@ -56,7 +56,6 @@
- 
- #include "config.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "game_preferences.hpp"
- #include "log.hpp"
-@@ -65,6 +64,8 @@
- #include "serialization/string_utils.hpp"
- #include "version.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_filesystem("filesystem");
- #define DBG_FS LOG_STREAM(debug, log_filesystem)
- #define LOG_FS LOG_STREAM(info, log_filesystem)
-@@ -1010,7 +1011,7 @@
- 	cleanup();
- 	init_binary_paths();
- 
--	foreach (const config &bp, cfg.child_range("binary_path"))
-+	BOOST_FOREACH(const config &bp, cfg.child_range("binary_path"))
- 	{
- 		std::string path = bp["path"].str();
- 		if (path.find("..") != std::string::npos) {
-@@ -1057,7 +1058,7 @@
- 
- 	init_binary_paths();
- 
--	foreach (const std::string &path, binary_paths)
-+	BOOST_FOREACH(const std::string &path, binary_paths)
- 	{
- 		res.push_back(get_user_data_dir() + "/" + path + type + "/");
- 
-@@ -1098,7 +1099,7 @@
- 		return std::string();
- 	}
- 
--	foreach (const std::string &path, get_binary_paths(type))
-+	BOOST_FOREACH(const std::string &path, get_binary_paths(type))
- 	{
- 		const std::string file = path + filename;
- 		DBG_FS << "  checking '" << path << "'\n";
-@@ -1126,7 +1127,7 @@
- 		return std::string();
- 	}
- 
--	foreach (const std::string &path, get_binary_paths(type))
-+	BOOST_FOREACH(const std::string &path, get_binary_paths(type))
- 	{
- 		const std::string file = path + filename;
- 		DBG_FS << "  checking '" << path << "'\n";
-@@ -1291,7 +1292,7 @@
- 	p4 << drive;
- #endif
- 
--	foreach (const std::string &s, components)
-+	BOOST_FOREACH(const std::string &s, components)
- 	{
- 		p4 << '/' << s;
- 	}
-Index: src/help.cpp
-===================================================================
---- src/help.cpp	(revision 54624)
-+++ src/help.cpp	(revision 54625)
-@@ -27,7 +27,6 @@
- #include "about.hpp"
- #include "display.hpp"
- #include "exceptions.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
- #include "gui/dialogs/transient_message.hpp"
-@@ -40,6 +39,8 @@
- #include "wml_separators.hpp"
- #include "serialization/parser.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <queue>
- 
- static lg::log_domain log_display("display");
-@@ -793,7 +794,7 @@
- 			// opening the help browser in the default manner.
- 			config hidden_toplevel;
- 			std::stringstream ss;
--			foreach (const config &section, help_config->child_range("section"))
-+			BOOST_FOREACH(const config &section, help_config->child_range("section"))
- 			{
- 				const std::string id = section["id"];
- 				if (find_section(toplevel, id) == NULL) {
-@@ -810,7 +811,7 @@
- 			}
- 			hidden_toplevel["sections"] = ss.str();
- 			ss.str("");
--			foreach (const config &topic, help_config->child_range("topic"))
-+			BOOST_FOREACH(const config &topic, help_config->child_range("topic"))
- 			{
- 				const std::string id = topic["id"];
- 				if (find_topic(toplevel, id) == NULL) {
-@@ -861,7 +862,7 @@
- 		}
- 	}
- 
--	foreach (const config &section, cfg.child_range("section"))
-+	BOOST_FOREACH(const config &section, cfg.child_range("section"))
- 	{
- 		const std::vector<std::string> sections_refd
- 			= utils::quoted_split(section["sections"]);
-@@ -885,7 +886,7 @@
- 		}
- 	}
- 
--	foreach (const config &section, cfg.child_range("section"))
-+	BOOST_FOREACH(const config &section, cfg.child_range("section"))
- 	{
- 		const std::vector<std::string> topics_refd
- 			= utils::quoted_split(section["topics"]);
-@@ -1103,7 +1104,7 @@
- 	std::map<t_string, std::string> special_description;
- 	std::map<t_string, std::set<std::string, string_less> > special_units;
- 
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		const unit_type &type = i.second;
- 		// Only show the weapon special if we find it on a unit that
-@@ -1171,7 +1172,7 @@
- 	// should have a full description, if so, add this units abilities
- 	// for display. We do not want to show abilities that the user has
- 	// not encountered yet.
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		const unit_type &type = i.second;
- 		if (description_type(type) == FULL_DESCRIPTION) {
-@@ -1244,7 +1245,7 @@
- 	const config& era = game_cfg->child("era");
- 	if (era) {
- 		std::vector<std::string> faction_links;
--		foreach (const config &f, era.child_range("multiplayer_side")) {
-+		BOOST_FOREACH(const config &f, era.child_range("multiplayer_side")) {
- 			const std::string& id = f["id"];
- 			if (id == "Random")
- 				continue;
-@@ -1260,7 +1261,7 @@
- 			text << "<header>text='" << _("Leaders:") << "'</header>" << "\n";
- 			const std::vector<std::string> leaders =
- 					make_unit_links_list( utils::split(f["leader"]), true );
--			foreach (const std::string &link, leaders) {
-+			BOOST_FOREACH(const std::string &link, leaders) {
- 				text << link << "\n";
- 			}
- 
-@@ -1269,7 +1270,7 @@
- 			text << "<header>text='" << _("Recruits:") << "'</header>" << "\n";
- 			const std::vector<std::string> recruits =
- 					make_unit_links_list( utils::split(f["recruit"]), true );
--			foreach (const std::string &link, recruits) {
-+			BOOST_FOREACH(const std::string &link, recruits) {
- 				text << link << "\n";
- 			}
- 
-@@ -1291,7 +1292,7 @@
- 		text << "<header>text='" << _("Factions:") << "'</header>" << "\n";
- 
- 		std::sort(faction_links.begin(), faction_links.end());
--		foreach (const std::string &link, faction_links) {
-+		BOOST_FOREACH(const std::string &link, faction_links) {
- 			text << link << "\n";
- 		}
- 
-@@ -1366,7 +1367,7 @@
- 				reverse ? type_.advances_from() : type_.advances_to();
- 			bool first = true;
- 
--			foreach (const std::string &adv, adv_units)
-+			BOOST_FOREACH(const std::string &adv, adv_units)
- 			{
- 				const unit_type *type = unit_types.find(adv);
- 				if (!type || type->hide_help()) continue;
-@@ -1676,7 +1677,7 @@
- std::vector<std::string> make_unit_links_list(const std::vector<std::string>& type_id_list, bool ordered)
- {
- 	std::vector<std::string> links_list;
--	foreach (const std::string &type_id, type_id_list) {
-+	BOOST_FOREACH(const std::string &type_id, type_id_list) {
- 		std::string unit_link = make_unit_link(type_id);
- 		if (!unit_link.empty())
- 			links_list.push_back(unit_link);
-@@ -1693,7 +1694,7 @@
- 	std::set<std::string, string_less> races;
- 	std::set<std::string, string_less> visible_races;
- 
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		const unit_type &type = i.second;
- 		UNIT_DESCRIPTION_TYPE desc_type = description_type(type);
-@@ -1736,7 +1737,7 @@
- 	std::set<std::string, string_less> race_units;
- 	std::set<std::string, string_less> race_topics;
- 
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		const unit_type &type = i.second;
- 
-@@ -1768,7 +1769,7 @@
- 		race_name = r->plural_name();
- 		race_description = r->description();
- 		// if (description.empty()) description =  _("No description Available");
--		foreach (const config &additional_topic, r->additional_topics())
-+		BOOST_FOREACH(const config &additional_topic, r->additional_topics())
- 		  {
- 		    std::string id = additional_topic["id"];
- 		    std::string title = additional_topic["title"];
-Index: src/savegame.cpp
-===================================================================
---- src/savegame.cpp	(revision 54624)
-+++ src/savegame.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- #include "savegame.hpp"
- 
- #include "dialogs.hpp" //FIXME: get rid of this as soon as the two remaining dialogs are moved to gui2
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_preferences.hpp"
-@@ -40,6 +39,8 @@
- #include "unit_id.hpp"
- #include "version.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_SAVE LOG_STREAM(info, log_engine)
- #define ERR_SAVE LOG_STREAM(err, log_engine)
-@@ -913,7 +914,7 @@
- 	bool shrouded = false;
- 
- 	const config& snapshot = has_snapshot ? gamestate_.snapshot : gamestate_.starting_pos;
--	foreach (const config &side, snapshot.child_range("side"))
-+	BOOST_FOREACH(const config &side, snapshot.child_range("side"))
- 	{
- 		if (side["controller"] != "human") {
- 			continue;
-@@ -922,7 +923,7 @@
- 			shrouded = true;
- 		}
- 
--		foreach (const config &u, side.child_range("unit"))
-+		BOOST_FOREACH(const config &u, side.child_range("unit"))
- 		{
- 			if (u["canrecruit"].to_bool()) {
- 				leader = u["id"].str();
-@@ -960,7 +961,7 @@
- 	// if there is no scenario information in the starting pos, add the (persistent) sides from the snapshot
- 	// else do nothing, as persistence information was already added at the end of the previous scenario
- 	if (gamestate().starting_pos["id"].empty()) {
--		foreach(const config &snapshot_side, gamestate().snapshot.child_range("side")) {
-+		BOOST_FOREACH(const config &snapshot_side, gamestate().snapshot.child_range("side")) {
- 			//add all side tags (assuming they only contain carryover information)
- 			gamestate().starting_pos.add_child("side", snapshot_side);
- 		}
-Index: src/replay.cpp
-===================================================================
---- src/replay.cpp	(revision 54624)
-+++ src/replay.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- #include "global.hpp"
- 
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_events.hpp"
-@@ -41,6 +40,7 @@
- #include "whiteboard/manager.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_replay("replay");
- #define DBG_REPLAY LOG_STREAM(debug, log_replay)
-@@ -67,7 +67,7 @@
- 			   << nunits << " according to data source. " << units.size() << " locally\n";
- 
- 		std::set<map_location> locs;
--		foreach (const config &u, cfg.child_range("unit"))
-+		BOOST_FOREACH(const config &u, cfg.child_range("unit"))
- 		{
- 			const map_location loc(u, resources::state_of_game);
- 			locs.insert(loc);
-@@ -88,7 +88,7 @@
- 		errbuf.clear();
- 	}
- 
--	foreach (const config &un, cfg.child_range("unit"))
-+	BOOST_FOREACH(const config &un, cfg.child_range("unit"))
- 	{
- 		const map_location loc(un, resources::state_of_game);
- 		const unit_map::const_iterator u = units.find(loc);
-@@ -560,7 +560,7 @@
- 		const map_location &src = steps.front();
- 		const map_location &dst = steps.back();
- 
--		foreach (const async_cmd &ac, async_cmds)
-+		BOOST_FOREACH(const async_cmd &ac, async_cmds)
- 		{
- 			if (config &async_child = ac.cfg->child("rename")) {
- 				map_location aloc(async_child, resources::state_of_game);
-@@ -576,7 +576,7 @@
- 			// A unit is being un-recruited or un-recalled.
- 			// Remove unsynced commands that would act on that unit.
- 			map_location src(*chld, resources::state_of_game);
--			foreach (const async_cmd &ac, async_cmds)
-+			BOOST_FOREACH(const async_cmd &ac, async_cmds)
- 			{
- 				if (config &async_child = ac.cfg->child("rename"))
- 				{
-@@ -680,7 +680,7 @@
- 
- void replay::add_config(const config& cfg, MARK_SENT mark)
- {
--	foreach (const config &cmd, cfg.child_range("command"))
-+	BOOST_FOREACH(const config &cmd, cfg.child_range("command"))
- 	{
- 		config &cfg = cfg_.add_child("command", cmd);
- 		if (cfg.child("speak"))
-@@ -730,7 +730,7 @@
- 	if(! game_config::mp_debug) {
- 		return;
- 	}
--	foreach (const config &ch, cfg.child_range("checksum"))
-+	BOOST_FOREACH(const config &ch, cfg.child_range("checksum"))
- 	{
- 		map_location loc(ch, resources::state_of_game);
- 		unit_map::const_iterator u = resources::units->find(loc);
-@@ -1151,7 +1151,7 @@
- 		}
- 		else if (const config &child = cfg->child("fire_event"))
- 		{
--			foreach (const config &v, child.child_range("set_variable")) {
-+			BOOST_FOREACH(const config &v, child.child_range("set_variable")) {
- 				resources::state_of_game->set_variable(v["name"], v["value"]);
- 			}
- 			const std::string &event = child["raise"];
-Index: src/game_preferences_display.cpp
-===================================================================
---- src/game_preferences_display.cpp	(revision 54624)
-+++ src/game_preferences_display.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
- #include "display.hpp"
- #include "filesystem.hpp"
- #include "filechooser.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
- #include "gui/dialogs/simple_item_selector.hpp"
-@@ -30,6 +29,7 @@
- #include "widgets/slider.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- namespace preferences {
- 
-@@ -1071,7 +1071,7 @@
- void preferences_dialog::set_advanced_menu()
- {
- 	std::vector<std::string> advanced_items;
--	foreach (const config &adv, adv_preferences_cfg_)
-+	BOOST_FOREACH(const config &adv, adv_preferences_cfg_)
- 	{
- 		std::ostringstream str;
- 		std::string field = preferences::get(adv["field"]);
-@@ -1096,7 +1096,7 @@
- {
- 	adv_preferences_cfg_.clear();
- 
--	foreach(const config& adv, game_cfg_.child_range("advanced_preference")) {
-+	BOOST_FOREACH(const config& adv, game_cfg_.child_range("advanced_preference")) {
- 		adv_preferences_cfg_.push_back(adv);
- 	}
- 
-Index: src/image.cpp
-===================================================================
---- src/image.cpp	(revision 54624)
-+++ src/image.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "color_range.hpp"
- #include "config.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "image.hpp"
- #include "image_modifications.hpp"
-@@ -36,6 +35,7 @@
- #include "SDL_image.h"
- 
- #include <boost/functional/hash.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <list>
- #include <set>
-@@ -376,7 +376,7 @@
- 		std::string trackpath = get_binary_file_location("", "l10n-track");
- 		std::string contents = read_file(trackpath);
- 		std::vector<std::string> lines = utils::split(contents, '\n');
--		foreach (const std::string &line, lines) {
-+		BOOST_FOREACH(const std::string &line, lines) {
- 			size_t p1 = line.find(fsep);
- 			if (p1 == std::string::npos)
- 				continue;
-@@ -423,7 +423,7 @@
- 	// add en_US with lowest priority, since the message above will
- 	// not have it when translated.
- 	langs.push_back("en_US");
--	foreach (const std::string &lang, langs) {
-+	BOOST_FOREACH(const std::string &lang, langs) {
- 		std::string loc_file = dir + "l10n" + "/" + lang + "/" + loc_base;
- 		if (file_exists(loc_file) && localized_file_uptodate(loc_file)) {
- 			return loc_file;
-Index: src/team.cpp
-===================================================================
---- src/team.cpp	(revision 54624)
-+++ src/team.cpp	(revision 54625)
-@@ -21,13 +21,14 @@
- #include "team.hpp"
- 
- #include "ai/manager.hpp"
--#include "foreach.hpp"
- #include "game_events.hpp"
- #include "gamestatus.hpp"
- #include "resources.hpp"
- #include "game_preferences.hpp"
- #include "whiteboard/side_actions.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
- #define LOG_NG LOG_STREAM(info, log_engine)
-@@ -318,7 +319,7 @@
- 	// Was it correct?
- 
- 	// Load in the villages the side controls at the start
--	foreach (const config &v, cfg.child_range("village"))
-+	BOOST_FOREACH(const config &v, cfg.child_range("village"))
- 	{
- 		map_location loc(v, resources::state_of_game);
- 		if (map.is_village(loc)) {
-@@ -397,7 +398,7 @@
- 		return info_.minimum_recruit_price;
- 	}else{
- 		int min = 20;
--		foreach(std::string recruit, info_.can_recruit){
-+		BOOST_FOREACH(std::string recruit, info_.can_recruit){
- 			const unit_type *ut = unit_types.find(recruit);
- 			if(!ut)
- 				continue;
-@@ -605,7 +606,7 @@
- 		return true;
- 	}
- 
--	foreach (const team &t, *teams) {
-+	BOOST_FOREACH(const team &t, *teams) {
- 		if (t.is_human())
- 			return false;
- 	}
-Index: src/config_cache.cpp
-===================================================================
---- src/config_cache.cpp	(revision 54624)
-+++ src/config_cache.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "config_cache.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "game_config.hpp"
- #include "game_display.hpp"
-@@ -29,6 +28,7 @@
- #include "serialization/parser.hpp"
- #include "version.hpp"
- 
-+#include <boost/foreach.hpp>
- #include <boost/algorithm/string/replace.hpp>
- 
- static lg::log_domain log_cache("cache");
-@@ -113,7 +113,7 @@
- 		config_writer writer(*stream, gzip, game_config::cache_compression_level);
- 
- 		// write all defines to stream
--		foreach (const preproc_map::value_type &define, defines_map) {
-+		BOOST_FOREACH(const preproc_map::value_type &define, defines_map) {
- 			define.second.write(writer, define.first);
- 		}
- 	}
-@@ -262,7 +262,7 @@
- 
- 		// use static preproc_define::read_pair(config) to make a object
- 		// and pass that object config_cache_transaction::insert_to_active method
--		foreach (const config::any_child &value, cfg.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &value, cfg.all_children_range()) {
- 			config_cache_transaction::instance().insert_to_active(
- 				preproc_define::read_pair(value.cfg));
- 		}
-@@ -271,7 +271,7 @@
- 	void config_cache::read_defines_queue()
- 	{
- 		const config_cache_transaction::filenames& files = config_cache_transaction::instance().get_define_files();
--		foreach (const std::string &path, files) {
-+		BOOST_FOREACH(const std::string &path, files) {
- 			read_defines_file(path);
- 		}
- 	}
-@@ -394,7 +394,7 @@
- 					std::insert_iterator<preproc_map>(temp,temp.begin()),
- 					&compare_define);
- 
--			foreach (const preproc_map::value_type &def, temp) {
-+			BOOST_FOREACH(const preproc_map::value_type &def, temp) {
- 				insert_to_active(def);
- 			}
- 
-Index: src/game_events.cpp
-===================================================================
---- src/game_events.cpp	(revision 54624)
-+++ src/game_events.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- #include "actions.hpp"
- #include "ai/manager.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_events.hpp"
- #include "game_preferences.hpp"
-@@ -60,6 +59,8 @@
- #include <iomanip>
- #include <iostream>
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
- #define LOG_NG LOG_STREAM(info, log_engine)
-@@ -341,7 +342,7 @@
- 			std::vector<std::pair<int,int> > counts = (*u).has_attribute("count")
- 				? utils::parse_ranges((*u)["count"]) : default_counts;
- 			int match_count = 0;
--			foreach (const unit &i, *resources::units)
-+			BOOST_FOREACH(const unit &i, *resources::units)
- 			{
- 				if(i.hitpoints() > 0 && unit_matches_filter(i, *u)) {
- 					++match_count;
-@@ -396,7 +397,7 @@
- 		const vconfig::child_list& variables = cond.get_children("variable");
- 		backwards_compat = backwards_compat && variables.empty();
- 
--		foreach (const vconfig &values, variables)
-+		BOOST_FOREACH(const vconfig &values, variables)
- 		{
- 			const std::string name = values["name"];
- 			config::attribute_value value = resources::state_of_game->get_variable_const(name);
-@@ -589,7 +590,7 @@
- 			const std::vector<game_events::event_handler>& handlers,
- 			const std::string& msg) {
- 
--			foreach(const game_events::event_handler& h, handlers){
-+			BOOST_FOREACH(const game_events::event_handler& h, handlers){
- 				const config& cfg = h.get_config();
- 				ss << "name=" << cfg["name"] << ", with id=" << cfg["id"] << "; ";
- 			}
-@@ -603,7 +604,7 @@
- 			std::stringstream ss;
- 			log_handler(ss, active_, "active");
- 			log_handler(ss, insert_buffer_, "insert buffered");
--			foreach(const std::string& h, remove_buffer_){
-+			BOOST_FOREACH(const std::string& h, remove_buffer_){
- 				ss << "id=" << h << "; ";
- 			}
- 			DBG_EH << "remove buffered handlers are now " << ss.str() << "\n";
-@@ -631,7 +632,7 @@
- 				const config & cfg = new_handler.get_config();
- 				std::string id = cfg["id"];
- 				if(!id.empty()) {
--					foreach( game_events::event_handler const & eh, active_) {
-+					BOOST_FOREACH( game_events::event_handler const & eh, active_) {
- 						config const & temp_config( eh.get_config());
- 						if(id == temp_config["id"]) {
- 							DBG_EH << "ignoring event handler for name=" << cfg["name"] <<
-@@ -698,12 +699,12 @@
- 				return;
- 
- 			// Commit any event removals
--			foreach(std::string const & i ,  remove_buffer_ ){
-+			BOOST_FOREACH(std::string const & i ,  remove_buffer_ ){
- 				remove_event_handler( i ); }
- 			remove_buffer_.clear();
- 
- 			// Commit any spawned events-within-events
--			foreach( game_events::event_handler const & i ,  insert_buffer_ ){
-+			BOOST_FOREACH( game_events::event_handler const & i ,  insert_buffer_ ){
- 				add_event_handler( i ); }
- 			insert_buffer_.clear();
- 
-@@ -735,7 +736,7 @@
- 	std::vector<int> sides = game_events::get_sides_vector(cfg);
- 	size_t index;
- 
--	foreach (const int &side_num, sides)
-+	BOOST_FOREACH(const int &side_num, sides)
- 	{
- 		index = side_num - 1;
- 		team &t = (*resources::teams)[index];
-@@ -744,7 +745,7 @@
- 		filter.restrict_size(game_config::max_loop);
- 		filter.get_locations(locs, true);
- 
--		foreach (map_location const &loc, locs)
-+		BOOST_FOREACH(map_location const &loc, locs)
- 		{
- 			if (remove) {
- 				t.clear_shroud(loc);
-@@ -774,7 +775,7 @@
- 	const bool remove = utils::string_bool(cfg["remove"], false);
- 	if (remove) {
- 		const std::vector<std::string> ids = utils::split(cfg["id"]);
--		foreach(const std::string &id, ids) {
-+		BOOST_FOREACH(const std::string &id, ids) {
- 			resources::tunnels->remove(id);
- 		}
- 	} else if (cfg.get_children("source").empty() ||
-@@ -941,7 +942,7 @@
- WML_HANDLER_FUNCTION(modify_ai, /*event_info*/, cfg)
- {
- 	std::vector<int> sides = game_events::get_sides_vector(cfg);
--	foreach (const int &side_num, sides)
-+	BOOST_FOREACH(const int &side_num, sides)
- 	{
- 		ai::manager::modify_active_ai_for_side(side_num,cfg.get_parsed_config());
- 	}
-@@ -967,7 +968,7 @@
- 	std::vector<int> sides = game_events::get_sides_vector(cfg);
- 	size_t team_index;
- 
--	foreach (const int &side_num, sides)
-+	BOOST_FOREACH(const int &side_num, sides)
- 	{
- 		team_index = side_num - 1;
- 		LOG_NG << "modifying side: " << side_num << "\n";
-@@ -1212,7 +1213,7 @@
- 
- 	size_t longest_path = 0;
- 
--	foreach(const vconfig& config, unit_cfgs) {
-+	BOOST_FOREACH(const vconfig& config, unit_cfgs) {
- 		const std::vector<std::string> xvals = utils::split(config["x"]);
- 		const std::vector<std::string> yvals = utils::split(config["y"]);
- 		int skip_steps = config["skip_steps"];
-@@ -1461,7 +1462,7 @@
- 
- 		variable_info vi(array_name, true, variable_info::TYPE_ARRAY);
- 		bool first = true;
--		foreach (const config &cfg, vi.as_array())
-+		BOOST_FOREACH(const config &cfg, vi.as_array())
- 		{
- 			std::string current_string = cfg[key_name];
- 			if (remove_empty && current_string.empty()) continue;
-@@ -1589,7 +1590,7 @@
- 				dest.vars->merge_with(data);
- 			}
- 		} else if(mode == "insert" || dest.explicit_index) {
--			foreach (const config &child, data.child_range(dest.key))
-+			BOOST_FOREACH(const config &child, data.child_range(dest.key))
- 			{
- 				dest.vars->add_child_at(dest.key, child, dest.index++);
- 			}
-@@ -1619,7 +1620,7 @@
- 			item["type"] = *ti;
- 		}
- 		unit_map::iterator itor;
--		foreach (unit &u, *resources::units) {
-+		BOOST_FOREACH(unit &u, *resources::units) {
- 			if (game_events::unit_matches_filter(u, filter)) {
- 				u.set_role(cfg["role"]);
- 				found = true;
-@@ -1632,7 +1633,7 @@
- 		std::set<std::string> player_ids;
- 		std::vector<std::string> sides = utils::split(cfg["side"]);
- 		const bool has_any_sides = !sides.empty();
--		foreach(std::string const& side_str, sides) {
-+		BOOST_FOREACH(std::string const& side_str, sides) {
- 			size_t side_num = lexical_cast_default<size_t>(side_str,0);
- 			if(side_num > 0 && side_num <= resources::teams->size()) {
- 				player_ids.insert((resources::teams->begin() + (side_num - 1))->save_id());
-@@ -1699,7 +1700,7 @@
- 	game_map->set_terrain(loc, new_t);
- 	screen_needs_rebuild = true;
- 
--	foreach (const t_translation::t_terrain &ut, game_map->underlying_union_terrain(loc)) {
-+	BOOST_FOREACH(const t_translation::t_terrain &ut, game_map->underlying_union_terrain(loc)) {
- 		preferences::encountered_terrains().insert(ut);
- 	}
- }
-@@ -1820,7 +1821,7 @@
- 				const map_location cfg_loc = cfg_to_loc(cfg);
- 
- 				//TODO fendrin: comment this monster
--				foreach (unit_map::const_unit_iterator leader, leaders) {
-+				BOOST_FOREACH(unit_map::const_unit_iterator leader, leaders) {
- 					DBG_NG << "...considering " + leader->id() + " as the recalling leader...\n";
- 					map_location loc = cfg_loc;
- 					if ( (leader_filter.null() || leader->matches_filter(leader_filter, leader->get_location())) &&
-@@ -1879,7 +1880,7 @@
- 
- 	map_location loc;
- 	if(!filter.null()) {
--		foreach (const unit &u, *resources::units) {
-+		BOOST_FOREACH(const unit &u, *resources::units) {
- 			if (game_events::unit_matches_filter(u, filter)) {
- 				loc = u.get_location();
- 				break;
-@@ -1926,7 +1927,7 @@
- 		}
- 	}
- 
--	foreach (const vconfig &cmd, cfg.get_children(command_type)) {
-+	BOOST_FOREACH(const vconfig &cmd, cfg.get_children(command_type)) {
- 		handle_event_commands(event_info, cmd);
- 	}
- }
-@@ -2029,13 +2030,13 @@
- 	std::vector<unit *> dead_men_walking;
- 	// unit_map::iterator uit(resources::units->begin()), uend(resources::units->end());
- 	// for(;uit!=uend; ++uit){
--	foreach(unit & u, *resources::units){
-+	BOOST_FOREACH(unit & u, *resources::units){
- 		if(game_events::unit_matches_filter(u, cfg)){
- 			dead_men_walking.push_back(&u);
- 		}
- 	}
- 
--	foreach(unit * un, dead_men_walking) {
-+	BOOST_FOREACH(unit * un, dead_men_walking) {
- 		map_location loc(un->get_location());
- 		bool fire_event = false;
- 		game_events::entity_location death_loc(*un);
-@@ -2429,7 +2430,7 @@
- 
- 	if (clear_shroud_bool) {
- 		side_filter filter(cfg);
--		foreach(const int side, filter.get_teams()){
-+		BOOST_FOREACH(const int side, filter.get_teams()){
- 			clear_shroud(side);
- 		}
- 		screen.recalculate_minimap();
-@@ -2466,7 +2467,7 @@
- 	const vconfig healers_filter = cfg.child("filter_second");
- 	std::vector<unit*> healers;
- 	if (!healers_filter.null()) {
--		foreach (unit& u, *units) {
-+		BOOST_FOREACH(unit& u, *units) {
- 			if (game_events::unit_matches_filter(u, healers_filter) && u.has_ability_type("heals")) {
- 				healers.push_back(&u);
- 			}
-@@ -2835,7 +2836,7 @@
- 			return;
- 		}
- 
--		foreach (const vconfig &cmd, option_events[option_chosen]) {
-+		BOOST_FOREACH(const vconfig &cmd, option_events[option_chosen]) {
- 			handle_event_commands(event_info, cmd);
- 		}
- 	}
-@@ -2858,7 +2859,7 @@
- 	if(remove) {
- 		const std::vector<std::string> id_list =
- 			utils::split(ids, ',', utils::STRIP_SPACES | utils::REMOVE_EMPTY);
--		foreach(const std::string& id, id_list) {
-+		BOOST_FOREACH(const std::string& id, id_list) {
- 			resources::tod_manager->remove_time_area(id);
- 			LOG_NG << "event WML removed time_area '" << id << "'\n";
- 		}
-@@ -2997,7 +2998,7 @@
- 			if(is_empty_command) {
- 				mref->command.add_child("allow_undo");
- 			}
--			foreach(game_events::event_handler& hand, event_handlers) {
-+			BOOST_FOREACH(game_events::event_handler& hand, event_handlers) {
- 				if(hand.is_menu_item() && hand.matches_name(mref->name)) {
- 					LOG_NG << "changing command for " << mref->name << " to:\n" << *wcc.second;
- 					hand = game_events::event_handler(mref->command, true);
-@@ -3029,14 +3030,14 @@
- 	vconfig filters(handler.get_config());
- 
- 
--	foreach (const vconfig &condition, filters.get_children("filter_condition"))
-+	BOOST_FOREACH(const vconfig &condition, filters.get_children("filter_condition"))
- 	{
- 		if (!game_events::conditional_passed(condition)) {
- 			return false;
- 		}
- 	}
- 
--	foreach (const vconfig &f, filters.get_children("filter"))
-+	BOOST_FOREACH(const vconfig &f, filters.get_children("filter"))
- 	{
- 		if (unit1 == units->end() || !game_events::unit_matches_filter(*unit1, f)) {
- 			return false;
-@@ -3046,7 +3047,7 @@
- 		}
- 	}
- 
--	foreach (const vconfig &f, filters.get_children("filter_side"))
-+	BOOST_FOREACH(const vconfig &f, filters.get_children("filter_side"))
- 	{
- 		side_filter ssf(f);
- 		const int current_side = resources::controller->current_side();
-@@ -3055,7 +3056,7 @@
- 
- 	vconfig::child_list special_filters = filters.get_children("filter_attack");
- 	bool special_matches = special_filters.empty();
--	foreach (const vconfig &f, special_filters)
-+	BOOST_FOREACH(const vconfig &f, special_filters)
- 	{
- 		if (unit1 != units->end() && game_events::matches_special_filter(ev.data.child("first"), f)) {
- 			special_matches = true;
-@@ -3068,7 +3069,7 @@
- 		return false;
- 	}
- 
--	foreach (const vconfig &f, filters.get_children("filter_second"))
-+	BOOST_FOREACH(const vconfig &f, filters.get_children("filter_second"))
- 	{
- 		if (unit2 == units->end() || !game_events::unit_matches_filter(*unit2, f)) {
- 			return false;
-@@ -3080,7 +3081,7 @@
- 
- 	special_filters = filters.get_children("filter_second_attack");
- 	special_matches = special_filters.empty();
--	foreach (const vconfig &f, special_filters)
-+	BOOST_FOREACH(const vconfig &f, special_filters)
- 	{
- 		if (unit2 != units->end() && game_events::matches_special_filter(ev.data.child("second"), f)) {
- 			special_matches = true;
-@@ -3275,17 +3276,17 @@
- 		: variable_manager()
- 	{
- 		assert(!manager_running);
--		foreach (const config &ev, cfg.child_range("event")) {
-+		BOOST_FOREACH(const config &ev, cfg.child_range("event")) {
- 			event_handlers.add_event_handler(game_events::event_handler(ev));
- 		}
--		foreach (const std::string &id, utils::split(cfg["unit_wml_ids"])) {
-+		BOOST_FOREACH(const std::string &id, utils::split(cfg["unit_wml_ids"])) {
- 			unit_wml_ids.insert(id);
- 		}
- 
- 		resources::lua_kernel = new LuaKernel(cfg);
- 		manager_running = true;
- 
--		foreach (static_wml_action_map::value_type &action, static_wml_actions) {
-+		BOOST_FOREACH(static_wml_action_map::value_type &action, static_wml_actions) {
- 			resources::lua_kernel->set_wml_action(action.first, action.second);
- 		}
- 
-@@ -3298,7 +3299,7 @@
- 		}
- 		int wmi_count = 0;
- 		typedef std::pair<std::string, wml_menu_item *> item;
--		foreach (const item &itor, resources::state_of_game->wml_menu_items) {
-+		BOOST_FOREACH(const item &itor, resources::state_of_game->wml_menu_items) {
- 			if (!itor.second->command.empty()) {
- 				event_handlers.add_event_handler(game_events::event_handler(itor.second->command, true));
- 			}
-@@ -3312,7 +3313,7 @@
- 	void write_events(config& cfg)
- 	{
- 		assert(manager_running);
--		foreach (const game_events::event_handler &eh, event_handlers) {
-+		BOOST_FOREACH(const game_events::event_handler &eh, event_handlers) {
- 			if (eh.disabled() || eh.is_menu_item()) continue;
- 			cfg.add_child("event", eh.get_config());
- 		}
-@@ -3385,7 +3386,7 @@
- 			if(std::find(unit_wml_ids.begin(),unit_wml_ids.end(),type) != unit_wml_ids.end()) return;
- 			unit_wml_ids.insert(type);
- 		}
--		foreach (const config &new_ev, cfgs) {
-+		BOOST_FOREACH(const config &new_ev, cfgs) {
- 			if(type.empty() && new_ev["id"].empty())
- 			{
- 				WRN_NG << "attempt to add an [event] with empty id=, ignoring \n";
-@@ -3427,7 +3428,7 @@
- 
- 		if(!lg::debug.dont_log("event_handler")) {
- 			std::stringstream ss;
--			foreach(const game_events::queued_event& ev, events_queue) {
-+			BOOST_FOREACH(const game_events::queued_event& ev, events_queue) {
- 				ss << "name=" << ev.name << "; ";
- 			}
- 			DBG_EH << "processing queued events: " << ss.str() << "\n";
-@@ -3454,7 +3455,7 @@
- 
- 			bool init_event_vars = true;
- 
--			foreach(game_events::event_handler& handler, event_handlers) {
-+			BOOST_FOREACH(game_events::event_handler& handler, event_handlers) {
- 				if(!handler.matches_name(event_name))
- 					continue;
- 				// Set the variables for the event
-Index: src/formula_tokenizer.cpp
-===================================================================
---- src/formula_tokenizer.cpp	(revision 54624)
-+++ src/formula_tokenizer.cpp	(revision 54625)
-@@ -13,7 +13,6 @@
- 
- #include <sstream>
- 
--#include "foreach.hpp"
- #include "formula_tokenizer.hpp"
- 
- namespace formula_tokenizer
-Index: src/playcampaign.cpp
-===================================================================
---- src/playcampaign.cpp	(revision 54624)
-+++ src/playcampaign.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- 
- #include "global.hpp"
- 
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gui/dialogs/message.hpp"
- #include "gui/dialogs/transient_message.hpp"
-@@ -41,6 +40,8 @@
- #include "wml_exception.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #define LOG_G LOG_STREAM(info, lg::general)
- 
- static lg::log_domain log_engine("engine");
-@@ -260,7 +261,7 @@
- 	controller_map controllers;
- 
- 	if(io_type == IO_SERVER) {
--		foreach (config &side, const_cast<config *>(scenario)->child_range("side"))
-+		BOOST_FOREACH(config &side, const_cast<config *>(scenario)->child_range("side"))
- 		{
- 			if (side["current_player"] == preferences::login()) {
- 				side["controller"] = preferences::client_type();
-@@ -280,7 +281,7 @@
- 				scenario = &starting_pos;
- 			}
- 
--			foreach (config &side, starting_pos.child_range("side"))
-+			BOOST_FOREACH(config &side, starting_pos.child_range("side"))
- 			{
- 				if (side["current_player"] == preferences::login()) {
- 					side["controller"] = preferences::client_type();
-@@ -474,7 +475,7 @@
- 
- 			if(io_type == IO_SERVER && scenario != NULL) {
- 				// Tweaks sides to adapt controllers and descriptions.
--				foreach (config &side, starting_pos.child_range("side"))
-+				BOOST_FOREACH(config &side, starting_pos.child_range("side"))
- 				{
- 					std::string id = side["save_id"];
- 					if(id.empty()) {
-@@ -547,7 +548,7 @@
- 				next_cfg.add_child("replay_start", gamestate.starting_pos);
- 				//move side information from gamestate into the config that is sent to the other clients
- 				next_cfg.clear_children("side");
--				foreach (config& side, gamestate.starting_pos.child_range("side"))
-+				BOOST_FOREACH(config& side, gamestate.starting_pos.child_range("side"))
- 					next_cfg.add_child("side", side);
- 
- 				network::send_data(cfg, 0);
-Index: src/multiplayer.cpp
-===================================================================
---- src/multiplayer.cpp	(revision 54624)
-+++ src/multiplayer.cpp	(revision 54625)
-@@ -40,6 +40,7 @@
- #include "unit_id.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_network("network");
- #define LOG_NW LOG_STREAM(info, log_network)
-@@ -573,7 +574,7 @@
- 	while (true) {
- 		const config &cfg = game_config.child("lobby_music");
- 		if (cfg) {
--			foreach (const config &i, cfg.child_range("music")) {
-+			BOOST_FOREACH(const config &i, cfg.child_range("music")) {
- 				sound::play_music_config(i);
- 			}
- 			sound::commit_music_changes();
-Index: src/terrain_filter.cpp
-===================================================================
---- src/terrain_filter.cpp	(revision 54624)
-+++ src/terrain_filter.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
- 
- #include "actions.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "map.hpp"
- #include "resources.hpp"
-@@ -27,6 +26,8 @@
- #include "tod_manager.hpp"
- #include "variable.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- 
-@@ -129,7 +130,7 @@
- 				}
- 			} else {
- 				bool found = false;
--				foreach (const config &cfg, vi.as_array()) {
-+				BOOST_FOREACH(const config &cfg, vi.as_array()) {
- 					if (map_location(cfg, NULL) == loc) {
- 						found = true;
- 						break;
-@@ -358,7 +359,7 @@
- 			}
- 		} else {
- 			std::set<map_location> findin_locs;
--			foreach (const config &cfg, vi.as_array()) {
-+			BOOST_FOREACH(const config &cfg, vi.as_array()) {
- 				map_location test_loc(cfg, NULL);
- 				if (xy_set.count(test_loc)) {
- 					findin_locs.insert(test_loc);
-Index: src/playturn.cpp
-===================================================================
---- src/playturn.cpp	(revision 54624)
-+++ src/playturn.cpp	(revision 54625)
-@@ -16,7 +16,6 @@
- #include "playturn.hpp"
- 
- #include "construct_dialog.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_preferences.hpp"
-@@ -31,6 +30,8 @@
- #include "formula_string_utils.hpp"
- #include "play_controller.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <ctime>
- 
- static lg::log_domain log_network("network");
-@@ -124,11 +125,11 @@
- 				preferences::message_bell());
- 	}
- 
--	foreach (const config &ob, cfg.child_range("observer")) {
-+	BOOST_FOREACH(const config &ob, cfg.child_range("observer")) {
- 		resources::screen->add_observer(ob["name"]);
- 	}
- 
--	foreach (const config &ob, cfg.child_range("observer_quit")) {
-+	BOOST_FOREACH(const config &ob, cfg.child_range("observer_quit")) {
- 		resources::screen->remove_observer(ob["name"]);
- 	}
- 
-@@ -147,7 +148,7 @@
- 	const config& change = cfg.child_or_empty("change_controller");
- 	const std::string& side_drop = cfg["side_drop"].str();
- 
--	foreach (const config &t, turns)
-+	BOOST_FOREACH(const config &t, turns)
- 	{
- 		handle_turn(turn_end, t, skip_replay, backlog);
- 	}
-@@ -240,7 +241,7 @@
- 			options.push_back(_("Abort game"));
- 
- 			//get all observers in as options to transfer control
--			foreach (const std::string &ob, resources::screen->observers())
-+			BOOST_FOREACH(const std::string &ob, resources::screen->observers())
- 			{
- 				t_vars["player"] = ob;
- 				options.push_back(vgettext("Replace with $player", t_vars));
-@@ -248,7 +249,7 @@
- 			}
- 
- 			//get all allies in as options to transfer control
--			foreach (team &t, *resources::teams)
-+			BOOST_FOREACH(team &t, *resources::teams)
- 			{
- 				if (!t.is_enemy(side) && !t.is_human() && !t.is_ai() && !t.is_empty()
- 					&& t.current_player() != tm.current_player())
-Index: src/tod_manager.cpp
-===================================================================
---- src/tod_manager.cpp	(revision 54624)
-+++ src/tod_manager.cpp	(revision 54625)
-@@ -12,7 +12,6 @@
-    See the COPYING file for more details.
-  */
- 
--#include "foreach.hpp"
- #include "tod_manager.hpp"
- #include "wml_exception.hpp"
- #include "gettext.hpp"
-@@ -25,6 +24,8 @@
- #include "unit.hpp"
- #include "unit_abilities.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
- 
-@@ -279,7 +280,7 @@
- void tod_manager::set_new_current_times(const int new_current_turn_number)
- {
- 	currentTime_ = calculate_current_time(times_.size(), new_current_turn_number, currentTime_);
--	foreach(area_time_of_day& area, areas_) {
-+	BOOST_FOREACH(area_time_of_day& area, areas_) {
- 		area.currentTime = calculate_current_time(
- 			area.times.size(),
- 			new_current_turn_number,
-Index: src/multiplayer_create.cpp
-===================================================================
---- src/multiplayer_create.cpp	(revision 54624)
-+++ src/multiplayer_create.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- 
- #include "global.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
-@@ -40,6 +39,8 @@
- #include "wml_separators.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_CF LOG_STREAM(err, log_config)
- 
-@@ -127,7 +128,7 @@
- 
- 	// Standard maps
- 	i = 0;
--	foreach (const config &j, cfg.child_range("multiplayer"))
-+	BOOST_FOREACH(const config &j, cfg.child_range("multiplayer"))
- 	{
- 		if (j["allow_new_game"].to_bool(true))
- 		{
-@@ -217,7 +218,7 @@
- 
- 	// The possible eras to play
- 	std::vector<std::string> eras;
--	foreach (const config &er, cfg.child_range("era")) {
-+	BOOST_FOREACH(const config &er, cfg.child_range("era")) {
- 		eras.push_back(er["name"]);
- 	}
- 	if(eras.empty()) {
-@@ -547,7 +548,7 @@
- 		}
- 
- 		int nsides = 0;
--		foreach (const config &k, parameters_.scenario_data.child_range("side")) {
-+		BOOST_FOREACH(const config &k, parameters_.scenario_data.child_range("side")) {
- 			if (k["allow_player"].to_bool(true)) ++nsides;
- 		}
- 
-Index: src/commandline_options.cpp
-===================================================================
---- src/commandline_options.cpp	(revision 54624)
-+++ src/commandline_options.cpp	(revision 54625)
-@@ -14,12 +14,12 @@
- */
- 
- #include "commandline_options.hpp"
--#include "foreach.hpp"
- #include "serialization/string_utils.hpp"
- #include "util.hpp"
- #include "lua/llimits.h"
- 
- #include <boost/version.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace po = boost::program_options;
- 
-@@ -374,7 +374,7 @@
- void commandline_options::parse_log_domains_(const std::string &domains_string, const int severity)
- {
- 	const std::vector<std::string> domains = utils::split(domains_string, ',');
--	foreach (const std::string& domain, domains)
-+	BOOST_FOREACH(const std::string& domain, domains)
- 	{
- 		if (!log)
- 			log = std::vector<boost::tuple<int, std::string> >();
-@@ -396,7 +396,7 @@
- {
- 	std::vector<boost::tuple<unsigned int,std::string> > vec;
- 	boost::tuple<unsigned int,std::string> elem;
--	foreach(const std::string &s, strings)
-+	BOOST_FOREACH(const std::string &s, strings)
- 	{
- 		const std::vector<std::string> tokens = utils::split(s, separator);
- 		if (tokens.size()!=2)
-@@ -415,7 +415,7 @@
- {
- 	std::vector<boost::tuple<unsigned int,std::string,std::string> > vec;
- 	boost::tuple<unsigned int,std::string,std::string> elem;
--	foreach(const std::string &s, strings)
-+	BOOST_FOREACH(const std::string &s, strings)
- 	{
- 		const std::vector<std::string> tokens = utils::split(s, separator);
- 		if (tokens.size()!=3)
-Index: src/gui/dialogs/editor_set_starting_position.cpp
-===================================================================
---- src/gui/dialogs/editor_set_starting_position.cpp	(revision 54624)
-+++ src/gui/dialogs/editor_set_starting_position.cpp	(revision 54625)
-@@ -17,7 +17,7 @@
- 
- #include "gui/dialogs/editor_set_starting_position.hpp"
- 
--#include "foreach.hpp"
-+#include <boost/foreach.hpp>
- #include "formatter.hpp"
- #include "formula_string_utils.hpp"
- #include "gettext.hpp"
-Index: src/gui/dialogs/gamestate_inspector.cpp
-===================================================================
---- src/gui/dialogs/gamestate_inspector.cpp	(revision 54624)
-+++ src/gui/dialogs/gamestate_inspector.cpp	(revision 54625)
-@@ -27,7 +27,6 @@
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/window.hpp"
- 
--#include "../../foreach.hpp"
- #include "../../gamestatus.hpp"
- #include "../../resources.hpp"
- #include "../../team.hpp"
-@@ -36,6 +35,7 @@
- #include <vector>
- #include <boost/bind.hpp>
- #include <boost/shared_ptr.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -189,11 +189,11 @@
- 				? resources::state_of_game->get_variables()
- 				: config();
- 
--		foreach( const config::attribute &a, vars.attribute_range()) {
-+		BOOST_FOREACH( const config::attribute &a, vars.attribute_range()) {
- 			model_.add_row_to_stuff_list(a.first,a.first);
- 		}
- 
--		foreach( const config::any_child &c, vars.all_children_range()) {
-+		BOOST_FOREACH( const config::any_child &c, vars.all_children_range()) {
- 			model_.add_row_to_stuff_list("["+c.key+"]","["+c.key+"]");
- 		}
- 
-@@ -214,7 +214,7 @@
- 				? resources::state_of_game->get_variables()
- 				: config();
- 
--		foreach( const config::attribute &a, vars.attribute_range()) {
-+		BOOST_FOREACH( const config::attribute &a, vars.attribute_range()) {
- 			if (selected==i) {
- 				model_.set_inspect_window_text(a.second);
- 				return;
-@@ -222,7 +222,7 @@
- 			i++;
- 		}
- 
--		foreach( const config::any_child &c, vars.all_children_range()) {
-+		BOOST_FOREACH( const config::any_child &c, vars.all_children_range()) {
- 			if (selected==i) {
- 				model_.set_inspect_window_text(c.cfg.debug());
- 				return;
-@@ -268,7 +268,7 @@
- 					<< '/' << i->max_experience() << " xp; "
- 					<< i->hitpoints() << '/' << i->max_hitpoints()
- 					<< " hp; ";
--				foreach (const std::string &str, i->get_traits_list()) {
-+				BOOST_FOREACH(const std::string &str, i->get_traits_list()) {
- 					s << str <<" ";
- 				}
- 
-@@ -371,9 +371,9 @@
- 					: std::vector<unit>();
- 
- 			std::stringstream s;
--			foreach (const unit &u, recall_list) {
-+			BOOST_FOREACH(const unit &u, recall_list) {
- 				s << "id=["<<u.id() << "] "<<u.type_id() << "; L"<<u.level()<<"; " << u.experience() <<"/" << u.max_experience()<< " xp "<< std::endl;
--				foreach (const std::string &str, u.get_traits_list() ) {
-+				BOOST_FOREACH(const std::string &str, u.get_traits_list() ) {
- 					s << "\t" << str<< std::endl;
- 				}
- 				s << std::endl << std::endl;
-@@ -388,7 +388,7 @@
- 					: std::vector<unit>();
- 
- 			config c;
--			foreach (const unit &u, recall_list) {
-+			BOOST_FOREACH(const unit &u, recall_list) {
- 				config c_unit;
- 				u.write(c_unit);
- 				c.add_child("unit",c_unit);
-@@ -423,7 +423,7 @@
- 						<< i->max_experience() << " xp; "
- 						<< i->hitpoints() << '/'
- 						<< i->max_hitpoints()<<" hp.\n";
--					foreach (const std::string &str, i->get_traits_list() ) {
-+					BOOST_FOREACH(const std::string &str, i->get_traits_list() ) {
- 						s << "\t" << str<< std::endl;
- 					}
- 					s << std::endl << std::endl;
-@@ -457,7 +457,7 @@
- 				boost::shared_ptr<single_mode_controller>(new variable_mode_controller("variables",model_)));
- 		sm_controllers_.push_back(
- 				boost::shared_ptr<single_mode_controller>(new unit_mode_controller("units",model_)));
--		//foreach team
-+		//BOOST_FOREACHteam
- 		int sides = resources::teams
- 				? static_cast<int>((*resources::teams).size())
- 				: 0;
-@@ -481,7 +481,7 @@
- 	void show_stuff_types_list()
- 	{
- 		model_.clear_stuff_types_list();
--		foreach (boost::shared_ptr<single_mode_controller> sm_controller, sm_controllers_ ) {
-+		BOOST_FOREACH(boost::shared_ptr<single_mode_controller> sm_controller, sm_controllers_ ) {
- 			model_.add_row_to_stuff_types_list(sm_controller->name(),sm_controller->name());
- 		}
- 	}
-Index: src/gui/dialogs/unit_attack.cpp
-===================================================================
---- src/gui/dialogs/unit_attack.cpp	(revision 54624)
-+++ src/gui/dialogs/unit_attack.cpp	(revision 54625)
-@@ -27,6 +27,8 @@
- #include "gui/widgets/window.hpp"
- #include "unit.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /*WIKI
-@@ -106,7 +108,7 @@
- 	const config empty;
- 	attack_type no_weapon(empty);
- 
--	foreach(const battle_context& weapon, weapons) {
-+	BOOST_FOREACH(const battle_context& weapon, weapons) {
- 		const battle_context_unit_stats& attacker =
- 				weapon.get_attacker_stats();
- 
-Index: src/gui/dialogs/data_manage.cpp
-===================================================================
---- src/gui/dialogs/data_manage.cpp	(revision 54624)
-+++ src/gui/dialogs/data_manage.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/data_manage.hpp"
- 
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "game_config.hpp"
- #include "game_preferences.hpp"
-@@ -43,6 +42,7 @@
- 
- #include <cctype>
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -101,7 +101,7 @@
- 	tlistbox& list = find_widget<tlistbox>(&window, "persist_list", false);
- 	list.clear();
- 
--	foreach(const savegame::save_info game, games) {
-+	BOOST_FOREACH(const savegame::save_info game, games) {
- 		std::map<std::string, string_map> data;
- 		string_map item;
- 
-@@ -142,7 +142,7 @@
- 				find_widget<tlabel>(*it, "filename", false);
- 
- 			bool found = false;
--			foreach (const std::string& word, words){
-+			BOOST_FOREACH(const std::string& word, words){
- 				found = std::search(filename_label.label().str().begin()
- 						, filename_label.label().str().end()
- 						, word.begin(), word.end()
-Index: src/gui/dialogs/dialog.cpp
-===================================================================
---- src/gui/dialogs/dialog.cpp	(revision 54624)
-+++ src/gui/dialogs/dialog.cpp	(revision 54625)
-@@ -17,16 +17,17 @@
- 
- #include "gui/dialogs/dialog.hpp"
- 
--#include "foreach.hpp"
- #include "gui/dialogs/field.hpp"
- #include "gui/widgets/integer_selector.hpp"
- #include "video.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- tdialog::~tdialog()
- {
--	foreach(tfield_* field, fields_) {
-+	BOOST_FOREACH(tfield_* field, fields_) {
- 		delete field;
- 	}
- }
-@@ -193,7 +194,7 @@
- 
- void tdialog::init_fields(twindow& window)
- {
--	foreach(tfield_* field, fields_) {
-+	BOOST_FOREACH(tfield_* field, fields_) {
- 		field->attach_to_window(window);
- 		field->widget_init(window);
- 	}
-@@ -207,7 +208,7 @@
- 
- void tdialog::finalize_fields(twindow& window, const bool save_fields)
- {
--	foreach(tfield_* field, fields_) {
-+	BOOST_FOREACH(tfield_* field, fields_) {
- 		if(save_fields) {
- 			field->widget_finalize(window);
- 		}
-Index: src/gui/dialogs/debug_clock.cpp
-===================================================================
---- src/gui/dialogs/debug_clock.cpp	(revision 54624)
-+++ src/gui/dialogs/debug_clock.cpp	(revision 54625)
-@@ -24,6 +24,7 @@
- #include "gui/widgets/progress_bar.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <ctime>
- 
-@@ -153,7 +154,7 @@
- 	}
- 
- 	if(clock_) {
--		foreach(tcanvas& canvas, clock_->canvas()) {
-+		BOOST_FOREACH(tcanvas& canvas, clock_->canvas()) {
- 			canvas.set_variable("hour", variant(hour_stamp));
- 			canvas.set_variable("minute", variant(minute_stamp));
- 			canvas.set_variable("second", variant(second_stamp));
-Index: src/gui/dialogs/wml_message.cpp
-===================================================================
---- src/gui/dialogs/wml_message.cpp	(revision 54624)
-+++ src/gui/dialogs/wml_message.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/wml_message.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/old_markup.hpp"
- #include "gui/widgets/button.hpp"
- #include "gui/widgets/label.hpp"
-Index: src/gui/dialogs/simple_item_selector.cpp
-===================================================================
---- src/gui/dialogs/simple_item_selector.cpp	(revision 54624)
-+++ src/gui/dialogs/simple_item_selector.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/simple_item_selector.hpp"
- 
--#include "foreach.hpp"
- #include "gui/widgets/button.hpp"
- #include "gui/widgets/label.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
-@@ -28,6 +27,8 @@
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /*WIKI
-@@ -79,7 +80,7 @@
- 	tlistbox& list = find_widget<tlistbox>(&window, "listbox", false);
- 	window.keyboard_capture(&list);
- 
--	foreach(const tsimple_item_selector::item_type& it, items_) {
-+	BOOST_FOREACH(const tsimple_item_selector::item_type& it, items_) {
- 		std::map<std::string, string_map> data;
- 		string_map column;
- 
-Index: src/gui/dialogs/game_load.cpp
-===================================================================
---- src/gui/dialogs/game_load.cpp	(revision 54624)
-+++ src/gui/dialogs/game_load.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/game_load.hpp"
- 
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gettext.hpp"
- #include "game_config.hpp"
-@@ -43,6 +42,7 @@
- 
- #include <cctype>
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -151,7 +151,7 @@
- 	tlistbox& list = find_widget<tlistbox>(&window, "savegame_list", false);
- 	list.clear();
- 
--	foreach(const savegame::save_info game, games) {
-+	BOOST_FOREACH(const savegame::save_info game, games) {
- 		std::map<std::string, string_map> data;
- 		string_map item;
- 
-@@ -193,7 +193,7 @@
- 				find_widget<tlabel>(*it, "filename", false);
- 
- 			bool found = false;
--			foreach (const std::string& word, words){
-+			BOOST_FOREACH(const std::string& word, words){
- 				found = std::search(filename_label.label().str().begin()
- 						, filename_label.label().str().end()
- 						, word.begin(), word.end()
-Index: src/gui/dialogs/lobby_main.cpp
-===================================================================
---- src/gui/dialogs/lobby_main.cpp	(revision 54624)
-+++ src/gui/dialogs/lobby_main.cpp	(revision 54625)
-@@ -38,7 +38,6 @@
- #include "gui/widgets/toggle_panel.hpp"
- #include "gui/widgets/tree_view_node.hpp"
- 
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
-@@ -50,6 +49,7 @@
- #include "sound.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_network("network");
- #define DBG_NW LOG_STREAM(debug, log_network)
-@@ -499,14 +499,14 @@
- void modify_grid_with_data(tgrid* grid, const std::map<std::string, string_map>& map)
- {
- 	typedef std::map<std::string, string_map> strstrmap;
--	foreach (const strstrmap::value_type v, map) {
-+	BOOST_FOREACH(const strstrmap::value_type v, map) {
- 		const std::string& key = v.first;
- 		const string_map& strmap = v.second;
- 		twidget* w = grid->find(key, false);
- 		if (w == NULL) continue;
- 		tcontrol* c = dynamic_cast<tcontrol*>(w);
- 		if (c == NULL) continue;
--		foreach (const string_map::value_type& vv, strmap) {
-+		BOOST_FOREACH(const string_map::value_type& vv, strmap) {
- 			if (vv.first == "label") {
- 				c->set_label(vv.second);
- 			} else if (vv.first == "tooltip") {
-@@ -816,7 +816,7 @@
- 	player_list_.other_games.tree->clear();
- 	player_list_.other_rooms.tree->clear();
- 
--	foreach (user_info* userptr, lobby_info_.users_sorted())
-+	BOOST_FOREACH(user_info* userptr, lobby_info_.users_sorted())
- 	{
- 		user_info& user = *userptr;
- 		tsub_player_list* target_list(NULL);
-@@ -1093,7 +1093,7 @@
- 
- tlobby_chat_window* tlobby_main::search_create_window(const std::string& name, bool whisper, bool open_new)
- {
--	foreach (tlobby_chat_window& t, open_windows_) {
-+	BOOST_FOREACH(tlobby_chat_window& t, open_windows_) {
- 		if (t.name == name && t.whisper == whisper) return &t;
- 	}
- 	if (open_new) {
-@@ -1477,7 +1477,7 @@
- 			//TODO: this should really open a nice join room dialog instead
- 			std::stringstream ss;
- 			ss << "Rooms:";
--			foreach (const config& r, rooms.child_range("room")) {
-+			BOOST_FOREACH(const config& r, rooms.child_range("room")) {
- 				ss << " " << r["name"];
- 			}
- 			add_active_window_message("server", ss.str());
-@@ -1667,7 +1667,7 @@
- 		const std::vector<user_info>& match_infos = lobby_info_.users();
- 		std::vector<std::string> matches;
- 
--		foreach(const user_info& ui, match_infos) {
-+		BOOST_FOREACH(const user_info& ui, match_infos) {
- 			if(ui.name != preferences::login()) {
- 				matches.push_back(ui.name);
- 			}
-@@ -1694,7 +1694,7 @@
- {
- 	lobby_info_.clear_game_filter();
- 
--	foreach (const std::string& s, utils::split(filter_text_->get_value(), ' ')) {
-+	BOOST_FOREACH(const std::string& s, utils::split(filter_text_->get_value(), ' ')) {
- 		lobby_info_.add_game_filter(new game_filter_general_string_part(s));
- 	}
- 	//TODO: make changing friend/ignore lists trigger a refresh
-Index: src/gui/dialogs/campaign_difficulty.cpp
-===================================================================
---- src/gui/dialogs/campaign_difficulty.cpp	(revision 54624)
-+++ src/gui/dialogs/campaign_difficulty.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/campaign_difficulty.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/old_markup.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
- 	#include "gui/widgets/list.hpp"
-@@ -27,6 +26,8 @@
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /*WIKI
-@@ -65,7 +66,7 @@
- tcampaign_difficulty::tcampaign_difficulty(const std::vector<std::string>& items)
- 	: index_(-1), items_()
- {
--	foreach(const std::string& it, items) {
-+	BOOST_FOREACH(const std::string& it, items) {
- 		items_.push_back(tlegacy_menu_item(it));
- 	}
- }
-@@ -77,7 +78,7 @@
- 
- 	std::map<std::string, string_map> data;
- 
--	foreach(const tlegacy_menu_item& item, items_) {
-+	BOOST_FOREACH(const tlegacy_menu_item& item, items_) {
- 		if(item.is_default()) {
- 			index_ = list.get_item_count();
- 		}
-Index: src/gui/dialogs/unit_create.cpp
-===================================================================
---- src/gui/dialogs/unit_create.cpp	(revision 54624)
-+++ src/gui/dialogs/unit_create.cpp	(revision 54625)
-@@ -27,9 +27,10 @@
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/toggle_button.hpp"
- #include "gui/widgets/window.hpp"
--#include "foreach.hpp"
- #include "unit_types.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace {
- 	static std::string last_chosen_type_id = "";
- 	static unit_race::GENDER last_gender = unit_race::MALE;
-@@ -109,7 +110,7 @@
- 
- 	std::vector< std::string > type_labels, race_labels;
- 
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		unit_types.find(i.first, unit_type::HELP_INDEX);
- 
-Index: src/gui/dialogs/formula_debugger.cpp
-===================================================================
---- src/gui/dialogs/formula_debugger.cpp	(revision 54624)
-+++ src/gui/dialogs/formula_debugger.cpp	(revision 54625)
-@@ -21,10 +21,10 @@
- #include "gui/widgets/button.hpp"
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/window.hpp"
--#include "../../foreach.hpp"
- #include "../../formula_debugger.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -73,7 +73,7 @@
- 	std::stringstream stack_text;
- 	std::string indent = "  ";
- 	int c = 0;
--	foreach (const game_logic::debug_info &i, fdb_.get_call_stack()) {
-+	BOOST_FOREACH(const game_logic::debug_info &i, fdb_.get_call_stack()) {
- 		for(int d = 0; d < c; ++d) {
- 			stack_text << indent;
- 		}
-@@ -92,7 +92,7 @@
- 			&window, "execution", false, true);
- 
- 	std::stringstream execution_text;
--	foreach (const game_logic::debug_info &i, fdb_.get_execution_trace()) {
-+	BOOST_FOREACH(const game_logic::debug_info &i, fdb_.get_execution_trace()) {
- 		for(int d = 0; d < i.level(); ++d) {
- 			execution_text << indent;
- 		}
-Index: src/gui/dialogs/title_screen.cpp
-===================================================================
---- src/gui/dialogs/title_screen.cpp	(revision 54624)
-+++ src/gui/dialogs/title_screen.cpp	(revision 54625)
-@@ -35,6 +35,7 @@
- #include "preferences_display.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <algorithm>
- 
-@@ -306,7 +307,7 @@
- 		WRN_CF << "There are not tips of day available.\n";
- 	}
- 
--	foreach(const ttip& tip, tips) {
-+	BOOST_FOREACH(const ttip& tip, tips) {
- 
- 		string_map widget;
- 		std::map<std::string, string_map> page;
-Index: src/gui/dialogs/addon_list.cpp
-===================================================================
---- src/gui/dialogs/addon_list.cpp	(revision 54624)
-+++ src/gui/dialogs/addon_list.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/addon_list.hpp"
- 
--#include "foreach.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
- #include "gui/widgets/list.hpp"
- #else
-@@ -26,6 +25,8 @@
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /*WIKI
-@@ -70,7 +71,7 @@
- 	 * @todo do we really want to keep the length limit for the various
- 	 * items?
- 	 */
--	foreach(const config &c, cfg_.child_range("campaign")) {
-+	BOOST_FOREACH(const config &c, cfg_.child_range("campaign")) {
- 		std::map<std::string, string_map> data;
- 		string_map item;
- 
-Index: src/gui/dialogs/campaign_selection.cpp
-===================================================================
---- src/gui/dialogs/campaign_selection.cpp	(revision 54624)
-+++ src/gui/dialogs/campaign_selection.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/campaign_selection.hpp"
- 
--#include "foreach.hpp"
- #include "gui/dialogs/helper.hpp"
- #include "gui/widgets/image.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
-@@ -34,6 +33,7 @@
- #include "serialization/string_utils.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -140,7 +140,7 @@
- 				&window, "campaign_details", false);
- 
- 		unsigned id = 0;
--		foreach(const config &campaign, campaigns_) {
-+		BOOST_FOREACH(const config &campaign, campaigns_) {
- 
- 			/*** Add tree item ***/
- 			tree_group_field["label"] = campaign["icon"];
-@@ -206,7 +206,7 @@
- 		tmulti_page& multi_page = find_widget<tmulti_page>(
- 				&window, "campaign_details", false);
- 
--		foreach (const config &c, campaigns_) {
-+		BOOST_FOREACH(const config &c, campaigns_) {
- 
- 			/*** Add list item ***/
- 			string_map list_item;
-Index: src/gui/dialogs/mp_connect.cpp
-===================================================================
---- src/gui/dialogs/mp_connect.cpp	(revision 54624)
-+++ src/gui/dialogs/mp_connect.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/mp_connect.hpp"
- 
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gui/dialogs/field.hpp"
- #include "gui/widgets/button.hpp"
-@@ -30,6 +29,7 @@
- #include "video.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -90,7 +90,7 @@
- 	const std::vector<game_config::server_info>&
- 		pref_servers = preferences::server_list();
- 
--	foreach(const game_config::server_info& server, pref_servers) {
-+	BOOST_FOREACH(const game_config::server_info& server, pref_servers) {
- 
- 		std::map<std::string, string_map> data;
- 		string_map item;
-Index: src/gui/dialogs/language_selection.cpp
-===================================================================
---- src/gui/dialogs/language_selection.cpp	(revision 54624)
-+++ src/gui/dialogs/language_selection.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/language_selection.hpp"
- 
--#include "foreach.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
- #include "gui/widgets/list.hpp"
- #else
-@@ -28,6 +27,8 @@
- #include "language.hpp"
- #include "preferences.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /*WIKI
-@@ -65,7 +66,7 @@
- 
- 	const std::vector<language_def>& languages = get_languages();
- 	const language_def& current_language = get_language();
--	foreach(const language_def& lang, languages) {
-+	BOOST_FOREACH(const language_def& lang, languages) {
- 		string_map item;
- 		item.insert(std::make_pair("label", lang.language));
- 
-Index: src/gui/dialogs/mp_create_game.cpp
-===================================================================
---- src/gui/dialogs/mp_create_game.cpp	(revision 54624)
-+++ src/gui/dialogs/mp_create_game.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/mp_create_game.hpp"
- 
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
- #include "gui/dialogs/field.hpp"
-@@ -35,6 +34,7 @@
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
- #include <boost/bind.hpp>
- #endif
-+#include <boost/foreach.hpp>
- namespace gui2 {
- 
- REGISTER_DIALOG(mp_create_game)
-@@ -101,7 +101,7 @@
- 	std::vector<std::string> maps;
- 	get_files_in_dir(get_user_data_dir() + "/editor/maps", &maps, NULL, FILE_NAME_ONLY);
- 
--	foreach(const std::string& map, maps) {
-+	BOOST_FOREACH(const std::string& map, maps) {
- 		std::map<std::string, t_string> item;
- 		item.insert(std::make_pair("label", map));
- 		list->add_row(item);
-@@ -110,7 +110,7 @@
- 
- 	// Standard maps
- 	int i = 0;
--	foreach (const config &map, cfg_.child_range("multiplayer"))
-+	BOOST_FOREACH(const config &map, cfg_.child_range("multiplayer"))
- 	{
- 		if (map["allow_new_game"].to_bool(true)) {
- 			string_map item;
-Index: src/gui/dialogs/network_transmission.cpp
-===================================================================
---- src/gui/dialogs/network_transmission.cpp	(revision 54624)
-+++ src/gui/dialogs/network_transmission.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/network_transmission.hpp"
- 
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gettext.hpp"
- #include "gui/widgets/button.hpp"
-Index: src/gui/dialogs/addon/description.cpp
-===================================================================
---- src/gui/dialogs/addon/description.cpp	(revision 54624)
-+++ src/gui/dialogs/addon/description.cpp	(revision 54625)
-@@ -17,14 +17,15 @@
- 
- #include "gui/dialogs/addon/description.hpp"
- 
--#include "foreach.hpp"
- #include "gui/widgets/settings.hpp"
- #include "language.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace {
- 	std::string langcode_to_string(const std::string& lcode)
- 	{
--		foreach(const language_def& ld, get_languages()) {
-+		BOOST_FOREACH(const language_def& ld, get_languages()) {
- 			if(ld.localename == lcode || ld.localename.substr(0, 2) == lcode) {
- 				return ld.language;
- 			}
-@@ -90,7 +91,7 @@
- 
- 	std::string languages;
- 
--	foreach(const std::string& lc, addon.translations) {
-+	BOOST_FOREACH(const std::string& lc, addon.translations) {
- 		const std::string& langlabel = langcode_to_string(lc);
- 		if(!langlabel.empty()) {
- 			if(!languages.empty()) {
-Index: src/gui/dialogs/addon/uninstall_list.cpp
-===================================================================
---- src/gui/dialogs/addon/uninstall_list.cpp	(revision 54624)
-+++ src/gui/dialogs/addon/uninstall_list.cpp	(revision 54625)
-@@ -15,7 +15,6 @@
- 
- #include "gui/dialogs/addon/uninstall_list.hpp"
- 
--#include "foreach.hpp"
- #include "gui/widgets/grid.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
- 	#include "gui/widgets/list.hpp"
-@@ -26,6 +25,8 @@
- #include "gui/widgets/toggle_button.hpp"
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <algorithm>
- 
- namespace {
-@@ -50,7 +51,7 @@
- 	this->names_.clear();
- 	this->selections_.clear();
- 
--	foreach(const std::string& id, this->ids_) {
-+	BOOST_FOREACH(const std::string& id, this->ids_) {
- 		this->names_.push_back(make_addon_name(id));
- 		this->selections_[id] = false;
- 
-@@ -87,7 +88,7 @@
- 	std::vector<std::string> retv;
- 
- 	typedef std::map<std::string, bool> selections_map_type;
--	foreach(const selections_map_type::value_type& entry, this->selections_) {
-+	BOOST_FOREACH(const selections_map_type::value_type& entry, this->selections_) {
- 		if(entry.second) {
- 			retv.push_back(entry.first);
- 		}
-Index: src/gui/dialogs/chat_log.cpp
-===================================================================
---- src/gui/dialogs/chat_log.cpp	(revision 54624)
-+++ src/gui/dialogs/chat_log.cpp	(revision 54625)
-@@ -28,7 +28,6 @@
- #include "gui/widgets/window.hpp"
- #include "gui/widgets/slider.hpp"
- 
--#include "../../foreach.hpp"
- #include "../../gamestatus.hpp"
- #include "../../log.hpp"
- #include "../../resources.hpp"
-@@ -38,6 +37,7 @@
- #include <vector>
- #include <boost/bind.hpp>
- #include <boost/shared_ptr.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_chat_log("chat_log");
- #define DBG_CHAT_LOG LOG_STREAM(debug, log_chat_log)
-@@ -113,7 +113,7 @@
- 		std::stringstream str;
- 		LOG_CHAT_LOG << "entering tchat_log::model::add_row_to_chat_message_list\n";
- 		if (first<last) {
--			foreach (const chat_msg &t, make_pair(chat_log_history.begin()+first,chat_log_history.begin()+last))
-+			BOOST_FOREACH(const chat_msg &t, make_pair(chat_log_history.begin()+first,chat_log_history.begin()+last))
- 			{
- 				std::string prefix("/me");
- 				bool me = false;
-Index: src/gui/dialogs/mp_change_control.cpp
-===================================================================
---- src/gui/dialogs/mp_change_control.cpp	(revision 54624)
-+++ src/gui/dialogs/mp_change_control.cpp	(revision 54625)
-@@ -36,7 +36,7 @@
- #include <vector>
- #include <boost/bind.hpp>
- #include <boost/shared_ptr.hpp>
--#include <gui/widgets/button.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_gui("gui/dialogs/mp_change_control");
- #define ERR_GUI LOG_STREAM(err, log_gui)
-@@ -184,7 +184,7 @@
- 
- 		int i = 0; // because we need to know which row contains the controlling player
- 
--		foreach (const std::string &nick, nicks)
-+		BOOST_FOREACH(const std::string &nick, nicks)
- 		{
- 			if (side_number_ <= static_cast<int>(resources::teams->size()) &&
- 				resources::teams->at(side_number_-1).current_player() == nick)
-Index: src/gui/dialogs/message.cpp
-===================================================================
---- src/gui/dialogs/message.cpp	(revision 54624)
-+++ src/gui/dialogs/message.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/message.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/widgets/button.hpp"
- #include "gui/widgets/image.hpp"
-@@ -26,6 +25,8 @@
- #include "gui/widgets/window.hpp"
- #include "log.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- REGISTER_DIALOG(message)
-@@ -97,7 +98,7 @@
- 
- void tmessage::post_show(twindow& /*window*/)
- {
--	foreach(tbutton_status& button_status, buttons_) {
-+	BOOST_FOREACH(tbutton_status& button_status, buttons_) {
- 		button_status.button = NULL;
- 	}
- }
-Index: src/gui/dialogs/lobby/lobby_data.cpp
-===================================================================
---- src/gui/dialogs/lobby/lobby_data.cpp	(revision 54624)
-+++ src/gui/dialogs/lobby/lobby_data.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "config.hpp"
- #include "game_preferences.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gettext.hpp"
- #include "network.hpp"
-@@ -27,6 +26,8 @@
- #include "map_exception.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iterator>
- 
- static lg::log_domain log_config("config");
-@@ -89,7 +90,7 @@
- void room_info::process_room_members(const config& data)
- {
- 	members_.clear();
--	foreach (const config& m, data.child_range("member")) {
-+	BOOST_FOREACH(const config& m, data.child_range("member")) {
- 		members_.insert(m["name"]);
- 	}
- }
-@@ -254,7 +255,7 @@
- 				if (const config& hashes = game_config.child("multiplayer_hashes")) {
- 					std::string hash = game["hash"];
- 					bool hash_found = false;
--					foreach (const config::attribute &i, hashes.attribute_range()) {
-+					BOOST_FOREACH(const config::attribute &i, hashes.attribute_range()) {
- 						if (i.first == game["mp_scenario"] && i.second == hash) {
- 							hash_found = true;
- 							break;
-@@ -357,7 +358,7 @@
- 
- game_filter_stack::~game_filter_stack()
- {
--	foreach (game_filter_base* f, filters_) {
-+	BOOST_FOREACH(game_filter_base* f, filters_) {
- 		delete f;
- 	}
- }
-@@ -369,7 +370,7 @@
- 
- void game_filter_stack::clear()
- {
--	foreach (game_filter_base* f, filters_) {
-+	BOOST_FOREACH(game_filter_base* f, filters_) {
- 		delete f;
- 	}
- 	filters_.clear();
-@@ -377,7 +378,7 @@
- 
- bool game_filter_and_stack::match(const game_info &game) const
- {
--	foreach (game_filter_base* f, filters_) {
-+	BOOST_FOREACH(game_filter_base* f, filters_) {
- 		if (!f->match(game)) return false;
- 	}
- 	return true;
-Index: src/gui/dialogs/lobby/lobby_info.cpp
-===================================================================
---- src/gui/dialogs/lobby/lobby_info.cpp	(revision 54624)
-+++ src/gui/dialogs/lobby/lobby_info.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "config.hpp"
- #include "game_preferences.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gettext.hpp"
- #include "network.hpp"
-@@ -27,6 +26,8 @@
- #include "map_exception.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iterator>
- 
- static lg::log_domain log_config("config");
-@@ -66,7 +67,7 @@
- 
- void lobby_info::delete_games()
- {
--	foreach (const game_info_map::value_type& v, games_by_id_) {
-+	BOOST_FOREACH(const game_info_map::value_type& v, games_by_id_) {
- 		delete v.second;
- 	}
- }
-@@ -76,7 +77,7 @@
- std::string dump_games_map(const lobby_info::game_info_map& games)
- {
- 	std::stringstream ss;
--	foreach (const lobby_info::game_info_map::value_type& v, games) {
-+	BOOST_FOREACH(const lobby_info::game_info_map::value_type& v, games) {
- 		const game_info& game = *v.second;
- 		ss << "G" << game.id << "(" << game.name << ") " << game.display_status_string() << " ";
- 	}
-@@ -87,7 +88,7 @@
- std::string dump_games_config(const config& gamelist)
- {
- 	std::stringstream ss;
--	foreach (const config& c, gamelist.child_range("game")) {
-+	BOOST_FOREACH(const config& c, gamelist.child_range("game")) {
- 		ss << "g" << c["id"] << "(" << c["name"] << ") " << c[config::diff_track_attribute] << " ";
- 	}
- 	ss << "\n";
-@@ -103,7 +104,7 @@
- 	gamelist_initialized_ = true;
- 	delete_games();
- 	games_by_id_.clear();
--	foreach (const config& c, gamelist_.child("gamelist").child_range("game")) {
-+	BOOST_FOREACH(const config& c, gamelist_.child("gamelist").child_range("game")) {
- 		game_info* game = new game_info(c, game_config_);
- 		games_by_id_[game->id] = game;
- 	}
-@@ -180,10 +181,10 @@
- {
- 	SCOPE_LB;
- 	users_.clear();
--	foreach (const config& c, gamelist_.child_range("user")) {
-+	BOOST_FOREACH(const config& c, gamelist_.child_range("user")) {
- 		users_.push_back(user_info(c));
- 	}
--	foreach (user_info& ui, users_) {
-+	BOOST_FOREACH(user_info& ui, users_) {
- 		if (ui.game_id != 0) {
- 			game_info* g = get_game_by_id(ui.game_id);
- 			if (g == NULL) {
-@@ -235,7 +236,7 @@
- 
- room_info* lobby_info::get_room(const std::string &name)
- {
--	foreach (room_info& r, rooms_) {
-+	BOOST_FOREACH(room_info& r, rooms_) {
- 		if (r.name() == name) return &r;
- 	}
- 	return NULL;
-@@ -243,7 +244,7 @@
- 
- const room_info* lobby_info::get_room(const std::string &name) const
- {
--	foreach (const room_info& r, rooms_) {
-+	BOOST_FOREACH(const room_info& r, rooms_) {
- 		if (r.name() == name) return &r;
- 	}
- 	return NULL;
-@@ -301,7 +302,7 @@
- 	games_filtered_.clear();
- 	games_visibility_.clear();
- 	games_.clear();
--	foreach (const game_info_map::value_type& v, games_by_id_) {
-+	BOOST_FOREACH(const game_info_map::value_type& v, games_by_id_) {
- 		games_.push_back(v.second);
- 	}
- }
-@@ -310,7 +311,7 @@
- {
- 	games_filtered_.clear();
- 	games_visibility_.clear();
--	foreach (game_info* g, games_) {
-+	BOOST_FOREACH(game_info* g, games_) {
- 		game_info& gi = *g;
- 		bool show = game_filter_.match(gi);
- 		if (game_filter_invert_) {
-@@ -325,7 +326,7 @@
- 
- void lobby_info::update_user_statuses(int game_id, const room_info *room)
- {
--	foreach (user_info& user, users_) {
-+	BOOST_FOREACH(user_info& user, users_) {
- 		user.update_state(game_id, room);
- 	}
- }
-@@ -365,7 +366,7 @@
- void lobby_info::sort_users(bool by_name, bool by_relation)
- {
- 	users_sorted_.clear();
--	foreach (user_info& u, users_) {
-+	BOOST_FOREACH(user_info& u, users_) {
- 		users_sorted_.push_back(&u);
- 	}
- 	if (by_name) {
-Index: src/gui/dialogs/game_save.cpp
-===================================================================
---- src/gui/dialogs/game_save.cpp	(revision 54624)
-+++ src/gui/dialogs/game_save.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/game_save.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/dialogs/field.hpp"
- #include "gui/widgets/button.hpp"
-Index: src/gui/widgets/settings.cpp
-===================================================================
---- src/gui/widgets/settings.cpp	(revision 54624)
-+++ src/gui/widgets/settings.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "asserts.hpp"
- #include "config_cache.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/tips.hpp"
-@@ -35,6 +34,8 @@
- #include "serialization/schema_validator.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- bool new_widgets = false;
-@@ -283,12 +284,12 @@
- 				  , const config&
- 				  , const char *key)> > thack;
- 
--	foreach(thack& widget_type, registred_widget_type()) {
-+	BOOST_FOREACH(thack& widget_type, registred_widget_type()) {
- 		widget_type.second(*this, widget_type.first, cfg, NULL);
- 	}
- 
- 	/***** Window types *****/
--	foreach (const config &w, cfg.child_range("window")) {
-+	BOOST_FOREACH(const config &w, cfg.child_range("window")) {
- 		std::pair<std::string, twindow_builder> child;
- 		child.first = child.second.read(w);
- 		window_types.insert(child);
-@@ -423,7 +424,7 @@
- 		  const std::string& definition_type
- 		, const std::vector<tcontrol_definition_ptr>& definitions)
- {
--	foreach(const tcontrol_definition_ptr& def, definitions) {
-+	BOOST_FOREACH(const tcontrol_definition_ptr& def, definitions) {
- 
- 		// We assume all definitions are unique if not we would leak memory.
- 		assert(control_definition[definition_type].find(def->id)
-@@ -497,7 +498,7 @@
- 			ERR_GUI_P << e.message;
- 	}
- 	// Parse guis
--	foreach (const config &g, cfg.child_range("gui")) {
-+	BOOST_FOREACH(const config &g, cfg.child_range("gui")) {
- 		std::pair<std::string, tgui_definition> child;
- 		child.first = child.second.read(g);
- 		guis.insert(child);
-Index: src/gui/widgets/window.cpp
-===================================================================
---- src/gui/widgets/window.cpp	(revision 54624)
-+++ src/gui/widgets/window.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- #include "gui/widgets/window_private.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
-@@ -44,6 +43,7 @@
- #include "video.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -716,7 +716,7 @@
- 		return;
- 	}
- 
--	foreach(std::vector<twidget*>& item, dirty_list_) {
-+	BOOST_FOREACH(std::vector<twidget*>& item, dirty_list_) {
- 
- 		assert(!item.empty());
- 
-@@ -1047,12 +1047,12 @@
- {
- 	// evaluate the group sizes
- 	typedef std::pair<const std::string, tlinked_size> hack;
--	foreach(hack& linked_size, linked_size_) {
-+	BOOST_FOREACH(hack& linked_size, linked_size_) {
- 
- 		tpoint max_size(0, 0);
- 
- 		// Determine the maximum size.
--		foreach(twidget* widget, linked_size.second.widgets) {
-+		BOOST_FOREACH(twidget* widget, linked_size.second.widgets) {
- 
- 			const tpoint size = widget->get_best_size();
- 
-@@ -1065,7 +1065,7 @@
- 		}
- 
- 		// Set the maximum size.
--		foreach(twidget* widget, linked_size.second.widgets) {
-+		BOOST_FOREACH(twidget* widget, linked_size.second.widgets) {
- 
- 			tpoint size = widget->get_best_size();
- 
-Index: src/gui/widgets/stacked_widget.cpp
-===================================================================
---- src/gui/widgets/stacked_widget.cpp	(revision 54624)
-+++ src/gui/widgets/stacked_widget.cpp	(revision 54625)
-@@ -17,13 +17,13 @@
- 
- #include "gui/widgets/stacked_widget.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/widget_definition/stacked_widget.hpp"
- #include "gui/auxiliary/window_builder/stacked_widget.hpp"
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/generator.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -83,7 +83,7 @@
- {
- 	assert(generator_);
- 	string_map empty_data;
--	foreach(const tbuilder_grid_const_ptr& builder, widget_builder) {
-+	BOOST_FOREACH(const tbuilder_grid_const_ptr& builder, widget_builder) {
- 		generator_->create_item(-1, builder, empty_data, NULL);
- 	}
- 	swap_grid(NULL, &grid(), generator_, "_content_grid");
-Index: src/gui/widgets/text_box.cpp
-===================================================================
---- src/gui/widgets/text_box.cpp	(revision 54624)
-+++ src/gui/widgets/text_box.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "gui/widgets/text_box.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/text_box.hpp"
- #include "gui/auxiliary/window_builder/text_box.hpp"
-@@ -27,6 +26,7 @@
- #include "game_preferences.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -162,7 +162,7 @@
- 	const int max_width = get_text_maximum_width();
- 	const int max_height = get_text_maximum_height();
- 
--	foreach(tcanvas& tmp, canvas()) {
-+	BOOST_FOREACH(tcanvas& tmp, canvas()) {
- 
- 		tmp.set_variable("text", variant(get_value()));
- 		tmp.set_variable("text_x_offset", variant(text_x_offset_));
-@@ -260,7 +260,7 @@
- 
- 	// Since this variable doesn't change set it here instead of in
- 	// update_canvas().
--	foreach(tcanvas& tmp, canvas()) {
-+	BOOST_FOREACH(tcanvas& tmp, canvas()) {
- 		tmp.set_variable("text_font_height", variant(text_height_));
- 	}
- 
-Index: src/gui/widgets/toggle_panel.cpp
-===================================================================
---- src/gui/widgets/toggle_panel.cpp	(revision 54624)
-+++ src/gui/widgets/toggle_panel.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/widgets/toggle_panel.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/toggle_panel.hpp"
- #include "gui/auxiliary/window_builder/toggle_panel.hpp"
-@@ -26,6 +25,7 @@
- #include "sound.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -72,7 +72,7 @@
- {
- 	// typedef boost problem work around.
- 	typedef std::pair<std::string, string_map> hack ;
--	foreach(const hack& item, data) {
-+	BOOST_FOREACH(const hack& item, data) {
- 		tcontrol* control = dynamic_cast<tcontrol*>(find(item.first, false));
- 		if(control) {
- 			control->set_members(item.second);
-Index: src/gui/widgets/tree_view_node.cpp
-===================================================================
---- src/gui/widgets/tree_view_node.cpp	(revision 54624)
-+++ src/gui/widgets/tree_view_node.cpp	(revision 54625)
-@@ -24,6 +24,7 @@
- #include "gui/widgets/tree_view.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER \
- 		get_control_type() + " [" + tree_view().id() + "] " + __func__
-@@ -48,7 +49,7 @@
- 	grid_.set_parent(this);
- 	set_parent(&parent_tree_view);
- 	if(id != "root") {
--		foreach(const tnode_definition& node_definition, node_definitions_) {
-+		BOOST_FOREACH(const tnode_definition& node_definition, node_definitions_) {
- 			if(node_definition.id == id) {
- 				node_definition.builder->build(&grid_);
- 				init_grid(&grid_, data);
-@@ -217,7 +218,7 @@
- 	int height_reduction = 0;
- 
- 	if(!is_folded()) {
--		foreach(const ttree_view_node& node, children_) {
-+		BOOST_FOREACH(const ttree_view_node& node, children_) {
- 			height_reduction += node.get_current_size().y;
- 		}
- 	}
-@@ -300,7 +301,7 @@
- 		return;
- 	}
- 
--	foreach(ttree_view_node& node, children_) {
-+	BOOST_FOREACH(ttree_view_node& node, children_) {
- 		std::vector<twidget*> child_call_stack = call_stack;
- 		node.impl_populate_dirty_list(caller, child_call_stack);
- 	}
-@@ -455,7 +456,7 @@
- 	}
- 
- 	DBG_GUI_L << LOG_HEADER << " set children.\n";
--	foreach(ttree_view_node& node, children_) {
-+	BOOST_FOREACH(ttree_view_node& node, children_) {
- 		origin.y += node.place(indention_step_size, origin, width);
- 	}
- 
-@@ -477,7 +478,7 @@
- 		return;
- 	}
- 
--	foreach(ttree_view_node& node, children_) {
-+	BOOST_FOREACH(ttree_view_node& node, children_) {
- 		node.set_visible_area(area);
- 	}
- }
-@@ -490,7 +491,7 @@
- 		return;
- 	}
- 
--	foreach(ttree_view_node& node, children_) {
-+	BOOST_FOREACH(ttree_view_node& node, children_) {
- 		node.impl_draw_children(frame_buffer);
- 	}
- }
-Index: src/gui/widgets/settings.hpp
-===================================================================
---- src/gui/widgets/settings.hpp	(revision 54624)
-+++ src/gui/widgets/settings.hpp	(revision 54625)
-@@ -24,6 +24,7 @@
- #include "gui/auxiliary/widget_definition/window.hpp"
- 
- #include <boost/function.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <string>
- #include <vector>
-@@ -124,7 +125,7 @@
- {
- 	std::vector<tcontrol_definition_ptr> definitions;
- 
--	foreach(const config& definition
-+	BOOST_FOREACH(const config& definition
- 			, cfg.child_range(key ? key : definition_type + "_definition")) {
- 
- 		definitions.push_back(new T(definition));
-Index: src/gui/widgets/slider.cpp
-===================================================================
---- src/gui/widgets/slider.cpp	(revision 54624)
-+++ src/gui/widgets/slider.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/widgets/slider.hpp"
- 
--#include "foreach.hpp"
- #include "formatter.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/slider.hpp"
-@@ -27,6 +26,7 @@
- #include "sound.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -232,7 +232,7 @@
- 	// Inherited.
- 	tscrollbar_::update_canvas();
- 
--	foreach(tcanvas& tmp, canvas()) {
-+	BOOST_FOREACH(tcanvas& tmp, canvas()) {
- 		tmp.set_variable("text", variant(get_value_label()));
- 	}
- }
-Index: src/gui/widgets/scrollbar.cpp
-===================================================================
---- src/gui/widgets/scrollbar.cpp	(revision 54624)
-+++ src/gui/widgets/scrollbar.cpp	(revision 54625)
-@@ -17,11 +17,11 @@
- 
- #include "gui/widgets/scrollbar.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/widgets/window.hpp" // Needed for invalidate_layout()
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -132,7 +132,7 @@
- 
- void tscrollbar_::update_canvas() {
- 
--	foreach(tcanvas& tmp, canvas()) {
-+	BOOST_FOREACH(tcanvas& tmp, canvas()) {
- 		tmp.set_variable("positioner_offset", variant(positioner_offset_));
- 		tmp.set_variable("positioner_length", variant(positioner_length_));
- 	}
-@@ -287,7 +287,7 @@
- void tscrollbar_::load_config_extra()
- {
- 	// These values won't change so set them here.
--	foreach(tcanvas& tmp, canvas()) {
-+	BOOST_FOREACH(tcanvas& tmp, canvas()) {
- 		tmp.set_variable("offset_before", variant(offset_before()));
- 		tmp.set_variable("offset_after", variant(offset_after()));
- 	}
-Index: src/gui/widgets/grid_private.hpp
-===================================================================
---- src/gui/widgets/grid_private.hpp	(revision 54624)
-+++ src/gui/widgets/grid_private.hpp	(revision 54625)
-@@ -33,7 +33,7 @@
- 
- #include "gui/widgets/grid.hpp"
- 
--#include "foreach.hpp"
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -56,7 +56,7 @@
- 			const tpoint& coordinate, const bool must_be_active)
- 	{
- 		typedef typename tconst_duplicator<W, tgrid::tchild>::type hack;
--		foreach(hack& child, grid.children_) {
-+		BOOST_FOREACH(hack& child, grid.children_) {
- 
- 			W* widget = child.widget();
- 			if(!widget) {
-@@ -91,7 +91,7 @@
- 		}
- 
- 		typedef typename tconst_duplicator<W, tgrid::tchild>::type hack;
--		foreach(hack& child, grid.children_) {
-+		BOOST_FOREACH(hack& child, grid.children_) {
- 
- 			widget = child.widget();
- 			if(!widget) {
-Index: src/gui/widgets/grid.cpp
-===================================================================
---- src/gui/widgets/grid.cpp	(revision 54624)
-+++ src/gui/widgets/grid.cpp	(revision 54625)
-@@ -21,6 +21,8 @@
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/layout_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <numeric>
- 
- #define LOG_SCOPE_HEADER "tgrid [" + id() + "] " + __func__
-@@ -48,7 +50,7 @@
- {
- 	// Delete the children in this destructor since resizing a vector copies the
- 	// children and thus frees the child prematurely.
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 		delete child.widget();
- 	}
- }
-@@ -99,7 +101,7 @@
- {
- 	assert(widget);
- 
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 		if(child.id() != id) {
- 
- 			if(recurse) {
-@@ -145,7 +147,7 @@
- 
- void tgrid::remove_child(const std::string& id, const bool find_all)
- {
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		if(child.id() == id) {
- 			delete child.widget();
-@@ -160,7 +162,7 @@
- 
- void tgrid::set_active(const bool active)
- {
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		twidget* widget = child.widget();
- 		if(!widget) {
-@@ -186,7 +188,7 @@
- 	twidget::layout_init(full_initialization);
- 
- 	// Clear child caches.
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		child.layout_init(full_initialization);
- 
-@@ -426,7 +428,7 @@
- 
- bool tgrid::can_wrap() const
- {
--	foreach(const tchild& child, children_) {
-+	BOOST_FOREACH(const tchild& child, children_) {
- 		if(child.can_wrap()) {
- 			return true;
- 		}
-@@ -485,7 +487,7 @@
- 
- 			if(w_size == 0) {
- 				// If all sizes are 0 reset them to 1
--				foreach(unsigned& val, col_grow_factor_) {
-+				BOOST_FOREACH(unsigned& val, col_grow_factor_) {
- 					val = 1;
- 				}
- 				w_size = cols_;
-@@ -516,7 +518,7 @@
- 
- 			if(h_size == 0) {
- 				// If all sizes are 0 reset them to 1
--				foreach(unsigned& val, row_grow_factor_) {
-+				BOOST_FOREACH(unsigned& val, row_grow_factor_) {
- 					val = 1;
- 				}
- 				h_size = rows_;
-@@ -551,7 +553,7 @@
- 	// Inherited.
- 	twidget::set_origin(origin);
- 
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		twidget* widget = child.widget();
- 		assert(widget);
-@@ -567,7 +569,7 @@
- 	// Inherited.
- 	twidget::set_visible_area(area);
- 
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		twidget* widget = child.widget();
- 		assert(widget);
-@@ -578,7 +580,7 @@
- 
- void tgrid::layout_children()
- {
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 		assert(child.widget());
- 		child.widget()->layout_children();
- 	}
-@@ -589,7 +591,7 @@
- {
- 	assert(!call_stack.empty() && call_stack.back() == this);
- 
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		assert(child.widget());
- 
-@@ -627,7 +629,7 @@
- 
- bool tgrid::has_widget(const twidget* widget) const
- {
--	foreach(const tchild& child, children_) {
-+	BOOST_FOREACH(const tchild& child, children_) {
- 		if(child.widget() == widget) {
- 			return true;
- 		}
-@@ -641,7 +643,7 @@
- 		return false;
- 	}
- 
--	foreach(const tchild& child, children_) {
-+	BOOST_FOREACH(const tchild& child, children_) {
- 		const twidget* widget = child.widget();
- 		assert(widget);
- 
-@@ -936,7 +938,7 @@
- 	assert(get_visible() == twidget::VISIBLE);
- 	set_dirty(false);
- 
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		twidget* widget = child.widget();
- 		assert(widget);
-Index: src/gui/widgets/toggle_button.cpp
-===================================================================
---- src/gui/widgets/toggle_button.cpp	(revision 54624)
-+++ src/gui/widgets/toggle_button.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/widgets/toggle_button.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/toggle_button.hpp"
- #include "gui/auxiliary/window_builder/toggle_button.hpp"
-@@ -26,6 +25,7 @@
- #include "sound.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -89,7 +89,7 @@
- 
- 	// set icon in canvases
- 	std::vector<tcanvas>& canvases = tcontrol::canvas();
--	foreach(tcanvas& canvas, canvases) {
-+	BOOST_FOREACH(tcanvas& canvas, canvases) {
- 		canvas.set_variable("icon", variant(icon_name_));
- 	}
- 
-Index: src/gui/widgets/control.cpp
-===================================================================
---- src/gui/widgets/control.cpp	(revision 54624)
-+++ src/gui/widgets/control.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "control.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gui/auxiliary/iterator/walker_widget.hpp"
- #include "gui/auxiliary/log.hpp"
-@@ -29,6 +28,7 @@
- #include "marked-up_text.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <iomanip>
- 
-@@ -211,7 +211,7 @@
- void tcontrol::place(const tpoint& origin, const tpoint& size)
- {
- 	// resize canvasses
--	foreach(tcanvas& canvas, canvas_) {
-+	BOOST_FOREACH(tcanvas& canvas, canvas_) {
- 		canvas.set_width(size.x);
- 		canvas.set_height(size.y);
- 	}
-@@ -297,7 +297,7 @@
- 	const int max_height = get_text_maximum_height();
- 
- 	// set label in canvases
--	foreach(tcanvas& canvas, canvas_) {
-+	BOOST_FOREACH(tcanvas& canvas, canvas_) {
- 		canvas.set_variable("text", variant(label_));
- 		canvas.set_variable("text_markup", variant(use_markup_));
- 		canvas.set_variable("text_alignment"
-Index: src/gui/widgets/scrollbar_container.cpp
-===================================================================
---- src/gui/widgets/scrollbar_container.cpp	(revision 54624)
-+++ src/gui/widgets/scrollbar_container.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/widgets/scrollbar_container_private.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/layout_exception.hpp"
- #include "gui/widgets/clickable.hpp"
-@@ -25,6 +24,7 @@
- #include "gui/widgets/window.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -692,7 +692,7 @@
- 
- 	/***** Setup the scrollbar buttons *****/
- 	typedef std::pair<std::string, tscrollbar_::tscroll> hack;
--	foreach(const hack& item, scroll_lookup()) {
-+	BOOST_FOREACH(const hack& item, scroll_lookup()) {
- 
- 		// Vertical.
- 		tclickable_* button = find_widget<tclickable_>(
-@@ -838,7 +838,7 @@
- {
- 	if(true) { /** @todo scrollbar visibility. */
- 		/***** set scroll up button status *****/
--		foreach(const std::string& name, button_up_names) {
-+		BOOST_FOREACH(const std::string& name, button_up_names) {
- 			tcontrol* button = find_widget<tcontrol>(
- 					vertical_scrollbar_grid_, name, false, false);
- 
-@@ -848,7 +848,7 @@
- 		}
- 
- 		/***** set scroll down status *****/
--		foreach(const std::string& name, button_down_names) {
-+		BOOST_FOREACH(const std::string& name, button_down_names) {
- 			tcontrol* button = find_widget<tcontrol>(
- 					vertical_scrollbar_grid_, name, false, false);
- 
-@@ -864,7 +864,7 @@
- 
- 	if(true) { /** @todo scrollbar visibility. */
- 		/***** Set scroll left button status *****/
--		foreach(const std::string& name, button_up_names) {
-+		BOOST_FOREACH(const std::string& name, button_up_names) {
- 			tcontrol* button = find_widget<tcontrol>(
- 					horizontal_scrollbar_grid_, name, false, false);
- 
-@@ -874,7 +874,7 @@
- 		}
- 
- 		/***** Set scroll right button status *****/
--		foreach(const std::string& name, button_down_names) {
-+		BOOST_FOREACH(const std::string& name, button_down_names) {
- 			tcontrol* button = find_widget<tcontrol>(
- 					horizontal_scrollbar_grid_, name, false, false);
- 
-Index: src/gui/widgets/generator_private.hpp
-===================================================================
---- src/gui/widgets/generator_private.hpp	(revision 54624)
-+++ src/gui/widgets/generator_private.hpp	(revision 54625)
-@@ -19,12 +19,13 @@
- #include "gui/widgets/generator.hpp"
- 
- #include "asserts.hpp"
--#include "foreach.hpp"
- #include "gui/widgets/grid.hpp"
- #include "gui/widgets/selectable.hpp"
- #include "gui/widgets/toggle_button.hpp"
- #include "gui/widgets/toggle_panel.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /**
-@@ -584,7 +585,7 @@
- 	/** Inherited from tgenerator_. */
- 	void clear()
- 	{
--		foreach(titem* item, items_) {
-+		BOOST_FOREACH(titem* item, items_) {
- 			delete item;
- 		}
- 		selected_item_count_ = 0;
-@@ -750,7 +751,7 @@
- 	/** Inherited from tgenerator_. */
- 	void layout_init(const bool full_initialization)
- 	{
--		foreach(titem* item, items_) {
-+		BOOST_FOREACH(titem* item, items_) {
- 			if(item->grid.get_visible() != twidget::INVISIBLE && item->shown) {
- 				item->grid.layout_init(full_initialization);
- 			}
-@@ -804,7 +805,7 @@
- 	{
- 		assert(this->get_visible() == twidget::VISIBLE);
- 
--		foreach(titem* item, items_) {
-+		BOOST_FOREACH(titem* item, items_) {
- 			if(item->grid.get_visible() == twidget::VISIBLE && item->shown) {
- 				item->grid.draw_children(frame_buffer);
- 			}
-@@ -815,7 +816,7 @@
- 	void child_populate_dirty_list(twindow& caller,
- 			const std::vector<twidget*>& call_stack)
- 	{
--		foreach(titem* item, items_) {
-+		BOOST_FOREACH(titem* item, items_) {
- 			std::vector<twidget*> child_call_stack = call_stack;
- 			item->grid.populate_dirty_list(caller, child_call_stack);
- 		}
-@@ -838,7 +839,7 @@
- 	/** Inherited from widget. */
- 	bool disable_click_dismiss() const
- 	{
--		foreach(titem* item, items_) {
-+		BOOST_FOREACH(titem* item, items_) {
- 			if(item->grid.disable_click_dismiss()) {
- 				return true;
- 			}
-@@ -974,7 +975,7 @@
- 			void (*callback)(twidget*))
- 	{
- 		int i = index;
--		foreach(const T& item_data, data) {
-+		BOOST_FOREACH(const T& item_data, data) {
- 			create_item(i, list_builder, item_data, callback);
- 			if(i != -1) {
- 				++i;
-Index: src/gui/widgets/generator.cpp
-===================================================================
---- src/gui/widgets/generator.cpp	(revision 54624)
-+++ src/gui/widgets/generator.cpp	(revision 54625)
-@@ -19,6 +19,8 @@
- 
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace policy {
-@@ -678,7 +680,7 @@
- 	assert(!callback);
- 
- 	typedef std::pair<std::string, string_map> hack;
--	foreach(const hack& item, data) {
-+	BOOST_FOREACH(const hack& item, data) {
- 		if(item.first.empty()) {
- 			for(unsigned row = 0; row < grid->get_rows(); ++row) {
- 				for(unsigned col = 0; col < grid->get_cols(); ++col) {
-Index: src/gui/widgets/progress_bar.cpp
-===================================================================
---- src/gui/widgets/progress_bar.cpp	(revision 54624)
-+++ src/gui/widgets/progress_bar.cpp	(revision 54625)
-@@ -23,6 +23,7 @@
- #include "gui/widgets/settings.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -38,7 +39,7 @@
- 	if(percentage_ != percentage) {
- 		percentage_ = percentage;
- 
--		foreach(tcanvas& c, canvas()) {
-+		BOOST_FOREACH(tcanvas& c, canvas()) {
- 			c.set_variable("percentage", variant(percentage));
- 		}
- 
-Index: src/gui/auxiliary/widget_definition.hpp
-===================================================================
---- src/gui/auxiliary/widget_definition.hpp	(revision 54624)
-+++ src/gui/auxiliary/widget_definition.hpp	(revision 54625)
-@@ -17,9 +17,10 @@
- #define GUI_AUXILIARY_WIDGET_DEFINITION_HPP_INCLUDED
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gui/auxiliary/canvas.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /**
-@@ -98,7 +99,7 @@
- 	void load_resolutions(const config &cfg)
- 	{
- 		config::const_child_itors itors = cfg.child_range("resolution");
--		foreach(const config &resolution, itors) {
-+		BOOST_FOREACH(const config &resolution, itors) {
- 			resolutions.push_back(new T(resolution));
- 		}
- 	}
-Index: src/gui/auxiliary/event/dispatcher.cpp
-===================================================================
---- src/gui/auxiliary/event/dispatcher.cpp	(revision 54624)
-+++ src/gui/auxiliary/event/dispatcher.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/auxiliary/event/dispatcher_private.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- 
- namespace gui2 {
-Index: src/gui/auxiliary/event/handler.cpp
-===================================================================
---- src/gui/auxiliary/event/handler.cpp	(revision 54624)
-+++ src/gui/auxiliary/event/handler.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "gui/auxiliary/event/handler.hpp"
- 
- #include "clipboard.hpp"
--#include "foreach.hpp"
- #include "gui/auxiliary/event/dispatcher.hpp"
- #include "gui/auxiliary/timer.hpp"
- #include "gui/auxiliary/log.hpp"
-@@ -28,6 +27,8 @@
- #include "hotkeys.hpp"
- #include "video.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <cassert>
- 
- /**
-@@ -429,7 +430,7 @@
- 	}
- 
- 	/***** Set proper state for the other dispatchers. *****/
--	foreach(tdispatcher* dispatcher, dispatchers_) {
-+	BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) {
- 		dynamic_cast<twidget&>(*dispatcher).set_dirty();
- 	}
- 
-@@ -448,7 +449,7 @@
- 
- void thandler::activate()
- {
--	foreach(tdispatcher* dispatcher, dispatchers_) {
-+	BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) {
- 		dispatcher->fire(SDL_ACTIVATE
- 				, dynamic_cast<twidget&>(*dispatcher)
- 				, NULL);
-@@ -472,7 +473,7 @@
- 	 *
- 	 * For now we use a hack, but would be nice to rewrite it for 1.9/1.11.
- 	 */
--	foreach(tdispatcher* dispatcher, dispatchers_) {
-+	BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) {
- 		if(!first) {
- 			/*
- 			 * This leaves glitches on window borders if the window beneath it
-@@ -503,7 +504,7 @@
- {
- 	DBG_GUI_E << "Firing: " << SDL_VIDEO_RESIZE << ".\n";
- 
--	foreach(tdispatcher* dispatcher, dispatchers_) {
-+	BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) {
- 		dispatcher->fire(SDL_VIDEO_RESIZE
- 				, dynamic_cast<twidget&>(*dispatcher)
- 				, new_size);
-Index: src/gui/auxiliary/canvas.cpp
-===================================================================
---- src/gui/auxiliary/canvas.cpp	(revision 54624)
-+++ src/gui/auxiliary/canvas.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- 
- #include "config.hpp"
- #include "../../image.hpp"
--#include "foreach.hpp"
- #include "formatter.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/formula.hpp"
-@@ -33,6 +32,8 @@
- #include "../../text.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace {
-@@ -1455,7 +1456,7 @@
- 	log_scope2(log_gui_parse, "Canvas: parsing config.");
- 	shapes_.clear();
- 
--	foreach(const config::any_child& shape, cfg.all_children_range()) {
-+	BOOST_FOREACH(const config::any_child& shape, cfg.all_children_range()) {
- 		const std::string &type = shape.key;
- 		const config &data = shape.cfg;
- 
-@@ -1474,7 +1475,7 @@
- 		} else if(type == "pre_commit") {
- 
- 			/* note this should get split if more preprocessing is used. */
--			foreach(const config::any_child& function,
-+			BOOST_FOREACH(const config::any_child& function,
- 					data.all_children_range()) {
- 
- 				if(function.key == "blur") {
-Index: src/gui/auxiliary/window_builder.cpp
-===================================================================
---- src/gui/auxiliary/window_builder.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "gui/auxiliary/window_builder_private.hpp"
- 
- #include "asserts.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/window_builder/helper.hpp"
-@@ -43,6 +42,7 @@
- #include "formula_string_utils.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -67,7 +67,7 @@
- 				  std::string
- 				, boost::function<tbuilder_widget_ptr(config)> >
- 			thack;
--	foreach(const thack& item, builder_widget_lookup()) {
-+	BOOST_FOREACH(const thack& item, builder_widget_lookup()) {
- 		if(item.first == "window" || item.first == "tooltip") {
- 			continue;
- 		}
-@@ -153,7 +153,7 @@
- 			, definition->helptip);
- 	assert(window);
- 
--	foreach(const twindow_builder::tresolution::tlinked_group& lg,
-+	BOOST_FOREACH(const twindow_builder::tresolution::tlinked_group& lg,
- 			definition->linked_groups) {
- 
- 		if(window->has_linked_size_group(lg.id)) {
-@@ -238,7 +238,7 @@
- 
- 	config::const_child_itors cfgs = cfg.child_range("resolution");
- 	VALIDATE(cfgs.first != cfgs.second, _("No resolution defined."));
--	foreach (const config &i, cfgs) {
-+	BOOST_FOREACH(const config &i, cfgs) {
- 		resolutions.push_back(tresolution(i));
- 	}
- 
-@@ -386,7 +386,7 @@
- 		definition = "default";
- 	}
- 
--	foreach (const config &lg, cfg.child_range("linked_group")) {
-+	BOOST_FOREACH(const config &lg, cfg.child_range("linked_group")) {
- 		tlinked_group linked_group;
- 		linked_group.id = lg["id"].str();
- 		linked_group.fixed_width = lg["fixed_width"].to_bool();
-@@ -501,13 +501,13 @@
-  */
- 	log_scope2(log_gui_parse, "Window builder: parsing a grid");
- 
--	foreach (const config &row, cfg.child_range("row"))
-+	BOOST_FOREACH(const config &row, cfg.child_range("row"))
- 	{
- 		unsigned col = 0;
- 
- 		row_grow_factor.push_back(row["grow_factor"]);
- 
--		foreach (const config &c, row.child_range("column"))
-+		BOOST_FOREACH(const config &c, row.child_range("column"))
- 		{
- 			flags.push_back(implementation::read_flags(c));
- 			border_size.push_back(c["border_size"]);
-Index: src/gui/auxiliary/tips.cpp
-===================================================================
---- src/gui/auxiliary/tips.cpp	(revision 54624)
-+++ src/gui/auxiliary/tips.cpp	(revision 54625)
-@@ -18,10 +18,11 @@
- #include "gui/auxiliary/tips.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "serialization/string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- ttip::ttip(const t_string& text
-@@ -39,7 +40,7 @@
- {
- 	std::vector<ttip> result;
- 
--	foreach(const config &tip, cfg.child_range("tip")) {
-+	BOOST_FOREACH(const config &tip, cfg.child_range("tip")) {
- 		result.push_back(ttip(tip["text"]
- 				, tip["source"]
- 				, tip["encountered_units"]));
-@@ -54,11 +55,11 @@
- 
- 	const std::set<std::string>& units = preferences::encountered_units();
- 
--	foreach(const ttip& tip, tips) {
-+	BOOST_FOREACH(const ttip& tip, tips) {
- 		if(tip.unit_filter_.empty()) {
- 			result.push_back(tip);
- 		} else {
--			foreach(const std::string& unit, tip.unit_filter_) {
-+			BOOST_FOREACH(const std::string& unit, tip.unit_filter_) {
- 				if(units.find(unit) != units.end()) {
- 					result.push_back(tip);
- 					break;
-Index: src/gui/auxiliary/notifier.hpp
-===================================================================
---- src/gui/auxiliary/notifier.hpp	(revision 54624)
-+++ src/gui/auxiliary/notifier.hpp	(revision 54625)
-@@ -16,10 +16,10 @@
- #ifndef GUI_WIDGETS_AUXILIARY_NOTIFIER_HPP_INCLUDED
- #define GUI_WIDGETS_AUXILIARY_NOTIFIER_HPP_INCLUDED
- 
--#include "foreach.hpp"
--
- #include "gui/auxiliary/notifiee.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <cassert>
- #include <map>
- 
-@@ -47,7 +47,7 @@
- 	~tnotifier()
- 	{
- 		typedef std::pair<tnotifiee<tfunctor>* const, tfunctor> thack;
--		foreach(thack& item, notifiees_) {
-+		BOOST_FOREACH(thack& item, notifiees_) {
- 			assert(item.first);
- 			assert((*item.first).notifier_ == this);
- 
-Index: src/gui/auxiliary/window_builder/helper.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/helper.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/helper.cpp	(revision 54625)
-@@ -18,11 +18,12 @@
- #include "gui/auxiliary/window_builder/helper.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/widgets/grid.hpp"
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -60,7 +61,7 @@
- unsigned get_border(const std::vector<std::string>& border)
- {
- 	unsigned result = 0;
--	foreach (const std::string& s, border) {
-+	BOOST_FOREACH(const std::string& s, border) {
- 		if (s == "all") {
- 			return tgrid::BORDER_ALL;
- 		} else if (s == "top") {
-Index: src/gui/auxiliary/window_builder/stacked_widget.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/stacked_widget.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/stacked_widget.cpp	(revision 54625)
-@@ -18,13 +18,14 @@
- #include "gui/auxiliary/window_builder/stacked_widget.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/stacked_widget.hpp"
- #include "gui/widgets/stacked_widget.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -35,7 +36,7 @@
- {
- 	const config &s = cfg.child("stack");
- 	VALIDATE(s, _("No stack defined."));
--	foreach(const config &layer, s.child_range("layer")) {
-+	BOOST_FOREACH(const config &layer, s.child_range("layer")) {
- 		stack.push_back(new tbuilder_grid(layer));
- 	}
- }
-Index: src/gui/auxiliary/window_builder/slider.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/slider.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/slider.cpp	(revision 54625)
-@@ -18,12 +18,13 @@
- #include "gui/auxiliary/window_builder/slider.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/widgets/slider.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -44,7 +45,7 @@
- 		return;
- 	}
- 
--	foreach(const config& label, labels.child_range("value")) {
-+	BOOST_FOREACH(const config& label, labels.child_range("value")) {
- 		value_labels_.push_back(label["label"]);
- 	}
- }
-Index: src/gui/auxiliary/window_builder/horizontal_listbox.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/horizontal_listbox.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/horizontal_listbox.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/auxiliary/window_builder/horizontal_listbox.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/listbox.hpp"
-@@ -29,6 +28,8 @@
- #endif
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -53,12 +54,12 @@
- 	const config &data = cfg.child("list_data");
- 	if (!data) return;
- 
--	foreach(const config &row, data.child_range("row")) {
-+	BOOST_FOREACH(const config &row, data.child_range("row")) {
- 		unsigned col = 0;
- 
--		foreach(const config &c, row.child_range("column")) {
-+		BOOST_FOREACH(const config &c, row.child_range("column")) {
- 			list_data.push_back(string_map());
--			foreach (const config::attribute &i, c.attribute_range()) {
-+			BOOST_FOREACH(const config::attribute &i, c.attribute_range()) {
- 				list_data.back()[i.first] = i.second;
- 			}
- 			++col;
-Index: src/gui/auxiliary/window_builder/listbox.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/listbox.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/listbox.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/auxiliary/window_builder/listbox.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/listbox.hpp"
-@@ -30,6 +29,8 @@
- #include "gui/widgets/settings.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -66,12 +67,12 @@
- 		return;
- 	}
- 
--	foreach(const config& row, data.child_range("row")) {
-+	BOOST_FOREACH(const config& row, data.child_range("row")) {
- 		unsigned col = 0;
- 
--		foreach(const config& c, row.child_range("column")) {
-+		BOOST_FOREACH(const config& c, row.child_range("column")) {
- 			list_data.push_back(string_map());
--			foreach(const config::attribute& i, c.attribute_range()) {
-+			BOOST_FOREACH(const config::attribute& i, c.attribute_range()) {
- 				list_data.back()[i.first] = i.second;
- 			}
- 			++col;
-Index: src/gui/auxiliary/window_builder/multi_page.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/multi_page.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/multi_page.cpp	(revision 54625)
-@@ -18,13 +18,14 @@
- #include "gui/auxiliary/window_builder/multi_page.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/multi_page.hpp"
- #include "gui/widgets/multi_page.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -46,12 +47,12 @@
- 		return;
- 	}
- 
--	foreach(const config &row, d.child_range("row")) {
-+	BOOST_FOREACH(const config &row, d.child_range("row")) {
- 		unsigned col = 0;
- 
--		foreach(const config &column, row.child_range("column")) {
-+		BOOST_FOREACH(const config &column, row.child_range("column")) {
- 			data.push_back(string_map());
--			foreach(const config::attribute &i, column.attribute_range()) {
-+			BOOST_FOREACH(const config::attribute &i, column.attribute_range()) {
- 				data.back()[i.first] = i.second;
- 			}
- 			++col;
-Index: src/gui/auxiliary/window_builder/tree_view.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/tree_view.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/tree_view.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/auxiliary/window_builder/tree_view.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/tree_view.hpp"
-@@ -25,6 +24,8 @@
- #include "gui/widgets/tree_view.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -39,7 +40,7 @@
- 	, nodes()
- {
- 
--	foreach(const config &node, cfg.child_range("node")) {
-+	BOOST_FOREACH(const config &node, cfg.child_range("node")) {
- 		nodes.push_back(tnode(node));
- 	}
- 
-Index: src/unit_types.cpp
-===================================================================
---- src/unit_types.cpp	(revision 54624)
-+++ src/unit_types.cpp	(revision 54625)
-@@ -22,13 +22,13 @@
- 
- #include "unit_types.hpp"
- 
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "gettext.hpp"
- #include "loadscreen.hpp"
- #include "log.hpp"
- #include "map.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_config("config");
- #define ERR_CF LOG_STREAM(err, log_config)
-@@ -156,7 +156,7 @@
- 		if (config &specials = cfg_.child("specials"))
- 		{
- 			config new_specials;
--			foreach (const config::any_child &vp, specials.all_children_range()) {
-+			BOOST_FOREACH(const config::any_child &vp, specials.all_children_range()) {
- 				std::vector<std::string>::const_iterator found_id =
- 					std::find(dsl.begin(), dsl.end(), vp.cfg["id"]);
- 				if (found_id == dsl.end()) {
-@@ -174,7 +174,7 @@
- 			cfg_.clear_children("specials");
- 		}
- 		config &new_specials = cfg_.child_or_add("specials");
--		foreach (const config::any_child &value, set_specials.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &value, set_specials.all_children_range()) {
- 			new_specials.add_child(value.key, value.cfg);
- 		}
- 	}
-@@ -345,7 +345,7 @@
- 
- 	if (const config &resistance = cfg_.child("resistance"))
- 	{
--		foreach (const config::attribute &i, resistance.attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &i, resistance.attribute_range()) {
- 			res[i.first] = i.second;
- 		}
- 	}
-@@ -666,11 +666,11 @@
- 	movementType_ = unit_movement_type(cfg);
- 	alpha_ = ftofxp(1.0);
- 
--	foreach (const config &t, traits)
-+	BOOST_FOREACH(const config &t, traits)
- 	{
- 		possibleTraits_.add_child("trait", t);
- 	}
--	foreach (config &var_cfg, cfg.child_range("variation"))
-+	BOOST_FOREACH(config &var_cfg, cfg.child_range("variation"))
- 	{
- 		if (var_cfg["inherit"].to_bool()) {
- 			config nvar_cfg(cfg);
-@@ -710,7 +710,7 @@
- 		if (cfg["ignore_race_traits"].to_bool()) {
- 			possibleTraits_.clear();
- 		} else {
--			foreach (const config &t, race_->additional_traits())
-+			BOOST_FOREACH(const config &t, race_->additional_traits())
- 			{
- 				if (alignment_ != NEUTRAL || t["id"] != "fearless")
- 					possibleTraits_.add_child("trait", t);
-@@ -722,7 +722,7 @@
- 	}
- 
- 	// Insert any traits that are just for this unit type
--	foreach (const config &trait, cfg.child_range("trait"))
-+	BOOST_FOREACH(const config &trait, cfg.child_range("trait"))
- 	{
- 		possibleTraits_.add_child("trait", trait);
- 	}
-@@ -750,7 +750,7 @@
- 	game_config::add_color_info(cfg);
- 
- 
--	foreach (const config &portrait, cfg_.child_range("portrait")) {
-+	BOOST_FOREACH(const config &portrait, cfg_.child_range("portrait")) {
- 		portraits_.push_back(tportrait(portrait));
- 	}
- 
-@@ -807,7 +807,7 @@
- 
- 	if (const config &abil_cfg = cfg.child("abilities"))
- 	{
--		foreach (const config::any_child &ab, abil_cfg.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &ab, abil_cfg.all_children_range()) {
- 			const config::attribute_value &name = ab.cfg["name"];
- 			if (!name.empty()) {
- 				abilities_.push_back(name.t_str());
-@@ -816,15 +816,15 @@
- 		}
- 	}
- 
--	foreach (const config &adv, cfg.child_range("advancement"))
-+	BOOST_FOREACH(const config &adv, cfg.child_range("advancement"))
- 	{
--		foreach (const config &effect, adv.child_range("effect"))
-+		BOOST_FOREACH(const config &effect, adv.child_range("effect"))
- 		{
- 			const config &abil_cfg = effect.child("abilities");
- 			if (!abil_cfg || effect["apply_to"] != "new_ability") {
- 				continue;
- 			}
--			foreach (const config::any_child &ab, abil_cfg.all_children_range()) {
-+			BOOST_FOREACH(const config::any_child &ab, abil_cfg.all_children_range()) {
- 				const config::attribute_value &name = ab.cfg["name"];
- 				if (!name.empty()) {
- 					adv_abilities_.push_back(name.t_str());
-@@ -934,7 +934,7 @@
- std::vector<attack_type> unit_type::attacks() const
- {
- 	std::vector<attack_type> res;
--	foreach (const config &att, cfg_.child_range("attack")) {
-+	BOOST_FOREACH(const config &att, cfg_.child_range("attack")) {
- 		res.push_back(attack_type(att));
- 	}
- 
-@@ -990,7 +990,7 @@
- {
- 	if (const config &abil = cfg_.child("abilities"))
- 	{
--		foreach (const config::any_child &ab, abil.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &ab, abil.all_children_range()) {
- 			if (ab.cfg["id"] == ability)
- 				return true;
- 		}
-@@ -1005,7 +1005,7 @@
- 	const config &abilities = cfg_.child("abilities");
- 	if (!abilities) return res;
- 
--	foreach (const config::any_child &ab, abilities.all_children_range()) {
-+	BOOST_FOREACH(const config::any_child &ab, abilities.all_children_range()) {
- 		const std::string &id = ab.cfg["id"];
- 		if (!id.empty())
- 			res.push_back(id);
-@@ -1077,7 +1077,7 @@
- 	if (!ut)
- 		return;
- 
--	foreach(const std::string& adv, ut->advances_to()) {
-+	BOOST_FOREACH(const std::string& adv, ut->advances_to()) {
- 		if (tree.insert(adv).second) {
- 			// insertion succeed, expand the new type
- 			advancement_tree_internal(adv, tree);
-@@ -1098,9 +1098,9 @@
- 	unit_types.build_all(unit_type::HELP_INDEX);
- 
- 	std::vector<std::string> adv_from;
--	foreach (const unit_type_data::unit_type_map::value_type &ut, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &ut, unit_types.types())
- 	{
--		foreach(const std::string& adv, ut.second.advances_to()) {
-+		BOOST_FOREACH(const std::string& adv, ut.second.advances_to()) {
- 			if (adv == id_)
- 				adv_from.push_back(ut.second.id());
- 		}
-@@ -1127,7 +1127,7 @@
-     clear();
-     set_unit_config(cfg);
- 
--	foreach (const config &mt, cfg.child_range("movetype"))
-+	BOOST_FOREACH(const config &mt, cfg.child_range("movetype"))
- 	{
- 		const unit_movement_type move_type(mt);
- 		movement_types_.insert(
-@@ -1135,14 +1135,14 @@
- 		loadscreen::increment_progress();
- 	}
- 
--	foreach (const config &r, cfg.child_range("race"))
-+	BOOST_FOREACH(const config &r, cfg.child_range("race"))
- 	{
- 		const unit_race race(r);
- 		races_.insert(std::pair<std::string,unit_race>(race.id(),race));
- 		loadscreen::increment_progress();
- 	}
- 
--	foreach (config &ut, cfg.child_range("unit_type"))
-+	BOOST_FOREACH(config &ut, cfg.child_range("unit_type"))
- 	{
- 		std::string id = ut["id"];
- 		if (const config &bu = ut.child("base_unit"))
-@@ -1195,7 +1195,7 @@
- 
- void unit_type_data::check_types(const std::vector<std::string>& types) const
- {
--	foreach(const std::string& type, types) {
-+	BOOST_FOREACH(const std::string& type, types) {
- 		if(!find(type)) throw game::game_error("unknown unit type: " + type);
- 	}
- }
-@@ -1279,7 +1279,7 @@
- 
- 	std::vector<std::string> trees = utils::split(cfg["type_adv_tree"]);
- 	hide_help_type_.back().insert(trees.begin(), trees.end());
--	foreach(const std::string& t_id, trees) {
-+	BOOST_FOREACH(const std::string& t_id, trees) {
- 		unit_type_map::iterator ut = types_.find(t_id);
- 		if (ut != types_.end()) {
- 			std::set<std::string> adv_tree = ut->second.advancement_tree();
-@@ -1310,7 +1310,7 @@
- {
-     const config& cfg = to_unit.get_cfg();
- 
--    foreach (const config &af, cfg.child_range("advancefrom"))
-+    BOOST_FOREACH(const config &af, cfg.child_range("advancefrom"))
-     {
-         const std::string &from = af["unit"];
-         int xp = af["experience"];
-@@ -1349,12 +1349,12 @@
- 	// status gets changed. In the unlikely event it gets changed
- 	// multiple times, we want to try to do it in the same order
- 	// that unit::apply_modifications does things.
--	foreach (const config &mod, possible_traits())
-+	BOOST_FOREACH(const config &mod, possible_traits())
- 	{
- 		if (mod["availability"] != "musthave")
- 			continue;
- 
--		foreach (const config &effect, mod.child_range("effect"))
-+		BOOST_FOREACH(const config &effect, mod.child_range("effect"))
- 		{
- 			// See if the effect only applies to
- 			// certain unit types But don't worry
-Index: src/game_controller.cpp
-===================================================================
---- src/game_controller.cpp	(revision 54624)
-+++ src/game_controller.cpp	(revision 54625)
-@@ -50,6 +50,8 @@
- #include "statistics.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_CONFIG LOG_STREAM(err, log_config)
- #define WRN_CONFIG LOG_STREAM(warn, log_config)
-@@ -478,7 +480,7 @@
- 	}
- 
- 	int side_num = 1;
--	foreach (config &s, level.child_range("side"))
-+	BOOST_FOREACH(config &s, level.child_range("side"))
- 	{
- 		std::map<int,std::string>::const_iterator type = side_types.find(side_num),
- 		                                          controller = side_controllers.find(side_num),
-@@ -507,7 +509,7 @@
- 				faction_excepts.clear();
- 			}
- 			unsigned j = 0;
--			foreach (const config &faction, era_cfg.child_range("multiplayer_side"))
-+			BOOST_FOREACH(const config &faction, era_cfg.child_range("multiplayer_side"))
- 			{
- 				if (faction["random_faction"].to_bool()) continue;
- 				const std::string &faction_id = faction["id"];
-@@ -673,7 +675,7 @@
- 	}
- 
- 	if(state_.classification().campaign_type == "multiplayer") {
--		foreach (config &side, state_.snapshot.child_range("side"))
-+		BOOST_FOREACH(config &side, state_.snapshot.child_range("side"))
- 		{
- 			if (side["controller"] == "network")
- 				side["controller"] = "human";
-@@ -683,10 +685,10 @@
- 	}
- 
- 	if (load.cancel_orders()) {
--		foreach (config &side, state_.snapshot.child_range("side"))
-+		BOOST_FOREACH(config &side, state_.snapshot.child_range("side"))
- 		{
- 			if (side["controller"] != "human") continue;
--			foreach (config &unit, side.child_range("unit"))
-+			BOOST_FOREACH(config &unit, side.child_range("unit"))
- 			{
- 				unit["goto_x"] = -999;
- 				unit["goto_y"] = -999;
-@@ -710,7 +712,7 @@
- 
- void game_controller::mark_completed_campaigns(std::vector<config> &campaigns)
- {
--	foreach (config &campaign, campaigns) {
-+	BOOST_FOREACH(config &campaign, campaigns) {
- 		campaign["completed"] = preferences::is_campaign_completed(campaign["id"]);
- 	}
- }
-@@ -1218,7 +1220,7 @@
- 		game_config_.splice_children(core_terrain_rules, "terrain_graphics");
- 
- 		config& hashes = game_config_.add_child("multiplayer_hashes");
--		foreach (const config &ch, game_config_.child_range("multiplayer")) {
-+		BOOST_FOREACH(const config &ch, game_config_.child_range("multiplayer")) {
- 			hashes[ch["id"]] = ch.hash();
- 		}
- 
-Index: src/unit.cpp
-===================================================================
---- src/unit.cpp	(revision 54624)
-+++ src/unit.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "unit.hpp"
- 
- #include "callable_objects.hpp"
--#include "foreach.hpp"
- #include "formula.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
-@@ -38,6 +37,7 @@
- #include "side_filter.hpp"
- #include "play_controller.hpp"
- 
-+#include <boost/foreach.hpp>
- static lg::log_domain log_unit("unit");
- #define DBG_UT LOG_STREAM(debug, log_unit)
- #define LOG_UT LOG_STREAM(info, log_unit)
-@@ -288,7 +288,7 @@
- 			filter_recall_ = filter_recall.get_config();
- 
- 		const vconfig::child_list& events = vcfg->get_children("event");
--		foreach(const vconfig& e, events) {
-+		BOOST_FOREACH(const vconfig& e, events) {
- 			events_.add_child("event", e.get_config());
- 		}
- 	}
-@@ -296,7 +296,7 @@
- 	{
- 		filter_recall_ = cfg.child_or_empty("filter_recall");
- 
--		foreach(const config& unit_event, cfg.child_range("event")) {
-+		BOOST_FOREACH(const config& unit_event, cfg.child_range("event")) {
- 			events_.add_child("event", unit_event);
- 		}
- 	}
-@@ -375,7 +375,7 @@
- 			formula_vars_ = new game_logic::map_formula_callable;
- 
- 			variant var;
--			foreach (const config::attribute &i, ai_vars.attribute_range()) {
-+			BOOST_FOREACH(const config::attribute &i, ai_vars.attribute_range()) {
- 				var.serialize_from_string(i.second);
- 				formula_vars_->add(i.first, var);
- 			}
-@@ -432,7 +432,7 @@
- 
- 	if (const config &status_flags = cfg.child("status"))
- 	{
--		foreach (const config::attribute &st, status_flags.attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &st, status_flags.attribute_range()) {
- 			if (st.first == "healable") {
- 				///@deprecated 1.9.2 'healable' instead of 'unhealable'
- 				ERR_UT << "Usage of 'healable' is deprecated, use 'unhealable' instead, "
-@@ -449,7 +449,7 @@
- 	}
- 
- 	// Remove animations from private cfg, they're not needed there now
--	foreach(const std::string& tag_name, unit_animation::all_tag_names()) {
-+	BOOST_FOREACH(const std::string& tag_name, unit_animation::all_tag_names()) {
- 		cfg_.clear_children(tag_name);
- 	}
- 
-@@ -518,7 +518,7 @@
- 		"canrecruit", "extra_recruit", "x", "y", "placement",
- 		// Useless attributes created when saving units to WML:
- 		"flag_rgb", "language_name" };
--	foreach (const char *attr, internalized_attrs) {
-+	BOOST_FOREACH(const char *attr, internalized_attrs) {
- 		input_cfg.remove_attribute(attr);
- 		cfg_.remove_attribute(attr);
- 	}
-@@ -526,11 +526,11 @@
- 	static char const *raw_attrs[] = { "description", "halo",
- 		"profile", "small_profile", "upkeep", "usage", "ellipse",
- 		"image", "image_icon", "random_traits", "generate_name" };
--	foreach (const char *attr, raw_attrs) {
-+	BOOST_FOREACH(const char *attr, raw_attrs) {
- 		input_cfg.remove_attribute(attr);
- 	}
- 
--	foreach (const config::attribute &attr, input_cfg.attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &attr, input_cfg.attribute_range()) {
- 		if (attr.first == "do_not_list") continue;
- 		WRN_UT << "Unknown attribute '" << attr.first << "' discarded.\n";
- 	}
-@@ -715,12 +715,12 @@
- 	config::const_child_itors current_traits = modifications_.child_range("trait");
- 	std::vector<config> candidate_traits;
- 
--	foreach (const config &t, type->possible_traits())
-+	BOOST_FOREACH(const config &t, type->possible_traits())
- 	{
- 		// Skip the trait if the unit already has it.
- 		const std::string &tid = t["id"];
- 		bool already = false;
--		foreach (const config &mod, current_traits)
-+		BOOST_FOREACH(const config &mod, current_traits)
- 		{
- 			if (mod["id"] == tid) {
- 				already = true;
-@@ -767,7 +767,7 @@
- {
- 	std::vector<std::string> res;
- 
--	foreach (const config &mod, modifications_.child_range("trait"))
-+	BOOST_FOREACH(const config &mod, modifications_.child_range("trait"))
- 	{
- 			std::string const &id = mod["id"];
- 			if (!id.empty())
-@@ -797,7 +797,7 @@
- 	config new_cfg;
- 	static char const *persistent_attrs[] = { "upkeep", "ellipse",
- 		"image", "image_icon", "usage", "random_traits", "generate_name" };
--	foreach (const char *attr, persistent_attrs) {
-+	BOOST_FOREACH(const char *attr, persistent_attrs) {
- 		if (const config::attribute_value *v = old_cfg.get(attr)) {
- 			new_cfg[attr] = *v;
- 		}
-@@ -813,7 +813,7 @@
- 	static char const *unit_type_attrs[] = { "movement", "movement_type",
- 		"die_sound", "flies", "inherit", "variation_name",
- 		"ignore_race_traits", "hide_help" };
--	foreach (const char *attr, unit_type_attrs) {
-+	BOOST_FOREACH(const char *attr, unit_type_attrs) {
- 		new_cfg.remove_attribute(attr);
- 	}
- 
-@@ -1020,7 +1020,7 @@
- const std::vector<std::string> unit::advances_to_translated() const
- {
- 	std::vector<std::string> result;
--	foreach (std::string type_id, advances_to_)
-+	BOOST_FOREACH(std::string type_id, advances_to_)
- 	{
- 		const unit_type *type = unit_types.find(type_id);
- 		if (type)
-@@ -1120,7 +1120,7 @@
- const std::map<std::string,std::string> unit::get_states() const
- {
- 	std::map<std::string, std::string> all_states;
--	foreach (std::string const &s, states_) {
-+	BOOST_FOREACH(std::string const &s, states_) {
- 		all_states[s] = "yes";
- 	}
- 	for (std::map<std::string, state_t>::const_iterator i = known_boolean_state_names_.begin(),
-@@ -1195,7 +1195,7 @@
- {
- 	if (const config &abil = cfg_.child("abilities"))
- 	{
--		foreach (const config::any_child &ab, abil.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &ab, abil.all_children_range()) {
- 			if (ab.cfg["id"] == ability)
- 				return true;
- 		}
-@@ -2197,7 +2197,7 @@
- 	if (const config &resistance = cfg_.child("resistance"))
- 	{
- 		utils::string_map res;
--		foreach (const config::attribute &i, resistance.attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &i, resistance.attribute_range()) {
- 			res[i.first] = i.second;
- 		}
- 		return res;
-@@ -2222,7 +2222,7 @@
- 	{
- 		std::ostringstream tooltip;
- 		const std::string &image = game_config::images::level;
--		foreach (const std::string &s, advances_to())
-+		BOOST_FOREACH(const std::string &s, advances_to())
- 		{
- 			if (!s.empty())
- 				tooltip << s << '\n';
-@@ -2230,7 +2230,7 @@
- 		temp[image] = tooltip.str();
- 	}
- 
--	foreach (const config &adv, get_modification_advances())
-+	BOOST_FOREACH(const config &adv, get_modification_advances())
- 	{
- 		const std::string &image = adv["image"];
- 		if (image.empty()) continue;
-@@ -2248,7 +2248,7 @@
- 	std::vector<std::pair<std::string,std::string> > temp;
- 	std::pair<std::string,std::string> icon; //<image,tooltip>
- 
--	foreach (const config &adv, get_modification_advances())
-+	BOOST_FOREACH(const config &adv, get_modification_advances())
- 	{
- 		icon.first = adv["icon"].str();
- 		icon.second = adv["description"].str();
-@@ -2265,7 +2265,7 @@
- std::vector<config> unit::get_modification_advances() const
- {
- 	std::vector<config> res;
--	foreach (const config &adv, modification_advancements())
-+	BOOST_FOREACH(const config &adv, modification_advancements())
- 	{
- 		if (adv["strict_amla"].to_bool() && !advances_to_.empty())
- 			continue;
-@@ -2283,7 +2283,7 @@
- 		std::unique_copy(temp.begin(), temp.end(), std::back_inserter(uniq));
- 
- 		bool requirements_done = true;
--		foreach (const std::string &s, uniq)
-+		BOOST_FOREACH(const std::string &s, uniq)
- 		{
- 			int required_num = std::count(temp.begin(), temp.end(), s);
- 			int mod_num = modification_count("advance", s);
-@@ -2302,7 +2302,7 @@
- size_t unit::modification_count(const std::string& type, const std::string& id) const
- {
- 	size_t res = 0;
--	foreach (const config &item, modifications_.child_range(type)) {
-+	BOOST_FOREACH(const config &item, modifications_.child_range(type)) {
- 		if (item["id"] == id) {
- 			++res;
- 		}
-@@ -2314,7 +2314,7 @@
- /** Helper function for add_modifications */
- static void mod_mdr_merge(config& dst, const config& mod, bool delta)
- {
--	foreach (const config::attribute &i, mod.attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &i, mod.attribute_range()) {
- 		int v = 0;
- 		if (delta) v = dst[i.first];
- 		dst[i.first] = v + i.second.to_int();
-@@ -2336,7 +2336,7 @@
- 	}
- 	config last_effect;
- 	std::vector<t_string> effects_description;
--	foreach (const config &effect, mod.child_range("effect"))
-+	BOOST_FOREACH(const config &effect, mod.child_range("effect"))
- 	{
- 		// See if the effect only applies to certain unit types
- 		const std::string &type_filter = effect["unit_type"];
-@@ -2524,7 +2524,7 @@
- 					config &def = cfg_.child_or_add("defense");
- 					if (const config &ap = effect.child("defense")) {
- 						bool replace = effect["replace"].to_bool();
--						foreach (const config::attribute &i, ap.attribute_range()) {
-+						BOOST_FOREACH(const config::attribute &i, ap.attribute_range()) {
- 							int v = i.second.to_int();
- 							config::attribute_value &dst = def[i.first];
- 							if (!replace) {
-@@ -2551,7 +2551,7 @@
- 					config &ab = cfg_.child_or_add("abilities");
- 					if (const config &ab_effect = effect.child("abilities")) {
- 						config to_append;
--						foreach (const config::any_child &ab, ab_effect.all_children_range()) {
-+						BOOST_FOREACH(const config::any_child &ab, ab_effect.all_children_range()) {
- 							if(!has_ability_by_id(ab.cfg["id"])) {
- 								to_append.add_child(ab.key, ab.cfg);
- 							}
-@@ -2560,7 +2560,7 @@
- 					}
- 				} else if (apply_to == "remove_ability") {
- 					if (const config &ab_effect = effect.child("abilities")) {
--						foreach (const config::any_child &ab, ab_effect.all_children_range()) {
-+						BOOST_FOREACH(const config::any_child &ab, ab_effect.all_children_range()) {
- 							remove_ability_by_id(ab.cfg["id"]);
- 						}
- 					}
-@@ -2749,7 +2749,7 @@
- 
- 	for(size_t i = 0; i != NumModificationTypes; ++i) {
- 		const std::string& mod = ModificationTypes[i];
--		foreach (const config &m, modifications_.child_range(mod)) {
-+		BOOST_FOREACH(const config &m, modifications_.child_range(mod)) {
- 			log_scope("add mod");
- 			add_modification(ModificationTypes[i], m, true);
- 		}
-@@ -2779,7 +2779,7 @@
- 	bool is_inv = !get_state(STATE_UNCOVERED) && get_ability_bool(hides,loc);
- 	if(is_inv){
- 		const std::vector<team>& teams = *resources::teams;
--		foreach (const unit &u, *resources::units)
-+		BOOST_FOREACH(const unit &u, *resources::units)
- 		{
- 			const map_location &u_loc = u.get_location();
- 			if (teams[side_-1].is_enemy(u.side()) && tiles_adjacent(loc, u_loc)) {
-@@ -2881,7 +2881,7 @@
- int side_units(int side)
- {
- 	int res = 0;
--	foreach (const unit &u, *resources::units) {
-+	BOOST_FOREACH(const unit &u, *resources::units) {
- 		if (u.side() == side) ++res;
- 	}
- 	return res;
-@@ -2890,7 +2890,7 @@
- int side_units_cost(int side)
- {
- 	int res = 0;
--	foreach (const unit &u, *resources::units) {
-+	BOOST_FOREACH(const unit &u, *resources::units) {
- 		if (u.side() == side) res += u.cost();
- 	}
- 	return res;
-@@ -2899,7 +2899,7 @@
- int side_upkeep(int side)
- {
- 	int res = 0;
--	foreach (const unit &u, *resources::units) {
-+	BOOST_FOREACH(const unit &u, *resources::units) {
- 		if (u.side() == side) res += u.upkeep();
- 	}
- 	return res;
-@@ -3029,7 +3029,7 @@
- const tportrait* unit::portrait(
- 		const unsigned size, const tportrait::tside side) const
- {
--	foreach(const tportrait& portrait, (type()->portraits())) {
-+	BOOST_FOREACH(const tportrait& portrait, (type()->portraits())) {
- 		if(portrait.size == size
- 				&& (side ==  portrait.side || portrait.side == tportrait::BOTH)) {
- 
-@@ -3107,20 +3107,20 @@
-         	"number",
- 		""};
- 
--	foreach (const config &att, unit_config.child_range("attack"))
-+	BOOST_FOREACH(const config &att, unit_config.child_range("attack"))
- 	{
- 		config& child = wcfg.add_child("attack");
- 		for (int i = 0; !attack_keys[i].empty(); ++i) {
- 			child[attack_keys[i]] = att[attack_keys[i]];
- 		}
--		foreach (const config &spec, att.child_range("specials")) {
-+		BOOST_FOREACH(const config &spec, att.child_range("specials")) {
- 			config& child_spec = child.add_child("specials", spec);
- 			child_spec.recursive_clear_value("description");
- 		}
- 
- 	}
- 
--	foreach (const config &abi, unit_config.child_range("abilities"))
-+	BOOST_FOREACH(const config &abi, unit_config.child_range("abilities"))
- 	{
- 		config& child = wcfg.add_child("abilities", abi);
- 		child.recursive_clear_value("description");
-@@ -3129,7 +3129,7 @@
- 		child.recursive_clear_value("name_inactive");
- 	}
- 
--	foreach (const config &trait, unit_config.child_range("trait"))
-+	BOOST_FOREACH(const config &trait, unit_config.child_range("trait"))
- 	{
- 		config& child = wcfg.add_child("trait", trait);
- 		child.recursive_clear_value("description");
-@@ -3142,7 +3142,7 @@
- 
- 	for (int i = 0; !child_keys[i].empty(); ++i)
- 	{
--		foreach (const config &c, unit_config.child_range(child_keys[i])) {
-+		BOOST_FOREACH(const config &c, unit_config.child_range(child_keys[i])) {
- 			wcfg.add_child(child_keys[i], c);
- 		}
- 	}
-Index: src/campaign_server/campaign_server.cpp
-===================================================================
---- src/campaign_server/campaign_server.cpp	(revision 54624)
-+++ src/campaign_server/campaign_server.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
-  */
- 
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "network_worker.hpp"
- #include "serialization/binary_or_text.hpp"
-@@ -35,6 +34,7 @@
- 
- #include <csignal>
- 
-+#include <boost/foreach.hpp>
- #include <boost/iostreams/filter/gzip.hpp>
- 
- // the fork execute is unix specific only tested on Linux quite sure it won't
-@@ -202,7 +202,7 @@
- 
- 	void find_translations(const config& cfg, config& campaign)
- 	{
--		foreach (const config &dir, cfg.child_range("dir"))
-+		BOOST_FOREACH(const config &dir, cfg.child_range("dir"))
- 		{
- 			if (dir["name"] == "LC_MESSAGES") {
- 				config &language = campaign.add_child("translation");
-@@ -249,7 +249,7 @@
- 			LOG_CS << "Encoding all stored addons. Number of addons: "
- 				<< std::distance(camps.first, camps.second) << '\n';
- 
--			foreach (const config &cm, camps)
-+			BOOST_FOREACH(const config &cm, camps)
- 			{
- 				LOG_CS << "Encoding " << cm["name"] << '\n';
- 				std::string filename = cm["filename"], newfilename = filename + ".new";
-@@ -345,7 +345,7 @@
- 						} catch(bad_lexical_cast) {}
- 
- 						std::string name = req["name"], lang = req["language"];
--						foreach (const config &i, campaigns().child_range("campaign"))
-+						BOOST_FOREACH(const config &i, campaigns().child_range("campaign"))
- 						{
- 							if (!name.empty() && name != i["name"]) continue;
- 							std::string tm = i["timestamp"];
-@@ -353,7 +353,7 @@
- 							if (after_flag && (tm.empty() || lexical_cast_default<time_t>(tm, 0) <= after)) continue;
- 							if (!lang.empty()) {
- 								bool found = false;
--								foreach (const config &j, i.child_range("translation")) {
-+								BOOST_FOREACH(const config &j, i.child_range("translation")) {
- 									if (j["language"] == lang) {
- 										found = true;
- 										break;
-@@ -364,7 +364,7 @@
- 							campaign_list.add_child("campaign", i);
- 						}
- 
--						foreach (config &j, campaign_list.child_range("campaign")) {
-+						BOOST_FOREACH(config &j, campaign_list.child_range("campaign")) {
- 							j["passphrase"] = t_string();
- 							j["upload_ip"] = t_string();
- 							j["email"] = t_string();
-@@ -402,7 +402,7 @@
- 						std::string lc_name(name.size(), ' ');
- 						std::transform(name.begin(), name.end(), lc_name.begin(), tolower);
- 						config *campaign = NULL;
--						foreach (config &c, campaigns().child_range("campaign")) {
-+						BOOST_FOREACH(config &c, campaigns().child_range("campaign")) {
- 							if (utils::lowercase(c["name"]) == lc_name) {
- 								campaign = &c;
- 								break;
-Index: src/image_modifications.cpp
-===================================================================
---- src/image_modifications.cpp	(revision 54624)
-+++ src/image_modifications.cpp	(revision 54625)
-@@ -15,13 +15,14 @@
- 
- #include "color_range.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "image.hpp"
- #include "image_modifications.hpp"
- #include "log.hpp"
- #include "serialization/string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <map>
- 
- #define GETTEXT_DOMAIN "wesnoth-lib"
-@@ -99,7 +100,7 @@
- {
- 	modification_queue mods;
- 
--	foreach(const std::string& encoded_mod,
-+	BOOST_FOREACH(const std::string& encoded_mod,
- 		utils::parenthetical_split(encoded_mods, '~')) {
- 		modification* mod = decode_modification(encoded_mod);
- 
-Index: src/statistics.cpp
-===================================================================
---- src/statistics.cpp	(revision 54624)
-+++ src/statistics.cpp	(revision 54625)
-@@ -20,12 +20,13 @@
- 
- #include "global.hpp"
- #include "statistics.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "serialization/binary_or_text.hpp"
- #include "unit.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
- 
-@@ -57,7 +58,7 @@
- 	team_stats(),
- 	scenario_name(cfg["scenario"])
- {
--	foreach (const config &team, cfg.child_range("team")) {
-+	BOOST_FOREACH(const config &team, cfg.child_range("team")) {
- 		team_stats[team["save_id"]] = stats(team);
- 	}
- }
-@@ -121,7 +122,7 @@
- static stats::str_int_map read_str_int_map(const config& cfg)
- {
- 	stats::str_int_map m;
--	foreach (const config::attribute &i, cfg.attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &i, cfg.attribute_range()) {
- 		m[i.first] = i.second;
- 	}
- 
-@@ -159,7 +160,7 @@
- static stats::battle_result_map read_battle_result_map(const config& cfg)
- {
- 	stats::battle_result_map m;
--	foreach (const config &i, cfg.child_range("sequence"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("sequence"))
- 	{
- 		config item = i;
- 		int key = item["_num"];
-@@ -612,7 +613,7 @@
- 	fresh_stats();
- 	mid_scenario = cfg["mid_scenario"].to_bool();
- 
--	foreach (const config &s, cfg.child_range("scenario")) {
-+	BOOST_FOREACH(const config &s, cfg.child_range("scenario")) {
- 		master_stats.push_back(scenario_stats(s));
- 	}
- }
-Index: src/tooltips.cpp
-===================================================================
---- src/tooltips.cpp	(revision 54624)
-+++ src/tooltips.cpp	(revision 54625)
-@@ -17,13 +17,14 @@
- #include "tooltips.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "help.hpp"
- #include "marked-up_text.hpp"
- #include "resources.hpp"
- #include "video.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace {
- 
- CVideo* video_ = NULL;
-@@ -172,7 +173,7 @@
- 
- bool click(int mousex, int mousey)
- {
--	foreach(tooltip tip, tips) {
-+	BOOST_FOREACH(tooltip tip, tips) {
- 		if(!tip.action.empty() && point_in_rect(mousex, mousey, tip.rect)) {
- 			display* disp = resources::screen;
- 			help::show_help(*disp, tip.action);
-Index: src/server/ban.cpp
-===================================================================
---- src/server/ban.cpp	(revision 54624)
-+++ src/server/ban.cpp	(revision 54625)
-@@ -14,7 +14,6 @@
- */
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "filesystem.hpp"
- #include "serialization/parser.hpp"
-@@ -24,7 +23,7 @@
- 
- #include "ban.hpp"
- 
--
-+#include <boost/foreach.hpp>
- #include <boost/bind.hpp>
- 
- namespace wesnothd {
-@@ -260,7 +259,7 @@
- 		scoped_istream ban_file = istream_file(filename_);
- 		read_gz(cfg, *ban_file);
- 
--		foreach (const config &b, cfg.child_range("ban"))
-+		BOOST_FOREACH(const config &b, cfg.child_range("ban"))
- 		{
- 			try {
- 				banned_ptr new_ban(new banned(b));
-@@ -276,7 +275,7 @@
- 		// load deleted too
- 		if (const config &cfg_del = cfg.child("deleted"))
- 		{
--			foreach (const config &b, cfg_del.child_range("ban"))
-+			BOOST_FOREACH(const config &b, cfg_del.child_range("ban"))
- 			{
- 				try {
- 					banned_ptr new_ban(new banned(b));
-@@ -680,7 +679,7 @@
- 	void ban_manager::load_config(const config& cfg)
- 	{
- 		ban_times_.clear();
--		foreach (const config &bt, cfg.child_range("ban_time")) {
-+		BOOST_FOREACH(const config &bt, cfg.child_range("ban_time")) {
- 			time_t duration = 0;
- 			if (parse_time(bt["time"], &duration)) {
- 				ban_times_.insert(default_ban_times::value_type(bt["name"], duration));
-Index: src/server/server.cpp
-===================================================================
---- src/server/server.cpp	(revision 54624)
-+++ src/server/server.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- #include "../global.hpp"
- 
- #include "../config.hpp"
--#include "../foreach.hpp"
- #include "../game_config.hpp"
- #include "../log.hpp"
- #include "../map.hpp" // gamemap::MAX_PLAYERS
-@@ -54,6 +53,7 @@
- #include <boost/bind.hpp>
- #include <boost/scoped_ptr.hpp>
- #include <boost/scoped_array.hpp>
-+#include <boost/foreach.hpp>
- #include <boost/utility.hpp>
- #include <algorithm>
- #include <cassert>
-@@ -556,15 +556,15 @@
- 	}
- 
- 	redirected_versions_.clear();
--	foreach (const config &redirect, cfg_.child_range("redirect")) {
--		foreach (const std::string &version, utils::split(redirect["version"])) {
-+	BOOST_FOREACH(const config &redirect, cfg_.child_range("redirect")) {
-+		BOOST_FOREACH(const std::string &version, utils::split(redirect["version"])) {
- 			redirected_versions_[version] = redirect;
- 		}
- 	}
- 
- 	proxy_versions_.clear();
--	foreach (const config &proxy, cfg_.child_range("proxy")) {
--		foreach (const std::string &version, utils::split(proxy["version"])) {
-+	BOOST_FOREACH(const config &proxy, cfg_.child_range("proxy")) {
-+		BOOST_FOREACH(const std::string &version, utils::split(proxy["version"])) {
- 			proxy_versions_[version] = proxy;
- 		}
- 	}
-@@ -704,7 +704,7 @@
- 				simple_wml::document ping( strstr.str().c_str(),
- 							   simple_wml::INIT_COMPRESSED );
- 				simple_wml::string_span s = ping.output_compressed();
--				foreach (network::connection sock, ghost_players_) {
-+				BOOST_FOREACH(network::connection sock, ghost_players_) {
- 					if (!lg::debug.dont_log(log_server)) {
- 						wesnothd::player_map::const_iterator i = players_.find(sock);
- 						if (i != players_.end()) {
-@@ -720,7 +720,7 @@
-  				// Only a single thread should be accessing this
- 				// Erase before we copy - speeds inserts
- 				ghost_players_.clear();
--				foreach (const wesnothd::player_map::value_type v, players_) {
-+				BOOST_FOREACH(const wesnothd::player_map::value_type v, players_) {
- 					ghost_players_.insert(v.first);
- 				}
- 				last_ping_ = now;
-Index: src/server/room_manager.cpp
-===================================================================
---- src/server/room_manager.cpp	(revision 54624)
-+++ src/server/room_manager.cpp	(revision 54625)
-@@ -21,9 +21,10 @@
- #include "../serialization/string_utils.hpp"
- #include "../util.hpp"
- #include "../filesystem.hpp"
--#include "../foreach.hpp"
- #include "../log.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_server_lobby("server/lobby");
- #define ERR_LOBBY LOG_STREAM(err, log_server_lobby)
- #define WRN_LOBBY LOG_STREAM(warn, log_server_lobby)
-@@ -58,7 +59,7 @@
- 	// this assumes the server is shutting down, so there's no need to
- 	// send the actual room-quit messages to clients
- 	write_rooms();
--	foreach (t_rooms_by_name_::value_type i, rooms_by_name_) {
-+	BOOST_FOREACH(t_rooms_by_name_::value_type i, rooms_by_name_) {
- 		delete i.second;
- 	}
- }
-@@ -97,7 +98,7 @@
- 			read(cfg, *file);
- 		}
- 
--		foreach (const config &c, cfg.child_range("room")) {
-+		BOOST_FOREACH(const config &c, cfg.child_range("room")) {
- 			room* r(new room(c));
- 			if (room_exists(r->name())) {
- 				ERR_LOBBY << "Duplicate room ignored in stored rooms: "
-@@ -122,7 +123,7 @@
- 	if (filename_.empty()) return;
- 	LOG_LOBBY << "Writing rooms to " << filename_ << "\n";
- 	config cfg;
--	foreach (const t_rooms_by_name_::value_type& v, rooms_by_name_) {
-+	BOOST_FOREACH(const t_rooms_by_name_::value_type& v, rooms_by_name_) {
- 		const room& r = *v.second;
- 		if (r.persistent()) {
- 			config& c = cfg.add_child("room");
-@@ -211,7 +212,7 @@
- 
- void room_manager::enter_lobby(const wesnothd::game &game)
- {
--	foreach (network::connection player, game.all_game_users()) {
-+	BOOST_FOREACH(network::connection player, game.all_game_users()) {
- 		enter_lobby(player);
- 	}
- }
-@@ -225,7 +226,7 @@
- 	store_player_rooms(player);
- 	t_rooms_by_player_::iterator i = rooms_by_player_.find(player);
- 	if (i != rooms_by_player_.end()) {
--		foreach (room* r, i->second) {
-+		BOOST_FOREACH(room* r, i->second) {
- 			r->remove_player(player);
- 		}
- 	}
-@@ -244,7 +245,7 @@
- 	lobby_->remove_player(player);
- 	t_rooms_by_player_::iterator i = rooms_by_player_.find(player);
- 	if (i != rooms_by_player_.end()) {
--		foreach (room* r, i->second) {
-+		BOOST_FOREACH(room* r, i->second) {
- 			r->remove_player(player);
- 		}
- 	}
-@@ -315,7 +316,7 @@
- 	t_player_stored_rooms_::iterator it =
- 		player_stored_rooms_.insert(std::make_pair(player, std::set<std::string>())).first;
- 	std::set<std::string>& store = it->second;
--	foreach (room* r, i->second) {
-+	BOOST_FOREACH(room* r, i->second) {
- 		store.insert(r->name());
- 	}
- }
-@@ -337,7 +338,7 @@
- 	simple_wml::document doc;
- 	simple_wml::node& join_msg = doc.root().add_child("room_join");
- 	join_msg.set_attr_dup("player", user->second.name().c_str());
--	foreach (const std::string& room_name, it->second) {
-+	BOOST_FOREACH(const std::string& room_name, it->second) {
- 		room* r = get_create_room(room_name, user->first);
- 		if (r == NULL) {
- 			LOG_LOBBY << "Player " << user->second.name() << " unable to rejoin room " << room_name << "\n";
-@@ -528,7 +529,7 @@
- void room_manager::fill_room_list(simple_wml::node& root)
- {
- 	simple_wml::node& rooms = root.add_child("rooms");
--	foreach (const t_rooms_by_name_::value_type& tr, rooms_by_name_) {
-+	BOOST_FOREACH(const t_rooms_by_name_::value_type& tr, rooms_by_name_) {
- 		const room& r = *tr.second;
- 		simple_wml::node& room = rooms.add_child("room");
- 		room.set_attr_dup("name", r.name().c_str());
-@@ -539,7 +540,7 @@
- void room_manager::fill_member_list(const room* room, simple_wml::node& root)
- {
- 	simple_wml::node& members = root.add_child("members");
--	foreach (network::connection m, room->members()) {
-+	BOOST_FOREACH(network::connection m, room->members()) {
- 		simple_wml::node& member = members.add_child("member");
- 		player_map::const_iterator mi = all_players_.find(m);
- 		if (mi != all_players_.end()) {
-Index: src/variable.cpp
-===================================================================
---- src/variable.cpp	(revision 54624)
-+++ src/variable.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- 
- #include "variable.hpp"
- 
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gamestatus.hpp"
- #include "log.hpp"
-@@ -34,6 +33,7 @@
- #include "team.hpp"
- 
- #include <boost/variant.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
-@@ -233,11 +233,11 @@
- {
- 	config res;
- 
--	foreach (const config::attribute &i, cfg_->attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &i, cfg_->attribute_range()) {
- 		res[i.first] = expand(i.first);
- 	}
- 
--	foreach (const config::any_child &child, cfg_->all_children_range())
-+	BOOST_FOREACH(const config::any_child &child, cfg_->all_children_range())
- 	{
- 		if (child.key == "insert_tag") {
- 			vconfig insert_cfg(child.cfg);
-@@ -283,7 +283,7 @@
- {
- 	vconfig::child_list res;
- 
--	foreach (const config::any_child &child, cfg_->all_children_range())
-+	BOOST_FOREACH(const config::any_child &child, cfg_->all_children_range())
- 	{
- 		if (child.key == key) {
- 			res.push_back(vconfig(&child.cfg, cache_key_));
-@@ -319,7 +319,7 @@
- 	if (const config &natural = cfg_->child(key)) {
- 		return vconfig(&natural, cache_key_);
- 	}
--	foreach (const config &ins, cfg_->child_range("insert_tag"))
-+	BOOST_FOREACH(const config &ins, cfg_->child_range("insert_tag"))
- 	{
- 		vconfig insert_cfg(ins);
- 		if(insert_cfg["name"] == key) {
-@@ -339,7 +339,7 @@
- 	if (cfg_->child(key)) {
- 		return true;
- 	}
--	foreach (const config &ins, cfg_->child_range("insert_tag"))
-+	BOOST_FOREACH(const config &ins, cfg_->child_range("insert_tag"))
- 	{
- 		vconfig insert_cfg(ins);
- 		if(insert_cfg["name"] == key) {
-@@ -475,7 +475,7 @@
- 
- config &scoped_wml_variable::store(const config &var_value)
- {
--	foreach (const config &i, repos->get_variables().child_range(var_name_)) {
-+	BOOST_FOREACH(const config &i, repos->get_variables().child_range(var_name_)) {
- 		previous_val_.add_child(var_name_, i);
- 	}
- 	repos->clear_variable_cfg(var_name_);
-@@ -489,7 +489,7 @@
- {
- 	if(activated_) {
- 		repos->clear_variable_cfg(var_name_);
--		foreach (const config &i, previous_val_.child_range(var_name_)) {
-+		BOOST_FOREACH(const config &i, previous_val_.child_range(var_name_)) {
- 			repos->add_variable_cfg(var_name_, i);
- 		}
- 		LOG_NG << "scoped_wml_variable: var_name \"" << var_name_ << "\" has been reverted.\n";
-Index: src/preferences_display.cpp
-===================================================================
---- src/preferences_display.cpp	(revision 54624)
-+++ src/preferences_display.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- 
- #include "construct_dialog.hpp"
- #include "display.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
- #include "gui/dialogs/simple_item_selector.hpp"
-@@ -35,6 +34,8 @@
- #include "marked-up_text.hpp"
- #include "wml_separators.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace preferences {
- 
- display* disp = NULL;
-@@ -82,7 +83,7 @@
- 	bpp = video.modePossible(resolution.first, resolution.second,
- 		DefaultBPP, video_flags, true);
- 
--	foreach (const res_t &res, res_list)
-+	BOOST_FOREACH(const res_t &res, res_list)
- 	{
- 		if (bpp != 0) break;
- 		std::cerr << "Video mode " << resolution.first << 'x'
-Index: src/hotkeys.cpp
-===================================================================
---- src/hotkeys.cpp	(revision 54624)
-+++ src/hotkeys.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
- 
- #include "construct_dialog.hpp"
- #include "display.hpp"
--#include "foreach.hpp"
- #include "hotkeys.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_preferences.hpp"
-@@ -33,6 +32,8 @@
- #include "wesconfig.h"
- #include "wml_separators.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_G LOG_STREAM(err, lg::general)
- #define LOG_G LOG_STREAM(info, lg::general)
-@@ -609,7 +610,7 @@
- 
- void load_hotkeys(const config& cfg)
- {
--	foreach (const config &hk, cfg.child_range(hotkey_tag_name))
-+	BOOST_FOREACH(const config &hk, cfg.child_range(hotkey_tag_name))
- 	{
- 		hotkey_item& h = get_hotkey(hk["command"]);
- 		if(h.get_id() != HOTKEY_NULL) {
-Index: src/unit_display.cpp
-===================================================================
---- src/unit_display.cpp	(revision 54624)
-+++ src/unit_display.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "global.hpp"
- #include "unit_display.hpp"
- 
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "game_events.hpp"
- #include "log.hpp"
-@@ -26,6 +25,7 @@
- #include "resources.hpp"
- #include "terrain_filter.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- #define LOG_DP LOG_STREAM(info, display)
- 
-@@ -472,7 +472,7 @@
- 	disp->display_unit_hex(healed_loc);
- 	unit_animator animator;
- 
--	foreach (unit *h, healers) {
-+	BOOST_FOREACH(unit *h, healers) {
- 		h->set_facing(h->get_location().get_relative_dir(healed_loc));
- 		animator.add_animation(h, "healing", h->get_location(),
- 			healed_loc, healing);
-Index: src/editor/map_fragment.cpp
-===================================================================
---- src/editor/map_fragment.cpp	(revision 54624)
-+++ src/editor/map_fragment.cpp	(revision 54625)
-@@ -16,9 +16,10 @@
- 
- #include "map_fragment.hpp"
- 
--#include "../foreach.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace editor {
- 
- map_fragment::map_fragment()
-@@ -44,7 +45,7 @@
- 
- void map_fragment::add_tiles(const gamemap& map, const std::set<map_location>& locs)
- {
--	foreach (const map_location& loc, locs) {
-+	BOOST_FOREACH(const map_location& loc, locs) {
- 		add_tile(map, loc);
- 	}
- }
-@@ -57,7 +58,7 @@
- std::set<map_location> map_fragment::get_offset_area(const map_location& loc) const
- {
- 	std::set<map_location> result;
--	foreach (const tile_info& i, items_) {
-+	BOOST_FOREACH(const tile_info& i, items_) {
- 		result.insert(i.offset.vector_sum(loc));
- 	}
- 	return result;
-@@ -65,14 +66,14 @@
- 
- void map_fragment::paste_into(gamemap& map, const map_location& loc) const
- {
--	foreach (const tile_info& i, items_) {
-+	BOOST_FOREACH(const tile_info& i, items_) {
- 		map.set_terrain(i.offset.vector_sum(loc), i.terrain);
- 	}
- }
- 
- void map_fragment::shift(const map_location& offset)
- {
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		ti.offset.vector_sum_assign(offset);
- 	}
- }
-@@ -80,7 +81,7 @@
- map_location map_fragment::center_of_mass() const
- {
- 	map_location sum(0, 0);
--	foreach (const tile_info& ti, items_) {
-+	BOOST_FOREACH(const tile_info& ti, items_) {
- 		sum.vector_sum_assign(ti.offset);
- 	}
- 	sum.x /= static_cast<int>(items_.size());
-@@ -92,7 +93,7 @@
- {
- 	shift(center_of_mass().vector_negation());
- 	area_.clear();
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		area_.insert(ti.offset);
- 	}
- }
-@@ -100,7 +101,7 @@
- void map_fragment::rotate_60_cw()
- {
- 	area_.clear();
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		map_location l(0,0);
- 		int x = ti.offset.x;
- 		int y = ti.offset.y;
-@@ -120,7 +121,7 @@
- void map_fragment::rotate_60_ccw()
- {
- 	area_.clear();
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		map_location l(0,0);
- 		int x = ti.offset.x;
- 		int y = ti.offset.y;
-@@ -139,7 +140,7 @@
- 
- void map_fragment::flip_horizontal()
- {
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		ti.offset.x = -ti.offset.x;
- 	}
- 	center_by_mass();
-@@ -147,7 +148,7 @@
- 
- void map_fragment::flip_vertical()
- {
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		ti.offset.y = -ti.offset.y;
- 		if (ti.offset.x % 2) {
- 			ti.offset.y--;
-@@ -166,11 +167,11 @@
- {
- 	std::stringstream ss;
- 	ss << "MF: ";
--	foreach (const tile_info& ti, items_) {
-+	BOOST_FOREACH(const tile_info& ti, items_) {
- 		ss << "(" << ti.offset << ")";
- 	}
- 	ss << " -- ";
--	foreach (const map_location& loc, area_) {
-+	BOOST_FOREACH(const map_location& loc, area_) {
- 		ss << "(" << loc << ")";
- 	}
- 	return ss.str();
-Index: src/editor/action.cpp
-===================================================================
---- src/editor/action.cpp	(revision 54624)
-+++ src/editor/action.cpp	(revision 54625)
-@@ -21,10 +21,10 @@
- 
- #include "editor/action.hpp"
- #include "editor/map_context.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
- namespace editor {
- 
- int editor_action::next_id_ = 1;
-@@ -75,25 +75,25 @@
- editor_action_chain::editor_action_chain(const editor::editor_action_chain &other)
- 	: editor_action(), actions_()
- {
--	foreach (editor_action* a, other.actions_) {
-+	BOOST_FOREACH(editor_action* a, other.actions_) {
- 		actions_.push_back(a->clone());
- 	}
- }
- editor_action_chain& editor_action_chain::operator=(const editor_action_chain& other)
- {
- 	if (this == &other) return *this;
--	foreach (editor_action* a, actions_) {
-+	BOOST_FOREACH(editor_action* a, actions_) {
- 		delete a;
- 	}
- 	actions_.clear();
--	foreach (editor_action* a, other.actions_) {
-+	BOOST_FOREACH(editor_action* a, other.actions_) {
- 		actions_.push_back(a->clone());
- 	}
- 	return *this;
- }
- editor_action_chain::~editor_action_chain()
- {
--	foreach (editor_action* a, actions_) {
-+	BOOST_FOREACH(editor_action* a, actions_) {
- 		delete a;
- 	}
- }
-@@ -103,7 +103,7 @@
- }
- int editor_action_chain::action_count() const {
- 	int count = 0;
--	foreach (const editor_action* a, actions_) {
-+	BOOST_FOREACH(const editor_action* a, actions_) {
- 		if (a) {
- 			count += a->action_count();
- 		}
-@@ -133,7 +133,7 @@
- }
- editor_action_chain* editor_action_chain::perform(map_context& mc) const {
- 	util::unique_ptr<editor_action_chain> undo(new editor_action_chain());
--	foreach (editor_action* a, actions_) {
-+	BOOST_FOREACH(editor_action* a, actions_) {
- 		if (a != NULL) {
- 			undo->append_action(a->perform(mc));
- 		}
-@@ -143,7 +143,7 @@
- }
- void editor_action_chain::perform_without_undo(map_context& mc) const
- {
--	foreach (editor_action* a, actions_) {
-+	BOOST_FOREACH(editor_action* a, actions_) {
- 		if (a != NULL) {
- 			a->perform_without_undo(mc);
- 		}
-@@ -257,7 +257,7 @@
- }
- void editor_action_select::extend(const editor_map& map, const std::set<map_location>& locs)
- {
--	foreach (const map_location& loc, locs) {
-+	BOOST_FOREACH(const map_location& loc, locs) {
- 		LOG_ED << "Checking " << loc << "\n";
- 		if (map.in_selection(loc)) {
- 			LOG_ED << "Extending by " << loc << "\n";
-@@ -268,7 +268,7 @@
- editor_action* editor_action_select::perform(map_context& mc) const
- {
- 	std::set<map_location> undo_locs;
--	foreach (const map_location& loc, area_) {
-+	BOOST_FOREACH(const map_location& loc, area_) {
- 		if (!mc.get_map().in_selection(loc)) {
- 			undo_locs.insert(loc);
- 			mc.add_changed_location(loc);
-@@ -279,7 +279,7 @@
- }
- void editor_action_select::perform_without_undo(map_context& mc) const
- {
--	foreach (const map_location& loc, area_) {
-+	BOOST_FOREACH(const map_location& loc, area_) {
- 		mc.get_map().add_to_selection(loc);
- 		mc.add_changed_location(loc);
- 	}
-@@ -291,7 +291,7 @@
- }
- void editor_action_deselect::extend(const editor_map& map, const std::set<map_location>& locs)
- {
--	foreach (const map_location& loc, locs) {
-+	BOOST_FOREACH(const map_location& loc, locs) {
- 		LOG_ED << "Checking " << loc << "\n";
- 		if (!map.in_selection(loc)) {
- 			LOG_ED << "Extending by " << loc << "\n";
-@@ -302,7 +302,7 @@
- editor_action* editor_action_deselect::perform(map_context& mc) const
- {
- 	std::set<map_location> undo_locs;
--	foreach (const map_location& loc, area_) {
-+	BOOST_FOREACH(const map_location& loc, area_) {
- 		if (mc.get_map().in_selection(loc)) {
- 			undo_locs.insert(loc);
- 			mc.add_changed_location(loc);
-@@ -313,7 +313,7 @@
- }
- void editor_action_deselect::perform_without_undo(map_context& mc) const
- {
--	foreach (const map_location& loc, area_) {
-+	BOOST_FOREACH(const map_location& loc, area_) {
- 		mc.get_map().remove_from_selection(loc);
- 		mc.add_changed_location(loc);
- 	}
-Index: src/editor/map_context.cpp
-===================================================================
---- src/editor/map_context.cpp	(revision 54624)
-+++ src/editor/map_context.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
- 
- #include "../display.hpp"
- #include "../filesystem.hpp"
--#include "../foreach.hpp"
- #include "../gettext.hpp"
- #include "../map_exception.hpp"
- #include "../map_label.hpp"
-@@ -28,6 +27,7 @@
- #include "formula_string_utils.hpp"
- 
- #include <boost/regex.hpp>
-+#include <boost/foreach.hpp>
- 
- 
- namespace editor {
-@@ -146,7 +146,7 @@
- 	if (!one_layer_only) {
- 		terrain = map_.get_terrain_info(terrain).terrain_with_default_base();
- 	}
--	foreach (const map_location& loc, locs) {
-+	BOOST_FOREACH(const map_location& loc, locs) {
- 		draw_terrain_actual(terrain, loc, one_layer_only);
- 	}
- }
-@@ -374,7 +374,7 @@
- 
- void map_context::clear_stack(action_stack& stack)
- {
--	foreach (editor_action* a, stack) {
-+	BOOST_FOREACH(editor_action* a, stack) {
- 		delete a;
- 	}
- 	stack.clear();
-Index: src/editor/brush.cpp
-===================================================================
---- src/editor/brush.cpp	(revision 54624)
-+++ src/editor/brush.cpp	(revision 54625)
-@@ -17,9 +17,10 @@
- #include "brush.hpp"
- #include "editor_common.hpp"
- 
--#include "../foreach.hpp"
- #include "../pathutils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace editor {
- 
- /*WIKI
-@@ -74,11 +75,11 @@
- 	if (radius > 0) {
- 		std::vector<map_location> in_radius;
- 		get_tiles_in_radius(map_location(0, 0), radius, in_radius);
--		foreach (map_location& loc, in_radius) {
-+		BOOST_FOREACH(map_location& loc, in_radius) {
- 			add_relative_location(loc.x, loc.y);
- 		}
- 	}
--	foreach (const config &relative, cfg.child_range("relative"))
-+	BOOST_FOREACH(const config &relative, cfg.child_range("relative"))
- 	{
- 		int x = relative["x"];
- 		int y = relative["y"];
-@@ -97,7 +98,7 @@
- std::set<map_location> brush::project(const map_location& hotspot) const
- {
- 	std::set<map_location> result;
--	foreach (const map_location& relative, relative_tiles_) {
-+	BOOST_FOREACH(const map_location& relative, relative_tiles_) {
- 		result.insert(relative.vector_sum(hotspot));
- 	}
- 	return result;
-Index: src/editor/editor_map.cpp
-===================================================================
---- src/editor/editor_map.cpp	(revision 54624)
-+++ src/editor/editor_map.cpp	(revision 54625)
-@@ -20,12 +20,12 @@
- 
- #include "../display.hpp"
- #include "../filesystem.hpp"
--#include "../foreach.hpp"
- #include "../gettext.hpp"
- #include "../map_exception.hpp"
- #include "../map_label.hpp"
- #include "../wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- namespace editor {
- 
-@@ -111,7 +111,7 @@
- 			++errors;
- 		}
- 	}
--	foreach (const map_location& loc, selection_) {
-+	BOOST_FOREACH(const map_location& loc, selection_) {
- 		if (!on_board_with_border(loc)) {
- 			ERR_ED << "Off-map tile in selection: " << loc << "\n";
- 		}
-Index: src/editor/editor_palettes.cpp
-===================================================================
---- src/editor/editor_palettes.cpp	(revision 54624)
-+++ src/editor/editor_palettes.cpp	(revision 54625)
-@@ -23,13 +23,14 @@
- #include "editor_common.hpp"
- #include "editor_palettes.hpp"
- 
--#include "../foreach.hpp"
- #include "../gettext.hpp"
- #include "../serialization/string_utils.hpp"
- #include "../sound.hpp"
- #include "../tooltips.hpp"
- #include "../marked-up_text.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace {
- static std::string selected_terrain;
- }
-@@ -84,7 +85,7 @@
- 
- 	// Get the available groups and add them to the structure
- 	std::set<std::string> group_names;
--	foreach (const config &g, cfg.child_range("editor_group"))
-+	BOOST_FOREACH(const config &g, cfg.child_range("editor_group"))
- 	{
- 		if (group_names.find(g["id"]) == group_names.end()) {
- 			terrain_groups_.push_back(terrain_group(g, gui));
-@@ -97,14 +98,14 @@
- 		}
- 	}
- 	std::map<std::string, terrain_group*> id_to_group;
--	foreach (terrain_group& tg, terrain_groups_) {
-+	BOOST_FOREACH(terrain_group& tg, terrain_groups_) {
- 		id_to_group.insert(std::make_pair(tg.id, &tg));
- 	}
- 	// The rest of the code assumes this is a valid pointer
- 	assert(checked_group_btn_ != 0);
- 
- 	// add the groups for all terrains to the map
--	foreach (const t_translation::t_terrain& t, terrains_) {
-+	BOOST_FOREACH(const t_translation::t_terrain& t, terrains_) {
- 		const terrain_type& t_info = map().get_terrain_info(t);
- 		DBG_ED << "Palette: processing terrain " << t_info.name()
- 			<< "(editor name: '" << t_info.editor_name() << "') "
-@@ -119,7 +120,7 @@
- 		// add the terrain to the requested groups
- 		const std::vector<std::string>& keys = utils::split(t_info.editor_group());
- 		bool core = false;
--		foreach (const std::string& k, keys) {
-+		BOOST_FOREACH(const std::string& k, keys) {
- 			terrain_map_[k].push_back(t);
- 			nmax_terrains_ = std::max(nmax_terrains_, terrain_map_[k].size());
- 			std::map<std::string, terrain_group*>::iterator i = id_to_group.find(k);
-@@ -380,7 +381,7 @@
- 		scroll_down();
- 	}
- 
--	foreach (terrain_group& g, terrain_groups_) {
-+	BOOST_FOREACH(terrain_group& g, terrain_groups_) {
- 		if (g.button.pressed()) {
- 			checked_group_btn_ = &g.button;
- 			set_group(g.id);
-@@ -388,7 +389,7 @@
- 		}
- 	}
- 
--	foreach (terrain_group& g, terrain_groups_) {
-+	BOOST_FOREACH(terrain_group& g, terrain_groups_) {
- 		if (&g.button == checked_group_btn_) {
- 			g.button.set_check(true);
- 		} else {
-Index: src/editor/editor_controller.cpp
-===================================================================
---- src/editor/editor_controller.cpp	(revision 54624)
-+++ src/editor/editor_controller.cpp	(revision 54625)
-@@ -32,7 +32,6 @@
- #include "../clipboard.hpp"
- #include "../filechooser.hpp"
- #include "../filesystem.hpp"
--#include "../foreach.hpp"
- #include "../game_preferences.hpp"
- #include "../gettext.hpp"
- #include "../map_create.hpp"
-@@ -44,6 +43,7 @@
- #include "formula_string_utils.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace {
- static std::vector<std::string> saved_windows_;
-@@ -135,7 +135,7 @@
- 	image::set_color_adjustment(preferences::editor::tod_r(), preferences::editor::tod_g(), preferences::editor::tod_b());
- 	theme& theme = gui().get_theme();
- 	const theme::menu* default_tool_menu = NULL;
--	foreach (const theme::menu& m, theme.menus()) {
-+	BOOST_FOREACH(const theme::menu& m, theme.menus()) {
- 		if (m.get_id() == "draw_button_editor") {
- 			default_tool_menu = &m;
- 			break;
-@@ -173,7 +173,7 @@
- 
- void editor_controller::init_brushes(const config& game_config)
- {
--	foreach (const config &i, game_config.child_range("brush")) {
-+	BOOST_FOREACH(const config &i, game_config.child_range("brush")) {
- 		brushes_.push_back(brush(i));
- 	}
- 	if (brushes_.empty()) {
-@@ -196,7 +196,7 @@
- 		new mouse_action_starting_position(key_)));
- 	mouse_actions_.insert(std::make_pair(hotkey::HOTKEY_EDITOR_PASTE,
- 		new mouse_action_paste(clipboard_, key_)));
--	foreach (const theme::menu& menu, gui().get_theme().menus()) {
-+	BOOST_FOREACH(const theme::menu& menu, gui().get_theme().menus()) {
- 		if (menu.items().size() == 1) {
- 			hotkey::HOTKEY_COMMAND hk = hotkey::get_hotkey(menu.items().front()).get_id();
- 			mouse_action_map::iterator i = mouse_actions_.find(hk);
-@@ -205,7 +205,7 @@
- 			}
- 		}
- 	}
--	foreach (const config &c, game_config.child_range("editor_tool_hint")) {
-+	BOOST_FOREACH(const config &c, game_config.child_range("editor_tool_hint")) {
- 		mouse_action_map::iterator i =
- 			mouse_actions_.find(hotkey::get_hotkey(c["id"]).get_id());
- 		if (i != mouse_actions_.end()) {
-@@ -216,7 +216,7 @@
- 
- void editor_controller::init_map_generators(const config& game_config)
- {
--	foreach (const config &i, game_config.child_range("multiplayer"))
-+	BOOST_FOREACH(const config &i, game_config.child_range("multiplayer"))
- 	{
- 		if (i["map_generation"] == "default") {
- 			const config &generator_cfg = i.child("generator");
-@@ -238,7 +238,7 @@
- 		ERR_ED << "No editor time-of-day defined\n";
- 		return;
- 	}
--	foreach (const config &i, cfg.child_range("time")) {
-+	BOOST_FOREACH(const config &i, cfg.child_range("time")) {
- 		tods_.push_back(time_of_day(i));
- 	}
- }
-@@ -250,7 +250,7 @@
- 		ERR_ED << "No editor music defined\n";
- 		return;
- 	}
--	foreach (const config &i, cfg.child_range("music")) {
-+	BOOST_FOREACH(const config &i, cfg.child_range("music")) {
- 		sound::play_music_config(i);
- 	}
- 	sound::commit_music_changes();
-@@ -265,13 +265,13 @@
- 
- editor_controller::~editor_controller()
- {
--	foreach (const mouse_action_map::value_type a, mouse_actions_) {
-+	BOOST_FOREACH(const mouse_action_map::value_type a, mouse_actions_) {
- 		delete a.second;
- 	}
--	foreach (map_generator* m, map_generators_) {
-+	BOOST_FOREACH(map_generator* m, map_generators_) {
- 		delete m;
- 	}
--	foreach (map_context* mc, map_contexts_) {
-+	BOOST_FOREACH(map_context* mc, map_contexts_) {
- 		delete mc;
- 	}
- }
-@@ -303,7 +303,7 @@
- void editor_controller::quit_confirm(EXIT_STATUS mode)
- {
- 	std::vector<std::string> modified;
--	foreach (map_context* mc, map_contexts_) {
-+	BOOST_FOREACH(map_context* mc, map_contexts_) {
- 		if (mc->modified()) {
- 			if (!mc->get_filename().empty()) {
- 				modified.push_back(mc->get_filename());
-@@ -319,7 +319,7 @@
- 		message = _("Do you really want to quit? Changes in the map since the last save will be lost.");
- 	} else {
- 		message = _("Do you really want to quit? The following maps were modified and all changes since the last save will be lost:");
--		foreach (std::string& str, modified) {
-+		BOOST_FOREACH(std::string& str, modified) {
- 			message += "\n" + str;
- 		}
- 	}
-@@ -342,7 +342,7 @@
- 		map_context* mc = new map_context(editor_map(game_config_, 44, 33, t_translation::GRASS_LAND));
- 		add_map_context(mc);
- 	} else {
--		foreach(const std::string& filename, saved_windows_) {
-+		BOOST_FOREACH(const std::string& filename, saved_windows_) {
- 			map_context* mc = new map_context(game_config_, filename);
- 			add_map_context(mc);
- 		}
-@@ -796,7 +796,7 @@
- 				get_map_context().set_needs_terrain_rebuild(false);
- 				gui().invalidate_all();
- 			} else {
--				foreach (const map_location& loc, changed_locs) {
-+				BOOST_FOREACH(const map_location& loc, changed_locs) {
- 					gui().rebuild_terrain(loc);
- 				}
- 				gui().invalidate(changed_locs);
-@@ -1290,7 +1290,7 @@
- 
- void editor_controller::redraw_toolbar()
- {
--	foreach (mouse_action_map::value_type a, mouse_actions_) {
-+	BOOST_FOREACH(mouse_action_map::value_type a, mouse_actions_) {
- 		if (a.second->toolbar_button() != NULL) {
- 			SDL_Rect r = a.second->toolbar_button()->location(gui().screen_area());
- 			SDL_Rect outline = create_rect(r.x - 2, r.y - 2, r.h + 4, r.w + 4);
-Index: src/formula.cpp
-===================================================================
---- src/formula.cpp	(revision 54624)
-+++ src/formula.cpp	(revision 54625)
-@@ -17,11 +17,12 @@
- #include <set>
- #include <sstream>
- 
--#include "foreach.hpp"
- #include "formula_callable.hpp"
- #include "formula_function.hpp"
- #include "map_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace game_logic
- {
- 
-@@ -117,7 +118,7 @@
- 		std::stringstream s;
- 		s << '[';
- 		bool first_item = true;
--		foreach(expression_ptr a , items_) {
-+		BOOST_FOREACH(expression_ptr a , items_) {
- 			if (!first_item) {
- 				s << ',';
- 			} else {
-@@ -468,7 +469,7 @@
- 		std::stringstream s;
- 		s << "{where:(";
- 		s << body_->str();
--		foreach (const expr_table::value_type &a, *clauses_) {
-+		BOOST_FOREACH(const expr_table::value_type &a, *clauses_) {
- 			s << ", [" << a.first << "] -> ["<< a.second->str()<<"]";
- 		}
- 		s << ")}";
-Index: src/mouse_events.cpp
-===================================================================
---- src/mouse_events.cpp	(revision 54624)
-+++ src/mouse_events.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "actions.hpp"
- #include "attack_prediction_display.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_events.hpp"
- #include "gettext.hpp"
-@@ -45,6 +44,7 @@
- #include "whiteboard/manager.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
-@@ -1048,7 +1048,7 @@
- 
- 	map_location adj[6];
- 	get_adjacent_tiles(loc, adj);
--	foreach (const map_location &aloc, adj) {
-+	BOOST_FOREACH(const map_location &aloc, adj) {
- 		unit_map::const_iterator i = find_unit(aloc);
- 		if (i != units_.end() && uteam.is_enemy(i->side()))
- 			res.insert(aloc);
-@@ -1063,7 +1063,7 @@
- 
- 	map_location adj[6];
- 	get_adjacent_tiles(u->get_location(), adj);
--	foreach (const map_location &loc, adj)
-+	BOOST_FOREACH(const map_location &loc, adj)
- 	{
- 		if (!map_.on_board(loc)) continue;
- 		unit_map::const_iterator i = units_.find(loc);
-Index: src/multiplayer_connect.cpp
-===================================================================
---- src/multiplayer_connect.cpp	(revision 54624)
-+++ src/multiplayer_connect.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- 
- #include "ai/configuration.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
-@@ -39,6 +38,7 @@
- #include "wml_exception.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_network("network");
- #define LOG_NW LOG_STREAM(info, log_network)
-@@ -189,7 +189,7 @@
- 		// Hack: if there is a unit which can recruit, use it as a leader.
- 		// Necessary to display leader information when loading saves.
- 		std::string leader_type;
--		foreach (const config &side_unit, cfg.child_range("unit"))
-+		BOOST_FOREACH(const config &side_unit, cfg.child_range("unit"))
- 		{
- 			if (side_unit["canrecruit"].to_bool()) {
- 				leader_type = side_unit["type"].str();
-@@ -539,7 +539,7 @@
- 	std::vector<ai::description*> &ais_list = parent_->ai_algorithms_;
- 	std::vector<std::string> ais;
- 	int i = 0;
--	foreach (const ai::description *desc,  ais_list){
-+	BOOST_FOREACH(const ai::description *desc,  ais_list){
- 		ais.push_back(desc->text);
- 		if (desc->id==ai_algorithm_){
- 			sel = i;
-@@ -557,7 +557,7 @@
- void connect::side::update_faction_combo()
- {
- 	std::vector<std::string> factions;
--	foreach (const config *faction, parent_->era_sides_)
-+	BOOST_FOREACH(const config *faction, parent_->era_sides_)
- 	{
- 		const std::string& name = (*faction)["name"];
- 		const std::string& icon = (*faction)["image"];
-@@ -724,7 +724,7 @@
- 		static char const *attrs[] = { "side", "controller", "id",
- 			"team_name", "user_team_name", "color", "colour", "gold",
- 			"income", "allow_changes" };
--		foreach (const char *attr, attrs) {
-+		BOOST_FOREACH(const char *attr, attrs) {
- 			trimmed.remove_attribute(attr);
- 		}
- 
-@@ -827,8 +827,8 @@
- {
- 	std::map<std::string, config> children;
- 
--	foreach(const std::string& children_to_swap, get_children_to_swap())
--		foreach(const config& child, cfg_.child_range(children_to_swap))
-+	BOOST_FOREACH(const std::string& children_to_swap, get_children_to_swap())
-+		BOOST_FOREACH(const config& child, cfg_.child_range(children_to_swap))
- 			children.insert(std::pair<std::string, config>(children_to_swap, child));
- 
- 	return children;
-@@ -836,12 +836,12 @@
- 
- void connect::side::set_side_children(std::map<std::string, config> children)
- {
--	foreach(const std::string& children_to_remove, get_children_to_swap())
-+	BOOST_FOREACH(const std::string& children_to_remove, get_children_to_swap())
- 		cfg_.clear_children(children_to_remove);
- 
- 	std::pair<std::string, config> child_map;
- 
--	foreach(child_map, children)
-+	BOOST_FOREACH(child_map, children)
- 		cfg_.add_child(child_map.first, child_map.second);
- }
- 
-@@ -920,7 +920,7 @@
- 		// Builds the list of sides eligible for choice (nonrandom factions)
- 		std::vector<int> nonrandom_sides;
- 		int num = -1;
--		foreach (const config *i, parent_->era_sides_)
-+		BOOST_FOREACH(const config *i, parent_->era_sides_)
- 		{
- 			++num;
- 			if (!(*i)["random_faction"].to_bool()) {
-@@ -1524,7 +1524,7 @@
- 	player_types_.push_back(_("Computer Player"));
- 	player_types_.push_back(_("Empty"));
- 
--	foreach (const config *faction, era_sides_) {
-+	BOOST_FOREACH(const config *faction, era_sides_) {
- 		player_factions_.push_back((*faction)["name"]);
- 	}
- 
-@@ -1539,7 +1539,7 @@
- 	// Teams
- 	if(params_.use_map_settings) {
- 		int side_num = 1;
--		foreach (config &side, sides)
-+		BOOST_FOREACH(config &side, sides)
- 		{
- 			config::attribute_value &team_name = side["team_name"];
- 			config::attribute_value &user_team_name = side["user_team_name"];
-@@ -1566,7 +1566,7 @@
- 	} else {
- 		std::vector<std::string> map_team_names;
- 		int _side_num = 1;
--		foreach (config &side, sides)
-+		BOOST_FOREACH(config &side, sides)
- 		{
- 			const std::string side_num = lexical_cast<std::string>(_side_num);
- 			config::attribute_value &team_name = side["team_name"];
-@@ -1599,7 +1599,7 @@
- 
- 	// Populates "sides_" from the level configuration
- 	int index = 0;
--	foreach (const config &s, sides) {
-+	BOOST_FOREACH(const config &s, sides) {
- 		sides_.push_back(side(*this, s, index++));
- 	}
- 	int offset=0;
-@@ -1683,7 +1683,7 @@
- 	else
- 	{
- 		era_sides_.clear();
--		foreach (const config &e, era_cfg.child_range("multiplayer_side")) {
-+		BOOST_FOREACH(const config &e, era_cfg.child_range("multiplayer_side")) {
- 			era_sides_.push_back(&e);
- 		}
- 		level_.add_child("era", era_cfg);
-@@ -1789,7 +1789,7 @@
- 	 * creative in what is used in multiplayer [1] so use a simpler test now.
- 	 * [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568029
- 	 */
--	foreach(const side& s, sides_) {
-+	BOOST_FOREACH(const side& s, sides_) {
- 		if(s.get_controller() != CNTR_EMPTY) {
- 			if(s.allow_player()) {
- 				return true;
-
-------------------------------------------------------------------------
diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD
new file mode 100644
index 000000000..0bae3a41b
--- /dev/null
+++ b/community/weston/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Sébastien Luttringer
+# Contributor: Joel Teichroeb <joel@teichroeb.net>
+
+pkgname=weston
+pkgver=1.1.0
+pkgrel=1
+pkgdesc='Reference implementation of a Wayland compositor'
+arch=('i686' 'x86_64')
+url='http://wayland.freedesktop.org'
+license=('MIT')
+options=(!libtool)
+depends=('libxkbcommon' 'libunwind' 'wayland' 'mesa' 'cairo' 'poppler-glib' 'mtdev' 'libxcursor' 'glu'
+         'pango' 'xkeyboard-config')
+source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz")
+sha1sums=('0929afa86d795e0e970936623d86bdd950d48e8d')
+
+build() {
+	cd $pkgname-$pkgver
+	./configure \
+		--prefix=/usr \
+		--libexecdir=/usr/lib/weston \
+		--disable-android-compositor
+	make
+}
+
+package() {
+	cd $pkgname-$pkgver
+	make DESTDIR="$pkgdir" install
+	# license
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+	# embed more clients
+	for _c in calibrator clickdot cliptest dnd editor eventdemo flower gears image \
+	 resizor simple-egl simple-shm simple-touch smoke transformed view; do
+		install -Dm755 "clients/$_c" "$pkgdir/usr/bin/weston-$_c"
+	done
+	for _c in info keyboard screensaver screenshooter tablet-shell terminal; do
+		install -Dm755 "clients/weston-$_c" "$pkgdir/usr/bin/weston-$_c"
+	done
+}
diff --git a/community/windowlab/PKGBUILD b/community/windowlab/PKGBUILD
index cf5676443..7dec691b1 100644
--- a/community/windowlab/PKGBUILD
+++ b/community/windowlab/PKGBUILD
@@ -13,7 +13,7 @@ url="http://www.nickgravgaard.com/windowlab"
 license=('GPL')
 depends=('xorg-server' 'libxft' 'libxext')
 source=("http://www.nickgravgaard.com/windowlab/${pkgname}-${pkgver}.tar")
-md5sums=('346f8c187838a446b4cbb2326d035577')
+md5sums=('7fcf770b3da932ac7d252572974b0d54')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD
deleted file mode 100644
index 30f9fa0cd..000000000
--- a/community/wine/PKGBUILD
+++ /dev/null
@@ -1,154 +0,0 @@
-# $Id: PKGBUILD 83833 2013-02-05 14:18:11Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Eduardo Romero <eduardo@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=wine
-pkgver=1.5.23
-pkgrel=2
-
-_pkgbasever=${pkgver/rc/-rc}
-
-source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign})
-md5sums=('70228ea29efe9700a66202b495b068bc'
-         '8b8620cf523bb6c7e61d01480c167859')
-
-pkgdesc="A compatibility layer for running Windows programs"
-url="http://www.winehq.com"
-arch=(i686 x86_64)
-license=(LGPL)
-install=wine.install
-
-depends=(
-  fontconfig      lib32-fontconfig
-  libxcursor      lib32-libxcursor
-  libxrandr       lib32-libxrandr
-  libxdamage      lib32-libxdamage
-  libxi           lib32-libxi
-  gettext         lib32-gettext
-  glu             lib32-glu
-  libsm           lib32-libsm
-  gcc-libs        lib32-gcc-libs
-  desktop-file-utils
-)
-
-makedepends=(autoconf ncurses bison perl fontforge flex prelink
-  'gcc>=4.5.0-2'  'gcc-multilib>=4.5.0-2'
-  giflib          lib32-giflib
-  libpng          lib32-libpng
-  gnutls          lib32-gnutls
-  libxinerama     lib32-libxinerama
-  libxcomposite   lib32-libxcomposite
-  libxmu          lib32-libxmu
-  libxxf86vm      lib32-libxxf86vm
-  libxml2         lib32-libxml2
-  libldap         lib32-libldap
-  lcms            lib32-lcms
-  mpg123          lib32-mpg123
-  openal          lib32-openal
-  v4l-utils       lib32-v4l-utils
-  alsa-lib        lib32-alsa-lib
-  libxcomposite   lib32-libxcomposite
-  mesa            lib32-mesa
-  oss
-  samba
-)
-  
-optdepends=(
-  giflib          lib32-giflib
-  libpng          lib32-libpng
-  libldap         lib32-libldap
-  gnutls          lib32-gnutls
-  lcms            lib32-lcms
-  libxml2         lib32-libxml2
-  mpg123          lib32-mpg123
-  openal          lib32-openal
-  v4l-utils       lib32-v4l-utils
-  libpulse        lib32-libpulse
-  alsa-plugins    lib32-alsa-plugins
-  alsa-lib        lib32-alsa-lib
-  libjpeg-turbo   lib32-libjpeg-turbo
-  libxcomposite   lib32-libxcomposite
-  libxinerama     lib32-libxinerama
-  oss             cups
-  samba
-)
-
-if [[ $CARCH == i686 ]]; then
-  # Strip lib32 etc. on i686
-  depends=(${depends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*-multilib*/})
-  optdepends=(${optdepends[@]/*32-*/})
-else
-  provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
-  conflicts=('bin32-wine' 'wine-wow64')
-  replaces=('bin32-wine')
-fi
-
-build() {
-  cd "$srcdir"
-
-  # Allow ccache to work
-  mv $pkgname-$_pkgbasever $pkgname
-
-  # Get rid of old build dirs
-  rm -rf $pkgname-{32,64}-build
-  mkdir $pkgname-32-build
-
-  if [[ $CARCH == x86_64 ]]; then
-    msg2 "Building Wine-64..."
-
-    mkdir $pkgname-64-build
-    cd "$srcdir/$pkgname-64-build"
-    ../$pkgname/configure \
-      --prefix=/usr \
-      --libdir=/usr/lib \
-      --with-x \
-      --without-gstreamer \
-      --enable-win64
-    # Gstreamer was disabled for FS#33655
-
-    make
-
-    _wine32opts=(
-      --libdir=/usr/lib32
-      --with-wine64="$srcdir/$pkgname-64-build"
-    )
-
-    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  fi
-
-  msg2 "Building Wine-32..."
-  cd "$srcdir/$pkgname-32-build"
-  ../$pkgname/configure \
-    --prefix=/usr \
-    --with-x \
-    --without-gstreamer \
-    "${_wine32opts[@]}"
-
-  # These additional flags solve FS#23277
-  make CFLAGS+="-mincoming-stack-boundary=2" CXXFLAGS+="-mincoming-stack-boundary=2"
-}
-
-package() {
-  msg2 "Packaging Wine-32..."
-  cd "$srcdir/$pkgname-32-build"
-
-  if [[ $CARCH == i686 ]]; then
-    make prefix="$pkgdir/usr" install
-  else
-    make prefix="$pkgdir/usr" \
-      libdir="$pkgdir/usr/lib32" \
-      dlldir="$pkgdir/usr/lib32/wine" install
-
-    msg2 "Packaging Wine-64..."
-    cd "$srcdir/$pkgname-64-build"
-    make prefix="$pkgdir/usr" \
-      libdir="$pkgdir/usr/lib" \
-      dlldir="$pkgdir/usr/lib/wine" install
-  fi
-}
-
-# vim:set ts=8 sts=2 sw=2 et:
diff --git a/community/wine/wine.install b/community/wine/wine.install
deleted file mode 100644
index 0548b7ffd..000000000
--- a/community/wine/wine.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	update-desktop-database -q
-	#echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
-	#echo "If you are on x86_64, the default WINEARCH will be win64."
-	#echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
-	#echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
-	#echo "See the Arch wiki on wine for more information."
-}
-
-post_remove() {
-	update-desktop-database -q
-}
diff --git a/community/winefish/PKGBUILD b/community/winefish/PKGBUILD
deleted file mode 100644
index 1a098a70a..000000000
--- a/community/winefish/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 64363 2012-02-11 23:24:33Z allan $
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Claudio Riva <firetux83@gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgname=winefish
-pkgver=1.3.3
-pkgrel=11
-pkgdesc="LaTeX editor based on Bluefish with auto-completion and syntax highlighting"
-url="http://winefish.berlios.de/"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gtk2' 'desktop-file-utils' 'shared-mime-info')
-makedepends=('pkgconfig')
-optdepends=('aspell: for spell check')
-install=$pkgname.install
-source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tgz)
-md5sums=('63531e4dde7a53ab3a74e1152c7af1e9')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-update-databases \
-    --with-freedesktop_org-menu=/usr/share/applications \
-    --with-icon-path=/usr/share/pixmaps --mandir=/usr/share/man
-  make
-}
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community/winefish/winefish.install b/community/winefish/winefish.install
deleted file mode 100644
index 8ae71b3e6..000000000
--- a/community/winefish/winefish.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_remove() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD
index a03916839..dd72f80de 100644
--- a/community/wings3d/PKGBUILD
+++ b/community/wings3d/PKGBUILD
@@ -1,45 +1,44 @@
-# $Id: PKGBUILD 80322 2012-11-19 22:41:50Z arodseth $
+# $Id: PKGBUILD 87126 2013-03-27 16:37:11Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: kappa <kappacurve@gmail.com>
 
 pkgname=wings3d
 _pkgname=wings
 pkgver=1.4.1
-pkgrel=10
+pkgrel=17
 pkgdesc='3D modeling program'
 arch=('x86_64' 'i686')
 url='http://www.wings3d.com/'
 license=('GPL')
-depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils')
-makedepends=('setconf' 'gendesk')
+depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils' 'erlang')
+makedepends=('gendesk')
 optdepends=('povray: rendering support via POV-Ray')
 install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/wings/tar.gz/dgud/r15b-driver-compat"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/dgud/wings/archive/master.tar.gz"
         "$pkgname.sh"
         "$pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png")
-sha256sums=('b89aca41937d4d07424ccc0447eb5a6c3755350428201d7d7644e467dcd20fdf'
+sha256sums=('5fe17aa7bd26c031ca242f17b24eaa8f6fa9fe4c38b37a9669953c03e9e89b83'
             '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e'
             '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a')
 _genericname=('3D Modeler')
-_dirname="$_pkgname-dgud-r15b-driver-compat"
+_categories=('Graphics;3DGraphics')
 
 build() {
   cd "$srcdir"
   gendesk
-  setconf "$pkgname.desktop" Categories "Graphics;3DGraphics;"
 
-  cd "$_dirname"
+  cd "$_pkgname-master"
   export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*)
   make
   make lang
 }
 
 package() {
-  cd "$srcdir/$_dirname"
+  cd "$srcdir/$_pkgname-master"
 
   mkdir -p "$pkgdir/usr/lib/$pkgname"
   for subdir in ebin fonts patches plugins shaders textures; do
-    cp -r "$srcdir/$_dirname/$subdir/" "$pkgdir/usr/lib/$pkgname"
+    cp -r "$srcdir/$_pkgname-master/$subdir/" "$pkgdir/usr/lib/$pkgname"
   done
 
   install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/community/wmctrl/PKGBUILD b/community/wmctrl/PKGBUILD
index a4a8a9af6..0824dcc66 100644
--- a/community/wmctrl/PKGBUILD
+++ b/community/wmctrl/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=wmctrl
 pkgver=1.07
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Control your EWMH compliant window manager from command line"
 url="http://sweb.cz/tripie/utils/wmctrl/"
 arch=('i686' 'mips64el')
diff --git a/community/wput/PKGBUILD b/community/wput/PKGBUILD
index 5a158476c..1d747bbfc 100644
--- a/community/wput/PKGBUILD
+++ b/community/wput/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=wput
 pkgver=0.6.2
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A command line tool to upload files to FTP site, the opposite to wget"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wput.sourceforge.net/"
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 55c972c43..67fe2ec4e 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,18 +1,21 @@
-# $Id: PKGBUILD 83329 2013-01-29 17:20:18Z spupykin $
+# $Id: PKGBUILD 88025 2013-04-10 08:22:45Z svenstaro $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Denis Martinez <deuns.martinez@gmail.com>
 
+# TODO: Remove this note and change back to gcc once gcc 4.8.1 is out
+# It fixes a segfault while building the examples.
+
 pkgname=wt
-pkgver=3.2.3
-_pkgver=3.2.3
-pkgrel=4
+pkgver=3.3.0
+_pkgver=3.3.0
+pkgrel=1
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.webtoolkit.eu/"
 license=('GPL')
 depends=('boost-libs' 'libharu')
-makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qt')
+makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qt4' 'clang')
 optdepends=('openssl: for SSL support in built-in webserver'
 	    'zlib: for compression in HTTP protocol'
 	    'fcgi: for FastCGI support'
@@ -21,17 +24,17 @@ optdepends=('openssl: for SSL support in built-in webserver'
 	    'graphicsmagick: for raster image support (WRasterImage)'
 	    'pango: for advanced font rendering (WRasterImage)'
 	    'mysql++: for the hangman example'
-	    'qt: for the Wt/Qt interopability example (wtwithqt)')
+	    'qt4: for the Wt/Qt interopability example (wtwithqt)')
 backup=('etc/wt/wt_config.xml')
 source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz)
-md5sums=('58922ba5d68104880adbe2e022132fb5')
+md5sums=('b2331942ad01c4fda376abf30c6a503a')
 
 build() {
   cd ${srcdir}/${pkgname}-${_pkgver}
 
   [[ -d build ]] && rm -r build
   mkdir -p build && cd build
-  cmake \
+  CXX=clang++ cmake \
       -DCONNECTOR_HTTP=ON \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DWEBUSER=http \
diff --git a/community/wt/wt-boost-1.47.patch b/community/wt/wt-boost-1.47.patch
deleted file mode 100644
index 919e1371f..000000000
--- a/community/wt/wt-boost-1.47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -wbBur wt-3.1.10.q/src/CMakeLists.txt wt-3.1.10/src/CMakeLists.txt
---- wt-3.1.10.q/src/CMakeLists.txt	2011-07-26 00:58:19.000000000 +0400
-+++ wt-3.1.10/src/CMakeLists.txt	2011-06-24 18:51:54.000000000 +0400
-@@ -236,6 +236,7 @@
- web/TimeUtil.C
- web/XSSFilter.C
- web/XSSUtils.C
-+web/random_device.cpp
- web/base64.cpp
- Plain_html.C
- Boot_html.C
diff --git a/community/wxgtk2.9/PKGBUILD b/community/wxgtk2.9/PKGBUILD
index ac345de52..2247e2511 100644
--- a/community/wxgtk2.9/PKGBUILD
+++ b/community/wxgtk2.9/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=wxgtk2.9
 pkgver=2.9.4
 pkgrel=2
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://wxwidgets.org"
 license=('custom:wxWindows')
 depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm')
diff --git a/community/wxgtk2.9/wxGTK-2.9.3.1-collision.patch b/community/wxgtk2.9/wxGTK-2.9.3.1-collision.patch
deleted file mode 100644
index cd6c1c13b..000000000
--- a/community/wxgtk2.9/wxGTK-2.9.3.1-collision.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Prevent file collisions between multiple installed SLOTs.
-
-  - Don't install wxwin.m4.  It is installed with app-admin/eselect-wxwidgets.
-  - Version the bakefile preset filenames.  Unversioned symlinks to these files
-    are handled by eselect.
-  - Version wx-config and wxrc.  The unversioned forms are wrapper scripts
-    installed with eselect-wxwidgets.
-  - Version wxstd.mo and modify AddStdCatalog to use it.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -14076,10 +14076,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
- 
- install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
--	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
--	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
--	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
-+	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
-+	for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
-+	$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
- 	$(DYLIB_RPATH_INSTALL)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
- 	for f in setup.h $(RCDEFS_H); do \
-@@ -14964,15 +14964,16 @@ install-wxconfig:
- 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
- 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
--	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
--
-+	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
-+	&& $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
- locale_install: 
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
- 	for l in $(LOCALE_LINGUAS) ; do \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
- 	if test -f $(srcdir)/locale/$$l.mo ; then \
--	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
-+	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo \
-+	$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
- 	fi ; \
- 	done
- 
---- a/build/bakefiles/wx.bkl
-+++ b/build/bakefiles/wx.bkl
-@@ -138,7 +138,7 @@
-         <using module="gettext"/>
-         <gettext-catalogs id="locale">
-             <srcdir>$(SRCDIR)/locale</srcdir>
--            <catalog-name>wxstd</catalog-name>
-+            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
-             <linguas>
-                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
-                 zh zh_CN zh_TW
---- a/src/common/translation.cpp
-+++ b/src/common/translation.cpp
-@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
- 
- bool wxTranslations::AddStdCatalog()
- {
--    if ( !AddCatalog(wxS("wxstd")) )
-+    if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
-         return false;
- 
-     // there may be a catalog with toolkit specific overrides, it is not
---- a/utils/wxrc/Makefile.in
-+++ b/utils/wxrc/Makefile.in
-@@ -124,7 +124,6 @@ distclean: clean
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
- @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
- @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
--@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
- 
- @COND_USE_XRC_1@uninstall_wxrc: 
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/community/wyrd/PKGBUILD b/community/wyrd/PKGBUILD
index 30e04b55f..a81260f41 100644
--- a/community/wyrd/PKGBUILD
+++ b/community/wyrd/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Daniel J Griffiths <griffithsdj@archlinux.us>
 
 pkgname=wyrd
-pkgver=1.4.5
-pkgrel=3
+pkgver=1.4.6
+pkgrel=1
 pkgdesc='A text-based front-end to Remind.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pessimization.com/software/wyrd/'
@@ -12,16 +12,16 @@ license=('GPL')
 depends=('remind' 'ncurses')
 makedepends=('ocaml')
 source=("http://pessimization.com/software/wyrd/${pkgname}-${pkgver}.tar.gz")
-md5sums=('3f39fa83a54d2d890823094aba9ca3cc')
+md5sums=('2fc561482fdac4daac0cb6735d934ebe')
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-	./configure --prefix=/usr --sysconfdir=/etc --enable-utf8
-	make
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-utf8
+  make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/xapian-core/PKGBUILD b/community/xapian-core/PKGBUILD
index 20ea6bc91..8694bac37 100644
--- a/community/xapian-core/PKGBUILD
+++ b/community/xapian-core/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 74348 2012-07-25 06:16:56Z spupykin $
+# $Id: PKGBUILD 89923 2013-05-05 14:51:22Z spupykin $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=xapian-core
-pkgver=1.2.12
+pkgver=1.2.15
 pkgrel=1
 pkgdesc='Open source search engine library.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('sh' 'gcc-libs' 'zlib' 'util-linux')
 # xapian config requires libxapian.la
 options=('libtool')
 source=("http://oligarchy.co.uk/xapian/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('faf33a3945edbe4c848627750856cbeb')
+md5sums=('3af45069c6a14a7ecad2da24cbc3d2c5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/xbmc-pvr-addons/PKGBUILD b/community/xbmc-pvr-addons/PKGBUILD
new file mode 100644
index 000000000..0e867b56c
--- /dev/null
+++ b/community/xbmc-pvr-addons/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 86252 2013-03-14 11:10:40Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=xbmc-pvr-addons
+pkgver=12.0_Frodo
+pkgrel=1
+pkgdesc="XBMC PVR add-ons for current stable xbmc"
+arch=('i686' 'x86_64')
+url="https://github.com/opdenkamp/xbmc-pvr-addons"
+license=('GPL3')
+depends=('xbmc' 'libmysqlclient')
+makedepends=('git' 'libmysqlclient' 'boost')
+optdepends=('tvheadend-git: tvheadend backend' 'mythtv: mythtv backend')
+conflicts=('xbmc-pvr-addons-git')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/opdenkamp/xbmc-pvr-addons/archive/${pkgver/_/-}.tar.gz")
+md5sums=('4411848a648597037daf97562dd0fcd2')
+
+build() {
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  ./bootstrap
+  ./configure --prefix=/usr --enable-addons-with-dependencies
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD
index 1601e1e13..72adcc8cb 100644
--- a/community/xbmc/PKGBUILD
+++ b/community/xbmc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83330 2013-01-29 17:21:13Z spupykin $
+# $Id: PKGBUILD 87589 2013-04-03 13:31:16Z idevolder $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -8,14 +8,14 @@
 _prefix=/usr
 
 pkgname=xbmc
-pkgver=12.0
-pkgrel=1
+pkgver=12.1
+pkgrel=5
 pkgdesc="A software media player and entertainment hub for digital media"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
 license=('GPL' 'custom')
 depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
-	 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate'
+	 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate'
 	 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
 	 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
 	 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu'
@@ -33,11 +33,9 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
 	    'xorg-xinit: autostart xbmc')
 install="${pkgname}.install"
 source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
-	"xbmc.service"
-	"cdio.patch")
-md5sums=('a79128b9d094a046947bfd9bb4550809'
-         '76fae229ebc3bcfaab7e7f27e4fb51f5'
-         '49c0a7cbfca3666a24e8824950bd371b')
+	"xbmc.service")
+md5sums=('8955473f84cb2a0513c0f3efd7e68843'
+         '76fae229ebc3bcfaab7e7f27e4fb51f5')
 
 build() {
   cd "${srcdir}/xbmc-$pkgver"
@@ -45,12 +43,6 @@ build() {
   # fix lsb_release dependency
   sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
 
-#  sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADER:' \
-#	lib/libid3tag/libid3tag/configure.ac \
-#	lib/libdvd/libdvdcss/configure.ac
-
-#  patch -p1 <$srcdir/cdio.patch
-
   # Bootstrapping XBMC
   ./bootstrap
 
diff --git a/community/xbmc/cdio.patch b/community/xbmc/cdio.patch
deleted file mode 100644
index 0f74deaa4..000000000
--- a/community/xbmc/cdio.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -wbBur xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp
---- xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp	2012-03-22 02:07:50.000000000 +0400
-+++ xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp	2013-01-09 14:40:10.670040454 +0400
-@@ -27,6 +27,10 @@
- #include "storage/MediaManager.h"
- #include "utils/log.h"
- 
-+#define CDTEXT_TITLE CDTEXT_FIELD_TITLE
-+#define CDTEXT_PERFORMER CDTEXT_FIELD_PERFORMER
-+#define CDTEXT_GENRE CDTEXT_FIELD_GENRE
-+
- using namespace MUSIC_INFO;
- 
- #ifdef HAS_DVD_DRIVE
-diff -wbBur xbmc-11.0/xbmc/storage/cdioSupport.cpp xbmc-11.0.my/xbmc/storage/cdioSupport.cpp
---- xbmc-11.0/xbmc/storage/cdioSupport.cpp	2012-03-22 02:07:50.000000000 +0400
-+++ xbmc-11.0.my/xbmc/storage/cdioSupport.cpp	2013-01-09 14:51:40.276801092 +0400
-@@ -648,15 +648,18 @@
-   CSingleLock lock(*m_cdio);
- 
-   // Get the CD-Text , if any
--  cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio, trackNum);
-+  cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio);
- 
-   if (pcdtext == NULL)
-     return ;
- 
-   // same ids used in libcdio and for our structure + the ids are consecutive make this copy loop safe.
-   for (int i = 0; i < MAX_CDTEXT_FIELDS; i++)
--    if (pcdtext->field[i])
--      xcdt[(cdtext_field_t)i] = pcdtext->field[(cdtext_field_t)i];
-+  {
-+    char *data = cdtext_get(pcdtext, (cdtext_field_t)i, trackNum);
-+    if (data != NULL)
-+      xcdt[(cdtext_field_t)i] = data;
-+  }
- }
- 
- CCdInfo* CCdIoSupport::GetCdInfo(char* cDeviceFileName)
diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD
index 3331e7cc0..e081f135d 100644
--- a/community/xboard/PKGBUILD
+++ b/community/xboard/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 72645 2012-06-18 12:05:37Z spupykin $
+# $Id: PKGBUILD 84936 2013-02-26 10:20:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=xboard
-pkgver=4.6.2
-pkgrel=3
+pkgver=4.7.0
+pkgrel=1
 pkgdesc="Graphical user interfaces for chess"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/xboard/"
 license=('GPL3')
-depends=('libxaw' 'gnuchess' 'texinfo' 'xdg-utils'
-	 'xorg-fonts-75dpi' 'xorg-fonts-100dpi')
+depends=('gnuchess' 'texinfo' 'xdg-utils'
+	 'xorg-fonts-75dpi' 'xorg-fonts-100dpi'
+	 'gtk2' 'cairo' 'librsvg')
 makedepends=('gendesk')
 optdepends=('perl')
 install=${pkgname}.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('6e6d119fac60d68139d7836426212efb')
+md5sums=('646e5091f7ee4b5fa9998d2cca9cf795')
 
 build() {
   cd "${srcdir}"
   gendesk
 
   cd "${pkgname}-${pkgver}"
-  sed -i 's/fairymax/gnuchess/g' xboard.h xboard.conf.in
-  ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc
+  sed -i 's/fairymax/gnuchess/g' {xaw,gtk}/xboard.h xboard.conf.in
+  ./configure \
+    --prefix=/usr \
+    --mandir=/usr/share/man \
+    --sysconfdir=/etc \
+    --with-gtk
   make
 }
 
diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD
index e3d81614f..50b9ce992 100644
--- a/community/xcircuit/PKGBUILD
+++ b/community/xcircuit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 81613 2012-12-25 00:34:18Z foutrelis $
+# $Id: PKGBUILD 88341 2013-04-16 13:32:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Giovanni Scafora <linuxmania@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 
 pkgname=xcircuit
-pkgver=3.7.26
-pkgrel=3
+pkgver=3.7.48
+pkgrel=1
 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://opencircuitdesign.com/xcircuit"
@@ -13,12 +13,16 @@ license=('GPL2')
 depends=('tk' 'libxpm' 'zlib')
 makedepends=('chrpath')
 source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz)
-md5sums=('6026f65a4bc327e5769157ffd1387342')
+md5sums=('efe537f908b12d30ef1aeebf77222fbf')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure prefix=/usr --build=$CHOST --with-tcl=/usr/lib --with-tk=/usr/lib --mandir=/usr/share/man
+  ./configure --prefix=/usr --build=$CHOST --with-tcl=/usr/lib --with-tk=/usr/lib --mandir=/usr/share/man
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
   mkdir -p $pkgdir/usr/share/man/man1
   mv $pkgdir/usr/lib/xcircuit-3.7/man/* $pkgdir/usr/share/man/man1/
diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD
index adcc5d09c..45e32d541 100644
--- a/community/xdebug/PKGBUILD
+++ b/community/xdebug/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 74088 2012-07-20 08:07:10Z spupykin $
+# $Id: PKGBUILD 88795 2013-04-22 10:32:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jonathan Wiersma <arch aur at jonw dot org>
 # Contributor: Jonathan Wiersma <arch aur at jonw dot org>
 # Contributor: sracker <smb.sac@gmail.com>
 
 pkgname=xdebug
-pkgver=2.2.1
-pkgrel=1
+pkgver=2.2.2
+pkgrel=2
 pkgdesc="PHP debugging extension"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xdebug.org"
@@ -17,13 +17,11 @@ backup=('etc/php/conf.d/xdebug.ini')
 source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz
 	xdebug-5.2.ini
 	xdebug.ini)
-md5sums=('5e5c467e920240c20f165687d7ac3709'
+md5sums=('5687bca6270b9668721090d780c7c966'
          '6b7fdbbe0bf381bda40e77e29981f439'
          '68de800943369d4c76bdf7eb35c8463b')
 
 build() {
-  local PHPVER=`php -r 'echo phpversion();'`
-
   cd $srcdir/$pkgname-$pkgver
   phpize
   ./configure --prefix=/usr --enable-xdebug
@@ -32,11 +30,17 @@ build() {
   cd debugclient
   ./configure --prefix=/usr --build=$CHOST
   make
+}
+
+package() {
+  local PHPVER=`php -r 'echo phpversion();'`
+
+  cd $srcdir/$pkgname-$pkgver/debugclient
   make DESTDIR=$pkgdir install
 
   cd $srcdir/$pkgname-$pkgver
   if [ "$PHPVER" \< "5.3.0" ] ; then
-    install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/xdebug.so
+    install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so
     install -D -m 644 $srcdir/xdebug-5.2.ini $pkgdir/etc/php/conf.d/xdebug.ini
   else
     install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so
diff --git a/community/xdelta3/PKGBUILD b/community/xdelta3/PKGBUILD
index fe78f2aab..58270c4a4 100644
--- a/community/xdelta3/PKGBUILD
+++ b/community/xdelta3/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xdelta3
 pkgver=3.0.6
 pkgrel=1
 pkgdesc="A diff utility which works with binary files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xdelta.org/"
 license=('GPL')
 depends=('xz')
diff --git a/community/xe-guest-utilities/PKGBUILD b/community/xe-guest-utilities/PKGBUILD
new file mode 100644
index 000000000..feafca99b
--- /dev/null
+++ b/community/xe-guest-utilities/PKGBUILD
@@ -0,0 +1,77 @@
+# $Id: PKGBUILD 89210 2013-04-28 05:04:55Z dwallace $
+# Maintainer: Daniel Wallace <danielwallace at code gtmanfred com>
+# Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com>
+# Contributor: Krzysztof Raczkowski <raczkow@gnu-tech.pl>
+
+pkgbase=xe-guest-utilities
+pkgname=('xe-guest-utilities' 'xenstore')
+pkgver=6.1.0
+pkgrel=4
+pkgdesc="Citrix XenServer Tools"
+arch=('i686' 'x86_64')
+url="http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US"
+license=('GPL' 'LGPL')
+makedepends=(python2)
+optdepends=('linux: DomU kernel for x86_64'
+	          'linux-xen: DomU kernel for i686'
+            'kernel-lts-xen: DomU kernel for i686')
+source=("ftp://ftp.archlinux.org/other/community/$pkgbase/${pkgbase}_${pkgver}-1033.tar.gz"
+      	'ip_address.patch'
+        'xe-linux-distribution.service'
+        'xe-daemon.service'
+        'proc-xen.mount'
+        'tmpfile')
+md5sums=('26fd52ffc5ddeb7d3e510e6f272c2860'
+         '9bd39e95384056069f7faa870a28413a'
+         'abf49bd0925142e51ce2875cd5e5ad45'
+         '43264c6954c9c036b260521653ade41f'
+         '3252fa21362fd55246f9d8b923070151'
+         'cadad1eb5b1fa6d5fe463a1a0fd82fff')
+
+prepare(){
+  patch -d $srcdir/$pkgname-$pkgver -Np1 -i $srcdir/ip_address.patch
+  bsdtar xf "$srcdir/$pkgname-$pkgver/xenstore-sources.tar.bz2"
+}
+
+build() {
+  export CC=gcc
+  CFLAGS='-Wall -Wstrict-prototypes -Wno-unused-local-typedefs -Wno-sizeof-pointer-memaccess'
+  export CFLAGS
+  export PYTHON=python2
+  cd "$srcdir/uclibc-sources"
+  make -C tools/include
+  make -C tools/libxc
+  make -C tools/xenstore
+}
+
+package_xenstore() {
+  depends=(bzip2 lzo2 zlib xz)
+  export CFLAGS+='-Wall -Wstrict-prototypes -Wno-unused-local-typedefs -Wno-sizeof-pointer-memaccess'
+  if [[ $CARCH == x86_64 ]]; then
+    export LIBLEAFDIR_x86_64=lib
+  fi
+  for f in include libxc xenstore; do
+    [[ ! -d "$srcdir"/uclibc-sources/tools/$f ]] && continue
+    make -C ""$srcdir"/uclibc-sources/tools/$f" DESTDIR="$pkgdir" install
+  done
+  cd "$srcdir/$pkgbase-$pkgver"
+  install -Dm644 "COPYING.LGPL" "$pkgdir/usr/share/licenses/$pkgname/COPYING.LGPL"
+  install -Dm644 "COPYING" "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm644 $srcdir/proc-xen.mount "$pkgdir/usr/lib/systemd/system/proc-xen.mount"
+  install -Dm644 $srcdir/tmpfile "$pkgdir/usr/lib/tmpfiles.d/30-xenstored.conf"
+  rm -r "$pkgdir"/var
+}
+
+package_xe-guest-utilities(){
+  cd "$srcdir/$pkgname-$pkgver"
+  depends=('xenstore' 'bash')
+  install -Dm755 xe-linux-distribution "$pkgdir/usr/sbin/xe-linux-distribution"
+  install -Dm755 xe-update-guest-attrs "$pkgdir/usr/sbin/xe-update-guest-attrs"
+  install -Dm755 xe-daemon "$pkgdir/usr/sbin/xe-daemon"
+  install -Dm644 xen-vcpu-hotplug.rules "$pkgdir/usr/lib/udev/rules.d/10-xen-vcpu-hotplug.rules"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm644 $srcdir/xe-daemon.service "$pkgdir/usr/lib/systemd/system/xe-daemon.service"
+  install -Dm644 $srcdir/xe-linux-distribution.service "$pkgdir/usr/lib/systemd/system/"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/xe-guest-utilities/ip_address.patch b/community/xe-guest-utilities/ip_address.patch
new file mode 100644
index 000000000..3142c3d6b
--- /dev/null
+++ b/community/xe-guest-utilities/ip_address.patch
@@ -0,0 +1,16 @@
+diff -uNr a/xe-update-guest-attrs b/xe-update-guest-attrs
+--- a/xe-update-guest-attrs	2012-09-25 12:45:14.000000000 +0200
++++ b/xe-update-guest-attrs	2012-11-21 16:46:35.000000000 +0100
+@@ -177,9 +177,9 @@
+ #           collisions:0 txqueuelen:0 
+ #           RX bytes:3604609 (3.4 MiB)  TX bytes:3604609 (3.4 MiB)
+ 
+-ifs=`/sbin/ifconfig | sed -n -e 's/^\([a-z0-9]\+\).*/name \1/p' \
+-    -e 's/.*inet addr:\('$IPADDR_RE'\) .*/ipv4 \1/p' \
+-    -e 's+.*inet6 addr: \('$IPADDR6_RE'\)/.*+ipv6 \1+p' | \
++ifs=`ip addr show | sed -n -e 's/^[[:digit:]]*: \([a-z0-9]*\): .*/name \1 /gp;' \
++    -e 's/^[[:space:]]\{4\}inet \('${IPADDR_RE}'\)\/.*/ipv4 \1 /gp;' \
++    -e 's/^[[:space:]]\{4\}inet6 \('${IPADDR6_RE}'\)\/.*/ipv6 \1 /gp;' | \
+ while read tag value; do
+     case "${tag}" in
+         name)
diff --git a/community/xe-guest-utilities/proc-xen.mount b/community/xe-guest-utilities/proc-xen.mount
new file mode 100644
index 000000000..0eaa59c5f
--- /dev/null
+++ b/community/xe-guest-utilities/proc-xen.mount
@@ -0,0 +1,9 @@
+[Unit]
+Description=Mount /proc/xen files
+ConditionPathExists=/proc/xen
+RefuseManualStop=true
+
+[Mount]
+What=xenfs
+Where=/proc/xen
+Type=xenfs
diff --git a/community/xe-guest-utilities/tmpfile b/community/xe-guest-utilities/tmpfile
new file mode 100644
index 000000000..44337cf44
--- /dev/null
+++ b/community/xe-guest-utilities/tmpfile
@@ -0,0 +1 @@
+d /run/xenstored 0755 - - -
diff --git a/community/xe-guest-utilities/xe-daemon.service b/community/xe-guest-utilities/xe-daemon.service
new file mode 100644
index 000000000..5245c702d
--- /dev/null
+++ b/community/xe-guest-utilities/xe-daemon.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=xen daemon file
+After=xe-linux-distribution.service
+Requires=proc-xen.mount
+
+[Service]
+PIDFile=/run/xe-daemon.pid
+ExecStart=/usr/sbin/xe-daemon -p /run/xe-daemon.pid
+ExecStop=/bin/pkill -TERM  -F /run/xe-daemon.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/xe-guest-utilities/xe-linux-distribution.service b/community/xe-guest-utilities/xe-linux-distribution.service
new file mode 100644
index 000000000..5f3f91cc0
--- /dev/null
+++ b/community/xe-guest-utilities/xe-linux-distribution.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=xen linux distribution service
+Before=xend.service
+
+[Service]
+Type=simple
+RemainAfterExit=yes
+ExecStart=/usr/sbin/xe-linux-distribution /var/cache/xe-linux-distribution
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/xemacs/xemacs-21.5.29-optimization-bug.patch b/community/xemacs/xemacs-21.5.29-optimization-bug.patch
deleted file mode 100644
index 32a1a02c2..000000000
--- a/community/xemacs/xemacs-21.5.29-optimization-bug.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Work around a GCC optimization bug as described in
-http://tracker.xemacs.org/XEmacs/its/issue354
-
---- src/dumper.c.~1~	2008-01-26 09:54:11.000000000 +0100
-+++ src/dumper.c	2008-05-03 10:17:03.000000000 +0200
-@@ -2584,7 +2584,7 @@
- #endif /* !WIN32_NATIVE */
- 
- 
--static int
-+int
- pdump_file_try (Wexttext *exe_path)
- {
-   Wexttext *w = exe_path + wext_strlen (exe_path);
diff --git a/community/xfe/PKGBUILD b/community/xfe/PKGBUILD
index 5ca0e3ab0..ec0b832c1 100644
--- a/community/xfe/PKGBUILD
+++ b/community/xfe/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74893 2012-08-09 07:50:54Z spupykin $
+# $Id: PKGBUILD 84135 2013-02-11 11:34:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
 # Contributor: Ravi Desai <ravster3@hotmail.com>
 
 pkgname=xfe
-pkgver=1.33
+pkgver=1.34
 pkgrel=1
 pkgdesc="X File Explorer (Xfe) is an MS-Explorer like file manager for X."
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=("GPL")
 depends=('fox')
 makedepends=('intltool')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('fb089ba73add411b08a6560eeb51742d')
+md5sums=('36d0a590d95742eb59d8128a9a7a35b4')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/xfmedia/PKGBUILD b/community/xfmedia/PKGBUILD
index a3bece90b..9aee44152 100644
--- a/community/xfmedia/PKGBUILD
+++ b/community/xfmedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70120 2012-04-30 04:20:16Z foutrelis $
+# $Id: PKGBUILD 85661 2013-03-04 13:23:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Tom Killian <tomk@runbox.com>
@@ -6,7 +6,7 @@
 
 pkgname=xfmedia
 pkgver=0.9.2
-pkgrel=11
+pkgrel=12
 pkgdesc="xfce media player"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -31,7 +31,8 @@ build() {
   patch -Np1 -i ../xfmedia-empty-prev-next-fix.patch
   patch -Np1 -i ../xfmedia-exo-0.6.patch
   patch -Np1 -i ../xfmedia-xine-1.2.0.patch
-  LDFLAGS="$LDFLAGS -lXext -lm -lgmodule-2.0" ./configure --prefix=/usr
+  LDFLAGS="$LDFLAGS -lXext -lm -lgmodule-2.0" ./configure \
+    --prefix=/usr --sysconfdir=/etc
   make
 }
 
diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD
index ba33064bd..99406a5bc 100644
--- a/community/xlockmore/PKGBUILD
+++ b/community/xlockmore/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 80569 2012-11-25 17:22:16Z spupykin $
+# $Id: PKGBUILD 88423 2013-04-17 12:42:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: dorphell <dorphell@archlinux.org>
 
 pkgname=xlockmore
-pkgver=5.41
+pkgver=5.42
 pkgrel=1
 pkgdesc="screen saver / locker for the X Window System"
 arch=(i686 x86_64 'mips64el')
 license=('BSD')
 depends=(freetype2 gtk2 libxpm lesstif pam libxmu glu)
+optdepends=('fortune-mod')
 makedepends=(mesa)
 url="http://www.tux.org/~bagleyd/xlockmore.html"
 options=('!makeflags')
 source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2
 	LICENSE)
-md5sums=('a9af1cc72f0fd096ba4bba9097f9291c'
+md5sums=('de1dc31f686178703659fbb46d638518'
          'a64afab4283f53972a6702c2e59850d7')
 
 build() {
@@ -23,6 +24,11 @@ build() {
 	      --enable-appdefaultdir=/usr/share/X11/app-defaults \
 	      --enable-pam --with-gtk2 --without-esound --without-ftgl
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
   make xapploaddir=$pkgdir/usr/share/X11/app-defaults \
        mandir=$pkgdir/usr/man/man1 \
        prefix=$pkgdir/usr install
diff --git a/community/xml2/01_use_libxml2_instead_of_libxml.patch b/community/xml2/01_use_libxml2_instead_of_libxml.patch
deleted file mode 100644
index 975060ed3..000000000
--- a/community/xml2/01_use_libxml2_instead_of_libxml.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_use_libxml2_instead_of_libxml.dpatch by Daniel Leidert
-## <daniel.leidert@wgdd.de>
-##
-## DP: Make use of libxml2 instead of libxml
-
-@DPATCH@
-diff -urNad xml2-0.4~/2xml.c xml2-0.4/2xml.c
---- xml2-0.4~/2xml.c	2003-12-24 21:28:48.000000000 +0100
-+++ xml2-0.4/2xml.c	2008-03-12 09:32:17.345380803 +0100
-@@ -24,7 +24,7 @@
- #include <assert.h>
- #include <ctype.h>
- 
--#include <HTMLparser.h>
-+#include <libxml/HTMLparser.h>
- 
- int do_html;
- int in_tag = 0;
-@@ -104,7 +104,7 @@
- 			fputs("/>",stdout);
- 		else {
- 			const htmlElemDesc *elem = NULL;
--			if (do_html) elem = htmlTagLookup(name);
-+			if (do_html) elem = htmlTagLookup((xmlChar *) name);
- 			finish_tag();
- 			if (NULL == elem || (!elem->endTag && !elem->empty)) {
- 				fputs("</",stdout);
-diff -urNad xml2-0.4~/Makefile.am xml2-0.4/Makefile.am
---- xml2-0.4~/Makefile.am	2008-02-07 16:58:13.000000000 +0100
-+++ xml2-0.4/Makefile.am	2008-03-12 09:32:17.345380803 +0100
-@@ -1,9 +1,9 @@
--AM_CPPFLAGS = $(XML_CFLAGS)
-+AM_CFLAGS = $(XML_CFLAGS)
- bin_PROGRAMS = xml2 2xml csv2 2csv
- xml2_SOURCES = xml2.c
--xml2_LDADD = -lxml
-+xml2_LDADD = $(XML_LIBS)
- 2xml_SOURCES = 2xml.c
--2xml_LDADD = -lxml
-+2xml_LDADD = $(XML_LIBS)
- csv2_SOURCES = csv2.c
- 2csv_SOURCES = 2csv.c
- 
-diff -urNad xml2-0.4~/configure.ac xml2-0.4/configure.ac
---- xml2-0.4~/configure.ac	2008-02-07 17:11:54.000000000 +0100
-+++ xml2-0.4/configure.ac	2008-03-12 09:32:17.345380803 +0100
-@@ -11,7 +11,7 @@
- AC_PROG_CC
- 
- # Checks for libraries.
--PKG_CHECK_MODULES(XML, libxml)
-+PKG_CHECK_MODULES(XML, libxml-2.0)
- AC_SUBST(XML_LIBS)
- AC_SUBST(XML_CFLAGS)
- 
-diff -urNad xml2-0.4~/xml2.c xml2-0.4/xml2.c
---- xml2-0.4~/xml2.c	2001-10-28 05:29:46.000000000 +0100
-+++ xml2-0.4/xml2.c	2008-03-12 09:32:17.345380803 +0100
-@@ -24,8 +24,8 @@
- #include <string.h>
- #include <ctype.h>
- 
--#include <parser.h>
--#include <HTMLparser.h>
-+#include <libxml/parser.h>
-+#include <libxml/HTMLparser.h>
- 
- struct node
- {
diff --git a/community/xml2/PKGBUILD b/community/xml2/PKGBUILD
index 409334ff4..87457b8ee 100644
--- a/community/xml2/PKGBUILD
+++ b/community/xml2/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 55027 2011-08-31 14:49:55Z spupykin $
+# $Id: PKGBUILD 89943 2013-05-05 21:39:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Orivej Desh <masecretaire@gmx.fr>
 # Maintainer: Orivej Desh <masecretaire@gmx.fr>
 
 pkgname=xml2
-pkgver=0.4
-pkgrel=2
+pkgver=0.5
+pkgrel=1
 pkgdesc="XML/Unix Processing Tools to convert XML and HTML to and from a line-oriented format more amenable to processing by classic Unix pipeline processing tools"
 arch=("i686" "x86_64" "mips64el")
 url="http://www.ofb.net/~egnor/xml2/"
 license=("GPL")
 depends=("libxml2")
-source=("http://download.ofb.net/gale/$pkgname-$pkgver.tar.gz"
-        "01_use_libxml2_instead_of_libxml.patch")
-md5sums=('8a0ef16fe0b3e1495307318c590c1ec0'
-         '9e810be33d2abbc8aabd8203db1f9654')
+source=("http://download.ofb.net/gale/$pkgname-$pkgver.tar.gz")
+md5sums=('48eacf64b01ca3a4a5afb1a36f5906e6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i ../01_use_libxml2_instead_of_libxml.patch
-  autoreconf
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
   cd "$pkgdir/usr/bin"
   rm html2 2html
diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD
index 6982c0e3d..fd394728b 100644
--- a/community/xmlrpc-c/PKGBUILD
+++ b/community/xmlrpc-c/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 79057 2012-10-29 19:02:22Z arodseth $
+# $Id: PKGBUILD 87246 2013-03-29 00:18:37Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Vitaliy Berdinskikh <skipper13@root.ua>
 
 pkgname=xmlrpc-c
-pkgver=1.32.2
+pkgver=1.33.03
 pkgrel=1
 epoch=1
 pkgdesc='XML-RPC for C and C++'
@@ -16,7 +16,7 @@ depends=('curl' 'libxml2')
 makedepends=('libtool' 'setconf')
 options=('!makeflags' '!libtool' '!emptydirs')
 source=("$pkgname-advanced-$pkgver.tar.gz::http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced/?view=tar")
-sha256sums=('5ed7260e6d07b0fe1a1e8d117ddf6ef1e1d2b6a4c40f1ec7083e0da36b2eade5')
+sha256sums=('89ee1a2cd7319fbb0940cb1e87c8592d17379659f05da231aec603d70bd1233a')
 
 build() {
   cd "$srcdir/advanced"
@@ -43,8 +43,8 @@ package() {
   make DESTDIR="$pkgdir" -C tools install
   install -Dm644 doc/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   # Remove references to build directory
-  setconf "$pkgdir/usr/bin/xmlrpc-c-config" BLDDIR ""
-  setconf "$pkgdir/usr/bin/xmlrpc-c-config" ABS_SRCDIR ""
+  setconf "$pkgdir/usr/bin/xmlrpc-c-config" BLDDIR ''
+  setconf "$pkgdir/usr/bin/xmlrpc-c-config" ABS_SRCDIR ''
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD
index cbf481a01..41b8529cc 100644
--- a/community/xmms2/PKGBUILD
+++ b/community/xmms2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79342 2012-11-03 08:25:25Z spupykin $
+# $Id: PKGBUILD 88557 2013-04-19 17:25:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xmms2
 pkgver=0.8DrO_o
-pkgrel=9
+pkgrel=12
 pkgdesc="complete rewrite of the popular music player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmms2.org/"
@@ -12,6 +12,7 @@ backup=('etc/conf.d/xmms2d.conf')
 depends=('sqlite' 'libmad')
 makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib'
 	'jack' 'libao' 'libmms' 'libmpcdec' 'libofa' 'libsamplerate' 'libshout'
+	'libdiscid' 'libcdio-paranoia'
 	'libvorbis' 'libxml2' 'mpg123' 'perl' 'pulseaudio' 'pyrex'
 	'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug' 'python' 'python2' 'libgme' 'avahi')
 [ "$CARCH" = "mips64el" ] || makedepends+=('oss')
@@ -26,6 +27,8 @@ optdepends=('alsa-lib: ALSA audio output'
 	    'jack: JACK audio output'
 	    'libao: liboa audio output'
 	    'libgme: game-music-emu support'
+	    'libdiscid: cdda support'
+	    'libcdio-paranoia: cdda support'
 	    'libofa: MusicDNS fingerprinting'
 	    'libmms: play MMS streams'
 	    'libmodplug: to play MOD files'
@@ -56,7 +59,7 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz
 md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3'
          'af13c937bf3c86b77ae6820107aab9b8'
          '31ab8c0980966dbe3e9f5e80b7b82612'
-         '19167aa54e4745853689abad72443b3e'
+         '47e68461589578e8a99857746c5b6f29'
          'e176971ef96807f72fa8fc17d260c20a')
 
 build() {
@@ -69,12 +72,19 @@ build() {
 
   # python2 fix
 #  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf
+  sed -i 's|#include <cdio/cdda.h>|#include <cdio/paranoia/cdda.h>|' src/plugins/cdda/cdda.c
+  sed -i 's|libsmbclient.h|samba-4.0/libsmbclient.h|' src/plugins/samba/{samba.c,wscript}
 
   ./waf configure --prefix=/usr \
 	--with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps,et,mdns,medialib-updater \
 	--with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \
 	--with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'`
   ./waf build
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
   ./waf --destdir=${pkgdir} install
 
   PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d
diff --git a/community/xmms2/xmms2d.service b/community/xmms2/xmms2d.service
index a38584df1..6adcf207f 100644
--- a/community/xmms2/xmms2d.service
+++ b/community/xmms2/xmms2d.service
@@ -5,8 +5,8 @@ After=network.target remote-fs.target nss-lookup.target
 [Service]
 Type=forking
 EnvironmentFile=/etc/conf.d/xmms2d.conf
-ExecStart=su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS &>/dev/null' - $XMMS2_USER
-ExecStop=su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER
+ExecStart=/bin/su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS &>/dev/null' - $XMMS2_USER
+ExecStop=/bin/su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch b/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch
deleted file mode 100644
index d4508c916..000000000
--- a/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b7345a790e8026a2075ce636ac377d8f049b4b7c Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Wed, 3 Oct 2012 06:51:21 -0700
-Subject: [PATCH] Update usage of catch to catchIOError since catch has been
- removed from System.IO.Error in ghc 7.6.1
-
----
- src/Plugins/Monitors/Bright.hs | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/Plugins/Monitors/Bright.hs b/src/Plugins/Monitors/Bright.hs
-index 499e5bc..b5ec4c0 100644
---- a/src/Plugins/Monitors/Bright.hs
-+++ b/src/Plugins/Monitors/Bright.hs
-@@ -20,6 +20,7 @@ import Data.Char
- import System.FilePath ((</>))
- import System.Posix.Files (fileExist)
- import System.Console.GetOpt
-+import System.IO.Error (catchIOError)
- 
- data BrightOpts = BrightOpts
- 	{ subDir :: String
-@@ -101,7 +102,7 @@ readBright files =
- 		maxVal <- grab $ (fMax files)
- 		return $ (currVal / maxVal) 
- 	where
--		grab f = catch (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0)
-+		grab f = catchIOError (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0)
- 
- 
- showHorizontalBar :: Float -> Monitor String
--- 
-1.7.12.2
-
diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD
index e80de221c..1a6e973aa 100644
--- a/community/xmobar/PKGBUILD
+++ b/community/xmobar/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 84020 2013-02-08 04:15:49Z td123 $
+# $Id: PKGBUILD 89333 2013-04-28 16:53:04Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=xmobar
 pkgver=0.16
-pkgrel=5
+pkgrel=6
 pkgdesc="A Minimalistic Text Based Status Bar"
 url="http://hackage.haskell.org/package/xmobar"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr')
-makedepends=('ghc=7.6.2-1' 'haskell-x11=1.6.0.2-2' 'haskell-x11-xft=0.3.1-6' 'haskell-utf8-string=0.3.7-4'
-	     'haskell-stm=2.4.2-1' 'haskell-parsec=3.1.3-2' 'haskell-mtl=2.1.2-2')
+makedepends=('ghc=7.6.3-1' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5'
+	     'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz)
 md5sums=('4742f1556a8e9b292f18df1176dcd378')
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD
index db31b8b7e..19c3f98bb 100644
--- a/community/xmonad-contrib/PKGBUILD
+++ b/community/xmonad-contrib/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 84022 2013-02-08 04:15:51Z td123 $
+# $Id: PKGBUILD 89335 2013-04-28 16:53:08Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: orbisvicis <gmail.com>
 
 pkgname=xmonad-contrib
 pkgver=0.11
-pkgrel=2
+pkgrel=7
 pkgdesc="Add-ons for xmonad"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.6.2-1' 'xmonad=0.11-2' 'sh' 'haskell-x11=1.6.0.2-2' 'haskell-x11-xft=0.3.1-6' 'haskell-utf8-string=0.3.7-4' 'haskell-random=1.0.1.1-4')
+depends=('ghc=7.6.3-1' 'xmonad=0.11-6' 'sh' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' 'haskell-random=1.0.1.1-5')
 install='xmonad-contrib.install'
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('05fba258ac6063e49b50786a0869bd1f')
+source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-remove-getatomname.patch)
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/xmonad-contrib-remove-getatomname.patch
 
   runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \
              --libsubdir=\$compiler/site-local/\$pkgid
@@ -33,3 +33,5 @@ package() {
   runhaskell Setup.lhs copy --destdir=$pkgdir
   install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE
 }
+md5sums=('05fba258ac6063e49b50786a0869bd1f'
+         '1d1fab94ae24b2a8f6a5dcd9cd6d9548')
diff --git a/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch b/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch
deleted file mode 100644
index 8372b4144..000000000
--- a/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Tue Mar 20 03:53:11 FET 2012  Adam Vogt <vogt.adam@gmail.com>
-  * Bump version to 0.10.1
-  
-  Raising the X11 dependency while keeping the xmonad version the same leads to
-  problems where cabal install uses the dependency versions following hackage,
-  not what is installed.
-diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
-index 743bdc8..0fbf4ac 100644
---- a/xmonad-contrib.cabal
-+++ b/xmonad-contrib.cabal
-@@ -61,7 +61,7 @@ library
-         extensions: ForeignFunctionInterface
-         cpp-options: -DXFT
- 
--    build-depends:      mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.10, xmonad<0.11, utf8-string
-+    build-depends:      mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.7, xmonad>=0.10, xmonad<0.11, utf8-string
- 
-     if true
-         ghc-options:    -fwarn-tabs -Wall
-diff --git a/XMonad/Layout/Spiral.hs b/XMonad/Layout/Spiral.hs
-index a485d95..5e388e2 100644
---- a/XMonad/Layout/Spiral.hs
-+++ b/XMonad/Layout/Spiral.hs
-@@ -26,7 +26,7 @@ module XMonad.Layout.Spiral (
-                             ) where
- 
- import Data.Ratio
--import XMonad
-+import XMonad (LayoutClass(..), Rectangle(..), fromMessage, Resize(..))
- import XMonad.StackSet ( integrate )
- 
- -- $usage
-diff --git a/XMonad/Util/Paste.hs b/XMonad/Util/Paste.hs
-index 0d78653..4b7fd3b 100644
---- a/XMonad/Util/Paste.hs
-+++ b/XMonad/Util/Paste.hs
-@@ -23,7 +23,8 @@ module XMonad.Util.Paste ( -- * Usage
-                            where
- 
- import XMonad (io, theRoot, withDisplay, X ())
--import Graphics.X11
-+import Graphics.X11 (Window, shiftMask, KeyMask, stringToKeysym, KeySym, keysymToKeycode)
-+import Graphics.X11 (allocaXEvent, keyPress, sendEvent, keyPressMask, keyRelease, keyReleaseMask)
- import Graphics.X11.Xlib.Extras (none, setEventType, setKeyEvent)
- import Control.Monad.Reader (asks)
- import XMonad.Operations (withFocused)
diff --git a/community/xmonad-contrib/xmonad-contrib-remove-getatomname.patch b/community/xmonad-contrib/xmonad-contrib-remove-getatomname.patch
new file mode 100644
index 000000000..92ea9bddf
--- /dev/null
+++ b/community/xmonad-contrib/xmonad-contrib-remove-getatomname.patch
@@ -0,0 +1,19 @@
+diff -aur xmonad-contrib-0.11/XMonad/Hooks/DebugEvents.hs xmonad-contrib.new/XMonad/Hooks/DebugEvents.hs
+--- xmonad-contrib-0.11/XMonad/Hooks/DebugEvents.hs	2013-01-01 01:32:44.000000000 +0000
++++ xmonad-contrib.new/XMonad/Hooks/DebugEvents.hs	2013-03-18 07:54:52.082723862 +0000
+@@ -50,6 +50,7 @@
+ import           System.Process
+ 
+ -- this should move into X11
++{-
+ foreign import ccall unsafe "XGetAtomName"
+   xGetAtomName :: Display -> Atom -> IO CString
+ 
+@@ -63,6 +64,7 @@
+       xFree n
+       return $ Just n'
+ 
++-}
+ -- | Event hook to dump all received events.  You should probably not use this
+ --   unconditionally; it will produce massive amounts of output.
+ debugEventsHook   :: Event -> X All
diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD
index c3aa02d4d..08c578503 100644
--- a/community/xmonad/PKGBUILD
+++ b/community/xmonad/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 84021 2013-02-08 04:15:50Z td123 $
+# $Id: PKGBUILD 89334 2013-04-28 16:53:06Z td123 $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: shild <shildv@gmail.com>
 
 pkgname=xmonad
 pkgver=0.11
-pkgrel=2
+pkgrel=6
 pkgdesc="Lightweight X11 tiled window manager written in Haskell"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.6.2-1' 'gmp' 'haskell-x11=1.6.0.2-2' 'sh' 'haskell-mtl=2.1.2-2' 'haskell-utf8-string=0.3.7-4' 'haskell-extensible-exceptions=0.1.1.4-4')
-makedepends=('setconf' 'gendesk')
+depends=('ghc=7.6.3-1' 'gmp' 'haskell-x11=1.6.1.1-3' 'sh' 'haskell-mtl=2.1.2-3' 'haskell-utf8-string=0.3.7-5' 'haskell-extensible-exceptions=0.1.1.4-5')
+makedepends=('gendesk')
 optdepends=('xorg-xmessage: for displaying visual error messages')
 install='xmonad.install'
 source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
diff --git a/community/xmonad/xmonad-0.10-x11-1.6.patch b/community/xmonad/xmonad-0.10-x11-1.6.patch
deleted file mode 100644
index 5b7afaf3b..000000000
--- a/community/xmonad/xmonad-0.10-x11-1.6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Tue Mar 20 03:49:24 FET 2012  Adam Vogt <vogt.adam@gmail.com>
-  * Address versioning problems related to X11 1.6 release.
-  
-  Bump version to 0.10.1 since cabal uses hackage dependencies even when the
-  locally installed package differs.
-  
-  Allow X11-1.6 dependency.
-diff -rN -u old-xmonad/xmonad.cabal new-xmonad/xmonad.cabal
---- old-xmonad/xmonad.cabal	2012-05-06 12:20:26.788767220 +0300
-+++ new-xmonad/xmonad.cabal	2012-05-06 12:20:26.818766844 +0300
-@@ -46,7 +46,7 @@
-         build-depends: base < 5 && >=3, containers, directory, process, filepath, extensible-exceptions
-     else
-         build-depends: base < 3
--    build-depends: X11>=1.5.0.0 && < 1.6, mtl, unix,
-+    build-depends: X11>=1.5 && < 1.7, mtl, unix,
-                    utf8-string >= 0.3 && < 0.4
- 
-     if true
diff --git a/community/xmonad/xmonad.desktop b/community/xmonad/xmonad.desktop
deleted file mode 100644
index 0af0f2d9b..000000000
--- a/community/xmonad/xmonad.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Xmonad GNOME
-Comment=Tiling window manager
-TryExec=/usr/bin/gnome-session
-Exec=gnome-session --session=xmonad
-Type=XSession
-Icon=/usr/share/pixmaps/xmonad.svg
diff --git a/community/xmonad/xmonad.png b/community/xmonad/xmonad.png
deleted file mode 100644
index d957f62f8..000000000
--- a/community/xmonad/xmonad.png
+++ /dev/null
diff --git a/community/xmonad/xmonad.session b/community/xmonad/xmonad.session
deleted file mode 100644
index c0bd16781..000000000
--- a/community/xmonad/xmonad.session
+++ /dev/null
@@ -1,6 +0,0 @@
-[GNOME Session]
-Name=Xmonad session
-RequiredComponents=gnome-panel;gnome-settings-daemon;
-RequiredProviders=windowmanager;notifications;
-DefaultProvider-windowmanager=xmonad
-DefaultProvider-notifications=notification-daemon
diff --git a/community/xmoto/PKGBUILD b/community/xmoto/PKGBUILD
index 081ac181c..0c958c2bd 100644
--- a/community/xmoto/PKGBUILD
+++ b/community/xmoto/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=xmoto
 pkgver=0.5.10
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmoto.tuxfamily.org"
diff --git a/community/xmoto/xmoto-0.5.9-libpng15.patch b/community/xmoto/xmoto-0.5.9-libpng15.patch
deleted file mode 100644
index 0410c81c5..000000000
--- a/community/xmoto/xmoto-0.5.9-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/image/tim_png.cpp	2011-10-11 22:18:11.000000000 +0200
-+++ b/src/image/tim_png.cpp	2012-01-19 19:58:24.000000000 +0100
-@@ -24,6 +24,7 @@
-  */
- #include <stdio.h>
- #include <string.h>
-+#include <zlib.h>
- #include "tim.h"
- #include "png.h"
- 
diff --git a/community/xmoto/xmoto.desktop b/community/xmoto/xmoto.desktop
deleted file mode 100644
index 5ae6fe226..000000000
--- a/community/xmoto/xmoto.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Icon=/usr/share/xmoto/xmoto_icone_x.ico
-Exec=/usr/bin/xmoto
-Terminal=false
-StartupNotify=false
-
-Name=XMoto
-GenericName=Game
-Comment=is a 2D physics-based motocross game.
-
-Categories=Game;
diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD
index 298bc0a9a..81f912cbd 100644
--- a/community/xnee/PKGBUILD
+++ b/community/xnee/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 82003 2013-01-05 15:43:50Z jlichtblau $
+# $Id: PKGBUILD 88303 2013-04-16 10:25:07Z bgyorgy $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 
 pkgname=xnee
 pkgver=3.15
-pkgrel=1
+pkgrel=2
 pkgdesc="A program to record, distribute, and replay X (X11) protocol data"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.sandklef.com/xnee/"
 license=('GPL3')
-depends=('gtk2' 'libgnomeui' 'libxtst')
+depends=('gtk2' 'libxtst')
 makedepends=('texinfo')
+optdepends=('xosd: feedback support')
 options=('!libtool' '!emptydirs')
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('56e0b1cca36ebf95b6f7c82c7028ab8a9b5003728ca1044016031b489bc3e8cd')
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
+        gnee.desktop)
+sha256sums=('56e0b1cca36ebf95b6f7c82c7028ab8a9b5003728ca1044016031b489bc3e8cd'
+            'de42d419a46083e39a9b6d60c045c1cd68deb793cc5166a86df81dff608387c1')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 
-  ./configure --prefix=/usr --disable-gnome-applet
+  ./configure --prefix=/usr --enable-gui --enable-lib --disable-static --disable-static-programs
   make
 }
 
@@ -26,4 +29,5 @@ package() {
   cd ${srcdir}/$pkgname-$pkgver
 
   make DESTDIR=${pkgdir} install
+  install -Dm644 ${srcdir}/gnee.desktop ${pkgdir}/usr/share/applications/gnee.desktop
 }
diff --git a/community/xnee/gnee.desktop b/community/xnee/gnee.desktop
new file mode 100644
index 000000000..c96850599
--- /dev/null
+++ b/community/xnee/gnee.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Gnee
+GenericName=X11 Recorder
+Comment=For replay action under X11 environment
+Exec=gnee
+Icon=/usr/share/pixmaps/xnee.png
+Terminal=false
+Type=Application
+Categories=Utility;
diff --git a/community/xnee/xnee.changelog b/community/xnee/xnee.changelog
index b93cdf5b5..b10864c83 100644
--- a/community/xnee/xnee.changelog
+++ b/community/xnee/xnee.changelog
@@ -1,3 +1,8 @@
+2013-04-16 Balló György <ballogyor+arch at gmail dot com>
+	* fix dependencies
+	* enable GUI and library
+	* add .desktop file
+
 2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* xnee 3.15-1
 
diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD
index 89c19244f..9222d0f85 100755
--- a/community/xnoise/PKGBUILD
+++ b/community/xnoise/PKGBUILD
@@ -1,25 +1,24 @@
-# $Id: PKGBUILD 83989 2013-02-08 01:40:12Z fyan $
+# $Id: PKGBUILD 87484 2013-04-01 12:09:37Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: archtux <antonio dot arias99999 at gmail dot com>
 
 pkgname=xnoise
-pkgver=0.2.15
-pkgrel=1
+pkgver=0.2.17
+pkgrel=3
 pkgdesc="Media player with a slick GUI, great speed and lots of features."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xnoise-media-player.com/"
 license=('GPL2')
-depends=('desktop-file-utils' 'gnome-icon-theme' 'gstreamer0.10-base-plugins' 'gtk3' 'libsoup' 'sqlite' 'taglib')
-optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
-	    'gstreamer0.10-bad-plugins: Extra media codecs'
-            'gstreamer0.10-ugly-plugins: Extra media codecs'
-	    'gstreamer0.10-ffmpeg: Extra media codecs')
+depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo' 'librsvg')
+optdepends=('gst-plugins-base: Basic media codecs'
+            'gst-plugins-bad: Extra media codecs'
+            'gst-plugins-ugly: Extra media codecs'
+	    'gst-libav: Extra media codecs'
+	    'gvfs: Needed for fetching album art')
 makedepends=('gettext' 'intltool')
 options=('!libtool')
 install=$pkgname.install
 source=("https://bitbucket.org/shuerhaaken/xnoise/downloads/$pkgname-$pkgver.tar.gz")
-md5sums=('774b52c94d5b1d3de963307835ade35b')
-
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -33,6 +32,6 @@ package() {
   make DESTDIR="$pkgdir" install
   
   # Remove obsolete files
-  rm -rf $pkgdir/usr/include $pkgdir/usr/share/vala
+  rm -rf "$pkgdir/usr/include" "$pkgdir/usr/share/vala"
 }
-md5sums=('59736de51d9747e7a784103b902f9222')
+md5sums=('a72b0adf06667f682f972f9c38174f02')
diff --git a/community/xosd/PKGBUILD b/community/xosd/PKGBUILD
index 525ea5aaf..c712242af 100644
--- a/community/xosd/PKGBUILD
+++ b/community/xosd/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=xosd
 pkgver=2.2.14
-pkgrel=5.1
+pkgrel=5.2
 pkgdesc="Displays text on your screen. On-Screen-Display-libs for some tools"
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL2')
diff --git a/community/xrestop/PKGBUILD b/community/xrestop/PKGBUILD
index 141e97f53..df1f20755 100644
--- a/community/xrestop/PKGBUILD
+++ b/community/xrestop/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=xrestop
 pkgver=0.4
-pkgrel=4
+pkgrel=4.1
 pkgdesc="Uses the X-Resource extension to provide 'top' like statistics"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freedesktop.org/wiki/Software/xrestop"
diff --git a/community/xsel/PKGBUILD b/community/xsel/PKGBUILD
index 7e945448d..ca1976da9 100644
--- a/community/xsel/PKGBUILD
+++ b/community/xsel/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=xsel
 pkgver=1.2.0
-pkgrel=5
+pkgrel=5.1
 pkgdesc="XSel is a command-line program for getting and setting the contents of the X selection"
 arch=(i686 x86_64 'mips64el')
 url="http://www.vergenet.net/~conrad/software/xsel/"
diff --git a/community/xsettings-client/PKGBUILD b/community/xsettings-client/PKGBUILD
index 4b259f6e8..f9ead9d39 100644
--- a/community/xsettings-client/PKGBUILD
+++ b/community/xsettings-client/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 65273 2012-02-20 12:44:47Z spupykin $
+# $Id: PKGBUILD 88791 2013-04-22 10:19:12Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alois Belaska <lloyd@centrum.cz>
 
 pkgname=xsettings-client
 pkgver=0.10
-pkgrel=6
+pkgrel=6.1
 pkgdesc="Provides cross toolkit configuration settings such as theme parameters"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://matchbox-project.org"
 depends=('libx11')
 options=('!libtool')
-source=(http://matchbox-project.org/sources/optional-dependencies/Xsettings-client-$pkgver.tar.gz)
+source=(http://downloads.yoctoproject.org/releases/matchbox/optional-dependencies/Xsettings-client-$pkgver.tar.gz)
 md5sums=('c14aa9db6c097e0306dac97fb7da1add')
 
 build() {
   cd $srcdir/Xsettings-client-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/Xsettings-client-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/xv/PKGBUILD b/community/xv/PKGBUILD
deleted file mode 100644
index bbb0fdc18..000000000
--- a/community/xv/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 63794 2012-02-05 12:15:48Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xv
-pkgver=3.10a
-pkgrel=15
-pkgdesc="A nice image viewer"
-arch=('i686' 'x86_64')
-url="http://www.trilon.com/xv/"
-license=('custom')
-depends=('libpng' 'libx11' 'libtiff')
-makedepends=('libxt' 'jasper')
-options=('!emptydirs')
-source=(ftp://ftp.trilon.com/pub/xv/${pkgname}-${pkgver}.tar.gz \
-        http://downloads.sourceforge.net/sourceforge/png-mng/xv-3.10a-jumbo-patches-20070520.tar.gz \
-        license.txt xv-3.10a-libpng15.patch)
-sha1sums=('092f8eb100f16d6b91c88b126c2b2b998eb09b99'
-          'd00308c1687d9d803d26ef40c73d19a0f593c626'
-          '4561344e8f2c30eee9c55b14a14f062d89d6e7b7'
-          '3d19aa0c6ecc8b554081906babe0b4f9a6946da3')
-
-build() {
-  cd "${srcdir}"
-  tar -cJf xv-${pkgver}-source.tar.xz xv-${pkgver}
-  cd ${pkgname}-${pkgver}
-  patch -p1 < ../xv-3.10a-jumbo-fix-enh-patch-20070520.txt
-  patch -p0 < ../xv-3.10a-libpng15.patch
-  make JP2KDIR=/usr/lib
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -d "${pkgdir}"/usr/{bin,lib,share/man/man1}
-  make DESTDIR="${pkgdir}" PREFIX=/usr install
-  install -D -m644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
-
-# installing source tarball (to comply with license)
-  install -D -m644 "${srcdir}/xv-${pkgver}-source.tar.xz" "${pkgdir}/usr/share/doc/xv/xv-${pkgver}-source.tar.xz"
-  ln -s "/usr/share/licenses/${pkgname}/license.txt" "${pkgdir}/usr/share/doc/xv/license.txt"
-}
diff --git a/community/xv/license.txt b/community/xv/license.txt
deleted file mode 100644
index 7dd87c233..000000000
--- a/community/xv/license.txt
+++ /dev/null
@@ -1,139 +0,0 @@
-XV Licensing Information
-------------------------
-XV IS SHAREWARE FOR PERSONAL USE ONLY.  
-
-You may use XV for your own amusement, and if you find it nifty,
-useful, generally cool, or of some value to you, your registration fee
-would be greatly appreciated.  $25 is the standard registration fee,
-though of course, larger amounts are quite welcome.  Folks who donate
-$40 or more can receive a printed, bound copy of the XV manual for no
-extra charge.  If you want one, just ask.  BE SURE TO SPECIFY THE
-VERSION OF XV THAT YOU ARE USING!
-
-COMMERCIAL, GOVERNMENT, AND INSTITUTIONAL USERS MUST REGISTER THEIR
-COPIES OF XV.
-
-This does *not* mean that you are required to register XV just because
-you play with it on the workstation in your office.  This falls under
-the heading of 'personal use'.  If you are a sysadmin, you can put XV
-up in a public directory for your users amusement.  Again, 'personal
-use', albeit plural.
-
-On the other hand, if you use XV in the course of doing your work,
-whatever your 'work' may happen to be, you *must* register your
-copy of XV.  (Note:  If you are a student, and you use XV to do 
-classwork or research, you should get your professor/teacher/advisor
-to purchase an appropriate number of copies.)
-
-XV licenses are $25 each.  You should purchase one license per
-workstation, or one per XV user, whichever is the smaller number.  XV
-is *not* sold on a 'number of concurrent users' basis.  If XV was some
-$1000 program, yes, that would be a reasonable request, but at $25,
-it's not.  Also, given that XV is completely unlocked, there is no way
-to enforce any 'number of concurrent users' limits, so it isn't sold
-that way.
-
-Printed and bound copies of the 100-odd page XV manual are available
-for $15 each.  Note that manuals are *only* sold with, at minimum, an
-equal number of licenses.  (e.g.  if you purchase 5 licenses, you can
-also purchase *up to* 5 copies of the manual)
-
-The source code to the program can be had (as a compressed 'tar' file
-split over a couple 3.5" MS-DOS formatted floppies) for $15, for those
-who don't have ftp capabilities.
-
-Orders outside the US and Canada must add an additional $5 per manual
-ordered to cover the additional shipping charges.
-
-Checks, money orders, and purchase orders are accepted.  Credit cards
-are not.  All forms of payment must be payable in US Funds.  Checks
-must be payable through a US bank (or a US branch of a non-US bank).
-Purchase orders for less than $50, while still accepted, are not
-encouraged. 
-
-All payments should be payable to 'John Bradley', and mailed to:
-        John Bradley
-        1053 Floyd Terrace
-        Bryn Mawr, PA  19010
-        USA
-
-
-Site Licenses
--------------
-If you are planning to purchase 10 or more licenses, site licenses are
-available, at a substantial discount.  Site licenses let you run XV on
-any and all computing equipment at the site, for any purpose
-whatsoever.  The site license covers the current version of XV, and
-any versions released within one year of the licensing date.  You are
-also allowed to duplicate and distribute an unlimited number of copies
-of the XV manual, but only for use within the site.  Covered versions
-of the software may be run in perpetuity.
-
-Also, it should be noted that a 'site' can be defined as anything
-you'd like.  It can be a physical location (a room, building,
-location, etc.), an organizational grouping (a workgroup, department,
-division, etc.) or any other logical grouping ("the seventeen
-technical writers scattered about our company", etc.).
-
-The site license cost will be based on your estimate of the number of
-XV users or workstations at your site, whichever is the smaller
-number.
-
-If you are interested in obtaining a site license, please contact the
-author via electronic mail or FAX (see below for details).  Send
-information regarding your site (the name or definition of the 'site',
-a physical address, a fax number, and an estimate of the number of
-users or workstations), and we'll get a site license out to you for
-your examination.
-
-
-Copyright Notice
-----------------
-XV is Copyright 1989, 1994 by John Bradley
-
-Permission to copy and distribute XV in its entirety, for
-non-commercial purposes, is hereby granted without fee, provided that
-this license information and copyright notice appear in all copies.
-
-If you redistribute XV, the *entire* contents of this distribution
-must be distributed, including the README, and INSTALL files, the
-sources, and the complete contents of the 'docs' directory.
-
-Note that distributing XV 'bundled' in with any product is considered
-to be a 'commercial purpose'.
-
-Also note that any copies of XV that are distributed MUST be built
-and/or configured to be in their 'unregistered copy' mode, so that it
-is made obvious to the user that XV is shareware, and that they should
-consider registering, or at least reading this information.
-
-The software may be modified for your own purposes, but modified
-versions may not be distributed without prior consent of the author.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the author be held liable for any damages
-arising from the use of this software.
-
-If you would like to do something with XV that this copyright
-prohibits (such as distributing it with a commercial product, using
-portions of the source in some other program, distributing registered
-copies, etc.), please contact the author (preferably via email).
-Arrangements can probably be worked out.
-
-
-The author may be contacted via:
-    US Mail:  John Bradley
-              1053 Floyd Terrace
-              Bryn Mawr, PA  19010
-
-    FAX:     (610) 520-2042
-
-Electronic Mail regarding XV should be sent to one of these three addresses:
-     xv@devo.dccs.upenn.edu               - general XV questions
-     xvbiz@devo.dccs.upenn.edu            - all XV licensing questions
-     xvtech@devo.dccs.upenn.edu           - bug reports, technical questions
-
-Please do *not* send electronic mail directly to the author, as he
-gets more than enough as it is.
-
-
diff --git a/community/xv/xv-3.10a-libpng15.patch b/community/xv/xv-3.10a-libpng15.patch
deleted file mode 100644
index 43c517668..000000000
--- a/community/xv/xv-3.10a-libpng15.patch
+++ /dev/null
@@ -1,520 +0,0 @@
---- xvinfo.c
-+++ xvinfo.c
-@@ -26,7 +26,7 @@
- #define INFOHIGH 270
- 
- /* max length of an Info String */
--#define ISTRLEN 80
-+#define ISTRLEN 256
- 
- /* baseline of top line of text */
- #define TOPBASE (36 + penn_height/2 + 4 + 8 + ASCENT)
---- xvpng.c
-+++ xvpng.c
-@@ -31,6 +31,7 @@
- 
- #ifdef HAVE_PNG
- 
-+#include "zlib.h"
- #include "png.h"
- 
- /*** Stuff for PNG Dialog box ***/
-@@ -41,7 +42,9 @@
- #define COMPRESSION   6     /* default zlib compression level, not max
-                                (Z_BEST_COMPRESSION) */
- 
--#define HAVE_tRNS  (info_ptr->valid & PNG_INFO_tRNS)
-+/* old
-+#define HAVE_tRNS  (info_ptr->valid & PNG_INFO_tRNS) */
-+#define HAVE_tRNS  png_get_valid(png_ptr,info_ptr,PNG_INFO_tRNS)
- 
- #define DWIDE    86
- #define DHIGH    104
-@@ -444,6 +447,10 @@
-   byte       *p, *png_line;
-   char        software[256];
-   char       *savecmnt;
-+  /* for storing values until all are accumulated, so that the image header can be set in full */
-+  int         _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;
-+  png_uint_32 _width,_height;
-+  png_time    _mod_time;
- 
-   if ((png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,
-        png_xv_error, png_xv_warning)) == NULL) {
-@@ -458,7 +465,7 @@
-     FatalError(software);
-   }
- 
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     png_destroy_write_struct(&png_ptr, &info_ptr);
-     return -1;
-   }
-@@ -489,8 +496,8 @@
-     png_set_filter(png_ptr, 0, filter);
-   }
- 
--  info_ptr->width = w;
--  info_ptr->height = h;
-+  _width = w;
-+  _height = h;
-   if (w <= 0 || h <= 0) {
-     SetISTR(ISTR_WARNING, "%s:  image dimensions out of range (%dx%d)",
-       fbasename, w, h);
-@@ -498,7 +505,7 @@
-     return -1;
-   }
- 
--  info_ptr->interlace_type = interCB.val ? 1 : 0;
-+  _interlace_type = interCB.val ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE;
- 
-   linesize = 0;   /* quiet a compiler warning */
- 
-@@ -542,40 +549,44 @@
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         return -1;
-       }
--      info_ptr->color_type = PNG_COLOR_TYPE_RGB;
--      info_ptr->bit_depth = 8;
-+      _color_type = PNG_COLOR_TYPE_RGB;
-+      _bit_depth = 8;
-     } else /* ptype == PIC8 */ {
-       linesize = w;
--      info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-+      _color_type = PNG_COLOR_TYPE_PALETTE;
-       if (numuniqcols <= 2)
--        info_ptr->bit_depth = 1;
-+        _bit_depth = 1;
-       else
-       if (numuniqcols <= 4)
--        info_ptr->bit_depth = 2;
-+        _bit_depth = 2;
-       else
-       if (numuniqcols <= 16)
--        info_ptr->bit_depth = 4;
-+        _bit_depth = 4;
-       else
--        info_ptr->bit_depth = 8;
-+        _bit_depth = 8;
- 
-       for (i = 0; i < numuniqcols; i++) {
-         palette[i].red   = r1[i];
-         palette[i].green = g1[i];
-         palette[i].blue  = b1[i];
-       }
--      info_ptr->num_palette = numuniqcols;
--      info_ptr->palette = palette;
-+/* cannot find a setter for this, unsure if it is necessary anymore...
-       info_ptr->valid |= PNG_INFO_PLTE;
-+*/
-+      /* set the header just in case it's needed */
-+      png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type,
-+        _interlace_type,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT);
-+      png_set_PLTE(png_ptr,info_ptr,palette,numuniqcols);
-     }
-   }
- 
-   else if (colorType == F_GREYSCALE || colorType == F_BWDITHER) {
--    info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
-+    _color_type = PNG_COLOR_TYPE_GRAY;
-     if (colorType == F_BWDITHER) {
-       /* shouldn't happen */
-       if (ptype == PIC24) FatalError("PIC24 and B/W Stipple in WritePNG()");
- 
--      info_ptr->bit_depth = 1;
-+      _bit_depth = 1;
-       if (MONO(r1[0], g1[0], b1[0]) > MONO(r1[1], g1[1], b1[1])) {
-         remap[0] = 1;
-         remap[1] = 0;
-@@ -595,7 +606,7 @@
-           png_destroy_write_struct(&png_ptr, &info_ptr);
-           return -1;
-         }
--        info_ptr->bit_depth = 8;
-+        _bit_depth = 8;
-       }
-       else /* ptype == PIC8 */ {
-         int low_precision;
-@@ -617,7 +628,7 @@
-         for (; i < 256; i++)
-           remap[i]=0;  /* shouldn't be necessary, but... */
- 
--        info_ptr->bit_depth = 8;
-+        _bit_depth = 8;
- 
-         /* Note that this fails most of the time because of gamma */
-            /* (and that would be a bug:  GRR FIXME) */
-@@ -636,7 +647,7 @@
-           for (i = 0; i < numuniqcols; i++) {
-             remap[i] &= 0xf;
-           }
--          info_ptr->bit_depth = 4;
-+          _bit_depth = 4;
- 
-           /* try to adjust to 2-bit precision grayscale */
- 
-@@ -652,7 +663,7 @@
-           for (i = 0; i < numuniqcols; i++) {
-             remap[i] &= 3;
-           }
--          info_ptr->bit_depth = 2;
-+          _bit_depth = 2;
- 
-           /* try to adjust to 1-bit precision grayscale */
- 
-@@ -668,7 +679,7 @@
-           for (i = 0; i < numuniqcols; i++) {
-             remap[i] &= 1;
-           }
--          info_ptr->bit_depth = 1;
-+          _bit_depth = 1;
-         }
-       }
-     }
-@@ -677,6 +688,9 @@
-   else
-     png_error(png_ptr, "Unknown colorstyle in WritePNG");
- 
-+  png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type,
-+    _interlace_type,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT);
-+
-   if ((text = (png_textp)malloc(sizeof(png_text)))) {
-     sprintf(software, "XV %s", REVDATE);
- 
-@@ -685,20 +699,22 @@
-     text->text = software;
-     text->text_length = strlen(text->text);
- 
--    info_ptr->max_text = 1;
--    info_ptr->num_text = 1;
--    info_ptr->text = text;
-+/* max_text seems to be internal only now, do not set
-+    info_ptr->max_text = 1; */
-+    png_set_text(png_ptr,info_ptr,text,1);
-   }
- 
-   Display_Gamma = gDial.val;  /* Save the current gamma for loading */
- 
- // GRR FIXME:  add .Xdefaults option to omit writing gamma (size, cumulative errors when editing)--alternatively, modify save box to include "omit" checkbox
--  info_ptr->gamma = 1.0/gDial.val;
--  info_ptr->valid |= PNG_INFO_gAMA;
-+  png_set_gAMA(png_ptr,info_ptr,1.0/gDial.val);
-+/* doesn't seem to be a way to set valid directly anymore, unnecessary maybe.. 
-+  info_ptr->valid |= PNG_INFO_gAMA; */
- 
-+/* might need to be png_write_info_before_PLTE() ... */
-   png_write_info(png_ptr, info_ptr);
- 
--  if (info_ptr->bit_depth < 8)
-+  if (_bit_depth < 8)
-     png_set_packing(png_ptr);
- 
-   pass=png_set_interlace_handling(png_ptr);
-@@ -711,13 +727,13 @@
-     int j;
-     p = pic;
-     for (j = 0; j < h; ++j) {
--      if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) {
-+      if (_color_type == PNG_COLOR_TYPE_GRAY) {
-         int k;
-         for (k = 0; k < w; ++k)
-           png_line[k] = ptype==PIC24 ? MONO(p[k*3], p[k*3+1], p[k*3+2]) :
-                                        remap[pc2nc[p[k]]];
-         png_write_row(png_ptr, png_line);
--      } else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) {
-+      } else if (_color_type == PNG_COLOR_TYPE_PALETTE) {
-         int k;
-         for (k = 0; k < w; ++k)
-           png_line[k] = pc2nc[p[k]];
-@@ -739,28 +755,31 @@
-         (savecmnt = (char *)malloc((strlen(picComments) + 1)*sizeof(char)))) {
-       png_textp tp;
-       char *comment, *key;
-+      int nt;
-+      int mt;
- 
-       strcpy(savecmnt, picComments);
-       key = savecmnt;
-+      png_get_text(png_ptr,info_ptr,&tp,&mt); /* to get 'max_text' */
-       tp = text;
--      info_ptr->num_text = 0;
-+      nt = 0;      
- 
-       comment = strchr(key, ':');
- 
-       do  {
-         /* Allocate a larger structure for comments if necessary */
--        if (info_ptr->num_text >= info_ptr->max_text)
-+        if (nt >= mt)
-         {
-           if ((tp =
--              realloc(text, (info_ptr->num_text + 2)*sizeof(png_text))) == NULL)
-+              realloc(text, (nt + 2)*sizeof(png_text))) == NULL)
-           {
-             break;
-           }
-           else
-           {
-             text = tp;
--            tp = &text[info_ptr->num_text];
--            info_ptr->max_text += 2;
-+            tp = &text[nt];
-+            mt += 2;
-           }
-         }
- 
-@@ -810,7 +829,7 @@
-             }
- 
-             tp->compression = tp->text_length > 640 ? 0 : -1;
--            info_ptr->num_text++;
-+            nt++;
-             tp++;
-           }
-         }
-@@ -834,27 +853,29 @@
-           tp->text = key;
-           tp->text_length = q - key;
-           tp->compression = tp->text_length > 750 ? 0 : -1;
--          info_ptr->num_text++;
-+          nt++;
-           key = NULL;
-         }
-       } while (key && *key);
-+      png_set_text(png_ptr,info_ptr,text,nt);
-     }
-     else {
--      info_ptr->num_text = 0;
-+      png_set_text(png_ptr,info_ptr,text,0);
-     }
-   }
--  info_ptr->text = text;
- 
--  png_convert_from_time_t(&(info_ptr->mod_time), time(NULL));
--  info_ptr->valid |= PNG_INFO_tIME;
-+  png_convert_from_time_t(&_mod_time, time(NULL));
-+  png_set_tIME(png_ptr,info_ptr,&_mod_time);
-+/* dunno how to set validity
-+  info_ptr->valid |= PNG_INFO_tIME; */
- 
-   png_write_end(png_ptr, info_ptr);
-   fflush(fp);   /* just in case we core-dump before finishing... */
- 
-   if (text) {
-     free(text);
--    /* must do this or png_destroy_write_struct() 0.97+ will free text again: */
--    info_ptr->text = (png_textp)NULL;
-+    /* must do this or png_destroy_write_struct() 0.97+ will free text again: 
-+    info_ptr->text = (png_textp)NULL; */
-     if (savecmnt)
-     {
-       free(savecmnt);
-@@ -886,6 +907,14 @@
-   int pass;
-   int gray_to_rgb;
-   size_t commentsize;
-+  /* temp storage vars for libpng15 migration */
-+  int         _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type,_num_text,_num_palette;
-+  png_uint_32 _width,_height;
-+  png_timep   _mod_time;
-+  double      _gamma;
-+  png_textp   _text;
-+  png_colorp  _palette;
-+  png_color_16p _background;
- 
-   fbasename = BaseName(fname);
- 
-@@ -921,7 +950,7 @@
-     FatalError("malloc failure in LoadPNG");
-   }
- 
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     fclose(fp);
-     png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-     if (!read_anything) {
-@@ -945,8 +974,10 @@
- #endif
-   png_read_info(png_ptr, info_ptr);
- 
--  pinfo->w = pinfo->normw = info_ptr->width;
--  pinfo->h = pinfo->normh = info_ptr->height;
-+  png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,&_interlace_type,NULL,NULL);
-+
-+  pinfo->w = pinfo->normw = _width;
-+  pinfo->h = pinfo->normh = _height;
-   if (pinfo->w <= 0 || pinfo->h <= 0) {
-     SetISTR(ISTR_WARNING, "%s:  image dimensions out of range (%dx%d)",
-       fbasename, pinfo->w, pinfo->h);
-@@ -957,9 +988,9 @@
-   pinfo->frmType = F_PNG;
- 
-   sprintf(pinfo->fullInfo, "PNG, %d bit ",
--          info_ptr->bit_depth * info_ptr->channels);
-+          _bit_depth * png_get_channels(png_ptr,info_ptr));
- 
--  switch(info_ptr->color_type) {
-+  switch(_color_type) {
-     case PNG_COLOR_TYPE_PALETTE:
-       strcat(pinfo->fullInfo, "palette color");
-       break;
-@@ -983,15 +1014,17 @@
- 
-   sprintf(pinfo->fullInfo + strlen(pinfo->fullInfo),
- 	  ", %sinterlaced. (%d bytes)",
--	  info_ptr->interlace_type ? "" : "non-", filesize);
-+	  _interlace_type ? "" : "non-", filesize);
- 
--  sprintf(pinfo->shrtInfo, "%lux%lu PNG", info_ptr->width, info_ptr->height);
-+  sprintf(pinfo->shrtInfo, "%lux%lu PNG", _width, _height);
- 
--  if (info_ptr->bit_depth < 8)
-+  if (_bit_depth < 8)
-       png_set_packing(png_ptr);
- 
--  if (info_ptr->valid & PNG_INFO_gAMA)
--    png_set_gamma(png_ptr, Display_Gamma, info_ptr->gamma);
-+  if (png_get_valid(png_ptr,info_ptr,PNG_INFO_gAMA)) {
-+    png_get_gAMA(png_ptr,info_ptr,&_gamma);
-+    png_set_gamma(png_ptr, Display_Gamma, _gamma);
-+  }
- /*
-  *else
-  *  png_set_gamma(png_ptr, Display_Gamma, 0.45);
-@@ -1000,7 +1033,7 @@
-   gray_to_rgb = 0;   /* quiet a compiler warning */
- 
-   if (have_imagebg) {
--    if (info_ptr->bit_depth == 16) {
-+    if (_bit_depth == 16) {
-       my_background.red   = imagebgR;
-       my_background.green = imagebgG;
-       my_background.blue  = imagebgB;
-@@ -1013,8 +1046,8 @@
-     }
-     png_set_background(png_ptr, &my_background, PNG_BACKGROUND_GAMMA_SCREEN,
-                        0, Display_Gamma);
--    if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
--         (info_ptr->color_type == PNG_COLOR_TYPE_GRAY && HAVE_tRNS)) &&
-+    if ((_color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
-+         (_color_type == PNG_COLOR_TYPE_GRAY && HAVE_tRNS)) &&
-         (imagebgR != imagebgG || imagebgR != imagebgB))  /* i.e., colored bg */
-     {
-       png_set_gray_to_rgb(png_ptr);
-@@ -1022,8 +1055,9 @@
-       gray_to_rgb = 1;
-     }
-   } else {
--    if (info_ptr->valid & PNG_INFO_bKGD) {
--      png_set_background(png_ptr, &info_ptr->background,
-+    if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
-+      png_get_bKGD(png_ptr,info_ptr,&_background);
-+      png_set_background(png_ptr, _background,
-                          PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
-     } else {
-       my_background.red = my_background.green = my_background.blue =
-@@ -1033,13 +1067,13 @@
-     }
-   }
- 
--  if (info_ptr->bit_depth == 16)
-+  if (_bit_depth == 16)
-     png_set_strip_16(png_ptr);
- 
--  if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
--      info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+  if (_color_type == PNG_COLOR_TYPE_GRAY ||
-+      _color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-   {
--    if (info_ptr->bit_depth == 1)
-+    if (_bit_depth == 1)
-       pinfo->colType = F_BWDITHER;
-     else
-       pinfo->colType = F_GREYSCALE;
-@@ -1049,9 +1083,11 @@
-   pass=png_set_interlace_handling(png_ptr);
- 
-   png_read_update_info(png_ptr, info_ptr);
-+  /* get HIDR again just in case the info_ptr changed */
-+  png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,&_interlace_type,NULL,NULL);
- 
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB ||
--     info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA || gray_to_rgb)
-+  if (_color_type == PNG_COLOR_TYPE_RGB ||
-+     _color_type == PNG_COLOR_TYPE_RGB_ALPHA || gray_to_rgb)
-   {
-     linesize = 3 * pinfo->w;
-     if (linesize/3 < pinfo->w) {   /* know pinfo->w > 0 (see above) */
-@@ -1065,16 +1101,17 @@
-   } else {
-     linesize = pinfo->w;
-     pinfo->type = PIC8;
--    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
--       info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
-+    if (_color_type == PNG_COLOR_TYPE_GRAY ||
-+       _color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
-       for (i = 0; i < 256; i++)
-         pinfo->r[i] = pinfo->g[i] = pinfo->b[i] = i;
-     } else {
-       pinfo->colType = F_FULLCOLOR;
--      for (i = 0; i < info_ptr->num_palette; i++) {
--        pinfo->r[i] = info_ptr->palette[i].red;
--        pinfo->g[i] = info_ptr->palette[i].green;
--        pinfo->b[i] = info_ptr->palette[i].blue;
-+      png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette);
-+      for (i = 0; i < _num_palette; i++) {
-+        pinfo->r[i] = _palette[i].red;
-+        pinfo->g[i] = _palette[i].green;
-+        pinfo->b[i] = _palette[i].blue;
-       }
-     }
-   }
-@@ -1092,7 +1129,7 @@
-     png_error(png_ptr, "can't allocate space for PNG image");
-   }
- 
--  png_start_read_image(png_ptr);
-+  /*png_start_read_image(png_ptr); -- causes a warning and seems to be unnecessary */
- 
-   for (i = 0; i < pass; i++) {
-     byte *p = pinfo->pic;
-@@ -1106,22 +1143,23 @@
- 
-   png_read_end(png_ptr, info_ptr);
- 
--  if (info_ptr->num_text > 0) {
-+  png_get_text(png_ptr,info_ptr,&_text,&_num_text);
-+  if (_num_text > 0) {
-     commentsize = 1;
- 
--    for (i = 0; i < info_ptr->num_text; i++)
--      commentsize += strlen(info_ptr->text[i].key) + 1 +
--                     info_ptr->text[i].text_length + 2;
-+    for (i = 0; i < _num_text; i++)
-+      commentsize += strlen(_text[i].key) + 1 +
-+                     _text[i].text_length + 2;
- 
-     if ((pinfo->comment = malloc(commentsize)) == NULL) {
-       png_warning(png_ptr,"can't allocate comment string");
-     }
-     else {
-       pinfo->comment[0] = '\0';
--      for (i = 0; i < info_ptr->num_text; i++) {
--        strcat(pinfo->comment, info_ptr->text[i].key);
-+      for (i = 0; i < _num_text; i++) {
-+        strcat(pinfo->comment, _text[i].key);
-         strcat(pinfo->comment, "::");
--        strcat(pinfo->comment, info_ptr->text[i].text);
-+        strcat(pinfo->comment, _text[i].text);
-         strcat(pinfo->comment, "\n");
-       }
-     }
-@@ -1143,7 +1181,7 @@
- {
-   SetISTR(ISTR_WARNING,"%s:  libpng error: %s", fbasename, message);
- 
--  longjmp(png_ptr->jmpbuf, 1);
-+  longjmp(png_jmpbuf(png_ptr), 1);
- }
- 
- 
diff --git a/community/xvba-video-open/PKGBUILD b/community/xvba-video-open/PKGBUILD
deleted file mode 100644
index b676215f2..000000000
--- a/community/xvba-video-open/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 77096 2012-10-04 19:43:11Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Jesse Jaara <gmail.com: jesse.jaara>
-
-pkgname=xvba-video-open
-pkgver=0.8.0
-pkgrel=1
-pkgdesc="OSS version of xvba-video lib to enable hw video acceleration on AMD's HD series of GFX cards"
-arch=('i686' 'x86_64')
-url="http://www.splitted-desktop.com/~gbeauchesne/xvba-video/"
-license=('GPL2')
-depends=('catalyst-utils' 'libva')
-makedepends=('mesa')
-options=(!libtool)
-source=(ftp://ftp.archlinux.org/other/community/xvba-video-open/xvba-video-${pkgver}.tar.gz
-        http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz)
-md5sums=('d9ddec2e7f02c1fa533773918e88e311'
-         'b8f56bc55aa70cb19dd12857fdc184cc')
-
-build() {
-  cd "${srcdir}/xvba-video-${pkgver}"
-
-  export CPPFLAGS="${CPPFLAGS} -I${srcdir}/include"
-  
-  ./configure --disable-debug --enable-libxvba-dlopen --prefix=/usr
-  make PYTHON=python2
-}
-
-package() {
-  cd "${srcdir}/xvba-video-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/xvkbd/PKGBUILD b/community/xvkbd/PKGBUILD
index 631d31c17..bbdc4c545 100644
--- a/community/xvkbd/PKGBUILD
+++ b/community/xvkbd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67325 2012-03-08 16:34:46Z spupykin $
+# $Id: PKGBUILD 88530 2013-04-19 10:33:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Benjamin Andresen <benny@klapmuetz.org>
 # Contributor: Mikko Seppдlд <t-r-a-y@mbnet.fi>
 
 pkgname=xvkbd
-pkgver=3.3
+pkgver=3.4a
 pkgrel=1
 pkgdesc="virtual (graphical) keyboard program for X Window System"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('libxmu' 'xaw3d' 'glibc' 'libxt' 'libxtst' 'libxp' 'libxpm')
 makedepends=('imake')
 source=(http://homepage3.nifty.com/tsato/xvkbd/xvkbd-$pkgver.tar.gz)
-md5sums=('8495402211a610293563a749bb45a0f0')
+md5sums=('3d996ba9f84b5ed2392f9809ada22711')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/yabause-gtk/PKGBUILD b/community/yabause-gtk/PKGBUILD
new file mode 100755
index 000000000..d902e0f26
--- /dev/null
+++ b/community/yabause-gtk/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 86073 2013-03-11 21:44:40Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: Harley Laue <losinggeneration@gmail.com>
+# Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>
+# Contributor: Anton Shestakov <engoredi@ya.ru>
+# Contributor: Tiago Camargo <tcamargo@gmail.com>
+# Contributor: robb_force <robb_force@holybuffalo.net>
+
+pkgname=yabause-gtk
+pkgver=0.9.12
+pkgrel=2
+pkgdesc='A Sega Saturn emulator'
+arch=('i686' 'x86_64' 'mips64el')
+url="http://yabause.org/"
+license=('GPL')
+depends=('freeglut' 'gtkglext' 'openal' 'sdl')
+makedepends=('cmake' 'mesa')
+conflicts=('yabause-qt')
+source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname%-*}-${pkgver}.tar.gz" 'rwx.patch')
+sha256sums=('f45c9649c379e1e790856f8dfa37d93be5638e8f697319b241951316f817bfb1'
+            'd29997d3249683081a2687f31e777f917093101d56815d22103aaaf22ac786b1')
+
+build() {
+  cd "${srcdir}"/${pkgname%-*}-${pkgver}
+
+# Patch
+  patch -Np1 -i "${srcdir}"/rwx.patch
+
+# Build
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=on -DYAB_PERKEYNAME=ON
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname%-*}-${pkgver}/build
+
+# Install
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/yabause-gtk/rwx.patch b/community/yabause-gtk/rwx.patch
new file mode 100755
index 000000000..bb0491b37
--- /dev/null
+++ b/community/yabause-gtk/rwx.patch
@@ -0,0 +1,20 @@
+--- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
++++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
+@@ -747,3 +747,7 @@ breakpoint:
+ 	ret
+ 	/* Set breakpoint here for debugging */
+ 	.size	breakpoint, .-breakpoint
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+--- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
++++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
+@@ -743,3 +743,7 @@ breakpoint:
+ 	ret
+ 	/* Set breakpoint here for debugging */
+ 	.size	breakpoint, .-breakpoint
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/community/yabause-qt/PKGBUILD b/community/yabause-qt/PKGBUILD
new file mode 100755
index 000000000..38b8f0a0a
--- /dev/null
+++ b/community/yabause-qt/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 86075 2013-03-11 21:47:54Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: Harley Laue <losinggeneration@gmail.com>
+# Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>
+# Contributor: Anton Shestakov <engoredi@ya.ru>
+# Contributor: Tiago Camargo <tcamargo@gmail.com>
+# Contributor: robb_force <robb_force@holybuffalo.net>
+
+pkgname=yabause-qt
+pkgver=0.9.12
+pkgrel=1
+pkgdesc='A Sega Saturn emulator'
+arch=('i686' 'x86_64' 'mips64el')
+url="http://yabause.org/"
+license=('GPL')
+depends=('freeglut' 'mesa' 'openal' 'qt4' 'sdl')
+makedepends=('cmake' 'glu')
+conflicts=('yabause-gtk')
+source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname%-*}-${pkgver}.tar.gz" 'rwx.patch')
+sha256sums=('f45c9649c379e1e790856f8dfa37d93be5638e8f697319b241951316f817bfb1'
+            'd29997d3249683081a2687f31e777f917093101d56815d22103aaaf22ac786b1')
+
+build() {
+  cd "${srcdir}"/${pkgname%-*}-${pkgver}
+
+# Patch
+  patch -Np1 -i "${srcdir}"/rwx.patch
+
+# Build
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DYAB_PORTS=qt -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=on -DYAB_PERKEYNAME=ON
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname%-*}-${pkgver}/build
+
+# Install
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/yabause-qt/rwx.patch b/community/yabause-qt/rwx.patch
new file mode 100755
index 000000000..bb0491b37
--- /dev/null
+++ b/community/yabause-qt/rwx.patch
@@ -0,0 +1,20 @@
+--- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
++++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
+@@ -747,3 +747,7 @@ breakpoint:
+ 	ret
+ 	/* Set breakpoint here for debugging */
+ 	.size	breakpoint, .-breakpoint
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+--- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
++++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
+@@ -743,3 +743,7 @@ breakpoint:
+ 	ret
+ 	/* Set breakpoint here for debugging */
+ 	.size	breakpoint, .-breakpoint
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/community/yacpi/PKGBUILD b/community/yacpi/PKGBUILD
index e484be041..bec79ec8e 100644
--- a/community/yacpi/PKGBUILD
+++ b/community/yacpi/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=yacpi
 pkgver=3.0.1
-pkgrel=3
+pkgrel=3.1
 pkgdesc="ncurses-based acpi monitor."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ngolde.de/yacpi.html"
diff --git a/community/yagf/PKGBUILD b/community/yagf/PKGBUILD
index 204be06b7..10844f3a5 100644
--- a/community/yagf/PKGBUILD
+++ b/community/yagf/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 76879 2012-10-01 15:20:01Z spupykin $
+# $Id: PKGBUILD 85428 2013-03-01 10:43:02Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: das-ich <das-ich@yandex.ru>
 
 pkgname=yagf
 pkgver=0.9.2
-pkgrel=2
+pkgrel=3
 pkgdesc="QT4-based GUI for Cuneiform and Tesseract OCRs"
 arch=(i686 x86_64 'mips64el')
 url="http://symmetrica.net/cuneiform-linux/yagf-en.html"
 license=('GPL')
-depends=('qt>=4.3' 'aspell')
+depends=('qt4' 'aspell')
 optdepends=('cuneiform: recognition tool'
 	    'tesseract: recognition tool'
 	    'xsane: acquire images from a scanner into YAGF directly')
@@ -22,6 +22,10 @@ build() {
   cd "${srcdir}/${pkgname}-$pkgver"
   cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release .
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-$pkgver"
   make DESTDIR=${pkgdir} install
   [ -d $pkgdir/usr/lib64 ] && mv $pkgdir/usr/lib64 $pkgdir/usr/lib || true
 }
diff --git a/community/yamdi/PKGBUILD b/community/yamdi/PKGBUILD
index 1aa9f795d..d4ef6f03f 100644
--- a/community/yamdi/PKGBUILD
+++ b/community/yamdi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=yamdi
 pkgver=1.9
 pkgrel=1
 pkgdesc="A metadata injector for FLV files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://yamdi.sourceforge.net/"
 license=('custom:BSD')
 depends=('glibc')
diff --git a/community/yaml-cpp/PKGBUILD b/community/yaml-cpp/PKGBUILD
index e87b249b8..47a77d7db 100644
--- a/community/yaml-cpp/PKGBUILD
+++ b/community/yaml-cpp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 82853 2013-01-25 03:41:30Z svenstaro $
+# $Id: PKGBUILD 89824 2013-05-02 16:13:14Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Markus Martin <markus@archwyrm.net>
 pkgname=yaml-cpp
-pkgver=0.5.0
+pkgver=0.5.1
 pkgrel=1
 pkgdesc="YAML parser and emitter in C++, written around the YAML 1.2 spec"
 url="http://code.google.com/p/yaml-cpp/"
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 makedepends=('cmake' 'boost')
 source=(http://yaml-cpp.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('c6d96190434d5959d814c603f98512c6')
+md5sums=('0fa47a5ed8fedefab766592785c85ee7')
 
 build() {
     cd $srcdir/$pkgname-$pkgver
diff --git a/community/yaml-cpp0.3/PKGBUILD b/community/yaml-cpp0.3/PKGBUILD
index f8f7da315..302acb91b 100644
--- a/community/yaml-cpp0.3/PKGBUILD
+++ b/community/yaml-cpp0.3/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.3.0
 pkgrel=2
 pkgdesc="YAML parser and emitter in C++, written around the YAML 1.2 spec"
 url="http://code.google.com/p/yaml-cpp/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 conflicts=('yaml-cpp')
 provides=('yaml-cpp=0.3')
diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD
index 402d60541..0b32e20c4 100644
--- a/community/yaws/PKGBUILD
+++ b/community/yaws/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82428 2013-01-17 13:32:57Z arodseth $
-# Maintainer: Vesa Kaihlavirta
+# $Id: PKGBUILD 88640 2013-04-20 21:08:12Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Patrick Smits <mail@patricksmits.net>
 
 pkgname=yaws
-pkgver=1.95
-pkgrel=4
+pkgver=1.96
+pkgrel=1
 pkgdesc='Yet Another Web Server, pure Erlang HTTP server/framework'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://yaws.hyber.org/'
@@ -14,20 +14,25 @@ depends=('pam' 'erlang')
 backup=('etc/yaws/yaws.conf')
 options=('!emptydirs')
 install=$pkgname.install
-optdepends=('erlang-nox: erlang without X')
+optdepends=('erlang-nox: Erlang without X (headless)')
 source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz"
         "$pkgname.service")
-sha256sums=('e4efae836561f5e8a1324a5c9ab63fb82468e9dc93dc95cb4cb6248ab6b95406'
+sha256sums=('8d4f16d18937335ac021ca4c65c8ee81dc4d71f133718c7148856cc6bf1f55e2'
             '3f8347add6e3741e77f7bb9ba6b31feb1c878e2e58ecf19063891e801fa24698')
 
-build() {
+prepare() {
   cd "$pkgname-$pkgver"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   # python2 fix
   for file in cgi.yaws cgi-bin/foo.py; do
 	  sed -i '0,/on/s//on2/' "www/$file"
   done
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }
 
diff --git a/community/yaws/yaws.profile b/community/yaws/yaws.profile
deleted file mode 100644
index 57303c1f8..000000000
--- a/community/yaws/yaws.profile
+++ /dev/null
@@ -1 +0,0 @@
-export PATH=$PATH:/opt/yaws/bin
diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD
index 3eb6ba72a..1527540d1 100644
--- a/community/yaz/PKGBUILD
+++ b/community/yaz/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 82691 2013-01-23 00:16:01Z eric $
+# $Id: PKGBUILD 88599 2013-04-20 16:23:14Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,7 +7,7 @@
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 
 pkgname=yaz
-pkgver=4.2.49
+pkgver=4.2.54
 pkgrel=1
 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ depends=('openssl' 'libxslt' 'icu')
 options=('!libtool')
 changelog=$pkgname.changelog
 source=(http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('b4dd27100fdf18219a0e1fde53eaf385e426db6795ab4fbb4a01796d4c9056a1')
+sha256sums=('a11fb3b7129bec80311f8e27a0717b9bf6d7c56049674bb5477b91e7e98d2087')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/yaz/yaz.changelog b/community/yaz/yaz.changelog
index 2124e895e..27f48a9c4 100644
--- a/community/yaz/yaz.changelog
+++ b/community/yaz/yaz.changelog
@@ -1,2 +1,5 @@
+2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* yaz 4.2.54-1
+
 2013-01-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* yaz 4.2.49-1
diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD
index ceb1748c8..d11cfdb2b 100644
--- a/community/zathura-pdf-mupdf/PKGBUILD
+++ b/community/zathura-pdf-mupdf/PKGBUILD
@@ -4,16 +4,16 @@
 # Contributor: Moritz Lipp <mlq@pwmt.org>
 
 pkgname=zathura-pdf-mupdf
-pkgver=0.2.2
-pkgrel=1
+pkgver=0.2.3
+pkgrel=2
 pkgdesc="Adds pdf support to zathura by using the mupdf library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/"
 license=('custom')
 depends=('mupdf>=1.1' 'zathura')
 conflicts=('zathura-pdf-poppler')
 source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz")
-md5sums=('b66656d7c8cede5db92e1f66e472985d')
+md5sums=('777ba69a321ef4bb9cbced8f6733927a')
 
 build() {
   make -C "${srcdir}/$pkgname-$pkgver"
diff --git a/community/zeitgeist-datahub/PKGBUILD b/community/zeitgeist-datahub/PKGBUILD
deleted file mode 100644
index 535899a65..000000000
--- a/community/zeitgeist-datahub/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 79124 2012-10-30 23:06:48Z heftig $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Leontius Adhika Pradhana <leon@leapon.net>
-# Contributor: Ner0
-
-pkgname=zeitgeist-datahub
-pkgver=0.9.5
-pkgrel=2
-pkgdesc="Provides passive plugins which insert events into Zeitgeist"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/zeitgeist-datahub"
-license=('GPL3')
-depends=('libzeitgeist' 'json-glib' 'gtk2' 'telepathy-glib' 'zeitgeist')
-makedepends=('intltool' 'vala')
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('b2b76b82b67363c45e5fe4f39a172775')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community/zile/PKGBUILD b/community/zile/PKGBUILD
index 4ed801004..34665a8fb 100644
--- a/community/zile/PKGBUILD
+++ b/community/zile/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=zile
 pkgver=2.4.9
 pkgrel=1
 pkgdesc="A small, fast, and powerful Emacs clone"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/zile/"
 license=('GPL3')
 depends=('acl' 'gc' 'ncurses')