Sat Nov 3 01:13:31 PDT 2012

20 files changed, 163 insertions, 100 deletions

diff --git a/community/calf/PKGBUILD b/community/calf/PKGBUILD
index c6de08cdf..5d87b4067 100644
--- a/community/calf/PKGBUILD
+++ b/community/calf/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79263 2012-11-02 00:01:25Z arodseth $
+# $Id: PKGBUILD 79299 2012-11-02 14:14:33Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 
 pkgname=calf
 pkgver=0.0.19
-pkgrel=2
+pkgrel=3
 pkgdesc='LV2/DSSI/LADSPA plug-ins suite and standalone JACK host'
 arch=('x86_64' 'i686')
 url='http://calf.sf.net/'
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index e6e8d4035..51668779b 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79255 2012-11-01 21:56:27Z spupykin $
+# $Id: PKGBUILD 79325 2012-11-02 19:21:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hedgewars
 pkgver=0.9.18
-pkgrel=2
+pkgrel=3
 pkgdesc="Free Worms-like turn based strategy game"
 arch=('i686' 'x86_64')
 url="http://hedgewars.org"
@@ -15,10 +15,10 @@ makedepends=('fpc' 'cmake'
 	     'haskell-network' 'haskell-bytestring-show'
 	     'haskell-utf8-string' 'haskell-dataenc'
 	     'haskell-hslogger' 'haskell-vector')
-source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver-2.tar.bz2
+source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver-3.tar.bz2
 	hedgewars.desktop
 	hedgewars.png)
-md5sums=('94f6c998591e2fae18e8e2d173e1fe93'
+md5sums=('02465736fdcf48feea1cacaa0aa5960e'
          '48c66a3204d4fa0a69e9aa46f7c31e0c'
          'eeb14d50df39063549ac5eca9dbc65d1')
 
diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD
index c93ffb015..a97a36fd0 100644
--- a/community/ibus-anthy/PKGBUILD
+++ b/community/ibus-anthy/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 68017 2012-03-17 00:56:59Z ebelanger $
+# $Id: PKGBUILD 79278 2012-11-02 10:15:38Z bpiotrowski $
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars at gmail dot com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ibus-anthy
-pkgver=1.2.7
+pkgver=1.4.99.20121006 
 pkgrel=1
-pkgdesc="Japanese input method Anthy IMEngine for IBus Framework"
+pkgdesc='Japanese input method Anthy IMEngine for IBus Framework'
 arch=('i686' 'x86_64')
 license=('LGPL')
-url="http://ibus.googlecode.com"
-depends=('ibus' 'anthy' 'python2')
+url='http://ibus.googlecode.com'
+depends=('ibus' 'anthy' 'python2' 'pygtk')
 makedepends=('swig' 'intltool')
 options=('!libtool')
 source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('091a13ff950171981768463993ffb683')
+md5sums=('518aa503ce40054e0027f2a79c9df640')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-# python2 fix
+  cd $srcdir/$pkgname-$pkgver
+
+  # python2 fix
   for file in setup/ibus-setup-anthy.in engine/ibus-engine-anthy.in; do
     sed -i 's_exec python_exec python2_' $file
   done
@@ -28,6 +29,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir/ install
 }
diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD
index 77dd0435f..3046d605d 100644
--- a/community/libfm/PKGBUILD
+++ b/community/libfm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79227 2012-11-01 10:30:17Z bpiotrowski $
+# $Id: PKGBUILD 79276 2012-11-02 10:03:48Z 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=1
+pkgrel=2
 pkgdesc="A library for file management"
 url="http://pcmanfm.sourceforge.net/"
 arch=('i686' 'x86_64')
@@ -31,4 +31,8 @@ build() {
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
+
+  # Temporary fix to FS#32361
+  rm $pkgdir/usr/include/libfm
+  mv $pkgdir/usr/include/libfm-1.0/ $pkgdir/usr/include/libfm 
 }
diff --git a/community/libpaper/PKGBUILD b/community/libpaper/PKGBUILD
index 395f66806..113fe83f1 100644
--- a/community/libpaper/PKGBUILD
+++ b/community/libpaper/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 67411 2012-03-11 13:41:08Z cbrannon $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 79303 2012-11-02 14:41:55Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: royrocks <royrocks13@gmail.com>
 
 pkgname=libpaper
 pkgver=1.1.24
-pkgrel=2
-pkgdesc="Library for handling paper characteristics"
-arch=('i686' 'x86_64')
-url="http://packages.debian.org/unstable/source/libpaper"
+pkgrel=3
+pkgdesc='Library for handling paper characteristics'
+arch=('x86_64' 'i686')
+url='http://packages.debian.org/unstable/source/libpaper'
 license=('GPL')
-source=(http://ftp.debian.org/debian/pool/main/libp/libpaper/libpaper_${pkgver}.tar.gz)
-md5sums=('5bc87d494ba470aba54f6d2d51471834')
+source=("http://ftp.de.debian.org/debian/pool/main/libp/$pkgname/${pkgname}_$pkgver+nmu2.tar.gz")
+sha256sums=('c5bdd6d9dff179699160675dbb61651d9b3158f6da27558fdaba00e7c427ba96')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver+nmu2
   ./configure --prefix=/usr \
   	--mandir=$pkgdir/usr/share/man \
 	--sysconfdir=/etc
@@ -21,6 +22,8 @@ build() {
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver+nmu2
   make prefix=$pkgdir/usr install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 830e9fee7..505767fd8 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79047 2012-10-29 16:19:15Z spupykin $
+# $Id: PKGBUILD 79301 2012-11-02 14:27:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=0.10.2
-pkgrel=4
+pkgver=1.0.0
+pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -36,11 +36,11 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	libvirtd-guests.conf.d
 	libvirt.tmpfiles.d
 	openbsd-netcat-default.patch)
-md5sums=('a5e50860d9da238ba270b528411c4a0d'
+md5sums=('7c8b006de7338e30866bb56738803b21'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          'b47419dfd8c40d1b37fae6576d07baa0'
-         'bc2971dacdbac967fc3474e50affc345'
+         '0a96ed876ffb1fcb9dff5a9b3a609c1e'
          '8d98e62915785686b0b6c8c070628392'
          '456723b41903d3aaa7ec948c1feea265')
 
@@ -86,6 +86,10 @@ 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 \
 	$pkgdir/etc/sysconfig \
diff --git a/community/libvirt/libvirt.install b/community/libvirt/libvirt.install
index 3881386d2..32c28d559 100644
--- a/community/libvirt/libvirt.install
+++ b/community/libvirt/libvirt.install
@@ -1,4 +1,5 @@
 _libvirt_setup() {
+  systemd-tmpfiles --create libvirt.conf
   rm -f /usr/lib/python?.?/site-packages/libvirt.pyc
   echo ">>> To use libvirt as a non-root user:"
   echo ">>>  Use polkit to grant access."
@@ -16,16 +17,16 @@ post_install() {
   echo ">>> Add 'libvirtd' to daemons in /etc/rc.conf if you want it to load upon"
   echo ">>>  booting."
   echo ""
-  /bin/true
 }
 
 post_upgrade() {
   _libvirt_setup || return 1
-  echo ">>> To finish the upgrade, restart libvirtd by running the command:"
-  echo ">>>  '/etc/rc.d/libvirtd restart' as root or rebooting."
+  echo ">>> To finish the upgrade, restart libvirtd by:"
+  echo ">>>  'systemctl restart libvirtd' as root (systemd) or"
+  echo ">>>  '/etc/rc.d/libvirtd restart' as root (initscripts) or"
+  echo ">>>  rebooting."
   echo ">>> You may also need to run 'rm -rf ~/.libvirt'"
   echo ""
-  /bin/true
 }
 
 post_remove() {
@@ -34,5 +35,4 @@ post_remove() {
    echo ">>>  It can be removed by running 'groupdel libvirt' as root."
    echo ""
    depmod -a
-   /bin/true
 }
diff --git a/community/libvirt/libvirtd-guests.conf.d b/community/libvirt/libvirtd-guests.conf.d
index 02a933715..dd987611b 100644
--- a/community/libvirt/libvirtd-guests.conf.d
+++ b/community/libvirt/libvirtd-guests.conf.d
@@ -8,4 +8,4 @@ LIBVIRTD_BYPASS_CACHE=""
 
 LIBVIRTD_START_DELAY=0
 
-LIBVIRTD_SHUTDOWN_TIMEOUT=3
+LIBVIRTD_SHUTDOWN_TIMEOUT=60
diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD
index 2fc5cefaa..4ef4daa5b 100644
--- a/community/luajit/PKGBUILD
+++ b/community/luajit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79221 2012-11-01 10:19:51Z bpiotrowski $
+# $Id: PKGBUILD 79274 2012-11-02 08:02:31Z bpiotrowski $
 # Maintainer:  Chris Brannon <chris@the-brannons.com>
 # Maintainer:  Bartłomiej Piotrowski 
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
@@ -6,20 +6,17 @@
 
 pkgname=luajit
 pkgver=2.0.0rc1
-pkgrel=1
+pkgrel=2
 pkgdesc='A Just-In-Time Compiler for Lua'
 arch=('i686' 'x86_64')
 url='http://luajit.org/'
 license=('MIT')
 depends=('gcc-libs') 
-source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz
-        Makefile.patch)
-md5sums=('26dc243c12cab80b8fe2d9cfa02a81a6'
-         'c9dff2a84424fa0af322379a5f115fb7')
+source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz)
+md5sums=('26dc243c12cab80b8fe2d9cfa02a81a6')
 
 build() { 
   cd $srcdir/LuaJIT-${pkgver/rc1}
-  patch -Np0 -i $srcdir/Makefile.patch
   make PREFIX=/usr
 }
 
@@ -29,7 +26,4 @@ package() {
 
   install -Dm644 $srcdir/LuaJIT-${pkgver/rc1}/COPYRIGHT \
                  $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
-
-  # Poor man's slot system
-  ln -s /usr/share/$pkgname $pkgdir/usr/share/$pkgname-${pkgver/rc1}
 }
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index 7f2076dab..ea741af17 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 76403 2012-09-17 10:17:02Z spupykin $
+# $Id: PKGBUILD 79291 2012-11-02 13:50:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
@@ -7,15 +7,15 @@
 
 pkgname=minidlna
 pkgver=1.0.25
-pkgrel=2
+pkgrel=3
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/minidlna/"
 license=('GPL')
 depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg' 'sqlite')
-conflicts=('minidlna-cvs')
 backup=('etc/minidlna.conf'
 	'etc/conf.d/minidlna')
+install=minidlna.install
 changelog=changelog
 source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz
 	minidlna.rc
@@ -29,6 +29,7 @@ md5sums=('d966256baf2f9b068b9de871ab5dade5'
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   sed -i 's|DB_PATH=.*|DB_PATH=/var/cache/minidlna|' genconfig.sh
+  find -type f -name '*.c' -exec sed -i '1,1i#include </usr/include/time.h>' {} \;
   make
 }
 
diff --git a/community/minidlna/minidlna.install b/community/minidlna/minidlna.install
new file mode 100644
index 000000000..c9cdc0f13
--- /dev/null
+++ b/community/minidlna/minidlna.install
@@ -0,0 +1,7 @@
+post_install() {
+  systemd-tmpfiles --create minidlna.conf
+}
+
+post_upgrade() {
+  systemd-tmpfiles --create minidlna.conf
+}
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 3fde55c5c..9214b3fa6 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 76844 2012-10-01 05:33:09Z svenstaro $
+# $Id: PKGBUILD 79282 2012-11-02 11:36:48Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Mathias Stearn <mathias@10gen.com>
 # Contributor: Alec Thomas
 
 pkgname=mongodb
-pkgver=2.2.0
-pkgrel=2
+pkgver=2.2.1
+pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64')
 url='http://www.mongodb.org'
@@ -20,7 +20,7 @@ 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')
-md5sums=('832bdb6cc659176fd8d6b16a660ccfc6'
+md5sums=('f41ee6fd3ac3f21ac5309db3e20e10ea'
          '9c67e00f4626ad761a8f7d4e037a54d7'
          '4839fe1d638187ca3226e8267b947318'
          '96ab4517b48974ce0e566d9746a75a4f'
@@ -28,6 +28,7 @@ md5sums=('832bdb6cc659176fd8d6b16a660ccfc6'
          'da8a9d78e4a38d1ed8e92a210d4b5ba7')
 
 build() {
+  # fucking mongo aint no fun to package
   export SCONSFLAGS="$MAKEFLAGS"
 
   cd mongodb-src-r${pkgver}
@@ -66,6 +67,7 @@ package() {
   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/
-  rm -r ${pkgdir}/usr/lib64
+  mv ${pkgdir}/usr/lib64/libmongoclient.a ${pkgdir}/usr/lib/ || true
+  rm -r ${pkgdir}/usr/lib64 || true
+
 }
diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD
index b82c2491d..ce5b87fad 100644
--- a/community/paraview/PKGBUILD
+++ b/community/paraview/PKGBUILD
@@ -5,19 +5,19 @@
 
 pkgname=paraview
 pkgver=3.14.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Parallel Visualization Application using VTK'
 arch=('i686' 'x86_64')
 url='http://www.paraview.org'
 license=('custom')
 depends=('qt' 'python2' 'libgl' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit'
-         'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'libcgns2'
+         'libmysqlclient' 'openmpi' 'boost-libs' 'libcgns2'
          # export as avi support
          #'ffmpeg'
          # The following is a list of libraries we explicitly tell cmake to use the system library of
          'hdf5' 'freetype2' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'expat' 'libxml2' 'libtheora'
         )
-makedepends=('cmake' 'desktop-file-utils' 'boost')
+makedepends=('cmake' 'desktop-file-utils' 'boost' 'mesa')
 source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}-Source.tar.gz"
         'paraview.png'
         'paraview.desktop'
diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD
index b14f42de7..b6d54a1d6 100644
--- a/community/perl-params-validate/PKGBUILD
+++ b/community/perl-params-validate/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71825 2012-06-02 10:31:58Z bluewind $
+# $Id: PKGBUILD 79319 2012-11-02 19:11:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-params-validate
-pkgver=1.06
-pkgrel=3
+pkgver=1.07
+pkgrel=1
 pkgdesc="Validate sub params against a spec"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/Params-Validate"
@@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic')
 depends=('perl' 'perl-module-implementation')
 options=('!emptydirs')
 source=("http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-${pkgver}.tar.gz")
-md5sums=('4f7a281269cd30d7c3994ba5acb50857')
+md5sums=('7cb0e18bd547f3ba9c492712d1795ac6')
 
 build() {
   cd  Params-Validate-${pkgver}
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index df7d3f3f0..8f8d7477e 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78790 2012-10-24 21:59:59Z arodseth $
+# $Id: PKGBUILD 79309 2012-11-02 16:29:05Z spupykin $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: phrakture <aaronmgriffin--gmail--com>
 # Contributor: Fazlul Shahriar
@@ -6,8 +6,8 @@
 
 pkgname=plan9port
 pkgver=20121022
-pkgrel=1
-pkgdesc='Port of many programs from Plan 9'
+pkgrel=2
+pkgdesc="A port of many programs from Plan 9 to Unix-like operating systems"
 arch=('i686' 'x86_64')
 url="http://swtch.com/plan9port/"
 license=('custom')
@@ -15,6 +15,7 @@ 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'
             '0247c4446497359d305aaec069b07180fbf79ce4fa5191464cd9ebb8c7f0228d')
@@ -60,4 +61,12 @@ package() {
     install -m644 $i "$pkgdir/usr/share/doc/$pkgname"
     rm -f $i
   done
+
+  echo "==> Decompressing plan9 man pages"
+  for i in `find /opt/plan9/man -type f`; do
+    if [ ${i##*.} = "gz" ]; then
+#      echo "    ${i%%.*}..."
+      gunzip $i
+    fi
+  done
 }
diff --git a/community/plan9port/plan9.install b/community/plan9port/plan9.install
index 97ca74fa6..5c76552f3 100644
--- a/community/plan9port/plan9.install
+++ b/community/plan9port/plan9.install
@@ -1,12 +1,4 @@
 post_install() {
-  echo "==> Decompressing plan9 man pages"
-  for i in `find /opt/plan9/man -type f`; do
-    if [ ${i##*.} = "gz" ]; then
-#      echo "    ${i%%.*}..."
-      gunzip $i
-    fi
-  done
-
   echo ""
   echo "==> In order to use Plan9 specific apps, run them"
   echo "    as arguments to the '9' script, i.e. '9 date'"
@@ -15,16 +7,15 @@ post_install() {
   source /etc/profile.d/plan9.sh
 }
 
-pre_upgrade() {
-  post_remove
-}
-
 post_upgrade() {
   post_install
 }
 
+pre_upgrade() {
+  post_remove
+}
+
 post_remove() {
   #we had to unpack them so they won't get removed....
   rm -rf /opt/plan9/man
 }
-
diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD
index 2e0e43573..7e56b4be0 100644
--- a/community/tigervnc/PKGBUILD
+++ b/community/tigervnc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73952 2012-07-17 11:36:12Z spupykin $
+# $Id: PKGBUILD 79289 2012-11-02 13:49:13Z 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=7
+pkgrel=8
 _xorgver=1.12.3
 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC."
 arch=('i686' 'x86_64')
@@ -16,11 +16,12 @@ 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')
+	     'xtrans' 'mesa' 'glproto' 'dri2proto')
 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
 	xorg111.patch
 	xorg112.patch
 	gnutls.patch
@@ -28,6 +29,7 @@ source=(http://downloads.sourceforge.net/tigervnc/${pkgname}-${pkgver}.tar.gz
 	cmakelists.patch)
 md5sums=('3a5755b4ed600a81c3a17976c6f8420d'
          '65a53b11bc01dcc97ee9b201dc620c32'
+         'ce06ff57ba53bd386d71249dfc3cb719'
          'b680b55f7f9f569cd26ac0b330012a8b'
          'f73e055153889ae7b5aac8e697f7a841'
          '1a5fe8867ab3e49e20aafc70c415494f'
@@ -66,4 +68,5 @@ package() {
   cd unix/xserver/hw/vnc
   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
 }
diff --git a/community/tigervnc/vncserver.service b/community/tigervnc/vncserver.service
new file mode 100644
index 000000000..85f77b9a0
--- /dev/null
+++ b/community/tigervnc/vncserver.service
@@ -0,0 +1,44 @@
+# The vncserver service unit file
+#
+# Quick HowTo:
+# 1. Copy this file to /etc/systemd/system/vncserver@:<display>.service
+# 2. Edit <USER> and vncserver parameters appropriately
+#   ("su <USER> -c /usr/bin/vncserver %i -arg1 -arg2")
+# 3. Run `systemctl daemon-reload`
+# 4. Run `systemctl enable vncserver@:<display>.service`
+#
+# DO NOT RUN THIS SERVICE if your local area network is
+# untrusted!  For a secure way of using VNC, you should
+# limit connections to the local host and then tunnel from
+# the machine you want to view VNC on (host A) to the machine
+# whose VNC output you want to view (host B)
+#
+# [user@hostA ~]$ ssh -v -C -L 590N:localhost:590M hostB
+#
+# this will open a connection on port 590N of your hostA to hostB's port 590M
+# (in fact, it ssh-connects to hostB and then connects to localhost (on hostB).
+# See the ssh man page for details on port forwarding)
+#
+# You can then point a VNC client on hostA at vncdisplay N of localhost and with
+# the help of ssh, you end up seeing what hostB makes available on port 590M
+#
+# Use "-nolisten tcp" to prevent X connections to your VNC server via TCP.
+#
+# Use "-localhost" to prevent remote VNC clients connecting except when
+# doing so through a secure tunnel.  See the "-via" option in the
+# `man vncviewer' manual page.
+
+
+[Unit]
+Description=Remote desktop service (VNC)
+After=syslog.target network.target
+
+[Service]
+Type=forking
+# Clean any existing files in /tmp/.X11-unix environment
+ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || true'
+ExecStart=/bin/su <USER> -c "/usr/bin/vncserver %i"
+ExecStop=/bin/su <USER> -c "/usr/bin/vncserver -kill %i"
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/grantlee/PKGBUILD b/extra/grantlee/PKGBUILD
index 5acc48479..23721cd2e 100644
--- a/extra/grantlee/PKGBUILD
+++ b/extra/grantlee/PKGBUILD
@@ -1,21 +1,19 @@
-# $Id: PKGBUILD 142010 2011-11-03 23:27:16Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 170108 2012-11-02 08:45:56Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=grantlee
-pkgver=0.2.0
+pkgver=0.3.0
 pkgrel=1
 pkgdesc="A string template engine based on the Django template system and written in Qt"
 arch=('i686' 'x86_64')
 url="http://www.gitorious.org/grantlee/pages/Home"
 license=('LGPL3')
 depends=('qt')
-makedepends=('cmake')
+makedepends=('cmake' 'doxygen')
 source=("http://downloads.grantlee.org/${pkgname}-${pkgver}.tar.gz")
-md5sums=('0622ed30630a44b5fac0bfa7e176d3fe')
+md5sums=('195763a3238f51f8885881fc8012cd83')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -25,6 +23,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
-} 
+}
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index d54ca33fa..e714c01d7 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169442 2012-10-21 09:07:49Z giovanni $
+# $Id: PKGBUILD 170110 2012-11-02 09:09:21Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=2.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -19,7 +19,7 @@ makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
              'fluidsynth' 'libdc1394' 'libavc1394' 'lirc-utils'
              'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd'
              'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss'
-             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus')
+             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2')
 optdepends=('avahi: for service discovery using bonjour protocol'
             'libnotify: for notification plugin'
             'ncurses: for ncurses interface support'
@@ -28,8 +28,8 @@ optdepends=('avahi: for service discovery using bonjour protocol'
             'libavc1394: for devices using the 1394ta AV/C'
             'libdc1394: for IEEE 1394 plugin'
             'kdelibs: KDE Solid hardware integration'
-            'vdpau-video: vdpau back-end for nvidia'
-            'libva-driver-intel: back-end for intel cards'
+            'libva-vdpau-driver: vdpau back-end for nvidia'
+            'libva-intel-driver: back-end for intel cards'
             'libbluray: for Blu-Ray support'
             'flac: for Free Lossless Audio Codec plugin'
             'oss: for OSS audio support'
@@ -50,7 +50,8 @@ optdepends=('avahi: for service discovery using bonjour protocol'
             'libcdio: for audio CD playback support'
             'ttf-freefont: for subtitle font '
             'ttf-dejavu: for subtitle font'
-            'opus: for opus support')
+            'opus: for opus support'
+            'libssh2: for sftp support')
 conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 backup=('usr/share/vlc/lua/http/.hosts'
@@ -80,7 +81,8 @@ build() {
               --enable-aa \
               --enable-vcdx \
               --enable-upnp \
-              --enable-opus
+              --enable-opus \
+              --enable-sftp
   make
 }