Tue Sep 6 23:14:33 UTC 2011

51 files changed, 622 insertions, 150 deletions

diff --git a/community/clewn/PKGBUILD b/community/clewn/PKGBUILD
index 63179410e..f557aa50b 100644
--- a/community/clewn/PKGBUILD
+++ b/community/clewn/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 39861 2011-02-17 21:58:48Z spupykin $
+# $Id: PKGBUILD 55182 2011-09-05 09:01:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tardo <tardo@nagi-fanboi.net>
 
 pkgname=clewn
 pkgver=1.15
-pkgrel=4
+pkgrel=5
 pkgdesc="gdb support for vim"
 arch=('i686' 'x86_64')
 url="http://clewn.sourceforge.net"
 license=('GPL')
-depends=("vim" "gdb")
+depends=("gvim" "gdb")
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('dcfa989e6250109a7f0f99dc2d6db3e6')
diff --git a/community/dar/PKGBUILD b/community/dar/PKGBUILD
index d013f771f..be82f3409 100644
--- a/community/dar/PKGBUILD
+++ b/community/dar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 55079 2011-09-02 08:39:46Z andrea $
+# $Id: PKGBUILD 55197 2011-09-06 02:04:39Z shusmann $
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=dar
-pkgver=2.4.1
+pkgver=2.4.2
 pkgrel=1
 pkgdesc='A full featured command-line backup tool, short for Disk ARchive'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('bzip2' 'lzo2' 'libgcrypt')
 optdepends=('perl: for running some samples')
 makedepends=('doxygen')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('727e0b266d761e4dfd48a6af759413cb')
+md5sums=('b23c0509513b895f4ab9ce9191b2f65b')
 options=('!libtool')
 
 build() {
diff --git a/community/freecol/PKGBUILD b/community/freecol/PKGBUILD
index a6d6b1972..3e2d8f208 100644
--- a/community/freecol/PKGBUILD
+++ b/community/freecol/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 52513 2011-07-25 23:52:16Z svenstaro $
+# $Id: PKGBUILD 55188 2011-09-05 11:39:48Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: TDY <tdy@gmx.com>
 # Contributor: Nelson Menon <nelsonmenon@gmail.com insanatorium.wordpress.com>
 
 pkgname=freecol
-pkgver=0.10.1
+pkgver=0.10.2
 pkgrel=1
 pkgdesc="A turn-based strategy game based on Colonization"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('java-runtime')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.zip
         fc.desktop fc.sh)
-md5sums=('1511c1fbd71e36c0f998e32a1279718a'
+md5sums=('7889dc5fc994381f73e97eea8be5d799'
          '55594d770904af3e3e3852d375085357'
          'ae473cd1d86f8f764250ee00b6fda90b')
 
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index f972df1ea..c4ea91a7c 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 54641 2011-08-22 09:44:28Z spupykin $
+# $Id: PKGBUILD 55184 2011-09-05 09:03:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
 # Contributor: Dale Blount <dale@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=ulogd
 pkgver=1.24
-pkgrel=6
+pkgrel=7
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64')
 url='http://www.netfilter.org/projects/ulogd/index.html'
@@ -21,7 +21,7 @@ source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
 	'rc'
 	'logrotate')
 md5sums=('05b4ed2926b9a22aaeaf642917bbf8ff'
-         'a408932d8cdd9d5993783e2e808b1e85'
+         'c42230c1cabf5dd9b80bf9a0fd87ca7e'
          'fe40b3073b7474a77e0b8b0bfd19ab63')
 
 build() {
diff --git a/community/ulogd/rc b/community/ulogd/rc
index 756abdf86..83f0550cc 100644
--- a/community/ulogd/rc
+++ b/community/ulogd/rc
@@ -14,7 +14,7 @@ case "$1" in
     [ -f /var/run/ulog.pid ] && rm -f /var/run/ulog.pid
     PID=`get_pid`
     if [ -z "$PID" ]; then
-       /usr/sbin/ulogd -d
+       /usr/sbin/ulogd -d &>/dev/null
       if [ $? -gt 0 ]; then
         stat_fail
         exit 1
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index 1d0f1daf2..9039c42b7 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 135645 2011-08-16 22:40:28Z bisson $
+# $Id: PKGBUILD 137062 2011-09-05 19:40:28Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=feh
-pkgver=1.15.1
+pkgver=1.16
 pkgrel=1
 pkgdesc='Fast, lightweight image viewer which uses imlib2'
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama')
 optdepends=('perl: feh-cam, webcam wrapper for feh')
 makedepends=('libxt')
 source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('0c098f2656b4ad8d178bc57a3692b06045b000ec')
+sha1sums=('4793cecb7986335c096bb3c8adf0c364c36d8a34')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/fluidsynth/PKGBUILD b/extra/fluidsynth/PKGBUILD
index b82e347d7..b54502a19 100644
--- a/extra/fluidsynth/PKGBUILD
+++ b/extra/fluidsynth/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134628 2011-08-06 19:12:36Z schiv $
+# $Id: PKGBUILD 137033 2011-09-05 17:19:25Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=fluidsynth
-pkgver=1.1.4
+pkgver=1.1.5
 pkgrel=1
 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ backup=('etc/conf.d/fluidsynth')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
         'fluidsynth.conf'
         'fluidsynthd')
-md5sums=('71f297a90d00a253f0f12ceb5d3d661d'
+md5sums=('657e49e682b316432a4421dbb0313c3e'
          '16c5f4d4cbdddc6c5fcbd4fd4cc142f1'
          'b296dbfb524c2164f552f68bd9abe2ec')
 
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index dc0a8fdfe..ef8002d16 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 136997 2011-09-05 01:18:48Z bisson $
+# $Id: PKGBUILD 137064 2011-09-05 20:37:32Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=1.6.5
-pkgrel=2
+pkgver=1.6.6
+pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -16,19 +16,23 @@ optdepends=('qt: support for qt4 input method'
             'gtk3: support for gtk3 input method'
             'anthy: support for anthy input method'
             'libchewing: support for chewing input method')
-source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.bz2"
-        'gtk3-crash.patch'
+source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz"
         'qt4-lib64.patch')
-sha1sums=('4ca040981b5a473a8ff70d46e4a92bba39e22405'
-          '5529884d655cf9c95e7bf5ddced3ffed140bbc20'
+sha1sums=('d230f8cd0bd1d16321a49e51e42869fd18c3f399'
           '4307b0d7d6dc10f15909c94973c4357caf31de7e')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+
 	patch -p1 -i ../qt4-lib64.patch
-	patch -p1 -i ../gtk3-crash.patch
+	sed '/include suffixes-rule/a \
+		CFLAGS+='"${CFLAGS}"' \
+		LDFLAGS+='"${LDFLAGS}"' \
+		OPTFLAGS=' \
+		-i Makefile
+
 	./configure --prefix=/usr --use_i18n=Y
 	make
 }
diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD
index 369098afa..1e54dc324 100644
--- a/extra/gdb/PKGBUILD
+++ b/extra/gdb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 133976 2011-07-31 04:32:05Z allan $
+# $Id: PKGBUILD 137004 2011-09-05 05:59:05Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdb
-pkgver=7.3
-pkgrel=2
+pkgver=7.3.1
+pkgrel=1
 pkgdesc="The GNU Debugger"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gdb/"
@@ -15,7 +15,7 @@ backup=('etc/gdb/gdbinit')
 options=('!libtool')
 install=gdb.install
 source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('485022b8df7ba2221f217e128f479fe7')
+md5sums=('b89a5fac359c618dda97b88645ceab47')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD
index 5bf15e17b..3dae73fad 100644
--- a/extra/libgda/PKGBUILD
+++ b/extra/libgda/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123051 2011-05-07 19:17:52Z ibiru $
+# $Id: PKGBUILD 137050 2011-09-05 18:18:33Z ibiru $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=libgda
-pkgver=4.2.7
+pkgver=4.2.9
 pkgrel=1
 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
 arch=(i686 x86_64)
@@ -15,8 +15,8 @@ makedepends=('intltool' 'gobject-introspection' 'namcap')
 options=('!libtool')
 url="http://www.gnome-db.org"
 install=libgda.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('0c95d2ae4563bbb024c9179a20e95a4b544a7d4fc687ca79ac6b33c5adc113d5')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('bbae913734b0bf0149b36d1b8617e343f08611c10219fa5ba24b84dfa782e814')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index a96e34f29..3eaf2461f 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -1,33 +1,40 @@
-# $Id: PKGBUILD 81727 2010-06-02 13:16:13Z juergen $
+# $Id: PKGBUILD 137082 2011-09-06 03:22:00Z eric $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=licq
-pkgver=1.3.9
+pkgver=1.5.1
 pkgrel=1
 pkgdesc="Advanced graphical ICQ clone and more for Unix" 
 arch=('i686' 'x86_64')
 url="http://www.licq.org"
 license=('GPL')
-depends=('libxss' 'qt' 'openssl' 'boost')
-makedepends=('cmake')
-options=(!libtool)
+depends=('libxss' 'qt' 'openssl')
+makedepends=('cmake' 'boost')
+options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
-md5sums=('5285efd538fc5540cc85bc8979b8efae')
+md5sums=('7dbf9f4f190fdae4c34ab6edefb34997')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   # licq
-  GPGME_CONFIG=/bin/false ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  mkdir build
+  cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr  ..
+  make
 
   # qt4-gui
-  cd plugins/qt4-gui || return 1
+  cd ../plugins/qt4-gui
   mkdir build
   cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake"  ..
+  make
+}
 
-  cmake -DWITH_KDE=OFF -DCMAKE_INSTALL_PREFIX=/usr .. || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/build"
+  make DESTDIR="${pkgdir}" install
 
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  cd ../plugins/qt4-gui/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 255c0c3ce..29df3c452 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 135557 2011-08-15 13:18:59Z dreisner $
+# $Id: PKGBUILD 137078 2011-09-05 23:07:50Z dreisner $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
 pkgver=5.24.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://maxima.sourceforge.net"
-depends=('sbcl=1.0.50' 'texinfo' 'sh')
+depends=('sbcl=1.0.51' 'texinfo' 'sh')
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
 # needs rebuild when bash changes version
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index c971f7337..f90d8576f 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131166 2011-07-11 13:06:25Z stephane $
+# $Id: PKGBUILD 136999 2011-09-05 05:47:36Z allan $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=python
-pkgver=3.2.1
+pkgver=3.2.2
 pkgrel=1
 _pybasever=3.2
 pkgdesc="Next generation of the python high-level scripting language"
@@ -18,7 +18,7 @@ provides=('python3')
 replaces=('python3')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
-sha1sums=('ab5cf4a4c21abe590dea87473a1dee6820699d79')
+sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
diff --git a/extra/rcs/PKGBUILD b/extra/rcs/PKGBUILD
index b034c7cda..814bd760d 100644
--- a/extra/rcs/PKGBUILD
+++ b/extra/rcs/PKGBUILD
@@ -1,31 +1,29 @@
-# $Id: PKGBUILD 127635 2011-06-17 10:04:08Z bisson $
+# $Id: PKGBUILD 137009 2011-09-05 07:46:17Z bisson $
 # Contributor: dorphell <dorphell@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=rcs
-pkgver=5.7
-pkgrel=6
-pkgdesc='Revision Control System'
+pkgver=5.8
+pkgrel=1
+pkgdesc='Revision Control System: manages multiple revisions of files'
+url='http://www.gnu.org/software/rcs/'
+license=('GPL3')
 arch=('i686' 'x86_64')
-url="http://www.cs.purdue.edu/homes/trinkle/RCS/"
-license=('GPL')
-source=("http://www.cs.purdue.edu/homes/trinkle/RCS/rcs-${pkgver}.tar.Z" \
-        'path.patch')
-sha1sums=('976774bda26a7743b8375797f92fbd18e51ac7a2'
-          '0f0be997e5d018e0d638b5f16430423ccb3774be')
+source=("http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('6ba0c3ea2d170990214a26b323feaadb89bb4206')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../path.patch
 	./configure --prefix=/usr
 	make
 }
 
-package() {
+check() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make install \
-		prefix="${pkgdir}"/usr \
-		man1dir="${pkgdir}"/usr/share/man/man1 \
-		man5dir="${pkgdir}"/usr/share/man/man5 \
+	make check
+}
 
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make prefix="${pkgdir}/usr" install
 }
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 9c23c55fc..5829ea5b4 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 135444 2011-08-13 20:11:24Z dreisner $
+# $Id: PKGBUILD 137076 2011-09-05 23:05:51Z dreisner $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
-pkgver=1.0.50
-pkgrel=2
+pkgver=1.0.51
+pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
 arch=('i686' 'x86_64')
@@ -16,11 +16,9 @@ provides=('common-lisp' 'cl-asdf')
 makedepends=('sbcl' 'texinfo')
 install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
-        "arch-fixes.lisp"
-        "0001-Fix-version-string-parsing-for-Linux-3.0.patch")
-md5sums=('74ce9b24516885d066ec4287cde52e8c'
-         '7ac0c1936547f4278198b8bf7725204d'
-         '7af58d1de2d788ad6a8d82c89279a75f')
+        "arch-fixes.lisp")
+md5sums=('08032cc777f1236953cb901e24775457'
+         '7ac0c1936547f4278198b8bf7725204d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -32,7 +30,7 @@ build() {
   export LINKFLAGS="$LDFLAGS"
   unset LDFLAGS
 
-  # Make a multi-threaded SBCL, disable LARGEFILE  
+  # Make a multi-threaded SBCL, disable LARGEFILE
   cat >customize-target-features.lisp <<EOF
 (lambda (features)
   (flet ((enable (x) (pushnew x features))
@@ -41,9 +39,6 @@ build() {
   (disable :largefile)))
 EOF
 
-  # fix build against 3.0-ARCH
-  patch -Np1 < "$srcdir/0001-Fix-version-string-parsing-for-Linux-3.0.patch"
-
   sh make.sh sbcl
   make -C doc/manual info
 }
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index d26b48d47..4ee6e3427 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136823 2011-09-01 21:33:21Z eric $
+# $Id: PKGBUILD 137072 2011-09-05 21:46:27Z eric $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,9 +6,9 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=289
+_patchlevel=294
 pkgver=${_topver}.${_patchlevel}
-__hgrev=ba9f075a347d
+__hgrev=9c96fb7330b5 
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:vim')
@@ -97,7 +97,7 @@ build() {
 
 package_vim() {
   pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl')
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm')
   conflicts=('gvim')
 
   cd "${srcdir}"/vim-build
diff --git a/gnome-unstable/accountsservice/PKGBUILD b/gnome-unstable/accountsservice/PKGBUILD
index 63919dc42..ab83464c2 100644
--- a/gnome-unstable/accountsservice/PKGBUILD
+++ b/gnome-unstable/accountsservice/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 136779 2011-09-01 14:07:44Z ibiru $
+# $Id: PKGBUILD 137012 2011-09-05 08:29:25Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=accountsservice
-pkgver=0.6.13
+pkgver=0.6.14
 pkgrel=1
 pkgdesc="D-Bus interface for user account query and manipulation"
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ depends=('dbus-glib' 'polkit')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('204b19e4522d5fdd3381b1ea14cd8263')
+md5sums=('88f4d5d0d1f0ce0fa6a180cbff936041')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/gnome-unstable/clutter/PKGBUILD b/gnome-unstable/clutter/PKGBUILD
index 361c08e32..3a731bd4b 100644
--- a/gnome-unstable/clutter/PKGBUILD
+++ b/gnome-unstable/clutter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 136821 2011-09-01 21:15:55Z ibiru $
+# $Id: PKGBUILD 137068 2011-09-05 20:55:27Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=clutter
-pkgver=1.7.12
-pkgrel=2
+pkgver=1.7.14
+pkgrel=1
 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
 arch=('i686' 'x86_64')
 url="http://clutter-project.org/"
@@ -14,7 +14,7 @@ license=('LGPL')
 depends=('cogl>=1.7.6' 'mesa' 'json-glib' 'atk' 'libxi')
 makedepends=('gobject-introspection' 'mesa')
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b145cb02b1682fd9a4fb5af38d7baee94d3841e84a5ad960ecc2fead96b3ac7a')
+sha256sums=('a2ad6f09df6dc6cf4c495446053fc0b48e9fc1d9b4d1a63a0a0003a3a92bcae1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/gnome-unstable/cogl/PKGBUILD b/gnome-unstable/cogl/PKGBUILD
index 11d671d6b..11afabb6c 100644
--- a/gnome-unstable/cogl/PKGBUILD
+++ b/gnome-unstable/cogl/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 136612 2011-08-30 21:40:13Z ibiru $
+# $Id: PKGBUILD 137066 2011-09-05 20:44:58Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=cogl
-pkgver=1.7.6
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
 makedepends=('mesa' 'gobject-introspection')
 options=(!libtool)
 source=(http://download.gnome.org/sources/$pkgname/1.7/$pkgname-$pkgver.tar.xz)
-sha256sums=('4dd97260ecf464753f9daa30e10ee9d160b323515811b73bef8d84d3274ae072')
+sha256sums=('afa114951946c5aafde965b6c34eef487731de06e002474d7956faa8e5754749')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/gnome-unstable/gnome-color-manager/PKGBUILD b/gnome-unstable/gnome-color-manager/PKGBUILD
index 808c21006..b4d150fe5 100644
--- a/gnome-unstable/gnome-color-manager/PKGBUILD
+++ b/gnome-unstable/gnome-color-manager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 136863 2011-09-02 13:47:20Z heftig $
+# $Id: PKGBUILD 137040 2011-09-05 17:46:47Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
-pkgver=3.1.90
+pkgver=3.1.91
 pkgrel=1
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ makedepends=(intltool gtk-doc)
 install=gnome-color-manager.install
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6e50b1da207b8aa154ba84c59059a3b19fcae0f30ac41eb68b8de0e036d54249')
+sha256sums=('bc8907cd72bdc399b6cd900f940eb3baa858d52e5ca15883fc5a849bdf76c6a6')
 
 build(){
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/gnome-unstable/gnome-control-center/PKGBUILD b/gnome-unstable/gnome-control-center/PKGBUILD
index 3b416a1d8..f2e7662d2 100644
--- a/gnome-unstable/gnome-control-center/PKGBUILD
+++ b/gnome-unstable/gnome-control-center/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 136787 2011-09-01 14:24:24Z ibiru $
+# $Id: PKGBUILD 137030 2011-09-05 15:27:19Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=3.1.90
+pkgver=3.1.91
 pkgrel=1
 pkgdesc="The Control Center for GNOME"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ install=gnome-control-center.install
 license=('GPL')
 options=('!libtool' '!emptydirs')
 source=(http://download.gnome.org/sources/${pkgname}/3.1/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('119db946291af93e004fa42afbb91a2cdaee3767fbdcac79ce9fceda8211b041')
+sha256sums=('486faa402aeacf5a25f55bbfae5e797094dba59d19ffd0c58cc0d7da5b4f8f94')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/gnome-unstable/gnome-desktop/PKGBUILD b/gnome-unstable/gnome-desktop/PKGBUILD
index 40a6d6682..a1afacb59 100644
--- a/gnome-unstable/gnome-desktop/PKGBUILD
+++ b/gnome-unstable/gnome-desktop/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 136771 2011-09-01 13:31:49Z ibiru $
+# $Id: PKGBUILD 137019 2011-09-05 10:10:34Z ibiru $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
-pkgver=3.1.90.1
+pkgver=3.1.91
 pkgrel=1
 pkgdesc="Library with common API for various GNOME modules"
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8c8fd3e05efee0f63ade1dbdea23b25e06e37ef1d3e5cda029c47d845e1b3a98')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('80e5386d28f8dca454ce0e513aa855b26ccb045a4612a67951f08031f38a2e0b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/gnome-unstable/gnome-keyring/PKGBUILD b/gnome-unstable/gnome-keyring/PKGBUILD
index 1b31febf4..b9a8bc95b 100644
--- a/gnome-unstable/gnome-keyring/PKGBUILD
+++ b/gnome-unstable/gnome-keyring/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 136929 2011-09-03 00:09:33Z ibiru $
+#$Id: PKGBUILD 137013 2011-09-05 08:31:24Z ibiru $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=3.1.90
-pkgrel=2
+pkgver=3.1.91
+pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('044b9758d9a9e147a6fc3443a2e28731c129876eebe44855b17fe453489f28e3')
+sha256sums=('6a5b448b33804e86375f61325e5037efbc84d56f35f44976c0cb0e107b252f62')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/gnome-unstable/gnome-panel/PKGBUILD b/gnome-unstable/gnome-panel/PKGBUILD
index da5792a99..26980d33b 100644
--- a/gnome-unstable/gnome-panel/PKGBUILD
+++ b/gnome-unstable/gnome-panel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 136869 2011-09-02 14:24:33Z ibiru $
+# $Id: PKGBUILD 137021 2011-09-05 10:20:15Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-panel
-pkgver=3.1.5
+pkgver=3.1.91
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,7 +16,7 @@ replaces=('gnome-panel-bonobo')
 provides=("gnome-panel-bonobo=${pkgver}")
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('86214f5abebac973073dd3102813add2dcc199567c6ba2bbd48305ed53d9a19b')
+sha256sums=('74ca1bf568d72ac2f764f6384434e7b05c9a819a1924a0dbdea4e7ebb9616cd6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/gnome-unstable/gnome-screensaver/PKGBUILD b/gnome-unstable/gnome-screensaver/PKGBUILD
index e6576a9e5..3bf14cdb4 100644
--- a/gnome-unstable/gnome-screensaver/PKGBUILD
+++ b/gnome-unstable/gnome-screensaver/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 136937 2011-09-03 00:52:21Z ibiru $
+# $Id: PKGBUILD 137023 2011-09-05 10:26:19Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-screensaver
-pkgver=3.1.90
+pkgver=3.1.91
 pkgrel=1
 pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ options=(!emptydirs)
 install=gnome-screensaver.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
        gnome-screensaver.pam)
-sha256sums=('0ed0620dd32f763386f1d98b445d29d1c257a2c1c57f511ccaeb984f673f3c27'
+sha256sums=('aa0947438138fc8d4b40b50af066fbea82da7a95cd15781e5c8ea3340c6aaae3'
             '2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2')
 
 build() {
diff --git a/gnome-unstable/gnome-session/PKGBUILD b/gnome-unstable/gnome-session/PKGBUILD
index 239c021dd..c0ba70753 100644
--- a/gnome-unstable/gnome-session/PKGBUILD
+++ b/gnome-unstable/gnome-session/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 136766 2011-09-01 13:20:03Z ibiru $
+# $Id: PKGBUILD 137017 2011-09-05 10:06:40Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-session
-pkgver=3.1.90
+pkgver=3.1.91
 pkgrel=1
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('upower' 'gtk3' 'gconf' 'json-glib' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl' 'librsvg'
+depends=('upower' 'gtk3' 'gconf' 'json-glib' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl'
          'gsettings-desktop-schemas' 'consolekit' 'libsm' 'dconf')
 makedepends=('intltool' 'mesa' 'xtrans')
 options=('!emptydirs')
@@ -15,7 +15,7 @@ install=gnome-session.install
 url="http://www.gnome.org"
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('59901a0ca07eb833df4f3403563f20444568fb8535143f39c4e71b5577c81b9a')
+sha256sums=('4de05975b78e5a0ff29a421cec50be379059a88abf15247b21ec65afb3125d0d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/gnome-unstable/gnome-settings-daemon/PKGBUILD b/gnome-unstable/gnome-settings-daemon/PKGBUILD
index c3d00ca28..9fc0bb336 100644
--- a/gnome-unstable/gnome-settings-daemon/PKGBUILD
+++ b/gnome-unstable/gnome-settings-daemon/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 136777 2011-09-01 14:04:25Z ibiru $
+# $Id: PKGBUILD 137027 2011-09-05 15:05:39Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-settings-daemon
-pkgver=3.1.90
+pkgver=3.1.91
 pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ license=('GPL')
 depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme'
          'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf'
          'dconf' 'pulseaudio' 'pulseaudio-alsa' 'upower')
-makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'colord' 'namcap')
+makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'colord')
 options=('!emptydirs' '!libtool')
 install=gnome-settings-daemon.install
 url="http://www.gnome.org"
@@ -18,7 +18,7 @@ groups=('gnome')
 replaces=(gnome-settings-daemon-pulse)
 conflicts=(gnome-settings-daemon-pulse)
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('ff163f0332532134ca18ae2ee4062fc9bb15341c8cd1bea609c7e0da9edb35ed')
+sha256sums=('bd907225c84f5a6cf84356a22d5935cb141b3f8841290f7192de20642c0b5e90')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/gnome-unstable/grilo-plugins/PKGBUILD b/gnome-unstable/grilo-plugins/PKGBUILD
new file mode 100644
index 000000000..458e9a556
--- /dev/null
+++ b/gnome-unstable/grilo-plugins/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 137057 2011-09-05 18:40:27Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
+pkgname=grilo-plugins
+pkgver=0.1.17
+pkgrel=1
+pkgdesc="Plugins for Grilo"
+url="http://www.gnome.org"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('grilo')
+makedepends=('gupnp-av' 'libgdata' 'quvi' 'sqlite3' 'gmime' 'libgcrypt' 'rest')
+optdepends=('gupnp-av: uPnP plugin'
+            'libgdata: Youtube plugin'
+            'quvi: Youtube plugin'
+            'sqlite3: Podcasts plugin'
+            'gmime: Podcasts plugin'
+            'sqlite3: Bookmarks plugin'
+            'sqlite3: Metadata store plugin'
+            'libgcrypt: Vimeo plugin'
+            'rest: Blip.tv plugin')
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('c77f70c02ab8a9abb7cddc909f90853d13e2a18d4b69db65a411082c3ef79b0a')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
+    --enable-shoutcast
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/gnome-unstable/grilo/PKGBUILD b/gnome-unstable/grilo/PKGBUILD
index e09f67740..5b0a39678 100644
--- a/gnome-unstable/grilo/PKGBUILD
+++ b/gnome-unstable/grilo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 136898 2011-09-02 17:34:31Z heftig $
+# $Id: PKGBUILD 137051 2011-09-05 18:19:24Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=grilo
-pkgver=0.1.16
+pkgver=0.1.17
 pkgrel=1
 pkgdesc="Framework that provides access to various sources of multimedia content"
 url="http://www.gnome.org"
@@ -11,12 +11,11 @@ license=('LGPL')
 depends=('gtk3' 'libxml2' 'libsoup')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('690dabd2bf0fb5f1f11ec9c69005c7c7b1b7c1585dc9ab7b93d3ee3aab284c74')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('f88406b1737bdf0dc38c3acda418983084afe62ddc09fefd14a95f42ec727eaf')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's/vala-0.12/vala-0.14/g' configure
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }
diff --git a/gnome-unstable/gssdp/PKGBUILD b/gnome-unstable/gssdp/PKGBUILD
new file mode 100644
index 000000000..08e9971ca
--- /dev/null
+++ b/gnome-unstable/gssdp/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 137053 2011-09-05 18:37:48Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: György Balló <ballogy@freestart.hu>
+
+pkgname=gssdp
+pkgver=0.10.0
+pkgrel=1
+pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
+arch=('i686' 'x86_64')
+url="http://gupnp.org/"
+license=('LGPL')
+depends=('libsoup')
+makedepends=('gobject-introspection' 'gtk2' 'gtk-doc')
+optdepends=('gtk2: gssdp-device-sniffer')
+options=('!libtool')
+source=(http://gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz)
+sha256sums=('94de92bb4f7906ed2f047b0146a3b21d53d09908fe1f0149484f61c6afc598ea')
+
+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/gnome-unstable/gtk3/PKGBUILD b/gnome-unstable/gtk3/PKGBUILD
index 6b8ca77a6..8fb644609 100644
--- a/gnome-unstable/gtk3/PKGBUILD
+++ b/gnome-unstable/gtk3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 136606 2011-08-30 18:02:37Z ibiru $
+# $Id: PKGBUILD 137070 2011-09-05 21:25:37Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.1.16
+pkgver=3.1.18
 pkgrel=1
 pkgdesc="The GTK+ Toolkit (v3)"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.1/gtk+-${pkgver}.tar.xz
         settings.ini)
-sha256sums=('2f0b9c6ba48e7ef741c08d6c2c2a2fee6751ecfc63719579ca905d5c8e5b5995'
+sha256sums=('22197439092404b43184d6121d047610f6c4573891309feca36ac8eedeaf6ab4'
             'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
 
 build() {
diff --git a/gnome-unstable/gupnp-av/PKGBUILD b/gnome-unstable/gupnp-av/PKGBUILD
new file mode 100644
index 000000000..0bf3cc2dd
--- /dev/null
+++ b/gnome-unstable/gupnp-av/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 137056 2011-09-05 18:39:37Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
+# Contributor: Denis Zawada <deno@rootnode.net>
+
+pkgname=gupnp-av
+pkgver=0.8.0
+pkgrel=1
+pkgdesc="Library to ease handling and implementation of UPnP A/V profiles"
+arch=('i686' 'x86_64')
+url="http://gupnp.org/"
+license=('LGPL')
+depends=('gupnp')
+makedepends=('gobject-introspection' 'gtk-doc')
+options=('!libtool')
+source=(http://gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz)
+sha256sums=('e6aa032377488cedc4e347519bd30701c583780b7c54f00bab083f2316a93dc9')
+
+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/gnome-unstable/gupnp/PKGBUILD b/gnome-unstable/gupnp/PKGBUILD
new file mode 100644
index 000000000..bb387d0a6
--- /dev/null
+++ b/gnome-unstable/gupnp/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 137054 2011-09-05 18:38:40Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: György Balló <ballogy@freestart.hu>
+
+pkgname=gupnp
+pkgver=0.16.1
+pkgrel=1
+pkgdesc="An object-oriented UPNP framework"
+arch=('i686' 'x86_64')
+url="http://gupnp.org/"
+license=('LGPL')
+depends=('gssdp')
+makedepends=('gobject-introspection' 'gtk-doc')
+optdepends=('python2: gupnp-binding-tool')
+options=('!libtool')
+source=(http://gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz)
+sha256sums=('f01a1f4fd36ce161a3df29fa83e1a0a2fb40d3c9f30f6b403e7791688ad24cfe')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  sed -i '1s|^#!.*python$|&2|' tools/gupnp-binding-tool
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/gnome-unstable/gvfs/PKGBUILD b/gnome-unstable/gvfs/PKGBUILD
index bf9069629..0a5699a42 100644
--- a/gnome-unstable/gvfs/PKGBUILD
+++ b/gnome-unstable/gvfs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136731 2011-08-31 19:24:33Z ibiru $
+# $Id: PKGBUILD 137058 2011-09-05 18:43:02Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.9.4
+pkgver=1.9.5
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -13,7 +13,7 @@ makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2'
 url="http://www.gnome.org"
 options=(!libtool)
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('a923e183b35357e8a6a33dd2909ebe6b26311d0fa99c1752a7050752f339fa60')
+sha256sums=('a90dfc87f37171b2c047d7af823b9372e9e9f9e9ca7728b37b90c6d89855e08f')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/gnome-unstable/mousetweaks/PKGBUILD b/gnome-unstable/mousetweaks/PKGBUILD
new file mode 100644
index 000000000..fcbd666ca
--- /dev/null
+++ b/gnome-unstable/mousetweaks/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 2392 2008-06-01 19:38:25Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=mousetweaks
+pkgver=3.1.91
+pkgrel=1
+pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
+arch=(i686 x86_64)
+license=('GPL3' 'FDL')
+depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas')
+makedepends=('gnome-doc-utils' 'intltool')
+groups=('gnome-extra')
+options=('!libtool' '!emptydirs')
+url="http://www.gnome.org"
+install=mousetweaks.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('3cb61eda34e74a53ba53492b37a87e2873959b9894356f9584032021551c3381')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-scrollkeeper
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/gnome-unstable/mousetweaks/mousetweaks.install b/gnome-unstable/mousetweaks/mousetweaks.install
new file mode 100644
index 000000000..1ae919322
--- /dev/null
+++ b/gnome-unstable/mousetweaks/mousetweaks.install
@@ -0,0 +1,17 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall mousetweaks
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/gnome-unstable/seahorse/PKGBUILD b/gnome-unstable/seahorse/PKGBUILD
index a672bdfc4..d09b0f0eb 100644
--- a/gnome-unstable/seahorse/PKGBUILD
+++ b/gnome-unstable/seahorse/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136875 2011-09-02 14:51:00Z ibiru $
+# $Id: PKGBUILD 137015 2011-09-05 08:37:59Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michel Brabants <michel.linux@tiscali.be>
 
 pkgname=seahorse
-pkgver=3.1.90
+pkgver=3.1.91
 pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 install=seahorse.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e866d3dd46d3e1e303bc76fa47073a0fb48b8825fe9839157ac37916e4cd19a2')
+sha256sums=('7b253f62641fd1adb7d949f4f9ce9623590a5552c14056ddc9f1786822f837e2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/gnome-unstable/sushi/PKGBUILD b/gnome-unstable/sushi/PKGBUILD
new file mode 100644
index 000000000..6f690a569
--- /dev/null
+++ b/gnome-unstable/sushi/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 137031 2011-09-05 17:00:37Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+pkgname=sushi
+pkgver=0.1.90
+pkgrel=1
+pkgdesc="A quick previewer for Nautilus"
+arch=(i686 x86_64)
+url="http://www.gnome.org"
+license=('GPL2')
+groups=(gnome-extra)
+depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz3' 'libwebkit3' 'gtksourceview3' 'evince')
+makedepends=('intltool' 'gobject-introspection')
+options=(!libtool)
+source=(http://download.gnome.org/sources/$pkgname/0.1/$pkgname-$pkgver.tar.xz)
+sha256sums=('a4c7fafbfb43cd91ccd9937bfd094f3d72cadc3c01e930aa069f3b2288574b9f')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --libexecdir=/usr/lib/sushi
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/totem/PKGBUILD b/gnome-unstable/totem/PKGBUILD
new file mode 100644
index 000000000..215979e22
--- /dev/null
+++ b/gnome-unstable/totem/PKGBUILD
@@ -0,0 +1,69 @@
+# $Id: PKGBUILD 137060 2011-09-05 18:52:32Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=totem
+pkgname=('totem' 'totem-plugin')
+pkgver=3.1.4
+pkgrel=1
+pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
+url="http://www.gnome.org"
+arch=('i686' 'x86_64')
+license=('GPL2' 'custom')
+depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm'
+         'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme'
+         'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf' 'clutter-gst'
+         'clutter-gtk' 'mx')
+makedepends=('intltool' 'gtk-doc' 'python2-gobject2' 'nautilus' 'libgdata' 'xulrunner' 'lirc-utils'
+             'libepc' 'bluez' 'vala' 'grilo')
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
+sha256sums=('46b9c1cf136de90ed649ca6ff636a63aa452c9724e137e983ba4e3250fa35749')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/totem \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-python \
+    --enable-nautilus
+  make
+}
+
+package_totem() {
+  groups=('gnome-extra')
+  install=totem.install
+  optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
+              'gstreamer0.10-bad-plugins: Extra media codecs'
+              'gstreamer0.10-ffmpeg: Extra media codecs'
+              'lirc-utils: Infrared Remote Control plugin'
+              'libepc: Publish Playlist plugin'
+              'libgdata: YouTube Browser plugin'
+              'bluez: Bemused plugin'
+              'grilo: Grilo plugin')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  rm -r "${pkgdir}/usr/lib/mozilla"
+  rm "${pkgdir}/usr/lib/totem/totem-plugin-viewer"
+
+  sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \
+    $pkgdir/usr/lib/totem/{totem/totem-bugreport.py,plugins/iplayer/iplayer2.py}
+
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem/COPYING"
+}
+
+package_totem-plugin() {
+  pkgdesc="Totem mozilla/firefox plugin"
+  depends=("totem=${pkgver}")
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -C browser-plugin \
+    plugindir=/usr/lib/mozilla/plugins \
+    xptdir=/usr/lib/mozilla/plugins \
+    DESTDIR="${pkgdir}" install
+
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem-plugin/COPYING"
+}
diff --git a/gnome-unstable/totem/totem.install b/gnome-unstable/totem/totem.install
new file mode 100644
index 000000000..07cb42dcb
--- /dev/null
+++ b/gnome-unstable/totem/totem.install
@@ -0,0 +1,19 @@
+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
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.91.91) < 0 )); then
+    usr/sbin/gconfpkg --uninstall totem
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/gnome-unstable/upower/PKGBUILD b/gnome-unstable/upower/PKGBUILD
new file mode 100644
index 000000000..c4e769670
--- /dev/null
+++ b/gnome-unstable/upower/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 137028 2011-09-05 15:14:03Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=upower
+pkgver=0.9.13
+pkgrel=1
+pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
+arch=('i686' 'x86_64')
+url="http://upower.freedesktop.org"
+license=('GPL')
+depends=('udev' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
+makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection')
+replaces=('devicekit-power')
+options=('!libtool')
+source=($url/releases/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('2c7dd2c26d11da628d68111d50eed51244a8337c1d0830addecd1372a7d44a22')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/upower --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/gnome-unstable/vinagre/PKGBUILD b/gnome-unstable/vinagre/PKGBUILD
new file mode 100644
index 000000000..aa5c39dec
--- /dev/null
+++ b/gnome-unstable/vinagre/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 137042 2011-09-05 17:49:53Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Allan McRae <mcrae_allan@hotmail.com>
+# Contributor: lp76 <l.peduto@gmail.com>
+
+pkgname=vinagre
+pkgver=3.1.91
+pkgrel=1
+pkgdesc="A VNC Client for the GNOME Desktop"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/vinagre/"
+install=vinagre.install
+depends=('libgnome-keyring' 'gtk-vnc' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme')
+optdepends=('rdesktop: RDP plugin')
+makedepends=('gtk-doc' 'intltool' 'rdesktop')
+groups=('gnome-extra')
+options=('!emptydirs' '!libtool')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('6e62ce78e0fb867444f4403668684c05394f55d1f3468f725297431b1a14fbc8')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \
+      --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/gnome-unstable/vinagre/vinagre.install b/gnome-unstable/vinagre/vinagre.install
new file mode 100644
index 000000000..68158ac80
--- /dev/null
+++ b/gnome-unstable/vinagre/vinagre.install
@@ -0,0 +1,20 @@
+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
+  update-mime-database usr/share/mime > /dev/null
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.91.91-2) < 0 )); then
+    usr/sbin/gconfpkg --uninstall vinagre
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/gnome-unstable/vino/PKGBUILD b/gnome-unstable/vino/PKGBUILD
index 8701f1792..9056c890d 100644
--- a/gnome-unstable/vino/PKGBUILD
+++ b/gnome-unstable/vino/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 136767 2011-09-01 13:21:47Z heftig $
+# $Id: PKGBUILD 137043 2011-09-05 17:54:42Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vino
-pkgver=3.1.90
+pkgver=3.1.91
 pkgrel=1
 pkgdesc="a VNC server for the GNOME desktop"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ url="http://www.gnome.org"
 options=(!emptydirs)
 install=vino.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('155048c8240aaa2c66f054dbf2eb0d9d730ce0cc669fbbee85d01cfa2ea1c948')
+sha256sums=('07f841812c9b30722374693b6e28c0dea34b1037b2afeefd5873394bf3a6001c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/multilib/lib32-libx11/PKGBUILD b/multilib/lib32-libx11/PKGBUILD
index cdd1c285c..f5392d36d 100644
--- a/multilib/lib32-libx11/PKGBUILD
+++ b/multilib/lib32-libx11/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 45003 2011-04-14 07:54:26Z lcarlier $
+# $Id: PKGBUILD 55180 2011-09-05 08:14:08Z bluewind $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 _pkgbasename=libx11
 pkgname=lib32-$_pkgbasename
-pkgver=1.4.3
+pkgver=1.4.4
 pkgrel=1
 pkgdesc="X11 client-side library (32-bit)"
 arch=(x86_64)
@@ -13,7 +13,7 @@ makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto' 'gcc-multilib'
 options=('!libtool')
 license=('custom:XFREE86')
 source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2)
-sha1sums=('174270a0e51614b5077026fc6c20701d4e09aef8')
+sha1sums=('2d9d38bfd7003ec60eea0b1999ab72cfd5fa3b90')
 
 build() {
   export CC="gcc -m32"
diff --git a/testing/xf86-input-synaptics/PKGBUILD b/testing/xf86-input-synaptics/PKGBUILD
index f0a8ad31c..fb9b5836b 100644
--- a/testing/xf86-input-synaptics/PKGBUILD
+++ b/testing/xf86-input-synaptics/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 136561 2011-08-30 08:46:01Z jgc $
+# $Id: PKGBUILD 137001 2011-09-05 05:55:06Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski  <tpowa@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-input-synaptics
-pkgver=1.4.1
-pkgrel=2
+pkgver=1.5.0
+pkgrel=1
 pkgdesc="Synaptics driver for notebook touchpads"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxtst')
@@ -22,7 +22,7 @@ options=(!libtool)
 backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         10-synaptics.conf)
-sha1sums=('e41201476f4bc8658291808d2d6ef2e0535179ae'
+sha1sums=('7373c1e3f02bf7e18f71b65762a982d907b4a053'
           '68e1f4ef5e1038231d210eb422fa4d18c5922f0f')
 
 build() {
@@ -30,6 +30,7 @@ build() {
   ./configure --prefix=/usr
   make
 }
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff b/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff
new file mode 100644
index 000000000..99e8a6754
--- /dev/null
+++ b/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff
@@ -0,0 +1,20 @@
+Move startx auth files in /tmp so they are removed on reboot.
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
+The trap patch didn't seem to work on reboot.
+---
+ startx.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: xinit/startx.cpp
+===================================================================
+--- xinit.orig/startx.cpp
++++ xinit/startx.cpp
+@@ -273,7 +273,7 @@
+     dummy=0
+ 
+     XCOMM create a file with auth information for the server. ':0' is a dummy.
+-    xserverauthfile=$HOME/.serverauth.$$
++    xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
+     trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
+     xauth -q -f "$xserverauthfile" << EOF
+ add :$dummy . $mcookie
diff --git a/testing/xorg-xinit/PKGBUILD b/testing/xorg-xinit/PKGBUILD
new file mode 100644
index 000000000..9328da501
--- /dev/null
+++ b/testing/xorg-xinit/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 137005 2011-09-05 06:01:09Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+
+pkgname=xorg-xinit
+pkgver=1.3.1
+pkgrel=1
+pkgdesc="X.Org initialisation program "
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libx11' 'xorg-xauth')
+makedepends=('xorg-util-macros')
+optdepends=('xorg-twm' 'xterm')
+backup=('etc/skel/.xinitrc'
+        'etc/skel/.xsession'
+        'etc/X11/xinit/xserverrc'
+        'etc/X11/xinit/xinitrc')
+source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
+        06_move_serverauthfile_into_tmp.diff
+        xinitrc
+        xsession
+        xserverrc)
+options=(!emptydirs)
+md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4'
+         'abd072ec435ce084cf4e89c58f83d45c'
+         'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
+         '7873d97db30d6c279ed37e3559e7c59d'
+         'c5baef10fdb7239594daee72a94ddab3')
+
+build() {
+  cd "${srcdir}/xinit-${pkgver}"
+  patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
+  sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
+  ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
+  make
+}
+
+package() {
+  cd "${srcdir}/xinit-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/etc/skel"
+  install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc"
+  install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession"
+  install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/testing/xorg-xinit/xinitrc b/testing/xorg-xinit/xinitrc
new file mode 100644
index 000000000..dbd080d00
--- /dev/null
+++ b/testing/xorg-xinit/xinitrc
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# ~/.xinitrc
+#
+# Executed by startx (run your window manager from here)
+
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for f in /etc/X11/xinit/xinitrc.d/*; do
+    [ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
+# exec gnome-session
+# exec startkde
+# exec startxfce4
+# ...or the Window Manager of your choice
diff --git a/testing/xorg-xinit/xserverrc b/testing/xorg-xinit/xserverrc
new file mode 100644
index 000000000..6f746cdce
--- /dev/null
+++ b/testing/xorg-xinit/xserverrc
@@ -0,0 +1 @@
+exec /usr/bin/X -nolisten tcp "$@"
diff --git a/testing/xorg-xinit/xsession b/testing/xorg-xinit/xsession
new file mode 100644
index 000000000..a16dc0b84
--- /dev/null
+++ b/testing/xorg-xinit/xsession
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+#
+# ~/.xsession
+#
+# Executed by xdm/gdm/kdm at login
+#
+
+/bin/bash --login -i ~/.xinitrc
+